Merge /spare/repo/linux-2.6/

652 files changed, 86750 insertions, 21305 deletions

diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index c4b75ecf9460..55959e4d1cb7 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -417,9 +417,9 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
                 chan = (here[3] & uPD98401_AAL5_CHAN) >>
                     uPD98401_AAL5_CHAN_SHIFT;
                 if (chan < zatm_dev->chans && zatm_dev->rx_map[chan]) {
-                        int pos = ZATM_VCC(vcc)->pool;
-
+                        int pos;
                         vcc = zatm_dev->rx_map[chan];
+                        pos = ZATM_VCC(vcc)->pool;
                         if (skb == zatm_dev->last_free[pos])
                                 zatm_dev->last_free[pos] = NULL;
                         skb_unlink(skb, zatm_dev->pool + pos);
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index ec615d854be9..373e7b728fa7 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -22,11 +22,26 @@
 /* This is a private structure used to tie the classdev and the
  * container .. it should never be visible outside this file */
 struct internal_container {
-        struct list_head node;
+        struct klist_node node;
         struct attribute_container *cont;
         struct class_device classdev;
 };
 
+static void internal_container_klist_get(struct klist_node *n)
+{
+        struct internal_container *ic =
+                container_of(n, struct internal_container, node);
+        class_device_get(&ic->classdev);
+}
+
+static void internal_container_klist_put(struct klist_node *n)
+{
+        struct internal_container *ic =
+                container_of(n, struct internal_container, node);
+        class_device_put(&ic->classdev);
+}
+
+
 /**
  * attribute_container_classdev_to_container - given a classdev, return the container
  *
@@ -57,7 +72,8 @@ int
 attribute_container_register(struct attribute_container *cont)
 {
         INIT_LIST_HEAD(&cont->node);
-        INIT_LIST_HEAD(&cont->containers);
+        klist_init(&cont->containers,internal_container_klist_get,
+                   internal_container_klist_put);
                 
         down(&attribute_container_mutex);
         list_add_tail(&cont->node, &attribute_container_list);
@@ -77,11 +93,13 @@ attribute_container_unregister(struct attribute_container *cont)
 {
         int retval = -EBUSY;
         down(&attribute_container_mutex);
-        if (!list_empty(&cont->containers))
+        spin_lock(&cont->containers.k_lock);
+        if (!list_empty(&cont->containers.k_list))
                 goto out;
         retval = 0;
         list_del(&cont->node);
  out:
+        spin_unlock(&cont->containers.k_lock);
         up(&attribute_container_mutex);
         return retval;
                 
@@ -140,7 +158,6 @@ attribute_container_add_device(struct device *dev,
                         continue;
                 }
                 memset(ic, 0, sizeof(struct internal_container));
-                INIT_LIST_HEAD(&ic->node);
                 ic->cont = cont;
                 class_device_initialize(&ic->classdev);
                 ic->classdev.dev = get_device(dev);
@@ -151,11 +168,22 @@ attribute_container_add_device(struct device *dev,
                         fn(cont, dev, &ic->classdev);
                 else
                         attribute_container_add_class_device(&ic->classdev);
-                list_add_tail(&ic->node, &cont->containers);
+                klist_add_tail(&ic->node, &cont->containers);
         }
         up(&attribute_container_mutex);
 }
 
+/* FIXME: can't break out of this unless klist_iter_exit is also
+ * called before doing the break
+ */
+#define klist_for_each_entry(pos, head, member, iter) \
+        for (klist_iter_init(head, iter); (pos = ({ \
+                struct klist_node *n = klist_next(iter); \
+                n ? container_of(n, typeof(*pos), member) : \
+                        ({ klist_iter_exit(iter) ; NULL; }); \
+        }) ) != NULL; )
+                        
+
 /**
  * attribute_container_remove_device - make device eligible for removal.
  *
@@ -182,17 +210,19 @@ attribute_container_remove_device(struct device *dev,
 
         down(&attribute_container_mutex);
         list_for_each_entry(cont, &attribute_container_list, node) {
-                struct internal_container *ic, *tmp;
+                struct internal_container *ic;
+                struct klist_iter iter;
 
                 if (attribute_container_no_classdevs(cont))
                         continue;
 
                 if (!cont->match(cont, dev))
                         continue;
-                list_for_each_entry_safe(ic, tmp, &cont->containers, node) {
+
+                klist_for_each_entry(ic, &cont->containers, node, &iter) {
                         if (dev != ic->classdev.dev)
                                 continue;
-                        list_del(&ic->node);
+                        klist_del(&ic->node);
                         if (fn)
                                 fn(cont, dev, &ic->classdev);
                         else {
@@ -225,12 +255,18 @@ attribute_container_device_trigger(struct device *dev,
 
         down(&attribute_container_mutex);
         list_for_each_entry(cont, &attribute_container_list, node) {
-                struct internal_container *ic, *tmp;
+                struct internal_container *ic;
+                struct klist_iter iter;
 
                 if (!cont->match(cont, dev))
                         continue;
 
-                list_for_each_entry_safe(ic, tmp, &cont->containers, node) {
+                if (attribute_container_no_classdevs(cont)) {
+                        fn(cont, dev, NULL);
+                        continue;
+                }
+
+                klist_for_each_entry(ic, &cont->containers, node, &iter) {
                         if (dev == ic->classdev.dev)
                                 fn(cont, dev, &ic->classdev);
                 }
@@ -368,6 +404,36 @@ attribute_container_class_device_del(struct class_device *classdev)
 }
 EXPORT_SYMBOL_GPL(attribute_container_class_device_del);
 
+/**
+ * attribute_container_find_class_device - find the corresponding class_device
+ *
+ * @cont:       the container
+ * @dev:        the generic device
+ *
+ * Looks up the device in the container's list of class devices and returns
+ * the corresponding class_device.
+ */
+struct class_device *
+attribute_container_find_class_device(struct attribute_container *cont,
+                                      struct device *dev)
+{
+        struct class_device *cdev = NULL;
+        struct internal_container *ic;
+        struct klist_iter iter;
+
+        klist_for_each_entry(ic, &cont->containers, node, &iter) {
+                if (ic->classdev.dev == dev) {
+                        cdev = &ic->classdev;
+                        /* FIXME: must exit iterator then break */
+                        klist_iter_exit(&iter);
+                        break;
+                }
+        }
+
+        return cdev;
+}
+EXPORT_SYMBOL_GPL(attribute_container_find_class_device);
+
 int __init
 attribute_container_init(void)
 {
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index ab53832d57e5..03204bfd17af 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -156,7 +156,9 @@ static ssize_t driver_unbind(struct device_driver *drv,
                 device_release_driver(dev);
                 err = count;
         }
-        return err;
+        if (err)
+                return err;
+        return count;
 }
 static DRIVER_ATTR(unbind, S_IWUSR, NULL, driver_unbind);
 
@@ -358,7 +360,7 @@ int bus_add_device(struct device * dev)
         if (bus) {
                 pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
                 device_attach(dev);
-                klist_add_tail(&bus->klist_devices, &dev->knode_bus);
+                klist_add_tail(&dev->knode_bus, &bus->klist_devices);
                 error = device_add_attrs(bus, dev);
                 if (!error) {
                         sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
@@ -446,7 +448,7 @@ int bus_add_driver(struct device_driver * drv)
                 }
 
                 driver_attach(drv);
-                klist_add_tail(&bus->klist_drivers, &drv->knode_bus);
+                klist_add_tail(&drv->knode_bus, &bus->klist_drivers);
                 module_add_driver(drv->owner, drv);
 
                 driver_add_attrs(bus, drv);
@@ -566,6 +568,36 @@ static void bus_remove_attrs(struct bus_type * bus)
         }
 }
 
+static void klist_devices_get(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_bus);
+
+        get_device(dev);
+}
+
+static void klist_devices_put(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_bus);
+
+        put_device(dev);
+}
+
+static void klist_drivers_get(struct klist_node *n)
+{
+        struct device_driver *drv = container_of(n, struct device_driver,
+                                                 knode_bus);
+
+        get_driver(drv);
+}
+
+static void klist_drivers_put(struct klist_node *n)
+{
+        struct device_driver *drv = container_of(n, struct device_driver,
+                                                 knode_bus);
+
+        put_driver(drv);
+}
+
 /**
  *      bus_register - register a bus with the system.
  *      @bus:   bus.
@@ -600,8 +632,8 @@ int bus_register(struct bus_type * bus)
         if (retval)
                 goto bus_drivers_fail;
 
-        klist_init(&bus->klist_devices);
-        klist_init(&bus->klist_drivers);
+        klist_init(&bus->klist_devices, klist_devices_get, klist_devices_put);
+        klist_init(&bus->klist_drivers, klist_drivers_get, klist_drivers_put);
         bus_add_attrs(bus);
 
         pr_debug("bus type '%s' registered\n", bus->name);
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 0154a1623b21..d164c32a97ad 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -299,10 +299,8 @@ static void class_dev_release(struct kobject * kobj)
 
         pr_debug("device class '%s': release.\n", cd->class_id);
 
-        if (cd->devt_attr) {
-                kfree(cd->devt_attr);
-                cd->devt_attr = NULL;
-        }
+        kfree(cd->devt_attr);
+        cd->devt_attr = NULL;
 
         if (cls->release)
                 cls->release(cd);
@@ -452,10 +450,29 @@ void class_device_initialize(struct class_device *class_dev)
         INIT_LIST_HEAD(&class_dev->node);
 }
 
+static char *make_class_name(struct class_device *class_dev)
+{
+        char *name;
+        int size;
+
+        size = strlen(class_dev->class->name) +
+                strlen(kobject_name(&class_dev->kobj)) + 2;
+
+        name = kmalloc(size, GFP_KERNEL);
+        if (!name)
+                return ERR_PTR(-ENOMEM);
+
+        strcpy(name, class_dev->class->name);
+        strcat(name, ":");
+        strcat(name, kobject_name(&class_dev->kobj));
+        return name;
+}
+
 int class_device_add(struct class_device *class_dev)
 {
         struct class * parent = NULL;
         struct class_interface * class_intf;
+        char *class_name = NULL;
         int error;
 
         class_dev = class_device_get(class_dev);
@@ -500,9 +517,13 @@ int class_device_add(struct class_device *class_dev)
         }
 
         class_device_add_attrs(class_dev);
-        if (class_dev->dev)
+        if (class_dev->dev) {
+                class_name = make_class_name(class_dev);
                 sysfs_create_link(&class_dev->kobj,
                                   &class_dev->dev->kobj, "device");
+                sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj,
+                                  class_name);
+        }
 
         /* notify any interfaces this device is now here */
         if (parent) {
@@ -519,6 +540,7 @@ int class_device_add(struct class_device *class_dev)
         if (error && parent)
                 class_put(parent);
         class_device_put(class_dev);
+        kfree(class_name);
         return error;
 }
 
@@ -584,6 +606,7 @@ void class_device_del(struct class_device *class_dev)
 {
         struct class * parent = class_dev->class;
         struct class_interface * class_intf;
+        char *class_name = NULL;
 
         if (parent) {
                 down(&parent->sem);
@@ -594,8 +617,11 @@ void class_device_del(struct class_device *class_dev)
                 up(&parent->sem);
         }
 
-        if (class_dev->dev)
+        if (class_dev->dev) {
+                class_name = make_class_name(class_dev);
                 sysfs_remove_link(&class_dev->kobj, "device");
+                sysfs_remove_link(&class_dev->dev->kobj, class_name);
+        }
         if (class_dev->devt_attr)
                 class_device_remove_file(class_dev, class_dev->devt_attr);
         class_device_remove_attrs(class_dev);
@@ -605,6 +631,7 @@ void class_device_del(struct class_device *class_dev)
 
         if (parent)
                 class_put(parent);
+        kfree(class_name);
 }
 
 void class_device_unregister(struct class_device *class_dev)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index efe03a024a5b..6ab73f5c799a 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -191,6 +191,20 @@ void device_remove_file(struct device * dev, struct device_attribute * attr)
         }
 }
 
+static void klist_children_get(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_parent);
+
+        get_device(dev);
+}
+
+static void klist_children_put(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_parent);
+
+        put_device(dev);
+}
+
 
 /**
  *      device_initialize - init device structure.
@@ -207,7 +221,8 @@ void device_initialize(struct device *dev)
 {
         kobj_set_kset_s(dev, devices_subsys);
         kobject_init(&dev->kobj);
-        klist_init(&dev->klist_children);
+        klist_init(&dev->klist_children, klist_children_get,
+                   klist_children_put);
         INIT_LIST_HEAD(&dev->dma_pools);
         init_MUTEX(&dev->sem);
 }
@@ -249,7 +264,7 @@ int device_add(struct device *dev)
         if ((error = bus_add_device(dev)))
                 goto BusError;
         if (parent)
-                klist_add_tail(&parent->klist_children, &dev->knode_parent);
+                klist_add_tail(&dev->knode_parent, &parent->klist_children);
 
         /* notify platform of device entry */
         if (platform_notify)
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 16323f9cbff0..d5bbce38282f 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -42,7 +42,7 @@ void device_bind_driver(struct device * dev)
 {
         pr_debug("bound device '%s' to driver '%s'\n",
                  dev->bus_id, dev->driver->name);
-        klist_add_tail(&dev->driver->klist_devices, &dev->knode_driver);
+        klist_add_tail(&dev->knode_driver, &dev->driver->klist_devices);
         sysfs_create_link(&dev->driver->kobj, &dev->kobj,
                           kobject_name(&dev->kobj));
         sysfs_create_link(&dev->kobj, &dev->driver->kobj, "driver");
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 291c5954a3af..ef3fe513e398 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -142,6 +142,19 @@ void put_driver(struct device_driver * drv)
         kobject_put(&drv->kobj);
 }
 
+static void klist_devices_get(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_driver);
+
+        get_device(dev);
+}
+
+static void klist_devices_put(struct klist_node *n)
+{
+        struct device *dev = container_of(n, struct device, knode_driver);
+
+        put_device(dev);
+}
 
 /**
  *      driver_register - register driver with bus
@@ -157,7 +170,7 @@ void put_driver(struct device_driver * drv)
  */
 int driver_register(struct device_driver * drv)
 {
-        klist_init(&drv->klist_devices);
+        klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);
         init_completion(&drv->unloaded);
         return bus_add_driver(drv);
 }
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 652281402c92..5bfa2e9a7c26 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -28,6 +28,7 @@ enum {
         FW_STATUS_DONE,
         FW_STATUS_ABORT,
         FW_STATUS_READY,
+        FW_STATUS_READY_NOHOTPLUG,
 };
 
 static int loading_timeout = 10;        /* In seconds */
@@ -344,7 +345,7 @@ error_kfree:
 
 static int
 fw_setup_class_device(struct firmware *fw, struct class_device **class_dev_p,
-                      const char *fw_name, struct device *device)
+                      const char *fw_name, struct device *device, int hotplug)
 {
         struct class_device *class_dev;
         struct firmware_priv *fw_priv;
@@ -376,7 +377,10 @@ fw_setup_class_device(struct firmware *fw, struct class_device **class_dev_p,
                 goto error_unreg;
         }
 
-        set_bit(FW_STATUS_READY, &fw_priv->status);
+        if (hotplug)
+                set_bit(FW_STATUS_READY, &fw_priv->status);
+        else
+                set_bit(FW_STATUS_READY_NOHOTPLUG, &fw_priv->status);
         *class_dev_p = class_dev;
         goto out;
 
@@ -386,21 +390,9 @@ out:
         return retval;
 }
 
-/**
- * request_firmware: - request firmware to hotplug and wait for it
- * Description:
- *      @firmware will be used to return a firmware image by the name
- *      of @name for device @device.
- *
- *      Should be called from user context where sleeping is allowed.
- *
- *      @name will be use as $FIRMWARE in the hotplug environment and
- *      should be distinctive enough not to be confused with any other
- *      firmware image for this or any other device.
- **/
-int
-request_firmware(const struct firmware **firmware_p, const char *name,
-                 struct device *device)
+static int
+_request_firmware(const struct firmware **firmware_p, const char *name,
+                 struct device *device, int hotplug)
 {
         struct class_device *class_dev;
         struct firmware_priv *fw_priv;
@@ -419,22 +411,25 @@ request_firmware(const struct firmware **firmware_p, const char *name,
         }
         memset(firmware, 0, sizeof (*firmware));
 
-        retval = fw_setup_class_device(firmware, &class_dev, name, device);
+        retval = fw_setup_class_device(firmware, &class_dev, name, device,
+                hotplug);
         if (retval)
                 goto error_kfree_fw;
 
         fw_priv = class_get_devdata(class_dev);
 
-        if (loading_timeout > 0) {
-                fw_priv->timeout.expires = jiffies + loading_timeout * HZ;
-                add_timer(&fw_priv->timeout);
-        }
-
-        kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
-        wait_for_completion(&fw_priv->completion);
-        set_bit(FW_STATUS_DONE, &fw_priv->status);
+        if (hotplug) {
+                if (loading_timeout > 0) {
+                        fw_priv->timeout.expires = jiffies + loading_timeout * HZ;
+                        add_timer(&fw_priv->timeout);
+                }
 
-        del_timer_sync(&fw_priv->timeout);
+                kobject_hotplug(&class_dev->kobj, KOBJ_ADD);
+                wait_for_completion(&fw_priv->completion);
+                set_bit(FW_STATUS_DONE, &fw_priv->status);
+                del_timer_sync(&fw_priv->timeout);
+        } else
+                wait_for_completion(&fw_priv->completion);
 
         down(&fw_lock);
         if (!fw_priv->fw->size || test_bit(FW_STATUS_ABORT, &fw_priv->status)) {
@@ -455,6 +450,26 @@ out:
 }
 
 /**
+ * request_firmware: - request firmware to hotplug and wait for it
+ * Description:
+ *      @firmware will be used to return a firmware image by the name
+ *      of @name for device @device.
+ *
+ *      Should be called from user context where sleeping is allowed.
+ *
+ *      @name will be use as $FIRMWARE in the hotplug environment and
+ *      should be distinctive enough not to be confused with any other
+ *      firmware image for this or any other device.
+ **/
+int
+request_firmware(const struct firmware **firmware_p, const char *name,
+                 struct device *device)
+{
+        int hotplug = 1;
+        return _request_firmware(firmware_p, name, device, hotplug);
+}
+
+/**
  * release_firmware: - release the resource associated with a firmware image
  **/
 void
@@ -491,6 +506,7 @@ struct firmware_work {
         struct device *device;
         void *context;
         void (*cont)(const struct firmware *fw, void *context);
+        int hotplug;
 };
 
 static int
@@ -503,7 +519,8 @@ request_firmware_work_func(void *arg)
                 return 0;
         }
         daemonize("%s/%s", "firmware", fw_work->name);
-        request_firmware(&fw, fw_work->name, fw_work->device);
+        _request_firmware(&fw, fw_work->name, fw_work->device,
+                fw_work->hotplug);
         fw_work->cont(fw, fw_work->context);
         release_firmware(fw);
         module_put(fw_work->module);
@@ -518,6 +535,9 @@ request_firmware_work_func(void *arg)
  *      Asynchronous variant of request_firmware() for contexts where
  *      it is not possible to sleep.
  *
+ *      @hotplug invokes hotplug event to copy the firmware image if this flag
+ *      is non-zero else the firmware copy must be done manually.
+ *
  *      @cont will be called asynchronously when the firmware request is over.
  *
  *      @context will be passed over to @cont.
@@ -527,7 +547,7 @@ request_firmware_work_func(void *arg)
  **/
 int
 request_firmware_nowait(
-        struct module *module,
+        struct module *module, int hotplug,
         const char *name, struct device *device, void *context,
         void (*cont)(const struct firmware *fw, void *context))
 {
@@ -548,6 +568,7 @@ request_firmware_nowait(
                 .device = device,
                 .context = context,
                 .cont = cont,
+                .hotplug = hotplug,
         };
 
         ret = kernel_thread(request_firmware_work_func, fw_work,
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 904b27caf697..16c513aa4d48 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -39,13 +39,25 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
         int n;
         int nid = dev->id;
         struct sysinfo i;
+        struct page_state ps;
         unsigned long inactive;
         unsigned long active;
         unsigned long free;
 
         si_meminfo_node(&i, nid);
+        get_page_state_node(&ps, nid);
         __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
 
+        /* Check for negative values in these approximate counters */
+        if ((long)ps.nr_dirty < 0)
+                ps.nr_dirty = 0;
+        if ((long)ps.nr_writeback < 0)
+                ps.nr_writeback = 0;
+        if ((long)ps.nr_mapped < 0)
+                ps.nr_mapped = 0;
+        if ((long)ps.nr_slab < 0)
+                ps.nr_slab = 0;
+
         n = sprintf(buf, "\n"
                        "Node %d MemTotal:     %8lu kB\n"
                        "Node %d MemFree:      %8lu kB\n"
@@ -55,7 +67,11 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                        "Node %d HighTotal:    %8lu kB\n"
                        "Node %d HighFree:     %8lu kB\n"
                        "Node %d LowTotal:     %8lu kB\n"
-                       "Node %d LowFree:      %8lu kB\n",
+                       "Node %d LowFree:      %8lu kB\n"
+                       "Node %d Dirty:        %8lu kB\n"
+                       "Node %d Writeback:    %8lu kB\n"
+                       "Node %d Mapped:       %8lu kB\n"
+                       "Node %d Slab:         %8lu kB\n",
                        nid, K(i.totalram),
                        nid, K(i.freeram),
                        nid, K(i.totalram - i.freeram),
@@ -64,7 +80,11 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                        nid, K(i.totalhigh),
                        nid, K(i.freehigh),
                        nid, K(i.totalram - i.totalhigh),
-                       nid, K(i.freeram - i.freehigh));
+                       nid, K(i.freeram - i.freehigh),
+                       nid, K(ps.nr_dirty),
+                       nid, K(ps.nr_writeback),
+                       nid, K(ps.nr_mapped),
+                       nid, K(ps.nr_slab));
         n += hugetlb_report_node_meminfo(nid, buf + n);
         return n;
 }
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index bdd96b03b885..0a7aa07b9a2a 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -26,11 +26,11 @@ int resume_device(struct device * dev)
 
         down(&dev->sem);
         if (dev->power.pm_parent
-                        && dev->power.pm_parent->power.power_state) {
+                        && dev->power.pm_parent->power.power_state.event) {
                 dev_err(dev, "PM: resume from %d, parent %s still %d\n",
-                        dev->power.power_state,
+                        dev->power.power_state.event,
                         dev->power.pm_parent->bus_id,
-                        dev->power.pm_parent->power.power_state);
+                        dev->power.pm_parent->power.power_state.event);
         }
         if (dev->bus && dev->bus->resume) {
                 dev_dbg(dev,"resuming\n");
@@ -54,7 +54,7 @@ void dpm_resume(void)
                 list_add_tail(entry, &dpm_active);
 
                 up(&dpm_list_sem);
-                if (!dev->power.prev_state)
+                if (!dev->power.prev_state.event)
                         resume_device(dev);
                 down(&dpm_list_sem);
                 put_device(dev);
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 325962d80191..e8f0519f5dfa 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -13,10 +13,10 @@
 static void runtime_resume(struct device * dev)
 {
         dev_dbg(dev, "resuming\n");
-        if (!dev->power.power_state)
+        if (!dev->power.power_state.event)
                 return;
         if (!resume_device(dev))
-                dev->power.power_state = 0;
+                dev->power.power_state = PMSG_ON;
 }
 
 
@@ -49,10 +49,10 @@ int dpm_runtime_suspend(struct device * dev, pm_message_t state)
         int error = 0;
 
         down(&dpm_sem);
-        if (dev->power.power_state == state)
+        if (dev->power.power_state.event == state.event)
                 goto Done;
 
-        if (dev->power.power_state)
+        if (dev->power.power_state.event)
                 runtime_resume(dev);
 
         if (!(error = suspend_device(dev, state)))
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 2ccee3763acf..50501764d050 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -40,22 +40,22 @@ int suspend_device(struct device * dev, pm_message_t state)
         int error = 0;
 
         down(&dev->sem);
-        if (dev->power.power_state) {
+        if (dev->power.power_state.event) {
                 dev_dbg(dev, "PM: suspend %d-->%d\n",
-                        dev->power.power_state, state);
+                        dev->power.power_state.event, state.event);
         }
         if (dev->power.pm_parent
-                        && dev->power.pm_parent->power.power_state) {
+                        && dev->power.pm_parent->power.power_state.event) {
                 dev_err(dev,
                         "PM: suspend %d->%d, parent %s already %d\n",
-                        dev->power.power_state, state,
+                        dev->power.power_state.event, state.event,
                         dev->power.pm_parent->bus_id,
-                        dev->power.pm_parent->power.power_state);
+                        dev->power.pm_parent->power.power_state.event);
         }
 
         dev->power.prev_state = dev->power.power_state;
 
-        if (dev->bus && dev->bus->suspend && !dev->power.power_state) {
+        if (dev->bus && dev->bus->suspend && !dev->power.power_state.event) {
                 dev_dbg(dev, "suspending\n");
                 error = dev->bus->suspend(dev, state);
         }
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index f82b3df9545f..8d04fb435c17 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -26,19 +26,19 @@
 
 static ssize_t state_show(struct device * dev, struct device_attribute *attr, char * buf)
 {
-        return sprintf(buf, "%u\n", dev->power.power_state);
+        return sprintf(buf, "%u\n", dev->power.power_state.event);
 }
 
 static ssize_t state_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t n)
 {
-        u32 state;
+        pm_message_t state;
         char * rest;
         int error = 0;
 
-        state = simple_strtoul(buf, &rest, 10);
+        state.event = simple_strtoul(buf, &rest, 10);
         if (*rest)
                 return -EINVAL;
-        if (state)
+        if (state.event)
                 error = dpm_runtime_suspend(dev, state);
         else
                 dpm_runtime_resume(dev);
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 214b96435409..3431eb6004c3 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -288,6 +288,27 @@ void sysdev_shutdown(void)
         up(&sysdev_drivers_lock);
 }
 
+static void __sysdev_resume(struct sys_device *dev)
+{
+        struct sysdev_class *cls = dev->cls;
+        struct sysdev_driver *drv;
+
+        /* First, call the class-specific one */
+        if (cls->resume)
+                cls->resume(dev);
+
+        /* Call auxillary drivers next. */
+        list_for_each_entry(drv, &cls->drivers, entry) {
+                if (drv->resume)
+                        drv->resume(dev);
+        }
+
+        /* Call global drivers. */
+        list_for_each_entry(drv, &sysdev_drivers, entry) {
+                if (drv->resume)
+                        drv->resume(dev);
+        }
+}
 
 /**
  *      sysdev_suspend - Suspend all system devices.
@@ -305,38 +326,93 @@ void sysdev_shutdown(void)
 int sysdev_suspend(pm_message_t state)
 {
         struct sysdev_class * cls;
+        struct sys_device *sysdev, *err_dev;
+        struct sysdev_driver *drv, *err_drv;
+        int ret;
 
         pr_debug("Suspending System Devices\n");
 
         list_for_each_entry_reverse(cls, &system_subsys.kset.list,
                                     kset.kobj.entry) {
-                struct sys_device * sysdev;
 
                 pr_debug("Suspending type '%s':\n",
                          kobject_name(&cls->kset.kobj));
 
                 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) {
-                        struct sysdev_driver * drv;
                         pr_debug(" %s\n", kobject_name(&sysdev->kobj));
 
                         /* Call global drivers first. */
                         list_for_each_entry(drv, &sysdev_drivers, entry) {
-                                if (drv->suspend)
-                                        drv->suspend(sysdev, state);
+                                if (drv->suspend) {
+                                        ret = drv->suspend(sysdev, state);
+                                        if (ret)
+                                                goto gbl_driver;
+                                }
                         }
 
                         /* Call auxillary drivers next. */
                         list_for_each_entry(drv, &cls->drivers, entry) {
-                                if (drv->suspend)
-                                        drv->suspend(sysdev, state);
+                                if (drv->suspend) {
+                                        ret = drv->suspend(sysdev, state);
+                                        if (ret)
+                                                goto aux_driver;
+                                }
                         }
 
                         /* Now call the generic one */
-                        if (cls->suspend)
-                                cls->suspend(sysdev, state);
+                        if (cls->suspend) {
+                                ret = cls->suspend(sysdev, state);
+                                if (ret)
+                                        goto cls_driver;
+                        }
                 }
         }
         return 0;
+        /* resume current sysdev */
+cls_driver:
+        drv = NULL;
+        printk(KERN_ERR "Class suspend failed for %s\n",
+                kobject_name(&sysdev->kobj));
+
+aux_driver:
+        if (drv)
+                printk(KERN_ERR "Class driver suspend failed for %s\n",
+                                kobject_name(&sysdev->kobj));
+        list_for_each_entry(err_drv, &cls->drivers, entry) {
+                if (err_drv == drv)
+                        break;
+                if (err_drv->resume)
+                        err_drv->resume(sysdev);
+        }
+        drv = NULL;
+
+gbl_driver:
+        if (drv)
+                printk(KERN_ERR "sysdev driver suspend failed for %s\n",
+                                kobject_name(&sysdev->kobj));
+        list_for_each_entry(err_drv, &sysdev_drivers, entry) {
+                if (err_drv == drv)
+                        break;
+                if (err_drv->resume)
+                        err_drv->resume(sysdev);
+        }
+        /* resume other sysdevs in current class */
+        list_for_each_entry(err_dev, &cls->kset.list, kobj.entry) {
+                if (err_dev == sysdev)
+                        break;
+                pr_debug(" %s\n", kobject_name(&err_dev->kobj));
+                __sysdev_resume(err_dev);
+        }
+
+        /* resume other classes */
+        list_for_each_entry_continue(cls, &system_subsys.kset.list,
+                                        kset.kobj.entry) {
+                list_for_each_entry(err_dev, &cls->kset.list, kobj.entry) {
+                        pr_debug(" %s\n", kobject_name(&err_dev->kobj));
+                        __sysdev_resume(err_dev);
+                }
+        }
+        return ret;
 }
 
 
@@ -362,25 +438,9 @@ int sysdev_resume(void)
                          kobject_name(&cls->kset.kobj));
 
                 list_for_each_entry(sysdev, &cls->kset.list, kobj.entry) {
-                        struct sysdev_driver * drv;
                         pr_debug(" %s\n", kobject_name(&sysdev->kobj));
 
-                        /* First, call the class-specific one */
-                        if (cls->resume)
-                                cls->resume(sysdev);
-
-                        /* Call auxillary drivers next. */
-                        list_for_each_entry(drv, &cls->drivers, entry) {
-                                if (drv->resume)
-                                        drv->resume(sysdev);
-                        }
-
-                        /* Call global drivers. */
-                        list_for_each_entry(drv, &sysdev_drivers, entry) {
-                                if (drv->resume)
-                                        drv->resume(sysdev);
-                        }
-
+                        __sysdev_resume(sysdev);
                 }
         }
         return 0;
diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index 6c2b447a3336..f25e7c6b2d27 100644
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -7,7 +7,7 @@
  * This file is licensed under GPLv2
  *
  * The basic idea here is to allow any "device controller" (which
- * would most often be a Host Bus Adapter" to use the services of one
+ * would most often be a Host Bus Adapter to use the services of one
  * or more tranport classes for performing transport specific
  * services.  Transport specific services are things that the generic
  * command layer doesn't want to know about (speed settings, line
@@ -64,7 +64,9 @@ void transport_class_unregister(struct transport_class *tclass)
 }
 EXPORT_SYMBOL_GPL(transport_class_unregister);
 
-static int anon_transport_dummy_function(struct device *dev)
+static int anon_transport_dummy_function(struct transport_container *tc,
+                                         struct device *dev,
+                                         struct class_device *cdev)
 {
         /* do nothing */
         return 0;
@@ -115,9 +117,10 @@ static int transport_setup_classdev(struct attribute_container *cont,
                                     struct class_device *classdev)
 {
         struct transport_class *tclass = class_to_transport_class(cont->class);
+        struct transport_container *tcont = attribute_container_to_transport_container(cont);
 
         if (tclass->setup)
-                tclass->setup(dev);
+                tclass->setup(tcont, dev, classdev);
 
         return 0;
 }
@@ -178,12 +181,14 @@ void transport_add_device(struct device *dev)
 EXPORT_SYMBOL_GPL(transport_add_device);
 
 static int transport_configure(struct attribute_container *cont,
-                               struct device *dev)
+                               struct device *dev,
+                               struct class_device *cdev)
 {
         struct transport_class *tclass = class_to_transport_class(cont->class);
+        struct transport_container *tcont = attribute_container_to_transport_container(cont);
 
         if (tclass->configure)
-                tclass->configure(dev);
+                tclass->configure(tcont, dev, cdev);
 
         return 0;
 }
@@ -202,7 +207,7 @@ static int transport_configure(struct attribute_container *cont,
  */
 void transport_configure_device(struct device *dev)
 {
-        attribute_container_trigger(dev, transport_configure);
+        attribute_container_device_trigger(dev, transport_configure);
 }
 EXPORT_SYMBOL_GPL(transport_configure_device);
 
@@ -215,7 +220,7 @@ static int transport_remove_classdev(struct attribute_container *cont,
         struct transport_class *tclass = class_to_transport_class(cont->class);
 
         if (tclass->remove)
-                tclass->remove(dev);
+                tclass->remove(tcont, dev, classdev);
 
         if (tclass->remove != anon_transport_dummy_function) {
                 if (tcont->statistics)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index b594768b0241..51b0af1cebee 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -6,7 +6,7 @@ menu "Block devices"
 
 config BLK_DEV_FD
         tristate "Normal floppy disk support"
-        depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285
+        depends on ARCH_MAY_HAVE_PC_FDC
         ---help---
           If you want to use the floppy disk drive(s) of your PC under Linux,
           say Y. Information about this driver, especially important for IBM
@@ -408,54 +408,12 @@ config BLK_DEV_INITRD
           "real" root file system, etc. See <file:Documentation/initrd.txt>
           for details.
 
-config INITRAMFS_SOURCE
-        string "Initramfs source file(s)"
-        default ""
-        help
-          This can be either a single cpio archive with a .cpio suffix or a
-          space-separated list of directories and files for building the
-          initramfs image.  A cpio archive should contain a filesystem archive
-          to be used as an initramfs image.  Directories should contain a
-          filesystem layout to be included in the initramfs image.  Files
-          should contain entries according to the format described by the
-          "usr/gen_init_cpio" program in the kernel tree.
-
-          When multiple directories and files are specified then the
-          initramfs image will be the aggregate of all of them.
-
-          See <file:Documentation/early-userspace/README for more details.
-
-          If you are not sure, leave it blank.
-
-config INITRAMFS_ROOT_UID
-        int "User ID to map to 0 (user root)"
-        depends on INITRAMFS_SOURCE!=""
-        default "0"
-        help
-          This setting is only meaningful if the INITRAMFS_SOURCE is
-          contains a directory.  Setting this user ID (UID) to something
-          other than "0" will cause all files owned by that UID to be
-          owned by user root in the initial ramdisk image.
-
-          If you are not sure, leave it set to "0".
-
-config INITRAMFS_ROOT_GID
-        int "Group ID to map to 0 (group root)"
-        depends on INITRAMFS_SOURCE!=""
-        default "0"
-        help
-          This setting is only meaningful if the INITRAMFS_SOURCE is
-          contains a directory.  Setting this group ID (GID) to something
-          other than "0" will cause all files owned by that GID to be
-          owned by group root in the initial ramdisk image.
-
-          If you are not sure, leave it set to "0".
 
 #XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
 #for instance.
 config LBD
         bool "Support for Large Block Devices"
-        depends on X86 || MIPS32 || PPC32 || ARCH_S390_31 || SUPERH || UML
+        depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
         help
           Say Y here if you want to attach large (bigger than 2TB) discs to
           your machine, or if you want to have a raid or loopback device
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index 6e231c5a1199..ded33ba31acc 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -35,7 +35,7 @@ aoedev_newdev(ulong nframes)
         struct aoedev *d;
         struct frame *f, *e;
 
-        d = kcalloc(1, sizeof *d, GFP_ATOMIC);
+        d = kzalloc(sizeof *d, GFP_ATOMIC);
         if (d == NULL)
                 return NULL;
         f = kcalloc(nframes, sizeof *f, GFP_ATOMIC);
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index cd056e7e64ec..30c0903c7cdd 100644
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -2260,8 +2260,6 @@ static void cfq_put_cfqd(struct cfq_data *cfqd)
         if (!atomic_dec_and_test(&cfqd->ref))
                 return;
 
-        blk_put_queue(q);
-
         cfq_shutdown_timer_wq(cfqd);
         q->elevator->elevator_data = NULL;
 
@@ -2318,7 +2316,6 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e)
         e->elevator_data = cfqd;
 
         cfqd->queue = q;
-        atomic_inc(&q->refcnt);
 
         cfqd->max_queued = q->nr_requests / 4;
         q->nr_batching = cfq_queued;
diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c
index 5be6f998d8c5..3d4261c39f16 100644
--- a/drivers/block/cryptoloop.c
+++ b/drivers/block/cryptoloop.c
@@ -57,9 +57,11 @@ cryptoloop_init(struct loop_device *lo, const struct loop_info64 *info)
         mode = strsep(&cmsp, "-");
 
         if (mode == NULL || strcmp(mode, "cbc") == 0)
-                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC);
+                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC |
+                                               CRYPTO_TFM_REQ_MAY_SLEEP);
         else if (strcmp(mode, "ecb") == 0)
-                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB);
+                tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB |
+                                               CRYPTO_TFM_REQ_MAY_SLEEP);
         if (tfm == NULL)
                 return -EINVAL;
 
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index ff5201e02153..24594c57c323 100644
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -507,18 +507,12 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
         const int reads = !list_empty(&dd->fifo_list[READ]);
         const int writes = !list_empty(&dd->fifo_list[WRITE]);
         struct deadline_rq *drq;
-        int data_dir, other_dir;
+        int data_dir;
 
         /*
          * batches are currently reads XOR writes
          */
-        drq = NULL;
-
-        if (dd->next_drq[READ])
-                drq = dd->next_drq[READ];
-
-        if (dd->next_drq[WRITE])
-                drq = dd->next_drq[WRITE];
+        drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];
 
         if (drq) {
                 /* we have a "next request" */
@@ -544,7 +538,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
                         goto dispatch_writes;
 
                 data_dir = READ;
-                other_dir = WRITE;
 
                 goto dispatch_find_request;
         }
@@ -560,7 +553,6 @@ dispatch_writes:
                 dd->starved = 0;
 
                 data_dir = WRITE;
-                other_dir = READ;
 
                 goto dispatch_find_request;
         }
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index f0c1084b840f..888dad5eef34 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -493,6 +493,8 @@ static struct floppy_struct user_params[N_DRIVE];
 
 static sector_t floppy_sizes[256];
 
+static char floppy_device_name[] = "floppy";
+
 /*
  * The driver is trying to determine the correct media format
  * while probing is set. rw_interrupt() clears it after a
@@ -4191,18 +4193,24 @@ static int __init floppy_setup(char *str)
 
 static int have_no_fdc = -ENODEV;
 
+static ssize_t floppy_cmos_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct platform_device *p;
+        int drive;
+
+        p = container_of(dev, struct platform_device,dev);
+        drive = p->id;
+        return sprintf(buf, "%X\n", UDP->cmos);
+}
+DEVICE_ATTR(cmos,S_IRUGO,floppy_cmos_show,NULL);
+
 static void floppy_device_release(struct device *dev)
 {
         complete(&device_release);
 }
 
-static struct platform_device floppy_device = {
-        .name           = "floppy",
-        .id             = 0,
-        .dev            = {
-                        .release = floppy_device_release,
-                        }
-};
+static struct platform_device floppy_device[N_DRIVE];
 
 static struct kobject *floppy_find(dev_t dev, int *part, void *data)
 {
@@ -4370,20 +4378,26 @@ static int __init floppy_init(void)
                 goto out_flush_work;
         }
 
-        err = platform_device_register(&floppy_device);
-        if (err)
-                goto out_flush_work;
-
         for (drive = 0; drive < N_DRIVE; drive++) {
                 if (!(allowed_drive_mask & (1 << drive)))
                         continue;
                 if (fdc_state[FDC(drive)].version == FDC_NONE)
                         continue;
+
+                floppy_device[drive].name = floppy_device_name;
+                floppy_device[drive].id = drive;
+                floppy_device[drive].dev.release = floppy_device_release;
+
+                err = platform_device_register(&floppy_device[drive]);
+                if (err)
+                        goto out_flush_work;
+
+                device_create_file(&floppy_device[drive].dev,&dev_attr_cmos);
                 /* to be cleaned up... */
                 disks[drive]->private_data = (void *)(long)drive;
                 disks[drive]->queue = floppy_queue;
                 disks[drive]->flags |= GENHD_FL_REMOVABLE;
-                disks[drive]->driverfs_dev = &floppy_device.dev;
+                disks[drive]->driverfs_dev = &floppy_device[drive].dev;
                 add_disk(disks[drive]);
         }
 
@@ -4603,10 +4617,11 @@ void cleanup_module(void)
                     fdc_state[FDC(drive)].version != FDC_NONE) {
                         del_gendisk(disks[drive]);
                         unregister_devfs_entries(drive);
+                        device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);
+                        platform_device_unregister(&floppy_device[drive]);
                 }
                 put_disk(disks[drive]);
         }
-        platform_device_unregister(&floppy_device);
         devfs_remove("floppy");
 
         del_timer_sync(&fd_timeout);
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 47fd3659a061..d42840cc0d1d 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -45,7 +45,7 @@ int get_blkdev_list(char *p, int used)
         struct blk_major_name *n;
         int i, len;
 
-        len = sprintf(p, "\nBlock devices:\n");
+        len = snprintf(p, (PAGE_SIZE-used), "\nBlock devices:\n");
 
         down(&block_subsys_sem);
         for (i = 0; i < ARRAY_SIZE(major_names); i++) {
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 3c818544475e..483d71b10cf9 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -235,8 +235,8 @@ void blk_queue_make_request(request_queue_t * q, make_request_fn * mfn)
          * set defaults
          */
         q->nr_requests = BLKDEV_MAX_RQ;
-        q->max_phys_segments = MAX_PHYS_SEGMENTS;
-        q->max_hw_segments = MAX_HW_SEGMENTS;
+        blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
+        blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
         q->make_request_fn = mfn;
         q->backing_dev_info.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
         q->backing_dev_info.state = 0;
@@ -284,6 +284,7 @@ static inline void rq_init(request_queue_t *q, struct request *rq)
         rq->special = NULL;
         rq->data_len = 0;
         rq->data = NULL;
+        rq->nr_phys_segments = 0;
         rq->sense = NULL;
         rq->end_io = NULL;
         rq->end_io_data = NULL;
@@ -2115,7 +2116,7 @@ EXPORT_SYMBOL(blk_insert_request);
 /**
  * blk_rq_map_user - map user data to a request, for REQ_BLOCK_PC usage
  * @q:          request queue where request should be inserted
- * @rw:         READ or WRITE data
+ * @rq:         request structure to fill
  * @ubuf:       the user buffer
  * @len:        length of user data
  *
@@ -2132,21 +2133,19 @@ EXPORT_SYMBOL(blk_insert_request);
  *    original bio must be passed back in to blk_rq_unmap_user() for proper
  *    unmapping.
  */
-struct request *blk_rq_map_user(request_queue_t *q, int rw, void __user *ubuf,
-                                unsigned int len)
+int blk_rq_map_user(request_queue_t *q, struct request *rq, void __user *ubuf,
+                    unsigned int len)
 {
         unsigned long uaddr;
-        struct request *rq;
         struct bio *bio;
+        int reading;
 
         if (len > (q->max_sectors << 9))
-                return ERR_PTR(-EINVAL);
-        if ((!len && ubuf) || (len && !ubuf))
-                return ERR_PTR(-EINVAL);
+                return -EINVAL;
+        if (!len || !ubuf)
+                return -EINVAL;
 
-        rq = blk_get_request(q, rw, __GFP_WAIT);
-        if (!rq)
-                return ERR_PTR(-ENOMEM);
+        reading = rq_data_dir(rq) == READ;
 
         /*
          * if alignment requirement is satisfied, map in user pages for
@@ -2154,9 +2153,9 @@ struct request *blk_rq_map_user(request_queue_t *q, int rw, void __user *ubuf,
          */
         uaddr = (unsigned long) ubuf;
         if (!(uaddr & queue_dma_alignment(q)) && !(len & queue_dma_alignment(q)))
-                bio = bio_map_user(q, NULL, uaddr, len, rw == READ);
+                bio = bio_map_user(q, NULL, uaddr, len, reading);
         else
-                bio = bio_copy_user(q, uaddr, len, rw == READ);
+                bio = bio_copy_user(q, uaddr, len, reading);
 
         if (!IS_ERR(bio)) {
                 rq->bio = rq->biotail = bio;
@@ -2164,28 +2163,70 @@ struct request *blk_rq_map_user(request_queue_t *q, int rw, void __user *ubuf,
 
                 rq->buffer = rq->data = NULL;
                 rq->data_len = len;
-                return rq;
+                return 0;
         }
 
         /*
          * bio is the err-ptr
          */
-        blk_put_request(rq);
-        return (struct request *) bio;
+        return PTR_ERR(bio);
 }
 
 EXPORT_SYMBOL(blk_rq_map_user);
 
 /**
+ * blk_rq_map_user_iov - map user data to a request, for REQ_BLOCK_PC usage
+ * @q:          request queue where request should be inserted
+ * @rq:         request to map data to
+ * @iov:        pointer to the iovec
+ * @iov_count:  number of elements in the iovec
+ *
+ * Description:
+ *    Data will be mapped directly for zero copy io, if possible. Otherwise
+ *    a kernel bounce buffer is used.
+ *
+ *    A matching blk_rq_unmap_user() must be issued at the end of io, while
+ *    still in process context.
+ *
+ *    Note: The mapped bio may need to be bounced through blk_queue_bounce()
+ *    before being submitted to the device, as pages mapped may be out of
+ *    reach. It's the callers responsibility to make sure this happens. The
+ *    original bio must be passed back in to blk_rq_unmap_user() for proper
+ *    unmapping.
+ */
+int blk_rq_map_user_iov(request_queue_t *q, struct request *rq,
+                        struct sg_iovec *iov, int iov_count)
+{
+        struct bio *bio;
+
+        if (!iov || iov_count <= 0)
+                return -EINVAL;
+
+        /* we don't allow misaligned data like bio_map_user() does.  If the
+         * user is using sg, they're expected to know the alignment constraints
+         * and respect them accordingly */
+        bio = bio_map_user_iov(q, NULL, iov, iov_count, rq_data_dir(rq)== READ);
+        if (IS_ERR(bio))
+                return PTR_ERR(bio);
+
+        rq->bio = rq->biotail = bio;
+        blk_rq_bio_prep(q, rq, bio);
+        rq->buffer = rq->data = NULL;
+        rq->data_len = bio->bi_size;
+        return 0;
+}
+
+EXPORT_SYMBOL(blk_rq_map_user_iov);
+
+/**
  * blk_rq_unmap_user - unmap a request with user data
- * @rq:         request to be unmapped
- * @bio:        bio for the request
+ * @bio:        bio to be unmapped
  * @ulen:       length of user buffer
  *
  * Description:
- *    Unmap a request previously mapped by blk_rq_map_user().
+ *    Unmap a bio previously mapped by blk_rq_map_user().
  */
-int blk_rq_unmap_user(struct request *rq, struct bio *bio, unsigned int ulen)
+int blk_rq_unmap_user(struct bio *bio, unsigned int ulen)
 {
         int ret = 0;
 
@@ -2196,31 +2237,89 @@ int blk_rq_unmap_user(struct request *rq, struct bio *bio, unsigned int ulen)
                         ret = bio_uncopy_user(bio);
         }
 
-        blk_put_request(rq);
-        return ret;
+        return 0;
 }
 
 EXPORT_SYMBOL(blk_rq_unmap_user);
 
 /**
+ * blk_rq_map_kern - map kernel data to a request, for REQ_BLOCK_PC usage
+ * @q:          request queue where request should be inserted
+ * @rq:         request to fill
+ * @kbuf:       the kernel buffer
+ * @len:        length of user data
+ * @gfp_mask:   memory allocation flags
+ */
+int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf,
+                    unsigned int len, unsigned int gfp_mask)
+{
+        struct bio *bio;
+
+        if (len > (q->max_sectors << 9))
+                return -EINVAL;
+        if (!len || !kbuf)
+                return -EINVAL;
+
+        bio = bio_map_kern(q, kbuf, len, gfp_mask);
+        if (IS_ERR(bio))
+                return PTR_ERR(bio);
+
+        if (rq_data_dir(rq) == WRITE)
+                bio->bi_rw |= (1 << BIO_RW);
+
+        rq->bio = rq->biotail = bio;
+        blk_rq_bio_prep(q, rq, bio);
+
+        rq->buffer = rq->data = NULL;
+        rq->data_len = len;
+        return 0;
+}
+
+EXPORT_SYMBOL(blk_rq_map_kern);
+
+/**
+ * blk_execute_rq_nowait - insert a request into queue for execution
+ * @q:          queue to insert the request in
+ * @bd_disk:    matching gendisk
+ * @rq:         request to insert
+ * @at_head:    insert request at head or tail of queue
+ * @done:       I/O completion handler
+ *
+ * Description:
+ *    Insert a fully prepared request at the back of the io scheduler queue
+ *    for execution.  Don't wait for completion.
+ */
+void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk,
+                           struct request *rq, int at_head,
+                           void (*done)(struct request *))
+{
+        int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK;
+
+        rq->rq_disk = bd_disk;
+        rq->flags |= REQ_NOMERGE;
+        rq->end_io = done;
+        elv_add_request(q, rq, where, 1);
+        generic_unplug_device(q);
+}
+
+/**
  * blk_execute_rq - insert a request into queue for execution
  * @q:          queue to insert the request in
  * @bd_disk:    matching gendisk
  * @rq:         request to insert
+ * @at_head:    insert request at head or tail of queue
  *
  * Description:
  *    Insert a fully prepared request at the back of the io scheduler queue
- *    for execution.
+ *    for execution and wait for completion.
  */
 int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
-                   struct request *rq)
+                   struct request *rq, int at_head)
 {
         DECLARE_COMPLETION(wait);
         char sense[SCSI_SENSE_BUFFERSIZE];
         int err = 0;
 
-        rq->rq_disk = bd_disk;
-
         /*
          * we need an extra reference to the request, so we can look at
          * it after io completion
@@ -2233,11 +2332,8 @@ int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
                 rq->sense_len = 0;
         }
 
-        rq->flags |= REQ_NOMERGE;
         rq->waiting = &wait;
-        rq->end_io = blk_end_sync_rq;
-        elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1);
-        generic_unplug_device(q);
+        blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq);
         wait_for_completion(&wait);
         rq->waiting = NULL;
 
@@ -2277,6 +2373,44 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)
 
 EXPORT_SYMBOL(blkdev_issue_flush);
 
+/**
+ * blkdev_scsi_issue_flush_fn - issue flush for SCSI devices
+ * @q:          device queue
+ * @disk:       gendisk
+ * @error_sector:       error offset
+ *
+ * Description:
+ *    Devices understanding the SCSI command set, can use this function as
+ *    a helper for issuing a cache flush. Note: driver is required to store
+ *    the error offset (in case of error flushing) in ->sector of struct
+ *    request.
+ */
+int blkdev_scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
+                               sector_t *error_sector)
+{
+        struct request *rq = blk_get_request(q, WRITE, __GFP_WAIT);
+        int ret;
+
+        rq->flags |= REQ_BLOCK_PC | REQ_SOFTBARRIER;
+        rq->sector = 0;
+        memset(rq->cmd, 0, sizeof(rq->cmd));
+        rq->cmd[0] = 0x35;
+        rq->cmd_len = 12;
+        rq->data = NULL;
+        rq->data_len = 0;
+        rq->timeout = 60 * HZ;
+
+        ret = blk_execute_rq(q, disk, rq, 0);
+
+        if (ret && error_sector)
+                *error_sector = rq->sector;
+
+        blk_put_request(rq);
+        return ret;
+}
+
+EXPORT_SYMBOL(blkdev_scsi_issue_flush_fn);
+
 static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)
 {
         int rw = rq_data_dir(rq);
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
index 681871ca5d60..abb2df249fd3 100644
--- a/drivers/block/scsi_ioctl.c
+++ b/drivers/block/scsi_ioctl.c
@@ -216,7 +216,7 @@ static int sg_io(struct file *file, request_queue_t *q,
                 struct gendisk *bd_disk, struct sg_io_hdr *hdr)
 {
         unsigned long start_time;
-        int reading, writing;
+        int writing = 0, ret = 0;
         struct request *rq;
         struct bio *bio;
         char sense[SCSI_SENSE_BUFFERSIZE];
@@ -231,38 +231,48 @@ static int sg_io(struct file *file, request_queue_t *q,
         if (verify_command(file, cmd))
                 return -EPERM;
 
-        /*
-         * we'll do that later
-         */
-        if (hdr->iovec_count)
-                return -EOPNOTSUPP;
-
         if (hdr->dxfer_len > (q->max_sectors << 9))
                 return -EIO;
 
-        reading = writing = 0;
-        if (hdr->dxfer_len) {
+        if (hdr->dxfer_len)
                 switch (hdr->dxfer_direction) {
                 default:
                         return -EINVAL;
                 case SG_DXFER_TO_FROM_DEV:
-                        reading = 1;
-                        /* fall through */
                 case SG_DXFER_TO_DEV:
                         writing = 1;
                         break;
                 case SG_DXFER_FROM_DEV:
-                        reading = 1;
                         break;
                 }
 
-                rq = blk_rq_map_user(q, writing ? WRITE : READ, hdr->dxferp,
-                                     hdr->dxfer_len);
+        rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
+        if (!rq)
+                return -ENOMEM;
+
+        if (hdr->iovec_count) {
+                const int size = sizeof(struct sg_iovec) * hdr->iovec_count;
+                struct sg_iovec *iov;
+
+                iov = kmalloc(size, GFP_KERNEL);
+                if (!iov) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
+
+                if (copy_from_user(iov, hdr->dxferp, size)) {
+                        kfree(iov);
+                        ret = -EFAULT;
+                        goto out;
+                }
+
+                ret = blk_rq_map_user_iov(q, rq, iov, hdr->iovec_count);
+                kfree(iov);
+        } else if (hdr->dxfer_len)
+                ret = blk_rq_map_user(q, rq, hdr->dxferp, hdr->dxfer_len);
 
-                if (IS_ERR(rq))
-                        return PTR_ERR(rq);
-        } else
-                rq = blk_get_request(q, READ, __GFP_WAIT);
+        if (ret)
+                goto out;
 
         /*
          * fill in request structure
@@ -298,7 +308,7 @@ static int sg_io(struct file *file, request_queue_t *q,
          * (if he doesn't check that is his problem).
          * N.B. a non-zero SCSI status is _not_ necessarily an error.
          */
-        blk_execute_rq(q, bd_disk, rq);
+        blk_execute_rq(q, bd_disk, rq, 0);
 
         /* write to all output members */
         hdr->status = 0xff & rq->errors;
@@ -320,12 +330,14 @@ static int sg_io(struct file *file, request_queue_t *q,
                         hdr->sb_len_wr = len;
         }
 
-        if (blk_rq_unmap_user(rq, bio, hdr->dxfer_len))
-                return -EFAULT;
+        if (blk_rq_unmap_user(bio, hdr->dxfer_len))
+                ret = -EFAULT;
 
         /* may not have succeeded, but output values written to control
          * structure (struct sg_io_hdr).  */
-        return 0;
+out:
+        blk_put_request(rq);
+        return ret;
 }
 
 #define OMAX_SB_LEN 16          /* For backward compatibility */
@@ -408,7 +420,7 @@ static int sg_scsi_ioctl(struct file *file, request_queue_t *q,
         rq->data_len = bytes;
         rq->flags |= REQ_BLOCK_PC;
 
-        blk_execute_rq(q, bd_disk, rq);
+        blk_execute_rq(q, bd_disk, rq, 0);
         err = rq->errors & 0xff;        /* only 8 bit SCSI status */
         if (err) {
                 if (rq->sense_len && rq->sense) {
@@ -561,7 +573,7 @@ int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd,
                         rq->cmd[0] = GPCMD_START_STOP_UNIT;
                         rq->cmd[4] = 0x02 + (close != 0);
                         rq->cmd_len = 6;
-                        err = blk_execute_rq(q, bd_disk, rq);
+                        err = blk_execute_rq(q, bd_disk, rq, 0);
                         blk_put_request(rq);
                         break;
                 default:
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index beaa561f2ed8..153960348414 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2097,6 +2097,10 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
         if (!q)
                 return -ENXIO;
 
+        rq = blk_get_request(q, READ, GFP_KERNEL);
+        if (!rq)
+                return -ENOMEM;
+
         cdi->last_sense = 0;
 
         while (nframes) {
@@ -2108,9 +2112,9 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
 
                 len = nr * CD_FRAMESIZE_RAW;
 
-                rq = blk_rq_map_user(q, READ, ubuf, len);
-                if (IS_ERR(rq))
-                        return PTR_ERR(rq);
+                ret = blk_rq_map_user(q, rq, ubuf, len);
+                if (ret)
+                        break;
 
                 memset(rq->cmd, 0, sizeof(rq->cmd));
                 rq->cmd[0] = GPCMD_READ_CD;
@@ -2132,13 +2136,13 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 if (rq->bio)
                         blk_queue_bounce(q, &rq->bio);
 
-                if (blk_execute_rq(q, cdi->disk, rq)) {
+                if (blk_execute_rq(q, cdi->disk, rq, 0)) {
                         struct request_sense *s = rq->sense;
                         ret = -EIO;
                         cdi->last_sense = s->sense_key;
                 }
 
-                if (blk_rq_unmap_user(rq, bio, len))
+                if (blk_rq_unmap_user(bio, len))
                         ret = -EFAULT;
 
                 if (ret)
@@ -2149,6 +2153,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 ubuf += len;
         }
 
+        blk_put_request(rq);
         return ret;
 }
 
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7333b41d4224..2bc9d64db106 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -138,7 +138,7 @@ config CYZ_INTR
 
 config DIGIEPCA
         tristate "Digiboard Intelligent Async Support"
-        depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (!64BIT || BROKEN)
+        depends on SERIAL_NONSTANDARD
         ---help---
           This is a driver for Digi International's Xx, Xeve, and Xem series
           of cards which provide multiple serial ports. You would need
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
-        depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32
+        depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32 && !SPARC64
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -842,8 +842,7 @@ config SONYPI
 
 config TANBAC_TB0219
         tristate "TANBAC TB0219 base board support"
-        depends TANBAC_TB0229
-
+        depends TANBAC_TB022X
 
 menu "Ftape, the floppy tape device driver"
 
diff --git a/drivers/char/digi1.h b/drivers/char/digi1.h
index 184378d23f8c..94d4eab5d3ca 100644
--- a/drivers/char/digi1.h
+++ b/drivers/char/digi1.h
@@ -1,46 +1,46 @@
 /*          Definitions for DigiBoard ditty(1) command.                 */
 
 #if !defined(TIOCMODG)
-#define TIOCMODG        ('d'<<8) | 250          /* get modem ctrl state */
-#define TIOCMODS        ('d'<<8) | 251          /* set modem ctrl state */
+#define TIOCMODG        (('d'<<8) | 250)        /* get modem ctrl state */
+#define TIOCMODS        (('d'<<8) | 251)        /* set modem ctrl state */
 #endif
 
 #if !defined(TIOCMSET)
-#define TIOCMSET        ('d'<<8) | 252          /* set modem ctrl state */
-#define TIOCMGET        ('d'<<8) | 253          /* set modem ctrl state */
+#define TIOCMSET        (('d'<<8) | 252)        /* set modem ctrl state */
+#define TIOCMGET        (('d'<<8) | 253)        /* set modem ctrl state */
 #endif
 
 #if !defined(TIOCMBIC)
-#define TIOCMBIC        ('d'<<8) | 254          /* set modem ctrl state */
-#define TIOCMBIS        ('d'<<8) | 255          /* set modem ctrl state */
+#define TIOCMBIC        (('d'<<8) | 254)        /* set modem ctrl state */
+#define TIOCMBIS        (('d'<<8) | 255)        /* set modem ctrl state */
 #endif
 
 #if !defined(TIOCSDTR)
-#define TIOCSDTR        ('e'<<8) | 0            /* set DTR              */
-#define TIOCCDTR        ('e'<<8) | 1            /* clear DTR            */
+#define TIOCSDTR        (('e'<<8) | 0)          /* set DTR              */
+#define TIOCCDTR        (('e'<<8) | 1)          /* clear DTR            */
 #endif
 
 /************************************************************************
  * Ioctl command arguments for DIGI parameters.
  ************************************************************************/
-#define DIGI_GETA       ('e'<<8) | 94           /* Read params          */
+#define DIGI_GETA       (('e'<<8) | 94)         /* Read params          */
 
-#define DIGI_SETA       ('e'<<8) | 95           /* Set params           */
-#define DIGI_SETAW      ('e'<<8) | 96           /* Drain & set params   */
-#define DIGI_SETAF      ('e'<<8) | 97           /* Drain, flush & set params */
+#define DIGI_SETA       (('e'<<8) | 95)         /* Set params           */
+#define DIGI_SETAW      (('e'<<8) | 96)         /* Drain & set params   */
+#define DIGI_SETAF      (('e'<<8) | 97)         /* Drain, flush & set params */
 
-#define DIGI_GETFLOW    ('e'<<8) | 99           /* Get startc/stopc flow */
+#define DIGI_GETFLOW    (('e'<<8) | 99)         /* Get startc/stopc flow */
                                                 /* control characters    */
-#define DIGI_SETFLOW    ('e'<<8) | 100          /* Set startc/stopc flow */
+#define DIGI_SETFLOW    (('e'<<8) | 100)        /* Set startc/stopc flow */
                                                 /* control characters    */
-#define DIGI_GETAFLOW   ('e'<<8) | 101          /* Get Aux. startc/stopc */
+#define DIGI_GETAFLOW   (('e'<<8) | 101)        /* Get Aux. startc/stopc */
                                                 /* flow control chars    */
-#define DIGI_SETAFLOW   ('e'<<8) | 102          /* Set Aux. startc/stopc */
+#define DIGI_SETAFLOW   (('e'<<8) | 102)        /* Set Aux. startc/stopc */
                                                 /* flow control chars    */
 
-#define DIGI_GETINFO    ('e'<<8) | 103          /* Fill in digi_info */
-#define DIGI_POLLER     ('e'<<8) | 104          /* Turn on/off poller */
-#define DIGI_INIT       ('e'<<8) | 105          /* Allow things to run. */
+#define DIGI_GETINFO    (('e'<<8) | 103)        /* Fill in digi_info */
+#define DIGI_POLLER     (('e'<<8) | 104)        /* Turn on/off poller */
+#define DIGI_INIT       (('e'<<8) | 105)        /* Allow things to run. */
 
 struct  digiflow_struct 
 {
diff --git a/drivers/char/digiFep1.h b/drivers/char/digiFep1.h
index c47d7fcb8400..3c1f1922c798 100644
--- a/drivers/char/digiFep1.h
+++ b/drivers/char/digiFep1.h
@@ -13,88 +13,88 @@
 
 struct global_data 
 {
-        volatile ushort cin;
-        volatile ushort cout;
-        volatile ushort cstart;
-        volatile ushort cmax;
-        volatile ushort ein;
-        volatile ushort eout;
-        volatile ushort istart;
-        volatile ushort imax;
+        u16 cin;
+        u16 cout;
+        u16 cstart;
+        u16 cmax;
+        u16 ein;
+        u16 eout;
+        u16 istart;
+        u16 imax;
 };
 
 
 struct board_chan 
 {
-        int filler1; 
-        int filler2;
-        volatile ushort tseg;
-        volatile ushort tin;
-        volatile ushort tout;
-        volatile ushort tmax;
-        
-        volatile ushort rseg;
-        volatile ushort rin;
-        volatile ushort rout;
-        volatile ushort rmax;
-        
-        volatile ushort tlow;
-        volatile ushort rlow;
-        volatile ushort rhigh;
-        volatile ushort incr;
-        
-        volatile ushort etime;
-        volatile ushort edelay;
-        volatile unchar *dev;
-        
-        volatile ushort iflag;
-        volatile ushort oflag;
-        volatile ushort cflag;
-        volatile ushort gmask;
-        
-        volatile ushort col;
-        volatile ushort delay;
-        volatile ushort imask;
-        volatile ushort tflush;
-
-        int filler3;
-        int filler4;
-        int filler5;
-        int filler6;
-        
-        volatile unchar num;
-        volatile unchar ract;
-        volatile unchar bstat;
-        volatile unchar tbusy;
-        volatile unchar iempty;
-        volatile unchar ilow;
-        volatile unchar idata;
-        volatile unchar eflag;
-        
-        volatile unchar tflag;
-        volatile unchar rflag;
-        volatile unchar xmask;
-        volatile unchar xval;
-        volatile unchar mstat;
-        volatile unchar mchange;
-        volatile unchar mint;
-        volatile unchar lstat;
-
-        volatile unchar mtran;
-        volatile unchar orun;
-        volatile unchar startca;
-        volatile unchar stopca;
-        volatile unchar startc;
-        volatile unchar stopc;
-        volatile unchar vnext;
-        volatile unchar hflow;
-
-        volatile unchar fillc;
-        volatile unchar ochar;
-        volatile unchar omask;
-
-        unchar filler7;
-        unchar filler8[28];
+        u32 filler1;
+        u32 filler2;
+        u16 tseg;
+        u16 tin;
+        u16 tout;
+        u16 tmax;
+
+        u16 rseg;
+        u16 rin;
+        u16 rout;
+        u16 rmax;
+
+        u16 tlow;
+        u16 rlow;
+        u16 rhigh;
+        u16 incr;
+
+        u16 etime;
+        u16 edelay;
+        unchar *dev;
+
+        u16 iflag;
+        u16 oflag;
+        u16 cflag;
+        u16 gmask;
+
+        u16 col;
+        u16 delay;
+        u16 imask;
+        u16 tflush;
+
+        u32 filler3;
+        u32 filler4;
+        u32 filler5;
+        u32 filler6;
+
+        u8 num;
+        u8 ract;
+        u8 bstat;
+        u8 tbusy;
+        u8 iempty;
+        u8 ilow;
+        u8 idata;
+        u8 eflag;
+
+        u8 tflag;
+        u8 rflag;
+        u8 xmask;
+        u8 xval;
+        u8 mstat;
+        u8 mchange;
+        u8 mint;
+        u8 lstat;
+
+        u8 mtran;
+        u8 orun;
+        u8 startca;
+        u8 stopca;
+        u8 startc;
+        u8 stopc;
+        u8 vnext;
+        u8 hflow;
+
+        u8 fillc;
+        u8 ochar;
+        u8 omask;
+
+        u8 filler7;
+        u8 filler8[28];
 }; 
 
 
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index 123417e43040..56ace9d5e2ae 100644
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -23,13 +23,6 @@ config DRM_TDFX
           Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
           graphics card.  If M is selected, the module will be called tdfx.
 
-config DRM_GAMMA
-        tristate "3dlabs GMX 2000"
-        depends on DRM && BROKEN
-        help
-          This is the old gamma driver, please tell me if it might actually
-          work.
-
 config DRM_R128
         tristate "ATI Rage 128"
         depends on DRM && PCI
@@ -82,7 +75,7 @@ endchoice
 
 config DRM_MGA
         tristate "Matrox g200/g400"
-        depends on DRM && AGP
+        depends on DRM
         help
           Choose this option if you have a Matrox G200, G400 or G450 graphics
           card.  If M is selected, the module will be called mga.  AGP
@@ -103,3 +96,10 @@ config DRM_VIA
           Choose this option if you have a Via unichrome or compatible video
           chipset. If M is selected the module will be called via.
 
+config DRM_SAVAGE
+        tristate "Savage video cards"
+        depends on DRM
+        help
+          Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
+          chipset. If M is selected the module will be called savage.
+
diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
index ddd941045b1f..e41060c76226 100644
--- a/drivers/char/drm/Makefile
+++ b/drivers/char/drm/Makefile
@@ -8,16 +8,16 @@ drm-objs    :=	drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
                 drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
                 drm_sysfs.o
 
-gamma-objs  := gamma_drv.o gamma_dma.o
 tdfx-objs   := tdfx_drv.o
 r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
 mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
 i810-objs   := i810_drv.o i810_dma.o
 i830-objs   := i830_drv.o i830_dma.o i830_irq.o
 i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
-radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
+radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
 ffb-objs    := ffb_drv.o ffb_context.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
+savage-objs := savage_drv.o savage_bci.o savage_state.o
 via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o
 
 ifeq ($(CONFIG_COMPAT),y)
@@ -29,7 +29,6 @@ i915-objs   += i915_ioc32.o
 endif
 
 obj-$(CONFIG_DRM)       += drm.o
-obj-$(CONFIG_DRM_GAMMA) += gamma.o
 obj-$(CONFIG_DRM_TDFX)  += tdfx.o
 obj-$(CONFIG_DRM_R128)  += r128.o
 obj-$(CONFIG_DRM_RADEON)+= radeon.o
@@ -39,5 +38,7 @@ obj-$(CONFIG_DRM_I830)	+= i830.o
 obj-$(CONFIG_DRM_I915)  += i915.o
 obj-$(CONFIG_DRM_FFB)   += ffb.o
 obj-$(CONFIG_DRM_SIS)   += sis.o
+obj-$(CONFIG_DRM_SAVAGE)+= savage.o
 obj-$(CONFIG_DRM_VIA)   +=via.o
 
+
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
index e8371dd87fbc..fc6598a81acd 100644
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
@@ -98,7 +98,7 @@
 #define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
 
 
-typedef unsigned long drm_handle_t;
+typedef unsigned int  drm_handle_t;
 typedef unsigned int  drm_context_t;
 typedef unsigned int  drm_drawable_t;
 typedef unsigned int  drm_magic_t;
@@ -209,7 +209,8 @@ typedef enum drm_map_type {
         _DRM_REGISTERS      = 1,  /**< no caching, no core dump */
         _DRM_SHM            = 2,  /**< shared, cached */
         _DRM_AGP            = 3,  /**< AGP/GART */
-        _DRM_SCATTER_GATHER = 4   /**< Scatter/gather memory for PCI DMA */
+        _DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
+        _DRM_CONSISTENT     = 5,  /**< Consistent memory for PCI DMA */
 } drm_map_type_t;
 
 
@@ -368,7 +369,8 @@ typedef struct drm_buf_desc {
         enum {
                 _DRM_PAGE_ALIGN = 0x01, /**< Align on page boundaries for DMA */
                 _DRM_AGP_BUFFER = 0x02, /**< Buffer is in AGP space */
-                _DRM_SG_BUFFER  = 0x04  /**< Scatter/gather memory buffer */
+                _DRM_SG_BUFFER  = 0x04, /**< Scatter/gather memory buffer */
+                _DRM_FB_BUFFER  = 0x08  /**< Buffer is in frame buffer */
         }             flags;
         unsigned long agp_start; /**< 
                                   * Start address of where the AGP buffers are
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 5df09cc8c6db..6f98701dfe15 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -53,7 +53,6 @@
 #include <linux/init.h>
 #include <linux/file.h>
 #include <linux/pci.h>
-#include <linux/version.h>
 #include <linux/jiffies.h>
 #include <linux/smp_lock.h>     /* For (un)lock_kernel */
 #include <linux/mm.h>
@@ -96,6 +95,7 @@
 #define DRIVER_IRQ_SHARED  0x80
 #define DRIVER_IRQ_VBL     0x100
 #define DRIVER_DMA_QUEUE   0x200
+#define DRIVER_FB_DMA      0x400
 
 /***********************************************************************/
 /** \name Begin the DRM... */
@@ -160,36 +160,7 @@
 #define pte_unmap(pte)
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
-static inline struct page * vmalloc_to_page(void * vmalloc_addr)
-{
-        unsigned long addr = (unsigned long) vmalloc_addr;
-        struct page *page = NULL;
-        pgd_t *pgd = pgd_offset_k(addr);
-        pmd_t *pmd;
-        pte_t *ptep, pte;
-  
-        if (!pgd_none(*pgd)) {
-                pmd = pmd_offset(pgd, addr);
-                if (!pmd_none(*pmd)) {
-                        preempt_disable();
-                        ptep = pte_offset_map(pmd, addr);
-                        pte = *ptep;
-                        if (pte_present(pte))
-                                page = pte_page(pte);
-                        pte_unmap(ptep);
-                        preempt_enable();
-                }
-        }
-        return page;
-}
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define DRM_RPR_ARG(vma)
-#else
 #define DRM_RPR_ARG(vma) vma,
-#endif
 
 #define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
 
@@ -474,7 +445,8 @@ typedef struct drm_device_dma {
         unsigned long     byte_count;
         enum {
                 _DRM_DMA_USE_AGP = 0x01,
-                _DRM_DMA_USE_SG  = 0x02
+                _DRM_DMA_USE_SG  = 0x02,
+                _DRM_DMA_USE_FB  = 0x04
         } flags;
 
 } drm_device_dma_t;
@@ -525,12 +497,19 @@ typedef struct drm_sigdata {
         drm_hw_lock_t *lock;
 } drm_sigdata_t;
 
+typedef struct drm_dma_handle {
+        dma_addr_t busaddr;
+        void *vaddr;
+        size_t size;
+} drm_dma_handle_t;
+
 /**
  * Mappings list
  */
 typedef struct drm_map_list {
         struct list_head        head;   /**< list head */
         drm_map_t               *map;   /**< mapping */
+        unsigned int user_token;
 } drm_map_list_t;
 
 typedef drm_map_t drm_local_map_t;
@@ -578,7 +557,22 @@ struct drm_driver {
         int (*kernel_context_switch)(struct drm_device *dev, int old, int new);
         void (*kernel_context_switch_unlock)(struct drm_device *dev, drm_lock_t *lock);
         int (*vblank_wait)(struct drm_device *dev, unsigned int *sequence);
+        
+        /**
+         * Called by \c drm_device_is_agp.  Typically used to determine if a
+         * card is really attached to AGP or not.
+         *
+         * \param dev  DRM device handle
+         *
+         * \returns
+         * One of three values is returned depending on whether or not the
+         * card is absolutely \b not AGP (return of 0), absolutely \b is AGP
+         * (return of 1), or may or may not be AGP (return of 2).
+         */
+        int (*device_is_agp) (struct drm_device * dev);
+
         /* these have to be filled in */
+  
         int (*postinit)(struct drm_device *, unsigned long flags);
         irqreturn_t (*irq_handler)( DRM_IRQ_ARGS );
         void (*irq_preinstall)(struct drm_device *dev);
@@ -722,12 +716,8 @@ typedef struct drm_device {
         int               pci_slot;     /**< PCI slot number */
         int               pci_func;     /**< PCI function number */
 #ifdef __alpha__
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
-        struct pci_controler *hose;
-#else
         struct pci_controller *hose;
 #endif
-#endif
         drm_sg_mem_t      *sg;  /**< Scatter gather memory */
         unsigned long     *ctx_bitmap;  /**< context bitmap */
         void              *dev_private; /**< device private data */
@@ -736,6 +726,7 @@ typedef struct drm_device {
 
         struct            drm_driver *driver;
         drm_local_map_t   *agp_buffer_map;
+        unsigned int agp_buffer_token;
         drm_head_t primary;             /**< primary screen head */
 } drm_device_t;
 
@@ -806,7 +797,7 @@ extern void	     *drm_ioremap_nocache(unsigned long offset, unsigned long size,
                                            drm_device_t *dev);
 extern void          drm_ioremapfree(void *pt, unsigned long size, drm_device_t *dev);
 
-extern DRM_AGP_MEM   *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type);
+extern DRM_AGP_MEM   *drm_alloc_agp(drm_device_t *dev, int pages, u32 type);
 extern int           drm_free_agp(DRM_AGP_MEM *handle, int pages);
 extern int           drm_bind_agp(DRM_AGP_MEM *handle, unsigned int start);
 extern int           drm_unbind_agp(DRM_AGP_MEM *handle);
@@ -881,11 +872,19 @@ extern int	     drm_lock_free(drm_device_t *dev,
                                     unsigned int context);
 
                                 /* Buffer management support (drm_bufs.h) */
+extern int drm_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request);
+extern int drm_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request);
+extern int drm_addmap(drm_device_t *dev, unsigned int offset,
+                      unsigned int size, drm_map_type_t type,
+                      drm_map_flags_t flags, drm_local_map_t **map_ptr);
+extern int drm_addmap_ioctl(struct inode *inode, struct file *filp,
+                            unsigned int cmd, unsigned long arg);
+extern int drm_rmmap(drm_device_t *dev, drm_local_map_t *map);
+extern int drm_rmmap_locked(drm_device_t *dev, drm_local_map_t *map);
+extern int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
+                           unsigned int cmd, unsigned long arg);
+
 extern int           drm_order( unsigned long size );
-extern int           drm_addmap( struct inode *inode, struct file *filp,
-                                  unsigned int cmd, unsigned long arg );
-extern int           drm_rmmap( struct inode *inode, struct file *filp,
-                                 unsigned int cmd, unsigned long arg );
 extern int           drm_addbufs( struct inode *inode, struct file *filp,
                                    unsigned int cmd, unsigned long arg );
 extern int           drm_infobufs( struct inode *inode, struct file *filp,
@@ -896,6 +895,10 @@ extern int	     drm_freebufs( struct inode *inode, struct file *filp,
                                     unsigned int cmd, unsigned long arg );
 extern int           drm_mapbufs( struct inode *inode, struct file *filp,
                                    unsigned int cmd, unsigned long arg );
+extern unsigned long drm_get_resource_start(drm_device_t *dev,
+                                            unsigned int resource);
+extern unsigned long drm_get_resource_len(drm_device_t *dev,
+                                          unsigned int resource);
 
                                 /* DMA support (drm_dma.h) */
 extern int           drm_dma_setup(drm_device_t *dev);
@@ -919,15 +922,18 @@ extern void          drm_vbl_send_signals( drm_device_t *dev );
 
                                 /* AGP/GART support (drm_agpsupport.h) */
 extern drm_agp_head_t *drm_agp_init(drm_device_t *dev);
-extern int            drm_agp_acquire(struct inode *inode, struct file *filp,
-                                       unsigned int cmd, unsigned long arg);
-extern void           drm_agp_do_release(drm_device_t *dev);
-extern int            drm_agp_release(struct inode *inode, struct file *filp,
-                                       unsigned int cmd, unsigned long arg);
-extern int            drm_agp_enable(struct inode *inode, struct file *filp,
-                                      unsigned int cmd, unsigned long arg);
-extern int            drm_agp_info(struct inode *inode, struct file *filp,
-                                    unsigned int cmd, unsigned long arg);
+extern int drm_agp_acquire(drm_device_t * dev);
+extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
+                           unsigned int cmd, unsigned long arg);
+extern int drm_agp_release(drm_device_t *dev);
+extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
+                           unsigned int cmd, unsigned long arg);
+extern int drm_agp_enable(drm_device_t *dev, drm_agp_mode_t mode);
+extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
+                          unsigned int cmd, unsigned long arg);
+extern int drm_agp_info(drm_device_t * dev, drm_agp_info_t *info);
+extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
+                        unsigned int cmd, unsigned long arg);
 extern int            drm_agp_alloc(struct inode *inode, struct file *filp,
                                      unsigned int cmd, unsigned long arg);
 extern int            drm_agp_free(struct inode *inode, struct file *filp,
@@ -976,12 +982,10 @@ extern int            drm_ati_pcigart_cleanup(drm_device_t *dev,
                                                unsigned long addr,
                                                dma_addr_t bus_addr);
 
-extern void *drm_pci_alloc(drm_device_t * dev, size_t size,
-                           size_t align, dma_addr_t maxaddr,
-                           dma_addr_t * busaddr);
-
-extern void drm_pci_free(drm_device_t * dev, size_t size,
-                         void *vaddr, dma_addr_t busaddr);
+extern drm_dma_handle_t *drm_pci_alloc(drm_device_t *dev, size_t size,
+                                       size_t align, dma_addr_t maxaddr);
+extern void __drm_pci_free(drm_device_t *dev, drm_dma_handle_t *dmah);
+extern void drm_pci_free(drm_device_t *dev, drm_dma_handle_t *dmah);
 
                                /* sysfs support (drm_sysfs.c) */
 struct drm_sysfs_class;
@@ -1012,17 +1016,26 @@ static __inline__ void drm_core_ioremapfree(struct drm_map *map, struct drm_devi
                 drm_ioremapfree( map->handle, map->size, dev );
 }
 
-static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev, unsigned long offset)
+static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev, unsigned int token)
 {
-        struct list_head *_list;
-        list_for_each( _list, &dev->maplist->head ) {
-                drm_map_list_t *_entry = list_entry( _list, drm_map_list_t, head );
-                if ( _entry->map &&
-                     _entry->map->offset == offset ) {
+        drm_map_list_t *_entry;
+        list_for_each_entry(_entry, &dev->maplist->head, head)
+                if (_entry->user_token == token)
                         return _entry->map;
+        return NULL;
+}
+
+static __inline__ int drm_device_is_agp(drm_device_t *dev)
+{
+        if ( dev->driver->device_is_agp != NULL ) {
+                int err = (*dev->driver->device_is_agp)( dev );
+        
+                if (err != 2) {
+                        return err;
                 }
         }
-        return NULL;
+
+        return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
 }
 
 static __inline__ void drm_core_dropmap(struct drm_map *map)
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c
index 8d94c0b5fa44..8c215adcb4b2 100644
--- a/drivers/char/drm/drm_agpsupport.c
+++ b/drivers/char/drm/drm_agpsupport.c
@@ -37,7 +37,7 @@
 #if __OS_HAS_AGP
 
 /**
- * AGP information ioctl.
+ * Get AGP information.
  *
  * \param inode device inode.
  * \param filp file pointer.
@@ -48,51 +48,56 @@
  * Verifies the AGP device has been initialized and acquired and fills in the
  * drm_agp_info structure with the information in drm_agp_head::agp_info.
  */
-int drm_agp_info(struct inode *inode, struct file *filp,
-                  unsigned int cmd, unsigned long arg)
+int drm_agp_info(drm_device_t *dev, drm_agp_info_t *info)
 {
-        drm_file_t       *priv   = filp->private_data;
-        drm_device_t     *dev    = priv->head->dev;
         DRM_AGP_KERN     *kern;
-        drm_agp_info_t   info;
 
         if (!dev->agp || !dev->agp->acquired)
                 return -EINVAL;
 
         kern                   = &dev->agp->agp_info;
-        info.agp_version_major = kern->version.major;
-        info.agp_version_minor = kern->version.minor;
-        info.mode              = kern->mode;
-        info.aperture_base     = kern->aper_base;
-        info.aperture_size     = kern->aper_size * 1024 * 1024;
-        info.memory_allowed    = kern->max_memory << PAGE_SHIFT;
-        info.memory_used       = kern->current_memory << PAGE_SHIFT;
-        info.id_vendor         = kern->device->vendor;
-        info.id_device         = kern->device->device;
-
-        if (copy_to_user((drm_agp_info_t __user *)arg, &info, sizeof(info)))
+        info->agp_version_major = kern->version.major;
+        info->agp_version_minor = kern->version.minor;
+        info->mode              = kern->mode;
+        info->aperture_base     = kern->aper_base;
+        info->aperture_size     = kern->aper_size * 1024 * 1024;
+        info->memory_allowed    = kern->max_memory << PAGE_SHIFT;
+        info->memory_used       = kern->current_memory << PAGE_SHIFT;
+        info->id_vendor         = kern->device->vendor;
+        info->id_device         = kern->device->device;
+
+        return 0;
+}
+EXPORT_SYMBOL(drm_agp_info);
+
+int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
+                 unsigned int cmd, unsigned long arg)
+{
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
+        drm_agp_info_t info;
+        int err;
+
+        err = drm_agp_info(dev, &info);
+        if (err)
+                return err;
+        
+        if (copy_to_user((drm_agp_info_t __user *) arg, &info, sizeof(info)))
                 return -EFAULT;
         return 0;
 }
 
 /**
- * Acquire the AGP device (ioctl).
+ * Acquire the AGP device.
  *
- * \param inode device inode.
- * \param filp file pointer.
- * \param cmd command.
- * \param arg user argument.
+ * \param dev DRM device that is to acquire AGP
  * \return zero on success or a negative number on failure. 
  *
  * Verifies the AGP device hasn't been acquired before and calls
- * agp_acquire().
+ * \c agp_backend_acquire.
  */
-int drm_agp_acquire(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg)
+int drm_agp_acquire(drm_device_t *dev)
 {
-        drm_file_t       *priv   = filp->private_data;
-        drm_device_t     *dev    = priv->head->dev;
-
         if (!dev->agp)
                 return -ENODEV;
         if (dev->agp->acquired)
@@ -102,9 +107,10 @@ int drm_agp_acquire(struct inode *inode, struct file *filp,
         dev->agp->acquired = 1;
         return 0;
 }
+EXPORT_SYMBOL(drm_agp_acquire);
 
 /**
- * Release the AGP device (ioctl).
+ * Acquire the AGP device (ioctl).
  *
  * \param inode device inode.
  * \param filp file pointer.
@@ -112,63 +118,80 @@ int drm_agp_acquire(struct inode *inode, struct file *filp,
  * \param arg user argument.
  * \return zero on success or a negative number on failure.
  *
- * Verifies the AGP device has been acquired and calls agp_backend_release().
+ * Verifies the AGP device hasn't been acquired before and calls
+ * \c agp_backend_acquire.
  */
-int drm_agp_release(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg)
+int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
+                          unsigned int cmd, unsigned long arg)
 {
-        drm_file_t       *priv   = filp->private_data;
-        drm_device_t     *dev    = priv->head->dev;
+        drm_file_t *priv = filp->private_data;
+        
+        return drm_agp_acquire( (drm_device_t *) priv->head->dev );
+}
 
+/**
+ * Release the AGP device.
+ *
+ * \param dev DRM device that is to release AGP
+ * \return zero on success or a negative number on failure.
+ *
+ * Verifies the AGP device has been acquired and calls \c agp_backend_release.
+ */
+int drm_agp_release(drm_device_t *dev)
+{
         if (!dev->agp || !dev->agp->acquired)
                 return -EINVAL;
         agp_backend_release(dev->agp->bridge);
         dev->agp->acquired = 0;
         return 0;
-
 }
+EXPORT_SYMBOL(drm_agp_release);
 
-/**
- * Release the AGP device.
- *
- * Calls agp_backend_release().
- */
-void drm_agp_do_release(drm_device_t *dev)
+int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
+                          unsigned int cmd, unsigned long arg)
 {
-  agp_backend_release(dev->agp->bridge);
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
+        
+        return drm_agp_release(dev);
 }
 
 /**
  * Enable the AGP bus.
  * 
- * \param inode device inode.
- * \param filp file pointer.
- * \param cmd command.
- * \param arg pointer to a drm_agp_mode structure.
+ * \param dev DRM device that has previously acquired AGP.
+ * \param mode Requested AGP mode.
  * \return zero on success or a negative number on failure.
  *
  * Verifies the AGP device has been acquired but not enabled, and calls
- * agp_enable().
+ * \c agp_enable.
  */
-int drm_agp_enable(struct inode *inode, struct file *filp,
-                    unsigned int cmd, unsigned long arg)
+int drm_agp_enable(drm_device_t *dev, drm_agp_mode_t mode)
 {
-        drm_file_t       *priv   = filp->private_data;
-        drm_device_t     *dev    = priv->head->dev;
-        drm_agp_mode_t   mode;
-
         if (!dev->agp || !dev->agp->acquired)
                 return -EINVAL;
 
-        if (copy_from_user(&mode, (drm_agp_mode_t __user *)arg, sizeof(mode)))
-                return -EFAULT;
-
         dev->agp->mode    = mode.mode;
         agp_enable(dev->agp->bridge, mode.mode);
         dev->agp->base    = dev->agp->agp_info.aper_base;
         dev->agp->enabled = 1;
         return 0;
 }
+EXPORT_SYMBOL(drm_agp_enable);
+
+int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
+                   unsigned int cmd, unsigned long arg)
+{
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
+        drm_agp_mode_t mode;
+
+
+        if (copy_from_user(&mode, (drm_agp_mode_t __user *) arg, sizeof(mode)))
+                return -EFAULT;
+
+        return drm_agp_enable(dev, mode);
+}
 
 /**
  * Allocate AGP memory.
@@ -206,7 +229,7 @@ int drm_agp_alloc(struct inode *inode, struct file *filp,
         pages = (request.size + PAGE_SIZE - 1) / PAGE_SIZE;
         type = (u32) request.type;
 
-        if (!(memory = drm_alloc_agp(dev->agp->bridge, pages, type))) {
+        if (!(memory = drm_alloc_agp(dev, pages, type))) {
                 drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
                 return -ENOMEM;
         }
@@ -403,13 +426,8 @@ drm_agp_head_t *drm_agp_init(drm_device_t *dev)
                 return NULL;
         }
         head->memory = NULL;
-#if LINUX_VERSION_CODE <= 0x020408
-        head->cant_use_aperture = 0;
-        head->page_mask = ~(0xfff);
-#else
         head->cant_use_aperture = head->agp_info.cant_use_aperture;
         head->page_mask = head->agp_info.page_mask;
-#endif
 
         return head;
 }
@@ -436,6 +454,7 @@ int drm_agp_bind_memory(DRM_AGP_MEM *handle, off_t start)
                 return -EINVAL;
         return agp_bind_memory(handle, start);
 }
+EXPORT_SYMBOL(drm_agp_bind_memory);
 
 /** Calls agp_unbind_memory() */
 int drm_agp_unbind_memory(DRM_AGP_MEM *handle)
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 4c6191d231b8..f28e70ae6606 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -36,37 +36,69 @@
 #include <linux/vmalloc.h>
 #include "drmP.h"
 
-/**
- * Compute size order.  Returns the exponent of the smaller power of two which
- * is greater or equal to given number.
- * 
- * \param size size.
- * \return order.
- *
- * \todo Can be made faster.
- */
-int drm_order( unsigned long size )
+unsigned long drm_get_resource_start(drm_device_t *dev, unsigned int resource)
 {
-        int order;
-        unsigned long tmp;
+        return pci_resource_start(dev->pdev, resource);
+}
+EXPORT_SYMBOL(drm_get_resource_start);
 
-        for (order = 0, tmp = size >> 1; tmp; tmp >>= 1, order++)
-                ;
+unsigned long drm_get_resource_len(drm_device_t *dev, unsigned int resource)
+{
+        return pci_resource_len(dev->pdev, resource);
+}
+EXPORT_SYMBOL(drm_get_resource_len);
 
-        if (size & (size - 1))
-                ++order;
+static drm_map_list_t *drm_find_matching_map(drm_device_t *dev,
+                                             drm_local_map_t *map)
+{
+        struct list_head *list;
 
-        return order;
+        list_for_each(list, &dev->maplist->head) {
+                drm_map_list_t *entry = list_entry(list, drm_map_list_t, head);
+                if (entry->map && map->type == entry->map->type &&
+                    entry->map->offset == map->offset) {
+                        return entry;
+                }
+        }
+
+        return NULL;
 }
-EXPORT_SYMBOL(drm_order);
 
-#ifdef CONFIG_COMPAT
 /*
- * Used to allocate 32-bit handles for _DRM_SHM regions
- * The 0x10000000 value is chosen to be out of the way of
- * FB/register and GART physical addresses.
+ * Used to allocate 32-bit handles for mappings.
  */
-static unsigned int map32_handle = 0x10000000;
+#define START_RANGE 0x10000000
+#define END_RANGE 0x40000000
+
+#ifdef _LP64
+static __inline__ unsigned int HandleID(unsigned long lhandle, drm_device_t *dev) 
+{
+        static unsigned int map32_handle = START_RANGE;
+        unsigned int hash;
+
+        if (lhandle & 0xffffffff00000000) {
+                hash = map32_handle;
+                map32_handle += PAGE_SIZE;
+                if (map32_handle > END_RANGE)
+                        map32_handle = START_RANGE;
+        } else 
+                hash = lhandle;
+
+        while (1) {
+                drm_map_list_t *_entry;
+                list_for_each_entry(_entry, &dev->maplist->head,head) {
+                        if (_entry->user_token == hash)
+                                break;
+                }
+                if (&_entry->head == &dev->maplist->head)
+                        return hash;
+
+                hash += PAGE_SIZE;
+                map32_handle += PAGE_SIZE;
+        }
+}
+#else
+# define HandleID(x,dev) (unsigned int)(x)
 #endif
 
 /**
@@ -82,25 +114,22 @@ static unsigned int map32_handle = 0x10000000;
  * type.  Adds the map to the map list drm_device::maplist. Adds MTRR's where
  * applicable and if supported by the kernel.
  */
-int drm_addmap( struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg )
+int drm_addmap_core(drm_device_t * dev, unsigned int offset,
+                    unsigned int size, drm_map_type_t type,
+                    drm_map_flags_t flags, drm_map_list_t **maplist)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
         drm_map_t *map;
-        drm_map_t __user *argp = (void __user *)arg;
         drm_map_list_t *list;
-
-        if ( !(filp->f_mode & 3) ) return -EACCES; /* Require read/write */
+        drm_dma_handle_t *dmah;
 
         map = drm_alloc( sizeof(*map), DRM_MEM_MAPS );
         if ( !map )
                 return -ENOMEM;
 
-        if ( copy_from_user( map, argp, sizeof(*map) ) ) {
-                drm_free( map, sizeof(*map), DRM_MEM_MAPS );
-                return -EFAULT;
-        }
+        map->offset = offset;
+        map->size = size;
+        map->flags = flags;
+        map->type = type;
 
         /* Only allow shared memory to be removable since we only keep enough
          * book keeping information about shared memory to allow for removal
@@ -122,7 +151,7 @@ int drm_addmap( struct inode *inode, struct file *filp,
         switch ( map->type ) {
         case _DRM_REGISTERS:
         case _DRM_FRAME_BUFFER:
-#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__)
                 if ( map->offset + map->size < map->offset ||
                      map->offset < virt_to_phys(high_memory) ) {
                         drm_free( map, sizeof(*map), DRM_MEM_MAPS );
@@ -132,6 +161,24 @@ int drm_addmap( struct inode *inode, struct file *filp,
 #ifdef __alpha__
                 map->offset += dev->hose->mem_space->start;
 #endif
+                /* Some drivers preinitialize some maps, without the X Server
+                 * needing to be aware of it.  Therefore, we just return success
+                 * when the server tries to create a duplicate map.
+                 */
+                list = drm_find_matching_map(dev, map);
+                if (list != NULL) {
+                        if (list->map->size != map->size) {
+                                DRM_DEBUG("Matching maps of type %d with "
+                                   "mismatched sizes, (%ld vs %ld)\n",
+                                    map->type, map->size, list->map->size);
+                                list->map->size = map->size;
+                        }
+
+                        drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                        *maplist = list;
+                        return 0;
+                }
+
                 if (drm_core_has_MTRR(dev)) {
                         if ( map->type == _DRM_FRAME_BUFFER ||
                              (map->flags & _DRM_WRITE_COMBINING) ) {
@@ -178,9 +225,22 @@ int drm_addmap( struct inode *inode, struct file *filp,
                         drm_free(map, sizeof(*map), DRM_MEM_MAPS);
                         return -EINVAL;
                 }
-                map->offset += dev->sg->handle;
+                map->offset += (unsigned long)dev->sg->virtual;
+                break;
+        case _DRM_CONSISTENT: 
+                /* dma_addr_t is 64bit on i386 with CONFIG_HIGHMEM64G,
+                 * As we're limiting the address to 2^32-1 (or less),
+                 * casting it down to 32 bits is no problem, but we
+                 * need to point to a 64bit variable first. */
+                dmah = drm_pci_alloc(dev, map->size, map->size, 0xffffffffUL);
+                if (!dmah) {
+                        drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                        return -ENOMEM;
+                }
+                map->handle = dmah->vaddr;
+                map->offset = (unsigned long)dmah->busaddr;
+                kfree(dmah);
                 break;
-
         default:
                 drm_free( map, sizeof(*map), DRM_MEM_MAPS );
                 return -EINVAL;
@@ -196,17 +256,57 @@ int drm_addmap( struct inode *inode, struct file *filp,
 
         down(&dev->struct_sem);
         list_add(&list->head, &dev->maplist->head);
-#ifdef CONFIG_COMPAT
-        /* Assign a 32-bit handle for _DRM_SHM mappings */
+        /* Assign a 32-bit handle */
         /* We do it here so that dev->struct_sem protects the increment */
-        if (map->type == _DRM_SHM)
-                map->offset = map32_handle += PAGE_SIZE;
-#endif
+        list->user_token = HandleID(map->type==_DRM_SHM
+                                    ? (unsigned long)map->handle
+                                    : map->offset, dev);
         up(&dev->struct_sem);
 
-        if ( copy_to_user( argp, map, sizeof(*map) ) )
+        *maplist = list;
+        return 0;
+}
+
+int drm_addmap(drm_device_t *dev, unsigned int offset,
+               unsigned int size, drm_map_type_t type,
+               drm_map_flags_t flags, drm_local_map_t **map_ptr)
+{
+        drm_map_list_t *list;
+        int rc;
+
+        rc = drm_addmap_core(dev, offset, size, type, flags, &list);
+        if (!rc)
+                *map_ptr = list->map;
+        return rc;
+}
+EXPORT_SYMBOL(drm_addmap);
+
+int drm_addmap_ioctl(struct inode *inode, struct file *filp,
+                     unsigned int cmd, unsigned long arg)
+{
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
+        drm_map_t map;
+        drm_map_list_t *maplist;
+        drm_map_t __user *argp = (void __user *)arg;
+        int err;
+
+        if (!(filp->f_mode & 3))
+                return -EACCES; /* Require read/write */
+
+        if (copy_from_user(& map, argp, sizeof(map))) {
                 return -EFAULT;
-        if (copy_to_user(&argp->handle, &map->offset, sizeof(map->offset)))
+        }
+
+        err = drm_addmap_core(dev, map.offset, map.size, map.type, map.flags,
+                              &maplist);
+
+        if (err) 
+                return err;
+
+        if (copy_to_user(argp, maplist->map, sizeof(drm_map_t)))
+                return -EFAULT;
+        if (put_user(maplist->user_token, &argp->handle))
                 return -EFAULT;
         return 0;
 }
@@ -226,81 +326,138 @@ int drm_addmap( struct inode *inode, struct file *filp,
  * its being used, and free any associate resource (such as MTRR's) if it's not
  * being on use.
  *
- * \sa addmap().
+ * \sa drm_addmap
  */
-int drm_rmmap(struct inode *inode, struct file *filp,
-               unsigned int cmd, unsigned long arg)
+int drm_rmmap_locked(drm_device_t *dev, drm_local_map_t *map)
 {
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->head->dev;
         struct list_head *list;
         drm_map_list_t *r_list = NULL;
-        drm_vma_entry_t *pt, *prev;
-        drm_map_t *map;
+        drm_dma_handle_t dmah;
+
+        /* Find the list entry for the map and remove it */
+        list_for_each(list, &dev->maplist->head) {
+                r_list = list_entry(list, drm_map_list_t, head);
+
+                if (r_list->map == map) {
+                        list_del(list);
+                        drm_free(list, sizeof(*list), DRM_MEM_MAPS);
+                        break;
+                }
+        }
+
+        /* List has wrapped around to the head pointer, or it's empty and we
+         * didn't find anything.
+         */
+        if (list == (&dev->maplist->head)) {
+                return -EINVAL;
+        }
+
+        switch (map->type) {
+        case _DRM_REGISTERS:
+                drm_ioremapfree(map->handle, map->size, dev);
+                /* FALLTHROUGH */
+        case _DRM_FRAME_BUFFER:
+                if (drm_core_has_MTRR(dev) && map->mtrr >= 0) {
+                        int retcode;
+                        retcode = mtrr_del(map->mtrr, map->offset,
+                                           map->size);
+                        DRM_DEBUG ("mtrr_del=%d\n", retcode);
+                }
+                break;
+        case _DRM_SHM:
+                vfree(map->handle);
+                break;
+        case _DRM_AGP:
+        case _DRM_SCATTER_GATHER:
+                break;
+        case _DRM_CONSISTENT:
+                dmah.vaddr = map->handle;
+                dmah.busaddr = map->offset;
+                dmah.size = map->size;
+                __drm_pci_free(dev, &dmah);
+                break;
+        }
+        drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+
+        return 0;
+}
+EXPORT_SYMBOL(drm_rmmap_locked);
+
+int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)
+{
+        int ret;
+
+        down(&dev->struct_sem);
+        ret = drm_rmmap_locked(dev, map);
+        up(&dev->struct_sem);
+
+        return ret;
+}
+EXPORT_SYMBOL(drm_rmmap);
+
+/* The rmmap ioctl appears to be unnecessary.  All mappings are torn down on
+ * the last close of the device, and this is necessary for cleanup when things
+ * exit uncleanly.  Therefore, having userland manually remove mappings seems
+ * like a pointless exercise since they're going away anyway.
+ *
+ * One use case might be after addmap is allowed for normal users for SHM and
+ * gets used by drivers that the server doesn't need to care about.  This seems
+ * unlikely.
+ */
+int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
+                    unsigned int cmd, unsigned long arg)
+{
+        drm_file_t *priv = filp->private_data;
+        drm_device_t *dev = priv->head->dev;
         drm_map_t request;
-        int found_maps = 0;
+        drm_local_map_t *map = NULL;
+        struct list_head *list;
+        int ret;
 
-        if (copy_from_user(&request, (drm_map_t __user *)arg,
-                           sizeof(request))) {
+        if (copy_from_user(&request, (drm_map_t __user *)arg, sizeof(request))) {
                 return -EFAULT;
         }
 
         down(&dev->struct_sem);
-        list = &dev->maplist->head;
         list_for_each(list, &dev->maplist->head) {
-                r_list = list_entry(list, drm_map_list_t, head);
+                drm_map_list_t *r_list = list_entry(list, drm_map_list_t, head);
 
-                if(r_list->map &&
-                   r_list->map->offset == (unsigned long) request.handle &&
-                   r_list->map->flags & _DRM_REMOVABLE) break;
+                if (r_list->map &&
+                    r_list->user_token == (unsigned long) request.handle &&
+                    r_list->map->flags & _DRM_REMOVABLE) {
+                        map = r_list->map;
+                        break;
+                }
         }
 
         /* List has wrapped around to the head pointer, or its empty we didn't
          * find anything.
          */
-        if(list == (&dev->maplist->head)) {
+        if (list == (&dev->maplist->head)) {
                 up(&dev->struct_sem);
                 return -EINVAL;
         }
-        map = r_list->map;
-        list_del(list);
-        drm_free(list, sizeof(*list), DRM_MEM_MAPS);
 
-        for (pt = dev->vmalist, prev = NULL; pt; prev = pt, pt = pt->next) {
-                if (pt->vma->vm_private_data == map) found_maps++;
-        }
+        if (!map)
+                return -EINVAL;
 
-        if(!found_maps) {
-                switch (map->type) {
-                case _DRM_REGISTERS:
-                case _DRM_FRAME_BUFFER:
-                  if (drm_core_has_MTRR(dev)) {
-                                if (map->mtrr >= 0) {
-                                        int retcode;
-                                        retcode = mtrr_del(map->mtrr,
-                                                           map->offset,
-                                                           map->size);
-                                        DRM_DEBUG("mtrr_del = %d\n", retcode);
-                                }
-                        }
-                        drm_ioremapfree(map->handle, map->size, dev);
-                        break;
-                case _DRM_SHM:
-                        vfree(map->handle);
-                        break;
-                case _DRM_AGP:
-                case _DRM_SCATTER_GATHER:
-                        break;
-                }
-                drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+        /* Register and framebuffer maps are permanent */
+        if ((map->type == _DRM_REGISTERS) || (map->type == _DRM_FRAME_BUFFER)) {
+                up(&dev->struct_sem);
+                return 0;
         }
+
+        ret = drm_rmmap_locked(dev, map);
+
         up(&dev->struct_sem);
-        return 0;
+
+        return ret;
 }
 
 /**
  * Cleanup after an error on one of the addbufs() functions.
  *
+ * \param dev DRM device.
  * \param entry buffer entry where the error occurred.
  *
  * Frees any pages and buffers associated with the given entry.
@@ -344,25 +501,19 @@ static void drm_cleanup_buf_error(drm_device_t *dev, drm_buf_entry_t *entry)
 
 #if __OS_HAS_AGP
 /**
- * Add AGP buffers for DMA transfers (ioctl).
+ * Add AGP buffers for DMA transfers.
  *
- * \param inode device inode.
- * \param filp file pointer.
- * \param cmd command.
- * \param arg pointer to a drm_buf_desc_t request.
+ * \param dev drm_device_t to which the buffers are to be added.
+ * \param request pointer to a drm_buf_desc_t describing the request.
  * \return zero on success or a negative number on failure.
  * 
  * After some sanity checks creates a drm_buf structure for each buffer and
  * reallocates the buffer list of the same size order to accommodate the new
  * buffers.
  */
-static int drm_addbufs_agp( struct inode *inode, struct file *filp,
-                            unsigned int cmd, unsigned long arg )
+int drm_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
-        drm_buf_desc_t request;
         drm_buf_entry_t *entry;
         drm_buf_t *buf;
         unsigned long offset;
@@ -376,25 +527,20 @@ static int drm_addbufs_agp( struct inode *inode, struct file *filp,
         int byte_count;
         int i;
         drm_buf_t **temp_buflist;
-        drm_buf_desc_t __user *argp = (void __user *)arg;
 
         if ( !dma ) return -EINVAL;
 
-        if ( copy_from_user( &request, argp,
-                             sizeof(request) ) )
-                return -EFAULT;
-
-        count = request.count;
-        order = drm_order( request.size );
+        count = request->count;
+        order = drm_order(request->size);
         size = 1 << order;
 
-        alignment  = (request.flags & _DRM_PAGE_ALIGN)
+        alignment  = (request->flags & _DRM_PAGE_ALIGN)
                 ? PAGE_ALIGN(size) : size;
         page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
         total = PAGE_SIZE << page_order;
 
         byte_count = 0;
-        agp_offset = dev->agp->base + request.agp_start;
+        agp_offset = dev->agp->base + request->agp_start;
 
         DRM_DEBUG( "count:      %d\n",  count );
         DRM_DEBUG( "order:      %d\n",  order );
@@ -508,26 +654,20 @@ static int drm_addbufs_agp( struct inode *inode, struct file *filp,
 
         up( &dev->struct_sem );
 
-        request.count = entry->buf_count;
-        request.size = size;
-
-        if ( copy_to_user( argp, &request, sizeof(request) ) )
-                return -EFAULT;
+        request->count = entry->buf_count;
+        request->size = size;
 
         dma->flags = _DRM_DMA_USE_AGP;
 
         atomic_dec( &dev->buf_alloc );
         return 0;
 }
+EXPORT_SYMBOL(drm_addbufs_agp);
 #endif /* __OS_HAS_AGP */
 
-static int drm_addbufs_pci( struct inode *inode, struct file *filp,
-                            unsigned int cmd, unsigned long arg )
+int drm_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
-        drm_buf_desc_t request;
         int count;
         int order;
         int size;
@@ -543,26 +683,22 @@ static int drm_addbufs_pci( struct inode *inode, struct file *filp,
         int page_count;
         unsigned long *temp_pagelist;
         drm_buf_t **temp_buflist;
-        drm_buf_desc_t __user *argp = (void __user *)arg;
 
         if (!drm_core_check_feature(dev, DRIVER_PCI_DMA)) return -EINVAL;
         if ( !dma ) return -EINVAL;
 
-        if ( copy_from_user( &request, argp, sizeof(request) ) )
-                return -EFAULT;
-
-        count = request.count;
-        order = drm_order( request.size );
+        count = request->count;
+        order = drm_order(request->size);
         size = 1 << order;
 
         DRM_DEBUG( "count=%d, size=%d (%d), order=%d, queue_count=%d\n",
-                   request.count, request.size, size,
+                   request->count, request->size, size,
                    order, dev->queue_count );
 
         if ( order < DRM_MIN_ORDER || order > DRM_MAX_ORDER ) return -EINVAL;
         if ( dev->queue_count ) return -EBUSY; /* Not while in use */
 
-        alignment = (request.flags & _DRM_PAGE_ALIGN)
+        alignment = (request->flags & _DRM_PAGE_ALIGN)
                 ? PAGE_ALIGN(size) : size;
         page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
         total = PAGE_SIZE << page_order;
@@ -740,25 +876,18 @@ static int drm_addbufs_pci( struct inode *inode, struct file *filp,
 
         up( &dev->struct_sem );
 
-        request.count = entry->buf_count;
-        request.size = size;
-
-        if ( copy_to_user( argp, &request, sizeof(request) ) )
-                return -EFAULT;
+        request->count = entry->buf_count;
+        request->size = size;
 
         atomic_dec( &dev->buf_alloc );
         return 0;
 
 }
+EXPORT_SYMBOL(drm_addbufs_pci);
 
-static int drm_addbufs_sg( struct inode *inode, struct file *filp,
-                           unsigned int cmd, unsigned long arg )
+static int drm_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
-        drm_buf_desc_t __user *argp = (void __user *)arg;
-        drm_buf_desc_t request;
         drm_buf_entry_t *entry;
         drm_buf_t *buf;
         unsigned long offset;
@@ -777,20 +906,17 @@ static int drm_addbufs_sg( struct inode *inode, struct file *filp,
         
         if ( !dma ) return -EINVAL;
 
-        if ( copy_from_user( &request, argp, sizeof(request) ) )
-                return -EFAULT;
-
-        count = request.count;
-        order = drm_order( request.size );
+        count = request->count;
+        order = drm_order(request->size);
         size = 1 << order;
 
-        alignment  = (request.flags & _DRM_PAGE_ALIGN)
+        alignment  = (request->flags & _DRM_PAGE_ALIGN)
                         ? PAGE_ALIGN(size) : size;
         page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
         total = PAGE_SIZE << page_order;
 
         byte_count = 0;
-        agp_offset = request.agp_start;
+        agp_offset = request->agp_start;
 
         DRM_DEBUG( "count:      %d\n",  count );
         DRM_DEBUG( "order:      %d\n",  order );
@@ -848,7 +974,8 @@ static int drm_addbufs_sg( struct inode *inode, struct file *filp,
 
                 buf->offset  = (dma->byte_count + offset);
                 buf->bus_address = agp_offset + offset;
-                buf->address = (void *)(agp_offset + offset + dev->sg->handle);
+                buf->address = (void *)(agp_offset + offset 
+                                        + (unsigned long)dev->sg->virtual);
                 buf->next    = NULL;
                 buf->waiting = 0;
                 buf->pending = 0;
@@ -905,11 +1032,8 @@ static int drm_addbufs_sg( struct inode *inode, struct file *filp,
 
         up( &dev->struct_sem );
 
-        request.count = entry->buf_count;
-        request.size = size;
-
-        if ( copy_to_user( argp, &request, sizeof(request) ) )
-                return -EFAULT;
+        request->count = entry->buf_count;
+        request->size = size;
 
         dma->flags = _DRM_DMA_USE_SG;
 
@@ -917,6 +1041,161 @@ static int drm_addbufs_sg( struct inode *inode, struct file *filp,
         return 0;
 }
 
+static int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
+{
+        drm_device_dma_t *dma = dev->dma;
+        drm_buf_entry_t *entry;
+        drm_buf_t *buf;
+        unsigned long offset;
+        unsigned long agp_offset;
+        int count;
+        int order;
+        int size;
+        int alignment;
+        int page_order;
+        int total;
+        int byte_count;
+        int i;
+        drm_buf_t **temp_buflist;
+
+        if (!drm_core_check_feature(dev, DRIVER_FB_DMA))
+                return -EINVAL;
+    
+        if (!dma)
+                return -EINVAL;
+
+        count = request->count;
+        order = drm_order(request->size);
+        size = 1 << order;
+
+        alignment = (request->flags & _DRM_PAGE_ALIGN)
+            ? PAGE_ALIGN(size) : size;
+        page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
+        total = PAGE_SIZE << page_order;
+
+        byte_count = 0;
+        agp_offset = request->agp_start;
+
+        DRM_DEBUG("count:      %d\n", count);
+        DRM_DEBUG("order:      %d\n", order);
+        DRM_DEBUG("size:       %d\n", size);
+        DRM_DEBUG("agp_offset: %lu\n", agp_offset);
+        DRM_DEBUG("alignment:  %d\n", alignment);
+        DRM_DEBUG("page_order: %d\n", page_order);
+        DRM_DEBUG("total:      %d\n", total);
+
+        if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)
+                return -EINVAL;
+        if (dev->queue_count)
+                return -EBUSY;  /* Not while in use */
+
+        spin_lock(&dev->count_lock);
+        if (dev->buf_use) {
+                spin_unlock(&dev->count_lock);
+                return -EBUSY;
+        }
+        atomic_inc(&dev->buf_alloc);
+        spin_unlock(&dev->count_lock);
+
+        down(&dev->struct_sem);
+        entry = &dma->bufs[order];
+        if (entry->buf_count) {
+                up(&dev->struct_sem);
+                atomic_dec(&dev->buf_alloc);
+                return -ENOMEM; /* May only call once for each order */
+        }
+
+        if (count < 0 || count > 4096) {
+                up(&dev->struct_sem);
+                atomic_dec(&dev->buf_alloc);
+                return -EINVAL;
+        }
+
+        entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
+                                   DRM_MEM_BUFS);
+        if (!entry->buflist) {
+                up(&dev->struct_sem);
+                atomic_dec(&dev->buf_alloc);
+                return -ENOMEM;
+        }
+        memset(entry->buflist, 0, count * sizeof(*entry->buflist));
+
+        entry->buf_size = size;
+        entry->page_order = page_order;
+
+        offset = 0;
+
+        while (entry->buf_count < count) {
+                buf = &entry->buflist[entry->buf_count];
+                buf->idx = dma->buf_count + entry->buf_count;
+                buf->total = alignment;
+                buf->order = order;
+                buf->used = 0;
+
+                buf->offset = (dma->byte_count + offset);
+                buf->bus_address = agp_offset + offset;
+                buf->address = (void *)(agp_offset + offset);
+                buf->next = NULL;
+                buf->waiting = 0;
+                buf->pending = 0;
+                init_waitqueue_head(&buf->dma_wait);
+                buf->filp = NULL;
+
+                buf->dev_priv_size = dev->driver->dev_priv_size;
+                buf->dev_private = drm_alloc(buf->dev_priv_size, DRM_MEM_BUFS);
+                if (!buf->dev_private) {
+                        /* Set count correctly so we free the proper amount. */
+                        entry->buf_count = count;
+                        drm_cleanup_buf_error(dev, entry);
+                        up(&dev->struct_sem);
+                        atomic_dec(&dev->buf_alloc);
+                        return -ENOMEM;
+                }
+                memset(buf->dev_private, 0, buf->dev_priv_size);
+
+                DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);
+
+                offset += alignment;
+                entry->buf_count++;
+                byte_count += PAGE_SIZE << page_order;
+        }
+
+        DRM_DEBUG("byte_count: %d\n", byte_count);
+
+        temp_buflist = drm_realloc(dma->buflist,
+                                   dma->buf_count * sizeof(*dma->buflist),
+                                   (dma->buf_count + entry->buf_count)
+                                   * sizeof(*dma->buflist), DRM_MEM_BUFS);
+        if (!temp_buflist) {
+                /* Free the entry because it isn't valid */
+                drm_cleanup_buf_error(dev, entry);
+                up(&dev->struct_sem);
+                atomic_dec(&dev->buf_alloc);
+                return -ENOMEM;
+        }
+        dma->buflist = temp_buflist;
+
+        for (i = 0; i < entry->buf_count; i++) {
+                dma->buflist[i + dma->buf_count] = &entry->buflist[i];
+        }
+
+        dma->buf_count += entry->buf_count;
+        dma->byte_count += byte_count;
+
+        DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
+        DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
+
+        up(&dev->struct_sem);
+
+        request->count = entry->buf_count;
+        request->size = size;
+
+        dma->flags = _DRM_DMA_USE_FB;
+
+        atomic_dec(&dev->buf_alloc);
+        return 0;
+}
+
 /**
  * Add buffers for DMA transfers (ioctl).
  *
@@ -937,6 +1216,7 @@ int drm_addbufs( struct inode *inode, struct file *filp,
         drm_buf_desc_t request;
         drm_file_t *priv = filp->private_data;
         drm_device_t *dev = priv->head->dev;
+        int ret;
         
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 return -EINVAL;
@@ -947,13 +1227,23 @@ int drm_addbufs( struct inode *inode, struct file *filp,
 
 #if __OS_HAS_AGP
         if ( request.flags & _DRM_AGP_BUFFER )
-                return drm_addbufs_agp( inode, filp, cmd, arg );
+                ret=drm_addbufs_agp(dev, &request);
         else
 #endif
         if ( request.flags & _DRM_SG_BUFFER )
-                return drm_addbufs_sg( inode, filp, cmd, arg );
+                ret=drm_addbufs_sg(dev, &request);
+        else if ( request.flags & _DRM_FB_BUFFER)
+                ret=drm_addbufs_fb(dev, &request);
         else
-                return drm_addbufs_pci( inode, filp, cmd, arg );
+                ret=drm_addbufs_pci(dev, &request);
+
+        if (ret==0) {
+                if (copy_to_user((void __user *)arg, &request,
+                                 sizeof(request))) {
+                        ret = -EFAULT;
+                }
+        }
+        return ret;
 }
 
 
@@ -1196,43 +1486,31 @@ int drm_mapbufs( struct inode *inode, struct file *filp,
                 return -EFAULT;
 
         if ( request.count >= dma->buf_count ) {
-                if ((drm_core_has_AGP(dev) && (dma->flags & _DRM_DMA_USE_AGP)) ||
-                    (drm_core_check_feature(dev, DRIVER_SG) && (dma->flags & _DRM_DMA_USE_SG)) ) {
+                if ((drm_core_has_AGP(dev) && (dma->flags & _DRM_DMA_USE_AGP))
+                    || (drm_core_check_feature(dev, DRIVER_SG) 
+                        && (dma->flags & _DRM_DMA_USE_SG))
+                    || (drm_core_check_feature(dev, DRIVER_FB_DMA)
+                        && (dma->flags & _DRM_DMA_USE_FB))) {
                         drm_map_t *map = dev->agp_buffer_map;
+                        unsigned long token = dev->agp_buffer_token;
 
                         if ( !map ) {
                                 retcode = -EINVAL;
                                 goto done;
                         }
 
-#if LINUX_VERSION_CODE <= 0x020402
-                        down( &current->mm->mmap_sem );
-#else
                         down_write( &current->mm->mmap_sem );
-#endif
                         virtual = do_mmap( filp, 0, map->size,
                                            PROT_READ | PROT_WRITE,
                                            MAP_SHARED,
-                                           (unsigned long)map->offset );
-#if LINUX_VERSION_CODE <= 0x020402
-                        up( &current->mm->mmap_sem );
-#else
+                                           token );
                         up_write( &current->mm->mmap_sem );
-#endif
                 } else {
-#if LINUX_VERSION_CODE <= 0x020402
-                        down( &current->mm->mmap_sem );
-#else
                         down_write( &current->mm->mmap_sem );
-#endif
                         virtual = do_mmap( filp, 0, dma->byte_count,
                                            PROT_READ | PROT_WRITE,
                                            MAP_SHARED, 0 );
-#if LINUX_VERSION_CODE <= 0x020402
-                        up( &current->mm->mmap_sem );
-#else
                         up_write( &current->mm->mmap_sem );
-#endif
                 }
                 if ( virtual > -1024UL ) {
                         /* Real error */
@@ -1279,3 +1557,26 @@ int drm_mapbufs( struct inode *inode, struct file *filp,
         return retcode;
 }
 
+/**
+ * Compute size order.  Returns the exponent of the smaller power of two which
+ * is greater or equal to given number.
+ * 
+ * \param size size.
+ * \return order.
+ *
+ * \todo Can be made faster.
+ */
+int drm_order( unsigned long size )
+{
+        int order;
+        unsigned long tmp;
+
+        for (order = 0, tmp = size >> 1; tmp; tmp >>= 1, order++)
+                ;
+
+        if (size & (size - 1))
+                ++order;
+
+        return order;
+}
+EXPORT_SYMBOL(drm_order);
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index a7cfabd1ca2e..502892794c16 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -212,6 +212,7 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
         drm_ctx_priv_map_t __user *argp = (void __user *)arg;
         drm_ctx_priv_map_t request;
         drm_map_t *map;
+        drm_map_list_t *_entry;
 
         if (copy_from_user(&request, argp, sizeof(request)))
                 return -EFAULT;
@@ -225,7 +226,17 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
         map = dev->context_sareas[request.ctx_id];
         up(&dev->struct_sem);
 
-        request.handle = (void *) map->offset;
+        request.handle = 0;
+        list_for_each_entry(_entry, &dev->maplist->head,head) {
+                if (_entry->map == map) {
+                        request.handle = (void *)(unsigned long)_entry->user_token;
+                        break;
+                }
+        }
+        if (request.handle == 0)
+                return -EINVAL;
+
+
         if (copy_to_user(argp, &request, sizeof(request)))
                 return -EFAULT;
         return 0;
@@ -262,7 +273,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
         list_for_each(list, &dev->maplist->head) {
                 r_list = list_entry(list, drm_map_list_t, head);
                 if (r_list->map
-                    && r_list->map->offset == (unsigned long) request.handle)
+                    && r_list->user_token == (unsigned long) request.handle)
                         goto found;
         }
 bad:
@@ -297,7 +308,7 @@ found:
  *
  * Attempt to set drm_device::context_flag.
  */
-int drm_context_switch( drm_device_t *dev, int old, int new )
+static int drm_context_switch( drm_device_t *dev, int old, int new )
 {
         if ( test_and_set_bit( 0, &dev->context_flag ) ) {
                 DRM_ERROR( "Reentering -- FIXME\n" );
@@ -369,7 +380,7 @@ int drm_resctx( struct inode *inode, struct file *filp,
                 for ( i = 0 ; i < DRM_RESERVED_CONTEXTS ; i++ ) {
                         ctx.handle = i;
                         if ( copy_to_user( &res.contexts[i],
-                                           &i, sizeof(i) ) )
+                                           &ctx, sizeof(ctx) ) )
                                 return -EFAULT;
                 }
         }
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index 3333c250c4d9..6ba48f346fcf 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -70,8 +70,8 @@ static drm_ioctl_desc_t		  drm_ioctls[] = {
         [DRM_IOCTL_NR(DRM_IOCTL_UNBLOCK)]       = { drm_noop,        1, 1 },
         [DRM_IOCTL_NR(DRM_IOCTL_AUTH_MAGIC)]    = { drm_authmagic,   1, 1 },
 
-        [DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]       = { drm_addmap,      1, 1 },
-        [DRM_IOCTL_NR(DRM_IOCTL_RM_MAP)]        = { drm_rmmap,       1, 0 },
+        [DRM_IOCTL_NR(DRM_IOCTL_ADD_MAP)]       = { drm_addmap_ioctl,1, 1 },
+        [DRM_IOCTL_NR(DRM_IOCTL_RM_MAP)]        = { drm_rmmap_ioctl, 1, 0 },
 
         [DRM_IOCTL_NR(DRM_IOCTL_SET_SAREA_CTX)] = { drm_setsareactx, 1, 1 },
         [DRM_IOCTL_NR(DRM_IOCTL_GET_SAREA_CTX)] = { drm_getsareactx, 1, 0 },
@@ -102,10 +102,10 @@ static drm_ioctl_desc_t		  drm_ioctls[] = {
         [DRM_IOCTL_NR(DRM_IOCTL_CONTROL)]       = { drm_control,     1, 1 },
 
 #if __OS_HAS_AGP
-        [DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)]   = { drm_agp_acquire, 1, 1 },
-        [DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)]   = { drm_agp_release, 1, 1 },
-        [DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)]    = { drm_agp_enable,  1, 1 },
-        [DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)]      = { drm_agp_info,    1, 0 },
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)]   = { drm_agp_acquire_ioctl, 1, 1 },
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)]   = { drm_agp_release_ioctl, 1, 1 },
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)]    = { drm_agp_enable_ioctl, 1, 1 },
+        [DRM_IOCTL_NR(DRM_IOCTL_AGP_INFO)]      = { drm_agp_info_ioctl, 1, 0 },
         [DRM_IOCTL_NR(DRM_IOCTL_AGP_ALLOC)]     = { drm_agp_alloc,   1, 1 },
         [DRM_IOCTL_NR(DRM_IOCTL_AGP_FREE)]      = { drm_agp_free,    1, 1 },
         [DRM_IOCTL_NR(DRM_IOCTL_AGP_BIND)]      = { drm_agp_bind,    1, 1 },
@@ -127,14 +127,12 @@ static drm_ioctl_desc_t		  drm_ioctls[] = {
  *
  * Frees every resource in \p dev.
  *
- * \sa drm_device and setup().
+ * \sa drm_device
  */
 int drm_takedown( drm_device_t *dev )
 {
         drm_magic_entry_t *pt, *next;
-        drm_map_t *map;
         drm_map_list_t *r_list;
-        struct list_head *list, *list_next;
         drm_vma_entry_t *vma, *vma_next;
         int i;
 
@@ -142,6 +140,7 @@ int drm_takedown( drm_device_t *dev )
 
         if (dev->driver->pretakedown)
           dev->driver->pretakedown(dev);
+        DRM_DEBUG("driver pretakedown completed\n");
 
         if (dev->unique) {
                 drm_free(dev->unique, strlen(dev->unique) + 1, DRM_MEM_DRIVER);
@@ -178,11 +177,16 @@ int drm_takedown( drm_device_t *dev )
                 }
                 dev->agp->memory = NULL;
 
-                if ( dev->agp->acquired ) drm_agp_do_release(dev);
+                if (dev->agp->acquired)
+                  drm_agp_release(dev);
 
                 dev->agp->acquired = 0;
                 dev->agp->enabled  = 0;
         }
+        if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg) {
+                drm_sg_cleanup(dev->sg);
+                dev->sg = NULL;
+        }
 
                                 /* Clear vma list (only built for debugging) */
         if ( dev->vmalist ) {
@@ -194,48 +198,11 @@ int drm_takedown( drm_device_t *dev )
         }
 
         if( dev->maplist ) {
-                list_for_each_safe( list, list_next, &dev->maplist->head ) {
-                        r_list = (drm_map_list_t *)list;
-
-                        if ( ( map = r_list->map ) ) {
-                                switch ( map->type ) {
-                                case _DRM_REGISTERS:
-                                case _DRM_FRAME_BUFFER:
-                                        if (drm_core_has_MTRR(dev)) {
-                                                if ( map->mtrr >= 0 ) {
-                                                        int retcode;
-                                                        retcode = mtrr_del( map->mtrr,
-                                                                            map->offset,
-                                                                            map->size );
-                                                        DRM_DEBUG( "mtrr_del=%d\n", retcode );
-                                                }
-                                        }
-                                        drm_ioremapfree( map->handle, map->size, dev );
-                                        break;
-                                case _DRM_SHM:
-                                        vfree(map->handle);
-                                        break;
-
-                                case _DRM_AGP:
-                                        /* Do nothing here, because this is all
-                                         * handled in the AGP/GART driver.
-                                         */
-                                        break;
-                                case _DRM_SCATTER_GATHER:
-                                        /* Handle it */
-                                        if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg) {
-                                                drm_sg_cleanup(dev->sg);
-                                                dev->sg = NULL;
-                                        }
-                                        break;
-                                }
-                                drm_free(map, sizeof(*map), DRM_MEM_MAPS);
-                        }
-                        list_del( list );
-                        drm_free(r_list, sizeof(*r_list), DRM_MEM_MAPS);
-                }
-                drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS);
-                dev->maplist = NULL;
+                while (!list_empty(&dev->maplist->head)) {
+                        struct list_head *list = dev->maplist->head.next;
+                        r_list = list_entry(list, drm_map_list_t, head);
+                        drm_rmmap_locked(dev, r_list->map);
+                }
         }
 
         if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE) && dev->queuelist ) {
@@ -264,6 +231,7 @@ int drm_takedown( drm_device_t *dev )
         }
         up( &dev->struct_sem );
 
+        DRM_DEBUG("takedown completed\n");
         return 0;
 }
 
@@ -312,7 +280,7 @@ EXPORT_SYMBOL(drm_init);
  *
  * Cleans up all DRM device, calling takedown().
  * 
- * \sa drm_init().
+ * \sa drm_init
  */
 static void drm_cleanup( drm_device_t *dev )
 {
@@ -325,6 +293,11 @@ static void drm_cleanup( drm_device_t *dev )
 
         drm_takedown( dev );    
 
+        if (dev->maplist) {
+                drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS);
+                dev->maplist = NULL;
+        }
+
         drm_ctxbitmap_cleanup( dev );
         
         if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 10e64fde8d78..a1f4e9cd64ed 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -71,12 +71,6 @@ static int drm_setup( drm_device_t *dev )
                 dev->magiclist[i].tail = NULL;
         }
 
-        dev->maplist = drm_alloc(sizeof(*dev->maplist),
-                                  DRM_MEM_MAPS);
-        if(dev->maplist == NULL) return -ENOMEM;
-        memset(dev->maplist, 0, sizeof(*dev->maplist));
-        INIT_LIST_HEAD(&dev->maplist->head);
-
         dev->ctxlist = drm_alloc(sizeof(*dev->ctxlist),
                                   DRM_MEM_CTXLIST);
         if(dev->ctxlist == NULL) return -ENOMEM;
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
index 39afda0ccabe..d2ed3ba5aca9 100644
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -208,7 +208,7 @@ int drm_getmap( struct inode *inode, struct file *filp,
         map.size   = r_list->map->size;
         map.type   = r_list->map->type;
         map.flags  = r_list->map->flags;
-        map.handle = r_list->map->handle;
+        map.handle = (void *)(unsigned long) r_list->user_token;
         map.mtrr   = r_list->map->mtrr;
         up(&dev->struct_sem);
 
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c
index ace3d42f4407..ff483fb418aa 100644
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/char/drm/drm_memory.c
@@ -142,27 +142,31 @@ void drm_free_pages(unsigned long address, int order, int area)
 
 #if __OS_HAS_AGP
 /** Wrapper around agp_allocate_memory() */
-DRM_AGP_MEM *drm_alloc_agp(struct agp_bridge_data *bridge, int pages, u32 type)
+DRM_AGP_MEM *drm_alloc_agp(drm_device_t *dev, int pages, u32 type)
 {
-        return drm_agp_allocate_memory(bridge, pages, type);
+        return drm_agp_allocate_memory(dev->agp->bridge, pages, type);
 }
+EXPORT_SYMBOL(drm_alloc_agp);
 
 /** Wrapper around agp_free_memory() */
 int drm_free_agp(DRM_AGP_MEM *handle, int pages)
 {
         return drm_agp_free_memory(handle) ? 0 : -EINVAL;
 }
+EXPORT_SYMBOL(drm_free_agp);
 
 /** Wrapper around agp_bind_memory() */
 int drm_bind_agp(DRM_AGP_MEM *handle, unsigned int start)
 {
         return drm_agp_bind_memory(handle, start);
 }
+EXPORT_SYMBOL(drm_bind_agp);
 
 /** Wrapper around agp_unbind_memory() */
 int drm_unbind_agp(DRM_AGP_MEM *handle)
 {
         return drm_agp_unbind_memory(handle);
 }
+EXPORT_SYMBOL(drm_unbind_agp);
 #endif /* agp */
 #endif /* debug_memory */
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c
index 192e8762571c..09ed712c1a7f 100644
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/char/drm/drm_pci.c
@@ -46,11 +46,11 @@
 /**
  * \brief Allocate a PCI consistent memory block, for DMA.
  */
-void *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align,
-                    dma_addr_t maxaddr, dma_addr_t * busaddr)
+drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align,
+                                dma_addr_t maxaddr)
 {
-        void *address;
-#if DRM_DEBUG_MEMORY
+        drm_dma_handle_t *dmah;
+#ifdef DRM_DEBUG_MEMORY
         int area = DRM_MEM_DMA;
 
         spin_lock(&drm_mem_lock);
@@ -74,13 +74,19 @@ void *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align,
                 return NULL;
         }
 
-        address = pci_alloc_consistent(dev->pdev, size, busaddr);
+        dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);
+        if (!dmah)
+                return NULL;
+        
+        dmah->size = size;
+        dmah->vaddr = pci_alloc_consistent(dev->pdev, size, &dmah->busaddr);
 
-#if DRM_DEBUG_MEMORY
-        if (address == NULL) {
+#ifdef DRM_DEBUG_MEMORY
+        if (dmah->vaddr == NULL) {
                 spin_lock(&drm_mem_lock);
                 ++drm_mem_stats[area].fail_count;
                 spin_unlock(&drm_mem_lock);
+                kfree(dmah);
                 return NULL;
         }
 
@@ -90,37 +96,42 @@ void *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align,
         drm_ram_used += size;
         spin_unlock(&drm_mem_lock);
 #else
-        if (address == NULL)
+        if (dmah->vaddr == NULL) {
+                kfree(dmah);
                 return NULL;
+        }
 #endif
 
-        memset(address, 0, size);
+        memset(dmah->vaddr, 0, size);
 
-        return address;
+        return dmah;
 }
 EXPORT_SYMBOL(drm_pci_alloc);
 
 /**
- * \brief Free a PCI consistent memory block.
+ * \brief Free a PCI consistent memory block with freeing its descriptor.
+ *
+ * This function is for internal use in the Linux-specific DRM core code.
  */
 void
-drm_pci_free(drm_device_t * dev, size_t size, void *vaddr, dma_addr_t busaddr)
+__drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah)
 {
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
         int area = DRM_MEM_DMA;
         int alloc_count;
         int free_count;
 #endif
 
-        if (!vaddr) {
-#if DRM_DEBUG_MEMORY
+        if (!dmah->vaddr) {
+#ifdef DRM_DEBUG_MEMORY
                 DRM_MEM_ERROR(area, "Attempt to free address 0\n");
 #endif
         } else {
-                pci_free_consistent(dev->pdev, size, vaddr, busaddr);
+                pci_free_consistent(dev->pdev, dmah->size, dmah->vaddr,
+                                    dmah->busaddr);
         }
 
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
         spin_lock(&drm_mem_lock);
         free_count = ++drm_mem_stats[area].free_count;
         alloc_count = drm_mem_stats[area].succeed_count;
@@ -135,6 +146,16 @@ drm_pci_free(drm_device_t * dev, size_t size, void *vaddr, dma_addr_t busaddr)
 #endif
 
 }
+
+/**
+ * \brief Free a PCI consistent memory block
+ */
+void
+drm_pci_free(drm_device_t *dev, drm_dma_handle_t *dmah)
+{
+        __drm_pci_free(dev, dmah);
+        kfree(dmah);
+}
 EXPORT_SYMBOL(drm_pci_free);
 
 /*@}*/
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 70ca4fa55c9d..58b1747cd440 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -25,6 +25,8 @@
         {0x1002, 0x4965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \
         {0x1002, 0x4966, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \
         {0x1002, 0x4967, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \
+        {0x1002, 0x4A49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \
+        {0x1002, 0x4A4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \
         {0x1002, 0x4C57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \
         {0x1002, 0x4C58, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \
         {0x1002, 0x4C59, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100|CHIP_IS_MOBILITY}, \
@@ -33,7 +35,17 @@
         {0x1002, 0x4C65, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \
         {0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \
         {0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \
+        {0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
+        {0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
+        {0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
+        {0x1002, 0x4E47, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
+        {0x1002, 0x4E48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
+        {0x1002, 0x4E49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
+        {0x1002, 0x4E4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
+        {0x1002, 0x4E4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \
         {0x1002, 0x4E50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \
+        {0x1002, 0x4E51, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \
+        {0x1002, 0x4E54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \
         {0x1002, 0x5144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \
         {0x1002, 0x5145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \
         {0x1002, 0x5146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \
@@ -56,6 +68,7 @@
         {0x1002, 0x516A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
         {0x1002, 0x516B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
         {0x1002, 0x516C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \
+        {0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
         {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \
         {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY}, \
         {0x1002, 0x5836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \
@@ -116,9 +129,10 @@
         {0, 0, 0}
 
 #define mga_PCI_IDS \
-        {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x102b, 0x0520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \
+        {0x102b, 0x0521, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G200}, \
+        {0x102b, 0x0525, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G400}, \
+        {0x102b, 0x2527, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MGA_CARD_TYPE_G550}, \
         {0, 0, 0}
 
 #define mach64_PCI_IDS \
@@ -162,9 +176,10 @@
 
 #define viadrv_PCI_IDS \
         {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x1106, 0x3118, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x7204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
 #define i810_PCI_IDS \
@@ -181,33 +196,30 @@
         {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
-#define gamma_PCI_IDS \
-        {0x3d3d, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
 #define savage_PCI_IDS \
-        {0x5333, 0x8a22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8a23, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c10, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c11, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c13, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c24, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c2a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c2b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c2c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8c2f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8a25, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8d01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
+        {0x5333, 0x8a21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
+        {0x5333, 0x8a22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE4}, \
+        {0x5333, 0x8a23, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE4}, \
+        {0x5333, 0x8c10, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
+        {0x5333, 0x8c11, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
+        {0x5333, 0x8c12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
+        {0x5333, 0x8c13, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE_MX}, \
+        {0x5333, 0x8c22, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c24, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c2a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c2b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c2c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8c2f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SUPERSAVAGE}, \
+        {0x5333, 0x8a25, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGE}, \
+        {0x5333, 0x8a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGE}, \
+        {0x5333, 0x8d01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
+        {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
+        {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
+        {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
         {0, 0, 0}
 
 #define ffb_PCI_IDS \
@@ -223,10 +235,3 @@
         {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
-#define viadrv_PCI_IDS \
-        {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0x1106, 0x7204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
-        {0, 0, 0}
-
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 4774087d2e9e..32d2bb99462c 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -210,8 +210,8 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
 
                                 /* Hardcoded from _DRM_FRAME_BUFFER,
                                    _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
-                                   _DRM_SCATTER_GATHER. */
-        const char   *types[] = { "FB", "REG", "SHM", "AGP", "SG" };
+                                   _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
+        const char   *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
         const char   *type;
         int          i;
 
@@ -229,16 +229,19 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
         if (dev->maplist != NULL) list_for_each(list, &dev->maplist->head) {
                 r_list = list_entry(list, drm_map_list_t, head);
                 map = r_list->map;
-                if(!map) continue;
-                if (map->type < 0 || map->type > 4) type = "??";
-                else                                type = types[map->type];
-                DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",
+                if(!map)
+                        continue;
+                if (map->type < 0 || map->type > 5)
+                        type = "??";
+                else    
+                        type = types[map->type];
+                DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08x ",
                                i,
                                map->offset,
                                map->size,
                                type,
                                map->flags,
-                               (unsigned long)map->handle);
+                               r_list->user_token);
                 if (map->mtrr < 0) {
                         DRM_PROC_PRINT("none\n");
                 } else {
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index 54fddb6ea2d1..ed267d49bc6a 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -61,6 +61,12 @@ void drm_sg_cleanup( drm_sg_mem_t *entry )
                    DRM_MEM_SGLISTS );
 }
 
+#ifdef _LP64
+# define ScatterHandle(x) (unsigned int)((x >> 32) + (x & ((1L << 32) - 1)))
+#else
+# define ScatterHandle(x) (unsigned int)(x)
+#endif
+
 int drm_sg_alloc( struct inode *inode, struct file *filp,
                    unsigned int cmd, unsigned long arg )
 {
@@ -133,12 +139,13 @@ int drm_sg_alloc( struct inode *inode, struct file *filp,
          */
         memset( entry->virtual, 0, pages << PAGE_SHIFT );
 
-        entry->handle = (unsigned long)entry->virtual;
+        entry->handle = ScatterHandle((unsigned long)entry->virtual);
 
         DRM_DEBUG( "sg alloc handle  = %08lx\n", entry->handle );
         DRM_DEBUG( "sg alloc virtual = %p\n", entry->virtual );
 
-        for ( i = entry->handle, j = 0 ; j < pages ; i += PAGE_SIZE, j++ ) {
+        for (i = (unsigned long)entry->virtual, j = 0; j < pages; 
+                i += PAGE_SIZE, j++) {
                 entry->pagelist[j] = vmalloc_to_page((void *)i);
                 if (!entry->pagelist[j])
                         goto failed;
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 48829a1a086a..95a976c96eb8 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -75,6 +75,11 @@ static int drm_fill_in_dev(drm_device_t *dev, struct pci_dev *pdev, const struct
         dev->pci_func = PCI_FUNC(pdev->devfn);
         dev->irq = pdev->irq;
 
+        dev->maplist = drm_calloc(1, sizeof(*dev->maplist), DRM_MEM_MAPS);
+        if (dev->maplist == NULL)
+                return -ENOMEM;
+        INIT_LIST_HEAD(&dev->maplist->head);
+
         /* the DRM has 6 basic counters */
         dev->counters = 6;
         dev->types[0]  = _DRM_STAT_LOCK;
@@ -91,7 +96,8 @@ static int drm_fill_in_dev(drm_device_t *dev, struct pci_dev *pdev, const struct
                         goto error_out_unreg;
 
         if (drm_core_has_AGP(dev)) {
-                dev->agp = drm_agp_init(dev);
+                if (drm_device_is_agp(dev))
+                        dev->agp = drm_agp_init(dev);
                 if (drm_core_check_feature(dev, DRIVER_REQUIRE_AGP) && (dev->agp == NULL)) {
                         DRM_ERROR( "Cannot initialize the agpgart module.\n" );
                         retcode = -EINVAL;
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index 2fc10c4bbcdf..475cc5e555e1 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 
 #include "drm_core.h"
+#include "drmP.h"
 
 struct drm_sysfs_class {
         struct class_device_attribute attr;
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 621220f3f372..ced4215e2275 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -73,12 +73,13 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
                 r_list = list_entry(list, drm_map_list_t, head);
                 map = r_list->map;
                 if (!map) continue;
-                if (map->offset == VM_OFFSET(vma)) break;
+                if (r_list->user_token == VM_OFFSET(vma))
+                        break;
         }
 
         if (map && map->type == _DRM_AGP) {
                 unsigned long offset = address - vma->vm_start;
-                unsigned long baddr = VM_OFFSET(vma) + offset;
+                unsigned long baddr = map->offset + offset;
                 struct drm_agp_mem *agpmem;
                 struct page *page;
 
@@ -210,6 +211,8 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
                 }
 
                 if(!found_maps) {
+                        drm_dma_handle_t dmah;
+
                         switch (map->type) {
                         case _DRM_REGISTERS:
                         case _DRM_FRAME_BUFFER:
@@ -228,6 +231,12 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
                         case _DRM_AGP:
                         case _DRM_SCATTER_GATHER:
                                 break;
+                        case _DRM_CONSISTENT:
+                                dmah.vaddr = map->handle;
+                                dmah.busaddr = map->offset;
+                                dmah.size = map->size;
+                                __drm_pci_free(dev, &dmah);
+                                break;
                         }
                         drm_free(map, sizeof(*map), DRM_MEM_MAPS);
                 }
@@ -296,7 +305,7 @@ static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
 
 
         offset = address - vma->vm_start;
-        map_offset = map->offset - dev->sg->handle;
+        map_offset = map->offset - (unsigned long)dev->sg->virtual;
         page_offset = (offset >> PAGE_SHIFT) + (map_offset >> PAGE_SHIFT);
         page = entry->pagelist[page_offset];
         get_page(page);
@@ -305,8 +314,6 @@ static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
 }
 
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-
 static struct page *drm_vm_nopage(struct vm_area_struct *vma,
                                    unsigned long address,
                                    int *type) {
@@ -335,35 +342,6 @@ static struct page *drm_vm_sg_nopage(struct vm_area_struct *vma,
         return drm_do_vm_sg_nopage(vma, address);
 }
 
-#else   /* LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,0) */
-
-static struct page *drm_vm_nopage(struct vm_area_struct *vma,
-                                   unsigned long address,
-                                   int unused) {
-        return drm_do_vm_nopage(vma, address);
-}
-
-static struct page *drm_vm_shm_nopage(struct vm_area_struct *vma,
-                                       unsigned long address,
-                                       int unused) {
-        return drm_do_vm_shm_nopage(vma, address);
-}
-
-static struct page *drm_vm_dma_nopage(struct vm_area_struct *vma,
-                                       unsigned long address,
-                                       int unused) {
-        return drm_do_vm_dma_nopage(vma, address);
-}
-
-static struct page *drm_vm_sg_nopage(struct vm_area_struct *vma,
-                                      unsigned long address,
-                                      int unused) {
-        return drm_do_vm_sg_nopage(vma, address);
-}
-
-#endif
-
-
 /** AGP virtual memory operations */
 static struct vm_operations_struct   drm_vm_ops = {
         .nopage = drm_vm_nopage,
@@ -487,11 +465,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
 
         vma->vm_ops   = &drm_vm_dma_ops;
 
-#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
-        vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */
-#else
         vma->vm_flags |= VM_RESERVED; /* Don't swap */
-#endif
 
         vma->vm_file  =  filp;  /* Needed for drm_vm_open() */
         drm_vm_open(vma);
@@ -560,13 +534,12 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
                                    for performance, even if the list was a
                                    bit longer. */
         list_for_each(list, &dev->maplist->head) {
-                unsigned long off;
 
                 r_list = list_entry(list, drm_map_list_t, head);
                 map = r_list->map;
                 if (!map) continue;
-                off = dev->driver->get_map_ofs(map);
-                if (off == VM_OFFSET(vma)) break;
+                if (r_list->user_token == VM_OFFSET(vma))
+                        break;
         }
 
         if (!map || ((map->flags&_DRM_RESTRICTED) && !capable(CAP_SYS_ADMIN)))
@@ -605,17 +578,17 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
                 /* fall through to _DRM_FRAME_BUFFER... */        
         case _DRM_FRAME_BUFFER:
         case _DRM_REGISTERS:
-                if (VM_OFFSET(vma) >= __pa(high_memory)) {
 #if defined(__i386__) || defined(__x86_64__)
-                        if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
-                                pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
-                                pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
-                        }
+                if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
+                        pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
+                        pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
+                }
 #elif defined(__powerpc__)
-                        pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE | _PAGE_GUARDED;
+                pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
+                if (map->type == _DRM_REGISTERS)
+                        pgprot_val(vma->vm_page_prot) |= _PAGE_GUARDED;
 #endif
-                        vma->vm_flags |= VM_IO; /* not in core dump */
-                }
+                vma->vm_flags |= VM_IO; /* not in core dump */
 #if defined(__ia64__)
                 if (efi_range_is_wc(vma->vm_start, vma->vm_end -
                                     vma->vm_start))
@@ -628,12 +601,12 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
                 offset = dev->driver->get_reg_ofs(dev);
 #ifdef __sparc__
                 if (io_remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start,
-                                        (VM_OFFSET(vma) + offset) >> PAGE_SHIFT,
+                                        (map->offset + offset) >> PAGE_SHIFT,
                                         vma->vm_end - vma->vm_start,
                                         vma->vm_page_prot))
 #else
                 if (io_remap_pfn_range(vma, vma->vm_start,
-                                     (VM_OFFSET(vma) + offset) >> PAGE_SHIFT,
+                                     (map->offset + offset) >> PAGE_SHIFT,
                                      vma->vm_end - vma->vm_start,
                                      vma->vm_page_prot))
 #endif
@@ -641,37 +614,28 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma)
                 DRM_DEBUG("   Type = %d; start = 0x%lx, end = 0x%lx,"
                           " offset = 0x%lx\n",
                           map->type,
-                          vma->vm_start, vma->vm_end, VM_OFFSET(vma) + offset);
+                          vma->vm_start, vma->vm_end, map->offset + offset);
                 vma->vm_ops = &drm_vm_ops;
                 break;
         case _DRM_SHM:
+        case _DRM_CONSISTENT:
+                /* Consistent memory is really like shared memory. It's only
+                 * allocate in a different way */
                 vma->vm_ops = &drm_vm_shm_ops;
                 vma->vm_private_data = (void *)map;
                                 /* Don't let this area swap.  Change when
                                    DRM_KERNEL advisory is supported. */
-#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
-                vma->vm_flags |= VM_LOCKED;
-#else
                 vma->vm_flags |= VM_RESERVED;
-#endif
                 break;
         case _DRM_SCATTER_GATHER:
                 vma->vm_ops = &drm_vm_sg_ops;
                 vma->vm_private_data = (void *)map;
-#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
-                vma->vm_flags |= VM_LOCKED;
-#else
                 vma->vm_flags |= VM_RESERVED;
-#endif
                 break;
         default:
                 return -EINVAL; /* This should never happen. */
         }
-#if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */
-        vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */
-#else
         vma->vm_flags |= VM_RESERVED; /* Don't swap */
-#endif
 
         vma->vm_file  =  filp;  /* Needed for drm_vm_open() */
         drm_vm_open(vma);
diff --git a/drivers/char/drm/ffb_drv.c b/drivers/char/drm/ffb_drv.c
index ec614fff8f04..1bd0d55ee0f0 100644
--- a/drivers/char/drm/ffb_drv.c
+++ b/drivers/char/drm/ffb_drv.c
@@ -152,14 +152,11 @@ static drm_map_t *ffb_find_map(struct file *filp, unsigned long off)
                 return NULL;
 
         list_for_each(list, &dev->maplist->head) {
-                unsigned long uoff;
-
                 r_list = (drm_map_list_t *)list;
                 map = r_list->map;
                 if (!map)
                         continue;
-                uoff = (map->offset & 0xffffffff);
-                if (uoff == off)
+                if (r_list->user_token == off)
                         return map;
         }
 
diff --git a/drivers/char/drm/gamma_context.h b/drivers/char/drm/gamma_context.h
deleted file mode 100644
index d11b507f87ee..000000000000
--- a/drivers/char/drm/gamma_context.h
+++ /dev/null
@@ -1,492 +0,0 @@
-/* drm_context.h -- IOCTLs for generic contexts -*- linux-c -*-
- * Created: Fri Nov 24 18:31:37 2000 by gareth@valinux.com
- *
- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
- * ChangeLog:
- *  2001-11-16  Torsten Duwe <duwe@caldera.de>
- *              added context constructor/destructor hooks,
- *              needed by SiS driver's memory management.
- */
-
-/* ================================================================
- * Old-style context support -- only used by gamma.  
- */
-
-
-/* The drm_read and drm_write_string code (especially that which manages
-   the circular buffer), is based on Alessandro Rubini's LINUX DEVICE
-   DRIVERS (Cambridge: O'Reilly, 1998), pages 111-113. */
-
-ssize_t gamma_fops_read(struct file *filp, char __user *buf, size_t count, loff_t *off)
-{
-        drm_file_t    *priv   = filp->private_data;
-        drm_device_t  *dev    = priv->dev;
-        int           left;
-        int           avail;
-        int           send;
-        int           cur;
-
-        DRM_DEBUG("%p, %p\n", dev->buf_rp, dev->buf_wp);
-
-        while (dev->buf_rp == dev->buf_wp) {
-                DRM_DEBUG("  sleeping\n");
-                if (filp->f_flags & O_NONBLOCK) {
-                        return -EAGAIN;
-                }
-                interruptible_sleep_on(&dev->buf_readers);
-                if (signal_pending(current)) {
-                        DRM_DEBUG("  interrupted\n");
-                        return -ERESTARTSYS;
-                }
-                DRM_DEBUG("  awake\n");
-        }
-
-        left  = (dev->buf_rp + DRM_BSZ - dev->buf_wp) % DRM_BSZ;
-        avail = DRM_BSZ - left;
-        send  = DRM_MIN(avail, count);
-
-        while (send) {
-                if (dev->buf_wp > dev->buf_rp) {
-                        cur = DRM_MIN(send, dev->buf_wp - dev->buf_rp);
-                } else {
-                        cur = DRM_MIN(send, dev->buf_end - dev->buf_rp);
-                }
-                if (copy_to_user(buf, dev->buf_rp, cur))
-                        return -EFAULT;
-                dev->buf_rp += cur;
-                if (dev->buf_rp == dev->buf_end) dev->buf_rp = dev->buf;
-                send -= cur;
-        }
-
-        wake_up_interruptible(&dev->buf_writers);
-        return DRM_MIN(avail, count);
-}
-
-
-/* In an incredibly convoluted setup, the kernel module actually calls
- * back into the X server to perform context switches on behalf of the
- * 3d clients.
- */
-int DRM(write_string)(drm_device_t *dev, const char *s)
-{
-        int left   = (dev->buf_rp + DRM_BSZ - dev->buf_wp) % DRM_BSZ;
-        int send   = strlen(s);
-        int count;
-
-        DRM_DEBUG("%d left, %d to send (%p, %p)\n",
-                  left, send, dev->buf_rp, dev->buf_wp);
-
-        if (left == 1 || dev->buf_wp != dev->buf_rp) {
-                DRM_ERROR("Buffer not empty (%d left, wp = %p, rp = %p)\n",
-                          left,
-                          dev->buf_wp,
-                          dev->buf_rp);
-        }
-
-        while (send) {
-                if (dev->buf_wp >= dev->buf_rp) {
-                        count = DRM_MIN(send, dev->buf_end - dev->buf_wp);
-                        if (count == left) --count; /* Leave a hole */
-                } else {
-                        count = DRM_MIN(send, dev->buf_rp - dev->buf_wp - 1);
-                }
-                strncpy(dev->buf_wp, s, count);
-                dev->buf_wp += count;
-                if (dev->buf_wp == dev->buf_end) dev->buf_wp = dev->buf;
-                send -= count;
-        }
-
-        if (dev->buf_async) kill_fasync(&dev->buf_async, SIGIO, POLL_IN);
-
-        DRM_DEBUG("waking\n");
-        wake_up_interruptible(&dev->buf_readers);
-        return 0;
-}
-
-unsigned int gamma_fops_poll(struct file *filp, struct poll_table_struct *wait)
-{
-        drm_file_t   *priv = filp->private_data;
-        drm_device_t *dev  = priv->dev;
-
-        poll_wait(filp, &dev->buf_readers, wait);
-        if (dev->buf_wp != dev->buf_rp) return POLLIN | POLLRDNORM;
-        return 0;
-}
-
-int DRM(context_switch)(drm_device_t *dev, int old, int new)
-{
-        char        buf[64];
-        drm_queue_t *q;
-
-        if (test_and_set_bit(0, &dev->context_flag)) {
-                DRM_ERROR("Reentering -- FIXME\n");
-                return -EBUSY;
-        }
-
-        DRM_DEBUG("Context switch from %d to %d\n", old, new);
-
-        if (new >= dev->queue_count) {
-                clear_bit(0, &dev->context_flag);
-                return -EINVAL;
-        }
-
-        if (new == dev->last_context) {
-                clear_bit(0, &dev->context_flag);
-                return 0;
-        }
-
-        q = dev->queuelist[new];
-        atomic_inc(&q->use_count);
-        if (atomic_read(&q->use_count) == 1) {
-                atomic_dec(&q->use_count);
-                clear_bit(0, &dev->context_flag);
-                return -EINVAL;
-        }
-
-        /* This causes the X server to wake up & do a bunch of hardware
-         * interaction to actually effect the context switch.
-         */
-        sprintf(buf, "C %d %d\n", old, new);
-        DRM(write_string)(dev, buf);
-
-        atomic_dec(&q->use_count);
-
-        return 0;
-}
-
-int DRM(context_switch_complete)(drm_device_t *dev, int new)
-{
-        drm_device_dma_t *dma = dev->dma;
-
-        dev->last_context = new;  /* PRE/POST: This is the _only_ writer. */
-        dev->last_switch  = jiffies;
-
-        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
-                DRM_ERROR("Lock isn't held after context switch\n");
-        }
-
-        if (!dma || !(dma->next_buffer && dma->next_buffer->while_locked)) {
-                if (DRM(lock_free)(dev, &dev->lock.hw_lock->lock,
-                                  DRM_KERNEL_CONTEXT)) {
-                        DRM_ERROR("Cannot free lock\n");
-                }
-        }
-
-        clear_bit(0, &dev->context_flag);
-        wake_up_interruptible(&dev->context_wait);
-
-        return 0;
-}
-
-static int DRM(init_queue)(drm_device_t *dev, drm_queue_t *q, drm_ctx_t *ctx)
-{
-        DRM_DEBUG("\n");
-
-        if (atomic_read(&q->use_count) != 1
-            || atomic_read(&q->finalization)
-            || atomic_read(&q->block_count)) {
-                DRM_ERROR("New queue is already in use: u%d f%d b%d\n",
-                          atomic_read(&q->use_count),
-                          atomic_read(&q->finalization),
-                          atomic_read(&q->block_count));
-        }
-
-        atomic_set(&q->finalization,  0);
-        atomic_set(&q->block_count,   0);
-        atomic_set(&q->block_read,    0);
-        atomic_set(&q->block_write,   0);
-        atomic_set(&q->total_queued,  0);
-        atomic_set(&q->total_flushed, 0);
-        atomic_set(&q->total_locks,   0);
-
-        init_waitqueue_head(&q->write_queue);
-        init_waitqueue_head(&q->read_queue);
-        init_waitqueue_head(&q->flush_queue);
-
-        q->flags = ctx->flags;
-
-        DRM(waitlist_create)(&q->waitlist, dev->dma->buf_count);
-
-        return 0;
-}
-
-
-/* drm_alloc_queue:
-PRE: 1) dev->queuelist[0..dev->queue_count] is allocated and will not
-        disappear (so all deallocation must be done after IOCTLs are off)
-     2) dev->queue_count < dev->queue_slots
-     3) dev->queuelist[i].use_count == 0 and
-        dev->queuelist[i].finalization == 0 if i not in use
-POST: 1) dev->queuelist[i].use_count == 1
-      2) dev->queue_count < dev->queue_slots */
-
-static int DRM(alloc_queue)(drm_device_t *dev)
-{
-        int         i;
-        drm_queue_t *queue;
-        int         oldslots;
-        int         newslots;
-                                /* Check for a free queue */
-        for (i = 0; i < dev->queue_count; i++) {
-                atomic_inc(&dev->queuelist[i]->use_count);
-                if (atomic_read(&dev->queuelist[i]->use_count) == 1
-                    && !atomic_read(&dev->queuelist[i]->finalization)) {
-                        DRM_DEBUG("%d (free)\n", i);
-                        return i;
-                }
-                atomic_dec(&dev->queuelist[i]->use_count);
-        }
-                                /* Allocate a new queue */
-        down(&dev->struct_sem);
-
-        queue = DRM(alloc)(sizeof(*queue), DRM_MEM_QUEUES);
-        memset(queue, 0, sizeof(*queue));
-        atomic_set(&queue->use_count, 1);
-
-        ++dev->queue_count;
-        if (dev->queue_count >= dev->queue_slots) {
-                oldslots = dev->queue_slots * sizeof(*dev->queuelist);
-                if (!dev->queue_slots) dev->queue_slots = 1;
-                dev->queue_slots *= 2;
-                newslots = dev->queue_slots * sizeof(*dev->queuelist);
-
-                dev->queuelist = DRM(realloc)(dev->queuelist,
-                                              oldslots,
-                                              newslots,
-                                              DRM_MEM_QUEUES);
-                if (!dev->queuelist) {
-                        up(&dev->struct_sem);
-                        DRM_DEBUG("out of memory\n");
-                        return -ENOMEM;
-                }
-        }
-        dev->queuelist[dev->queue_count-1] = queue;
-
-        up(&dev->struct_sem);
-        DRM_DEBUG("%d (new)\n", dev->queue_count - 1);
-        return dev->queue_count - 1;
-}
-
-int DRM(resctx)(struct inode *inode, struct file *filp,
-                unsigned int cmd, unsigned long arg)
-{
-        drm_ctx_res_t __user *argp = (void __user *)arg;
-        drm_ctx_res_t   res;
-        drm_ctx_t       ctx;
-        int             i;
-
-        DRM_DEBUG("%d\n", DRM_RESERVED_CONTEXTS);
-        if (copy_from_user(&res, argp, sizeof(res)))
-                return -EFAULT;
-        if (res.count >= DRM_RESERVED_CONTEXTS) {
-                memset(&ctx, 0, sizeof(ctx));
-                for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
-                        ctx.handle = i;
-                        if (copy_to_user(&res.contexts[i],
-                                         &i,
-                                         sizeof(i)))
-                                return -EFAULT;
-                }
-        }
-        res.count = DRM_RESERVED_CONTEXTS;
-        if (copy_to_user(argp, &res, sizeof(res)))
-                return -EFAULT;
-        return 0;
-}
-
-int DRM(addctx)(struct inode *inode, struct file *filp,
-                unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_t       ctx;
-        drm_ctx_t       __user *argp = (void __user *)arg;
-
-        if (copy_from_user(&ctx, argp, sizeof(ctx)))
-                return -EFAULT;
-        if ((ctx.handle = DRM(alloc_queue)(dev)) == DRM_KERNEL_CONTEXT) {
-                                /* Init kernel's context and get a new one. */
-                DRM(init_queue)(dev, dev->queuelist[ctx.handle], &ctx);
-                ctx.handle = DRM(alloc_queue)(dev);
-        }
-        DRM(init_queue)(dev, dev->queuelist[ctx.handle], &ctx);
-        DRM_DEBUG("%d\n", ctx.handle);
-        if (copy_to_user(argp, &ctx, sizeof(ctx)))
-                return -EFAULT;
-        return 0;
-}
-
-int DRM(modctx)(struct inode *inode, struct file *filp,
-                unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_t       ctx;
-        drm_queue_t     *q;
-
-        if (copy_from_user(&ctx, (drm_ctx_t __user *)arg, sizeof(ctx)))
-                return -EFAULT;
-
-        DRM_DEBUG("%d\n", ctx.handle);
-
-        if (ctx.handle < 0 || ctx.handle >= dev->queue_count) return -EINVAL;
-        q = dev->queuelist[ctx.handle];
-
-        atomic_inc(&q->use_count);
-        if (atomic_read(&q->use_count) == 1) {
-                                /* No longer in use */
-                atomic_dec(&q->use_count);
-                return -EINVAL;
-        }
-
-        if (DRM_BUFCOUNT(&q->waitlist)) {
-                atomic_dec(&q->use_count);
-                return -EBUSY;
-        }
-
-        q->flags = ctx.flags;
-
-        atomic_dec(&q->use_count);
-        return 0;
-}
-
-int DRM(getctx)(struct inode *inode, struct file *filp,
-                unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_t       __user *argp = (void __user *)arg;
-        drm_ctx_t       ctx;
-        drm_queue_t     *q;
-
-        if (copy_from_user(&ctx, argp, sizeof(ctx)))
-                return -EFAULT;
-
-        DRM_DEBUG("%d\n", ctx.handle);
-
-        if (ctx.handle >= dev->queue_count) return -EINVAL;
-        q = dev->queuelist[ctx.handle];
-
-        atomic_inc(&q->use_count);
-        if (atomic_read(&q->use_count) == 1) {
-                                /* No longer in use */
-                atomic_dec(&q->use_count);
-                return -EINVAL;
-        }
-
-        ctx.flags = q->flags;
-        atomic_dec(&q->use_count);
-
-        if (copy_to_user(argp, &ctx, sizeof(ctx)))
-                return -EFAULT;
-
-        return 0;
-}
-
-int DRM(switchctx)(struct inode *inode, struct file *filp,
-                   unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_t       ctx;
-
-        if (copy_from_user(&ctx, (drm_ctx_t __user *)arg, sizeof(ctx)))
-                return -EFAULT;
-        DRM_DEBUG("%d\n", ctx.handle);
-        return DRM(context_switch)(dev, dev->last_context, ctx.handle);
-}
-
-int DRM(newctx)(struct inode *inode, struct file *filp,
-                unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_t       ctx;
-
-        if (copy_from_user(&ctx, (drm_ctx_t __user *)arg, sizeof(ctx)))
-                return -EFAULT;
-        DRM_DEBUG("%d\n", ctx.handle);
-        DRM(context_switch_complete)(dev, ctx.handle);
-
-        return 0;
-}
-
-int DRM(rmctx)(struct inode *inode, struct file *filp,
-               unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_t       ctx;
-        drm_queue_t     *q;
-        drm_buf_t       *buf;
-
-        if (copy_from_user(&ctx, (drm_ctx_t __user *)arg, sizeof(ctx)))
-                return -EFAULT;
-        DRM_DEBUG("%d\n", ctx.handle);
-
-        if (ctx.handle >= dev->queue_count) return -EINVAL;
-        q = dev->queuelist[ctx.handle];
-
-        atomic_inc(&q->use_count);
-        if (atomic_read(&q->use_count) == 1) {
-                                /* No longer in use */
-                atomic_dec(&q->use_count);
-                return -EINVAL;
-        }
-
-        atomic_inc(&q->finalization); /* Mark queue in finalization state */
-        atomic_sub(2, &q->use_count); /* Mark queue as unused (pending
-                                         finalization) */
-
-        while (test_and_set_bit(0, &dev->interrupt_flag)) {
-                schedule();
-                if (signal_pending(current)) {
-                        clear_bit(0, &dev->interrupt_flag);
-                        return -EINTR;
-                }
-        }
-                                /* Remove queued buffers */
-        while ((buf = DRM(waitlist_get)(&q->waitlist))) {
-                DRM(free_buffer)(dev, buf);
-        }
-        clear_bit(0, &dev->interrupt_flag);
-
-                                /* Wakeup blocked processes */
-        wake_up_interruptible(&q->read_queue);
-        wake_up_interruptible(&q->write_queue);
-        wake_up_interruptible(&q->flush_queue);
-
-                                /* Finalization over.  Queue is made
-                                   available when both use_count and
-                                   finalization become 0, which won't
-                                   happen until all the waiting processes
-                                   stop waiting. */
-        atomic_dec(&q->finalization);
-        return 0;
-}
-
diff --git a/drivers/char/drm/gamma_dma.c b/drivers/char/drm/gamma_dma.c
deleted file mode 100644
index e486fb8d31e9..000000000000
--- a/drivers/char/drm/gamma_dma.c
+++ /dev/null
@@ -1,946 +0,0 @@
-/* gamma_dma.c -- DMA support for GMX 2000 -*- linux-c -*-
- * Created: Fri Mar 19 14:30:16 1999 by faith@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *
- */
-
-#include "gamma.h"
-#include "drmP.h"
-#include "drm.h"
-#include "gamma_drm.h"
-#include "gamma_drv.h"
-
-#include <linux/interrupt.h>    /* For task queue support */
-#include <linux/delay.h>
-
-static inline void gamma_dma_dispatch(drm_device_t *dev, unsigned long address,
-                                      unsigned long length)
-{
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-        mb();
-        while ( GAMMA_READ(GAMMA_INFIFOSPACE) < 2)
-                cpu_relax();
-
-        GAMMA_WRITE(GAMMA_DMAADDRESS, address);
-
-        while (GAMMA_READ(GAMMA_GCOMMANDSTATUS) != 4)
-                cpu_relax();
-
-        GAMMA_WRITE(GAMMA_DMACOUNT, length / 4);
-}
-
-void gamma_dma_quiescent_single(drm_device_t *dev)
-{
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-        while (GAMMA_READ(GAMMA_DMACOUNT))
-                cpu_relax();
-
-        while (GAMMA_READ(GAMMA_INFIFOSPACE) < 2)
-                cpu_relax();
-
-        GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
-        GAMMA_WRITE(GAMMA_SYNC, 0);
-
-        do {
-                while (!GAMMA_READ(GAMMA_OUTFIFOWORDS))
-                        cpu_relax();
-        } while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
-}
-
-void gamma_dma_quiescent_dual(drm_device_t *dev)
-{
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-        while (GAMMA_READ(GAMMA_DMACOUNT))
-                cpu_relax();
-
-        while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
-                cpu_relax();
-
-        GAMMA_WRITE(GAMMA_BROADCASTMASK, 3);
-        GAMMA_WRITE(GAMMA_FILTERMODE, 1 << 10);
-        GAMMA_WRITE(GAMMA_SYNC, 0);
-
-        /* Read from first MX */
-        do {
-                while (!GAMMA_READ(GAMMA_OUTFIFOWORDS))
-                        cpu_relax();
-        } while (GAMMA_READ(GAMMA_OUTPUTFIFO) != GAMMA_SYNC_TAG);
-
-        /* Read from second MX */
-        do {
-                while (!GAMMA_READ(GAMMA_OUTFIFOWORDS + 0x10000))
-                        cpu_relax();
-        } while (GAMMA_READ(GAMMA_OUTPUTFIFO + 0x10000) != GAMMA_SYNC_TAG);
-}
-
-void gamma_dma_ready(drm_device_t *dev)
-{
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-        while (GAMMA_READ(GAMMA_DMACOUNT))
-                cpu_relax();
-}
-
-static inline int gamma_dma_is_ready(drm_device_t *dev)
-{
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-        return (!GAMMA_READ(GAMMA_DMACOUNT));
-}
-
-irqreturn_t gamma_driver_irq_handler( DRM_IRQ_ARGS )
-{
-        drm_device_t     *dev = (drm_device_t *)arg;
-        drm_device_dma_t *dma = dev->dma;
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-
-        /* FIXME: should check whether we're actually interested in the interrupt? */
-        atomic_inc(&dev->counts[6]); /* _DRM_STAT_IRQ */
-
-        while (GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
-                cpu_relax();
-
-        GAMMA_WRITE(GAMMA_GDELAYTIMER, 0xc350/2); /* 0x05S */
-        GAMMA_WRITE(GAMMA_GCOMMANDINTFLAGS, 8);
-        GAMMA_WRITE(GAMMA_GINTFLAGS, 0x2001);
-        if (gamma_dma_is_ready(dev)) {
-                                /* Free previous buffer */
-                if (test_and_set_bit(0, &dev->dma_flag))
-                        return IRQ_HANDLED;
-                if (dma->this_buffer) {
-                        gamma_free_buffer(dev, dma->this_buffer);
-                        dma->this_buffer = NULL;
-                }
-                clear_bit(0, &dev->dma_flag);
-
-                /* Dispatch new buffer */
-                schedule_work(&dev->work);
-        }
-        return IRQ_HANDLED;
-}
-
-/* Only called by gamma_dma_schedule. */
-static int gamma_do_dma(drm_device_t *dev, int locked)
-{
-        unsigned long    address;
-        unsigned long    length;
-        drm_buf_t        *buf;
-        int              retcode = 0;
-        drm_device_dma_t *dma = dev->dma;
-
-        if (test_and_set_bit(0, &dev->dma_flag)) return -EBUSY;
-
-
-        if (!dma->next_buffer) {
-                DRM_ERROR("No next_buffer\n");
-                clear_bit(0, &dev->dma_flag);
-                return -EINVAL;
-        }
-
-        buf     = dma->next_buffer;
-        /* WE NOW ARE ON LOGICAL PAGES!! - using page table setup in dma_init */
-        /* So we pass the buffer index value into the physical page offset */
-        address = buf->idx << 12;
-        length  = buf->used;
-
-        DRM_DEBUG("context %d, buffer %d (%ld bytes)\n",
-                  buf->context, buf->idx, length);
-
-        if (buf->list == DRM_LIST_RECLAIM) {
-                gamma_clear_next_buffer(dev);
-                gamma_free_buffer(dev, buf);
-                clear_bit(0, &dev->dma_flag);
-                return -EINVAL;
-        }
-
-        if (!length) {
-                DRM_ERROR("0 length buffer\n");
-                gamma_clear_next_buffer(dev);
-                gamma_free_buffer(dev, buf);
-                clear_bit(0, &dev->dma_flag);
-                return 0;
-        }
-
-        if (!gamma_dma_is_ready(dev)) {
-                clear_bit(0, &dev->dma_flag);
-                return -EBUSY;
-        }
-
-        if (buf->while_locked) {
-                if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
-                        DRM_ERROR("Dispatching buffer %d from pid %d"
-                                  " \"while locked\", but no lock held\n",
-                                  buf->idx, current->pid);
-                }
-        } else {
-                if (!locked && !gamma_lock_take(&dev->lock.hw_lock->lock,
-                                              DRM_KERNEL_CONTEXT)) {
-                        clear_bit(0, &dev->dma_flag);
-                        return -EBUSY;
-                }
-        }
-
-        if (dev->last_context != buf->context
-            && !(dev->queuelist[buf->context]->flags
-                 & _DRM_CONTEXT_PRESERVED)) {
-                                /* PRE: dev->last_context != buf->context */
-                if (DRM(context_switch)(dev, dev->last_context,
-                                        buf->context)) {
-                        DRM(clear_next_buffer)(dev);
-                        DRM(free_buffer)(dev, buf);
-                }
-                retcode = -EBUSY;
-                goto cleanup;
-
-                                /* POST: we will wait for the context
-                                   switch and will dispatch on a later call
-                                   when dev->last_context == buf->context.
-                                   NOTE WE HOLD THE LOCK THROUGHOUT THIS
-                                   TIME! */
-        }
-
-        gamma_clear_next_buffer(dev);
-        buf->pending     = 1;
-        buf->waiting     = 0;
-        buf->list        = DRM_LIST_PEND;
-
-        /* WE NOW ARE ON LOGICAL PAGES!!! - overriding address */
-        address = buf->idx << 12;
-
-        gamma_dma_dispatch(dev, address, length);
-        gamma_free_buffer(dev, dma->this_buffer);
-        dma->this_buffer = buf;
-
-        atomic_inc(&dev->counts[7]); /* _DRM_STAT_DMA */
-        atomic_add(length, &dev->counts[8]); /* _DRM_STAT_PRIMARY */
-
-        if (!buf->while_locked && !dev->context_flag && !locked) {
-                if (gamma_lock_free(dev, &dev->lock.hw_lock->lock,
-                                  DRM_KERNEL_CONTEXT)) {
-                        DRM_ERROR("\n");
-                }
-        }
-cleanup:
-
-        clear_bit(0, &dev->dma_flag);
-
-
-        return retcode;
-}
-
-static void gamma_dma_timer_bh(unsigned long dev)
-{
-        gamma_dma_schedule((drm_device_t *)dev, 0);
-}
-
-void gamma_irq_immediate_bh(void *dev)
-{
-        gamma_dma_schedule(dev, 0);
-}
-
-int gamma_dma_schedule(drm_device_t *dev, int locked)
-{
-        int              next;
-        drm_queue_t      *q;
-        drm_buf_t        *buf;
-        int              retcode   = 0;
-        int              processed = 0;
-        int              missed;
-        int              expire    = 20;
-        drm_device_dma_t *dma      = dev->dma;
-
-        if (test_and_set_bit(0, &dev->interrupt_flag)) {
-                                /* Not reentrant */
-                atomic_inc(&dev->counts[10]); /* _DRM_STAT_MISSED */
-                return -EBUSY;
-        }
-        missed = atomic_read(&dev->counts[10]);
-
-
-again:
-        if (dev->context_flag) {
-                clear_bit(0, &dev->interrupt_flag);
-                return -EBUSY;
-        }
-        if (dma->next_buffer) {
-                                /* Unsent buffer that was previously
-                                   selected, but that couldn't be sent
-                                   because the lock could not be obtained
-                                   or the DMA engine wasn't ready.  Try
-                                   again. */
-                if (!(retcode = gamma_do_dma(dev, locked))) ++processed;
-        } else {
-                do {
-                        next = gamma_select_queue(dev, gamma_dma_timer_bh);
-                        if (next >= 0) {
-                                q   = dev->queuelist[next];
-                                buf = gamma_waitlist_get(&q->waitlist);
-                                dma->next_buffer = buf;
-                                dma->next_queue  = q;
-                                if (buf && buf->list == DRM_LIST_RECLAIM) {
-                                        gamma_clear_next_buffer(dev);
-                                        gamma_free_buffer(dev, buf);
-                                }
-                        }
-                } while (next >= 0 && !dma->next_buffer);
-                if (dma->next_buffer) {
-                        if (!(retcode = gamma_do_dma(dev, locked))) {
-                                ++processed;
-                        }
-                }
-        }
-
-        if (--expire) {
-                if (missed != atomic_read(&dev->counts[10])) {
-                        if (gamma_dma_is_ready(dev)) goto again;
-                }
-                if (processed && gamma_dma_is_ready(dev)) {
-                        processed = 0;
-                        goto again;
-                }
-        }
-
-        clear_bit(0, &dev->interrupt_flag);
-
-        return retcode;
-}
-
-static int gamma_dma_priority(struct file *filp, 
-                              drm_device_t *dev, drm_dma_t *d)
-{
-        unsigned long     address;
-        unsigned long     length;
-        int               must_free = 0;
-        int               retcode   = 0;
-        int               i;
-        int               idx;
-        drm_buf_t         *buf;
-        drm_buf_t         *last_buf = NULL;
-        drm_device_dma_t  *dma      = dev->dma;
-        int               *send_indices = NULL;
-        int               *send_sizes = NULL;
-
-        DECLARE_WAITQUEUE(entry, current);
-
-                                /* Turn off interrupt handling */
-        while (test_and_set_bit(0, &dev->interrupt_flag)) {
-                schedule();
-                if (signal_pending(current)) return -EINTR;
-        }
-        if (!(d->flags & _DRM_DMA_WHILE_LOCKED)) {
-                while (!gamma_lock_take(&dev->lock.hw_lock->lock,
-                                      DRM_KERNEL_CONTEXT)) {
-                        schedule();
-                        if (signal_pending(current)) {
-                                clear_bit(0, &dev->interrupt_flag);
-                                return -EINTR;
-                        }
-                }
-                ++must_free;
-        }
-
-        send_indices = DRM(alloc)(d->send_count * sizeof(*send_indices),
-                                  DRM_MEM_DRIVER);
-        if (send_indices == NULL)
-                return -ENOMEM;
-        if (copy_from_user(send_indices, d->send_indices, 
-                           d->send_count * sizeof(*send_indices))) {
-                retcode = -EFAULT;
-                goto cleanup;
-        }
-        
-        send_sizes = DRM(alloc)(d->send_count * sizeof(*send_sizes),
-                                DRM_MEM_DRIVER);
-        if (send_sizes == NULL)
-                return -ENOMEM;
-        if (copy_from_user(send_sizes, d->send_sizes, 
-                           d->send_count * sizeof(*send_sizes))) {
-                retcode = -EFAULT;
-                goto cleanup;
-        }
-
-        for (i = 0; i < d->send_count; i++) {
-                idx = send_indices[i];
-                if (idx < 0 || idx >= dma->buf_count) {
-                        DRM_ERROR("Index %d (of %d max)\n",
-                                  send_indices[i], dma->buf_count - 1);
-                        continue;
-                }
-                buf = dma->buflist[ idx ];
-                if (buf->filp != filp) {
-                        DRM_ERROR("Process %d using buffer not owned\n",
-                                  current->pid);
-                        retcode = -EINVAL;
-                        goto cleanup;
-                }
-                if (buf->list != DRM_LIST_NONE) {
-                        DRM_ERROR("Process %d using buffer on list %d\n",
-                                  current->pid, buf->list);
-                        retcode = -EINVAL;
-                        goto cleanup;
-                }
-                                /* This isn't a race condition on
-                                   buf->list, since our concern is the
-                                   buffer reclaim during the time the
-                                   process closes the /dev/drm? handle, so
-                                   it can't also be doing DMA. */
-                buf->list         = DRM_LIST_PRIO;
-                buf->used         = send_sizes[i];
-                buf->context      = d->context;
-                buf->while_locked = d->flags & _DRM_DMA_WHILE_LOCKED;
-                address           = (unsigned long)buf->address;
-                length            = buf->used;
-                if (!length) {
-                        DRM_ERROR("0 length buffer\n");
-                }
-                if (buf->pending) {
-                        DRM_ERROR("Sending pending buffer:"
-                                  " buffer %d, offset %d\n",
-                                  send_indices[i], i);
-                        retcode = -EINVAL;
-                        goto cleanup;
-                }
-                if (buf->waiting) {
-                        DRM_ERROR("Sending waiting buffer:"
-                                  " buffer %d, offset %d\n",
-                                  send_indices[i], i);
-                        retcode = -EINVAL;
-                        goto cleanup;
-                }
-                buf->pending = 1;
-
-                if (dev->last_context != buf->context
-                    && !(dev->queuelist[buf->context]->flags
-                         & _DRM_CONTEXT_PRESERVED)) {
-                        add_wait_queue(&dev->context_wait, &entry);
-                        current->state = TASK_INTERRUPTIBLE;
-                                /* PRE: dev->last_context != buf->context */
-                        DRM(context_switch)(dev, dev->last_context,
-                                            buf->context);
-                                /* POST: we will wait for the context
-                                   switch and will dispatch on a later call
-                                   when dev->last_context == buf->context.
-                                   NOTE WE HOLD THE LOCK THROUGHOUT THIS
-                                   TIME! */
-                        schedule();
-                        current->state = TASK_RUNNING;
-                        remove_wait_queue(&dev->context_wait, &entry);
-                        if (signal_pending(current)) {
-                                retcode = -EINTR;
-                                goto cleanup;
-                        }
-                        if (dev->last_context != buf->context) {
-                                DRM_ERROR("Context mismatch: %d %d\n",
-                                          dev->last_context,
-                                          buf->context);
-                        }
-                }
-
-                gamma_dma_dispatch(dev, address, length);
-                atomic_inc(&dev->counts[9]); /* _DRM_STAT_SPECIAL */
-                atomic_add(length, &dev->counts[8]); /* _DRM_STAT_PRIMARY */
-
-                if (last_buf) {
-                        gamma_free_buffer(dev, last_buf);
-                }
-                last_buf = buf;
-        }
-
-
-cleanup:
-        if (last_buf) {
-                gamma_dma_ready(dev);
-                gamma_free_buffer(dev, last_buf);
-        }
-        if (send_indices)
-                DRM(free)(send_indices, d->send_count * sizeof(*send_indices), 
-                          DRM_MEM_DRIVER);
-        if (send_sizes)
-                DRM(free)(send_sizes, d->send_count * sizeof(*send_sizes), 
-                          DRM_MEM_DRIVER);
-
-        if (must_free && !dev->context_flag) {
-                if (gamma_lock_free(dev, &dev->lock.hw_lock->lock,
-                                  DRM_KERNEL_CONTEXT)) {
-                        DRM_ERROR("\n");
-                }
-        }
-        clear_bit(0, &dev->interrupt_flag);
-        return retcode;
-}
-
-static int gamma_dma_send_buffers(struct file *filp,
-                                  drm_device_t *dev, drm_dma_t *d)
-{
-        DECLARE_WAITQUEUE(entry, current);
-        drm_buf_t         *last_buf = NULL;
-        int               retcode   = 0;
-        drm_device_dma_t  *dma      = dev->dma;
-        int               send_index;
-
-        if (get_user(send_index, &d->send_indices[d->send_count-1]))
-                return -EFAULT;
-
-        if (d->flags & _DRM_DMA_BLOCK) {
-                last_buf = dma->buflist[send_index];
-                add_wait_queue(&last_buf->dma_wait, &entry);
-        }
-
-        if ((retcode = gamma_dma_enqueue(filp, d))) {
-                if (d->flags & _DRM_DMA_BLOCK)
-                        remove_wait_queue(&last_buf->dma_wait, &entry);
-                return retcode;
-        }
-
-        gamma_dma_schedule(dev, 0);
-
-        if (d->flags & _DRM_DMA_BLOCK) {
-                DRM_DEBUG("%d waiting\n", current->pid);
-                for (;;) {
-                        current->state = TASK_INTERRUPTIBLE;
-                        if (!last_buf->waiting && !last_buf->pending)
-                                break; /* finished */
-                        schedule();
-                        if (signal_pending(current)) {
-                                retcode = -EINTR; /* Can't restart */
-                                break;
-                        }
-                }
-                current->state = TASK_RUNNING;
-                DRM_DEBUG("%d running\n", current->pid);
-                remove_wait_queue(&last_buf->dma_wait, &entry);
-                if (!retcode
-                    || (last_buf->list==DRM_LIST_PEND && !last_buf->pending)) {
-                        if (!waitqueue_active(&last_buf->dma_wait)) {
-                                gamma_free_buffer(dev, last_buf);
-                        }
-                }
-                if (retcode) {
-                        DRM_ERROR("ctx%d w%d p%d c%ld i%d l%d pid:%d\n",
-                                  d->context,
-                                  last_buf->waiting,
-                                  last_buf->pending,
-                                  (long)DRM_WAITCOUNT(dev, d->context),
-                                  last_buf->idx,
-                                  last_buf->list,
-                                  current->pid);
-                }
-        }
-        return retcode;
-}
-
-int gamma_dma(struct inode *inode, struct file *filp, unsigned int cmd,
-              unsigned long arg)
-{
-        drm_file_t        *priv     = filp->private_data;
-        drm_device_t      *dev      = priv->dev;
-        drm_device_dma_t  *dma      = dev->dma;
-        int               retcode   = 0;
-        drm_dma_t         __user *argp = (void __user *)arg;
-        drm_dma_t         d;
-
-        if (copy_from_user(&d, argp, sizeof(d)))
-                return -EFAULT;
-
-        if (d.send_count < 0 || d.send_count > dma->buf_count) {
-                DRM_ERROR("Process %d trying to send %d buffers (of %d max)\n",
-                          current->pid, d.send_count, dma->buf_count);
-                return -EINVAL;
-        }
-
-        if (d.request_count < 0 || d.request_count > dma->buf_count) {
-                DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
-                          current->pid, d.request_count, dma->buf_count);
-                return -EINVAL;
-        }
-
-        if (d.send_count) {
-                if (d.flags & _DRM_DMA_PRIORITY)
-                        retcode = gamma_dma_priority(filp, dev, &d);
-                else
-                        retcode = gamma_dma_send_buffers(filp, dev, &d);
-        }
-
-        d.granted_count = 0;
-
-        if (!retcode && d.request_count) {
-                retcode = gamma_dma_get_buffers(filp, &d);
-        }
-
-        DRM_DEBUG("%d returning, granted = %d\n",
-                  current->pid, d.granted_count);
-        if (copy_to_user(argp, &d, sizeof(d)))
-                return -EFAULT;
-
-        return retcode;
-}
-
-/* =============================================================
- * DMA initialization, cleanup
- */
-
-static int gamma_do_init_dma( drm_device_t *dev, drm_gamma_init_t *init )
-{
-        drm_gamma_private_t *dev_priv;
-        drm_device_dma_t    *dma = dev->dma;
-        drm_buf_t           *buf;
-        int i;
-        struct list_head    *list;
-        unsigned long       *pgt;
-
-        DRM_DEBUG( "%s\n", __FUNCTION__ );
-
-        dev_priv = DRM(alloc)( sizeof(drm_gamma_private_t),
-                                                        DRM_MEM_DRIVER );
-        if ( !dev_priv )
-                return -ENOMEM;
-
-        dev->dev_private = (void *)dev_priv;
-
-        memset( dev_priv, 0, sizeof(drm_gamma_private_t) );
-
-        dev_priv->num_rast = init->num_rast;
-
-        list_for_each(list, &dev->maplist->head) {
-                drm_map_list_t *r_list = list_entry(list, drm_map_list_t, head);
-                if( r_list->map &&
-                    r_list->map->type == _DRM_SHM &&
-                    r_list->map->flags & _DRM_CONTAINS_LOCK ) {
-                        dev_priv->sarea = r_list->map;
-                        break;
-                }
-        }
-        
-        dev_priv->mmio0 = drm_core_findmap(dev, init->mmio0);
-        dev_priv->mmio1 = drm_core_findmap(dev, init->mmio1);
-        dev_priv->mmio2 = drm_core_findmap(dev, init->mmio2);
-        dev_priv->mmio3 = drm_core_findmap(dev, init->mmio3);
-        
-        dev_priv->sarea_priv = (drm_gamma_sarea_t *)
-                ((u8 *)dev_priv->sarea->handle +
-                 init->sarea_priv_offset);
-
-        if (init->pcimode) {
-                buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-                pgt = buf->address;
-
-                for (i = 0; i < GLINT_DRI_BUF_COUNT; i++) {
-                        buf = dma->buflist[i];
-                        *pgt = virt_to_phys((void*)buf->address) | 0x07;
-                        pgt++;
-                }
-
-                buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-        } else {
-                dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
-                drm_core_ioremap( dev->agp_buffer_map, dev);
-
-                buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-                pgt = buf->address;
-
-                for (i = 0; i < GLINT_DRI_BUF_COUNT; i++) {
-                        buf = dma->buflist[i];
-                        *pgt = (unsigned long)buf->address + 0x07;
-                        pgt++;
-                }
-
-                buf = dma->buflist[GLINT_DRI_BUF_COUNT];
-
-                while (GAMMA_READ(GAMMA_INFIFOSPACE) < 1);
-                GAMMA_WRITE( GAMMA_GDMACONTROL, 0xe);
-        }
-        while (GAMMA_READ(GAMMA_INFIFOSPACE) < 2);
-        GAMMA_WRITE( GAMMA_PAGETABLEADDR, virt_to_phys((void*)buf->address) );
-        GAMMA_WRITE( GAMMA_PAGETABLELENGTH, 2 );
-
-        return 0;
-}
-
-int gamma_do_cleanup_dma( drm_device_t *dev )
-{
-        DRM_DEBUG( "%s\n", __FUNCTION__ );
-
-        /* Make sure interrupts are disabled here because the uninstall ioctl
-         * may not have been called from userspace and after dev_private
-         * is freed, it's too late.
-         */
-        if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
-                if ( dev->irq_enabled ) 
-                        DRM(irq_uninstall)(dev);
-
-        if ( dev->dev_private ) {
-
-                if ( dev->agp_buffer_map != NULL )
-                        drm_core_ioremapfree( dev->agp_buffer_map, dev );
-
-                DRM(free)( dev->dev_private, sizeof(drm_gamma_private_t),
-                           DRM_MEM_DRIVER );
-                dev->dev_private = NULL;
-        }
-
-        return 0;
-}
-
-int gamma_dma_init( struct inode *inode, struct file *filp,
-                  unsigned int cmd, unsigned long arg )
-{
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->dev;
-        drm_gamma_init_t init;
-
-        LOCK_TEST_WITH_RETURN( dev, filp );
-
-        if ( copy_from_user( &init, (drm_gamma_init_t __user *)arg, sizeof(init) ) )
-                return -EFAULT;
-
-        switch ( init.func ) {
-        case GAMMA_INIT_DMA:
-                return gamma_do_init_dma( dev, &init );
-        case GAMMA_CLEANUP_DMA:
-                return gamma_do_cleanup_dma( dev );
-        }
-
-        return -EINVAL;
-}
-
-static int gamma_do_copy_dma( drm_device_t *dev, drm_gamma_copy_t *copy )
-{
-        drm_device_dma_t    *dma = dev->dma;
-        unsigned int        *screenbuf;
-
-        DRM_DEBUG( "%s\n", __FUNCTION__ );
-
-        /* We've DRM_RESTRICTED this DMA buffer */
-
-        screenbuf = dma->buflist[ GLINT_DRI_BUF_COUNT + 1 ]->address;
-
-#if 0
-        *buffer++ = 0x180;      /* Tag (FilterMode) */
-        *buffer++ = 0x200;      /* Allow FBColor through */
-        *buffer++ = 0x53B;      /* Tag */
-        *buffer++ = copy->Pitch;
-        *buffer++ = 0x53A;      /* Tag */
-        *buffer++ = copy->SrcAddress;
-        *buffer++ = 0x539;      /* Tag */
-        *buffer++ = copy->WidthHeight; /* Initiates transfer */
-        *buffer++ = 0x53C;      /* Tag - DMAOutputAddress */
-        *buffer++ = virt_to_phys((void*)screenbuf);
-        *buffer++ = 0x53D;      /* Tag - DMAOutputCount */
-        *buffer++ = copy->Count; /* Reads HostOutFifo BLOCKS until ..*/
-
-        /* Data now sitting in dma->buflist[ GLINT_DRI_BUF_COUNT + 1 ] */
-        /* Now put it back to the screen */
-
-        *buffer++ = 0x180;      /* Tag (FilterMode) */
-        *buffer++ = 0x400;      /* Allow Sync through */
-        *buffer++ = 0x538;      /* Tag - DMARectangleReadTarget */
-        *buffer++ = 0x155;      /* FBSourceData | count */
-        *buffer++ = 0x537;      /* Tag */
-        *buffer++ = copy->Pitch;
-        *buffer++ = 0x536;      /* Tag */
-        *buffer++ = copy->DstAddress;
-        *buffer++ = 0x535;      /* Tag */
-        *buffer++ = copy->WidthHeight; /* Initiates transfer */
-        *buffer++ = 0x530;      /* Tag - DMAAddr */
-        *buffer++ = virt_to_phys((void*)screenbuf);
-        *buffer++ = 0x531;
-        *buffer++ = copy->Count; /* initiates DMA transfer of color data */
-#endif
-
-        /* need to dispatch it now */
-
-        return 0;
-}
-
-int gamma_dma_copy( struct inode *inode, struct file *filp,
-                  unsigned int cmd, unsigned long arg )
-{
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->dev;
-        drm_gamma_copy_t copy;
-
-        if ( copy_from_user( &copy, (drm_gamma_copy_t __user *)arg, sizeof(copy) ) )
-                return -EFAULT;
-
-        return gamma_do_copy_dma( dev, &copy );
-}
-
-/* =============================================================
- * Per Context SAREA Support
- */
-
-int gamma_getsareactx(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_priv_map_t __user *argp = (void __user *)arg;
-        drm_ctx_priv_map_t request;
-        drm_map_t *map;
-
-        if (copy_from_user(&request, argp, sizeof(request)))
-                return -EFAULT;
-
-        down(&dev->struct_sem);
-        if ((int)request.ctx_id >= dev->max_context) {
-                up(&dev->struct_sem);
-                return -EINVAL;
-        }
-
-        map = dev->context_sareas[request.ctx_id];
-        up(&dev->struct_sem);
-
-        request.handle = map->handle;
-        if (copy_to_user(argp, &request, sizeof(request)))
-                return -EFAULT;
-        return 0;
-}
-
-int gamma_setsareactx(struct inode *inode, struct file *filp,
-                     unsigned int cmd, unsigned long arg)
-{
-        drm_file_t      *priv   = filp->private_data;
-        drm_device_t    *dev    = priv->dev;
-        drm_ctx_priv_map_t request;
-        drm_map_t *map = NULL;
-        drm_map_list_t *r_list;
-        struct list_head *list;
-
-        if (copy_from_user(&request,
-                           (drm_ctx_priv_map_t __user *)arg,
-                           sizeof(request)))
-                return -EFAULT;
-
-        down(&dev->struct_sem);
-        r_list = NULL;
-        list_for_each(list, &dev->maplist->head) {
-                r_list = list_entry(list, drm_map_list_t, head);
-                if(r_list->map &&
-                   r_list->map->handle == request.handle) break;
-        }
-        if (list == &(dev->maplist->head)) {
-                up(&dev->struct_sem);
-                return -EINVAL;
-        }
-        map = r_list->map;
-        up(&dev->struct_sem);
-
-        if (!map) return -EINVAL;
-
-        down(&dev->struct_sem);
-        if ((int)request.ctx_id >= dev->max_context) {
-                up(&dev->struct_sem);
-                return -EINVAL;
-        }
-        dev->context_sareas[request.ctx_id] = map;
-        up(&dev->struct_sem);
-        return 0;
-}
-
-void gamma_driver_irq_preinstall( drm_device_t *dev ) {
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-
-        while(GAMMA_READ(GAMMA_INFIFOSPACE) < 2)
-                cpu_relax();
-
-        GAMMA_WRITE( GAMMA_GCOMMANDMODE,        0x00000004 );
-        GAMMA_WRITE( GAMMA_GDMACONTROL,         0x00000000 );
-}
-
-void gamma_driver_irq_postinstall( drm_device_t *dev ) {
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-
-        while(GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
-                cpu_relax();
-
-        GAMMA_WRITE( GAMMA_GINTENABLE,          0x00002001 );
-        GAMMA_WRITE( GAMMA_COMMANDINTENABLE,    0x00000008 );
-        GAMMA_WRITE( GAMMA_GDELAYTIMER,         0x00039090 );
-}
-
-void gamma_driver_irq_uninstall( drm_device_t *dev ) {
-        drm_gamma_private_t *dev_priv =
-                                (drm_gamma_private_t *)dev->dev_private;
-        if (!dev_priv)
-                return;
-
-        while(GAMMA_READ(GAMMA_INFIFOSPACE) < 3)
-                cpu_relax();
-
-        GAMMA_WRITE( GAMMA_GDELAYTIMER,         0x00000000 );
-        GAMMA_WRITE( GAMMA_COMMANDINTENABLE,    0x00000000 );
-        GAMMA_WRITE( GAMMA_GINTENABLE,          0x00000000 );
-}
-
-extern drm_ioctl_desc_t DRM(ioctls)[];
-
-static int gamma_driver_preinit(drm_device_t *dev)
-{
-        /* reset the finish ioctl */
-        DRM(ioctls)[DRM_IOCTL_NR(DRM_IOCTL_FINISH)].func = DRM(finish);
-        return 0;
-}
-
-static void gamma_driver_pretakedown(drm_device_t *dev)
-{
-        gamma_do_cleanup_dma(dev);
-}
-
-static void gamma_driver_dma_ready(drm_device_t *dev)
-{
-        gamma_dma_ready(dev);
-}
-
-static int gamma_driver_dma_quiescent(drm_device_t *dev)
-{
-        drm_gamma_private_t *dev_priv = (
-                drm_gamma_private_t *)dev->dev_private;
-        if (dev_priv->num_rast == 2)
-                gamma_dma_quiescent_dual(dev);
-        else gamma_dma_quiescent_single(dev);
-        return 0;
-}
-
-void gamma_driver_register_fns(drm_device_t *dev)
-{
-        dev->driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ;
-        DRM(fops).read = gamma_fops_read;
-        DRM(fops).poll = gamma_fops_poll;
-        dev->driver.preinit = gamma_driver_preinit;
-        dev->driver.pretakedown = gamma_driver_pretakedown;
-        dev->driver.dma_ready = gamma_driver_dma_ready;
-        dev->driver.dma_quiescent = gamma_driver_dma_quiescent;
-        dev->driver.dma_flush_block_and_flush = gamma_flush_block_and_flush;
-        dev->driver.dma_flush_unblock = gamma_flush_unblock;
-}
diff --git a/drivers/char/drm/gamma_drm.h b/drivers/char/drm/gamma_drm.h
deleted file mode 100644
index 20819ded0e15..000000000000
--- a/drivers/char/drm/gamma_drm.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef _GAMMA_DRM_H_
-#define _GAMMA_DRM_H_
-
-typedef struct _drm_gamma_tex_region {
-        unsigned char next, prev; /* indices to form a circular LRU  */
-        unsigned char in_use;   /* owned by a client, or free? */
-        int age;                /* tracked by clients to update local LRU's */
-} drm_gamma_tex_region_t;
-
-typedef struct {
-        unsigned int    GDeltaMode;
-        unsigned int    GDepthMode;
-        unsigned int    GGeometryMode;
-        unsigned int    GTransformMode;
-} drm_gamma_context_regs_t;
-
-typedef struct _drm_gamma_sarea {
-        drm_gamma_context_regs_t context_state;
-
-        unsigned int dirty;
-
-
-        /* Maintain an LRU of contiguous regions of texture space.  If
-         * you think you own a region of texture memory, and it has an
-         * age different to the one you set, then you are mistaken and
-         * it has been stolen by another client.  If global texAge
-         * hasn't changed, there is no need to walk the list.
-         *
-         * These regions can be used as a proxy for the fine-grained
-         * texture information of other clients - by maintaining them
-         * in the same lru which is used to age their own textures,
-         * clients have an approximate lru for the whole of global
-         * texture space, and can make informed decisions as to which
-         * areas to kick out.  There is no need to choose whether to
-         * kick out your own texture or someone else's - simply eject
-         * them all in LRU order.  
-         */
-   
-#define GAMMA_NR_TEX_REGIONS 64
-        drm_gamma_tex_region_t texList[GAMMA_NR_TEX_REGIONS+1]; 
-                                /* Last elt is sentinal */
-        int texAge;             /* last time texture was uploaded */
-        int last_enqueue;       /* last time a buffer was enqueued */
-        int last_dispatch;      /* age of the most recently dispatched buffer */
-        int last_quiescent;     /*  */
-        int ctxOwner;           /* last context to upload state */
-
-        int vertex_prim;
-} drm_gamma_sarea_t;
-
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmGamma.h)
- */
-
-/* Gamma specific ioctls
- * The device specific ioctl range is 0x40 to 0x79.
- */
-#define DRM_IOCTL_GAMMA_INIT            DRM_IOW( 0x40, drm_gamma_init_t)
-#define DRM_IOCTL_GAMMA_COPY            DRM_IOW( 0x41, drm_gamma_copy_t)
-
-typedef struct drm_gamma_copy {
-        unsigned int    DMAOutputAddress;
-        unsigned int    DMAOutputCount;
-        unsigned int    DMAReadGLINTSource;
-        unsigned int    DMARectangleWriteAddress;
-        unsigned int    DMARectangleWriteLinePitch;
-        unsigned int    DMARectangleWrite;
-        unsigned int    DMARectangleReadAddress;
-        unsigned int    DMARectangleReadLinePitch;
-        unsigned int    DMARectangleRead;
-        unsigned int    DMARectangleReadTarget;
-} drm_gamma_copy_t;
-
-typedef struct drm_gamma_init {
-        enum {
-                GAMMA_INIT_DMA    = 0x01,
-                GAMMA_CLEANUP_DMA = 0x02
-        } func;
-
-        int sarea_priv_offset;
-        int pcimode;
-        unsigned int mmio0;
-        unsigned int mmio1;
-        unsigned int mmio2;
-        unsigned int mmio3;
-        unsigned int buffers_offset;
-        int num_rast;
-} drm_gamma_init_t;
-
-#endif /* _GAMMA_DRM_H_ */
diff --git a/drivers/char/drm/gamma_drv.c b/drivers/char/drm/gamma_drv.c
deleted file mode 100644
index e7e64b62792a..000000000000
--- a/drivers/char/drm/gamma_drv.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* gamma.c -- 3dlabs GMX 2000 driver -*- linux-c -*-
- * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-#include <linux/config.h>
-#include "gamma.h"
-#include "drmP.h"
-#include "drm.h"
-#include "gamma_drm.h"
-#include "gamma_drv.h"
-
-#include "drm_auth.h"
-#include "drm_agpsupport.h"
-#include "drm_bufs.h"
-#include "gamma_context.h"      /* NOTE! */
-#include "drm_dma.h"
-#include "gamma_old_dma.h"      /* NOTE */
-#include "drm_drawable.h"
-#include "drm_drv.h"
-
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_irq.h"
-#include "gamma_lists.h"        /* NOTE */
-#include "drm_lock.h"
-#include "gamma_lock.h"         /* NOTE */
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
diff --git a/drivers/char/drm/gamma_drv.h b/drivers/char/drm/gamma_drv.h
deleted file mode 100644
index 146fcc6253cd..000000000000
--- a/drivers/char/drm/gamma_drv.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* gamma_drv.h -- Private header for 3dlabs GMX 2000 driver -*- linux-c -*-
- * Created: Mon Jan  4 10:05:05 1999 by faith@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *
- */
-
-#ifndef _GAMMA_DRV_H_
-#define _GAMMA_DRV_H_
-
-typedef struct drm_gamma_private {
-        drm_gamma_sarea_t *sarea_priv;
-        drm_map_t *sarea;
-        drm_map_t *mmio0;
-        drm_map_t *mmio1;
-        drm_map_t *mmio2;
-        drm_map_t *mmio3;
-        int num_rast;
-} drm_gamma_private_t;
-
-                                /* gamma_dma.c */
-extern int gamma_dma_init( struct inode *inode, struct file *filp,
-                         unsigned int cmd, unsigned long arg );
-extern int gamma_dma_copy( struct inode *inode, struct file *filp,
-                         unsigned int cmd, unsigned long arg );
-
-extern int gamma_do_cleanup_dma( drm_device_t *dev );
-extern void gamma_dma_ready(drm_device_t *dev);
-extern void gamma_dma_quiescent_single(drm_device_t *dev);
-extern void gamma_dma_quiescent_dual(drm_device_t *dev);
-
-                                /* gamma_dma.c */
-extern int  gamma_dma_schedule(drm_device_t *dev, int locked);
-extern int  gamma_dma(struct inode *inode, struct file *filp,
-                      unsigned int cmd, unsigned long arg);
-extern int  gamma_find_devices(void);
-extern int  gamma_found(void);
-
-/* Gamma-specific code pulled from drm_fops.h:
- */
-extern int           DRM(finish)(struct inode *inode, struct file *filp,
-                                 unsigned int cmd, unsigned long arg);
-extern int           DRM(flush_unblock)(drm_device_t *dev, int context,
-                                        drm_lock_flags_t flags);
-extern int           DRM(flush_block_and_flush)(drm_device_t *dev, int context,
-                                                drm_lock_flags_t flags);
-
-/* Gamma-specific code pulled from drm_dma.h:
- */
-extern void          DRM(clear_next_buffer)(drm_device_t *dev);
-extern int           DRM(select_queue)(drm_device_t *dev,
-                                       void (*wrapper)(unsigned long));
-extern int           DRM(dma_enqueue)(struct file *filp, drm_dma_t *dma);
-extern int           DRM(dma_get_buffers)(struct file *filp, drm_dma_t *dma);
-
-
-/* Gamma-specific code pulled from drm_lists.h (now renamed gamma_lists.h):
- */
-extern int           DRM(waitlist_create)(drm_waitlist_t *bl, int count);
-extern int           DRM(waitlist_destroy)(drm_waitlist_t *bl);
-extern int           DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf);
-extern drm_buf_t     *DRM(waitlist_get)(drm_waitlist_t *bl);
-extern int           DRM(freelist_create)(drm_freelist_t *bl, int count);
-extern int           DRM(freelist_destroy)(drm_freelist_t *bl);
-extern int           DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl,
-                                       drm_buf_t *buf);
-extern drm_buf_t     *DRM(freelist_get)(drm_freelist_t *bl, int block);
-
-/* externs for gamma changes to the ops */
-extern struct file_operations DRM(fops);
-extern unsigned int gamma_fops_poll(struct file *filp, struct poll_table_struct *wait);
-extern ssize_t gamma_fops_read(struct file *filp, char __user *buf, size_t count, loff_t *off);
-
-
-#define GLINT_DRI_BUF_COUNT 256
-
-#define GAMMA_OFF(reg)                                             \
-        ((reg < 0x1000)                                            \
-         ? reg                                                     \
-         : ((reg < 0x10000)                                        \
-            ? (reg - 0x1000)                                       \
-            : ((reg < 0x11000)                                     \
-               ? (reg - 0x10000)                                   \
-               : (reg - 0x11000))))
-
-#define GAMMA_BASE(reg)  ((unsigned long)                                    \
-                          ((reg < 0x1000)    ? dev_priv->mmio0->handle :     \
-                           ((reg < 0x10000)  ? dev_priv->mmio1->handle :     \
-                            ((reg < 0x11000) ? dev_priv->mmio2->handle :     \
-                                               dev_priv->mmio3->handle))))
-#define GAMMA_ADDR(reg)  (GAMMA_BASE(reg) + GAMMA_OFF(reg))
-#define GAMMA_DEREF(reg) *(__volatile__ int *)GAMMA_ADDR(reg)
-#define GAMMA_READ(reg)  GAMMA_DEREF(reg)
-#define GAMMA_WRITE(reg,val) do { GAMMA_DEREF(reg) = val; } while (0)
-
-#define GAMMA_BROADCASTMASK    0x9378
-#define GAMMA_COMMANDINTENABLE 0x0c48
-#define GAMMA_DMAADDRESS       0x0028
-#define GAMMA_DMACOUNT         0x0030
-#define GAMMA_FILTERMODE       0x8c00
-#define GAMMA_GCOMMANDINTFLAGS 0x0c50
-#define GAMMA_GCOMMANDMODE     0x0c40
-#define         GAMMA_QUEUED_DMA_MODE           1<<1
-#define GAMMA_GCOMMANDSTATUS   0x0c60
-#define GAMMA_GDELAYTIMER      0x0c38
-#define GAMMA_GDMACONTROL      0x0060
-#define         GAMMA_USE_AGP                   1<<1
-#define GAMMA_GINTENABLE       0x0808
-#define GAMMA_GINTFLAGS        0x0810
-#define GAMMA_INFIFOSPACE      0x0018
-#define GAMMA_OUTFIFOWORDS     0x0020
-#define GAMMA_OUTPUTFIFO       0x2000
-#define GAMMA_SYNC             0x8c40
-#define GAMMA_SYNC_TAG         0x0188
-#define GAMMA_PAGETABLEADDR    0x0C00
-#define GAMMA_PAGETABLELENGTH  0x0C08
-
-#define GAMMA_PASSTHROUGH       0x1FE
-#define GAMMA_DMAADDRTAG        0x530
-#define GAMMA_DMACOUNTTAG       0x531
-#define GAMMA_COMMANDINTTAG     0x532
-
-#endif
diff --git a/drivers/char/drm/gamma_lists.h b/drivers/char/drm/gamma_lists.h
deleted file mode 100644
index 2d93f412b96b..000000000000
--- a/drivers/char/drm/gamma_lists.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* drm_lists.h -- Buffer list handling routines -*- linux-c -*-
- * Created: Mon Apr 19 20:54:22 1999 by faith@valinux.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-#include "drmP.h"
-
-
-int DRM(waitlist_create)(drm_waitlist_t *bl, int count)
-{
-        if (bl->count) return -EINVAL;
-
-        bl->bufs       = DRM(alloc)((bl->count + 2) * sizeof(*bl->bufs),
-                                    DRM_MEM_BUFLISTS);
-
-        if(!bl->bufs) return -ENOMEM;
-        memset(bl->bufs, 0, sizeof(*bl->bufs));
-        bl->count      = count;
-        bl->rp         = bl->bufs;
-        bl->wp         = bl->bufs;
-        bl->end        = &bl->bufs[bl->count+1];
-        spin_lock_init(&bl->write_lock);
-        spin_lock_init(&bl->read_lock);
-        return 0;
-}
-
-int DRM(waitlist_destroy)(drm_waitlist_t *bl)
-{
-        if (bl->rp != bl->wp) return -EINVAL;
-        if (bl->bufs) DRM(free)(bl->bufs,
-                                (bl->count + 2) * sizeof(*bl->bufs),
-                                DRM_MEM_BUFLISTS);
-        bl->count = 0;
-        bl->bufs  = NULL;
-        bl->rp    = NULL;
-        bl->wp    = NULL;
-        bl->end   = NULL;
-        return 0;
-}
-
-int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf)
-{
-        int           left;
-        unsigned long flags;
-
-        left = DRM_LEFTCOUNT(bl);
-        if (!left) {
-                DRM_ERROR("Overflow while adding buffer %d from filp %p\n",
-                          buf->idx, buf->filp);
-                return -EINVAL;
-        }
-        buf->list        = DRM_LIST_WAIT;
-
-        spin_lock_irqsave(&bl->write_lock, flags);
-        *bl->wp = buf;
-        if (++bl->wp >= bl->end) bl->wp = bl->bufs;
-        spin_unlock_irqrestore(&bl->write_lock, flags);
-
-        return 0;
-}
-
-drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl)
-{
-        drm_buf_t     *buf;
-        unsigned long flags;
-
-        spin_lock_irqsave(&bl->read_lock, flags);
-        buf = *bl->rp;
-        if (bl->rp == bl->wp) {
-                spin_unlock_irqrestore(&bl->read_lock, flags);
-                return NULL;
-        }
-        if (++bl->rp >= bl->end) bl->rp = bl->bufs;
-        spin_unlock_irqrestore(&bl->read_lock, flags);
-
-        return buf;
-}
-
-int DRM(freelist_create)(drm_freelist_t *bl, int count)
-{
-        atomic_set(&bl->count, 0);
-        bl->next      = NULL;
-        init_waitqueue_head(&bl->waiting);
-        bl->low_mark  = 0;
-        bl->high_mark = 0;
-        atomic_set(&bl->wfh,   0);
-        spin_lock_init(&bl->lock);
-        ++bl->initialized;
-        return 0;
-}
-
-int DRM(freelist_destroy)(drm_freelist_t *bl)
-{
-        atomic_set(&bl->count, 0);
-        bl->next = NULL;
-        return 0;
-}
-
-int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl, drm_buf_t *buf)
-{
-        drm_device_dma_t *dma  = dev->dma;
-
-        if (!dma) {
-                DRM_ERROR("No DMA support\n");
-                return 1;
-        }
-
-        if (buf->waiting || buf->pending || buf->list == DRM_LIST_FREE) {
-                DRM_ERROR("Freed buffer %d: w%d, p%d, l%d\n",
-                          buf->idx, buf->waiting, buf->pending, buf->list);
-        }
-        if (!bl) return 1;
-        buf->list       = DRM_LIST_FREE;
-
-        spin_lock(&bl->lock);
-        buf->next       = bl->next;
-        bl->next        = buf;
-        spin_unlock(&bl->lock);
-
-        atomic_inc(&bl->count);
-        if (atomic_read(&bl->count) > dma->buf_count) {
-                DRM_ERROR("%d of %d buffers free after addition of %d\n",
-                          atomic_read(&bl->count), dma->buf_count, buf->idx);
-                return 1;
-        }
-                                /* Check for high water mark */
-        if (atomic_read(&bl->wfh) && atomic_read(&bl->count)>=bl->high_mark) {
-                atomic_set(&bl->wfh, 0);
-                wake_up_interruptible(&bl->waiting);
-        }
-        return 0;
-}
-
-static drm_buf_t *DRM(freelist_try)(drm_freelist_t *bl)
-{
-        drm_buf_t         *buf;
-
-        if (!bl) return NULL;
-
-                                /* Get buffer */
-        spin_lock(&bl->lock);
-        if (!bl->next) {
-                spin_unlock(&bl->lock);
-                return NULL;
-        }
-        buf       = bl->next;
-        bl->next  = bl->next->next;
-        spin_unlock(&bl->lock);
-
-        atomic_dec(&bl->count);
-        buf->next = NULL;
-        buf->list = DRM_LIST_NONE;
-        if (buf->waiting || buf->pending) {
-                DRM_ERROR("Free buffer %d: w%d, p%d, l%d\n",
-                          buf->idx, buf->waiting, buf->pending, buf->list);
-        }
-
-        return buf;
-}
-
-drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block)
-{
-        drm_buf_t         *buf  = NULL;
-        DECLARE_WAITQUEUE(entry, current);
-
-        if (!bl || !bl->initialized) return NULL;
-
-                                /* Check for low water mark */
-        if (atomic_read(&bl->count) <= bl->low_mark) /* Became low */
-                atomic_set(&bl->wfh, 1);
-        if (atomic_read(&bl->wfh)) {
-                if (block) {
-                        add_wait_queue(&bl->waiting, &entry);
-                        for (;;) {
-                                current->state = TASK_INTERRUPTIBLE;
-                                if (!atomic_read(&bl->wfh)
-                                    && (buf = DRM(freelist_try)(bl))) break;
-                                schedule();
-                                if (signal_pending(current)) break;
-                        }
-                        current->state = TASK_RUNNING;
-                        remove_wait_queue(&bl->waiting, &entry);
-                }
-                return buf;
-        }
-
-        return DRM(freelist_try)(bl);
-}
-
diff --git a/drivers/char/drm/gamma_lock.h b/drivers/char/drm/gamma_lock.h
deleted file mode 100644
index ddec67e4ed16..000000000000
--- a/drivers/char/drm/gamma_lock.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* lock.c -- IOCTLs for locking -*- linux-c -*-
- * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-
-/* Gamma-specific code extracted from drm_lock.h:
- */
-static int DRM(flush_queue)(drm_device_t *dev, int context)
-{
-        DECLARE_WAITQUEUE(entry, current);
-        int               ret   = 0;
-        drm_queue_t       *q    = dev->queuelist[context];
-
-        DRM_DEBUG("\n");
-
-        atomic_inc(&q->use_count);
-        if (atomic_read(&q->use_count) > 1) {
-                atomic_inc(&q->block_write);
-                add_wait_queue(&q->flush_queue, &entry);
-                atomic_inc(&q->block_count);
-                for (;;) {
-                        current->state = TASK_INTERRUPTIBLE;
-                        if (!DRM_BUFCOUNT(&q->waitlist)) break;
-                        schedule();
-                        if (signal_pending(current)) {
-                                ret = -EINTR; /* Can't restart */
-                                break;
-                        }
-                }
-                atomic_dec(&q->block_count);
-                current->state = TASK_RUNNING;
-                remove_wait_queue(&q->flush_queue, &entry);
-        }
-        atomic_dec(&q->use_count);
-
-                                /* NOTE: block_write is still incremented!
-                                   Use drm_flush_unlock_queue to decrement. */
-        return ret;
-}
-
-static int DRM(flush_unblock_queue)(drm_device_t *dev, int context)
-{
-        drm_queue_t       *q    = dev->queuelist[context];
-
-        DRM_DEBUG("\n");
-
-        atomic_inc(&q->use_count);
-        if (atomic_read(&q->use_count) > 1) {
-                if (atomic_read(&q->block_write)) {
-                        atomic_dec(&q->block_write);
-                        wake_up_interruptible(&q->write_queue);
-                }
-        }
-        atomic_dec(&q->use_count);
-        return 0;
-}
-
-int DRM(flush_block_and_flush)(drm_device_t *dev, int context,
-                               drm_lock_flags_t flags)
-{
-        int ret = 0;
-        int i;
-
-        DRM_DEBUG("\n");
-
-        if (flags & _DRM_LOCK_FLUSH) {
-                ret = DRM(flush_queue)(dev, DRM_KERNEL_CONTEXT);
-                if (!ret) ret = DRM(flush_queue)(dev, context);
-        }
-        if (flags & _DRM_LOCK_FLUSH_ALL) {
-                for (i = 0; !ret && i < dev->queue_count; i++) {
-                        ret = DRM(flush_queue)(dev, i);
-                }
-        }
-        return ret;
-}
-
-int DRM(flush_unblock)(drm_device_t *dev, int context, drm_lock_flags_t flags)
-{
-        int ret = 0;
-        int i;
-
-        DRM_DEBUG("\n");
-
-        if (flags & _DRM_LOCK_FLUSH) {
-                ret = DRM(flush_unblock_queue)(dev, DRM_KERNEL_CONTEXT);
-                if (!ret) ret = DRM(flush_unblock_queue)(dev, context);
-        }
-        if (flags & _DRM_LOCK_FLUSH_ALL) {
-                for (i = 0; !ret && i < dev->queue_count; i++) {
-                        ret = DRM(flush_unblock_queue)(dev, i);
-                }
-        }
-
-        return ret;
-}
-
-int DRM(finish)(struct inode *inode, struct file *filp, unsigned int cmd,
-                unsigned long arg)
-{
-        drm_file_t        *priv   = filp->private_data;
-        drm_device_t      *dev    = priv->dev;
-        int               ret     = 0;
-        drm_lock_t        lock;
-
-        DRM_DEBUG("\n");
-
-        if (copy_from_user(&lock, (drm_lock_t __user *)arg, sizeof(lock)))
-                return -EFAULT;
-        ret = DRM(flush_block_and_flush)(dev, lock.context, lock.flags);
-        DRM(flush_unblock)(dev, lock.context, lock.flags);
-        return ret;
-}
diff --git a/drivers/char/drm/gamma_old_dma.h b/drivers/char/drm/gamma_old_dma.h
deleted file mode 100644
index abdd454aab9f..000000000000
--- a/drivers/char/drm/gamma_old_dma.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/* drm_dma.c -- DMA IOCTL and function support -*- linux-c -*-
- * Created: Fri Mar 19 14:30:16 1999 by faith@valinux.com
- *
- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
- */
-
-
-/* Gamma-specific code pulled from drm_dma.h:
- */
-
-void DRM(clear_next_buffer)(drm_device_t *dev)
-{
-        drm_device_dma_t *dma = dev->dma;
-
-        dma->next_buffer = NULL;
-        if (dma->next_queue && !DRM_BUFCOUNT(&dma->next_queue->waitlist)) {
-                wake_up_interruptible(&dma->next_queue->flush_queue);
-        }
-        dma->next_queue  = NULL;
-}
-
-int DRM(select_queue)(drm_device_t *dev, void (*wrapper)(unsigned long))
-{
-        int        i;
-        int        candidate = -1;
-        int        j         = jiffies;
-
-        if (!dev) {
-                DRM_ERROR("No device\n");
-                return -1;
-        }
-        if (!dev->queuelist || !dev->queuelist[DRM_KERNEL_CONTEXT]) {
-                                /* This only happens between the time the
-                                   interrupt is initialized and the time
-                                   the queues are initialized. */
-                return -1;
-        }
-
-                                /* Doing "while locked" DMA? */
-        if (DRM_WAITCOUNT(dev, DRM_KERNEL_CONTEXT)) {
-                return DRM_KERNEL_CONTEXT;
-        }
-
-                                /* If there are buffers on the last_context
-                                   queue, and we have not been executing
-                                   this context very long, continue to
-                                   execute this context. */
-        if (dev->last_switch <= j
-            && dev->last_switch + DRM_TIME_SLICE > j
-            && DRM_WAITCOUNT(dev, dev->last_context)) {
-                return dev->last_context;
-        }
-
-                                /* Otherwise, find a candidate */
-        for (i = dev->last_checked + 1; i < dev->queue_count; i++) {
-                if (DRM_WAITCOUNT(dev, i)) {
-                        candidate = dev->last_checked = i;
-                        break;
-                }
-        }
-
-        if (candidate < 0) {
-                for (i = 0; i < dev->queue_count; i++) {
-                        if (DRM_WAITCOUNT(dev, i)) {
-                                candidate = dev->last_checked = i;
-                                break;
-                        }
-                }
-        }
-
-        if (wrapper
-            && candidate >= 0
-            && candidate != dev->last_context
-            && dev->last_switch <= j
-            && dev->last_switch + DRM_TIME_SLICE > j) {
-                if (dev->timer.expires != dev->last_switch + DRM_TIME_SLICE) {
-                        del_timer(&dev->timer);
-                        dev->timer.function = wrapper;
-                        dev->timer.data     = (unsigned long)dev;
-                        dev->timer.expires  = dev->last_switch+DRM_TIME_SLICE;
-                        add_timer(&dev->timer);
-                }
-                return -1;
-        }
-
-        return candidate;
-}
-
-
-int DRM(dma_enqueue)(struct file *filp, drm_dma_t *d)
-{
-        drm_file_t    *priv   = filp->private_data;
-        drm_device_t  *dev    = priv->dev;
-        int               i;
-        drm_queue_t       *q;
-        drm_buf_t         *buf;
-        int               idx;
-        int               while_locked = 0;
-        drm_device_dma_t  *dma = dev->dma;
-        int               *ind;
-        int               err;
-        DECLARE_WAITQUEUE(entry, current);
-
-        DRM_DEBUG("%d\n", d->send_count);
-
-        if (d->flags & _DRM_DMA_WHILE_LOCKED) {
-                int context = dev->lock.hw_lock->lock;
-
-                if (!_DRM_LOCK_IS_HELD(context)) {
-                        DRM_ERROR("No lock held during \"while locked\""
-                                  " request\n");
-                        return -EINVAL;
-                }
-                if (d->context != _DRM_LOCKING_CONTEXT(context)
-                    && _DRM_LOCKING_CONTEXT(context) != DRM_KERNEL_CONTEXT) {
-                        DRM_ERROR("Lock held by %d while %d makes"
-                                  " \"while locked\" request\n",
-                                  _DRM_LOCKING_CONTEXT(context),
-                                  d->context);
-                        return -EINVAL;
-                }
-                q = dev->queuelist[DRM_KERNEL_CONTEXT];
-                while_locked = 1;
-        } else {
-                q = dev->queuelist[d->context];
-        }
-
-
-        atomic_inc(&q->use_count);
-        if (atomic_read(&q->block_write)) {
-                add_wait_queue(&q->write_queue, &entry);
-                atomic_inc(&q->block_count);
-                for (;;) {
-                        current->state = TASK_INTERRUPTIBLE;
-                        if (!atomic_read(&q->block_write)) break;
-                        schedule();
-                        if (signal_pending(current)) {
-                                atomic_dec(&q->use_count);
-                                remove_wait_queue(&q->write_queue, &entry);
-                                return -EINTR;
-                        }
-                }
-                atomic_dec(&q->block_count);
-                current->state = TASK_RUNNING;
-                remove_wait_queue(&q->write_queue, &entry);
-        }
-
-        ind = DRM(alloc)(d->send_count * sizeof(int), DRM_MEM_DRIVER);
-        if (!ind)
-                return -ENOMEM;
-
-        if (copy_from_user(ind, d->send_indices, d->send_count * sizeof(int))) {
-                err = -EFAULT;
-                goto out;
-        }
-
-        err = -EINVAL;
-        for (i = 0; i < d->send_count; i++) {
-                idx = ind[i];
-                if (idx < 0 || idx >= dma->buf_count) {
-                        DRM_ERROR("Index %d (of %d max)\n",
-                                  ind[i], dma->buf_count - 1);
-                        goto out;
-                }
-                buf = dma->buflist[ idx ];
-                if (buf->filp != filp) {
-                        DRM_ERROR("Process %d using buffer not owned\n",
-                                  current->pid);
-                        goto out;
-                }
-                if (buf->list != DRM_LIST_NONE) {
-                        DRM_ERROR("Process %d using buffer %d on list %d\n",
-                                  current->pid, buf->idx, buf->list);
-                        goto out;
-                }
-                buf->used         = ind[i];
-                buf->while_locked = while_locked;
-                buf->context      = d->context;
-                if (!buf->used) {
-                        DRM_ERROR("Queueing 0 length buffer\n");
-                }
-                if (buf->pending) {
-                        DRM_ERROR("Queueing pending buffer:"
-                                  " buffer %d, offset %d\n",
-                                  ind[i], i);
-                        goto out;
-                }
-                if (buf->waiting) {
-                        DRM_ERROR("Queueing waiting buffer:"
-                                  " buffer %d, offset %d\n",
-                                  ind[i], i);
-                        goto out;
-                }
-                buf->waiting = 1;
-                if (atomic_read(&q->use_count) == 1
-                    || atomic_read(&q->finalization)) {
-                        DRM(free_buffer)(dev, buf);
-                } else {
-                        DRM(waitlist_put)(&q->waitlist, buf);
-                        atomic_inc(&q->total_queued);
-                }
-        }
-        atomic_dec(&q->use_count);
-
-        return 0;
-
-out:
-        DRM(free)(ind, d->send_count * sizeof(int), DRM_MEM_DRIVER);
-        atomic_dec(&q->use_count);
-        return err;
-}
-
-static int DRM(dma_get_buffers_of_order)(struct file *filp, drm_dma_t *d,
-                                         int order)
-{
-        drm_file_t    *priv   = filp->private_data;
-        drm_device_t  *dev    = priv->dev;
-        int               i;
-        drm_buf_t         *buf;
-        drm_device_dma_t  *dma = dev->dma;
-
-        for (i = d->granted_count; i < d->request_count; i++) {
-                buf = DRM(freelist_get)(&dma->bufs[order].freelist,
-                                        d->flags & _DRM_DMA_WAIT);
-                if (!buf) break;
-                if (buf->pending || buf->waiting) {
-                        DRM_ERROR("Free buffer %d in use: filp %p (w%d, p%d)\n",
-                                  buf->idx,
-                                  buf->filp,
-                                  buf->waiting,
-                                  buf->pending);
-                }
-                buf->filp     = filp;
-                if (copy_to_user(&d->request_indices[i],
-                                 &buf->idx,
-                                 sizeof(buf->idx)))
-                        return -EFAULT;
-
-                if (copy_to_user(&d->request_sizes[i],
-                                 &buf->total,
-                                 sizeof(buf->total)))
-                        return -EFAULT;
-
-                ++d->granted_count;
-        }
-        return 0;
-}
-
-
-int DRM(dma_get_buffers)(struct file *filp, drm_dma_t *dma)
-{
-        int               order;
-        int               retcode = 0;
-        int               tmp_order;
-
-        order = DRM(order)(dma->request_size);
-
-        dma->granted_count = 0;
-        retcode            = DRM(dma_get_buffers_of_order)(filp, dma, order);
-
-        if (dma->granted_count < dma->request_count
-            && (dma->flags & _DRM_DMA_SMALLER_OK)) {
-                for (tmp_order = order - 1;
-                     !retcode
-                             && dma->granted_count < dma->request_count
-                             && tmp_order >= DRM_MIN_ORDER;
-                     --tmp_order) {
-
-                        retcode = DRM(dma_get_buffers_of_order)(filp, dma,
-                                                                tmp_order);
-                }
-        }
-
-        if (dma->granted_count < dma->request_count
-            && (dma->flags & _DRM_DMA_LARGER_OK)) {
-                for (tmp_order = order + 1;
-                     !retcode
-                             && dma->granted_count < dma->request_count
-                             && tmp_order <= DRM_MAX_ORDER;
-                     ++tmp_order) {
-
-                        retcode = DRM(dma_get_buffers_of_order)(filp, dma,
-                                                                tmp_order);
-                }
-        }
-        return 0;
-}
-
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index 18e0b7622893..2f1659b96fd1 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -45,11 +45,6 @@
 #define I810_BUF_UNMAPPED 0
 #define I810_BUF_MAPPED   1
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,2)
-#define down_write down
-#define up_write up
-#endif
-
 static drm_buf_t *i810_freelist_get(drm_device_t *dev)
 {
         drm_device_dma_t *dma = dev->dma;
@@ -351,6 +346,7 @@ static int i810_dma_initialize(drm_device_t *dev,
                 DRM_ERROR("can not find mmio map!\n");
                 return -EINVAL;
         }
+        dev->agp_buffer_token = init->buffers_offset;
         dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
         if (!dev->agp_buffer_map) {
                 dev->dev_private = (void *)dev_priv;
@@ -1383,3 +1379,19 @@ drm_ioctl_desc_t i810_ioctls[] = {
 };
 
 int i810_max_ioctl = DRM_ARRAY_SIZE(i810_ioctls);
+
+/**
+ * Determine if the device really is AGP or not.
+ *
+ * All Intel graphics chipsets are treated as AGP, even if they are really
+ * PCI-e.
+ *
+ * \param dev   The device to be tested.
+ *
+ * \returns
+ * A value of 1 is always retured to indictate every i810 is AGP.
+ */
+int i810_driver_device_is_agp(drm_device_t * dev)
+{
+        return 1;
+}
diff --git a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c
index ff51b3259af9..00609329d578 100644
--- a/drivers/char/drm/i810_drv.c
+++ b/drivers/char/drm/i810_drv.c
@@ -84,6 +84,7 @@ static struct drm_driver driver = {
         .dev_priv_size = sizeof(drm_i810_buf_priv_t),
         .pretakedown = i810_driver_pretakedown,
         .prerelease = i810_driver_prerelease,
+        .device_is_agp = i810_driver_device_is_agp,
         .release = i810_driver_release,
         .dma_quiescent = i810_driver_dma_quiescent,
         .reclaim_buffers = i810_reclaim_buffers,
diff --git a/drivers/char/drm/i810_drv.h b/drivers/char/drm/i810_drv.h
index 1b40538d1725..62ee4f58c59a 100644
--- a/drivers/char/drm/i810_drv.h
+++ b/drivers/char/drm/i810_drv.h
@@ -120,6 +120,7 @@ extern int i810_driver_dma_quiescent(drm_device_t *dev);
 extern void i810_driver_release(drm_device_t *dev, struct file *filp);
 extern void i810_driver_pretakedown(drm_device_t *dev);
 extern void i810_driver_prerelease(drm_device_t *dev, DRMFILE filp);
+extern int i810_driver_device_is_agp(drm_device_t * dev);
 
 #define I810_BASE(reg)          ((unsigned long) \
                                 dev_priv->mmio_map->handle)
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index dc7733035864..6f89d5796ef3 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -47,11 +47,6 @@
 #define I830_BUF_UNMAPPED 0
 #define I830_BUF_MAPPED   1
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,2)
-#define down_write down
-#define up_write up
-#endif
-
 static drm_buf_t *i830_freelist_get(drm_device_t *dev)
 {
         drm_device_dma_t *dma = dev->dma;
@@ -358,6 +353,7 @@ static int i830_dma_initialize(drm_device_t *dev,
                 DRM_ERROR("can not find mmio map!\n");
                 return -EINVAL;
         }
+        dev->agp_buffer_token = init->buffers_offset;
         dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
         if(!dev->agp_buffer_map) {
                 dev->dev_private = (void *)dev_priv;
@@ -1586,3 +1582,19 @@ drm_ioctl_desc_t i830_ioctls[] = {
 };
 
 int i830_max_ioctl = DRM_ARRAY_SIZE(i830_ioctls);
+
+/**
+ * Determine if the device really is AGP or not.
+ *
+ * All Intel graphics chipsets are treated as AGP, even if they are really
+ * PCI-e.
+ *
+ * \param dev   The device to be tested.
+ *
+ * \returns
+ * A value of 1 is always retured to indictate every i8xx is AGP.
+ */
+int i830_driver_device_is_agp(drm_device_t * dev)
+{
+        return 1;
+}
diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c
index bc36be76b8b2..0da9cd19919e 100644
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/char/drm/i830_drv.c
@@ -88,6 +88,7 @@ static struct drm_driver driver = {
         .dev_priv_size = sizeof(drm_i830_buf_priv_t),
         .pretakedown = i830_driver_pretakedown,
         .prerelease = i830_driver_prerelease,
+        .device_is_agp = i830_driver_device_is_agp,
         .release = i830_driver_release,
         .dma_quiescent = i830_driver_dma_quiescent,
         .reclaim_buffers = i830_reclaim_buffers,
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h
index df7746131dea..63f96a8b6a4a 100644
--- a/drivers/char/drm/i830_drv.h
+++ b/drivers/char/drm/i830_drv.h
@@ -137,6 +137,7 @@ extern void i830_driver_pretakedown(drm_device_t *dev);
 extern void i830_driver_release(drm_device_t *dev, struct file *filp);
 extern int i830_driver_dma_quiescent(drm_device_t *dev);
 extern void i830_driver_prerelease(drm_device_t *dev, DRMFILE filp);
+extern int i830_driver_device_is_agp(drm_device_t * dev);
 
 #define I830_BASE(reg)          ((unsigned long) \
                                 dev_priv->mmio_map->handle)
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index acf9e52a9507..34f552f90c4a 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -95,9 +95,8 @@ static int i915_dma_cleanup(drm_device_t * dev)
                         drm_core_ioremapfree( &dev_priv->ring.map, dev);
                 }
 
-                if (dev_priv->hw_status_page) {
-                        drm_pci_free(dev, PAGE_SIZE, dev_priv->hw_status_page,
-                                     dev_priv->dma_status_page);
+                if (dev_priv->status_page_dmah) {
+                        drm_pci_free(dev, dev_priv->status_page_dmah);
                         /* Need to rewrite hardware status page */
                         I915_WRITE(0x02080, 0x1ffff000);
                 }
@@ -174,16 +173,18 @@ static int i915_initialize(drm_device_t * dev,
         dev_priv->allow_batchbuffer = 1;
 
         /* Program Hardware Status Page */
-        dev_priv->hw_status_page = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE,
-                                                 0xffffffff, 
-                                                 &dev_priv->dma_status_page);
+        dev_priv->status_page_dmah = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE,
+                                                   0xffffffff);
 
-        if (!dev_priv->hw_status_page) {
+        if (!dev_priv->status_page_dmah) {
                 dev->dev_private = (void *)dev_priv;
                 i915_dma_cleanup(dev);
                 DRM_ERROR("Can not allocate hardware status page\n");
                 return DRM_ERR(ENOMEM);
         }
+        dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
+        dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
+
         memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
         DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
 
@@ -731,3 +732,19 @@ drm_ioctl_desc_t i915_ioctls[] = {
 };
 
 int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
+
+/**
+ * Determine if the device really is AGP or not.
+ *
+ * All Intel graphics chipsets are treated as AGP, even if they are really
+ * PCI-e.
+ *
+ * \param dev   The device to be tested.
+ *
+ * \returns
+ * A value of 1 is always retured to indictate every i9x5 is AGP.
+ */
+int i915_driver_device_is_agp(drm_device_t * dev)
+{
+        return 1;
+}
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index 1f59d3fc79bc..106b9ec02213 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -79,6 +79,7 @@ static struct drm_driver driver = {
                                 DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
         .pretakedown = i915_driver_pretakedown,
         .prerelease = i915_driver_prerelease,
+        .device_is_agp = i915_driver_device_is_agp,
         .irq_preinstall = i915_driver_irq_preinstall,
         .irq_postinstall = i915_driver_irq_postinstall,
         .irq_uninstall = i915_driver_irq_uninstall,
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 9c37d2367dd5..70ed4e68eac8 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -79,9 +79,10 @@ typedef struct drm_i915_private {
         drm_i915_sarea_t *sarea_priv;
         drm_i915_ring_buffer_t ring;
 
+        drm_dma_handle_t *status_page_dmah;
         void *hw_status_page;
-        unsigned long counter;
         dma_addr_t dma_status_page;
+        unsigned long counter;
 
         int back_offset;
         int front_offset;
@@ -102,6 +103,7 @@ typedef struct drm_i915_private {
 extern void i915_kernel_lost_context(drm_device_t * dev);
 extern void i915_driver_pretakedown(drm_device_t *dev);
 extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp);
+extern int i915_driver_device_is_agp(drm_device_t *dev);
 
 /* i915_irq.c */
 extern int i915_irq_emit(DRM_IOCTL_ARGS);
diff --git a/drivers/char/drm/mga_dma.c b/drivers/char/drm/mga_dma.c
index 832eaf8a5068..fc7d4a594bca 100644
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
@@ -23,18 +23,21 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *    Jeff Hartmann <jhartmann@valinux.com>
- *    Keith Whitwell <keith@tungstengraphics.com>
- *
- * Rewritten by:
- *    Gareth Hughes <gareth@valinux.com>
+ */
+
+/**
+ * \file mga_dma.c
+ * DMA support for MGA G200 / G400.
+ * 
+ * \author Rickard E. (Rik) Faith <faith@valinux.com>
+ * \author Jeff Hartmann <jhartmann@valinux.com>
+ * \author Keith Whitwell <keith@tungstengraphics.com>
+ * \author Gareth Hughes <gareth@valinux.com>
  */
 
 #include "drmP.h"
 #include "drm.h"
+#include "drm_sarea.h"
 #include "mga_drm.h"
 #include "mga_drv.h"
 
@@ -148,7 +151,7 @@ void mga_do_dma_flush( drm_mga_private_t *dev_priv )
         DRM_DEBUG( "  space = 0x%06x\n", primary->space );
 
         mga_flush_write_combine();
-        MGA_WRITE( MGA_PRIMEND, tail | MGA_PAGPXFER );
+        MGA_WRITE(MGA_PRIMEND, tail | dev_priv->dma_access);
 
         DRM_DEBUG( "done.\n" );
 }
@@ -190,7 +193,7 @@ void mga_do_dma_wrap_start( drm_mga_private_t *dev_priv )
         DRM_DEBUG( "  space = 0x%06x\n", primary->space );
 
         mga_flush_write_combine();
-        MGA_WRITE( MGA_PRIMEND, tail | MGA_PAGPXFER );
+        MGA_WRITE(MGA_PRIMEND, tail | dev_priv->dma_access);
 
         set_bit( 0, &primary->wrapped );
         DRM_DEBUG( "done.\n" );
@@ -396,23 +399,390 @@ int mga_freelist_put( drm_device_t *dev, drm_buf_t *buf )
  * DMA initialization, cleanup
  */
 
+
+int mga_driver_preinit(drm_device_t *dev, unsigned long flags)
+{
+        drm_mga_private_t * dev_priv;
+
+        dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER);
+        if (!dev_priv)
+                return DRM_ERR(ENOMEM);
+
+        dev->dev_private = (void *)dev_priv;
+        memset(dev_priv, 0, sizeof(drm_mga_private_t));
+
+        dev_priv->usec_timeout = MGA_DEFAULT_USEC_TIMEOUT;
+        dev_priv->chipset = flags;
+
+        return 0;
+}
+
+#if __OS_HAS_AGP
+/**
+ * Bootstrap the driver for AGP DMA.
+ * 
+ * \todo
+ * Investigate whether there is any benifit to storing the WARP microcode in
+ * AGP memory.  If not, the microcode may as well always be put in PCI
+ * memory.
+ *
+ * \todo
+ * This routine needs to set dma_bs->agp_mode to the mode actually configured
+ * in the hardware.  Looking just at the Linux AGP driver code, I don't see
+ * an easy way to determine this.
+ *
+ * \sa mga_do_dma_bootstrap, mga_do_pci_dma_bootstrap
+ */
+static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
+                                    drm_mga_dma_bootstrap_t * dma_bs)
+{
+        drm_mga_private_t * const dev_priv = (drm_mga_private_t *) dev->dev_private;
+        const unsigned int warp_size = mga_warp_microcode_size(dev_priv);
+        int err;
+        unsigned  offset;
+        const unsigned secondary_size = dma_bs->secondary_bin_count
+                * dma_bs->secondary_bin_size;
+        const unsigned agp_size = (dma_bs->agp_size << 20);
+        drm_buf_desc_t req;
+        drm_agp_mode_t mode;
+        drm_agp_info_t info;
+
+        
+        /* Acquire AGP. */
+        err = drm_agp_acquire(dev);
+        if (err) {
+                DRM_ERROR("Unable to acquire AGP\n");
+                return err;
+        }
+
+        err = drm_agp_info(dev, &info);
+        if (err) {
+                DRM_ERROR("Unable to get AGP info\n");
+                return err;
+        }
+
+        mode.mode = (info.mode & ~0x07) | dma_bs->agp_mode;
+        err = drm_agp_enable(dev, mode);
+        if (err) {
+                DRM_ERROR("Unable to enable AGP (mode = 0x%lx)\n", mode.mode);
+                return err;
+        }
+
+
+        /* In addition to the usual AGP mode configuration, the G200 AGP cards
+         * need to have the AGP mode "manually" set.
+         */
+
+        if (dev_priv->chipset == MGA_CARD_TYPE_G200) {
+                if (mode.mode & 0x02) {
+                        MGA_WRITE(MGA_AGP_PLL, MGA_AGP2XPLL_ENABLE);
+                }
+                else {
+                        MGA_WRITE(MGA_AGP_PLL, MGA_AGP2XPLL_DISABLE);
+                }
+        }
+
+
+        /* Allocate and bind AGP memory. */
+        dev_priv->agp_pages = agp_size / PAGE_SIZE;
+        dev_priv->agp_mem = drm_alloc_agp( dev, dev_priv->agp_pages, 0 );
+        if (dev_priv->agp_mem == NULL) {
+                dev_priv->agp_pages = 0;
+                DRM_ERROR("Unable to allocate %uMB AGP memory\n",
+                          dma_bs->agp_size);
+                return DRM_ERR(ENOMEM);
+        }
+                
+        err = drm_bind_agp( dev_priv->agp_mem, 0 );
+        if (err) {
+                DRM_ERROR("Unable to bind AGP memory\n");
+                return err;
+        }
+
+        offset = 0;
+        err = drm_addmap( dev, offset, warp_size,
+                          _DRM_AGP, _DRM_READ_ONLY, & dev_priv->warp );
+        if (err) {
+                DRM_ERROR("Unable to map WARP microcode\n");
+                return err;
+        }
+
+        offset += warp_size;
+        err = drm_addmap( dev, offset, dma_bs->primary_size,
+                          _DRM_AGP, _DRM_READ_ONLY, & dev_priv->primary );
+        if (err) {
+                DRM_ERROR("Unable to map primary DMA region\n");
+                return err;
+        }
+
+        offset += dma_bs->primary_size;
+        err = drm_addmap( dev, offset, secondary_size,
+                          _DRM_AGP, 0, & dev->agp_buffer_map );
+        if (err) {
+                DRM_ERROR("Unable to map secondary DMA region\n");
+                return err;
+        }
+
+        (void) memset( &req, 0, sizeof(req) );
+        req.count = dma_bs->secondary_bin_count;
+        req.size = dma_bs->secondary_bin_size;
+        req.flags = _DRM_AGP_BUFFER;
+        req.agp_start = offset;
+
+        err = drm_addbufs_agp( dev, & req );
+        if (err) {
+                DRM_ERROR("Unable to add secondary DMA buffers\n");
+                return err;
+        }
+
+        offset += secondary_size;
+        err = drm_addmap( dev, offset, agp_size - offset,
+                          _DRM_AGP, 0, & dev_priv->agp_textures );
+        if (err) {
+                DRM_ERROR("Unable to map AGP texture region\n");
+                return err;
+        }
+
+        drm_core_ioremap(dev_priv->warp, dev);
+        drm_core_ioremap(dev_priv->primary, dev);
+        drm_core_ioremap(dev->agp_buffer_map, dev);
+
+        if (!dev_priv->warp->handle ||
+            !dev_priv->primary->handle || !dev->agp_buffer_map->handle) {
+                DRM_ERROR("failed to ioremap agp regions! (%p, %p, %p)\n",
+                          dev_priv->warp->handle, dev_priv->primary->handle,
+                          dev->agp_buffer_map->handle);
+                return DRM_ERR(ENOMEM);
+        }
+
+        dev_priv->dma_access = MGA_PAGPXFER;
+        dev_priv->wagp_enable = MGA_WAGP_ENABLE;
+
+        DRM_INFO("Initialized card for AGP DMA.\n");
+        return 0;
+}
+#else
+static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
+                                    drm_mga_dma_bootstrap_t * dma_bs)
+{
+        return -EINVAL;
+}
+#endif
+
+/**
+ * Bootstrap the driver for PCI DMA.
+ * 
+ * \todo
+ * The algorithm for decreasing the size of the primary DMA buffer could be
+ * better.  The size should be rounded up to the nearest page size, then
+ * decrease the request size by a single page each pass through the loop.
+ *
+ * \todo
+ * Determine whether the maximum address passed to drm_pci_alloc is correct.
+ * The same goes for drm_addbufs_pci.
+ * 
+ * \sa mga_do_dma_bootstrap, mga_do_agp_dma_bootstrap
+ */
+static int mga_do_pci_dma_bootstrap(drm_device_t * dev,
+                                    drm_mga_dma_bootstrap_t * dma_bs)
+{
+        drm_mga_private_t * const dev_priv = (drm_mga_private_t *) dev->dev_private;
+        const unsigned int warp_size = mga_warp_microcode_size(dev_priv);
+        unsigned int primary_size;
+        unsigned int bin_count;
+        int err;
+        drm_buf_desc_t req;
+
+        
+        if (dev->dma == NULL) {
+                DRM_ERROR("dev->dma is NULL\n");
+                return DRM_ERR(EFAULT);
+        }
+
+        /* The proper alignment is 0x100 for this mapping */
+        err = drm_addmap(dev, 0, warp_size, _DRM_CONSISTENT,
+                         _DRM_READ_ONLY, &dev_priv->warp);
+        if (err != 0) {
+                DRM_ERROR("Unable to create mapping for WARP microcode\n");
+                return err;
+        }
+
+        /* Other than the bottom two bits being used to encode other
+         * information, there don't appear to be any restrictions on the
+         * alignment of the primary or secondary DMA buffers.
+         */
+
+        for ( primary_size = dma_bs->primary_size
+              ; primary_size != 0
+              ; primary_size >>= 1 ) {
+                /* The proper alignment for this mapping is 0x04 */
+                err = drm_addmap(dev, 0, primary_size, _DRM_CONSISTENT,
+                                 _DRM_READ_ONLY, &dev_priv->primary);
+                if (!err)
+                        break;
+        }
+
+        if (err != 0) {
+                DRM_ERROR("Unable to allocate primary DMA region\n");
+                return DRM_ERR(ENOMEM);
+        }
+
+        if (dev_priv->primary->size != dma_bs->primary_size) {
+                DRM_INFO("Primary DMA buffer size reduced from %u to %u.\n",
+                         dma_bs->primary_size, 
+                         (unsigned) dev_priv->primary->size);
+                dma_bs->primary_size = dev_priv->primary->size;
+        }
+
+        for ( bin_count = dma_bs->secondary_bin_count
+              ; bin_count > 0 
+              ; bin_count-- ) {
+                (void) memset( &req, 0, sizeof(req) );
+                req.count = bin_count;
+                req.size = dma_bs->secondary_bin_size;
+
+                err = drm_addbufs_pci( dev, & req );
+                if (!err) {
+                        break;
+                }
+        }
+        
+        if (bin_count == 0) {
+                DRM_ERROR("Unable to add secondary DMA buffers\n");
+                return err;
+        }
+
+        if (bin_count != dma_bs->secondary_bin_count) {
+                DRM_INFO("Secondary PCI DMA buffer bin count reduced from %u "
+                         "to %u.\n", dma_bs->secondary_bin_count, bin_count);
+
+                dma_bs->secondary_bin_count = bin_count;
+        }
+
+        dev_priv->dma_access = 0;
+        dev_priv->wagp_enable = 0;
+
+        dma_bs->agp_mode = 0;
+
+        DRM_INFO("Initialized card for PCI DMA.\n");
+        return 0;
+}
+
+
+static int mga_do_dma_bootstrap(drm_device_t * dev,
+                                drm_mga_dma_bootstrap_t * dma_bs)
+{
+        const int is_agp = (dma_bs->agp_mode != 0) && drm_device_is_agp(dev);
+        int err;
+        drm_mga_private_t * const dev_priv =
+                (drm_mga_private_t *) dev->dev_private;
+
+
+        dev_priv->used_new_dma_init = 1;
+
+        /* The first steps are the same for both PCI and AGP based DMA.  Map
+         * the cards MMIO registers and map a status page.
+         */
+        err = drm_addmap( dev, dev_priv->mmio_base, dev_priv->mmio_size,
+                          _DRM_REGISTERS, _DRM_READ_ONLY, & dev_priv->mmio );
+        if (err) {
+                DRM_ERROR("Unable to map MMIO region\n");
+                return err;
+        }
+
+
+        err = drm_addmap( dev, 0, SAREA_MAX, _DRM_SHM,
+                          _DRM_READ_ONLY | _DRM_LOCKED | _DRM_KERNEL,
+                          & dev_priv->status );
+        if (err) {
+                DRM_ERROR("Unable to map status region\n");
+                return err;
+        }
+
+
+        /* The DMA initialization procedure is slightly different for PCI and
+         * AGP cards.  AGP cards just allocate a large block of AGP memory and
+         * carve off portions of it for internal uses.  The remaining memory
+         * is returned to user-mode to be used for AGP textures.
+         */
+        if (is_agp) {
+                err = mga_do_agp_dma_bootstrap(dev, dma_bs);
+        }
+        
+        /* If we attempted to initialize the card for AGP DMA but failed,
+         * clean-up any mess that may have been created.
+         */
+
+        if (err) {
+                mga_do_cleanup_dma(dev);
+        }
+
+
+        /* Not only do we want to try and initialized PCI cards for PCI DMA,
+         * but we also try to initialized AGP cards that could not be
+         * initialized for AGP DMA.  This covers the case where we have an AGP
+         * card in a system with an unsupported AGP chipset.  In that case the
+         * card will be detected as AGP, but we won't be able to allocate any
+         * AGP memory, etc.
+         */
+
+        if (!is_agp || err) {
+                err = mga_do_pci_dma_bootstrap(dev, dma_bs);
+        }
+
+
+        return err;
+}
+
+int mga_dma_bootstrap(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_mga_dma_bootstrap_t bootstrap;
+        int err;
+
+
+        DRM_COPY_FROM_USER_IOCTL(bootstrap,
+                                 (drm_mga_dma_bootstrap_t __user *) data,
+                                 sizeof(bootstrap));
+
+        err = mga_do_dma_bootstrap(dev, & bootstrap);
+        if (! err) {
+                static const int modes[] = { 0, 1, 2, 2, 4, 4, 4, 4 };
+                const drm_mga_private_t * const dev_priv = 
+                        (drm_mga_private_t *) dev->dev_private;
+
+                if (dev_priv->agp_textures != NULL) {
+                        bootstrap.texture_handle = dev_priv->agp_textures->offset;
+                        bootstrap.texture_size = dev_priv->agp_textures->size;
+                }
+                else {
+                        bootstrap.texture_handle = 0;
+                        bootstrap.texture_size = 0;
+                }
+
+                bootstrap.agp_mode = modes[ bootstrap.agp_mode & 0x07 ];
+                if (DRM_COPY_TO_USER( (void __user *) data, & bootstrap,
+                                     sizeof(bootstrap))) {
+                        err = DRM_ERR(EFAULT);
+                }
+        }
+        else {
+                mga_do_cleanup_dma(dev);
+        }
+
+        return err;
+}
+
 static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
 {
         drm_mga_private_t *dev_priv;
         int ret;
         DRM_DEBUG( "\n" );
 
-        dev_priv = drm_alloc( sizeof(drm_mga_private_t), DRM_MEM_DRIVER );
-        if ( !dev_priv )
-                return DRM_ERR(ENOMEM);
-
-        memset( dev_priv, 0, sizeof(drm_mga_private_t) );
 
-        dev_priv->chipset = init->chipset;
+        dev_priv = dev->dev_private;
 
-        dev_priv->usec_timeout = MGA_DEFAULT_USEC_TIMEOUT;
-
-        if ( init->sgram ) {
+        if (init->sgram) {
                 dev_priv->clear_cmd = MGA_DWGCTL_CLEAR | MGA_ATYPE_BLK;
         } else {
                 dev_priv->clear_cmd = MGA_DWGCTL_CLEAR | MGA_ATYPE_RSTR;
@@ -436,88 +806,66 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
 
         DRM_GETSAREA();
 
-        if(!dev_priv->sarea) {
-                DRM_ERROR( "failed to find sarea!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
+        if (!dev_priv->sarea) {
+                DRM_ERROR("failed to find sarea!\n");
                 return DRM_ERR(EINVAL);
         }
 
-        dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
-        if(!dev_priv->mmio) {
-                DRM_ERROR( "failed to find mmio region!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
-                return DRM_ERR(EINVAL);
-        }
-        dev_priv->status = drm_core_findmap(dev, init->status_offset);
-        if(!dev_priv->status) {
-                DRM_ERROR( "failed to find status page!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
-                return DRM_ERR(EINVAL);
-        }
-        dev_priv->warp = drm_core_findmap(dev, init->warp_offset);
-        if(!dev_priv->warp) {
-                DRM_ERROR( "failed to find warp microcode region!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
-                return DRM_ERR(EINVAL);
-        }
-        dev_priv->primary = drm_core_findmap(dev, init->primary_offset);
-        if(!dev_priv->primary) {
-                DRM_ERROR( "failed to find primary dma region!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
-                return DRM_ERR(EINVAL);
-        }
-        dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
-        if(!dev->agp_buffer_map) {
-                DRM_ERROR( "failed to find dma buffer region!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
-                return DRM_ERR(EINVAL);
+        if (! dev_priv->used_new_dma_init) {
+                dev_priv->status = drm_core_findmap(dev, init->status_offset);
+                if (!dev_priv->status) {
+                        DRM_ERROR("failed to find status page!\n");
+                        return DRM_ERR(EINVAL);
+                }
+                dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
+                if (!dev_priv->mmio) {
+                        DRM_ERROR("failed to find mmio region!\n");
+                        return DRM_ERR(EINVAL);
+                }
+                dev_priv->warp = drm_core_findmap(dev, init->warp_offset);
+                if (!dev_priv->warp) {
+                        DRM_ERROR("failed to find warp microcode region!\n");
+                        return DRM_ERR(EINVAL);
+                }
+                dev_priv->primary = drm_core_findmap(dev, init->primary_offset);
+                if (!dev_priv->primary) {
+                        DRM_ERROR("failed to find primary dma region!\n");
+                        return DRM_ERR(EINVAL);
+                }
+                dev->agp_buffer_token = init->buffers_offset;
+                dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
+                if (!dev->agp_buffer_map) {
+                        DRM_ERROR("failed to find dma buffer region!\n");
+                        return DRM_ERR(EINVAL);
+                }
+
+                drm_core_ioremap(dev_priv->warp, dev);
+                drm_core_ioremap(dev_priv->primary, dev);
+                drm_core_ioremap(dev->agp_buffer_map, dev);
         }
 
         dev_priv->sarea_priv =
                 (drm_mga_sarea_t *)((u8 *)dev_priv->sarea->handle +
                                     init->sarea_priv_offset);
 
-        drm_core_ioremap( dev_priv->warp, dev );
-        drm_core_ioremap( dev_priv->primary, dev );
-        drm_core_ioremap( dev->agp_buffer_map, dev );
-
-        if(!dev_priv->warp->handle ||
-           !dev_priv->primary->handle ||
-           !dev->agp_buffer_map->handle ) {
-                DRM_ERROR( "failed to ioremap agp regions!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
+        if (!dev_priv->warp->handle ||
+            !dev_priv->primary->handle ||
+            ((dev_priv->dma_access != 0) &&
+             ((dev->agp_buffer_map == NULL) ||
+              (dev->agp_buffer_map->handle == NULL)))) {
+                DRM_ERROR("failed to ioremap agp regions!\n");
                 return DRM_ERR(ENOMEM);
         }
 
-        ret = mga_warp_install_microcode( dev_priv );
-        if ( ret < 0 ) {
-                DRM_ERROR( "failed to install WARP ucode!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
+        ret = mga_warp_install_microcode(dev_priv);
+        if (ret < 0) {
+                DRM_ERROR("failed to install WARP ucode!\n");
                 return ret;
         }
 
-        ret = mga_warp_init( dev_priv );
-        if ( ret < 0 ) {
-                DRM_ERROR( "failed to init WARP engine!\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
+        ret = mga_warp_init(dev_priv);
+        if (ret < 0) {
+                DRM_ERROR("failed to init WARP engine!\n");
                 return ret;
         }
 
@@ -557,22 +905,18 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
         dev_priv->sarea_priv->last_frame.head = 0;
         dev_priv->sarea_priv->last_frame.wrap = 0;
 
-        if ( mga_freelist_init( dev, dev_priv ) < 0 ) {
-                DRM_ERROR( "could not initialize freelist\n" );
-                /* Assign dev_private so we can do cleanup. */
-                dev->dev_private = (void *)dev_priv;
-                mga_do_cleanup_dma( dev );
+        if (mga_freelist_init(dev, dev_priv) < 0) {
+                DRM_ERROR("could not initialize freelist\n");
                 return DRM_ERR(ENOMEM);
         }
 
-        /* Make dev_private visable to others. */
-        dev->dev_private = (void *)dev_priv;
         return 0;
 }
 
 static int mga_do_cleanup_dma( drm_device_t *dev )
 {
-        DRM_DEBUG( "\n" );
+        int err = 0;
+        DRM_DEBUG("\n");
 
         /* Make sure interrupts are disabled here because the uninstall ioctl
          * may not have been called from userspace and after dev_private
@@ -583,37 +927,73 @@ static int mga_do_cleanup_dma( drm_device_t *dev )
         if ( dev->dev_private ) {
                 drm_mga_private_t *dev_priv = dev->dev_private;
 
-                if ( dev_priv->warp != NULL )
-                        drm_core_ioremapfree( dev_priv->warp, dev );
-                if ( dev_priv->primary != NULL )
-                        drm_core_ioremapfree( dev_priv->primary, dev );
-                if ( dev->agp_buffer_map != NULL )
-                        drm_core_ioremapfree( dev->agp_buffer_map, dev );
+                if ((dev_priv->warp != NULL) 
+                    && (dev_priv->mmio->type != _DRM_CONSISTENT))
+                        drm_core_ioremapfree(dev_priv->warp, dev);
+
+                if ((dev_priv->primary != NULL) 
+                    && (dev_priv->primary->type != _DRM_CONSISTENT))
+                        drm_core_ioremapfree(dev_priv->primary, dev);
+
+                if (dev->agp_buffer_map != NULL)
+                        drm_core_ioremapfree(dev->agp_buffer_map, dev);
 
-                if ( dev_priv->head != NULL ) {
-                        mga_freelist_cleanup( dev );
+                if (dev_priv->used_new_dma_init) {
+#if __OS_HAS_AGP
+                        if (dev_priv->agp_mem != NULL) {
+                                dev_priv->agp_textures = NULL;
+                                drm_unbind_agp(dev_priv->agp_mem);
+
+                                drm_free_agp(dev_priv->agp_mem, dev_priv->agp_pages);
+                                dev_priv->agp_pages = 0;
+                                dev_priv->agp_mem = NULL;
+                        }
+
+                        if ((dev->agp != NULL) && dev->agp->acquired) {
+                                err = drm_agp_release(dev);
+                        }
+#endif
+                        dev_priv->used_new_dma_init = 0;
                 }
 
-                drm_free( dev->dev_private, sizeof(drm_mga_private_t),
-                           DRM_MEM_DRIVER );
-                dev->dev_private = NULL;
+                dev_priv->warp = NULL;
+                dev_priv->primary = NULL;
+                dev_priv->mmio = NULL;
+                dev_priv->status = NULL;
+                dev_priv->sarea = NULL;
+                dev_priv->sarea_priv = NULL;
+                dev->agp_buffer_map = NULL;
+
+                memset(&dev_priv->prim, 0, sizeof(dev_priv->prim));
+                dev_priv->warp_pipe = 0;
+                memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
+
+                if (dev_priv->head != NULL) {
+                        mga_freelist_cleanup(dev);
+                }
         }
 
-        return 0;
+        return err;
 }
 
 int mga_dma_init( DRM_IOCTL_ARGS )
 {
         DRM_DEVICE;
         drm_mga_init_t init;
+        int err;
 
         LOCK_TEST_WITH_RETURN( dev, filp );
 
-        DRM_COPY_FROM_USER_IOCTL( init, (drm_mga_init_t __user *)data, sizeof(init) );
+        DRM_COPY_FROM_USER_IOCTL(init, (drm_mga_init_t __user *) data,
+                                 sizeof(init));
 
         switch ( init.func ) {
         case MGA_INIT_DMA:
-                return mga_do_init_dma( dev, &init );
+                err = mga_do_init_dma(dev, &init);
+                if (err) {
+                        (void) mga_do_cleanup_dma(dev);
+                }
+                return err;
         case MGA_CLEANUP_DMA:
                 return mga_do_cleanup_dma( dev );
         }
@@ -742,7 +1122,21 @@ int mga_dma_buffers( DRM_IOCTL_ARGS )
         return ret;
 }
 
-void mga_driver_pretakedown(drm_device_t *dev)
+/**
+ * Called just before the module is unloaded.
+ */
+int mga_driver_postcleanup(drm_device_t * dev)
+{
+        drm_free(dev->dev_private, sizeof(drm_mga_private_t), DRM_MEM_DRIVER);
+        dev->dev_private = NULL;
+
+        return 0;
+}
+
+/**
+ * Called when the last opener of the device is closed.
+ */
+void mga_driver_pretakedown(drm_device_t * dev)
 {
         mga_do_cleanup_dma( dev );
 }
diff --git a/drivers/char/drm/mga_drm.h b/drivers/char/drm/mga_drm.h
index 521d4451d012..d20aab3bd57b 100644
--- a/drivers/char/drm/mga_drm.h
+++ b/drivers/char/drm/mga_drm.h
@@ -73,7 +73,8 @@
 
 #define MGA_CARD_TYPE_G200      1
 #define MGA_CARD_TYPE_G400      2
-
+#define MGA_CARD_TYPE_G450      3       /* not currently used */
+#define MGA_CARD_TYPE_G550      4
 
 #define MGA_FRONT               0x1
 #define MGA_BACK                0x2
@@ -225,10 +226,6 @@ typedef struct _drm_mga_sarea {
 } drm_mga_sarea_t;
 
 
-/* WARNING: If you change any of these defines, make sure to change the
- * defines in the Xserver file (xf86drmMga.h)
- */
-
 /* MGA specific ioctls
  * The device specific ioctl range is 0x40 to 0x79.
  */
@@ -243,6 +240,14 @@ typedef struct _drm_mga_sarea {
 #define DRM_MGA_BLIT     0x08
 #define DRM_MGA_GETPARAM 0x09
 
+/* 3.2:
+ * ioctls for operating on fences.
+ */
+#define DRM_MGA_SET_FENCE      0x0a
+#define DRM_MGA_WAIT_FENCE     0x0b
+#define DRM_MGA_DMA_BOOTSTRAP  0x0c
+
+
 #define DRM_IOCTL_MGA_INIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INIT, drm_mga_init_t)
 #define DRM_IOCTL_MGA_FLUSH    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, drm_lock_t)
 #define DRM_IOCTL_MGA_RESET    DRM_IO(  DRM_COMMAND_BASE + DRM_MGA_RESET)
@@ -253,6 +258,9 @@ typedef struct _drm_mga_sarea {
 #define DRM_IOCTL_MGA_ILOAD    DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_ILOAD, drm_mga_iload_t)
 #define DRM_IOCTL_MGA_BLIT     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_BLIT, drm_mga_blit_t)
 #define DRM_IOCTL_MGA_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_GETPARAM, drm_mga_getparam_t)
+#define DRM_IOCTL_MGA_SET_FENCE     DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_SET_FENCE, uint32_t)
+#define DRM_IOCTL_MGA_WAIT_FENCE    DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_WAIT_FENCE, uint32_t)
+#define DRM_IOCTL_MGA_DMA_BOOTSTRAP DRM_IOWR(DRM_COMMAND_BASE + DRM_MGA_DMA_BOOTSTRAP, drm_mga_dma_bootstrap_t)
 
 typedef struct _drm_mga_warp_index {
         int installed;
@@ -291,12 +299,72 @@ typedef struct drm_mga_init {
         unsigned long buffers_offset;
 } drm_mga_init_t;
 
-typedef struct drm_mga_fullscreen {
-        enum {
-                MGA_INIT_FULLSCREEN    = 0x01,
-                MGA_CLEANUP_FULLSCREEN = 0x02
-        } func;
-} drm_mga_fullscreen_t;
+typedef struct drm_mga_dma_bootstrap {
+        /**
+         * \name AGP texture region
+         * 
+         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, these fields will
+         * be filled in with the actual AGP texture settings.
+         * 
+         * \warning
+         * If these fields are non-zero, but dma_mga_dma_bootstrap::agp_mode
+         * is zero, it means that PCI memory (most likely through the use of
+         * an IOMMU) is being used for "AGP" textures.
+         */
+        /*@{*/
+        unsigned long texture_handle; /**< Handle used to map AGP textures. */
+        uint32_t     texture_size;    /**< Size of the AGP texture region. */
+        /*@}*/
+
+
+        /**
+         * Requested size of the primary DMA region.
+         * 
+         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
+         * filled in with the actual AGP mode.  If AGP was not available
+         */
+        uint32_t primary_size;
+
+
+        /**
+         * Requested number of secondary DMA buffers.
+         * 
+         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
+         * filled in with the actual number of secondary DMA buffers
+         * allocated.  Particularly when PCI DMA is used, this may be
+         * (subtantially) less than the number requested.
+         */
+        uint32_t secondary_bin_count;
+        
+        
+        /**
+         * Requested size of each secondary DMA buffer.
+         * 
+         * While the kernel \b is free to reduce
+         * dma_mga_dma_bootstrap::secondary_bin_count, it is \b not allowed
+         * to reduce dma_mga_dma_bootstrap::secondary_bin_size.
+         */
+        uint32_t secondary_bin_size;
+
+
+        /**
+         * Bit-wise mask of AGPSTAT2_* values.  Currently only \c AGPSTAT2_1X,
+         * \c AGPSTAT2_2X, and \c AGPSTAT2_4X are supported.  If this value is
+         * zero, it means that PCI DMA should be used, even if AGP is
+         * possible.
+         * 
+         * On return from the DRM_MGA_DMA_BOOTSTRAP ioctl, this field will be
+         * filled in with the actual AGP mode.  If AGP was not available
+         * (i.e., PCI DMA was used), this value will be zero.
+         */
+        uint32_t agp_mode;
+
+
+        /**
+         * Desired AGP GART size, measured in megabytes.
+         */
+        uint8_t agp_size;
+} drm_mga_dma_bootstrap_t;
 
 typedef struct drm_mga_clear {
         unsigned int flags;
@@ -341,6 +409,14 @@ typedef struct _drm_mga_blit {
  */
 #define MGA_PARAM_IRQ_NR            1
 
+/* 3.2: Query the actual card type.  The DDX only distinguishes between
+ * G200 chips and non-G200 chips, which it calls G400.  It turns out that
+ * there are some very sublte differences between the G4x0 chips and the G550
+ * chips.  Using this parameter query, a client-side driver can detect the
+ * difference between a G4x0 and a G550.
+ */
+#define MGA_PARAM_CARD_TYPE         2
+
 typedef struct drm_mga_getparam {
         int param;
         void __user *value;
diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
index 844cca9cb29d..daabbba3b297 100644
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -38,8 +38,15 @@
   
 #include "drm_pciids.h"
 
+static int mga_driver_device_is_agp(drm_device_t * dev);
 static int postinit( struct drm_device *dev, unsigned long flags )
 {
+        drm_mga_private_t * const dev_priv =
+                (drm_mga_private_t *) dev->dev_private;
+
+        dev_priv->mmio_base = pci_resource_start(dev->pdev, 1);
+        dev_priv->mmio_size = pci_resource_len(dev->pdev, 1);
+
         dev->counters += 3;
         dev->types[6] = _DRM_STAT_IRQ;
         dev->types[7] = _DRM_STAT_PRIMARY;
@@ -79,8 +86,11 @@ extern int mga_max_ioctl;
 
 static struct drm_driver driver = {
         .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
+        .preinit = mga_driver_preinit,
+        .postcleanup = mga_driver_postcleanup,
         .pretakedown = mga_driver_pretakedown,
         .dma_quiescent = mga_driver_dma_quiescent,
+        .device_is_agp = mga_driver_device_is_agp,
         .vblank_wait = mga_driver_vblank_wait,
         .irq_preinstall = mga_driver_irq_preinstall,
         .irq_postinstall = mga_driver_irq_postinstall,
@@ -128,3 +138,38 @@ module_exit(mga_exit);
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
 MODULE_LICENSE("GPL and additional rights");
+
+/**
+ * Determine if the device really is AGP or not.
+ *
+ * In addition to the usual tests performed by \c drm_device_is_agp, this
+ * function detects PCI G450 cards that appear to the system exactly like
+ * AGP G450 cards.
+ *
+ * \param dev   The device to be tested.
+ *
+ * \returns
+ * If the device is a PCI G450, zero is returned.  Otherwise 2 is returned.
+ */
+int mga_driver_device_is_agp(drm_device_t * dev)
+{
+        const struct pci_dev * const pdev = dev->pdev;
+
+
+        /* There are PCI versions of the G450.  These cards have the
+         * same PCI ID as the AGP G450, but have an additional PCI-to-PCI
+         * bridge chip.  We detect these cards, which are not currently
+         * supported by this driver, by looking at the device ID of the
+         * bus the "card" is on.  If vendor is 0x3388 (Hint Corp) and the
+         * device is 0x0021 (HB6 Universal PCI-PCI bridge), we reject the
+         * device.
+         */
+        
+        if ( (pdev->device == 0x0525)
+             && (pdev->bus->self->vendor == 0x3388)
+             && (pdev->bus->self->device == 0x0021) ) {
+                return 0;
+        }
+
+        return 2;
+}
diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index 9412e2816eb7..b22fdbd4f830 100644
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
@@ -38,10 +38,10 @@
 
 #define DRIVER_NAME             "mga"
 #define DRIVER_DESC             "Matrox G200/G400"
-#define DRIVER_DATE             "20021029"
+#define DRIVER_DATE             "20050607"
 
 #define DRIVER_MAJOR            3
-#define DRIVER_MINOR            1
+#define DRIVER_MINOR            2
 #define DRIVER_PATCHLEVEL       0
 
 typedef struct drm_mga_primary_buffer {
@@ -87,9 +87,43 @@ typedef struct drm_mga_private {
         int chipset;
         int usec_timeout;
 
+        /**
+         * If set, the new DMA initialization sequence was used.  This is
+         * primarilly used to select how the driver should uninitialized its
+         * internal DMA structures.
+         */
+        int used_new_dma_init;
+
+        /**
+         * If AGP memory is used for DMA buffers, this will be the value
+         * \c MGA_PAGPXFER.  Otherwise, it will be zero (for a PCI transfer).
+         */
+        u32 dma_access;
+
+        /**
+         * If AGP memory is used for DMA buffers, this will be the value
+         * \c MGA_WAGP_ENABLE.  Otherwise, it will be zero (for a PCI
+         * transfer).
+         */
+        u32 wagp_enable;
+
+        /**
+         * \name MMIO region parameters.
+         * 
+         * \sa drm_mga_private_t::mmio
+         */
+        /*@{*/
+        u32 mmio_base;             /**< Bus address of base of MMIO. */
+        u32 mmio_size;             /**< Size of the MMIO region. */
+        /*@}*/
+
         u32 clear_cmd;
         u32 maccess;
 
+        wait_queue_head_t fence_queue;
+        atomic_t last_fence_retired;
+        u32 next_fence_to_post;
+
         unsigned int fb_cpp;
         unsigned int front_offset;
         unsigned int front_pitch;
@@ -108,35 +142,43 @@ typedef struct drm_mga_private {
         drm_local_map_t *status;
         drm_local_map_t *warp;
         drm_local_map_t *primary;
-        drm_local_map_t *buffers;
         drm_local_map_t *agp_textures;
+        
+        DRM_AGP_MEM *agp_mem;
+        unsigned int agp_pages;
 } drm_mga_private_t;
 
                                 /* mga_dma.c */
-extern int mga_dma_init( DRM_IOCTL_ARGS );
-extern int mga_dma_flush( DRM_IOCTL_ARGS );
-extern int mga_dma_reset( DRM_IOCTL_ARGS );
-extern int mga_dma_buffers( DRM_IOCTL_ARGS );
-extern void mga_driver_pretakedown(drm_device_t *dev);
-extern int mga_driver_dma_quiescent(drm_device_t *dev);
-
-extern int mga_do_wait_for_idle( drm_mga_private_t *dev_priv );
-
-extern void mga_do_dma_flush( drm_mga_private_t *dev_priv );
-extern void mga_do_dma_wrap_start( drm_mga_private_t *dev_priv );
-extern void mga_do_dma_wrap_end( drm_mga_private_t *dev_priv );
+extern int mga_driver_preinit(drm_device_t * dev, unsigned long flags);
+extern int mga_dma_bootstrap(DRM_IOCTL_ARGS);
+extern int mga_dma_init(DRM_IOCTL_ARGS);
+extern int mga_dma_flush(DRM_IOCTL_ARGS);
+extern int mga_dma_reset(DRM_IOCTL_ARGS);
+extern int mga_dma_buffers(DRM_IOCTL_ARGS);
+extern int mga_driver_postcleanup(drm_device_t * dev);
+extern void mga_driver_pretakedown(drm_device_t * dev);
+extern int mga_driver_dma_quiescent(drm_device_t * dev);
+
+extern int mga_do_wait_for_idle(drm_mga_private_t * dev_priv);
+
+extern void mga_do_dma_flush(drm_mga_private_t * dev_priv);
+extern void mga_do_dma_wrap_start(drm_mga_private_t * dev_priv);
+extern void mga_do_dma_wrap_end(drm_mga_private_t * dev_priv);
 
 extern int mga_freelist_put( drm_device_t *dev, drm_buf_t *buf );
 
                                 /* mga_warp.c */
-extern int mga_warp_install_microcode( drm_mga_private_t *dev_priv );
-extern int mga_warp_init( drm_mga_private_t *dev_priv );
-
-extern int mga_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence);
-extern irqreturn_t mga_driver_irq_handler( DRM_IRQ_ARGS );
-extern void mga_driver_irq_preinstall( drm_device_t *dev );
-extern void mga_driver_irq_postinstall( drm_device_t *dev );
-extern void mga_driver_irq_uninstall( drm_device_t *dev );
+extern unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv);
+extern int mga_warp_install_microcode(drm_mga_private_t * dev_priv);
+extern int mga_warp_init(drm_mga_private_t * dev_priv);
+
+                                /* mga_irq.c */
+extern int mga_driver_fence_wait(drm_device_t * dev, unsigned int *sequence);
+extern int mga_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence);
+extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
+extern void mga_driver_irq_preinstall(drm_device_t * dev);
+extern void mga_driver_irq_postinstall(drm_device_t * dev);
+extern void mga_driver_irq_uninstall(drm_device_t * dev);
 extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,
                              unsigned long arg);
 
@@ -527,6 +569,12 @@ do {									\
  */
 #define MGA_EXEC                        0x0100
 
+/* AGP PLL encoding (for G200 only).
+ */
+#define MGA_AGP_PLL                     0x1e4c
+#       define MGA_AGP2XPLL_DISABLE             (0 << 0)
+#       define MGA_AGP2XPLL_ENABLE              (1 << 0)
+
 /* Warp registers
  */
 #define MGA_WR0                         0x2d00
diff --git a/drivers/char/drm/mga_ioc32.c b/drivers/char/drm/mga_ioc32.c
index bc745cfa2095..77d738e75a4d 100644
--- a/drivers/char/drm/mga_ioc32.c
+++ b/drivers/char/drm/mga_ioc32.c
@@ -129,9 +129,76 @@ static int compat_mga_getparam(struct file *file, unsigned int cmd,
                          DRM_IOCTL_MGA_GETPARAM, (unsigned long)getparam);
 }
 
+typedef struct drm_mga_drm_bootstrap32 {
+        u32 texture_handle;
+        u32 texture_size;
+        u32 primary_size;
+        u32 secondary_bin_count;
+        u32 secondary_bin_size;
+        u32 agp_mode;
+        u8 agp_size;
+} drm_mga_dma_bootstrap32_t;
+
+static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
+                                    unsigned long arg)
+{
+        drm_mga_dma_bootstrap32_t dma_bootstrap32;
+        drm_mga_dma_bootstrap_t __user *dma_bootstrap;
+        int err;
+
+        if (copy_from_user(&dma_bootstrap32, (void __user *)arg,
+                           sizeof(dma_bootstrap32)))
+                return -EFAULT;
+
+        dma_bootstrap = compat_alloc_user_space(sizeof(*dma_bootstrap));
+        if (!access_ok(VERIFY_WRITE, dma_bootstrap, sizeof(*dma_bootstrap))
+            || __put_user(dma_bootstrap32.texture_handle,
+                          &dma_bootstrap->texture_handle)
+            || __put_user(dma_bootstrap32.texture_size,
+                          &dma_bootstrap->texture_size)
+            || __put_user(dma_bootstrap32.primary_size,
+                          &dma_bootstrap->primary_size)
+            || __put_user(dma_bootstrap32.secondary_bin_count,
+                          &dma_bootstrap->secondary_bin_count)
+            || __put_user(dma_bootstrap32.secondary_bin_size,
+                          &dma_bootstrap->secondary_bin_size)
+            || __put_user(dma_bootstrap32.agp_mode, &dma_bootstrap->agp_mode)
+            || __put_user(dma_bootstrap32.agp_size, &dma_bootstrap->agp_size))
+                return -EFAULT;
+
+        err = drm_ioctl(file->f_dentry->d_inode, file,
+                        DRM_IOCTL_MGA_DMA_BOOTSTRAP,
+                        (unsigned long)dma_bootstrap);
+        if (err)
+                return err;
+
+        if (__get_user(dma_bootstrap32.texture_handle,
+                       &dma_bootstrap->texture_handle)
+            || __get_user(dma_bootstrap32.texture_size,
+                          &dma_bootstrap->texture_size)
+            || __get_user(dma_bootstrap32.primary_size,
+                          &dma_bootstrap->primary_size)
+            || __get_user(dma_bootstrap32.secondary_bin_count,
+                          &dma_bootstrap->secondary_bin_count)
+            || __get_user(dma_bootstrap32.secondary_bin_size,
+                          &dma_bootstrap->secondary_bin_size)
+            || __get_user(dma_bootstrap32.agp_mode,
+                          &dma_bootstrap->agp_mode)
+            || __get_user(dma_bootstrap32.agp_size,
+                          &dma_bootstrap->agp_size))
+                return -EFAULT;
+
+        if (copy_to_user((void __user *)arg, &dma_bootstrap32,
+                         sizeof(dma_bootstrap32)))
+                return -EFAULT;
+
+        return 0;
+}
+
 drm_ioctl_compat_t *mga_compat_ioctls[] = {
         [DRM_MGA_INIT] = compat_mga_init,
         [DRM_MGA_GETPARAM] = compat_mga_getparam,
+        [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
 };
 
 /**
diff --git a/drivers/char/drm/mga_irq.c b/drivers/char/drm/mga_irq.c
index bc0b6b5d43a6..52eaa4e788f9 100644
--- a/drivers/char/drm/mga_irq.c
+++ b/drivers/char/drm/mga_irq.c
@@ -41,15 +41,40 @@ irqreturn_t mga_driver_irq_handler( DRM_IRQ_ARGS )
         drm_mga_private_t *dev_priv = 
            (drm_mga_private_t *)dev->dev_private;
         int status;
+        int handled = 0;
+
+        status = MGA_READ(MGA_STATUS);
 
-        status = MGA_READ( MGA_STATUS );
-        
         /* VBLANK interrupt */
         if ( status & MGA_VLINEPEN ) {
                 MGA_WRITE( MGA_ICLEAR, MGA_VLINEICLR );
                 atomic_inc(&dev->vbl_received);
                 DRM_WAKEUP(&dev->vbl_queue);
-                drm_vbl_send_signals( dev );
+                drm_vbl_send_signals(dev);
+                handled = 1;
+        }
+
+        /* SOFTRAP interrupt */
+        if (status & MGA_SOFTRAPEN) {
+                const u32 prim_start = MGA_READ(MGA_PRIMADDRESS);
+                const u32 prim_end   = MGA_READ(MGA_PRIMEND);
+
+
+                MGA_WRITE(MGA_ICLEAR, MGA_SOFTRAPICLR);
+
+                /* In addition to clearing the interrupt-pending bit, we
+                 * have to write to MGA_PRIMEND to re-start the DMA operation.
+                 */
+                if ( (prim_start & ~0x03) != (prim_end & ~0x03) ) {
+                        MGA_WRITE(MGA_PRIMEND, prim_end);
+                }
+
+                atomic_inc(&dev_priv->last_fence_retired);
+                DRM_WAKEUP(&dev_priv->fence_queue);
+                handled = 1;
+        }
+
+        if ( handled ) {
                 return IRQ_HANDLED;
         }
         return IRQ_NONE;
@@ -73,9 +98,28 @@ int mga_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence)
         return ret;
 }
 
-void mga_driver_irq_preinstall( drm_device_t *dev ) {
-        drm_mga_private_t *dev_priv = 
-           (drm_mga_private_t *)dev->dev_private;
+int mga_driver_fence_wait(drm_device_t * dev, unsigned int *sequence)
+{
+        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
+        unsigned int cur_fence;
+        int ret = 0;
+
+        /* Assume that the user has missed the current sequence number
+         * by about a day rather than she wants to wait for years
+         * using fences.
+         */
+        DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
+                    (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
+                      - *sequence) <= (1 << 23)));
+
+        *sequence = cur_fence;
+
+        return ret;
+}
+
+void mga_driver_irq_preinstall(drm_device_t * dev)
+{
+        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
 
         /* Disable *all* interrupts */
         MGA_WRITE( MGA_IEN, 0 );
@@ -83,12 +127,14 @@ void mga_driver_irq_preinstall( drm_device_t *dev ) {
         MGA_WRITE( MGA_ICLEAR, ~0 );
 }
 
-void mga_driver_irq_postinstall( drm_device_t *dev ) {
-        drm_mga_private_t *dev_priv = 
-           (drm_mga_private_t *)dev->dev_private;
+void mga_driver_irq_postinstall(drm_device_t * dev)
+{
+        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
+
+        DRM_INIT_WAITQUEUE( &dev_priv->fence_queue );
 
-        /* Turn on VBL interrupt */
-        MGA_WRITE( MGA_IEN, MGA_VLINEIEN );
+        /* Turn on vertical blank interrupt and soft trap interrupt. */
+        MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN);
 }
 
 void mga_driver_irq_uninstall( drm_device_t *dev ) {
@@ -98,5 +144,7 @@ void mga_driver_irq_uninstall( drm_device_t *dev ) {
                 return;
 
         /* Disable *all* interrupts */
-        MGA_WRITE( MGA_IEN, 0 );
+        MGA_WRITE(MGA_IEN, 0);
+        
+        dev->irq_enabled = 0;
 }
diff --git a/drivers/char/drm/mga_state.c b/drivers/char/drm/mga_state.c
index 3c7a8f5ba501..05bbb4719376 100644
--- a/drivers/char/drm/mga_state.c
+++ b/drivers/char/drm/mga_state.c
@@ -53,16 +53,16 @@ static void mga_emit_clip_rect( drm_mga_private_t *dev_priv,
 
         /* Force reset of DWGCTL on G400 (eliminates clip disable bit).
          */
-        if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) {
-                DMA_BLOCK( MGA_DWGCTL,          ctx->dwgctl,
-                           MGA_LEN + MGA_EXEC,  0x80000000,
-                           MGA_DWGCTL,          ctx->dwgctl,
-                           MGA_LEN + MGA_EXEC,  0x80000000 );
+        if (dev_priv->chipset == MGA_CARD_TYPE_G400) {
+                DMA_BLOCK(MGA_DWGCTL, ctx->dwgctl,
+                          MGA_LEN + MGA_EXEC, 0x80000000,
+                          MGA_DWGCTL, ctx->dwgctl,
+                          MGA_LEN + MGA_EXEC, 0x80000000);
         }
-        DMA_BLOCK( MGA_DMAPAD,  0x00000000,
-                   MGA_CXBNDRY, (box->x2 << 16) | box->x1,
-                   MGA_YTOP,    box->y1 * pitch,
-                   MGA_YBOT,    box->y2 * pitch );
+        DMA_BLOCK(MGA_DMAPAD, 0x00000000,
+                  MGA_CXBNDRY, ((box->x2 - 1) << 16) | box->x1,
+                  MGA_YTOP, box->y1 * pitch,
+                  MGA_YBOT, (box->y2 - 1) * pitch);
 
         ADVANCE_DMA();
 }
@@ -260,12 +260,11 @@ static __inline__ void mga_g200_emit_pipe( drm_mga_private_t *dev_priv )
 
         /* Padding required to to hardware bug.
          */
-        DMA_BLOCK( MGA_DMAPAD,  0xffffffff,
-                   MGA_DMAPAD,  0xffffffff,
-                   MGA_DMAPAD,  0xffffffff,
-                   MGA_WIADDR,  (dev_priv->warp_pipe_phys[pipe] |
-                                 MGA_WMODE_START |
-                                 MGA_WAGP_ENABLE) );
+        DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
+                  MGA_DMAPAD, 0xffffffff,
+                  MGA_DMAPAD, 0xffffffff,
+                  MGA_WIADDR, (dev_priv->warp_pipe_phys[pipe] |
+                               MGA_WMODE_START | dev_priv->wagp_enable));
 
         ADVANCE_DMA();
 }
@@ -342,12 +341,11 @@ static __inline__ void mga_g400_emit_pipe( drm_mga_private_t *dev_priv )
                    MGA_WR60,    MGA_G400_WR_MAGIC );    /* tex1 height       */
 
         /* Padding required to to hardware bug */
-        DMA_BLOCK( MGA_DMAPAD,  0xffffffff,
-                   MGA_DMAPAD,  0xffffffff,
-                   MGA_DMAPAD,  0xffffffff,
-                   MGA_WIADDR2, (dev_priv->warp_pipe_phys[pipe] |
-                                 MGA_WMODE_START |
-                                 MGA_WAGP_ENABLE) );
+        DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
+                  MGA_DMAPAD, 0xffffffff,
+                  MGA_DMAPAD, 0xffffffff,
+                  MGA_WIADDR2, (dev_priv->warp_pipe_phys[pipe] |
+                                MGA_WMODE_START | dev_priv->wagp_enable));
 
         ADVANCE_DMA();
 }
@@ -459,9 +457,9 @@ static int mga_verify_state( drm_mga_private_t *dev_priv )
         if ( dirty & MGA_UPLOAD_TEX0 )
                 ret |= mga_verify_tex( dev_priv, 0 );
 
-        if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) {
-                if ( dirty & MGA_UPLOAD_TEX1 )
-                        ret |= mga_verify_tex( dev_priv, 1 );
+        if (dev_priv->chipset >= MGA_CARD_TYPE_G400) {
+                if (dirty & MGA_UPLOAD_TEX1)
+                        ret |= mga_verify_tex(dev_priv, 1);
 
                 if ( dirty & MGA_UPLOAD_PIPE )
                         ret |= ( sarea_priv->warp_pipe > MGA_MAX_G400_PIPES );
@@ -686,12 +684,12 @@ static void mga_dma_dispatch_vertex( drm_device_t *dev, drm_buf_t *buf )
 
                         BEGIN_DMA( 1 );
 
-                        DMA_BLOCK( MGA_DMAPAD,          0x00000000,
-                                   MGA_DMAPAD,          0x00000000,
-                                   MGA_SECADDRESS,      (address |
-                                                         MGA_DMA_VERTEX),
-                                   MGA_SECEND,          ((address + length) |
-                                                         MGA_PAGPXFER) );
+                        DMA_BLOCK(MGA_DMAPAD, 0x00000000,
+                                  MGA_DMAPAD, 0x00000000,
+                                  MGA_SECADDRESS, (address |
+                                                   MGA_DMA_VERTEX),
+                                  MGA_SECEND, ((address + length) |
+                                               dev_priv->dma_access));
 
                         ADVANCE_DMA();
                 } while ( ++i < sarea_priv->nbox );
@@ -733,11 +731,11 @@ static void mga_dma_dispatch_indices( drm_device_t *dev, drm_buf_t *buf,
 
                         BEGIN_DMA( 1 );
 
-                        DMA_BLOCK( MGA_DMAPAD,          0x00000000,
-                                   MGA_DMAPAD,          0x00000000,
-                                   MGA_SETUPADDRESS,    address + start,
-                                   MGA_SETUPEND,        ((address + end) |
-                                                         MGA_PAGPXFER) );
+                        DMA_BLOCK(MGA_DMAPAD, 0x00000000,
+                                  MGA_DMAPAD, 0x00000000,
+                                  MGA_SETUPADDRESS, address + start,
+                                  MGA_SETUPEND, ((address + end) |
+                                                 dev_priv->dma_access));
 
                         ADVANCE_DMA();
                 } while ( ++i < sarea_priv->nbox );
@@ -764,7 +762,7 @@ static void mga_dma_dispatch_iload( drm_device_t *dev, drm_buf_t *buf,
         drm_mga_private_t *dev_priv = dev->dev_private;
         drm_mga_buf_priv_t *buf_priv = buf->dev_private;
         drm_mga_context_regs_t *ctx = &dev_priv->sarea_priv->context_state;
-        u32 srcorg = buf->bus_address | MGA_SRCACC_AGP | MGA_SRCMAP_SYSMEM;
+        u32 srcorg = buf->bus_address | dev_priv->dma_access | MGA_SRCMAP_SYSMEM;
         u32 y2;
         DMA_LOCALS;
         DRM_DEBUG( "buf=%d used=%d\n", buf->idx, buf->used );
@@ -1095,6 +1093,9 @@ static int mga_getparam( DRM_IOCTL_ARGS )
         case MGA_PARAM_IRQ_NR:
                 value = dev->irq;
                 break;
+        case MGA_PARAM_CARD_TYPE:
+                value = dev_priv->chipset;
+                break;
         default:
                 return DRM_ERR(EINVAL);
         }
@@ -1107,17 +1108,82 @@ static int mga_getparam( DRM_IOCTL_ARGS )
         return 0;
 }
 
+static int mga_set_fence(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_mga_private_t *dev_priv = dev->dev_private;
+        u32 temp;
+        DMA_LOCALS;
+
+        if (!dev_priv) {
+                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                return DRM_ERR(EINVAL);
+        }
+
+        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
+
+        /* I would normal do this assignment in the declaration of temp,
+         * but dev_priv may be NULL.
+         */
+
+        temp = dev_priv->next_fence_to_post;
+        dev_priv->next_fence_to_post++;
+
+        BEGIN_DMA(1);
+        DMA_BLOCK(MGA_DMAPAD, 0x00000000,
+                  MGA_DMAPAD, 0x00000000,
+                  MGA_DMAPAD, 0x00000000,
+                  MGA_SOFTRAP, 0x00000000);
+        ADVANCE_DMA();
+
+        if (DRM_COPY_TO_USER( (u32 __user *) data, & temp, sizeof(u32))) {
+                DRM_ERROR("copy_to_user\n");
+                return DRM_ERR(EFAULT);
+        }
+
+        return 0;
+}
+
+static int mga_wait_fence(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_mga_private_t *dev_priv = dev->dev_private;
+        u32 fence;
+
+        if (!dev_priv) {
+                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                return DRM_ERR(EINVAL);
+        }
+
+        DRM_COPY_FROM_USER_IOCTL(fence, (u32 __user *) data, sizeof(u32));
+
+        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
+
+        mga_driver_fence_wait(dev, & fence);
+
+        if (DRM_COPY_TO_USER( (u32 __user *) data, & fence, sizeof(u32))) {
+                DRM_ERROR("copy_to_user\n");
+                return DRM_ERR(EFAULT);
+        }
+
+        return 0;
+}
+
 drm_ioctl_desc_t mga_ioctls[] = {
-        [DRM_IOCTL_NR(DRM_MGA_INIT)]    = { mga_dma_init,    1, 1 },
-        [DRM_IOCTL_NR(DRM_MGA_FLUSH)]   = { mga_dma_flush,   1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_RESET)]   = { mga_dma_reset,   1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_SWAP)]    = { mga_dma_swap,    1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_CLEAR)]   = { mga_dma_clear,   1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_VERTEX)]  = { mga_dma_vertex,  1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_INDICES)] = { mga_dma_indices, 1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_ILOAD)]   = { mga_dma_iload,   1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_BLIT)]    = { mga_dma_blit,    1, 0 },
-        [DRM_IOCTL_NR(DRM_MGA_GETPARAM)]= { mga_getparam,    1, 0 },
+        [DRM_IOCTL_NR(DRM_MGA_INIT)] = {mga_dma_init, 1, 1},
+        [DRM_IOCTL_NR(DRM_MGA_FLUSH)] = {mga_dma_flush, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_RESET)] = {mga_dma_reset, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_SWAP)] = {mga_dma_swap, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_CLEAR)] = {mga_dma_clear, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_VERTEX)] = {mga_dma_vertex, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_INDICES)] = {mga_dma_indices, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_ILOAD)] = {mga_dma_iload, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_BLIT)] = {mga_dma_blit, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_GETPARAM)] = {mga_getparam, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_SET_FENCE)] = {mga_set_fence, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_WAIT_FENCE)] = {mga_wait_fence, 1, 0},
+        [DRM_IOCTL_NR(DRM_MGA_DMA_BOOTSTRAP)] = {mga_dma_bootstrap, 1, 1},
+
 };
 
 int mga_max_ioctl = DRM_ARRAY_SIZE(mga_ioctls);
diff --git a/drivers/char/drm/mga_warp.c b/drivers/char/drm/mga_warp.c
index 0a3a0cc700dc..55ccc8a0ac29 100644
--- a/drivers/char/drm/mga_warp.c
+++ b/drivers/char/drm/mga_warp.c
@@ -48,65 +48,52 @@ do {									\
         vcbase += WARP_UCODE_SIZE( which );                             \
 } while (0)
 
-
-static unsigned int mga_warp_g400_microcode_size( drm_mga_private_t *dev_priv )
-{
-        unsigned int size;
-
-        size = ( WARP_UCODE_SIZE( warp_g400_tgz ) +
-                 WARP_UCODE_SIZE( warp_g400_tgza ) +
-                 WARP_UCODE_SIZE( warp_g400_tgzaf ) +
-                 WARP_UCODE_SIZE( warp_g400_tgzf ) +
-                 WARP_UCODE_SIZE( warp_g400_tgzs ) +
-                 WARP_UCODE_SIZE( warp_g400_tgzsa ) +
-                 WARP_UCODE_SIZE( warp_g400_tgzsaf ) +
-                 WARP_UCODE_SIZE( warp_g400_tgzsf ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gz ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gza ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gzaf ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gzf ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gzs ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gzsa ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gzsaf ) +
-                 WARP_UCODE_SIZE( warp_g400_t2gzsf ) );
-
-        size = PAGE_ALIGN( size );
-
-        DRM_DEBUG( "G400 ucode size = %d bytes\n", size );
-        return size;
-}
-
-static unsigned int mga_warp_g200_microcode_size( drm_mga_private_t *dev_priv )
+static const unsigned int mga_warp_g400_microcode_size =
+               (WARP_UCODE_SIZE(warp_g400_tgz) +
+                WARP_UCODE_SIZE(warp_g400_tgza) +
+                WARP_UCODE_SIZE(warp_g400_tgzaf) +
+                WARP_UCODE_SIZE(warp_g400_tgzf) +
+                WARP_UCODE_SIZE(warp_g400_tgzs) +
+                WARP_UCODE_SIZE(warp_g400_tgzsa) +
+                WARP_UCODE_SIZE(warp_g400_tgzsaf) +
+                WARP_UCODE_SIZE(warp_g400_tgzsf) +
+                WARP_UCODE_SIZE(warp_g400_t2gz) +
+                WARP_UCODE_SIZE(warp_g400_t2gza) +
+                WARP_UCODE_SIZE(warp_g400_t2gzaf) +
+                WARP_UCODE_SIZE(warp_g400_t2gzf) +
+                WARP_UCODE_SIZE(warp_g400_t2gzs) +
+                WARP_UCODE_SIZE(warp_g400_t2gzsa) +
+                WARP_UCODE_SIZE(warp_g400_t2gzsaf) +
+                WARP_UCODE_SIZE(warp_g400_t2gzsf));
+
+static const unsigned int mga_warp_g200_microcode_size =
+               (WARP_UCODE_SIZE(warp_g200_tgz) +
+                WARP_UCODE_SIZE(warp_g200_tgza) +
+                WARP_UCODE_SIZE(warp_g200_tgzaf) +
+                WARP_UCODE_SIZE(warp_g200_tgzf) +
+                WARP_UCODE_SIZE(warp_g200_tgzs) +
+                WARP_UCODE_SIZE(warp_g200_tgzsa) +
+                WARP_UCODE_SIZE(warp_g200_tgzsaf) +
+                WARP_UCODE_SIZE(warp_g200_tgzsf));
+
+
+unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv)
 {
-        unsigned int size;
-
-        size = ( WARP_UCODE_SIZE( warp_g200_tgz ) +
-                 WARP_UCODE_SIZE( warp_g200_tgza ) +
-                 WARP_UCODE_SIZE( warp_g200_tgzaf ) +
-                 WARP_UCODE_SIZE( warp_g200_tgzf ) +
-                 WARP_UCODE_SIZE( warp_g200_tgzs ) +
-                 WARP_UCODE_SIZE( warp_g200_tgzsa ) +
-                 WARP_UCODE_SIZE( warp_g200_tgzsaf ) +
-                 WARP_UCODE_SIZE( warp_g200_tgzsf ) );
-
-        size = PAGE_ALIGN( size );
-
-        DRM_DEBUG( "G200 ucode size = %d bytes\n", size );
-        return size;
+        switch (dev_priv->chipset) {
+        case MGA_CARD_TYPE_G400:
+        case MGA_CARD_TYPE_G550:
+                return PAGE_ALIGN(mga_warp_g400_microcode_size);
+        case MGA_CARD_TYPE_G200:
+                return PAGE_ALIGN(mga_warp_g200_microcode_size);
+        default:
+                return 0;
+        }
 }
 
 static int mga_warp_install_g400_microcode( drm_mga_private_t *dev_priv )
 {
         unsigned char *vcbase = dev_priv->warp->handle;
         unsigned long pcbase = dev_priv->warp->offset;
-        unsigned int size;
-
-        size = mga_warp_g400_microcode_size( dev_priv );
-        if ( size > dev_priv->warp->size ) {
-                DRM_ERROR( "microcode too large! (%u > %lu)\n",
-                           size, dev_priv->warp->size );
-                return DRM_ERR(ENOMEM);
-        }
 
         memset( dev_priv->warp_pipe_phys, 0,
                 sizeof(dev_priv->warp_pipe_phys) );
@@ -136,35 +123,36 @@ static int mga_warp_install_g200_microcode( drm_mga_private_t *dev_priv )
 {
         unsigned char *vcbase = dev_priv->warp->handle;
         unsigned long pcbase = dev_priv->warp->offset;
-        unsigned int size;
-
-        size = mga_warp_g200_microcode_size( dev_priv );
-        if ( size > dev_priv->warp->size ) {
-                DRM_ERROR( "microcode too large! (%u > %lu)\n",
-                           size, dev_priv->warp->size );
-                return DRM_ERR(ENOMEM);
-        }
 
-        memset( dev_priv->warp_pipe_phys, 0,
-                sizeof(dev_priv->warp_pipe_phys) );
+        memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
 
-        WARP_UCODE_INSTALL( warp_g200_tgz,      MGA_WARP_TGZ );
-        WARP_UCODE_INSTALL( warp_g200_tgzf,     MGA_WARP_TGZF );
-        WARP_UCODE_INSTALL( warp_g200_tgza,     MGA_WARP_TGZA );
-        WARP_UCODE_INSTALL( warp_g200_tgzaf,    MGA_WARP_TGZAF );
-        WARP_UCODE_INSTALL( warp_g200_tgzs,     MGA_WARP_TGZS );
-        WARP_UCODE_INSTALL( warp_g200_tgzsf,    MGA_WARP_TGZSF );
-        WARP_UCODE_INSTALL( warp_g200_tgzsa,    MGA_WARP_TGZSA );
-        WARP_UCODE_INSTALL( warp_g200_tgzsaf,   MGA_WARP_TGZSAF );
+        WARP_UCODE_INSTALL(warp_g200_tgz, MGA_WARP_TGZ);
+        WARP_UCODE_INSTALL(warp_g200_tgzf, MGA_WARP_TGZF);
+        WARP_UCODE_INSTALL(warp_g200_tgza, MGA_WARP_TGZA);
+        WARP_UCODE_INSTALL(warp_g200_tgzaf, MGA_WARP_TGZAF);
+        WARP_UCODE_INSTALL(warp_g200_tgzs, MGA_WARP_TGZS);
+        WARP_UCODE_INSTALL(warp_g200_tgzsf, MGA_WARP_TGZSF);
+        WARP_UCODE_INSTALL(warp_g200_tgzsa, MGA_WARP_TGZSA);
+        WARP_UCODE_INSTALL(warp_g200_tgzsaf, MGA_WARP_TGZSAF);
 
         return 0;
 }
 
 int mga_warp_install_microcode( drm_mga_private_t *dev_priv )
 {
-        switch ( dev_priv->chipset ) {
+        const unsigned int size = mga_warp_microcode_size(dev_priv);
+
+        DRM_DEBUG("MGA ucode size = %d bytes\n", size);
+        if (size > dev_priv->warp->size) {
+                DRM_ERROR("microcode too large! (%u > %lu)\n",
+                          size, dev_priv->warp->size);
+                return DRM_ERR(ENOMEM);
+        }
+
+        switch (dev_priv->chipset) {
         case MGA_CARD_TYPE_G400:
-                return mga_warp_install_g400_microcode( dev_priv );
+        case MGA_CARD_TYPE_G550:
+                return mga_warp_install_g400_microcode(dev_priv);
         case MGA_CARD_TYPE_G200:
                 return mga_warp_install_g200_microcode( dev_priv );
         default:
@@ -182,10 +170,11 @@ int mga_warp_init( drm_mga_private_t *dev_priv )
          */
         switch ( dev_priv->chipset ) {
         case MGA_CARD_TYPE_G400:
-                MGA_WRITE( MGA_WIADDR2, MGA_WMODE_SUSPEND );
-                MGA_WRITE( MGA_WGETMSB, 0x00000E00 );
-                MGA_WRITE( MGA_WVRTXSZ, 0x00001807 );
-                MGA_WRITE( MGA_WACCEPTSEQ, 0x18000000 );
+        case MGA_CARD_TYPE_G550:
+                MGA_WRITE(MGA_WIADDR2, MGA_WMODE_SUSPEND);
+                MGA_WRITE(MGA_WGETMSB, 0x00000E00);
+                MGA_WRITE(MGA_WVRTXSZ, 0x00001807);
+                MGA_WRITE(MGA_WACCEPTSEQ, 0x18000000);
                 break;
         case MGA_CARD_TYPE_G200:
                 MGA_WRITE( MGA_WIADDR, MGA_WMODE_SUSPEND );
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index 08ed8d01d9d9..895152206b31 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -326,7 +326,8 @@ static void r128_cce_init_ring_buffer( drm_device_t *dev,
                 ring_start = dev_priv->cce_ring->offset - dev->agp->base;
         else
 #endif
-                ring_start = dev_priv->cce_ring->offset - dev->sg->handle;
+                ring_start = dev_priv->cce_ring->offset - 
+                                (unsigned long)dev->sg->virtual;
 
         R128_WRITE( R128_PM4_BUFFER_OFFSET, ring_start | R128_AGP_OFFSET );
 
@@ -487,6 +488,7 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init )
                 r128_do_cleanup_cce( dev );
                 return DRM_ERR(EINVAL);
         }
+        dev->agp_buffer_token = init->buffers_offset;
         dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
         if(!dev->agp_buffer_map) {
                 DRM_ERROR("could not find dma buffer region!\n");
@@ -537,7 +539,7 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init )
                 dev_priv->cce_buffers_offset = dev->agp->base;
         else
 #endif
-                dev_priv->cce_buffers_offset = dev->sg->handle;
+                dev_priv->cce_buffers_offset = (unsigned long)dev->sg->virtual;
 
         dev_priv->ring.start = (u32 *)dev_priv->cce_ring->handle;
         dev_priv->ring.end = ((u32 *)dev_priv->cce_ring->handle
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
index 0cba17d1e0ff..b616cd3ed2cd 100644
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
@@ -215,7 +215,7 @@ typedef struct drm_r128_sarea {
 #define DRM_IOCTL_R128_INDIRECT   DRM_IOWR(DRM_COMMAND_BASE + DRM_R128_INDIRECT, drm_r128_indirect_t)
 #define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_R128_FULLSCREEN, drm_r128_fullscreen_t)
 #define DRM_IOCTL_R128_CLEAR2     DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR2, drm_r128_clear2_t)
-#define DRM_IOCTL_R128_GETPARAM   DRM_IOW( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t)
+#define DRM_IOCTL_R128_GETPARAM   DRM_IOWR( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t)
 #define DRM_IOCTL_R128_FLIP       DRM_IO(  DRM_COMMAND_BASE + DRM_R128_FLIP)
 
 typedef struct drm_r128_init {
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
new file mode 100644
index 000000000000..623f1f460cb5
--- /dev/null
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -0,0 +1,801 @@
+/* r300_cmdbuf.c -- Command buffer emission for R300 -*- linux-c -*-
+ *
+ * Copyright (C) The Weather Channel, Inc.  2002.
+ * Copyright (C) 2004 Nicolai Haehnle.
+ * All Rights Reserved.
+ *
+ * The Weather Channel (TM) funded Tungsten Graphics to develop the
+ * initial release of the Radeon 8500 driver under the XFree86 license.
+ * This notice must be preserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Nicolai Haehnle <prefect_@gmx.net>
+ */
+
+#include "drmP.h"
+#include "drm.h"
+#include "radeon_drm.h"
+#include "radeon_drv.h"
+#include "r300_reg.h"
+
+
+#define R300_SIMULTANEOUS_CLIPRECTS             4
+
+/* Values for R300_RE_CLIPRECT_CNTL depending on the number of cliprects
+ */
+static const int r300_cliprect_cntl[4] = {
+        0xAAAA,
+        0xEEEE,
+        0xFEFE,
+        0xFFFE
+};
+
+
+/**
+ * Emit up to R300_SIMULTANEOUS_CLIPRECTS cliprects from the given command
+ * buffer, starting with index n.
+ */
+static int r300_emit_cliprects(drm_radeon_private_t* dev_priv,
+                               drm_radeon_cmd_buffer_t* cmdbuf,
+                               int n)
+{
+        drm_clip_rect_t box;
+        int nr;
+        int i;
+        RING_LOCALS;
+
+        nr = cmdbuf->nbox - n;
+        if (nr > R300_SIMULTANEOUS_CLIPRECTS)
+                nr = R300_SIMULTANEOUS_CLIPRECTS;
+
+        DRM_DEBUG("%i cliprects\n", nr);
+
+        if (nr) {
+                BEGIN_RING(6 + nr*2);
+                OUT_RING( CP_PACKET0( R300_RE_CLIPRECT_TL_0, nr*2 - 1 ) );
+
+                for(i = 0; i < nr; ++i) {
+                        if (DRM_COPY_FROM_USER_UNCHECKED(&box, &cmdbuf->boxes[n+i], sizeof(box))) {
+                                DRM_ERROR("copy cliprect faulted\n");
+                                return DRM_ERR(EFAULT);
+                        }
+
+                        box.x1 = (box.x1 + R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK;
+                        box.y1 = (box.y1 + R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK;
+                        box.x2 = (box.x2 + R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK;
+                        box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) & R300_CLIPRECT_MASK;
+
+                        OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) |
+                                        (box.y1 << R300_CLIPRECT_Y_SHIFT));
+                        OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) |
+                                        (box.y2 << R300_CLIPRECT_Y_SHIFT));
+                }
+
+                OUT_RING_REG( R300_RE_CLIPRECT_CNTL, r300_cliprect_cntl[nr-1] );
+
+                /* TODO/SECURITY: Force scissors to a safe value, otherwise the
+                * client might be able to trample over memory.
+                * The impact should be very limited, but I'd rather be safe than
+                * sorry.
+                */
+                OUT_RING( CP_PACKET0( R300_RE_SCISSORS_TL, 1 ) );
+                OUT_RING( 0 );
+                OUT_RING( R300_SCISSORS_X_MASK | R300_SCISSORS_Y_MASK );
+                ADVANCE_RING();
+                } else {
+                /* Why we allow zero cliprect rendering:
+                 * There are some commands in a command buffer that must be submitted
+                 * even when there are no cliprects, e.g. DMA buffer discard
+                 * or state setting (though state setting could be avoided by
+                 * simulating a loss of context).
+                 *
+                 * Now since the cmdbuf interface is so chaotic right now (and is
+                 * bound to remain that way for a bit until things settle down),
+                 * it is basically impossible to filter out the commands that are
+                 * necessary and those that aren't.
+                 *
+                 * So I choose the safe way and don't do any filtering at all;
+                 * instead, I simply set up the engine so that all rendering
+                 * can't produce any fragments.
+                 */
+                BEGIN_RING(2);
+                OUT_RING_REG( R300_RE_CLIPRECT_CNTL, 0 );
+                ADVANCE_RING();
+                }
+
+        return 0;
+}
+
+u8  r300_reg_flags[0x10000>>2];
+
+
+void r300_init_reg_flags(void)
+{
+        int i;
+        memset(r300_reg_flags, 0, 0x10000>>2);
+        #define ADD_RANGE_MARK(reg, count,mark) \
+                for(i=((reg)>>2);i<((reg)>>2)+(count);i++)\
+                        r300_reg_flags[i]|=(mark);
+        
+        #define MARK_SAFE               1
+        #define MARK_CHECK_OFFSET       2
+        
+        #define ADD_RANGE(reg, count)   ADD_RANGE_MARK(reg, count, MARK_SAFE)
+
+        /* these match cmducs() command in r300_driver/r300/r300_cmdbuf.c */
+        ADD_RANGE(R300_SE_VPORT_XSCALE, 6);
+        ADD_RANGE(0x2080, 1);
+        ADD_RANGE(R300_SE_VTE_CNTL, 2);
+        ADD_RANGE(0x2134, 2);
+        ADD_RANGE(0x2140, 1);
+        ADD_RANGE(R300_VAP_INPUT_CNTL_0, 2);
+        ADD_RANGE(0x21DC, 1);
+        ADD_RANGE(0x221C, 1);
+        ADD_RANGE(0x2220, 4);
+        ADD_RANGE(0x2288, 1);
+        ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2);
+        ADD_RANGE(R300_VAP_PVS_CNTL_1, 3);
+        ADD_RANGE(R300_GB_ENABLE, 1);
+        ADD_RANGE(R300_GB_MSPOS0, 5);
+        ADD_RANGE(R300_TX_ENABLE, 1);
+        ADD_RANGE(0x4200, 4);
+        ADD_RANGE(0x4214, 1);
+        ADD_RANGE(R300_RE_POINTSIZE, 1);
+        ADD_RANGE(0x4230, 3);
+        ADD_RANGE(R300_RE_LINE_CNT, 1);
+        ADD_RANGE(0x4238, 1);
+        ADD_RANGE(0x4260, 3);
+        ADD_RANGE(0x4274, 4);
+        ADD_RANGE(0x4288, 5);
+        ADD_RANGE(0x42A0, 1);
+        ADD_RANGE(R300_RE_ZBIAS_T_FACTOR, 4);
+        ADD_RANGE(0x42B4, 1);
+        ADD_RANGE(R300_RE_CULL_CNTL, 1);
+        ADD_RANGE(0x42C0, 2);
+        ADD_RANGE(R300_RS_CNTL_0, 2);
+        ADD_RANGE(R300_RS_INTERP_0, 8);
+        ADD_RANGE(R300_RS_ROUTE_0, 8);
+        ADD_RANGE(0x43A4, 2);
+        ADD_RANGE(0x43E8, 1);
+        ADD_RANGE(R300_PFS_CNTL_0, 3);
+        ADD_RANGE(R300_PFS_NODE_0, 4);
+        ADD_RANGE(R300_PFS_TEXI_0, 64);
+        ADD_RANGE(0x46A4, 5);
+        ADD_RANGE(R300_PFS_INSTR0_0, 64);
+        ADD_RANGE(R300_PFS_INSTR1_0, 64);
+        ADD_RANGE(R300_PFS_INSTR2_0, 64);
+        ADD_RANGE(R300_PFS_INSTR3_0, 64);
+        ADD_RANGE(0x4BC0, 1);
+        ADD_RANGE(0x4BC8, 3);
+        ADD_RANGE(R300_PP_ALPHA_TEST, 2);
+        ADD_RANGE(0x4BD8, 1);
+        ADD_RANGE(R300_PFS_PARAM_0_X, 64);
+        ADD_RANGE(0x4E00, 1);
+        ADD_RANGE(R300_RB3D_CBLEND, 2);
+        ADD_RANGE(R300_RB3D_COLORMASK, 1);
+        ADD_RANGE(0x4E10, 3);
+        ADD_RANGE_MARK(R300_RB3D_COLOROFFSET0, 1, MARK_CHECK_OFFSET); /* check offset */
+        ADD_RANGE(R300_RB3D_COLORPITCH0, 1);
+        ADD_RANGE(0x4E50, 9);
+        ADD_RANGE(0x4E88, 1);
+        ADD_RANGE(0x4EA0, 2);
+        ADD_RANGE(R300_RB3D_ZSTENCIL_CNTL_0, 3);
+        ADD_RANGE(0x4F10, 4);
+        ADD_RANGE_MARK(R300_RB3D_DEPTHOFFSET, 1, MARK_CHECK_OFFSET); /* check offset */
+        ADD_RANGE(R300_RB3D_DEPTHPITCH, 1); 
+        ADD_RANGE(0x4F28, 1);
+        ADD_RANGE(0x4F30, 2);
+        ADD_RANGE(0x4F44, 1);
+        ADD_RANGE(0x4F54, 1);
+
+        ADD_RANGE(R300_TX_FILTER_0, 16);
+        ADD_RANGE(R300_TX_UNK1_0, 16);
+        ADD_RANGE(R300_TX_SIZE_0, 16);
+        ADD_RANGE(R300_TX_FORMAT_0, 16);
+                /* Texture offset is dangerous and needs more checking */
+        ADD_RANGE_MARK(R300_TX_OFFSET_0, 16, MARK_CHECK_OFFSET);
+        ADD_RANGE(R300_TX_UNK4_0, 16);
+        ADD_RANGE(R300_TX_BORDER_COLOR_0, 16);
+
+        /* Sporadic registers used as primitives are emitted */
+        ADD_RANGE(0x4f18, 1);
+        ADD_RANGE(R300_RB3D_DSTCACHE_CTLSTAT, 1);
+        ADD_RANGE(R300_VAP_INPUT_ROUTE_0_0, 8);
+        ADD_RANGE(R300_VAP_INPUT_ROUTE_1_0, 8);
+
+}
+
+static __inline__ int r300_check_range(unsigned  reg, int count)
+{
+        int i;
+        if(reg & ~0xffff)return -1;
+        for(i=(reg>>2);i<(reg>>2)+count;i++)
+                if(r300_reg_flags[i]!=MARK_SAFE)return 1;
+        return 0;
+}
+
+  /* we expect offsets passed to the framebuffer to be either within video memory or
+      within AGP space */
+static __inline__ int r300_check_offset(drm_radeon_private_t* dev_priv, u32 offset)
+{
+        /* we realy want to check against end of video aperture
+                but this value is not being kept. 
+                This code is correct for now (does the same thing as the
+                code that sets MC_FB_LOCATION) in radeon_cp.c */
+        if((offset>=dev_priv->fb_location) && 
+                (offset<dev_priv->gart_vm_start))return 0;
+        if((offset>=dev_priv->gart_vm_start) &&
+                 (offset<dev_priv->gart_vm_start+dev_priv->gart_size))return 0;
+        return 1;
+}
+
+static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t* dev_priv,
+                                                drm_radeon_cmd_buffer_t* cmdbuf,
+                                                drm_r300_cmd_header_t header)
+{
+        int reg;
+        int sz;
+        int i;
+        int values[64];
+        RING_LOCALS;
+
+        sz = header.packet0.count;
+        reg = (header.packet0.reghi << 8) | header.packet0.reglo;
+        
+        if((sz>64)||(sz<0)){
+                DRM_ERROR("Cannot emit more than 64 values at a time (reg=%04x sz=%d)\n", reg, sz);
+                return DRM_ERR(EINVAL);
+                }
+        for(i=0;i<sz;i++){
+                values[i]=((int __user*)cmdbuf->buf)[i];
+                switch(r300_reg_flags[(reg>>2)+i]){
+                case MARK_SAFE:
+                        break;
+                case MARK_CHECK_OFFSET:
+                        if(r300_check_offset(dev_priv, (u32)values[i])){
+                                DRM_ERROR("Offset failed range check (reg=%04x sz=%d)\n", reg, sz);
+                                return DRM_ERR(EINVAL);
+                                }
+                        break;
+                default:
+                        DRM_ERROR("Register %04x failed check as flag=%02x\n", reg+i*4, r300_reg_flags[(reg>>2)+i]);
+                        return DRM_ERR(EINVAL);
+                        }
+                }
+                
+        BEGIN_RING(1+sz);
+        OUT_RING( CP_PACKET0( reg, sz-1 ) );
+        OUT_RING_TABLE( values, sz );
+        ADVANCE_RING();
+
+        cmdbuf->buf += sz*4;
+        cmdbuf->bufsz -= sz*4;
+
+        return 0;
+}
+
+/**
+ * Emits a packet0 setting arbitrary registers.
+ * Called by r300_do_cp_cmdbuf.
+ *
+ * Note that checks are performed on contents and addresses of the registers
+ */
+static __inline__ int r300_emit_packet0(drm_radeon_private_t* dev_priv,
+                                                drm_radeon_cmd_buffer_t* cmdbuf,
+                                                drm_r300_cmd_header_t header)
+{
+        int reg;
+        int sz;
+        RING_LOCALS;
+
+        sz = header.packet0.count;
+        reg = (header.packet0.reghi << 8) | header.packet0.reglo;
+
+        if (!sz)
+                return 0;
+
+        if (sz*4 > cmdbuf->bufsz)
+                return DRM_ERR(EINVAL);
+                
+        if (reg+sz*4 >= 0x10000){
+                DRM_ERROR("No such registers in hardware reg=%04x sz=%d\n", reg, sz);
+                return DRM_ERR(EINVAL);
+                }
+
+        if(r300_check_range(reg, sz)){
+                /* go and check everything */
+                return r300_emit_carefully_checked_packet0(dev_priv, cmdbuf, header);
+                }
+        /* the rest of the data is safe to emit, whatever the values the user passed */
+
+        BEGIN_RING(1+sz);
+        OUT_RING( CP_PACKET0( reg, sz-1 ) );
+        OUT_RING_TABLE( (int __user*)cmdbuf->buf, sz );
+        ADVANCE_RING();
+
+        cmdbuf->buf += sz*4;
+        cmdbuf->bufsz -= sz*4;
+
+        return 0;
+}
+
+
+/**
+ * Uploads user-supplied vertex program instructions or parameters onto
+ * the graphics card.
+ * Called by r300_do_cp_cmdbuf.
+ */
+static __inline__ int r300_emit_vpu(drm_radeon_private_t* dev_priv,
+                                    drm_radeon_cmd_buffer_t* cmdbuf,
+                                    drm_r300_cmd_header_t header)
+{
+        int sz;
+        int addr;
+        RING_LOCALS;
+
+        sz = header.vpu.count;
+        addr = (header.vpu.adrhi << 8) | header.vpu.adrlo;
+
+        if (!sz)
+                return 0;
+        if (sz*16 > cmdbuf->bufsz)
+                return DRM_ERR(EINVAL);
+
+        BEGIN_RING(5+sz*4);
+        /* Wait for VAP to come to senses.. */
+        /* there is no need to emit it multiple times, (only once before VAP is programmed,
+           but this optimization is for later */
+        OUT_RING_REG( R300_VAP_PVS_WAITIDLE, 0 );
+        OUT_RING_REG( R300_VAP_PVS_UPLOAD_ADDRESS, addr );
+        OUT_RING( CP_PACKET0_TABLE( R300_VAP_PVS_UPLOAD_DATA, sz*4 - 1 ) );
+        OUT_RING_TABLE( (int __user*)cmdbuf->buf, sz*4 );
+
+        ADVANCE_RING();
+
+        cmdbuf->buf += sz*16;
+        cmdbuf->bufsz -= sz*16;
+
+        return 0;
+}
+
+
+/**
+ * Emit a clear packet from userspace.
+ * Called by r300_emit_packet3.
+ */
+static __inline__ int r300_emit_clear(drm_radeon_private_t* dev_priv,
+                                      drm_radeon_cmd_buffer_t* cmdbuf)
+{
+        RING_LOCALS;
+
+        if (8*4 > cmdbuf->bufsz)
+                return DRM_ERR(EINVAL);
+
+        BEGIN_RING(10);
+        OUT_RING( CP_PACKET3( R200_3D_DRAW_IMMD_2, 8 ) );
+        OUT_RING( R300_PRIM_TYPE_POINT|R300_PRIM_WALK_RING|
+                  (1<<R300_PRIM_NUM_VERTICES_SHIFT) );
+        OUT_RING_TABLE( (int __user*)cmdbuf->buf, 8 );
+        ADVANCE_RING();
+
+        cmdbuf->buf += 8*4;
+        cmdbuf->bufsz -= 8*4;
+
+        return 0;
+}
+
+static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t* dev_priv,
+                                      drm_radeon_cmd_buffer_t* cmdbuf,
+                                      u32 header)
+{
+        int count, i,k;
+        #define MAX_ARRAY_PACKET  64
+        u32 payload[MAX_ARRAY_PACKET];
+        u32 narrays;
+        RING_LOCALS;
+
+        count=(header>>16) & 0x3fff;
+        
+        if((count+1)>MAX_ARRAY_PACKET){
+                DRM_ERROR("Too large payload in 3D_LOAD_VBPNTR (count=%d)\n", count);
+                return DRM_ERR(EINVAL);
+                }
+        memset(payload, 0, MAX_ARRAY_PACKET*4);
+        memcpy(payload, cmdbuf->buf+4, (count+1)*4);    
+        
+        /* carefully check packet contents */
+        
+        narrays=payload[0];
+        k=0;
+        i=1;
+        while((k<narrays) && (i<(count+1))){
+                i++; /* skip attribute field */
+                if(r300_check_offset(dev_priv, payload[i])){
+                        DRM_ERROR("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n", k, i);
+                        return DRM_ERR(EINVAL);
+                        }
+                k++;
+                i++;
+                if(k==narrays)break;
+                /* have one more to process, they come in pairs */
+                if(r300_check_offset(dev_priv, payload[i])){
+                        DRM_ERROR("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n", k, i);
+                        return DRM_ERR(EINVAL);
+                        }
+                k++;
+                i++;                    
+                }
+        /* do the counts match what we expect ? */
+        if((k!=narrays) || (i!=(count+1))){
+                DRM_ERROR("Malformed 3D_LOAD_VBPNTR packet (k=%d i=%d narrays=%d count+1=%d).\n", k, i, narrays, count+1);
+                return DRM_ERR(EINVAL);
+                }
+
+        /* all clear, output packet */
+
+        BEGIN_RING(count+2);
+        OUT_RING(header);
+        OUT_RING_TABLE(payload, count+1);
+        ADVANCE_RING();
+
+        cmdbuf->buf += (count+2)*4;
+        cmdbuf->bufsz -= (count+2)*4;
+
+        return 0;
+}
+
+static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t* dev_priv,
+                                      drm_radeon_cmd_buffer_t* cmdbuf)
+{
+        u32 header;
+        int count;
+        RING_LOCALS;
+
+        if (4 > cmdbuf->bufsz)
+                return DRM_ERR(EINVAL);
+
+        /* Fixme !! This simply emits a packet without much checking.
+           We need to be smarter. */
+
+        /* obtain first word - actual packet3 header */
+        header = *(u32 __user*)cmdbuf->buf;
+
+        /* Is it packet 3 ? */
+        if( (header>>30)!=0x3 ) {
+                DRM_ERROR("Not a packet3 header (0x%08x)\n", header);
+                return DRM_ERR(EINVAL);
+                }
+
+        count=(header>>16) & 0x3fff;
+
+        /* Check again now that we know how much data to expect */
+        if ((count+2)*4 > cmdbuf->bufsz){
+                DRM_ERROR("Expected packet3 of length %d but have only %d bytes left\n",
+                        (count+2)*4, cmdbuf->bufsz);
+                return DRM_ERR(EINVAL);
+                }
+
+        /* Is it a packet type we know about ? */
+        switch(header & 0xff00){
+        case RADEON_3D_LOAD_VBPNTR: /* load vertex array pointers */
+                return r300_emit_3d_load_vbpntr(dev_priv, cmdbuf, header);
+
+        case RADEON_CP_3D_DRAW_IMMD_2: /* triggers drawing using in-packet vertex data */
+        case RADEON_CP_3D_DRAW_VBUF_2: /* triggers drawing of vertex buffers setup elsewhere */
+        case RADEON_CP_3D_DRAW_INDX_2: /* triggers drawing using indices to vertex buffer */
+        case RADEON_CP_INDX_BUFFER: /* DRAW_INDX_2 without INDX_BUFFER seems to lock up the gpu */
+        case RADEON_WAIT_FOR_IDLE:
+        case RADEON_CP_NOP:
+                /* these packets are safe */
+                break;
+        default:
+                DRM_ERROR("Unknown packet3 header (0x%08x)\n", header);
+                return DRM_ERR(EINVAL);
+                }
+
+
+        BEGIN_RING(count+2);
+        OUT_RING(header);
+        OUT_RING_TABLE( (int __user*)(cmdbuf->buf+4), count+1);
+        ADVANCE_RING();
+
+        cmdbuf->buf += (count+2)*4;
+        cmdbuf->bufsz -= (count+2)*4;
+
+        return 0;
+}
+
+
+/**
+ * Emit a rendering packet3 from userspace.
+ * Called by r300_do_cp_cmdbuf.
+ */
+static __inline__ int r300_emit_packet3(drm_radeon_private_t* dev_priv,
+                                        drm_radeon_cmd_buffer_t* cmdbuf,
+                                        drm_r300_cmd_header_t header)
+{
+        int n;
+        int ret;
+        char __user* orig_buf = cmdbuf->buf;
+        int orig_bufsz = cmdbuf->bufsz;
+
+        /* This is a do-while-loop so that we run the interior at least once,
+         * even if cmdbuf->nbox is 0. Compare r300_emit_cliprects for rationale.
+         */
+        n = 0;
+        do {
+                if (cmdbuf->nbox > R300_SIMULTANEOUS_CLIPRECTS) {
+                        ret = r300_emit_cliprects(dev_priv, cmdbuf, n);
+                        if (ret)
+                                return ret;
+
+                        cmdbuf->buf = orig_buf;
+                        cmdbuf->bufsz = orig_bufsz;
+                        }
+
+                switch(header.packet3.packet) {
+                case R300_CMD_PACKET3_CLEAR:
+                        DRM_DEBUG("R300_CMD_PACKET3_CLEAR\n");
+                        ret = r300_emit_clear(dev_priv, cmdbuf);
+                        if (ret) {
+                                DRM_ERROR("r300_emit_clear failed\n");
+                                return ret;
+                                }
+                        break;
+
+                case R300_CMD_PACKET3_RAW:
+                        DRM_DEBUG("R300_CMD_PACKET3_RAW\n");
+                        ret = r300_emit_raw_packet3(dev_priv, cmdbuf);
+                        if (ret) {
+                                DRM_ERROR("r300_emit_raw_packet3 failed\n");
+                                return ret;
+                                }
+                        break;
+
+                default:
+                        DRM_ERROR("bad packet3 type %i at %p\n",
+                                header.packet3.packet,
+                                cmdbuf->buf - sizeof(header));
+                        return DRM_ERR(EINVAL);
+                        }
+
+                n += R300_SIMULTANEOUS_CLIPRECTS;
+        } while(n < cmdbuf->nbox);
+
+        return 0;
+}
+
+/* Some of the R300 chips seem to be extremely touchy about the two registers
+ * that are configured in r300_pacify.
+ * Among the worst offenders seems to be the R300 ND (0x4E44): When userspace
+ * sends a command buffer that contains only state setting commands and a
+ * vertex program/parameter upload sequence, this will eventually lead to a
+ * lockup, unless the sequence is bracketed by calls to r300_pacify.
+ * So we should take great care to *always* call r300_pacify before
+ * *anything* 3D related, and again afterwards. This is what the
+ * call bracket in r300_do_cp_cmdbuf is for.
+ */
+
+/**
+ * Emit the sequence to pacify R300.
+ */
+static __inline__ void r300_pacify(drm_radeon_private_t* dev_priv)
+{
+        RING_LOCALS;
+
+        BEGIN_RING(6);
+        OUT_RING( CP_PACKET0( R300_RB3D_DSTCACHE_CTLSTAT, 0 ) );
+        OUT_RING( 0xa );
+        OUT_RING( CP_PACKET0( 0x4f18, 0 ) );
+        OUT_RING( 0x3 );
+        OUT_RING( CP_PACKET3( RADEON_CP_NOP, 0 ) );
+        OUT_RING( 0x0 );
+        ADVANCE_RING();
+}
+
+
+/**
+ * Called by r300_do_cp_cmdbuf to update the internal buffer age and state.
+ * The actual age emit is done by r300_do_cp_cmdbuf, which is why you must
+ * be careful about how this function is called.
+ */
+static void r300_discard_buffer(drm_device_t * dev, drm_buf_t * buf)
+{
+        drm_radeon_private_t *dev_priv = dev->dev_private;
+        drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
+
+        buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
+        buf->pending = 1;
+        buf->used = 0;
+}
+
+
+/**
+ * Parses and validates a user-supplied command buffer and emits appropriate
+ * commands on the DMA ring buffer.
+ * Called by the ioctl handler function radeon_cp_cmdbuf.
+ */
+int r300_do_cp_cmdbuf(drm_device_t* dev,
+                          DRMFILE filp,
+                      drm_file_t* filp_priv,
+                      drm_radeon_cmd_buffer_t* cmdbuf)
+{
+        drm_radeon_private_t *dev_priv = dev->dev_private;
+        drm_device_dma_t *dma = dev->dma;
+        drm_buf_t *buf = NULL;
+        int emit_dispatch_age = 0;
+        int ret = 0;
+
+        DRM_DEBUG("\n");
+
+        /* See the comment above r300_emit_begin3d for why this call must be here,
+         * and what the cleanup gotos are for. */
+        r300_pacify(dev_priv);
+
+        if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) {
+                ret = r300_emit_cliprects(dev_priv, cmdbuf, 0);
+                if (ret)
+                        goto cleanup;
+                }
+
+        while(cmdbuf->bufsz >= sizeof(drm_r300_cmd_header_t)) {
+                int idx;
+                drm_r300_cmd_header_t header;
+
+                header.u = *(unsigned int *)cmdbuf->buf;
+
+                cmdbuf->buf += sizeof(header);
+                cmdbuf->bufsz -= sizeof(header);
+
+                switch(header.header.cmd_type) {
+                case R300_CMD_PACKET0: 
+                        DRM_DEBUG("R300_CMD_PACKET0\n");
+                        ret = r300_emit_packet0(dev_priv, cmdbuf, header);
+                        if (ret) {
+                                DRM_ERROR("r300_emit_packet0 failed\n");
+                                goto cleanup;
+                                }
+                        break;
+
+                case R300_CMD_VPU:
+                        DRM_DEBUG("R300_CMD_VPU\n");
+                        ret = r300_emit_vpu(dev_priv, cmdbuf, header);
+                        if (ret) {
+                                DRM_ERROR("r300_emit_vpu failed\n");
+                                goto cleanup;
+                                }
+                        break;
+
+                case R300_CMD_PACKET3:
+                        DRM_DEBUG("R300_CMD_PACKET3\n");
+                        ret = r300_emit_packet3(dev_priv, cmdbuf, header);
+                        if (ret) {
+                                DRM_ERROR("r300_emit_packet3 failed\n");
+                                goto cleanup;
+                                }
+                        break;
+
+                case R300_CMD_END3D:
+                        DRM_DEBUG("R300_CMD_END3D\n");
+                        /* TODO: 
+                                Ideally userspace driver should not need to issue this call, 
+                                i.e. the drm driver should issue it automatically and prevent
+                                lockups.
+                                
+                                In practice, we do not understand why this call is needed and what
+                                it does (except for some vague guesses that it has to do with cache
+                                coherence) and so the user space driver does it. 
+                                
+                                Once we are sure which uses prevent lockups the code could be moved
+                                into the kernel and the userspace driver will not
+                                need to use this command.
+
+                                Note that issuing this command does not hurt anything
+                                except, possibly, performance */
+                        r300_pacify(dev_priv);
+                        break;
+
+                case R300_CMD_CP_DELAY:
+                        /* simple enough, we can do it here */
+                        DRM_DEBUG("R300_CMD_CP_DELAY\n");
+                        {
+                                int i;
+                                RING_LOCALS;
+
+                                BEGIN_RING(header.delay.count);
+                                for(i=0;i<header.delay.count;i++)
+                                        OUT_RING(RADEON_CP_PACKET2);
+                                ADVANCE_RING();
+                        }
+                        break;
+
+                case R300_CMD_DMA_DISCARD:
+                        DRM_DEBUG("RADEON_CMD_DMA_DISCARD\n");
+                        idx = header.dma.buf_idx;
+                        if (idx < 0 || idx >= dma->buf_count) {
+                                DRM_ERROR("buffer index %d (of %d max)\n",
+                                        idx, dma->buf_count - 1);
+                                ret = DRM_ERR(EINVAL);
+                                goto cleanup;
+                                }
+
+                        buf = dma->buflist[idx];
+                        if (buf->filp != filp || buf->pending) {
+                                DRM_ERROR("bad buffer %p %p %d\n",
+                                buf->filp, filp, buf->pending);
+                                ret = DRM_ERR(EINVAL);
+                                goto cleanup;
+                                }
+
+                        emit_dispatch_age = 1;
+                        r300_discard_buffer(dev, buf);
+                        break;
+
+                case R300_CMD_WAIT:
+                        /* simple enough, we can do it here */
+                        DRM_DEBUG("R300_CMD_WAIT\n");
+                        if(header.wait.flags==0)break; /* nothing to do */
+
+                        {
+                                RING_LOCALS;
+
+                                BEGIN_RING(2);
+                                OUT_RING( CP_PACKET0( RADEON_WAIT_UNTIL, 0 ) );
+                                OUT_RING( (header.wait.flags & 0xf)<<14 );
+                                ADVANCE_RING();
+                        }
+                        break;
+
+                default:
+                        DRM_ERROR("bad cmd_type %i at %p\n",
+                                  header.header.cmd_type,
+                                  cmdbuf->buf - sizeof(header));
+                        ret = DRM_ERR(EINVAL);
+                        goto cleanup;
+                        }
+        }
+
+        DRM_DEBUG("END\n");
+
+cleanup:
+        r300_pacify(dev_priv);
+
+        /* We emit the vertex buffer age here, outside the pacifier "brackets"
+         * for two reasons:
+         *  (1) This may coalesce multiple age emissions into a single one and
+         *  (2) more importantly, some chips lock up hard when scratch registers
+         *      are written inside the pacifier bracket.
+         */
+        if (emit_dispatch_age) {
+                RING_LOCALS;
+
+                /* Emit the vertex buffer age */
+                BEGIN_RING(2);
+                RADEON_DISPATCH_AGE(dev_priv->sarea_priv->last_dispatch);
+                ADVANCE_RING();
+                }
+
+        COMMIT_RING();
+
+        return ret;
+}
+
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h
new file mode 100644
index 000000000000..c3e7ca3dbe3d
--- /dev/null
+++ b/drivers/char/drm/r300_reg.h
@@ -0,0 +1,1412 @@
+/**************************************************************************
+
+Copyright (C) 2004-2005 Nicolai Haehnle et al.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+#ifndef _R300_REG_H
+#define _R300_REG_H
+
+#define R300_MC_INIT_MISC_LAT_TIMER     0x180
+#       define R300_MC_MISC__MC_CPR_INIT_LAT_SHIFT      0
+#       define R300_MC_MISC__MC_VF_INIT_LAT_SHIFT       4
+#       define R300_MC_MISC__MC_DISP0R_INIT_LAT_SHIFT   8
+#       define R300_MC_MISC__MC_DISP1R_INIT_LAT_SHIFT   12
+#       define R300_MC_MISC__MC_FIXED_INIT_LAT_SHIFT    16
+#       define R300_MC_MISC__MC_E2R_INIT_LAT_SHIFT      20
+#       define R300_MC_MISC__MC_SAME_PAGE_PRIO_SHIFT    24
+#       define R300_MC_MISC__MC_GLOBW_INIT_LAT_SHIFT    28
+
+
+#define R300_MC_INIT_GFX_LAT_TIMER      0x154
+#       define R300_MC_MISC__MC_G3D0R_INIT_LAT_SHIFT    0
+#       define R300_MC_MISC__MC_G3D1R_INIT_LAT_SHIFT    4
+#       define R300_MC_MISC__MC_G3D2R_INIT_LAT_SHIFT    8
+#       define R300_MC_MISC__MC_G3D3R_INIT_LAT_SHIFT    12
+#       define R300_MC_MISC__MC_TX0R_INIT_LAT_SHIFT     16
+#       define R300_MC_MISC__MC_TX1R_INIT_LAT_SHIFT     20
+#       define R300_MC_MISC__MC_GLOBR_INIT_LAT_SHIFT    24
+#       define R300_MC_MISC__MC_GLOBW_FULL_LAT_SHIFT    28
+
+/*
+This file contains registers and constants for the R300. They have been
+found mostly by examining command buffers captured using glxtest, as well
+as by extrapolating some known registers and constants from the R200.
+
+I am fairly certain that they are correct unless stated otherwise in comments.
+*/
+
+#define R300_SE_VPORT_XSCALE                0x1D98
+#define R300_SE_VPORT_XOFFSET               0x1D9C
+#define R300_SE_VPORT_YSCALE                0x1DA0
+#define R300_SE_VPORT_YOFFSET               0x1DA4
+#define R300_SE_VPORT_ZSCALE                0x1DA8
+#define R300_SE_VPORT_ZOFFSET               0x1DAC
+
+
+/* This register is written directly and also starts data section in many 3d CP_PACKET3's */
+#define R300_VAP_VF_CNTL        0x2084
+
+#       define  R300_VAP_VF_CNTL__PRIM_TYPE__SHIFT                       0
+#       define  R300_VAP_VF_CNTL__PRIM_NONE                              (0<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_POINTS                            (1<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_LINES                             (2<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_LINE_STRIP                        (3<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_TRIANGLES                         (4<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_TRIANGLE_FAN                      (5<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_TRIANGLE_STRIP                    (6<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_LINE_LOOP                         (12<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_QUADS                             (13<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_QUAD_STRIP                        (14<<0)
+#       define  R300_VAP_VF_CNTL__PRIM_POLYGON                           (15<<0)
+
+#       define  R300_VAP_VF_CNTL__PRIM_WALK__SHIFT                       4
+        /* State based - direct writes to registers trigger vertex generation */
+#       define  R300_VAP_VF_CNTL__PRIM_WALK_STATE_BASED                      (0<<4)
+#       define  R300_VAP_VF_CNTL__PRIM_WALK_INDICES                          (1<<4)
+#       define  R300_VAP_VF_CNTL__PRIM_WALK_VERTEX_LIST                      (2<<4)
+#       define  R300_VAP_VF_CNTL__PRIM_WALK_VERTEX_EMBEDDED                  (3<<4)
+
+                /* I don't think I saw these three used.. */
+#       define  R300_VAP_VF_CNTL__COLOR_ORDER__SHIFT                     6
+#       define  R300_VAP_VF_CNTL__TCL_OUTPUT_CTL_ENA__SHIFT              9
+#       define  R300_VAP_VF_CNTL__PROG_STREAM_ENA__SHIFT                 10
+
+                /* index size - when not set the indices are assumed to be 16 bit */
+#       define  R300_VAP_VF_CNTL__INDEX_SIZE_32bit                      (1<<11)
+                /* number of vertices */
+#       define  R300_VAP_VF_CNTL__NUM_VERTICES__SHIFT                    16
+
+/* BEGIN: Wild guesses */
+#define R300_VAP_OUTPUT_VTX_FMT_0           0x2090
+#       define R300_VAP_OUTPUT_VTX_FMT_0__POS_PRESENT     (1<<0)
+#       define R300_VAP_OUTPUT_VTX_FMT_0__COLOR_PRESENT   (1<<1)
+#       define R300_VAP_OUTPUT_VTX_FMT_0__COLOR_1_PRESENT (1<<2) /* GUESS */
+#       define R300_VAP_OUTPUT_VTX_FMT_0__COLOR_2_PRESENT (1<<3) /* GUESS */
+#       define R300_VAP_OUTPUT_VTX_FMT_0__COLOR_3_PRESENT (1<<4) /* GUESS */
+#       define R300_VAP_OUTPUT_VTX_FMT_0__PT_SIZE_PRESENT (1<<16) /* GUESS */
+
+#define R300_VAP_OUTPUT_VTX_FMT_1           0x2094
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_0_COMP_CNT_SHIFT 0
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_1_COMP_CNT_SHIFT 3
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_2_COMP_CNT_SHIFT 6
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_3_COMP_CNT_SHIFT 9
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_4_COMP_CNT_SHIFT 12
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_5_COMP_CNT_SHIFT 15
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_6_COMP_CNT_SHIFT 18
+#       define R300_VAP_OUTPUT_VTX_FMT_1__TEX_7_COMP_CNT_SHIFT 21
+/* END */
+
+#define R300_SE_VTE_CNTL                  0x20b0
+#       define     R300_VPORT_X_SCALE_ENA                0x00000001
+#       define     R300_VPORT_X_OFFSET_ENA               0x00000002
+#       define     R300_VPORT_Y_SCALE_ENA                0x00000004
+#       define     R300_VPORT_Y_OFFSET_ENA               0x00000008
+#       define     R300_VPORT_Z_SCALE_ENA                0x00000010
+#       define     R300_VPORT_Z_OFFSET_ENA               0x00000020
+#       define     R300_VTX_XY_FMT                       0x00000100
+#       define     R300_VTX_Z_FMT                        0x00000200
+#       define     R300_VTX_W0_FMT                       0x00000400
+#       define     R300_VTX_W0_NORMALIZE                 0x00000800
+#       define     R300_VTX_ST_DENORMALIZED              0x00001000
+
+/* BEGIN: Vertex data assembly - lots of uncertainties */
+/* gap */
+/* Where do we get our vertex data?
+//
+// Vertex data either comes either from immediate mode registers or from
+// vertex arrays.
+// There appears to be no mixed mode (though we can force the pitch of
+// vertex arrays to 0, effectively reusing the same element over and over
+// again).
+//
+// Immediate mode is controlled by the INPUT_CNTL registers. I am not sure
+// if these registers influence vertex array processing.
+//
+// Vertex arrays are controlled via the 3D_LOAD_VBPNTR packet3.
+//
+// In both cases, vertex attributes are then passed through INPUT_ROUTE.
+
+// Beginning with INPUT_ROUTE_0_0 is a list of WORDs that route vertex data
+// into the vertex processor's input registers.
+// The first word routes the first input, the second word the second, etc.
+// The corresponding input is routed into the register with the given index.
+// The list is ended by a word with INPUT_ROUTE_END set.
+//
+// Always set COMPONENTS_4 in immediate mode. */
+
+#define R300_VAP_INPUT_ROUTE_0_0            0x2150
+#       define R300_INPUT_ROUTE_COMPONENTS_1     (0 << 0)
+#       define R300_INPUT_ROUTE_COMPONENTS_2     (1 << 0)
+#       define R300_INPUT_ROUTE_COMPONENTS_3     (2 << 0)
+#       define R300_INPUT_ROUTE_COMPONENTS_4     (3 << 0)
+#       define R300_INPUT_ROUTE_COMPONENTS_RGBA  (4 << 0) /* GUESS */
+#       define R300_VAP_INPUT_ROUTE_IDX_SHIFT    8
+#       define R300_VAP_INPUT_ROUTE_IDX_MASK     (31 << 8) /* GUESS */
+#       define R300_VAP_INPUT_ROUTE_END          (1 << 13)
+#       define R300_INPUT_ROUTE_IMMEDIATE_MODE   (0 << 14) /* GUESS */
+#       define R300_INPUT_ROUTE_FLOAT            (1 << 14) /* GUESS */
+#       define R300_INPUT_ROUTE_UNSIGNED_BYTE    (2 << 14) /* GUESS */
+#       define R300_INPUT_ROUTE_FLOAT_COLOR      (3 << 14) /* GUESS */
+#define R300_VAP_INPUT_ROUTE_0_1            0x2154
+#define R300_VAP_INPUT_ROUTE_0_2            0x2158
+#define R300_VAP_INPUT_ROUTE_0_3            0x215C
+#define R300_VAP_INPUT_ROUTE_0_4            0x2160
+#define R300_VAP_INPUT_ROUTE_0_5            0x2164
+#define R300_VAP_INPUT_ROUTE_0_6            0x2168
+#define R300_VAP_INPUT_ROUTE_0_7            0x216C
+
+/* gap */
+/* Notes:
+//  - always set up to produce at least two attributes:
+//    if vertex program uses only position, fglrx will set normal, too
+//  - INPUT_CNTL_0_COLOR and INPUT_CNTL_COLOR bits are always equal */
+#define R300_VAP_INPUT_CNTL_0               0x2180
+#       define R300_INPUT_CNTL_0_COLOR           0x00000001
+#define R300_VAP_INPUT_CNTL_1               0x2184
+#       define R300_INPUT_CNTL_POS               0x00000001
+#       define R300_INPUT_CNTL_NORMAL            0x00000002
+#       define R300_INPUT_CNTL_COLOR             0x00000004
+#       define R300_INPUT_CNTL_TC0               0x00000400
+#       define R300_INPUT_CNTL_TC1               0x00000800
+#       define R300_INPUT_CNTL_TC2               0x00001000 /* GUESS */
+#       define R300_INPUT_CNTL_TC3               0x00002000 /* GUESS */
+#       define R300_INPUT_CNTL_TC4               0x00004000 /* GUESS */
+#       define R300_INPUT_CNTL_TC5               0x00008000 /* GUESS */
+#       define R300_INPUT_CNTL_TC6               0x00010000 /* GUESS */
+#       define R300_INPUT_CNTL_TC7               0x00020000 /* GUESS */
+
+/* gap */
+/* Words parallel to INPUT_ROUTE_0; All words that are active in INPUT_ROUTE_0
+// are set to a swizzling bit pattern, other words are 0.
+//
+// In immediate mode, the pattern is always set to xyzw. In vertex array
+// mode, the swizzling pattern is e.g. used to set zw components in texture
+// coordinates with only tweo components. */
+#define R300_VAP_INPUT_ROUTE_1_0            0x21E0
+#       define R300_INPUT_ROUTE_SELECT_X    0
+#       define R300_INPUT_ROUTE_SELECT_Y    1
+#       define R300_INPUT_ROUTE_SELECT_Z    2
+#       define R300_INPUT_ROUTE_SELECT_W    3
+#       define R300_INPUT_ROUTE_SELECT_ZERO 4
+#       define R300_INPUT_ROUTE_SELECT_ONE  5
+#       define R300_INPUT_ROUTE_SELECT_MASK 7
+#       define R300_INPUT_ROUTE_X_SHIFT          0
+#       define R300_INPUT_ROUTE_Y_SHIFT          3
+#       define R300_INPUT_ROUTE_Z_SHIFT          6
+#       define R300_INPUT_ROUTE_W_SHIFT          9
+#       define R300_INPUT_ROUTE_ENABLE           (15 << 12)
+#define R300_VAP_INPUT_ROUTE_1_1            0x21E4
+#define R300_VAP_INPUT_ROUTE_1_2            0x21E8
+#define R300_VAP_INPUT_ROUTE_1_3            0x21EC
+#define R300_VAP_INPUT_ROUTE_1_4            0x21F0
+#define R300_VAP_INPUT_ROUTE_1_5            0x21F4
+#define R300_VAP_INPUT_ROUTE_1_6            0x21F8
+#define R300_VAP_INPUT_ROUTE_1_7            0x21FC
+
+/* END */
+
+/* gap */
+/* BEGIN: Upload vertex program and data
+// The programmable vertex shader unit has a memory bank of unknown size
+// that can be written to in 16 byte units by writing the address into
+// UPLOAD_ADDRESS, followed by data in UPLOAD_DATA (multiples of 4 DWORDs).
+//
+// Pointers into the memory bank are always in multiples of 16 bytes.
+//
+// The memory bank is divided into areas with fixed meaning.
+//
+// Starting at address UPLOAD_PROGRAM: Vertex program instructions.
+// Native limits reported by drivers from ATI suggest size 256 (i.e. 4KB),
+// whereas the difference between known addresses suggests size 512.
+//
+// Starting at address UPLOAD_PARAMETERS: Vertex program parameters.
+// Native reported limits and the VPI layout suggest size 256, whereas
+// difference between known addresses suggests size 512.
+//
+// At address UPLOAD_POINTSIZE is a vector (0, 0, ps, 0), where ps is the
+// floating point pointsize. The exact purpose of this state is uncertain,
+// as there is also the R300_RE_POINTSIZE register.
+//
+// Multiple vertex programs and parameter sets can be loaded at once,
+// which could explain the size discrepancy. */
+#define R300_VAP_PVS_UPLOAD_ADDRESS         0x2200
+#       define R300_PVS_UPLOAD_PROGRAM           0x00000000
+#       define R300_PVS_UPLOAD_PARAMETERS        0x00000200
+#       define R300_PVS_UPLOAD_POINTSIZE         0x00000406
+/* gap */
+#define R300_VAP_PVS_UPLOAD_DATA            0x2208
+/* END */
+
+/* gap */
+/* I do not know the purpose of this register. However, I do know that
+// it is set to 221C_CLEAR for clear operations and to 221C_NORMAL
+// for normal rendering. */
+#define R300_VAP_UNKNOWN_221C               0x221C
+#       define R300_221C_NORMAL                  0x00000000
+#       define R300_221C_CLEAR                   0x0001C000
+
+/* gap */
+/* Sometimes, END_OF_PKT and 0x2284=0 are the only commands sent between
+// rendering commands and overwriting vertex program parameters.
+// Therefore, I suspect writing zero to 0x2284 synchronizes the engine and
+// avoids bugs caused by still running shaders reading bad data from memory. */
+#define R300_VAP_PVS_WAITIDLE               0x2284 /* GUESS */
+
+/* Absolutely no clue what this register is about. */
+#define R300_VAP_UNKNOWN_2288               0x2288
+#       define R300_2288_R300                    0x00750000 /* -- nh */
+#       define R300_2288_RV350                   0x0000FFFF /* -- Vladimir */
+
+/* gap */
+/* Addresses are relative to the vertex program instruction area of the
+// memory bank. PROGRAM_END points to the last instruction of the active
+// program
+//
+// The meaning of the two UNKNOWN fields is obviously not known. However,
+// experiments so far have shown that both *must* point to an instruction
+// inside the vertex program, otherwise the GPU locks up.
+// fglrx usually sets CNTL_3_UNKNOWN to the end of the program and
+// CNTL_1_UNKNOWN points to instruction where last write to position takes place. 
+// Most likely this is used to ignore rest of the program in cases where group of verts arent visible.
+// For some reason this "section" is sometimes accepted other instruction that have
+// no relationship with position calculations. 
+*/
+#define R300_VAP_PVS_CNTL_1                 0x22D0
+#       define R300_PVS_CNTL_1_PROGRAM_START_SHIFT   0
+#       define R300_PVS_CNTL_1_POS_END_SHIFT         10
+#       define R300_PVS_CNTL_1_PROGRAM_END_SHIFT     20
+/* Addresses are relative the the vertex program parameters area. */
+#define R300_VAP_PVS_CNTL_2                 0x22D4
+#       define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0
+#       define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT  16
+#define R300_VAP_PVS_CNTL_3                0x22D8
+#       define R300_PVS_CNTL_3_PROGRAM_UNKNOWN_SHIFT 10
+#       define R300_PVS_CNTL_3_PROGRAM_UNKNOWN2_SHIFT 0
+
+/* The entire range from 0x2300 to 0x2AC inclusive seems to be used for
+// immediate vertices */
+#define R300_VAP_VTX_COLOR_R                0x2464
+#define R300_VAP_VTX_COLOR_G                0x2468
+#define R300_VAP_VTX_COLOR_B                0x246C
+#define R300_VAP_VTX_POS_0_X_1              0x2490 /* used for glVertex2*() */
+#define R300_VAP_VTX_POS_0_Y_1              0x2494
+#define R300_VAP_VTX_COLOR_PKD              0x249C /* RGBA */
+#define R300_VAP_VTX_POS_0_X_2              0x24A0 /* used for glVertex3*() */
+#define R300_VAP_VTX_POS_0_Y_2              0x24A4
+#define R300_VAP_VTX_POS_0_Z_2              0x24A8
+#define R300_VAP_VTX_END_OF_PKT             0x24AC /* write 0 to indicate end of packet? */
+
+/* gap */
+
+/* These are values from r300_reg/r300_reg.h - they are known to be correct
+   and are here so we can use one register file instead of several
+   - Vladimir */
+#define R300_GB_VAP_RASTER_VTX_FMT_0    0x4000
+#       define R300_GB_VAP_RASTER_VTX_FMT_0__POS_PRESENT        (1<<0)
+#       define R300_GB_VAP_RASTER_VTX_FMT_0__COLOR_0_PRESENT    (1<<1)
+#       define R300_GB_VAP_RASTER_VTX_FMT_0__COLOR_1_PRESENT    (1<<2)
+#       define R300_GB_VAP_RASTER_VTX_FMT_0__COLOR_2_PRESENT    (1<<3)
+#       define R300_GB_VAP_RASTER_VTX_FMT_0__COLOR_3_PRESENT    (1<<4)
+#       define R300_GB_VAP_RASTER_VTX_FMT_0__COLOR_SPACE        (0xf<<5)
+#       define R300_GB_VAP_RASTER_VTX_FMT_0__PT_SIZE_PRESENT    (0x1<<16)
+
+#define R300_GB_VAP_RASTER_VTX_FMT_1    0x4004
+        /* each of the following is 3 bits wide, specifies number
+           of components */
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_0_COMP_CNT_SHIFT       0
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_1_COMP_CNT_SHIFT       3
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_2_COMP_CNT_SHIFT       6
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_3_COMP_CNT_SHIFT       9
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_4_COMP_CNT_SHIFT       12
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_5_COMP_CNT_SHIFT       15
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_6_COMP_CNT_SHIFT       18
+#       define R300_GB_VAP_RASTER_VTX_FMT_1__TEX_7_COMP_CNT_SHIFT       21
+
+/* UNK30 seems to enables point to quad transformation on textures
+   (or something closely related to that).
+   This bit is rather fatal at the time being due to lackings at pixel shader side */
+#define R300_GB_ENABLE  0x4008
+#       define R300_GB_POINT_STUFF_ENABLE       (1<<0)
+#       define R300_GB_LINE_STUFF_ENABLE        (1<<1)
+#       define R300_GB_TRIANGLE_STUFF_ENABLE    (1<<2)
+#       define R300_GB_STENCIL_AUTO_ENABLE      (1<<4)
+#       define R300_GB_UNK30                    (1<<30)
+        /* each of the following is 2 bits wide */
+#define R300_GB_TEX_REPLICATE   0
+#define R300_GB_TEX_ST          1
+#define R300_GB_TEX_STR         2
+#       define R300_GB_TEX0_SOURCE_SHIFT        16
+#       define R300_GB_TEX1_SOURCE_SHIFT        18
+#       define R300_GB_TEX2_SOURCE_SHIFT        20
+#       define R300_GB_TEX3_SOURCE_SHIFT        22
+#       define R300_GB_TEX4_SOURCE_SHIFT        24
+#       define R300_GB_TEX5_SOURCE_SHIFT        26
+#       define R300_GB_TEX6_SOURCE_SHIFT        28
+#       define R300_GB_TEX7_SOURCE_SHIFT        30
+
+/* MSPOS - positions for multisample antialiasing (?) */
+#define R300_GB_MSPOS0  0x4010
+        /* shifts - each of the fields is 4 bits */
+#       define R300_GB_MSPOS0__MS_X0_SHIFT      0
+#       define R300_GB_MSPOS0__MS_Y0_SHIFT      4
+#       define R300_GB_MSPOS0__MS_X1_SHIFT      8
+#       define R300_GB_MSPOS0__MS_Y1_SHIFT      12
+#       define R300_GB_MSPOS0__MS_X2_SHIFT      16
+#       define R300_GB_MSPOS0__MS_Y2_SHIFT      20
+#       define R300_GB_MSPOS0__MSBD0_Y          24
+#       define R300_GB_MSPOS0__MSBD0_X          28
+
+#define R300_GB_MSPOS1  0x4014
+#       define R300_GB_MSPOS1__MS_X3_SHIFT      0
+#       define R300_GB_MSPOS1__MS_Y3_SHIFT      4
+#       define R300_GB_MSPOS1__MS_X4_SHIFT      8
+#       define R300_GB_MSPOS1__MS_Y4_SHIFT      12
+#       define R300_GB_MSPOS1__MS_X5_SHIFT      16
+#       define R300_GB_MSPOS1__MS_Y5_SHIFT      20
+#       define R300_GB_MSPOS1__MSBD1            24
+
+
+#define R300_GB_TILE_CONFIG     0x4018
+#       define R300_GB_TILE_ENABLE      (1<<0)
+#       define R300_GB_TILE_PIPE_COUNT_RV300    0
+#       define R300_GB_TILE_PIPE_COUNT_R300     (3<<1)
+#       define R300_GB_TILE_PIPE_COUNT_R420     (7<<1)
+#       define R300_GB_TILE_SIZE_8              0
+#       define R300_GB_TILE_SIZE_16             (1<<4)
+#       define R300_GB_TILE_SIZE_32             (2<<4)
+#       define R300_GB_SUPER_SIZE_1             (0<<6)
+#       define R300_GB_SUPER_SIZE_2             (1<<6)
+#       define R300_GB_SUPER_SIZE_4             (2<<6)
+#       define R300_GB_SUPER_SIZE_8             (3<<6)
+#       define R300_GB_SUPER_SIZE_16            (4<<6)
+#       define R300_GB_SUPER_SIZE_32            (5<<6)
+#       define R300_GB_SUPER_SIZE_64            (6<<6)
+#       define R300_GB_SUPER_SIZE_128           (7<<6)
+#       define R300_GB_SUPER_X_SHIFT            9       /* 3 bits wide */
+#       define R300_GB_SUPER_Y_SHIFT            12      /* 3 bits wide */
+#       define R300_GB_SUPER_TILE_A             0
+#       define R300_GB_SUPER_TILE_B             (1<<15)
+#       define R300_GB_SUBPIXEL_1_12            0
+#       define R300_GB_SUBPIXEL_1_16            (1<<16)
+
+#define R300_GB_FIFO_SIZE       0x4024
+        /* each of the following is 2 bits wide */
+#define R300_GB_FIFO_SIZE_32    0
+#define R300_GB_FIFO_SIZE_64    1
+#define R300_GB_FIFO_SIZE_128   2
+#define R300_GB_FIFO_SIZE_256   3
+#       define R300_SC_IFIFO_SIZE_SHIFT 0
+#       define R300_SC_TZFIFO_SIZE_SHIFT        2
+#       define R300_SC_BFIFO_SIZE_SHIFT 4
+
+#       define R300_US_OFIFO_SIZE_SHIFT 12
+#       define R300_US_WFIFO_SIZE_SHIFT 14
+        /* the following use the same constants as above, but meaning is
+           is times 2 (i.e. instead of 32 words it means 64 */
+#       define R300_RS_TFIFO_SIZE_SHIFT 6
+#       define R300_RS_CFIFO_SIZE_SHIFT 8
+#       define R300_US_RAM_SIZE_SHIFT           10
+        /* watermarks, 3 bits wide */
+#       define R300_RS_HIGHWATER_COL_SHIFT      16
+#       define R300_RS_HIGHWATER_TEX_SHIFT      19
+#       define R300_OFIFO_HIGHWATER_SHIFT       22      /* two bits only */
+#       define R300_CUBE_FIFO_HIGHWATER_COL_SHIFT       24
+
+#define R300_GB_SELECT  0x401C
+#       define R300_GB_FOG_SELECT_C0A           0
+#       define R300_GB_FOG_SELECT_C1A           1
+#       define R300_GB_FOG_SELECT_C2A           2
+#       define R300_GB_FOG_SELECT_C3A           3
+#       define R300_GB_FOG_SELECT_1_1_W 4
+#       define R300_GB_FOG_SELECT_Z             5
+#       define R300_GB_DEPTH_SELECT_Z           0
+#       define R300_GB_DEPTH_SELECT_1_1_W       (1<<3)
+#       define R300_GB_W_SELECT_1_W             0
+#       define R300_GB_W_SELECT_1               (1<<4)
+
+#define R300_GB_AA_CONFIG               0x4020
+#       define R300_AA_ENABLE                   0x01
+#       define R300_AA_SUBSAMPLES_2             0
+#       define R300_AA_SUBSAMPLES_3             (1<<1)
+#       define R300_AA_SUBSAMPLES_4             (2<<1)
+#       define R300_AA_SUBSAMPLES_6             (3<<1)
+
+/* END */
+
+/* gap */
+/* The upper enable bits are guessed, based on fglrx reported limits. */
+#define R300_TX_ENABLE                      0x4104
+#       define R300_TX_ENABLE_0                  (1 << 0)
+#       define R300_TX_ENABLE_1                  (1 << 1)
+#       define R300_TX_ENABLE_2                  (1 << 2)
+#       define R300_TX_ENABLE_3                  (1 << 3)
+#       define R300_TX_ENABLE_4                  (1 << 4)
+#       define R300_TX_ENABLE_5                  (1 << 5)
+#       define R300_TX_ENABLE_6                  (1 << 6)
+#       define R300_TX_ENABLE_7                  (1 << 7)
+#       define R300_TX_ENABLE_8                  (1 << 8)
+#       define R300_TX_ENABLE_9                  (1 << 9)
+#       define R300_TX_ENABLE_10                 (1 << 10)
+#       define R300_TX_ENABLE_11                 (1 << 11)
+#       define R300_TX_ENABLE_12                 (1 << 12)
+#       define R300_TX_ENABLE_13                 (1 << 13)
+#       define R300_TX_ENABLE_14                 (1 << 14)
+#       define R300_TX_ENABLE_15                 (1 << 15)
+
+/* The pointsize is given in multiples of 6. The pointsize can be
+// enormous: Clear() renders a single point that fills the entire
+// framebuffer. */
+#define R300_RE_POINTSIZE                   0x421C
+#       define R300_POINTSIZE_Y_SHIFT            0
+#       define R300_POINTSIZE_Y_MASK             (0xFFFF << 0) /* GUESS */
+#       define R300_POINTSIZE_X_SHIFT            16
+#       define R300_POINTSIZE_X_MASK             (0xFFFF << 16) /* GUESS */
+#       define R300_POINTSIZE_MAX             (R300_POINTSIZE_Y_MASK / 6)
+
+/* The line width is given in multiples of 6.
+   In default mode lines are classified as vertical lines.
+   HO: horizontal
+   VE: vertical or horizontal
+   HO & VE: no classification
+*/
+#define R300_RE_LINE_CNT                      0x4234
+#       define R300_LINESIZE_SHIFT            0
+#       define R300_LINESIZE_MASK             (0xFFFF << 0) /* GUESS */
+#       define R300_LINESIZE_MAX             (R300_LINESIZE_MASK / 6)
+#       define R300_LINE_CNT_HO               (1 << 16)
+#       define R300_LINE_CNT_VE               (1 << 17)
+
+/* Some sort of scale or clamp value for texcoordless textures. */
+#define R300_RE_UNK4238                       0x4238
+
+#define R300_RE_SHADE_MODEL                   0x4278
+#       define R300_RE_SHADE_MODEL_SMOOTH     0x3aaaa
+#       define R300_RE_SHADE_MODEL_FLAT       0x39595
+
+/* Dangerous */
+#define R300_RE_POLYGON_MODE                  0x4288
+#       define R300_PM_ENABLED                (1 << 0)
+#       define R300_PM_FRONT_POINT            (0 << 0)
+#       define R300_PM_BACK_POINT             (0 << 0)
+#       define R300_PM_FRONT_LINE             (1 << 4)
+#       define R300_PM_FRONT_FILL             (1 << 5)
+#       define R300_PM_BACK_LINE              (1 << 7)
+#       define R300_PM_BACK_FILL              (1 << 8)
+
+/* Not sure why there are duplicate of factor and constant values. 
+   My best guess so far is that there are seperate zbiases for test and write. 
+   Ordering might be wrong.
+   Some of the tests indicate that fgl has a fallback implementation of zbias
+   via pixel shaders. */
+#define R300_RE_ZBIAS_T_FACTOR                0x42A4
+#define R300_RE_ZBIAS_T_CONSTANT              0x42A8
+#define R300_RE_ZBIAS_W_FACTOR                0x42AC
+#define R300_RE_ZBIAS_W_CONSTANT              0x42B0
+
+/* This register needs to be set to (1<<1) for RV350 to correctly
+   perform depth test (see --vb-triangles in r300_demo)
+   Don't know about other chips. - Vladimir
+   This is set to 3 when GL_POLYGON_OFFSET_FILL is on.
+   My guess is that there are two bits for each zbias primitive (FILL, LINE, POINT).
+   One to enable depth test and one for depth write.
+   Yet this doesnt explain why depth writes work ...
+    */
+#define R300_RE_OCCLUSION_CNTL              0x42B4
+#       define R300_OCCLUSION_ON                (1<<1)
+
+#define R300_RE_CULL_CNTL                   0x42B8
+#       define R300_CULL_FRONT                   (1 << 0)
+#       define R300_CULL_BACK                    (1 << 1)
+#       define R300_FRONT_FACE_CCW               (0 << 2)
+#       define R300_FRONT_FACE_CW                (1 << 2)
+
+
+/* BEGIN: Rasterization / Interpolators - many guesses
+// 0_UNKNOWN_18 has always been set except for clear operations.
+// TC_CNT is the number of incoming texture coordinate sets (i.e. it depends
+// on the vertex program, *not* the fragment program) */
+#define R300_RS_CNTL_0                      0x4300
+#       define R300_RS_CNTL_TC_CNT_SHIFT         2
+#       define R300_RS_CNTL_TC_CNT_MASK          (7 << 2)
+#               define R300_RS_CNTL_CI_CNT_SHIFT         7 /* number of color interpolators used */
+#       define R300_RS_CNTL_0_UNKNOWN_18         (1 << 18)
+/* Guess: RS_CNTL_1 holds the index of the highest used RS_ROUTE_n register. */
+#define R300_RS_CNTL_1                      0x4304
+
+/* gap */
+/* Only used for texture coordinates.
+// Use the source field to route texture coordinate input from the vertex program
+// to the desired interpolator. Note that the source field is relative to the
+// outputs the vertex program *actually* writes. If a vertex program only writes
+// texcoord[1], this will be source index 0.
+// Set INTERP_USED on all interpolators that produce data used by the
+// fragment program. INTERP_USED looks like a swizzling mask, but
+// I haven't seen it used that way.
+//
+// Note: The _UNKNOWN constants are always set in their respective register.
+// I don't know if this is necessary. */
+#define R300_RS_INTERP_0                    0x4310
+#define R300_RS_INTERP_1                    0x4314
+#       define R300_RS_INTERP_1_UNKNOWN          0x40
+#define R300_RS_INTERP_2                    0x4318
+#       define R300_RS_INTERP_2_UNKNOWN          0x80
+#define R300_RS_INTERP_3                    0x431C
+#       define R300_RS_INTERP_3_UNKNOWN          0xC0
+#define R300_RS_INTERP_4                    0x4320
+#define R300_RS_INTERP_5                    0x4324
+#define R300_RS_INTERP_6                    0x4328
+#define R300_RS_INTERP_7                    0x432C
+#       define R300_RS_INTERP_SRC_SHIFT          2
+#       define R300_RS_INTERP_SRC_MASK           (7 << 2)
+#       define R300_RS_INTERP_USED               0x00D10000
+
+/* These DWORDs control how vertex data is routed into fragment program
+// registers, after interpolators. */
+#define R300_RS_ROUTE_0                     0x4330
+#define R300_RS_ROUTE_1                     0x4334
+#define R300_RS_ROUTE_2                     0x4338
+#define R300_RS_ROUTE_3                     0x433C /* GUESS */
+#define R300_RS_ROUTE_4                     0x4340 /* GUESS */
+#define R300_RS_ROUTE_5                     0x4344 /* GUESS */
+#define R300_RS_ROUTE_6                     0x4348 /* GUESS */
+#define R300_RS_ROUTE_7                     0x434C /* GUESS */
+#       define R300_RS_ROUTE_SOURCE_INTERP_0     0
+#       define R300_RS_ROUTE_SOURCE_INTERP_1     1
+#       define R300_RS_ROUTE_SOURCE_INTERP_2     2
+#       define R300_RS_ROUTE_SOURCE_INTERP_3     3
+#       define R300_RS_ROUTE_SOURCE_INTERP_4     4
+#       define R300_RS_ROUTE_SOURCE_INTERP_5     5 /* GUESS */
+#       define R300_RS_ROUTE_SOURCE_INTERP_6     6 /* GUESS */
+#       define R300_RS_ROUTE_SOURCE_INTERP_7     7 /* GUESS */
+#       define R300_RS_ROUTE_ENABLE              (1 << 3) /* GUESS */
+#       define R300_RS_ROUTE_DEST_SHIFT          6
+#       define R300_RS_ROUTE_DEST_MASK           (31 << 6) /* GUESS */
+
+/* Special handling for color: When the fragment program uses color,
+// the ROUTE_0_COLOR bit is set and ROUTE_0_COLOR_DEST contains the
+// color register index. */
+#       define R300_RS_ROUTE_0_COLOR             (1 << 14)
+#       define R300_RS_ROUTE_0_COLOR_DEST_SHIFT  17
+#       define R300_RS_ROUTE_0_COLOR_DEST_MASK   (31 << 17) /* GUESS */
+/* As above, but for secondary color */
+#               define R300_RS_ROUTE_1_COLOR1            (1 << 14)
+#               define R300_RS_ROUTE_1_COLOR1_DEST_SHIFT 17
+#               define R300_RS_ROUTE_1_COLOR1_DEST_MASK  (31 << 17)
+#               define R300_RS_ROUTE_1_UNKNOWN11         (1 << 11)
+/* END */
+
+/* BEGIN: Scissors and cliprects
+// There are four clipping rectangles. Their corner coordinates are inclusive.
+// Every pixel is assigned a number from 0 and 15 by setting bits 0-3 depending
+// on whether the pixel is inside cliprects 0-3, respectively. For example,
+// if a pixel is inside cliprects 0 and 1, but outside 2 and 3, it is assigned
+// the number 3 (binary 0011).
+// Iff the bit corresponding to the pixel's number in RE_CLIPRECT_CNTL is set,
+// the pixel is rasterized.
+//
+// In addition to this, there is a scissors rectangle. Only pixels inside the
+// scissors rectangle are drawn. (coordinates are inclusive)
+//
+// For some reason, the top-left corner of the framebuffer is at (1440, 1440)
+// for the purpose of clipping and scissors. */
+#define R300_RE_CLIPRECT_TL_0               0x43B0
+#define R300_RE_CLIPRECT_BR_0               0x43B4
+#define R300_RE_CLIPRECT_TL_1               0x43B8
+#define R300_RE_CLIPRECT_BR_1               0x43BC
+#define R300_RE_CLIPRECT_TL_2               0x43C0
+#define R300_RE_CLIPRECT_BR_2               0x43C4
+#define R300_RE_CLIPRECT_TL_3               0x43C8
+#define R300_RE_CLIPRECT_BR_3               0x43CC
+#       define R300_CLIPRECT_OFFSET              1440
+#       define R300_CLIPRECT_MASK                0x1FFF
+#       define R300_CLIPRECT_X_SHIFT             0
+#       define R300_CLIPRECT_X_MASK              (0x1FFF << 0)
+#       define R300_CLIPRECT_Y_SHIFT             13
+#       define R300_CLIPRECT_Y_MASK              (0x1FFF << 13)
+#define R300_RE_CLIPRECT_CNTL               0x43D0
+#       define R300_CLIP_OUT                     (1 << 0)
+#       define R300_CLIP_0                       (1 << 1)
+#       define R300_CLIP_1                       (1 << 2)
+#       define R300_CLIP_10                      (1 << 3)
+#       define R300_CLIP_2                       (1 << 4)
+#       define R300_CLIP_20                      (1 << 5)
+#       define R300_CLIP_21                      (1 << 6)
+#       define R300_CLIP_210                     (1 << 7)
+#       define R300_CLIP_3                       (1 << 8)
+#       define R300_CLIP_30                      (1 << 9)
+#       define R300_CLIP_31                      (1 << 10)
+#       define R300_CLIP_310                     (1 << 11)
+#       define R300_CLIP_32                      (1 << 12)
+#       define R300_CLIP_320                     (1 << 13)
+#       define R300_CLIP_321                     (1 << 14)
+#       define R300_CLIP_3210                    (1 << 15)
+
+/* gap */
+#define R300_RE_SCISSORS_TL                 0x43E0
+#define R300_RE_SCISSORS_BR                 0x43E4
+#       define R300_SCISSORS_OFFSET              1440
+#       define R300_SCISSORS_X_SHIFT             0
+#       define R300_SCISSORS_X_MASK              (0x1FFF << 0)
+#       define R300_SCISSORS_Y_SHIFT             13
+#       define R300_SCISSORS_Y_MASK              (0x1FFF << 13)
+/* END */
+
+/* BEGIN: Texture specification
+// The texture specification dwords are grouped by meaning and not by texture unit.
+// This means that e.g. the offset for texture image unit N is found in register
+// TX_OFFSET_0 + (4*N) */
+#define R300_TX_FILTER_0                    0x4400
+#       define R300_TX_REPEAT                    0
+#       define R300_TX_MIRRORED                  1
+#       define R300_TX_CLAMP                     4
+#       define R300_TX_CLAMP_TO_EDGE             2
+#       define R300_TX_CLAMP_TO_BORDER           6
+#       define R300_TX_WRAP_S_SHIFT              0
+#       define R300_TX_WRAP_S_MASK               (7 << 0)
+#       define R300_TX_WRAP_T_SHIFT              3
+#       define R300_TX_WRAP_T_MASK               (7 << 3)
+#       define R300_TX_WRAP_Q_SHIFT              6
+#       define R300_TX_WRAP_Q_MASK               (7 << 6)
+#       define R300_TX_MAG_FILTER_NEAREST        (1 << 9)
+#       define R300_TX_MAG_FILTER_LINEAR         (2 << 9)
+#       define R300_TX_MAG_FILTER_MASK           (3 << 9)
+#       define R300_TX_MIN_FILTER_NEAREST        (1 << 11)
+#       define R300_TX_MIN_FILTER_LINEAR         (2 << 11)
+#       define R300_TX_MIN_FILTER_NEAREST_MIP_NEAREST       (5  <<  11)
+#       define R300_TX_MIN_FILTER_NEAREST_MIP_LINEAR        (9  <<  11)
+#       define R300_TX_MIN_FILTER_LINEAR_MIP_NEAREST        (6  <<  11)
+#       define R300_TX_MIN_FILTER_LINEAR_MIP_LINEAR         (10 <<  11)
+
+/* NOTE: NEAREST doesnt seem to exist.
+   Im not seting MAG_FILTER_MASK and (3 << 11) on for all
+   anisotropy modes because that would void selected mag filter */
+#       define R300_TX_MIN_FILTER_ANISO_NEAREST             ((0 << 13) /*|R300_TX_MAG_FILTER_MASK|(3<<11)*/)
+#       define R300_TX_MIN_FILTER_ANISO_LINEAR              ((0 << 13) /*|R300_TX_MAG_FILTER_MASK|(3<<11)*/)
+#       define R300_TX_MIN_FILTER_ANISO_NEAREST_MIP_NEAREST ((1 << 13) /*|R300_TX_MAG_FILTER_MASK|(3<<11)*/)
+#       define R300_TX_MIN_FILTER_ANISO_NEAREST_MIP_LINEAR  ((2 << 13) /*|R300_TX_MAG_FILTER_MASK|(3<<11)*/)
+#       define R300_TX_MIN_FILTER_MASK           ( (15 << 11) | (3 << 13) )
+#       define R300_TX_MAX_ANISO_1_TO_1  (0 << 21)
+#       define R300_TX_MAX_ANISO_2_TO_1  (2 << 21)
+#       define R300_TX_MAX_ANISO_4_TO_1  (4 << 21)
+#       define R300_TX_MAX_ANISO_8_TO_1  (6 << 21)
+#       define R300_TX_MAX_ANISO_16_TO_1 (8 << 21)
+#       define R300_TX_MAX_ANISO_MASK    (14 << 21)
+
+#define R300_TX_UNK1_0                      0x4440
+#       define R300_LOD_BIAS_MASK           0x1fff
+
+#define R300_TX_SIZE_0                      0x4480
+#       define R300_TX_WIDTHMASK_SHIFT           0
+#       define R300_TX_WIDTHMASK_MASK            (2047 << 0)
+#       define R300_TX_HEIGHTMASK_SHIFT          11
+#       define R300_TX_HEIGHTMASK_MASK           (2047 << 11)
+#       define R300_TX_UNK23                     (1 << 23)
+#       define R300_TX_SIZE_SHIFT                26 /* largest of width, height */
+#       define R300_TX_SIZE_MASK                 (15 << 26)
+#define R300_TX_FORMAT_0                    0x44C0
+        /* The interpretation of the format word by Wladimir van der Laan */
+        /* The X, Y, Z and W refer to the layout of the components.
+           They are given meanings as R, G, B and Alpha by the swizzle
+           specification */
+#       define R300_TX_FORMAT_X8                    0x0
+#       define R300_TX_FORMAT_X16                   0x1
+#       define R300_TX_FORMAT_Y4X4                  0x2
+#       define R300_TX_FORMAT_Y8X8                  0x3
+#       define R300_TX_FORMAT_Y16X16                0x4
+#       define R300_TX_FORMAT_Z3Y3X2                0x5
+#       define R300_TX_FORMAT_Z5Y6X5                0x6
+#       define R300_TX_FORMAT_Z6Y5X5                0x7
+#       define R300_TX_FORMAT_Z11Y11X10             0x8
+#       define R300_TX_FORMAT_Z10Y11X11             0x9
+#       define R300_TX_FORMAT_W4Z4Y4X4              0xA
+#       define R300_TX_FORMAT_W1Z5Y5X5              0xB
+#       define R300_TX_FORMAT_W8Z8Y8X8              0xC
+#       define R300_TX_FORMAT_W2Z10Y10X10           0xD
+#       define R300_TX_FORMAT_W16Z16Y16X16          0xE
+#       define R300_TX_FORMAT_DXT1                  0xF
+#       define R300_TX_FORMAT_DXT3                  0x10
+#       define R300_TX_FORMAT_DXT5                  0x11
+#       define R300_TX_FORMAT_D3DMFT_CxV8U8         0x12     /* no swizzle */
+#       define R300_TX_FORMAT_A8R8G8B8              0x13     /* no swizzle */
+#       define R300_TX_FORMAT_B8G8_B8G8             0x14     /* no swizzle */
+#       define R300_TX_FORMAT_G8R8_G8B8             0x15     /* no swizzle */
+                                                  /* 0x16 - some 16 bit green format.. ?? */
+#       define R300_TX_FORMAT_UNK25                (1 << 25) /* no swizzle */
+
+        /* gap */
+        /* Floating point formats */
+        /* Note - hardware supports both 16 and 32 bit floating point */
+#       define R300_TX_FORMAT_FL_I16                0x18
+#       define R300_TX_FORMAT_FL_I16A16             0x19
+#       define R300_TX_FORMAT_FL_R16G16B16A16       0x1A
+#       define R300_TX_FORMAT_FL_I32                0x1B
+#       define R300_TX_FORMAT_FL_I32A32             0x1C
+#       define R300_TX_FORMAT_FL_R32G32B32A32       0x1D
+        /* alpha modes, convenience mostly */
+        /* if you have alpha, pick constant appropriate to the
+           number of channels (1 for I8, 2 for I8A8, 4 for R8G8B8A8, etc */
+#       define R300_TX_FORMAT_ALPHA_1CH             0x000
+#       define R300_TX_FORMAT_ALPHA_2CH             0x200
+#       define R300_TX_FORMAT_ALPHA_4CH             0x600
+#       define R300_TX_FORMAT_ALPHA_NONE            0xA00
+        /* Swizzling */
+        /* constants */
+#       define R300_TX_FORMAT_X         0
+#       define R300_TX_FORMAT_Y         1
+#       define R300_TX_FORMAT_Z         2
+#       define R300_TX_FORMAT_W         3
+#       define R300_TX_FORMAT_ZERO      4
+#       define R300_TX_FORMAT_ONE       5
+#       define R300_TX_FORMAT_CUT_Z     6               /* 2.0*Z, everything above 1.0 is set to 0.0 */
+#       define R300_TX_FORMAT_CUT_W     7               /* 2.0*W, everything above 1.0 is set to 0.0 */
+
+#       define R300_TX_FORMAT_B_SHIFT   18
+#       define R300_TX_FORMAT_G_SHIFT   15
+#       define R300_TX_FORMAT_R_SHIFT   12
+#       define R300_TX_FORMAT_A_SHIFT   9
+        /* Convenience macro to take care of layout and swizzling */
+#       define R300_EASY_TX_FORMAT(B, G, R, A, FMT)     (\
+          ((R300_TX_FORMAT_##B)<<R300_TX_FORMAT_B_SHIFT) \
+        | ((R300_TX_FORMAT_##G)<<R300_TX_FORMAT_G_SHIFT) \
+        | ((R300_TX_FORMAT_##R)<<R300_TX_FORMAT_R_SHIFT) \
+        | ((R300_TX_FORMAT_##A)<<R300_TX_FORMAT_A_SHIFT) \
+        | (R300_TX_FORMAT_##FMT) \
+          )
+        /* These can be ORed with result of R300_EASY_TX_FORMAT() */
+        /* We don't really know what they do. Take values from a constant color ? */
+#       define R300_TX_FORMAT_CONST_X           (1<<5)
+#       define R300_TX_FORMAT_CONST_Y           (2<<5)
+#       define R300_TX_FORMAT_CONST_Z           (4<<5)
+#       define R300_TX_FORMAT_CONST_W           (8<<5)
+
+#       define R300_TX_FORMAT_YUV_MODE          0x00800000
+
+#define R300_TX_OFFSET_0                    0x4540
+/* BEGIN: Guess from R200 */
+#       define R300_TXO_ENDIAN_NO_SWAP           (0 << 0)
+#       define R300_TXO_ENDIAN_BYTE_SWAP         (1 << 0)
+#       define R300_TXO_ENDIAN_WORD_SWAP         (2 << 0)
+#       define R300_TXO_ENDIAN_HALFDW_SWAP       (3 << 0)
+#       define R300_TXO_OFFSET_MASK              0xffffffe0
+#       define R300_TXO_OFFSET_SHIFT             5
+/* END */
+#define R300_TX_UNK4_0                      0x4580
+#define R300_TX_BORDER_COLOR_0              0x45C0 //ff00ff00 == { 0, 1.0, 0, 1.0 }
+
+/* END */
+
+/* BEGIN: Fragment program instruction set
+// Fragment programs are written directly into register space.
+// There are separate instruction streams for texture instructions and ALU
+// instructions.
+// In order to synchronize these streams, the program is divided into up
+// to 4 nodes. Each node begins with a number of TEX operations, followed
+// by a number of ALU operations.
+// The first node can have zero TEX ops, all subsequent nodes must have at least
+// one TEX ops.
+// All nodes must have at least one ALU op.
+//
+// The index of the last node is stored in PFS_CNTL_0: A value of 0 means
+// 1 node, a value of 3 means 4 nodes.
+// The total amount of instructions is defined in PFS_CNTL_2. The offsets are
+// offsets into the respective instruction streams, while *_END points to the
+// last instruction relative to this offset. */
+#define R300_PFS_CNTL_0                     0x4600
+#       define R300_PFS_CNTL_LAST_NODES_SHIFT    0
+#       define R300_PFS_CNTL_LAST_NODES_MASK     (3 << 0)
+#       define R300_PFS_CNTL_FIRST_NODE_HAS_TEX  (1 << 3)
+#define R300_PFS_CNTL_1                     0x4604
+/* There is an unshifted value here which has so far always been equal to the
+// index of the highest used temporary register. */
+#define R300_PFS_CNTL_2                     0x4608
+#       define R300_PFS_CNTL_ALU_OFFSET_SHIFT    0
+#       define R300_PFS_CNTL_ALU_OFFSET_MASK     (63 << 0)
+#       define R300_PFS_CNTL_ALU_END_SHIFT       6
+#       define R300_PFS_CNTL_ALU_END_MASK        (63 << 0)
+#       define R300_PFS_CNTL_TEX_OFFSET_SHIFT    12
+#       define R300_PFS_CNTL_TEX_OFFSET_MASK     (31 << 12) /* GUESS */
+#       define R300_PFS_CNTL_TEX_END_SHIFT       18
+#       define R300_PFS_CNTL_TEX_END_MASK        (31 << 18) /* GUESS */
+
+/* gap */
+/* Nodes are stored backwards. The last active node is always stored in
+// PFS_NODE_3.
+// Example: In a 2-node program, NODE_0 and NODE_1 are set to 0. The
+// first node is stored in NODE_2, the second node is stored in NODE_3.
+//
+// Offsets are relative to the master offset from PFS_CNTL_2.
+// LAST_NODE is set for the last node, and only for the last node. */
+#define R300_PFS_NODE_0                     0x4610
+#define R300_PFS_NODE_1                     0x4614
+#define R300_PFS_NODE_2                     0x4618
+#define R300_PFS_NODE_3                     0x461C
+#       define R300_PFS_NODE_ALU_OFFSET_SHIFT    0
+#       define R300_PFS_NODE_ALU_OFFSET_MASK     (63 << 0)
+#       define R300_PFS_NODE_ALU_END_SHIFT       6
+#       define R300_PFS_NODE_ALU_END_MASK        (63 << 6)
+#       define R300_PFS_NODE_TEX_OFFSET_SHIFT    12
+#       define R300_PFS_NODE_TEX_OFFSET_MASK     (31 << 12)
+#       define R300_PFS_NODE_TEX_END_SHIFT       17
+#       define R300_PFS_NODE_TEX_END_MASK        (31 << 17)
+#       define R300_PFS_NODE_LAST_NODE           (1 << 22)
+
+/* TEX
+// As far as I can tell, texture instructions cannot write into output
+// registers directly. A subsequent ALU instruction is always necessary,
+// even if it's just MAD o0, r0, 1, 0 */
+#define R300_PFS_TEXI_0                     0x4620
+#       define R300_FPITX_SRC_SHIFT              0
+#       define R300_FPITX_SRC_MASK               (31 << 0)
+#       define R300_FPITX_SRC_CONST              (1 << 5) /* GUESS */
+#       define R300_FPITX_DST_SHIFT              6
+#       define R300_FPITX_DST_MASK               (31 << 6)
+#       define R300_FPITX_IMAGE_SHIFT            11
+#       define R300_FPITX_IMAGE_MASK             (15 << 11) /* GUESS based on layout and native limits */
+/* Unsure if these are opcodes, or some kind of bitfield, but this is how
+ * they were set when I checked
+ */
+#               define R300_FPITX_OPCODE_SHIFT                  15
+#                       define R300_FPITX_OP_TEX                        1
+#                       define R300_FPITX_OP_TXP                        3
+#                       define R300_FPITX_OP_TXB                        4
+
+/* ALU
+// The ALU instructions register blocks are enumerated according to the order
+// in which fglrx. I assume there is space for 64 instructions, since
+// each block has space for a maximum of 64 DWORDs, and this matches reported
+// native limits.
+//
+// The basic functional block seems to be one MAD for each color and alpha,
+// and an adder that adds all components after the MUL.
+//  - ADD, MUL, MAD etc.: use MAD with appropriate neutral operands
+//  - DP4: Use OUTC_DP4, OUTA_DP4
+//  - DP3: Use OUTC_DP3, OUTA_DP4, appropriate alpha operands
+//  - DPH: Use OUTC_DP4, OUTA_DP4, appropriate alpha operands
+//  - CMP: If ARG2 < 0, return ARG1, else return ARG0
+//  - FLR: use FRC+MAD
+//  - XPD: use MAD+MAD
+//  - SGE, SLT: use MAD+CMP
+//  - RSQ: use ABS modifier for argument
+//  - Use OUTC_REPL_ALPHA to write results of an alpha-only operation (e.g. RCP)
+//    into color register
+//  - apparently, there's no quick DST operation
+//  - fglrx set FPI2_UNKNOWN_31 on a "MAD fragment.color, tmp0, tmp1, tmp2"
+//  - fglrx set FPI2_UNKNOWN_31 on a "MAX r2, r1, c0"
+//  - fglrx once set FPI0_UNKNOWN_31 on a "FRC r1, r1"
+//
+// Operand selection
+// First stage selects three sources from the available registers and
+// constant parameters. This is defined in INSTR1 (color) and INSTR3 (alpha).
+// fglrx sorts the three source fields: Registers before constants,
+// lower indices before higher indices; I do not know whether this is necessary.
+// fglrx fills unused sources with "read constant 0"
+// According to specs, you cannot select more than two different constants.
+//
+// Second stage selects the operands from the sources. This is defined in
+// INSTR0 (color) and INSTR2 (alpha). You can also select the special constants
+// zero and one.
+// Swizzling and negation happens in this stage, as well.
+//
+// Important: Color and alpha seem to be mostly separate, i.e. their sources
+// selection appears to be fully independent (the register storage is probably
+// physically split into a color and an alpha section).
+// However (because of the apparent physical split), there is some interaction
+// WRT swizzling. If, for example, you want to load an R component into an
+// Alpha operand, this R component is taken from a *color* source, not from
+// an alpha source. The corresponding register doesn't even have to appear in
+// the alpha sources list. (I hope this alll makes sense to you)
+//
+// Destination selection
+// The destination register index is in FPI1 (color) and FPI3 (alpha) together
+// with enable bits.
+// There are separate enable bits for writing into temporary registers
+// (DSTC_REG_* /DSTA_REG) and and program output registers (DSTC_OUTPUT_* /DSTA_OUTPUT).
+// You can write to both at once, or not write at all (the same index
+// must be used for both).
+//
+// Note: There is a special form for LRP
+//  - Argument order is the same as in ARB_fragment_program.
+//  - Operation is MAD
+//  - ARG1 is set to ARGC_SRC1C_LRP/ARGC_SRC1A_LRP
+//  - Set FPI0/FPI2_SPECIAL_LRP
+// Arbitrary LRP (including support for swizzling) requires vanilla MAD+MAD */
+#define R300_PFS_INSTR1_0                   0x46C0
+#       define R300_FPI1_SRC0C_SHIFT             0
+#       define R300_FPI1_SRC0C_MASK              (31 << 0)
+#       define R300_FPI1_SRC0C_CONST             (1 << 5)
+#       define R300_FPI1_SRC1C_SHIFT             6
+#       define R300_FPI1_SRC1C_MASK              (31 << 6)
+#       define R300_FPI1_SRC1C_CONST             (1 << 11)
+#       define R300_FPI1_SRC2C_SHIFT             12
+#       define R300_FPI1_SRC2C_MASK              (31 << 12)
+#       define R300_FPI1_SRC2C_CONST             (1 << 17)
+#       define R300_FPI1_DSTC_SHIFT              18
+#       define R300_FPI1_DSTC_MASK               (31 << 18)
+#       define R300_FPI1_DSTC_REG_X              (1 << 23)
+#       define R300_FPI1_DSTC_REG_Y              (1 << 24)
+#       define R300_FPI1_DSTC_REG_Z              (1 << 25)
+#       define R300_FPI1_DSTC_OUTPUT_X           (1 << 26)
+#       define R300_FPI1_DSTC_OUTPUT_Y           (1 << 27)
+#       define R300_FPI1_DSTC_OUTPUT_Z           (1 << 28)
+
+#define R300_PFS_INSTR3_0                   0x47C0
+#       define R300_FPI3_SRC0A_SHIFT             0
+#       define R300_FPI3_SRC0A_MASK              (31 << 0)
+#       define R300_FPI3_SRC0A_CONST             (1 << 5)
+#       define R300_FPI3_SRC1A_SHIFT             6
+#       define R300_FPI3_SRC1A_MASK              (31 << 6)
+#       define R300_FPI3_SRC1A_CONST             (1 << 11)
+#       define R300_FPI3_SRC2A_SHIFT             12
+#       define R300_FPI3_SRC2A_MASK              (31 << 12)
+#       define R300_FPI3_SRC2A_CONST             (1 << 17)
+#       define R300_FPI3_DSTA_SHIFT              18
+#       define R300_FPI3_DSTA_MASK               (31 << 18)
+#       define R300_FPI3_DSTA_REG                (1 << 23)
+#       define R300_FPI3_DSTA_OUTPUT             (1 << 24)
+
+#define R300_PFS_INSTR0_0                   0x48C0
+#       define R300_FPI0_ARGC_SRC0C_XYZ          0
+#       define R300_FPI0_ARGC_SRC0C_XXX          1
+#       define R300_FPI0_ARGC_SRC0C_YYY          2
+#       define R300_FPI0_ARGC_SRC0C_ZZZ          3
+#       define R300_FPI0_ARGC_SRC1C_XYZ          4
+#       define R300_FPI0_ARGC_SRC1C_XXX          5
+#       define R300_FPI0_ARGC_SRC1C_YYY          6
+#       define R300_FPI0_ARGC_SRC1C_ZZZ          7
+#       define R300_FPI0_ARGC_SRC2C_XYZ          8
+#       define R300_FPI0_ARGC_SRC2C_XXX          9
+#       define R300_FPI0_ARGC_SRC2C_YYY          10
+#       define R300_FPI0_ARGC_SRC2C_ZZZ          11
+#       define R300_FPI0_ARGC_SRC0A              12
+#       define R300_FPI0_ARGC_SRC1A              13
+#       define R300_FPI0_ARGC_SRC2A              14
+#       define R300_FPI0_ARGC_SRC1C_LRP          15
+#       define R300_FPI0_ARGC_ZERO               20
+#       define R300_FPI0_ARGC_ONE                21
+#       define R300_FPI0_ARGC_HALF               22 /* GUESS */
+#       define R300_FPI0_ARGC_SRC0C_YZX          23
+#       define R300_FPI0_ARGC_SRC1C_YZX          24
+#       define R300_FPI0_ARGC_SRC2C_YZX          25
+#       define R300_FPI0_ARGC_SRC0C_ZXY          26
+#       define R300_FPI0_ARGC_SRC1C_ZXY          27
+#       define R300_FPI0_ARGC_SRC2C_ZXY          28
+#       define R300_FPI0_ARGC_SRC0CA_WZY         29
+#       define R300_FPI0_ARGC_SRC1CA_WZY         30
+#       define R300_FPI0_ARGC_SRC2CA_WZY         31
+
+#       define R300_FPI0_ARG0C_SHIFT             0
+#       define R300_FPI0_ARG0C_MASK              (31 << 0)
+#       define R300_FPI0_ARG0C_NEG               (1 << 5)
+#       define R300_FPI0_ARG0C_ABS               (1 << 6)
+#       define R300_FPI0_ARG1C_SHIFT             7
+#       define R300_FPI0_ARG1C_MASK              (31 << 7)
+#       define R300_FPI0_ARG1C_NEG               (1 << 12)
+#       define R300_FPI0_ARG1C_ABS               (1 << 13)
+#       define R300_FPI0_ARG2C_SHIFT             14
+#       define R300_FPI0_ARG2C_MASK              (31 << 14)
+#       define R300_FPI0_ARG2C_NEG               (1 << 19)
+#       define R300_FPI0_ARG2C_ABS               (1 << 20)
+#       define R300_FPI0_SPECIAL_LRP             (1 << 21)
+#       define R300_FPI0_OUTC_MAD                (0 << 23)
+#       define R300_FPI0_OUTC_DP3                (1 << 23)
+#       define R300_FPI0_OUTC_DP4                (2 << 23)
+#       define R300_FPI0_OUTC_MIN                (4 << 23)
+#       define R300_FPI0_OUTC_MAX                (5 << 23)
+#       define R300_FPI0_OUTC_CMP                (8 << 23)
+#       define R300_FPI0_OUTC_FRC                (9 << 23)
+#       define R300_FPI0_OUTC_REPL_ALPHA         (10 << 23)
+#       define R300_FPI0_OUTC_SAT                (1 << 30)
+#       define R300_FPI0_UNKNOWN_31              (1 << 31)
+
+#define R300_PFS_INSTR2_0                   0x49C0
+#       define R300_FPI2_ARGA_SRC0C_X            0
+#       define R300_FPI2_ARGA_SRC0C_Y            1
+#       define R300_FPI2_ARGA_SRC0C_Z            2
+#       define R300_FPI2_ARGA_SRC1C_X            3
+#       define R300_FPI2_ARGA_SRC1C_Y            4
+#       define R300_FPI2_ARGA_SRC1C_Z            5
+#       define R300_FPI2_ARGA_SRC2C_X            6
+#       define R300_FPI2_ARGA_SRC2C_Y            7
+#       define R300_FPI2_ARGA_SRC2C_Z            8
+#       define R300_FPI2_ARGA_SRC0A              9
+#       define R300_FPI2_ARGA_SRC1A              10
+#       define R300_FPI2_ARGA_SRC2A              11
+#       define R300_FPI2_ARGA_SRC1A_LRP          15
+#       define R300_FPI2_ARGA_ZERO               16
+#       define R300_FPI2_ARGA_ONE                17
+#       define R300_FPI2_ARGA_HALF               18 /* GUESS */
+
+#       define R300_FPI2_ARG0A_SHIFT             0
+#       define R300_FPI2_ARG0A_MASK              (31 << 0)
+#       define R300_FPI2_ARG0A_NEG               (1 << 5)
+#               define R300_FPI2_ARG0A_ABS                               (1 << 6) /* GUESS */
+#       define R300_FPI2_ARG1A_SHIFT             7
+#       define R300_FPI2_ARG1A_MASK              (31 << 7)
+#       define R300_FPI2_ARG1A_NEG               (1 << 12)
+#               define R300_FPI2_ARG1A_ABS                               (1 << 13) /* GUESS */
+#       define R300_FPI2_ARG2A_SHIFT             14
+#       define R300_FPI2_ARG2A_MASK              (31 << 14)
+#       define R300_FPI2_ARG2A_NEG               (1 << 19)
+#               define R300_FPI2_ARG2A_ABS                               (1 << 20) /* GUESS */
+#       define R300_FPI2_SPECIAL_LRP             (1 << 21)
+#       define R300_FPI2_OUTA_MAD                (0 << 23)
+#       define R300_FPI2_OUTA_DP4                (1 << 23)
+#       define R300_FPI2_OUTA_MIN                (2 << 23)
+#       define R300_FPI2_OUTA_MAX                (3 << 23)
+#       define R300_FPI2_OUTA_CMP                (6 << 23)
+#       define R300_FPI2_OUTA_FRC                (7 << 23)
+#       define R300_FPI2_OUTA_EX2                (8 << 23)
+#       define R300_FPI2_OUTA_LG2                (9 << 23)
+#       define R300_FPI2_OUTA_RCP                (10 << 23)
+#       define R300_FPI2_OUTA_RSQ                (11 << 23)
+#       define R300_FPI2_OUTA_SAT                (1 << 30)
+#       define R300_FPI2_UNKNOWN_31              (1 << 31)
+/* END */
+
+/* gap */
+#define R300_PP_ALPHA_TEST                  0x4BD4
+#       define R300_REF_ALPHA_MASK               0x000000ff
+#       define R300_ALPHA_TEST_FAIL              (0 << 8)
+#       define R300_ALPHA_TEST_LESS              (1 << 8)
+#       define R300_ALPHA_TEST_LEQUAL            (3 << 8)
+#       define R300_ALPHA_TEST_EQUAL             (2 << 8)
+#       define R300_ALPHA_TEST_GEQUAL            (6 << 8)
+#       define R300_ALPHA_TEST_GREATER           (4 << 8)
+#       define R300_ALPHA_TEST_NEQUAL            (5 << 8)
+#       define R300_ALPHA_TEST_PASS              (7 << 8)
+#       define R300_ALPHA_TEST_OP_MASK           (7 << 8)
+#       define R300_ALPHA_TEST_ENABLE            (1 << 11)
+
+/* gap */
+/* Fragment program parameters in 7.16 floating point */
+#define R300_PFS_PARAM_0_X                  0x4C00
+#define R300_PFS_PARAM_0_Y                  0x4C04
+#define R300_PFS_PARAM_0_Z                  0x4C08
+#define R300_PFS_PARAM_0_W                  0x4C0C
+/* GUESS: PARAM_31 is last, based on native limits reported by fglrx */
+#define R300_PFS_PARAM_31_X                 0x4DF0
+#define R300_PFS_PARAM_31_Y                 0x4DF4
+#define R300_PFS_PARAM_31_Z                 0x4DF8
+#define R300_PFS_PARAM_31_W                 0x4DFC
+
+/* Notes:
+// - AFAIK fglrx always sets BLEND_UNKNOWN when blending is used in the application
+// - AFAIK fglrx always sets BLEND_NO_SEPARATE when CBLEND and ABLEND are set to the same
+//   function (both registers are always set up completely in any case)
+// - Most blend flags are simply copied from R200 and not tested yet */
+#define R300_RB3D_CBLEND                    0x4E04
+#define R300_RB3D_ABLEND                    0x4E08
+ /* the following only appear in CBLEND */
+#       define R300_BLEND_ENABLE                     (1 << 0)
+#       define R300_BLEND_UNKNOWN                    (3 << 1)
+#       define R300_BLEND_NO_SEPARATE                (1 << 3)
+ /* the following are shared between CBLEND and ABLEND */
+#       define R300_FCN_MASK                         (3  << 12)
+#       define R300_COMB_FCN_ADD_CLAMP               (0  << 12)
+#       define R300_COMB_FCN_ADD_NOCLAMP             (1  << 12)
+#       define R300_COMB_FCN_SUB_CLAMP               (2  << 12)
+#       define R300_COMB_FCN_SUB_NOCLAMP             (3  << 12)
+#       define R300_SRC_BLEND_GL_ZERO                (32 << 16)
+#       define R300_SRC_BLEND_GL_ONE                 (33 << 16)
+#       define R300_SRC_BLEND_GL_SRC_COLOR           (34 << 16)
+#       define R300_SRC_BLEND_GL_ONE_MINUS_SRC_COLOR (35 << 16)
+#       define R300_SRC_BLEND_GL_DST_COLOR           (36 << 16)
+#       define R300_SRC_BLEND_GL_ONE_MINUS_DST_COLOR (37 << 16)
+#       define R300_SRC_BLEND_GL_SRC_ALPHA           (38 << 16)
+#       define R300_SRC_BLEND_GL_ONE_MINUS_SRC_ALPHA (39 << 16)
+#       define R300_SRC_BLEND_GL_DST_ALPHA           (40 << 16)
+#       define R300_SRC_BLEND_GL_ONE_MINUS_DST_ALPHA (41 << 16)
+#       define R300_SRC_BLEND_GL_SRC_ALPHA_SATURATE  (42 << 16)
+#       define R300_SRC_BLEND_MASK                   (63 << 16)
+#       define R300_DST_BLEND_GL_ZERO                (32 << 24)
+#       define R300_DST_BLEND_GL_ONE                 (33 << 24)
+#       define R300_DST_BLEND_GL_SRC_COLOR           (34 << 24)
+#       define R300_DST_BLEND_GL_ONE_MINUS_SRC_COLOR (35 << 24)
+#       define R300_DST_BLEND_GL_DST_COLOR           (36 << 24)
+#       define R300_DST_BLEND_GL_ONE_MINUS_DST_COLOR (37 << 24)
+#       define R300_DST_BLEND_GL_SRC_ALPHA           (38 << 24)
+#       define R300_DST_BLEND_GL_ONE_MINUS_SRC_ALPHA (39 << 24)
+#       define R300_DST_BLEND_GL_DST_ALPHA           (40 << 24)
+#       define R300_DST_BLEND_GL_ONE_MINUS_DST_ALPHA (41 << 24)
+#       define R300_DST_BLEND_MASK                   (63 << 24)
+#define R300_RB3D_COLORMASK                 0x4E0C
+#       define R300_COLORMASK0_B                 (1<<0)
+#       define R300_COLORMASK0_G                 (1<<1)
+#       define R300_COLORMASK0_R                 (1<<2)
+#       define R300_COLORMASK0_A                 (1<<3)
+
+/* gap */
+#define R300_RB3D_COLOROFFSET0              0x4E28
+#       define R300_COLOROFFSET_MASK             0xFFFFFFF0 /* GUESS */
+#define R300_RB3D_COLOROFFSET1              0x4E2C /* GUESS */
+#define R300_RB3D_COLOROFFSET2              0x4E30 /* GUESS */
+#define R300_RB3D_COLOROFFSET3              0x4E34 /* GUESS */
+/* gap */
+/* Bit 16: Larger tiles
+// Bit 17: 4x2 tiles
+// Bit 18: Extremely weird tile like, but some pixels duplicated? */
+#define R300_RB3D_COLORPITCH0               0x4E38
+#       define R300_COLORPITCH_MASK              0x00001FF8 /* GUESS */
+#       define R300_COLOR_TILE_ENABLE            (1 << 16) /* GUESS */
+#       define R300_COLOR_MICROTILE_ENABLE       (1 << 17) /* GUESS */
+#       define R300_COLOR_ENDIAN_NO_SWAP         (0 << 18) /* GUESS */
+#       define R300_COLOR_ENDIAN_WORD_SWAP       (1 << 18) /* GUESS */
+#       define R300_COLOR_ENDIAN_DWORD_SWAP      (2 << 18) /* GUESS */
+#       define R300_COLOR_FORMAT_RGB565          (2 << 22)
+#       define R300_COLOR_FORMAT_ARGB8888        (3 << 22)
+#define R300_RB3D_COLORPITCH1               0x4E3C /* GUESS */
+#define R300_RB3D_COLORPITCH2               0x4E40 /* GUESS */
+#define R300_RB3D_COLORPITCH3               0x4E44 /* GUESS */
+
+/* gap */
+/* Guess by Vladimir.
+// Set to 0A before 3D operations, set to 02 afterwards. */
+#define R300_RB3D_DSTCACHE_CTLSTAT          0x4E4C
+#       define R300_RB3D_DSTCACHE_02             0x00000002
+#       define R300_RB3D_DSTCACHE_0A             0x0000000A
+
+/* gap */
+/* There seems to be no "write only" setting, so use Z-test = ALWAYS for this. */
+/* Bit (1<<8) is the "test" bit. so plain write is 6  - vd */
+#define R300_RB3D_ZSTENCIL_CNTL_0                   0x4F00
+#       define R300_RB3D_Z_DISABLED_1            0x00000010 /* GUESS */
+#       define R300_RB3D_Z_DISABLED_2            0x00000014 /* GUESS */
+#       define R300_RB3D_Z_TEST                  0x00000012
+#       define R300_RB3D_Z_TEST_AND_WRITE        0x00000016
+#       define R300_RB3D_Z_WRITE_ONLY            0x00000006
+
+#       define R300_RB3D_Z_TEST                  0x00000012
+#       define R300_RB3D_Z_TEST_AND_WRITE        0x00000016
+#       define R300_RB3D_Z_WRITE_ONLY            0x00000006
+#       define R300_RB3D_STENCIL_ENABLE          0x00000001
+
+#define R300_RB3D_ZSTENCIL_CNTL_1                   0x4F04
+                /* functions */
+#       define R300_ZS_NEVER                    0
+#       define R300_ZS_LESS                     1
+#       define R300_ZS_LEQUAL                   2
+#       define R300_ZS_EQUAL                    3
+#       define R300_ZS_GEQUAL                   4
+#       define R300_ZS_GREATER                  5
+#       define R300_ZS_NOTEQUAL                 6
+#       define R300_ZS_ALWAYS                   7
+#       define R300_ZS_MASK                     7
+                /* operations */
+#       define R300_ZS_KEEP                     0
+#       define R300_ZS_ZERO                     1
+#       define R300_ZS_REPLACE                  2
+#       define R300_ZS_INCR                     3
+#       define R300_ZS_DECR                     4
+#       define R300_ZS_INVERT                   5
+#       define R300_ZS_INCR_WRAP                6
+#       define R300_ZS_DECR_WRAP                7
+
+       /* front and back refer to operations done for front
+          and back faces, i.e. separate stencil function support */
+#       define R300_RB3D_ZS1_DEPTH_FUNC_SHIFT           0
+#       define R300_RB3D_ZS1_FRONT_FUNC_SHIFT           3
+#       define R300_RB3D_ZS1_FRONT_FAIL_OP_SHIFT        6
+#       define R300_RB3D_ZS1_FRONT_ZPASS_OP_SHIFT       9
+#       define R300_RB3D_ZS1_FRONT_ZFAIL_OP_SHIFT      12
+#       define R300_RB3D_ZS1_BACK_FUNC_SHIFT           15
+#       define R300_RB3D_ZS1_BACK_FAIL_OP_SHIFT        18
+#       define R300_RB3D_ZS1_BACK_ZPASS_OP_SHIFT       21
+#       define R300_RB3D_ZS1_BACK_ZFAIL_OP_SHIFT       24
+
+
+
+#define R300_RB3D_ZSTENCIL_CNTL_2                   0x4F08
+#       define R300_RB3D_ZS2_STENCIL_REF_SHIFT          0
+#       define R300_RB3D_ZS2_STENCIL_MASK               0xFF
+#       define R300_RB3D_ZS2_STENCIL_MASK_SHIFT         8
+#       define R300_RB3D_ZS2_STENCIL_WRITE_MASK_SHIFT   16
+
+/* gap */
+
+#define R300_RB3D_ZSTENCIL_FORMAT                   0x4F10
+#       define R300_DEPTH_FORMAT_16BIT_INT_Z     (0 << 0)
+#       define R300_DEPTH_FORMAT_24BIT_INT_Z     (2 << 0)
+
+/* gap */
+#define R300_RB3D_DEPTHOFFSET               0x4F20
+#define R300_RB3D_DEPTHPITCH                0x4F24
+#       define R300_DEPTHPITCH_MASK              0x00001FF8 /* GUESS */
+#       define R300_DEPTH_TILE_ENABLE            (1 << 16) /* GUESS */
+#       define R300_DEPTH_MICROTILE_ENABLE       (1 << 17) /* GUESS */
+#       define R300_DEPTH_ENDIAN_NO_SWAP         (0 << 18) /* GUESS */
+#       define R300_DEPTH_ENDIAN_WORD_SWAP       (1 << 18) /* GUESS */
+#       define R300_DEPTH_ENDIAN_DWORD_SWAP      (2 << 18) /* GUESS */
+
+/* BEGIN: Vertex program instruction set
+// Every instruction is four dwords long:
+//  DWORD 0: output and opcode
+//  DWORD 1: first argument
+//  DWORD 2: second argument
+//  DWORD 3: third argument
+//
+// Notes:
+//  - ABS r, a is implemented as MAX r, a, -a
+//  - MOV is implemented as ADD to zero
+//  - XPD is implemented as MUL + MAD
+//  - FLR is implemented as FRC + ADD
+//  - apparently, fglrx tries to schedule instructions so that there is at least
+//    one instruction between the write to a temporary and the first read
+//    from said temporary; however, violations of this scheduling are allowed
+//  - register indices seem to be unrelated with OpenGL aliasing to conventional state
+//  - only one attribute and one parameter can be loaded at a time; however, the
+//    same attribute/parameter can be used for more than one argument
+//  - the second software argument for POW is the third hardware argument (no idea why)
+//  - MAD with only temporaries as input seems to use VPI_OUT_SELECT_MAD_2
+//
+// There is some magic surrounding LIT:
+//  The single argument is replicated across all three inputs, but swizzled:
+//   First argument: xyzy
+//   Second argument: xyzx
+//   Third argument: xyzw
+//  Whenever the result is used later in the fragment program, fglrx forces x and w
+//  to be 1.0 in the input selection; I don't know whether this is strictly necessary */
+#define R300_VPI_OUT_OP_DOT                     (1 << 0)
+#define R300_VPI_OUT_OP_MUL                     (2 << 0)
+#define R300_VPI_OUT_OP_ADD                     (3 << 0)
+#define R300_VPI_OUT_OP_MAD                     (4 << 0)
+#define R300_VPI_OUT_OP_DST                     (5 << 0)
+#define R300_VPI_OUT_OP_FRC                     (6 << 0)
+#define R300_VPI_OUT_OP_MAX                     (7 << 0)
+#define R300_VPI_OUT_OP_MIN                     (8 << 0)
+#define R300_VPI_OUT_OP_SGE                     (9 << 0)
+#define R300_VPI_OUT_OP_SLT                     (10 << 0)
+#define R300_VPI_OUT_OP_UNK12                   (12 << 0) /* Used in GL_POINT_DISTANCE_ATTENUATION_ARB, vector(scalar, vector) */
+#define R300_VPI_OUT_OP_EXP                     (65 << 0)
+#define R300_VPI_OUT_OP_LOG                     (66 << 0)
+#define R300_VPI_OUT_OP_UNK67                   (67 << 0) /* Used in fog computations, scalar(scalar) */
+#define R300_VPI_OUT_OP_LIT                     (68 << 0)
+#define R300_VPI_OUT_OP_POW                     (69 << 0)
+#define R300_VPI_OUT_OP_RCP                     (70 << 0)
+#define R300_VPI_OUT_OP_RSQ                     (72 << 0)
+#define R300_VPI_OUT_OP_UNK73                   (73 << 0) /* Used in GL_POINT_DISTANCE_ATTENUATION_ARB, scalar(scalar) */
+#define R300_VPI_OUT_OP_EX2                     (75 << 0)
+#define R300_VPI_OUT_OP_LG2                     (76 << 0)
+#define R300_VPI_OUT_OP_MAD_2                   (128 << 0)
+#define R300_VPI_OUT_OP_UNK129                  (129 << 0) /* all temps, vector(scalar, vector, vector) */
+
+#define R300_VPI_OUT_REG_CLASS_TEMPORARY        (0 << 8)
+#define R300_VPI_OUT_REG_CLASS_RESULT           (2 << 8)
+#define R300_VPI_OUT_REG_CLASS_MASK             (31 << 8)
+
+#define R300_VPI_OUT_REG_INDEX_SHIFT            13
+#define R300_VPI_OUT_REG_INDEX_MASK             (31 << 13) /* GUESS based on fglrx native limits */
+
+#define R300_VPI_OUT_WRITE_X                    (1 << 20)
+#define R300_VPI_OUT_WRITE_Y                    (1 << 21)
+#define R300_VPI_OUT_WRITE_Z                    (1 << 22)
+#define R300_VPI_OUT_WRITE_W                    (1 << 23)
+
+#define R300_VPI_IN_REG_CLASS_TEMPORARY         (0 << 0)
+#define R300_VPI_IN_REG_CLASS_ATTRIBUTE         (1 << 0)
+#define R300_VPI_IN_REG_CLASS_PARAMETER         (2 << 0)
+#define R300_VPI_IN_REG_CLASS_NONE              (9 << 0)
+#define R300_VPI_IN_REG_CLASS_MASK              (31 << 0) /* GUESS */
+
+#define R300_VPI_IN_REG_INDEX_SHIFT             5
+#define R300_VPI_IN_REG_INDEX_MASK              (255 << 5) /* GUESS based on fglrx native limits */
+
+/* The R300 can select components from the input register arbitrarily.
+// Use the following constants, shifted by the component shift you
+// want to select */
+#define R300_VPI_IN_SELECT_X    0
+#define R300_VPI_IN_SELECT_Y    1
+#define R300_VPI_IN_SELECT_Z    2
+#define R300_VPI_IN_SELECT_W    3
+#define R300_VPI_IN_SELECT_ZERO 4
+#define R300_VPI_IN_SELECT_ONE  5
+#define R300_VPI_IN_SELECT_MASK 7
+
+#define R300_VPI_IN_X_SHIFT                     13
+#define R300_VPI_IN_Y_SHIFT                     16
+#define R300_VPI_IN_Z_SHIFT                     19
+#define R300_VPI_IN_W_SHIFT                     22
+
+#define R300_VPI_IN_NEG_X                       (1 << 25)
+#define R300_VPI_IN_NEG_Y                       (1 << 26)
+#define R300_VPI_IN_NEG_Z                       (1 << 27)
+#define R300_VPI_IN_NEG_W                       (1 << 28)
+/* END */
+
+//BEGIN: Packet 3 commands
+
+// A primitive emission dword.
+#define R300_PRIM_TYPE_NONE                     (0 << 0)
+#define R300_PRIM_TYPE_POINT                    (1 << 0)
+#define R300_PRIM_TYPE_LINE                     (2 << 0)
+#define R300_PRIM_TYPE_LINE_STRIP               (3 << 0)
+#define R300_PRIM_TYPE_TRI_LIST                 (4 << 0)
+#define R300_PRIM_TYPE_TRI_FAN                  (5 << 0)
+#define R300_PRIM_TYPE_TRI_STRIP                (6 << 0)
+#define R300_PRIM_TYPE_TRI_TYPE2                (7 << 0)
+#define R300_PRIM_TYPE_RECT_LIST                (8 << 0)
+#define R300_PRIM_TYPE_3VRT_POINT_LIST          (9 << 0)
+#define R300_PRIM_TYPE_3VRT_LINE_LIST           (10 << 0)
+#define R300_PRIM_TYPE_POINT_SPRITES            (11 << 0) // GUESS (based on r200)
+#define R300_PRIM_TYPE_LINE_LOOP                (12 << 0)
+#define R300_PRIM_TYPE_QUADS                    (13 << 0)
+#define R300_PRIM_TYPE_QUAD_STRIP               (14 << 0)
+#define R300_PRIM_TYPE_POLYGON                  (15 << 0)
+#define R300_PRIM_TYPE_MASK                     0xF
+#define R300_PRIM_WALK_IND                      (1 << 4)
+#define R300_PRIM_WALK_LIST                     (2 << 4)
+#define R300_PRIM_WALK_RING                     (3 << 4)
+#define R300_PRIM_WALK_MASK                     (3 << 4)
+#define R300_PRIM_COLOR_ORDER_BGRA              (0 << 6) // GUESS (based on r200)
+#define R300_PRIM_COLOR_ORDER_RGBA              (1 << 6) // GUESS
+#define R300_PRIM_NUM_VERTICES_SHIFT            16
+
+// Draw a primitive from vertex data in arrays loaded via 3D_LOAD_VBPNTR.
+// Two parameter dwords:
+// 0. The first parameter appears to be always 0
+// 1. The second parameter is a standard primitive emission dword.
+#define R300_PACKET3_3D_DRAW_VBUF           0x00002800
+
+// Specify the full set of vertex arrays as (address, stride).
+// The first parameter is the number of vertex arrays specified.
+// The rest of the command is a variable length list of blocks, where
+// each block is three dwords long and specifies two arrays.
+// The first dword of a block is split into two words, the lower significant
+// word refers to the first array, the more significant word to the second
+// array in the block.
+// The low byte of each word contains the size of an array entry in dwords,
+// the high byte contains the stride of the array.
+// The second dword of a block contains the pointer to the first array,
+// the third dword of a block contains the pointer to the second array.
+// Note that if the total number of arrays is odd, the third dword of
+// the last block is omitted.
+#define R300_PACKET3_3D_LOAD_VBPNTR         0x00002F00
+
+#define R300_PACKET3_INDX_BUFFER            0x00003300
+#    define R300_EB_UNK1_SHIFT                      24
+#    define R300_EB_UNK1                    (0x80<<24)
+#    define R300_EB_UNK2                        0x0810
+#define R300_PACKET3_3D_DRAW_INDX_2         0x00003600
+
+//END
+
+#endif /* _R300_REG_H */
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 20bcf872b348..6d9080a3ca7e 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -32,6 +32,7 @@
 #include "drm.h"
 #include "radeon_drm.h"
 #include "radeon_drv.h"
+#include "r300_reg.h"
 
 #define RADEON_FIFO_DEBUG       0
 
@@ -1151,6 +1152,8 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev,
 
 #if __OS_HAS_AGP
         if ( !dev_priv->is_pci ) {
+                /* set RADEON_AGP_BASE here instead of relying on X from user space */
+                RADEON_WRITE(RADEON_AGP_BASE, (unsigned int)dev->agp->base);
                 RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
                               dev_priv->ring_rptr->offset
                               - dev->agp->base
@@ -1407,6 +1410,7 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
                 radeon_do_cleanup_cp(dev);
                 return DRM_ERR(EINVAL);
         }
+        dev->agp_buffer_token = init->buffers_offset;
         dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
         if(!dev->agp_buffer_map) {
                 DRM_ERROR("could not find dma buffer region!\n");
@@ -1625,6 +1629,9 @@ int radeon_cp_init( DRM_IOCTL_ARGS )
 
         DRM_COPY_FROM_USER_IOCTL( init, (drm_radeon_init_t __user *)data, sizeof(init) );
 
+        if(init.func == RADEON_INIT_R300_CP)
+                r300_init_reg_flags();
+
         switch ( init.func ) {
         case RADEON_INIT_CP:
         case RADEON_INIT_R200_CP:
@@ -2039,15 +2046,43 @@ int radeon_driver_preinit(struct drm_device *dev, unsigned long flags)
         case CHIP_RV200:
         case CHIP_R200:
         case CHIP_R300:
+        case CHIP_R420:
                 dev_priv->flags |= CHIP_HAS_HIERZ;
                 break;
         default:
         /* all other chips have no hierarchical z buffer */
                 break;
         }
+
+        if (drm_device_is_agp(dev))
+                dev_priv->flags |= CHIP_IS_AGP;
+        
+        DRM_DEBUG("%s card detected\n",
+                  ((dev_priv->flags & CHIP_IS_AGP) ? "AGP" : "PCI"));
         return ret;
 }
 
+int radeon_presetup(struct drm_device *dev)
+{
+        int ret;
+        drm_local_map_t *map;
+        drm_radeon_private_t *dev_priv = dev->dev_private;
+
+        ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
+                         drm_get_resource_len(dev, 2), _DRM_REGISTERS,
+                         _DRM_READ_ONLY, &dev_priv->mmio);
+        if (ret != 0)
+                return ret;
+
+        ret = drm_addmap(dev, drm_get_resource_start(dev, 0),
+                         drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,
+                         _DRM_WRITE_COMBINING, &map);
+        if (ret != 0)
+                return ret;
+
+        return 0;
+}
+
 int radeon_driver_postcleanup(struct drm_device *dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h
index c1e62d047989..3792798270a4 100644
--- a/drivers/char/drm/radeon_drm.h
+++ b/drivers/char/drm/radeon_drm.h
@@ -195,6 +195,52 @@ typedef union {
 #define RADEON_WAIT_2D  0x1
 #define RADEON_WAIT_3D  0x2
 
+/* Allowed parameters for R300_CMD_PACKET3
+ */
+#define R300_CMD_PACKET3_CLEAR          0
+#define R300_CMD_PACKET3_RAW            1
+
+/* Commands understood by cmd_buffer ioctl for R300.
+ * The interface has not been stabilized, so some of these may be removed
+ * and eventually reordered before stabilization.
+ */
+#define R300_CMD_PACKET0                1 
+#define R300_CMD_VPU                    2 /* emit vertex program upload */
+#define R300_CMD_PACKET3                3 /* emit a packet3 */
+#define R300_CMD_END3D                  4 /* emit sequence ending 3d rendering */
+#define R300_CMD_CP_DELAY               5
+#define R300_CMD_DMA_DISCARD            6
+#define R300_CMD_WAIT                   7
+#       define R300_WAIT_2D             0x1
+#       define R300_WAIT_3D             0x2
+#       define R300_WAIT_2D_CLEAN       0x3
+#       define R300_WAIT_3D_CLEAN       0x4
+
+typedef union {
+        unsigned int u;
+        struct {
+                unsigned char cmd_type, pad0, pad1, pad2;
+        } header;
+        struct {
+                unsigned char cmd_type, count, reglo, reghi;
+        } packet0;
+        struct {
+                unsigned char cmd_type, count, adrlo, adrhi;
+        } vpu;
+        struct {
+                unsigned char cmd_type, packet, pad0, pad1;
+        } packet3;
+        struct {
+                unsigned char cmd_type, packet;
+                unsigned short count; /* amount of packet2 to emit */
+        } delay;
+        struct {
+                unsigned char cmd_type, buf_idx, pad0, pad1;
+        } dma;
+        struct {
+                unsigned char cmd_type, flags, pad0, pad1;      
+        } wait;
+} drm_r300_cmd_header_t;
 
 #define RADEON_FRONT                    0x1
 #define RADEON_BACK                     0x2
diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c
index 18e4e5b0952f..e0682f64b400 100644
--- a/drivers/char/drm/radeon_drv.c
+++ b/drivers/char/drm/radeon_drv.c
@@ -76,6 +76,7 @@ static struct drm_driver driver = {
         .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
         .dev_priv_size = sizeof(drm_radeon_buf_priv_t),
         .preinit = radeon_driver_preinit,
+        .presetup = radeon_presetup,
         .postcleanup = radeon_driver_postcleanup,
         .prerelease = radeon_driver_prerelease,
         .pretakedown = radeon_driver_pretakedown,
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 771aa80a5e8c..f12a963ede18 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -82,9 +82,10 @@
  *     - Add support for r100 cube maps
  * 1.16- Add R200_EMIT_PP_TRI_PERF_CNTL packet to support brilinear
  *       texture filtering on r200
+ * 1.17- Add initial support for R300 (3D).
  */
 #define DRIVER_MAJOR            1
-#define DRIVER_MINOR            16
+#define DRIVER_MINOR            17
 #define DRIVER_PATCHLEVEL       0
 
 #define GET_RING_HEAD(dev_priv)         DRM_READ32(  (dev_priv)->ring_rptr, 0 )
@@ -106,7 +107,9 @@ enum radeon_family {
         CHIP_RV280,
         CHIP_R300,
         CHIP_RS300,
+        CHIP_R350,
         CHIP_RV350,
+        CHIP_R420,
         CHIP_LAST,
 };
 
@@ -290,6 +293,7 @@ extern int radeon_wait_ring( drm_radeon_private_t *dev_priv, int n );
 extern int radeon_do_cp_idle( drm_radeon_private_t *dev_priv );
 
 extern int radeon_driver_preinit(struct drm_device *dev, unsigned long flags);
+extern int radeon_presetup(struct drm_device *dev);
 extern int radeon_driver_postcleanup(struct drm_device *dev);
 
 extern int radeon_mem_alloc( DRM_IOCTL_ARGS );
@@ -320,6 +324,14 @@ extern int radeon_postcleanup( struct drm_device *dev );
 extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
                                 unsigned long arg);
 
+
+/* r300_cmdbuf.c */
+extern void r300_init_reg_flags(void);
+
+extern int r300_do_cp_cmdbuf(drm_device_t* dev, DRMFILE filp,
+                             drm_file_t* filp_priv,
+                             drm_radeon_cmd_buffer_t* cmdbuf);
+
 /* Flags for stats.boxes
  */
 #define RADEON_BOX_DMA_IDLE      0x1
@@ -357,6 +369,11 @@ extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
 #define RADEON_CRTC2_OFFSET             0x0324
 #define RADEON_CRTC2_OFFSET_CNTL        0x0328
 
+#define RADEON_MPP_TB_CONFIG            0x01c0
+#define RADEON_MEM_CNTL                 0x0140
+#define RADEON_MEM_SDRAM_MODE_REG       0x0158
+#define RADEON_AGP_BASE                 0x0170
+
 #define RADEON_RB3D_COLOROFFSET         0x1c40
 #define RADEON_RB3D_COLORPITCH          0x1c48
 
@@ -651,16 +668,27 @@ extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd,
 #define RADEON_CP_PACKET1               0x40000000
 #define RADEON_CP_PACKET2               0x80000000
 #define RADEON_CP_PACKET3               0xC0000000
+#       define RADEON_CP_NOP                    0x00001000
+#       define RADEON_CP_NEXT_CHAR              0x00001900
+#       define RADEON_CP_PLY_NEXTSCAN           0x00001D00
+#       define RADEON_CP_SET_SCISSORS           0x00001E00
+             /* GEN_INDX_PRIM is unsupported starting with R300 */
 #       define RADEON_3D_RNDR_GEN_INDX_PRIM     0x00002300
 #       define RADEON_WAIT_FOR_IDLE             0x00002600
 #       define RADEON_3D_DRAW_VBUF              0x00002800
 #       define RADEON_3D_DRAW_IMMD              0x00002900
 #       define RADEON_3D_DRAW_INDX              0x00002A00
+#       define RADEON_CP_LOAD_PALETTE           0x00002C00
 #       define RADEON_3D_LOAD_VBPNTR            0x00002F00
 #       define RADEON_MPEG_IDCT_MACROBLOCK      0x00003000
 #       define RADEON_MPEG_IDCT_MACROBLOCK_REV  0x00003100
 #       define RADEON_3D_CLEAR_ZMASK            0x00003200
+#       define RADEON_CP_INDX_BUFFER            0x00003300
+#       define RADEON_CP_3D_DRAW_VBUF_2         0x00003400
+#       define RADEON_CP_3D_DRAW_IMMD_2         0x00003500
+#       define RADEON_CP_3D_DRAW_INDX_2         0x00003600
 #       define RADEON_3D_CLEAR_HIZ              0x00003700
+#       define RADEON_CP_3D_CLEAR_CMASK         0x00003802
 #       define RADEON_CNTL_HOSTDATA_BLT         0x00009400
 #       define RADEON_CNTL_PAINT_MULTI          0x00009A00
 #       define RADEON_CNTL_BITBLT_MULTI         0x00009B00
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 1f79e249146c..64a3e3a406ef 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -1493,7 +1493,7 @@ static void radeon_cp_dispatch_indices( drm_device_t *dev,
 
 }
 
-#define RADEON_MAX_TEXTURE_SIZE (RADEON_BUFFER_SIZE - 8 * sizeof(u32))
+#define RADEON_MAX_TEXTURE_SIZE RADEON_BUFFER_SIZE
 
 static int radeon_cp_dispatch_texture( DRMFILE filp,
                                        drm_device_t *dev,
@@ -1506,10 +1506,11 @@ static int radeon_cp_dispatch_texture( DRMFILE filp,
         u32 format;
         u32 *buffer;
         const u8 __user *data;
-        int size, dwords, tex_width, blit_width;
+        int size, dwords, tex_width, blit_width, spitch;
         u32 height;
         int i;
         u32 texpitch, microtile;
+        u32 offset;
         RING_LOCALS;
 
         DRM_GET_PRIV_WITH_RETURN( filp_priv, filp );
@@ -1530,17 +1531,6 @@ static int radeon_cp_dispatch_texture( DRMFILE filp,
         RADEON_WAIT_UNTIL_IDLE();
         ADVANCE_RING();
 
-#ifdef __BIG_ENDIAN
-        /* The Mesa texture functions provide the data in little endian as the
-         * chip wants it, but we need to compensate for the fact that the CP
-         * ring gets byte-swapped
-         */
-        BEGIN_RING( 2 );
-        OUT_RING_REG( RADEON_RBBM_GUICNTL, RADEON_HOST_DATA_SWAP_32BIT );
-        ADVANCE_RING();
-#endif
-
-
         /* The compiler won't optimize away a division by a variable,
          * even if the only legal values are powers of two.  Thus, we'll
          * use a shift instead.
@@ -1572,6 +1562,10 @@ static int radeon_cp_dispatch_texture( DRMFILE filp,
                 DRM_ERROR( "invalid texture format %d\n", tex->format );
                 return DRM_ERR(EINVAL);
         }
+        spitch = blit_width >> 6;
+        if (spitch == 0 && image->height > 1)
+                return DRM_ERR(EINVAL);
+
         texpitch = tex->pitch;
         if ((texpitch << 22) & RADEON_DST_TILE_MICRO) {
                 microtile = 1;
@@ -1624,25 +1618,6 @@ static int radeon_cp_dispatch_texture( DRMFILE filp,
                  */
                 buffer = (u32*)((char*)dev->agp_buffer_map->handle + buf->offset);
                 dwords = size / 4;
-                buffer[0] = CP_PACKET3( RADEON_CNTL_HOSTDATA_BLT, dwords + 6 );
-                buffer[1] = (RADEON_GMC_DST_PITCH_OFFSET_CNTL |
-                             RADEON_GMC_BRUSH_NONE |
-                             (format << 8) |
-                             RADEON_GMC_SRC_DATATYPE_COLOR |
-                             RADEON_ROP3_S |
-                             RADEON_DP_SRC_SOURCE_HOST_DATA |
-                             RADEON_GMC_CLR_CMP_CNTL_DIS |
-                             RADEON_GMC_WR_MSK_DIS);
-                
-                buffer[2] = (texpitch << 22) | (tex->offset >> 10);
-                buffer[3] = 0xffffffff;
-                buffer[4] = 0xffffffff;
-                buffer[5] = (image->y << 16) | image->x;
-                buffer[6] = (height << 16) | image->width;
-                buffer[7] = dwords;
-                buffer += 8;
-
-                
 
                 if (microtile) {
                         /* texture micro tiling in use, minimum texture width is thus 16 bytes.
@@ -1750,9 +1725,28 @@ static int radeon_cp_dispatch_texture( DRMFILE filp,
                 }
 
                 buf->filp = filp;
-                buf->used = (dwords + 8) * sizeof(u32);
-                radeon_cp_dispatch_indirect( dev, buf, 0, buf->used );
-                radeon_cp_discard_buffer( dev, buf );
+                buf->used = size;
+                offset = dev_priv->gart_buffers_offset + buf->offset;
+                BEGIN_RING(9);
+                OUT_RING(CP_PACKET3(RADEON_CNTL_BITBLT_MULTI, 5));
+                OUT_RING(RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
+                         RADEON_GMC_DST_PITCH_OFFSET_CNTL |
+                         RADEON_GMC_BRUSH_NONE |
+                         (format << 8) |
+                         RADEON_GMC_SRC_DATATYPE_COLOR |
+                         RADEON_ROP3_S |
+                         RADEON_DP_SRC_SOURCE_MEMORY |
+                         RADEON_GMC_CLR_CMP_CNTL_DIS |
+                         RADEON_GMC_WR_MSK_DIS );
+                OUT_RING((spitch << 22) | (offset >> 10));
+                OUT_RING((texpitch << 22) | (tex->offset >> 10));
+                OUT_RING(0);
+                OUT_RING((image->x << 16) | image->y);
+                OUT_RING((image->width << 16) | height);
+                RADEON_WAIT_UNTIL_2D_IDLE();
+                ADVANCE_RING();
+
+                radeon_cp_discard_buffer(dev, buf);
 
                 /* Update the input parameters for next time */
                 image->y += height;
@@ -2797,6 +2791,17 @@ static int radeon_cp_cmdbuf( DRM_IOCTL_ARGS )
 
         orig_nbox = cmdbuf.nbox;
 
+        if(dev_priv->microcode_version == UCODE_R300) {
+                int temp;
+                temp=r300_do_cp_cmdbuf(dev, filp, filp_priv, &cmdbuf);
+        
+                if (orig_bufsz != 0)
+                        drm_free(kbuf, orig_bufsz, DRM_MEM_DRIVER);
+        
+                return temp;
+        }
+
+        /* microcode_version != r300 */
         while ( cmdbuf.bufsz >= sizeof(header) ) {
 
                 header.i = *(int *)cmdbuf.buf;
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c
new file mode 100644
index 000000000000..2fd40bac7c97
--- /dev/null
+++ b/drivers/char/drm/savage_bci.c
@@ -0,0 +1,1096 @@
+/* savage_bci.c -- BCI support for Savage
+ *
+ * Copyright 2004  Felix Kuehling
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "drmP.h"
+#include "savage_drm.h"
+#include "savage_drv.h"
+
+/* Need a long timeout for shadow status updates can take a while
+ * and so can waiting for events when the queue is full. */
+#define SAVAGE_DEFAULT_USEC_TIMEOUT     1000000 /* 1s */
+#define SAVAGE_EVENT_USEC_TIMEOUT       5000000 /* 5s */
+#define SAVAGE_FREELIST_DEBUG           0
+
+static int
+savage_bci_wait_fifo_shadow(drm_savage_private_t *dev_priv, unsigned int n)
+{
+        uint32_t mask = dev_priv->status_used_mask;
+        uint32_t threshold = dev_priv->bci_threshold_hi;
+        uint32_t status;
+        int i;
+
+#if SAVAGE_BCI_DEBUG
+        if (n > dev_priv->cob_size + SAVAGE_BCI_FIFO_SIZE - threshold)
+                DRM_ERROR("Trying to emit %d words "
+                          "(more than guaranteed space in COB)\n", n);
+#endif
+
+        for (i = 0; i < SAVAGE_DEFAULT_USEC_TIMEOUT; i++) {
+                DRM_MEMORYBARRIER();
+                status = dev_priv->status_ptr[0];
+                if ((status & mask) < threshold)
+                        return 0;
+                DRM_UDELAY(1);
+        }
+
+#if SAVAGE_BCI_DEBUG
+        DRM_ERROR("failed!\n");
+        DRM_INFO("   status=0x%08x, threshold=0x%08x\n", status, threshold);
+#endif
+        return DRM_ERR(EBUSY);
+}
+
+static int
+savage_bci_wait_fifo_s3d(drm_savage_private_t *dev_priv, unsigned int n)
+{
+        uint32_t maxUsed = dev_priv->cob_size + SAVAGE_BCI_FIFO_SIZE - n;
+        uint32_t status;
+        int i;
+
+        for (i = 0; i < SAVAGE_DEFAULT_USEC_TIMEOUT; i++) {
+                status = SAVAGE_READ(SAVAGE_STATUS_WORD0);
+                if ((status & SAVAGE_FIFO_USED_MASK_S3D) <= maxUsed)
+                        return 0;
+                DRM_UDELAY(1);
+        }
+
+#if SAVAGE_BCI_DEBUG
+        DRM_ERROR("failed!\n");
+        DRM_INFO("   status=0x%08x\n", status);
+#endif
+        return DRM_ERR(EBUSY);
+}
+
+static int
+savage_bci_wait_fifo_s4(drm_savage_private_t *dev_priv, unsigned int n)
+{
+        uint32_t maxUsed = dev_priv->cob_size + SAVAGE_BCI_FIFO_SIZE - n;
+        uint32_t status;
+        int i;
+
+        for (i = 0; i < SAVAGE_DEFAULT_USEC_TIMEOUT; i++) {
+                status = SAVAGE_READ(SAVAGE_ALT_STATUS_WORD0);
+                if ((status & SAVAGE_FIFO_USED_MASK_S4) <= maxUsed)
+                        return 0;
+                DRM_UDELAY(1);
+        }
+
+#if SAVAGE_BCI_DEBUG
+        DRM_ERROR("failed!\n");
+        DRM_INFO("   status=0x%08x\n", status);
+#endif
+        return DRM_ERR(EBUSY);
+}
+
+/*
+ * Waiting for events.
+ *
+ * The BIOSresets the event tag to 0 on mode changes. Therefore we
+ * never emit 0 to the event tag. If we find a 0 event tag we know the
+ * BIOS stomped on it and return success assuming that the BIOS waited
+ * for engine idle.
+ *
+ * Note: if the Xserver uses the event tag it has to follow the same
+ * rule. Otherwise there may be glitches every 2^16 events.
+ */
+static int
+savage_bci_wait_event_shadow(drm_savage_private_t *dev_priv, uint16_t e)
+{
+        uint32_t status;
+        int i;
+
+        for (i = 0; i < SAVAGE_EVENT_USEC_TIMEOUT; i++) {
+                DRM_MEMORYBARRIER();
+                status = dev_priv->status_ptr[1];
+                if ((((status & 0xffff) - e) & 0xffff) <= 0x7fff ||
+                    (status & 0xffff) == 0)
+                        return 0;
+                DRM_UDELAY(1);
+        }
+
+#if SAVAGE_BCI_DEBUG
+        DRM_ERROR("failed!\n");
+        DRM_INFO("   status=0x%08x, e=0x%04x\n", status, e);
+#endif
+
+        return DRM_ERR(EBUSY);
+}
+
+static int
+savage_bci_wait_event_reg(drm_savage_private_t *dev_priv, uint16_t e)
+{
+        uint32_t status;
+        int i;
+
+        for (i = 0; i < SAVAGE_EVENT_USEC_TIMEOUT; i++) {
+                status = SAVAGE_READ(SAVAGE_STATUS_WORD1);
+                if ((((status & 0xffff) - e) & 0xffff) <= 0x7fff ||
+                    (status & 0xffff) == 0)
+                        return 0;
+                DRM_UDELAY(1);
+        }
+
+#if SAVAGE_BCI_DEBUG
+        DRM_ERROR("failed!\n");
+        DRM_INFO("   status=0x%08x, e=0x%04x\n", status, e);
+#endif
+
+        return DRM_ERR(EBUSY);
+}
+
+uint16_t savage_bci_emit_event(drm_savage_private_t *dev_priv,
+                               unsigned int flags)
+{
+        uint16_t count;
+        BCI_LOCALS;
+
+        if (dev_priv->status_ptr) {
+                /* coordinate with Xserver */
+                count = dev_priv->status_ptr[1023];
+                if (count < dev_priv->event_counter)
+                        dev_priv->event_wrap++;
+        } else {
+                count = dev_priv->event_counter;
+        }
+        count = (count + 1) & 0xffff;
+        if (count == 0) {
+                count++; /* See the comment above savage_wait_event_*. */
+                dev_priv->event_wrap++;
+        }
+        dev_priv->event_counter = count;
+        if (dev_priv->status_ptr)
+                dev_priv->status_ptr[1023] = (uint32_t)count;
+
+        if ((flags & (SAVAGE_WAIT_2D | SAVAGE_WAIT_3D))) {
+                unsigned int wait_cmd = BCI_CMD_WAIT;
+                if ((flags & SAVAGE_WAIT_2D))
+                        wait_cmd |= BCI_CMD_WAIT_2D;
+                if ((flags & SAVAGE_WAIT_3D))
+                        wait_cmd |= BCI_CMD_WAIT_3D;
+                BEGIN_BCI(2);
+                BCI_WRITE(wait_cmd);
+        } else {
+                BEGIN_BCI(1);
+        }
+        BCI_WRITE(BCI_CMD_UPDATE_EVENT_TAG | (uint32_t)count);
+
+        return count;
+}
+
+/*
+ * Freelist management
+ */
+static int savage_freelist_init(drm_device_t *dev)
+{
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        drm_device_dma_t *dma = dev->dma;
+        drm_buf_t *buf;
+        drm_savage_buf_priv_t *entry;
+        int i;
+        DRM_DEBUG("count=%d\n", dma->buf_count);
+
+        dev_priv->head.next = &dev_priv->tail;
+        dev_priv->head.prev = NULL;
+        dev_priv->head.buf = NULL;
+
+        dev_priv->tail.next = NULL;
+        dev_priv->tail.prev = &dev_priv->head;
+        dev_priv->tail.buf = NULL;
+
+        for (i = 0; i < dma->buf_count; i++) {
+                buf = dma->buflist[i];
+                entry = buf->dev_private;
+
+                SET_AGE(&entry->age, 0, 0);
+                entry->buf = buf;
+
+                entry->next = dev_priv->head.next;
+                entry->prev = &dev_priv->head;
+                dev_priv->head.next->prev = entry;
+                dev_priv->head.next = entry;
+        }
+
+        return 0;
+}
+
+static drm_buf_t *savage_freelist_get(drm_device_t *dev)
+{
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        drm_savage_buf_priv_t *tail = dev_priv->tail.prev;
+        uint16_t event;
+        unsigned int wrap;
+        DRM_DEBUG("\n");
+
+        UPDATE_EVENT_COUNTER();
+        if (dev_priv->status_ptr)
+                event = dev_priv->status_ptr[1] & 0xffff;
+        else
+                event = SAVAGE_READ(SAVAGE_STATUS_WORD1) & 0xffff;
+        wrap = dev_priv->event_wrap;
+        if (event > dev_priv->event_counter)
+                wrap--; /* hardware hasn't passed the last wrap yet */
+
+        DRM_DEBUG("   tail=0x%04x %d\n", tail->age.event, tail->age.wrap);
+        DRM_DEBUG("   head=0x%04x %d\n", event, wrap);
+
+        if (tail->buf && (TEST_AGE(&tail->age, event, wrap) || event == 0)) {
+                drm_savage_buf_priv_t *next = tail->next;
+                drm_savage_buf_priv_t *prev = tail->prev;
+                prev->next = next;
+                next->prev = prev;
+                tail->next = tail->prev = NULL;
+                return tail->buf;
+        }
+
+        DRM_DEBUG("returning NULL, tail->buf=%p!\n", tail->buf);
+        return NULL;
+}
+
+void savage_freelist_put(drm_device_t *dev, drm_buf_t *buf)
+{
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        drm_savage_buf_priv_t *entry = buf->dev_private, *prev, *next;
+
+        DRM_DEBUG("age=0x%04x wrap=%d\n", entry->age.event, entry->age.wrap);
+
+        if (entry->next != NULL || entry->prev != NULL) {
+                DRM_ERROR("entry already on freelist.\n");
+                return;
+        }
+
+        prev = &dev_priv->head;
+        next = prev->next;
+        prev->next = entry;
+        next->prev = entry;
+        entry->prev = prev;
+        entry->next = next;
+}
+
+/*
+ * Command DMA
+ */
+static int savage_dma_init(drm_savage_private_t *dev_priv)
+{
+        unsigned int i;
+
+        dev_priv->nr_dma_pages = dev_priv->cmd_dma->size /
+                (SAVAGE_DMA_PAGE_SIZE*4);
+        dev_priv->dma_pages = drm_alloc(sizeof(drm_savage_dma_page_t) *
+                                        dev_priv->nr_dma_pages,
+                                        DRM_MEM_DRIVER);
+        if (dev_priv->dma_pages == NULL)
+                return DRM_ERR(ENOMEM);
+
+        for (i = 0; i < dev_priv->nr_dma_pages; ++i) {
+                SET_AGE(&dev_priv->dma_pages[i].age, 0, 0);
+                dev_priv->dma_pages[i].used = 0;
+                dev_priv->dma_pages[i].flushed = 0;
+        }
+        SET_AGE(&dev_priv->last_dma_age, 0, 0);
+
+        dev_priv->first_dma_page = 0;
+        dev_priv->current_dma_page = 0;
+
+        return 0;
+}
+
+void savage_dma_reset(drm_savage_private_t *dev_priv)
+{
+        uint16_t event;
+        unsigned int wrap, i;
+        event = savage_bci_emit_event(dev_priv, 0);
+        wrap = dev_priv->event_wrap;
+        for (i = 0; i < dev_priv->nr_dma_pages; ++i) {
+                SET_AGE(&dev_priv->dma_pages[i].age, event, wrap);
+                dev_priv->dma_pages[i].used = 0;
+                dev_priv->dma_pages[i].flushed = 0;
+        }
+        SET_AGE(&dev_priv->last_dma_age, event, wrap);
+        dev_priv->first_dma_page = dev_priv->current_dma_page = 0;
+}
+
+void savage_dma_wait(drm_savage_private_t *dev_priv, unsigned int page)
+{
+        uint16_t event;
+        unsigned int wrap;
+
+        /* Faked DMA buffer pages don't age. */
+        if (dev_priv->cmd_dma == &dev_priv->fake_dma)
+                return;
+
+        UPDATE_EVENT_COUNTER();
+        if (dev_priv->status_ptr)
+                event = dev_priv->status_ptr[1] & 0xffff;
+        else
+                event = SAVAGE_READ(SAVAGE_STATUS_WORD1) & 0xffff;
+        wrap = dev_priv->event_wrap;
+        if (event > dev_priv->event_counter)
+                wrap--; /* hardware hasn't passed the last wrap yet */
+
+        if (dev_priv->dma_pages[page].age.wrap > wrap ||
+            (dev_priv->dma_pages[page].age.wrap == wrap &&
+             dev_priv->dma_pages[page].age.event > event)) {
+                if (dev_priv->wait_evnt(dev_priv,
+                                        dev_priv->dma_pages[page].age.event)
+                    < 0)
+                        DRM_ERROR("wait_evnt failed!\n");
+        }
+}
+
+uint32_t *savage_dma_alloc(drm_savage_private_t *dev_priv, unsigned int n)
+{
+        unsigned int cur = dev_priv->current_dma_page;
+        unsigned int rest = SAVAGE_DMA_PAGE_SIZE -
+                dev_priv->dma_pages[cur].used;
+        unsigned int nr_pages = (n - rest + SAVAGE_DMA_PAGE_SIZE-1) /
+                SAVAGE_DMA_PAGE_SIZE;
+        uint32_t *dma_ptr;
+        unsigned int i;
+
+        DRM_DEBUG("cur=%u, cur->used=%u, n=%u, rest=%u, nr_pages=%u\n",
+                  cur, dev_priv->dma_pages[cur].used, n, rest, nr_pages);
+
+        if (cur + nr_pages < dev_priv->nr_dma_pages) {
+                dma_ptr = (uint32_t *)dev_priv->cmd_dma->handle +
+                        cur*SAVAGE_DMA_PAGE_SIZE +
+                        dev_priv->dma_pages[cur].used;
+                if (n < rest)
+                        rest = n;
+                dev_priv->dma_pages[cur].used += rest;
+                n -= rest;
+                cur++;
+        } else {
+                dev_priv->dma_flush(dev_priv);
+                nr_pages = (n + SAVAGE_DMA_PAGE_SIZE-1) / SAVAGE_DMA_PAGE_SIZE;
+                for (i = cur; i < dev_priv->nr_dma_pages; ++i) {
+                        dev_priv->dma_pages[i].age = dev_priv->last_dma_age;
+                        dev_priv->dma_pages[i].used = 0;
+                        dev_priv->dma_pages[i].flushed = 0;
+                }
+                dma_ptr = (uint32_t *)dev_priv->cmd_dma->handle;
+                dev_priv->first_dma_page = cur = 0;
+        }
+        for (i = cur; nr_pages > 0; ++i, --nr_pages) {
+#if SAVAGE_DMA_DEBUG
+                if (dev_priv->dma_pages[i].used) {
+                        DRM_ERROR("unflushed page %u: used=%u\n",
+                                  i, dev_priv->dma_pages[i].used);
+                }
+#endif
+                if (n > SAVAGE_DMA_PAGE_SIZE)
+                        dev_priv->dma_pages[i].used = SAVAGE_DMA_PAGE_SIZE;
+                else
+                        dev_priv->dma_pages[i].used = n;
+                n -= SAVAGE_DMA_PAGE_SIZE;
+        }
+        dev_priv->current_dma_page = --i;
+
+        DRM_DEBUG("cur=%u, cur->used=%u, n=%u\n",
+                  i, dev_priv->dma_pages[i].used, n);
+
+        savage_dma_wait(dev_priv, dev_priv->current_dma_page);
+
+        return dma_ptr;
+}
+
+static void savage_dma_flush(drm_savage_private_t *dev_priv)
+{
+        unsigned int first = dev_priv->first_dma_page;
+        unsigned int cur = dev_priv->current_dma_page;
+        uint16_t event;
+        unsigned int wrap, pad, align, len, i;
+        unsigned long phys_addr;
+        BCI_LOCALS;
+
+        if (first == cur &&
+            dev_priv->dma_pages[cur].used == dev_priv->dma_pages[cur].flushed)
+                return;
+
+        /* pad length to multiples of 2 entries
+         * align start of next DMA block to multiles of 8 entries */
+        pad = -dev_priv->dma_pages[cur].used & 1;
+        align = -(dev_priv->dma_pages[cur].used + pad) & 7;
+
+        DRM_DEBUG("first=%u, cur=%u, first->flushed=%u, cur->used=%u, "
+                  "pad=%u, align=%u\n",
+                  first, cur, dev_priv->dma_pages[first].flushed,
+                  dev_priv->dma_pages[cur].used, pad, align);
+
+        /* pad with noops */
+        if (pad) {
+                uint32_t *dma_ptr = (uint32_t *)dev_priv->cmd_dma->handle +
+                        cur * SAVAGE_DMA_PAGE_SIZE +
+                        dev_priv->dma_pages[cur].used;
+                dev_priv->dma_pages[cur].used += pad;
+                while(pad != 0) {
+                        *dma_ptr++ = BCI_CMD_WAIT;
+                        pad--;
+                }
+        }
+
+        DRM_MEMORYBARRIER();
+
+        /* do flush ... */
+        phys_addr = dev_priv->cmd_dma->offset +
+                (first * SAVAGE_DMA_PAGE_SIZE +
+                 dev_priv->dma_pages[first].flushed) * 4;
+        len = (cur - first) * SAVAGE_DMA_PAGE_SIZE +
+                dev_priv->dma_pages[cur].used -
+                dev_priv->dma_pages[first].flushed;
+
+        DRM_DEBUG("phys_addr=%lx, len=%u\n",
+                  phys_addr | dev_priv->dma_type, len);
+
+        BEGIN_BCI(3);
+        BCI_SET_REGISTERS(SAVAGE_DMABUFADDR, 1);
+        BCI_WRITE(phys_addr | dev_priv->dma_type);
+        BCI_DMA(len);
+
+        /* fix alignment of the start of the next block */
+        dev_priv->dma_pages[cur].used += align;
+
+        /* age DMA pages */
+        event = savage_bci_emit_event(dev_priv, 0);
+        wrap = dev_priv->event_wrap;
+        for (i = first; i < cur; ++i) {
+                SET_AGE(&dev_priv->dma_pages[i].age, event, wrap);
+                dev_priv->dma_pages[i].used = 0;
+                dev_priv->dma_pages[i].flushed = 0;
+        }
+        /* age the current page only when it's full */
+        if (dev_priv->dma_pages[cur].used == SAVAGE_DMA_PAGE_SIZE) {
+                SET_AGE(&dev_priv->dma_pages[cur].age, event, wrap);
+                dev_priv->dma_pages[cur].used = 0;
+                dev_priv->dma_pages[cur].flushed = 0;
+                /* advance to next page */
+                cur++;
+                if (cur == dev_priv->nr_dma_pages)
+                        cur = 0;
+                dev_priv->first_dma_page = dev_priv->current_dma_page = cur;
+        } else {
+                dev_priv->first_dma_page = cur;
+                dev_priv->dma_pages[cur].flushed = dev_priv->dma_pages[i].used;
+        }
+        SET_AGE(&dev_priv->last_dma_age, event, wrap);
+
+        DRM_DEBUG("first=cur=%u, cur->used=%u, cur->flushed=%u\n", cur,
+                  dev_priv->dma_pages[cur].used,
+                  dev_priv->dma_pages[cur].flushed);
+}
+
+static void savage_fake_dma_flush(drm_savage_private_t *dev_priv)
+{
+        unsigned int i, j;
+        BCI_LOCALS;
+
+        if (dev_priv->first_dma_page == dev_priv->current_dma_page &&
+            dev_priv->dma_pages[dev_priv->current_dma_page].used == 0)
+                return;
+
+        DRM_DEBUG("first=%u, cur=%u, cur->used=%u\n",
+                  dev_priv->first_dma_page, dev_priv->current_dma_page,
+                  dev_priv->dma_pages[dev_priv->current_dma_page].used);
+
+        for (i = dev_priv->first_dma_page;
+             i <= dev_priv->current_dma_page && dev_priv->dma_pages[i].used;
+             ++i) {
+                uint32_t *dma_ptr = (uint32_t *)dev_priv->cmd_dma->handle +
+                        i * SAVAGE_DMA_PAGE_SIZE;
+#if SAVAGE_DMA_DEBUG
+                /* Sanity check: all pages except the last one must be full. */
+                if (i < dev_priv->current_dma_page &&
+                    dev_priv->dma_pages[i].used != SAVAGE_DMA_PAGE_SIZE) {
+                        DRM_ERROR("partial DMA page %u: used=%u",
+                                  i, dev_priv->dma_pages[i].used);
+                }
+#endif
+                BEGIN_BCI(dev_priv->dma_pages[i].used);
+                for (j = 0; j < dev_priv->dma_pages[i].used; ++j) {
+                        BCI_WRITE(dma_ptr[j]);
+                }
+                dev_priv->dma_pages[i].used = 0;
+        }
+
+        /* reset to first page */
+        dev_priv->first_dma_page = dev_priv->current_dma_page = 0;
+}
+
+/*
+ * Initalize mappings. On Savage4 and SavageIX the alignment
+ * and size of the aperture is not suitable for automatic MTRR setup
+ * in drm_addmap. Therefore we do it manually before the maps are
+ * initialized. We also need to take care of deleting the MTRRs in
+ * postcleanup.
+ */
+int savage_preinit(drm_device_t *dev, unsigned long chipset)
+{
+        drm_savage_private_t *dev_priv;
+        unsigned long mmio_base, fb_base, fb_size, aperture_base;
+        /* fb_rsrc and aper_rsrc aren't really used currently, but still exist
+         * in case we decide we need information on the BAR for BSD in the
+         * future.
+         */
+        unsigned int fb_rsrc, aper_rsrc;
+        int ret = 0;
+
+        dev_priv = drm_alloc(sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
+        if (dev_priv == NULL)
+                return DRM_ERR(ENOMEM);
+
+        memset(dev_priv, 0, sizeof(drm_savage_private_t));
+        dev->dev_private = (void *)dev_priv;
+        dev_priv->chipset = (enum savage_family)chipset;
+
+        dev_priv->mtrr[0].handle = -1;
+        dev_priv->mtrr[1].handle = -1;
+        dev_priv->mtrr[2].handle = -1;
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                fb_rsrc = 0;
+                fb_base = drm_get_resource_start(dev, 0);
+                fb_size = SAVAGE_FB_SIZE_S3;
+                mmio_base = fb_base + SAVAGE_FB_SIZE_S3;
+                aper_rsrc = 0;
+                aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
+                /* this should always be true */
+                if (drm_get_resource_len(dev, 0) == 0x08000000) {
+                        /* Don't make MMIO write-cobining! We need 3
+                         * MTRRs. */
+                        dev_priv->mtrr[0].base = fb_base;
+                        dev_priv->mtrr[0].size = 0x01000000;
+                        dev_priv->mtrr[0].handle = mtrr_add(
+                                dev_priv->mtrr[0].base, dev_priv->mtrr[0].size,
+                                MTRR_TYPE_WRCOMB, 1);
+                        dev_priv->mtrr[1].base = fb_base+0x02000000;
+                        dev_priv->mtrr[1].size = 0x02000000;
+                        dev_priv->mtrr[1].handle = mtrr_add(
+                                dev_priv->mtrr[1].base, dev_priv->mtrr[1].size,
+                                MTRR_TYPE_WRCOMB, 1);
+                        dev_priv->mtrr[2].base = fb_base+0x04000000;
+                        dev_priv->mtrr[2].size = 0x04000000;
+                        dev_priv->mtrr[2].handle = mtrr_add(
+                                dev_priv->mtrr[2].base, dev_priv->mtrr[2].size,
+                                MTRR_TYPE_WRCOMB, 1);
+                } else {
+                        DRM_ERROR("strange pci_resource_len %08lx\n",
+                                  drm_get_resource_len(dev, 0));
+                }
+        } else if (chipset != S3_SUPERSAVAGE && chipset != S3_SAVAGE2000) {
+                mmio_base = drm_get_resource_start(dev, 0);
+                fb_rsrc = 1;
+                fb_base = drm_get_resource_start(dev, 1);
+                fb_size = SAVAGE_FB_SIZE_S4;
+                aper_rsrc = 1;
+                aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
+                /* this should always be true */
+                if (drm_get_resource_len(dev, 1) == 0x08000000) {
+                        /* Can use one MTRR to cover both fb and
+                         * aperture. */
+                        dev_priv->mtrr[0].base = fb_base;
+                        dev_priv->mtrr[0].size = 0x08000000;
+                        dev_priv->mtrr[0].handle = mtrr_add(
+                                dev_priv->mtrr[0].base, dev_priv->mtrr[0].size,
+                                MTRR_TYPE_WRCOMB, 1);
+                } else {
+                        DRM_ERROR("strange pci_resource_len %08lx\n",
+                                  drm_get_resource_len(dev, 1));
+                }
+        } else {
+                mmio_base = drm_get_resource_start(dev, 0);
+                fb_rsrc = 1;
+                fb_base = drm_get_resource_start(dev, 1);
+                fb_size = drm_get_resource_len(dev, 1);
+                aper_rsrc = 2;
+                aperture_base = drm_get_resource_start(dev, 2);
+                /* Automatic MTRR setup will do the right thing. */
+        }
+
+        ret = drm_addmap(dev, mmio_base, SAVAGE_MMIO_SIZE, _DRM_REGISTERS,
+                         _DRM_READ_ONLY, &dev_priv->mmio);
+        if (ret)
+                return ret;
+
+        ret = drm_addmap(dev, fb_base, fb_size, _DRM_FRAME_BUFFER,
+                         _DRM_WRITE_COMBINING, &dev_priv->fb);
+        if (ret)
+                return ret;
+
+        ret = drm_addmap(dev, aperture_base, SAVAGE_APERTURE_SIZE,
+                         _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING,
+                         &dev_priv->aperture);
+        if (ret)
+                return ret;
+
+        return ret;
+}
+
+/*
+ * Delete MTRRs and free device-private data.
+ */
+int savage_postcleanup(drm_device_t *dev)
+{
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        int i;
+
+        for (i = 0; i < 3; ++i)
+                if (dev_priv->mtrr[i].handle >= 0)
+                        mtrr_del(dev_priv->mtrr[i].handle,
+                                 dev_priv->mtrr[i].base,
+                                 dev_priv->mtrr[i].size);
+
+        drm_free(dev_priv, sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
+
+        return 0;
+}
+
+static int savage_do_init_bci(drm_device_t *dev, drm_savage_init_t *init)
+{
+        drm_savage_private_t *dev_priv = dev->dev_private;
+
+        if (init->fb_bpp != 16 && init->fb_bpp != 32) {
+                DRM_ERROR("invalid frame buffer bpp %d!\n", init->fb_bpp);
+                return DRM_ERR(EINVAL);
+        }
+        if (init->depth_bpp != 16 && init->depth_bpp != 32) {
+                DRM_ERROR("invalid depth buffer bpp %d!\n", init->fb_bpp);
+                return DRM_ERR(EINVAL);
+        }
+        if (init->dma_type != SAVAGE_DMA_AGP &&
+            init->dma_type != SAVAGE_DMA_PCI) {
+                DRM_ERROR("invalid dma memory type %d!\n", init->dma_type);
+                return DRM_ERR(EINVAL);
+        }
+
+        dev_priv->cob_size = init->cob_size;
+        dev_priv->bci_threshold_lo = init->bci_threshold_lo;
+        dev_priv->bci_threshold_hi = init->bci_threshold_hi;
+        dev_priv->dma_type = init->dma_type;
+
+        dev_priv->fb_bpp = init->fb_bpp;
+        dev_priv->front_offset = init->front_offset;
+        dev_priv->front_pitch = init->front_pitch;
+        dev_priv->back_offset = init->back_offset;
+        dev_priv->back_pitch = init->back_pitch;
+        dev_priv->depth_bpp = init->depth_bpp;
+        dev_priv->depth_offset = init->depth_offset;
+        dev_priv->depth_pitch = init->depth_pitch;
+
+        dev_priv->texture_offset = init->texture_offset;
+        dev_priv->texture_size = init->texture_size;
+
+        DRM_GETSAREA();
+        if (!dev_priv->sarea) {
+                DRM_ERROR("could not find sarea!\n");
+                savage_do_cleanup_bci(dev);
+                return DRM_ERR(EINVAL);
+        }
+        if (init->status_offset != 0) {
+                dev_priv->status = drm_core_findmap(dev, init->status_offset);
+                if (!dev_priv->status) {
+                        DRM_ERROR("could not find shadow status region!\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(EINVAL);
+                }
+        } else {
+                dev_priv->status = NULL;
+        }
+        if (dev_priv->dma_type == SAVAGE_DMA_AGP && init->buffers_offset) {
+                dev->agp_buffer_map = drm_core_findmap(dev,
+                                                       init->buffers_offset);
+                if (!dev->agp_buffer_map) {
+                        DRM_ERROR("could not find DMA buffer region!\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(EINVAL);
+                }
+                drm_core_ioremap(dev->agp_buffer_map, dev);
+                if (!dev->agp_buffer_map) {
+                        DRM_ERROR("failed to ioremap DMA buffer region!\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(ENOMEM);
+                }
+        }
+        if (init->agp_textures_offset) {
+                dev_priv->agp_textures =
+                        drm_core_findmap(dev, init->agp_textures_offset);
+                if (!dev_priv->agp_textures) {
+                        DRM_ERROR("could not find agp texture region!\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(EINVAL);
+                }
+        } else {
+                dev_priv->agp_textures = NULL;
+        }
+
+        if (init->cmd_dma_offset) {
+                if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                        DRM_ERROR("command DMA not supported on "
+                                  "Savage3D/MX/IX.\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(EINVAL);
+                }
+                if (dev->dma && dev->dma->buflist) {
+                        DRM_ERROR("command and vertex DMA not supported "
+                                  "at the same time.\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(EINVAL);
+                }
+                dev_priv->cmd_dma = drm_core_findmap(dev, init->cmd_dma_offset);
+                if (!dev_priv->cmd_dma) {
+                        DRM_ERROR("could not find command DMA region!\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(EINVAL);
+                }
+                if (dev_priv->dma_type == SAVAGE_DMA_AGP) {
+                        if (dev_priv->cmd_dma->type != _DRM_AGP) {
+                                DRM_ERROR("AGP command DMA region is not a "
+                                          "_DRM_AGP map!\n");
+                                savage_do_cleanup_bci(dev);
+                                return DRM_ERR(EINVAL);
+                        }
+                        drm_core_ioremap(dev_priv->cmd_dma, dev);
+                        if (!dev_priv->cmd_dma->handle) {
+                                DRM_ERROR("failed to ioremap command "
+                                          "DMA region!\n");
+                                savage_do_cleanup_bci(dev);
+                                return DRM_ERR(ENOMEM);
+                        }
+                } else if (dev_priv->cmd_dma->type != _DRM_CONSISTENT) {
+                        DRM_ERROR("PCI command DMA region is not a "
+                                  "_DRM_CONSISTENT map!\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(EINVAL);
+                }
+        } else {
+                dev_priv->cmd_dma = NULL;
+        }
+
+        dev_priv->dma_flush = savage_dma_flush;
+        if (!dev_priv->cmd_dma) {
+                DRM_DEBUG("falling back to faked command DMA.\n");
+                dev_priv->fake_dma.offset = 0;
+                dev_priv->fake_dma.size = SAVAGE_FAKE_DMA_SIZE;
+                dev_priv->fake_dma.type = _DRM_SHM;
+                dev_priv->fake_dma.handle = drm_alloc(SAVAGE_FAKE_DMA_SIZE,
+                                                      DRM_MEM_DRIVER);
+                if (!dev_priv->fake_dma.handle) {
+                        DRM_ERROR("could not allocate faked DMA buffer!\n");
+                        savage_do_cleanup_bci(dev);
+                        return DRM_ERR(ENOMEM);
+                }
+                dev_priv->cmd_dma = &dev_priv->fake_dma;
+                dev_priv->dma_flush = savage_fake_dma_flush;
+        }
+
+        dev_priv->sarea_priv =
+                (drm_savage_sarea_t *)((uint8_t *)dev_priv->sarea->handle +
+                                       init->sarea_priv_offset);
+
+        /* setup bitmap descriptors */
+        {
+                unsigned int color_tile_format;
+                unsigned int depth_tile_format;
+                unsigned int front_stride, back_stride, depth_stride;
+                if (dev_priv->chipset <= S3_SAVAGE4) {
+                        color_tile_format = dev_priv->fb_bpp == 16 ?
+                                SAVAGE_BD_TILE_16BPP : SAVAGE_BD_TILE_32BPP;
+                        depth_tile_format = dev_priv->depth_bpp == 16 ?
+                                SAVAGE_BD_TILE_16BPP : SAVAGE_BD_TILE_32BPP;
+                } else {
+                        color_tile_format = SAVAGE_BD_TILE_DEST;
+                        depth_tile_format = SAVAGE_BD_TILE_DEST;
+                }
+                front_stride = dev_priv->front_pitch / (dev_priv->fb_bpp/8);
+                back_stride  = dev_priv-> back_pitch / (dev_priv->fb_bpp/8);
+                depth_stride = dev_priv->depth_pitch / (dev_priv->depth_bpp/8);
+
+                dev_priv->front_bd = front_stride | SAVAGE_BD_BW_DISABLE |
+                        (dev_priv->fb_bpp << SAVAGE_BD_BPP_SHIFT) |
+                        (color_tile_format << SAVAGE_BD_TILE_SHIFT);
+
+                dev_priv-> back_bd =  back_stride | SAVAGE_BD_BW_DISABLE |
+                        (dev_priv->fb_bpp << SAVAGE_BD_BPP_SHIFT) |
+                        (color_tile_format << SAVAGE_BD_TILE_SHIFT);
+
+                dev_priv->depth_bd = depth_stride | SAVAGE_BD_BW_DISABLE |
+                        (dev_priv->depth_bpp << SAVAGE_BD_BPP_SHIFT) |
+                        (depth_tile_format << SAVAGE_BD_TILE_SHIFT);
+        }
+
+        /* setup status and bci ptr */
+        dev_priv->event_counter = 0;
+        dev_priv->event_wrap = 0;
+        dev_priv->bci_ptr = (volatile uint32_t *)
+            ((uint8_t *)dev_priv->mmio->handle + SAVAGE_BCI_OFFSET);
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                dev_priv->status_used_mask = SAVAGE_FIFO_USED_MASK_S3D;
+        } else {
+                dev_priv->status_used_mask = SAVAGE_FIFO_USED_MASK_S4;
+        }
+        if (dev_priv->status != NULL) {
+                dev_priv->status_ptr =
+                        (volatile uint32_t *)dev_priv->status->handle;
+                dev_priv->wait_fifo = savage_bci_wait_fifo_shadow;
+                dev_priv->wait_evnt = savage_bci_wait_event_shadow;
+                dev_priv->status_ptr[1023] = dev_priv->event_counter;
+        } else {
+                dev_priv->status_ptr = NULL;
+                if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                        dev_priv->wait_fifo = savage_bci_wait_fifo_s3d;
+                } else {
+                        dev_priv->wait_fifo = savage_bci_wait_fifo_s4;
+                }
+                dev_priv->wait_evnt = savage_bci_wait_event_reg;
+        }
+
+        /* cliprect functions */
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset))
+                dev_priv->emit_clip_rect = savage_emit_clip_rect_s3d;
+        else
+                dev_priv->emit_clip_rect = savage_emit_clip_rect_s4;
+
+        if (savage_freelist_init(dev) < 0) {
+                DRM_ERROR("could not initialize freelist\n");
+                savage_do_cleanup_bci(dev);
+                return DRM_ERR(ENOMEM);
+        }
+
+        if (savage_dma_init(dev_priv) <  0) {
+                DRM_ERROR("could not initialize command DMA\n");
+                savage_do_cleanup_bci(dev);
+                return DRM_ERR(ENOMEM);
+        }
+
+        return 0;
+}
+
+int savage_do_cleanup_bci(drm_device_t *dev)
+{
+        drm_savage_private_t *dev_priv = dev->dev_private;
+
+        if (dev_priv->cmd_dma == &dev_priv->fake_dma) {
+                if (dev_priv->fake_dma.handle)
+                        drm_free(dev_priv->fake_dma.handle,
+                                 SAVAGE_FAKE_DMA_SIZE, DRM_MEM_DRIVER);
+        } else if (dev_priv->cmd_dma && dev_priv->cmd_dma->handle &&
+                   dev_priv->cmd_dma->type == _DRM_AGP &&
+                   dev_priv->dma_type == SAVAGE_DMA_AGP)
+                drm_core_ioremapfree(dev_priv->cmd_dma, dev);
+
+        if (dev_priv->dma_type == SAVAGE_DMA_AGP &&
+            dev->agp_buffer_map && dev->agp_buffer_map->handle) {
+                drm_core_ioremapfree(dev->agp_buffer_map, dev);
+                /* make sure the next instance (which may be running
+                 * in PCI mode) doesn't try to use an old
+                 * agp_buffer_map. */
+                dev->agp_buffer_map = NULL;
+        }
+
+        if (dev_priv->dma_pages)
+                drm_free(dev_priv->dma_pages,
+                         sizeof(drm_savage_dma_page_t)*dev_priv->nr_dma_pages,
+                         DRM_MEM_DRIVER);
+
+        return 0;
+}
+
+static int savage_bci_init(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_savage_init_t init;
+
+        LOCK_TEST_WITH_RETURN(dev, filp);
+
+        DRM_COPY_FROM_USER_IOCTL(init, (drm_savage_init_t __user *)data,
+                                 sizeof(init));
+
+        switch (init.func) {
+        case SAVAGE_INIT_BCI:
+                return savage_do_init_bci(dev, &init);
+        case SAVAGE_CLEANUP_BCI:
+                return savage_do_cleanup_bci(dev);
+        }
+
+        return DRM_ERR(EINVAL);
+}
+
+static int savage_bci_event_emit(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        drm_savage_event_emit_t event;
+
+        DRM_DEBUG("\n");
+
+        LOCK_TEST_WITH_RETURN(dev, filp);
+
+        DRM_COPY_FROM_USER_IOCTL(event, (drm_savage_event_emit_t __user *)data,
+                                 sizeof(event));
+
+        event.count = savage_bci_emit_event(dev_priv, event.flags);
+        event.count |= dev_priv->event_wrap << 16;
+        DRM_COPY_TO_USER_IOCTL(&((drm_savage_event_emit_t __user *)data)->count,
+                               event.count, sizeof(event.count));
+        return 0;
+}
+
+static int savage_bci_event_wait(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        drm_savage_event_wait_t event;
+        unsigned int event_e, hw_e;
+        unsigned int event_w, hw_w;
+
+        DRM_DEBUG("\n");
+
+        DRM_COPY_FROM_USER_IOCTL(event, (drm_savage_event_wait_t __user *)data,
+                                 sizeof(event));
+
+        UPDATE_EVENT_COUNTER();
+        if (dev_priv->status_ptr)
+                hw_e = dev_priv->status_ptr[1] & 0xffff;
+        else
+                hw_e = SAVAGE_READ(SAVAGE_STATUS_WORD1) & 0xffff;
+        hw_w = dev_priv->event_wrap;
+        if (hw_e > dev_priv->event_counter)
+                hw_w--; /* hardware hasn't passed the last wrap yet */
+
+        event_e = event.count & 0xffff;
+        event_w = event.count >> 16;
+
+        /* Don't need to wait if
+         * - event counter wrapped since the event was emitted or
+         * - the hardware has advanced up to or over the event to wait for.
+         */
+        if (event_w < hw_w || (event_w == hw_w && event_e <= hw_e) )
+                return 0;
+        else
+                return dev_priv->wait_evnt(dev_priv, event_e);
+}
+
+/*
+ * DMA buffer management
+ */
+
+static int savage_bci_get_buffers(DRMFILE filp, drm_device_t *dev, drm_dma_t *d)
+{
+        drm_buf_t *buf;
+        int i;
+
+        for (i = d->granted_count; i < d->request_count; i++) {
+                buf = savage_freelist_get(dev);
+                if (!buf)
+                        return DRM_ERR(EAGAIN);
+
+                buf->filp = filp;
+
+                if (DRM_COPY_TO_USER(&d->request_indices[i],
+                                     &buf->idx, sizeof(buf->idx)))
+                        return DRM_ERR(EFAULT);
+                if (DRM_COPY_TO_USER(&d->request_sizes[i],
+                                     &buf->total, sizeof(buf->total)))
+                        return DRM_ERR(EFAULT);
+
+                d->granted_count++;
+        }
+        return 0;
+}
+
+int savage_bci_buffers(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_device_dma_t *dma = dev->dma;
+        drm_dma_t d;
+        int ret = 0;
+
+        LOCK_TEST_WITH_RETURN(dev, filp);
+
+        DRM_COPY_FROM_USER_IOCTL(d, (drm_dma_t __user *)data, sizeof(d));
+
+        /* Please don't send us buffers.
+         */
+        if (d.send_count != 0) {
+                DRM_ERROR("Process %d trying to send %d buffers via drmDMA\n",
+                          DRM_CURRENTPID, d.send_count);
+                return DRM_ERR(EINVAL);
+        }
+
+        /* We'll send you buffers.
+         */
+        if (d.request_count < 0 || d.request_count > dma->buf_count) {
+                DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
+                          DRM_CURRENTPID, d.request_count, dma->buf_count);
+                return DRM_ERR(EINVAL);
+        }
+
+        d.granted_count = 0;
+
+        if (d.request_count) {
+                ret = savage_bci_get_buffers(filp, dev, &d);
+        }
+
+        DRM_COPY_TO_USER_IOCTL((drm_dma_t __user *)data, d, sizeof(d));
+
+        return ret;
+}
+
+void savage_reclaim_buffers(drm_device_t *dev, DRMFILE filp) {
+        drm_device_dma_t *dma = dev->dma;
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        int i;
+
+        if (!dma)
+                return;
+        if (!dev_priv)
+                return;
+        if (!dma->buflist)
+                return;
+
+        /*i830_flush_queue(dev);*/
+
+        for (i = 0; i < dma->buf_count; i++) {
+                drm_buf_t *buf = dma->buflist[i];
+                drm_savage_buf_priv_t *buf_priv = buf->dev_private;
+
+                if (buf->filp == filp && buf_priv &&
+                    buf_priv->next == NULL && buf_priv->prev == NULL) {
+                        uint16_t event;
+                        DRM_DEBUG("reclaimed from client\n");
+                        event = savage_bci_emit_event(dev_priv, SAVAGE_WAIT_3D);
+                        SET_AGE(&buf_priv->age, event, dev_priv->event_wrap);
+                        savage_freelist_put(dev, buf);
+                }
+        }
+
+        drm_core_reclaim_buffers(dev, filp);
+}
+
+
+drm_ioctl_desc_t savage_ioctls[] = {
+        [DRM_IOCTL_NR(DRM_SAVAGE_BCI_INIT)] = {savage_bci_init, 1, 1},
+        [DRM_IOCTL_NR(DRM_SAVAGE_BCI_CMDBUF)] = {savage_bci_cmdbuf, 1, 0},
+        [DRM_IOCTL_NR(DRM_SAVAGE_BCI_EVENT_EMIT)] = {savage_bci_event_emit, 1, 0},
+        [DRM_IOCTL_NR(DRM_SAVAGE_BCI_EVENT_WAIT)] = {savage_bci_event_wait, 1, 0},
+};
+
+int savage_max_ioctl = DRM_ARRAY_SIZE(savage_ioctls);
diff --git a/drivers/char/drm/savage_drm.h b/drivers/char/drm/savage_drm.h
new file mode 100644
index 000000000000..6526c9aa7589
--- /dev/null
+++ b/drivers/char/drm/savage_drm.h
@@ -0,0 +1,209 @@
+/* savage_drm.h -- Public header for the savage driver
+ *
+ * Copyright 2004  Felix Kuehling
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __SAVAGE_DRM_H__
+#define __SAVAGE_DRM_H__
+
+#ifndef __SAVAGE_SAREA_DEFINES__
+#define __SAVAGE_SAREA_DEFINES__
+
+/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+ * regions, subject to a minimum region size of (1<<16) == 64k.
+ *
+ * Clients may subdivide regions internally, but when sharing between
+ * clients, the region size is the minimum granularity.
+ */
+
+#define SAVAGE_CARD_HEAP                0
+#define SAVAGE_AGP_HEAP                 1
+#define SAVAGE_NR_TEX_HEAPS             2
+#define SAVAGE_NR_TEX_REGIONS           16
+#define SAVAGE_LOG_MIN_TEX_REGION_SIZE  16
+
+#endif /* __SAVAGE_SAREA_DEFINES__ */
+
+typedef struct _drm_savage_sarea {
+        /* LRU lists for texture memory in agp space and on the card.
+         */
+        drm_tex_region_t texList[SAVAGE_NR_TEX_HEAPS][SAVAGE_NR_TEX_REGIONS+1];
+        unsigned int texAge[SAVAGE_NR_TEX_HEAPS];
+
+        /* Mechanism to validate card state.
+         */
+        int ctxOwner;
+} drm_savage_sarea_t, *drm_savage_sarea_ptr;
+
+/* Savage-specific ioctls
+ */
+#define DRM_SAVAGE_BCI_INIT             0x00
+#define DRM_SAVAGE_BCI_CMDBUF           0x01
+#define DRM_SAVAGE_BCI_EVENT_EMIT       0x02
+#define DRM_SAVAGE_BCI_EVENT_WAIT       0x03
+
+#define DRM_IOCTL_SAVAGE_INIT           DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_INIT, drm_savage_init_t)
+#define DRM_IOCTL_SAVAGE_CMDBUF         DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_CMDBUF, drm_savage_cmdbuf_t)
+#define DRM_IOCTL_SAVAGE_EVENT_EMIT     DRM_IOWR(DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_EMIT, drm_savage_event_emit_t)
+#define DRM_IOCTL_SAVAGE_EVENT_WAIT     DRM_IOW( DRM_COMMAND_BASE + DRM_SAVAGE_BCI_EVENT_WAIT, drm_savage_event_wait_t)
+
+#define SAVAGE_DMA_PCI  1
+#define SAVAGE_DMA_AGP  3
+typedef struct drm_savage_init {
+        enum {
+                SAVAGE_INIT_BCI = 1,
+                SAVAGE_CLEANUP_BCI = 2
+        } func;
+        unsigned int sarea_priv_offset;
+
+        /* some parameters */
+        unsigned int cob_size;
+        unsigned int bci_threshold_lo, bci_threshold_hi;
+        unsigned int dma_type;
+
+        /* frame buffer layout */
+        unsigned int fb_bpp;
+        unsigned int front_offset, front_pitch;
+        unsigned int back_offset, back_pitch;
+        unsigned int depth_bpp;
+        unsigned int depth_offset, depth_pitch;
+
+        /* local textures */
+        unsigned int texture_offset;
+        unsigned int texture_size;
+
+        /* physical locations of non-permanent maps */
+        unsigned long status_offset;
+        unsigned long buffers_offset;
+        unsigned long agp_textures_offset;
+        unsigned long cmd_dma_offset;
+} drm_savage_init_t;
+
+typedef union drm_savage_cmd_header drm_savage_cmd_header_t;
+typedef struct drm_savage_cmdbuf {
+                                /* command buffer in client's address space */
+        drm_savage_cmd_header_t __user *cmd_addr;
+        unsigned int size;      /* size of the command buffer in 64bit units */
+
+        unsigned int dma_idx;   /* DMA buffer index to use */
+        int discard;            /* discard DMA buffer when done */
+                                /* vertex buffer in client's address space */
+        unsigned int __user *vb_addr;
+        unsigned int vb_size;   /* size of client vertex buffer in bytes */
+        unsigned int vb_stride; /* stride of vertices in 32bit words */
+                                /* boxes in client's address space */
+        drm_clip_rect_t __user *box_addr;
+        unsigned int nbox;      /* number of clipping boxes */
+} drm_savage_cmdbuf_t;
+
+#define SAVAGE_WAIT_2D  0x1 /* wait for 2D idle before updating event tag */
+#define SAVAGE_WAIT_3D  0x2 /* wait for 3D idle before updating event tag */
+#define SAVAGE_WAIT_IRQ 0x4 /* emit or wait for IRQ, not implemented yet */
+typedef struct drm_savage_event {
+        unsigned int count;
+        unsigned int flags;
+} drm_savage_event_emit_t, drm_savage_event_wait_t;
+
+/* Commands for the cmdbuf ioctl
+ */
+#define SAVAGE_CMD_STATE        0  /* a range of state registers */
+#define SAVAGE_CMD_DMA_PRIM     1  /* vertices from DMA buffer */
+#define SAVAGE_CMD_VB_PRIM      2  /* vertices from client vertex buffer */
+#define SAVAGE_CMD_DMA_IDX      3  /* indexed vertices from DMA buffer */
+#define SAVAGE_CMD_VB_IDX       4  /* indexed vertices client vertex buffer */
+#define SAVAGE_CMD_CLEAR        5  /* clear buffers */
+#define SAVAGE_CMD_SWAP         6  /* swap buffers */
+
+/* Primitive types
+*/
+#define SAVAGE_PRIM_TRILIST     0  /* triangle list */
+#define SAVAGE_PRIM_TRISTRIP    1  /* triangle strip */
+#define SAVAGE_PRIM_TRIFAN      2  /* triangle fan */
+#define SAVAGE_PRIM_TRILIST_201 3  /* reorder verts for correct flat
+                                    * shading on s3d */
+
+/* Skip flags (vertex format)
+ */
+#define SAVAGE_SKIP_Z           0x01
+#define SAVAGE_SKIP_W           0x02
+#define SAVAGE_SKIP_C0          0x04
+#define SAVAGE_SKIP_C1          0x08
+#define SAVAGE_SKIP_S0          0x10
+#define SAVAGE_SKIP_T0          0x20
+#define SAVAGE_SKIP_ST0         0x30
+#define SAVAGE_SKIP_S1          0x40
+#define SAVAGE_SKIP_T1          0x80
+#define SAVAGE_SKIP_ST1         0xc0
+#define SAVAGE_SKIP_ALL_S3D     0x3f
+#define SAVAGE_SKIP_ALL_S4      0xff
+
+/* Buffer names for clear command
+ */
+#define SAVAGE_FRONT            0x1
+#define SAVAGE_BACK             0x2
+#define SAVAGE_DEPTH            0x4
+
+/* 64-bit command header
+ */
+union drm_savage_cmd_header {
+        struct {
+                unsigned char cmd;      /* command */
+                unsigned char pad0;
+                unsigned short pad1;
+                unsigned short pad2;
+                unsigned short pad3;
+        } cmd; /* generic */
+        struct {
+                unsigned char cmd;
+                unsigned char global;   /* need idle engine? */
+                unsigned short count;   /* number of consecutive registers */
+                unsigned short start;   /* first register */
+                unsigned short pad3;
+        } state; /* SAVAGE_CMD_STATE */
+        struct {
+                unsigned char cmd;
+                unsigned char prim;     /* primitive type */
+                unsigned short skip;    /* vertex format (skip flags) */
+                unsigned short count;   /* number of vertices */
+                unsigned short start;   /* first vertex in DMA/vertex buffer */
+        } prim; /* SAVAGE_CMD_DMA_PRIM, SAVAGE_CMD_VB_PRIM */
+        struct {
+                unsigned char cmd;
+                unsigned char prim;
+                unsigned short skip;
+                unsigned short count;   /* number of indices that follow */
+                unsigned short pad3;
+        } idx; /* SAVAGE_CMD_DMA_IDX, SAVAGE_CMD_VB_IDX */
+        struct {
+                unsigned char cmd;
+                unsigned char pad0;
+                unsigned short pad1;
+                unsigned int flags;
+        } clear0; /* SAVAGE_CMD_CLEAR */
+        struct {
+                unsigned int mask;
+                unsigned int value;
+        } clear1; /* SAVAGE_CMD_CLEAR data */
+};
+
+#endif
diff --git a/drivers/char/drm/savage_drv.c b/drivers/char/drm/savage_drv.c
new file mode 100644
index 000000000000..ac8d270427ca
--- /dev/null
+++ b/drivers/char/drm/savage_drv.c
@@ -0,0 +1,112 @@
+/* savage_drv.c -- Savage driver for Linux
+ *
+ * Copyright 2004  Felix Kuehling
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <linux/config.h>
+#include "drmP.h"
+#include "savage_drm.h"
+#include "savage_drv.h"
+
+#include "drm_pciids.h"
+
+static int postinit( struct drm_device *dev, unsigned long flags )
+{
+        DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n",
+                DRIVER_NAME,
+                DRIVER_MAJOR,
+                DRIVER_MINOR,
+                DRIVER_PATCHLEVEL,
+                DRIVER_DATE,
+                dev->primary.minor,
+                pci_pretty_name(dev->pdev)
+                );
+        return 0;
+}
+
+static int version( drm_version_t *version )
+{
+        int len;
+
+        version->version_major = DRIVER_MAJOR;
+        version->version_minor = DRIVER_MINOR;
+        version->version_patchlevel = DRIVER_PATCHLEVEL;
+        DRM_COPY( version->name, DRIVER_NAME );
+        DRM_COPY( version->date, DRIVER_DATE );
+        DRM_COPY( version->desc, DRIVER_DESC );
+        return 0;
+}
+
+static struct pci_device_id pciidlist[] = {
+        savage_PCI_IDS
+};
+
+extern drm_ioctl_desc_t savage_ioctls[];
+extern int savage_max_ioctl;
+
+static struct drm_driver driver = {
+        .driver_features =
+            DRIVER_USE_AGP | DRIVER_USE_MTRR |
+            DRIVER_HAVE_DMA | DRIVER_PCI_DMA,
+        .dev_priv_size = sizeof(drm_savage_buf_priv_t),
+        .preinit = savage_preinit,
+        .postinit = postinit,
+        .postcleanup = savage_postcleanup,
+        .reclaim_buffers = savage_reclaim_buffers,
+        .get_map_ofs = drm_core_get_map_ofs,
+        .get_reg_ofs = drm_core_get_reg_ofs,
+        .version = version,
+        .ioctls = savage_ioctls,
+        .dma_ioctl = savage_bci_buffers,
+        .fops = {
+                .owner   = THIS_MODULE,
+                .open    = drm_open,
+                .release = drm_release,
+                .ioctl   = drm_ioctl,
+                .mmap    = drm_mmap,
+                .poll = drm_poll,
+                .fasync  = drm_fasync,
+        },
+        .pci_driver = {
+                .name          = DRIVER_NAME,
+                .id_table      = pciidlist,
+        }
+};
+
+static int __init savage_init(void)
+{
+        driver.num_ioctls = savage_max_ioctl;
+        return drm_init(&driver);
+}
+
+static void __exit savage_exit(void)
+{
+        drm_exit(&driver);
+}
+
+module_init(savage_init);
+module_exit(savage_exit);
+
+MODULE_AUTHOR( DRIVER_AUTHOR );
+MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_LICENSE("GPL and additional rights");
diff --git a/drivers/char/drm/savage_drv.h b/drivers/char/drm/savage_drv.h
new file mode 100644
index 000000000000..a45434944658
--- /dev/null
+++ b/drivers/char/drm/savage_drv.h
@@ -0,0 +1,579 @@
+/* savage_drv.h -- Private header for the savage driver
+ *
+ * Copyright 2004  Felix Kuehling
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __SAVAGE_DRV_H__
+#define __SAVAGE_DRV_H__
+
+#define DRIVER_AUTHOR   "Felix Kuehling"
+
+#define DRIVER_NAME     "savage"
+#define DRIVER_DESC     "Savage3D/MX/IX, Savage4, SuperSavage, Twister, ProSavage[DDR]"
+#define DRIVER_DATE     "20050313"
+
+#define DRIVER_MAJOR            2
+#define DRIVER_MINOR            4
+#define DRIVER_PATCHLEVEL       1
+/* Interface history:
+ *
+ * 1.x   The DRM driver from the VIA/S3 code drop, basically a dummy
+ * 2.0   The first real DRM
+ * 2.1   Scissors registers managed by the DRM, 3D operations clipped by
+ *       cliprects of the cmdbuf ioctl
+ * 2.2   Implemented SAVAGE_CMD_DMA_IDX and SAVAGE_CMD_VB_IDX
+ * 2.3   Event counters used by BCI_EVENT_EMIT/WAIT ioctls are now 32 bits
+ *       wide and thus very long lived (unlikely to ever wrap). The size
+ *       in the struct was 32 bits before, but only 16 bits were used
+ * 2.4   Implemented command DMA. Now drm_savage_init_t.cmd_dma_offset is
+ *       actually used
+ */
+
+typedef struct drm_savage_age {
+        uint16_t event;
+        unsigned int wrap;
+} drm_savage_age_t;
+
+typedef struct drm_savage_buf_priv {
+        struct drm_savage_buf_priv *next;
+        struct drm_savage_buf_priv *prev;
+        drm_savage_age_t age;
+        drm_buf_t *buf;
+} drm_savage_buf_priv_t;
+
+typedef struct drm_savage_dma_page {
+        drm_savage_age_t age;
+        unsigned int used, flushed;
+} drm_savage_dma_page_t;
+#define SAVAGE_DMA_PAGE_SIZE 1024 /* in dwords */
+/* Fake DMA buffer size in bytes. 4 pages. Allows a maximum command
+ * size of 16kbytes or 4k entries. Minimum requirement would be
+ * 10kbytes for 255 40-byte vertices in one drawing command. */
+#define SAVAGE_FAKE_DMA_SIZE (SAVAGE_DMA_PAGE_SIZE*4*4)
+
+/* interesting bits of hardware state that are saved in dev_priv */
+typedef union {
+        struct drm_savage_common_state {
+                uint32_t vbaddr;
+        } common;
+        struct {
+                unsigned char pad[sizeof(struct drm_savage_common_state)];
+                uint32_t texctrl, texaddr;
+                uint32_t scstart, new_scstart;
+                uint32_t scend, new_scend;
+        } s3d;
+        struct {
+                unsigned char pad[sizeof(struct drm_savage_common_state)];
+                uint32_t texdescr, texaddr0, texaddr1;
+                uint32_t drawctrl0, new_drawctrl0;
+                uint32_t drawctrl1, new_drawctrl1;
+        } s4;
+} drm_savage_state_t;
+
+/* these chip tags should match the ones in the 2D driver in savage_regs.h. */
+enum savage_family {
+        S3_UNKNOWN = 0,
+        S3_SAVAGE3D,
+        S3_SAVAGE_MX,
+        S3_SAVAGE4,
+        S3_PROSAVAGE,
+        S3_TWISTER,
+        S3_PROSAVAGEDDR,
+        S3_SUPERSAVAGE,
+        S3_SAVAGE2000,
+        S3_LAST
+};
+
+#define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
+
+#define S3_SAVAGE4_SERIES(chip)  ((chip==S3_SAVAGE4)            \
+                                  || (chip==S3_PROSAVAGE)       \
+                                  || (chip==S3_TWISTER)         \
+                                  || (chip==S3_PROSAVAGEDDR))
+
+#define S3_SAVAGE_MOBILE_SERIES(chip)   ((chip==S3_SAVAGE_MX) || (chip==S3_SUPERSAVAGE))
+
+#define S3_SAVAGE_SERIES(chip)    ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE2000))
+
+#define S3_MOBILE_TWISTER_SERIES(chip)   ((chip==S3_TWISTER)    \
+                                          ||(chip==S3_PROSAVAGEDDR))
+
+/* flags */
+#define SAVAGE_IS_AGP 1
+
+typedef struct drm_savage_private {
+        drm_savage_sarea_t *sarea_priv;
+
+        drm_savage_buf_priv_t head, tail;
+
+        /* who am I? */
+        enum savage_family chipset;
+
+        unsigned int cob_size;
+        unsigned int bci_threshold_lo, bci_threshold_hi;
+        unsigned int dma_type;
+
+        /* frame buffer layout */
+        unsigned int fb_bpp;
+        unsigned int front_offset, front_pitch;
+        unsigned int back_offset, back_pitch;
+        unsigned int depth_bpp;
+        unsigned int depth_offset, depth_pitch;
+
+        /* bitmap descriptors for swap and clear */
+        unsigned int front_bd, back_bd, depth_bd;
+
+        /* local textures */
+        unsigned int texture_offset;
+        unsigned int texture_size;
+
+        /* memory regions in physical memory */
+        drm_local_map_t *sarea;
+        drm_local_map_t *mmio;
+        drm_local_map_t *fb;
+        drm_local_map_t *aperture;
+        drm_local_map_t *status;
+        drm_local_map_t *agp_textures;
+        drm_local_map_t *cmd_dma;
+        drm_local_map_t fake_dma;
+
+        struct {
+                int handle;
+                unsigned long base, size;
+        } mtrr[3];
+
+        /* BCI and status-related stuff */
+        volatile uint32_t *status_ptr, *bci_ptr;
+        uint32_t status_used_mask;
+        uint16_t event_counter;
+        unsigned int event_wrap;
+
+        /* Savage4 command DMA */
+        drm_savage_dma_page_t *dma_pages;
+        unsigned int nr_dma_pages, first_dma_page, current_dma_page;
+        drm_savage_age_t last_dma_age;
+
+        /* saved hw state for global/local check on S3D */
+        uint32_t hw_draw_ctrl, hw_zbuf_ctrl;
+        /* and for scissors (global, so don't emit if not changed) */
+        uint32_t hw_scissors_start, hw_scissors_end;
+
+        drm_savage_state_t state;
+
+        /* after emitting a wait cmd Savage3D needs 63 nops before next DMA */
+        unsigned int waiting;
+
+        /* config/hardware-dependent function pointers */
+        int (*wait_fifo)(struct drm_savage_private *dev_priv, unsigned int n);
+        int (*wait_evnt)(struct drm_savage_private *dev_priv, uint16_t e);
+        /* Err, there is a macro wait_event in include/linux/wait.h.
+         * Avoid unwanted macro expansion. */
+        void (*emit_clip_rect)(struct drm_savage_private *dev_priv,
+                               drm_clip_rect_t *pbox);
+        void (*dma_flush)(struct drm_savage_private *dev_priv);
+} drm_savage_private_t;
+
+/* ioctls */
+extern int savage_bci_cmdbuf(DRM_IOCTL_ARGS);
+extern int savage_bci_buffers(DRM_IOCTL_ARGS);
+
+/* BCI functions */
+extern uint16_t savage_bci_emit_event(drm_savage_private_t *dev_priv,
+                                      unsigned int flags);
+extern void savage_freelist_put(drm_device_t *dev, drm_buf_t *buf);
+extern void savage_dma_reset(drm_savage_private_t *dev_priv);
+extern void savage_dma_wait(drm_savage_private_t *dev_priv, unsigned int page);
+extern uint32_t *savage_dma_alloc(drm_savage_private_t *dev_priv,
+                                  unsigned int n);
+extern int savage_preinit(drm_device_t *dev, unsigned long chipset);
+extern int savage_postcleanup(drm_device_t *dev);
+extern int savage_do_cleanup_bci(drm_device_t *dev);
+extern void savage_reclaim_buffers(drm_device_t *dev, DRMFILE filp);
+
+/* state functions */
+extern void savage_emit_clip_rect_s3d(drm_savage_private_t *dev_priv,
+                                      drm_clip_rect_t *pbox);
+extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
+                                     drm_clip_rect_t *pbox);
+
+#define SAVAGE_FB_SIZE_S3       0x01000000      /*  16MB */
+#define SAVAGE_FB_SIZE_S4       0x02000000      /*  32MB */
+#define SAVAGE_MMIO_SIZE        0x00080000      /* 512kB */
+#define SAVAGE_APERTURE_OFFSET  0x02000000      /*  32MB */
+#define SAVAGE_APERTURE_SIZE    0x05000000      /* 5 tiled surfaces, 16MB each */
+
+#define SAVAGE_BCI_OFFSET       0x00010000      /* offset of the BCI region
+                                                 * inside the MMIO region */
+#define SAVAGE_BCI_FIFO_SIZE    32              /* number of entries in on-chip
+                                                 * BCI FIFO */
+
+/*
+ * MMIO registers
+ */
+#define SAVAGE_STATUS_WORD0             0x48C00
+#define SAVAGE_STATUS_WORD1             0x48C04
+#define SAVAGE_ALT_STATUS_WORD0         0x48C60
+
+#define SAVAGE_FIFO_USED_MASK_S3D       0x0001ffff
+#define SAVAGE_FIFO_USED_MASK_S4        0x001fffff
+
+/* Copied from savage_bci.h in the 2D driver with some renaming. */
+
+/* Bitmap descriptors */
+#define SAVAGE_BD_STRIDE_SHIFT 0
+#define SAVAGE_BD_BPP_SHIFT   16
+#define SAVAGE_BD_TILE_SHIFT  24
+#define SAVAGE_BD_BW_DISABLE  (1<<28)
+/* common: */
+#define SAVAGE_BD_TILE_LINEAR           0
+/* savage4, MX, IX, 3D */
+#define SAVAGE_BD_TILE_16BPP            2
+#define SAVAGE_BD_TILE_32BPP            3
+/* twister, prosavage, DDR, supersavage, 2000 */
+#define SAVAGE_BD_TILE_DEST             1
+#define SAVAGE_BD_TILE_TEXTURE          2
+/* GBD - BCI enable */
+/* savage4, MX, IX, 3D */
+#define SAVAGE_GBD_BCI_ENABLE                    8
+/* twister, prosavage, DDR, supersavage, 2000 */
+#define SAVAGE_GBD_BCI_ENABLE_TWISTER            0
+
+#define SAVAGE_GBD_BIG_ENDIAN                    4
+#define SAVAGE_GBD_LITTLE_ENDIAN                 0
+#define SAVAGE_GBD_64                            1
+
+/*  Global Bitmap Descriptor */
+#define SAVAGE_BCI_GLB_BD_LOW             0x8168
+#define SAVAGE_BCI_GLB_BD_HIGH            0x816C
+
+/*
+ * BCI registers
+ */
+/* Savage4/Twister/ProSavage 3D registers */
+#define SAVAGE_DRAWLOCALCTRL_S4         0x1e
+#define SAVAGE_TEXPALADDR_S4            0x1f
+#define SAVAGE_TEXCTRL0_S4              0x20
+#define SAVAGE_TEXCTRL1_S4              0x21
+#define SAVAGE_TEXADDR0_S4              0x22
+#define SAVAGE_TEXADDR1_S4              0x23
+#define SAVAGE_TEXBLEND0_S4             0x24
+#define SAVAGE_TEXBLEND1_S4             0x25
+#define SAVAGE_TEXXPRCLR_S4             0x26 /* never used */
+#define SAVAGE_TEXDESCR_S4              0x27
+#define SAVAGE_FOGTABLE_S4              0x28
+#define SAVAGE_FOGCTRL_S4               0x30
+#define SAVAGE_STENCILCTRL_S4           0x31
+#define SAVAGE_ZBUFCTRL_S4              0x32
+#define SAVAGE_ZBUFOFF_S4               0x33
+#define SAVAGE_DESTCTRL_S4              0x34
+#define SAVAGE_DRAWCTRL0_S4             0x35
+#define SAVAGE_DRAWCTRL1_S4             0x36
+#define SAVAGE_ZWATERMARK_S4            0x37
+#define SAVAGE_DESTTEXRWWATERMARK_S4    0x38
+#define SAVAGE_TEXBLENDCOLOR_S4         0x39
+/* Savage3D/MX/IX 3D registers */
+#define SAVAGE_TEXPALADDR_S3D           0x18
+#define SAVAGE_TEXXPRCLR_S3D            0x19 /* never used */
+#define SAVAGE_TEXADDR_S3D              0x1A
+#define SAVAGE_TEXDESCR_S3D             0x1B
+#define SAVAGE_TEXCTRL_S3D              0x1C
+#define SAVAGE_FOGTABLE_S3D             0x20
+#define SAVAGE_FOGCTRL_S3D              0x30
+#define SAVAGE_DRAWCTRL_S3D             0x31
+#define SAVAGE_ZBUFCTRL_S3D             0x32
+#define SAVAGE_ZBUFOFF_S3D              0x33
+#define SAVAGE_DESTCTRL_S3D             0x34
+#define SAVAGE_SCSTART_S3D              0x35
+#define SAVAGE_SCEND_S3D                0x36
+#define SAVAGE_ZWATERMARK_S3D           0x37 
+#define SAVAGE_DESTTEXRWWATERMARK_S3D   0x38
+/* common stuff */
+#define SAVAGE_VERTBUFADDR              0x3e
+#define SAVAGE_BITPLANEWTMASK           0xd7
+#define SAVAGE_DMABUFADDR               0x51
+
+/* texture enable bits (needed for tex addr checking) */
+#define SAVAGE_TEXCTRL_TEXEN_MASK       0x00010000 /* S3D */
+#define SAVAGE_TEXDESCR_TEX0EN_MASK     0x02000000 /* S4 */
+#define SAVAGE_TEXDESCR_TEX1EN_MASK     0x04000000 /* S4 */
+
+/* Global fields in Savage4/Twister/ProSavage 3D registers:
+ *
+ * All texture registers and DrawLocalCtrl are local. All other
+ * registers are global. */
+
+/* Global fields in Savage3D/MX/IX 3D registers:
+ *
+ * All texture registers are local. DrawCtrl and ZBufCtrl are
+ * partially local. All other registers are global.
+ *
+ * DrawCtrl global fields: cullMode, alphaTestCmpFunc, alphaTestEn, alphaRefVal
+ * ZBufCtrl global fields: zCmpFunc, zBufEn
+ */
+#define SAVAGE_DRAWCTRL_S3D_GLOBAL      0x03f3c00c
+#define SAVAGE_ZBUFCTRL_S3D_GLOBAL      0x00000027
+
+/* Masks for scissor bits (drawCtrl[01] on s4, scissorStart/End on s3d)
+ */
+#define SAVAGE_SCISSOR_MASK_S4          0x00fff7ff
+#define SAVAGE_SCISSOR_MASK_S3D         0x07ff07ff
+
+/*
+ * BCI commands
+ */
+#define BCI_CMD_NOP                  0x40000000
+#define BCI_CMD_RECT                 0x48000000
+#define BCI_CMD_RECT_XP              0x01000000
+#define BCI_CMD_RECT_YP              0x02000000
+#define BCI_CMD_SCANLINE             0x50000000
+#define BCI_CMD_LINE                 0x5C000000
+#define BCI_CMD_LINE_LAST_PIXEL      0x58000000
+#define BCI_CMD_BYTE_TEXT            0x63000000
+#define BCI_CMD_NT_BYTE_TEXT         0x67000000
+#define BCI_CMD_BIT_TEXT             0x6C000000
+#define BCI_CMD_GET_ROP(cmd)         (((cmd) >> 16) & 0xFF)
+#define BCI_CMD_SET_ROP(cmd, rop)    ((cmd) |= ((rop & 0xFF) << 16))
+#define BCI_CMD_SEND_COLOR           0x00008000
+
+#define BCI_CMD_CLIP_NONE            0x00000000
+#define BCI_CMD_CLIP_CURRENT         0x00002000
+#define BCI_CMD_CLIP_LR              0x00004000
+#define BCI_CMD_CLIP_NEW             0x00006000
+
+#define BCI_CMD_DEST_GBD             0x00000000
+#define BCI_CMD_DEST_PBD             0x00000800
+#define BCI_CMD_DEST_PBD_NEW         0x00000C00
+#define BCI_CMD_DEST_SBD             0x00001000
+#define BCI_CMD_DEST_SBD_NEW         0x00001400
+
+#define BCI_CMD_SRC_TRANSPARENT      0x00000200
+#define BCI_CMD_SRC_SOLID            0x00000000
+#define BCI_CMD_SRC_GBD              0x00000020
+#define BCI_CMD_SRC_COLOR            0x00000040
+#define BCI_CMD_SRC_MONO             0x00000060
+#define BCI_CMD_SRC_PBD_COLOR        0x00000080
+#define BCI_CMD_SRC_PBD_MONO         0x000000A0
+#define BCI_CMD_SRC_PBD_COLOR_NEW    0x000000C0
+#define BCI_CMD_SRC_PBD_MONO_NEW     0x000000E0
+#define BCI_CMD_SRC_SBD_COLOR        0x00000100
+#define BCI_CMD_SRC_SBD_MONO         0x00000120
+#define BCI_CMD_SRC_SBD_COLOR_NEW    0x00000140
+#define BCI_CMD_SRC_SBD_MONO_NEW     0x00000160
+
+#define BCI_CMD_PAT_TRANSPARENT      0x00000010
+#define BCI_CMD_PAT_NONE             0x00000000
+#define BCI_CMD_PAT_COLOR            0x00000002
+#define BCI_CMD_PAT_MONO             0x00000003
+#define BCI_CMD_PAT_PBD_COLOR        0x00000004
+#define BCI_CMD_PAT_PBD_MONO         0x00000005
+#define BCI_CMD_PAT_PBD_COLOR_NEW    0x00000006
+#define BCI_CMD_PAT_PBD_MONO_NEW     0x00000007
+#define BCI_CMD_PAT_SBD_COLOR        0x00000008
+#define BCI_CMD_PAT_SBD_MONO         0x00000009
+#define BCI_CMD_PAT_SBD_COLOR_NEW    0x0000000A
+#define BCI_CMD_PAT_SBD_MONO_NEW     0x0000000B
+
+#define BCI_BD_BW_DISABLE            0x10000000
+#define BCI_BD_TILE_MASK             0x03000000
+#define BCI_BD_TILE_NONE             0x00000000
+#define BCI_BD_TILE_16               0x02000000
+#define BCI_BD_TILE_32               0x03000000
+#define BCI_BD_GET_BPP(bd)           (((bd) >> 16) & 0xFF)
+#define BCI_BD_SET_BPP(bd, bpp)      ((bd) |= (((bpp) & 0xFF) << 16))
+#define BCI_BD_GET_STRIDE(bd)        ((bd) & 0xFFFF)
+#define BCI_BD_SET_STRIDE(bd, st)    ((bd) |= ((st) & 0xFFFF))
+
+#define BCI_CMD_SET_REGISTER            0x96000000
+
+#define BCI_CMD_WAIT                    0xC0000000
+#define BCI_CMD_WAIT_3D                 0x00010000
+#define BCI_CMD_WAIT_2D                 0x00020000
+
+#define BCI_CMD_UPDATE_EVENT_TAG        0x98000000
+
+#define BCI_CMD_DRAW_PRIM               0x80000000
+#define BCI_CMD_DRAW_INDEXED_PRIM       0x88000000
+#define BCI_CMD_DRAW_CONT               0x01000000
+#define BCI_CMD_DRAW_TRILIST            0x00000000
+#define BCI_CMD_DRAW_TRISTRIP           0x02000000
+#define BCI_CMD_DRAW_TRIFAN             0x04000000
+#define BCI_CMD_DRAW_SKIPFLAGS          0x000000ff
+#define BCI_CMD_DRAW_NO_Z               0x00000001
+#define BCI_CMD_DRAW_NO_W               0x00000002
+#define BCI_CMD_DRAW_NO_CD              0x00000004
+#define BCI_CMD_DRAW_NO_CS              0x00000008
+#define BCI_CMD_DRAW_NO_U0              0x00000010
+#define BCI_CMD_DRAW_NO_V0              0x00000020
+#define BCI_CMD_DRAW_NO_UV0             0x00000030
+#define BCI_CMD_DRAW_NO_U1              0x00000040
+#define BCI_CMD_DRAW_NO_V1              0x00000080
+#define BCI_CMD_DRAW_NO_UV1             0x000000c0
+
+#define BCI_CMD_DMA                     0xa8000000
+
+#define BCI_W_H(w, h)                ((((h) << 16) | (w)) & 0x0FFF0FFF)
+#define BCI_X_Y(x, y)                ((((y) << 16) | (x)) & 0x0FFF0FFF)
+#define BCI_X_W(x, y)                ((((w) << 16) | (x)) & 0x0FFF0FFF)
+#define BCI_CLIP_LR(l, r)            ((((r) << 16) | (l)) & 0x0FFF0FFF)
+#define BCI_CLIP_TL(t, l)            ((((t) << 16) | (l)) & 0x0FFF0FFF)
+#define BCI_CLIP_BR(b, r)            ((((b) << 16) | (r)) & 0x0FFF0FFF)
+
+#define BCI_LINE_X_Y(x, y)           (((y) << 16) | ((x) & 0xFFFF))
+#define BCI_LINE_STEPS(diag, axi)    (((axi) << 16) | ((diag) & 0xFFFF))
+#define BCI_LINE_MISC(maj, ym, xp, yp, err) \
+        (((maj) & 0x1FFF) | \
+        ((ym) ? 1<<13 : 0) | \
+        ((xp) ? 1<<14 : 0) | \
+        ((yp) ? 1<<15 : 0) | \
+        ((err) << 16))
+
+/*
+ * common commands
+ */
+#define BCI_SET_REGISTERS( first, n )                   \
+        BCI_WRITE(BCI_CMD_SET_REGISTER |                \
+                  ((uint32_t)(n) & 0xff) << 16 |        \
+                  ((uint32_t)(first) & 0xffff))
+#define DMA_SET_REGISTERS( first, n )                   \
+        DMA_WRITE(BCI_CMD_SET_REGISTER |                \
+                  ((uint32_t)(n) & 0xff) << 16 |        \
+                  ((uint32_t)(first) & 0xffff))
+
+#define BCI_DRAW_PRIMITIVE(n, type, skip)         \
+        BCI_WRITE(BCI_CMD_DRAW_PRIM | (type) | (skip) | \
+                  ((n) << 16))
+#define DMA_DRAW_PRIMITIVE(n, type, skip)         \
+        DMA_WRITE(BCI_CMD_DRAW_PRIM | (type) | (skip) | \
+                  ((n) << 16))
+
+#define BCI_DRAW_INDICES_S3D(n, type, i0)         \
+        BCI_WRITE(BCI_CMD_DRAW_INDEXED_PRIM | (type) |  \
+                  ((n) << 16) | (i0))
+
+#define BCI_DRAW_INDICES_S4(n, type, skip)        \
+        BCI_WRITE(BCI_CMD_DRAW_INDEXED_PRIM | (type) |  \
+                  (skip) | ((n) << 16))
+
+#define BCI_DMA(n)      \
+        BCI_WRITE(BCI_CMD_DMA | (((n) >> 1) - 1))
+
+/*
+ * access to MMIO
+ */
+#define SAVAGE_READ(reg)        DRM_READ32(  dev_priv->mmio, (reg) )
+#define SAVAGE_WRITE(reg)       DRM_WRITE32( dev_priv->mmio, (reg) )
+
+/*
+ * access to the burst command interface (BCI)
+ */
+#define SAVAGE_BCI_DEBUG 1
+
+#define BCI_LOCALS    volatile uint32_t *bci_ptr;
+
+#define BEGIN_BCI( n ) do {                     \
+        dev_priv->wait_fifo(dev_priv, (n));     \
+        bci_ptr = dev_priv->bci_ptr;            \
+} while(0)
+
+#define BCI_WRITE( val ) *bci_ptr++ = (uint32_t)(val)
+
+#define BCI_COPY_FROM_USER(src,n) do {                          \
+    unsigned int i;                                             \
+    for (i = 0; i < n; ++i) {                                   \
+        uint32_t val;                                           \
+        DRM_GET_USER_UNCHECKED(val, &((uint32_t*)(src))[i]);    \
+        BCI_WRITE(val);                                         \
+    }                                                           \
+} while(0)
+
+/*
+ * command DMA support
+ */
+#define SAVAGE_DMA_DEBUG 1
+
+#define DMA_LOCALS   uint32_t *dma_ptr;
+
+#define BEGIN_DMA( n ) do {                                             \
+        unsigned int cur = dev_priv->current_dma_page;                  \
+        unsigned int rest = SAVAGE_DMA_PAGE_SIZE -                      \
+                dev_priv->dma_pages[cur].used;                          \
+        if ((n) > rest) {                                               \
+                dma_ptr = savage_dma_alloc(dev_priv, (n));              \
+        } else { /* fast path for small allocations */                  \
+                dma_ptr = (uint32_t *)dev_priv->cmd_dma->handle +       \
+                        cur * SAVAGE_DMA_PAGE_SIZE +                    \
+                        dev_priv->dma_pages[cur].used;                  \
+                if (dev_priv->dma_pages[cur].used == 0)                 \
+                        savage_dma_wait(dev_priv, cur);                 \
+                dev_priv->dma_pages[cur].used += (n);                   \
+        }                                                               \
+} while(0)
+
+#define DMA_WRITE( val ) *dma_ptr++ = (uint32_t)(val)
+
+#define DMA_COPY_FROM_USER(src,n) do {                          \
+        DRM_COPY_FROM_USER_UNCHECKED(dma_ptr, (src), (n)*4);    \
+        dma_ptr += n;                                           \
+} while(0)
+
+#if SAVAGE_DMA_DEBUG
+#define DMA_COMMIT() do {                                               \
+        unsigned int cur = dev_priv->current_dma_page;                  \
+        uint32_t *expected = (uint32_t *)dev_priv->cmd_dma->handle +    \
+                        cur * SAVAGE_DMA_PAGE_SIZE +                    \
+                        dev_priv->dma_pages[cur].used;                  \
+        if (dma_ptr != expected) {                                      \
+                DRM_ERROR("DMA allocation and use don't match: "        \
+                          "%p != %p\n", expected, dma_ptr);             \
+                savage_dma_reset(dev_priv);                             \
+        }                                                               \
+} while(0)
+#else
+#define DMA_COMMIT() do {/* nothing */} while(0)
+#endif
+
+#define DMA_FLUSH() dev_priv->dma_flush(dev_priv)
+
+/* Buffer aging via event tag
+ */
+
+#define UPDATE_EVENT_COUNTER( ) do {                    \
+        if (dev_priv->status_ptr) {                     \
+                uint16_t count;                         \
+                /* coordinate with Xserver */           \
+                count = dev_priv->status_ptr[1023];     \
+                if (count < dev_priv->event_counter)    \
+                        dev_priv->event_wrap++;         \
+                dev_priv->event_counter = count;        \
+        }                                               \
+} while(0)
+
+#define SET_AGE( age, e, w ) do {       \
+        (age)->event = e;               \
+        (age)->wrap = w;                \
+} while(0)
+
+#define TEST_AGE( age, e, w )                           \
+        ( (age)->wrap < (w) || ( (age)->wrap == (w) && (age)->event <= (e) ) )
+
+#endif /* __SAVAGE_DRV_H__ */
diff --git a/drivers/char/drm/savage_state.c b/drivers/char/drm/savage_state.c
new file mode 100644
index 000000000000..475695a00083
--- /dev/null
+++ b/drivers/char/drm/savage_state.c
@@ -0,0 +1,1146 @@
+/* savage_state.c -- State and drawing support for Savage
+ *
+ * Copyright 2004  Felix Kuehling
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT. IN NO EVENT SHALL FELIX KUEHLING BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "drmP.h"
+#include "savage_drm.h"
+#include "savage_drv.h"
+
+void savage_emit_clip_rect_s3d(drm_savage_private_t *dev_priv,
+                               drm_clip_rect_t *pbox)
+{
+        uint32_t scstart = dev_priv->state.s3d.new_scstart;
+        uint32_t scend   = dev_priv->state.s3d.new_scend;
+        scstart = (scstart & ~SAVAGE_SCISSOR_MASK_S3D) |
+                ((uint32_t)pbox->x1 & 0x000007ff) | 
+                (((uint32_t)pbox->y1 << 16) & 0x07ff0000);
+        scend   = (scend   & ~SAVAGE_SCISSOR_MASK_S3D) |
+                (((uint32_t)pbox->x2-1) & 0x000007ff) |
+                ((((uint32_t)pbox->y2-1) << 16) & 0x07ff0000);
+        if (scstart != dev_priv->state.s3d.scstart ||
+            scend   != dev_priv->state.s3d.scend) {
+                DMA_LOCALS;
+                BEGIN_DMA(4);
+                DMA_WRITE(BCI_CMD_WAIT|BCI_CMD_WAIT_3D);
+                DMA_SET_REGISTERS(SAVAGE_SCSTART_S3D, 2);
+                DMA_WRITE(scstart);
+                DMA_WRITE(scend);
+                dev_priv->state.s3d.scstart = scstart;
+                dev_priv->state.s3d.scend   = scend;
+                dev_priv->waiting = 1;
+                DMA_COMMIT();
+        }
+}
+
+void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv,
+                              drm_clip_rect_t *pbox)
+{
+        uint32_t drawctrl0 = dev_priv->state.s4.new_drawctrl0;
+        uint32_t drawctrl1 = dev_priv->state.s4.new_drawctrl1;
+        drawctrl0 = (drawctrl0 & ~SAVAGE_SCISSOR_MASK_S4) |
+                ((uint32_t)pbox->x1 & 0x000007ff) |
+                (((uint32_t)pbox->y1 << 12) & 0x00fff000);
+        drawctrl1 = (drawctrl1 & ~SAVAGE_SCISSOR_MASK_S4) |
+                (((uint32_t)pbox->x2-1) & 0x000007ff) |
+                ((((uint32_t)pbox->y2-1) << 12) & 0x00fff000);
+        if (drawctrl0 != dev_priv->state.s4.drawctrl0 ||
+            drawctrl1 != dev_priv->state.s4.drawctrl1) {
+                DMA_LOCALS;
+                BEGIN_DMA(4);
+                DMA_WRITE(BCI_CMD_WAIT|BCI_CMD_WAIT_3D);
+                DMA_SET_REGISTERS(SAVAGE_DRAWCTRL0_S4, 2);
+                DMA_WRITE(drawctrl0);
+                DMA_WRITE(drawctrl1);
+                dev_priv->state.s4.drawctrl0 = drawctrl0;
+                dev_priv->state.s4.drawctrl1 = drawctrl1;
+                dev_priv->waiting = 1;
+                DMA_COMMIT();
+        }
+}
+
+static int savage_verify_texaddr(drm_savage_private_t *dev_priv, int unit,
+                                 uint32_t addr)
+{
+        if ((addr & 6) != 2) { /* reserved bits */
+                DRM_ERROR("bad texAddr%d %08x (reserved bits)\n", unit, addr);
+                return DRM_ERR(EINVAL);
+        }
+        if (!(addr & 1)) { /* local */
+                addr &= ~7;
+                if (addr <  dev_priv->texture_offset ||
+                    addr >= dev_priv->texture_offset+dev_priv->texture_size) {
+                        DRM_ERROR("bad texAddr%d %08x (local addr out of range)\n",
+                                  unit, addr);
+                        return DRM_ERR(EINVAL);
+                }
+        } else { /* AGP */
+                if (!dev_priv->agp_textures) {
+                        DRM_ERROR("bad texAddr%d %08x (AGP not available)\n",
+                                  unit, addr);
+                        return DRM_ERR(EINVAL);
+                }
+                addr &= ~7;
+                if (addr < dev_priv->agp_textures->offset ||
+                    addr >= (dev_priv->agp_textures->offset +
+                             dev_priv->agp_textures->size)) {
+                        DRM_ERROR("bad texAddr%d %08x (AGP addr out of range)\n",
+                                  unit, addr);
+                        return DRM_ERR(EINVAL);
+                }
+        }
+        return 0;
+}
+
+#define SAVE_STATE(reg,where)                   \
+        if(start <= reg && start+count > reg)   \
+                DRM_GET_USER_UNCHECKED(dev_priv->state.where, &regs[reg-start])
+#define SAVE_STATE_MASK(reg,where,mask) do {                    \
+        if(start <= reg && start+count > reg) {                 \
+                uint32_t tmp;                                   \
+                DRM_GET_USER_UNCHECKED(tmp, &regs[reg-start]);  \
+                dev_priv->state.where = (tmp & (mask)) |        \
+                        (dev_priv->state.where & ~(mask));      \
+        }                                                       \
+} while (0)
+static int savage_verify_state_s3d(drm_savage_private_t *dev_priv,
+                                   unsigned int start, unsigned int count,
+                                   const uint32_t __user *regs)
+{
+        if (start < SAVAGE_TEXPALADDR_S3D ||
+            start+count-1 > SAVAGE_DESTTEXRWWATERMARK_S3D) {
+                DRM_ERROR("invalid register range (0x%04x-0x%04x)\n",
+                          start, start+count-1);
+                return DRM_ERR(EINVAL);
+        }
+
+        SAVE_STATE_MASK(SAVAGE_SCSTART_S3D, s3d.new_scstart,
+                        ~SAVAGE_SCISSOR_MASK_S3D);
+        SAVE_STATE_MASK(SAVAGE_SCEND_S3D, s3d.new_scend,
+                        ~SAVAGE_SCISSOR_MASK_S3D);
+
+        /* if any texture regs were changed ... */
+        if (start <= SAVAGE_TEXCTRL_S3D &&
+            start+count > SAVAGE_TEXPALADDR_S3D) {
+                /* ... check texture state */
+                SAVE_STATE(SAVAGE_TEXCTRL_S3D, s3d.texctrl);
+                SAVE_STATE(SAVAGE_TEXADDR_S3D, s3d.texaddr);
+                if (dev_priv->state.s3d.texctrl & SAVAGE_TEXCTRL_TEXEN_MASK)
+                        return savage_verify_texaddr(
+                                dev_priv, 0, dev_priv->state.s3d.texaddr);
+        }
+
+        return 0;
+}
+
+static int savage_verify_state_s4(drm_savage_private_t *dev_priv,
+                                  unsigned int start, unsigned int count,
+                                  const uint32_t __user *regs)
+{
+        int ret = 0;
+
+        if (start < SAVAGE_DRAWLOCALCTRL_S4 ||
+            start+count-1 > SAVAGE_TEXBLENDCOLOR_S4) {
+                DRM_ERROR("invalid register range (0x%04x-0x%04x)\n",
+                          start, start+count-1);
+                return DRM_ERR(EINVAL);
+        }
+
+        SAVE_STATE_MASK(SAVAGE_DRAWCTRL0_S4, s4.new_drawctrl0,
+                        ~SAVAGE_SCISSOR_MASK_S4);
+        SAVE_STATE_MASK(SAVAGE_DRAWCTRL1_S4, s4.new_drawctrl1,
+                        ~SAVAGE_SCISSOR_MASK_S4);
+
+        /* if any texture regs were changed ... */
+        if (start <= SAVAGE_TEXDESCR_S4 &&
+            start+count > SAVAGE_TEXPALADDR_S4) {
+                /* ... check texture state */
+                SAVE_STATE(SAVAGE_TEXDESCR_S4, s4.texdescr);
+                SAVE_STATE(SAVAGE_TEXADDR0_S4, s4.texaddr0);
+                SAVE_STATE(SAVAGE_TEXADDR1_S4, s4.texaddr1);
+                if (dev_priv->state.s4.texdescr & SAVAGE_TEXDESCR_TEX0EN_MASK)
+                        ret |= savage_verify_texaddr(
+                                dev_priv, 0, dev_priv->state.s4.texaddr0);
+                if (dev_priv->state.s4.texdescr & SAVAGE_TEXDESCR_TEX1EN_MASK)
+                        ret |= savage_verify_texaddr(
+                                dev_priv, 1, dev_priv->state.s4.texaddr1);
+        }
+
+        return ret;
+}
+#undef SAVE_STATE
+#undef SAVE_STATE_MASK
+
+static int savage_dispatch_state(drm_savage_private_t *dev_priv,
+                                 const drm_savage_cmd_header_t *cmd_header,
+                                 const uint32_t __user *regs)
+{
+        unsigned int count = cmd_header->state.count;
+        unsigned int start = cmd_header->state.start;
+        unsigned int count2 = 0;
+        unsigned int bci_size;
+        int ret;
+        DMA_LOCALS;
+
+        if (!count)
+                return 0;
+
+        if (DRM_VERIFYAREA_READ(regs, count*4))
+                return DRM_ERR(EFAULT);
+
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                ret = savage_verify_state_s3d(dev_priv, start, count, regs);
+                if (ret != 0)
+                        return ret;
+                /* scissor regs are emitted in savage_dispatch_draw */
+                if (start < SAVAGE_SCSTART_S3D) {
+                        if (start+count > SAVAGE_SCEND_S3D+1)
+                                count2 = count - (SAVAGE_SCEND_S3D+1 - start);
+                        if (start+count > SAVAGE_SCSTART_S3D)
+                                count = SAVAGE_SCSTART_S3D - start;
+                } else if (start <= SAVAGE_SCEND_S3D) {
+                        if (start+count > SAVAGE_SCEND_S3D+1) {
+                                count -= SAVAGE_SCEND_S3D+1 - start;
+                                start = SAVAGE_SCEND_S3D+1;
+                        } else
+                                return 0;
+                }
+        } else {
+                ret = savage_verify_state_s4(dev_priv, start, count, regs);
+                if (ret != 0)
+                        return ret;
+                /* scissor regs are emitted in savage_dispatch_draw */
+                if (start < SAVAGE_DRAWCTRL0_S4) {
+                        if (start+count > SAVAGE_DRAWCTRL1_S4+1)
+                                count2 = count - (SAVAGE_DRAWCTRL1_S4+1 - start);
+                        if (start+count > SAVAGE_DRAWCTRL0_S4)
+                                count = SAVAGE_DRAWCTRL0_S4 - start;
+                } else if (start <= SAVAGE_DRAWCTRL1_S4) {
+                        if (start+count > SAVAGE_DRAWCTRL1_S4+1) {
+                                count -= SAVAGE_DRAWCTRL1_S4+1 - start;
+                                start = SAVAGE_DRAWCTRL1_S4+1;
+                        } else
+                                return 0;
+                }
+        }
+
+        bci_size = count + (count+254)/255 + count2 + (count2+254)/255;
+
+        if (cmd_header->state.global) {
+                BEGIN_DMA(bci_size+1);
+                DMA_WRITE(BCI_CMD_WAIT | BCI_CMD_WAIT_3D);
+                dev_priv->waiting = 1;
+        } else {
+                BEGIN_DMA(bci_size);
+        }
+
+        do {
+                while (count > 0) {
+                        unsigned int n = count < 255 ? count : 255;
+                        DMA_SET_REGISTERS(start, n);
+                        DMA_COPY_FROM_USER(regs, n);
+                        count -= n;
+                        start += n;
+                        regs += n;
+                }
+                start += 2;
+                regs += 2;
+                count = count2;
+                count2 = 0;
+        } while (count);
+
+        DMA_COMMIT();
+
+        return 0;
+}
+
+static int savage_dispatch_dma_prim(drm_savage_private_t *dev_priv,
+                                    const drm_savage_cmd_header_t *cmd_header,
+                                    const drm_buf_t *dmabuf)
+{
+        unsigned char reorder = 0;
+        unsigned int prim = cmd_header->prim.prim;
+        unsigned int skip = cmd_header->prim.skip;
+        unsigned int n = cmd_header->prim.count;
+        unsigned int start = cmd_header->prim.start;
+        unsigned int i;
+        BCI_LOCALS;
+
+        if (!dmabuf) {
+            DRM_ERROR("called without dma buffers!\n");
+            return DRM_ERR(EINVAL);
+        }
+
+        if (!n)
+                return 0;
+
+        switch (prim) {
+        case SAVAGE_PRIM_TRILIST_201:
+                reorder = 1;
+                prim = SAVAGE_PRIM_TRILIST;
+        case SAVAGE_PRIM_TRILIST:
+                if (n % 3 != 0) {
+                        DRM_ERROR("wrong number of vertices %u in TRILIST\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        case SAVAGE_PRIM_TRISTRIP:
+        case SAVAGE_PRIM_TRIFAN:
+                if (n < 3) {
+                        DRM_ERROR("wrong number of vertices %u in TRIFAN/STRIP\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        default:
+                DRM_ERROR("invalid primitive type %u\n", prim);
+                return DRM_ERR(EINVAL);
+        }
+
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                if (skip != 0) {
+                        DRM_ERROR("invalid skip flags 0x%04x for DMA\n",
+                                  skip);
+                        return DRM_ERR(EINVAL);
+                }
+        } else {
+                unsigned int size = 10 - (skip & 1) - (skip >> 1 & 1) -
+                        (skip >> 2 & 1) - (skip >> 3 & 1) - (skip >> 4 & 1) -
+                        (skip >> 5 & 1) - (skip >> 6 & 1) - (skip >> 7 & 1);
+                if (skip > SAVAGE_SKIP_ALL_S4 || size != 8) {
+                        DRM_ERROR("invalid skip flags 0x%04x for DMA\n",
+                                  skip);
+                        return DRM_ERR(EINVAL);
+                }
+                if (reorder) {
+                        DRM_ERROR("TRILIST_201 used on Savage4 hardware\n");
+                        return DRM_ERR(EINVAL);
+                }
+        }
+
+        if (start + n > dmabuf->total/32) {
+                DRM_ERROR("vertex indices (%u-%u) out of range (0-%u)\n",
+                          start, start + n - 1, dmabuf->total/32);
+                return DRM_ERR(EINVAL);
+        }
+
+        /* Vertex DMA doesn't work with command DMA at the same time,
+         * so we use BCI_... to submit commands here. Flush buffered
+         * faked DMA first. */
+        DMA_FLUSH();
+
+        if (dmabuf->bus_address != dev_priv->state.common.vbaddr) {
+                BEGIN_BCI(2);
+                BCI_SET_REGISTERS(SAVAGE_VERTBUFADDR, 1);
+                BCI_WRITE(dmabuf->bus_address | dev_priv->dma_type);
+                dev_priv->state.common.vbaddr = dmabuf->bus_address;
+        }
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset) && dev_priv->waiting) {
+                /* Workaround for what looks like a hardware bug. If a
+                 * WAIT_3D_IDLE was emitted some time before the
+                 * indexed drawing command then the engine will lock
+                 * up. There are two known workarounds:
+                 * WAIT_IDLE_EMPTY or emit at least 63 NOPs. */
+                BEGIN_BCI(63);
+                for (i = 0; i < 63; ++i)
+                        BCI_WRITE(BCI_CMD_WAIT);
+                dev_priv->waiting = 0;
+        }
+
+        prim <<= 25;
+        while (n != 0) {
+                /* Can emit up to 255 indices (85 triangles) at once. */
+                unsigned int count = n > 255 ? 255 : n;
+                if (reorder) {
+                        /* Need to reorder indices for correct flat
+                         * shading while preserving the clock sense
+                         * for correct culling. Only on Savage3D. */
+                        int reorder[3] = {-1, -1, -1};
+                        reorder[start%3] = 2;
+
+                        BEGIN_BCI((count+1+1)/2);
+                        BCI_DRAW_INDICES_S3D(count, prim, start+2);
+
+                        for (i = start+1; i+1 < start+count; i += 2)
+                                BCI_WRITE((i + reorder[i % 3]) |
+                                          ((i+1 + reorder[(i+1) % 3]) << 16));
+                        if (i < start+count)
+                                BCI_WRITE(i + reorder[i%3]);
+                } else if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                        BEGIN_BCI((count+1+1)/2);
+                        BCI_DRAW_INDICES_S3D(count, prim, start);
+
+                        for (i = start+1; i+1 < start+count; i += 2)
+                                BCI_WRITE(i | ((i+1) << 16));
+                        if (i < start+count)
+                                BCI_WRITE(i);
+                } else {
+                        BEGIN_BCI((count+2+1)/2);
+                        BCI_DRAW_INDICES_S4(count, prim, skip);
+
+                        for (i = start; i+1 < start+count; i += 2)
+                                BCI_WRITE(i | ((i+1) << 16));
+                        if (i < start+count)
+                                BCI_WRITE(i);
+                }
+
+                start += count;
+                n -= count;
+
+                prim |= BCI_CMD_DRAW_CONT;
+        }
+
+        return 0;
+}
+
+static int savage_dispatch_vb_prim(drm_savage_private_t *dev_priv,
+                                   const drm_savage_cmd_header_t *cmd_header,
+                                   const uint32_t __user *vtxbuf,
+                                   unsigned int vb_size,
+                                   unsigned int vb_stride)
+{
+        unsigned char reorder = 0;
+        unsigned int prim = cmd_header->prim.prim;
+        unsigned int skip = cmd_header->prim.skip;
+        unsigned int n = cmd_header->prim.count;
+        unsigned int start = cmd_header->prim.start;
+        unsigned int vtx_size;
+        unsigned int i;
+        DMA_LOCALS;
+
+        if (!n)
+                return 0;
+
+        switch (prim) {
+        case SAVAGE_PRIM_TRILIST_201:
+                reorder = 1;
+                prim = SAVAGE_PRIM_TRILIST;
+        case SAVAGE_PRIM_TRILIST:
+                if (n % 3 != 0) {
+                        DRM_ERROR("wrong number of vertices %u in TRILIST\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        case SAVAGE_PRIM_TRISTRIP:
+        case SAVAGE_PRIM_TRIFAN:
+                if (n < 3) {
+                        DRM_ERROR("wrong number of vertices %u in TRIFAN/STRIP\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        default:
+                DRM_ERROR("invalid primitive type %u\n", prim);
+                return DRM_ERR(EINVAL);
+        }
+
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                if (skip > SAVAGE_SKIP_ALL_S3D) {
+                        DRM_ERROR("invalid skip flags 0x%04x\n", skip);
+                        return DRM_ERR(EINVAL);
+                }
+                vtx_size = 8; /* full vertex */
+        } else {
+                if (skip > SAVAGE_SKIP_ALL_S4) {
+                        DRM_ERROR("invalid skip flags 0x%04x\n", skip);
+                        return DRM_ERR(EINVAL);
+                }
+                vtx_size = 10; /* full vertex */
+        }
+
+        vtx_size -= (skip & 1) + (skip >> 1 & 1) +
+                (skip >> 2 & 1) + (skip >> 3 & 1) + (skip >> 4 & 1) +
+                (skip >> 5 & 1) + (skip >> 6 & 1) + (skip >> 7 & 1);
+
+        if (vtx_size > vb_stride) {
+                DRM_ERROR("vertex size greater than vb stride (%u > %u)\n",
+                          vtx_size, vb_stride);
+                return DRM_ERR(EINVAL);
+        }
+
+        if (start + n > vb_size / (vb_stride*4)) {
+                DRM_ERROR("vertex indices (%u-%u) out of range (0-%u)\n",
+                          start, start + n - 1, vb_size / (vb_stride*4));
+                return DRM_ERR(EINVAL);
+        }
+
+        prim <<= 25;
+        while (n != 0) {
+                /* Can emit up to 255 vertices (85 triangles) at once. */
+                unsigned int count = n > 255 ? 255 : n;
+                if (reorder) {
+                        /* Need to reorder vertices for correct flat
+                         * shading while preserving the clock sense
+                         * for correct culling. Only on Savage3D. */
+                        int reorder[3] = {-1, -1, -1};
+                        reorder[start%3] = 2;
+
+                        BEGIN_DMA(count*vtx_size+1);
+                        DMA_DRAW_PRIMITIVE(count, prim, skip);
+
+                        for (i = start; i < start+count; ++i) {
+                                unsigned int j = i + reorder[i % 3];
+                                DMA_COPY_FROM_USER(&vtxbuf[vb_stride*j],
+                                                   vtx_size);
+                        }
+
+                        DMA_COMMIT();
+                } else {
+                        BEGIN_DMA(count*vtx_size+1);
+                        DMA_DRAW_PRIMITIVE(count, prim, skip);
+
+                        if (vb_stride == vtx_size) {
+                                DMA_COPY_FROM_USER(&vtxbuf[vb_stride*start],
+                                                   vtx_size*count);
+                        } else {
+                                for (i = start; i < start+count; ++i) {
+                                        DMA_COPY_FROM_USER(
+                                                &vtxbuf[vb_stride*i],
+                                                vtx_size);
+                                }
+                        }
+
+                        DMA_COMMIT();
+                }
+
+                start += count;
+                n -= count;
+
+                prim |= BCI_CMD_DRAW_CONT;
+        }
+
+        return 0;
+}
+
+static int savage_dispatch_dma_idx(drm_savage_private_t *dev_priv,
+                                   const drm_savage_cmd_header_t *cmd_header,
+                                   const uint16_t __user *usr_idx,
+                                   const drm_buf_t *dmabuf)
+{
+        unsigned char reorder = 0;
+        unsigned int prim = cmd_header->idx.prim;
+        unsigned int skip = cmd_header->idx.skip;
+        unsigned int n = cmd_header->idx.count;
+        unsigned int i;
+        BCI_LOCALS;
+
+        if (!dmabuf) {
+            DRM_ERROR("called without dma buffers!\n");
+            return DRM_ERR(EINVAL);
+        }
+
+        if (!n)
+                return 0;
+
+        switch (prim) {
+        case SAVAGE_PRIM_TRILIST_201:
+                reorder = 1;
+                prim = SAVAGE_PRIM_TRILIST;
+        case SAVAGE_PRIM_TRILIST:
+                if (n % 3 != 0) {
+                        DRM_ERROR("wrong number of indices %u in TRILIST\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        case SAVAGE_PRIM_TRISTRIP:
+        case SAVAGE_PRIM_TRIFAN:
+                if (n < 3) {
+                        DRM_ERROR("wrong number of indices %u in TRIFAN/STRIP\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        default:
+                DRM_ERROR("invalid primitive type %u\n", prim);
+                return DRM_ERR(EINVAL);
+        }
+
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                if (skip != 0) {
+                        DRM_ERROR("invalid skip flags 0x%04x for DMA\n",
+                                  skip);
+                        return DRM_ERR(EINVAL);
+                }
+        } else {
+                unsigned int size = 10 - (skip & 1) - (skip >> 1 & 1) -
+                        (skip >> 2 & 1) - (skip >> 3 & 1) - (skip >> 4 & 1) -
+                        (skip >> 5 & 1) - (skip >> 6 & 1) - (skip >> 7 & 1);
+                if (skip > SAVAGE_SKIP_ALL_S4 || size != 8) {
+                        DRM_ERROR("invalid skip flags 0x%04x for DMA\n",
+                                  skip);
+                        return DRM_ERR(EINVAL);
+                }
+                if (reorder) {
+                        DRM_ERROR("TRILIST_201 used on Savage4 hardware\n");
+                        return DRM_ERR(EINVAL);
+                }
+        }
+
+        /* Vertex DMA doesn't work with command DMA at the same time,
+         * so we use BCI_... to submit commands here. Flush buffered
+         * faked DMA first. */
+        DMA_FLUSH();
+
+        if (dmabuf->bus_address != dev_priv->state.common.vbaddr) {
+                BEGIN_BCI(2);
+                BCI_SET_REGISTERS(SAVAGE_VERTBUFADDR, 1);
+                BCI_WRITE(dmabuf->bus_address | dev_priv->dma_type);
+                dev_priv->state.common.vbaddr = dmabuf->bus_address;
+        }
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset) && dev_priv->waiting) {
+                /* Workaround for what looks like a hardware bug. If a
+                 * WAIT_3D_IDLE was emitted some time before the
+                 * indexed drawing command then the engine will lock
+                 * up. There are two known workarounds:
+                 * WAIT_IDLE_EMPTY or emit at least 63 NOPs. */
+                BEGIN_BCI(63);
+                for (i = 0; i < 63; ++i)
+                        BCI_WRITE(BCI_CMD_WAIT);
+                dev_priv->waiting = 0;
+        }
+
+        prim <<= 25;
+        while (n != 0) {
+                /* Can emit up to 255 indices (85 triangles) at once. */
+                unsigned int count = n > 255 ? 255 : n;
+                /* Is it ok to allocate 510 bytes on the stack in an ioctl? */
+                uint16_t idx[255];
+
+                /* Copy and check indices */
+                DRM_COPY_FROM_USER_UNCHECKED(idx, usr_idx, count*2);
+                for (i = 0; i < count; ++i) {
+                        if (idx[i] > dmabuf->total/32) {
+                                DRM_ERROR("idx[%u]=%u out of range (0-%u)\n",
+                                          i, idx[i], dmabuf->total/32);
+                                return DRM_ERR(EINVAL);
+                        }
+                }
+
+                if (reorder) {
+                        /* Need to reorder indices for correct flat
+                         * shading while preserving the clock sense
+                         * for correct culling. Only on Savage3D. */
+                        int reorder[3] = {2, -1, -1};
+
+                        BEGIN_BCI((count+1+1)/2);
+                        BCI_DRAW_INDICES_S3D(count, prim, idx[2]);
+
+                        for (i = 1; i+1 < count; i += 2)
+                                BCI_WRITE(idx[i + reorder[i % 3]] |
+                                          (idx[i+1 + reorder[(i+1) % 3]] << 16));
+                        if (i < count)
+                                BCI_WRITE(idx[i + reorder[i%3]]);
+                } else if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                        BEGIN_BCI((count+1+1)/2);
+                        BCI_DRAW_INDICES_S3D(count, prim, idx[0]);
+
+                        for (i = 1; i+1 < count; i += 2)
+                                BCI_WRITE(idx[i] | (idx[i+1] << 16));
+                        if (i < count)
+                                BCI_WRITE(idx[i]);
+                } else {
+                        BEGIN_BCI((count+2+1)/2);
+                        BCI_DRAW_INDICES_S4(count, prim, skip);
+
+                        for (i = 0; i+1 < count; i += 2)
+                                BCI_WRITE(idx[i] | (idx[i+1] << 16));
+                        if (i < count)
+                                BCI_WRITE(idx[i]);
+                }
+
+                usr_idx += count;
+                n -= count;
+
+                prim |= BCI_CMD_DRAW_CONT;
+        }
+
+        return 0;
+}
+
+static int savage_dispatch_vb_idx(drm_savage_private_t *dev_priv,
+                                  const drm_savage_cmd_header_t *cmd_header,
+                                  const uint16_t __user *usr_idx,
+                                  const uint32_t __user *vtxbuf,
+                                  unsigned int vb_size,
+                                  unsigned int vb_stride)
+{
+        unsigned char reorder = 0;
+        unsigned int prim = cmd_header->idx.prim;
+        unsigned int skip = cmd_header->idx.skip;
+        unsigned int n = cmd_header->idx.count;
+        unsigned int vtx_size;
+        unsigned int i;
+        DMA_LOCALS;
+
+        if (!n)
+                return 0;
+
+        switch (prim) {
+        case SAVAGE_PRIM_TRILIST_201:
+                reorder = 1;
+                prim = SAVAGE_PRIM_TRILIST;
+        case SAVAGE_PRIM_TRILIST:
+                if (n % 3 != 0) {
+                        DRM_ERROR("wrong number of indices %u in TRILIST\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        case SAVAGE_PRIM_TRISTRIP:
+        case SAVAGE_PRIM_TRIFAN:
+                if (n < 3) {
+                        DRM_ERROR("wrong number of indices %u in TRIFAN/STRIP\n",
+                                  n);
+                        return DRM_ERR(EINVAL);
+                }
+                break;
+        default:
+                DRM_ERROR("invalid primitive type %u\n", prim);
+                return DRM_ERR(EINVAL);
+        }
+
+        if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
+                if (skip > SAVAGE_SKIP_ALL_S3D) {
+                        DRM_ERROR("invalid skip flags 0x%04x\n", skip);
+                        return DRM_ERR(EINVAL);
+                }
+                vtx_size = 8; /* full vertex */
+        } else {
+                if (skip > SAVAGE_SKIP_ALL_S4) {
+                        DRM_ERROR("invalid skip flags 0x%04x\n", skip);
+                        return DRM_ERR(EINVAL);
+                }
+                vtx_size = 10; /* full vertex */
+        }
+
+        vtx_size -= (skip & 1) + (skip >> 1 & 1) +
+                (skip >> 2 & 1) + (skip >> 3 & 1) + (skip >> 4 & 1) +
+                (skip >> 5 & 1) + (skip >> 6 & 1) + (skip >> 7 & 1);
+
+        if (vtx_size > vb_stride) {
+                DRM_ERROR("vertex size greater than vb stride (%u > %u)\n",
+                          vtx_size, vb_stride);
+                return DRM_ERR(EINVAL);
+        }
+
+        prim <<= 25;
+        while (n != 0) {
+                /* Can emit up to 255 vertices (85 triangles) at once. */
+                unsigned int count = n > 255 ? 255 : n;
+                /* Is it ok to allocate 510 bytes on the stack in an ioctl? */
+                uint16_t idx[255];
+
+                /* Copy and check indices */
+                DRM_COPY_FROM_USER_UNCHECKED(idx, usr_idx, count*2);
+                for (i = 0; i < count; ++i) {
+                        if (idx[i] > vb_size / (vb_stride*4)) {
+                                DRM_ERROR("idx[%u]=%u out of range (0-%u)\n",
+                                          i, idx[i],  vb_size / (vb_stride*4));
+                                return DRM_ERR(EINVAL);
+                        }
+                }
+
+                if (reorder) {
+                        /* Need to reorder vertices for correct flat
+                         * shading while preserving the clock sense
+                         * for correct culling. Only on Savage3D. */
+                        int reorder[3] = {2, -1, -1};
+
+                        BEGIN_DMA(count*vtx_size+1);
+                        DMA_DRAW_PRIMITIVE(count, prim, skip);
+
+                        for (i = 0; i < count; ++i) {
+                                unsigned int j = idx[i + reorder[i % 3]];
+                                DMA_COPY_FROM_USER(&vtxbuf[vb_stride*j],
+                                                   vtx_size);
+                        }
+
+                        DMA_COMMIT();
+                } else {
+                        BEGIN_DMA(count*vtx_size+1);
+                        DMA_DRAW_PRIMITIVE(count, prim, skip);
+
+                        for (i = 0; i < count; ++i) {
+                                unsigned int j = idx[i];
+                                DMA_COPY_FROM_USER(&vtxbuf[vb_stride*j],
+                                                   vtx_size);
+                        }
+
+                        DMA_COMMIT();
+                }
+
+                usr_idx += count;
+                n -= count;
+
+                prim |= BCI_CMD_DRAW_CONT;
+        }
+
+        return 0;
+}
+
+static int savage_dispatch_clear(drm_savage_private_t *dev_priv,
+                                 const drm_savage_cmd_header_t *cmd_header,
+                                 const drm_savage_cmd_header_t __user *data,
+                                 unsigned int nbox,
+                                 const drm_clip_rect_t __user *usr_boxes)
+{
+        unsigned int flags = cmd_header->clear0.flags, mask, value;
+        unsigned int clear_cmd;
+        unsigned int i, nbufs;
+        DMA_LOCALS;
+
+        if (nbox == 0)
+                return 0;
+
+        DRM_GET_USER_UNCHECKED(mask, &((const drm_savage_cmd_header_t*)data)
+                               ->clear1.mask);
+        DRM_GET_USER_UNCHECKED(value, &((const drm_savage_cmd_header_t*)data)
+                               ->clear1.value);
+
+        clear_cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP |
+                BCI_CMD_SEND_COLOR | BCI_CMD_DEST_PBD_NEW;
+        BCI_CMD_SET_ROP(clear_cmd,0xCC);
+
+        nbufs = ((flags & SAVAGE_FRONT) ? 1 : 0) +
+                ((flags & SAVAGE_BACK) ? 1 : 0) +
+                ((flags & SAVAGE_DEPTH) ? 1 : 0);
+        if (nbufs == 0)
+                return 0;
+
+        if (mask != 0xffffffff) {
+                /* set mask */
+                BEGIN_DMA(2);
+                DMA_SET_REGISTERS(SAVAGE_BITPLANEWTMASK, 1);
+                DMA_WRITE(mask);
+                DMA_COMMIT();
+        }
+        for (i = 0; i < nbox; ++i) {
+                drm_clip_rect_t box;
+                unsigned int x, y, w, h;
+                unsigned int buf;
+                DRM_COPY_FROM_USER_UNCHECKED(&box, &usr_boxes[i], sizeof(box));
+                x = box.x1, y = box.y1;
+                w = box.x2 - box.x1;
+                h = box.y2 - box.y1;
+                BEGIN_DMA(nbufs*6);
+                for (buf = SAVAGE_FRONT; buf <= SAVAGE_DEPTH; buf <<= 1) {
+                        if (!(flags & buf))
+                                continue;
+                        DMA_WRITE(clear_cmd);
+                        switch(buf) {
+                        case SAVAGE_FRONT:
+                                DMA_WRITE(dev_priv->front_offset);
+                                DMA_WRITE(dev_priv->front_bd);
+                                break;
+                        case SAVAGE_BACK:
+                                DMA_WRITE(dev_priv->back_offset);
+                                DMA_WRITE(dev_priv->back_bd);
+                                break;
+                        case SAVAGE_DEPTH:
+                                DMA_WRITE(dev_priv->depth_offset);
+                                DMA_WRITE(dev_priv->depth_bd);
+                                break;
+                        }
+                        DMA_WRITE(value);
+                        DMA_WRITE(BCI_X_Y(x, y));
+                        DMA_WRITE(BCI_W_H(w, h));
+                }
+                DMA_COMMIT();
+        }
+        if (mask != 0xffffffff) {
+                /* reset mask */
+                BEGIN_DMA(2);
+                DMA_SET_REGISTERS(SAVAGE_BITPLANEWTMASK, 1);
+                DMA_WRITE(0xffffffff);
+                DMA_COMMIT();
+        }
+
+        return 0;
+}
+
+static int savage_dispatch_swap(drm_savage_private_t *dev_priv,
+                                unsigned int nbox,
+                                const drm_clip_rect_t __user *usr_boxes)
+{
+        unsigned int swap_cmd;
+        unsigned int i;
+        DMA_LOCALS;
+
+        if (nbox == 0)
+                return 0;
+
+        swap_cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP |
+                BCI_CMD_SRC_PBD_COLOR_NEW | BCI_CMD_DEST_GBD;
+        BCI_CMD_SET_ROP(swap_cmd,0xCC);
+
+        for (i = 0; i < nbox; ++i) {
+                drm_clip_rect_t box;
+                DRM_COPY_FROM_USER_UNCHECKED(&box, &usr_boxes[i], sizeof(box));
+
+                BEGIN_DMA(6);
+                DMA_WRITE(swap_cmd);
+                DMA_WRITE(dev_priv->back_offset);
+                DMA_WRITE(dev_priv->back_bd);
+                DMA_WRITE(BCI_X_Y(box.x1, box.y1));
+                DMA_WRITE(BCI_X_Y(box.x1, box.y1));
+                DMA_WRITE(BCI_W_H(box.x2-box.x1, box.y2-box.y1));
+                DMA_COMMIT();
+        }
+
+        return 0;
+}
+
+static int savage_dispatch_draw(drm_savage_private_t *dev_priv,
+                                const drm_savage_cmd_header_t __user *start,
+                                const drm_savage_cmd_header_t __user *end,
+                                const drm_buf_t *dmabuf,
+                                const unsigned int __user *usr_vtxbuf,
+                                unsigned int vb_size, unsigned int vb_stride,
+                                unsigned int nbox,
+                                const drm_clip_rect_t __user *usr_boxes)
+{
+        unsigned int i, j;
+        int ret;
+
+        for (i = 0; i < nbox; ++i) {
+                drm_clip_rect_t box;
+                const drm_savage_cmd_header_t __user *usr_cmdbuf;
+                DRM_COPY_FROM_USER_UNCHECKED(&box, &usr_boxes[i], sizeof(box));
+                dev_priv->emit_clip_rect(dev_priv, &box);
+
+                usr_cmdbuf = start;
+                while (usr_cmdbuf < end) {
+                        drm_savage_cmd_header_t cmd_header;
+                        DRM_COPY_FROM_USER_UNCHECKED(&cmd_header, usr_cmdbuf,
+                                                     sizeof(cmd_header));
+                        usr_cmdbuf++;
+                        switch (cmd_header.cmd.cmd) {
+                        case SAVAGE_CMD_DMA_PRIM:
+                                ret = savage_dispatch_dma_prim(
+                                        dev_priv, &cmd_header, dmabuf);
+                                break;
+                        case SAVAGE_CMD_VB_PRIM:
+                                ret = savage_dispatch_vb_prim(
+                                        dev_priv, &cmd_header,
+                                        (const uint32_t __user *)usr_vtxbuf,
+                                        vb_size, vb_stride);
+                                break;
+                        case SAVAGE_CMD_DMA_IDX:
+                                j = (cmd_header.idx.count + 3) / 4;
+                                /* j was check in savage_bci_cmdbuf */
+                                ret = savage_dispatch_dma_idx(
+                                        dev_priv, &cmd_header,
+                                        (const uint16_t __user *)usr_cmdbuf,
+                                        dmabuf);
+                                usr_cmdbuf += j;
+                                break;
+                        case SAVAGE_CMD_VB_IDX:
+                                j = (cmd_header.idx.count + 3) / 4;
+                                /* j was check in savage_bci_cmdbuf */
+                                ret = savage_dispatch_vb_idx(
+                                        dev_priv, &cmd_header,
+                                        (const uint16_t __user *)usr_cmdbuf,
+                                        (const uint32_t __user *)usr_vtxbuf,
+                                        vb_size, vb_stride);
+                                usr_cmdbuf += j;
+                                break;
+                        default:
+                                /* What's the best return code? EFAULT? */
+                                DRM_ERROR("IMPLEMENTATION ERROR: "
+                                          "non-drawing-command %d\n",
+                                          cmd_header.cmd.cmd);
+                                return DRM_ERR(EINVAL);
+                        }
+
+                        if (ret != 0)
+                                return ret;
+                }
+        }
+
+        return 0;
+}
+
+int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
+{
+        DRM_DEVICE;
+        drm_savage_private_t *dev_priv = dev->dev_private;
+        drm_device_dma_t *dma = dev->dma;
+        drm_buf_t *dmabuf;
+        drm_savage_cmdbuf_t cmdbuf;
+        drm_savage_cmd_header_t __user *usr_cmdbuf;
+        drm_savage_cmd_header_t __user *first_draw_cmd;
+        unsigned int __user *usr_vtxbuf;
+        drm_clip_rect_t __user *usr_boxes;
+        unsigned int i, j;
+        int ret = 0;
+
+        DRM_DEBUG("\n");
+        
+        LOCK_TEST_WITH_RETURN(dev, filp);
+
+        DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_savage_cmdbuf_t __user *)data,
+                                 sizeof(cmdbuf));
+
+        if (dma && dma->buflist) {
+                if (cmdbuf.dma_idx > dma->buf_count) {
+                        DRM_ERROR("vertex buffer index %u out of range (0-%u)\n",
+                                  cmdbuf.dma_idx, dma->buf_count-1);
+                        return DRM_ERR(EINVAL);
+                }
+                dmabuf = dma->buflist[cmdbuf.dma_idx];
+        } else {
+                dmabuf = NULL;
+        }
+
+        usr_cmdbuf = (drm_savage_cmd_header_t __user *)cmdbuf.cmd_addr;
+        usr_vtxbuf = (unsigned int __user *)cmdbuf.vb_addr;
+        usr_boxes = (drm_clip_rect_t __user *)cmdbuf.box_addr;
+        if ((cmdbuf.size && DRM_VERIFYAREA_READ(usr_cmdbuf, cmdbuf.size*8)) ||
+            (cmdbuf.vb_size && DRM_VERIFYAREA_READ(
+                    usr_vtxbuf, cmdbuf.vb_size)) ||
+            (cmdbuf.nbox && DRM_VERIFYAREA_READ(
+                    usr_boxes, cmdbuf.nbox*sizeof(drm_clip_rect_t))))
+                return DRM_ERR(EFAULT);
+
+        /* Make sure writes to DMA buffers are finished before sending
+         * DMA commands to the graphics hardware. */
+        DRM_MEMORYBARRIER();
+
+        /* Coming from user space. Don't know if the Xserver has
+         * emitted wait commands. Assuming the worst. */
+        dev_priv->waiting = 1;
+
+        i = 0;
+        first_draw_cmd = NULL;
+        while (i < cmdbuf.size) {
+                drm_savage_cmd_header_t cmd_header;
+                DRM_COPY_FROM_USER_UNCHECKED(&cmd_header, usr_cmdbuf,
+                                             sizeof(cmd_header));
+                usr_cmdbuf++;
+                i++;
+
+                /* Group drawing commands with same state to minimize
+                 * iterations over clip rects. */
+                j = 0;
+                switch (cmd_header.cmd.cmd) {
+                case SAVAGE_CMD_DMA_IDX:
+                case SAVAGE_CMD_VB_IDX:
+                        j = (cmd_header.idx.count + 3) / 4;
+                        if (i + j > cmdbuf.size) {
+                                DRM_ERROR("indexed drawing command extends "
+                                          "beyond end of command buffer\n");
+                                DMA_FLUSH();
+                                return DRM_ERR(EINVAL);
+                        }
+                        /* fall through */
+                case SAVAGE_CMD_DMA_PRIM:
+                case SAVAGE_CMD_VB_PRIM:
+                        if (!first_draw_cmd)
+                                first_draw_cmd = usr_cmdbuf-1;
+                        usr_cmdbuf += j;
+                        i += j;
+                        break;
+                default:
+                        if (first_draw_cmd) {
+                                ret = savage_dispatch_draw (
+                                        dev_priv, first_draw_cmd, usr_cmdbuf-1,
+                                        dmabuf, usr_vtxbuf, cmdbuf.vb_size,
+                                        cmdbuf.vb_stride,
+                                        cmdbuf.nbox, usr_boxes);
+                                if (ret != 0)
+                                        return ret;
+                                first_draw_cmd = NULL;
+                        }
+                }
+                if (first_draw_cmd)
+                        continue;
+
+                switch (cmd_header.cmd.cmd) {
+                case SAVAGE_CMD_STATE:
+                        j = (cmd_header.state.count + 1) / 2;
+                        if (i + j > cmdbuf.size) {
+                                DRM_ERROR("command SAVAGE_CMD_STATE extends "
+                                          "beyond end of command buffer\n");
+                                DMA_FLUSH();
+                                return DRM_ERR(EINVAL);
+                        }
+                        ret = savage_dispatch_state(
+                                dev_priv, &cmd_header,
+                                (uint32_t __user *)usr_cmdbuf);
+                        usr_cmdbuf += j;
+                        i += j;
+                        break;
+                case SAVAGE_CMD_CLEAR:
+                        if (i + 1 > cmdbuf.size) {
+                                DRM_ERROR("command SAVAGE_CMD_CLEAR extends "
+                                          "beyond end of command buffer\n");
+                                DMA_FLUSH();
+                                return DRM_ERR(EINVAL);
+                        }
+                        ret = savage_dispatch_clear(dev_priv, &cmd_header,
+                                                    usr_cmdbuf,
+                                                    cmdbuf.nbox, usr_boxes);
+                        usr_cmdbuf++;
+                        i++;
+                        break;
+                case SAVAGE_CMD_SWAP:
+                        ret = savage_dispatch_swap(dev_priv,
+                                                   cmdbuf.nbox, usr_boxes);
+                        break;
+                default:
+                        DRM_ERROR("invalid command 0x%x\n", cmd_header.cmd.cmd);
+                        DMA_FLUSH();
+                        return DRM_ERR(EINVAL);
+                }
+
+                if (ret != 0) {
+                        DMA_FLUSH();
+                        return ret;
+                }
+        }
+
+        if (first_draw_cmd) {
+                ret = savage_dispatch_draw (
+                        dev_priv, first_draw_cmd, usr_cmdbuf, dmabuf,
+                        usr_vtxbuf, cmdbuf.vb_size, cmdbuf.vb_stride,
+                        cmdbuf.nbox, usr_boxes);
+                if (ret != 0) {
+                        DMA_FLUSH();
+                        return ret;
+                }
+        }
+
+        DMA_FLUSH();
+
+        if (dmabuf && cmdbuf.discard) {
+                drm_savage_buf_priv_t *buf_priv = dmabuf->dev_private;
+                uint16_t event;
+                event = savage_bci_emit_event(dev_priv, SAVAGE_WAIT_3D);
+                SET_AGE(&buf_priv->age, event, dev_priv->event_wrap);
+                savage_freelist_put(dev, dmabuf);
+        }
+
+        return 0;
+}
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 6025e1866c7e..58d3738a2b7f 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -6,6 +6,8 @@
         For technical support please email digiLinux@dgii.com or
         call Digi tech support at (612) 912-3456
 
+        ** This driver is no longer supported by Digi **
+
         Much of this design and code came from epca.c which was 
         copyright (C) 1994, 1995 Troy De Jongh, and subsquently 
         modified by David Nugent, Christoph Lameter, Mike McLagan. 
@@ -43,31 +45,19 @@
 #include <linux/interrupt.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-
-#ifdef CONFIG_PCI
-#define ENABLE_PCI
-#endif /* CONFIG_PCI */
-
-#define putUser(arg1, arg2) put_user(arg1, (unsigned long __user *)arg2)
-#define getUser(arg1, arg2) get_user(arg1, (unsigned __user *)arg2)
-
-#ifdef ENABLE_PCI
+#include <linux/spinlock.h>
 #include <linux/pci.h>
 #include "digiPCI.h"
-#endif /* ENABLE_PCI */
+
 
 #include "digi1.h"
 #include "digiFep1.h"
 #include "epca.h"
 #include "epcaconfig.h"
 
-#if BITS_PER_LONG != 32
-#  error FIXME: this driver only works on 32-bit platforms
-#endif
-
 /* ---------------------- Begin defines ------------------------ */
 
-#define VERSION            "1.3.0.1-LK"
+#define VERSION            "1.3.0.1-LK2.6"
 
 /* This major needs to be submitted to Linux to join the majors list */
 
@@ -81,13 +71,17 @@
 
 /* ----------------- Begin global definitions ------------------- */
 
-static char mesg[100];
 static int nbdevs, num_cards, liloconfig;
 static int digi_poller_inhibited = 1 ;
 
 static int setup_error_code;
 static int invalid_lilo_config;
 
+/* The ISA boards do window flipping into the same spaces so its only sane
+   with a single lock. It's still pretty efficient */
+
+static spinlock_t epca_lock = SPIN_LOCK_UNLOCKED;
+
 /* -----------------------------------------------------------------------
         MAXBOARDS is typically 12, but ISA and EISA cards are restricted to 
         7 below.
@@ -129,58 +123,58 @@ static struct timer_list epca_timer;
         configured.
 ----------------------------------------------------------------------- */
         
-static inline void memwinon(struct board_info *b, unsigned int win);
-static inline void memwinoff(struct board_info *b, unsigned int win);
-static inline void globalwinon(struct channel *ch);
-static inline void rxwinon(struct channel *ch);
-static inline void txwinon(struct channel *ch);
-static inline void memoff(struct channel *ch);
-static inline void assertgwinon(struct channel *ch);
-static inline void assertmemoff(struct channel *ch);
+static void memwinon(struct board_info *b, unsigned int win);
+static void memwinoff(struct board_info *b, unsigned int win);
+static void globalwinon(struct channel *ch);
+static void rxwinon(struct channel *ch);
+static void txwinon(struct channel *ch);
+static void memoff(struct channel *ch);
+static void assertgwinon(struct channel *ch);
+static void assertmemoff(struct channel *ch);
 
 /* ---- Begin more 'specific' memory functions for cx_like products --- */
 
-static inline void pcxem_memwinon(struct board_info *b, unsigned int win);
-static inline void pcxem_memwinoff(struct board_info *b, unsigned int win);
-static inline void pcxem_globalwinon(struct channel *ch);
-static inline void pcxem_rxwinon(struct channel *ch);
-static inline void pcxem_txwinon(struct channel *ch);
-static inline void pcxem_memoff(struct channel *ch);
+static void pcxem_memwinon(struct board_info *b, unsigned int win);
+static void pcxem_memwinoff(struct board_info *b, unsigned int win);
+static void pcxem_globalwinon(struct channel *ch);
+static void pcxem_rxwinon(struct channel *ch);
+static void pcxem_txwinon(struct channel *ch);
+static void pcxem_memoff(struct channel *ch);
 
 /* ------ Begin more 'specific' memory functions for the pcxe ------- */
 
-static inline void pcxe_memwinon(struct board_info *b, unsigned int win);
-static inline void pcxe_memwinoff(struct board_info *b, unsigned int win);
-static inline void pcxe_globalwinon(struct channel *ch);
-static inline void pcxe_rxwinon(struct channel *ch);
-static inline void pcxe_txwinon(struct channel *ch);
-static inline void pcxe_memoff(struct channel *ch);
+static void pcxe_memwinon(struct board_info *b, unsigned int win);
+static void pcxe_memwinoff(struct board_info *b, unsigned int win);
+static void pcxe_globalwinon(struct channel *ch);
+static void pcxe_rxwinon(struct channel *ch);
+static void pcxe_txwinon(struct channel *ch);
+static void pcxe_memoff(struct channel *ch);
 
 /* ---- Begin more 'specific' memory functions for the pc64xe and pcxi ---- */
 /* Note : pc64xe and pcxi share the same windowing routines */
 
-static inline void pcxi_memwinon(struct board_info *b, unsigned int win);
-static inline void pcxi_memwinoff(struct board_info *b, unsigned int win);
-static inline void pcxi_globalwinon(struct channel *ch);
-static inline void pcxi_rxwinon(struct channel *ch);
-static inline void pcxi_txwinon(struct channel *ch);
-static inline void pcxi_memoff(struct channel *ch);
+static void pcxi_memwinon(struct board_info *b, unsigned int win);
+static void pcxi_memwinoff(struct board_info *b, unsigned int win);
+static void pcxi_globalwinon(struct channel *ch);
+static void pcxi_rxwinon(struct channel *ch);
+static void pcxi_txwinon(struct channel *ch);
+static void pcxi_memoff(struct channel *ch);
 
 /* - Begin 'specific' do nothing memory functions needed for some cards - */
 
-static inline void dummy_memwinon(struct board_info *b, unsigned int win);
-static inline void dummy_memwinoff(struct board_info *b, unsigned int win);
-static inline void dummy_globalwinon(struct channel *ch);
-static inline void dummy_rxwinon(struct channel *ch);
-static inline void dummy_txwinon(struct channel *ch);
-static inline void dummy_memoff(struct channel *ch);
-static inline void dummy_assertgwinon(struct channel *ch);
-static inline void dummy_assertmemoff(struct channel *ch);
+static void dummy_memwinon(struct board_info *b, unsigned int win);
+static void dummy_memwinoff(struct board_info *b, unsigned int win);
+static void dummy_globalwinon(struct channel *ch);
+static void dummy_rxwinon(struct channel *ch);
+static void dummy_txwinon(struct channel *ch);
+static void dummy_memoff(struct channel *ch);
+static void dummy_assertgwinon(struct channel *ch);
+static void dummy_assertmemoff(struct channel *ch);
 
 /* ------------------- Begin declare functions ----------------------- */
 
-static inline struct channel *verifyChannel(register struct tty_struct *);
-static inline void pc_sched_event(struct channel *, int);
+static struct channel *verifyChannel(struct tty_struct *);
+static void pc_sched_event(struct channel *, int);
 static void epca_error(int, char *);
 static void pc_close(struct tty_struct *, struct file *);
 static void shutdown(struct channel *);
@@ -215,15 +209,11 @@ static void pc_unthrottle(struct tty_struct *tty);
 static void digi_send_break(struct channel *ch, int msec);
 static void setup_empty_event(struct tty_struct *tty, struct channel *ch);
 void epca_setup(char *, int *);
-void console_print(const char *);
 
 static int get_termio(struct tty_struct *, struct termio __user *);
 static int pc_write(struct tty_struct *, const unsigned char *, int);
-int pc_init(void);
-
-#ifdef ENABLE_PCI
+static int pc_init(void);
 static int init_PCI(void);
-#endif /* ENABLE_PCI */
 
 
 /* ------------------------------------------------------------------
@@ -237,41 +227,41 @@ static int init_PCI(void);
         making direct calls deserves what they get.
 -------------------------------------------------------------------- */
 
-static inline void memwinon(struct board_info *b, unsigned int win)
+static void memwinon(struct board_info *b, unsigned int win)
 {
         (b->memwinon)(b, win);
 }
 
-static inline void memwinoff(struct board_info *b, unsigned int win)
+static void memwinoff(struct board_info *b, unsigned int win)
 {
         (b->memwinoff)(b, win);
 }
 
-static inline void globalwinon(struct channel *ch)
+static void globalwinon(struct channel *ch)
 {
         (ch->board->globalwinon)(ch);
 }
 
-static inline void rxwinon(struct channel *ch)
+static void rxwinon(struct channel *ch)
 {
         (ch->board->rxwinon)(ch);
 }
 
-static inline void txwinon(struct channel *ch)
+static void txwinon(struct channel *ch)
 {
         (ch->board->txwinon)(ch);
 }
 
-static inline void memoff(struct channel *ch)
+static void memoff(struct channel *ch)
 {
         (ch->board->memoff)(ch);
 }
-static inline void assertgwinon(struct channel *ch)
+static void assertgwinon(struct channel *ch)
 {
         (ch->board->assertgwinon)(ch);
 }
 
-static inline void assertmemoff(struct channel *ch)
+static void assertmemoff(struct channel *ch)
 {
         (ch->board->assertmemoff)(ch);
 }
@@ -281,66 +271,66 @@ static inline void assertmemoff(struct channel *ch)
         and CX series cards.
 ------------------------------------------------------------ */
 
-static inline void pcxem_memwinon(struct board_info *b, unsigned int win)
+static void pcxem_memwinon(struct board_info *b, unsigned int win)
 {
-        outb_p(FEPWIN|win, (int)b->port + 1);
+        outb_p(FEPWIN|win, b->port + 1);
 }
 
-static inline void pcxem_memwinoff(struct board_info *b, unsigned int win)
+static void pcxem_memwinoff(struct board_info *b, unsigned int win)
 {
-        outb_p(0, (int)b->port + 1);
+        outb_p(0, b->port + 1);
 }
 
-static inline void pcxem_globalwinon(struct channel *ch)
+static void pcxem_globalwinon(struct channel *ch)
 {
         outb_p( FEPWIN, (int)ch->board->port + 1);
 }
 
-static inline void pcxem_rxwinon(struct channel *ch)
+static void pcxem_rxwinon(struct channel *ch)
 {
         outb_p(ch->rxwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxem_txwinon(struct channel *ch)
+static void pcxem_txwinon(struct channel *ch)
 {
         outb_p(ch->txwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxem_memoff(struct channel *ch)
+static void pcxem_memoff(struct channel *ch)
 {
         outb_p(0, (int)ch->board->port + 1);
 }
 
 /* ----------------- Begin pcxe memory window stuff ------------------ */
 
-static inline void pcxe_memwinon(struct board_info *b, unsigned int win)
+static void pcxe_memwinon(struct board_info *b, unsigned int win)
 {
-               outb_p(FEPWIN | win, (int)b->port + 1);
+               outb_p(FEPWIN | win, b->port + 1);
 }
 
-static inline void pcxe_memwinoff(struct board_info *b, unsigned int win)
+static void pcxe_memwinoff(struct board_info *b, unsigned int win)
 {
-        outb_p(inb((int)b->port) & ~FEPMEM,
-                   (int)b->port + 1);
-        outb_p(0, (int)b->port + 1);
+        outb_p(inb(b->port) & ~FEPMEM,
+                   b->port + 1);
+        outb_p(0, b->port + 1);
 }
 
-static inline void pcxe_globalwinon(struct channel *ch)
+static void pcxe_globalwinon(struct channel *ch)
 {
         outb_p( FEPWIN, (int)ch->board->port + 1);
 }
 
-static inline void pcxe_rxwinon(struct channel *ch)
+static void pcxe_rxwinon(struct channel *ch)
 {
                 outb_p(ch->rxwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxe_txwinon(struct channel *ch)
+static void pcxe_txwinon(struct channel *ch)
 {
                 outb_p(ch->txwin, (int)ch->board->port + 1);
 }
 
-static inline void pcxe_memoff(struct channel *ch)
+static void pcxe_memoff(struct channel *ch)
 {
         outb_p(0, (int)ch->board->port);
         outb_p(0, (int)ch->board->port + 1);
@@ -348,44 +338,44 @@ static inline void pcxe_memoff(struct channel *ch)
 
 /* ------------- Begin pc64xe and pcxi memory window stuff -------------- */
 
-static inline void pcxi_memwinon(struct board_info *b, unsigned int win)
+static void pcxi_memwinon(struct board_info *b, unsigned int win)
 {
-               outb_p(inb((int)b->port) | FEPMEM, (int)b->port);
+               outb_p(inb(b->port) | FEPMEM, b->port);
 }
 
-static inline void pcxi_memwinoff(struct board_info *b, unsigned int win)
+static void pcxi_memwinoff(struct board_info *b, unsigned int win)
 {
-        outb_p(inb((int)b->port) & ~FEPMEM, (int)b->port);
+        outb_p(inb(b->port) & ~FEPMEM, b->port);
 }
 
-static inline void pcxi_globalwinon(struct channel *ch)
+static void pcxi_globalwinon(struct channel *ch)
 {
-        outb_p(FEPMEM, (int)ch->board->port);
+        outb_p(FEPMEM, ch->board->port);
 }
 
-static inline void pcxi_rxwinon(struct channel *ch)
+static void pcxi_rxwinon(struct channel *ch)
 {
-                outb_p(FEPMEM, (int)ch->board->port);
+                outb_p(FEPMEM, ch->board->port);
 }
 
-static inline void pcxi_txwinon(struct channel *ch)
+static void pcxi_txwinon(struct channel *ch)
 {
-                outb_p(FEPMEM, (int)ch->board->port);
+                outb_p(FEPMEM, ch->board->port);
 }
 
-static inline void pcxi_memoff(struct channel *ch)
+static void pcxi_memoff(struct channel *ch)
 {
-        outb_p(0, (int)ch->board->port);
+        outb_p(0, ch->board->port);
 }
 
-static inline void pcxi_assertgwinon(struct channel *ch)
+static void pcxi_assertgwinon(struct channel *ch)
 {
-        epcaassert(inb((int)ch->board->port) & FEPMEM, "Global memory off");
+        epcaassert(inb(ch->board->port) & FEPMEM, "Global memory off");
 }
 
-static inline void pcxi_assertmemoff(struct channel *ch)
+static void pcxi_assertmemoff(struct channel *ch)
 {
-        epcaassert(!(inb((int)ch->board->port) & FEPMEM), "Memory on");
+        epcaassert(!(inb(ch->board->port) & FEPMEM), "Memory on");
 }
 
 
@@ -398,185 +388,143 @@ static inline void pcxi_assertmemoff(struct channel *ch)
         may or may not do anything.
 ---------------------------------------------------------------------------*/
 
-static inline void dummy_memwinon(struct board_info *b, unsigned int win)
+static void dummy_memwinon(struct board_info *b, unsigned int win)
 {
 }
 
-static inline void dummy_memwinoff(struct board_info *b, unsigned int win)
+static void dummy_memwinoff(struct board_info *b, unsigned int win)
 {
 }
 
-static inline void dummy_globalwinon(struct channel *ch)
+static void dummy_globalwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_rxwinon(struct channel *ch)
+static void dummy_rxwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_txwinon(struct channel *ch)
+static void dummy_txwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_memoff(struct channel *ch)
+static void dummy_memoff(struct channel *ch)
 {
 }
 
-static inline void dummy_assertgwinon(struct channel *ch)
+static void dummy_assertgwinon(struct channel *ch)
 {
 }
 
-static inline void dummy_assertmemoff(struct channel *ch)
+static void dummy_assertmemoff(struct channel *ch)
 {
 }
 
 /* ----------------- Begin verifyChannel function ----------------------- */
-static inline struct channel *verifyChannel(register struct tty_struct *tty)
+static struct channel *verifyChannel(struct tty_struct *tty)
 { /* Begin verifyChannel */
-
         /* --------------------------------------------------------------------
                 This routine basically provides a sanity check.  It insures that
                 the channel returned is within the proper range of addresses as
                 well as properly initialized.  If some bogus info gets passed in
                 through tty->driver_data this should catch it.
-        --------------------------------------------------------------------- */
-
-        if (tty) 
-        { /* Begin if tty */
-
-                register struct channel *ch = (struct channel *)tty->driver_data;
-
-                if ((ch >= &digi_channels[0]) && (ch < &digi_channels[nbdevs])) 
-                {
+                --------------------------------------------------------------------- */
+        if (tty) {
+                struct channel *ch = (struct channel *)tty->driver_data;
+                if ((ch >= &digi_channels[0]) && (ch < &digi_channels[nbdevs])) {
                         if (ch->magic == EPCA_MAGIC)
                                 return ch;
                 }
-
-        } /* End if tty */
-
-        /* Else return a NULL for invalid */
+        }
         return NULL;
 
 } /* End verifyChannel */
 
 /* ------------------ Begin pc_sched_event ------------------------- */
 
-static inline void pc_sched_event(struct channel *ch, int event)
-{ /* Begin pc_sched_event */
-
-
+static void pc_sched_event(struct channel *ch, int event)
+{
         /* ----------------------------------------------------------------------
                 We call this to schedule interrupt processing on some event.  The 
                 kernel sees our request and calls the related routine in OUR driver.
         -------------------------------------------------------------------------*/
-
         ch->event |= 1 << event;
         schedule_work(&ch->tqueue);
-
-
 } /* End pc_sched_event */
 
 /* ------------------ Begin epca_error ------------------------- */
 
 static void epca_error(int line, char *msg)
-{ /* Begin epca_error */
-
+{
         printk(KERN_ERR "epca_error (Digi): line = %d %s\n",line,msg);
-        return;
-
-} /* End epca_error */
+}
 
 /* ------------------ Begin pc_close ------------------------- */
 static void pc_close(struct tty_struct * tty, struct file * filp)
-{ /* Begin pc_close */
-
+{
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if ch != NULL */
-
-                save_flags(flags);
-                cli();
-
-                if (tty_hung_up_p(filp)) 
-                {
-                        restore_flags(flags);
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if ch != NULL */
+                spin_lock_irqsave(&epca_lock, flags);
+                if (tty_hung_up_p(filp)) {
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         return;
                 }
-
                 /* Check to see if the channel is open more than once */
-                if (ch->count-- > 1) 
-                { /* Begin channel is open more than once */
-
+                if (ch->count-- > 1)  {
+                        /* Begin channel is open more than once */
                         /* -------------------------------------------------------------
                                 Return without doing anything.  Someone might still be using
                                 the channel.
                         ---------------------------------------------------------------- */
-
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         return;
                 } /* End channel is open more than once */
 
                 /* Port open only once go ahead with shutdown & reset */
-
-                if (ch->count < 0) 
-                {
-                        ch->count = 0;
-                }
+                if (ch->count < 0)
+                        BUG();
 
                 /* ---------------------------------------------------------------
                         Let the rest of the driver know the channel is being closed.
                         This becomes important if an open is attempted before close 
                         is finished.
                 ------------------------------------------------------------------ */
-
                 ch->asyncflags |= ASYNC_CLOSING;
-        
                 tty->closing = 1;
 
-                if (ch->asyncflags & ASYNC_INITIALIZED) 
-                {
+                spin_unlock_irqrestore(&epca_lock, flags);
+
+                if (ch->asyncflags & ASYNC_INITIALIZED)  {
                         /* Setup an event to indicate when the transmit buffer empties */
                         setup_empty_event(tty, ch);             
                         tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */
                 }
-        
                 if (tty->driver->flush_buffer)
                         tty->driver->flush_buffer(tty);
 
                 tty_ldisc_flush(tty);
                 shutdown(ch);
+
+                spin_lock_irqsave(&epca_lock, flags);
                 tty->closing = 0;
                 ch->event = 0;
                 ch->tty = NULL;
+                spin_unlock_irqrestore(&epca_lock, flags);
 
-                if (ch->blocked_open) 
-                { /* Begin if blocked_open */
-
+                if (ch->blocked_open)  { /* Begin if blocked_open */
                         if (ch->close_delay) 
-                        {
                                 msleep_interruptible(jiffies_to_msecs(ch->close_delay));
-                        }
-
                         wake_up_interruptible(&ch->open_wait);
-
                 } /* End if blocked_open */
-
                 ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED | 
                                       ASYNC_CLOSING);
                 wake_up_interruptible(&ch->close_wait);
-
-
-                restore_flags(flags);
-
         } /* End if ch != NULL */
-
 } /* End pc_close */ 
 
 /* ------------------ Begin shutdown  ------------------------- */
@@ -586,15 +534,14 @@ static void shutdown(struct channel *ch)
 
         unsigned long flags;
         struct tty_struct *tty;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
 
         if (!(ch->asyncflags & ASYNC_INITIALIZED)) 
                 return;
 
-        save_flags(flags);
-        cli();
-        globalwinon(ch);
+        spin_lock_irqsave(&epca_lock, flags);
 
+        globalwinon(ch);
         bc = ch->brdchan;
 
         /* ------------------------------------------------------------------
@@ -604,20 +551,17 @@ static void shutdown(struct channel *ch)
         --------------------------------------------------------------------- */ 
 
         if (bc)
-                bc->idata = 0;
-
+                writeb(0, &bc->idata);
         tty = ch->tty;
 
         /* ----------------------------------------------------------------
            If we're a modem control device and HUPCL is on, drop RTS & DTR.
         ------------------------------------------------------------------ */
 
-        if (tty->termios->c_cflag & HUPCL) 
-        {
+        if (tty->termios->c_cflag & HUPCL)  {
                 ch->omodem &= ~(ch->m_rts | ch->m_dtr);
                 fepcmd(ch, SETMODEM, 0, ch->m_dtr | ch->m_rts, 10, 1);
         }
-
         memoff(ch);
 
         /* ------------------------------------------------------------------
@@ -628,7 +572,7 @@ static void shutdown(struct channel *ch)
         /* Prevent future Digi programmed interrupts from coming active */
 
         ch->asyncflags &= ~ASYNC_INITIALIZED;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
 
 } /* End shutdown */
 
@@ -636,7 +580,6 @@ static void shutdown(struct channel *ch)
 
 static void pc_hangup(struct tty_struct *tty)
 { /* Begin pc_hangup */
-
         struct channel *ch;
         
         /* ---------------------------------------------------------
@@ -644,25 +587,21 @@ static void pc_hangup(struct tty_struct *tty)
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
 
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if ch != NULL */
-
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if ch != NULL */
                 unsigned long flags;
 
-                save_flags(flags);
-                cli();
                 if (tty->driver->flush_buffer)
                         tty->driver->flush_buffer(tty);
                 tty_ldisc_flush(tty);
                 shutdown(ch);
 
+                spin_lock_irqsave(&epca_lock, flags);
                 ch->tty   = NULL;
                 ch->event = 0;
                 ch->count = 0;
-                restore_flags(flags);
                 ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED);
+                spin_unlock_irqrestore(&epca_lock, flags);
                 wake_up_interruptible(&ch->open_wait);
-
         } /* End if ch != NULL */
 
 } /* End pc_hangup */
@@ -672,18 +611,14 @@ static void pc_hangup(struct tty_struct *tty)
 static int pc_write(struct tty_struct * tty,
                     const unsigned char *buf, int bytesAvailable)
 { /* Begin pc_write */
-
-        register unsigned int head, tail;
-        register int dataLen;
-        register int size;
-        register int amountCopied;
-
-
+        unsigned int head, tail;
+        int dataLen;
+        int size;
+        int amountCopied;
         struct channel *ch;
         unsigned long flags;
         int remain;
-        volatile struct board_chan *bc;
-
+        struct board_chan *bc;
 
         /* ----------------------------------------------------------------
                 pc_write is primarily called directly by the kernel routine
@@ -706,24 +641,20 @@ static int pc_write(struct tty_struct * tty,
 
         bc   = ch->brdchan;
         size = ch->txbufsize;
-
         amountCopied = 0;
-        save_flags(flags);
-        cli();
 
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
 
-        head = bc->tin & (size - 1);
-        tail = bc->tout;
+        head = readw(&bc->tin) & (size - 1);
+        tail = readw(&bc->tout);
 
-        if (tail != bc->tout)
-                tail = bc->tout;
+        if (tail != readw(&bc->tout))
+                tail = readw(&bc->tout);
         tail &= (size - 1);
 
         /*      If head >= tail, head has not wrapped around. */ 
-        if (head >= tail) 
-        { /* Begin head has not wrapped */
-
+        if (head >= tail)  { /* Begin head has not wrapped */
                 /* ---------------------------------------------------------------
                         remain (much like dataLen above) represents the total amount of
                         space available on the card for data.  Here dataLen represents
@@ -731,26 +662,19 @@ static int pc_write(struct tty_struct * tty,
                         buffer.  This is important because a memcpy cannot be told to
                         automatically wrap around when it hits the buffer end.
                 ------------------------------------------------------------------ */ 
-
                 dataLen = size - head;
                 remain = size - (head - tail) - 1;
-
-        } /* End head has not wrapped */
-        else 
-        { /* Begin head has wrapped around */
+        } else { /* Begin head has wrapped around */
 
                 remain = tail - head - 1;
                 dataLen = remain;
 
         } /* End head has wrapped around */
-
         /* -------------------------------------------------------------------
                         Check the space on the card.  If we have more data than 
                         space; reduce the amount of data to fit the space.
         ---------------------------------------------------------------------- */
-
         bytesAvailable = min(remain, bytesAvailable);
-
         txwinon(ch);
         while (bytesAvailable > 0) 
         { /* Begin while there is data to copy onto card */
@@ -767,26 +691,21 @@ static int pc_write(struct tty_struct * tty,
                 amountCopied += dataLen;
                 bytesAvailable -= dataLen;
 
-                if (head >= size) 
-                {
+                if (head >= size) {
                         head = 0;
                         dataLen = tail;
                 }
-
         } /* End while there is data to copy onto card */
-
         ch->statusflags |= TXBUSY;
         globalwinon(ch);
-        bc->tin = head;
+        writew(head, &bc->tin);
 
-        if ((ch->statusflags & LOWWAIT) == 0) 
-        {
+        if ((ch->statusflags & LOWWAIT) == 0)  {
                 ch->statusflags |= LOWWAIT;
-                bc->ilow = 1;
+                writeb(1, &bc->ilow);
         }
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         return(amountCopied);
 
 } /* End pc_write */
@@ -795,11 +714,7 @@ static int pc_write(struct tty_struct * tty,
 
 static void pc_put_char(struct tty_struct *tty, unsigned char c)
 { /* Begin pc_put_char */
-
-   
         pc_write(tty, &c, 1);
-        return;
-
 } /* End pc_put_char */
 
 /* ------------------ Begin pc_write_room  ------------------------- */
@@ -811,7 +726,7 @@ static int pc_write_room(struct tty_struct *tty)
         struct channel *ch;
         unsigned long flags;
         unsigned int head, tail;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
 
         remain = 0;
 
@@ -820,33 +735,29 @@ static int pc_write_room(struct tty_struct *tty)
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
 
-        if ((ch = verifyChannel(tty)) != NULL) 
-        {
-                save_flags(flags);
-                cli();
+        if ((ch = verifyChannel(tty)) != NULL)  {
+                spin_lock_irqsave(&epca_lock, flags);
                 globalwinon(ch);
 
                 bc   = ch->brdchan;
-                head = bc->tin & (ch->txbufsize - 1);
-                tail = bc->tout;
+                head = readw(&bc->tin) & (ch->txbufsize - 1);
+                tail = readw(&bc->tout);
 
-                if (tail != bc->tout)
-                        tail = bc->tout;
+                if (tail != readw(&bc->tout))
+                        tail = readw(&bc->tout);
                 /* Wrap tail if necessary */
                 tail &= (ch->txbufsize - 1);
 
                 if ((remain = tail - head - 1) < 0 )
                         remain += ch->txbufsize;
 
-                if (remain && (ch->statusflags & LOWWAIT) == 0) 
-                {
+                if (remain && (ch->statusflags & LOWWAIT) == 0) {
                         ch->statusflags |= LOWWAIT;
-                        bc->ilow = 1;
+                        writeb(1, &bc->ilow);
                 }
                 memoff(ch);
-                restore_flags(flags);
+                spin_unlock_irqrestore(&epca_lock, flags);
         }
-
         /* Return how much room is left on card */
         return remain;
 
@@ -862,8 +773,7 @@ static int pc_chars_in_buffer(struct tty_struct *tty)
         int remain;
         unsigned long flags;
         struct channel *ch;
-        volatile struct board_chan *bc;
-
+        struct board_chan *bc;
 
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
@@ -873,34 +783,27 @@ static int pc_chars_in_buffer(struct tty_struct *tty)
         if ((ch = verifyChannel(tty)) == NULL)
                 return(0);
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
 
         bc = ch->brdchan;
-        tail = bc->tout;
-        head = bc->tin;
-        ctail = ch->mailbox->cout;
+        tail = readw(&bc->tout);
+        head = readw(&bc->tin);
+        ctail = readw(&ch->mailbox->cout);
 
-        if (tail == head && ch->mailbox->cin == ctail && bc->tbusy == 0)
+        if (tail == head && readw(&ch->mailbox->cin) == ctail && readb(&bc->tbusy) == 0)
                 chars = 0;
-        else 
-        { /* Begin if some space on the card has been used */
-
-                head = bc->tin & (ch->txbufsize - 1);
+        else  { /* Begin if some space on the card has been used */
+                head = readw(&bc->tin) & (ch->txbufsize - 1);
                 tail &= (ch->txbufsize - 1);
-
                 /*  --------------------------------------------------------------
                         The logic here is basically opposite of the above pc_write_room
                         here we are finding the amount of bytes in the buffer filled.
                         Not the amount of bytes empty.
                 ------------------------------------------------------------------- */
-
                 if ((remain = tail - head - 1) < 0 )
                         remain += ch->txbufsize;
-
                 chars = (int)(ch->txbufsize - remain);
-
                 /* -------------------------------------------------------------  
                         Make it possible to wakeup anything waiting for output
                         in tty_ioctl.c, etc.
@@ -908,15 +811,12 @@ static int pc_chars_in_buffer(struct tty_struct *tty)
                         If not already set.  Setup an event to indicate when the
                         transmit buffer empties 
                 ----------------------------------------------------------------- */
-
                 if (!(ch->statusflags & EMPTYWAIT))
                         setup_empty_event(tty,ch);
 
         } /* End if some space on the card has been used */
-
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         /* Return number of characters residing on card. */
         return(chars);
 
@@ -930,67 +830,46 @@ static void pc_flush_buffer(struct tty_struct *tty)
         unsigned int tail;
         unsigned long flags;
         struct channel *ch;
-        volatile struct board_chan *bc;
-
-
+        struct board_chan *bc;
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
         if ((ch = verifyChannel(tty)) == NULL)
                 return;
 
-        save_flags(flags);
-        cli();
-
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
-
         bc   = ch->brdchan;
-        tail = bc->tout;
-
+        tail = readw(&bc->tout);
         /* Have FEP move tout pointer; effectively flushing transmit buffer */
-
         fepcmd(ch, STOUT, (unsigned) tail, 0, 0, 0);
-
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         wake_up_interruptible(&tty->write_wait);
         tty_wakeup(tty);
-
 } /* End pc_flush_buffer */
 
 /* ------------------ Begin pc_flush_chars  ---------------------- */
 
 static void pc_flush_chars(struct tty_struct *tty)
 { /* Begin pc_flush_chars */
-
         struct channel * ch;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        {
+        if ((ch = verifyChannel(tty)) != NULL) {
                 unsigned long flags;
-
-                save_flags(flags);
-                cli();
-
+                spin_lock_irqsave(&epca_lock, flags);
                 /* ----------------------------------------------------------------
                         If not already set and the transmitter is busy setup an event
                         to indicate when the transmit empties.
                 ------------------------------------------------------------------- */
-
                 if ((ch->statusflags & TXBUSY) && !(ch->statusflags & EMPTYWAIT))
                         setup_empty_event(tty,ch);
-
-                restore_flags(flags);
+                spin_unlock_irqrestore(&epca_lock, flags);
         }
-
 } /* End pc_flush_chars */
 
 /* ------------------ Begin block_til_ready  ---------------------- */
@@ -998,14 +877,11 @@ static void pc_flush_chars(struct tty_struct *tty)
 static int block_til_ready(struct tty_struct *tty, 
                            struct file *filp, struct channel *ch)
 { /* Begin block_til_ready */
-
         DECLARE_WAITQUEUE(wait,current);
         int     retval, do_clocal = 0;
         unsigned long flags;
 
-
-        if (tty_hung_up_p(filp))
-        {
+        if (tty_hung_up_p(filp)) {
                 if (ch->asyncflags & ASYNC_HUP_NOTIFY)
                         retval = -EAGAIN;
                 else
@@ -1017,8 +893,7 @@ static int block_til_ready(struct tty_struct *tty,
                 If the device is in the middle of being closed, then block
                 until it's done, and then try again.
         -------------------------------------------------------------------- */
-        if (ch->asyncflags & ASYNC_CLOSING) 
-        {
+        if (ch->asyncflags & ASYNC_CLOSING) {
                 interruptible_sleep_on(&ch->close_wait);
 
                 if (ch->asyncflags & ASYNC_HUP_NOTIFY)
@@ -1027,43 +902,29 @@ static int block_til_ready(struct tty_struct *tty,
                         return -ERESTARTSYS;
         }
 
-        if (filp->f_flags & O_NONBLOCK) 
-        {
+        if (filp->f_flags & O_NONBLOCK)  {
                 /* ----------------------------------------------------------------- 
                  If non-blocking mode is set, then make the check up front
                  and then exit.
                 -------------------------------------------------------------------- */
-
                 ch->asyncflags |= ASYNC_NORMAL_ACTIVE;
-
                 return 0;
         }
-
-
         if (tty->termios->c_cflag & CLOCAL)
                 do_clocal = 1;
-        
-   /* Block waiting for the carrier detect and the line to become free */
+        /* Block waiting for the carrier detect and the line to become free */
         
         retval = 0;
         add_wait_queue(&ch->open_wait, &wait);
-        save_flags(flags);
-        cli();
-
 
+        spin_lock_irqsave(&epca_lock, flags);
         /* We dec count so that pc_close will know when to free things */
         if (!tty_hung_up_p(filp))
                 ch->count--;
-
-        restore_flags(flags);
-
         ch->blocked_open++;
-
         while(1) 
         { /* Begin forever while  */
-
                 set_current_state(TASK_INTERRUPTIBLE);
-
                 if (tty_hung_up_p(filp) ||
                     !(ch->asyncflags & ASYNC_INITIALIZED)) 
                 {
@@ -1073,17 +934,14 @@ static int block_til_ready(struct tty_struct *tty,
                                 retval = -ERESTARTSYS;  
                         break;
                 }
-
                 if (!(ch->asyncflags & ASYNC_CLOSING) && 
                           (do_clocal || (ch->imodem & ch->dcd)))
                         break;
-
-                if (signal_pending(current)) 
-                {
+                if (signal_pending(current)) {
                         retval = -ERESTARTSYS;
                         break;
                 }
-
+                spin_unlock_irqrestore(&epca_lock, flags);
                 /* ---------------------------------------------------------------
                         Allow someone else to be scheduled.  We will occasionally go
                         through this loop until one of the above conditions change.
@@ -1091,25 +949,23 @@ static int block_til_ready(struct tty_struct *tty,
                         prevent this loop from hogging the cpu.
                 ------------------------------------------------------------------ */
                 schedule();
+                spin_lock_irqsave(&epca_lock, flags);
 
         } /* End forever while  */
 
         current->state = TASK_RUNNING;
         remove_wait_queue(&ch->open_wait, &wait);
-        cli();
         if (!tty_hung_up_p(filp))
                 ch->count++;
-        restore_flags(flags);
-
         ch->blocked_open--;
 
+        spin_unlock_irqrestore(&epca_lock, flags);
+
         if (retval)
                 return retval;
 
         ch->asyncflags |= ASYNC_NORMAL_ACTIVE;
-
         return 0;
-
 } /* End block_til_ready */     
 
 /* ------------------ Begin pc_open  ---------------------- */
@@ -1120,17 +976,12 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
         struct channel *ch;
         unsigned long flags;
         int line, retval, boardnum;
-        volatile struct board_chan *bc;
-        volatile unsigned int head;
+        struct board_chan *bc;
+        unsigned int head;
 
         line = tty->index;
-        if (line < 0 || line >= nbdevs) 
-        {
-                printk(KERN_ERR "<Error> - pc_open : line out of range in pc_open\n");
-                tty->driver_data = NULL;
-                return(-ENODEV);
-        }
-
+        if (line < 0 || line >= nbdevs)
+                return -ENODEV;
 
         ch = &digi_channels[line];
         boardnum = ch->boardnum;
@@ -1143,66 +994,49 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
                 goes here.
         ---------------------------------------------------------------------- */
 
-        if (invalid_lilo_config)
-        {
+        if (invalid_lilo_config) {
                 if (setup_error_code & INVALID_BOARD_TYPE)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board type specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board type specified in kernel options.\n");
                 if (setup_error_code & INVALID_NUM_PORTS)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid number of ports specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid number of ports specified in kernel options.\n");
                 if (setup_error_code & INVALID_MEM_BASE)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board memory address specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board memory address specified in kernel options.\n");
                 if (setup_error_code & INVALID_PORT_BASE)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board port address specified in LILO command\n");
-
+                        printk(KERN_ERR "epca; pc_open: Invalid board port address specified in kernel options.\n");
                 if (setup_error_code & INVALID_BOARD_STATUS)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board status specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board status specified in kernel options.\n");
                 if (setup_error_code & INVALID_ALTPIN)
-                        printk(KERN_ERR "<Error> - pc_open: Invalid board altpin specified in LILO command\n");
-
+                        printk(KERN_ERR "epca: pc_open: Invalid board altpin specified in kernel options;\n");
                 tty->driver_data = NULL;   /* Mark this device as 'down' */
-                return(-ENODEV);
+                return -ENODEV;
         }
-
-        if ((boardnum >= num_cards) || (boards[boardnum].status == DISABLED)) 
-        {
+        if (boardnum >= num_cards || boards[boardnum].status == DISABLED)  {
                 tty->driver_data = NULL;   /* Mark this device as 'down' */
                 return(-ENODEV);
         }
         
-        if (( bc = ch->brdchan) == 0) 
-        {
+        if ((bc = ch->brdchan) == 0) {
                 tty->driver_data = NULL;
-                return(-ENODEV);
+                return -ENODEV;
         }
 
+        spin_lock_irqsave(&epca_lock, flags);
         /* ------------------------------------------------------------------
                 Every time a channel is opened, increment a counter.  This is 
                 necessary because we do not wish to flush and shutdown the channel
                 until the last app holding the channel open, closes it.         
         --------------------------------------------------------------------- */
-
         ch->count++;
-
         /* ----------------------------------------------------------------
                 Set a kernel structures pointer to our local channel 
                 structure.  This way we can get to it when passed only
                 a tty struct.
         ------------------------------------------------------------------ */
-
         tty->driver_data = ch;
-        
         /* ----------------------------------------------------------------
                 If this is the first time the channel has been opened, initialize
                 the tty->termios struct otherwise let pc_close handle it.
         -------------------------------------------------------------------- */
-
-        save_flags(flags);
-        cli();
-
         globalwinon(ch);
         ch->statusflags = 0;
 
@@ -1213,8 +1047,8 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
            Set receive head and tail ptrs to each other.  This indicates
            no data available to read.
         ----------------------------------------------------------------- */
-        head = bc->rin;
-        bc->rout = head;
+        head = readw(&bc->rin);
+        writew(head, &bc->rout);
 
         /* Set the channels associated tty structure */
         ch->tty = tty;
@@ -1224,122 +1058,74 @@ static int pc_open(struct tty_struct *tty, struct file * filp)
                 issues, etc.... It effect both control flags and input flags.
         -------------------------------------------------------------------- */
         epcaparam(tty,ch);
-
         ch->asyncflags |= ASYNC_INITIALIZED;
         memoff(ch);
-
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
 
         retval = block_til_ready(tty, filp, ch);
         if (retval)
-        {
                 return retval;
-        }
-
         /* -------------------------------------------------------------
                 Set this again in case a hangup set it to zero while this 
                 open() was waiting for the line...
         --------------------------------------------------------------- */
+        spin_lock_irqsave(&epca_lock, flags);
         ch->tty = tty;
-
-        save_flags(flags);
-        cli();
         globalwinon(ch);
-
         /* Enable Digi Data events */
-        bc->idata = 1;
-
+        writeb(1, &bc->idata);
         memoff(ch);
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
         return 0;
-
 } /* End pc_open */
 
-#ifdef MODULE
 static int __init epca_module_init(void)
 { /* Begin init_module */
-
-        unsigned long   flags;
-
-        save_flags(flags);
-        cli();
-
-        pc_init();
-
-        restore_flags(flags);
-
-        return(0);
+        return pc_init();
 }
 
 module_init(epca_module_init);
-#endif
 
-#ifdef ENABLE_PCI
 static struct pci_driver epca_driver;
-#endif
-
-#ifdef MODULE
-/* -------------------- Begin cleanup_module  ---------------------- */
 
 static void __exit epca_module_exit(void)
 {
-
         int               count, crd;
         struct board_info *bd;
         struct channel    *ch;
-        unsigned long     flags;
 
         del_timer_sync(&epca_timer);
 
-        save_flags(flags);
-        cli();
-
         if ((tty_unregister_driver(pc_driver)) ||  
             (tty_unregister_driver(pc_info)))
         {
-                printk(KERN_WARNING "<Error> - DIGI : cleanup_module failed to un-register tty driver\n");
-                restore_flags(flags);
+                printk(KERN_WARNING "epca: cleanup_module failed to un-register tty driver\n");
                 return;
         }
         put_tty_driver(pc_driver);
         put_tty_driver(pc_info);
 
-        for (crd = 0; crd < num_cards; crd++) 
-        { /* Begin for each card */
-
+        for (crd = 0; crd < num_cards; crd++)  { /* Begin for each card */
                 bd = &boards[crd];
-
                 if (!bd)
                 { /* Begin sanity check */
                         printk(KERN_ERR "<Error> - Digi : cleanup_module failed\n");
                         return;
                 } /* End sanity check */
-
-                ch = card_ptr[crd]; 
-
+                ch = card_ptr[crd];
                 for (count = 0; count < bd->numports; count++, ch++) 
                 { /* Begin for each port */
-
-                        if (ch) 
-                        {
+                        if (ch) {
                                 if (ch->tty)
                                         tty_hangup(ch->tty);
                                 kfree(ch->tmp_buf);
                         }
-
                 } /* End for each port */
         } /* End for each card */
-
-#ifdef ENABLE_PCI
         pci_unregister_driver (&epca_driver);
-#endif
-
-        restore_flags(flags);
-
 }
+
 module_exit(epca_module_exit);
-#endif /* MODULE */
 
 static struct tty_operations pc_ops = {
         .open = pc_open,
@@ -1371,34 +1157,15 @@ static struct tty_operations info_ops = {
 
 /* ------------------ Begin pc_init  ---------------------- */
 
-int __init pc_init(void)
+static int __init pc_init(void)
 { /* Begin pc_init */
-
-        /* ----------------------------------------------------------------
-                pc_init is called by the operating system during boot up prior to
-                any open calls being made.  In the older versions of Linux (Prior
-                to 2.0.0) an entry is made into tty_io.c.  A pointer to the last
-                memory location (from kernel space) used (kmem_start) is passed
-                to pc_init.  It is pc_inits responsibility to modify this value 
-                for any memory that the Digi driver might need and then return
-                this value to the operating system.  For example if the driver
-                wishes to allocate 1K of kernel memory, pc_init would return 
-                (kmem_start + 1024).  This memory (Between kmem_start and kmem_start
-                + 1024) would then be available for use exclusively by the driver.  
-                In this case our driver does not allocate any of this kernel 
-                memory.
-        ------------------------------------------------------------------*/
-
-        ulong flags;
         int crd;
         struct board_info *bd;
         unsigned char board_id = 0;
 
-#ifdef ENABLE_PCI
         int pci_boards_found, pci_count;
 
         pci_count = 0;
-#endif /* ENABLE_PCI */
 
         pc_driver = alloc_tty_driver(MAX_ALLOC);
         if (!pc_driver)
@@ -1416,8 +1183,7 @@ int __init pc_init(void)
                 Note : If LILO has ran epca_setup then epca_setup will handle defining
                 num_cards as well as copying the data into the board structure.
         -------------------------------------------------------------------------- */
-        if (!liloconfig)
-        { /* Begin driver has been configured via. epcaconfig */
+        if (!liloconfig) { /* Begin driver has been configured via. epcaconfig */
 
                 nbdevs = NBDEVS;
                 num_cards = NUMCARDS;
@@ -1440,8 +1206,6 @@ int __init pc_init(void)
 
         printk(KERN_INFO "DIGI epca driver version %s loaded.\n",VERSION);
 
-#ifdef ENABLE_PCI
-
         /* ------------------------------------------------------------------
                 NOTE : This code assumes that the number of ports found in 
                        the boards array is correct.  This could be wrong if
@@ -1467,8 +1231,6 @@ int __init pc_init(void)
                 pci_boards_found += init_PCI();
         num_cards += pci_boards_found;
 
-#endif /* ENABLE_PCI */
-
         pc_driver->owner = THIS_MODULE;
         pc_driver->name = "ttyD"; 
         pc_driver->devfs_name = "tts/D";
@@ -1499,9 +1261,6 @@ int __init pc_init(void)
         tty_set_operations(pc_info, &info_ops);
 
 
-        save_flags(flags);
-        cli();
-
         for (crd = 0; crd < num_cards; crd++) 
         { /* Begin for each card */
 
@@ -1610,11 +1369,7 @@ int __init pc_init(void)
                                         if ((board_id & 0x30) == 0x30) 
                                                 bd->memory_seg = 0x8000;
 
-                                } /* End it is an XI card */
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - Board at 0x%x doesn't appear to be an XI\n",(int)bd->port);
-                                }
+                                } else printk(KERN_ERR "epca: Board at 0x%x doesn't appear to be an XI\n",(int)bd->port);
                         break;
 
                 } /* End switch on bd->type */
@@ -1634,9 +1389,6 @@ int __init pc_init(void)
         init_timer(&epca_timer);
         epca_timer.function = epcapoll;
         mod_timer(&epca_timer, jiffies + HZ/25);
-
-        restore_flags(flags);
-
         return 0;
 
 } /* End pc_init */
@@ -1647,10 +1399,10 @@ static void post_fep_init(unsigned int crd)
 { /* Begin post_fep_init */
 
         int i;
-        unchar *memaddr;
-        volatile struct global_data *gd;
+        unsigned char *memaddr;
+        struct global_data *gd;
         struct board_info *bd;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         struct channel *ch; 
         int shrinkmem = 0, lowwater ; 
  
@@ -1669,9 +1421,7 @@ static void post_fep_init(unsigned int crd)
                 after DIGI_INIT has been called will return the proper values. 
         ------------------------------------------------------------------- */
 
-        if (bd->type >= PCIXEM) /* If the board in question is PCI */
-        { /* Begin get PCI number of ports */
-
+        if (bd->type >= PCIXEM) { /* Begin get PCI number of ports */
                 /* --------------------------------------------------------------------
                         Below we use XEMPORTS as a memory offset regardless of which PCI
                         card it is.  This is because all of the supported PCI cards have
@@ -1685,15 +1435,15 @@ static void post_fep_init(unsigned int crd)
                         (FYI - The id should be located at 0x1ac (And may use up to 4 bytes
                         if the box in question is a XEM or CX)).  
                 ------------------------------------------------------------------------ */ 
-
-                bd->numports = (unsigned short)*(unsigned char *)bus_to_virt((unsigned long)
-                                                       (bd->re_map_membase + XEMPORTS));
-
-                
+                /* PCI cards are already remapped at this point ISA are not */
+                bd->numports = readw(bd->re_map_membase + XEMPORTS);
                 epcaassert(bd->numports <= 64,"PCI returned a invalid number of ports");
                 nbdevs += (bd->numports);
-
-        } /* End get PCI number of ports */
+        } else {
+                /* Fix up the mappings for ISA/EISA etc */
+                /* FIXME: 64K - can we be smarter ? */
+                bd->re_map_membase = ioremap(bd->membase, 0x10000);
+        }
 
         if (crd != 0)
                 card_ptr[crd] = card_ptr[crd-1] + boards[crd-1].numports;
@@ -1701,19 +1451,9 @@ static void post_fep_init(unsigned int crd)
                 card_ptr[crd] = &digi_channels[crd]; /* <- For card 0 only */
 
         ch = card_ptr[crd];
-
-
         epcaassert(ch <= &digi_channels[nbdevs - 1], "ch out of range");
 
-        memaddr = (unchar *)bd->re_map_membase;
-
-        /* 
-           The below command is necessary because newer kernels (2.1.x and
-           up) do not have a 1:1 virtual to physical mapping.  The below
-           call adjust for that.
-        */
-
-        memaddr = (unsigned char *)bus_to_virt((unsigned long)memaddr);
+        memaddr = bd->re_map_membase;
 
         /* -----------------------------------------------------------------
                 The below assignment will set bc to point at the BEGINING of
@@ -1721,7 +1461,7 @@ static void post_fep_init(unsigned int crd)
                 8 and 64 of these structures.
         -------------------------------------------------------------------- */
 
-        bc = (volatile struct board_chan *)((ulong)memaddr + CHANSTRUCT);
+        bc = (struct board_chan *)(memaddr + CHANSTRUCT);
 
         /* -------------------------------------------------------------------
                 The below assignment will set gd to point at the BEGINING of
@@ -1730,20 +1470,18 @@ static void post_fep_init(unsigned int crd)
                 pointer begins at 0xd10.
         ---------------------------------------------------------------------- */
 
-        gd = (volatile struct global_data *)((ulong)memaddr + GLOBAL);
+        gd = (struct global_data *)(memaddr + GLOBAL);
 
         /* --------------------------------------------------------------------
                 XEPORTS (address 0xc22) points at the number of channels the
                 card supports. (For 64XE, XI, XEM, and XR use 0xc02)
         ----------------------------------------------------------------------- */
 
-        if (((bd->type == PCXEVE) | (bd->type == PCXE)) &&
-            (*(ushort *)((ulong)memaddr + XEPORTS) < 3))
+        if ((bd->type == PCXEVE || bd->type == PCXE) && (readw(memaddr + XEPORTS) < 3))
                 shrinkmem = 1;
         if (bd->type < PCIXEM)
                 if (!request_region((int)bd->port, 4, board_desc[bd->type]))
                         return;         
-
         memwinon(bd, 0);
 
         /*  --------------------------------------------------------------------
@@ -1753,17 +1491,16 @@ static void post_fep_init(unsigned int crd)
 
         /* For every port on the card do ..... */
 
-        for (i = 0; i < bd->numports; i++, ch++, bc++) 
-        { /* Begin for each port */
+        for (i = 0; i < bd->numports; i++, ch++, bc++)  { /* Begin for each port */
+                unsigned long flags;
 
                 ch->brdchan        = bc;
                 ch->mailbox        = gd; 
                 INIT_WORK(&ch->tqueue, do_softint, ch);
                 ch->board          = &boards[crd];
 
-                switch (bd->type)
-                { /* Begin switch bd->type */
-
+                spin_lock_irqsave(&epca_lock, flags);
+                switch (bd->type) {
                         /* ----------------------------------------------------------------
                                 Since some of the boards use different bitmaps for their
                                 control signals we cannot hard code these values and retain
@@ -1796,14 +1533,12 @@ static void post_fep_init(unsigned int crd)
         
                 } /* End switch bd->type */
 
-                if (boards[crd].altpin) 
-                {
+                if (boards[crd].altpin) {
                         ch->dsr = ch->m_dcd;
                         ch->dcd = ch->m_dsr;
                         ch->digiext.digi_flags |= DIGI_ALTPIN;
                 }
-                else 
-                { 
+                else {
                         ch->dcd = ch->m_dcd;
                         ch->dsr = ch->m_dsr;
                 }
@@ -1813,14 +1548,12 @@ static void post_fep_init(unsigned int crd)
                 ch->magic      = EPCA_MAGIC;
                 ch->tty        = NULL;
 
-                if (shrinkmem) 
-                {
+                if (shrinkmem) {
                         fepcmd(ch, SETBUFFER, 32, 0, 0, 0);
                         shrinkmem = 0;
                 }
 
-                switch (bd->type)
-                { /* Begin switch bd->type */
+                switch (bd->type) {
 
                         case PCIXEM:
                         case PCIXRJ:
@@ -1878,13 +1611,13 @@ static void post_fep_init(unsigned int crd)
 
                 fepcmd(ch, SRXHWATER, (3 * ch->rxbufsize / 4), 0, 10, 0);
 
-                bc->edelay = 100;
-                bc->idata = 1;
+                writew(100, &bc->edelay);
+                writeb(1, &bc->idata);
         
-                ch->startc  = bc->startc;
-                ch->stopc   = bc->stopc;
-                ch->startca = bc->startca;
-                ch->stopca  = bc->stopca;
+                ch->startc  = readb(&bc->startc);
+                ch->stopc   = readb(&bc->stopc);
+                ch->startca = readb(&bc->startca);
+                ch->stopca  = readb(&bc->stopca);
         
                 ch->fepcflag = 0;
                 ch->fepiflag = 0;
@@ -1899,27 +1632,23 @@ static void post_fep_init(unsigned int crd)
                 ch->blocked_open = 0;
                 init_waitqueue_head(&ch->open_wait);
                 init_waitqueue_head(&ch->close_wait);
+
+                spin_unlock_irqrestore(&epca_lock, flags);
+
                 ch->tmp_buf = kmalloc(ch->txbufsize,GFP_KERNEL);
-                if (!(ch->tmp_buf))
-                {
+                if (!ch->tmp_buf) {
                         printk(KERN_ERR "POST FEP INIT : kmalloc failed for port 0x%x\n",i);
                         release_region((int)bd->port, 4);
                         while(i-- > 0)
                                 kfree((ch--)->tmp_buf);
                         return;
-                }
-                else 
+                } else
                         memset((void *)ch->tmp_buf,0,ch->txbufsize);
         } /* End for each port */
 
         printk(KERN_INFO 
                 "Digi PC/Xx Driver V%s:  %s I/O = 0x%lx Mem = 0x%lx Ports = %d\n", 
                 VERSION, board_desc[bd->type], (long)bd->port, (long)bd->membase, bd->numports);
-        sprintf(mesg, 
-                "Digi PC/Xx Driver V%s:  %s I/O = 0x%lx Mem = 0x%lx Ports = %d\n", 
-                VERSION, board_desc[bd->type], (long)bd->port, (long)bd->membase, bd->numports);
-        console_print(mesg);
-
         memwinoff(bd, 0);
 
 } /* End post_fep_init */
@@ -1943,9 +1672,6 @@ static void epcapoll(unsigned long ignored)
                 buffer empty) and acts on those events.
         ----------------------------------------------------------------------- */
         
-        save_flags(flags);
-        cli();
-
         for (crd = 0; crd < num_cards; crd++) 
         { /* Begin for each card */
 
@@ -1961,6 +1687,8 @@ static void epcapoll(unsigned long ignored)
                         some legacy boards.
                 ---------------------------------------------------------------- */
 
+                spin_lock_irqsave(&epca_lock, flags);
+
                 assertmemoff(ch);
 
                 globalwinon(ch);
@@ -1970,21 +1698,19 @@ static void epcapoll(unsigned long ignored)
                         the transmit or receive queue.
                 ------------------------------------------------------------------- */
 
-                head = ch->mailbox->ein;
-                tail = ch->mailbox->eout;
+                head = readw(&ch->mailbox->ein);
+                tail = readw(&ch->mailbox->eout);
                 
                 /* If head isn't equal to tail we have an event */
 
                 if (head != tail)
                         doevent(crd);
-
                 memoff(ch);
 
-        } /* End for each card */
+                spin_unlock_irqrestore(&epca_lock, flags);
 
+        } /* End for each card */
         mod_timer(&epca_timer, jiffies + (HZ / 25));
-
-        restore_flags(flags);
 } /* End epcapoll */
 
 /* --------------------- Begin doevent  ------------------------ */
@@ -1992,53 +1718,42 @@ static void epcapoll(unsigned long ignored)
 static void doevent(int crd)
 { /* Begin doevent */
 
-        volatile unchar *eventbuf;
+        void *eventbuf;
         struct channel *ch, *chan0;
         static struct tty_struct *tty;
-        volatile struct board_info *bd;
-        volatile struct board_chan *bc;
-        register volatile unsigned int tail, head;
-        register int event, channel;
-        register int mstat, lstat;
+        struct board_info *bd;
+        struct board_chan *bc;
+        unsigned int tail, head;
+        int event, channel;
+        int mstat, lstat;
 
         /* -------------------------------------------------------------------
                 This subroutine is called by epcapoll when an event is detected 
                 in the event queue.  This routine responds to those events.
         --------------------------------------------------------------------- */
-
         bd = &boards[crd];
 
         chan0 = card_ptr[crd];
         epcaassert(chan0 <= &digi_channels[nbdevs - 1], "ch out of range");
-
         assertgwinon(chan0);
-
-        while ((tail = chan0->mailbox->eout) != (head = chan0->mailbox->ein)) 
+        while ((tail = readw(&chan0->mailbox->eout)) != (head = readw(&chan0->mailbox->ein)))
         { /* Begin while something in event queue */
-
                 assertgwinon(chan0);
-
-                eventbuf = (volatile unchar *)bus_to_virt((ulong)(bd->re_map_membase + tail + ISTART));
-
+                eventbuf = bd->re_map_membase + tail + ISTART;
                 /* Get the channel the event occurred on */
-                channel = eventbuf[0];
-
+                channel = readb(eventbuf);
                 /* Get the actual event code that occurred */
-                event = eventbuf[1];
-
+                event = readb(eventbuf + 1);
                 /*  ----------------------------------------------------------------
                         The two assignments below get the current modem status (mstat)
                         and the previous modem status (lstat).  These are useful becuase
                         an event could signal a change in modem signals itself.
                 ------------------------------------------------------------------- */
-
-                mstat = eventbuf[2];
-                lstat = eventbuf[3];
+                mstat = readb(eventbuf + 2);
+                lstat = readb(eventbuf + 3);
 
                 ch = chan0 + channel;
-
-                if ((unsigned)channel >= bd->numports || !ch) 
-                { 
+                if ((unsigned)channel >= bd->numports || !ch)  {
                         if (channel >= bd->numports)
                                 ch = chan0;
                         bc = ch->brdchan;
@@ -2048,97 +1763,53 @@ static void doevent(int crd)
                 if ((bc = ch->brdchan) == NULL)
                         goto next;
 
-                if (event & DATA_IND) 
-                { /* Begin DATA_IND */
-
+                if (event & DATA_IND)  { /* Begin DATA_IND */
                         receive_data(ch);
                         assertgwinon(ch);
-
                 } /* End DATA_IND */
                 /* else *//* Fix for DCD transition missed bug */
-                if (event & MODEMCHG_IND) 
-                { /* Begin MODEMCHG_IND */
-
+                if (event & MODEMCHG_IND)  { /* Begin MODEMCHG_IND */
                         /* A modem signal change has been indicated */
-
                         ch->imodem = mstat;
-
-                        if (ch->asyncflags & ASYNC_CHECK_CD) 
-                        {
+                        if (ch->asyncflags & ASYNC_CHECK_CD)  {
                                 if (mstat & ch->dcd)  /* We are now receiving dcd */
                                         wake_up_interruptible(&ch->open_wait);
                                 else
                                         pc_sched_event(ch, EPCA_EVENT_HANGUP); /* No dcd; hangup */
                         }
-
                 } /* End MODEMCHG_IND */
-
                 tty = ch->tty;
-                if (tty) 
-                { /* Begin if valid tty */
-
-                        if (event & BREAK_IND) 
-                        { /* Begin if BREAK_IND */
-
+                if (tty)  { /* Begin if valid tty */
+                        if (event & BREAK_IND)  { /* Begin if BREAK_IND */
                                 /* A break has been indicated */
-
                                 tty->flip.count++;
                                 *tty->flip.flag_buf_ptr++ = TTY_BREAK;
-
                                 *tty->flip.char_buf_ptr++ = 0;
-
                                 tty_schedule_flip(tty); 
-
-                        } /* End if BREAK_IND */
-                        else
-                        if (event & LOWTX_IND) 
-                        { /* Begin LOWTX_IND */
-
+                        } else if (event & LOWTX_IND)  { /* Begin LOWTX_IND */
                                 if (ch->statusflags & LOWWAIT) 
                                 { /* Begin if LOWWAIT */
-
                                         ch->statusflags &= ~LOWWAIT;
                                         tty_wakeup(tty);
                                         wake_up_interruptible(&tty->write_wait);
-
                                 } /* End if LOWWAIT */
-
-                        } /* End LOWTX_IND */
-                        else
-                        if (event & EMPTYTX_IND) 
-                        { /* Begin EMPTYTX_IND */
-
+                        } else if (event & EMPTYTX_IND)  { /* Begin EMPTYTX_IND */
                                 /* This event is generated by setup_empty_event */
-
                                 ch->statusflags &= ~TXBUSY;
-                                if (ch->statusflags & EMPTYWAIT) 
-                                { /* Begin if EMPTYWAIT */
-
+                                if (ch->statusflags & EMPTYWAIT)  { /* Begin if EMPTYWAIT */
                                         ch->statusflags &= ~EMPTYWAIT;
                                         tty_wakeup(tty);
-
                                         wake_up_interruptible(&tty->write_wait);
-
                                 } /* End if EMPTYWAIT */
-
                         } /* End EMPTYTX_IND */
-
                 } /* End if valid tty */
-
-
         next:
                 globalwinon(ch);
-
-                if (!bc)
-                        printk(KERN_ERR "<Error> - bc == NULL in doevent!\n");
-                else 
-                        bc->idata = 1;
-
-                chan0->mailbox->eout = (tail + 4) & (IMAX - ISTART - 4);
+                BUG_ON(!bc);
+                writew(1, &bc->idata);
+                writew((tail + 4) & (IMAX - ISTART - 4), &chan0->mailbox->eout);
                 globalwinon(chan0);
-
         } /* End while something in event queue */
-
 } /* End doevent */
 
 /* --------------------- Begin fepcmd  ------------------------ */
@@ -2146,7 +1817,6 @@ static void doevent(int crd)
 static void fepcmd(struct channel *ch, int cmd, int word_or_byte,
                    int byte2, int ncmds, int bytecmd)
 { /* Begin fepcmd */
-
         unchar *memaddr;
         unsigned int head, cmdTail, cmdStart, cmdMax;
         long count;
@@ -2155,93 +1825,57 @@ static void fepcmd(struct channel *ch, int cmd, int word_or_byte,
         /* This is the routine in which commands may be passed to the card. */
 
         if (ch->board->status == DISABLED)
-        {
                 return;
-        }
-
         assertgwinon(ch);
-
         /* Remember head (As well as max) is just an offset not a base addr */
-        head = ch->mailbox->cin;
-
+        head = readw(&ch->mailbox->cin);
         /* cmdStart is a base address */
-        cmdStart = ch->mailbox->cstart;
-
+        cmdStart = readw(&ch->mailbox->cstart);
         /* ------------------------------------------------------------------
                 We do the addition below because we do not want a max pointer 
                 relative to cmdStart.  We want a max pointer that points at the 
                 physical end of the command queue.
         -------------------------------------------------------------------- */
-
-        cmdMax = (cmdStart + 4 + (ch->mailbox->cmax));
-
+        cmdMax = (cmdStart + 4 + readw(&ch->mailbox->cmax));
         memaddr = ch->board->re_map_membase;
 
-        /* 
-           The below command is necessary because newer kernels (2.1.x and
-           up) do not have a 1:1 virtual to physical mapping.  The below
-           call adjust for that.
-        */
-
-        memaddr = (unsigned char *)bus_to_virt((unsigned long)memaddr);
-
-        if (head >= (cmdMax - cmdStart) || (head & 03)) 
-        {
-                printk(KERN_ERR "line %d: Out of range, cmd = %x, head = %x\n", __LINE__, 
-              cmd, head);
-                printk(KERN_ERR "line %d: Out of range, cmdMax = %x, cmdStart = %x\n", __LINE__, 
-              cmdMax, cmdStart);
+        if (head >= (cmdMax - cmdStart) || (head & 03))  {
+                printk(KERN_ERR "line %d: Out of range, cmd = %x, head = %x\n", __LINE__,  cmd, head);
+                printk(KERN_ERR "line %d: Out of range, cmdMax = %x, cmdStart = %x\n", __LINE__,  cmdMax, cmdStart);
                 return;
         }
-
-        if (bytecmd) 
-        {
-                *(volatile unchar *)(memaddr + head + cmdStart + 0) = (unchar)cmd;
-
-                *(volatile unchar *)(memaddr + head + cmdStart + 1) = (unchar)ch->channelnum;
+        if (bytecmd)  {
+                writeb(cmd, memaddr + head + cmdStart + 0);
+                writeb(ch->channelnum,  memaddr + head + cmdStart + 1);
                 /* Below word_or_byte is bits to set */
-                *(volatile unchar *)(memaddr + head + cmdStart + 2) = (unchar)word_or_byte;
+                writeb(word_or_byte,  memaddr + head + cmdStart + 2);
                 /* Below byte2 is bits to reset */
-                *(volatile unchar *)(memaddr + head + cmdStart + 3) = (unchar)byte2;
-
-        } 
-        else 
-        {
-                *(volatile unchar *)(memaddr + head + cmdStart + 0) = (unchar)cmd;
-                *(volatile unchar *)(memaddr + head + cmdStart + 1) = (unchar)ch->channelnum;
-                *(volatile ushort*)(memaddr + head + cmdStart + 2) = (ushort)word_or_byte;
+                writeb(byte2, memaddr + head + cmdStart + 3);
+        }  else {
+                writeb(cmd, memaddr + head + cmdStart + 0);
+                writeb(ch->channelnum,  memaddr + head + cmdStart + 1);
+                writeb(word_or_byte,  memaddr + head + cmdStart + 2);
         }
-
         head = (head + 4) & (cmdMax - cmdStart - 4);
-        ch->mailbox->cin = head;
-
+        writew(head, &ch->mailbox->cin);
         count = FEPTIMEOUT;
 
-        for (;;) 
-        { /* Begin forever loop */
-
+        for (;;)  { /* Begin forever loop */
                 count--;
-                if (count == 0) 
-                {
+                if (count == 0)  {
                         printk(KERN_ERR "<Error> - Fep not responding in fepcmd()\n");
                         return;
                 }
-
-                head = ch->mailbox->cin;
-                cmdTail = ch->mailbox->cout;
-
+                head = readw(&ch->mailbox->cin);
+                cmdTail = readw(&ch->mailbox->cout);
                 n = (head - cmdTail) & (cmdMax - cmdStart - 4);
-
                 /* ----------------------------------------------------------
                         Basically this will break when the FEP acknowledges the 
                         command by incrementing cmdTail (Making it equal to head).
                 ------------------------------------------------------------- */
-
                 if (n <= ncmds * (sizeof(short) * 4))
                         break; /* Well nearly forever :-) */
-
         } /* End forever loop */
-
 } /* End fepcmd */
 
 /* ---------------------------------------------------------------------
@@ -2255,11 +1889,9 @@ static void fepcmd(struct channel *ch, int cmd, int word_or_byte,
 
 static unsigned termios2digi_h(struct channel *ch, unsigned cflag)
 { /* Begin termios2digi_h */
-
         unsigned res = 0;
 
-        if (cflag & CRTSCTS) 
-        {
+        if (cflag & CRTSCTS) {
                 ch->digiext.digi_flags |= (RTSPACE | CTSPACE);
                 res |= ((ch->m_cts) | (ch->m_rts));
         }
@@ -2295,7 +1927,6 @@ static unsigned termios2digi_i(struct channel *ch, unsigned iflag)
 
         unsigned res = iflag & (IGNBRK | BRKINT | IGNPAR | PARMRK | 
                                 INPCK | ISTRIP|IXON|IXANY|IXOFF);
-        
         if (ch->digiext.digi_flags & DIGI_AIXON)
                 res |= IAIXON;
         return res;
@@ -2308,28 +1939,15 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
 { /* Begin termios2digi_c */
 
         unsigned res = 0;
-
-#ifdef SPEED_HACK
-        /* CL: HACK to force 115200 at 38400 and 57600 at 19200 Baud */
-        if ((cflag & CBAUD)== B38400) cflag=cflag - B38400 + B115200;
-        if ((cflag & CBAUD)== B19200) cflag=cflag - B19200 + B57600;
-#endif /* SPEED_HACK */
-
-        if (cflag & CBAUDEX)
-        { /* Begin detected CBAUDEX */
-
+        if (cflag & CBAUDEX) { /* Begin detected CBAUDEX */
                 ch->digiext.digi_flags |= DIGI_FAST;
-
                 /* -------------------------------------------------------------
                    HUPCL bit is used by FEP to indicate fast baud
                    table is to be used.
                 ----------------------------------------------------------------- */
-
                 res |= FEP_HUPCL;
-
         } /* End detected CBAUDEX */
         else ch->digiext.digi_flags &= ~DIGI_FAST; 
-
         /* -------------------------------------------------------------------
                 CBAUD has bit position 0x1000 set these days to indicate Linux
                 baud rate remap.  Digi hardware can't handle the bit assignment.
@@ -2337,7 +1955,6 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
                 bit out.
         ---------------------------------------------------------------------- */
         res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE);
-
         /* -------------------------------------------------------------
                 This gets a little confusing.  The Digi cards have their own
                 representation of c_cflags controling baud rate.  For the most
@@ -2357,10 +1974,8 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
                 should be checked for a screened out prior to termios2digi_c 
                 returning.  Since CLOCAL isn't used by the board this can be
                 ignored as long as the returned value is used only by Digi hardware. 
-        ----------------------------------------------------------------- */
-
-        if (cflag & CBAUDEX)
-        {
+                ----------------------------------------------------------------- */
+        if (cflag & CBAUDEX) {
                 /* -------------------------------------------------------------
                         The below code is trying to guarantee that only baud rates
                         115200 and 230400 are remapped.  We use exclusive or because
@@ -2371,138 +1986,96 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
                                 
                 if ((!((cflag & 0x7) ^ (B115200 & ~CBAUDEX))) || 
                     (!((cflag & 0x7) ^ (B230400 & ~CBAUDEX))))
-                {
                         res += 1;
-                }
         }
-
         return res;
 
 } /* End termios2digi_c */
 
 /* --------------------- Begin epcaparam  ----------------------- */
 
+/* Caller must hold the locks */
 static void epcaparam(struct tty_struct *tty, struct channel *ch)
 { /* Begin epcaparam */
 
         unsigned int cmdHead;
         struct termios *ts;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         unsigned mval, hflow, cflag, iflag;
 
         bc = ch->brdchan;
         epcaassert(bc !=0, "bc out of range");
 
         assertgwinon(ch);
-
         ts = tty->termios;
-
-        if ((ts->c_cflag & CBAUD) == 0) 
-        { /* Begin CBAUD detected */
-
-                cmdHead = bc->rin;
+        if ((ts->c_cflag & CBAUD) == 0)  { /* Begin CBAUD detected */
+                cmdHead = readw(&bc->rin);
                 bc->rout = cmdHead;
-                cmdHead = bc->tin;
-
+                cmdHead = readw(&bc->tin);
                 /* Changing baud in mid-stream transmission can be wonderful */
                 /* ---------------------------------------------------------------
                         Flush current transmit buffer by setting cmdTail pointer (tout)
                         to cmdHead pointer (tin).  Hopefully the transmit buffer is empty.
                 ----------------------------------------------------------------- */
-
                 fepcmd(ch, STOUT, (unsigned) cmdHead, 0, 0, 0);
                 mval = 0;
-
-        } /* End CBAUD detected */
-        else 
-        { /* Begin CBAUD not detected */
-
+        } else  { /* Begin CBAUD not detected */
                 /* -------------------------------------------------------------------
                         c_cflags have changed but that change had nothing to do with BAUD.
                         Propagate the change to the card.
                 ---------------------------------------------------------------------- */ 
-
                 cflag = termios2digi_c(ch, ts->c_cflag);
-
-                if (cflag != ch->fepcflag) 
-                {
+                if (cflag != ch->fepcflag)  {
                         ch->fepcflag = cflag;
                         /* Set baud rate, char size, stop bits, parity */
                         fepcmd(ch, SETCTRLFLAGS, (unsigned) cflag, 0, 0, 0);
                 }
-
-
                 /* ----------------------------------------------------------------
                         If the user has not forced CLOCAL and if the device is not a 
                         CALLOUT device (Which is always CLOCAL) we set flags such that
                         the driver will wait on carrier detect.
                 ------------------------------------------------------------------- */
-
                 if (ts->c_cflag & CLOCAL)
-                { /* Begin it is a cud device or a ttyD device with CLOCAL on */
                         ch->asyncflags &= ~ASYNC_CHECK_CD;
-                } /* End it is a cud device or a ttyD device with CLOCAL on */
                 else
-                { /* Begin it is a ttyD device */
                         ch->asyncflags |= ASYNC_CHECK_CD;
-                } /* End it is a ttyD device */
-
                 mval = ch->m_dtr | ch->m_rts;
-
         } /* End CBAUD not detected */
-
         iflag = termios2digi_i(ch, ts->c_iflag);
-
         /* Check input mode flags */
-
-        if (iflag != ch->fepiflag) 
-        {
+        if (iflag != ch->fepiflag)  {
                 ch->fepiflag = iflag;
-
                 /* ---------------------------------------------------------------
                         Command sets channels iflag structure on the board. Such things 
                         as input soft flow control, handling of parity errors, and
                         break handling are all set here.
                 ------------------------------------------------------------------- */
-
                 /* break handling, parity handling, input stripping, flow control chars */
                 fepcmd(ch, SETIFLAGS, (unsigned int) ch->fepiflag, 0, 0, 0);
         }
-
         /* ---------------------------------------------------------------
                 Set the board mint value for this channel.  This will cause hardware
                 events to be generated each time the DCD signal (Described in mint) 
                 changes.        
         ------------------------------------------------------------------- */
-        bc->mint = ch->dcd;
-
+        writeb(ch->dcd, &bc->mint);
         if ((ts->c_cflag & CLOCAL) || (ch->digiext.digi_flags & DIGI_FORCEDCD))
                 if (ch->digiext.digi_flags & DIGI_FORCEDCD)
-                        bc->mint = 0;
-
-        ch->imodem = bc->mstat;
-
+                        writeb(0, &bc->mint);
+        ch->imodem = readb(&bc->mstat);
         hflow = termios2digi_h(ch, ts->c_cflag);
-
-        if (hflow != ch->hflow) 
-        {
+        if (hflow != ch->hflow)  {
                 ch->hflow = hflow;
-
                 /* --------------------------------------------------------------
                         Hard flow control has been selected but the board is not
                         using it.  Activate hard flow control now.
                 ----------------------------------------------------------------- */
-
                 fepcmd(ch, SETHFLOW, hflow, 0xff, 0, 1);
         }
-        
-
         mval ^= ch->modemfake & (mval ^ ch->modem);
 
-        if (ch->omodem ^ mval) 
-        {
+        if (ch->omodem ^ mval)  {
                 ch->omodem = mval;
-
                 /* --------------------------------------------------------------
                         The below command sets the DTR and RTS mstat structure.  If
                         hard flow control is NOT active these changes will drive the
@@ -2514,87 +2087,65 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch)
                 /* First reset DTR & RTS; then set them */
                 fepcmd(ch, SETMODEM, 0, ((ch->m_dtr)|(ch->m_rts)), 0, 1);
                 fepcmd(ch, SETMODEM, mval, 0, 0, 1);
-
         }
-
-        if (ch->startc != ch->fepstartc || ch->stopc != ch->fepstopc) 
-        {
+        if (ch->startc != ch->fepstartc || ch->stopc != ch->fepstopc)  {
                 ch->fepstartc = ch->startc;
                 ch->fepstopc = ch->stopc;
-
                 /* ------------------------------------------------------------
                         The XON / XOFF characters have changed; propagate these
                         changes to the card.    
                 --------------------------------------------------------------- */
-
                 fepcmd(ch, SONOFFC, ch->fepstartc, ch->fepstopc, 0, 1);
         }
-
-        if (ch->startca != ch->fepstartca || ch->stopca != ch->fepstopca) 
-        {
+        if (ch->startca != ch->fepstartca || ch->stopca != ch->fepstopca)  {
                 ch->fepstartca = ch->startca;
                 ch->fepstopca = ch->stopca;
-
                 /* ---------------------------------------------------------------
                         Similar to the above, this time the auxilarly XON / XOFF 
                         characters have changed; propagate these changes to the card.
                 ------------------------------------------------------------------ */
-
                 fepcmd(ch, SAUXONOFFC, ch->fepstartca, ch->fepstopca, 0, 1);
         }
-
 } /* End epcaparam */
 
 /* --------------------- Begin receive_data  ----------------------- */
-
+/* Caller holds lock */
 static void receive_data(struct channel *ch)
 { /* Begin receive_data */
 
         unchar *rptr;
         struct termios *ts = NULL;
         struct tty_struct *tty;
-        volatile struct board_chan *bc;
-        register int dataToRead, wrapgap, bytesAvailable;
-        register unsigned int tail, head;
+        struct board_chan *bc;
+        int dataToRead, wrapgap, bytesAvailable;
+        unsigned int tail, head;
         unsigned int wrapmask;
         int rc;
 
-
         /* ---------------------------------------------------------------
                 This routine is called by doint when a receive data event 
                 has taken place.
         ------------------------------------------------------------------- */
 
         globalwinon(ch);
-
         if (ch->statusflags & RXSTOPPED)
                 return;
-
         tty = ch->tty;
         if (tty)
                 ts = tty->termios;
-
         bc = ch->brdchan;
-
-        if (!bc) 
-        {
-                printk(KERN_ERR "<Error> - bc is NULL in receive_data!\n");
-                return;
-        }
-
+        BUG_ON(!bc);
         wrapmask = ch->rxbufsize - 1;
 
         /* --------------------------------------------------------------------- 
                 Get the head and tail pointers to the receiver queue.  Wrap the 
                 head pointer if it has reached the end of the buffer.
         ------------------------------------------------------------------------ */
-
-        head = bc->rin;
+        head = readw(&bc->rin);
         head &= wrapmask;
-        tail = bc->rout & wrapmask;
+        tail = readw(&bc->rout) & wrapmask;
 
         bytesAvailable = (head - tail) & wrapmask;
-
         if (bytesAvailable == 0)
                 return;
 
@@ -2602,8 +2153,7 @@ static void receive_data(struct channel *ch)
            If CREAD bit is off or device not open, set TX tail to head
         --------------------------------------------------------------------- */
 
-        if (!tty || !ts || !(ts->c_cflag & CREAD)) 
-        {
+        if (!tty || !ts || !(ts->c_cflag & CREAD))  {
                 bc->rout = head;
                 return;
         }
@@ -2611,64 +2161,45 @@ static void receive_data(struct channel *ch)
         if (tty->flip.count == TTY_FLIPBUF_SIZE) 
                 return;
 
-        if (bc->orun) 
-        {
-                bc->orun = 0;
-                printk(KERN_WARNING "overrun! DigiBoard device %s\n",tty->name);
+        if (readb(&bc->orun)) {
+                writeb(0, &bc->orun);
+                printk(KERN_WARNING "epca; overrun! DigiBoard device %s\n",tty->name);
         }
-
         rxwinon(ch);
         rptr = tty->flip.char_buf_ptr;
         rc = tty->flip.count;
-
-        while (bytesAvailable > 0) 
-        { /* Begin while there is data on the card */
-
+        while (bytesAvailable > 0)  { /* Begin while there is data on the card */
                 wrapgap = (head >= tail) ? head - tail : ch->rxbufsize - tail;
-
                 /* ---------------------------------------------------------------
                         Even if head has wrapped around only report the amount of
                         data to be equal to the size - tail.  Remember memcpy can't
                         automaticly wrap around the receive buffer.
                 ----------------------------------------------------------------- */
-
                 dataToRead = (wrapgap < bytesAvailable) ? wrapgap : bytesAvailable;
-
                 /* --------------------------------------------------------------
                    Make sure we don't overflow the buffer
                 ----------------------------------------------------------------- */
-
                 if ((rc + dataToRead) > TTY_FLIPBUF_SIZE)
                         dataToRead = TTY_FLIPBUF_SIZE - rc;
-
                 if (dataToRead == 0)
                         break;
-
                 /* ---------------------------------------------------------------
                         Move data read from our card into the line disciplines buffer
                         for translation if necessary.
                 ------------------------------------------------------------------ */
-
-                if ((memcpy(rptr, ch->rxptr + tail, dataToRead)) != rptr)
-                        printk(KERN_ERR "<Error> - receive_data : memcpy failed\n");
-                        
+                memcpy_fromio(rptr, ch->rxptr + tail, dataToRead);
                 rc   += dataToRead;
                 rptr += dataToRead;
                 tail = (tail + dataToRead) & wrapmask;
                 bytesAvailable -= dataToRead;
-
         } /* End while there is data on the card */
-
-
         tty->flip.count = rc;
         tty->flip.char_buf_ptr = rptr;
         globalwinon(ch);
-        bc->rout = tail;
-
+        writew(tail, &bc->rout);
         /* Must be called with global data */
         tty_schedule_flip(ch->tty); 
         return;
-
 } /* End receive_data */
 
 static int info_ioctl(struct tty_struct *tty, struct file * file,
@@ -2676,17 +2207,15 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
 {
         switch (cmd) 
         { /* Begin switch cmd */
-
                 case DIGI_GETINFO:
                 { /* Begin case DIGI_GETINFO */
-
                         struct digi_info di ;
                         int brd;
 
-                        getUser(brd, (unsigned int __user *)arg);
-
-                        if ((brd < 0) || (brd >= num_cards) || (num_cards == 0))
-                                return (-ENODEV);
+                        if(get_user(brd, (unsigned int __user *)arg))
+                                return -EFAULT;
+                        if (brd < 0 || brd >= num_cards || num_cards == 0)
+                                return -ENODEV;
 
                         memset(&di, 0, sizeof(di));
 
@@ -2694,8 +2223,9 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
                         di.status = boards[brd].status;
                         di.type = boards[brd].type ;
                         di.numports = boards[brd].numports ;
-                        di.port = boards[brd].port ;
-                        di.membase = boards[brd].membase ;
+                        /* Legacy fixups - just move along nothing to see */
+                        di.port = (unsigned char *)boards[brd].port ;
+                        di.membase = (unsigned char *)boards[brd].membase ;
 
                         if (copy_to_user((void __user *)arg, &di, sizeof (di)))
                                 return -EFAULT;
@@ -2709,39 +2239,29 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
                         int brd = arg & 0xff000000 >> 16 ; 
                         unsigned char state = arg & 0xff ; 
 
-                        if ((brd < 0) || (brd >= num_cards))
-                        {
-                                printk(KERN_ERR "<Error> - DIGI POLLER : brd not valid!\n");
+                        if (brd < 0 || brd >= num_cards) {
+                                printk(KERN_ERR "epca: DIGI POLLER : brd not valid!\n");
                                 return (-ENODEV);
                         }
-
                         digi_poller_inhibited = state ;
                         break ; 
-
                 } /* End case DIGI_POLLER */
 
                 case DIGI_INIT:
                 { /* Begin case DIGI_INIT */
-
                         /* ------------------------------------------------------------
                                 This call is made by the apps to complete the initilization
                                 of the board(s).  This routine is responsible for setting
                                 the card to its initial state and setting the drivers control
                                 fields to the sutianle settings for the card in question.
                         ---------------------------------------------------------------- */
-                
                         int crd ; 
                         for (crd = 0; crd < num_cards; crd++) 
                                 post_fep_init (crd);
-
                         break ; 
-
                 } /* End case DIGI_INIT */
-
-
                 default:
-                        return -ENOIOCTLCMD;
-
+                        return -ENOTTY;
         } /* End switch cmd */
         return (0) ;
 }
@@ -2750,43 +2270,33 @@ static int info_ioctl(struct tty_struct *tty, struct file * file,
 static int pc_tiocmget(struct tty_struct *tty, struct file *file)
 {
         struct channel *ch = (struct channel *) tty->driver_data;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         unsigned int mstat, mflag = 0;
         unsigned long flags;
 
         if (ch)
                 bc = ch->brdchan;
         else
-        {
-                printk(KERN_ERR "<Error> - ch is NULL in pc_tiocmget!\n");
-                return(-EINVAL);
-        }
+                return -EINVAL;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
-        mstat = bc->mstat;
+        mstat = readb(&bc->mstat);
         memoff(ch);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
 
         if (mstat & ch->m_dtr)
                 mflag |= TIOCM_DTR;
-
         if (mstat & ch->m_rts)
                 mflag |= TIOCM_RTS;
-
         if (mstat & ch->m_cts)
                 mflag |= TIOCM_CTS;
-
         if (mstat & ch->dsr)
                 mflag |= TIOCM_DSR;
-
         if (mstat & ch->m_ri)
                 mflag |= TIOCM_RI;
-
         if (mstat & ch->dcd)
                 mflag |= TIOCM_CD;
-
         return mflag;
 }
 
@@ -2796,13 +2306,10 @@ static int pc_tiocmset(struct tty_struct *tty, struct file *file,
         struct channel *ch = (struct channel *) tty->driver_data;
         unsigned long flags;
 
-        if (!ch) {
-                printk(KERN_ERR "<Error> - ch is NULL in pc_tiocmset!\n");
-                return(-EINVAL);
-        }
+        if (!ch)
+                return -EINVAL;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         /*
          * I think this modemfake stuff is broken.  It doesn't
          * correctly reflect the behaviour desired by the TIOCM*
@@ -2824,17 +2331,14 @@ static int pc_tiocmset(struct tty_struct *tty, struct file *file,
                 ch->modemfake |= ch->m_dtr;
                 ch->modem &= ~ch->m_dtr;
         }
-
         globalwinon(ch);
-
         /*  --------------------------------------------------------------
                 The below routine generally sets up parity, baud, flow control
                 issues, etc.... It effect both control flags and input flags.
         ------------------------------------------------------------------ */
-
         epcaparam(tty,ch);
         memoff(ch);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&epca_lock, flags);
         return 0;
 }
 
@@ -2847,19 +2351,14 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
         unsigned long flags;
         unsigned int mflag, mstat;
         unsigned char startc, stopc;
-        volatile struct board_chan *bc;
+        struct board_chan *bc;
         struct channel *ch = (struct channel *) tty->driver_data;
         void __user *argp = (void __user *)arg;
         
         if (ch)
                 bc = ch->brdchan;
         else 
-        {
-                printk(KERN_ERR "<Error> - ch is NULL in pc_ioctl!\n");
-                return(-EINVAL);
-        }
-
-        save_flags(flags);
+                return -EINVAL;
 
         /* -------------------------------------------------------------------
                 For POSIX compliance we need to add more ioctls.  See tty_ioctl.c
@@ -2871,46 +2370,39 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
         { /* Begin switch cmd */
 
                 case TCGETS:
-                        if (copy_to_user(argp, 
-                                         tty->termios, sizeof(struct termios)))
+                        if (copy_to_user(argp, tty->termios, sizeof(struct termios)))
                                 return -EFAULT;
-                        return(0);
-
+                        return 0;
                 case TCGETA:
                         return get_termio(tty, argp);
-
                 case TCSBRK:    /* SVID version: non-zero arg --> no break */
-
                         retval = tty_check_change(tty);
                         if (retval)
                                 return retval;
-
                         /* Setup an event to indicate when the transmit buffer empties */
-
+                        spin_lock_irqsave(&epca_lock, flags);
                         setup_empty_event(tty,ch);              
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         tty_wait_until_sent(tty, 0);
                         if (!arg)
                                 digi_send_break(ch, HZ/4);    /* 1/4 second */
                         return 0;
-
                 case TCSBRKP:   /* support for POSIX tcsendbreak() */
-
                         retval = tty_check_change(tty);
                         if (retval)
                                 return retval;
 
                         /* Setup an event to indicate when the transmit buffer empties */
-
+                        spin_lock_irqsave(&epca_lock, flags);
                         setup_empty_event(tty,ch);              
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         tty_wait_until_sent(tty, 0);
                         digi_send_break(ch, arg ? arg*(HZ/10) : HZ/4);
                         return 0;
-
                 case TIOCGSOFTCAR:
                         if (put_user(C_CLOCAL(tty)?1:0, (unsigned long __user *)arg))
                                 return -EFAULT;
                         return 0;
-
                 case TIOCSSOFTCAR:
                 {
                         unsigned int value;
@@ -2922,75 +2414,63 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
                                  (value ? CLOCAL : 0));
                         return 0;
                 }
-
                 case TIOCMODG:
                         mflag = pc_tiocmget(tty, file);
                         if (put_user(mflag, (unsigned long __user *)argp))
                                 return -EFAULT;
                         break;
-
                 case TIOCMODS:
                         if (get_user(mstat, (unsigned __user *)argp))
                                 return -EFAULT;
                         return pc_tiocmset(tty, file, mstat, ~mstat);
-
                 case TIOCSDTR:
+                        spin_lock_irqsave(&epca_lock, flags);
                         ch->omodem |= ch->m_dtr;
-                        cli();
                         globalwinon(ch);
                         fepcmd(ch, SETMODEM, ch->m_dtr, 0, 10, 1);
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         break;
 
                 case TIOCCDTR:
+                        spin_lock_irqsave(&epca_lock, flags);
                         ch->omodem &= ~ch->m_dtr;
-                        cli();
                         globalwinon(ch);
                         fepcmd(ch, SETMODEM, 0, ch->m_dtr, 10, 1);
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         break;
-
                 case DIGI_GETA:
                         if (copy_to_user(argp, &ch->digiext, sizeof(digi_t)))
                                 return -EFAULT;
                         break;
-
                 case DIGI_SETAW:
                 case DIGI_SETAF:
-                        if ((cmd) == (DIGI_SETAW)) 
-                        {
+                        if (cmd == DIGI_SETAW) {
                                 /* Setup an event to indicate when the transmit buffer empties */
-
+                                spin_lock_irqsave(&epca_lock, flags);
                                 setup_empty_event(tty,ch);              
+                                spin_unlock_irqrestore(&epca_lock, flags);
                                 tty_wait_until_sent(tty, 0);
-                        }
-                        else 
-                        {
+                        } else  {
                                 /* ldisc lock already held in ioctl */
                                 if (tty->ldisc.flush_buffer)
                                         tty->ldisc.flush_buffer(tty);
                         }
-
                         /* Fall Thru */
-
                 case DIGI_SETA:
                         if (copy_from_user(&ch->digiext, argp, sizeof(digi_t)))
                                 return -EFAULT;
                         
-                        if (ch->digiext.digi_flags & DIGI_ALTPIN) 
-                        {
+                        if (ch->digiext.digi_flags & DIGI_ALTPIN)  {
                                 ch->dcd = ch->m_dsr;
                                 ch->dsr = ch->m_dcd;
-                        } 
-                        else 
-                        {
+                        } else {
                                 ch->dcd = ch->m_dcd;
                                 ch->dsr = ch->m_dsr;
                         }
                 
-                        cli();
+                        spin_lock_irqsave(&epca_lock, flags);
                         globalwinon(ch);
 
                         /* -----------------------------------------------------------------
@@ -3000,25 +2480,22 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
 
                         epcaparam(tty,ch);
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
                         break;
 
                 case DIGI_GETFLOW:
                 case DIGI_GETAFLOW:
-                        cli();  
+                        spin_lock_irqsave(&epca_lock, flags);
                         globalwinon(ch);
-                        if ((cmd) == (DIGI_GETFLOW)) 
-                        {
-                                dflow.startc = bc->startc;
-                                dflow.stopc = bc->stopc;
-                        }
-                        else 
-                        {
-                                dflow.startc = bc->startca;
-                                dflow.stopc = bc->stopca;
+                        if (cmd == DIGI_GETFLOW) {
+                                dflow.startc = readb(&bc->startc);
+                                dflow.stopc = readb(&bc->stopc);
+                        } else {
+                                dflow.startc = readb(&bc->startca);
+                                dflow.stopc = readb(&bc->stopca);
                         }
                         memoff(ch);
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&epca_lock, flags);
 
                         if (copy_to_user(argp, &dflow, sizeof(dflow)))
                                 return -EFAULT;
@@ -3026,13 +2503,10 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
 
                 case DIGI_SETAFLOW:
                 case DIGI_SETFLOW:
-                        if ((cmd) == (DIGI_SETFLOW)) 
-                        {
+                        if (cmd == DIGI_SETFLOW) {
                                 startc = ch->startc;
                                 stopc = ch->stopc;
-                        } 
-                        else 
-                        {
+                        } else {
                                 startc = ch->startca;
                                 stopc = ch->stopca;
                         }
@@ -3040,40 +2514,31 @@ static int pc_ioctl(struct tty_struct *tty, struct file * file,
                         if (copy_from_user(&dflow, argp, sizeof(dflow)))
                                 return -EFAULT;
 
-                        if (dflow.startc != startc || dflow.stopc != stopc) 
-                        { /* Begin  if setflow toggled */
-                                cli();
+                        if (dflow.startc != startc || dflow.stopc != stopc) { /* Begin  if setflow toggled */
+                                spin_lock_irqsave(&epca_lock, flags);
                                 globalwinon(ch);
 
-                                if ((cmd) == (DIGI_SETFLOW)) 
-                                {
+                                if (cmd == DIGI_SETFLOW) {
                                         ch->fepstartc = ch->startc = dflow.startc;
                                         ch->fepstopc = ch->stopc = dflow.stopc;
                                         fepcmd(ch, SONOFFC, ch->fepstartc, ch->fepstopc, 0, 1);
-                                } 
-                                else 
-                                {
+                                } else {
                                         ch->fepstartca = ch->startca = dflow.startc;
                                         ch->fepstopca  = ch->stopca = dflow.stopc;
                                         fepcmd(ch, SAUXONOFFC, ch->fepstartca, ch->fepstopca, 0, 1);
                                 }
 
-                                if      (ch->statusflags & TXSTOPPED)
+                                if (ch->statusflags & TXSTOPPED)
                                         pc_start(tty);
 
                                 memoff(ch);
-                                restore_flags(flags);
-
+                                spin_unlock_irqrestore(&epca_lock, flags);
                         } /* End if setflow toggled */
                         break;
-
                 default:
                         return -ENOIOCTLCMD;
-
         } /* End switch cmd */
-
         return 0;
-
 } /* End pc_ioctl */
 
 /* --------------------- Begin pc_set_termios  ----------------------- */
@@ -3083,20 +2548,16 @@ static void pc_set_termios(struct tty_struct *tty, struct termios *old_termios)
 
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
-                save_flags(flags);
-                cli();
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if channel valid */
+                spin_lock_irqsave(&epca_lock, flags);
                 globalwinon(ch);
                 epcaparam(tty, ch);
                 memoff(ch);
+                spin_unlock_irqrestore(&epca_lock, flags);
 
                 if ((old_termios->c_cflag & CRTSCTS) &&
                          ((tty->termios->c_cflag & CRTSCTS) == 0))
@@ -3106,8 +2567,6 @@ static void pc_set_termios(struct tty_struct *tty, struct termios *old_termios)
                          (tty->termios->c_cflag & CLOCAL))
                         wake_up_interruptible(&ch->open_wait);
 
-                restore_flags(flags);
-
         } /* End if channel valid */
 
 } /* End pc_set_termios */
@@ -3116,29 +2575,18 @@ static void pc_set_termios(struct tty_struct *tty, struct termios *old_termios)
 
 static void do_softint(void *private_)
 { /* Begin do_softint */
-
         struct channel *ch = (struct channel *) private_;
-        
-
         /* Called in response to a modem change event */
-
-        if (ch && ch->magic == EPCA_MAGIC) 
-        { /* Begin EPCA_MAGIC */
-
+        if (ch && ch->magic == EPCA_MAGIC)  { /* Begin EPCA_MAGIC */
                 struct tty_struct *tty = ch->tty;
 
-                if (tty && tty->driver_data) 
-                { 
-                        if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) 
-                        { /* Begin if clear_bit */
-
+                if (tty && tty->driver_data) {
+                        if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) { /* Begin if clear_bit */
                                 tty_hangup(tty);        /* FIXME: module removal race here - AKPM */
                                 wake_up_interruptible(&ch->open_wait);
                                 ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
-
                         } /* End if clear_bit */
                 }
-
         } /* End EPCA_MAGIC */
 } /* End do_softint */
 
@@ -3154,82 +2602,49 @@ static void pc_stop(struct tty_struct *tty)
 
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if valid channel */
-
-                save_flags(flags); 
-                cli();
-
-                if ((ch->statusflags & TXSTOPPED) == 0) 
-                { /* Begin if transmit stop requested */
-
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if valid channel */
+                spin_lock_irqsave(&epca_lock, flags);
+                if ((ch->statusflags & TXSTOPPED) == 0)  { /* Begin if transmit stop requested */
                         globalwinon(ch);
-
                         /* STOP transmitting now !! */
-
                         fepcmd(ch, PAUSETX, 0, 0, 0, 0);
-
                         ch->statusflags |= TXSTOPPED;
                         memoff(ch);
-
                 } /* End if transmit stop requested */
-
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if valid channel */
-
 } /* End pc_stop */
 
 /* --------------------- Begin pc_start  ----------------------- */
 
 static void pc_start(struct tty_struct *tty)
 { /* Begin pc_start */
-
         struct channel *ch;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
+        if ((ch = verifyChannel(tty)) != NULL) { /* Begin if channel valid */
                 unsigned long flags;
-
-                save_flags(flags);
-                cli();
-
+                spin_lock_irqsave(&epca_lock, flags);
                 /* Just in case output was resumed because of a change in Digi-flow */
-                if (ch->statusflags & TXSTOPPED) 
-                { /* Begin transmit resume requested */
-
-                        volatile struct board_chan *bc;
-
+                if (ch->statusflags & TXSTOPPED)  { /* Begin transmit resume requested */
+                        struct board_chan *bc;
                         globalwinon(ch);
                         bc = ch->brdchan;
                         if (ch->statusflags & LOWWAIT)
-                                bc->ilow = 1;
-
+                                writeb(1, &bc->ilow);
                         /* Okay, you can start transmitting again... */
-
                         fepcmd(ch, RESUMETX, 0, 0, 0, 0);
-
                         ch->statusflags &= ~TXSTOPPED;
                         memoff(ch);
-
                 } /* End transmit resume requested */
-
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if channel valid */
-
 } /* End pc_start */
 
 /* ------------------------------------------------------------------
@@ -3244,86 +2659,55 @@ ______________________________________________________________________ */
 
 static void pc_throttle(struct tty_struct * tty)
 { /* Begin pc_throttle */
-
         struct channel *ch;
         unsigned long flags;
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
-
-                save_flags(flags);
-                cli();
-
-                if ((ch->statusflags & RXSTOPPED) == 0)
-                {
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if channel valid */
+                spin_lock_irqsave(&epca_lock, flags);
+                if ((ch->statusflags & RXSTOPPED) == 0) {
                         globalwinon(ch);
                         fepcmd(ch, PAUSERX, 0, 0, 0, 0);
-
                         ch->statusflags |= RXSTOPPED;
                         memoff(ch);
                 }
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if channel valid */
-
 } /* End pc_throttle */
 
 /* --------------------- Begin unthrottle  ----------------------- */
 
 static void pc_unthrottle(struct tty_struct *tty)
 { /* Begin pc_unthrottle */
-
         struct channel *ch;
         unsigned long flags;
-        volatile struct board_chan *bc;
-
-
         /* ---------------------------------------------------------
                 verifyChannel returns the channel from the tty struct
                 if it is valid.  This serves as a sanity check.
         ------------------------------------------------------------- */
-
-        if ((ch = verifyChannel(tty)) != NULL) 
-        { /* Begin if channel valid */
-
-
+        if ((ch = verifyChannel(tty)) != NULL)  { /* Begin if channel valid */
                 /* Just in case output was resumed because of a change in Digi-flow */
-                save_flags(flags);
-                cli();
-
-                if (ch->statusflags & RXSTOPPED) 
-                {
-
+                spin_lock_irqsave(&epca_lock, flags);
+                if (ch->statusflags & RXSTOPPED) {
                         globalwinon(ch);
-                        bc = ch->brdchan;
                         fepcmd(ch, RESUMERX, 0, 0, 0, 0);
-
                         ch->statusflags &= ~RXSTOPPED;
                         memoff(ch);
                 }
-                restore_flags(flags);
-
+                spin_unlock_irqrestore(&epca_lock, flags);
         } /* End if channel valid */
-
 } /* End pc_unthrottle */
 
 /* --------------------- Begin digi_send_break  ----------------------- */
 
 void digi_send_break(struct channel *ch, int msec)
 { /* Begin digi_send_break */
-
         unsigned long flags;
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&epca_lock, flags);
         globalwinon(ch);
-
         /* -------------------------------------------------------------------- 
            Maybe I should send an infinite break here, schedule() for
            msec amount of time, and then stop the break.  This way,
@@ -3331,36 +2715,28 @@ void digi_send_break(struct channel *ch, int msec)
            to be called (i.e. via an ioctl()) more than once in msec amount 
            of time.  Try this for now...
         ------------------------------------------------------------------------ */
-
         fepcmd(ch, SENDBREAK, msec, 0, 10, 0);
         memoff(ch);
-
-        restore_flags(flags);
-
+        spin_unlock_irqrestore(&epca_lock, flags);
 } /* End digi_send_break */
 
 /* --------------------- Begin setup_empty_event  ----------------------- */
 
+/* Caller MUST hold the lock */
+
 static void setup_empty_event(struct tty_struct *tty, struct channel *ch)
 { /* Begin setup_empty_event */
 
-        volatile struct board_chan *bc = ch->brdchan;
-        unsigned long int flags;
+        struct board_chan *bc = ch->brdchan;
 
-        save_flags(flags);
-        cli();
         globalwinon(ch);
         ch->statusflags |= EMPTYWAIT;
-        
         /* ------------------------------------------------------------------
                 When set the iempty flag request a event to be generated when the 
                 transmit buffer is empty (If there is no BREAK in progress).
         --------------------------------------------------------------------- */
-
-        bc->iempty = 1;
+        writeb(1, &bc->iempty);
         memoff(ch);
-        restore_flags(flags);
-
 } /* End setup_empty_event */
 
 /* --------------------- Begin get_termio ----------------------- */
@@ -3369,10 +2745,10 @@ static int get_termio(struct tty_struct * tty, struct termio __user * termio)
 { /* Begin get_termio */
         return kernel_termios_to_user_termio(termio, tty->termios);
 } /* End get_termio */
+
 /* ---------------------- Begin epca_setup  -------------------------- */
 void epca_setup(char *str, int *ints)
 { /* Begin epca_setup */
-
         struct board_info board;
         int               index, loop, last;
         char              *temp, *t2;
@@ -3394,49 +2770,41 @@ void epca_setup(char *str, int *ints)
         for (last = 0, index = 1; index <= ints[0]; index++)
                 switch(index)
                 { /* Begin parse switch */
-
                         case 1:
                                 board.status = ints[index];
-                                
                                 /* ---------------------------------------------------------
                                         We check for 2 (As opposed to 1; because 2 is a flag
                                         instructing the driver to ignore epcaconfig.)  For this
                                         reason we check for 2.
                                 ------------------------------------------------------------ */ 
-                                if (board.status == 2)
-                                { /* Begin ignore epcaconfig as well as lilo cmd line */
+                                if (board.status == 2) { /* Begin ignore epcaconfig as well as lilo cmd line */
                                         nbdevs = 0;
                                         num_cards = 0;
                                         return;
                                 } /* End ignore epcaconfig as well as lilo cmd line */
         
-                                if (board.status > 2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board status 0x%x\n", board.status);
+                                if (board.status > 2) {
+                                        printk(KERN_ERR "epca_setup: Invalid board status 0x%x\n", board.status);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_STATUS;
                                         return;
                                 }
                                 last = index;
                                 break;
-
                         case 2:
                                 board.type = ints[index];
-                                if (board.type >= PCIXEM) 
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board type 0x%x\n", board.type);
+                                if (board.type >= PCIXEM)  {
+                                        printk(KERN_ERR "epca_setup: Invalid board type 0x%x\n", board.type);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_TYPE;
                                         return;
                                 }
                                 last = index;
                                 break;
-
                         case 3:
                                 board.altpin = ints[index];
-                                if (board.altpin > 1)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board altpin 0x%x\n", board.altpin);
+                                if (board.altpin > 1) {
+                                        printk(KERN_ERR "epca_setup: Invalid board altpin 0x%x\n", board.altpin);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_ALTPIN;
                                         return;
@@ -3446,9 +2814,8 @@ void epca_setup(char *str, int *ints)
 
                         case 4:
                                 board.numports = ints[index];
-                                if ((board.numports < 2) || (board.numports > 256))
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board numports 0x%x\n", board.numports);
+                                if (board.numports < 2 || board.numports > 256) {
+                                        printk(KERN_ERR "epca_setup: Invalid board numports 0x%x\n", board.numports);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_NUM_PORTS;
                                         return;
@@ -3458,10 +2825,9 @@ void epca_setup(char *str, int *ints)
                                 break;
 
                         case 5:
-                                board.port = (unsigned char *)ints[index];
-                                if (ints[index] <= 0)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid io port 0x%x\n", (unsigned int)board.port);
+                                board.port = ints[index];
+                                if (ints[index] <= 0) {
+                                        printk(KERN_ERR "epca_setup: Invalid io port 0x%x\n", (unsigned int)board.port);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_PORT_BASE;
                                         return;
@@ -3470,10 +2836,9 @@ void epca_setup(char *str, int *ints)
                                 break;
 
                         case 6:
-                                board.membase = (unsigned char *)ints[index];
-                                if (ints[index] <= 0)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid memory base 0x%x\n",(unsigned int)board.membase);
+                                board.membase = ints[index];
+                                if (ints[index] <= 0) {
+                                        printk(KERN_ERR "epca_setup: Invalid memory base 0x%x\n",(unsigned int)board.membase);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_MEM_BASE;
                                         return;
@@ -3487,21 +2852,16 @@ void epca_setup(char *str, int *ints)
 
                 } /* End parse switch */
 
-        while (str && *str) 
-        { /* Begin while there is a string arg */
-
+        while (str && *str)  { /* Begin while there is a string arg */
                 /* find the next comma or terminator */
                 temp = str;
-
                 /* While string is not null, and a comma hasn't been found */
                 while (*temp && (*temp != ','))
                         temp++;
-
                 if (!*temp)
                         temp = NULL;
                 else
                         *temp++ = 0;
-
                 /* Set index to the number of args + 1 */
                 index = last + 1;
 
@@ -3511,12 +2871,10 @@ void epca_setup(char *str, int *ints)
                                 len = strlen(str);
                                 if (strncmp("Disable", str, len) == 0) 
                                         board.status = 0;
-                                else
-                                if (strncmp("Enable", str, len) == 0)
+                                else if (strncmp("Enable", str, len) == 0)
                                         board.status = 1;
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid status %s\n", str);
+                                else {
+                                        printk(KERN_ERR "epca_setup: Invalid status %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_STATUS;
                                         return;
@@ -3525,22 +2883,17 @@ void epca_setup(char *str, int *ints)
                                 break;
 
                         case 2:
-
                                 for(loop = 0; loop < EPCA_NUM_TYPES; loop++)
                                         if (strcmp(board_desc[loop], str) == 0)
                                                 break;
-
-
                                 /* ---------------------------------------------------------------
                                         If the index incremented above refers to a legitamate board 
                                         type set it here. 
                                 ------------------------------------------------------------------*/
-
                                 if (index < EPCA_NUM_TYPES) 
                                         board.type = loop;
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid board type: %s\n", str);
+                                else {
+                                        printk(KERN_ERR "epca_setup: Invalid board type: %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_BOARD_TYPE;
                                         return;
@@ -3552,12 +2905,10 @@ void epca_setup(char *str, int *ints)
                                 len = strlen(str);
                                 if (strncmp("Disable", str, len) == 0) 
                                         board.altpin = 0;
-                                else
-                                if (strncmp("Enable", str, len) == 0)
+                                else if (strncmp("Enable", str, len) == 0)
                                         board.altpin = 1;
-                                else
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid altpin %s\n", str);
+                                else {
+                                        printk(KERN_ERR "epca_setup: Invalid altpin %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_ALTPIN;
                                         return;
@@ -3570,9 +2921,8 @@ void epca_setup(char *str, int *ints)
                                 while (isdigit(*t2))
                                         t2++;
 
-                                if (*t2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid port count %s\n", str);
+                                if (*t2) {
+                                        printk(KERN_ERR "epca_setup: Invalid port count %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_NUM_PORTS;
                                         return;
@@ -3601,15 +2951,14 @@ void epca_setup(char *str, int *ints)
                                 while (isxdigit(*t2))
                                         t2++;
 
-                                if (*t2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid i/o address %s\n", str);
+                                if (*t2) {
+                                        printk(KERN_ERR "epca_setup: Invalid i/o address %s\n", str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_PORT_BASE;
                                         return;
                                 }
 
-                                board.port = (unsigned char *)simple_strtoul(str, NULL, 16);
+                                board.port = simple_strtoul(str, NULL, 16);
                                 last = index;
                                 break;
 
@@ -3618,52 +2967,38 @@ void epca_setup(char *str, int *ints)
                                 while (isxdigit(*t2))
                                         t2++;
 
-                                if (*t2)
-                                {
-                                        printk(KERN_ERR "<Error> - epca_setup: Invalid memory base %s\n",str);
+                                if (*t2) {
+                                        printk(KERN_ERR "epca_setup: Invalid memory base %s\n",str);
                                         invalid_lilo_config = 1;
                                         setup_error_code |= INVALID_MEM_BASE;
                                         return;
                                 }
-
-                                board.membase = (unsigned char *)simple_strtoul(str, NULL, 16);
+                                board.membase = simple_strtoul(str, NULL, 16);
                                 last = index;
                                 break;
-
                         default:
-                                printk(KERN_ERR "PC/Xx: Too many string parms\n");
+                                printk(KERN_ERR "epca: Too many string parms\n");
                                 return;
                 }
                 str = temp;
-
         } /* End while there is a string arg */
 
-
-        if (last < 6)  
-        {
-                printk(KERN_ERR "PC/Xx: Insufficient parms specified\n");
+        if (last < 6) {
+                printk(KERN_ERR "epca: Insufficient parms specified\n");
                 return;
         }
  
         /* I should REALLY validate the stuff here */
-
         /* Copies our local copy of board into boards */
         memcpy((void *)&boards[num_cards],(void *)&board, sizeof(board));
-
-
         /* Does this get called once per lilo arg are what ? */
-
         printk(KERN_INFO "PC/Xx: Added board %i, %s %i ports at 0x%4.4X base 0x%6.6X\n", 
                 num_cards, board_desc[board.type], 
                 board.numports, (int)board.port, (unsigned int) board.membase);
-
         num_cards++;
-
 } /* End epca_setup */
 
 
-
-#ifdef ENABLE_PCI
 /* ------------------------ Begin init_PCI  --------------------------- */
 
 enum epic_board_types {
@@ -3685,7 +3020,6 @@ static struct {
         { PCIXRJ, 2, },
 };
 
-
 static int __devinit epca_init_one (struct pci_dev *pdev,
                                  const struct pci_device_id *ent)
 {
@@ -3711,10 +3045,8 @@ static int __devinit epca_init_one (struct pci_dev *pdev,
         boards[board_idx].status = ENABLED;
         boards[board_idx].type = epca_info_tbl[info_idx].board_type;
         boards[board_idx].numports = 0x0;
-        boards[board_idx].port =
-                (unsigned char *)((char *) addr + PCI_IO_OFFSET);
-        boards[board_idx].membase =
-                (unsigned char *)((char *) addr);
+        boards[board_idx].port = addr + PCI_IO_OFFSET;
+        boards[board_idx].membase = addr;
 
         if (!request_mem_region (addr + PCI_IO_OFFSET, 0x200000, "epca")) {
                 printk (KERN_ERR PFX "resource 0x%x @ 0x%lx unavailable\n",
@@ -3775,15 +3107,13 @@ static struct pci_device_id epca_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, epca_pci_tbl);
 
 int __init init_PCI (void)
-{ /* Begin init_PCI */
+{       /* Begin init_PCI */
         memset (&epca_driver, 0, sizeof (epca_driver));
         epca_driver.name = "epca";
         epca_driver.id_table = epca_pci_tbl;
         epca_driver.probe = epca_init_one;
 
         return pci_register_driver(&epca_driver);
-} /* End init_PCI */
-
-#endif /* ENABLE_PCI */
+}
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/char/epca.h b/drivers/char/epca.h
index 52205ef71314..20eeb5a70e1a 100644
--- a/drivers/char/epca.h
+++ b/drivers/char/epca.h
@@ -85,73 +85,73 @@ static char *board_desc[] =
 struct channel 
 {
         long   magic;
-        unchar boardnum;
-        unchar channelnum;
-        unchar omodem;         /* FEP output modem status     */
-        unchar imodem;         /* FEP input modem status      */
-        unchar modemfake;      /* Modem values to be forced   */
-        unchar modem;          /* Force values                */
-        unchar hflow;
-        unchar dsr;
-        unchar dcd;
-        unchar m_rts ;          /* The bits used in whatever FEP */
-        unchar m_dcd ;          /* is indiginous to this board to */
-        unchar m_dsr ;          /* represent each of the physical */
-        unchar m_cts ;          /* handshake lines */
-        unchar m_ri ;
-        unchar m_dtr ;
-        unchar stopc;
-        unchar startc;
-        unchar stopca;
-        unchar startca;
-        unchar fepstopc;
-        unchar fepstartc;
-        unchar fepstopca;
-        unchar fepstartca;
-        unchar txwin;
-        unchar rxwin;
-        ushort fepiflag;
-        ushort fepcflag;
-        ushort fepoflag;
-        ushort txbufhead;
-        ushort txbufsize;
-        ushort rxbufhead;
-        ushort rxbufsize;
+        unsigned char boardnum;
+        unsigned char channelnum;
+        unsigned char omodem;         /* FEP output modem status     */
+        unsigned char imodem;         /* FEP input modem status      */
+        unsigned char modemfake;      /* Modem values to be forced   */
+        unsigned char modem;          /* Force values                */
+        unsigned char hflow;
+        unsigned char dsr;
+        unsigned char dcd;
+        unsigned char m_rts ;           /* The bits used in whatever FEP */
+        unsigned char m_dcd ;           /* is indiginous to this board to */
+        unsigned char m_dsr ;           /* represent each of the physical */
+        unsigned char m_cts ;           /* handshake lines */
+        unsigned char m_ri ;
+        unsigned char m_dtr ;
+        unsigned char stopc;
+        unsigned char startc;
+        unsigned char stopca;
+        unsigned char startca;
+        unsigned char fepstopc;
+        unsigned char fepstartc;
+        unsigned char fepstopca;
+        unsigned char fepstartca;
+        unsigned char txwin;
+        unsigned char rxwin;
+        unsigned short fepiflag;
+        unsigned short fepcflag;
+        unsigned short fepoflag;
+        unsigned short txbufhead;
+        unsigned short txbufsize;
+        unsigned short rxbufhead;
+        unsigned short rxbufsize;
         int    close_delay;
         int    count;
         int    blocked_open;
-        ulong  event;
+        unsigned long  event;
         int    asyncflags;
         uint   dev;
-        ulong  statusflags;
-        ulong  c_iflag;
-        ulong  c_cflag;
-        ulong  c_lflag;
-        ulong  c_oflag;
-        unchar *txptr;
-        unchar *rxptr;
-        unchar *tmp_buf;
+        unsigned long  statusflags;
+        unsigned long  c_iflag;
+        unsigned long  c_cflag;
+        unsigned long  c_lflag;
+        unsigned long  c_oflag;
+        unsigned char *txptr;
+        unsigned char *rxptr;
+        unsigned char *tmp_buf;
         struct board_info           *board;
-        volatile struct board_chan  *brdchan;
+        struct board_chan           *brdchan;
         struct digi_struct          digiext;
         struct tty_struct           *tty;
         wait_queue_head_t           open_wait;
         wait_queue_head_t           close_wait;
-        struct work_struct            tqueue;
-        volatile struct global_data *mailbox;
+        struct work_struct          tqueue;
+        struct global_data          *mailbox;
 };
 
 struct board_info       
 {
-        unchar status;
-        unchar type;
-        unchar altpin;
-        ushort numports;
-        unchar *port;
-        unchar *membase;
-        unchar __iomem *re_map_port;
-        unchar *re_map_membase;
-        ulong  memory_seg;
+        unsigned char status;
+        unsigned char type;
+        unsigned char altpin;
+        unsigned short numports;
+        unsigned long port;
+        unsigned long membase;
+        unsigned char __iomem *re_map_port;
+        unsigned char *re_map_membase;
+        unsigned long  memory_seg;
         void ( * memwinon )     (struct board_info *, unsigned int) ;
         void ( * memwinoff )    (struct board_info *, unsigned int) ;
         void ( * globalwinon )  (struct channel *) ;
@@ -160,6 +160,6 @@ struct board_info
         void ( * memoff )       (struct channel *) ;
         void ( * assertgwinon ) (struct channel *) ;
         void ( * assertmemoff ) (struct channel *) ;
-        unchar poller_inhibited ;
+        unsigned char poller_inhibited ;
 };
 
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 762fa430fb5b..a695f25e4497 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -44,7 +44,7 @@
 /*
  * The High Precision Event Timer driver.
  * This driver is closely modelled after the rtc.c driver.
- * http://www.intel.com/labs/platcomp/hpet/hpetspec.htm
+ * http://www.intel.com/hardwaredesign/hpetspec.htm
  */
 #define HPET_USER_FREQ  (64)
 #define HPET_DRIFT      (500)
@@ -712,7 +712,7 @@ static void hpet_register_interpolator(struct hpets *hpetp)
         ti->shift = 10;
         ti->addr = &hpetp->hp_hpet->hpet_mc;
         ti->frequency = hpet_time_div(hpets->hp_period);
-        ti->drift = ti->frequency * HPET_DRIFT / 1000000;
+        ti->drift = HPET_DRIFT;
         ti->mask = -1;
 
         hpetp->hp_interpolator = ti;
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c
index 5ce9c6269033..33862670e285 100644
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -31,8 +31,6 @@
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
-#define IPMI_BT_VERSION "v33"
-
 static int bt_debug = 0x00;     /* Production value 0, see following flags */
 
 #define BT_DEBUG_ENABLE 1
@@ -163,7 +161,8 @@ static int bt_start_transaction(struct si_sm_data *bt,
 {
         unsigned int i;
 
-        if ((size < 2) || (size > IPMI_MAX_MSG_LENGTH)) return -1;
+        if ((size < 2) || (size > IPMI_MAX_MSG_LENGTH))
+               return -1;
 
         if ((bt->state != BT_STATE_IDLE) && (bt->state != BT_STATE_HOSED))
                 return -2;
@@ -171,7 +170,8 @@ static int bt_start_transaction(struct si_sm_data *bt,
         if (bt_debug & BT_DEBUG_MSG) {
                 printk(KERN_WARNING "+++++++++++++++++++++++++++++++++++++\n");
                 printk(KERN_WARNING "BT: write seq=0x%02X:", bt->seq);
-                for (i = 0; i < size; i ++) printk (" %02x", data[i]);
+                for (i = 0; i < size; i ++)
+                       printk (" %02x", data[i]);
                 printk("\n");
         }
         bt->write_data[0] = size + 1;   /* all data plus seq byte */
@@ -210,15 +210,18 @@ static int bt_get_result(struct si_sm_data *bt,
         } else {
                 data[0] = bt->read_data[1];
                 data[1] = bt->read_data[3];
-                if (length < msg_len) bt->truncated = 1;
+                if (length < msg_len)
+                       bt->truncated = 1;
                 if (bt->truncated) {    /* can be set in read_all_bytes() */
                         data[2] = IPMI_ERR_MSG_TRUNCATED;
                         msg_len = 3;
-                } else memcpy(data + 2, bt->read_data + 4, msg_len - 2);
+                } else
+                       memcpy(data + 2, bt->read_data + 4, msg_len - 2);
 
                 if (bt_debug & BT_DEBUG_MSG) {
                         printk (KERN_WARNING "BT: res (raw)");
-                        for (i = 0; i < msg_len; i++) printk(" %02x", data[i]);
+                        for (i = 0; i < msg_len; i++)
+                               printk(" %02x", data[i]);
                         printk ("\n");
                 }
         }
@@ -231,8 +234,10 @@ static int bt_get_result(struct si_sm_data *bt,
 
 static void reset_flags(struct si_sm_data *bt)
 {
-        if (BT_STATUS & BT_H_BUSY) BT_CONTROL(BT_H_BUSY);
-        if (BT_STATUS & BT_B_BUSY) BT_CONTROL(BT_B_BUSY);
+        if (BT_STATUS & BT_H_BUSY)
+               BT_CONTROL(BT_H_BUSY);
+        if (BT_STATUS & BT_B_BUSY)
+               BT_CONTROL(BT_B_BUSY);
         BT_CONTROL(BT_CLR_WR_PTR);
         BT_CONTROL(BT_SMS_ATN);
 #ifdef DEVELOPMENT_ONLY_NOT_FOR_PRODUCTION
@@ -241,7 +246,8 @@ static void reset_flags(struct si_sm_data *bt)
                 BT_CONTROL(BT_H_BUSY);
                 BT_CONTROL(BT_B2H_ATN);
                 BT_CONTROL(BT_CLR_RD_PTR);
-                for (i = 0; i < IPMI_MAX_MSG_LENGTH + 2; i++) BMC2HOST;
+                for (i = 0; i < IPMI_MAX_MSG_LENGTH + 2; i++)
+                       BMC2HOST;
                 BT_CONTROL(BT_H_BUSY);
         }
 #endif
@@ -258,7 +264,8 @@ static inline void write_all_bytes(struct si_sm_data *bt)
                         printk (" %02x", bt->write_data[i]);
                 printk ("\n");
         }
-        for (i = 0; i < bt->write_count; i++) HOST2BMC(bt->write_data[i]);
+        for (i = 0; i < bt->write_count; i++)
+               HOST2BMC(bt->write_data[i]);
 }
 
 static inline int read_all_bytes(struct si_sm_data *bt)
@@ -278,7 +285,8 @@ static inline int read_all_bytes(struct si_sm_data *bt)
                 bt->truncated = 1;
                 return 1;       /* let next XACTION START clean it up */
         }
-        for (i = 1; i <= bt->read_count; i++) bt->read_data[i] = BMC2HOST;
+        for (i = 1; i <= bt->read_count; i++)
+               bt->read_data[i] = BMC2HOST;
         bt->read_count++;       /* account for the length byte */
 
         if (bt_debug & BT_DEBUG_MSG) {
@@ -295,7 +303,8 @@ static inline int read_all_bytes(struct si_sm_data *bt)
                 ((bt->read_data[1] & 0xF8) == (bt->write_data[1] & 0xF8)))
                         return 1;
 
-        if (bt_debug & BT_DEBUG_MSG) printk(KERN_WARNING "BT: bad packet: "
+        if (bt_debug & BT_DEBUG_MSG)
+               printk(KERN_WARNING "BT: bad packet: "
                 "want 0x(%02X, %02X, %02X) got (%02X, %02X, %02X)\n",
                 bt->write_data[1], bt->write_data[2], bt->write_data[3],
                 bt->read_data[1],  bt->read_data[2],  bt->read_data[3]);
@@ -359,7 +368,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                         time);
         bt->last_state = bt->state;
 
-        if (bt->state == BT_STATE_HOSED) return SI_SM_HOSED;
+        if (bt->state == BT_STATE_HOSED)
+               return SI_SM_HOSED;
 
         if (bt->state != BT_STATE_IDLE) {       /* do timeout test */
 
@@ -371,7 +381,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
         /* FIXME: bt_event is sometimes called with time > BT_NORMAL_TIMEOUT
               (noticed in ipmi_smic_sm.c January 2004) */
 
-                if ((time <= 0) || (time >= BT_NORMAL_TIMEOUT)) time = 100;
+                if ((time <= 0) || (time >= BT_NORMAL_TIMEOUT))
+                       time = 100;
                 bt->timeout -= time;
                 if ((bt->timeout < 0) && (bt->state < BT_STATE_RESET1)) {
                         error_recovery(bt, "timed out");
@@ -393,12 +404,14 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                         BT_CONTROL(BT_H_BUSY);
                         break;
                 }
-                if (status & BT_B2H_ATN) break;
+                if (status & BT_B2H_ATN)
+                       break;
                 bt->state = BT_STATE_WRITE_BYTES;
                 return SI_SM_CALL_WITHOUT_DELAY;        /* for logging */
 
         case BT_STATE_WRITE_BYTES:
-                if (status & (BT_B_BUSY | BT_H2B_ATN)) break;
+                if (status & (BT_B_BUSY | BT_H2B_ATN))
+                       break;
                 BT_CONTROL(BT_CLR_WR_PTR);
                 write_all_bytes(bt);
                 BT_CONTROL(BT_H2B_ATN); /* clears too fast to catch? */
@@ -406,7 +419,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                 return SI_SM_CALL_WITHOUT_DELAY; /* it MIGHT sail through */
 
         case BT_STATE_WRITE_CONSUME: /* BMCs usually blow right thru here */
-                if (status & (BT_H2B_ATN | BT_B_BUSY)) break;
+                if (status & (BT_H2B_ATN | BT_B_BUSY))
+                       break;
                 bt->state = BT_STATE_B2H_WAIT;
                 /* fall through with status */
 
@@ -415,15 +429,18 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
            generation of B2H_ATN so ALWAYS return CALL_WITH_DELAY. */
 
         case BT_STATE_B2H_WAIT:
-                if (!(status & BT_B2H_ATN)) break;
+                if (!(status & BT_B2H_ATN))
+                       break;
 
                 /* Assume ordered, uncached writes: no need to wait */
-                if (!(status & BT_H_BUSY)) BT_CONTROL(BT_H_BUSY); /* set */
+                if (!(status & BT_H_BUSY))
+                       BT_CONTROL(BT_H_BUSY); /* set */
                 BT_CONTROL(BT_B2H_ATN);         /* clear it, ACK to the BMC */
                 BT_CONTROL(BT_CLR_RD_PTR);      /* reset the queue */
                 i = read_all_bytes(bt);
                 BT_CONTROL(BT_H_BUSY);          /* clear */
-                if (!i) break;                  /* Try this state again */
+                if (!i)                         /* Try this state again */
+                       break;
                 bt->state = BT_STATE_READ_END;
                 return SI_SM_CALL_WITHOUT_DELAY;        /* for logging */
 
@@ -436,7 +453,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
 
 #ifdef MAKE_THIS_TRUE_IF_NECESSARY
 
-                if (status & BT_H_BUSY) break;
+                if (status & BT_H_BUSY)
+                       break;
 #endif
                 bt->seq++;
                 bt->state = BT_STATE_IDLE;
@@ -459,7 +477,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                 break;
 
         case BT_STATE_RESET3:
-                if (bt->timeout > 0) return SI_SM_CALL_WITH_DELAY;
+                if (bt->timeout > 0)
+                       return SI_SM_CALL_WITH_DELAY;
                 bt->state = BT_STATE_RESTART;   /* printk in debug modes */
                 break;
 
@@ -485,7 +504,8 @@ static int bt_detect(struct si_sm_data *bt)
            but that's what you get from reading a bogus address, so we
            test that first.  The calling routine uses negative logic. */
 
-        if ((BT_STATUS == 0xFF) && (BT_INTMASK_R == 0xFF)) return 1;
+        if ((BT_STATUS == 0xFF) && (BT_INTMASK_R == 0xFF))
+               return 1;
         reset_flags(bt);
         return 0;
 }
@@ -501,7 +521,6 @@ static int bt_size(void)
 
 struct si_sm_handlers bt_smi_handlers =
 {
-        .version           = IPMI_BT_VERSION,
         .init_data         = bt_init_data,
         .start_transaction = bt_start_transaction,
         .get_result        = bt_get_result,
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index e0a53570fea1..883ac4352be4 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -47,8 +47,6 @@
 #include <linux/device.h>
 #include <linux/compat.h>
 
-#define IPMI_DEVINTF_VERSION "v33"
-
 struct ipmi_file_private
 {
         ipmi_user_t          user;
@@ -411,6 +409,7 @@ static int ipmi_ioctl(struct inode  *inode,
                 break;
         }
 
+        /* The next four are legacy, not per-channel. */
         case IPMICTL_SET_MY_ADDRESS_CMD:
         {
                 unsigned int val;
@@ -420,22 +419,25 @@ static int ipmi_ioctl(struct inode  *inode,
                         break;
                 }
 
-                ipmi_set_my_address(priv->user, val);
-                rv = 0;
+                rv = ipmi_set_my_address(priv->user, 0, val);
                 break;
         }
 
         case IPMICTL_GET_MY_ADDRESS_CMD:
         {
-                unsigned int val;
+                unsigned int  val;
+                unsigned char rval;
+
+                rv = ipmi_get_my_address(priv->user, 0, &rval);
+                if (rv)
+                        break;
 
-                val = ipmi_get_my_address(priv->user);
+                val = rval;
 
                 if (copy_to_user(arg, &val, sizeof(val))) {
                         rv = -EFAULT;
                         break;
                 }
-                rv = 0;
                 break;
         }
 
@@ -448,24 +450,94 @@ static int ipmi_ioctl(struct inode  *inode,
                         break;
                 }
 
-                ipmi_set_my_LUN(priv->user, val);
-                rv = 0;
+                rv = ipmi_set_my_LUN(priv->user, 0, val);
                 break;
         }
 
         case IPMICTL_GET_MY_LUN_CMD:
         {
-                unsigned int val;
+                unsigned int  val;
+                unsigned char rval;
 
-                val = ipmi_get_my_LUN(priv->user);
+                rv = ipmi_get_my_LUN(priv->user, 0, &rval);
+                if (rv)
+                        break;
+
+                val = rval;
+
+                if (copy_to_user(arg, &val, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+                break;
+        }
+
+        case IPMICTL_SET_MY_CHANNEL_ADDRESS_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                return ipmi_set_my_address(priv->user, val.channel, val.value);
+                break;
+        }
+
+        case IPMICTL_GET_MY_CHANNEL_ADDRESS_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                rv = ipmi_get_my_address(priv->user, val.channel, &val.value);
+                if (rv)
+                        break;
+
+                if (copy_to_user(arg, &val, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+                break;
+        }
+
+        case IPMICTL_SET_MY_CHANNEL_LUN_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                rv = ipmi_set_my_LUN(priv->user, val.channel, val.value);
+                break;
+        }
+
+        case IPMICTL_GET_MY_CHANNEL_LUN_CMD:
+        {
+                struct ipmi_channel_lun_address_set val;
+
+                if (copy_from_user(&val, arg, sizeof(val))) {
+                        rv = -EFAULT;
+                        break;
+                }
+
+                rv = ipmi_get_my_LUN(priv->user, val.channel, &val.value);
+                if (rv)
+                        break;
 
                 if (copy_to_user(arg, &val, sizeof(val))) {
                         rv = -EFAULT;
                         break;
                 }
-                rv = 0;
                 break;
         }
+
         case IPMICTL_SET_TIMING_PARMS_CMD:
         {
                 struct ipmi_timing_parms parms;
@@ -748,8 +820,7 @@ static __init int init_ipmi_devintf(void)
         if (ipmi_major < 0)
                 return -EINVAL;
 
-        printk(KERN_INFO "ipmi device interface version "
-               IPMI_DEVINTF_VERSION "\n");
+        printk(KERN_INFO "ipmi device interface\n");
 
         ipmi_class = class_create(THIS_MODULE, "ipmi");
         if (IS_ERR(ipmi_class)) {
@@ -792,3 +863,5 @@ static __exit void cleanup_ipmi(void)
 module_exit(cleanup_ipmi);
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("Linux device interface for the IPMI message handler.");
diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c
index 48cce24329be..d21853a594a3 100644
--- a/drivers/char/ipmi/ipmi_kcs_sm.c
+++ b/drivers/char/ipmi/ipmi_kcs_sm.c
@@ -42,8 +42,6 @@
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
-#define IPMI_KCS_VERSION "v33"
-
 /* Set this if you want a printout of why the state machine was hosed
    when it gets hosed. */
 #define DEBUG_HOSED_REASON
@@ -489,7 +487,6 @@ static void kcs_cleanup(struct si_sm_data *kcs)
 
 struct si_sm_handlers kcs_smi_handlers =
 {
-        .version           = IPMI_KCS_VERSION,
         .init_data         = init_kcs_data,
         .start_transaction = start_kcs_transaction,
         .get_result        = get_kcs_result,
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index e16c13fe698d..463351d4f942 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -47,7 +47,8 @@
 #include <linux/proc_fs.h>
 
 #define PFX "IPMI message handler: "
-#define IPMI_MSGHANDLER_VERSION "v33"
+
+#define IPMI_DRIVER_VERSION "36.0"
 
 static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);
 static int ipmi_init_msghandler(void);
@@ -116,7 +117,7 @@ struct seq_table
         do {                                                            \
                 seq = ((msgid >> 26) & 0x3f);                           \
                 seqid = (msgid & 0x3fffff);                             \
-        } while(0)
+        } while (0)
 
 #define NEXT_SEQID(seqid) (((seqid) + 1) & 0x3fffff)
 
@@ -124,6 +125,14 @@ struct ipmi_channel
 {
         unsigned char medium;
         unsigned char protocol;
+
+        /* My slave address.  This is initialized to IPMI_BMC_SLAVE_ADDR,
+           but may be changed by the user. */
+        unsigned char address;
+
+        /* My LUN.  This should generally stay the SMS LUN, but just in
+           case... */
+        unsigned char lun;
 };
 
 #ifdef CONFIG_PROC_FS
@@ -135,7 +144,7 @@ struct ipmi_proc_entry
 #endif
 
 #define IPMI_IPMB_NUM_SEQ       64
-#define IPMI_MAX_CHANNELS       8
+#define IPMI_MAX_CHANNELS       16
 struct ipmi_smi
 {
         /* What interface number are we? */
@@ -193,20 +202,6 @@ struct ipmi_smi
         struct list_head waiting_events;
         unsigned int     waiting_events_count; /* How many events in queue? */
 
-        /* This will be non-null if someone registers to receive all
-           IPMI commands (this is for interface emulation).  There
-           may not be any things in the cmd_rcvrs list above when
-           this is registered. */
-        ipmi_user_t all_cmd_rcvr;
-
-        /* My slave address.  This is initialized to IPMI_BMC_SLAVE_ADDR,
-           but may be changed by the user. */
-        unsigned char my_address;
-
-        /* My LUN.  This should generally stay the SMS LUN, but just in
-           case... */
-        unsigned char my_lun;
-
         /* The event receiver for my BMC, only really used at panic
            shutdown as a place to store this. */
         unsigned char event_receiver;
@@ -218,7 +213,7 @@ struct ipmi_smi
            interface comes in with a NULL user, call this routine with
            it.  Note that the message will still be freed by the
            caller.  This only works on the system interface. */
-        void (*null_user_handler)(ipmi_smi_t intf, struct ipmi_smi_msg *msg);
+        void (*null_user_handler)(ipmi_smi_t intf, struct ipmi_recv_msg *msg);
 
         /* When we are scanning the channels for an SMI, this will
            tell which channel we are scanning. */
@@ -325,7 +320,7 @@ int ipmi_smi_watcher_register(struct ipmi_smi_watcher *watcher)
         down_read(&interfaces_sem);
         down_write(&smi_watchers_sem);
         list_add(&(watcher->link), &smi_watchers);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 if (ipmi_interfaces[i] != NULL) {
                         watcher->new_smi(i);
                 }
@@ -458,7 +453,27 @@ unsigned int ipmi_addr_length(int addr_type)
 
 static void deliver_response(struct ipmi_recv_msg *msg)
 {
-        msg->user->handler->ipmi_recv_hndl(msg, msg->user->handler_data);
+        if (! msg->user) {
+                ipmi_smi_t    intf = msg->user_msg_data;
+                unsigned long flags;
+
+                /* Special handling for NULL users. */
+                if (intf->null_user_handler) {
+                        intf->null_user_handler(intf, msg);
+                        spin_lock_irqsave(&intf->counter_lock, flags);
+                        intf->handled_local_responses++;
+                        spin_unlock_irqrestore(&intf->counter_lock, flags);
+                } else {
+                        /* No handler, so give up. */
+                        spin_lock_irqsave(&intf->counter_lock, flags);
+                        intf->unhandled_local_responses++;
+                        spin_unlock_irqrestore(&intf->counter_lock, flags);
+                }
+                ipmi_free_recv_msg(msg);
+        } else {
+                msg->user->handler->ipmi_recv_hndl(msg,
+                                                   msg->user->handler_data);
+        }
 }
 
 /* Find the next sequence number not being used and add the given
@@ -475,9 +490,9 @@ static int intf_next_seq(ipmi_smi_t           intf,
         int          rv = 0;
         unsigned int i;
 
-        for (i=intf->curr_seq;
+        for (i = intf->curr_seq;
              (i+1)%IPMI_IPMB_NUM_SEQ != intf->curr_seq;
-             i=(i+1)%IPMI_IPMB_NUM_SEQ)
+             i = (i+1)%IPMI_IPMB_NUM_SEQ)
         {
                 if (! intf->seq_table[i].inuse)
                         break;
@@ -712,7 +727,7 @@ static int ipmi_destroy_user_nolock(ipmi_user_t user)
 
         /* Remove the user from the interfaces sequence table. */
         spin_lock_irqsave(&(user->intf->seq_lock), flags);
-        for (i=0; i<IPMI_IPMB_NUM_SEQ; i++) {
+        for (i = 0; i < IPMI_IPMB_NUM_SEQ; i++) {
                 if (user->intf->seq_table[i].inuse
                     && (user->intf->seq_table[i].recv_msg->user == user))
                 {
@@ -766,26 +781,44 @@ void ipmi_get_version(ipmi_user_t   user,
         *minor = user->intf->version_minor;
 }
 
-void ipmi_set_my_address(ipmi_user_t   user,
-                         unsigned char address)
+int ipmi_set_my_address(ipmi_user_t   user,
+                        unsigned int  channel,
+                        unsigned char address)
 {
-        user->intf->my_address = address;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        user->intf->channels[channel].address = address;
+        return 0;
 }
 
-unsigned char ipmi_get_my_address(ipmi_user_t user)
+int ipmi_get_my_address(ipmi_user_t   user,
+                        unsigned int  channel,
+                        unsigned char *address)
 {
-        return user->intf->my_address;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        *address = user->intf->channels[channel].address;
+        return 0;
 }
 
-void ipmi_set_my_LUN(ipmi_user_t   user,
-                     unsigned char LUN)
+int ipmi_set_my_LUN(ipmi_user_t   user,
+                    unsigned int  channel,
+                    unsigned char LUN)
 {
-        user->intf->my_lun = LUN & 0x3;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        user->intf->channels[channel].lun = LUN & 0x3;
+        return 0;
 }
 
-unsigned char ipmi_get_my_LUN(ipmi_user_t user)
+int ipmi_get_my_LUN(ipmi_user_t   user,
+                    unsigned int  channel,
+                    unsigned char *address)
 {
-        return user->intf->my_lun;
+        if (channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        *address = user->intf->channels[channel].lun;
+        return 0;
 }
 
 int ipmi_set_gets_events(ipmi_user_t user, int val)
@@ -828,11 +861,6 @@ int ipmi_register_for_cmd(ipmi_user_t   user,
 
         read_lock(&(user->intf->users_lock));
         write_lock_irqsave(&(user->intf->cmd_rcvr_lock), flags);
-        if (user->intf->all_cmd_rcvr != NULL) {
-                rv = -EBUSY;
-                goto out_unlock;
-        }
-
         /* Make sure the command/netfn is not already registered. */
         list_for_each_entry(cmp, &(user->intf->cmd_rcvrs), link) {
                 if ((cmp->netfn == netfn) && (cmp->cmd == cmd)) {
@@ -847,7 +875,7 @@ int ipmi_register_for_cmd(ipmi_user_t   user,
                 rcvr->user = user;
                 list_add_tail(&(rcvr->link), &(user->intf->cmd_rcvrs));
         }
- out_unlock:
+
         write_unlock_irqrestore(&(user->intf->cmd_rcvr_lock), flags);
         read_unlock(&(user->intf->users_lock));
 
@@ -1213,7 +1241,7 @@ static inline int i_ipmi_request(ipmi_user_t          user,
                 unsigned char         ipmb_seq;
                 long                  seqid;
 
-                if (addr->channel > IPMI_NUM_CHANNELS) {
+                if (addr->channel >= IPMI_NUM_CHANNELS) {
                         spin_lock_irqsave(&intf->counter_lock, flags);
                         intf->sent_invalid_commands++;
                         spin_unlock_irqrestore(&intf->counter_lock, flags);
@@ -1331,7 +1359,7 @@ static inline int i_ipmi_request(ipmi_user_t          user,
 #ifdef DEBUG_MSGING
         {
                 int m;
-                for (m=0; m<smi_msg->data_size; m++)
+                for (m = 0; m < smi_msg->data_size; m++)
                         printk(" %2.2x", smi_msg->data[m]);
                 printk("\n");
         }
@@ -1346,6 +1374,18 @@ static inline int i_ipmi_request(ipmi_user_t          user,
         return rv;
 }
 
+static int check_addr(ipmi_smi_t       intf,
+                      struct ipmi_addr *addr,
+                      unsigned char    *saddr,
+                      unsigned char    *lun)
+{
+        if (addr->channel >= IPMI_MAX_CHANNELS)
+                return -EINVAL;
+        *lun = intf->channels[addr->channel].lun;
+        *saddr = intf->channels[addr->channel].address;
+        return 0;
+}
+
 int ipmi_request_settime(ipmi_user_t      user,
                          struct ipmi_addr *addr,
                          long             msgid,
@@ -1355,6 +1395,14 @@ int ipmi_request_settime(ipmi_user_t      user,
                          int              retries,
                          unsigned int     retry_time_ms)
 {
+        unsigned char saddr, lun;
+        int           rv;
+
+        if (! user)
+                return -EINVAL;
+        rv = check_addr(user->intf, addr, &saddr, &lun);
+        if (rv)
+                return rv;
         return i_ipmi_request(user,
                               user->intf,
                               addr,
@@ -1363,8 +1411,8 @@ int ipmi_request_settime(ipmi_user_t      user,
                               user_msg_data,
                               NULL, NULL,
                               priority,
-                              user->intf->my_address,
-                              user->intf->my_lun,
+                              saddr,
+                              lun,
                               retries,
                               retry_time_ms);
 }
@@ -1378,6 +1426,14 @@ int ipmi_request_supply_msgs(ipmi_user_t          user,
                              struct ipmi_recv_msg *supplied_recv,
                              int                  priority)
 {
+        unsigned char saddr, lun;
+        int           rv;
+
+        if (! user)
+                return -EINVAL;
+        rv = check_addr(user->intf, addr, &saddr, &lun);
+        if (rv)
+                return rv;
         return i_ipmi_request(user,
                               user->intf,
                               addr,
@@ -1387,8 +1443,8 @@ int ipmi_request_supply_msgs(ipmi_user_t          user,
                               supplied_smi,
                               supplied_recv,
                               priority,
-                              user->intf->my_address,
-                              user->intf->my_lun,
+                              saddr,
+                              lun,
                               -1, 0);
 }
 
@@ -1397,8 +1453,15 @@ static int ipmb_file_read_proc(char *page, char **start, off_t off,
 {
         char       *out = (char *) page;
         ipmi_smi_t intf = data;
+        int        i;
+        int        rv= 0;
 
-        return sprintf(out, "%x\n", intf->my_address);
+        for (i = 0; i < IPMI_MAX_CHANNELS; i++)
+                rv += sprintf(out+rv, "%x ", intf->channels[i].address);
+        out[rv-1] = '\n'; /* Replace the final space with a newline */
+        out[rv] = '\0';
+        rv++;
+        return rv;
 }
 
 static int version_file_read_proc(char *page, char **start, off_t off,
@@ -1588,29 +1651,30 @@ send_channel_info_cmd(ipmi_smi_t intf, int chan)
                               (struct ipmi_addr *) &si,
                               0,
                               &msg,
-                              NULL,
+                              intf,
                               NULL,
                               NULL,
                               0,
-                              intf->my_address,
-                              intf->my_lun,
+                              intf->channels[0].address,
+                              intf->channels[0].lun,
                               -1, 0);
 }
 
 static void
-channel_handler(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
+channel_handler(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
 {
         int rv = 0;
         int chan;
 
-        if ((msg->rsp[0] == (IPMI_NETFN_APP_RESPONSE << 2))
-            && (msg->rsp[1] == IPMI_GET_CHANNEL_INFO_CMD))
+        if ((msg->addr.addr_type == IPMI_SYSTEM_INTERFACE_ADDR_TYPE)
+            && (msg->msg.netfn == IPMI_NETFN_APP_RESPONSE)
+            && (msg->msg.cmd == IPMI_GET_CHANNEL_INFO_CMD))
         {
                 /* It's the one we want */
-                if (msg->rsp[2] != 0) {
+                if (msg->msg.data[0] != 0) {
                         /* Got an error from the channel, just go on. */
 
-                        if (msg->rsp[2] == IPMI_INVALID_COMMAND_ERR) {
+                        if (msg->msg.data[0] == IPMI_INVALID_COMMAND_ERR) {
                                 /* If the MC does not support this
                                    command, that is legal.  We just
                                    assume it has one IPMB at channel
@@ -1627,13 +1691,13 @@ channel_handler(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
                         }
                         goto next_channel;
                 }
-                if (msg->rsp_size < 6) {
+                if (msg->msg.data_len < 4) {
                         /* Message not big enough, just go on. */
                         goto next_channel;
                 }
                 chan = intf->curr_channel;
-                intf->channels[chan].medium = msg->rsp[4] & 0x7f;
-                intf->channels[chan].protocol = msg->rsp[5] & 0x1f;
+                intf->channels[chan].medium = msg->msg.data[2] & 0x7f;
+                intf->channels[chan].protocol = msg->msg.data[3] & 0x1f;
 
         next_channel:
                 intf->curr_channel++;
@@ -1691,22 +1755,24 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
         rv = -ENOMEM;
 
         down_write(&interfaces_sem);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 if (ipmi_interfaces[i] == NULL) {
                         new_intf->intf_num = i;
                         new_intf->version_major = version_major;
                         new_intf->version_minor = version_minor;
-                        if (slave_addr == 0)
-                                new_intf->my_address = IPMI_BMC_SLAVE_ADDR;
-                        else
-                                new_intf->my_address = slave_addr;
-                        new_intf->my_lun = 2;  /* the SMS LUN. */
+                        for (j = 0; j < IPMI_MAX_CHANNELS; j++) {
+                                new_intf->channels[j].address
+                                        = IPMI_BMC_SLAVE_ADDR;
+                                new_intf->channels[j].lun = 2;
+                        }
+                        if (slave_addr != 0)
+                                new_intf->channels[0].address = slave_addr;
                         rwlock_init(&(new_intf->users_lock));
                         INIT_LIST_HEAD(&(new_intf->users));
                         new_intf->handlers = handlers;
                         new_intf->send_info = send_info;
                         spin_lock_init(&(new_intf->seq_lock));
-                        for (j=0; j<IPMI_IPMB_NUM_SEQ; j++) {
+                        for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++) {
                                 new_intf->seq_table[j].inuse = 0;
                                 new_intf->seq_table[j].seqid = 0;
                         }
@@ -1722,7 +1788,6 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                         rwlock_init(&(new_intf->cmd_rcvr_lock));
                         init_waitqueue_head(&new_intf->waitq);
                         INIT_LIST_HEAD(&(new_intf->cmd_rcvrs));
-                        new_intf->all_cmd_rcvr = NULL;
 
                         spin_lock_init(&(new_intf->counter_lock));
 
@@ -1814,7 +1879,7 @@ static void clean_up_interface_data(ipmi_smi_t intf)
         free_recv_msg_list(&(intf->waiting_events));
         free_cmd_rcvr_list(&(intf->cmd_rcvrs));
 
-        for (i=0; i<IPMI_IPMB_NUM_SEQ; i++) {
+        for (i = 0; i < IPMI_IPMB_NUM_SEQ; i++) {
                 if ((intf->seq_table[i].inuse)
                     && (intf->seq_table[i].recv_msg))
                 {
@@ -1833,7 +1898,7 @@ int ipmi_unregister_smi(ipmi_smi_t intf)
         down_write(&interfaces_sem);
         if (list_empty(&(intf->users)))
         {
-                for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+                for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                         if (ipmi_interfaces[i] == intf) {
                                 remove_proc_entries(intf);
                                 spin_lock_irqsave(&interfaces_lock, flags);
@@ -1960,15 +2025,11 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
 
         read_lock(&(intf->cmd_rcvr_lock));
         
-        if (intf->all_cmd_rcvr) {
-                user = intf->all_cmd_rcvr;
-        } else {
-                /* Find the command/netfn. */
-                list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
-                        if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
-                                user = rcvr->user;
-                                break;
-                        }
+        /* Find the command/netfn. */
+        list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
+                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
+                        user = rcvr->user;
+                        break;
                 }
         }
         read_unlock(&(intf->cmd_rcvr_lock));
@@ -1985,7 +2046,7 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
                 msg->data[3] = msg->rsp[6];
                 msg->data[4] = ((netfn + 1) << 2) | (msg->rsp[7] & 0x3);
                 msg->data[5] = ipmb_checksum(&(msg->data[3]), 2);
-                msg->data[6] = intf->my_address;
+                msg->data[6] = intf->channels[msg->rsp[3] & 0xf].address;
                 /* rqseq/lun */
                 msg->data[7] = (msg->rsp[7] & 0xfc) | (msg->rsp[4] & 0x3);
                 msg->data[8] = msg->rsp[8]; /* cmd */
@@ -1997,7 +2058,7 @@ static int handle_ipmb_get_msg_cmd(ipmi_smi_t          intf,
         {
                 int m;
                 printk("Invalid command:");
-                for (m=0; m<msg->data_size; m++)
+                for (m = 0; m < msg->data_size; m++)
                         printk(" %2.2x", msg->data[m]);
                 printk("\n");
         }
@@ -2145,15 +2206,11 @@ static int handle_lan_get_msg_cmd(ipmi_smi_t          intf,
 
         read_lock(&(intf->cmd_rcvr_lock));
 
-        if (intf->all_cmd_rcvr) {
-                user = intf->all_cmd_rcvr;
-        } else {
-                /* Find the command/netfn. */
-                list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
-                        if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
-                                user = rcvr->user;
-                                break;
-                        }
+        /* Find the command/netfn. */
+        list_for_each_entry(rcvr, &(intf->cmd_rcvrs), link) {
+                if ((rcvr->netfn == netfn) && (rcvr->cmd == cmd)) {
+                        user = rcvr->user;
+                        break;
                 }
         }
         read_unlock(&(intf->cmd_rcvr_lock));
@@ -2330,6 +2387,14 @@ static int handle_bmc_rsp(ipmi_smi_t          intf,
         unsigned long        flags;
 
         recv_msg = (struct ipmi_recv_msg *) msg->user_data;
+        if (recv_msg == NULL)
+        {
+                printk(KERN_WARNING"IPMI message received with no owner. This\n"
+                        "could be because of a malformed message, or\n"
+                        "because of a hardware error.  Contact your\n"
+                        "hardware vender for assistance\n");
+                return 0;
+        }
 
         /* Make sure the user still exists. */
         list_for_each_entry(user, &(intf->users), link) {
@@ -2340,19 +2405,11 @@ static int handle_bmc_rsp(ipmi_smi_t          intf,
                 }
         }
 
-        if (!found) {
-                /* Special handling for NULL users. */
-                if (!recv_msg->user && intf->null_user_handler){
-                        intf->null_user_handler(intf, msg);
-                        spin_lock_irqsave(&intf->counter_lock, flags);
-                        intf->handled_local_responses++;
-                        spin_unlock_irqrestore(&intf->counter_lock, flags);
-                }else{
-                        /* The user for the message went away, so give up. */
-                        spin_lock_irqsave(&intf->counter_lock, flags);
-                        intf->unhandled_local_responses++;
-                        spin_unlock_irqrestore(&intf->counter_lock, flags);
-                }
+        if ((! found) && recv_msg->user) {
+                /* The user for the message went away, so give up. */
+                spin_lock_irqsave(&intf->counter_lock, flags);
+                intf->unhandled_local_responses++;
+                spin_unlock_irqrestore(&intf->counter_lock, flags);
                 ipmi_free_recv_msg(recv_msg);
         } else {
                 struct ipmi_system_interface_addr *smi_addr;
@@ -2392,7 +2449,7 @@ static int handle_new_recv_msg(ipmi_smi_t          intf,
 #ifdef DEBUG_MSGING
         int m;
         printk("Recv:");
-        for (m=0; m<msg->rsp_size; m++)
+        for (m = 0; m < msg->rsp_size; m++)
                 printk(" %2.2x", msg->rsp[m]);
         printk("\n");
 #endif
@@ -2626,7 +2683,7 @@ smi_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg,
         {
                 int m;
                 printk("Resend: ");
-                for (m=0; m<smi_msg->data_size; m++)
+                for (m = 0; m < smi_msg->data_size; m++)
                         printk(" %2.2x", smi_msg->data[m]);
                 printk("\n");
         }
@@ -2647,7 +2704,7 @@ ipmi_timeout_handler(long timeout_period)
         INIT_LIST_HEAD(&timeouts);
 
         spin_lock(&interfaces_lock);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -2672,7 +2729,7 @@ ipmi_timeout_handler(long timeout_period)
                    have timed out, putting them in the timeouts
                    list. */
                 spin_lock_irqsave(&(intf->seq_lock), flags);
-                for (j=0; j<IPMI_IPMB_NUM_SEQ; j++) {
+                for (j = 0; j < IPMI_IPMB_NUM_SEQ; j++) {
                         struct seq_table *ent = &(intf->seq_table[j]);
                         if (!ent->inuse)
                                 continue;
@@ -2712,7 +2769,7 @@ ipmi_timeout_handler(long timeout_period)
                                 spin_unlock(&intf->counter_lock);
                                 smi_msg = smi_from_recv_msg(intf,
                                                 ent->recv_msg, j, ent->seqid);
-                                if(!smi_msg)
+                                if (! smi_msg)
                                         continue;
 
                                 spin_unlock_irqrestore(&(intf->seq_lock),flags);
@@ -2743,7 +2800,7 @@ static void ipmi_request_event(void)
         int        i;
 
         spin_lock(&interfaces_lock);
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -2838,28 +2895,30 @@ static void dummy_recv_done_handler(struct ipmi_recv_msg *msg)
 }
 
 #ifdef CONFIG_IPMI_PANIC_STRING
-static void event_receiver_fetcher(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
+static void event_receiver_fetcher(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
 {
-        if ((msg->rsp[0] == (IPMI_NETFN_SENSOR_EVENT_RESPONSE << 2))
-            && (msg->rsp[1] == IPMI_GET_EVENT_RECEIVER_CMD)
-            && (msg->rsp[2] == IPMI_CC_NO_ERROR))
+        if ((msg->addr.addr_type == IPMI_SYSTEM_INTERFACE_ADDR_TYPE)
+            && (msg->msg.netfn == IPMI_NETFN_SENSOR_EVENT_RESPONSE)
+            && (msg->msg.cmd == IPMI_GET_EVENT_RECEIVER_CMD)
+            && (msg->msg.data[0] == IPMI_CC_NO_ERROR))
         {
                 /* A get event receiver command, save it. */
-                intf->event_receiver = msg->rsp[3];
-                intf->event_receiver_lun = msg->rsp[4] & 0x3;
+                intf->event_receiver = msg->msg.data[1];
+                intf->event_receiver_lun = msg->msg.data[2] & 0x3;
         }
 }
 
-static void device_id_fetcher(ipmi_smi_t intf, struct ipmi_smi_msg *msg)
+static void device_id_fetcher(ipmi_smi_t intf, struct ipmi_recv_msg *msg)
 {
-        if ((msg->rsp[0] == (IPMI_NETFN_APP_RESPONSE << 2))
-            && (msg->rsp[1] == IPMI_GET_DEVICE_ID_CMD)
-            && (msg->rsp[2] == IPMI_CC_NO_ERROR))
+        if ((msg->addr.addr_type == IPMI_SYSTEM_INTERFACE_ADDR_TYPE)
+            && (msg->msg.netfn == IPMI_NETFN_APP_RESPONSE)
+            && (msg->msg.cmd == IPMI_GET_DEVICE_ID_CMD)
+            && (msg->msg.data[0] == IPMI_CC_NO_ERROR))
         {
                 /* A get device id command, save if we are an event
                    receiver or generator. */
-                intf->local_sel_device = (msg->rsp[8] >> 2) & 1;
-                intf->local_event_generator = (msg->rsp[8] >> 5) & 1;
+                intf->local_sel_device = (msg->msg.data[6] >> 2) & 1;
+                intf->local_event_generator = (msg->msg.data[6] >> 5) & 1;
         }
 }
 #endif
@@ -2903,7 +2962,7 @@ static void send_panic_events(char *str)
         recv_msg.done = dummy_recv_done_handler;
 
         /* For every registered interface, send the event. */
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -2915,12 +2974,12 @@ static void send_panic_events(char *str)
                                &addr,
                                0,
                                &msg,
-                               NULL,
+                               intf,
                                &smi_msg,
                                &recv_msg,
                                0,
-                               intf->my_address,
-                               intf->my_lun,
+                               intf->channels[0].address,
+                               intf->channels[0].lun,
                                0, 1); /* Don't retry, and don't wait. */
         }
 
@@ -2930,7 +2989,7 @@ static void send_panic_events(char *str)
         if (!str) 
                 return;
 
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 char                  *p = str;
                 struct ipmi_ipmb_addr *ipmb;
                 int                   j;
@@ -2961,12 +3020,12 @@ static void send_panic_events(char *str)
                                &addr,
                                0,
                                &msg,
-                               NULL,
+                               intf,
                                &smi_msg,
                                &recv_msg,
                                0,
-                               intf->my_address,
-                               intf->my_lun,
+                               intf->channels[0].address,
+                               intf->channels[0].lun,
                                0, 1); /* Don't retry, and don't wait. */
 
                 if (intf->local_event_generator) {
@@ -2981,12 +3040,12 @@ static void send_panic_events(char *str)
                                        &addr,
                                        0,
                                        &msg,
-                                       NULL,
+                                       intf,
                                        &smi_msg,
                                        &recv_msg,
                                        0,
-                                       intf->my_address,
-                                       intf->my_lun,
+                                       intf->channels[0].address,
+                                       intf->channels[0].lun,
                                        0, 1); /* no retry, and no wait. */
                 }
                 intf->null_user_handler = NULL;
@@ -2996,7 +3055,7 @@ static void send_panic_events(char *str)
                    be zero, and it must not be my address. */
                 if (((intf->event_receiver & 1) == 0)
                     && (intf->event_receiver != 0)
-                    && (intf->event_receiver != intf->my_address))
+                    && (intf->event_receiver != intf->channels[0].address))
                 {
                         /* The event receiver is valid, send an IPMB
                            message. */
@@ -3031,7 +3090,7 @@ static void send_panic_events(char *str)
                         data[0] = 0;
                         data[1] = 0;
                         data[2] = 0xf0; /* OEM event without timestamp. */
-                        data[3] = intf->my_address;
+                        data[3] = intf->channels[0].address;
                         data[4] = j++; /* sequence # */
                         /* Always give 11 bytes, so strncpy will fill
                            it with zeroes for me. */
@@ -3043,12 +3102,12 @@ static void send_panic_events(char *str)
                                        &addr,
                                        0,
                                        &msg,
-                                       NULL,
+                                       intf,
                                        &smi_msg,
                                        &recv_msg,
                                        0,
-                                       intf->my_address,
-                                       intf->my_lun,
+                                       intf->channels[0].address,
+                                       intf->channels[0].lun,
                                        0, 1); /* no retry, and no wait. */
                 }
         }       
@@ -3070,7 +3129,7 @@ static int panic_event(struct notifier_block *this,
         has_paniced = 1;
 
         /* For every registered interface, set it to run to completion. */
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 intf = ipmi_interfaces[i];
                 if (intf == NULL)
                         continue;
@@ -3099,9 +3158,9 @@ static int ipmi_init_msghandler(void)
                 return 0;
 
         printk(KERN_INFO "ipmi message handler version "
-               IPMI_MSGHANDLER_VERSION "\n");
+               IPMI_DRIVER_VERSION "\n");
 
-        for (i=0; i<MAX_IPMI_INTERFACES; i++) {
+        for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
                 ipmi_interfaces[i] = NULL;
         }
 
@@ -3171,6 +3230,9 @@ module_exit(cleanup_ipmi);
 
 module_init(ipmi_init_msghandler_mod);
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("Incoming and outgoing message routing for an IPMI interface.");
+MODULE_VERSION(IPMI_DRIVER_VERSION);
 
 EXPORT_SYMBOL(ipmi_create_user);
 EXPORT_SYMBOL(ipmi_destroy_user);
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index f951c30236c9..e82a96ba396b 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -42,7 +42,6 @@
 #include <linux/ipmi_smi.h>
 
 #define PFX "IPMI poweroff: "
-#define IPMI_POWEROFF_VERSION   "v33"
 
 /* Where to we insert our poweroff function? */
 extern void (*pm_power_off)(void);
@@ -53,16 +52,17 @@ extern void (*pm_power_off)(void);
 #define IPMI_CHASSIS_POWER_CYCLE        0x02    /* power cycle */
 
 /* the IPMI data command */
-static int poweroff_control = IPMI_CHASSIS_POWER_DOWN;
+static int poweroff_powercycle;
 
 /* parameter definition to allow user to flag power cycle */
-module_param(poweroff_control, int, IPMI_CHASSIS_POWER_DOWN);
-MODULE_PARM_DESC(poweroff_control, " Set to 2 to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down.");
+module_param(poweroff_powercycle, int, 0);
+MODULE_PARM_DESC(poweroff_powercycles, " Set to non-zero to enable power cycle instead of power down. Power cycle is contingent on hardware support, otherwise it defaults back to power down.");
 
 /* Stuff from the get device id command. */
 static unsigned int mfg_id;
 static unsigned int prod_id;
 static unsigned char capabilities;
+static unsigned char ipmi_version;
 
 /* We use our own messages for this operation, we don't let the system
    allocate them, since we may be in a panic situation.  The whole
@@ -338,6 +338,25 @@ static void ipmi_poweroff_cpi1 (ipmi_user_t user)
 }
 
 /*
+ * ipmi_dell_chassis_detect()
+ * Dell systems with IPMI < 1.5 don't set the chassis capability bit
+ * but they can handle a chassis poweroff or powercycle command.
+ */
+
+#define DELL_IANA_MFR_ID {0xA2, 0x02, 0x00}
+static int ipmi_dell_chassis_detect (ipmi_user_t user)
+{
+        const char ipmi_version_major = ipmi_version & 0xF;
+        const char ipmi_version_minor = (ipmi_version >> 4) & 0xF;
+        const char mfr[3]=DELL_IANA_MFR_ID;
+        if (!memcmp(mfr, &mfg_id, sizeof(mfr)) &&
+            ipmi_version_major <= 1 &&
+            ipmi_version_minor < 5)
+                return 1;
+        return 0;
+}
+
+/*
  * Standard chassis support
  */
 
@@ -366,37 +385,34 @@ static void ipmi_poweroff_chassis (ipmi_user_t user)
 
  powercyclefailed:
         printk(KERN_INFO PFX "Powering %s via IPMI chassis control command\n",
-                ((poweroff_control != IPMI_CHASSIS_POWER_CYCLE) ? "down" : "cycle"));
+                (poweroff_powercycle ? "cycle" : "down"));
 
         /*
          * Power down
          */
         send_msg.netfn = IPMI_NETFN_CHASSIS_REQUEST;
         send_msg.cmd = IPMI_CHASSIS_CONTROL_CMD;
-        data[0] = poweroff_control;
+        if (poweroff_powercycle)
+                data[0] = IPMI_CHASSIS_POWER_CYCLE;
+        else
+                data[0] = IPMI_CHASSIS_POWER_DOWN;
         send_msg.data = data;
         send_msg.data_len = sizeof(data);
         rv = ipmi_request_in_rc_mode(user,
                                      (struct ipmi_addr *) &smi_addr,
                                      &send_msg);
         if (rv) {
-                switch (poweroff_control) {
-                        case IPMI_CHASSIS_POWER_CYCLE:
-                                /* power cycle failed, default to power down */
-                                printk(KERN_ERR PFX "Unable to send chassis power " \
-                                        "cycle message, IPMI error 0x%x\n", rv);
-                                poweroff_control = IPMI_CHASSIS_POWER_DOWN;
-                                goto powercyclefailed;
-
-                        case IPMI_CHASSIS_POWER_DOWN:
-                        default:
-                                printk(KERN_ERR PFX "Unable to send chassis power " \
-                                        "down message, IPMI error 0x%x\n", rv);
-                                break;
+                if (poweroff_powercycle) {
+                        /* power cycle failed, default to power down */
+                        printk(KERN_ERR PFX "Unable to send chassis power " \
+                               "cycle message, IPMI error 0x%x\n", rv);
+                        poweroff_powercycle = 0;
+                        goto powercyclefailed;
                 }
-        }
 
-        return;
+                printk(KERN_ERR PFX "Unable to send chassis power " \
+                       "down message, IPMI error 0x%x\n", rv);
+        }
 }
 
 
@@ -414,6 +430,9 @@ static struct poweroff_function poweroff_functions[] = {
         { .platform_type        = "CPI1",
           .detect               = ipmi_cpi1_detect,
           .poweroff_func        = ipmi_poweroff_cpi1 },
+        { .platform_type        = "chassis",
+          .detect               = ipmi_dell_chassis_detect,
+          .poweroff_func        = ipmi_poweroff_chassis },
         /* Chassis should generally be last, other things should override
            it. */
         { .platform_type        = "chassis",
@@ -499,10 +518,11 @@ static void ipmi_po_new_smi(int if_num)
         prod_id = (halt_recv_msg.msg.data[10]
                    | (halt_recv_msg.msg.data[11] << 8));
         capabilities = halt_recv_msg.msg.data[6];
+        ipmi_version = halt_recv_msg.msg.data[5];
 
 
         /* Scan for a poweroff method */
-        for (i=0; i<NUM_PO_FUNCS; i++) {
+        for (i = 0; i < NUM_PO_FUNCS; i++) {
                 if (poweroff_functions[i].detect(ipmi_user))
                         goto found;
         }
@@ -538,39 +558,35 @@ static struct ipmi_smi_watcher smi_watcher =
 
 
 #ifdef CONFIG_PROC_FS
-/* displays properties to proc */
-static int proc_read_chassctrl(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
-{
-        return sprintf(page, "%d\t[ 0=powerdown 2=powercycle ]\n",
-                        poweroff_control);
-}
+#include <linux/sysctl.h>
+
+static ctl_table ipmi_table[] = {
+        { .ctl_name     = DEV_IPMI_POWEROFF_POWERCYCLE,
+          .procname     = "poweroff_powercycle",
+          .data         = &poweroff_powercycle,
+          .maxlen       = sizeof(poweroff_powercycle),
+          .mode         = 0644,
+          .proc_handler = &proc_dointvec },
+        { }
+};
 
-/* process property writes from proc */
-static int proc_write_chassctrl(struct file *file, const char *buffer,
-                                unsigned long count, void *data)
-{
-        int          rv = count;
-        unsigned int newval = 0;
-
-        sscanf(buffer, "%d", &newval);
-        switch (newval) {
-                case IPMI_CHASSIS_POWER_CYCLE:
-                        printk(KERN_INFO PFX "power cycle is now enabled\n");
-                        poweroff_control = newval;
-                        break;
-
-                case IPMI_CHASSIS_POWER_DOWN:
-                        poweroff_control = IPMI_CHASSIS_POWER_DOWN;
-                        break;
-
-                default:
-                        rv = -EINVAL;
-                        break;
-        }
+static ctl_table ipmi_dir_table[] = {
+        { .ctl_name     = DEV_IPMI,
+          .procname     = "ipmi",
+          .mode         = 0555,
+          .child        = ipmi_table },
+        { }
+};
 
-        return rv;
-}
+static ctl_table ipmi_root_table[] = {
+        { .ctl_name     = CTL_DEV,
+          .procname     = "dev",
+          .mode         = 0555,
+          .child        = ipmi_dir_table },
+        { }
+};
+
+static struct ctl_table_header *ipmi_table_header;
 #endif /* CONFIG_PROC_FS */
 
 /*
@@ -578,42 +594,32 @@ static int proc_write_chassctrl(struct file *file, const char *buffer,
  */
 static int ipmi_poweroff_init (void)
 {
-        int                   rv;
-        struct proc_dir_entry *file;
+        int rv;
 
         printk ("Copyright (C) 2004 MontaVista Software -"
-                " IPMI Powerdown via sys_reboot version "
-                IPMI_POWEROFF_VERSION ".\n");
-
-        switch (poweroff_control) {
-                case IPMI_CHASSIS_POWER_CYCLE:
-                        printk(KERN_INFO PFX "Power cycle is enabled.\n");
-                        break;
-
-                case IPMI_CHASSIS_POWER_DOWN:
-                default:
-                        poweroff_control = IPMI_CHASSIS_POWER_DOWN;
-                        break;
+                " IPMI Powerdown via sys_reboot.\n");
+
+        if (poweroff_powercycle)
+                printk(KERN_INFO PFX "Power cycle is enabled.\n");
+
+#ifdef CONFIG_PROC_FS
+        ipmi_table_header = register_sysctl_table(ipmi_root_table, 1);
+        if (!ipmi_table_header) {
+                printk(KERN_ERR PFX "Unable to register powercycle sysctl\n");
+                rv = -ENOMEM;
+                goto out_err;
         }
+#endif
 
+#ifdef CONFIG_PROC_FS
         rv = ipmi_smi_watcher_register(&smi_watcher);
+#endif
         if (rv) {
+                unregister_sysctl_table(ipmi_table_header);
                 printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);
                 goto out_err;
         }
 
-#ifdef CONFIG_PROC_FS
-        file = create_proc_entry("poweroff_control", 0, proc_ipmi_root);
-        if (!file) {
-                printk(KERN_ERR PFX "Unable to create proc power control\n");
-        } else {
-                file->nlink = 1;
-                file->read_proc = proc_read_chassctrl;
-                file->write_proc = proc_write_chassctrl;
-                file->owner = THIS_MODULE;
-        }
-#endif
-
  out_err:
         return rv;
 }
@@ -624,7 +630,7 @@ static __exit void ipmi_poweroff_cleanup(void)
         int rv;
 
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("poweroff_control", proc_ipmi_root);
+        unregister_sysctl_table(ipmi_table_header);
 #endif
 
         ipmi_smi_watcher_unregister(&smi_watcher);
@@ -642,3 +648,5 @@ module_exit(ipmi_poweroff_cleanup);
 
 module_init(ipmi_poweroff_init);
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("IPMI Poweroff extension to sys_reboot");
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index a44b97304e95..1abec687865c 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -61,11 +61,11 @@
 # endif
 static inline void add_usec_to_timer(struct timer_list *t, long v)
 {
-        t->sub_expires += nsec_to_arch_cycle(v * 1000);
-        while (t->sub_expires >= arch_cycles_per_jiffy)
+        t->arch_cycle_expires += nsec_to_arch_cycle(v * 1000);
+        while (t->arch_cycle_expires >= arch_cycles_per_jiffy)
         {
                 t->expires++;
-                t->sub_expires -= arch_cycles_per_jiffy;
+                t->arch_cycle_expires -= arch_cycles_per_jiffy;
         }
 }
 #endif
@@ -75,8 +75,7 @@ static inline void add_usec_to_timer(struct timer_list *t, long v)
 #include <asm/io.h>
 #include "ipmi_si_sm.h"
 #include <linux/init.h>
-
-#define IPMI_SI_VERSION "v33"
+#include <linux/dmi.h>
 
 /* Measure times between events in the driver. */
 #undef DEBUG_TIMING
@@ -109,6 +108,21 @@ enum si_type {
     SI_KCS, SI_SMIC, SI_BT
 };
 
+struct ipmi_device_id {
+        unsigned char device_id;
+        unsigned char device_revision;
+        unsigned char firmware_revision_1;
+        unsigned char firmware_revision_2;
+        unsigned char ipmi_version;
+        unsigned char additional_device_support;
+        unsigned char manufacturer_id[3];
+        unsigned char product_id[2];
+        unsigned char aux_firmware_revision[4];
+} __attribute__((packed));
+
+#define ipmi_version_major(v) ((v)->ipmi_version & 0xf)
+#define ipmi_version_minor(v) ((v)->ipmi_version >> 4)
+
 struct smi_info
 {
         ipmi_smi_t             intf;
@@ -131,12 +145,24 @@ struct smi_info
         void (*irq_cleanup)(struct smi_info *info);
         unsigned int io_size;
 
+        /* Per-OEM handler, called from handle_flags().
+           Returns 1 when handle_flags() needs to be re-run
+           or 0 indicating it set si_state itself.
+        */
+        int (*oem_data_avail_handler)(struct smi_info *smi_info);
+
         /* Flags from the last GET_MSG_FLAGS command, used when an ATTN
            is set to hold the flags until we are done handling everything
            from the flags. */
 #define RECEIVE_MSG_AVAIL       0x01
 #define EVENT_MSG_BUFFER_FULL   0x02
 #define WDT_PRE_TIMEOUT_INT     0x08
+#define OEM0_DATA_AVAIL     0x20
+#define OEM1_DATA_AVAIL     0x40
+#define OEM2_DATA_AVAIL     0x80
+#define OEM_DATA_AVAIL      (OEM0_DATA_AVAIL | \
+                             OEM1_DATA_AVAIL | \
+                             OEM2_DATA_AVAIL)
         unsigned char       msg_flags;
 
         /* If set to true, this will request events the next time the
@@ -175,11 +201,7 @@ struct smi_info
            interrupts. */
         int interrupt_disabled;
 
-        unsigned char ipmi_si_dev_rev;
-        unsigned char ipmi_si_fw_rev_major;
-        unsigned char ipmi_si_fw_rev_minor;
-        unsigned char ipmi_version_major;
-        unsigned char ipmi_version_minor;
+        struct ipmi_device_id device_id;
 
         /* Slave address, could be reported from DMI. */
         unsigned char slave_addr;
@@ -245,7 +267,7 @@ static enum si_sm_result start_next_msg(struct smi_info *smi_info)
                 entry = smi_info->xmit_msgs.next;
         }
 
-        if (!entry) {
+        if (! entry) {
                 smi_info->curr_msg = NULL;
                 rv = SI_SM_IDLE;
         } else {
@@ -306,7 +328,7 @@ static void start_clear_flags(struct smi_info *smi_info)
    memory, we will re-enable the interrupt. */
 static inline void disable_si_irq(struct smi_info *smi_info)
 {
-        if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
+        if ((smi_info->irq) && (! smi_info->interrupt_disabled)) {
                 disable_irq_nosync(smi_info->irq);
                 smi_info->interrupt_disabled = 1;
         }
@@ -322,6 +344,7 @@ static inline void enable_si_irq(struct smi_info *smi_info)
 
 static void handle_flags(struct smi_info *smi_info)
 {
+ retry:
         if (smi_info->msg_flags & WDT_PRE_TIMEOUT_INT) {
                 /* Watchdog pre-timeout */
                 spin_lock(&smi_info->count_lock);
@@ -336,7 +359,7 @@ static void handle_flags(struct smi_info *smi_info)
         } else if (smi_info->msg_flags & RECEIVE_MSG_AVAIL) {
                 /* Messages available. */
                 smi_info->curr_msg = ipmi_alloc_smi_msg();
-                if (!smi_info->curr_msg) {
+                if (! smi_info->curr_msg) {
                         disable_si_irq(smi_info);
                         smi_info->si_state = SI_NORMAL;
                         return;
@@ -355,7 +378,7 @@ static void handle_flags(struct smi_info *smi_info)
         } else if (smi_info->msg_flags & EVENT_MSG_BUFFER_FULL) {
                 /* Events available. */
                 smi_info->curr_msg = ipmi_alloc_smi_msg();
-                if (!smi_info->curr_msg) {
+                if (! smi_info->curr_msg) {
                         disable_si_irq(smi_info);
                         smi_info->si_state = SI_NORMAL;
                         return;
@@ -371,6 +394,10 @@ static void handle_flags(struct smi_info *smi_info)
                         smi_info->curr_msg->data,
                         smi_info->curr_msg->data_size);
                 smi_info->si_state = SI_GETTING_EVENTS;
+        } else if (smi_info->msg_flags & OEM_DATA_AVAIL) {
+                if (smi_info->oem_data_avail_handler)
+                        if (smi_info->oem_data_avail_handler(smi_info))
+                                goto retry;
         } else {
                 smi_info->si_state = SI_NORMAL;
         }
@@ -387,7 +414,7 @@ static void handle_transaction_done(struct smi_info *smi_info)
 #endif
         switch (smi_info->si_state) {
         case SI_NORMAL:
-                if (!smi_info->curr_msg)
+                if (! smi_info->curr_msg)
                         break;
 
                 smi_info->curr_msg->rsp_size
@@ -761,18 +788,20 @@ static void si_restart_short_timer(struct smi_info *smi_info)
 #if defined(CONFIG_HIGH_RES_TIMERS)
         unsigned long flags;
         unsigned long jiffies_now;
+        unsigned long seq;
 
         if (del_timer(&(smi_info->si_timer))) {
                 /* If we don't delete the timer, then it will go off
                    immediately, anyway.  So we only process if we
                    actually delete the timer. */
 
-                /* We already have irqsave on, so no need for it
-                   here. */
-                read_lock(&xtime_lock);
-                jiffies_now = jiffies;
-                smi_info->si_timer.expires = jiffies_now;
-                smi_info->si_timer.sub_expires = get_arch_cycles(jiffies_now);
+                do {
+                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
+                        jiffies_now = jiffies;
+                        smi_info->si_timer.expires = jiffies_now;
+                        smi_info->si_timer.arch_cycle_expires
+                                = get_arch_cycles(jiffies_now);
+                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 
                 add_usec_to_timer(&smi_info->si_timer, SI_SHORT_TIMEOUT_USEC);
 
@@ -826,15 +855,19 @@ static void smi_timeout(unsigned long data)
         /* If the state machine asks for a short delay, then shorten
            the timer timeout. */
         if (smi_result == SI_SM_CALL_WITH_DELAY) {
+#if defined(CONFIG_HIGH_RES_TIMERS)
+                unsigned long seq;
+#endif
                 spin_lock_irqsave(&smi_info->count_lock, flags);
                 smi_info->short_timeouts++;
                 spin_unlock_irqrestore(&smi_info->count_lock, flags);
 #if defined(CONFIG_HIGH_RES_TIMERS)
-                read_lock(&xtime_lock);
-                smi_info->si_timer.expires = jiffies;
-                smi_info->si_timer.sub_expires
-                        = get_arch_cycles(smi_info->si_timer.expires);
-                read_unlock(&xtime_lock);
+                do {
+                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
+                        smi_info->si_timer.expires = jiffies;
+                        smi_info->si_timer.arch_cycle_expires
+                                = get_arch_cycles(smi_info->si_timer.expires);
+                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
                 add_usec_to_timer(&smi_info->si_timer, SI_SHORT_TIMEOUT_USEC);
 #else
                 smi_info->si_timer.expires = jiffies + 1;
@@ -845,7 +878,7 @@ static void smi_timeout(unsigned long data)
                 spin_unlock_irqrestore(&smi_info->count_lock, flags);
                 smi_info->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES;
 #if defined(CONFIG_HIGH_RES_TIMERS)
-                smi_info->si_timer.sub_expires = 0;
+                smi_info->si_timer.arch_cycle_expires = 0;
 #endif
         }
 
@@ -1014,7 +1047,7 @@ static int std_irq_setup(struct smi_info *info)
 {
         int rv;
 
-        if (!info->irq)
+        if (! info->irq)
                 return 0;
 
         if (info->si_type == SI_BT) {
@@ -1023,7 +1056,7 @@ static int std_irq_setup(struct smi_info *info)
                                  SA_INTERRUPT,
                                  DEVICE_NAME,
                                  info);
-                if (!rv)
+                if (! rv)
                         /* Enable the interrupt in the BT interface. */
                         info->io.outputb(&info->io, IPMI_BT_INTMASK_REG,
                                          IPMI_BT_INTMASK_ENABLE_IRQ_BIT);
@@ -1048,7 +1081,7 @@ static int std_irq_setup(struct smi_info *info)
 
 static void std_irq_cleanup(struct smi_info *info)
 {
-        if (!info->irq)
+        if (! info->irq)
                 return;
 
         if (info->si_type == SI_BT)
@@ -1121,7 +1154,7 @@ static int port_setup(struct smi_info *info)
         unsigned int *addr = info->io.info;
         int           mapsize;
 
-        if (!addr || (!*addr))
+        if (! addr || (! *addr))
                 return -ENODEV;
 
         info->io_cleanup = port_cleanup;
@@ -1164,15 +1197,15 @@ static int try_init_port(int intf_num, struct smi_info **new_info)
 {
         struct smi_info *info;
 
-        if (!ports[intf_num])
+        if (! ports[intf_num])
                 return -ENODEV;
 
-        if (!is_new_interface(intf_num, IPMI_IO_ADDR_SPACE,
+        if (! is_new_interface(intf_num, IPMI_IO_ADDR_SPACE,
                               ports[intf_num]))
                 return -ENODEV;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (1)\n");
                 return -ENOMEM;
         }
@@ -1182,10 +1215,10 @@ static int try_init_port(int intf_num, struct smi_info **new_info)
         info->io.info = &(ports[intf_num]);
         info->io.addr = NULL;
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = regsizes[intf_num];
-        if (!info->io.regsize)
+        if (! info->io.regsize)
                 info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
         info->irq = 0;
@@ -1270,7 +1303,7 @@ static int mem_setup(struct smi_info *info)
         unsigned long *addr = info->io.info;
         int           mapsize;
 
-        if (!addr || (!*addr))
+        if (! addr || (! *addr))
                 return -ENODEV;
 
         info->io_cleanup = mem_cleanup;
@@ -1325,15 +1358,15 @@ static int try_init_mem(int intf_num, struct smi_info **new_info)
 {
         struct smi_info *info;
 
-        if (!addrs[intf_num])
+        if (! addrs[intf_num])
                 return -ENODEV;
 
-        if (!is_new_interface(intf_num, IPMI_MEM_ADDR_SPACE,
+        if (! is_new_interface(intf_num, IPMI_MEM_ADDR_SPACE,
                               addrs[intf_num]))
                 return -ENODEV;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (2)\n");
                 return -ENOMEM;
         }
@@ -1343,10 +1376,10 @@ static int try_init_mem(int intf_num, struct smi_info **new_info)
         info->io.info = &addrs[intf_num];
         info->io.addr = NULL;
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = regsizes[intf_num];
-        if (!info->io.regsize)
+        if (! info->io.regsize)
                 info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
         info->irq = 0;
@@ -1404,7 +1437,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
 {
         acpi_status status;
 
-        if (!info->irq)
+        if (! info->irq)
                 return 0;
 
         /* FIXME - is level triggered right? */
@@ -1428,7 +1461,7 @@ static int acpi_gpe_irq_setup(struct smi_info *info)
 
 static void acpi_gpe_irq_cleanup(struct smi_info *info)
 {
-        if (!info->irq)
+        if (! info->irq)
                 return;
 
         acpi_remove_gpe_handler(NULL, info->irq, &ipmi_acpi_gpe);
@@ -1504,10 +1537,10 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
                 addr_space = IPMI_MEM_ADDR_SPACE;
         else
                 addr_space = IPMI_IO_ADDR_SPACE;
-        if (!is_new_interface(-1, addr_space, spmi->addr.address))
+        if (! is_new_interface(-1, addr_space, spmi->addr.address))
                 return -ENODEV;
 
-        if (!spmi->addr.register_bit_width) {
+        if (! spmi->addr.register_bit_width) {
                 acpi_failure = 1;
                 return -ENODEV;
         }
@@ -1534,7 +1567,7 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
         }
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (3)\n");
                 return -ENOMEM;
         }
@@ -1610,22 +1643,15 @@ typedef struct dmi_ipmi_data
 static dmi_ipmi_data_t dmi_data[SI_MAX_DRIVERS];
 static int dmi_data_entries;
 
-typedef struct dmi_header
-{
-        u8      type;
-        u8      length;
-        u16     handle;
-} dmi_header_t;
-
-static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
+static int __init decode_dmi(struct dmi_header *dm, int intf_num)
 {
-        u8              __iomem *data = (u8 __iomem *)dm;
+        u8              *data = (u8 *)dm;
         unsigned long   base_addr;
         u8              reg_spacing;
-        u8              len = readb(&dm->length);
+        u8              len = dm->length;
         dmi_ipmi_data_t *ipmi_data = dmi_data+intf_num;
 
-        ipmi_data->type = readb(&data[4]);
+        ipmi_data->type = data[4];
 
         memcpy(&base_addr, data+8, sizeof(unsigned long));
         if (len >= 0x11) {
@@ -1640,12 +1666,12 @@ static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
                 }
                 /* If bit 4 of byte 0x10 is set, then the lsb for the address
                    is odd. */
-                ipmi_data->base_addr = base_addr | ((readb(&data[0x10]) & 0x10) >> 4);
+                ipmi_data->base_addr = base_addr | ((data[0x10] & 0x10) >> 4);
 
-                ipmi_data->irq = readb(&data[0x11]);
+                ipmi_data->irq = data[0x11];
 
                 /* The top two bits of byte 0x10 hold the register spacing. */
-                reg_spacing = (readb(&data[0x10]) & 0xC0) >> 6;
+                reg_spacing = (data[0x10] & 0xC0) >> 6;
                 switch(reg_spacing){
                 case 0x00: /* Byte boundaries */
                     ipmi_data->offset = 1;
@@ -1673,7 +1699,7 @@ static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
                 ipmi_data->offset = 1;
         }
 
-        ipmi_data->slave_addr = readb(&data[6]);
+        ipmi_data->slave_addr = data[6];
 
         if (is_new_interface(-1, ipmi_data->addr_space,ipmi_data->base_addr)) {
                 dmi_data_entries++;
@@ -1685,94 +1711,29 @@ static int decode_dmi(dmi_header_t __iomem *dm, int intf_num)
         return -1;
 }
 
-static int dmi_table(u32 base, int len, int num)
+static void __init dmi_find_bmc(void)
 {
-        u8                __iomem *buf;
-        struct dmi_header __iomem *dm;
-        u8                __iomem *data;
-        int               i=1;
-        int               status=-1;
+        struct dmi_device *dev = NULL;
         int               intf_num = 0;
 
-        buf = ioremap(base, len);
-        if(buf==NULL)
-                return -1;
-
-        data = buf;
-
-        while(i<num && (data - buf) < len)
-        {
-                dm=(dmi_header_t __iomem *)data;
-
-                if((data-buf+readb(&dm->length)) >= len)
-                        break;
-
-                if (readb(&dm->type) == 38) {
-                        if (decode_dmi(dm, intf_num) == 0) {
-                                intf_num++;
-                                if (intf_num >= SI_MAX_DRIVERS)
-                                        break;
-                        }
-                }
-
-                data+=readb(&dm->length);
-                while((data-buf) < len && (readb(data)||readb(data+1)))
-                        data++;
-                data+=2;
-                i++;
-        }
-        iounmap(buf);
-
-        return status;
-}
-
-static inline int dmi_checksum(u8 *buf)
-{
-        u8   sum=0;
-        int  a;
-
-        for(a=0; a<15; a++)
-                sum+=buf[a];
-        return (sum==0);
-}
-
-static int dmi_decode(void)
-{
-        u8   buf[15];
-        u32  fp=0xF0000;
-
-#ifdef CONFIG_SIMNOW
-        return -1;
-#endif
-
-        while(fp < 0xFFFFF)
-        {
-                isa_memcpy_fromio(buf, fp, 15);
-                if(memcmp(buf, "_DMI_", 5)==0 && dmi_checksum(buf))
-                {
-                        u16 num=buf[13]<<8|buf[12];
-                        u16 len=buf[7]<<8|buf[6];
-                        u32 base=buf[11]<<24|buf[10]<<16|buf[9]<<8|buf[8];
+        while ((dev = dmi_find_device(DMI_DEV_TYPE_IPMI, NULL, dev))) {
+                if (intf_num >= SI_MAX_DRIVERS)
+                        break;
 
-                        if(dmi_table(base, len, num) == 0)
-                                return 0;
-                }
-                fp+=16;
+                decode_dmi((struct dmi_header *) dev->device_data, intf_num++);
         }
-
-        return -1;
 }
 
 static int try_init_smbios(int intf_num, struct smi_info **new_info)
 {
-        struct smi_info   *info;
-        dmi_ipmi_data_t   *ipmi_data = dmi_data+intf_num;
-        char              *io_type;
+        struct smi_info *info;
+        dmi_ipmi_data_t *ipmi_data = dmi_data+intf_num;
+        char            *io_type;
 
         if (intf_num >= dmi_data_entries)
                 return -ENODEV;
 
-        switch(ipmi_data->type) {
+        switch (ipmi_data->type) {
                 case 0x01: /* KCS */
                         si_type[intf_num] = "kcs";
                         break;
@@ -1787,7 +1748,7 @@ static int try_init_smbios(int intf_num, struct smi_info **new_info)
         }
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (4)\n");
                 return -ENOMEM;
         }
@@ -1811,7 +1772,7 @@ static int try_init_smbios(int intf_num, struct smi_info **new_info)
 
         regspacings[intf_num] = ipmi_data->offset;
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
@@ -1853,14 +1814,14 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
 
         pci_smic_checked = 1;
 
-        if ((pci_dev = pci_get_device(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID,
-                                       NULL)))
-                ;
-        else if ((pci_dev = pci_get_class(PCI_ERMC_CLASSCODE, NULL)) &&
-                 pci_dev->subsystem_vendor == PCI_HP_VENDOR_ID)
-                fe_rmc = 1;
-        else
-                return -ENODEV;
+        pci_dev = pci_get_device(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID, NULL);
+        if (! pci_dev) {
+                pci_dev = pci_get_class(PCI_ERMC_CLASSCODE, NULL);
+                if (pci_dev && (pci_dev->subsystem_vendor == PCI_HP_VENDOR_ID))
+                        fe_rmc = 1;
+                else
+                        return -ENODEV;
+        }
 
         error = pci_read_config_word(pci_dev, PCI_MMC_ADDR_CW, &base_addr);
         if (error)
@@ -1873,7 +1834,7 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
         }
 
         /* Bit 0: 1 specifies programmed I/O, 0 specifies memory mapped I/O */
-        if (!(base_addr & 0x0001))
+        if (! (base_addr & 0x0001))
         {
                 pci_dev_put(pci_dev);
                 printk(KERN_ERR
@@ -1883,17 +1844,17 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
         }
 
         base_addr &= 0xFFFE;
-        if (!fe_rmc)
+        if (! fe_rmc)
                 /* Data register starts at base address + 1 in eRMC */
                 ++base_addr;
 
-        if (!is_new_interface(-1, IPMI_IO_ADDR_SPACE, base_addr)) {
+        if (! is_new_interface(-1, IPMI_IO_ADDR_SPACE, base_addr)) {
                 pci_dev_put(pci_dev);
                 return -ENODEV;
         }
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
-        if (!info) {
+        if (! info) {
                 pci_dev_put(pci_dev);
                 printk(KERN_ERR "ipmi_si: Could not allocate SI data (5)\n");
                 return -ENOMEM;
@@ -1904,7 +1865,7 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
         ports[intf_num] = base_addr;
         info->io.info = &(ports[intf_num]);
         info->io.regspacing = regspacings[intf_num];
-        if (!info->io.regspacing)
+        if (! info->io.regspacing)
                 info->io.regspacing = DEFAULT_REGSPACING;
         info->io.regsize = DEFAULT_REGSPACING;
         info->io.regshift = regshifts[intf_num];
@@ -1925,7 +1886,7 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info)
 static int try_init_plug_and_play(int intf_num, struct smi_info **new_info)
 {
 #ifdef CONFIG_PCI
-        if (find_pci_smic(intf_num, new_info)==0)
+        if (find_pci_smic(intf_num, new_info) == 0)
                 return 0;
 #endif
         /* Include other methods here. */
@@ -1943,7 +1904,7 @@ static int try_get_dev_id(struct smi_info *smi_info)
         int               rv = 0;
 
         resp = kmalloc(IPMI_MAX_MSG_LENGTH, GFP_KERNEL);
-        if (!resp)
+        if (! resp)
                 return -ENOMEM;
 
         /* Do a Get Device ID command, since it comes back with some
@@ -1992,11 +1953,8 @@ static int try_get_dev_id(struct smi_info *smi_info)
         }
 
         /* Record info from the get device id, in case we need it. */
-        smi_info->ipmi_si_dev_rev = resp[4] & 0xf;
-        smi_info->ipmi_si_fw_rev_major = resp[5] & 0x7f;
-        smi_info->ipmi_si_fw_rev_minor = resp[6];
-        smi_info->ipmi_version_major = resp[7] & 0xf;
-        smi_info->ipmi_version_minor = resp[7] >> 4;
+        memcpy(&smi_info->device_id, &resp[3],
+               min_t(unsigned long, resp_len-3, sizeof(smi_info->device_id)));
 
  out:
         kfree(resp);
@@ -2028,7 +1986,7 @@ static int stat_file_read_proc(char *page, char **start, off_t off,
         struct smi_info *smi = data;
 
         out += sprintf(out, "interrupts_enabled:    %d\n",
-                       smi->irq && !smi->interrupt_disabled);
+                       smi->irq && ! smi->interrupt_disabled);
         out += sprintf(out, "short_timeouts:        %ld\n",
                        smi->short_timeouts);
         out += sprintf(out, "long_timeouts:         %ld\n",
@@ -2057,6 +2015,73 @@ static int stat_file_read_proc(char *page, char **start, off_t off,
         return (out - ((char *) page));
 }
 
+/*
+ * oem_data_avail_to_receive_msg_avail
+ * @info - smi_info structure with msg_flags set
+ *
+ * Converts flags from OEM_DATA_AVAIL to RECEIVE_MSG_AVAIL
+ * Returns 1 indicating need to re-run handle_flags().
+ */
+static int oem_data_avail_to_receive_msg_avail(struct smi_info *smi_info)
+{
+        smi_info->msg_flags = ((smi_info->msg_flags & ~OEM_DATA_AVAIL) |
+                                RECEIVE_MSG_AVAIL);
+        return 1;
+}
+
+/*
+ * setup_dell_poweredge_oem_data_handler
+ * @info - smi_info.device_id must be populated
+ *
+ * Systems that match, but have firmware version < 1.40 may assert
+ * OEM0_DATA_AVAIL on their own, without being told via Set Flags that
+ * it's safe to do so.  Such systems will de-assert OEM1_DATA_AVAIL
+ * upon receipt of IPMI_GET_MSG_CMD, so we should treat these flags
+ * as RECEIVE_MSG_AVAIL instead.
+ *
+ * As Dell has no plans to release IPMI 1.5 firmware that *ever*
+ * assert the OEM[012] bits, and if it did, the driver would have to
+ * change to handle that properly, we don't actually check for the
+ * firmware version.
+ * Device ID = 0x20                BMC on PowerEdge 8G servers
+ * Device Revision = 0x80
+ * Firmware Revision1 = 0x01       BMC version 1.40
+ * Firmware Revision2 = 0x40       BCD encoded
+ * IPMI Version = 0x51             IPMI 1.5
+ * Manufacturer ID = A2 02 00      Dell IANA
+ *
+ */
+#define DELL_POWEREDGE_8G_BMC_DEVICE_ID  0x20
+#define DELL_POWEREDGE_8G_BMC_DEVICE_REV 0x80
+#define DELL_POWEREDGE_8G_BMC_IPMI_VERSION 0x51
+#define DELL_IANA_MFR_ID {0xA2, 0x02, 0x00}
+static void setup_dell_poweredge_oem_data_handler(struct smi_info *smi_info)
+{
+        struct ipmi_device_id *id = &smi_info->device_id;
+        const char mfr[3]=DELL_IANA_MFR_ID;
+        if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr))
+            && (id->device_id       == DELL_POWEREDGE_8G_BMC_DEVICE_ID)
+            && (id->device_revision == DELL_POWEREDGE_8G_BMC_DEVICE_REV)
+            && (id->ipmi_version    == DELL_POWEREDGE_8G_BMC_IPMI_VERSION))
+        {
+                smi_info->oem_data_avail_handler =
+                        oem_data_avail_to_receive_msg_avail;
+        }
+}
+
+/*
+ * setup_oem_data_handler
+ * @info - smi_info.device_id must be filled in already
+ *
+ * Fills in smi_info.device_id.oem_data_available_handler
+ * when we know what function to use there.
+ */
+
+static void setup_oem_data_handler(struct smi_info *smi_info)
+{
+        setup_dell_poweredge_oem_data_handler(smi_info);
+}
+
 /* Returns 0 if initialized, or negative on an error. */
 static int init_one_smi(int intf_num, struct smi_info **smi)
 {
@@ -2068,19 +2093,15 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         if (rv)
                 rv = try_init_port(intf_num, &new_smi);
 #ifdef CONFIG_ACPI_INTERPRETER
-        if ((rv) && (si_trydefaults)) {
+        if (rv && si_trydefaults)
                 rv = try_init_acpi(intf_num, &new_smi);
-        }
 #endif
 #ifdef CONFIG_X86
-        if ((rv) && (si_trydefaults)) {
+        if (rv && si_trydefaults)
                 rv = try_init_smbios(intf_num, &new_smi);
-        }
 #endif
-        if ((rv) && (si_trydefaults)) {
+        if (rv && si_trydefaults)
                 rv = try_init_plug_and_play(intf_num, &new_smi);
-        }
-
 
         if (rv)
                 return rv;
@@ -2090,7 +2111,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         new_smi->si_sm = NULL;
         new_smi->handlers = NULL;
 
-        if (!new_smi->irq_setup) {
+        if (! new_smi->irq_setup) {
                 new_smi->irq = irqs[intf_num];
                 new_smi->irq_setup = std_irq_setup;
                 new_smi->irq_cleanup = std_irq_cleanup;
@@ -2124,7 +2145,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         /* Allocate the state machine's data and initialize it. */
         new_smi->si_sm = kmalloc(new_smi->handlers->size(), GFP_KERNEL);
-        if (!new_smi->si_sm) {
+        if (! new_smi->si_sm) {
                 printk(" Could not allocate state machine memory\n");
                 rv = -ENOMEM;
                 goto out_err;
@@ -2155,6 +2176,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         if (rv)
                 goto out_err;
 
+        setup_oem_data_handler(new_smi);
+
         /* Try to claim any interrupts. */
         new_smi->irq_setup(new_smi);
 
@@ -2188,8 +2211,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         rv = ipmi_register_smi(&handlers,
                                new_smi,
-                               new_smi->ipmi_version_major,
-                               new_smi->ipmi_version_minor,
+                               ipmi_version_major(&new_smi->device_id),
+                               ipmi_version_minor(&new_smi->device_id),
                                new_smi->slave_addr,
                                &(new_smi->intf));
         if (rv) {
@@ -2230,7 +2253,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
 
         /* Wait for the timer to stop.  This avoids problems with race
            conditions removing the timer here. */
-        while (!new_smi->timer_stopped) {
+        while (! new_smi->timer_stopped) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         }
@@ -2270,7 +2293,7 @@ static __init int init_ipmi_si(void)
         /* Parse out the si_type string into its components. */
         str = si_type_str;
         if (*str != '\0') {
-                for (i=0; (i<SI_MAX_PARMS) && (*str != '\0'); i++) {
+                for (i = 0; (i < SI_MAX_PARMS) && (*str != '\0'); i++) {
                         si_type[i] = str;
                         str = strchr(str, ',');
                         if (str) {
@@ -2282,22 +2305,14 @@ static __init int init_ipmi_si(void)
                 }
         }
 
-        printk(KERN_INFO "IPMI System Interface driver version "
-               IPMI_SI_VERSION);
-        if (kcs_smi_handlers.version)
-                printk(", KCS version %s", kcs_smi_handlers.version);
-        if (smic_smi_handlers.version)
-                printk(", SMIC version %s", smic_smi_handlers.version);
-        if (bt_smi_handlers.version)
-                printk(", BT version %s", bt_smi_handlers.version);
-        printk("\n");
+        printk(KERN_INFO "IPMI System Interface driver.\n");
 
 #ifdef CONFIG_X86
-        dmi_decode();
+        dmi_find_bmc();
 #endif
 
         rv = init_one_smi(0, &(smi_infos[pos]));
-        if (rv && !ports[0] && si_trydefaults) {
+        if (rv && ! ports[0] && si_trydefaults) {
                 /* If we are trying defaults and the initial port is
                    not set, then set it. */
                 si_type[0] = "kcs";
@@ -2319,7 +2334,7 @@ static __init int init_ipmi_si(void)
         if (rv == 0)
                 pos++;
 
-        for (i=1; i < SI_MAX_PARMS; i++) {
+        for (i = 1; i < SI_MAX_PARMS; i++) {
                 rv = init_one_smi(i, &(smi_infos[pos]));
                 if (rv == 0)
                         pos++;
@@ -2361,14 +2376,14 @@ static void __exit cleanup_one_si(struct smi_info *to_clean)
 
         /* Wait for the timer to stop.  This avoids problems with race
            conditions removing the timer here. */
-        while (!to_clean->timer_stopped) {
+        while (! to_clean->timer_stopped) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
         }
 
         /* Interrupts and timeouts are stopped, now make sure the
            interface is in a clean state. */
-        while ((to_clean->curr_msg) || (to_clean->si_state != SI_NORMAL)) {
+        while (to_clean->curr_msg || (to_clean->si_state != SI_NORMAL)) {
                 poll(to_clean);
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
@@ -2392,13 +2407,15 @@ static __exit void cleanup_ipmi_si(void)
 {
         int i;
 
-        if (!initialized)
+        if (! initialized)
                 return;
 
-        for (i=0; i<SI_MAX_DRIVERS; i++) {
+        for (i = 0; i < SI_MAX_DRIVERS; i++) {
                 cleanup_one_si(smi_infos[i]);
         }
 }
 module_exit(cleanup_ipmi_si);
 
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("Interface to the IPMI driver for the KCS, SMIC, and BT system interfaces.");
diff --git a/drivers/char/ipmi/ipmi_smic_sm.c b/drivers/char/ipmi/ipmi_smic_sm.c
index ae18747e670b..add2aa2732f0 100644
--- a/drivers/char/ipmi/ipmi_smic_sm.c
+++ b/drivers/char/ipmi/ipmi_smic_sm.c
@@ -46,8 +46,6 @@
 #include <linux/ipmi_msgdefs.h>         /* for completion codes */
 #include "ipmi_si_sm.h"
 
-#define IPMI_SMIC_VERSION "v33"
-
 /* smic_debug is a bit-field
  *      SMIC_DEBUG_ENABLE -     turned on for now
  *      SMIC_DEBUG_MSG -        commands and their responses
@@ -588,7 +586,6 @@ static int smic_size(void)
 
 struct si_sm_handlers smic_smi_handlers =
 {
-        .version           = IPMI_SMIC_VERSION,
         .init_data         = init_smic_data,
         .start_transaction = start_smic_transaction,
         .get_result        = smic_get_result,
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index d35a953961cb..e71aaae855ad 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -53,8 +53,6 @@
 
 #define PFX "IPMI Watchdog: "
 
-#define IPMI_WATCHDOG_VERSION "v33"
-
 /*
  * The IPMI command/response information for the watchdog timer.
  */
@@ -259,7 +257,7 @@ static int i_ipmi_set_timeout(struct ipmi_smi_msg  *smi_msg,
 
         data[1] = 0;
         WDOG_SET_TIMEOUT_ACT(data[1], ipmi_watchdog_state);
-        if (pretimeout > 0) {
+        if ((pretimeout > 0) && (ipmi_watchdog_state != WDOG_TIMEOUT_NONE)) {
             WDOG_SET_PRETIMEOUT_ACT(data[1], preaction_val);
             data[2] = pretimeout;
         } else {
@@ -659,19 +657,18 @@ static ssize_t ipmi_read(struct file *file,
 
 static int ipmi_open(struct inode *ino, struct file *filep)
 {
-        switch (iminor(ino))
-        {
-                case WATCHDOG_MINOR:
-                    if(test_and_set_bit(0, &ipmi_wdog_open))
+        switch (iminor(ino)) {
+        case WATCHDOG_MINOR:
+                if (test_and_set_bit(0, &ipmi_wdog_open))
                         return -EBUSY;
 
-                    /* Don't start the timer now, let it start on the
-                       first heartbeat. */
-                    ipmi_start_timer_on_heartbeat = 1;
-                    return nonseekable_open(ino, filep);
+                /* Don't start the timer now, let it start on the
+                   first heartbeat. */
+                ipmi_start_timer_on_heartbeat = 1;
+                return nonseekable_open(ino, filep);
 
-                default:
-                    return (-ENODEV);
+        default:
+                return (-ENODEV);
         }
 }
 
@@ -817,15 +814,19 @@ static void ipmi_register_watchdog(int ipmi_intf)
 static int
 ipmi_nmi(void *dev_id, struct pt_regs *regs, int cpu, int handled)
 {
+        /* If we are not expecting a timeout, ignore it. */
+        if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)
+                return NOTIFY_DONE;
+
         /* If no one else handled the NMI, we assume it was the IPMI
            watchdog. */
-        if ((!handled) && (preop_val == WDOG_PREOP_PANIC))
+        if ((!handled) && (preop_val == WDOG_PREOP_PANIC)) {
+                /* On some machines, the heartbeat will give
+                   an error and not work unless we re-enable
+                   the timer.   So do so. */
+                pretimeout_since_last_heartbeat = 1;
                 panic(PFX "pre-timeout");
-
-        /* On some machines, the heartbeat will give
-           an error and not work unless we re-enable
-           the timer.   So do so. */
-        pretimeout_since_last_heartbeat = 1;
+        }
 
         return NOTIFY_DONE;
 }
@@ -924,9 +925,6 @@ static int __init ipmi_wdog_init(void)
 {
         int rv;
 
-        printk(KERN_INFO PFX "driver version "
-               IPMI_WATCHDOG_VERSION "\n");
-
         if (strcmp(action, "reset") == 0) {
                 action_val = WDOG_TIMEOUT_RESET;
         } else if (strcmp(action, "none") == 0) {
@@ -1011,6 +1009,8 @@ static int __init ipmi_wdog_init(void)
         register_reboot_notifier(&wdog_reboot_notifier);
         notifier_chain_register(&panic_notifier_list, &wdog_panic_notifier);
 
+        printk(KERN_INFO PFX "driver initialized\n");
+
         return 0;
 }
 
@@ -1062,3 +1062,5 @@ static void __exit ipmi_wdog_exit(void)
 module_exit(ipmi_wdog_exit);
 module_init(ipmi_wdog_init);
 MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
+MODULE_DESCRIPTION("watchdog timer based upon the IPMI interface.");
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 115dbb35334b..3fa64c631108 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -750,7 +750,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id)
 
         dev->soft = NULL;
 
-        soft = kcalloc(1, sizeof(struct mbcs_soft), GFP_KERNEL);
+        soft = kzalloc(sizeof(struct mbcs_soft), GFP_KERNEL);
         if (soft == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 850a78c9c4bc..f182752fe918 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -35,10 +35,6 @@
 # include <linux/efi.h>
 #endif
 
-#if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
-extern void tapechar_init(void);
-#endif
-
 /*
  * Architectures vary in how they handle caching for addresses
  * outside of main memory.
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 931efd58f87a..0c8375165e29 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -63,8 +63,6 @@ static DECLARE_MUTEX(misc_sem);
 #define DYNAMIC_MINORS 64 /* like dynamic majors */
 static unsigned char misc_minors[DYNAMIC_MINORS / 8];
 
-extern int rtc_DP8570A_init(void);
-extern int rtc_MK48T08_init(void);
 extern int pmu_device_init(void);
 
 #ifdef CONFIG_PROC_FS
@@ -303,12 +301,7 @@ static int __init misc_init(void)
         misc_class = class_create(THIS_MODULE, "misc");
         if (IS_ERR(misc_class))
                 return PTR_ERR(misc_class);
-#ifdef CONFIG_MVME16x
-        rtc_MK48T08_init();
-#endif
-#ifdef CONFIG_BVME6000
-        rtc_DP8570A_init();
-#endif
+
         if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
                 printk("unable to get major %d for misc devices\n",
                        MISC_MAJOR);
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 95f7046ff059..79e490ef2cf2 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -339,7 +339,7 @@ static int __init moxa_init(void)
 
         init_MUTEX(&moxaBuffSem);
         moxaDriver->owner = THIS_MODULE;
-        moxaDriver->name = "ttya";
+        moxaDriver->name = "ttyMX";
         moxaDriver->devfs_name = "tts/a";
         moxaDriver->major = ttymajor;
         moxaDriver->minor_start = 0;
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index d568991ac6b3..8666171e187b 100644
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -57,6 +57,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
+#include <linux/serial_8250.h>
 #include "smapi.h"
 #include "mwavedd.h"
 #include "3780i.h"
@@ -410,8 +411,8 @@ static ssize_t mwave_write(struct file *file, const char __user *buf,
 
 static int register_serial_portandirq(unsigned int port, int irq)
 {
-        struct serial_struct serial;
-
+        struct uart_port uart;
+        
         switch ( port ) {
                 case 0x3f8:
                 case 0x2f8:
@@ -442,12 +443,14 @@ static int register_serial_portandirq(unsigned int port, int irq)
         } /* switch */
         /* irq is okay */
 
-        memset(&serial, 0, sizeof(serial));
-        serial.port = port;
-        serial.irq = irq;
-        serial.flags = ASYNC_SHARE_IRQ;
-
-        return register_serial(&serial);
+        memset(&uart, 0, sizeof(struct uart_port));
+        
+        uart.uartclk =  1843200;
+        uart.iobase = port;
+        uart.irq = irq;
+        uart.iotype = UPIO_PORT;
+        uart.flags =  UPF_SHARE_IRQ;
+        return serial8250_register_port(&uart);
 }
 
 
@@ -523,7 +526,7 @@ static void mwave_exit(void)
 #endif
 
         if ( pDrvData->sLine >= 0 ) {
-                unregister_serial(pDrvData->sLine);
+                serial8250_unregister_port(pDrvData->sLine);
         }
         if (pDrvData->bMwaveDevRegistered) {
                 misc_deregister(&mwave_misc_dev);
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index f022f0944434..d0ef1ae41298 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -63,7 +63,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/segment.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index cd4fe8b1709f..63fff7c1244a 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -938,10 +938,9 @@ found:
 
         /*
          * XXX Interrupt pin #7 in Espresso is shared between RTC and
-         * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here
-         * is asking for trouble with add-on boards. Change to SA_SHIRQ.
+         * PCI Slot 2 INTA# (and some INTx# in Slot 1).
          */
-        if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) {
+        if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) {
                 /*
                  * Standard way for sparc to print irq's is to use
                  * __irq_itoa(). I think for EBus it's ok to use %d.
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index d692af57213a..baaa365285fa 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/byteorder/generic.h>
 #include <asm/sn/sn_sal.h>
+#include <asm/unaligned.h>
 #include "snsc.h"
 
 static struct subch_data_s *event_sd;
@@ -62,13 +63,16 @@ static int
 scdrv_parse_event(char *event, int *src, int *code, int *esp_code, char *desc)
 {
         char *desc_end;
+        __be32 from_buf;
 
         /* record event source address */
-        *src = be32_to_cpup((__be32 *)event);
+        from_buf = get_unaligned((__be32 *)event);
+        *src = be32_to_cpup(&from_buf);
         event += 4;                     /* move on to event code */
 
         /* record the system controller's event code */
-        *code = be32_to_cpup((__be32 *)event);
+        from_buf = get_unaligned((__be32 *)event);
+        *code = be32_to_cpup(&from_buf);
         event += 4;                     /* move on to event arguments */
 
         /* how many arguments are in the packet? */
@@ -82,7 +86,8 @@ scdrv_parse_event(char *event, int *src, int *code, int *esp_code, char *desc)
                 /* not an integer argument, so give up */
                 return -1;
         }
-        *esp_code = be32_to_cpup((__be32 *)event);
+        from_buf = get_unaligned((__be32 *)event);
+        *esp_code = be32_to_cpup(&from_buf);
         event += 4;
 
         /* parse out the event description */
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index cefbe985e55c..36ae9ad2598c 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -98,12 +98,13 @@ MODULE_PARM_DESC(useinput,
 
 #define SONYPI_DEVICE_MODEL_TYPE1       1
 #define SONYPI_DEVICE_MODEL_TYPE2       2
+#define SONYPI_DEVICE_MODEL_TYPE3       3
 
 /* type1 models use those */
 #define SONYPI_IRQ_PORT                 0x8034
 #define SONYPI_IRQ_SHIFT                22
-#define SONYPI_BASE                     0x50
-#define SONYPI_G10A                     (SONYPI_BASE+0x14)
+#define SONYPI_TYPE1_BASE               0x50
+#define SONYPI_G10A                     (SONYPI_TYPE1_BASE+0x14)
 #define SONYPI_TYPE1_REGION_SIZE        0x08
 #define SONYPI_TYPE1_EVTYPE_OFFSET      0x04
 
@@ -114,6 +115,13 @@ MODULE_PARM_DESC(useinput,
 #define SONYPI_TYPE2_REGION_SIZE        0x20
 #define SONYPI_TYPE2_EVTYPE_OFFSET      0x12
 
+/* type3 series specifics */
+#define SONYPI_TYPE3_BASE               0x40
+#define SONYPI_TYPE3_GID2               (SONYPI_TYPE3_BASE+0x48) /* 16 bits */
+#define SONYPI_TYPE3_MISC               (SONYPI_TYPE3_BASE+0x6d) /* 8 bits  */
+#define SONYPI_TYPE3_REGION_SIZE        0x20
+#define SONYPI_TYPE3_EVTYPE_OFFSET      0x12
+
 /* battery / brightness addresses */
 #define SONYPI_BAT_FLAGS        0x81
 #define SONYPI_LCD_LIGHT        0x96
@@ -159,6 +167,10 @@ static struct sonypi_ioport_list sonypi_type2_ioport_list[] = {
         { 0x0, 0x0 }
 };
 
+/* same as in type 2 models */
+static struct sonypi_ioport_list *sonypi_type3_ioport_list =
+        sonypi_type2_ioport_list;
+
 /* The set of possible interrupts */
 struct sonypi_irq_list {
         u16     irq;
@@ -180,6 +192,9 @@ static struct sonypi_irq_list sonypi_type2_irq_list[] = {
         {  0, 0x00 }    /* no IRQ, 0x00 in SIRQ in AML */
 };
 
+/* same as in type2 models */
+static struct sonypi_irq_list *sonypi_type3_irq_list = sonypi_type2_irq_list;
+
 #define SONYPI_CAMERA_BRIGHTNESS                0
 #define SONYPI_CAMERA_CONTRAST                  1
 #define SONYPI_CAMERA_HUE                       2
@@ -223,6 +238,7 @@ static struct sonypi_irq_list sonypi_type2_irq_list[] = {
 #define SONYPI_MEYE_MASK                        0x00000400
 #define SONYPI_MEMORYSTICK_MASK                 0x00000800
 #define SONYPI_BATTERY_MASK                     0x00001000
+#define SONYPI_WIRELESS_MASK                    0x00002000
 
 struct sonypi_event {
         u8      data;
@@ -305,6 +321,13 @@ static struct sonypi_event sonypi_blueev[] = {
         { 0, 0 }
 };
 
+/* The set of possible wireless events */
+static struct sonypi_event sonypi_wlessev[] = {
+        { 0x59, SONYPI_EVENT_WIRELESS_ON },
+        { 0x5a, SONYPI_EVENT_WIRELESS_OFF },
+        { 0, 0 }
+};
+
 /* The set of possible back button events */
 static struct sonypi_event sonypi_backev[] = {
         { 0x20, SONYPI_EVENT_BACK_PRESSED },
@@ -383,7 +406,6 @@ static struct sonypi_eventtypes {
         { SONYPI_DEVICE_MODEL_TYPE2, 0x31, SONYPI_BLUETOOTH_MASK, sonypi_blueev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_PKEY_MASK, sonypi_pkeyev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x11, SONYPI_BACK_MASK, sonypi_backev },
-        { SONYPI_DEVICE_MODEL_TYPE2, 0x08, SONYPI_HELP_MASK, sonypi_helpev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x21, SONYPI_HELP_MASK, sonypi_helpev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x21, SONYPI_ZOOM_MASK, sonypi_zoomev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x20, SONYPI_THUMBPHRASE_MASK, sonypi_thumbphraseev },
@@ -391,6 +413,12 @@ static struct sonypi_eventtypes {
         { SONYPI_DEVICE_MODEL_TYPE2, 0x41, SONYPI_BATTERY_MASK, sonypi_batteryev },
         { SONYPI_DEVICE_MODEL_TYPE2, 0x31, SONYPI_PKEY_MASK, sonypi_pkeyev },
 
+        { SONYPI_DEVICE_MODEL_TYPE3, 0, 0xffffffff, sonypi_releaseev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x21, SONYPI_FNKEY_MASK, sonypi_fnkeyev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x31, SONYPI_WIRELESS_MASK, sonypi_wlessev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x31, SONYPI_MEMORYSTICK_MASK, sonypi_memorystickev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x41, SONYPI_BATTERY_MASK, sonypi_batteryev },
+        { SONYPI_DEVICE_MODEL_TYPE3, 0x31, SONYPI_PKEY_MASK, sonypi_pkeyev },
         { 0 }
 };
 
@@ -563,6 +591,23 @@ static void sonypi_type2_srs(void)
         udelay(10);
 }
 
+static void sonypi_type3_srs(void)
+{
+        u16 v16;
+        u8  v8;
+
+        /* This model type uses the same initialiazation of
+         * the embedded controller as the type2 models. */
+        sonypi_type2_srs();
+
+        /* Initialization of PCI config space of the LPC interface bridge. */
+        v16 = (sonypi_device.ioport1 & 0xFFF0) | 0x01;
+        pci_write_config_word(sonypi_device.dev, SONYPI_TYPE3_GID2, v16);
+        pci_read_config_byte(sonypi_device.dev, SONYPI_TYPE3_MISC, &v8);
+        v8 = (v8 & 0xCF) | 0x10;
+        pci_write_config_byte(sonypi_device.dev, SONYPI_TYPE3_MISC, v8);
+}
+
 /* Disables the device - this comes from the AML code in the ACPI bios */
 static void sonypi_type1_dis(void)
 {
@@ -587,6 +632,13 @@ static void sonypi_type2_dis(void)
                 printk(KERN_WARNING "ec_write failed\n");
 }
 
+static void sonypi_type3_dis(void)
+{
+        sonypi_type2_dis();
+        udelay(10);
+        pci_write_config_word(sonypi_device.dev, SONYPI_TYPE3_GID2, 0);
+}
+
 static u8 sonypi_call1(u8 dev)
 {
         u8 v1, v2;
@@ -1067,10 +1119,17 @@ static struct miscdevice sonypi_misc_device = {
 
 static void sonypi_enable(unsigned int camera_on)
 {
-        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
-                sonypi_type2_srs();
-        else
+        switch (sonypi_device.model) {
+        case SONYPI_DEVICE_MODEL_TYPE1:
                 sonypi_type1_srs();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE2:
+                sonypi_type2_srs();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE3:
+                sonypi_type3_srs();
+                break;
+        }
 
         sonypi_call1(0x82);
         sonypi_call2(0x81, 0xff);
@@ -1094,10 +1153,18 @@ static int sonypi_disable(void)
         if (!SONYPI_ACPI_ACTIVE && fnkeyinit)
                 outb(0xf1, 0xb2);
 
-        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
-                sonypi_type2_dis();
-        else
+        switch (sonypi_device.model) {
+        case SONYPI_DEVICE_MODEL_TYPE1:
                 sonypi_type1_dis();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE2:
+                sonypi_type2_dis();
+                break;
+        case SONYPI_DEVICE_MODEL_TYPE3:
+                sonypi_type3_dis();
+                break;
+        }
+
         return 0;
 }
 
@@ -1143,12 +1210,16 @@ static int __devinit sonypi_probe(void)
         struct sonypi_irq_list *irq_list;
         struct pci_dev *pcidev;
 
-        pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                PCI_DEVICE_ID_INTEL_82371AB_3, NULL);
+        if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                     PCI_DEVICE_ID_INTEL_82371AB_3, NULL)))
+                sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE1;
+        else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                          PCI_DEVICE_ID_INTEL_ICH6_1, NULL)))
+                sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3;
+        else
+                sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE2;
 
         sonypi_device.dev = pcidev;
-        sonypi_device.model = pcidev ?
-                SONYPI_DEVICE_MODEL_TYPE1 : SONYPI_DEVICE_MODEL_TYPE2;
 
         spin_lock_init(&sonypi_device.fifo_lock);
         sonypi_device.fifo = kfifo_alloc(SONYPI_BUF_SIZE, GFP_KERNEL,
@@ -1176,16 +1247,22 @@ static int __devinit sonypi_probe(void)
                 goto out_miscreg;
         }
 
-        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2) {
+
+        if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE1) {
+                ioport_list = sonypi_type1_ioport_list;
+                sonypi_device.region_size = SONYPI_TYPE1_REGION_SIZE;
+                sonypi_device.evtype_offset = SONYPI_TYPE1_EVTYPE_OFFSET;
+                irq_list = sonypi_type1_irq_list;
+        } else if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2) {
                 ioport_list = sonypi_type2_ioport_list;
                 sonypi_device.region_size = SONYPI_TYPE2_REGION_SIZE;
                 sonypi_device.evtype_offset = SONYPI_TYPE2_EVTYPE_OFFSET;
                 irq_list = sonypi_type2_irq_list;
         } else {
-                ioport_list = sonypi_type1_ioport_list;
-                sonypi_device.region_size = SONYPI_TYPE1_REGION_SIZE;
-                sonypi_device.evtype_offset = SONYPI_TYPE1_EVTYPE_OFFSET;
-                irq_list = sonypi_type1_irq_list;
+                ioport_list = sonypi_type3_ioport_list;
+                sonypi_device.region_size = SONYPI_TYPE3_REGION_SIZE;
+                sonypi_device.evtype_offset = SONYPI_TYPE3_EVTYPE_OFFSET;
+                irq_list = sonypi_type3_irq_list;
         }
 
         for (i = 0; ioport_list[i].port1; i++) {
@@ -1274,11 +1351,10 @@ static int __devinit sonypi_probe(void)
 
         printk(KERN_INFO "sonypi: Sony Programmable I/O Controller Driver"
                "v%s.\n", SONYPI_DRIVER_VERSION);
-        printk(KERN_INFO "sonypi: detected %s model, "
+        printk(KERN_INFO "sonypi: detected type%d model, "
                "verbose = %d, fnkeyinit = %s, camera = %s, "
                "compat = %s, mask = 0x%08lx, useinput = %s, acpi = %s\n",
-               (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE1) ?
-                        "type1" : "type2",
+               sonypi_device.model,
                verbose,
                fnkeyinit ? "on" : "off",
                camera ? "on" : "off",
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index cc2cc77fd174..c0d64914595f 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -206,6 +206,9 @@ static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0)},
         {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
         {PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6LPC)},
         {0,}
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index dc8c540391fd..939e51e119e6 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -14,7 +14,6 @@
  * License.
  */
 
-#include <acpi/acpi_bus.h>
 #include <linux/pnp.h>
 #include "tpm.h"
 
@@ -29,9 +28,10 @@
 #define TPM_MAX_TRIES           5000
 #define TPM_INFINEON_DEV_VEN_VALUE      0x15D1
 
-/* These values will be filled after ACPI-call */
+/* These values will be filled after PnP-call */
 static int TPM_INF_DATA = 0;
 static int TPM_INF_ADDR = 0;
+static int pnp_registered = 0;
 
 /* TPM header definitions */
 enum infineon_tpm_header {
@@ -356,24 +356,26 @@ static const struct pnp_device_id tpm_pnp_tbl[] = {
         {"IFX0102", 0},
         {"", 0}
 };
+MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
 
-static int __devinit tpm_inf_acpi_probe(struct pnp_dev *dev,
+static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
                                         const struct pnp_device_id *dev_id)
 {
-        TPM_INF_ADDR = (pnp_port_start(dev, 0) & 0xff);
-        TPM_INF_DATA = ((TPM_INF_ADDR + 1) & 0xff);
-        tpm_inf.base = pnp_port_start(dev, 1);
-        dev_info(&dev->dev, "Found %s with ID %s\n",
-                 dev->name, dev_id->id);
-        if (!((tpm_inf.base >> 8) & 0xff))
-                tpm_inf.base = 0;
-        return 0;
+        if (pnp_port_valid(dev, 0)) {
+                TPM_INF_ADDR = (pnp_port_start(dev, 0) & 0xff);
+                TPM_INF_DATA = ((TPM_INF_ADDR + 1) & 0xff);
+                tpm_inf.base = pnp_port_start(dev, 1);
+                dev_info(&dev->dev, "Found %s with ID %s\n",
+                dev->name, dev_id->id);
+                return 0;
+        }
+        return -ENODEV;
 }
 
 static struct pnp_driver tpm_inf_pnp = {
         .name = "tpm_inf_pnp",
         .id_table = tpm_pnp_tbl,
-        .probe = tpm_inf_acpi_probe,
+        .probe = tpm_inf_pnp_probe,
 };
 
 static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
@@ -386,19 +388,30 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
         int productid[2];
         char chipname[20];
 
-        if (pci_enable_device(pci_dev))
-                return -EIO;
+        rc = pci_enable_device(pci_dev);
+        if (rc)
+                return rc;
 
         dev_info(&pci_dev->dev, "LPC-bus found at 0x%x\n", pci_id->device);
 
-        /* read IO-ports from ACPI */
-        pnp_register_driver(&tpm_inf_pnp);
-        pnp_unregister_driver(&tpm_inf_pnp);
+        /* read IO-ports from PnP */
+        rc = pnp_register_driver(&tpm_inf_pnp);
+        if (rc < 0) {
+                dev_err(&pci_dev->dev,
+                        "Error %x from pnp_register_driver!\n",rc);
+                goto error2;
+        }
+        if (!rc) {
+                dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+                goto error;
+        } else {
+                pnp_registered = 1;
+        }
 
         /* Make sure, we have received valid config ports */
         if (!TPM_INF_ADDR) {
-                pci_disable_device(pci_dev);
-                return -EIO;
+                dev_err(&pci_dev->dev, "No valid IO-ports received!\n");
+                goto error;
         }
 
         /* query chip for its vendor, its version number a.s.o. */
@@ -418,23 +431,21 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
 
         switch ((productid[0] << 8) | productid[1]) {
         case 6:
-                sprintf(chipname, " (SLD 9630 TT 1.1)");
+                snprintf(chipname, sizeof(chipname), " (SLD 9630 TT 1.1)");
                 break;
         case 11:
-                sprintf(chipname, " (SLB 9635 TT 1.2)");
+                snprintf(chipname, sizeof(chipname), " (SLB 9635 TT 1.2)");
                 break;
         default:
-                sprintf(chipname, " (unknown chip)");
+                snprintf(chipname, sizeof(chipname), " (unknown chip)");
                 break;
         }
-        chipname[19] = 0;
 
         if ((vendorid[0] << 8 | vendorid[1]) == (TPM_INFINEON_DEV_VEN_VALUE)) {
 
                 if (tpm_inf.base == 0) {
                         dev_err(&pci_dev->dev, "No IO-ports found!\n");
-                        pci_disable_device(pci_dev);
-                        return -EIO;
+                        goto error;
                 }
                 /* configure TPM with IO-ports */
                 outb(IOLIMH, TPM_INF_ADDR);
@@ -452,8 +463,7 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                         dev_err(&pci_dev->dev,
                                 "Could not set IO-ports to %04x\n",
                                 tpm_inf.base);
-                        pci_disable_device(pci_dev);
-                        return -EIO;
+                        goto error;
                 }
 
                 /* activate register */
@@ -479,14 +489,16 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                          productid[0], productid[1], chipname);
 
                 rc = tpm_register_hardware(pci_dev, &tpm_inf);
-                if (rc < 0) {
-                        pci_disable_device(pci_dev);
-                        return -ENODEV;
-                }
+                if (rc < 0)
+                        goto error;
                 return 0;
         } else {
                 dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+error:
+                pnp_unregister_driver(&tpm_inf_pnp);
+error2:
                 pci_disable_device(pci_dev);
+                pnp_registered = 0;
                 return -ENODEV;
         }
 }
@@ -521,6 +533,8 @@ static int __init init_inf(void)
 
 static void __exit cleanup_inf(void)
 {
+        if (pnp_registered)
+                pnp_unregister_driver(&tpm_inf_pnp);
         pci_unregister_driver(&inf_pci_driver);
 }
 
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 6e4be3bb2d89..9d657127f313 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -153,7 +153,6 @@ static int tty_release(struct inode *, struct file *);
 int tty_ioctl(struct inode * inode, struct file * file,
               unsigned int cmd, unsigned long arg);
 static int tty_fasync(int fd, struct file * filp, int on);
-extern void rs_360_init(void);
 static void release_mem(struct tty_struct *tty, int idx);
 
 
@@ -2911,11 +2910,6 @@ void __init console_init(void)
 #ifdef CONFIG_EARLY_PRINTK
         disable_early_printk();
 #endif
-#ifdef CONFIG_SERIAL_68360
-        /* This is not a console initcall. I know not what it's doing here.
-           So I haven't moved it. dwmw2 */
-        rs_360_init();
-#endif
         call = __con_initcall_start;
         while (call < __con_initcall_end) {
                 (*call)();
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 665103ccaee8..b8d0c290b0db 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -434,21 +434,25 @@ void invert_screen(struct vc_data *vc, int offset, int count, int viewed)
 /* used by selection: complement pointer position */
 void complement_pos(struct vc_data *vc, int offset)
 {
-        static unsigned short *p;
+        static int old_offset = -1;
         static unsigned short old;
         static unsigned short oldx, oldy;
 
         WARN_CONSOLE_UNLOCKED();
 
-        if (p) {
-                scr_writew(old, p);
+        if (old_offset != -1 && old_offset >= 0 &&
+            old_offset < vc->vc_screenbuf_size) {
+                scr_writew(old, screenpos(vc, old_offset, 1));
                 if (DO_UPDATE(vc))
                         vc->vc_sw->con_putc(vc, old, oldy, oldx);
         }
-        if (offset == -1)
-                p = NULL;
-        else {
+
+        old_offset = offset;
+
+        if (offset != -1 && offset >= 0 &&
+            offset < vc->vc_screenbuf_size) {
                 unsigned short new;
+                unsigned short *p;
                 p = screenpos(vc, offset, 1);
                 old = scr_readw(p);
                 new = old ^ vc->vc_complement_mask;
@@ -459,6 +463,7 @@ void complement_pos(struct vc_data *vc, int offset)
                         vc->vc_sw->con_putc(vc, new, oldy, oldx);
                 }
         }
+
 }
 
 static void insert_char(struct vc_data *vc, unsigned int nr)
@@ -2272,7 +2277,9 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         ret = paste_selection(tty);
                         break;
                 case TIOCL_UNBLANKSCREEN:
+                        acquire_console_sem();
                         unblank_screen();
+                        release_console_sem();
                         break;
                 case TIOCL_SELLOADLUT:
                         ret = sel_loadlut(p);
@@ -2317,8 +2324,10 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                         }
                         break;
                 case TIOCL_BLANKSCREEN: /* until explicitly unblanked, not only poked */
+                        acquire_console_sem();
                         ignore_poke = 1;
                         do_blank_screen(0);
+                        release_console_sem();
                         break;
                 case TIOCL_BLANKEDSCREEN:
                         ret = console_blanked;
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index b53e2e2b5aee..c3898afce3ae 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -346,6 +346,13 @@ config 8xx_WDT
         tristate "MPC8xx Watchdog Timer"
         depends on WATCHDOG && 8xx
 
+config BOOKE_WDT
+        tristate "PowerPC Book-E Watchdog Timer"
+        depends on WATCHDOG && (BOOKE || 4xx)
+        ---help---
+          Please see Documentation/watchdog/watchdog-api.txt for
+          more information.
+
 # MIPS Architecture
 
 config INDYDOG
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index c1838834ea7f..cfeac6f10137 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -2,42 +2,68 @@
 # Makefile for the WatchDog device drivers.
 #
 
+# Only one watchdog can succeed. We probe the ISA/PCI/USB based
+# watchdog-cards first, then the architecture specific watchdog
+# drivers and then the architecture independant "softdog" driver.
+# This means that if your ISA/PCI/USB card isn't detected that
+# you can fall back to an architecture specific driver and if
+# that also fails then you can fall back to the software watchdog
+# to give you some cover.
+
+# ISA-based Watchdog Cards
 obj-$(CONFIG_PCWATCHDOG) += pcwd.o
-obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
-obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
-obj-$(CONFIG_IB700_WDT) += ib700wdt.o
 obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
-obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
-obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_WDT) += wdt.o
+
+# PCI-based Watchdog Cards
+obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
 obj-$(CONFIG_WDTPCI) += wdt_pci.o
+
+# USB-based Watchdog Cards
+obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
+
+# ARM Architecture
 obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
 obj-$(CONFIG_977_WATCHDOG) += wdt977.o
-obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
-obj-$(CONFIG_MACHZ_WDT) += machzwd.o
-obj-$(CONFIG_SH_WDT) += shwdt.o
+obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
+obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
 obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
-obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
-obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
-obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
-obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
-obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+
+# X86 (i386 + ia64 + x86_64) Architecture
+obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
+obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
 obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o
-obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
+obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
+obj-$(CONFIG_IB700_WDT) += ib700wdt.o
 obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
+obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
+obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
+obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
+obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
-obj-$(CONFIG_INDYDOG) += indydog.o
-obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
-obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
-obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
-obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
+obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
+obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
+obj-$(CONFIG_MACHZ_WDT) += machzwd.o
+
+# PowerPC Architecture
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+
+# PPC64 Architecture
 obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
+obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
+
+# MIPS Architecture
+obj-$(CONFIG_INDYDOG) += indydog.o
+
+# S390 Architecture
+
+# SUPERH Architecture
+obj-$(CONFIG_SH_WDT) += shwdt.o
 
-# Only one watchdog can succeed. We probe the hardware watchdog
-# drivers first, then the softdog driver.  This means if your hardware
-# watchdog dies or is 'borrowed' for some reason the software watchdog
-# still gives you some cover.
+# SPARC64 Architecture
 
+# Architecture Independant
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
new file mode 100644
index 000000000000..abc30cca6645
--- /dev/null
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -0,0 +1,192 @@
+/*
+ * drivers/char/watchdog/booke_wdt.c
+ *
+ * Watchdog timer for PowerPC Book-E systems
+ *
+ * Author: Matthew McClintock
+ * Maintainer: Kumar Gala <kumar.gala@freescale.com>
+ *
+ * Copyright 2005 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/notifier.h>
+#include <linux/watchdog.h>
+
+#include <asm/reg_booke.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
+/* If the kernel parameter wdt_enable=1, the watchdog will be enabled at boot.
+ * Also, the wdt_period sets the watchdog timer period timeout.
+ * For E500 cpus the wdt_period sets which bit changing from 0->1 will
+ * trigger a watchog timeout. This watchdog timeout will occur 3 times, the
+ * first time nothing will happen, the second time a watchdog exception will
+ * occur, and the final time the board will reset.
+ */
+
+#ifdef  CONFIG_FSL_BOOKE
+#define WDT_PERIOD_DEFAULT 63   /* Ex. wdt_period=28 bus=333Mhz , reset=~40sec */
+#else
+#define WDT_PERIOD_DEFAULT 4    /* Refer to the PPC40x and PPC4xx manuals */
+#endif                          /* for timing information */
+
+u32 booke_wdt_enabled = 0;
+u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
+
+#ifdef  CONFIG_FSL_BOOKE
+#define WDTP(x)         ((((63-x)&0x3)<<30)|(((63-x)&0x3c)<<15))
+#else
+#define WDTP(x)         (TCR_WP(x))
+#endif
+
+/*
+ * booke_wdt_enable:
+ */
+static __inline__ void booke_wdt_enable(void)
+{
+        u32 val;
+
+        val = mfspr(SPRN_TCR);
+        val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
+
+        mtspr(SPRN_TCR, val);
+}
+
+/*
+ * booke_wdt_ping:
+ */
+static __inline__ void booke_wdt_ping(void)
+{
+        mtspr(SPRN_TSR, TSR_ENW|TSR_WIS);
+}
+
+/*
+ * booke_wdt_write:
+ */
+static ssize_t booke_wdt_write (struct file *file, const char *buf,
+                                size_t count, loff_t *ppos)
+{
+        booke_wdt_ping();
+        return count;
+}
+
+static struct watchdog_info ident = {
+  .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+  .firmware_version = 0,
+  .identity = "PowerPC Book-E Watchdog",
+};
+
+/*
+ * booke_wdt_ioctl:
+ */
+static int booke_wdt_ioctl (struct inode *inode, struct file *file,
+                            unsigned int cmd, unsigned long arg)
+{
+        u32 tmp = 0;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user ((struct watchdog_info *) arg, &ident,
+                                sizeof(struct watchdog_info)))
+                        return -EFAULT;
+        case WDIOC_GETSTATUS:
+                return put_user(ident.options, (u32 *) arg);
+        case WDIOC_GETBOOTSTATUS:
+                /* XXX: something is clearing TSR */
+                tmp = mfspr(SPRN_TSR) & TSR_WRS(3);
+                /* returns 1 if last reset was caused by the WDT */
+                return (tmp ? 1 : 0);
+        case WDIOC_KEEPALIVE:
+                booke_wdt_ping();
+                return 0;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(booke_wdt_period, (u32 *) arg))
+                        return -EFAULT;
+                mtspr(SPRN_TCR, (mfspr(SPRN_TCR)&~WDTP(0))|WDTP(booke_wdt_period));
+                return 0;
+        case WDIOC_GETTIMEOUT:
+                return put_user(booke_wdt_period, (u32 *) arg);
+        case WDIOC_SETOPTIONS:
+                if (get_user(tmp, (u32 *) arg))
+                        return -EINVAL;
+                if (tmp == WDIOS_ENABLECARD) {
+                        booke_wdt_ping();
+                        break;
+                } else
+                        return -EINVAL;
+                return 0;
+        default:
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+/*
+ * booke_wdt_open:
+ */
+static int booke_wdt_open (struct inode *inode, struct file *file)
+{
+        if (booke_wdt_enabled == 0) {
+                booke_wdt_enabled = 1;
+                booke_wdt_enable();
+                printk (KERN_INFO "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                                booke_wdt_period);
+        }
+
+        return 0;
+}
+
+static struct file_operations booke_wdt_fops = {
+  .owner = THIS_MODULE,
+  .llseek = no_llseek,
+  .write = booke_wdt_write,
+  .ioctl = booke_wdt_ioctl,
+  .open = booke_wdt_open,
+};
+
+static struct miscdevice booke_wdt_miscdev = {
+  .minor = WATCHDOG_MINOR,
+  .name = "watchdog",
+  .fops = &booke_wdt_fops,
+};
+
+static void __exit booke_wdt_exit(void)
+{
+        misc_deregister(&booke_wdt_miscdev);
+}
+
+/*
+ * booke_wdt_init:
+ */
+static int __init booke_wdt_init(void)
+{
+        int ret = 0;
+
+        printk (KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");
+        ident.firmware_version = cpu_specs[0].pvr_value;
+
+        ret = misc_register(&booke_wdt_miscdev);
+        if (ret) {
+                printk (KERN_CRIT "Cannot register miscdev on minor=%d (err=%d)\n",
+                                WATCHDOG_MINOR, ret);
+                return ret;
+        }
+
+        if (booke_wdt_enabled == 1) {
+                printk (KERN_INFO "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
+                                booke_wdt_period);
+                booke_wdt_enable();
+        }
+
+        return ret;
+}
+device_initcall(booke_wdt_init);
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index e7640bc4904b..0cfb9b9c4a4b 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -182,7 +182,7 @@ static struct file_operations ixp2000_wdt_fops =
 static struct miscdevice ixp2000_wdt_miscdev =
 {
         .minor          = WATCHDOG_MINOR,
-        .name           = "IXP2000 Watchdog",
+        .name           = "watchdog",
         .fops           = &ixp2000_wdt_fops,
 };
 
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index 8d916afbf4fa..b5be8b11104a 100644
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -176,7 +176,7 @@ static struct file_operations ixp4xx_wdt_fops =
 static struct miscdevice ixp4xx_wdt_miscdev =
 {
         .minor          = WATCHDOG_MINOR,
-        .name           = "IXP4xx Watchdog",
+        .name           = "watchdog",
         .fops           = &ixp4xx_wdt_fops,
 };
 
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index f85ac898a49a..8b292bf343c4 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -27,7 +27,10 @@
  *                              Fixed tmr_count / wdt_count confusion
  *                              Added configurable debug
  *
- *      11-Jan-2004     BJD     Fixed divide-by-2 in timeout code
+ *      11-Jan-2005     BJD     Fixed divide-by-2 in timeout code
+ *
+ *      25-Jan-2005     DA      Added suspend/resume support
+ *                              Replaced reboot notifier with .shutdown method
  *
  *      10-Mar-2005     LCVR    Changed S3C2410_VA to S3C24XX_VA
 */
@@ -40,8 +43,6 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/fs.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
@@ -317,20 +318,6 @@ static int s3c2410wdt_ioctl(struct inode *inode, struct file *file,
         }
 }
 
-/*
- *      Notifier for system down
- */
-
-static int s3c2410wdt_notify_sys(struct notifier_block *this, unsigned long code,
-                              void *unused)
-{
-        if(code==SYS_DOWN || code==SYS_HALT) {
-                /* Turn the WDT off */
-                s3c2410wdt_stop();
-        }
-        return NOTIFY_DONE;
-}
-
 /* kernel interface */
 
 static struct file_operations s3c2410wdt_fops = {
@@ -348,10 +335,6 @@ static struct miscdevice s3c2410wdt_miscdev = {
         .fops           = &s3c2410wdt_fops,
 };
 
-static struct notifier_block s3c2410wdt_notifier = {
-        .notifier_call  = s3c2410wdt_notify_sys,
-};
-
 /* interrupt handler code */
 
 static irqreturn_t s3c2410wdt_irq(int irqno, void *param,
@@ -432,18 +415,10 @@ static int s3c2410wdt_probe(struct device *dev)
                 }
         }
 
-        ret = register_reboot_notifier(&s3c2410wdt_notifier);
-        if (ret) {
-                printk (KERN_ERR PFX "cannot register reboot notifier (%d)\n",
-                        ret);
-                return ret;
-        }
-
         ret = misc_register(&s3c2410wdt_miscdev);
         if (ret) {
                 printk (KERN_ERR PFX "cannot register miscdev on minor=%d (%d)\n",
                         WATCHDOG_MINOR, ret);
-                unregister_reboot_notifier(&s3c2410wdt_notifier);
                 return ret;
         }
 
@@ -479,15 +454,63 @@ static int s3c2410wdt_remove(struct device *dev)
         return 0;
 }
 
+static void s3c2410wdt_shutdown(struct device *dev)
+{
+        s3c2410wdt_stop();      
+}
+
+#ifdef CONFIG_PM
+
+static unsigned long wtcon_save;
+static unsigned long wtdat_save;
+
+static int s3c2410wdt_suspend(struct device *dev, u32 state, u32 level)
+{
+        if (level == SUSPEND_POWER_DOWN) {
+                /* Save watchdog state, and turn it off. */
+                wtcon_save = readl(wdt_base + S3C2410_WTCON);
+                wtdat_save = readl(wdt_base + S3C2410_WTDAT);
+
+                /* Note that WTCNT doesn't need to be saved. */
+                s3c2410wdt_stop();
+        }
+
+        return 0;
+}
+
+static int s3c2410wdt_resume(struct device *dev, u32 level)
+{
+        if (level == RESUME_POWER_ON) {
+                /* Restore watchdog state. */
+
+                writel(wtdat_save, wdt_base + S3C2410_WTDAT);
+                writel(wtdat_save, wdt_base + S3C2410_WTCNT); /* Reset count */
+                writel(wtcon_save, wdt_base + S3C2410_WTCON);
+
+                printk(KERN_INFO PFX "watchdog %sabled\n",
+                       (wtcon_save & S3C2410_WTCON_ENABLE) ? "en" : "dis");
+        }
+
+        return 0;
+}
+
+#else
+#define s3c2410wdt_suspend NULL
+#define s3c2410wdt_resume  NULL
+#endif /* CONFIG_PM */
+
+
 static struct device_driver s3c2410wdt_driver = {
         .name           = "s3c2410-wdt",
         .bus            = &platform_bus_type,
         .probe          = s3c2410wdt_probe,
         .remove         = s3c2410wdt_remove,
+        .shutdown       = s3c2410wdt_shutdown,
+        .suspend        = s3c2410wdt_suspend,
+        .resume         = s3c2410wdt_resume,
 };
 
 
-
 static char banner[] __initdata = KERN_INFO "S3C2410 Watchdog Timer, (c) 2004 Simtec Electronics\n";
 
 static int __init watchdog_init(void)
@@ -499,13 +522,13 @@ static int __init watchdog_init(void)
 static void __exit watchdog_exit(void)
 {
         driver_unregister(&s3c2410wdt_driver);
-        unregister_reboot_notifier(&s3c2410wdt_notifier);
 }
 
 module_init(watchdog_init);
 module_exit(watchdog_exit);
 
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
+MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>, "
+              "Dimitry Andric <dimitry.andric@tomtom.com>");
 MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c
index c4568569f3a8..b4a102a2d7e3 100644
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -206,7 +206,7 @@ static struct file_operations scx200_wdt_fops = {
 
 static struct miscdevice scx200_wdt_miscdev = {
         .minor = WATCHDOG_MINOR,
-        .name  = NAME,
+        .name  = "watchdog",
         .fops  = &scx200_wdt_fops,
 };
 
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index 4d7ed931f5c6..20e5eb8667f2 100644
--- a/drivers/char/watchdog/softdog.c
+++ b/drivers/char/watchdog/softdog.c
@@ -77,7 +77,7 @@ static void watchdog_fire(unsigned long);
 
 static struct timer_list watchdog_ticktock =
                 TIMER_INITIALIZER(watchdog_fire, 0, 0);
-static unsigned long timer_alive;
+static unsigned long driver_open, orphan_timer;
 static char expect_close;
 
 
@@ -87,6 +87,9 @@ static char expect_close;
 
 static void watchdog_fire(unsigned long data)
 {
+        if (test_and_clear_bit(0, &orphan_timer))
+                module_put(THIS_MODULE);
+
         if (soft_noboot)
                 printk(KERN_CRIT PFX "Triggered - Reboot ignored.\n");
         else
@@ -128,9 +131,9 @@ static int softdog_set_heartbeat(int t)
 
 static int softdog_open(struct inode *inode, struct file *file)
 {
-        if(test_and_set_bit(0, &timer_alive))
+        if (test_and_set_bit(0, &driver_open))
                 return -EBUSY;
-        if (nowayout)
+        if (!test_and_clear_bit(0, &orphan_timer))
                 __module_get(THIS_MODULE);
         /*
          *      Activate timer
@@ -147,11 +150,13 @@ static int softdog_release(struct inode *inode, struct file *file)
          */
         if (expect_close == 42) {
                 softdog_stop();
+                module_put(THIS_MODULE);
         } else {
                 printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+                set_bit(0, &orphan_timer);
                 softdog_keepalive();
         }
-        clear_bit(0, &timer_alive);
+        clear_bit(0, &driver_open);
         expect_close = 0;
         return 0;
 }
diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/char/watchdog/w83627hf_wdt.c
index 465e0fd0423d..b5d821015421 100644
--- a/drivers/char/watchdog/w83627hf_wdt.c
+++ b/drivers/char/watchdog/w83627hf_wdt.c
@@ -93,6 +93,12 @@ w83627hf_init(void)
 
         w83627hf_select_wd_register();
 
+        outb_p(0xF6, WDT_EFER); /* Select CRF6 */
+        t=inb_p(WDT_EFDR);      /* read CRF6 */
+        if (t != 0) {
+                printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
+                outb_p(timeout, WDT_EFDR);    /* Write back to CRF6 */
+        }
         outb_p(0xF5, WDT_EFER); /* Select CRF5 */
         t=inb_p(WDT_EFDR);      /* read CRF5 */
         t&=~0x0C;               /* set second mode & disable keyboard turning off watchdog */
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 5b29c3b2a331..327b58e64875 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -58,4 +58,31 @@ config EFI_PCDP
 
           See <http://www.dig64.org/specifications/DIG64_HCDPv20_042804.pdf>
 
+config DELL_RBU
+        tristate "BIOS update support for DELL systems via sysfs"
+        select FW_LOADER
+        help
+         Say m if you want to have the option of updating the BIOS for your
+         DELL system. Note you need a Dell OpenManage or Dell Update package (DUP)
+         supporting application to comunicate with the BIOS regarding the new
+         image for the image update to take effect.
+         See <file:Documentation/dell_rbu.txt> for more details on the driver.
+
+config DCDBAS
+        tristate "Dell Systems Management Base Driver"
+        depends on X86 || X86_64
+        default m
+        help
+          The Dell Systems Management Base Driver provides a sysfs interface
+          for systems management software to perform System Management
+          Interrupts (SMIs) and Host Control Actions (system power cycle or
+          power off after OS shutdown) on certain Dell systems.
+
+          See <file:Documentation/dcdbas.txt> for more details on the driver
+          and the Dell systems on which Dell systems management software makes
+          use of this driver.
+
+          Say Y or M here to enable the driver for use by Dell systems
+          management software such as Dell OpenManage.
+
 endmenu
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 90fd0b26db8b..85429979d0db 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -4,3 +4,5 @@
 obj-$(CONFIG_EDD)               += edd.o
 obj-$(CONFIG_EFI_VARS)          += efivars.o
 obj-$(CONFIG_EFI_PCDP)          += pcdp.o
+obj-$(CONFIG_DELL_RBU)          += dell_rbu.o
+obj-$(CONFIG_DCDBAS)            += dcdbas.o
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
new file mode 100644
index 000000000000..955537fe9958
--- /dev/null
+++ b/drivers/firmware/dcdbas.c
@@ -0,0 +1,596 @@
+/*
+ *  dcdbas.c: Dell Systems Management Base Driver
+ *
+ *  The Dell Systems Management Base Driver provides a sysfs interface for
+ *  systems management software to perform System Management Interrupts (SMIs)
+ *  and Host Control Actions (power cycle or power off after OS shutdown) on
+ *  Dell systems.
+ *
+ *  See Documentation/dcdbas.txt for more information.
+ *
+ *  Copyright (C) 1995-2005 Dell Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License v2.0 as published by
+ *  the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
+#include <linux/module.h>
+#include <linux/reboot.h>
+#include <linux/sched.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/semaphore.h>
+
+#include "dcdbas.h"
+
+#define DRIVER_NAME             "dcdbas"
+#define DRIVER_VERSION          "5.6.0-1"
+#define DRIVER_DESCRIPTION      "Dell Systems Management Base Driver"
+
+static struct platform_device *dcdbas_pdev;
+
+static u8 *smi_data_buf;
+static dma_addr_t smi_data_buf_handle;
+static unsigned long smi_data_buf_size;
+static u32 smi_data_buf_phys_addr;
+static DECLARE_MUTEX(smi_data_lock);
+
+static unsigned int host_control_action;
+static unsigned int host_control_smi_type;
+static unsigned int host_control_on_shutdown;
+
+/**
+ * smi_data_buf_free: free SMI data buffer
+ */
+static void smi_data_buf_free(void)
+{
+        if (!smi_data_buf)
+                return;
+
+        dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
+                __FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size);
+
+        dma_free_coherent(&dcdbas_pdev->dev, smi_data_buf_size, smi_data_buf,
+                          smi_data_buf_handle);
+        smi_data_buf = NULL;
+        smi_data_buf_handle = 0;
+        smi_data_buf_phys_addr = 0;
+        smi_data_buf_size = 0;
+}
+
+/**
+ * smi_data_buf_realloc: grow SMI data buffer if needed
+ */
+static int smi_data_buf_realloc(unsigned long size)
+{
+        void *buf;
+        dma_addr_t handle;
+
+        if (smi_data_buf_size >= size)
+                return 0;
+
+        if (size > MAX_SMI_DATA_BUF_SIZE)
+                return -EINVAL;
+
+        /* new buffer is needed */
+        buf = dma_alloc_coherent(&dcdbas_pdev->dev, size, &handle, GFP_KERNEL);
+        if (!buf) {
+                dev_dbg(&dcdbas_pdev->dev,
+                        "%s: failed to allocate memory size %lu\n",
+                        __FUNCTION__, size);
+                return -ENOMEM;
+        }
+        /* memory zeroed by dma_alloc_coherent */
+
+        if (smi_data_buf)
+                memcpy(buf, smi_data_buf, smi_data_buf_size);
+
+        /* free any existing buffer */
+        smi_data_buf_free();
+
+        /* set up new buffer for use */
+        smi_data_buf = buf;
+        smi_data_buf_handle = handle;
+        smi_data_buf_phys_addr = (u32) virt_to_phys(buf);
+        smi_data_buf_size = size;
+
+        dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n",
+                __FUNCTION__, smi_data_buf_phys_addr, smi_data_buf_size);
+
+        return 0;
+}
+
+static ssize_t smi_data_buf_phys_addr_show(struct device *dev,
+                                           struct device_attribute *attr,
+                                           char *buf)
+{
+        return sprintf(buf, "%x\n", smi_data_buf_phys_addr);
+}
+
+static ssize_t smi_data_buf_size_show(struct device *dev,
+                                      struct device_attribute *attr,
+                                      char *buf)
+{
+        return sprintf(buf, "%lu\n", smi_data_buf_size);
+}
+
+static ssize_t smi_data_buf_size_store(struct device *dev,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
+{
+        unsigned long buf_size;
+        ssize_t ret;
+
+        buf_size = simple_strtoul(buf, NULL, 10);
+
+        /* make sure SMI data buffer is at least buf_size */
+        down(&smi_data_lock);
+        ret = smi_data_buf_realloc(buf_size);
+        up(&smi_data_lock);
+        if (ret)
+                return ret;
+
+        return count;
+}
+
+static ssize_t smi_data_read(struct kobject *kobj, char *buf, loff_t pos,
+                             size_t count)
+{
+        size_t max_read;
+        ssize_t ret;
+
+        down(&smi_data_lock);
+
+        if (pos >= smi_data_buf_size) {
+                ret = 0;
+                goto out;
+        }
+
+        max_read = smi_data_buf_size - pos;
+        ret = min(max_read, count);
+        memcpy(buf, smi_data_buf + pos, ret);
+out:
+        up(&smi_data_lock);
+        return ret;
+}
+
+static ssize_t smi_data_write(struct kobject *kobj, char *buf, loff_t pos,
+                              size_t count)
+{
+        ssize_t ret;
+
+        down(&smi_data_lock);
+
+        ret = smi_data_buf_realloc(pos + count);
+        if (ret)
+                goto out;
+
+        memcpy(smi_data_buf + pos, buf, count);
+        ret = count;
+out:
+        up(&smi_data_lock);
+        return ret;
+}
+
+static ssize_t host_control_action_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        return sprintf(buf, "%u\n", host_control_action);
+}
+
+static ssize_t host_control_action_store(struct device *dev,
+                                         struct device_attribute *attr,
+                                         const char *buf, size_t count)
+{
+        ssize_t ret;
+
+        /* make sure buffer is available for host control command */
+        down(&smi_data_lock);
+        ret = smi_data_buf_realloc(sizeof(struct apm_cmd));
+        up(&smi_data_lock);
+        if (ret)
+                return ret;
+
+        host_control_action = simple_strtoul(buf, NULL, 10);
+        return count;
+}
+
+static ssize_t host_control_smi_type_show(struct device *dev,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        return sprintf(buf, "%u\n", host_control_smi_type);
+}
+
+static ssize_t host_control_smi_type_store(struct device *dev,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+        host_control_smi_type = simple_strtoul(buf, NULL, 10);
+        return count;
+}
+
+static ssize_t host_control_on_shutdown_show(struct device *dev,
+                                             struct device_attribute *attr,
+                                             char *buf)
+{
+        return sprintf(buf, "%u\n", host_control_on_shutdown);
+}
+
+static ssize_t host_control_on_shutdown_store(struct device *dev,
+                                              struct device_attribute *attr,
+                                              const char *buf, size_t count)
+{
+        host_control_on_shutdown = simple_strtoul(buf, NULL, 10);
+        return count;
+}
+
+/**
+ * smi_request: generate SMI request
+ *
+ * Called with smi_data_lock.
+ */
+static int smi_request(struct smi_cmd *smi_cmd)
+{
+        cpumask_t old_mask;
+        int ret = 0;
+
+        if (smi_cmd->magic != SMI_CMD_MAGIC) {
+                dev_info(&dcdbas_pdev->dev, "%s: invalid magic value\n",
+                         __FUNCTION__);
+                return -EBADR;
+        }
+
+        /* SMI requires CPU 0 */
+        old_mask = current->cpus_allowed;
+        set_cpus_allowed(current, cpumask_of_cpu(0));
+        if (smp_processor_id() != 0) {
+                dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n",
+                        __FUNCTION__);
+                ret = -EBUSY;
+                goto out;
+        }
+
+        /* generate SMI */
+        asm volatile (
+                "outb %b0,%w1"
+                : /* no output args */
+                : "a" (smi_cmd->command_code),
+                  "d" (smi_cmd->command_address),
+                  "b" (smi_cmd->ebx),
+                  "c" (smi_cmd->ecx)
+                : "memory"
+        );
+
+out:
+        set_cpus_allowed(current, old_mask);
+        return ret;
+}
+
+/**
+ * smi_request_store:
+ *
+ * The valid values are:
+ * 0: zero SMI data buffer
+ * 1: generate calling interface SMI
+ * 2: generate raw SMI
+ *
+ * User application writes smi_cmd to smi_data before telling driver
+ * to generate SMI.
+ */
+static ssize_t smi_request_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+        struct smi_cmd *smi_cmd;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        ssize_t ret;
+
+        down(&smi_data_lock);
+
+        if (smi_data_buf_size < sizeof(struct smi_cmd)) {
+                ret = -ENODEV;
+                goto out;
+        }
+        smi_cmd = (struct smi_cmd *)smi_data_buf;
+
+        switch (val) {
+        case 2:
+                /* Raw SMI */
+                ret = smi_request(smi_cmd);
+                if (!ret)
+                        ret = count;
+                break;
+        case 1:
+                /* Calling Interface SMI */
+                smi_cmd->ebx = (u32) virt_to_phys(smi_cmd->command_buffer);
+                ret = smi_request(smi_cmd);
+                if (!ret)
+                        ret = count;
+                break;
+        case 0:
+                memset(smi_data_buf, 0, smi_data_buf_size);
+                ret = count;
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+out:
+        up(&smi_data_lock);
+        return ret;
+}
+
+/**
+ * host_control_smi: generate host control SMI
+ *
+ * Caller must set up the host control command in smi_data_buf.
+ */
+static int host_control_smi(void)
+{
+        struct apm_cmd *apm_cmd;
+        u8 *data;
+        unsigned long flags;
+        u32 num_ticks;
+        s8 cmd_status;
+        u8 index;
+
+        apm_cmd = (struct apm_cmd *)smi_data_buf;
+        apm_cmd->status = ESM_STATUS_CMD_UNSUCCESSFUL;
+
+        switch (host_control_smi_type) {
+        case HC_SMITYPE_TYPE1:
+                spin_lock_irqsave(&rtc_lock, flags);
+                /* write SMI data buffer physical address */
+                data = (u8 *)&smi_data_buf_phys_addr;
+                for (index = PE1300_CMOS_CMD_STRUCT_PTR;
+                     index < (PE1300_CMOS_CMD_STRUCT_PTR + 4);
+                     index++, data++) {
+                        outb(index,
+                             (CMOS_BASE_PORT + CMOS_PAGE2_INDEX_PORT_PIIX4));
+                        outb(*data,
+                             (CMOS_BASE_PORT + CMOS_PAGE2_DATA_PORT_PIIX4));
+                }
+
+                /* first set status to -1 as called by spec */
+                cmd_status = ESM_STATUS_CMD_UNSUCCESSFUL;
+                outb((u8) cmd_status, PCAT_APM_STATUS_PORT);
+
+                /* generate SMM call */
+                outb(ESM_APM_CMD, PCAT_APM_CONTROL_PORT);
+                spin_unlock_irqrestore(&rtc_lock, flags);
+
+                /* wait a few to see if it executed */
+                num_ticks = TIMEOUT_USEC_SHORT_SEMA_BLOCKING;
+                while ((cmd_status = inb(PCAT_APM_STATUS_PORT))
+                       == ESM_STATUS_CMD_UNSUCCESSFUL) {
+                        num_ticks--;
+                        if (num_ticks == EXPIRED_TIMER)
+                                return -ETIME;
+                }
+                break;
+
+        case HC_SMITYPE_TYPE2:
+        case HC_SMITYPE_TYPE3:
+                spin_lock_irqsave(&rtc_lock, flags);
+                /* write SMI data buffer physical address */
+                data = (u8 *)&smi_data_buf_phys_addr;
+                for (index = PE1400_CMOS_CMD_STRUCT_PTR;
+                     index < (PE1400_CMOS_CMD_STRUCT_PTR + 4);
+                     index++, data++) {
+                        outb(index, (CMOS_BASE_PORT + CMOS_PAGE1_INDEX_PORT));
+                        outb(*data, (CMOS_BASE_PORT + CMOS_PAGE1_DATA_PORT));
+                }
+
+                /* generate SMM call */
+                if (host_control_smi_type == HC_SMITYPE_TYPE3)
+                        outb(ESM_APM_CMD, PCAT_APM_CONTROL_PORT);
+                else
+                        outb(ESM_APM_CMD, PE1400_APM_CONTROL_PORT);
+
+                /* restore RTC index pointer since it was written to above */
+                CMOS_READ(RTC_REG_C);
+                spin_unlock_irqrestore(&rtc_lock, flags);
+
+                /* read control port back to serialize write */
+                cmd_status = inb(PE1400_APM_CONTROL_PORT);
+
+                /* wait a few to see if it executed */
+                num_ticks = TIMEOUT_USEC_SHORT_SEMA_BLOCKING;
+                while (apm_cmd->status == ESM_STATUS_CMD_UNSUCCESSFUL) {
+                        num_ticks--;
+                        if (num_ticks == EXPIRED_TIMER)
+                                return -ETIME;
+                }
+                break;
+
+        default:
+                dev_dbg(&dcdbas_pdev->dev, "%s: invalid SMI type %u\n",
+                        __FUNCTION__, host_control_smi_type);
+                return -ENOSYS;
+        }
+
+        return 0;
+}
+
+/**
+ * dcdbas_host_control: initiate host control
+ *
+ * This function is called by the driver after the system has
+ * finished shutting down if the user application specified a
+ * host control action to perform on shutdown.  It is safe to
+ * use smi_data_buf at this point because the system has finished
+ * shutting down and no userspace apps are running.
+ */
+static void dcdbas_host_control(void)
+{
+        struct apm_cmd *apm_cmd;
+        u8 action;
+
+        if (host_control_action == HC_ACTION_NONE)
+                return;
+
+        action = host_control_action;
+        host_control_action = HC_ACTION_NONE;
+
+        if (!smi_data_buf) {
+                dev_dbg(&dcdbas_pdev->dev, "%s: no SMI buffer\n", __FUNCTION__);
+                return;
+        }
+
+        if (smi_data_buf_size < sizeof(struct apm_cmd)) {
+                dev_dbg(&dcdbas_pdev->dev, "%s: SMI buffer too small\n",
+                        __FUNCTION__);
+                return;
+        }
+
+        apm_cmd = (struct apm_cmd *)smi_data_buf;
+
+        /* power off takes precedence */
+        if (action & HC_ACTION_HOST_CONTROL_POWEROFF) {
+                apm_cmd->command = ESM_APM_POWER_CYCLE;
+                apm_cmd->reserved = 0;
+                *((s16 *)&apm_cmd->parameters.shortreq.parm[0]) = (s16) 0;
+                host_control_smi();
+        } else if (action & HC_ACTION_HOST_CONTROL_POWERCYCLE) {
+                apm_cmd->command = ESM_APM_POWER_CYCLE;
+                apm_cmd->reserved = 0;
+                *((s16 *)&apm_cmd->parameters.shortreq.parm[0]) = (s16) 20;
+                host_control_smi();
+        }
+}
+
+/**
+ * dcdbas_reboot_notify: handle reboot notification for host control
+ */
+static int dcdbas_reboot_notify(struct notifier_block *nb, unsigned long code,
+                                void *unused)
+{
+        static unsigned int notify_cnt = 0;
+
+        switch (code) {
+        case SYS_DOWN:
+        case SYS_HALT:
+        case SYS_POWER_OFF:
+                if (host_control_on_shutdown) {
+                        /* firmware is going to perform host control action */
+                        if (++notify_cnt == 2) {
+                                printk(KERN_WARNING
+                                       "Please wait for shutdown "
+                                       "action to complete...\n");
+                                dcdbas_host_control();
+                        }
+                        /*
+                         * register again and initiate the host control
+                         * action on the second notification to allow
+                         * everyone that registered to be notified
+                         */
+                        register_reboot_notifier(nb);
+                }
+                break;
+        }
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block dcdbas_reboot_nb = {
+        .notifier_call = dcdbas_reboot_notify,
+        .next = NULL,
+        .priority = 0
+};
+
+static DCDBAS_BIN_ATTR_RW(smi_data);
+
+static struct bin_attribute *dcdbas_bin_attrs[] = {
+        &bin_attr_smi_data,
+        NULL
+};
+
+static DCDBAS_DEV_ATTR_RW(smi_data_buf_size);
+static DCDBAS_DEV_ATTR_RO(smi_data_buf_phys_addr);
+static DCDBAS_DEV_ATTR_WO(smi_request);
+static DCDBAS_DEV_ATTR_RW(host_control_action);
+static DCDBAS_DEV_ATTR_RW(host_control_smi_type);
+static DCDBAS_DEV_ATTR_RW(host_control_on_shutdown);
+
+static struct device_attribute *dcdbas_dev_attrs[] = {
+        &dev_attr_smi_data_buf_size,
+        &dev_attr_smi_data_buf_phys_addr,
+        &dev_attr_smi_request,
+        &dev_attr_host_control_action,
+        &dev_attr_host_control_smi_type,
+        &dev_attr_host_control_on_shutdown,
+        NULL
+};
+
+/**
+ * dcdbas_init: initialize driver
+ */
+static int __init dcdbas_init(void)
+{
+        int i;
+
+        host_control_action = HC_ACTION_NONE;
+        host_control_smi_type = HC_SMITYPE_NONE;
+
+        dcdbas_pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0);
+        if (IS_ERR(dcdbas_pdev))
+                return PTR_ERR(dcdbas_pdev);
+
+        /*
+         * BIOS SMI calls require buffer addresses be in 32-bit address space.
+         * This is done by setting the DMA mask below.
+         */
+        dcdbas_pdev->dev.coherent_dma_mask = DMA_32BIT_MASK;
+        dcdbas_pdev->dev.dma_mask = &dcdbas_pdev->dev.coherent_dma_mask;
+
+        register_reboot_notifier(&dcdbas_reboot_nb);
+
+        for (i = 0; dcdbas_bin_attrs[i]; i++)
+                sysfs_create_bin_file(&dcdbas_pdev->dev.kobj,
+                                      dcdbas_bin_attrs[i]);
+
+        for (i = 0; dcdbas_dev_attrs[i]; i++)
+                device_create_file(&dcdbas_pdev->dev, dcdbas_dev_attrs[i]);
+
+        dev_info(&dcdbas_pdev->dev, "%s (version %s)\n",
+                 DRIVER_DESCRIPTION, DRIVER_VERSION);
+
+        return 0;
+}
+
+/**
+ * dcdbas_exit: perform driver cleanup
+ */
+static void __exit dcdbas_exit(void)
+{
+        platform_device_unregister(dcdbas_pdev);
+        unregister_reboot_notifier(&dcdbas_reboot_nb);
+        smi_data_buf_free();
+}
+
+module_init(dcdbas_init);
+module_exit(dcdbas_exit);
+
+MODULE_DESCRIPTION(DRIVER_DESCRIPTION " (version " DRIVER_VERSION ")");
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_AUTHOR("Dell Inc.");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/firmware/dcdbas.h b/drivers/firmware/dcdbas.h
new file mode 100644
index 000000000000..58a85182b3e8
--- /dev/null
+++ b/drivers/firmware/dcdbas.h
@@ -0,0 +1,107 @@
+/*
+ *  dcdbas.h: Definitions for Dell Systems Management Base driver
+ *
+ *  Copyright (C) 1995-2005 Dell Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License v2.0 as published by
+ *  the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#ifndef _DCDBAS_H_
+#define _DCDBAS_H_
+
+#include <linux/device.h>
+#include <linux/input.h>
+#include <linux/sysfs.h>
+#include <linux/types.h>
+
+#define MAX_SMI_DATA_BUF_SIZE                   (256 * 1024)
+
+#define HC_ACTION_NONE                          (0)
+#define HC_ACTION_HOST_CONTROL_POWEROFF         BIT(1)
+#define HC_ACTION_HOST_CONTROL_POWERCYCLE       BIT(2)
+
+#define HC_SMITYPE_NONE                         (0)
+#define HC_SMITYPE_TYPE1                        (1)
+#define HC_SMITYPE_TYPE2                        (2)
+#define HC_SMITYPE_TYPE3                        (3)
+
+#define ESM_APM_CMD                             (0x0A0)
+#define ESM_APM_POWER_CYCLE                     (0x10)
+#define ESM_STATUS_CMD_UNSUCCESSFUL             (-1)
+
+#define CMOS_BASE_PORT                          (0x070)
+#define CMOS_PAGE1_INDEX_PORT                   (0)
+#define CMOS_PAGE1_DATA_PORT                    (1)
+#define CMOS_PAGE2_INDEX_PORT_PIIX4             (2)
+#define CMOS_PAGE2_DATA_PORT_PIIX4              (3)
+#define PE1400_APM_CONTROL_PORT                 (0x0B0)
+#define PCAT_APM_CONTROL_PORT                   (0x0B2)
+#define PCAT_APM_STATUS_PORT                    (0x0B3)
+#define PE1300_CMOS_CMD_STRUCT_PTR              (0x38)
+#define PE1400_CMOS_CMD_STRUCT_PTR              (0x70)
+
+#define MAX_SYSMGMT_SHORTCMD_PARMBUF_LEN        (14)
+#define MAX_SYSMGMT_LONGCMD_SGENTRY_NUM         (16)
+
+#define TIMEOUT_USEC_SHORT_SEMA_BLOCKING        (10000)
+#define EXPIRED_TIMER                           (0)
+
+#define SMI_CMD_MAGIC                           (0x534D4931)
+
+#define DCDBAS_DEV_ATTR_RW(_name) \
+        DEVICE_ATTR(_name,0600,_name##_show,_name##_store);
+
+#define DCDBAS_DEV_ATTR_RO(_name) \
+        DEVICE_ATTR(_name,0400,_name##_show,NULL);
+
+#define DCDBAS_DEV_ATTR_WO(_name) \
+        DEVICE_ATTR(_name,0200,NULL,_name##_store);
+
+#define DCDBAS_BIN_ATTR_RW(_name) \
+struct bin_attribute bin_attr_##_name = { \
+        .attr =  { .name = __stringify(_name), \
+                   .mode = 0600, \
+                   .owner = THIS_MODULE }, \
+        .read =  _name##_read, \
+        .write = _name##_write, \
+}
+
+struct smi_cmd {
+        __u32 magic;
+        __u32 ebx;
+        __u32 ecx;
+        __u16 command_address;
+        __u8 command_code;
+        __u8 reserved;
+        __u8 command_buffer[1];
+} __attribute__ ((packed));
+
+struct apm_cmd {
+        __u8 command;
+        __s8 status;
+        __u16 reserved;
+        union {
+                struct {
+                        __u8 parm[MAX_SYSMGMT_SHORTCMD_PARMBUF_LEN];
+                } __attribute__ ((packed)) shortreq;
+
+                struct {
+                        __u16 num_sg_entries;
+                        struct {
+                                __u32 size;
+                                __u64 addr;
+                        } __attribute__ ((packed))
+                            sglist[MAX_SYSMGMT_LONGCMD_SGENTRY_NUM];
+                } __attribute__ ((packed)) longreq;
+        } __attribute__ ((packed)) parameters;
+} __attribute__ ((packed));
+
+#endif /* _DCDBAS_H_ */
+
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c
new file mode 100644
index 000000000000..3b865f34a095
--- /dev/null
+++ b/drivers/firmware/dell_rbu.c
@@ -0,0 +1,634 @@
+/*
+ * dell_rbu.c
+ * Bios Update driver for Dell systems
+ * Author: Dell Inc
+ *         Abhay Salunke <abhay_salunke@dell.com>
+ *
+ * Copyright (C) 2005 Dell Inc.
+ *
+ * Remote BIOS Update (rbu) driver is used for updating DELL BIOS by
+ * creating entries in the /sys file systems on Linux 2.6 and higher
+ * kernels. The driver supports two mechanism to update the BIOS namely
+ * contiguous and packetized. Both these methods still require having some
+ * application to set the CMOS bit indicating the BIOS to update itself
+ * after a reboot.
+ *
+ * Contiguous method:
+ * This driver writes the incoming data in a monolithic image by allocating
+ * contiguous physical pages large enough to accommodate the incoming BIOS
+ * image size.
+ *
+ * Packetized method:
+ * The driver writes the incoming packet image by allocating a new packet
+ * on every time the packet data is written. This driver requires an
+ * application to break the BIOS image in to fixed sized packet chunks.
+ *
+ * See Documentation/dell_rbu.txt for more info.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License v2.0 as published by
+ * the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/version.h>
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/errno.h>
+#include <linux/blkdev.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
+#include <linux/moduleparam.h>
+#include <linux/firmware.h>
+#include <linux/dma-mapping.h>
+
+MODULE_AUTHOR("Abhay Salunke <abhay_salunke@dell.com>");
+MODULE_DESCRIPTION("Driver for updating BIOS image on DELL systems");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
+
+#define BIOS_SCAN_LIMIT 0xffffffff
+#define MAX_IMAGE_LENGTH 16
+static struct _rbu_data {
+        void *image_update_buffer;
+        unsigned long image_update_buffer_size;
+        unsigned long bios_image_size;
+        int image_update_ordernum;
+        int dma_alloc;
+        spinlock_t lock;
+        unsigned long packet_read_count;
+        unsigned long packet_write_count;
+        unsigned long num_packets;
+        unsigned long packetsize;
+} rbu_data;
+
+static char image_type[MAX_IMAGE_LENGTH] = "mono";
+module_param_string(image_type, image_type, sizeof(image_type), 0);
+MODULE_PARM_DESC(image_type, "BIOS image type. choose- mono or packet");
+
+struct packet_data {
+        struct list_head list;
+        size_t length;
+        void *data;
+        int ordernum;
+};
+
+static struct packet_data packet_data_head;
+
+static struct platform_device *rbu_device;
+static int context;
+static dma_addr_t dell_rbu_dmaaddr;
+
+static void init_packet_head(void)
+{
+        INIT_LIST_HEAD(&packet_data_head.list);
+        rbu_data.packet_write_count = 0;
+        rbu_data.packet_read_count = 0;
+        rbu_data.num_packets = 0;
+        rbu_data.packetsize = 0;
+}
+
+static int fill_last_packet(void *data, size_t length)
+{
+        struct list_head *ptemp_list;
+        struct packet_data *packet = NULL;
+        int packet_count = 0;
+
+        pr_debug("fill_last_packet: entry \n");
+
+        if (!rbu_data.num_packets) {
+                pr_debug("fill_last_packet: num_packets=0\n");
+                return -ENOMEM;
+        }
+
+        packet_count = rbu_data.num_packets;
+
+        ptemp_list = (&packet_data_head.list)->prev;
+
+        packet = list_entry(ptemp_list, struct packet_data, list);
+
+        if ((rbu_data.packet_write_count + length) > rbu_data.packetsize) {
+                pr_debug("dell_rbu:%s: packet size data "
+                         "overrun\n", __FUNCTION__);
+                return -EINVAL;
+        }
+
+        pr_debug("fill_last_packet : buffer = %p\n", packet->data);
+
+        memcpy((packet->data + rbu_data.packet_write_count), data, length);
+
+        if ((rbu_data.packet_write_count + length) == rbu_data.packetsize) {
+                /*
+                 * this was the last data chunk in the packet
+                 * so reinitialize the packet data counter to zero
+                 */
+                rbu_data.packet_write_count = 0;
+        } else
+                rbu_data.packet_write_count += length;
+
+        pr_debug("fill_last_packet: exit \n");
+        return 0;
+}
+
+static int create_packet(size_t length)
+{
+        struct packet_data *newpacket;
+        int ordernum = 0;
+
+        pr_debug("create_packet: entry \n");
+
+        if (!rbu_data.packetsize) {
+                pr_debug("create_packet: packetsize not specified\n");
+                return -EINVAL;
+        }
+
+        newpacket = kmalloc(sizeof(struct packet_data), GFP_KERNEL);
+        if (!newpacket) {
+                printk(KERN_WARNING
+                       "dell_rbu:%s: failed to allocate new "
+                       "packet\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+
+        ordernum = get_order(length);
+        /*
+         * there is no upper limit on memory
+         * address for packetized mechanism
+         */
+        newpacket->data = (unsigned char *)__get_free_pages(GFP_KERNEL,
+                                                            ordernum);
+
+        pr_debug("create_packet: newpacket %p\n", newpacket->data);
+
+        if (!newpacket->data) {
+                printk(KERN_WARNING
+                       "dell_rbu:%s: failed to allocate new "
+                       "packet\n", __FUNCTION__);
+                kfree(newpacket);
+                return -ENOMEM;
+        }
+
+        newpacket->ordernum = ordernum;
+        ++rbu_data.num_packets;
+        /*
+         * initialize the newly created packet headers
+         */
+        INIT_LIST_HEAD(&newpacket->list);
+        list_add_tail(&newpacket->list, &packet_data_head.list);
+        /*
+         * packets have fixed size
+         */
+        newpacket->length = rbu_data.packetsize;
+
+        pr_debug("create_packet: exit \n");
+
+        return 0;
+}
+
+static int packetize_data(void *data, size_t length)
+{
+        int rc = 0;
+
+        if (!rbu_data.packet_write_count) {
+                if ((rc = create_packet(length)))
+                        return rc;
+        }
+        if ((rc = fill_last_packet(data, length)))
+                return rc;
+
+        return rc;
+}
+
+static int
+do_packet_read(char *data, struct list_head *ptemp_list,
+               int length, int bytes_read, int *list_read_count)
+{
+        void *ptemp_buf;
+        struct packet_data *newpacket = NULL;
+        int bytes_copied = 0;
+        int j = 0;
+
+        newpacket = list_entry(ptemp_list, struct packet_data, list);
+        *list_read_count += newpacket->length;
+
+        if (*list_read_count > bytes_read) {
+                /* point to the start of unread data */
+                j = newpacket->length - (*list_read_count - bytes_read);
+                /* point to the offset in the packet buffer */
+                ptemp_buf = (u8 *) newpacket->data + j;
+                /*
+                 * check if there is enough room in
+                 * * the incoming buffer
+                 */
+                if (length > (*list_read_count - bytes_read))
+                        /*
+                         * copy what ever is there in this
+                         * packet and move on
+                         */
+                        bytes_copied = (*list_read_count - bytes_read);
+                else
+                        /* copy the remaining */
+                        bytes_copied = length;
+                memcpy(data, ptemp_buf, bytes_copied);
+        }
+        return bytes_copied;
+}
+
+static int packet_read_list(char *data, size_t * pread_length)
+{
+        struct list_head *ptemp_list;
+        int temp_count = 0;
+        int bytes_copied = 0;
+        int bytes_read = 0;
+        int remaining_bytes = 0;
+        char *pdest = data;
+
+        /* check if we have any packets */
+        if (0 == rbu_data.num_packets)
+                return -ENOMEM;
+
+        remaining_bytes = *pread_length;
+        bytes_read = rbu_data.packet_read_count;
+
+        ptemp_list = (&packet_data_head.list)->next;
+        while (!list_empty(ptemp_list)) {
+                bytes_copied = do_packet_read(pdest, ptemp_list,
+                                              remaining_bytes, bytes_read,
+                                              &temp_count);
+                remaining_bytes -= bytes_copied;
+                bytes_read += bytes_copied;
+                pdest += bytes_copied;
+                /*
+                 * check if we reached end of buffer before reaching the
+                 * last packet
+                 */
+                if (remaining_bytes == 0)
+                        break;
+
+                ptemp_list = ptemp_list->next;
+        }
+        /*finally set the bytes read */
+        *pread_length = bytes_read - rbu_data.packet_read_count;
+        rbu_data.packet_read_count = bytes_read;
+        return 0;
+}
+
+static void packet_empty_list(void)
+{
+        struct list_head *ptemp_list;
+        struct list_head *pnext_list;
+        struct packet_data *newpacket;
+
+        ptemp_list = (&packet_data_head.list)->next;
+        while (!list_empty(ptemp_list)) {
+                newpacket =
+                    list_entry(ptemp_list, struct packet_data, list);
+                pnext_list = ptemp_list->next;
+                list_del(ptemp_list);
+                ptemp_list = pnext_list;
+                /*
+                 * zero out the RBU packet memory before freeing
+                 * to make sure there are no stale RBU packets left in memory
+                 */
+                memset(newpacket->data, 0, rbu_data.packetsize);
+                free_pages((unsigned long)newpacket->data,
+                           newpacket->ordernum);
+                kfree(newpacket);
+        }
+        rbu_data.packet_write_count = 0;
+        rbu_data.packet_read_count = 0;
+        rbu_data.num_packets = 0;
+        rbu_data.packetsize = 0;
+}
+
+/*
+ * img_update_free: Frees the buffer allocated for storing BIOS image
+ * Always called with lock held and returned with lock held
+ */
+static void img_update_free(void)
+{
+        if (!rbu_data.image_update_buffer)
+                return;
+        /*
+         * zero out this buffer before freeing it to get rid of any stale
+         * BIOS image copied in memory.
+         */
+        memset(rbu_data.image_update_buffer, 0,
+               rbu_data.image_update_buffer_size);
+        if (rbu_data.dma_alloc == 1)
+                dma_free_coherent(NULL, rbu_data.bios_image_size,
+                                  rbu_data.image_update_buffer,
+                                  dell_rbu_dmaaddr);
+        else
+                free_pages((unsigned long)rbu_data.image_update_buffer,
+                           rbu_data.image_update_ordernum);
+
+        /*
+         * Re-initialize the rbu_data variables after a free
+         */
+        rbu_data.image_update_ordernum = -1;
+        rbu_data.image_update_buffer = NULL;
+        rbu_data.image_update_buffer_size = 0;
+        rbu_data.bios_image_size = 0;
+        rbu_data.dma_alloc = 0;
+}
+
+/*
+ * img_update_realloc: This function allocates the contiguous pages to
+ * accommodate the requested size of data. The memory address and size
+ * values are stored globally and on every call to this function the new
+ * size is checked to see if more data is required than the existing size.
+ * If true the previous memory is freed and new allocation is done to
+ * accommodate the new size. If the incoming size is less then than the
+ * already allocated size, then that memory is reused. This function is
+ * called with lock held and returns with lock held.
+ */
+static int img_update_realloc(unsigned long size)
+{
+        unsigned char *image_update_buffer = NULL;
+        unsigned long rc;
+        unsigned long img_buf_phys_addr;
+        int ordernum;
+        int dma_alloc = 0;
+
+        /*
+         * check if the buffer of sufficient size has been
+         * already allocated
+         */
+        if (rbu_data.image_update_buffer_size >= size) {
+                /*
+                 * check for corruption
+                 */
+                if ((size != 0) && (rbu_data.image_update_buffer == NULL)) {
+                        printk(KERN_ERR "dell_rbu:%s: corruption "
+                               "check failed\n", __FUNCTION__);
+                        return -EINVAL;
+                }
+                /*
+                 * we have a valid pre-allocated buffer with
+                 * sufficient size
+                 */
+                return 0;
+        }
+
+        /*
+         * free any previously allocated buffer
+         */
+        img_update_free();
+
+        spin_unlock(&rbu_data.lock);
+
+        ordernum = get_order(size);
+        image_update_buffer =
+            (unsigned char *)__get_free_pages(GFP_KERNEL, ordernum);
+
+        img_buf_phys_addr =
+            (unsigned long)virt_to_phys(image_update_buffer);
+
+        if (img_buf_phys_addr > BIOS_SCAN_LIMIT) {
+                free_pages((unsigned long)image_update_buffer, ordernum);
+                ordernum = -1;
+                image_update_buffer = dma_alloc_coherent(NULL, size,
+                                                         &dell_rbu_dmaaddr,
+                                                         GFP_KERNEL);
+                dma_alloc = 1;
+        }
+
+        spin_lock(&rbu_data.lock);
+
+        if (image_update_buffer != NULL) {
+                rbu_data.image_update_buffer = image_update_buffer;
+                rbu_data.image_update_buffer_size = size;
+                rbu_data.bios_image_size =
+                    rbu_data.image_update_buffer_size;
+                rbu_data.image_update_ordernum = ordernum;
+                rbu_data.dma_alloc = dma_alloc;
+                rc = 0;
+        } else {
+                pr_debug("Not enough memory for image update:"
+                         "size = %ld\n", size);
+                rc = -ENOMEM;
+        }
+
+        return rc;
+}
+
+static ssize_t read_packet_data(char *buffer, loff_t pos, size_t count)
+{
+        int retval;
+        size_t bytes_left;
+        size_t data_length;
+        char *ptempBuf = buffer;
+        unsigned long imagesize;
+
+        /* check to see if we have something to return */
+        if (rbu_data.num_packets == 0) {
+                pr_debug("read_packet_data: no packets written\n");
+                retval = -ENOMEM;
+                goto read_rbu_data_exit;
+        }
+
+        imagesize = rbu_data.num_packets * rbu_data.packetsize;
+
+        if (pos > imagesize) {
+                retval = 0;
+                printk(KERN_WARNING "dell_rbu:read_packet_data: "
+                       "data underrun\n");
+                goto read_rbu_data_exit;
+        }
+
+        bytes_left = imagesize - pos;
+        data_length = min(bytes_left, count);
+
+        if ((retval = packet_read_list(ptempBuf, &data_length)) < 0)
+                goto read_rbu_data_exit;
+
+        if ((pos + count) > imagesize) {
+                rbu_data.packet_read_count = 0;
+                /* this was the last copy */
+                retval = bytes_left;
+        } else
+                retval = count;
+
+      read_rbu_data_exit:
+        return retval;
+}
+
+static ssize_t read_rbu_mono_data(char *buffer, loff_t pos, size_t count)
+{
+        unsigned char *ptemp = NULL;
+        size_t bytes_left = 0;
+        size_t data_length = 0;
+        ssize_t ret_count = 0;
+
+        /* check to see if we have something to return */
+        if ((rbu_data.image_update_buffer == NULL) ||
+            (rbu_data.bios_image_size == 0)) {
+                pr_debug("read_rbu_data_mono: image_update_buffer %p ,"
+                         "bios_image_size %lu\n",
+                         rbu_data.image_update_buffer,
+                         rbu_data.bios_image_size);
+                ret_count = -ENOMEM;
+                goto read_rbu_data_exit;
+        }
+
+        if (pos > rbu_data.bios_image_size) {
+                ret_count = 0;
+                goto read_rbu_data_exit;
+        }
+
+        bytes_left = rbu_data.bios_image_size - pos;
+        data_length = min(bytes_left, count);
+
+        ptemp = rbu_data.image_update_buffer;
+        memcpy(buffer, (ptemp + pos), data_length);
+
+        if ((pos + count) > rbu_data.bios_image_size)
+                /* this was the last copy */
+                ret_count = bytes_left;
+        else
+                ret_count = count;
+      read_rbu_data_exit:
+        return ret_count;
+}
+
+static ssize_t
+read_rbu_data(struct kobject *kobj, char *buffer, loff_t pos, size_t count)
+{
+        ssize_t ret_count = 0;
+
+        spin_lock(&rbu_data.lock);
+
+        if (!strcmp(image_type, "mono"))
+                ret_count = read_rbu_mono_data(buffer, pos, count);
+        else if (!strcmp(image_type, "packet"))
+                ret_count = read_packet_data(buffer, pos, count);
+        else
+                pr_debug("read_rbu_data: invalid image type specified\n");
+
+        spin_unlock(&rbu_data.lock);
+        return ret_count;
+}
+
+static ssize_t
+read_rbu_image_type(struct kobject *kobj, char *buffer, loff_t pos,
+                    size_t count)
+{
+        int size = 0;
+        if (!pos)
+                size = sprintf(buffer, "%s\n", image_type);
+        return size;
+}
+
+static ssize_t
+write_rbu_image_type(struct kobject *kobj, char *buffer, loff_t pos,
+                     size_t count)
+{
+        int rc = count;
+        spin_lock(&rbu_data.lock);
+
+        if (strlen(buffer) < MAX_IMAGE_LENGTH)
+                sscanf(buffer, "%s", image_type);
+        else
+                printk(KERN_WARNING "dell_rbu: image_type is invalid"
+                       "max chars = %d, \n incoming str--%s-- \n",
+                       MAX_IMAGE_LENGTH, buffer);
+
+        /* we must free all previous allocations */
+        packet_empty_list();
+        img_update_free();
+
+        spin_unlock(&rbu_data.lock);
+        return rc;
+
+}
+
+static struct bin_attribute rbu_data_attr = {
+        .attr = {.name = "data",.owner = THIS_MODULE,.mode = 0444},
+        .read = read_rbu_data,
+};
+
+static struct bin_attribute rbu_image_type_attr = {
+        .attr = {.name = "image_type",.owner = THIS_MODULE,.mode = 0644},
+        .read = read_rbu_image_type,
+        .write = write_rbu_image_type,
+};
+
+static void callbackfn_rbu(const struct firmware *fw, void *context)
+{
+        int rc = 0;
+
+        if (!fw || !fw->size)
+                return;
+
+        spin_lock(&rbu_data.lock);
+        if (!strcmp(image_type, "mono")) {
+                if (!img_update_realloc(fw->size))
+                        memcpy(rbu_data.image_update_buffer,
+                               fw->data, fw->size);
+        } else if (!strcmp(image_type, "packet")) {
+                if (!rbu_data.packetsize)
+                        rbu_data.packetsize = fw->size;
+                else if (rbu_data.packetsize != fw->size) {
+                        packet_empty_list();
+                        rbu_data.packetsize = fw->size;
+                }
+                packetize_data(fw->data, fw->size);
+        } else
+                pr_debug("invalid image type specified.\n");
+        spin_unlock(&rbu_data.lock);
+
+        rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG,
+                                     "dell_rbu", &rbu_device->dev,
+                                     &context, callbackfn_rbu);
+        if (rc)
+                printk(KERN_ERR
+                       "dell_rbu:%s request_firmware_nowait failed"
+                       " %d\n", __FUNCTION__, rc);
+}
+
+static int __init dcdrbu_init(void)
+{
+        int rc = 0;
+        spin_lock_init(&rbu_data.lock);
+
+        init_packet_head();
+        rbu_device =
+            platform_device_register_simple("dell_rbu", -1, NULL, 0);
+        if (!rbu_device) {
+                printk(KERN_ERR
+                       "dell_rbu:%s:platform_device_register_simple "
+                       "failed\n", __FUNCTION__);
+                return -EIO;
+        }
+
+        sysfs_create_bin_file(&rbu_device->dev.kobj, &rbu_data_attr);
+        sysfs_create_bin_file(&rbu_device->dev.kobj, &rbu_image_type_attr);
+
+        rc = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG,
+                                     "dell_rbu", &rbu_device->dev,
+                                     &context, callbackfn_rbu);
+        if (rc)
+                printk(KERN_ERR "dell_rbu:%s:request_firmware_nowait"
+                       " failed %d\n", __FUNCTION__, rc);
+
+        return rc;
+
+}
+
+static __exit void dcdrbu_exit(void)
+{
+        spin_lock(&rbu_data.lock);
+        packet_empty_list();
+        img_update_free();
+        spin_unlock(&rbu_data.lock);
+        platform_device_unregister(rbu_device);
+}
+
+module_exit(dcdrbu_exit);
+module_init(dcdrbu_init);
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 140d5f851a5b..138dc50270e3 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -12,12 +12,20 @@ config HWMON
           of a system. Most modern motherboards include such a device. It
           can include temperature sensors, voltage sensors, fan speed
           sensors and various additional features such as the ability to
-          control the speed of the fans.
+          control the speed of the fans.  If you want this support you
+          should say Y here and also to the specific driver(s) for your
+          sensors chip(s) below.
+
+          This support can also be built as a module.  If so, the module
+          will be called hwmon.
+
+config HWMON_VID
+        tristate
+        default n
 
 config SENSORS_ADM1021
         tristate "Analog Devices ADM1021 and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1021
           and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
@@ -30,7 +38,7 @@ config SENSORS_ADM1021
 config SENSORS_ADM1025
         tristate "Analog Devices ADM1025 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM1025
           and Philips NE1619 sensor chips.
@@ -41,7 +49,7 @@ config SENSORS_ADM1025
 config SENSORS_ADM1026
         tristate "Analog Devices ADM1026 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM1026
           sensor chip.
@@ -52,7 +60,6 @@ config SENSORS_ADM1026
 config SENSORS_ADM1031
         tristate "Analog Devices ADM1031 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1031
           and ADM1030 sensor chips.
@@ -63,7 +70,7 @@ config SENSORS_ADM1031
 config SENSORS_ADM9240
         tristate "Analog Devices ADM9240 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Analog Devices ADM9240,
           Dallas DS1780, National Semiconductor LM81 sensor chips.
@@ -74,7 +81,7 @@ config SENSORS_ADM9240
 config SENSORS_ASB100
         tristate "Asus ASB100 Bach"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for the ASB100 Bach sensor
           chip found on some Asus mainboards.
@@ -85,7 +92,7 @@ config SENSORS_ASB100
 config SENSORS_ATXP1
         tristate "Attansic ATXP1 VID controller"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for the Attansic ATXP1 VID
           controller.
@@ -99,7 +106,6 @@ config SENSORS_ATXP1
 config SENSORS_DS1621
         tristate "Dallas Semiconductor DS1621 and DS1625"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1621 and DS1625 sensor chips.
@@ -110,7 +116,6 @@ config SENSORS_DS1621
 config SENSORS_FSCHER
         tristate "FSC Hermes"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Fujitsu Siemens
           Computers Hermes sensor chips.
@@ -121,7 +126,6 @@ config SENSORS_FSCHER
 config SENSORS_FSCPOS
         tristate "FSC Poseidon"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Fujitsu Siemens
           Computers Poseidon sensor chips.
@@ -132,7 +136,6 @@ config SENSORS_FSCPOS
 config SENSORS_GL518SM
         tristate "Genesys Logic GL518SM"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for Genesys Logic GL518SM
           sensor chips.
@@ -143,7 +146,7 @@ config SENSORS_GL518SM
 config SENSORS_GL520SM
         tristate "Genesys Logic GL520SM"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for Genesys Logic GL520SM
           sensor chips.
@@ -154,7 +157,8 @@ config SENSORS_GL520SM
 config SENSORS_IT87
         tristate "ITE IT87xx and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for ITE IT87xx sensor chips
           and clones: SiS960.
@@ -165,7 +169,6 @@ config SENSORS_IT87
 config SENSORS_LM63
         tristate "National Semiconductor LM63"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for the National Semiconductor
           LM63 remote diode digital temperature sensor with integrated fan
@@ -178,7 +181,6 @@ config SENSORS_LM63
 config SENSORS_LM75
         tristate "National Semiconductor LM75 and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM75
           sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
@@ -194,7 +196,6 @@ config SENSORS_LM75
 config SENSORS_LM77
         tristate "National Semiconductor LM77"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM77
           sensor chips.
@@ -205,7 +206,8 @@ config SENSORS_LM77
 config SENSORS_LM78
         tristate "National Semiconductor LM78 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM78,
           LM78-J and LM79.
@@ -216,7 +218,6 @@ config SENSORS_LM78
 config SENSORS_LM80
         tristate "National Semiconductor LM80"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor
           LM80 sensor chips.
@@ -227,7 +228,6 @@ config SENSORS_LM80
 config SENSORS_LM83
         tristate "National Semiconductor LM83"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor
           LM83 sensor chips.
@@ -238,7 +238,7 @@ config SENSORS_LM83
 config SENSORS_LM85
         tristate "National Semiconductor LM85 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM85
           sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027.
@@ -249,7 +249,7 @@ config SENSORS_LM85
 config SENSORS_LM87
         tristate "National Semiconductor LM87"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
         help
           If you say yes here you get support for National Semiconductor LM87
           sensor chips.
@@ -260,7 +260,6 @@ config SENSORS_LM87
 config SENSORS_LM90
         tristate "National Semiconductor LM90 and compatibles"
         depends on HWMON && I2C
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM90,
           LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
@@ -275,7 +274,6 @@ config SENSORS_LM90
 config SENSORS_LM92
         tristate "National Semiconductor LM92 and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM92
           and Maxim MAX6635 sensor chips.
@@ -286,7 +284,6 @@ config SENSORS_LM92
 config SENSORS_MAX1619
         tristate "Maxim MAX1619 sensor chip"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for MAX1619 sensor chip.
 
@@ -296,8 +293,8 @@ config SENSORS_MAX1619
 config SENSORS_PC87360
         tristate "National Semiconductor PC87360 family"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get access to the hardware monitoring
           functions of the National Semiconductor PC8736x Super-I/O chips.
@@ -311,7 +308,6 @@ config SENSORS_PC87360
 config SENSORS_SIS5595
         tristate "Silicon Integrated Systems Corp. SiS5595"
         depends on HWMON && I2C && PCI && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the integrated sensors in
@@ -323,7 +319,6 @@ config SENSORS_SIS5595
 config SENSORS_SMSC47M1
         tristate "SMSC LPC47M10x and compatibles"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the integrated fan
@@ -336,7 +331,6 @@ config SENSORS_SMSC47M1
 config SENSORS_SMSC47B397
         tristate "SMSC LPC47B397-NC"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the SMSC LPC47B397-NC
@@ -348,7 +342,6 @@ config SENSORS_SMSC47B397
 config SENSORS_VIA686A
         tristate "VIA686A"
         depends on HWMON && I2C && PCI
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get support for the integrated sensors in
@@ -360,7 +353,8 @@ config SENSORS_VIA686A
 config SENSORS_W83781D
         tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
         depends on HWMON && I2C
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for the Winbond W8378x series
           of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
@@ -369,10 +363,18 @@ config SENSORS_W83781D
           This driver can also be built as a module.  If so, the module
           will be called w83781d.
 
+config SENSORS_W83792D
+        tristate "Winbond W83792D"
+        depends on HWMON && I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Winbond W83792D chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called w83792d.
+
 config SENSORS_W83L785TS
         tristate "Winbond W83L785TS-S"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for the Winbond W83L785TS-S
           sensor chip, which is used on the Asus A7N8X, among other
@@ -384,8 +386,8 @@ config SENSORS_W83L785TS
 config SENSORS_W83627HF
         tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
+        select HWMON_VID
         help
           If you say yes here you get support for the Winbond W836X7 series
           of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
@@ -396,7 +398,6 @@ config SENSORS_W83627HF
 config SENSORS_W83627EHF
         tristate "Winbond W83627EHF"
         depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
         select I2C_ISA
         help
           If you say yes here you get preliminary support for the hardware
@@ -404,6 +405,9 @@ config SENSORS_W83627EHF
           Only fan and temperature inputs are supported at the moment, while
           the chip does much more than that.
 
+          This driver also supports the W83627EHG, which is the lead-free
+          version of the W83627EHF.
+
           This driver can also be built as a module.  If so, the module
           will be called w83627ehf.
 
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 2781403a0236..381f1bf04cc5 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -2,9 +2,13 @@
 # Makefile for sensor chip drivers.
 #
 
+obj-$(CONFIG_HWMON)             += hwmon.o
+obj-$(CONFIG_HWMON_VID)         += hwmon-vid.o
+
 # asb100, then w83781d go first, as they can override other drivers' addresses.
 obj-$(CONFIG_SENSORS_ASB100)    += asb100.o
 obj-$(CONFIG_SENSORS_W83627HF)  += w83627hf.o
+obj-$(CONFIG_SENSORS_W83792D)   += w83792d.o
 obj-$(CONFIG_SENSORS_W83781D)   += w83781d.o
 
 obj-$(CONFIG_SENSORS_ADM1021)   += adm1021.o
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index d2c774c32f45..e928cdb041cb 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -24,7 +24,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 
 /* Addresses to scan */
@@ -32,10 +33,9 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                         0x29, 0x2a, 0x2b,
                                         0x4c, 0x4d, 0x4e, 
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
+I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
 
 /* adm1021 constants specified below */
 
@@ -89,6 +89,7 @@ clearing it.  Weird, ey?   --Phil  */
 /* Each client has this additional data */
 struct adm1021_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         enum chips type;
 
         struct semaphore update_lock;
@@ -185,7 +186,7 @@ static int adm1021_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm1021_detect);
+        return i2c_probe(adapter, &addr_data, adm1021_detect);
 }
 
 static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -196,15 +197,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
         int err = 0;
         const char *type_name = "";
 
-        /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; i2c_detect really won't call us. */
-#ifdef DEBUG
-        if (i2c_is_isa_adapter(adapter)) {
-                dev_dbg(&adapter->dev, "adm1021_detect called for an ISA bus adapter?!?\n");
-                return 0;
-        }
-#endif
-
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 goto error0;
 
@@ -295,6 +287,12 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
                 adm1021_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error2;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
         device_create_file(&new_client->dev, &dev_attr_temp1_min);
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
@@ -305,6 +303,8 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+error2:
+        i2c_detach_client(new_client);
 error1:
         kfree(data);
 error0:
@@ -322,14 +322,15 @@ static void adm1021_init_client(struct i2c_client *client)
 
 static int adm1021_detach_client(struct i2c_client *client)
 {
+        struct adm1021_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index e452d0daf906..526b7ff179eb 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -50,8 +50,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -60,13 +61,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_2(adm1025, ne1619);
+I2C_CLIENT_INSMOD_2(adm1025, ne1619);
 
 /*
  * The ADM1025 registers
@@ -132,6 +132,7 @@ static struct i2c_driver adm1025_driver = {
 
 struct adm1025_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -312,7 +313,7 @@ static int adm1025_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm1025_detect);
+        return i2c_probe(adapter, &addr_data, adm1025_detect);
 }
 
 /*
@@ -416,6 +417,12 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
         adm1025_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -452,6 +459,8 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -464,7 +473,7 @@ static void adm1025_init_client(struct i2c_client *client)
         struct adm1025_data *data = i2c_get_clientdata(client);
         int i;
 
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         /*
          * Set high limits
@@ -502,15 +511,15 @@ static void adm1025_init_client(struct i2c_client *client)
 
 static int adm1025_detach_client(struct i2c_client *client)
 {
+        struct adm1025_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index c8a7f47911f9..625158110fd4 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -28,16 +28,16 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(adm1026);
+I2C_CLIENT_INSMOD_1(adm1026);
 
 static int gpio_input[17]  = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
                                 -1, -1, -1, -1, -1, -1, -1, -1 }; 
@@ -259,6 +259,7 @@ struct pwm_data {
 
 struct adm1026_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -319,13 +320,15 @@ int adm1026_attach_adapter(struct i2c_adapter *adapter)
         if (!(adapter->class & I2C_CLASS_HWMON)) {
                 return 0;
         }
-        return i2c_detect(adapter, &addr_data, adm1026_detect);
+        return i2c_probe(adapter, &addr_data, adm1026_detect);
 }
 
 int adm1026_detach_client(struct i2c_client *client)
 {
+        struct adm1026_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
@@ -1549,12 +1552,18 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
                 goto exitfree;
 
         /* Set the VRM version */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         /* Initialize the ADM1026 chip */
         adm1026_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exitdetach;
+        }
+
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
@@ -1690,6 +1699,8 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
         return 0;
 
         /* Error out and cleanup code */
+exitdetach:
+        i2c_detach_client(new_client);
 exitfree:
         kfree(data);
 exit:
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 936250957270..58338ed7c8a1 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -26,7 +26,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Following macros takes channel parameter starting from 0 to 2 */
 #define ADM1031_REG_FAN_SPEED(nr)       (0x08 + (nr))
@@ -59,16 +60,16 @@
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(adm1030, adm1031);
+I2C_CLIENT_INSMOD_2(adm1030, adm1031);
 
 typedef u8 auto_chan_table_t[8][2];
 
 /* Each client has this additional data */
 struct adm1031_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         int chip_type;
         char valid;             /* !=0 if following fields are valid */
@@ -725,10 +726,10 @@ static int adm1031_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm1031_detect);
+        return i2c_probe(adapter, &addr_data, adm1031_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -788,6 +789,12 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
         adm1031_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_fan1_input);
         device_create_file(&new_client->dev, &dev_attr_fan1_div);
         device_create_file(&new_client->dev, &dev_attr_fan1_min);
@@ -833,6 +840,8 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -841,11 +850,14 @@ exit:
 
 static int adm1031_detach_client(struct i2c_client *client)
 {
+        struct adm1031_data *data = i2c_get_clientdata(client);
         int ret;
+
+        hwmon_device_unregister(data->class_dev);
         if ((ret = i2c_detach_client(client)) != 0) {
                 return ret;
         }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index ce2a6eb93f6e..bc7faef162f7 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -45,17 +45,16 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                         I2C_CLIENT_END };
 
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-
 /* Insmod parameters */
-SENSORS_INSMOD_3(adm9240, ds1780, lm81);
+I2C_CLIENT_INSMOD_3(adm9240, ds1780, lm81);
 
 /* ADM9240 registers */
 #define ADM9240_REG_MAN_ID              0x3e
@@ -150,6 +149,7 @@ static struct i2c_driver adm9240_driver = {
 struct adm9240_data {
         enum chips type;
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;
         unsigned long last_updated_measure;
@@ -582,6 +582,12 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
         adm9240_init_client(new_client);
 
         /* populate sysfs filesystem */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -615,6 +621,9 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
 
         return 0;
+
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -625,20 +634,20 @@ static int adm9240_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, adm9240_detect);
+        return i2c_probe(adapter, &addr_data, adm9240_detect);
 }
 
 static int adm9240_detach_client(struct i2c_client *client)
 {
+        struct adm9240_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                                "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
@@ -648,7 +657,7 @@ static void adm9240_init_client(struct i2c_client *client)
         u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG);
         u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3;
 
-        data->vrm = i2c_which_vrm(); /* need this to report vid as mV */
+        data->vrm = vid_which_vrm(); /* need this to report vid as mV */
 
         dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
                         data->vrm % 10);
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 70d996d6fe0a..8e34855a6274 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -39,8 +39,9 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include "lm75.h"
@@ -54,11 +55,8 @@
 /* I2C addresses to scan */
 static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 
-/* ISA addresses to scan (none) */
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-
 /* Insmod parameters */
-SENSORS_INSMOD_1(asb100);
+I2C_CLIENT_INSMOD_1(asb100);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
         "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
@@ -183,6 +181,7 @@ static u8 DIV_TO_REG(long val)
    dynamically allocated, at the same time the client itself is allocated. */
 struct asb100_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -621,7 +620,7 @@ static int asb100_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, asb100_detect);
+        return i2c_probe(adapter, &addr_data, asb100_detect);
 }
 
 static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
@@ -714,14 +713,6 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         struct i2c_client *new_client;
         struct asb100_data *data;
 
-        /* asb100 is SMBus only */
-        if (i2c_is_isa_adapter(adapter)) {
-                pr_debug("asb100.o: detect failed, "
-                                "cannot attach to legacy adapter!\n");
-                err = -ENODEV;
-                goto ERROR0;
-        }
-
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 pr_debug("asb100.o: detect failed, "
                                 "smbus byte data not supported!\n");
@@ -821,6 +812,12 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         data->fan_min[2] = asb100_read_value(new_client, ASB100_REG_FAN_MIN(2));
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file_in(new_client, 0);
         device_create_file_in(new_client, 1);
         device_create_file_in(new_client, 2);
@@ -847,6 +844,11 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(data->lm75[1]);
+        i2c_detach_client(data->lm75[0]);
+        kfree(data->lm75[1]);
+        kfree(data->lm75[0]);
 ERROR2:
         i2c_detach_client(new_client);
 ERROR1:
@@ -857,21 +859,23 @@ ERROR0:
 
 static int asb100_detach_client(struct i2c_client *client)
 {
+        struct asb100_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "client deregistration failed; "
-                        "client not detached.\n");
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        if (i2c_get_clientdata(client)==NULL) {
-                /* subclients */
+        /* main client */
+        if (data)
+                kfree(data);
+
+        /* subclient */
+        else
                 kfree(client);
-        } else {
-                /* main client */
-                kfree(i2c_get_clientdata(client));
-        }
 
         return 0;
 }
@@ -969,7 +973,7 @@ static void asb100_init_client(struct i2c_client *client)
 
         vid = asb100_read_value(client, ASB100_REG_VID_FANDIV) & 0x0f;
         vid |= (asb100_read_value(client, ASB100_REG_CHIPID) & 0x01) << 4;
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
         vid = vid_from_reg(vid, data->vrm);
 
         /* Start monitoring */
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index fca3fc1cef72..deb4d34c9539 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -23,8 +23,9 @@
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
@@ -40,9 +41,8 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
 #define ATXP1_GPIO1MASK 0x0f
 
 static unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
-SENSORS_INSMOD_1(atxp1);
+I2C_CLIENT_INSMOD_1(atxp1);
 
 static int atxp1_attach_adapter(struct i2c_adapter * adapter);
 static int atxp1_detach_client(struct i2c_client * client);
@@ -59,6 +59,7 @@ static struct i2c_driver atxp1_driver = {
 
 struct atxp1_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         unsigned long last_updated;
         u8 valid;
@@ -252,7 +253,7 @@ static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
 
 static int atxp1_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, &atxp1_detect);
+        return i2c_probe(adapter, &addr_data, &atxp1_detect);
 };
 
 static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -295,7 +296,7 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Get VRM */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         if ((data->vrm != 90) && (data->vrm != 91)) {
                 dev_err(&new_client->dev, "Not supporting VRM %d.%d\n",
@@ -317,6 +318,12 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
                 goto exit_free;
         }
 
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_gpio1);
         device_create_file(&new_client->dev, &dev_attr_gpio2);
         device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
@@ -326,6 +333,8 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -334,14 +343,17 @@ exit:
 
 static int atxp1_detach_client(struct i2c_client * client)
 {
+        struct atxp1_data * data = i2c_get_clientdata(client);
         int err;
 
+        hwmon_device_unregister(data->class_dev);
+
         err = i2c_detach_client(client);
 
         if (err)
                 dev_err(&client->dev, "Failed to detach client.\n");
         else
-                kfree(i2c_get_clientdata(client));
+                kfree(data);
 
         return err;
 };
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 5360d58804f6..b0199e063d0e 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -26,16 +26,16 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include "lm75.h"
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(ds1621);
+I2C_CLIENT_INSMOD_1(ds1621);
 static int polarity = -1;
 module_param(polarity, int, 0);
 MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low");
@@ -71,6 +71,7 @@ MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low")
 /* Each client has this additional data */
 struct ds1621_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;                     /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -179,10 +180,10 @@ static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max, set_temp_max);
 
 static int ds1621_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, ds1621_detect);
+        return i2c_probe(adapter, &addr_data, ds1621_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int ds1621_detect(struct i2c_adapter *adapter, int address,
                   int kind)
 {
@@ -250,6 +251,12 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
         ds1621_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_alarms);
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_min);
@@ -259,6 +266,8 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
 
 /* OK, this is not exactly good programming practice, usually. But it is
    very code-efficient in this case. */
+      exit_detach:
+        i2c_detach_client(new_client);
       exit_free:
         kfree(data);
       exit:
@@ -267,15 +276,15 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
 
 static int ds1621_detach_client(struct i2c_client *client)
 {
+        struct ds1621_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index da411741c2c5..eef6061d786b 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -31,20 +31,20 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
  */
 
 static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(fscher);
+I2C_CLIENT_INSMOD_1(fscher);
 
 /*
  * The FSCHER registers
@@ -132,6 +132,7 @@ static struct i2c_driver fscher_driver = {
 
 struct fscher_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -287,7 +288,7 @@ static int fscher_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, fscher_detect);
+        return i2c_probe(adapter, &addr_data, fscher_detect);
 }
 
 static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -341,6 +342,12 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
         fscher_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file_revision(new_client);
         device_create_file_alarms(new_client);
         device_create_file_control(new_client);
@@ -360,6 +367,8 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -368,15 +377,15 @@ exit:
 
 static int fscher_detach_client(struct i2c_client *client)
 {
+        struct fscher_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 301ae98bd0ad..5fc77a5fed07 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -34,19 +34,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/init.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
  */
 static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
-SENSORS_INSMOD_1(fscpos);
+I2C_CLIENT_INSMOD_1(fscpos);
 
 /*
  * The FSCPOS registers
@@ -113,6 +113,7 @@ static struct i2c_driver fscpos_driver = {
  */
 struct fscpos_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* 0 until following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -434,7 +435,7 @@ static int fscpos_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, fscpos_detect);
+        return i2c_probe(adapter, &addr_data, fscpos_detect);
 }
 
 int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -496,6 +497,12 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
         dev_info(&new_client->dev, "Found fscpos chip, rev %u\n", data->revision);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_event);
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
@@ -526,6 +533,8 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -534,14 +543,14 @@ exit:
 
 static int fscpos_detach_client(struct i2c_client *client)
 {
+        struct fscpos_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, client"
-                                                        " not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 6bedf729dcf5..256b9323c84b 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -41,14 +41,14 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(gl518sm_r00, gl518sm_r80);
+I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80);
 
 /* Many GL518 constants specified below */
 
@@ -117,6 +117,7 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 /* Each client has this additional data */
 struct gl518_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         enum chips type;
 
         struct semaphore update_lock;
@@ -346,7 +347,7 @@ static int gl518_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, gl518_detect);
+        return i2c_probe(adapter, &addr_data, gl518_detect);
 }
 
 static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -419,6 +420,12 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
         gl518_init_client((struct i2c_client *) new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -450,6 +457,8 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
 /* OK, this is not exactly good programming practice, usually. But it is
    very code-efficient in this case. */
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -477,16 +486,15 @@ static void gl518_init_client(struct i2c_client *client)
 
 static int gl518_detach_client(struct i2c_client *client)
 {
+        struct gl518_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
-                return err;
-        }
+        hwmon_device_unregister(data->class_dev);
 
-        kfree(i2c_get_clientdata(client));
+        if ((err = i2c_detach_client(client)))
+                return err;
 
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 80ae8d30c2af..12fd757066fc 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -26,8 +26,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Type of the extra sensor */
 static unsigned short extra_sensor_type;
@@ -36,10 +37,9 @@ MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=tempe
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(gl520sm);
+I2C_CLIENT_INSMOD_1(gl520sm);
 
 /* Many GL520 constants specified below 
 One of the inputs can be configured as either temp or voltage.
@@ -120,6 +120,7 @@ static struct i2c_driver gl520_driver = {
 /* Client data */
 struct gl520_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* zero until the following fields are valid */
         unsigned long last_updated;     /* in jiffies */
@@ -518,7 +519,7 @@ static int gl520_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, gl520_detect);
+        return i2c_probe(adapter, &addr_data, gl520_detect);
 }
 
 static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -571,6 +572,12 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
         gl520_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file_vid(new_client, 0);
 
         device_create_file_in(new_client, 0);
@@ -592,6 +599,8 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -608,7 +617,7 @@ static void gl520_init_client(struct i2c_client *client)
         conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
 
         data->alarm_mask = 0xff;
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         if (extra_sensor_type == 1)
                 conf &= ~0x10;
@@ -639,15 +648,15 @@ static void gl520_init_client(struct i2c_client *client)
 
 static int gl520_detach_client(struct i2c_client *client)
 {
+        struct gl520_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
new file mode 100644
index 000000000000..312769ad4dab
--- /dev/null
+++ b/drivers/hwmon/hwmon-vid.c
@@ -0,0 +1,189 @@
+/*
+    hwmon-vid.c - VID/VRM/VRD voltage conversions
+
+    Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
+
+    Partly imported from i2c-vid.h of the lm_sensors project
+    Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
+    With assistance from Trent Piepho <xyzzy@speakeasy.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/hwmon-vid.h>
+
+/*
+    Common code for decoding VID pins.
+
+    References:
+
+    For VRM 8.4 to 9.1, "VRM x.y DC-DC Converter Design Guidelines",
+    available at http://developer.intel.com/.
+
+    For VRD 10.0 and up, "VRD x.y Design Guide",
+    available at http://developer.intel.com/.
+
+    AMD Opteron processors don't follow the Intel specifications.
+    I'm going to "make up" 2.4 as the spec number for the Opterons.
+    No good reason just a mnemonic for the 24x Opteron processor
+    series.
+
+    Opteron VID encoding is:
+       00000  =  1.550 V
+       00001  =  1.525 V
+        . . . .
+       11110  =  0.800 V
+       11111  =  0.000 V (off)
+*/
+
+/* vrm is the VRM/VRD document version multiplied by 10.
+   val is the 4-, 5- or 6-bit VID code.
+   Returned value is in mV to avoid floating point in the kernel. */
+int vid_from_reg(int val, int vrm)
+{
+        int vid;
+
+        switch(vrm) {
+
+        case  0:
+                return 0;
+
+        case 100:               /* VRD 10.0 */
+                if((val & 0x1f) == 0x1f)
+                        return 0;
+                if((val & 0x1f) <= 0x09 || val == 0x0a)
+                        vid = 10875 - (val & 0x1f) * 250;
+                else
+                        vid = 18625 - (val & 0x1f) * 250;
+                if(val & 0x20)
+                        vid -= 125;
+                vid /= 10;      /* only return 3 dec. places for now */
+                return vid;
+
+        case 24:                /* Opteron processor */
+                return(val == 0x1f ? 0 : 1550 - val * 25);
+
+        case 91:                /* VRM 9.1 */
+        case 90:                /* VRM 9.0 */
+                return(val == 0x1f ? 0 :
+                                       1850 - val * 25);
+
+        case 85:                /* VRM 8.5 */
+                return((val & 0x10  ? 25 : 0) +
+                       ((val & 0x0f) > 0x04 ? 2050 : 1250) -
+                       ((val & 0x0f) * 50));
+
+        case 84:                /* VRM 8.4 */
+                val &= 0x0f;
+                                /* fall through */
+        default:                /* VRM 8.2 */
+                return(val == 0x1f ? 0 :
+                       val & 0x10  ? 5100 - (val) * 100 :
+                                     2050 - (val) * 50);
+        }
+}
+
+
+/*
+    After this point is the code to automatically determine which
+    VRM/VRD specification should be used depending on the CPU.
+*/
+
+struct vrm_model {
+        u8 vendor;
+        u8 eff_family;
+        u8 eff_model;
+        int vrm_type;
+};
+
+#define ANY 0xFF
+
+#ifdef CONFIG_X86
+
+static struct vrm_model vrm_models[] = {
+        {X86_VENDOR_AMD, 0x6, ANY, 90},         /* Athlon Duron etc */
+        {X86_VENDOR_AMD, 0xF, ANY, 24},         /* Athlon 64, Opteron */
+        {X86_VENDOR_INTEL, 0x6, 0x9, 85},       /* 0.13um too */
+        {X86_VENDOR_INTEL, 0x6, 0xB, 85},       /* Tualatin */
+        {X86_VENDOR_INTEL, 0x6, ANY, 82},       /* any P6 */
+        {X86_VENDOR_INTEL, 0x7, ANY, 0},        /* Itanium */
+        {X86_VENDOR_INTEL, 0xF, 0x0, 90},       /* P4 */
+        {X86_VENDOR_INTEL, 0xF, 0x1, 90},       /* P4 Willamette */
+        {X86_VENDOR_INTEL, 0xF, 0x2, 90},       /* P4 Northwood */
+        {X86_VENDOR_INTEL, 0xF, 0x3, 100},      /* P4 Prescott */
+        {X86_VENDOR_INTEL, 0xF, 0x4, 100},      /* P4 Prescott */
+        {X86_VENDOR_INTEL, 0x10,ANY, 0},        /* Itanium 2 */
+        {X86_VENDOR_UNKNOWN, ANY, ANY, 0}       /* stop here */
+};
+
+static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
+{
+        int i = 0;
+
+        while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {
+                if (vrm_models[i].vendor==vendor)
+                        if ((vrm_models[i].eff_family==eff_family)
+                         && ((vrm_models[i].eff_model==eff_model) ||
+                             (vrm_models[i].eff_model==ANY)))
+                                return vrm_models[i].vrm_type;
+                i++;
+        }
+
+        return 0;
+}
+
+int vid_which_vrm(void)
+{
+        struct cpuinfo_x86 *c = cpu_data;
+        u32 eax;
+        u8 eff_family, eff_model;
+        int vrm_ret;
+
+        if (c->x86 < 6)         /* Any CPU with family lower than 6 */
+                return 0;       /* doesn't have VID and/or CPUID */
+
+        eax = cpuid_eax(1);
+        eff_family = ((eax & 0x00000F00)>>8);
+        eff_model  = ((eax & 0x000000F0)>>4);
+        if (eff_family == 0xF) {        /* use extended model & family */
+                eff_family += ((eax & 0x00F00000)>>20);
+                eff_model += ((eax & 0x000F0000)>>16)<<4;
+        }
+        vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
+        if (vrm_ret == 0)
+                printk(KERN_INFO "hwmon-vid: Unknown VRM version of your "
+                       "x86 CPU\n");
+        return vrm_ret;
+}
+
+/* and now something completely different for the non-x86 world */
+#else
+int vid_which_vrm(void)
+{
+        printk(KERN_INFO "hwmon-vid: Unknown VRM version of your CPU\n");
+        return 0;
+}
+#endif
+
+EXPORT_SYMBOL(vid_from_reg);
+EXPORT_SYMBOL(vid_which_vrm);
+
+MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>");
+
+MODULE_DESCRIPTION("hwmon-vid driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
new file mode 100644
index 000000000000..9b41c9bd805f
--- /dev/null
+++ b/drivers/hwmon/hwmon.c
@@ -0,0 +1,98 @@
+/*
+    hwmon.c - part of lm_sensors, Linux kernel modules for hardware monitoring
+
+    This file defines the sysfs class "hwmon", for use by sensors drivers.
+
+    Copyright (C) 2005 Mark M. Hoffman <mhoffman@lightlink.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+*/
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+#include <linux/hwmon.h>
+
+#define HWMON_ID_PREFIX "hwmon"
+#define HWMON_ID_FORMAT HWMON_ID_PREFIX "%d"
+
+static struct class *hwmon_class;
+
+static DEFINE_IDR(hwmon_idr);
+
+/**
+ * hwmon_device_register - register w/ hwmon sysfs class
+ * @dev: the device to register
+ *
+ * hwmon_device_unregister() must be called when the class device is no
+ * longer needed.
+ *
+ * Returns the pointer to the new struct class device.
+ */
+struct class_device *hwmon_device_register(struct device *dev)
+{
+        struct class_device *cdev;
+        int id;
+
+        if (idr_pre_get(&hwmon_idr, GFP_KERNEL) == 0)
+                return ERR_PTR(-ENOMEM);
+
+        if (idr_get_new(&hwmon_idr, NULL, &id) < 0)
+                return ERR_PTR(-ENOMEM);
+
+        id = id & MAX_ID_MASK;
+        cdev = class_device_create(hwmon_class, MKDEV(0,0), dev,
+                                        HWMON_ID_FORMAT, id);
+
+        if (IS_ERR(cdev))
+                idr_remove(&hwmon_idr, id);
+
+        return cdev;
+}
+
+/**
+ * hwmon_device_unregister - removes the previously registered class device
+ *
+ * @cdev: the class device to destroy
+ */
+void hwmon_device_unregister(struct class_device *cdev)
+{
+        int id;
+
+        if (sscanf(cdev->class_id, HWMON_ID_FORMAT, &id) == 1) {
+                class_device_unregister(cdev);
+                idr_remove(&hwmon_idr, id);
+        } else
+                dev_dbg(cdev->dev,
+                        "hwmon_device_unregister() failed: bad class ID!\n");
+}
+
+static int __init hwmon_init(void)
+{
+        hwmon_class = class_create(THIS_MODULE, "hwmon");
+        if (IS_ERR(hwmon_class)) {
+                printk(KERN_ERR "hwmon.c: couldn't create sysfs class\n");
+                return PTR_ERR(hwmon_class);
+        }
+        return 0;
+}
+
+static void __exit hwmon_exit(void)
+{
+        class_destroy(hwmon_class);
+}
+
+module_init(hwmon_init);
+module_exit(hwmon_exit);
+
+EXPORT_SYMBOL_GPL(hwmon_device_register);
+EXPORT_SYMBOL_GPL(hwmon_device_unregister);
+
+MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
+MODULE_DESCRIPTION("hardware monitoring sysfs/class support");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index db20c9e47393..53cc2b6d6385 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -36,19 +36,21 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                         0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(it87, it8712);
+I2C_CLIENT_INSMOD_2(it87, it8712);
 
 #define REG     0x2e    /* The register to read/write */
 #define DEV     0x07    /* Register: Logical device select */
@@ -192,6 +194,7 @@ static int DIV_TO_REG(int val)
    allocated. */
 struct it87_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -218,7 +221,7 @@ struct it87_data {
 
 
 static int it87_attach_adapter(struct i2c_adapter *adapter);
-static int it87_find(int *address);
+static int it87_isa_attach_adapter(struct i2c_adapter *adapter);
 static int it87_detect(struct i2c_adapter *adapter, int address, int kind);
 static int it87_detach_client(struct i2c_client *client);
 
@@ -239,6 +242,14 @@ static struct i2c_driver it87_driver = {
         .detach_client  = it87_detach_client,
 };
 
+static struct i2c_driver it87_isa_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "it87-isa",
+        .attach_adapter = it87_isa_attach_adapter,
+        .detach_client  = it87_detach_client,
+};
+
+
 static ssize_t show_in(struct device *dev, struct device_attribute *attr,
                 char *buf)
 {
@@ -686,11 +697,16 @@ static int it87_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, it87_detect);
+        return i2c_probe(adapter, &addr_data, it87_detect);
 }
 
-/* SuperIO detection - will change normal_isa[0] if a chip is found */
-static int it87_find(int *address)
+static int it87_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return it87_detect(adapter, isa_address, -1);
+}
+
+/* SuperIO detection - will change isa_address if a chip is found */
+static int __init it87_find(int *address)
 {
         int err = -ENODEV;
 
@@ -721,7 +737,7 @@ exit:
         return err;
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         int i;
@@ -738,7 +754,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Reserve the ISA region */
         if (is_isa)
-                if (!request_region(address, IT87_EXTENT, it87_driver.name))
+                if (!request_region(address, IT87_EXTENT, it87_isa_driver.name))
                         goto ERROR0;
 
         /* Probe whether there is anything available on this address. Already
@@ -784,7 +800,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
-        new_client->driver = &it87_driver;
+        new_client->driver = is_isa ? &it87_isa_driver : &it87_driver;
         new_client->flags = 0;
 
         /* Now, we do the remaining detection. */
@@ -840,6 +856,12 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         it87_init_client(new_client, data);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
         device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
@@ -897,13 +919,15 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         if (data->type == it8712) {
-                data->vrm = i2c_which_vrm();
+                data->vrm = vid_which_vrm();
                 device_create_file_vrm(new_client);
                 device_create_file_vid(new_client);
         }
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
         kfree(data);
 ERROR1:
@@ -915,17 +939,17 @@ ERROR0:
 
 static int it87_detach_client(struct i2c_client *client)
 {
+        struct it87_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         if(i2c_is_isa_client(client))
                 release_region(client->addr, IT87_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -1158,16 +1182,28 @@ static struct it87_data *it87_update_device(struct device *dev)
 
 static int __init sm_it87_init(void)
 {
-        int addr;
+        int addr, res;
 
         if (!it87_find(&addr)) {
-                normal_isa[0] = addr;
+                isa_address = addr;
+        }
+
+        res = i2c_add_driver(&it87_driver);
+        if (res)
+                return res;
+
+        res = i2c_isa_add_driver(&it87_isa_driver);
+        if (res) {
+                i2c_del_driver(&it87_driver);
+                return res;
         }
-        return i2c_add_driver(&it87_driver);
+
+        return 0;
 }
 
 static void __exit sm_it87_exit(void)
 {
+        i2c_isa_del_driver(&it87_isa_driver);
         i2c_del_driver(&it87_driver);
 }
 
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 7c6f9ea5a254..be5c7095ecbb 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -42,8 +42,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -51,13 +52,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(lm63);
+I2C_CLIENT_INSMOD_1(lm63);
 
 /*
  * The LM63 registers
@@ -152,6 +152,7 @@ static struct i2c_driver lm63_driver = {
 
 struct lm63_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -358,7 +359,7 @@ static int lm63_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm63_detect);
+        return i2c_probe(adapter, &addr_data, lm63_detect);
 }
 
 /*
@@ -437,6 +438,12 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
         lm63_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         if (data->config & 0x04) { /* tachometer enabled */
                 device_create_file(&new_client->dev,
                                    &sensor_dev_attr_fan1_input.dev_attr);
@@ -462,6 +469,8 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -505,15 +514,15 @@ static void lm63_init_client(struct i2c_client *client)
 
 static int lm63_detach_client(struct i2c_client *client)
 {
+        struct lm63_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 5be164ed278e..9a3ebdf583f4 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -23,17 +23,17 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include "lm75.h"
 
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm75);
+I2C_CLIENT_INSMOD_1(lm75);
 
 /* Many LM75 constants specified below */
 
@@ -46,6 +46,7 @@ SENSORS_INSMOD_1(lm75);
 /* Each client has this additional data */
 struct lm75_data {
         struct i2c_client       client;
+        struct class_device *class_dev;
         struct semaphore        update_lock;
         char                    valid;          /* !=0 if following fields are valid */
         unsigned long           last_updated;   /* In jiffies */
@@ -107,10 +108,10 @@ static int lm75_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm75_detect);
+        return i2c_probe(adapter, &addr_data, lm75_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         int i;
@@ -119,16 +120,6 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
         int err = 0;
         const char *name = "";
 
-        /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; i2c_detect really won't call us. */
-#ifdef DEBUG
-        if (i2c_is_isa_adapter(adapter)) {
-                dev_dbg(&adapter->dev,
-                        "lm75_detect called for an ISA bus adapter?!?\n");
-                goto exit;
-        }
-#endif
-
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
                                      I2C_FUNC_SMBUS_WORD_DATA))
                 goto exit;
@@ -208,12 +199,20 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
         lm75_init_client(new_client);
         
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
         device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -222,8 +221,10 @@ exit:
 
 static int lm75_detach_client(struct i2c_client *client)
 {
+        struct lm75_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
@@ -251,8 +252,12 @@ static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value)
 
 static void lm75_init_client(struct i2c_client *client)
 {
-        /* Initialize the LM75 chip */
-        lm75_write_value(client, LM75_REG_CONF, 0);
+        int reg;
+
+        /* Enable if in shutdown mode */
+        reg = lm75_read_value(client, LM75_REG_CONF);
+        if (reg >= 0 && (reg & 0x01))
+                lm75_write_value(client, LM75_REG_CONF, reg & 0xfe);
 }
 
 static struct lm75_data *lm75_update_device(struct device *dev)
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h
index 63e3f2fb4c21..af7dc650ee15 100644
--- a/drivers/hwmon/lm75.h
+++ b/drivers/hwmon/lm75.h
@@ -25,7 +25,7 @@
     which contains this code, we don't worry about the wasted space.
 */
 
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
 
 /* straight from the datasheet */
 #define LM75_TEMP_MIN (-55000)
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index b98f44952997..866eab96a6f6 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -30,15 +30,14 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm77);
+I2C_CLIENT_INSMOD_1(lm77);
 
 /* The LM77 registers */
 #define LM77_REG_TEMP           0x00
@@ -51,6 +50,7 @@ SENSORS_INSMOD_1(lm77);
 /* Each client has this additional data */
 struct lm77_data {
         struct i2c_client       client;
+        struct class_device *class_dev;
         struct semaphore        update_lock;
         char                    valid;
         unsigned long           last_updated;   /* In jiffies */
@@ -208,10 +208,10 @@ static int lm77_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm77_detect);
+        return i2c_probe(adapter, &addr_data, lm77_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -317,6 +317,12 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
         lm77_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit);
         device_create_file(&new_client->dev, &dev_attr_temp1_min);
@@ -327,6 +333,8 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_alarms);
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -335,8 +343,10 @@ exit:
 
 static int lm77_detach_client(struct i2c_client *client)
 {
+        struct lm77_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 29241469dcba..f6730dc3573b 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -23,7 +23,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 
 /* Addresses to scan */
@@ -31,10 +34,10 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
                                         0x25, 0x26, 0x27, 0x28, 0x29,
                                         0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
                                         0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
-SENSORS_INSMOD_3(lm78, lm78j, lm79);
+I2C_CLIENT_INSMOD_2(lm78, lm79);
 
 /* Many LM78 constants specified below */
 
@@ -104,13 +107,6 @@ static inline int TEMP_FROM_REG(s8 val)
         return val * 1000;
 }
 
-/* VID: mV
-   REG: (see doc/vid) */
-static inline int VID_FROM_REG(u8 val)
-{
-        return val==0x1f ? 0 : val>=0x10 ? 5100-val*100 : 2050-val*50;
-}
-
 #define DIV_FROM_REG(val) (1 << (val))
 
 /* There are some complications in a module like this. First off, LM78 chips
@@ -134,6 +130,7 @@ static inline int VID_FROM_REG(u8 val)
    allocated. */
 struct lm78_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -156,6 +153,7 @@ struct lm78_data {
 
 
 static int lm78_attach_adapter(struct i2c_adapter *adapter);
+static int lm78_isa_attach_adapter(struct i2c_adapter *adapter);
 static int lm78_detect(struct i2c_adapter *adapter, int address, int kind);
 static int lm78_detach_client(struct i2c_client *client);
 
@@ -174,6 +172,14 @@ static struct i2c_driver lm78_driver = {
         .detach_client  = lm78_detach_client,
 };
 
+static struct i2c_driver lm78_isa_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "lm78-isa",
+        .attach_adapter = lm78_isa_attach_adapter,
+        .detach_client  = lm78_detach_client,
+};
+
+
 /* 7 Voltages */
 static ssize_t show_in(struct device *dev, char *buf, int nr)
 {
@@ -445,7 +451,7 @@ static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
 static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
-        return sprintf(buf, "%d\n", VID_FROM_REG(data->vid));
+        return sprintf(buf, "%d\n", vid_from_reg(82, data->vid));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
@@ -465,10 +471,15 @@ static int lm78_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm78_detect);
+        return i2c_probe(adapter, &addr_data, lm78_detect);
+}
+
+static int lm78_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return lm78_detect(adapter, isa_address, -1);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         int i, err;
@@ -485,7 +496,8 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Reserve the ISA region */
         if (is_isa)
-                if (!request_region(address, LM78_EXTENT, lm78_driver.name)) {
+                if (!request_region(address, LM78_EXTENT,
+                                    lm78_isa_driver.name)) {
                         err = -EBUSY;
                         goto ERROR0;
                 }
@@ -540,7 +552,7 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         i2c_set_clientdata(new_client, data);
         new_client->addr = address;
         new_client->adapter = adapter;
-        new_client->driver = &lm78_driver;
+        new_client->driver = is_isa ? &lm78_isa_driver : &lm78_driver;
         new_client->flags = 0;
 
         /* Now, we do the remaining detection. */
@@ -559,10 +571,9 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Determine the chip type. */
         if (kind <= 0) {
                 i = lm78_read_value(new_client, LM78_REG_CHIPID);
-                if (i == 0x00 || i == 0x20)
+                if (i == 0x00 || i == 0x20      /* LM78 */
+                 || i == 0x40)                  /* LM78-J */
                         kind = lm78;
-                else if (i == 0x40)
-                        kind = lm78j;
                 else if ((i & 0xfe) == 0xc0)
                         kind = lm79;
                 else {
@@ -578,8 +589,6 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         if (kind == lm78) {
                 client_name = "lm78";
-        } else if (kind == lm78j) {
-                client_name = "lm78-j";
         } else if (kind == lm79) {
                 client_name = "lm79";
         }
@@ -605,6 +614,12 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -643,6 +658,8 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
         kfree(data);
 ERROR1:
@@ -654,18 +671,18 @@ ERROR0:
 
 static int lm78_detach_client(struct i2c_client *client)
 {
+        struct lm78_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         if(i2c_is_isa_client(client))
                 release_region(client->addr, LM78_EXTENT);
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -777,18 +794,31 @@ static struct lm78_data *lm78_update_device(struct device *dev)
 
 static int __init sm_lm78_init(void)
 {
-        return i2c_add_driver(&lm78_driver);
+        int res;
+
+        res = i2c_add_driver(&lm78_driver);
+        if (res)
+                return res;
+
+        res = i2c_isa_add_driver(&lm78_isa_driver);
+        if (res) {
+                i2c_del_driver(&lm78_driver);
+                return res;
+        }
+
+        return 0;
 }
 
 static void __exit sm_lm78_exit(void)
 {
+        i2c_isa_del_driver(&lm78_isa_driver);
         i2c_del_driver(&lm78_driver);
 }
 
 
 
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
-MODULE_DESCRIPTION("LM78, LM78-J and LM79 driver");
+MODULE_DESCRIPTION("LM78/LM79 driver");
 MODULE_LICENSE("GPL");
 
 module_init(sm_lm78_init);
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 8100595feb44..83af8b3a0cac 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -26,15 +26,15 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c,
                                         0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm80);
+I2C_CLIENT_INSMOD_1(lm80);
 
 /* Many LM80 constants specified below */
 
@@ -107,6 +107,7 @@ static inline long TEMP_FROM_REG(u16 temp)
 
 struct lm80_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -389,7 +390,7 @@ static int lm80_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm80_detect);
+        return i2c_probe(adapter, &addr_data, lm80_detect);
 }
 
 int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -451,6 +452,12 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
         data->fan_min[1] = lm80_read_value(new_client, LM80_REG_FAN_MIN(2));
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in1_min);
         device_create_file(&new_client->dev, &dev_attr_in2_min);
@@ -487,6 +494,8 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
         kfree(data);
 exit:
@@ -495,15 +504,15 @@ exit:
 
 static int lm80_detach_client(struct i2c_client *client)
 {
+        struct lm80_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index a49008b444c8..d74b2c20c719 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -32,8 +32,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -45,13 +46,12 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                         0x29, 0x2a, 0x2b,
                                         0x4c, 0x4d, 0x4e,
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(lm83);
+I2C_CLIENT_INSMOD_1(lm83);
 
 /*
  * The LM83 registers
@@ -138,6 +138,7 @@ static struct i2c_driver lm83_driver = {
 
 struct lm83_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -212,7 +213,7 @@ static int lm83_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm83_detect);
+        return i2c_probe(adapter, &addr_data, lm83_detect);
 }
 
 /*
@@ -312,6 +313,12 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
          */
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev,
                            &sensor_dev_attr_temp1_input.dev_attr);
         device_create_file(&new_client->dev,
@@ -340,6 +347,8 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -348,15 +357,15 @@ exit:
 
 static int lm83_detach_client(struct i2c_client *client)
 {
+        struct lm83_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index b4d7fd418264..ab214df9624b 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -28,15 +28,15 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
+I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
 
 /* The LM85 registers */
 
@@ -281,15 +281,6 @@ static int ZONE_TO_REG( int zone )
 #define PPR_TO_REG(val,fan) (SENSORS_LIMIT((val)-1,0,3)<<(fan *2))
 #define PPR_FROM_REG(val,fan) ((((val)>>(fan * 2))&0x03)+1)
 
-/* i2c-vid.h defines vid_from_reg() */
-#define VID_FROM_REG(val,vrm) (vid_from_reg((val),(vrm)))
-
-/* Unlike some other drivers we DO NOT set initial limits.  Use
- * the config file to set limits.  Some users have reported
- * motherboards shutting down when we set limits in a previous
- * version of the driver.
- */
-
 /* Chip sampling rates
  *
  * Some sensors are not updated more frequently than once per second
@@ -339,6 +330,7 @@ struct lm85_autofan {
 
 struct lm85_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -1019,7 +1011,7 @@ int lm85_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm85_detect);
+        return i2c_probe(adapter, &addr_data, lm85_detect);
 }
 
 int lm85_detect(struct i2c_adapter *adapter, int address,
@@ -1031,11 +1023,6 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
         int err = 0;
         const char *type_name = "";
 
-        if (i2c_is_isa_adapter(adapter)) {
-                /* This chip has no ISA interface */
-                goto ERROR0 ;
-        };
-
         if (!i2c_check_functionality(adapter,
                                         I2C_FUNC_SMBUS_BYTE_DATA)) {
                 /* We need to be able to do byte I/O */
@@ -1160,12 +1147,18 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
                 goto ERROR1;
 
         /* Set the VRM version */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         /* Initialize the LM85 chip */
         lm85_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR2;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_fan1_input);
         device_create_file(&new_client->dev, &dev_attr_fan2_input);
         device_create_file(&new_client->dev, &dev_attr_fan3_input);
@@ -1235,6 +1228,8 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
         return 0;
 
         /* Error out and cleanup code */
+    ERROR2:
+        i2c_detach_client(new_client);
     ERROR1:
         kfree(data);
     ERROR0:
@@ -1243,8 +1238,10 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
 
 int lm85_detach_client(struct i2c_client *client)
 {
+        struct lm85_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
         i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 1921ed1af182..dca996de4c33 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -57,8 +57,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -66,13 +67,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(lm87);
+I2C_CLIENT_INSMOD_1(lm87);
 
 /*
  * The LM87 registers
@@ -175,6 +175,7 @@ static struct i2c_driver lm87_driver = {
 
 struct lm87_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* In jiffies */
@@ -537,7 +538,7 @@ static int lm87_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm87_detect);
+        return i2c_probe(adapter, &addr_data, lm87_detect);
 }
 
 /*
@@ -608,6 +609,12 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
         data->in_scale[7] = 1875;
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in1_min);
         device_create_file(&new_client->dev, &dev_attr_in1_max);
@@ -673,6 +680,8 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -685,7 +694,7 @@ static void lm87_init_client(struct i2c_client *client)
         u8 config;
 
         data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         config = lm87_read_value(client, LM87_REG_CONFIG);
         if (!(config & 0x01)) {
@@ -719,15 +728,15 @@ static void lm87_init_client(struct i2c_client *client)
 
 static int lm87_detach_client(struct i2c_client *client)
 {
+        struct lm87_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index a67dcadf7cb0..14de05fcd431 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -75,8 +75,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /*
  * Addresses to scan
@@ -89,13 +90,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
+I2C_CLIENT_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
 
 /*
  * The LM90 registers
@@ -200,6 +200,7 @@ static struct i2c_driver lm90_driver = {
 
 struct lm90_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -352,7 +353,7 @@ static int lm90_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm90_detect);
+        return i2c_probe(adapter, &addr_data, lm90_detect);
 }
 
 /*
@@ -500,6 +501,12 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
         lm90_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev,
                            &sensor_dev_attr_temp1_input.dev_attr);
         device_create_file(&new_client->dev,
@@ -524,6 +531,8 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -547,15 +556,15 @@ static void lm90_init_client(struct i2c_client *client)
 
 static int lm90_detach_client(struct i2c_client *client)
 {
+        struct lm90_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 215c8e40ffdd..647b7c7cd575 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -44,17 +44,16 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* The LM92 and MAX6635 have 2 two-state pins for address selection,
    resulting in 4 possible addresses. */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm92);
+I2C_CLIENT_INSMOD_1(lm92);
 
 /* The LM92 registers */
 #define LM92_REG_CONFIG                 0x01 /* 8-bit, RW */
@@ -96,6 +95,7 @@ static struct i2c_driver lm92_driver;
 /* Client data (each client gets its own) */
 struct lm92_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -359,6 +359,12 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
         lm92_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
@@ -370,6 +376,8 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -380,20 +388,20 @@ static int lm92_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, lm92_detect);
+        return i2c_probe(adapter, &addr_data, lm92_detect);
 }
 
 static int lm92_detach_client(struct i2c_client *client)
 {
+        struct lm92_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 3c159f1d49ee..16bf71f3a04d 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -31,20 +31,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                         0x29, 0x2a, 0x2b,
                                         0x4c, 0x4d, 0x4e,
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(max1619);
+I2C_CLIENT_INSMOD_1(max1619);
 
 /*
  * The MAX1619 registers
@@ -104,6 +103,7 @@ static struct i2c_driver max1619_driver = {
 
 struct max1619_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -179,7 +179,7 @@ static int max1619_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, max1619_detect);
+        return i2c_probe(adapter, &addr_data, max1619_detect);
 }
 
 /*
@@ -275,6 +275,12 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
         max1619_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp2_input);
         device_create_file(&new_client->dev, &dev_attr_temp2_min);
@@ -285,6 +291,8 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -308,15 +316,15 @@ static void max1619_init_client(struct i2c_client *client)
 
 static int max1619_detach_client(struct i2c_client *client)
 {
+        struct max1619_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index fa4032d53b79..cf2a35799c7c 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -38,23 +38,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
-static struct i2c_force_data forces[] = {{ NULL }};
 static u8 devid;
-static unsigned int extra_isa[3];
+static unsigned short address;
+static unsigned short extra_isa[3];
 static u8 confreg[4];
 
 enum chips { any_chip, pc87360, pc87363, pc87364, pc87365, pc87366 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .forces                 = forces,
-};
 
 static int init = 1;
 module_param(init, int, 0);
@@ -186,6 +182,7 @@ static inline u8 PWM_TO_REG(int val, int inv)
 
 struct pc87360_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         struct semaphore update_lock;
         char valid;             /* !=0 if following fields are valid */
@@ -224,8 +221,7 @@ struct pc87360_data {
  * Functions declaration
  */
 
-static int pc87360_attach_adapter(struct i2c_adapter *adapter);
-static int pc87360_detect(struct i2c_adapter *adapter, int address, int kind);
+static int pc87360_detect(struct i2c_adapter *adapter);
 static int pc87360_detach_client(struct i2c_client *client);
 
 static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
@@ -242,8 +238,7 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
 static struct i2c_driver pc87360_driver = {
         .owner          = THIS_MODULE,
         .name           = "pc87360",
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = pc87360_attach_adapter,
+        .attach_adapter = pc87360_detect,
         .detach_client  = pc87360_detach_client,
 };
 
@@ -251,168 +246,178 @@ static struct i2c_driver pc87360_driver = {
  * Sysfs stuff
  */
 
-static ssize_t set_fan_min(struct device *dev, const char *buf,
-        size_t count, int nr)
+static ssize_t show_fan_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[attr->index],
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
+}
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[attr->index],
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
+}
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index]));
+}
+static ssize_t show_fan_status(struct device *dev, struct device_attribute *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       FAN_STATUS_FROM_REG(data->fan_status[attr->index]));
+}
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
         struct i2c_client *client = to_i2c_client(dev);
         struct pc87360_data *data = i2c_get_clientdata(client);
         long fan_min = simple_strtol(buf, NULL, 10);
 
         down(&data->update_lock);
-        fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[nr]));
+        fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[attr->index]));
 
         /* If it wouldn't fit, change clock divisor */
         while (fan_min > 255
-            && (data->fan_status[nr] & 0x60) != 0x60) {
+            && (data->fan_status[attr->index] & 0x60) != 0x60) {
                 fan_min >>= 1;
-                data->fan[nr] >>= 1;
-                data->fan_status[nr] += 0x20;
+                data->fan[attr->index] >>= 1;
+                data->fan_status[attr->index] += 0x20;
         }
-        data->fan_min[nr] = fan_min > 255 ? 255 : fan_min;
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_MIN(nr),
-                            data->fan_min[nr]);
+        data->fan_min[attr->index] = fan_min > 255 ? 255 : fan_min;
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_MIN(attr->index),
+                            data->fan_min[attr->index]);
 
         /* Write new divider, preserve alarm bits */
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(nr),
-                            data->fan_status[nr] & 0xF9);
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(attr->index),
+                            data->fan_status[attr->index] & 0xF9);
         up(&data->update_lock);
 
         return count;
 }
 
 #define show_and_set_fan(offset) \
-static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[offset-1], \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
-} \
-static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[offset-1], \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
-} \
-static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1])); \
-} \
-static ssize_t show_fan##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       FAN_STATUS_FROM_REG(data->fan_status[offset-1])); \
-} \
-static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        return set_fan_min(dev, buf, count, offset-1); \
-} \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
-        show_fan##offset##_input, NULL); \
-static DEVICE_ATTR(fan##offset##_min, S_IWUSR | S_IRUGO, \
-        show_fan##offset##_min, set_fan##offset##_min); \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
-        show_fan##offset##_div, NULL); \
-static DEVICE_ATTR(fan##offset##_status, S_IRUGO, \
-        show_fan##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
+        show_fan_input, NULL, offset-1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IWUSR | S_IRUGO, \
+        show_fan_min, set_fan_min, offset-1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
+        show_fan_div, NULL, offset-1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_status, S_IRUGO, \
+        show_fan_status, NULL, offset-1);
 show_and_set_fan(1)
 show_and_set_fan(2)
 show_and_set_fan(3)
 
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       PWM_FROM_REG(data->pwm[attr->index],
+                                    FAN_CONFIG_INVERT(data->fan_conf,
+                                                      attr->index)));
+}
+static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->pwm[attr->index] = PWM_TO_REG(val,
+                              FAN_CONFIG_INVERT(data->fan_conf, attr->index));
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(attr->index),
+                            data->pwm[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_pwm(offset) \
-static ssize_t show_pwm##offset(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       PWM_FROM_REG(data->pwm[offset-1], \
-                                    FAN_CONFIG_INVERT(data->fan_conf, \
-                                                      offset-1))); \
-} \
-static ssize_t set_pwm##offset(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->pwm[offset-1] = PWM_TO_REG(val, \
-                              FAN_CONFIG_INVERT(data->fan_conf, offset-1)); \
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(offset-1), \
-                            data->pwm[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(pwm##offset, S_IWUSR | S_IRUGO, \
-        show_pwm##offset, set_pwm##offset);
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IWUSR | S_IRUGO, \
+        show_pwm, set_pwm, offset-1);
 show_and_set_pwm(1)
 show_and_set_pwm(2)
 show_and_set_pwm(3)
 
+static ssize_t show_in_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", data->in_status[attr->index]);
+}
+static ssize_t set_in_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MIN,
+                            data->in_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_in_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_max[attr->index] = IN_TO_REG(val,
+                               data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MAX,
+                            data->in_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_in(offset) \
-static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", data->in_status[offset]); \
-} \
-static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_min[offset] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MIN, \
-                            data->in_min[offset]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_max[offset] = IN_TO_REG(val, \
-                               data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MAX, \
-                            data->in_max[offset]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
-        show_in##offset##_input, NULL); \
-static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
-        show_in##offset##_min, set_in##offset##_min); \
-static DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \
-        show_in##offset##_max, set_in##offset##_max); \
-static DEVICE_ATTR(in##offset##_status, S_IRUGO, \
-        show_in##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, \
+        show_in_input, NULL, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
+        show_in_min, set_in_min, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \
+        show_in_max, set_in_max, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_status, S_IRUGO, \
+        show_in_status, NULL, offset);
 show_and_set_in(0)
 show_and_set_in(1)
 show_and_set_in(2)
@@ -425,88 +430,97 @@ show_and_set_in(8)
 show_and_set_in(9)
 show_and_set_in(10)
 
+static ssize_t show_therm_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_crit(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[attr->index-11],
+                       data->in_vref));
+}
+static ssize_t show_therm_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", data->in_status[attr->index]);
+}
+static ssize_t set_therm_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MIN,
+                            data->in_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_therm_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_max[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MAX,
+                            data->in_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_therm_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_crit[attr->index-11] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_CRIT,
+                            data->in_crit[attr->index-11]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_therm(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset+7], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset+7], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset+7], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[offset-4], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", data->in_status[offset+7]); \
-} \
-static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_min[offset+7] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MIN, \
-                            data->in_min[offset+7]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_max[offset+7] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MAX, \
-                            data->in_max[offset+7]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_crit[offset-4] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_CRIT, \
-                            data->in_crit[offset-4]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-        show_temp##offset##_input, NULL); \
-static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_min, set_temp##offset##_min); \
-static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_max, set_temp##offset##_max); \
-static DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_crit, set_temp##offset##_crit); \
-static DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-        show_temp##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+        show_therm_input, NULL, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
+        show_therm_min, set_therm_min, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
+        show_therm_max, set_therm_max, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
+        show_therm_crit, set_therm_crit, 11+offset-4); \
+static SENSOR_DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
+        show_therm_status, NULL, 11+offset-4);
 show_and_set_therm(4)
 show_and_set_therm(5)
 show_and_set_therm(6)
@@ -539,84 +553,93 @@ static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);
 
+static ssize_t show_temp_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
+}
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[attr->index]));
+}
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[attr->index]));
+}
+static ssize_t show_temp_crit(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[attr->index]));
+}
+static ssize_t show_temp_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_status[attr->index]);
+}
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp_min[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MIN,
+                            data->temp_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp_max[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MAX,
+                            data->temp_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp_crit[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_CRIT,
+                            data->temp_crit[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+
 #define show_and_set_temp(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
-} \
-static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
-} \
-static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
-}\
-static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[offset-1])); \
-}\
-static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", data->temp_status[offset-1]); \
-}\
-static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_min[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MIN, \
-                            data->temp_min[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_max[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MAX, \
-                            data->temp_max[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_crit[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_CRIT, \
-                            data->temp_crit[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-        show_temp##offset##_input, NULL); \
-static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_min, set_temp##offset##_min); \
-static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_max, set_temp##offset##_max); \
-static DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_crit, set_temp##offset##_crit); \
-static DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-        show_temp##offset##_status, NULL);
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+        show_temp_input, NULL, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
+        show_temp_min, set_temp_min, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
+        show_temp_max, set_temp_max, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
+        show_temp_crit, set_temp_crit, offset-1); \
+static SENSOR_DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
+        show_temp_status, NULL, offset-1);
 show_and_set_temp(1)
 show_and_set_temp(2)
 show_and_set_temp(3)
@@ -632,12 +655,7 @@ static DEVICE_ATTR(alarms_temp, S_IRUGO, show_temp_alarms, NULL);
  * Device detection, registration and update
  */
 
-static int pc87360_attach_adapter(struct i2c_adapter *adapter)
-{
-        return i2c_detect(adapter, &addr_data, pc87360_detect);
-}
-
-static int pc87360_find(int sioaddr, u8 *devid, int *address)
+static int __init pc87360_find(int sioaddr, u8 *devid, unsigned short *addresses)
 {
         u16 val;
         int i;
@@ -683,7 +701,7 @@ static int pc87360_find(int sioaddr, u8 *devid, int *address)
                         continue;
                 }
 
-                address[i] = val;
+                addresses[i] = val;
 
                 if (i==0) { /* Fans */
                         confreg[0] = superio_inb(sioaddr, 0xF0);
@@ -727,9 +745,7 @@ static int pc87360_find(int sioaddr, u8 *devid, int *address)
         return 0;
 }
 
-/* We don't really care about the address.
-   Read from extra_isa instead. */
-int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
+static int pc87360_detect(struct i2c_adapter *adapter)
 {
         int i;
         struct i2c_client *new_client;
@@ -738,9 +754,6 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
         const char *name = "pc87360";
         int use_thermistors = 0;
 
-        if (!i2c_is_isa_adapter(adapter))
-                return -ENODEV;
-
         if (!(data = kmalloc(sizeof(struct pc87360_data), GFP_KERNEL)))
                 return -ENOMEM;
         memset(data, 0x00, sizeof(struct pc87360_data));
@@ -838,51 +851,57 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         if (data->innr) {
-                device_create_file(&new_client->dev, &dev_attr_in0_input);
-                device_create_file(&new_client->dev, &dev_attr_in1_input);
-                device_create_file(&new_client->dev, &dev_attr_in2_input);
-                device_create_file(&new_client->dev, &dev_attr_in3_input);
-                device_create_file(&new_client->dev, &dev_attr_in4_input);
-                device_create_file(&new_client->dev, &dev_attr_in5_input);
-                device_create_file(&new_client->dev, &dev_attr_in6_input);
-                device_create_file(&new_client->dev, &dev_attr_in7_input);
-                device_create_file(&new_client->dev, &dev_attr_in8_input);
-                device_create_file(&new_client->dev, &dev_attr_in9_input);
-                device_create_file(&new_client->dev, &dev_attr_in10_input);
-                device_create_file(&new_client->dev, &dev_attr_in0_min);
-                device_create_file(&new_client->dev, &dev_attr_in1_min);
-                device_create_file(&new_client->dev, &dev_attr_in2_min);
-                device_create_file(&new_client->dev, &dev_attr_in3_min);
-                device_create_file(&new_client->dev, &dev_attr_in4_min);
-                device_create_file(&new_client->dev, &dev_attr_in5_min);
-                device_create_file(&new_client->dev, &dev_attr_in6_min);
-                device_create_file(&new_client->dev, &dev_attr_in7_min);
-                device_create_file(&new_client->dev, &dev_attr_in8_min);
-                device_create_file(&new_client->dev, &dev_attr_in9_min);
-                device_create_file(&new_client->dev, &dev_attr_in10_min);
-                device_create_file(&new_client->dev, &dev_attr_in0_max);
-                device_create_file(&new_client->dev, &dev_attr_in1_max);
-                device_create_file(&new_client->dev, &dev_attr_in2_max);
-                device_create_file(&new_client->dev, &dev_attr_in3_max);
-                device_create_file(&new_client->dev, &dev_attr_in4_max);
-                device_create_file(&new_client->dev, &dev_attr_in5_max);
-                device_create_file(&new_client->dev, &dev_attr_in6_max);
-                device_create_file(&new_client->dev, &dev_attr_in7_max);
-                device_create_file(&new_client->dev, &dev_attr_in8_max);
-                device_create_file(&new_client->dev, &dev_attr_in9_max);
-                device_create_file(&new_client->dev, &dev_attr_in10_max);
-                device_create_file(&new_client->dev, &dev_attr_in0_status);
-                device_create_file(&new_client->dev, &dev_attr_in1_status);
-                device_create_file(&new_client->dev, &dev_attr_in2_status);
-                device_create_file(&new_client->dev, &dev_attr_in3_status);
-                device_create_file(&new_client->dev, &dev_attr_in4_status);
-                device_create_file(&new_client->dev, &dev_attr_in5_status);
-                device_create_file(&new_client->dev, &dev_attr_in6_status);
-                device_create_file(&new_client->dev, &dev_attr_in7_status);
-                device_create_file(&new_client->dev, &dev_attr_in8_status);
-                device_create_file(&new_client->dev, &dev_attr_in9_status);
-                device_create_file(&new_client->dev, &dev_attr_in10_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_status.dev_attr);
 
                 device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
                 device_create_file(&new_client->dev, &dev_attr_vrm);
@@ -890,90 +909,92 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         if (data->tempnr) {
-                device_create_file(&new_client->dev, &dev_attr_temp1_input);
-                device_create_file(&new_client->dev, &dev_attr_temp2_input);
-                device_create_file(&new_client->dev, &dev_attr_temp1_min);
-                device_create_file(&new_client->dev, &dev_attr_temp2_min);
-                device_create_file(&new_client->dev, &dev_attr_temp1_max);
-                device_create_file(&new_client->dev, &dev_attr_temp2_max);
-                device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp1_status);
-                device_create_file(&new_client->dev, &dev_attr_temp2_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_status.dev_attr);
 
                 device_create_file(&new_client->dev, &dev_attr_alarms_temp);
         }
         if (data->tempnr == 3) {
-                device_create_file(&new_client->dev, &dev_attr_temp3_input);
-                device_create_file(&new_client->dev, &dev_attr_temp3_min);
-                device_create_file(&new_client->dev, &dev_attr_temp3_max);
-                device_create_file(&new_client->dev, &dev_attr_temp3_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp3_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_status.dev_attr);
         }
         if (data->innr == 14) {
-                device_create_file(&new_client->dev, &dev_attr_temp4_input);
-                device_create_file(&new_client->dev, &dev_attr_temp5_input);
-                device_create_file(&new_client->dev, &dev_attr_temp6_input);
-                device_create_file(&new_client->dev, &dev_attr_temp4_min);
-                device_create_file(&new_client->dev, &dev_attr_temp5_min);
-                device_create_file(&new_client->dev, &dev_attr_temp6_min);
-                device_create_file(&new_client->dev, &dev_attr_temp4_max);
-                device_create_file(&new_client->dev, &dev_attr_temp5_max);
-                device_create_file(&new_client->dev, &dev_attr_temp6_max);
-                device_create_file(&new_client->dev, &dev_attr_temp4_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp5_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp6_crit);
-                device_create_file(&new_client->dev, &dev_attr_temp4_status);
-                device_create_file(&new_client->dev, &dev_attr_temp5_status);
-                device_create_file(&new_client->dev, &dev_attr_temp6_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_input.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_min.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_max.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_crit.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_status.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_status.dev_attr);
         }
 
         if (data->fannr) {
                 if (FAN_CONFIG_MONITOR(data->fan_conf, 0)) {
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_input);
+                                           &sensor_dev_attr_fan1_input.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_min);
+                                           &sensor_dev_attr_fan1_min.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_div);
+                                           &sensor_dev_attr_fan1_div.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_status);
+                                           &sensor_dev_attr_fan1_status.dev_attr);
                 }
 
                 if (FAN_CONFIG_MONITOR(data->fan_conf, 1)) {
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_input);
+                                           &sensor_dev_attr_fan2_input.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_min);
+                                           &sensor_dev_attr_fan2_min.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_div);
+                                           &sensor_dev_attr_fan2_div.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_status);
+                                           &sensor_dev_attr_fan2_status.dev_attr);
                 }
 
                 if (FAN_CONFIG_CONTROL(data->fan_conf, 0))
-                        device_create_file(&new_client->dev, &dev_attr_pwm1);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm1.dev_attr);
                 if (FAN_CONFIG_CONTROL(data->fan_conf, 1))
-                        device_create_file(&new_client->dev, &dev_attr_pwm2);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm2.dev_attr);
         }
         if (data->fannr == 3) {
                 if (FAN_CONFIG_MONITOR(data->fan_conf, 2)) {
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_input);
+                                           &sensor_dev_attr_fan3_input.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_min);
+                                           &sensor_dev_attr_fan3_min.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_div);
+                                           &sensor_dev_attr_fan3_div.dev_attr);
                         device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_status);
+                                           &sensor_dev_attr_fan3_status.dev_attr);
                 }
 
                 if (FAN_CONFIG_CONTROL(data->fan_conf, 2))
-                        device_create_file(&new_client->dev, &dev_attr_pwm3);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm3.dev_attr);
         }
 
         return 0;
 
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
         for (i = 0; i < 3; i++) {
                 if (data->address[i]) {
@@ -990,11 +1011,10 @@ static int pc87360_detach_client(struct i2c_client *client)
         struct pc87360_data *data = i2c_get_clientdata(client);
         int i;
 
-        if ((i = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((i = i2c_detach_client(client)))
                 return i;
-        }
 
         for (i = 0; i < 3; i++) {
                 if (data->address[i]) {
@@ -1320,23 +1340,23 @@ static int __init pc87360_init(void)
         /* Arbitrarily pick one of the addresses */
         for (i = 0; i < 3; i++) {
                 if (extra_isa[i] != 0x0000) {
-                        normal_isa[0] = extra_isa[i];
+                        address = extra_isa[i];
                         break;
                 }
         }
 
-        if (normal_isa[0] == 0x0000) {
+        if (address == 0x0000) {
                 printk(KERN_WARNING "pc87360: No active logical device, "
                        "module not inserted.\n");
                 return -ENODEV;
         }
 
-        return i2c_add_driver(&pc87360_driver);
+        return i2c_isa_add_driver(&pc87360_driver);
 }
 
 static void __exit pc87360_exit(void)
 {
-        i2c_del_driver(&pc87360_driver);
+        i2c_isa_del_driver(&pc87360_driver);
 }
 
 
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 6bbfc8fb4f13..8610bce08244 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -55,7 +55,9 @@
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <asm/io.h>
@@ -68,14 +70,10 @@ module_param(force_addr, ushort, 0);
 MODULE_PARM_DESC(force_addr,
                  "Initialize the base address of the sensors");
 
-/* Addresses to scan.
+/* Device address
    Note that we can't determine the ISA address until we have initialized
    our module */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_1(sis5595);
+static unsigned short address;
 
 /* Many SIS5595 constants specified below */
 
@@ -168,6 +166,7 @@ static inline u8 DIV_TO_REG(int val)
    allocated. */
 struct sis5595_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -190,8 +189,7 @@ struct sis5595_data {
 
 static struct pci_dev *s_bridge;        /* pointer to the (only) sis5595 */
 
-static int sis5595_attach_adapter(struct i2c_adapter *adapter);
-static int sis5595_detect(struct i2c_adapter *adapter, int address, int kind);
+static int sis5595_detect(struct i2c_adapter *adapter);
 static int sis5595_detach_client(struct i2c_client *client);
 
 static int sis5595_read_value(struct i2c_client *client, u8 register);
@@ -202,9 +200,7 @@ static void sis5595_init_client(struct i2c_client *client);
 static struct i2c_driver sis5595_driver = {
         .owner          = THIS_MODULE,
         .name           = "sis5595",
-        .id             = I2C_DRIVERID_SIS5595,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = sis5595_attach_adapter,
+        .attach_adapter = sis5595_detect,
         .detach_client  = sis5595_detach_client,
 };
 
@@ -476,14 +472,7 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
  
 /* This is called when the module is loaded */
-static int sis5595_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, sis5595_detect);
-}
-
-int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
+static int sis5595_detect(struct i2c_adapter *adapter)
 {
         int err = 0;
         int i;
@@ -492,10 +481,6 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
         char val;
         u16 a;
 
-        /* Make sure we are probing the ISA bus!!  */
-        if (!i2c_is_isa_adapter(adapter))
-                goto exit;
-
         if (force_addr)
                 address = force_addr & ~(SIS5595_EXTENT - 1);
         /* Reserve the ISA region */
@@ -578,6 +563,12 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -608,7 +599,9 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
                 device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
         }
         return 0;
-        
+
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit_release:
@@ -619,18 +612,17 @@ exit:
 
 static int sis5595_detach_client(struct i2c_client *client)
 {
+        struct sis5595_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        if (i2c_is_isa_client(client))
-                release_region(client->addr, SIS5595_EXTENT);
+        release_region(client->addr, SIS5595_EXTENT);
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -745,7 +737,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
 {
         u16 val;
         int *i;
-        int addr = 0;
 
         for (i = blacklist; *i != 0; i++) {
                 struct pci_dev *dev;
@@ -761,22 +752,19 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
             pci_read_config_word(dev, SIS5595_BASE_REG, &val))
                 return -ENODEV;
         
-        addr = val & ~(SIS5595_EXTENT - 1);
-        if (addr == 0 && force_addr == 0) {
+        address = val & ~(SIS5595_EXTENT - 1);
+        if (address == 0 && force_addr == 0) {
                 dev_err(&dev->dev, "Base address not set - upgrade BIOS or use force_addr=0xaddr\n");
                 return -ENODEV;
         }
-        if (force_addr)
-                addr = force_addr;      /* so detect will get called */
 
-        if (!addr) {
+        if (!address) {
                 dev_err(&dev->dev,"No SiS 5595 sensors found.\n");
                 return -ENODEV;
         }
-        normal_isa[0] = addr;
 
         s_bridge = pci_dev_get(dev);
-        if (i2c_add_driver(&sis5595_driver)) {
+        if (i2c_isa_add_driver(&sis5595_driver)) {
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
@@ -803,7 +791,7 @@ static void __exit sm_sis5595_exit(void)
 {
         pci_unregister_driver(&sis5595_pci_driver);
         if (s_bridge != NULL) {
-                i2c_del_driver(&sis5595_driver);
+                i2c_isa_del_driver(&sis5595_driver);
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index fdeeb3ab6f2f..7fe71576dea4 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -31,23 +31,14 @@
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
 
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
 /* Address is autodetected, there is no default value */
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-static struct i2c_force_data forces[] = {{NULL}};
-
-enum chips { any_chip, smsc47b397 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .probe                  = normal_i2c,           /* cheat */
-        .ignore                 = normal_i2c,           /* cheat */
-        .forces                 = forces,
-};
+static unsigned short address;
 
 /* Super-I/0 registers and commands */
 
@@ -100,6 +91,7 @@ static u8 smsc47b397_reg_temp[] = {0x25, 0x26, 0x27, 0x80};
 
 struct smsc47b397_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -215,52 +207,40 @@ sysfs_fan(4);
 #define device_create_file_fan(client, num) \
         device_create_file(&client->dev, &dev_attr_fan##num##_input)
 
-static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind);
-
-static int smsc47b397_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, smsc47b397_detect);
-}
-
 static int smsc47b397_detach_client(struct i2c_client *client)
 {
+        struct smsc47b397_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, SMSC_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
 
+static int smsc47b397_detect(struct i2c_adapter *adapter);
+
 static struct i2c_driver smsc47b397_driver = {
         .owner          = THIS_MODULE,
         .name           = "smsc47b397",
-        .id             = I2C_DRIVERID_SMSC47B397,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = smsc47b397_attach_adapter,
+        .attach_adapter = smsc47b397_detect,
         .detach_client  = smsc47b397_detach_client,
 };
 
-static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int smsc47b397_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *new_client;
         struct smsc47b397_data *data;
         int err = 0;
 
-        if (!i2c_is_isa_adapter(adapter)) {
-                return 0;
-        }
-
-        if (!request_region(addr, SMSC_EXTENT, smsc47b397_driver.name)) {
-                dev_err(&adapter->dev, "Region 0x%x already in use!\n", addr);
+        if (!request_region(address, SMSC_EXTENT, smsc47b397_driver.name)) {
+                dev_err(&adapter->dev, "Region 0x%x already in use!\n",
+                        address);
                 return -EBUSY;
         }
 
@@ -272,7 +252,7 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
 
         new_client = &data->client;
         i2c_set_clientdata(new_client, data);
-        new_client->addr = addr;
+        new_client->addr = address;
         init_MUTEX(&data->lock);
         new_client->adapter = adapter;
         new_client->driver = &smsc47b397_driver;
@@ -285,6 +265,12 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
         if ((err = i2c_attach_client(new_client)))
                 goto error_free;
 
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
+
         device_create_file_temp(new_client, 1);
         device_create_file_temp(new_client, 2);
         device_create_file_temp(new_client, 3);
@@ -297,14 +283,16 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
 
         return 0;
 
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
         kfree(data);
 error_release:
-        release_region(addr, SMSC_EXTENT);
+        release_region(address, SMSC_EXTENT);
         return err;
 }
 
-static int __init smsc47b397_find(unsigned int *addr)
+static int __init smsc47b397_find(unsigned short *addr)
 {
         u8 id, rev;
 
@@ -333,15 +321,15 @@ static int __init smsc47b397_init(void)
 {
         int ret;
 
-        if ((ret = smsc47b397_find(normal_isa)))
+        if ((ret = smsc47b397_find(&address)))
                 return ret;
 
-        return i2c_add_driver(&smsc47b397_driver);
+        return i2c_isa_add_driver(&smsc47b397_driver);
 }
 
 static void __exit smsc47b397_exit(void)
 {
-        i2c_del_driver(&smsc47b397_driver);
+        i2c_isa_del_driver(&smsc47b397_driver);
 }
 
 MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 7166ad0b2fda..7e699a8ede26 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -30,21 +30,14 @@
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
 
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
 /* Address is autodetected, there is no default value */
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-static struct i2c_force_data forces[] = {{NULL}};
-
-enum chips { any_chip, smsc47m1 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .forces                 = forces,
-};
+static unsigned short address;
 
 /* Super-I/0 registers and commands */
 
@@ -108,6 +101,7 @@ superio_exit(void)
 
 struct smsc47m1_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -121,9 +115,7 @@ struct smsc47m1_data {
 };
 
 
-static int smsc47m1_attach_adapter(struct i2c_adapter *adapter);
-static int smsc47m1_find(int *address);
-static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind);
+static int smsc47m1_detect(struct i2c_adapter *adapter);
 static int smsc47m1_detach_client(struct i2c_client *client);
 
 static int smsc47m1_read_value(struct i2c_client *client, u8 reg);
@@ -136,9 +128,7 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 static struct i2c_driver smsc47m1_driver = {
         .owner          = THIS_MODULE,
         .name           = "smsc47m1",
-        .id             = I2C_DRIVERID_SMSC47M1,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = smsc47m1_attach_adapter,
+        .attach_adapter = smsc47m1_detect,
         .detach_client  = smsc47m1_detach_client,
 };
 
@@ -354,14 +344,7 @@ fan_present(2);
 
 static DEVICE_ATTR(alarms, S_IRUGO, get_alarms, NULL);
 
-static int smsc47m1_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, smsc47m1_detect);
-}
-
-static int smsc47m1_find(int *address)
+static int __init smsc47m1_find(unsigned short *addr)
 {
         u8 val;
 
@@ -388,10 +371,10 @@ static int smsc47m1_find(int *address)
         }
 
         superio_select();
-        *address = (superio_inb(SUPERIO_REG_BASE) << 8)
-                 |  superio_inb(SUPERIO_REG_BASE + 1);
+        *addr = (superio_inb(SUPERIO_REG_BASE) << 8)
+              |  superio_inb(SUPERIO_REG_BASE + 1);
         val = superio_inb(SUPERIO_REG_ACT);
-        if (*address == 0 || (val & 0x01) == 0) {
+        if (*addr == 0 || (val & 0x01) == 0) {
                 printk(KERN_INFO "smsc47m1: Device is disabled, will not use\n");
                 superio_exit();
                 return -ENODEV;
@@ -401,17 +384,13 @@ static int smsc47m1_find(int *address)
         return 0;
 }
 
-static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
+static int smsc47m1_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *new_client;
         struct smsc47m1_data *data;
         int err = 0;
         int fan1, fan2, pwm1, pwm2;
 
-        if (!i2c_is_isa_adapter(adapter)) {
-                return 0;
-        }
-
         if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.name)) {
                 dev_err(&adapter->dev, "Region 0x%x already in use!\n", address);
                 return -EBUSY;
@@ -461,6 +440,13 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
            function. */
         smsc47m1_update_device(&new_client->dev, 1);
 
+        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
+
         if (fan1) {
                 device_create_file(&new_client->dev, &dev_attr_fan1_input);
                 device_create_file(&new_client->dev, &dev_attr_fan1_min);
@@ -494,6 +480,8 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
         kfree(data);
 error_release:
@@ -503,16 +491,16 @@ error_release:
 
 static int smsc47m1_detach_client(struct i2c_client *client)
 {
+        struct smsc47m1_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, SMSC_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -573,16 +561,16 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 
 static int __init sm_smsc47m1_init(void)
 {
-        if (smsc47m1_find(normal_isa)) {
+        if (smsc47m1_find(&address)) {
                 return -ENODEV;
         }
 
-        return i2c_add_driver(&smsc47m1_driver);
+        return i2c_isa_add_driver(&smsc47m1_driver);
 }
 
 static void __exit sm_smsc47m1_exit(void)
 {
-        i2c_del_driver(&smsc47m1_driver);
+        i2c_isa_del_driver(&smsc47m1_driver);
 }
 
 MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>");
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 164d47948390..eb84997627c8 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -35,7 +35,9 @@
 #include <linux/pci.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
 
@@ -47,14 +49,10 @@ module_param(force_addr, ushort, 0);
 MODULE_PARM_DESC(force_addr,
                  "Initialize the base address of the sensors");
 
-/* Addresses to scan.
+/* Device address
    Note that we can't determine the ISA address until we have initialized
    our module */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_1(via686a);
+static unsigned short address;
 
 /*
    The Via 686a southbridge has a LM78-like chip integrated on the same IC.
@@ -297,6 +295,7 @@ static inline long TEMP_FROM_REG10(u16 val)
    via686a client is allocated. */
 struct via686a_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -315,8 +314,7 @@ struct via686a_data {
 
 static struct pci_dev *s_bridge;        /* pointer to the (only) via686a */
 
-static int via686a_attach_adapter(struct i2c_adapter *adapter);
-static int via686a_detect(struct i2c_adapter *adapter, int address, int kind);
+static int via686a_detect(struct i2c_adapter *adapter);
 static int via686a_detach_client(struct i2c_client *client);
 
 static inline int via686a_read_value(struct i2c_client *client, u8 reg)
@@ -576,22 +574,13 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 static struct i2c_driver via686a_driver = {
         .owner          = THIS_MODULE,
         .name           = "via686a",
-        .id             = I2C_DRIVERID_VIA686A,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = via686a_attach_adapter,
+        .attach_adapter = via686a_detect,
         .detach_client  = via686a_detach_client,
 };
 
 
 /* This is called when the module is loaded */
-static int via686a_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, via686a_detect);
-}
-
-static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
+static int via686a_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *new_client;
         struct via686a_data *data;
@@ -599,13 +588,6 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         const char client_name[] = "via686a";
         u16 val;
 
-        /* Make sure we are probing the ISA bus!!  */
-        if (!i2c_is_isa_adapter(adapter)) {
-                dev_err(&adapter->dev,
-                "via686a_detect called for an I2C bus adapter?!?\n");
-                return 0;
-        }
-
         /* 8231 requires multiple of 256, we enforce that on 686 as well */
         if (force_addr)
                 address = force_addr & 0xFF00;
@@ -637,7 +619,7 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 
         if (!(data = kmalloc(sizeof(struct via686a_data), GFP_KERNEL))) {
                 err = -ENOMEM;
-                goto ERROR0;
+                goto exit_release;
         }
         memset(data, 0, sizeof(struct via686a_data));
 
@@ -655,12 +637,18 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         init_MUTEX(&data->update_lock);
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
-                goto ERROR3;
+                goto exit_free;
 
         /* Initialize the VIA686A chip */
         via686a_init_client(new_client);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_input);
         device_create_file(&new_client->dev, &dev_attr_in1_input);
         device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -695,25 +683,27 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
-ERROR3:
+exit_detach:
+        i2c_detach_client(new_client);
+exit_free:
         kfree(data);
-ERROR0:
+exit_release:
         release_region(address, VIA686A_EXTENT);
         return err;
 }
 
 static int via686a_detach_client(struct i2c_client *client)
 {
+        struct via686a_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, VIA686A_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -810,29 +800,25 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *id)
 {
         u16 val;
-        int addr = 0;
 
         if (PCIBIOS_SUCCESSFUL !=
             pci_read_config_word(dev, VIA686A_BASE_REG, &val))
                 return -ENODEV;
 
-        addr = val & ~(VIA686A_EXTENT - 1);
-        if (addr == 0 && force_addr == 0) {
+        address = val & ~(VIA686A_EXTENT - 1);
+        if (address == 0 && force_addr == 0) {
                 dev_err(&dev->dev, "base address not set - upgrade BIOS "
                         "or use force_addr=0xaddr\n");
                 return -ENODEV;
         }
-        if (force_addr)
-                addr = force_addr;      /* so detect will get called */
 
-        if (!addr) {
+        if (!address) {
                 dev_err(&dev->dev, "No Via 686A sensors found.\n");
                 return -ENODEV;
         }
-        normal_isa[0] = addr;
 
         s_bridge = pci_dev_get(dev);
-        if (i2c_add_driver(&via686a_driver)) {
+        if (i2c_isa_add_driver(&via686a_driver)) {
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
@@ -859,7 +845,7 @@ static void __exit sm_via686a_exit(void)
 {
         pci_unregister_driver(&via686a_pci_driver);
         if (s_bridge != NULL) {
-                i2c_del_driver(&via686a_driver);
+                i2c_isa_del_driver(&via686a_driver);
                 pci_dev_put(s_bridge);
                 s_bridge = NULL;
         }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 8a40b6976e1a..b60efe8f8b26 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -9,6 +9,9 @@
     Thanks to Leon Moonen, Steve Cliffe and Grant Coady for their help
     in testing and debugging this driver.
 
+    This driver also supports the W83627EHG, which is the lead-free
+    version of the W83627EHF.
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -37,17 +40,14 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
 
-/* Addresses to scan
-   The actual ISA address is read from Super-I/O configuration space */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
-
-/* Insmod parameters */
-SENSORS_INSMOD_1(w83627ehf);
+/* The actual ISA address is read from Super-I/O configuration space */
+static unsigned short address;
 
 /*
  * Super-I/O constants and functions
@@ -174,6 +174,7 @@ temp1_to_reg(int temp)
 
 struct w83627ehf_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
 
         struct semaphore update_lock;
@@ -666,15 +667,12 @@ static void w83627ehf_init_client(struct i2c_client *client)
         }
 }
 
-static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
+static int w83627ehf_detect(struct i2c_adapter *adapter)
 {
         struct i2c_client *client;
         struct w83627ehf_data *data;
         int i, err = 0;
 
-        if (!i2c_is_isa_adapter(adapter))
-                return 0;
-
         if (!request_region(address, REGION_LENGTH, w83627ehf_driver.name)) {
                 err = -EBUSY;
                 goto exit;
@@ -720,6 +718,12 @@ static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
                 data->has_fan |= (1 << 4);
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&client->dev, &dev_attr_fan1_input);
         device_create_file(&client->dev, &dev_attr_fan1_min);
         device_create_file(&client->dev, &dev_attr_fan1_div);
@@ -753,6 +757,8 @@ static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(client);
 exit_free:
         kfree(data);
 exit_release:
@@ -761,24 +767,17 @@ exit:
         return err;
 }
 
-static int w83627ehf_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, w83627ehf_detect);
-}
-
 static int w83627ehf_detach_client(struct i2c_client *client)
 {
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
         release_region(client->addr, REGION_LENGTH);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -786,12 +785,11 @@ static int w83627ehf_detach_client(struct i2c_client *client)
 static struct i2c_driver w83627ehf_driver = {
         .owner          = THIS_MODULE,
         .name           = "w83627ehf",
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = w83627ehf_attach_adapter,
+        .attach_adapter = w83627ehf_detect,
         .detach_client  = w83627ehf_detach_client,
 };
 
-static int __init w83627ehf_find(int sioaddr, int *address)
+static int __init w83627ehf_find(int sioaddr, unsigned short *addr)
 {
         u16 val;
 
@@ -809,8 +807,8 @@ static int __init w83627ehf_find(int sioaddr, int *address)
         superio_select(W83627EHF_LD_HWM);
         val = (superio_inb(SIO_REG_ADDR) << 8)
             | superio_inb(SIO_REG_ADDR + 1);
-        *address = val & ~(REGION_LENGTH - 1);
-        if (*address == 0) {
+        *addr = val & ~(REGION_LENGTH - 1);
+        if (*addr == 0) {
                 superio_exit();
                 return -ENODEV;
         }
@@ -826,16 +824,16 @@ static int __init w83627ehf_find(int sioaddr, int *address)
 
 static int __init sensors_w83627ehf_init(void)
 {
-        if (w83627ehf_find(0x2e, &normal_isa[0])
-         && w83627ehf_find(0x4e, &normal_isa[0]))
+        if (w83627ehf_find(0x2e, &address)
+         && w83627ehf_find(0x4e, &address))
                 return -ENODEV;
 
-        return i2c_add_driver(&w83627ehf_driver);
+        return i2c_isa_add_driver(&w83627ehf_driver);
 }
 
 static void __exit sensors_w83627ehf_exit(void)
 {
-        i2c_del_driver(&w83627ehf_driver);
+        i2c_isa_del_driver(&w83627ehf_driver);
 }
 
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index bd87a42e068a..02bd5c0239a2 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -42,8 +42,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
 
@@ -56,12 +58,11 @@ module_param(force_i2c, byte, 0);
 MODULE_PARM_DESC(force_i2c,
                  "Initialize the i2c address of the sensors");
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
+/* The actual ISA address is read from Super-I/O configuration space */
+static unsigned short address;
 
 /* Insmod parameters */
-SENSORS_INSMOD_4(w83627hf, w83627thf, w83697hf, w83637hf);
+enum chips { any_chip, w83627hf, w83627thf, w83697hf, w83637hf };
 
 static int init = 1;
 module_param(init, bool, 0);
@@ -277,6 +278,7 @@ static inline u8 DIV_TO_REG(long val)
    dynamically allocated, at the same time when a new client is allocated. */
 struct w83627hf_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -314,9 +316,7 @@ struct w83627hf_data {
 };
 
 
-static int w83627hf_attach_adapter(struct i2c_adapter *adapter);
-static int w83627hf_detect(struct i2c_adapter *adapter, int address,
-                          int kind);
+static int w83627hf_detect(struct i2c_adapter *adapter);
 static int w83627hf_detach_client(struct i2c_client *client);
 
 static int w83627hf_read_value(struct i2c_client *client, u16 register);
@@ -328,9 +328,7 @@ static void w83627hf_init_client(struct i2c_client *client);
 static struct i2c_driver w83627hf_driver = {
         .owner          = THIS_MODULE,
         .name           = "w83627hf",
-        .id             = I2C_DRIVERID_W83627HF,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = w83627hf_attach_adapter,
+        .attach_adapter = w83627hf_detect,
         .detach_client  = w83627hf_detach_client,
 };
 
@@ -959,16 +957,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_type); \
 } while (0)
 
 
-/* This function is called when:
-     * w83627hf_driver is inserted (when this module is loaded), for each
-       available adapter
-     * when a new adapter is inserted (and w83627hf_driver is still present) */
-static int w83627hf_attach_adapter(struct i2c_adapter *adapter)
-{
-        return i2c_detect(adapter, &addr_data, w83627hf_detect);
-}
-
-static int w83627hf_find(int sioaddr, int *address)
+static int __init w83627hf_find(int sioaddr, unsigned short *addr)
 {
         u16 val;
 
@@ -988,32 +977,24 @@ static int w83627hf_find(int sioaddr, int *address)
         superio_select(W83627HF_LD_HWM);
         val = (superio_inb(WINB_BASE_REG) << 8) |
                superio_inb(WINB_BASE_REG + 1);
-        *address = val & ~(WINB_EXTENT - 1);
-        if (*address == 0 && force_addr == 0) {
+        *addr = val & ~(WINB_EXTENT - 1);
+        if (*addr == 0 && force_addr == 0) {
                 superio_exit();
                 return -ENODEV;
         }
-        if (force_addr)
-                *address = force_addr;  /* so detect will get called */
 
         superio_exit();
         return 0;
 }
 
-int w83627hf_detect(struct i2c_adapter *adapter, int address,
-                   int kind)
+static int w83627hf_detect(struct i2c_adapter *adapter)
 {
-        int val;
+        int val, kind;
         struct i2c_client *new_client;
         struct w83627hf_data *data;
         int err = 0;
         const char *client_name = "";
 
-        if (!i2c_is_isa_adapter(adapter)) {
-                err = -ENODEV;
-                goto ERROR0;
-        }
-
         if(force_addr)
                 address = force_addr & ~(WINB_EXTENT - 1);
 
@@ -1102,6 +1083,12 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
         data->fan_min[2] = w83627hf_read_value(new_client, W83781D_REG_FAN_MIN(3));
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+
         device_create_file_in(new_client, 0);
         if (kind != w83697hf)
                 device_create_file_in(new_client, 1);
@@ -1152,6 +1139,8 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
 
         return 0;
 
+      ERROR3:
+        i2c_detach_client(new_client);
       ERROR2:
         kfree(data);
       ERROR1:
@@ -1162,16 +1151,16 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
 
 static int w83627hf_detach_client(struct i2c_client *client)
 {
+        struct w83627hf_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         release_region(client->addr, WINB_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
 
         return 0;
 }
@@ -1327,7 +1316,7 @@ static void w83627hf_init_client(struct i2c_client *client)
                 data->vrm = (data->vrm_ovt & 0x01) ? 90 : 82;
         } else {
                 /* Convert VID to voltage based on default VRM */
-                data->vrm = i2c_which_vrm();
+                data->vrm = vid_which_vrm();
         }
 
         tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
@@ -1485,20 +1474,17 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
 
 static int __init sensors_w83627hf_init(void)
 {
-        int addr;
-
-        if (w83627hf_find(0x2e, &addr)
-         && w83627hf_find(0x4e, &addr)) {
+        if (w83627hf_find(0x2e, &address)
+         && w83627hf_find(0x4e, &address)) {
                 return -ENODEV;
         }
-        normal_isa[0] = addr;
 
-        return i2c_add_driver(&w83627hf_driver);
+        return i2c_isa_add_driver(&w83627hf_driver);
 }
 
 static void __exit sensors_w83627hf_exit(void)
 {
-        i2c_del_driver(&w83627hf_driver);
+        i2c_isa_del_driver(&w83627hf_driver);
 }
 
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 0bb131ce09eb..4c43337ca780 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -38,8 +38,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-#include <linux/i2c-vid.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
 
@@ -47,10 +49,10 @@
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
                                         0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
                                         0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
-SENSORS_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
+I2C_CLIENT_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
                     "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
@@ -218,6 +220,7 @@ DIV_TO_REG(long val, enum chips type)
    allocated. */
 struct w83781d_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore lock;
         enum chips type;
 
@@ -255,6 +258,7 @@ struct w83781d_data {
 };
 
 static int w83781d_attach_adapter(struct i2c_adapter *adapter);
+static int w83781d_isa_attach_adapter(struct i2c_adapter *adapter);
 static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind);
 static int w83781d_detach_client(struct i2c_client *client);
 
@@ -273,6 +277,14 @@ static struct i2c_driver w83781d_driver = {
         .detach_client = w83781d_detach_client,
 };
 
+static struct i2c_driver w83781d_isa_driver = {
+        .owner = THIS_MODULE,
+        .name = "w83781d-isa",
+        .attach_adapter = w83781d_isa_attach_adapter,
+        .detach_client = w83781d_detach_client,
+};
+
+
 /* following are the sysfs callback functions */
 #define show_in_reg(reg) \
 static ssize_t show_##reg (struct device *dev, char *buf, int nr) \
@@ -856,7 +868,13 @@ w83781d_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, w83781d_detect);
+        return i2c_probe(adapter, &addr_data, w83781d_detect);
+}
+
+static int
+w83781d_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return w83781d_detect(adapter, isa_address, -1);
 }
 
 /* Assumes that adapter is of I2C, not ISA variety.
@@ -961,10 +979,10 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
 ERROR_SC_3:
         i2c_detach_client(data->lm75[0]);
 ERROR_SC_2:
-        if (NULL != data->lm75[1])
+        if (data->lm75[1])
                 kfree(data->lm75[1]);
 ERROR_SC_1:
-        if (NULL != data->lm75[0])
+        if (data->lm75[0])
                 kfree(data->lm75[0]);
 ERROR_SC_0:
         return err;
@@ -999,7 +1017,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         
         if (is_isa)
                 if (!request_region(address, W83781D_EXTENT,
-                                    w83781d_driver.name)) {
+                                    w83781d_isa_driver.name)) {
                         dev_dbg(&adapter->dev, "Request of region "
                                 "0x%x-0x%x for w83781d failed\n", address,
                                 address + W83781D_EXTENT - 1);
@@ -1057,7 +1075,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         new_client->addr = address;
         init_MUTEX(&data->lock);
         new_client->adapter = adapter;
-        new_client->driver = &w83781d_driver;
+        new_client->driver = is_isa ? &w83781d_isa_driver : &w83781d_driver;
         new_client->flags = 0;
 
         /* Now, we do the remaining detection. */
@@ -1189,6 +1207,12 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                         data->pwmenable[i] = 1;
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR4;
+        }
+
         device_create_file_in(new_client, 0);
         if (kind != w83783s)
                 device_create_file_in(new_client, 1);
@@ -1241,6 +1265,15 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+ERROR4:
+        if (data->lm75[1]) {
+                i2c_detach_client(data->lm75[1]);
+                kfree(data->lm75[1]);
+        }
+        if (data->lm75[0]) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
 ERROR3:
         i2c_detach_client(new_client);
 ERROR2:
@@ -1255,24 +1288,26 @@ ERROR0:
 static int
 w83781d_detach_client(struct i2c_client *client)
 {
+        struct w83781d_data *data = i2c_get_clientdata(client);
         int err;
 
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
+
         if (i2c_is_isa_client(client))
                 release_region(client->addr, W83781D_EXTENT);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        if (i2c_get_clientdata(client)==NULL) {
-                /* subclients */
+        /* main client */
+        if (data)
+                kfree(data);
+
+        /* subclient */
+        else
                 kfree(client);
-        } else {
-                /* main client */
-                kfree(i2c_get_clientdata(client));
-        }
 
         return 0;
 }
@@ -1443,7 +1478,7 @@ w83781d_init_client(struct i2c_client *client)
                 w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
         }
 
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
 
         if ((type != w83781d) && (type != as99127f)) {
                 tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
@@ -1613,12 +1648,25 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
 static int __init
 sensors_w83781d_init(void)
 {
-        return i2c_add_driver(&w83781d_driver);
+        int res;
+
+        res = i2c_add_driver(&w83781d_driver);
+        if (res)
+                return res;
+
+        res = i2c_isa_add_driver(&w83781d_isa_driver);
+        if (res) {
+                i2c_del_driver(&w83781d_driver);
+                return res;
+        }
+
+        return 0;
 }
 
 static void __exit
 sensors_w83781d_exit(void)
 {
+        i2c_isa_del_driver(&w83781d_isa_driver);
         i2c_del_driver(&w83781d_driver);
 }
 
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
new file mode 100644
index 000000000000..ba0c28015f6a
--- /dev/null
+++ b/drivers/hwmon/w83792d.c
@@ -0,0 +1,1649 @@
+/*
+    w83792d.c - Part of lm_sensors, Linux kernel modules for hardware
+                monitoring
+    Copyright (C) 2004, 2005 Winbond Electronics Corp.
+                        Chunhao Huang <DZShen@Winbond.com.tw>,
+                        Rudolf Marek <r.marek@sh.cvut.cz>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    Note:
+    1. This driver is only for 2.6 kernel, 2.4 kernel need a different driver.
+    2. This driver is only for Winbond W83792D C version device, there
+       are also some motherboards with B version W83792D device. The
+       calculation method to in6-in7(measured value, limits) is a little
+       different between C and B version. C or B version can be identified
+       by CR[0x49h].
+*/
+
+/*
+    Supports following chips:
+
+    Chip        #vin    #fanin  #pwm    #temp   wchipid vendid  i2c     ISA
+    w83792d     9       7       7       3       0x7a    0x5ca3  yes     no
+*/
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(w83792d);
+I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+                        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
+
+static int init;
+module_param(init, bool, 0);
+MODULE_PARM_DESC(init, "Set to one to force chip initialization");
+
+/* The W83792D registers */
+static const u8 W83792D_REG_IN[9] = {
+        0x20,   /* Vcore A in DataSheet */
+        0x21,   /* Vcore B in DataSheet */
+        0x22,   /* VIN0 in DataSheet */
+        0x23,   /* VIN1 in DataSheet */
+        0x24,   /* VIN2 in DataSheet */
+        0x25,   /* VIN3 in DataSheet */
+        0x26,   /* 5VCC in DataSheet */
+        0xB0,   /* 5VSB in DataSheet */
+        0xB1    /* VBAT in DataSheet */
+};
+#define W83792D_REG_LOW_BITS1 0x3E  /* Low Bits I in DataSheet */
+#define W83792D_REG_LOW_BITS2 0x3F  /* Low Bits II in DataSheet */
+static const u8 W83792D_REG_IN_MAX[9] = {
+        0x2B,   /* Vcore A High Limit in DataSheet */
+        0x2D,   /* Vcore B High Limit in DataSheet */
+        0x2F,   /* VIN0 High Limit in DataSheet */
+        0x31,   /* VIN1 High Limit in DataSheet */
+        0x33,   /* VIN2 High Limit in DataSheet */
+        0x35,   /* VIN3 High Limit in DataSheet */
+        0x37,   /* 5VCC High Limit in DataSheet */
+        0xB4,   /* 5VSB High Limit in DataSheet */
+        0xB6    /* VBAT High Limit in DataSheet */
+};
+static const u8 W83792D_REG_IN_MIN[9] = {
+        0x2C,   /* Vcore A Low Limit in DataSheet */
+        0x2E,   /* Vcore B Low Limit in DataSheet */
+        0x30,   /* VIN0 Low Limit in DataSheet */
+        0x32,   /* VIN1 Low Limit in DataSheet */
+        0x34,   /* VIN2 Low Limit in DataSheet */
+        0x36,   /* VIN3 Low Limit in DataSheet */
+        0x38,   /* 5VCC Low Limit in DataSheet */
+        0xB5,   /* 5VSB Low Limit in DataSheet */
+        0xB7    /* VBAT Low Limit in DataSheet */
+};
+static const u8 W83792D_REG_FAN[7] = {
+        0x28,   /* FAN 1 Count in DataSheet */
+        0x29,   /* FAN 2 Count in DataSheet */
+        0x2A,   /* FAN 3 Count in DataSheet */
+        0xB8,   /* FAN 4 Count in DataSheet */
+        0xB9,   /* FAN 5 Count in DataSheet */
+        0xBA,   /* FAN 6 Count in DataSheet */
+        0xBE    /* FAN 7 Count in DataSheet */
+};
+static const u8 W83792D_REG_FAN_MIN[7] = {
+        0x3B,   /* FAN 1 Count Low Limit in DataSheet */
+        0x3C,   /* FAN 2 Count Low Limit in DataSheet */
+        0x3D,   /* FAN 3 Count Low Limit in DataSheet */
+        0xBB,   /* FAN 4 Count Low Limit in DataSheet */
+        0xBC,   /* FAN 5 Count Low Limit in DataSheet */
+        0xBD,   /* FAN 6 Count Low Limit in DataSheet */
+        0xBF    /* FAN 7 Count Low Limit in DataSheet */
+};
+#define W83792D_REG_FAN_CFG 0x84        /* FAN Configuration in DataSheet */
+static const u8 W83792D_REG_FAN_DIV[4] = {
+        0x47,   /* contains FAN2 and FAN1 Divisor */
+        0x5B,   /* contains FAN4 and FAN3 Divisor */
+        0x5C,   /* contains FAN6 and FAN5 Divisor */
+        0x9E    /* contains FAN7 Divisor. */
+};
+static const u8 W83792D_REG_PWM[7] = {
+        0x81,   /* FAN 1 Duty Cycle, be used to control */
+        0x83,   /* FAN 2 Duty Cycle, be used to control */
+        0x94,   /* FAN 3 Duty Cycle, be used to control */
+        0xA3,   /* FAN 4 Duty Cycle, be used to control */
+        0xA4,   /* FAN 5 Duty Cycle, be used to control */
+        0xA5,   /* FAN 6 Duty Cycle, be used to control */
+        0xA6    /* FAN 7 Duty Cycle, be used to control */
+};
+#define W83792D_REG_BANK                0x4E
+#define W83792D_REG_TEMP2_CONFIG        0xC2
+#define W83792D_REG_TEMP3_CONFIG        0xCA
+
+static const u8 W83792D_REG_TEMP1[3] = {
+        0x27,   /* TEMP 1 in DataSheet */
+        0x39,   /* TEMP 1 Over in DataSheet */
+        0x3A,   /* TEMP 1 Hyst in DataSheet */
+};
+
+static const u8 W83792D_REG_TEMP_ADD[2][6] = {
+        { 0xC0,         /* TEMP 2 in DataSheet */
+          0xC1,         /* TEMP 2(0.5 deg) in DataSheet */
+          0xC5,         /* TEMP 2 Over High part in DataSheet */
+          0xC6,         /* TEMP 2 Over Low part in DataSheet */
+          0xC3,         /* TEMP 2 Thyst High part in DataSheet */
+          0xC4 },       /* TEMP 2 Thyst Low part in DataSheet */
+        { 0xC8,         /* TEMP 3 in DataSheet */
+          0xC9,         /* TEMP 3(0.5 deg) in DataSheet */
+          0xCD,         /* TEMP 3 Over High part in DataSheet */
+          0xCE,         /* TEMP 3 Over Low part in DataSheet */
+          0xCB,         /* TEMP 3 Thyst High part in DataSheet */
+          0xCC }        /* TEMP 3 Thyst Low part in DataSheet */
+};
+
+static const u8 W83792D_REG_THERMAL[3] = {
+        0x85,   /* SmartFanI: Fan1 target value */
+        0x86,   /* SmartFanI: Fan2 target value */
+        0x96    /* SmartFanI: Fan3 target value */
+};
+
+static const u8 W83792D_REG_TOLERANCE[3] = {
+        0x87,   /* (bit3-0)SmartFan Fan1 tolerance */
+        0x87,   /* (bit7-4)SmartFan Fan2 tolerance */
+        0x97    /* (bit3-0)SmartFan Fan3 tolerance */
+};
+
+static const u8 W83792D_REG_POINTS[3][4] = {
+        { 0x85,         /* SmartFanII: Fan1 temp point 1 */
+          0xE3,         /* SmartFanII: Fan1 temp point 2 */
+          0xE4,         /* SmartFanII: Fan1 temp point 3 */
+          0xE5 },       /* SmartFanII: Fan1 temp point 4 */
+        { 0x86,         /* SmartFanII: Fan2 temp point 1 */
+          0xE6,         /* SmartFanII: Fan2 temp point 2 */
+          0xE7,         /* SmartFanII: Fan2 temp point 3 */
+          0xE8 },       /* SmartFanII: Fan2 temp point 4 */
+        { 0x96,         /* SmartFanII: Fan3 temp point 1 */
+          0xE9,         /* SmartFanII: Fan3 temp point 2 */
+          0xEA,         /* SmartFanII: Fan3 temp point 3 */
+          0xEB }        /* SmartFanII: Fan3 temp point 4 */
+};
+
+static const u8 W83792D_REG_LEVELS[3][4] = {
+        { 0x88,         /* (bit3-0) SmartFanII: Fan1 Non-Stop */
+          0x88,         /* (bit7-4) SmartFanII: Fan1 Level 1 */
+          0xE0,         /* (bit7-4) SmartFanII: Fan1 Level 2 */
+          0xE0 },       /* (bit3-0) SmartFanII: Fan1 Level 3 */
+        { 0x89,         /* (bit3-0) SmartFanII: Fan2 Non-Stop */
+          0x89,         /* (bit7-4) SmartFanII: Fan2 Level 1 */
+          0xE1,         /* (bit7-4) SmartFanII: Fan2 Level 2 */
+          0xE1 },       /* (bit3-0) SmartFanII: Fan2 Level 3 */
+        { 0x98,         /* (bit3-0) SmartFanII: Fan3 Non-Stop */
+          0x98,         /* (bit7-4) SmartFanII: Fan3 Level 1 */
+          0xE2,         /* (bit7-4) SmartFanII: Fan3 Level 2 */
+          0xE2 }        /* (bit3-0) SmartFanII: Fan3 Level 3 */
+};
+
+#define W83792D_REG_CONFIG              0x40
+#define W83792D_REG_VID_FANDIV          0x47
+#define W83792D_REG_CHIPID              0x49
+#define W83792D_REG_WCHIPID             0x58
+#define W83792D_REG_CHIPMAN             0x4F
+#define W83792D_REG_PIN                 0x4B
+#define W83792D_REG_I2C_SUBADDR         0x4A
+
+#define W83792D_REG_ALARM1 0xA9         /* realtime status register1 */
+#define W83792D_REG_ALARM2 0xAA         /* realtime status register2 */
+#define W83792D_REG_ALARM3 0xAB         /* realtime status register3 */
+#define W83792D_REG_CHASSIS 0x42        /* Bit 5: Case Open status bit */
+#define W83792D_REG_CHASSIS_CLR 0x44    /* Bit 7: Case Open CLR_CHS/Reset bit */
+
+/* control in0/in1 's limit modifiability */
+#define W83792D_REG_VID_IN_B            0x17
+
+#define W83792D_REG_VBAT                0x5D
+#define W83792D_REG_I2C_ADDR            0x48
+
+/* Conversions. Rounding and limit checking is only done on the TO_REG
+   variants. Note that you should be a bit careful with which arguments
+   these macros are called: arguments may be evaluated more than once.
+   Fixing this is just not worth it. */
+#define IN_FROM_REG(nr,val) (((nr)<=1)?(val*2): \
+                                ((((nr)==6)||((nr)==7))?(val*6):(val*4)))
+#define IN_TO_REG(nr,val) (((nr)<=1)?(val/2): \
+                                ((((nr)==6)||((nr)==7))?(val/6):(val/4)))
+
+static inline u8
+FAN_TO_REG(long rpm, int div)
+{
+        if (rpm == 0)
+                return 255;
+        rpm = SENSORS_LIMIT(rpm, 1, 1000000);
+        return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
+}
+
+#define FAN_FROM_REG(val,div)   ((val) == 0   ? -1 : \
+                                ((val) == 255 ? 0 : \
+                                                1350000 / ((val) * (div))))
+
+/* for temp1 */
+#define TEMP1_TO_REG(val)       (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
+                                        : (val)) / 1000, 0, 0xff))
+#define TEMP1_FROM_REG(val)     (((val) & 0x80 ? (val)-0x100 : (val)) * 1000)
+/* for temp2 and temp3, because they need addtional resolution */
+#define TEMP_ADD_FROM_REG(val1, val2) \
+        ((((val1) & 0x80 ? (val1)-0x100 \
+                : (val1)) * 1000) + ((val2 & 0x80) ? 500 : 0))
+#define TEMP_ADD_TO_REG_HIGH(val) \
+        (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
+                        : (val)) / 1000, 0, 0xff))
+#define TEMP_ADD_TO_REG_LOW(val)        ((val%1000) ? 0x80 : 0x00)
+
+#define PWM_FROM_REG(val)               (val)
+#define PWM_TO_REG(val)                 (SENSORS_LIMIT((val),0,255))
+#define DIV_FROM_REG(val)               (1 << (val))
+
+static inline u8
+DIV_TO_REG(long val)
+{
+        int i;
+        val = SENSORS_LIMIT(val, 1, 128) >> 1;
+        for (i = 0; i < 6; i++) {
+                if (val == 0)
+                        break;
+                val >>= 1;
+        }
+        return ((u8) i);
+}
+
+struct w83792d_data {
+        struct i2c_client client;
+        struct class_device *class_dev;
+        struct semaphore lock;
+        enum chips type;
+
+        struct semaphore update_lock;
+        char valid;             /* !=0 if following fields are valid */
+        unsigned long last_updated;     /* In jiffies */
+
+        /* array of 2 pointers to subclients */
+        struct i2c_client *lm75[2];
+
+        u8 in[9];               /* Register value */
+        u8 in_max[9];           /* Register value */
+        u8 in_min[9];           /* Register value */
+        u8 low_bits[2];         /* Additional resolution to voltage in0-6 */
+        u8 fan[7];              /* Register value */
+        u8 fan_min[7];          /* Register value */
+        u8 temp1[3];            /* current, over, thyst */
+        u8 temp_add[2][6];      /* Register value */
+        u8 fan_div[7];          /* Register encoding, shifted right */
+        u8 pwm[7];              /* We only consider the first 3 set of pwm,
+                                   although 792 chip has 7 set of pwm. */
+        u8 pwmenable[3];
+        u8 pwm_mode[7];         /* indicates PWM or DC mode: 1->PWM; 0->DC */
+        u32 alarms;             /* realtime status register encoding,combined */
+        u8 chassis;             /* Chassis status */
+        u8 chassis_clear;       /* CLR_CHS, clear chassis intrusion detection */
+        u8 thermal_cruise[3];   /* Smart FanI: Fan1,2,3 target value */
+        u8 tolerance[3];        /* Fan1,2,3 tolerance(Smart Fan I/II) */
+        u8 sf2_points[3][4];    /* Smart FanII: Fan1,2,3 temperature points */
+        u8 sf2_levels[3][4];    /* Smart FanII: Fan1,2,3 duty cycle levels */
+};
+
+static int w83792d_attach_adapter(struct i2c_adapter *adapter);
+static int w83792d_detect(struct i2c_adapter *adapter, int address, int kind);
+static int w83792d_detach_client(struct i2c_client *client);
+
+static int w83792d_read_value(struct i2c_client *client, u8 register);
+static int w83792d_write_value(struct i2c_client *client, u8 register,
+                                u8 value);
+static struct w83792d_data *w83792d_update_device(struct device *dev);
+
+#ifdef DEBUG
+static void w83792d_print_debug(struct w83792d_data *data, struct device *dev);
+#endif
+
+static void w83792d_init_client(struct i2c_client *client);
+
+static struct i2c_driver w83792d_driver = {
+        .owner = THIS_MODULE,
+        .name = "w83792d",
+        .flags = I2C_DF_NOTIFY,
+        .attach_adapter = w83792d_attach_adapter,
+        .detach_client = w83792d_detach_client,
+};
+
+static long in_count_from_reg(int nr, struct w83792d_data *data)
+{
+        u16 vol_count = data->in[nr];
+        u16 low_bits = 0;
+        vol_count = (vol_count << 2);
+        switch (nr)
+        {
+        case 0:  /* vin0 */
+                low_bits = (data->low_bits[0]) & 0x03;
+                break;
+        case 1:  /* vin1 */
+                low_bits = ((data->low_bits[0]) & 0x0c) >> 2;
+                break;
+        case 2:  /* vin2 */
+                low_bits = ((data->low_bits[0]) & 0x30) >> 4;
+                break;
+        case 3:  /* vin3 */
+                low_bits = ((data->low_bits[0]) & 0xc0) >> 6;
+                break;
+        case 4:  /* vin4 */
+                low_bits = (data->low_bits[1]) & 0x03;
+                break;
+        case 5:  /* vin5 */
+                low_bits = ((data->low_bits[1]) & 0x0c) >> 2;
+                break;
+        case 6:  /* vin6 */
+                low_bits = ((data->low_bits[1]) & 0x30) >> 4;
+        default:
+                break;
+        }
+        vol_count = vol_count | low_bits;
+        return vol_count;
+}
+
+/* following are the sysfs callback functions */
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf,"%ld\n", IN_FROM_REG(nr,(in_count_from_reg(nr, data))));
+}
+
+#define show_in_reg(reg) \
+static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
+                        char *buf) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index; \
+        struct w83792d_data *data = w83792d_update_device(dev); \
+        return sprintf(buf,"%ld\n", (long)(IN_FROM_REG(nr, (data->reg[nr])*4))); \
+}
+
+show_in_reg(in_min);
+show_in_reg(in_max);
+
+#define store_in_reg(REG, reg) \
+static ssize_t store_in_##reg (struct device *dev, \
+                                struct device_attribute *attr, \
+                                const char *buf, size_t count) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index; \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct w83792d_data *data = i2c_get_clientdata(client); \
+        u32 val; \
+         \
+        val = simple_strtoul(buf, NULL, 10); \
+        data->in_##reg[nr] = SENSORS_LIMIT(IN_TO_REG(nr, val)/4, 0, 255); \
+        w83792d_write_value(client, W83792D_REG_IN_##REG[nr], data->in_##reg[nr]); \
+         \
+        return count; \
+}
+store_in_reg(MIN, min);
+store_in_reg(MAX, max);
+
+#define sysfs_in_reg(offset) \
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in, \
+                                NULL, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
+                                show_in_min, store_in_min, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \
+                                show_in_max, store_in_max, offset);
+
+sysfs_in_reg(0);
+sysfs_in_reg(1);
+sysfs_in_reg(2);
+sysfs_in_reg(3);
+sysfs_in_reg(4);
+sysfs_in_reg(5);
+sysfs_in_reg(6);
+sysfs_in_reg(7);
+sysfs_in_reg(8);
+
+#define device_create_file_in(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_max.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_min.dev_attr); \
+} while (0)
+
+#define show_fan_reg(reg) \
+static ssize_t show_##reg (struct device *dev, struct device_attribute *attr, \
+                        char *buf) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index - 1; \
+        struct w83792d_data *data = w83792d_update_device(dev); \
+        return sprintf(buf,"%d\n", \
+                FAN_FROM_REG(data->reg[nr], DIV_FROM_REG(data->fan_div[nr]))); \
+}
+
+show_fan_reg(fan);
+show_fan_reg(fan_min);
+
+static ssize_t
+store_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
+        w83792d_write_value(client, W83792D_REG_FAN_MIN[nr],
+                                data->fan_min[nr]);
+
+        return count;
+}
+
+static ssize_t
+show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%u\n", DIV_FROM_REG(data->fan_div[nr - 1]));
+}
+
+/* Note: we save and restore the fan minimum here, because its value is
+   determined in part by the fan divisor.  This follows the principle of
+   least suprise; the user doesn't expect the fan minimum to change just
+   because the divisor changed. */
+static ssize_t
+store_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        unsigned long min;
+        /*u8 reg;*/
+        u8 fan_div_reg = 0;
+        u8 tmp_fan_div;
+
+        /* Save fan_min */
+        min = FAN_FROM_REG(data->fan_min[nr],
+                           DIV_FROM_REG(data->fan_div[nr]));
+
+        data->fan_div[nr] = DIV_TO_REG(simple_strtoul(buf, NULL, 10));
+
+        fan_div_reg = w83792d_read_value(client, W83792D_REG_FAN_DIV[nr >> 1]);
+        fan_div_reg &= (nr & 0x01) ? 0x8f : 0xf8;
+        tmp_fan_div = (nr & 0x01) ? (((data->fan_div[nr]) << 4) & 0x70)
+                                        : ((data->fan_div[nr]) & 0x07);
+        w83792d_write_value(client, W83792D_REG_FAN_DIV[nr >> 1],
+                                        fan_div_reg | tmp_fan_div);
+
+        /* Restore fan_min */
+        data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
+        w83792d_write_value(client, W83792D_REG_FAN_MIN[nr], data->fan_min[nr]);
+
+        return count;
+}
+
+#define sysfs_fan(offset) \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan, NULL, \
+                                offset); \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
+                                show_fan_div, store_fan_div, offset); \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                                show_fan_min, store_fan_min, offset);
+
+sysfs_fan(1);
+sysfs_fan(2);
+sysfs_fan(3);
+sysfs_fan(4);
+sysfs_fan(5);
+sysfs_fan(6);
+sysfs_fan(7);
+
+#define device_create_file_fan(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_div.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_min.dev_attr); \
+} while (0)
+
+
+/* read/write the temperature1, includes measured value and limits */
+
+static ssize_t show_temp1(struct device *dev, struct device_attribute *attr,
+                                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->temp1[nr]));
+}
+
+static ssize_t store_temp1(struct device *dev, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        s32 val;
+
+        val = simple_strtol(buf, NULL, 10);
+
+        data->temp1[nr] = TEMP1_TO_REG(val);
+        w83792d_write_value(client, W83792D_REG_TEMP1[nr],
+                data->temp1[nr]);
+
+        return count;
+}
+
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp1,
+                                store_temp1, 1);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp1,
+                                store_temp1, 2);
+
+#define device_create_file_temp1(client) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_max.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_max_hyst.dev_attr); \
+} while (0)
+
+
+/* read/write the temperature2-3, includes measured value and limits */
+
+static ssize_t show_temp23(struct device *dev, struct device_attribute *attr,
+                                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf,"%ld\n",
+                (long)TEMP_ADD_FROM_REG(data->temp_add[nr][index],
+                        data->temp_add[nr][index+1]));
+}
+
+static ssize_t store_temp23(struct device *dev, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        s32 val;
+
+        val = simple_strtol(buf, NULL, 10);
+
+        data->temp_add[nr][index] = TEMP_ADD_TO_REG_HIGH(val);
+        data->temp_add[nr][index+1] = TEMP_ADD_TO_REG_LOW(val);
+        w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index],
+                data->temp_add[nr][index]);
+        w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index+1],
+                data->temp_add[nr][index+1]);
+
+        return count;
+}
+
+#define sysfs_temp23(name,idx) \
+static SENSOR_DEVICE_ATTR_2(name##_input, S_IRUGO, show_temp23, NULL, \
+                                idx, 0); \
+static SENSOR_DEVICE_ATTR_2(name##_max, S_IRUGO | S_IWUSR, \
+                                show_temp23, store_temp23, idx, 2); \
+static SENSOR_DEVICE_ATTR_2(name##_max_hyst, S_IRUGO | S_IWUSR, \
+                                show_temp23, store_temp23, idx, 4);
+
+sysfs_temp23(temp2,0)
+sysfs_temp23(temp3,1)
+
+#define device_create_file_temp_add(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_temp##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp##offset##_max.dev_attr); \
+device_create_file(&client->dev, \
+&sensor_dev_attr_temp##offset##_max_hyst.dev_attr); \
+} while (0)
+
+
+/* get reatime status of all sensors items: voltage, temp, fan */
+static ssize_t
+show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->alarms);
+}
+
+static
+DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
+#define device_create_file_alarms(client) \
+device_create_file(&client->dev, &dev_attr_alarms);
+
+
+
+static ssize_t
+show_pwm(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long) PWM_FROM_REG(data->pwm[nr-1]));
+}
+
+static ssize_t
+show_pwmenable(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        long pwm_enable_tmp = 1;
+
+        switch (data->pwmenable[nr]) {
+        case 0:
+                pwm_enable_tmp = 1; /* manual mode */
+                break;
+        case 1:
+                pwm_enable_tmp = 3; /*thermal cruise/Smart Fan I */
+                break;
+        case 2:
+                pwm_enable_tmp = 2; /* Smart Fan II */
+                break;
+        }
+
+        return sprintf(buf, "%ld\n", pwm_enable_tmp);
+}
+
+static ssize_t
+store_pwm(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->pwm[nr] = PWM_TO_REG(val);
+        w83792d_write_value(client, W83792D_REG_PWM[nr], data->pwm[nr]);
+
+        return count;
+}
+
+static ssize_t
+store_pwmenable(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 fan_cfg_tmp, cfg1_tmp, cfg2_tmp, cfg3_tmp, cfg4_tmp;
+
+        val = simple_strtoul(buf, NULL, 10);
+        switch (val) {
+        case 1:
+                data->pwmenable[nr] = 0; /* manual mode */
+                break;
+        case 2:
+                data->pwmenable[nr] = 2; /* Smart Fan II */
+                break;
+        case 3:
+                data->pwmenable[nr] = 1; /* thermal cruise/Smart Fan I */
+                break;
+        default:
+                return -EINVAL;
+        }
+        cfg1_tmp = data->pwmenable[0];
+        cfg2_tmp = (data->pwmenable[1]) << 2;
+        cfg3_tmp = (data->pwmenable[2]) << 4;
+        cfg4_tmp = w83792d_read_value(client,W83792D_REG_FAN_CFG) & 0xc0;
+        fan_cfg_tmp = ((cfg4_tmp | cfg3_tmp) | cfg2_tmp) | cfg1_tmp;
+        w83792d_write_value(client, W83792D_REG_FAN_CFG, fan_cfg_tmp);
+
+        return count;
+}
+
+#define sysfs_pwm(offset) \
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
+                                show_pwm, store_pwm, offset); \
+static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \
+                                show_pwmenable, store_pwmenable, offset); \
+
+sysfs_pwm(1);
+sysfs_pwm(2);
+sysfs_pwm(3);
+
+
+#define device_create_file_pwm(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset.dev_attr); \
+} while (0)
+
+#define device_create_file_pwmenable(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset##_enable.dev_attr); \
+} while (0)
+
+
+static ssize_t
+show_pwm_mode(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm_mode[nr-1]);
+}
+
+static ssize_t
+store_pwm_mode(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 pwm_mode_mask = 0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->pwm_mode[nr] = SENSORS_LIMIT(val, 0, 1);
+        pwm_mode_mask = w83792d_read_value(client,
+                W83792D_REG_PWM[nr]) & 0x7f;
+        w83792d_write_value(client, W83792D_REG_PWM[nr],
+                ((data->pwm_mode[nr]) << 7) | pwm_mode_mask);
+
+        return count;
+}
+
+#define sysfs_pwm_mode(offset) \
+static SENSOR_DEVICE_ATTR(pwm##offset##_mode, S_IRUGO | S_IWUSR, \
+                                show_pwm_mode, store_pwm_mode, offset);
+
+sysfs_pwm_mode(1);
+sysfs_pwm_mode(2);
+sysfs_pwm_mode(3);
+
+#define device_create_file_pwm_mode(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset##_mode.dev_attr); \
+} while (0)
+
+
+static ssize_t
+show_regs_chassis(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->chassis);
+}
+
+static DEVICE_ATTR(chassis, S_IRUGO, show_regs_chassis, NULL);
+
+#define device_create_file_chassis(client) \
+do { \
+device_create_file(&client->dev, &dev_attr_chassis); \
+} while (0)
+
+
+static ssize_t
+show_chassis_clear(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->chassis_clear);
+}
+
+static ssize_t
+store_chassis_clear(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 temp1 = 0, temp2 = 0;
+
+        val = simple_strtoul(buf, NULL, 10);
+
+        data->chassis_clear = SENSORS_LIMIT(val, 0 ,1);
+        temp1 = ((data->chassis_clear) << 7) & 0x80;
+        temp2 = w83792d_read_value(client,
+                W83792D_REG_CHASSIS_CLR) & 0x7f;
+        w83792d_write_value(client, W83792D_REG_CHASSIS_CLR, temp1 | temp2);
+
+        return count;
+}
+
+static DEVICE_ATTR(chassis_clear, S_IRUGO | S_IWUSR,
+                show_chassis_clear, store_chassis_clear);
+
+#define device_create_file_chassis_clear(client) \
+do { \
+device_create_file(&client->dev, &dev_attr_chassis_clear); \
+} while (0)
+
+
+
+/* For Smart Fan I / Thermal Cruise */
+static ssize_t
+show_thermal_cruise(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->thermal_cruise[nr-1]);
+}
+
+static ssize_t
+store_thermal_cruise(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 target_tmp=0, target_mask=0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        target_tmp = val;
+        target_tmp = target_tmp & 0x7f;
+        target_mask = w83792d_read_value(client, W83792D_REG_THERMAL[nr]) & 0x80;
+        data->thermal_cruise[nr] = SENSORS_LIMIT(target_tmp, 0, 255);
+        w83792d_write_value(client, W83792D_REG_THERMAL[nr],
+                (data->thermal_cruise[nr]) | target_mask);
+
+        return count;
+}
+
+#define sysfs_thermal_cruise(offset) \
+static SENSOR_DEVICE_ATTR(thermal_cruise##offset, S_IRUGO | S_IWUSR, \
+                        show_thermal_cruise, store_thermal_cruise, offset);
+
+sysfs_thermal_cruise(1);
+sysfs_thermal_cruise(2);
+sysfs_thermal_cruise(3);
+
+#define device_create_file_thermal_cruise(client, offset) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_thermal_cruise##offset.dev_attr); \
+} while (0)
+
+
+/* For Smart Fan I/Thermal Cruise and Smart Fan II */
+static ssize_t
+show_tolerance(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->tolerance[nr-1]);
+}
+
+static ssize_t
+store_tolerance(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 tol_tmp, tol_mask;
+
+        val = simple_strtoul(buf, NULL, 10);
+        tol_mask = w83792d_read_value(client,
+                W83792D_REG_TOLERANCE[nr]) & ((nr == 1) ? 0x0f : 0xf0);
+        tol_tmp = SENSORS_LIMIT(val, 0, 15);
+        tol_tmp &= 0x0f;
+        data->tolerance[nr] = tol_tmp;
+        if (nr == 1) {
+                tol_tmp <<= 4;
+        }
+        w83792d_write_value(client, W83792D_REG_TOLERANCE[nr],
+                tol_mask | tol_tmp);
+
+        return count;
+}
+
+#define sysfs_tolerance(offset) \
+static SENSOR_DEVICE_ATTR(tolerance##offset, S_IRUGO | S_IWUSR, \
+                                show_tolerance, store_tolerance, offset);
+
+sysfs_tolerance(1);
+sysfs_tolerance(2);
+sysfs_tolerance(3);
+
+#define device_create_file_tolerance(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_tolerance##offset.dev_attr); \
+} while (0)
+
+
+/* For Smart Fan II */
+static ssize_t
+show_sf2_point(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->sf2_points[index-1][nr-1]);
+}
+
+static ssize_t
+store_sf2_point(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr - 1;
+        int index = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 mask_tmp = 0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->sf2_points[index][nr] = SENSORS_LIMIT(val, 0, 127);
+        mask_tmp = w83792d_read_value(client,
+                                        W83792D_REG_POINTS[index][nr]) & 0x80;
+        w83792d_write_value(client, W83792D_REG_POINTS[index][nr],
+                mask_tmp|data->sf2_points[index][nr]);
+
+        return count;
+}
+
+#define sysfs_sf2_point(offset, index) \
+static SENSOR_DEVICE_ATTR_2(sf2_point##offset##_fan##index, S_IRUGO | S_IWUSR, \
+                                show_sf2_point, store_sf2_point, offset, index);
+
+sysfs_sf2_point(1, 1);  /* Fan1 */
+sysfs_sf2_point(2, 1);  /* Fan1 */
+sysfs_sf2_point(3, 1);  /* Fan1 */
+sysfs_sf2_point(4, 1);  /* Fan1 */
+sysfs_sf2_point(1, 2);  /* Fan2 */
+sysfs_sf2_point(2, 2);  /* Fan2 */
+sysfs_sf2_point(3, 2);  /* Fan2 */
+sysfs_sf2_point(4, 2);  /* Fan2 */
+sysfs_sf2_point(1, 3);  /* Fan3 */
+sysfs_sf2_point(2, 3);  /* Fan3 */
+sysfs_sf2_point(3, 3);  /* Fan3 */
+sysfs_sf2_point(4, 3);  /* Fan3 */
+
+#define device_create_file_sf2_point(client, offset, index) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_sf2_point##offset##_fan##index.dev_attr); \
+} while (0)
+
+
+static ssize_t
+show_sf2_level(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n",
+                        (((data->sf2_levels[index-1][nr]) * 100) / 15));
+}
+
+static ssize_t
+store_sf2_level(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 mask_tmp=0, level_tmp=0;
+
+        val = simple_strtoul(buf, NULL, 10);
+        data->sf2_levels[index][nr] = SENSORS_LIMIT((val * 15) / 100, 0, 15);
+        mask_tmp = w83792d_read_value(client, W83792D_REG_LEVELS[index][nr])
+                & ((nr==3) ? 0xf0 : 0x0f);
+        if (nr==3) {
+                level_tmp = data->sf2_levels[index][nr];
+        } else {
+                level_tmp = data->sf2_levels[index][nr] << 4;
+        }
+        w83792d_write_value(client, W83792D_REG_LEVELS[index][nr], level_tmp | mask_tmp);
+
+        return count;
+}
+
+#define sysfs_sf2_level(offset, index) \
+static SENSOR_DEVICE_ATTR_2(sf2_level##offset##_fan##index, S_IRUGO | S_IWUSR, \
+                                show_sf2_level, store_sf2_level, offset, index);
+
+sysfs_sf2_level(1, 1);  /* Fan1 */
+sysfs_sf2_level(2, 1);  /* Fan1 */
+sysfs_sf2_level(3, 1);  /* Fan1 */
+sysfs_sf2_level(1, 2);  /* Fan2 */
+sysfs_sf2_level(2, 2);  /* Fan2 */
+sysfs_sf2_level(3, 2);  /* Fan2 */
+sysfs_sf2_level(1, 3);  /* Fan3 */
+sysfs_sf2_level(2, 3);  /* Fan3 */
+sysfs_sf2_level(3, 3);  /* Fan3 */
+
+#define device_create_file_sf2_level(client, offset, index) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_sf2_level##offset##_fan##index.dev_attr); \
+} while (0)
+
+
+/* This function is called when:
+     * w83792d_driver is inserted (when this module is loaded), for each
+       available adapter
+     * when a new adapter is inserted (and w83792d_driver is still present) */
+static int
+w83792d_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, w83792d_detect);
+}
+
+
+static int
+w83792d_create_subclient(struct i2c_adapter *adapter,
+                                struct i2c_client *new_client, int addr,
+                                struct i2c_client **sub_cli)
+{
+        int err;
+        struct i2c_client *sub_client;
+
+        (*sub_cli) = sub_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!(sub_client)) {
+                return -ENOMEM;
+        }
+        memset(sub_client, 0x00, sizeof(struct i2c_client));
+        sub_client->addr = 0x48 + addr;
+        i2c_set_clientdata(sub_client, NULL);
+        sub_client->adapter = adapter;
+        sub_client->driver = &w83792d_driver;
+        sub_client->flags = 0;
+        strlcpy(sub_client->name, "w83792d subclient", I2C_NAME_SIZE);
+        if ((err = i2c_attach_client(sub_client))) {
+                dev_err(&new_client->dev, "subclient registration "
+                        "at address 0x%x failed\n", sub_client->addr);
+                kfree(sub_client);
+                return err;
+        }
+        return 0;
+}
+
+
+static int
+w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
+                struct i2c_client *new_client)
+{
+        int i, id, err;
+        u8 val;
+        struct w83792d_data *data = i2c_get_clientdata(new_client);
+
+        id = i2c_adapter_id(adapter);
+        if (force_subclients[0] == id && force_subclients[1] == address) {
+                for (i = 2; i <= 3; i++) {
+                        if (force_subclients[i] < 0x48 ||
+                            force_subclients[i] > 0x4f) {
+                                dev_err(&new_client->dev, "invalid subclient "
+                                        "address %d; must be 0x48-0x4f\n",
+                                        force_subclients[i]);
+                                err = -ENODEV;
+                                goto ERROR_SC_0;
+                        }
+                }
+                w83792d_write_value(new_client, W83792D_REG_I2C_SUBADDR,
+                                        (force_subclients[2] & 0x07) |
+                                        ((force_subclients[3] & 0x07) << 4));
+        }
+
+        val = w83792d_read_value(new_client, W83792D_REG_I2C_SUBADDR);
+        if (!(val & 0x08)) {
+                err = w83792d_create_subclient(adapter, new_client, val & 0x7,
+                                                &data->lm75[0]);
+                if (err < 0)
+                        goto ERROR_SC_0;
+        }
+        if (!(val & 0x80)) {
+                if ((data->lm75[0] != NULL) &&
+                        ((val & 0x7) == ((val >> 4) & 0x7))) {
+                        dev_err(&new_client->dev, "duplicate addresses 0x%x, "
+                                "use force_subclient\n", data->lm75[0]->addr);
+                        err = -ENODEV;
+                        goto ERROR_SC_1;
+                }
+                err = w83792d_create_subclient(adapter, new_client,
+                                                (val >> 4) & 0x7, &data->lm75[1]);
+                if (err < 0)
+                        goto ERROR_SC_1;
+        }
+
+        return 0;
+
+/* Undo inits in case of errors */
+
+ERROR_SC_1:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+ERROR_SC_0:
+        return err;
+}
+
+
+static int
+w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        int i = 0, val1 = 0, val2;
+        struct i2c_client *new_client;
+        struct w83792d_data *data;
+        int err = 0;
+        const char *client_name = "";
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                goto ERROR0;
+        }
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet.
+           But it allows us to access w83792d_{read,write}_value. */
+
+        if (!(data = kmalloc(sizeof(struct w83792d_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto ERROR0;
+        }
+        memset(data, 0, sizeof(struct w83792d_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        init_MUTEX(&data->lock);
+        new_client->adapter = adapter;
+        new_client->driver = &w83792d_driver;
+        new_client->flags = 0;
+
+        /* Now, we do the remaining detection. */
+
+        /* The w83792d may be stuck in some other bank than bank 0. This may
+           make reading other information impossible. Specify a force=... or
+           force_*=... parameter, and the Winbond will be reset to the right
+           bank. */
+        if (kind < 0) {
+                if (w83792d_read_value(new_client, W83792D_REG_CONFIG) & 0x80) {
+                        dev_warn(&new_client->dev, "Detection failed at step "
+                                "3\n");
+                        goto ERROR1;
+                }
+                val1 = w83792d_read_value(new_client, W83792D_REG_BANK);
+                val2 = w83792d_read_value(new_client, W83792D_REG_CHIPMAN);
+                /* Check for Winbond ID if in bank 0 */
+                if (!(val1 & 0x07)) {  /* is Bank0 */
+                        if (((!(val1 & 0x80)) && (val2 != 0xa3)) ||
+                             ((val1 & 0x80) && (val2 != 0x5c))) {
+                                goto ERROR1;
+                        }
+                }
+                /* If Winbond chip, address of chip and W83792D_REG_I2C_ADDR
+                   should match */
+                if (w83792d_read_value(new_client,
+                                        W83792D_REG_I2C_ADDR) != address) {
+                        dev_warn(&new_client->dev, "Detection failed "
+                                "at step 5\n");
+                        goto ERROR1;
+                }
+        }
+
+        /* We have either had a force parameter, or we have already detected the
+           Winbond. Put it now into bank 0 and Vendor ID High Byte */
+        w83792d_write_value(new_client,
+                            W83792D_REG_BANK,
+                            (w83792d_read_value(new_client,
+                                W83792D_REG_BANK) & 0x78) | 0x80);
+
+        /* Determine the chip type. */
+        if (kind <= 0) {
+                /* get vendor ID */
+                val2 = w83792d_read_value(new_client, W83792D_REG_CHIPMAN);
+                if (val2 != 0x5c) {  /* the vendor is NOT Winbond */
+                        goto ERROR1;
+                }
+                val1 = w83792d_read_value(new_client, W83792D_REG_WCHIPID);
+                if (val1 == 0x7a && address >= 0x2c) {
+                        kind = w83792d;
+                } else {
+                        if (kind == 0)
+                                        dev_warn(&new_client->dev,
+                                        "w83792d: Ignoring 'force' parameter for"
+                                        " unknown chip at adapter %d, address"
+                                        " 0x%02x\n", i2c_adapter_id(adapter),
+                                        address);
+                        goto ERROR1;
+                }
+        }
+
+        if (kind == w83792d) {
+                client_name = "w83792d";
+        } else {
+                dev_err(&new_client->dev, "w83792d: Internal error: unknown"
+                                          " kind (%d)?!?", kind);
+                goto ERROR1;
+        }
+
+        /* Fill in the remaining client fields and put into the global list */
+        strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
+        data->type = kind;
+
+        data->valid = 0;
+        init_MUTEX(&data->update_lock);
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(new_client)))
+                goto ERROR1;
+
+        if ((err = w83792d_detect_subclients(adapter, address,
+                        kind, new_client)))
+                goto ERROR2;
+
+        /* Initialize the chip */
+        w83792d_init_client(new_client);
+
+        /* A few vars need to be filled upon startup */
+        for (i = 1; i <= 7; i++) {
+                data->fan_min[i - 1] = w83792d_read_value(new_client,
+                                        W83792D_REG_FAN_MIN[i]);
+        }
+
+        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+        device_create_file_in(new_client, 0);
+        device_create_file_in(new_client, 1);
+        device_create_file_in(new_client, 2);
+        device_create_file_in(new_client, 3);
+        device_create_file_in(new_client, 4);
+        device_create_file_in(new_client, 5);
+        device_create_file_in(new_client, 6);
+        device_create_file_in(new_client, 7);
+        device_create_file_in(new_client, 8);
+
+        device_create_file_fan(new_client, 1);
+        device_create_file_fan(new_client, 2);
+        device_create_file_fan(new_client, 3);
+        device_create_file_fan(new_client, 4);
+        device_create_file_fan(new_client, 5);
+        device_create_file_fan(new_client, 6);
+        device_create_file_fan(new_client, 7);
+
+        device_create_file_temp1(new_client);           /* Temp1 */
+        device_create_file_temp_add(new_client, 2);     /* Temp2 */
+        device_create_file_temp_add(new_client, 3);     /* Temp3 */
+
+        device_create_file_alarms(new_client);
+
+        device_create_file_pwm(new_client, 1);
+        device_create_file_pwm(new_client, 2);
+        device_create_file_pwm(new_client, 3);
+
+        device_create_file_pwmenable(new_client, 1);
+        device_create_file_pwmenable(new_client, 2);
+        device_create_file_pwmenable(new_client, 3);
+
+        device_create_file_pwm_mode(new_client, 1);
+        device_create_file_pwm_mode(new_client, 2);
+        device_create_file_pwm_mode(new_client, 3);
+
+        device_create_file_chassis(new_client);
+        device_create_file_chassis_clear(new_client);
+
+        device_create_file_thermal_cruise(new_client, 1);
+        device_create_file_thermal_cruise(new_client, 2);
+        device_create_file_thermal_cruise(new_client, 3);
+
+        device_create_file_tolerance(new_client, 1);
+        device_create_file_tolerance(new_client, 2);
+        device_create_file_tolerance(new_client, 3);
+
+        device_create_file_sf2_point(new_client, 1, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 2, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 3, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 4, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 1, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 2, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 3, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 4, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 1, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 2, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 3, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 4, 3); /* Fan3 */
+
+        device_create_file_sf2_level(new_client, 1, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 2, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 3, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 1, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 2, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 3, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 1, 3); /* Fan3 */
+        device_create_file_sf2_level(new_client, 2, 3); /* Fan3 */
+        device_create_file_sf2_level(new_client, 3, 3); /* Fan3 */
+
+        return 0;
+
+ERROR3:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+        if (data->lm75[1] != NULL) {
+                i2c_detach_client(data->lm75[1]);
+                kfree(data->lm75[1]);
+        }
+ERROR2:
+        i2c_detach_client(new_client);
+ERROR1:
+        kfree(data);
+ERROR0:
+        return err;
+}
+
+static int
+w83792d_detach_client(struct i2c_client *client)
+{
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        int err;
+
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        /* main client */
+        if (data)
+                kfree(data);
+        /* subclient */
+        else
+                kfree(client);
+
+        return 0;
+}
+
+/* The SMBus locks itself, usually, but nothing may access the Winbond between
+   bank switches. ISA access must always be locked explicitly!
+   We ignore the W83792D BUSY flag at this moment - it could lead to deadlocks,
+   would slow down the W83792D access and should not be necessary.
+   There are some ugly typecasts here, but the good news is - they should
+   nowhere else be necessary! */
+static int
+w83792d_read_value(struct i2c_client *client, u8 reg)
+{
+        int res=0;
+        res = i2c_smbus_read_byte_data(client, reg);
+
+        return res;
+}
+
+static int
+w83792d_write_value(struct i2c_client *client, u8 reg, u8 value)
+{
+        i2c_smbus_write_byte_data(client, reg,  value);
+        return 0;
+}
+
+/* Called when we have found a new W83792D. It should set limits, etc. */
+static void
+w83792d_init_client(struct i2c_client *client)
+{
+        u8 temp2_cfg, temp3_cfg, vid_in_b;
+
+        if (init) {
+                w83792d_write_value(client, W83792D_REG_CONFIG, 0x80);
+        }
+        /* Clear the bit6 of W83792D_REG_VID_IN_B(set it into 0):
+           W83792D_REG_VID_IN_B bit6 = 0: the high/low limit of
+             vin0/vin1 can be modified by user;
+           W83792D_REG_VID_IN_B bit6 = 1: the high/low limit of
+             vin0/vin1 auto-updated, can NOT be modified by user. */
+        vid_in_b = w83792d_read_value(client, W83792D_REG_VID_IN_B);
+        w83792d_write_value(client, W83792D_REG_VID_IN_B,
+                            vid_in_b & 0xbf);
+
+        temp2_cfg = w83792d_read_value(client, W83792D_REG_TEMP2_CONFIG);
+        temp3_cfg = w83792d_read_value(client, W83792D_REG_TEMP3_CONFIG);
+        w83792d_write_value(client, W83792D_REG_TEMP2_CONFIG,
+                                temp2_cfg & 0xe6);
+        w83792d_write_value(client, W83792D_REG_TEMP3_CONFIG,
+                                temp3_cfg & 0xe6);
+
+        /* Start monitoring */
+        w83792d_write_value(client, W83792D_REG_CONFIG,
+                            (w83792d_read_value(client,
+                                                W83792D_REG_CONFIG) & 0xf7)
+                            | 0x01);
+}
+
+static struct w83792d_data *w83792d_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        int i, j;
+        u8 reg_array_tmp[4], pwm_array_tmp[7], reg_tmp;
+
+        down(&data->update_lock);
+
+        if (time_after
+            (jiffies - data->last_updated, (unsigned long) (HZ * 3))
+            || time_before(jiffies, data->last_updated) || !data->valid) {
+                dev_dbg(dev, "Starting device update\n");
+
+                /* Update the voltages measured value and limits */
+                for (i = 0; i < 9; i++) {
+                        data->in[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN[i]);
+                        data->in_max[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN_MAX[i]);
+                        data->in_min[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN_MIN[i]);
+                }
+                data->low_bits[0] = w83792d_read_value(client,
+                                                W83792D_REG_LOW_BITS1);
+                data->low_bits[1] = w83792d_read_value(client,
+                                                W83792D_REG_LOW_BITS2);
+                for (i = 0; i < 7; i++) {
+                        /* Update the Fan measured value and limits */
+                        data->fan[i] = w83792d_read_value(client,
+                                                W83792D_REG_FAN[i]);
+                        data->fan_min[i] = w83792d_read_value(client,
+                                                W83792D_REG_FAN_MIN[i]);
+                        /* Update the PWM/DC Value and PWM/DC flag */
+                        pwm_array_tmp[i] = w83792d_read_value(client,
+                                                W83792D_REG_PWM[i]);
+                        data->pwm[i] = pwm_array_tmp[i] & 0x0f;
+                        data->pwm_mode[i] = (pwm_array_tmp[i] >> 7) & 0x01;
+                }
+
+                reg_tmp = w83792d_read_value(client, W83792D_REG_FAN_CFG);
+                data->pwmenable[0] = reg_tmp & 0x03;
+                data->pwmenable[1] = (reg_tmp>>2) & 0x03;
+                data->pwmenable[2] = (reg_tmp>>4) & 0x03;
+
+                for (i = 0; i < 3; i++) {
+                        data->temp1[i] = w83792d_read_value(client,
+                                                        W83792D_REG_TEMP1[i]);
+                }
+                for (i = 0; i < 2; i++) {
+                        for (j = 0; j < 6; j++) {
+                                data->temp_add[i][j] = w83792d_read_value(
+                                        client,W83792D_REG_TEMP_ADD[i][j]);
+                        }
+                }
+
+                /* Update the Fan Divisor */
+                for (i = 0; i < 4; i++) {
+                        reg_array_tmp[i] = w83792d_read_value(client,
+                                                        W83792D_REG_FAN_DIV[i]);
+                }
+                data->fan_div[0] = reg_array_tmp[0] & 0x07;
+                data->fan_div[1] = (reg_array_tmp[0] >> 4) & 0x07;
+                data->fan_div[2] = reg_array_tmp[1] & 0x07;
+                data->fan_div[3] = (reg_array_tmp[1] >> 4) & 0x07;
+                data->fan_div[4] = reg_array_tmp[2] & 0x07;
+                data->fan_div[5] = (reg_array_tmp[2] >> 4) & 0x07;
+                data->fan_div[6] = reg_array_tmp[3] & 0x07;
+
+                /* Update the realtime status */
+                data->alarms = w83792d_read_value(client, W83792D_REG_ALARM1) +
+                        (w83792d_read_value(client, W83792D_REG_ALARM2) << 8) +
+                        (w83792d_read_value(client, W83792D_REG_ALARM3) << 16);
+
+                /* Update CaseOpen status and it's CLR_CHS. */
+                data->chassis = (w83792d_read_value(client,
+                        W83792D_REG_CHASSIS) >> 5) & 0x01;
+                data->chassis_clear = (w83792d_read_value(client,
+                        W83792D_REG_CHASSIS_CLR) >> 7) & 0x01;
+
+                /* Update Thermal Cruise/Smart Fan I target value */
+                for (i = 0; i < 3; i++) {
+                        data->thermal_cruise[i] =
+                                w83792d_read_value(client,
+                                W83792D_REG_THERMAL[i]) & 0x7f;
+                }
+
+                /* Update Smart Fan I/II tolerance */
+                reg_tmp = w83792d_read_value(client, W83792D_REG_TOLERANCE[0]);
+                data->tolerance[0] = reg_tmp & 0x0f;
+                data->tolerance[1] = (reg_tmp >> 4) & 0x0f;
+                data->tolerance[2] = w83792d_read_value(client,
+                                        W83792D_REG_TOLERANCE[2]) & 0x0f;
+
+                /* Update Smart Fan II temperature points */
+                for (i = 0; i < 3; i++) {
+                        for (j = 0; j < 4; j++) {
+                                data->sf2_points[i][j] = w83792d_read_value(
+                                        client,W83792D_REG_POINTS[i][j]) & 0x7f;
+                        }
+                }
+
+                /* Update Smart Fan II duty cycle levels */
+                for (i = 0; i < 3; i++) {
+                        reg_tmp = w83792d_read_value(client,
+                                                W83792D_REG_LEVELS[i][0]);
+                        data->sf2_levels[i][0] = reg_tmp & 0x0f;
+                        data->sf2_levels[i][1] = (reg_tmp >> 4) & 0x0f;
+                        reg_tmp = w83792d_read_value(client,
+                                                W83792D_REG_LEVELS[i][2]);
+                        data->sf2_levels[i][2] = (reg_tmp >> 4) & 0x0f;
+                        data->sf2_levels[i][3] = reg_tmp & 0x0f;
+                }
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        up(&data->update_lock);
+
+#ifdef DEBUG
+        w83792d_print_debug(data, dev);
+#endif
+
+        return data;
+}
+
+#ifdef DEBUG
+static void w83792d_print_debug(struct w83792d_data *data, struct device *dev)
+{
+        int i=0, j=0;
+        dev_dbg(dev, "==========The following is the debug message...========\n");
+        dev_dbg(dev, "9 set of Voltages: =====>\n");
+        for (i=0; i<9; i++) {
+                dev_dbg(dev, "vin[%d] is: 0x%x\n", i, data->in[i]);
+                dev_dbg(dev, "vin[%d] max is: 0x%x\n", i, data->in_max[i]);
+                dev_dbg(dev, "vin[%d] min is: 0x%x\n", i, data->in_min[i]);
+        }
+        dev_dbg(dev, "Low Bit1 is: 0x%x\n", data->low_bits[0]);
+        dev_dbg(dev, "Low Bit2 is: 0x%x\n", data->low_bits[1]);
+        dev_dbg(dev, "7 set of Fan Counts and Duty Cycles: =====>\n");
+        for (i=0; i<7; i++) {
+                dev_dbg(dev, "fan[%d] is: 0x%x\n", i, data->fan[i]);
+                dev_dbg(dev, "fan[%d] min is: 0x%x\n", i, data->fan_min[i]);
+                dev_dbg(dev, "pwm[%d]     is: 0x%x\n", i, data->pwm[i]);
+                dev_dbg(dev, "pwm_mode[%d] is: 0x%x\n", i, data->pwm_mode[i]);
+        }
+        dev_dbg(dev, "3 set of Temperatures: =====>\n");
+        for (i=0; i<3; i++) {
+                dev_dbg(dev, "temp1[%d] is: 0x%x\n", i, data->temp1[i]);
+        }
+
+        for (i=0; i<2; i++) {
+                for (j=0; j<6; j++) {
+                        dev_dbg(dev, "temp_add[%d][%d] is: 0x%x\n", i, j,
+                                                        data->temp_add[i][j]);
+                }
+        }
+
+        for (i=0; i<7; i++) {
+                dev_dbg(dev, "fan_div[%d] is: 0x%x\n", i, data->fan_div[i]);
+        }
+        dev_dbg(dev, "==========End of the debug message...==================\n");
+        dev_dbg(dev, "\n");
+}
+#endif
+
+static int __init
+sensors_w83792d_init(void)
+{
+        return i2c_add_driver(&w83792d_driver);
+}
+
+static void __exit
+sensors_w83792d_exit(void)
+{
+        i2c_del_driver(&w83792d_driver);
+}
+
+MODULE_AUTHOR("Chunhao Huang @ Winbond <DZShen@Winbond.com.tw>");
+MODULE_DESCRIPTION("W83792AD/D driver for linux-2.6");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_w83792d_init);
+module_exit(sensors_w83792d_exit);
+
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 4469d52aba4c..133e34ab1d0a 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -36,7 +36,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* How many retries on register read error */
 #define MAX_RETRIES     5
@@ -47,13 +48,12 @@
  */
 
 static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /*
  * Insmod parameters
  */
 
-SENSORS_INSMOD_1(w83l785ts);
+I2C_CLIENT_INSMOD_1(w83l785ts);
 
 /*
  * The W83L785TS-S registers
@@ -105,6 +105,7 @@ static struct i2c_driver w83l785ts_driver = {
 
 struct w83l785ts_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid; /* zero until following fields are valid */
         unsigned long last_updated; /* in jiffies */
@@ -140,7 +141,7 @@ static int w83l785ts_attach_adapter(struct i2c_adapter *adapter)
 {
         if (!(adapter->class & I2C_CLASS_HWMON))
                 return 0;
-        return i2c_detect(adapter, &addr_data, w83l785ts_detect);
+        return i2c_probe(adapter, &addr_data, w83l785ts_detect);
 }
 
 /*
@@ -239,11 +240,19 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
          */
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_temp1_input);
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
 
         return 0;
 
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
         kfree(data);
 exit:
@@ -252,15 +261,15 @@ exit:
 
 static int w83l785ts_detach_client(struct i2c_client *client)
 {
+        struct w83l785ts_data *data = i2c_get_clientdata(client);
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        hwmon_device_unregister(data->class_dev);
+
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }
 
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index cd170395a8c7..71c5a854ac5d 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -4,12 +4,8 @@
 
 obj-$(CONFIG_I2C)               += i2c-core.o
 obj-$(CONFIG_I2C_CHARDEV)       += i2c-dev.o
-obj-$(CONFIG_I2C_SENSOR)        += i2c-sensor.o
 obj-y                           += busses/ chips/ algos/
 
-i2c-sensor-objs := i2c-sensor-detect.o i2c-sensor-vid.o
-
-
 ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index fb5b732238ed..df05df1a0ef6 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -519,8 +519,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm i2c_bit_algo = {
-        .name           = "Bit-shift algorithm",
-        .id             = I2C_ALGO_BIT,
         .master_xfer    = bit_xfer,
         .functionality  = bit_func,
 };
@@ -541,8 +539,6 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= i2c_bit_algo.id;
         adap->algo = &i2c_bit_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index e6cae39f47aa..2db7bfc85225 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -713,8 +713,6 @@ static u32 iic_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm iic_algo = {
-        .name           = "ITE IIC algorithm",
-        .id             = I2C_ALGO_IIC,
         .master_xfer    = iic_xfer,
         .algo_control   = algo_control, /* ioctl */
         .functionality  = iic_func,
@@ -738,8 +736,6 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)
                     adap->name));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= iic_algo.id;
         adap->algo = &iic_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index cc3a952401f2..beb10edfe9c1 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -187,12 +187,14 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
         int numbytes = 0;
         int state;
         int ret;
+        int timeout = 100;
 
-        state = pca_status(adap);
-        if ( state != 0xF8 ) {
-                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state );
-                /* FIXME: what to do. Force stop ? */
-                return -EREMOTEIO;
+        while ((state = pca_status(adap)) != 0xf8 && timeout--) {
+                msleep(10);
+        }
+        if (state != 0xf8) {
+                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state);
+                return -EIO;
         }
 
         DEB1("{{{ XFER %d messages\n", num);
@@ -354,8 +356,6 @@ static int pca_init(struct i2c_algo_pca_data *adap)
 }
 
 static struct i2c_algorithm pca_algo = {
-        .name           = "PCA9564 algorithm",
-        .id             = I2C_ALGO_PCA,
         .master_xfer    = pca_xfer,
         .functionality  = pca_func,
 };
@@ -369,8 +369,6 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
         int rval;
 
         /* register new adapter to i2c module... */
-
-        adap->id |= pca_algo.id;
         adap->algo = &pca_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 8d087dac32af..6e498df1f717 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -459,8 +459,6 @@ static u32 pcf_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm pcf_algo = {
-        .name           = "PCF8584 algorithm",
-        .id             = I2C_ALGO_PCF,
         .master_xfer    = pcf_xfer,
         .functionality  = pcf_func,
 };
@@ -476,8 +474,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= pcf_algo.id;
         adap->algo = &pcf_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index 422721b241e5..932c4fa86c73 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -149,7 +149,7 @@ static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
                         err = i2c_write(adap, p->buf, p->len);
         }
 
-        return err;
+        return (err < 0) ? err : i;
 }
 
 static u32 sgi_func(struct i2c_adapter *adap)
@@ -158,8 +158,6 @@ static u32 sgi_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm sgi_algo = {
-        .name           = "SGI algorithm",
-        .id             = I2C_ALGO_SGI,
         .master_xfer    = sgi_xfer,
         .functionality  = sgi_func,
 };
@@ -169,7 +167,6 @@ static struct i2c_algorithm sgi_algo = {
  */
 int i2c_sgi_add_bus(struct i2c_adapter *adap)
 {
-        adap->id |= sgi_algo.id;
         adap->algo = &sgi_algo;
 
         return i2c_add_adapter(adap);
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index f2785499237b..8ed5ad12552f 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -135,8 +135,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 
 static struct i2c_algorithm i2c_sibyte_algo = {
-        .name           = "SiByte algorithm",
-        .id             = I2C_ALGO_SIBYTE,
         .smbus_xfer     = smbus_xfer,
         .algo_control   = algo_control, /* ioctl */
         .functionality  = bit_func,
@@ -151,8 +149,6 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
         struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data;
 
         /* register new adapter to i2c module... */
-
-        i2c_adap->id |= i2c_sibyte_algo.id;
         i2c_adap->algo = &i2c_sibyte_algo;
         
         /* Set the frequency to 100 kHz */
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 916ba5e40a96..6e9da1372225 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -182,14 +182,8 @@ config I2C_IOP3XX
           will be called i2c-iop3xx.
 
 config I2C_ISA
-        tristate "ISA Bus support"
+        tristate
         depends on I2C
-        help
-          If you say yes to this option, support will be included for i2c
-          interfaces that are on the ISA bus.
-
-          This driver can also be built as a module.  If so, the module
-          will be called i2c-isa.
 
 config I2C_ITE
         tristate "ITE I2C Adapter"
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index f634a0780cf0..f021acd2674e 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -472,8 +472,6 @@ static u32 ali1535_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-i2c SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = ali1535_access,
         .functionality  = ali1535_func,
 };
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index fdd881aee618..86947504aea1 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -366,8 +366,6 @@ static void ali1563_shutdown(struct pci_dev *dev)
 }
 
 static struct i2c_algorithm ali1563_algorithm = {
-        .name           = "Non-i2c SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = ali1563_access,
         .functionality  = ali1563_func,
 };
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 0f781a1a3323..b3f50bff39a0 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -462,8 +462,6 @@ static u32 ali15x3_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = ali15x3_access,
         .functionality  = ali15x3_func,
 };
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 6347ebc6fb53..6ad0603384b8 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -295,8 +295,6 @@ static u32 amd756_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = amd756_access,
         .functionality  = amd756_func,
 };
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index d6644481d2a0..45ea24ba14d5 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -323,8 +323,6 @@ static u32 amd8111_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name = "Non-I2C SMBus 2.0 adapter",
-        .id = I2C_ALGO_SMBUS,
         .smbus_xfer = amd8111_access,
         .functionality = amd8111_func,
 };
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index a7ff112e49bf..d06edce03bf4 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -283,8 +283,6 @@ au1550_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm au1550_algo = {
-        .name           = "Au1550 algorithm",
-        .id             = I2C_ALGO_AU1550,
         .master_xfer    = au1550_xfer,
         .functionality  = au1550_func,
 };
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 1ab41313ce51..709beab76609 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -535,8 +535,6 @@ static u32 i801_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = i801_access,
         .functionality  = i801_func,
 };
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 93ca36dc777e..a3ed9590f028 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -627,8 +627,6 @@ static u32 iic_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm iic_algo = {
-        .name           = "IBM IIC algorithm",
-        .id             = I2C_ALGO_OCP,
         .master_xfer    = iic_xfer,
         .functionality  = iic_func
 };
@@ -727,7 +725,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
         adap = &dev->adap;
         strcpy(adap->name, "IBM IIC");
         i2c_set_adapdata(adap, dev);
-        adap->id = I2C_HW_OCP | iic_algo.id;
+        adap->id = I2C_HW_OCP;
         adap->algo = &iic_algo;
         adap->client_register = NULL;
         adap->client_unregister = NULL;
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 6b682e903f09..7bd9102db701 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -399,8 +399,6 @@ iop3xx_i2c_func(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm iop3xx_i2c_algo = {
-        .name           = "IOP3xx I2C algorithm",
-        .id             = I2C_ALGO_IOP3XX,
         .master_xfer    = iop3xx_i2c_master_xfer,
         .algo_control   = iop3xx_i2c_algo_control,
         .functionality  = iop3xx_i2c_func,
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 00e7f7157b75..bdc6806dafae 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -1,6 +1,8 @@
 /*
-    i2c-isa.c - Part of lm_sensors, Linux kernel modules for hardware
-            monitoring
+    i2c-isa.c - an i2c-core-like thing for ISA hardware monitoring chips
+    Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
+
+    Based on the i2c-isa pseudo-adapter from the lm_sensors project
     Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl> 
 
     This program is free software; you can redistribute it and/or modify
@@ -18,30 +20,36 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* This implements an i2c algorithm/adapter for ISA bus. Not that this is
-   on first sight very useful; almost no functionality is preserved.
-   Except that it makes writing drivers for chips which can be on both
-   the SMBus and the ISA bus very much easier. See lm78.c for an example
-   of this. */
+/* This implements an i2c-core-like thing for ISA hardware monitoring
+   chips. Such chips are linked to the i2c subsystem for historical
+   reasons (because the early ISA hardware monitoring chips such as the
+   LM78 had both an I2C and an ISA interface). They used to be
+   registered with the main i2c-core, but as a first step in the
+   direction of a clean separation between I2C and ISA chip drivers,
+   we now have this separate core for ISA ones. It is significantly
+   more simple than the real one, of course, because we don't have to
+   handle multiple busses: there is only one (fake) ISA adapter.
+   It is worth noting that we still rely on i2c-core for some things
+   at the moment - but hopefully this won't last. */
 
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
+#include <linux/i2c-isa.h>
 
 static u32 isa_func(struct i2c_adapter *adapter);
 
 /* This is the actual algorithm we define */
 static struct i2c_algorithm isa_algorithm = {
-        .name           = "ISA bus algorithm",
-        .id             = I2C_ALGO_ISA,
         .functionality  = isa_func,
 };
 
 /* There can only be one... */
 static struct i2c_adapter isa_adapter = {
         .owner          = THIS_MODULE,
+        .id             = I2C_HW_ISA,
         .class          = I2C_CLASS_HWMON,
         .algo           = &isa_algorithm,
         .name           = "ISA main adapter",
@@ -53,17 +61,146 @@ static u32 isa_func(struct i2c_adapter *adapter)
         return 0;
 }
 
+
+/* Copied from i2c-core */
+static ssize_t show_adapter_name(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
+        return sprintf(buf, "%s\n", adap->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
+
+static int i2c_isa_device_probe(struct device *dev)
+{
+        return -ENODEV;
+}
+
+static int i2c_isa_device_remove(struct device *dev)
+{
+        return 0;
+}
+
+
+/* We implement an interface which resembles i2c_{add,del}_driver,
+   but for i2c-isa drivers. We don't have to remember and handle lists
+   of drivers and adapters so this is much more simple, of course. */
+
+int i2c_isa_add_driver(struct i2c_driver *driver)
+{
+        int res;
+
+        /* Add the driver to the list of i2c drivers in the driver core */
+        driver->driver.name = driver->name;
+        driver->driver.bus = &i2c_bus_type;
+        driver->driver.probe = i2c_isa_device_probe;
+        driver->driver.remove = i2c_isa_device_remove;
+        res = driver_register(&driver->driver);
+        if (res)
+                return res;
+        dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->name);
+
+        /* Now look for clients */
+        driver->attach_adapter(&isa_adapter);
+
+        return 0;
+}
+
+int i2c_isa_del_driver(struct i2c_driver *driver)
+{
+        struct list_head *item, *_n;
+        struct i2c_client *client;
+        int res;
+
+        /* Detach all clients belonging to this one driver */
+        list_for_each_safe(item, _n, &isa_adapter.clients) {
+                client = list_entry(item, struct i2c_client, list);
+                if (client->driver != driver)
+                        continue;
+                dev_dbg(&isa_adapter.dev, "Detaching client %s at 0x%x\n",
+                        client->name, client->addr);
+                if ((res = driver->detach_client(client))) {
+                        dev_err(&isa_adapter.dev, "Failed, driver "
+                                "%s not unregistered!\n",
+                                driver->name);
+                        return res;
+                }
+        }
+
+        /* Get the driver off the core list */
+        driver_unregister(&driver->driver);
+        dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->name);
+
+        return 0;
+}
+
+
 static int __init i2c_isa_init(void)
 {
-        return i2c_add_adapter(&isa_adapter);
+        init_MUTEX(&isa_adapter.clist_lock);
+        INIT_LIST_HEAD(&isa_adapter.clients);
+
+        isa_adapter.nr = ANY_I2C_ISA_BUS;
+        isa_adapter.dev.parent = &platform_bus;
+        sprintf(isa_adapter.dev.bus_id, "i2c-%d", isa_adapter.nr);
+        isa_adapter.dev.driver = &i2c_adapter_driver;
+        isa_adapter.dev.release = &i2c_adapter_dev_release;
+        device_register(&isa_adapter.dev);
+        device_create_file(&isa_adapter.dev, &dev_attr_name);
+
+        /* Add this adapter to the i2c_adapter class */
+        memset(&isa_adapter.class_dev, 0x00, sizeof(struct class_device));
+        isa_adapter.class_dev.dev = &isa_adapter.dev;
+        isa_adapter.class_dev.class = &i2c_adapter_class;
+        strlcpy(isa_adapter.class_dev.class_id, isa_adapter.dev.bus_id,
+                BUS_ID_SIZE);
+        class_device_register(&isa_adapter.class_dev);
+
+        dev_dbg(&isa_adapter.dev, "%s registered\n", isa_adapter.name);
+
+        return 0;
 }
 
 static void __exit i2c_isa_exit(void)
 {
-        i2c_del_adapter(&isa_adapter);
+#ifdef DEBUG
+        struct list_head  *item, *_n;
+        struct i2c_client *client = NULL;
+#endif
+
+        /* There should be no more active client */
+#ifdef DEBUG
+        dev_dbg(&isa_adapter.dev, "Looking for clients\n");
+        list_for_each_safe(item, _n, &isa_adapter.clients) {
+                client = list_entry(item, struct i2c_client, list);
+                dev_err(&isa_adapter.dev, "Driver %s still has an active "
+                        "ISA client at 0x%x\n", client->driver->name,
+                        client->addr);
+        }
+        if (client != NULL)
+                return;
+#endif
+
+        /* Clean up the sysfs representation */
+        dev_dbg(&isa_adapter.dev, "Unregistering from sysfs\n");
+        init_completion(&isa_adapter.dev_released);
+        init_completion(&isa_adapter.class_dev_released);
+        class_device_unregister(&isa_adapter.class_dev);
+        device_remove_file(&isa_adapter.dev, &dev_attr_name);
+        device_unregister(&isa_adapter.dev);
+
+        /* Wait for sysfs to drop all references */
+        dev_dbg(&isa_adapter.dev, "Waiting for sysfs completion\n");
+        wait_for_completion(&isa_adapter.dev_released);
+        wait_for_completion(&isa_adapter.class_dev_released);
+
+        dev_dbg(&isa_adapter.dev, "%s unregistered\n", isa_adapter.name);
 }
 
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
+EXPORT_SYMBOL(i2c_isa_add_driver);
+EXPORT_SYMBOL(i2c_isa_del_driver);
+
+MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
 MODULE_DESCRIPTION("ISA bus access through i2c");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index 94ae808314f7..37b49c2daf5f 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -87,12 +87,9 @@ static const char *__kw_state_names[] = {
 };
 #endif /* DEBUG */
 
-static int probe;
-
 MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
 MODULE_DESCRIPTION("I2C driver for Apple's Keywest");
 MODULE_LICENSE("GPL");
-module_param(probe, bool, 0);
 
 #ifdef POLLED_MODE
 /* Don't schedule, the g5 fan controller is too
@@ -498,8 +495,6 @@ keywest_func(struct i2c_adapter * adapter)
 
 /* For now, we only handle combined mode (smbus) */
 static struct i2c_algorithm keywest_algorithm = {
-        .name           = "Keywest i2c",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = keywest_smbus_xfer,
         .master_xfer    = keywest_xfer,
         .functionality  = keywest_func,
@@ -621,7 +616,6 @@ create_iface(struct device_node *np, struct device *dev)
                 sprintf(chan->adapter.name, "%s %d", np->parent->name, i);
                 chan->iface = iface;
                 chan->chan_no = i;
-                chan->adapter.id = I2C_ALGO_SMBUS;
                 chan->adapter.algo = &keywest_algorithm;
                 chan->adapter.algo_data = NULL;
                 chan->adapter.client_register = NULL;
@@ -635,15 +629,6 @@ create_iface(struct device_node *np, struct device *dev)
                                 chan->adapter.name);
                         i2c_set_adapdata(&chan->adapter, NULL);
                 }
-                if (probe) {
-                        printk("Probe: ");
-                        for (addr = 0x00; addr <= 0x7f; addr++) {
-                                if (i2c_smbus_xfer(&chan->adapter,addr,
-                                    0,0,0,I2C_SMBUS_QUICK,NULL) >= 0)
-                                        printk("%02x ", addr);
-                        }
-                        printk("\n");
-                }
         }
 
         printk(KERN_INFO "Found KeyWest i2c on \"%s\", %d channel%s, stepping: %d bits\n",
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 9ad3e9262e8a..f065583ddcf1 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -272,8 +272,6 @@ static u32 mpc_functionality(struct i2c_adapter *adap)
 }
 
 static struct i2c_algorithm mpc_algo = {
-        .name = "MPC algorithm",
-        .id = I2C_ALGO_MPC107,
         .master_xfer = mpc_xfer,
         .functionality = mpc_functionality,
 };
@@ -281,7 +279,7 @@ static struct i2c_algorithm mpc_algo = {
 static struct i2c_adapter mpc_ops = {
         .owner = THIS_MODULE,
         .name = "MPC adapter",
-        .id = I2C_ALGO_MPC107 | I2C_HW_MPC107,
+        .id = I2C_HW_MPC107,
         .algo = &mpc_algo,
         .class = I2C_CLASS_HWMON,
         .timeout = 1,
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 5b852782d2f5..99abca45fece 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -423,18 +423,16 @@ static int
 mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 {
         struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
-        int     i, rc = 0;
+        int     i, rc;
 
         for (i=0; i<num; i++)
-                if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) != 0)
-                        break;
+                if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) < 0)
+                        return rc;
 
-        return rc;
+        return num;
 }
 
 static struct i2c_algorithm mv64xxx_i2c_algo = {
-        .name = MV64XXX_I2C_CTLR_NAME " algorithm",
-        .id = I2C_ALGO_MV64XXX,
         .master_xfer = mv64xxx_i2c_xfer,
         .functionality = mv64xxx_i2c_functionality,
 };
@@ -523,7 +521,7 @@ mv64xxx_i2c_probe(struct device *dev)
         drv_data->freq_m = pdata->freq_m;
         drv_data->freq_n = pdata->freq_n;
         drv_data->irq = platform_get_irq(pd, 0);
-        drv_data->adapter.id = I2C_ALGO_MV64XXX | I2C_HW_MV64XXX;
+        drv_data->adapter.id = I2C_HW_MV64XXX;
         drv_data->adapter.algo = &mv64xxx_i2c_algo;
         drv_data->adapter.owner = THIS_MODULE;
         drv_data->adapter.class = I2C_CLASS_HWMON;
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 74eb89aa9350..e0b7a913431e 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -110,8 +110,6 @@ static u32 nforce2_func(struct i2c_adapter *adapter);
 
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name = "Non-I2C SMBus adapter",
-        .id = I2C_ALGO_SMBUS,
         .smbus_xfer = nforce2_access,
         .functionality = nforce2_func,
 };
@@ -131,7 +129,6 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
         struct nforce2_smbus *smbus = adap->algo_data;
         unsigned char protocol, pec, temp;
         unsigned char len = 0; /* to keep the compiler quiet */
-        int timeout = 0;
         int i;
 
         protocol = (read_write == I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ :
@@ -191,29 +188,10 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
                 case I2C_SMBUS_PROC_CALL:
                         dev_err(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
                         return -1;
-                        /*
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(data->word, NVIDIA_SMB_DATA);
-                        outb_p(data->word >> 8, NVIDIA_SMB_DATA + 1);
-                        protocol = NVIDIA_SMB_PRTCL_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                         */
 
                 case I2C_SMBUS_BLOCK_PROC_CALL:
                         dev_err(&adap->dev, "I2C_SMBUS_BLOCK_PROC_CALL not supported!\n");
                         return -1;
-                        /*
-                        protocol |= pec;
-                        len = min_t(u8, data->block[0], 31);
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(len, NVIDIA_SMB_BCNT);
-                        for (i = 0; i < len; i++)
-                                outb_p(data->block[i + 1], NVIDIA_SMB_DATA + i);
-                        protocol = NVIDIA_SMB_PRTCL_BLOCK_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                        */
 
                 case I2C_SMBUS_WORD_DATA_PEC:
                 case I2C_SMBUS_BLOCK_DATA_PEC:
@@ -232,12 +210,6 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
 
         temp = inb_p(NVIDIA_SMB_STS);
 
-#if 0
-        do {
-                i2c_do_pause(1);
-                temp = inb_p(NVIDIA_SMB_STS);
-        } while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
-#endif
         if (~temp & NVIDIA_SMB_STS_DONE) {
                 udelay(500);
                 temp = inb_p(NVIDIA_SMB_STS);
@@ -247,9 +219,10 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
                 temp = inb_p(NVIDIA_SMB_STS);
         }
 
-        if ((timeout >= MAX_TIMEOUT) || (~temp & NVIDIA_SMB_STS_DONE)
-                || (temp & NVIDIA_SMB_STS_STATUS))
+        if ((~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS)) {
+                dev_dbg(&adap->dev, "SMBus Timeout! (0x%02x)\n", temp);
                 return -1;
+        }
 
         if (read_write == I2C_SMBUS_WRITE)
                 return 0;
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 6d34ee381ce1..6d48a4da7bed 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -399,8 +399,6 @@ static u32 piix4_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = piix4_access,
         .functionality  = piix4_func,
 };
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index a3b38257cc3d..73a092fb0e7e 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -568,7 +568,6 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap)
 /* i2c bus registration info */
 
 static struct i2c_algorithm s3c24xx_i2c_algorithm = {
-        .name                   = "S3C2410-I2C-Algorithm",
         .master_xfer            = s3c24xx_i2c_xfer,
         .functionality          = s3c24xx_i2c_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index bbd5e4e52f09..080318d6f54b 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -357,8 +357,6 @@ static u32 sis5595_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = sis5595_access,
         .functionality  = sis5595_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index f58455e7689e..86f0f448fa0b 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -448,8 +448,6 @@ exit:
 
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = sis630_access,
         .functionality  = sis630_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 6484792e23a1..ead2ff3cf60e 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -249,8 +249,6 @@ static u32 sis96x_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = sis96x_access,
         .functionality  = sis96x_func,
 };
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index 00d94e886955..73f481e93a36 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -109,8 +109,6 @@ static u32 stub_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .functionality  = stub_func,
         .smbus_xfer     = stub_xfer,
 };
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 6b5008005c6f..99d209e0485a 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -286,8 +286,6 @@ static u32 vt596_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = vt596_access,
         .functionality  = vt596_func,
 };
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index a18bdd9aa7ba..a1d580e05361 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -395,8 +395,6 @@ static u32 scx200_acb_func(struct i2c_adapter *adapter)
 
 /* For now, we only handle combined mode (smbus) */
 static struct i2c_algorithm scx200_acb_algorithm = {
-        .name           = "NatSemi SCx200 ACCESS.bus",
-        .id             = I2C_ALGO_SMBUS,
         .smbus_xfer     = scx200_acb_smbus_xfer,
         .functionality  = scx200_acb_func,
 };
@@ -456,7 +454,7 @@ static int  __init scx200_acb_create(int base, int index)
         i2c_set_adapdata(adapter, iface);
         snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
         adapter->owner = THIS_MODULE;
-        adapter->id = I2C_ALGO_SMBUS;
+        adapter->id = I2C_HW_SMBUS_SCX200;
         adapter->algo = &scx200_acb_algorithm;
         adapter->class = I2C_CLASS_HWMON;
 
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 43f70dbfc03f..6bd44a44cd28 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -2,17 +2,12 @@
 # Miscellaneous I2C chip drivers configuration
 #
 
-config I2C_SENSOR
-        tristate
-        default n
-
 menu "Miscellaneous I2C Chip support"
         depends on I2C
 
 config SENSORS_DS1337
         tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1337 and DS1339 real-time clock chips.
@@ -23,7 +18,6 @@ config SENSORS_DS1337
 config SENSORS_DS1374
         tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
           DS1374 real-time clock chips.
@@ -34,7 +28,6 @@ config SENSORS_DS1374
 config SENSORS_EEPROM
         tristate "EEPROM reader"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get read-only access to the EEPROM data
           available on modern memory DIMMs and Sony Vaio laptops.  Such
@@ -46,7 +39,6 @@ config SENSORS_EEPROM
 config SENSORS_PCF8574
         tristate "Philips PCF8574 and PCF8574A"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Philips PCF8574 and 
           PCF8574A chips.
@@ -67,7 +59,6 @@ config SENSORS_PCA9539
 config SENSORS_PCF8591
         tristate "Philips PCF8591"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for Philips PCF8591 chips.
 
@@ -77,7 +68,6 @@ config SENSORS_PCF8591
 config SENSORS_RTC8564
         tristate "Epson 8564 RTC chip"
         depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
         help
           If you say yes here you get support for the Epson 8564 RTC chip.
 
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 82cf959989fd..9d3175c03395 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/string.h>
 #include <linux/rtc.h>          /* get the user-level API */
 #include <linux/bcd.h>
@@ -39,9 +38,8 @@
  * Functions declaration
  */
 static unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
-SENSORS_INSMOD_1(ds1337);
+I2C_CLIENT_INSMOD_1(ds1337);
 
 static int ds1337_attach_adapter(struct i2c_adapter *adapter);
 static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind);
@@ -227,7 +225,7 @@ int ds1337_do_command(int bus, int cmd, void *arg)
 
 static int ds1337_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, ds1337_detect);
+        return i2c_probe(adapter, &addr_data, ds1337_detect);
 }
 
 /*
@@ -354,11 +352,8 @@ static int ds1337_detach_client(struct i2c_client *client)
         int err;
         struct ds1337_data *data = i2c_get_clientdata(client);
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         list_del(&data->list);
         kfree(data);
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
index a445736d8838..0936327a946d 100644
--- a/drivers/i2c/chips/ds1374.c
+++ b/drivers/i2c/chips/ds1374.c
@@ -53,7 +53,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c = normal_addr,
         .probe = ignore,
         .ignore = ignore,
-        .force = ignore,
 };
 
 static ulong ds1374_read_rtc(void)
@@ -166,7 +165,7 @@ static void ds1374_set_tlet(ulong arg)
                          "can't confirm time set from rtc chip\n");
 }
 
-ulong new_time;
+static ulong new_time;
 
 DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet, (ulong) & new_time);
 
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index a2da31b0dd7b..d58403a47908 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -33,15 +33,13 @@
 #include <linux/sched.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
                                         0x55, 0x56, 0x57, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(eeprom);
+I2C_CLIENT_INSMOD_1(eeprom);
 
 
 /* Size of EEPROM in bytes */
@@ -153,21 +151,16 @@ static struct bin_attribute eeprom_attr = {
 
 static int eeprom_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, eeprom_detect);
+        return i2c_probe(adapter, &addr_data, eeprom_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
         struct eeprom_data *data;
         int err = 0;
 
-        /* prevent 24RF08 corruption */
-        if (kind < 0)
-                i2c_smbus_xfer(adapter, address, 0, 0, 0,
-                               I2C_SMBUS_QUICK, NULL);
-
         /* There are three ways we can read the EEPROM data:
            (1) I2C block reads (faster, but unsupported by most adapters)
            (2) Consecutive byte reads (100% overhead)
@@ -231,10 +224,8 @@ static int eeprom_detach_client(struct i2c_client *client)
         int err;
 
         err = i2c_detach_client(client);
-        if (err) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        if (err)
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
 
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 354a26295672..8ee56d4b3891 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -1489,7 +1489,7 @@ static int isp1301_probe(struct i2c_adapter *bus, int address, int kind)
         if (the_transceiver)
                 return 0;
 
-        isp = kcalloc(1, sizeof *isp, GFP_KERNEL);
+        isp = kzalloc(sizeof *isp, GFP_KERNEL);
         if (!isp)
                 return 0;
 
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 778d7e12859d..3f14528a52a9 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -42,7 +42,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
         .probe                  = ignore,
         .ignore                 = ignore,
-        .force                  = ignore,
 };
 
 ulong
@@ -145,7 +144,7 @@ m41t00_set_tlet(ulong arg)
         return;
 }
 
-ulong   new_time;
+static ulong    new_time;
 
 DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time);
 
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 0230375f72e5..9e1aeb69abf9 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -5,97 +5,60 @@
 
     Based on i2c/chips/eeprom.c
 
-    The MAX6875 has two EEPROM sections: config and user.
-    At reset, the config EEPROM is read into the registers.
+    The MAX6875 has a bank of registers and two banks of EEPROM.
+    Address ranges are defined as follows:
+     * 0x0000 - 0x0046 = configuration registers
+     * 0x8000 - 0x8046 = configuration EEPROM
+     * 0x8100 - 0x82FF = user EEPROM
 
-    This driver make 3 binary files available in sysfs:
-      reg_config    - direct access to the registers
-      eeprom_config - acesses configuration eeprom space
-      eeprom_user   - free for application use
+    This driver makes the user EEPROM available for read.
 
-    In our application, we put device serial & model numbers in user eeprom.
+    The registers & config EEPROM should be accessed via i2c-dev.
 
-    Notes:
-      1) The datasheet says that register 0x44 / EEPROM 0x8044 should NOT
-         be overwritten, so the driver explicitly prevents that.
-      2) It's a good idea to keep the config (0x45) locked in config EEPROM.
-         You can temporarily enable config writes by changing register 0x45.
+    The MAX6875 ignores the lowest address bit, so each chip responds to
+    two addresses - 0x50/0x51 and 0x52/0x53.
+
+    Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
+    address, so this driver is destructive if loaded for the wrong EEPROM chip.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; version 2 of the License.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <asm/semaphore.h>
 
-/* Addresses to scan */
-/* No address scanned by default, as this could corrupt standard EEPROMS. */
+/* Do not scan - the MAX6875 access method will write to some EEPROM chips */
 static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(max6875);
-
-/* this param will prevent 'accidental' writes to the eeprom */
-static int allow_write = 0;
-module_param(allow_write, int, 0);
-MODULE_PARM_DESC(allow_write,
-                 "Enable write access:\n"
-                 "*0: Read only\n"
-                 " 1: Read/Write access");
+I2C_CLIENT_INSMOD_1(max6875);
 
 /* The MAX6875 can only read/write 16 bytes at a time */
 #define SLICE_SIZE                      16
 #define SLICE_BITS                      4
 
-/* CONFIG EEPROM is at addresses 0x8000 - 0x8045, registers are at 0 - 0x45 */
-#define CONFIG_EEPROM_BASE              0x8000
-#define CONFIG_EEPROM_SIZE              0x0046
-#define CONFIG_EEPROM_SLICES            5
-
 /* USER EEPROM is at addresses 0x8100 - 0x82FF */
 #define USER_EEPROM_BASE                0x8100
 #define USER_EEPROM_SIZE                0x0200
 #define USER_EEPROM_SLICES              32
 
 /* MAX6875 commands */
-#define MAX6875_CMD_BLOCK_WRITE         0x83
-#define MAX6875_CMD_BLOCK_READ          0x84
-#define MAX6875_CMD_REBOOT              0x88
-
-enum max6875_area_type {
-        max6875_register_config=0,
-        max6875_eeprom_config,
-        max6875_eeprom_user,
-        max6857_max
-};
-
-struct eeprom_block {
-        enum max6875_area_type  type;
-        u8                      slices;
-        u32                     size;
-        u32                     valid;
-        u32                     base;
-        unsigned long           *updated;
-        u8                      *data;
-};
+#define MAX6875_CMD_BLK_READ            0x84
 
 /* Each client has this additional data */
 struct max6875_data {
         struct i2c_client       client;
         struct semaphore        update_lock;
-        struct eeprom_block     blocks[max6857_max];
-        /* the above structs point into the arrays below */
-        u8 data[USER_EEPROM_SIZE + (CONFIG_EEPROM_SIZE*2)];
-        unsigned long last_updated[USER_EEPROM_SLICES + (CONFIG_EEPROM_SLICES*2)];
+
+        u32                     valid;
+        u8                      data[USER_EEPROM_SIZE];
+        unsigned long           last_updated[USER_EEPROM_SLICES];
 };
 
 static int max6875_attach_adapter(struct i2c_adapter *adapter);
@@ -111,337 +74,160 @@ static struct i2c_driver max6875_driver = {
         .detach_client  = max6875_detach_client,
 };
 
-static int max6875_update_slice(struct i2c_client *client,
-                                struct eeprom_block *blk,
-                                int slice)
+static void max6875_update_slice(struct i2c_client *client, int slice)
 {
         struct max6875_data *data = i2c_get_clientdata(client);
-        int i, j, addr, count;
-        u8 rdbuf[SLICE_SIZE];
-        int retval = 0;
+        int i, j, addr;
+        u8 *buf;
 
-        if (slice >= blk->slices)
-                return -1;
+        if (slice >= USER_EEPROM_SLICES)
+                return;
 
         down(&data->update_lock);
 
-        if (!(blk->valid & (1 << slice)) ||
-            (jiffies - blk->updated[slice] > 300 * HZ) ||
-            (jiffies < blk->updated[slice])) {
-                dev_dbg(&client->dev, "Starting eeprom update, slice %u, base %u\n",
-                        slice, blk->base);
+        buf = &data->data[slice << SLICE_BITS];
 
-                addr = blk->base + (slice << SLICE_BITS);
-                count = blk->size - (slice << SLICE_BITS);
-                if (count > SLICE_SIZE) {
-                        count = SLICE_SIZE;
-                }
+        if (!(data->valid & (1 << slice)) ||
+            time_after(jiffies, data->last_updated[slice])) {
 
-                /* Preset the read address */
-                if (addr < 0x100) {
-                        /* select the register */
-                        if (i2c_smbus_write_byte(client, addr & 0xFF)) {
-                                dev_dbg(&client->dev, "max6875 register select has failed!\n");
-                                retval = -1;
-                                goto exit;
-                        }
-                } else {
-                        /* select the eeprom */
-                        if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
-                                dev_dbg(&client->dev, "max6875 address set has failed!\n");
-                                retval = -1;
-                                goto exit;
-                        }
+                dev_dbg(&client->dev, "Starting update of slice %u\n", slice);
+
+                data->valid &= ~(1 << slice);
+
+                addr = USER_EEPROM_BASE + (slice << SLICE_BITS);
+
+                /* select the eeprom address */
+                if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
+                        dev_err(&client->dev, "address set failed\n");
+                        goto exit_up;
                 }
 
-                if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                        if (i2c_smbus_read_i2c_block_data(client, MAX6875_CMD_BLOCK_READ,
-                                                          rdbuf) != SLICE_SIZE)
-                        {
-                                retval = -1;
-                                goto exit;
+                if (i2c_check_functionality(client->adapter,
+                                            I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+                        if (i2c_smbus_read_i2c_block_data(client,
+                                                          MAX6875_CMD_BLK_READ,
+                                                          buf) != SLICE_SIZE) {
+                                goto exit_up;
                         }
-
-                        memcpy(&blk->data[slice << SLICE_BITS], rdbuf, count);
                 } else {
-                        for (i = 0; i < count; i++) {
+                        for (i = 0; i < SLICE_SIZE; i++) {
                                 j = i2c_smbus_read_byte(client);
-                                if (j < 0)
-                                {
-                                        retval = -1;
-                                        goto exit;
+                                if (j < 0) {
+                                        goto exit_up;
                                 }
-                                blk->data[(slice << SLICE_BITS) + i] = (u8) j;
+                                buf[i] = j;
                         }
                 }
-                blk->updated[slice] = jiffies;
-                blk->valid |= (1 << slice);
+                data->last_updated[slice] = jiffies;
+                data->valid |= (1 << slice);
         }
-        exit:
+exit_up:
         up(&data->update_lock);
-        return retval;
 }
 
-static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off, size_t count,
-                            enum max6875_area_type area_type)
+static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off,
+                            size_t count)
 {
-        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
+        struct i2c_client *client = kobj_to_i2c_client(kobj);
         struct max6875_data *data = i2c_get_clientdata(client);
-        struct eeprom_block *blk;
-        int slice;
-
-        blk = &data->blocks[area_type];
+        int slice, max_slice;
 
-        if (off > blk->size)
+        if (off > USER_EEPROM_SIZE)
                 return 0;
-        if (off + count > blk->size)
-                count = blk->size - off;
 
-        /* Only refresh slices which contain requested bytes */
-        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
-                max6875_update_slice(client, blk, slice);
+        if (off + count > USER_EEPROM_SIZE)
+                count = USER_EEPROM_SIZE - off;
 
-        memcpy(buf, &blk->data[off], count);
+        /* refresh slices which contain requested bytes */
+        max_slice = (off + count - 1) >> SLICE_BITS;
+        for (slice = (off >> SLICE_BITS); slice <= max_slice; slice++)
+                max6875_update_slice(client, slice);
 
-        return count;
-}
-
-static ssize_t max6875_user_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_eeprom_user);
-}
-
-static ssize_t max6875_config_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_eeprom_config);
-}
-
-static ssize_t max6875_cfgreg_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_register_config);
-}
-
-
-static ssize_t max6875_write(struct kobject *kobj, char *buf, loff_t off, size_t count,
-                             enum max6875_area_type area_type)
-{
-        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
-        struct max6875_data *data = i2c_get_clientdata(client);
-        struct eeprom_block *blk;
-        int slice, addr, retval;
-        ssize_t sent = 0;
-
-        blk = &data->blocks[area_type];
-
-        if (off > blk->size)
-                return 0;
-        if ((off + count) > blk->size)
-                count = blk->size - off;
-
-        if (down_interruptible(&data->update_lock))
-                return -EAGAIN;
-
-        /* writing to a register is done with i2c_smbus_write_byte_data() */
-        if (blk->type == max6875_register_config) {
-                for (sent = 0; sent < count; sent++) {
-                        addr = off + sent;
-                        if (addr == 0x44)
-                                continue;
-
-                        retval = i2c_smbus_write_byte_data(client, addr, buf[sent]);
-                }
-        } else {
-                int cmd, val;
-
-                /* We are writing to EEPROM */
-                for (sent = 0; sent < count; sent++) {
-                        addr = blk->base + off + sent;
-                        cmd = addr >> 8;
-                        val = (addr & 0xff) | (buf[sent] << 8); // reversed
-
-                        if (addr == 0x8044)
-                                continue;
-
-                        retval = i2c_smbus_write_word_data(client, cmd, val);
-
-                        if (retval) {
-                                goto error_exit;
-                        }
+        memcpy(buf, &data->data[off], count);
 
-                        /* A write takes up to 11 ms */
-                        msleep(11);
-                }
-        }
-
-        /* Invalidate the scratch buffer */
-        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
-                blk->valid &= ~(1 << slice);
-
-        error_exit:
-        up(&data->update_lock);
-
-        return sent;
-}
-
-static ssize_t max6875_user_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_eeprom_user);
-}
-
-static ssize_t max6875_config_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_eeprom_config);
-}
-
-static ssize_t max6875_cfgreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_register_config);
+        return count;
 }
 
 static struct bin_attribute user_eeprom_attr = {
         .attr = {
-                .name = "eeprom_user",
-                .mode = S_IRUGO | S_IWUSR | S_IWGRP,
-                .owner = THIS_MODULE,
-        },
-        .size  = USER_EEPROM_SIZE,
-        .read  = max6875_user_read,
-        .write = max6875_user_write,
-};
-
-static struct bin_attribute config_eeprom_attr = {
-        .attr = {
-                .name = "eeprom_config",
-                .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
-        },
-        .size  = CONFIG_EEPROM_SIZE,
-        .read  = max6875_config_read,
-        .write = max6875_config_write,
-};
-
-static struct bin_attribute config_register_attr = {
-        .attr = {
-                .name = "reg_config",
-                .mode = S_IRUGO | S_IWUSR,
+                .name = "eeprom",
+                .mode = S_IRUGO,
                 .owner = THIS_MODULE,
         },
-        .size  = CONFIG_EEPROM_SIZE,
-        .read  = max6875_cfgreg_read,
-        .write = max6875_cfgreg_write,
+        .size = USER_EEPROM_SIZE,
+        .read = max6875_read,
 };
 
 static int max6875_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, max6875_detect);
+        return i2c_probe(adapter, &addr_data, max6875_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
 {
-        struct i2c_client *new_client;
+        struct i2c_client *real_client;
+        struct i2c_client *fake_client;
         struct max6875_data *data;
         int err = 0;
 
-        /* Prevent 24RF08 corruption (in case of user error) */
-        if (kind < 0)
-                i2c_smbus_xfer(adapter, address, 0, 0, 0,
-                               I2C_SMBUS_QUICK, NULL);
-
-        /* There are three ways we can read the EEPROM data:
-           (1) I2C block reads (faster, but unsupported by most adapters)
-           (2) Consecutive byte reads (100% overhead)
-           (3) Regular byte data reads (200% overhead)
-           The third method is not implemented by this driver because all
-           known adapters support at least the second. */
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA |
-                                     I2C_FUNC_SMBUS_BYTE |
-                                     I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
-                goto exit;
-
-        /* OK. For now, we presume we have a valid client. We now create the
-           client structure, even though we cannot fill it completely yet.
-           But it allows us to access eeprom_{read,write}_value. */
-        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
-        }
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE_DATA
+                                     | I2C_FUNC_SMBUS_READ_BYTE))
+                return 0;
+
+        /* Only check even addresses */
+        if (address & 1)
+                return 0;
+
+        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL)))
+                return -ENOMEM;
         memset(data, 0, sizeof(struct max6875_data));
 
-        new_client = &data->client;
-        i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
-        new_client->adapter = adapter;
-        new_client->driver = &max6875_driver;
-        new_client->flags = 0;
-
-        /* Setup the user section */
-        data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
-        data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;
-        data->blocks[max6875_eeprom_user].size    = USER_EEPROM_SIZE;
-        data->blocks[max6875_eeprom_user].base    = USER_EEPROM_BASE;
-        data->blocks[max6875_eeprom_user].data    = data->data;
-        data->blocks[max6875_eeprom_user].updated = data->last_updated;
-
-        /* Setup the config section */
-        data->blocks[max6875_eeprom_config].type    = max6875_eeprom_config;
-        data->blocks[max6875_eeprom_config].slices  = CONFIG_EEPROM_SLICES;
-        data->blocks[max6875_eeprom_config].size    = CONFIG_EEPROM_SIZE;
-        data->blocks[max6875_eeprom_config].base    = CONFIG_EEPROM_BASE;
-        data->blocks[max6875_eeprom_config].data    = &data->data[USER_EEPROM_SIZE];
-        data->blocks[max6875_eeprom_config].updated = &data->last_updated[USER_EEPROM_SLICES];
-
-        /* Setup the register section */
-        data->blocks[max6875_register_config].type    = max6875_register_config;
-        data->blocks[max6875_register_config].slices  = CONFIG_EEPROM_SLICES;
-        data->blocks[max6875_register_config].size    = CONFIG_EEPROM_SIZE;
-        data->blocks[max6875_register_config].base    = 0;
-        data->blocks[max6875_register_config].data    = &data->data[USER_EEPROM_SIZE+CONFIG_EEPROM_SIZE];
-        data->blocks[max6875_register_config].updated = &data->last_updated[USER_EEPROM_SLICES+CONFIG_EEPROM_SLICES];
-
-        /* Init the data */
-        memset(data->data, 0xff, sizeof(data->data));
-
-        /* Fill in the remaining client fields */
-        strlcpy(new_client->name, "max6875", I2C_NAME_SIZE);
+        /* A fake client is created on the odd address */
+        if (!(fake_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit_kfree1;
+        }
+        memset(fake_client, 0, sizeof(struct i2c_client));
+
+        /* Init real i2c_client */
+        real_client = &data->client;
+        i2c_set_clientdata(real_client, data);
+        real_client->addr = address;
+        real_client->adapter = adapter;
+        real_client->driver = &max6875_driver;
+        real_client->flags = 0;
+        strlcpy(real_client->name, "max6875", I2C_NAME_SIZE);
         init_MUTEX(&data->update_lock);
 
-        /* Verify that the chip is really what we think it is */
-        if ((max6875_update_slice(new_client, &data->blocks[max6875_eeprom_config], 4) < 0) ||
-            (max6875_update_slice(new_client, &data->blocks[max6875_register_config], 4) < 0))
-                goto exit_kfree;
-
-        /* 0x41,0x42 must be zero and 0x40 must match in eeprom and registers */
-        if ((data->blocks[max6875_eeprom_config].data[0x41] != 0) ||
-            (data->blocks[max6875_eeprom_config].data[0x42] != 0) ||
-            (data->blocks[max6875_register_config].data[0x41] != 0) ||
-            (data->blocks[max6875_register_config].data[0x42] != 0) ||
-            (data->blocks[max6875_eeprom_config].data[0x40] !=
-             data->blocks[max6875_register_config].data[0x40]))
-                goto exit_kfree;
-
-        /* Tell the I2C layer a new client has arrived */
-        if ((err = i2c_attach_client(new_client)))
-                goto exit_kfree;
-
-        /* create the sysfs eeprom files with the correct permissions */
-        if (allow_write == 0) {
-                user_eeprom_attr.attr.mode &= ~S_IWUGO;
-                user_eeprom_attr.write = NULL;
-                config_eeprom_attr.attr.mode &= ~S_IWUGO;
-                config_eeprom_attr.write = NULL;
-                config_register_attr.attr.mode &= ~S_IWUGO;
-                config_register_attr.write = NULL;
-        }
-        sysfs_create_bin_file(&new_client->dev.kobj, &user_eeprom_attr);
-        sysfs_create_bin_file(&new_client->dev.kobj, &config_eeprom_attr);
-        sysfs_create_bin_file(&new_client->dev.kobj, &config_register_attr);
+        /* Init fake client data */
+        /* set the client data to the i2c_client so that it will get freed */
+        i2c_set_clientdata(fake_client, fake_client);
+        fake_client->addr = address | 1;
+        fake_client->adapter = adapter;
+        fake_client->driver = &max6875_driver;
+        fake_client->flags = 0;
+        strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE);
+
+        /* Prevent 24RF08 corruption (in case of user error) */
+        i2c_smbus_write_quick(real_client, 0);
+
+        if ((err = i2c_attach_client(real_client)) != 0)
+                goto exit_kfree2;
+
+        if ((err = i2c_attach_client(fake_client)) != 0)
+                goto exit_detach;
+
+        sysfs_create_bin_file(&real_client->dev.kobj, &user_eeprom_attr);
 
         return 0;
 
-exit_kfree:
+exit_detach:
+        i2c_detach_client(real_client);
+exit_kfree2:
+        kfree(fake_client);
+exit_kfree1:
         kfree(data);
-exit:
         return err;
 }
 
@@ -450,13 +236,9 @@ static int max6875_detach_client(struct i2c_client *client)
         int err;
 
         err = i2c_detach_client(client);
-        if (err) {
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        if (err)
                 return err;
-        }
-
         kfree(i2c_get_clientdata(client));
-
         return 0;
 }
 
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index 9f3ad45daae2..225577fdda4d 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -13,14 +13,12 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/hwmon-sysfs.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x74, 0x75, 0x76, 0x77, I2C_CLIENT_END};
-static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(pca9539);
+I2C_CLIENT_INSMOD_1(pca9539);
 
 enum pca9539_cmd
 {
@@ -109,10 +107,10 @@ static struct attribute_group pca9539_defattr_group = {
 
 static int pca9539_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pca9539_detect);
+        return i2c_probe(adapter, &addr_data, pca9539_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -164,10 +162,8 @@ static int pca9539_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev, "Client deregistration failed.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index cfcf64654080..6525743ff9fd 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -39,16 +39,14 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
                                         0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
                                         I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_2(pcf8574, pcf8574a);
+I2C_CLIENT_INSMOD_2(pcf8574, pcf8574a);
 
 /* Initial values */
 #define PCF8574_INIT 255        /* All outputs on (input mode) */
@@ -113,10 +111,10 @@ static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write);
 
 static int pcf8574_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pcf8574_detect);
+        return i2c_probe(adapter, &addr_data, pcf8574_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -186,11 +184,8 @@ static int pcf8574_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index db812ade8564..80f1df9a4500 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -24,15 +24,13 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(pcf8591);
+I2C_CLIENT_INSMOD_1(pcf8591);
 
 static int input_mode;
 module_param(input_mode, int, 0);
@@ -164,10 +162,10 @@ static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO,
  */
 static int pcf8591_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pcf8591_detect);
+        return i2c_probe(adapter, &addr_data, pcf8591_detect);
 }
 
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         struct i2c_client *new_client;
@@ -241,11 +239,8 @@ static int pcf8591_detach_client(struct i2c_client *client)
 {
         int err;
 
-        if ((err = i2c_detach_client(client))) {
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                 return err;
-        }
 
         kfree(i2c_get_clientdata(client));
         return 0;
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 588fc2261a91..0b5385c892b1 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -67,7 +67,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
         .probe                  = ignore,
         .ignore                 = ignore,
-        .force                  = ignore,
 };
 
 static int rtc8564_read_mem(struct i2c_client *client, struct mem *mem);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 4a9ead277596..dda472e5e8be 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -61,7 +61,7 @@ static int i2c_bus_resume(struct device * dev)
         return rc;
 }
 
-static struct bus_type i2c_bus_type = {
+struct bus_type i2c_bus_type = {
         .name =         "i2c",
         .match =        i2c_device_match,
         .suspend =      i2c_bus_suspend,
@@ -78,13 +78,13 @@ static int i2c_device_remove(struct device *dev)
         return 0;
 }
 
-static void i2c_adapter_dev_release(struct device *dev)
+void i2c_adapter_dev_release(struct device *dev)
 {
         struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
         complete(&adap->dev_released);
 }
 
-static struct device_driver i2c_adapter_driver = {
+struct device_driver i2c_adapter_driver = {
         .name = "i2c_adapter",
         .bus = &i2c_bus_type,
         .probe = i2c_device_probe,
@@ -97,7 +97,7 @@ static void i2c_adapter_class_dev_release(struct class_device *dev)
         complete(&adap->class_dev_released);
 }
 
-static struct class i2c_adapter_class = {
+struct class i2c_adapter_class = {
         .name =         "i2c-adapter",
         .release =      &i2c_adapter_class_dev_release,
 };
@@ -188,6 +188,8 @@ int i2c_add_adapter(struct i2c_adapter *adap)
         strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
         class_device_register(&adap->class_dev);
 
+        dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
+
         /* inform drivers of new adapters */
         list_for_each(item,&drivers) {
                 driver = list_entry(item, struct i2c_driver, list);
@@ -196,8 +198,6 @@ int i2c_add_adapter(struct i2c_adapter *adap)
                         driver->attach_adapter(adap);
         }
 
-        dev_dbg(&adap->dev, "registered as adapter #%d\n", adap->nr);
-
 out_unlock:
         up(&core_lists);
         return res;
@@ -220,8 +220,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                         break;
         }
         if (adap_from_list != adap) {
-                pr_debug("I2C: Attempting to delete an unregistered "
-                         "adapter\n");
+                pr_debug("i2c-core: attempting to delete unregistered "
+                         "adapter [%s]\n", adap->name);
                 res = -EINVAL;
                 goto out_unlock;
         }
@@ -230,9 +230,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                 driver = list_entry(item, struct i2c_driver, list);
                 if (driver->detach_adapter)
                         if ((res = driver->detach_adapter(adap))) {
-                                dev_warn(&adap->dev, "can't detach adapter "
-                                         "while detaching driver %s: driver "
-                                         "not detached!\n", driver->name);
+                                dev_err(&adap->dev, "detach_adapter failed "
+                                        "for driver [%s]\n", driver->name);
                                 goto out_unlock;
                         }
         }
@@ -247,9 +246,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                  * must be deleted, as this would cause invalid states.
                  */
                 if ((res=client->driver->detach_client(client))) {
-                        dev_err(&adap->dev, "adapter not "
-                                "unregistered, because client at "
-                                "address %02x can't be detached. ",
+                        dev_err(&adap->dev, "detach_client failed for client "
+                                "[%s] at address 0x%02x\n", client->name,
                                 client->addr);
                         goto out_unlock;
                 }
@@ -270,7 +268,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         /* free dynamically allocated bus id */
         idr_remove(&i2c_adapter_idr, adap->nr);
 
-        dev_dbg(&adap->dev, "adapter unregistered\n");
+        dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
 
  out_unlock:
         up(&core_lists);
@@ -303,7 +301,7 @@ int i2c_add_driver(struct i2c_driver *driver)
                 goto out_unlock;
         
         list_add_tail(&driver->list,&drivers);
-        pr_debug("i2c-core: driver %s registered.\n", driver->name);
+        pr_debug("i2c-core: driver [%s] registered\n", driver->name);
 
         /* now look for instances of driver on our adapters */
         if (driver->flags & I2C_DF_NOTIFY) {
@@ -331,21 +329,17 @@ int i2c_del_driver(struct i2c_driver *driver)
         /* Have a look at each adapter, if clients of this driver are still
          * attached. If so, detach them to be able to kill the driver 
          * afterwards.
-         */
-        pr_debug("i2c-core: unregister_driver - looking for clients.\n");
-        /* removing clients does not depend on the notify flag, else 
+         *
+         * Removing clients does not depend on the notify flag, else
          * invalid operation might (will!) result, when using stale client
          * pointers.
          */
         list_for_each(item1,&adapters) {
                 adap = list_entry(item1, struct i2c_adapter, list);
-                dev_dbg(&adap->dev, "examining adapter\n");
                 if (driver->detach_adapter) {
                         if ((res = driver->detach_adapter(adap))) {
-                                dev_warn(&adap->dev, "while unregistering "
-                                       "dummy driver %s, adapter could "
-                                       "not be detached properly; driver "
-                                       "not unloaded!",driver->name);
+                                dev_err(&adap->dev, "detach_adapter failed "
+                                        "for driver [%s]\n", driver->name);
                                 goto out_unlock;
                         }
                 } else {
@@ -353,16 +347,13 @@ int i2c_del_driver(struct i2c_driver *driver)
                                 client = list_entry(item2, struct i2c_client, list);
                                 if (client->driver != driver)
                                         continue;
-                                pr_debug("i2c-core.o: detaching client %s:\n", client->name);
+                                dev_dbg(&adap->dev, "detaching client [%s] "
+                                        "at 0x%02x\n", client->name,
+                                        client->addr);
                                 if ((res = driver->detach_client(client))) {
-                                        dev_err(&adap->dev, "while "
-                                                "unregistering driver "
-                                                "`%s', the client at "
-                                                "address %02x of "
-                                                "adapter could not "
-                                                "be detached; driver "
-                                                "not unloaded!",
-                                                driver->name,
+                                        dev_err(&adap->dev, "detach_client "
+                                                "failed for client [%s] at "
+                                                "0x%02x\n", client->name,
                                                 client->addr);
                                         goto out_unlock;
                                 }
@@ -372,7 +363,7 @@ int i2c_del_driver(struct i2c_driver *driver)
 
         driver_unregister(&driver->driver);
         list_del(&driver->list);
-        pr_debug("i2c-core: driver unregistered: %s\n", driver->name);
+        pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
 
  out_unlock:
         up(&core_lists);
@@ -417,15 +408,12 @@ int i2c_attach_client(struct i2c_client *client)
         
         if (adapter->client_register)  {
                 if (adapter->client_register(client))  {
-                        dev_warn(&adapter->dev, "warning: client_register "
-                                "seems to have failed for client %02x\n",
-                                client->addr);
+                        dev_dbg(&adapter->dev, "client_register "
+                                "failed for client [%s] at 0x%02x\n",
+                                client->name, client->addr);
                 }
         }
 
-        dev_dbg(&adapter->dev, "client [%s] registered to adapter\n",
-                client->name);
-
         if (client->flags & I2C_CLIENT_ALLOW_USE)
                 client->usage_count = 0;
 
@@ -436,7 +424,8 @@ int i2c_attach_client(struct i2c_client *client)
         
         snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
                 "%d-%04x", i2c_adapter_id(adapter), client->addr);
-        pr_debug("registering %s\n", client->dev.bus_id);
+        dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
+                client->name, client->dev.bus_id);
         device_register(&client->dev);
         device_create_file(&client->dev, &dev_attr_client_name);
         
@@ -449,8 +438,12 @@ int i2c_detach_client(struct i2c_client *client)
         struct i2c_adapter *adapter = client->adapter;
         int res = 0;
         
-        if ((client->flags & I2C_CLIENT_ALLOW_USE) && (client->usage_count > 0))
+        if ((client->flags & I2C_CLIENT_ALLOW_USE)
+         && (client->usage_count > 0)) {
+                dev_warn(&client->dev, "Client [%s] still busy, "
+                         "can't detach\n", client->name);
                 return -EBUSY;
+        }
 
         if (adapter->client_unregister)  {
                 res = adapter->client_unregister(client);
@@ -669,98 +662,128 @@ int i2c_control(struct i2c_client *client,
  * Will not work for 10-bit addresses!
  * ----------------------------------------------------
  */
+static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
+                             int (*found_proc) (struct i2c_adapter *, int, int))
+{
+        int err;
+
+        /* Make sure the address is valid */
+        if (addr < 0x03 || addr > 0x77) {
+                dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
+                         addr);
+                return -EINVAL;
+        }
+
+        /* Skip if already in use */
+        if (i2c_check_addr(adapter, addr))
+                return 0;
+
+        /* Make sure there is something at this address, unless forced */
+        if (kind < 0) {
+                if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                   I2C_SMBUS_QUICK, NULL) < 0)
+                        return 0;
+
+                /* prevent 24RF08 corruption */
+                if ((addr & ~0x0f) == 0x50)
+                        i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                       I2C_SMBUS_QUICK, NULL);
+        }
+
+        /* Finally call the custom detection function */
+        err = found_proc(adapter, addr, kind);
+
+        /* -ENODEV can be returned if there is a chip at the given address
+           but it isn't supported by this chip driver. We catch it here as
+           this isn't an error. */
+        return (err == -ENODEV) ? 0 : err;
+}
+
 int i2c_probe(struct i2c_adapter *adapter,
               struct i2c_client_address_data *address_data,
               int (*found_proc) (struct i2c_adapter *, int, int))
 {
-        int addr,i,found,err;
+        int i, err;
         int adap_id = i2c_adapter_id(adapter);
 
         /* Forget it if we can't probe using SMBUS_QUICK */
         if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
                 return -1;
 
-        for (addr = 0x00; addr <= 0x7f; addr++) {
-
-                /* Skip if already in use */
-                if (i2c_check_addr(adapter,addr))
-                        continue;
-
-                /* If it is in one of the force entries, we don't do any detection
-                   at all */
-                found = 0;
-
-                for (i = 0; !found && (address_data->force[i] != I2C_CLIENT_END); i += 2) {
-                        if (((adap_id == address_data->force[i]) || 
-                             (address_data->force[i] == ANY_I2C_BUS)) &&
-                             (addr == address_data->force[i+1])) {
-                                dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n",
-                                        adap_id, addr);
-                                if ((err = found_proc(adapter,addr,0)))
-                                        return err;
-                                found = 1;
-                        }
-                }
-                if (found) 
-                        continue;
-
-                /* If this address is in one of the ignores, we can forget about
-                   it right now */
-                for (i = 0;
-                     !found && (address_data->ignore[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adap_id == address_data->ignore[i]) || 
-                            ((address_data->ignore[i] == ANY_I2C_BUS))) &&
-                            (addr == address_data->ignore[i+1])) {
-                                dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, "
-                                        "addr %04x\n", adap_id ,addr);
-                                found = 1;
+        /* Force entries are done first, and are not affected by ignore
+           entries */
+        if (address_data->forces) {
+                unsigned short **forces = address_data->forces;
+                int kind;
+
+                for (kind = 0; forces[kind]; kind++) {
+                        for (i = 0; forces[kind][i] != I2C_CLIENT_END;
+                             i += 2) {
+                                if (forces[kind][i] == adap_id
+                                 || forces[kind][i] == ANY_I2C_BUS) {
+                                        dev_dbg(&adapter->dev, "found force "
+                                                "parameter for adapter %d, "
+                                                "addr 0x%02x, kind %d\n",
+                                                adap_id, forces[kind][i + 1],
+                                                kind);
+                                        err = i2c_probe_address(adapter,
+                                                forces[kind][i + 1],
+                                                kind, found_proc);
+                                        if (err)
+                                                return err;
+                                }
                         }
                 }
-                if (found) 
-                        continue;
+        }
 
-                /* Now, we will do a detection, but only if it is in the normal or 
-                   probe entries */  
-                for (i = 0;
-                     !found && (address_data->normal_i2c[i] != I2C_CLIENT_END);
-                     i += 1) {
-                        if (addr == address_data->normal_i2c[i]) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, "
-                                        "addr %02x\n", adap_id, addr);
-                        }
+        /* Probe entries are done second, and are not affected by ignore
+           entries either */
+        for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
+                if (address_data->probe[i] == adap_id
+                 || address_data->probe[i] == ANY_I2C_BUS) {
+                        dev_dbg(&adapter->dev, "found probe parameter for "
+                                "adapter %d, addr 0x%02x\n", adap_id,
+                                address_data->probe[i + 1]);
+                        err = i2c_probe_address(adapter,
+                                                address_data->probe[i + 1],
+                                                -1, found_proc);
+                        if (err)
+                                return err;
                 }
+        }
 
-                for (i = 0;
-                     !found && (address_data->probe[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adap_id == address_data->probe[i]) ||
-                            ((address_data->probe[i] == ANY_I2C_BUS))) &&
-                            (addr == address_data->probe[i+1])) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found probe parameter for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
+        /* Normal entries are done last, unless shadowed by an ignore entry */
+        for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
+                int j, ignore;
+
+                ignore = 0;
+                for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
+                     j += 2) {
+                        if ((address_data->ignore[j] == adap_id ||
+                             address_data->ignore[j] == ANY_I2C_BUS)
+                         && address_data->ignore[j + 1]
+                            == address_data->normal_i2c[i]) {
+                                dev_dbg(&adapter->dev, "found ignore "
+                                        "parameter for adapter %d, "
+                                        "addr 0x%02x\n", adap_id,
+                                        address_data->ignore[j + 1]);
                         }
+                        ignore = 1;
+                        break;
                 }
-                if (!found) 
+                if (ignore)
                         continue;
 
-                /* OK, so we really should examine this address. First check
-                   whether there is some client here at all! */
-                if (i2c_smbus_xfer(adapter,addr,0,0,0,I2C_SMBUS_QUICK,NULL) >= 0)
-                        if ((err = found_proc(adapter,addr,-1)))
-                                return err;
+                dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
+                        "addr 0x%02x\n", adap_id,
+                        address_data->normal_i2c[i]);
+                err = i2c_probe_address(adapter, address_data->normal_i2c[i],
+                                        -1, found_proc);
+                if (err)
+                        return err;
         }
-        return 0;
-}
 
-/*
- * return id number for a specific adapter
- */
-int i2c_adapter_id(struct i2c_adapter *adap)
-{
-        return adap->nr;
+        return 0;
 }
 
 struct i2c_adapter* i2c_get_adapter(int id)
@@ -1171,6 +1194,12 @@ s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
 }
 
 
+/* Next four are needed by i2c-isa */
+EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
+EXPORT_SYMBOL_GPL(i2c_adapter_driver);
+EXPORT_SYMBOL_GPL(i2c_adapter_class);
+EXPORT_SYMBOL_GPL(i2c_bus_type);
+
 EXPORT_SYMBOL(i2c_add_adapter);
 EXPORT_SYMBOL(i2c_del_adapter);
 EXPORT_SYMBOL(i2c_add_driver);
@@ -1186,7 +1215,6 @@ EXPORT_SYMBOL(i2c_master_send);
 EXPORT_SYMBOL(i2c_master_recv);
 EXPORT_SYMBOL(i2c_control);
 EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_adapter_id);
 EXPORT_SYMBOL(i2c_get_adapter);
 EXPORT_SYMBOL(i2c_put_adapter);
 EXPORT_SYMBOL(i2c_probe);
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index bc5d557e5dd9..aa7a4fadef64 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -434,7 +434,8 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
 
         devfs_mk_cdev(MKDEV(I2C_MAJOR, i2c_dev->minor),
                         S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i2c_dev->minor);
-        dev_dbg(&adap->dev, "Registered as minor %d\n", i2c_dev->minor);
+        pr_debug("i2c-dev: adapter [%s] registered as minor %d\n",
+                 adap->name, i2c_dev->minor);
 
         /* register this i2c device with the driver core */
         i2c_dev->adap = adap;
@@ -471,7 +472,7 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
         wait_for_completion(&i2c_dev->released);
         kfree(i2c_dev);
 
-        dev_dbg(&adap->dev, "Adapter unregistered\n");
+        pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
         return 0;
 }
 
diff --git a/drivers/i2c/i2c-sensor-detect.c b/drivers/i2c/i2c-sensor-detect.c
deleted file mode 100644
index f99a8161a9f1..000000000000
--- a/drivers/i2c/i2c-sensor-detect.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    i2c-sensor-detect.c - Part of lm_sensors, Linux kernel modules for hardware
-                          monitoring
-    Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl> and
-    Mark D. Studebaker <mdsxyz123@yahoo.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-
-static unsigned short empty[] = {I2C_CLIENT_END};
-static unsigned int empty_isa[] = {I2C_CLIENT_ISA_END};
-
-/* Very inefficient for ISA detects, and won't work for 10-bit addresses! */
-int i2c_detect(struct i2c_adapter *adapter,
-               struct i2c_address_data *address_data,
-               int (*found_proc) (struct i2c_adapter *, int, int))
-{
-        int addr, i, found, j, err;
-        struct i2c_force_data *this_force;
-        int is_isa = i2c_is_isa_adapter(adapter);
-        int adapter_id =
-            is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter);
-        unsigned short *normal_i2c;
-        unsigned int *normal_isa;
-        unsigned short *probe;
-        unsigned short *ignore;
-
-        /* Forget it if we can't probe using SMBUS_QUICK */
-        if ((!is_isa) &&
-            !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK))
-                return -1;
-        
-        /* Use default "empty" list if the adapter doesn't specify any */
-        normal_i2c = probe = ignore = empty;
-        normal_isa = empty_isa;
-        if (address_data->normal_i2c)
-                normal_i2c = address_data->normal_i2c;
-        if (address_data->normal_isa)
-                normal_isa = address_data->normal_isa;
-        if (address_data->probe)
-                probe = address_data->probe;
-        if (address_data->ignore)
-                ignore = address_data->ignore;
-
-        for (addr = 0x00; addr <= (is_isa ? 0xffff : 0x7f); addr++) {
-                if (!is_isa && i2c_check_addr(adapter, addr))
-                        continue;
-
-                /* If it is in one of the force entries, we don't do any
-                   detection at all */
-                found = 0;
-                for (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) {
-                        for (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) {
-                                if ( ((adapter_id == this_force->force[j]) ||
-                                      ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) &&
-                                      (addr == this_force->force[j + 1]) ) {
-                                        dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                        if ((err = found_proc(adapter, addr, this_force->kind)))
-                                                return err;
-                                        found = 1;
-                                }
-                        }
-                }
-                if (found)
-                        continue;
-
-                /* If this address is in one of the ignores, we can forget about it
-                   right now */
-                for (i = 0; !found && (ignore[i] != I2C_CLIENT_END); i += 2) {
-                        if ( ((adapter_id == ignore[i]) ||
-                              ((ignore[i] == ANY_I2C_BUS) &&
-                               !is_isa)) &&
-                              (addr == ignore[i + 1])) {
-                                dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                found = 1;
-                        }
-                }
-                if (found)
-                        continue;
-
-                /* Now, we will do a detection, but only if it is in the normal or 
-                   probe entries */
-                if (is_isa) {
-                        for (i = 0; !found && (normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) {
-                                if (addr == normal_isa[i]) {
-                                        dev_dbg(&adapter->dev, "found normal isa entry for adapter %d, addr %04x\n", adapter_id, addr);
-                                        found = 1;
-                                }
-                        }
-                } else {
-                        for (i = 0; !found && (normal_i2c[i] != I2C_CLIENT_END); i += 1) {
-                                if (addr == normal_i2c[i]) {
-                                        found = 1;
-                                        dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x\n", adapter_id, addr);
-                                }
-                        }
-                }
-
-                for (i = 0;
-                     !found && (probe[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adapter_id == probe[i]) ||
-                             ((probe[i] == ANY_I2C_BUS) && !is_isa))
-                            && (addr == probe[i + 1])) {
-                                dev_dbg(&adapter->dev, "found probe parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                found = 1;
-                        }
-                }
-                if (!found)
-                        continue;
-
-                /* OK, so we really should examine this address. First check
-                   whether there is some client here at all! */
-                if (is_isa ||
-                    (i2c_smbus_xfer (adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL) >= 0))
-                        if ((err = found_proc(adapter, addr, -1)))
-                                return err;
-        }
-        return 0;
-}
-
-EXPORT_SYMBOL(i2c_detect);
-
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
-              "Rudolf Marek <r.marek@sh.cvut.cz>");
-
-MODULE_DESCRIPTION("i2c-sensor driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/i2c-sensor-vid.c b/drivers/i2c/i2c-sensor-vid.c
deleted file mode 100644
index 922e22f054bb..000000000000
--- a/drivers/i2c/i2c-sensor-vid.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    i2c-sensor-vid.c -  Part of lm_sensors, Linux kernel modules for hardware
-                        monitoring
-
-    Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-
-struct vrm_model {
-        u8 vendor;
-        u8 eff_family;
-        u8 eff_model;
-        int vrm_type;
-};
-
-#define ANY 0xFF
-
-#ifdef CONFIG_X86
-
-static struct vrm_model vrm_models[] = {
-        {X86_VENDOR_AMD, 0x6, ANY, 90},         /* Athlon Duron etc */
-        {X86_VENDOR_AMD, 0xF, ANY, 24},         /* Athlon 64, Opteron */
-        {X86_VENDOR_INTEL, 0x6, 0x9, 85},       /* 0.13um too */
-        {X86_VENDOR_INTEL, 0x6, 0xB, 85},       /* 0xB Tualatin */
-        {X86_VENDOR_INTEL, 0x6, ANY, 82},       /* any P6 */
-        {X86_VENDOR_INTEL, 0x7, ANY, 0},        /* Itanium */
-        {X86_VENDOR_INTEL, 0xF, 0x3, 100},      /* P4 Prescott */
-        {X86_VENDOR_INTEL, 0xF, ANY, 90},       /* P4 before Prescott */
-        {X86_VENDOR_INTEL, 0x10,ANY, 0},        /* Itanium 2 */
-        {X86_VENDOR_UNKNOWN, ANY, ANY, 0}       /* stop here */
-        };
-
-static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
-{
-        int i = 0;
-
-        while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {
-                if (vrm_models[i].vendor==vendor)
-                        if ((vrm_models[i].eff_family==eff_family)&& \
-                        ((vrm_models[i].eff_model==eff_model)|| \
-                        (vrm_models[i].eff_model==ANY)))
-                                return vrm_models[i].vrm_type;
-                i++;
-        }
-
-        return 0;
-}
-
-int i2c_which_vrm(void)
-{
-        struct cpuinfo_x86 *c = cpu_data;
-        u32 eax;
-        u8 eff_family, eff_model;
-        int vrm_ret;
-
-        if (c->x86 < 6) return 0;       /* any CPU with familly lower than 6
-                                        dont have VID and/or CPUID */
-        eax = cpuid_eax(1);
-        eff_family = ((eax & 0x00000F00)>>8);
-        eff_model  = ((eax & 0x000000F0)>>4);
-        if (eff_family == 0xF) {        /* use extended model & family */
-                eff_family += ((eax & 0x00F00000)>>20);
-                eff_model += ((eax & 0x000F0000)>>16)<<4;
-        }
-        vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
-        if (vrm_ret == 0)
-                printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your"
-                " x86 CPU\n");
-        return vrm_ret;
-}
-
-/* and now for something completely different for Non-x86 world*/
-#else
-int i2c_which_vrm(void)
-{
-        printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your CPU\n");
-        return 0;
-}
-#endif
-
-EXPORT_SYMBOL(i2c_which_vrm);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index c9d3a00a3c0c..234f5de3e929 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -754,7 +754,7 @@ static int idedisk_issue_flush(request_queue_t *q, struct gendisk *disk,
 
         idedisk_prepare_flush(q, rq);
 
-        ret = blk_execute_rq(q, disk, rq);
+        ret = blk_execute_rq(q, disk, rq, 0);
 
         /*
          * if we failed and caller wants error offset, get it
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 248e3cc8b352..f174aee659e5 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -150,7 +150,7 @@ static void ide_complete_power_step(ide_drive_t *drive, struct request *rq, u8 s
 
         switch (rq->pm->pm_step) {
         case ide_pm_flush_cache:        /* Suspend step 1 (flush cache) complete */
-                if (rq->pm->pm_state == 4)
+                if (rq->pm->pm_state == PM_EVENT_FREEZE)
                         rq->pm->pm_step = ide_pm_state_completed;
                 else
                         rq->pm->pm_step = idedisk_pm_standby;
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index dae1bd5b8c3e..73ca8f73917d 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1229,7 +1229,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)
         rq.special = &args;
         rq.pm = &rqpm;
         rqpm.pm_step = ide_pm_state_start_suspend;
-        rqpm.pm_state = state;
+        rqpm.pm_state = state.event;
 
         return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
@@ -1248,7 +1248,7 @@ static int generic_ide_resume(struct device *dev)
         rq.special = &args;
         rq.pm = &rqpm;
         rqpm.pm_step = ide_pm_state_start_resume;
-        rqpm.pm_state = 0;
+        rqpm.pm_state = PM_EVENT_ON;
 
         return ide_do_drive_cmd(drive, &rq, ide_head_wait);
 }
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 10592cec6c43..24e21b2838c1 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -350,9 +350,9 @@ static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
 {
         ide_hwif_t              *hwif = NULL;
 
-        printk("SC1200: suspend(%u)\n", state);
+        printk("SC1200: suspend(%u)\n", state.event);
 
-        if (state == 0) {
+        if (state.event == PM_EVENT_ON) {
                 // we only save state when going from full power to less
 
                 //
@@ -386,8 +386,8 @@ static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
         /* You don't need to iterate over disks -- sysfs should have done that for you already */ 
 
         pci_disable_device(dev);
-        pci_set_power_state(dev,state);
-        dev->current_state = state;
+        pci_set_power_state(dev, pci_choose_state(dev, state));
+        dev->current_state = state.event;
         return 0;
 }
 
@@ -396,8 +396,8 @@ static int sc1200_resume (struct pci_dev *dev)
         ide_hwif_t      *hwif = NULL;
 
 printk("SC1200: resume\n");
-        pci_set_power_state(dev,0);     // bring chip back from sleep state
-        dev->current_state = 0;
+        pci_set_power_state(dev, PCI_D0);       // bring chip back from sleep state
+        dev->current_state = PM_EVENT_ON;
         pci_enable_device(dev);
         //
         // loop over all interfaces that are part of this pci device:
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index ea65b070a367..87d1f8a1f41e 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1504,12 +1504,12 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
 }
 
 static int
-pmac_ide_macio_suspend(struct macio_dev *mdev, u32 state)
+pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t state)
 {
         ide_hwif_t      *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);
         int             rc = 0;
 
-        if (state != mdev->ofdev.dev.power.power_state && state >= 2) {
+        if (state.event != mdev->ofdev.dev.power.power_state.event && state.event >= PM_EVENT_SUSPEND) {
                 rc = pmac_ide_do_suspend(hwif);
                 if (rc == 0)
                         mdev->ofdev.dev.power.power_state = state;
@@ -1524,10 +1524,10 @@ pmac_ide_macio_resume(struct macio_dev *mdev)
         ide_hwif_t      *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);
         int             rc = 0;
         
-        if (mdev->ofdev.dev.power.power_state != 0) {
+        if (mdev->ofdev.dev.power.power_state.event != PM_EVENT_ON) {
                 rc = pmac_ide_do_resume(hwif);
                 if (rc == 0)
-                        mdev->ofdev.dev.power.power_state = 0;
+                        mdev->ofdev.dev.power.power_state = PMSG_ON;
         }
 
         return rc;
@@ -1608,12 +1608,12 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 }
 
 static int
-pmac_ide_pci_suspend(struct pci_dev *pdev, u32 state)
+pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         ide_hwif_t      *hwif = (ide_hwif_t *)pci_get_drvdata(pdev);
         int             rc = 0;
         
-        if (state != pdev->dev.power.power_state && state >= 2) {
+        if (state.event != pdev->dev.power.power_state.event && state.event >= 2) {
                 rc = pmac_ide_do_suspend(hwif);
                 if (rc == 0)
                         pdev->dev.power.power_state = state;
@@ -1628,10 +1628,10 @@ pmac_ide_pci_resume(struct pci_dev *pdev)
         ide_hwif_t      *hwif = (ide_hwif_t *)pci_get_drvdata(pdev);
         int             rc = 0;
         
-        if (pdev->dev.power.power_state != 0) {
+        if (pdev->dev.power.power_state.event != PM_EVENT_ON) {
                 rc = pmac_ide_do_resume(hwif);
                 if (rc == 0)
-                        pdev->dev.power.power_state = 0;
+                        pdev->dev.power.power_state = PMSG_ON;
         }
 
         return rc;
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index bebcc47ab06c..b23322523ef5 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1068,6 +1068,8 @@ static int nodemgr_hotplug(struct class_device *cdev, char **envp, int num_envp,
         struct unit_directory *ud;
         int i = 0;
         int length = 0;
+        /* ieee1394:venNmoNspNverN */
+        char buf[8 + 1 + 3 + 8 + 2 + 8 + 2 + 8 + 3 + 8 + 1];
 
         if (!cdev)
                 return -ENODEV;
@@ -1094,6 +1096,12 @@ do {								\
         PUT_ENVP("GUID=%016Lx", (unsigned long long)ud->ne->guid);
         PUT_ENVP("SPECIFIER_ID=%06x", ud->specifier_id);
         PUT_ENVP("VERSION=%06x", ud->version);
+        snprintf(buf, sizeof(buf), "ieee1394:ven%08Xmo%08Xsp%08Xver%08X",
+                        ud->vendor_id,
+                        ud->model_id,
+                        ud->specifier_id,
+                        ud->version);
+        PUT_ENVP("MODALIAS=%s", buf);
 
 #undef PUT_ENVP
 
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 36074e6eeebb..6b1ab875333b 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -1464,26 +1464,6 @@ static int __devinit add_card(struct pci_dev *dev,
                                                   { 0x50, I2C_M_RD, 20, (unsigned char*) lynx->bus_info_block }
                                                 };
 
-
-#ifdef CONFIG_IEEE1394_VERBOSEDEBUG
-                        union i2c_smbus_data data;
-
-                        if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_WRITE, 0, I2C_SMBUS_BYTE,NULL))
-                                PRINT(KERN_ERR, lynx->id,"eeprom read start has failed");
-                        else
-                        {
-                                u16 addr;
-                                for (addr=0x00; addr < 0x100; addr++) {
-                                        if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE,& data)) {
-                                                PRINT(KERN_ERR, lynx->id, "unable to read i2c %x", addr);
-                                                break;
-                                        }
-                                        else
-                                                PRINT(KERN_DEBUG, lynx->id,"got serial eeprom data at %x: %x",addr, data.byte);
-                                }
-                        }
-#endif
-
                         /* we use i2c_transfer, because i2c_smbus_read_block_data does not work properly and we
                            do it more efficiently in one transaction rather then using several reads */
                         if (i2c_transfer(i2c_ad, msg, 2) < 0) {
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index fae1c2dcee51..211ba3223f65 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -463,7 +463,7 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *,
                 return NULL;
 
         for (i = 0; i < len; i++) {
-                element = kcalloc(1, sizeof(struct port_table_attribute),
+                element = kzalloc(sizeof(struct port_table_attribute),
                                   GFP_KERNEL);
                 if (!element)
                         goto err;
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 20e3a165989f..19c14c4beb44 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -160,6 +160,8 @@ struct input_event_compat {
 #  define COMPAT_TEST IS_IA32_PROCESS(ia64_task_regs(current))
 #elif defined(CONFIG_ARCH_S390)
 #  define COMPAT_TEST test_thread_flag(TIF_31BIT)
+#elif defined(CONFIG_MIPS)
+#  define COMPAT_TEST (current->thread.mflags & MF_32BIT_ADDR)
 #else
 #  define COMPAT_TEST test_thread_flag(TIF_32BIT)
 #endif
@@ -391,6 +393,7 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                                 case EV_LED: bits = dev->ledbit; len = LED_MAX; break;
                                                 case EV_SND: bits = dev->sndbit; len = SND_MAX; break;
                                                 case EV_FF:  bits = dev->ffbit;  len = FF_MAX;  break;
+                                                case EV_SW:  bits = dev->swbit;  len = SW_MAX;  break;
                                                 default: return -EINVAL;
                                         }
                                         len = NBITS(len) * sizeof(long);
@@ -419,6 +422,13 @@ static long evdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                         return copy_to_user(p, dev->snd, len) ? -EFAULT : len;
                                 }
 
+                                if (_IOC_NR(cmd) == _IOC_NR(EVIOCGSW(0))) {
+                                        int len;
+                                        len = NBITS(SW_MAX) * sizeof(long);
+                                        if (len > _IOC_SIZE(cmd)) len = _IOC_SIZE(cmd);
+                                        return copy_to_user(p, dev->sw, len) ? -EFAULT : len;
+                                }
+
                                 if (_IOC_NR(cmd) == _IOC_NR(EVIOCGNAME(0))) {
                                         int len;
                                         if (!dev->name) return -ENOENT;
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
index a0118038330a..462f8d300aae 100644
--- a/drivers/input/gameport/emu10k1-gp.c
+++ b/drivers/input/gameport/emu10k1-gp.c
@@ -75,7 +75,7 @@ static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id
         if (!request_region(ioport, iolen, "emu10k1-gp"))
                 return -EBUSY;
 
-        emu = kcalloc(1, sizeof(struct emu), GFP_KERNEL);
+        emu = kzalloc(sizeof(struct emu), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!emu || !port) {
                 printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index 57615bc63906..47e93daa0fa7 100644
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -83,7 +83,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
         struct fm801_gp *gp;
         struct gameport *port;
 
-        gp = kcalloc(1, sizeof(struct fm801_gp), GFP_KERNEL);
+        gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!gp || !port) {
                 printk(KERN_ERR "fm801-gp: Memory allocation failed\n");
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index 70f051894a3c..d2e55dc956ba 100644
--- a/drivers/input/gameport/ns558.c
+++ b/drivers/input/gameport/ns558.c
@@ -142,7 +142,7 @@ static int ns558_isa_probe(int io)
                         return -EBUSY;
         }
 
-        ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL);
+        ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!ns558 || !port) {
                 printk(KERN_ERR "ns558: Memory allocation failed.\n");
@@ -215,7 +215,7 @@ static int ns558_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *did)
         if (!request_region(ioport, iolen, "ns558-pnp"))
                 return -EBUSY;
 
-        ns558 = kcalloc(1, sizeof(struct ns558), GFP_KERNEL);
+        ns558 = kzalloc(sizeof(struct ns558), GFP_KERNEL);
         port = gameport_allocate_port();
         if (!ns558 || !port) {
                 printk(KERN_ERR "ns558: Memory allocation failed\n");
diff --git a/drivers/input/input.c b/drivers/input/input.c
index a275211c8e1e..88636a204525 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -89,6 +89,15 @@ void input_event(struct input_dev *dev, unsigned int type, unsigned int code, in
 
                         break;
 
+                case EV_SW:
+
+                        if (code > SW_MAX || !test_bit(code, dev->swbit) || !!test_bit(code, dev->sw) == value)
+                                return;
+
+                        change_bit(code, dev->sw);
+
+                        break;
+
                 case EV_ABS:
 
                         if (code > ABS_MAX || !test_bit(code, dev->absbit))
@@ -402,6 +411,7 @@ static void input_call_hotplug(char *verb, struct input_dev *dev)
         SPRINTF_BIT_A2(ledbit, "LED=", LED_MAX, EV_LED);
         SPRINTF_BIT_A2(sndbit, "SND=", SND_MAX, EV_SND);
         SPRINTF_BIT_A2(ffbit,  "FF=",  FF_MAX, EV_FF);
+        SPRINTF_BIT_A2(swbit,  "SW=",  SW_MAX, EV_SW);
 
         envp[i++] = NULL;
 
@@ -490,6 +500,7 @@ static int input_devices_read(char *buf, char **start, off_t pos, int count, int
                 SPRINTF_BIT_B2(ledbit, "LED=", LED_MAX, EV_LED);
                 SPRINTF_BIT_B2(sndbit, "SND=", SND_MAX, EV_SND);
                 SPRINTF_BIT_B2(ffbit,  "FF=",  FF_MAX, EV_FF);
+                SPRINTF_BIT_B2(swbit,  "SW=",  SW_MAX, EV_SW);
 
                 len += sprintf(buf + len, "\n");
 
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index bf34f75b9467..bf65430181fa 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -269,7 +269,7 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i;
         int err;
 
-        if (!(a3d = kcalloc(1, sizeof(struct a3d), GFP_KERNEL)))
+        if (!(a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL)))
                 return -ENOMEM;
 
         a3d->gameport = gameport;
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 265962956c63..cf35ae638a0d 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -469,7 +469,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i;
         int err;
 
-        if (!(port = kcalloc(1, sizeof(struct adi_port), GFP_KERNEL)))
+        if (!(port = kzalloc(sizeof(struct adi_port), GFP_KERNEL)))
                 return -ENOMEM;
 
         port->gameport = gameport;
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index c3a5739030c3..64b1313a3c66 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -655,7 +655,7 @@ static int analog_connect(struct gameport *gameport, struct gameport_driver *drv
         int i;
         int err;
 
-        if (!(port = kcalloc(1, sizeof(struct analog_port), GFP_KERNEL)))
+        if (!(port = kzalloc(sizeof(struct analog_port), GFP_KERNEL)))
                 return - ENOMEM;
 
         err = analog_init_port(gameport, drv, port);
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index a6002205328f..0b2e9fa26579 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -163,7 +163,7 @@ static int cobra_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i, j;
         int err;
 
-        if (!(cobra = kcalloc(1, sizeof(struct cobra), GFP_KERNEL)))
+        if (!(cobra = kzalloc(sizeof(struct cobra), GFP_KERNEL)))
                 return -ENOMEM;
 
         cobra->gameport = gameport;
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index fbd3eed07f90..2a3e4bb2da50 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -572,7 +572,7 @@ static struct db9 __init *db9_probe(int *config, int nargs)
                 }
         }
 
-        if (!(db9 = kcalloc(1, sizeof(struct db9), GFP_KERNEL))) {
+        if (!(db9 = kzalloc(sizeof(struct db9), GFP_KERNEL))) {
                 parport_put_port(pp);
                 return NULL;
         }
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 95bbdd302aad..5427bf9fc862 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -554,7 +554,7 @@ static struct gc __init *gc_probe(int *config, int nargs)
                 return NULL;
         }
 
-        if (!(gc = kcalloc(1, sizeof(struct gc), GFP_KERNEL))) {
+        if (!(gc = kzalloc(sizeof(struct gc), GFP_KERNEL))) {
                 parport_put_port(pp);
                 return NULL;
         }
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index 7d969420066c..8e4f92b115e6 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -242,7 +242,7 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
         unsigned char data[GF2K_LENGTH];
         int i, err;
 
-        if (!(gf2k = kcalloc(1, sizeof(struct gf2k), GFP_KERNEL)))
+        if (!(gf2k = kzalloc(sizeof(struct gf2k), GFP_KERNEL)))
                 return -ENOMEM;
 
         gf2k->gameport = gameport;
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index d1500d2562d6..9d3f910dd568 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -301,7 +301,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i, j, t;
         int err;
 
-        if (!(grip = kcalloc(1, sizeof(struct grip), GFP_KERNEL)))
+        if (!(grip = kzalloc(sizeof(struct grip), GFP_KERNEL)))
                 return -ENOMEM;
 
         grip->gameport = gameport;
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 0da7bd133ccf..da17eee6f574 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -607,7 +607,7 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
         struct grip_mp *grip;
         int err;
 
-        if (!(grip = kcalloc(1, sizeof(struct grip_mp), GFP_KERNEL)))
+        if (!(grip = kzalloc(sizeof(struct grip_mp), GFP_KERNEL)))
                 return -ENOMEM;
 
         grip->gameport = gameport;
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index f93da7bc082d..6a70ec429f06 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -183,7 +183,7 @@ static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
         int i, t;
         int err;
 
-        if (!(guillemot = kcalloc(1, sizeof(struct guillemot), GFP_KERNEL)))
+        if (!(guillemot = kzalloc(sizeof(struct guillemot), GFP_KERNEL)))
                 return -ENOMEM;
 
         guillemot->gameport = gameport;
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 9d3f8c38cb09..d7b3472bd686 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -212,7 +212,7 @@ static int interact_connect(struct gameport *gameport, struct gameport_driver *d
         int i, t;
         int err;
 
-        if (!(interact = kcalloc(1, sizeof(struct interact), GFP_KERNEL)))
+        if (!(interact = kzalloc(sizeof(struct interact), GFP_KERNEL)))
                 return -ENOMEM;
 
         interact->gameport = gameport;
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 47144a7ed9e7..9e0353721a35 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -590,7 +590,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
 
         comment[0] = 0;
 
-        sw = kcalloc(1, sizeof(struct sw), GFP_KERNEL);
+        sw = kzalloc(sizeof(struct sw), GFP_KERNEL);
         buf = kmalloc(SW_LENGTH, GFP_KERNEL);
         idbuf = kmalloc(SW_LENGTH, GFP_KERNEL);
         if (!sw || !buf || !idbuf) {
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 9eb9954cac6e..7431efc4330e 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -262,7 +262,7 @@ static int tmdc_connect(struct gameport *gameport, struct gameport_driver *drv)
         int i, j, k, l, m;
         int err;
 
-        if (!(tmdc = kcalloc(1, sizeof(struct tmdc), GFP_KERNEL)))
+        if (!(tmdc = kzalloc(sizeof(struct tmdc), GFP_KERNEL)))
                 return -ENOMEM;
 
         tmdc->gameport = gameport;
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 28100d461cb7..0c5b9c8297cd 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -178,7 +178,7 @@ static struct tgfx __init *tgfx_probe(int *config, int nargs)
                 return NULL;
         }
 
-        if (!(tgfx = kcalloc(1, sizeof(struct tgfx), GFP_KERNEL))) {
+        if (!(tgfx = kzalloc(sizeof(struct tgfx), GFP_KERNEL))) {
                 parport_put_port(pp);
                 return NULL;
         }
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index a8551711e8d6..cd4b6e795013 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
+#include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <asm/irq.h>
@@ -32,7 +33,6 @@
 /* zero code, 124 scancodes + 3 hinge combinations */
 #define NR_SCANCODES            ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 +3 )
 #define SCAN_INTERVAL           (HZ/10)
-#define CORGIKBD_PRESSED        1
 
 #define HINGE_SCAN_INTERVAL             (HZ/4)
 
@@ -73,25 +73,13 @@ struct corgikbd {
         struct input_dev input;
         char phys[32];
 
-        unsigned char state[ARRAY_SIZE(corgikbd_keycode)];
         spinlock_t lock;
-
         struct timer_list timer;
         struct timer_list htimer;
-};
 
-static void handle_scancode(unsigned int pressed,unsigned int scancode, struct corgikbd *corgikbd_data)
-{
-        if (pressed && !(corgikbd_data->state[scancode] & CORGIKBD_PRESSED)) {
-                corgikbd_data->state[scancode] |= CORGIKBD_PRESSED;
-                input_report_key(&corgikbd_data->input, corgikbd_data->keycode[scancode], 1);
-                if (corgikbd_data->keycode[scancode] == CORGI_KEY_OFF)
-                        input_event(&corgikbd_data->input, EV_PWR, CORGI_KEY_OFF, 1);
-        } else if (!pressed && corgikbd_data->state[scancode] & CORGIKBD_PRESSED) {
-                corgikbd_data->state[scancode] &= ~CORGIKBD_PRESSED;
-                input_report_key(&corgikbd_data->input, corgikbd_data->keycode[scancode], 0);
-        }
-}
+        unsigned int suspended;
+        unsigned long suspend_jiffies;
+};
 
 #define KB_DISCHARGE_DELAY      10
 #define KB_ACTIVATE_DELAY       10
@@ -105,36 +93,36 @@ static void handle_scancode(unsigned int pressed,unsigned int scancode, struct c
  */
 static inline void corgikbd_discharge_all(void)
 {
-        // STROBE All HiZ
+        /* STROBE All HiZ */
         GPCR2  = CORGI_GPIO_ALL_STROBE_BIT;
         GPDR2 &= ~CORGI_GPIO_ALL_STROBE_BIT;
 }
 
 static inline void corgikbd_activate_all(void)
 {
-        // STROBE ALL -> High
+        /* STROBE ALL -> High */
         GPSR2  = CORGI_GPIO_ALL_STROBE_BIT;
         GPDR2 |= CORGI_GPIO_ALL_STROBE_BIT;
 
         udelay(KB_DISCHARGE_DELAY);
 
-        // Clear any interrupts we may have triggered when altering the GPIO lines
+        /* Clear any interrupts we may have triggered when altering the GPIO lines */
         GEDR1 = CORGI_GPIO_HIGH_SENSE_BIT;
         GEDR2 = CORGI_GPIO_LOW_SENSE_BIT;
 }
 
 static inline void corgikbd_activate_col(int col)
 {
-        // STROBE col -> High, not col -> HiZ
+        /* STROBE col -> High, not col -> HiZ */
         GPSR2 = CORGI_GPIO_STROBE_BIT(col);
         GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col);
 }
 
 static inline void corgikbd_reset_col(int col)
 {
-        // STROBE col -> Low
+        /* STROBE col -> Low */
         GPCR2 = CORGI_GPIO_STROBE_BIT(col);
-        // STROBE col -> out, not col -> HiZ
+        /* STROBE col -> out, not col -> HiZ */
         GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col);
 }
 
@@ -149,10 +137,13 @@ static inline void corgikbd_reset_col(int col)
 /* Scan the hardware keyboard and push any changes up through the input layer */
 static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data, struct pt_regs *regs)
 {
-        unsigned int row, col, rowd, scancode;
+        unsigned int row, col, rowd;
         unsigned long flags;
         unsigned int num_pressed;
 
+        if (corgikbd_data->suspended)
+                return;
+
         spin_lock_irqsave(&corgikbd_data->lock, flags);
 
         if (regs)
@@ -173,10 +164,21 @@ static void corgikbd_scankeyboard(struct corgikbd *corgikbd_data, struct pt_regs
 
                 rowd = GET_ROWS_STATUS(col);
                 for (row = 0; row < KB_ROWS; row++) {
+                        unsigned int scancode, pressed;
+
                         scancode = SCANCODE(row, col);
-                        handle_scancode((rowd & KB_ROWMASK(row)), scancode, corgikbd_data);
-                        if (rowd & KB_ROWMASK(row))
+                        pressed = rowd & KB_ROWMASK(row);
+
+                        input_report_key(&corgikbd_data->input, corgikbd_data->keycode[scancode], pressed);
+
+                        if (pressed)
                                 num_pressed++;
+
+                        if (pressed && (corgikbd_data->keycode[scancode] == CORGI_KEY_OFF)
+                                        && time_after(jiffies, corgikbd_data->suspend_jiffies + HZ)) {
+                                input_event(&corgikbd_data->input, EV_PWR, CORGI_KEY_OFF, 1);
+                                corgikbd_data->suspend_jiffies=jiffies;
+                        }
                 }
                 corgikbd_reset_col(col);
         }
@@ -221,8 +223,11 @@ static void corgikbd_timer_callback(unsigned long data)
  * The hinge switches generate no interrupt so they need to be
  * monitored by a timer.
  *
- * When we detect changes, we debounce it and then pass the three
- * positions the system can take as keypresses to the input system.
+ * We debounce the switches and pass them to the input system.
+ *
+ *  gprr == 0x00 - Keyboard with Landscape Screen
+ *          0x08 - No Keyboard with Portrait Screen
+ *          0x0c - Keyboard and Screen Closed
  */
 
 #define HINGE_STABLE_COUNT 2
@@ -235,7 +240,7 @@ static void corgikbd_hinge_timer(unsigned long data)
         unsigned long gprr;
         unsigned long flags;
 
-        gprr = read_scoop_reg(SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB);
+        gprr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_GPRR) & (CORGI_SCP_SWA | CORGI_SCP_SWB);
         if (gprr != sharpsl_hinge_state) {
                 hinge_count = 0;
                 sharpsl_hinge_state = gprr;
@@ -244,9 +249,8 @@ static void corgikbd_hinge_timer(unsigned long data)
                 if (hinge_count >= HINGE_STABLE_COUNT) {
                         spin_lock_irqsave(&corgikbd_data->lock, flags);
 
-                        handle_scancode((sharpsl_hinge_state == 0x00), 125, corgikbd_data); /* Keyboard with Landscape Screen */
-                        handle_scancode((sharpsl_hinge_state == 0x08), 126, corgikbd_data); /* No Keyboard with Portrait Screen */
-                        handle_scancode((sharpsl_hinge_state == 0x0c), 127, corgikbd_data); /* Keyboard and Screen Closed  */
+                        input_report_switch(&corgikbd_data->input, SW_0, ((sharpsl_hinge_state & CORGI_SCP_SWA) != 0));
+                        input_report_switch(&corgikbd_data->input, SW_1, ((sharpsl_hinge_state & CORGI_SCP_SWB) != 0));
                         input_sync(&corgikbd_data->input);
 
                         spin_unlock_irqrestore(&corgikbd_data->lock, flags);
@@ -255,19 +259,45 @@ static void corgikbd_hinge_timer(unsigned long data)
         mod_timer(&corgikbd_data->htimer, jiffies + HINGE_SCAN_INTERVAL);
 }
 
+#ifdef CONFIG_PM
+static int corgikbd_suspend(struct device *dev, pm_message_t state, uint32_t level)
+{
+        if (level == SUSPEND_POWER_DOWN) {
+                struct corgikbd *corgikbd = dev_get_drvdata(dev);
+                corgikbd->suspended = 1;
+        }
+        return 0;
+}
+
+static int corgikbd_resume(struct device *dev, uint32_t level)
+{
+        if (level == RESUME_POWER_ON) {
+                struct corgikbd *corgikbd = dev_get_drvdata(dev);
+
+                /* Upon resume, ignore the suspend key for a short while */
+                corgikbd->suspend_jiffies=jiffies;
+                corgikbd->suspended = 0;
+        }
+        return 0;
+}
+#else
+#define corgikbd_suspend        NULL
+#define corgikbd_resume         NULL
+#endif
+
 static int __init corgikbd_probe(struct device *dev)
 {
         int i;
         struct corgikbd *corgikbd;
 
-        corgikbd = kcalloc(1, sizeof(struct corgikbd), GFP_KERNEL);
+        corgikbd = kzalloc(sizeof(struct corgikbd), GFP_KERNEL);
         if (!corgikbd)
                 return -ENOMEM;
 
         dev_set_drvdata(dev,corgikbd);
         strcpy(corgikbd->phys, "corgikbd/input0");
 
-        spin_lock_init(corgikbd->lock);
+        spin_lock_init(&corgikbd->lock);
 
         /* Init Keyboard rescan timer */
         init_timer(&corgikbd->timer);
@@ -279,6 +309,8 @@ static int __init corgikbd_probe(struct device *dev)
         corgikbd->htimer.function = corgikbd_hinge_timer;
         corgikbd->htimer.data = (unsigned long) corgikbd;
 
+        corgikbd->suspend_jiffies=jiffies;
+
         init_input_dev(&corgikbd->input);
         corgikbd->input.private = corgikbd;
         corgikbd->input.name = "Corgi Keyboard";
@@ -288,7 +320,7 @@ static int __init corgikbd_probe(struct device *dev)
         corgikbd->input.id.vendor = 0x0001;
         corgikbd->input.id.product = 0x0001;
         corgikbd->input.id.version = 0x0100;
-        corgikbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR);
+        corgikbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP) | BIT(EV_PWR) | BIT(EV_SW);
         corgikbd->input.keycode = corgikbd->keycode;
         corgikbd->input.keycodesize = sizeof(unsigned char);
         corgikbd->input.keycodemax = ARRAY_SIZE(corgikbd_keycode);
@@ -297,6 +329,8 @@ static int __init corgikbd_probe(struct device *dev)
         for (i = 0; i < ARRAY_SIZE(corgikbd_keycode); i++)
                 set_bit(corgikbd->keycode[i], corgikbd->input.keybit);
         clear_bit(0, corgikbd->input.keybit);
+        set_bit(SW_0, corgikbd->input.swbit);
+        set_bit(SW_1, corgikbd->input.swbit);
 
         input_register_device(&corgikbd->input);
         mod_timer(&corgikbd->htimer, jiffies + HINGE_SCAN_INTERVAL);
@@ -343,6 +377,8 @@ static struct device_driver corgikbd_driver = {
         .bus            = &platform_bus_type,
         .probe          = corgikbd_probe,
         .remove         = corgikbd_remove,
+        .suspend        = corgikbd_suspend,
+        .resume         = corgikbd_resume,
 };
 
 static int __devinit corgikbd_init(void)
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 2bb2fe78bdca..12bdd3eff923 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -883,7 +883,7 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv)
                 psmouse_deactivate(parent);
         }
 
-        if (!(psmouse = kcalloc(1, sizeof(struct psmouse), GFP_KERNEL))) {
+        if (!(psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL))) {
                 retval = -ENOMEM;
                 goto out;
         }
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 79ca38469159..1bd88fca0542 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -87,7 +87,7 @@ static int serport_ldisc_open(struct tty_struct *tty)
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        serport = kcalloc(1, sizeof(struct serport), GFP_KERNEL);
+        serport = kzalloc(sizeof(struct serport), GFP_KERNEL);
         if (!serport)
                 return -ENOMEM;
 
@@ -165,7 +165,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, u
         if (test_and_set_bit(SERPORT_BUSY, &serport->flags))
                 return -EBUSY;
 
-        serport->serio = serio = kcalloc(1, sizeof(struct serio), GFP_KERNEL);
+        serport->serio = serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!serio)
                 return -ENOMEM;
 
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c
index 3f8b61cfbc37..5d19261b884f 100644
--- a/drivers/input/touchscreen/corgi_ts.c
+++ b/drivers/input/touchscreen/corgi_ts.c
@@ -53,11 +53,8 @@ struct corgi_ts {
 
 #define SyncHS()        while((STATUS_HSYNC) == 0); while((STATUS_HSYNC) != 0);
 #define CCNT(a)         asm volatile ("mrc p14, 0, %0, C1, C0, 0" : "=r"(a))
-#define CCNT_ON()       {int pmnc = 1; asm volatile ("mcr p14, 0, %0, C0, C0, 0" : : "r"(pmnc));}
-#define CCNT_OFF()      {int pmnc = 0; asm volatile ("mcr p14, 0, %0, C0, C0, 0" : : "r"(pmnc));}
-
-#define WAIT_HS_400_VGA         7013U   // 17.615us
-#define WAIT_HS_400_QVGA        16622U  // 41.750us
+#define PMNC_GET(x)     asm volatile ("mrc p14, 0, %0, C0, C0, 0" : "=r"(x))
+#define PMNC_SET(x)     asm volatile ("mcr p14, 0, %0, C0, C0, 0" : : "r"(x))
 
 
 /* ADS7846 Touch Screen Controller bit definitions */
@@ -69,41 +66,29 @@ struct corgi_ts {
 #define ADSCTRL_STS             (1u << 7)       /* Start Bit */
 
 /* External Functions */
-extern int w100fb_get_xres(void);
-extern int w100fb_get_blanking(void);
-extern int w100fb_get_fastsysclk(void);
+extern unsigned long w100fb_get_hsynclen(struct device *dev);
 extern unsigned int get_clk_frequency_khz(int info);
 
 static unsigned long calc_waittime(void)
 {
-        int w100fb_xres = w100fb_get_xres();
-        unsigned int waittime = 0;
-
-        if (w100fb_xres == 480 || w100fb_xres == 640) {
-                waittime = WAIT_HS_400_VGA * get_clk_frequency_khz(0) / 398131U;
-
-                if (w100fb_get_fastsysclk() == 100)
-                        waittime = waittime * 75 / 100;
-
-                if (w100fb_xres == 640)
-                        waittime *= 3;
+        unsigned long hsync_len = w100fb_get_hsynclen(&corgifb_device.dev);
 
-                return waittime;
-        }
-
-        return WAIT_HS_400_QVGA * get_clk_frequency_khz(0) / 398131U;
+        if (hsync_len)
+                return get_clk_frequency_khz(0)*1000/hsync_len;
+        else
+                return 0;
 }
 
 static int sync_receive_data_send_cmd(int doRecive, int doSend, unsigned int address, unsigned long wait_time)
 {
+        unsigned long timer1 = 0, timer2, pmnc = 0;
         int pos = 0;
-        unsigned long timer1 = 0, timer2;
-        int dosleep;
 
-        dosleep = !w100fb_get_blanking();
+        if (wait_time && doSend) {
+                PMNC_GET(pmnc);
+                if (!(pmnc & 0x01))
+                        PMNC_SET(0x01);
 
-        if (dosleep && doSend) {
-                CCNT_ON();
                 /* polling HSync */
                 SyncHS();
                 /* get CCNT */
@@ -119,11 +104,11 @@ static int sync_receive_data_send_cmd(int doRecive, int doSend, unsigned int add
                 corgi_ssp_ads7846_put(cmd);
                 corgi_ssp_ads7846_get();
 
-                if (dosleep) {
+                if (wait_time) {
                         /* Wait after HSync */
                         CCNT(timer2);
                         if (timer2-timer1 > wait_time) {
-                                /* timeout */
+                                /* too slow - timeout, try again */
                                 SyncHS();
                                 /* get OSCR */
                                 CCNT(timer1);
@@ -134,8 +119,8 @@ static int sync_receive_data_send_cmd(int doRecive, int doSend, unsigned int add
                                 CCNT(timer2);
                 }
                 corgi_ssp_ads7846_put(cmd);
-                if (dosleep)
-                        CCNT_OFF();
+                if (wait_time && !(pmnc & 0x01))
+                        PMNC_SET(pmnc);
         }
         return pos;
 }
@@ -244,7 +229,7 @@ static irqreturn_t ts_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_PM
-static int corgits_suspend(struct device *dev, uint32_t state, uint32_t level)
+static int corgits_suspend(struct device *dev, pm_message_t state, uint32_t level)
 {
         if (level == SUSPEND_POWER_DOWN) {
                 struct corgi_ts *corgi_ts = dev_get_drvdata(dev);
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 17cf7663c582..26c545fa223b 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/major.h>
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
@@ -1242,6 +1241,8 @@ struct IsdnCardState {
 
 #ifdef CONFIG_HISAX_ENTERNOW_PCI
 #define CARD_FN_ENTERNOW_PCI 1
+#else
+#define CARD_FN_ENTERNOW_PCI 0
 #endif
 
 #define TEI_PER_CARD 1
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
index f47f2b9846d8..38619e8cd823 100644
--- a/drivers/isdn/i4l/isdn_v110.c
+++ b/drivers/isdn/i4l/isdn_v110.c
@@ -516,11 +516,11 @@ buffer_full:
 }
 
 int
-isdn_v110_stat_callback(int idx, isdn_ctrl * c)
+isdn_v110_stat_callback(int idx, isdn_ctrl *c)
 {
         isdn_v110_stream *v = NULL;
         int i;
-        int ret;
+        int ret = 0;
 
         if (idx < 0)
                 return 0;
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 7c16c25fc5d4..c0712a1ea5af 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -708,7 +708,7 @@ static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state)
 {
         struct media_bay_info   *bay = macio_get_drvdata(mdev);
 
-        if (state != mdev->ofdev.dev.power.power_state && state == PM_SUSPEND_MEM) {
+        if (state.event != mdev->ofdev.dev.power.power_state.event && state.event == PM_EVENT_SUSPEND) {
                 down(&bay->lock);
                 bay->sleeping = 1;
                 set_mb_power(bay, 0);
@@ -723,8 +723,8 @@ static int __pmac media_bay_resume(struct macio_dev *mdev)
 {
         struct media_bay_info   *bay = macio_get_drvdata(mdev);
 
-        if (mdev->ofdev.dev.power.power_state != 0) {
-                mdev->ofdev.dev.power.power_state = 0;
+        if (mdev->ofdev.dev.power.power_state.event != PM_EVENT_ON) {
+                mdev->ofdev.dev.power.power_state = PMSG_ON;
 
                 /* We re-enable the bay using it's previous content
                    only if it did not change. Note those bozo timings,
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 4a0a0ad2d03c..645a2e5c70ab 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -3065,7 +3065,7 @@ static int pmu_sys_suspended = 0;
 
 static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
 {
-        if (state != PM_SUSPEND_DISK || pmu_sys_suspended)
+        if (state.event != PM_EVENT_SUSPEND || pmu_sys_suspended)
                 return 0;
 
         /* Suspend PMU event interrupts */
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index d0a4bab220e5..b82bc3150476 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -144,7 +144,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
         }
 
         /* Hash the cipher key with the given hash algorithm */
-        hash_tfm = crypto_alloc_tfm(opts, 0);
+        hash_tfm = crypto_alloc_tfm(opts, CRYPTO_TFM_REQ_MAY_SLEEP);
         if (hash_tfm == NULL) {
                 ti->error = PFX "Error initializing ESSIV hash";
                 return -EINVAL;
@@ -172,7 +172,8 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
 
         /* Setup the essiv_tfm with the given salt */
         essiv_tfm = crypto_alloc_tfm(crypto_tfm_alg_name(cc->tfm),
-                                     CRYPTO_TFM_MODE_ECB);
+                                     CRYPTO_TFM_MODE_ECB |
+                                     CRYPTO_TFM_REQ_MAY_SLEEP);
         if (essiv_tfm == NULL) {
                 ti->error = PFX "Error allocating crypto tfm for ESSIV";
                 kfree(salt);
@@ -587,7 +588,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad1;
         }
 
-        tfm = crypto_alloc_tfm(cipher, crypto_flags);
+        tfm = crypto_alloc_tfm(cipher, crypto_flags | CRYPTO_TFM_REQ_MAY_SLEEP);
         if (!tfm) {
                 ti->error = PFX "Error allocating crypto tfm";
                 goto bad1;
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 45754bb6a799..9de000131a8a 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -239,6 +239,11 @@ static void vm_dp_init(struct dpages *dp, void *data)
         dp->context_ptr = data;
 }
 
+static void dm_bio_destructor(struct bio *bio)
+{
+        bio_free(bio, _bios);
+}
+
 /*-----------------------------------------------------------------
  * IO routines that accept a list of pages.
  *---------------------------------------------------------------*/
@@ -263,6 +268,7 @@ static void do_region(int rw, unsigned int region, struct io_region *where,
                 bio->bi_bdev = where->bdev;
                 bio->bi_end_io = endio;
                 bio->bi_private = io;
+                bio->bi_destructor = dm_bio_destructor;
                 bio_set_region(bio, region);
 
                 /*
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d487d9deb98e..930b9fc27953 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -399,6 +399,11 @@ struct clone_info {
         unsigned short idx;
 };
 
+static void dm_bio_destructor(struct bio *bio)
+{
+        bio_free(bio, dm_set);
+}
+
 /*
  * Creates a little bio that is just does part of a bvec.
  */
@@ -410,6 +415,7 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector,
         struct bio_vec *bv = bio->bi_io_vec + idx;
 
         clone = bio_alloc_bioset(GFP_NOIO, 1, dm_set);
+        clone->bi_destructor = dm_bio_destructor;
         *clone->bi_io_vec = *bv;
 
         clone->bi_sector = sector;
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 781f23f0cbcc..6284894505c6 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -387,8 +387,6 @@ static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, in
 
 /* exported algorithm data */
 static struct i2c_algorithm saa7146_algo = {
-        .name           = "saa7146 i2c algorithm",
-        .id             = I2C_ALGO_SAA7146,
         .master_xfer    = saa7146_i2c_xfer,
         .functionality  = saa7146_i2c_func,
 };
@@ -412,7 +410,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
 #endif
                 i2c_adapter->algo          = &saa7146_algo;
                 i2c_adapter->algo_data     = NULL;
-                i2c_adapter->id            = I2C_ALGO_SAA7146;
+                i2c_adapter->id            = I2C_HW_SAA7146;
                 i2c_adapter->timeout = SAA7146_I2C_TIMEOUT;
                 i2c_adapter->retries = SAA7146_I2C_RETRIES;
         }
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index be4266d4ae91..56495cb6cd02 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -172,8 +172,6 @@ static u32 flexcop_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm flexcop_algo = {
-        .name                   = "FlexCop I2C algorithm",
-        .id                             = I2C_ALGO_BIT,
         .master_xfer    = flexcop_master_xfer,
         .functionality  = flexcop_i2c_func,
 };
@@ -192,7 +190,6 @@ int flexcop_i2c_init(struct flexcop_device *fc)
         fc->i2c_adap.class          = I2C_CLASS_TV_DIGITAL;
         fc->i2c_adap.algo       = &flexcop_algo;
         fc->i2c_adap.algo_data  = NULL;
-        fc->i2c_adap.id         = I2C_ALGO_BIT;
 
         if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0)
                 return ret;
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index b12545f093f8..1e85d16491b0 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -1,5 +1,5 @@
 config DVB_BT8XX
-        tristate "Nebula/Pinnacle PCTV/Twinhan PCI cards"
+        tristate "BT8xx based PCI cards"
         depends on DVB_CORE && PCI && VIDEO_BT848
         select DVB_MT352
         select DVB_SP887X
@@ -8,8 +8,8 @@ config DVB_BT8XX
         select DVB_OR51211
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
-          the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards and
-          pcHDTV HD2000 cards.
+          the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
+          the pcHDTV HD2000 cards, and certain AVerMedia cards.
 
           Since these cards have no MPEG decoder onboard, they transmit
           only compressed MPEG data over the PCI bus, so you need
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 7d8b3cad350b..9ea5747b1211 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -888,7 +888,7 @@ static int cinergyt2_suspend (struct usb_interface *intf, pm_message_t state)
         if (down_interruptible(&cinergyt2->sem))
                 return -ERESTARTSYS;
 
-        if (state > 0) {        /* state 0 seems to mean DEVICE_PM_ON */
+        if (state.event > PM_EVENT_ON) {
                 struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
 #ifdef ENABLE_RC
                 cancel_delayed_work(&cinergyt2->rc_query_work);
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index c3e1b661aae6..9e96a188f1e9 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -141,8 +141,6 @@ static u32 cxusb_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm cxusb_i2c_algo = {
-        .name          = "Conexant USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = cxusb_i2c_xfer,
         .functionality = cxusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 9b9d6f8ee74e..00b946419b40 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -156,8 +156,6 @@ static u32 dibusb_i2c_func(struct i2c_adapter *adapter)
 }
 
 struct i2c_algorithm dibusb_i2c_algo = {
-        .name          = "DiBcom USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = dibusb_i2c_xfer,
         .functionality = dibusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 9a676afc1d6e..f70e0be0920a 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -77,8 +77,6 @@ static u32 digitv_i2c_func(struct i2c_adapter *adapter)
 }
 
 static struct i2c_algorithm digitv_i2c_algo = {
-        .name          = "Nebula DigiTV USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
         .master_xfer   = digitv_i2c_xfer,
         .functionality = digitv_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 9f0a8d90d146..da970947dfc7 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -27,7 +27,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
 #endif
         d->i2c_adap.algo      = d->props.i2c_algo;
         d->i2c_adap.algo_data = NULL;
-        d->i2c_adap.id        = I2C_ALGO_BIT;
 
         i2c_set_adapdata(&d->i2c_adap, d);
 
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 1f1cd7a8d500..7142b9c51dd2 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -69,8 +69,8 @@ struct lgdt330x_state
 };
 
 static int i2c_write_demod_bytes (struct lgdt330x_state* state,
-                           u8 *buf, /* data bytes to send */
-                           int len  /* number of bytes to send */ )
+                                  u8 *buf, /* data bytes to send */
+                                  int len  /* number of bytes to send */ )
 {
         struct i2c_msg msg =
                 { .addr = state->config->demod_address,
@@ -129,13 +129,13 @@ static int lgdt3302_SwReset(struct lgdt330x_state* state)
         };
 
         ret = i2c_write_demod_bytes(state,
-                             reset, sizeof(reset));
+                                    reset, sizeof(reset));
         if (ret == 0) {
 
                 /* force reset high (inactive) and unmask interrupts */
                 reset[1] = 0x7f;
                 ret = i2c_write_demod_bytes(state,
-                                     reset, sizeof(reset));
+                                            reset, sizeof(reset));
         }
         return ret;
 }
@@ -149,13 +149,13 @@ static int lgdt3303_SwReset(struct lgdt330x_state* state)
         };
 
         ret = i2c_write_demod_bytes(state,
-                             reset, sizeof(reset));
+                                    reset, sizeof(reset));
         if (ret == 0) {
 
                 /* force reset high (inactive) */
                 reset[1] = 0x01;
                 ret = i2c_write_demod_bytes(state,
-                                     reset, sizeof(reset));
+                                            reset, sizeof(reset));
         }
         return ret;
 }
@@ -172,7 +172,6 @@ static int lgdt330x_SwReset(struct lgdt330x_state* state)
         }
 }
 
-
 static int lgdt330x_init(struct dvb_frontend* fe)
 {
         /* Hardware reset is done using gpio[0] of cx23880x chip.
@@ -229,13 +228,13 @@ static int lgdt330x_init(struct dvb_frontend* fe)
         case LGDT3302:
                 chip_name = "LGDT3302";
                 err = i2c_write_demod_bytes(state, lgdt3302_init_data,
-                                                                        sizeof(lgdt3302_init_data));
-                break;
+                                            sizeof(lgdt3302_init_data));
+                break;
         case LGDT3303:
                 chip_name = "LGDT3303";
                 err = i2c_write_demod_bytes(state, lgdt3303_init_data,
-                                                                        sizeof(lgdt3303_init_data));
-                break;
+                                            sizeof(lgdt3303_init_data));
+                break;
         default:
                 chip_name = "undefined";
                 printk (KERN_WARNING "Only LGDT3302 and LGDT3303 are supported chips.\n");
@@ -262,15 +261,15 @@ static int lgdt330x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         switch (state->config->demod_chip) {
         case LGDT3302:
                 err = i2c_read_demod_bytes(state, LGDT3302_PACKET_ERR_COUNTER1,
-                                                                  buf, sizeof(buf));
-                break;
+                                           buf, sizeof(buf));
+                break;
         case LGDT3303:
                 err = i2c_read_demod_bytes(state, LGDT3303_PACKET_ERR_COUNTER1,
-                                                                  buf, sizeof(buf));
-                break;
+                                           buf, sizeof(buf));
+                break;
         default:
                 printk(KERN_WARNING
-                           "Only LGDT3302 and LGDT3303 are supported chips.\n");
+                       "Only LGDT3302 and LGDT3303 are supported chips.\n");
                 err = -ENODEV;
         }
 
@@ -330,7 +329,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
 
                         if (state->config->demod_chip == LGDT3303) {
                                 err = i2c_write_demod_bytes(state, lgdt3303_8vsb_44_data,
-                                                                                        sizeof(lgdt3303_8vsb_44_data));
+                                                            sizeof(lgdt3303_8vsb_44_data));
                         }
                         break;
 
@@ -378,18 +377,19 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe,
 
                 /* Select the requested mode */
                 i2c_write_demod_bytes(state, top_ctrl_cfg,
-                                                          sizeof(top_ctrl_cfg));
-                state->config->set_ts_params(fe, 0);
+                                      sizeof(top_ctrl_cfg));
+                if (state->config->set_ts_params)
+                        state->config->set_ts_params(fe, 0);
                 state->current_modulation = param->u.vsb.modulation;
         }
 
-        /* Change only if we are actually changing the channel */
-        if (state->current_frequency != param->frequency) {
-                /* Tune to the new frequency */
+        /* Tune to the specified frequency */
+        if (state->config->pll_set)
                 state->config->pll_set(fe, param);
-                /* Keep track of the new frequency */
-                state->current_frequency = param->frequency;
-        }
+
+        /* Keep track of the new frequency */
+        state->current_frequency = param->frequency;
+
         lgdt330x_SwReset(state);
         return 0;
 }
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 706e0bcb5ede..85b437bbddcd 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -633,7 +633,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
         i2c_set_adapdata(&pluto->i2c_adap, pluto);
         strcpy(pluto->i2c_adap.name, DRIVER_NAME);
         pluto->i2c_adap.owner = THIS_MODULE;
-        pluto->i2c_adap.id = I2C_ALGO_BIT;
         pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
         pluto->i2c_adap.dev.parent = &pdev->dev;
         pluto->i2c_adap.algo_data = &pluto->i2c_bit;
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index bf3c011d2cfb..d8bf65877897 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -102,6 +102,9 @@ config DVB_BUDGET_AV
         select VIDEO_DEV
         select VIDEO_SAA7146_VV
         select DVB_STV0299
+        select DVB_TDA1004X
+        select DVB_TDA10021
+        select FW_LOADER
         help
           Support for simple SAA7146 based DVB cards
           (so called Budget- or Nova-PCI cards) without onboard
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index aa43b5fcb8e7..7daf7b1598a0 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1472,8 +1472,6 @@ static void frontend_init(struct ttusb* ttusb)
 
 
 static struct i2c_algorithm ttusb_dec_algo = {
-        .name           = "ttusb dec i2c algorithm",
-        .id             = I2C_ALGO_BIT,
         .master_xfer    = master_xfer,
         .functionality  = functionality,
 };
@@ -1525,7 +1523,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 #endif
         ttusb->i2c_adap.algo              = &ttusb_dec_algo;
         ttusb->i2c_adap.algo_data         = NULL;
-        ttusb->i2c_adap.id                = I2C_ALGO_BIT;
 
         result = i2c_add_adapter(&ttusb->i2c_adap);
         if (result) {
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3f5742396096..16c85c081e6e 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -254,6 +254,7 @@ config VIDEO_SAA7134_DVB
         select VIDEO_BUF_DVB
         select DVB_MT352
         select DVB_CX22702
+        select DVB_TDA1004X
         ---help---
           This adds support for DVB cards based on the
           Philips saa7134 chip.
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 810e7aac0a53..3e6f5347da21 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_VIDEO_ZORAN_LML33R10) += saa7114.o adv7170.o zr36060.o
 obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_PLANB) += planb.o
-obj-$(CONFIG_VIDEO_VINO) += vino.o
+obj-$(CONFIG_VIDEO_VINO) += vino.o saa7191.o indycam.o
 obj-$(CONFIG_VIDEO_STRADIS) += stradis.o
 obj-$(CONFIG_VIDEO_CPIA) += cpia.o
 obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 48989eda2400..1ca2b67aedfb 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -43,7 +43,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -391,7 +390,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7170;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index f898b6586374..173bca1e0295 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -39,7 +39,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -441,7 +440,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7175;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 8733588f6db3..3ee0afca76a7 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -43,7 +43,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -507,7 +506,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt819;
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index a070417e65e6..76c1b63ebdf2 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -188,7 +188,7 @@ static int bt832_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, bt832_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, bt832_attach);
 #endif
         return 0;
@@ -241,7 +241,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("bt832"),
+        .name       = "bt832",
         .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index a5d529ccf3ad..8eb871d0e85b 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -43,7 +43,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -295,7 +294,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_bt856;
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index eee9322ce21b..087efb4dea09 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -4047,7 +4047,6 @@ static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
         struct bttv_buffer_set idle;
         unsigned long flags;
 
-        dprintk("bttv%d: suspend %d\n", btv->c.nr, state);
 
         /* stop dma + irqs */
         spin_lock_irqsave(&btv->s_lock,flags);
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 234a85563769..706dc48df962 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -109,7 +109,7 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
         .class             = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt848"),
+        .name              = "bt848",
         .id                = I2C_HW_B_BT848,
         .client_register   = attach_inform,
 };
@@ -270,8 +270,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int
 }
 
 static struct i2c_algorithm bttv_algo = {
-        .name          = "bt878",
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
         .master_xfer   = bttv_i2c_xfer,
         .algo_control  = algo_control,
         .functionality = functionality,
@@ -282,8 +280,8 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
         .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt878"),
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
+        .name          = "bt878",
+        .id            = I2C_HW_B_BT848 /* FIXME */,
         .algo          = &bttv_algo,
         .client_register = attach_inform,
 };
@@ -298,7 +296,7 @@ static int attach_inform(struct i2c_client *client)
         if (bttv_debug)
                 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
                         btv->c.nr,client->driver->name,client->addr,
-                        i2c_clientname(client));
+                        client->name);
         if (!client->driver->command)
                 return 0;
 
@@ -326,7 +324,7 @@ void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
 }
 
 static struct i2c_client bttv_i2c_client_template = {
-        I2C_DEVNAME("bttv internal"),
+        .name   = "bttv internal",
 };
 
 
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index a628a55299c6..7f598039e025 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -95,7 +95,7 @@ static int attach_inform(struct i2c_client *client)
         struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
         dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                client->driver->name, client->addr, client->name);
         if (!client->driver->command)
                 return 0;
 
@@ -128,7 +128,7 @@ static int detach_inform(struct i2c_client *client)
 {
         struct cx88_core *core = i2c_get_adapdata(client->adapter);
 
-        dprintk(1, "i2c detach [client=%s]\n", i2c_clientname(client));
+        dprintk(1, "i2c detach [client=%s]\n", client->name);
         return 0;
 }
 
@@ -152,7 +152,7 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_adapter cx8800_i2c_adap_template = {
-        I2C_DEVNAME("cx2388x"),
+        .name              = "cx2388x",
         .owner             = THIS_MODULE,
         .id                = I2C_HW_B_CX2388x,
         .client_register   = attach_inform,
@@ -160,7 +160,7 @@ static struct i2c_adapter cx8800_i2c_adap_template = {
 };
 
 static struct i2c_client cx8800_i2c_client_template = {
-        I2C_DEVNAME("cx88xx internal"),
+        .name   = "cx88xx internal",
 };
 
 static char *i2c_devs[128] = {
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
new file mode 100644
index 000000000000..b2b0384cd4b9
--- /dev/null
+++ b/drivers/media/video/indycam.c
@@ -0,0 +1,412 @@
+/*
+ *  indycam.c - Silicon Graphics IndyCam digital camera driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/major.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+
+#include <linux/videodev.h>
+/* IndyCam decodes stream of photons into digital image representation ;-) */
+#include <linux/video_decoder.h>
+#include <linux/i2c.h>
+
+#include "indycam.h"
+
+//#define INDYCAM_DEBUG
+
+#define INDYCAM_MODULE_VERSION "0.0.3"
+
+MODULE_DESCRIPTION("SGI IndyCam driver");
+MODULE_VERSION(INDYCAM_MODULE_VERSION);
+MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
+MODULE_LICENSE("GPL");
+
+#ifdef INDYCAM_DEBUG
+#define dprintk(x...) printk("IndyCam: " x);
+#define indycam_regdump(client) indycam_regdump_debug(client)
+#else
+#define dprintk(x...)
+#define indycam_regdump(client)
+#endif
+
+#define VINO_ADAPTER    (I2C_ALGO_SGI | I2C_HW_SGI_VINO)
+
+struct indycam {
+        struct i2c_client *client;
+        int version;
+};
+
+static struct i2c_driver i2c_driver_indycam;
+
+static const unsigned char initseq[] = {
+        INDYCAM_CONTROL_AGCENA,         /* INDYCAM_CONTROL */
+        INDYCAM_SHUTTER_DEFAULT,        /* INDYCAM_SHUTTER */
+        INDYCAM_GAIN_DEFAULT,           /* INDYCAM_GAIN */
+        0x00,                           /* INDYCAM_BRIGHTNESS (read-only) */
+        INDYCAM_RED_BALANCE_DEFAULT,    /* INDYCAM_RED_BALANCE */
+        INDYCAM_BLUE_BALANCE_DEFAULT,   /* INDYCAM_BLUE_BALANCE */
+        INDYCAM_RED_SATURATION_DEFAULT, /* INDYCAM_RED_SATURATION */
+        INDYCAM_BLUE_SATURATION_DEFAULT,/* INDYCAM_BLUE_SATURATION */
+};
+
+/* IndyCam register handling */
+
+static int indycam_read_reg(struct i2c_client *client, unsigned char reg,
+                             unsigned char *value)
+{
+        int ret;
+
+        if (reg == INDYCAM_RESET) {
+                dprintk("indycam_read_reg(): "
+                        "skipping write-only register %d\n", reg);
+                *value = 0;
+                return 0;
+        }
+
+        ret = i2c_smbus_read_byte_data(client, reg);
+        if (ret < 0) {
+                printk(KERN_ERR "IndyCam: indycam_read_reg(): read failed, "
+                       "register = 0x%02x\n", reg);
+                return ret;
+        }
+
+        *value = (unsigned char)ret;
+
+        return 0;
+}
+
+static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
+                             unsigned char value)
+{
+        int err;
+
+        if ((reg == INDYCAM_BRIGHTNESS)
+            || (reg == INDYCAM_VERSION)) {
+                dprintk("indycam_write_reg(): "
+                        "skipping read-only register %d\n", reg);
+                return 0;
+        }
+
+        dprintk("Writing Reg %d = 0x%02x\n", reg, value);
+        err = i2c_smbus_write_byte_data(client, reg, value);
+        if (err) {
+                printk(KERN_ERR "IndyCam: indycam_write_reg(): write failed, "
+                       "register = 0x%02x, value = 0x%02x\n", reg, value);
+        }
+        return err;
+}
+
+static int indycam_write_block(struct i2c_client *client, unsigned char reg,
+                                unsigned char length, unsigned char *data)
+{
+        unsigned char i;
+        int err;
+
+        for (i = reg; i < length; i++) {
+                err = indycam_write_reg(client, reg + i, data[i]);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+/* Helper functions */
+
+#ifdef INDYCAM_DEBUG
+static void indycam_regdump_debug(struct i2c_client *client)
+{
+        int i;
+        unsigned char val;
+
+        for (i = 0; i < 9; i++) {
+                indycam_read_reg(client, i, &val);
+                dprintk("Reg %d = 0x%02x\n", i, val);
+        }
+}
+#endif
+
+static int indycam_get_controls(struct i2c_client *client,
+                                struct indycam_control *ctrl)
+{
+        unsigned char ctrl_reg;
+
+        indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg);
+        ctrl->agc = (ctrl_reg & INDYCAM_CONTROL_AGCENA)
+                ? INDYCAM_VALUE_ENABLED
+                : INDYCAM_VALUE_DISABLED;
+        ctrl->awb = (ctrl_reg & INDYCAM_CONTROL_AWBCTL)
+                ? INDYCAM_VALUE_ENABLED
+                : INDYCAM_VALUE_DISABLED;
+        indycam_read_reg(client, INDYCAM_SHUTTER,
+                         (unsigned char *)&ctrl->shutter);
+        indycam_read_reg(client, INDYCAM_GAIN,
+                         (unsigned char *)&ctrl->gain);
+        indycam_read_reg(client, INDYCAM_RED_BALANCE,
+                         (unsigned char *)&ctrl->red_balance);
+        indycam_read_reg(client, INDYCAM_BLUE_BALANCE,
+                         (unsigned char *)&ctrl->blue_balance);
+        indycam_read_reg(client, INDYCAM_RED_SATURATION,
+                         (unsigned char *)&ctrl->red_saturation);
+        indycam_read_reg(client, INDYCAM_BLUE_SATURATION,
+                         (unsigned char *)&ctrl->blue_saturation);
+        indycam_read_reg(client, INDYCAM_GAMMA,
+                         (unsigned char *)&ctrl->gamma);
+
+        return 0;
+}
+
+static int indycam_set_controls(struct i2c_client *client,
+                                struct indycam_control *ctrl)
+{
+        unsigned char ctrl_reg;
+
+        indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg);
+        if (ctrl->agc != INDYCAM_VALUE_UNCHANGED) {
+                if (ctrl->agc)
+                        ctrl_reg |= INDYCAM_CONTROL_AGCENA;
+                else
+                        ctrl_reg &= ~INDYCAM_CONTROL_AGCENA;
+        }
+        if (ctrl->awb != INDYCAM_VALUE_UNCHANGED) {
+                if (ctrl->awb)
+                        ctrl_reg |= INDYCAM_CONTROL_AWBCTL;
+                else
+                        ctrl_reg &= ~INDYCAM_CONTROL_AWBCTL;
+        }
+        indycam_write_reg(client, INDYCAM_CONTROL, ctrl_reg);
+
+        if (ctrl->shutter >= 0)
+                indycam_write_reg(client, INDYCAM_SHUTTER, ctrl->shutter);
+        if (ctrl->gain >= 0)
+                indycam_write_reg(client, INDYCAM_GAIN, ctrl->gain);
+        if (ctrl->red_balance >= 0)
+                indycam_write_reg(client, INDYCAM_RED_BALANCE,
+                                  ctrl->red_balance);
+        if (ctrl->blue_balance >= 0)
+                indycam_write_reg(client, INDYCAM_BLUE_BALANCE,
+                                  ctrl->blue_balance);
+        if (ctrl->red_saturation >= 0)
+                indycam_write_reg(client, INDYCAM_RED_SATURATION,
+                                  ctrl->red_saturation);
+        if (ctrl->blue_saturation >= 0)
+                indycam_write_reg(client, INDYCAM_BLUE_SATURATION,
+                                  ctrl->blue_saturation);
+        if (ctrl->gamma >= 0)
+                indycam_write_reg(client, INDYCAM_GAMMA, ctrl->gamma);
+
+        return 0;
+}
+
+/* I2C-interface */
+
+static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
+{
+        int err = 0;
+        struct indycam *camera;
+        struct i2c_client *client;
+
+        printk(KERN_INFO "SGI IndyCam driver version %s\n",
+               INDYCAM_MODULE_VERSION);
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!client)
+                return -ENOMEM;
+        camera = kmalloc(sizeof(struct indycam), GFP_KERNEL);
+        if (!camera) {
+                err = -ENOMEM;
+                goto out_free_client;
+        }
+
+        memset(client, 0, sizeof(struct i2c_client));
+        memset(camera, 0, sizeof(struct indycam));
+
+        client->addr = addr;
+        client->adapter = adap;
+        client->driver = &i2c_driver_indycam;
+        client->flags = 0;
+        strcpy(client->name, "IndyCam client");
+        i2c_set_clientdata(client, camera);
+
+        camera->client = client;
+
+        err = i2c_attach_client(client);
+        if (err)
+                goto out_free_camera;
+
+        camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION);
+        if (camera->version != CAMERA_VERSION_INDY &&
+            camera->version != CAMERA_VERSION_MOOSE) {
+                err = -ENODEV;
+                goto out_detach_client;
+        }
+        printk(KERN_INFO "IndyCam v%d.%d detected\n",
+               INDYCAM_VERSION_MAJOR(camera->version),
+               INDYCAM_VERSION_MINOR(camera->version));
+
+        indycam_regdump(client);
+
+        // initialize
+        err = indycam_write_block(client, 0, sizeof(initseq),
+                                  (unsigned char *)&initseq);
+        if (err) {
+                printk(KERN_ERR "IndyCam initalization failed\n");
+                err = -EIO;
+                goto out_detach_client;
+        }
+
+        indycam_regdump(client);
+
+        // white balance
+        err = indycam_write_reg(client, INDYCAM_CONTROL,
+                          INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL);
+        if (err) {
+                printk(KERN_ERR "IndyCam white balance "
+                       "initialization failed\n");
+                err = -EIO;
+                goto out_detach_client;
+        }
+
+        indycam_regdump(client);
+
+        printk(KERN_INFO "IndyCam initialized\n");
+
+        return 0;
+
+out_detach_client:
+        i2c_detach_client(client);
+out_free_camera:
+        kfree(camera);
+out_free_client:
+        kfree(client);
+        return err;
+}
+
+static int indycam_probe(struct i2c_adapter *adap)
+{
+        /* Indy specific crap */
+        if (adap->id == VINO_ADAPTER)
+                return indycam_attach(adap, INDYCAM_ADDR, 0);
+        /* Feel free to add probe here :-) */
+        return -ENODEV;
+}
+
+static int indycam_detach(struct i2c_client *client)
+{
+        struct indycam *camera = i2c_get_clientdata(client);
+
+        i2c_detach_client(client);
+        kfree(camera);
+        kfree(client);
+        return 0;
+}
+
+static int indycam_command(struct i2c_client *client, unsigned int cmd,
+                           void *arg)
+{
+        // struct indycam *camera = i2c_get_clientdata(client);
+
+        /* The old video_decoder interface just isn't enough,
+         * so we'll use some custom commands. */
+        switch (cmd) {
+        case DECODER_GET_CAPABILITIES: {
+                struct video_decoder_capability *cap = arg;
+
+                cap->flags  = VIDEO_DECODER_NTSC;
+                cap->inputs = 1;
+                cap->outputs = 1;
+                break;
+        }
+        case DECODER_GET_STATUS: {
+                int *iarg = arg;
+
+                *iarg = DECODER_STATUS_GOOD | DECODER_STATUS_NTSC |
+                        DECODER_STATUS_COLOR;
+                break;
+        }
+        case DECODER_SET_NORM: {
+                int *iarg = arg;
+
+                switch (*iarg) {
+                case VIDEO_MODE_NTSC:
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        }
+        case DECODER_SET_INPUT: {
+                int *iarg = arg;
+
+                if (*iarg != 0)
+                        return -EINVAL;
+                break;
+        }
+        case DECODER_SET_OUTPUT: {
+                int *iarg = arg;
+
+                if (*iarg != 0)
+                        return -EINVAL;
+                break;
+        }
+        case DECODER_ENABLE_OUTPUT: {
+                /* Always enabled */
+                break;
+        }
+        case DECODER_SET_PICTURE: {
+                // struct video_picture *pic = arg;
+                /* TODO: convert values for indycam_set_controls() */
+                break;
+        }
+        case DECODER_INDYCAM_GET_CONTROLS: {
+                struct indycam_control *ctrl = arg;
+                indycam_get_controls(client, ctrl);
+        }
+        case DECODER_INDYCAM_SET_CONTROLS: {
+                struct indycam_control *ctrl = arg;
+                indycam_set_controls(client, ctrl);
+        }
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct i2c_driver i2c_driver_indycam = {
+        .owner          = THIS_MODULE,
+        .name           = "indycam",
+        .id             = I2C_DRIVERID_INDYCAM,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = indycam_probe,
+        .detach_client  = indycam_detach,
+        .command        = indycam_command,
+};
+
+static int __init indycam_init(void)
+{
+        return i2c_add_driver(&i2c_driver_indycam);
+}
+
+static void __exit indycam_exit(void)
+{
+        i2c_del_driver(&i2c_driver_indycam);
+}
+
+module_init(indycam_init);
+module_exit(indycam_exit);
diff --git a/drivers/media/video/indycam.h b/drivers/media/video/indycam.h
new file mode 100644
index 000000000000..d9ddb6b79a03
--- /dev/null
+++ b/drivers/media/video/indycam.h
@@ -0,0 +1,112 @@
+/*
+ *  indycam.h - Silicon Graphics IndyCam digital camera driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef _INDYCAM_H_
+#define _INDYCAM_H_
+
+/* I2C address for the Guinness Camera */
+#define INDYCAM_ADDR                    0x56
+
+/* Camera version */
+#define CAMERA_VERSION_INDY             0x10    /* v1.0 */
+#define CAMERA_VERSION_MOOSE            0x12    /* v1.2 */
+#define INDYCAM_VERSION_MAJOR(x)        (((x) & 0xf0) >> 4)
+#define INDYCAM_VERSION_MINOR(x)        ((x) & 0x0f)
+
+/* Register bus addresses */
+#define INDYCAM_CONTROL                 0x00
+#define INDYCAM_SHUTTER                 0x01
+#define INDYCAM_GAIN                    0x02
+#define INDYCAM_BRIGHTNESS              0x03 /* read-only */
+#define INDYCAM_RED_BALANCE             0x04
+#define INDYCAM_BLUE_BALANCE            0x05
+#define INDYCAM_RED_SATURATION          0x06
+#define INDYCAM_BLUE_SATURATION         0x07
+#define INDYCAM_GAMMA                   0x08
+#define INDYCAM_VERSION                 0x0e /* read-only */
+#define INDYCAM_RESET                   0x0f /* write-only */
+
+#define INDYCAM_LED                     0x46
+#define INDYCAM_ORIENTATION             0x47
+#define INDYCAM_BUTTON                  0x48
+
+/* Field definitions of registers */
+#define INDYCAM_CONTROL_AGCENA          (1<<0) /* automatic gain control */
+#define INDYCAM_CONTROL_AWBCTL          (1<<1) /* automatic white balance */
+                                                /* 2-3 are reserved */
+#define INDYCAM_CONTROL_EVNFLD          (1<<4)  /* read-only */
+
+#define INDYCAM_SHUTTER_10000           0x02    /* 1/10000 second */
+#define INDYCAM_SHUTTER_4000            0x04    /* 1/4000 second */
+#define INDYCAM_SHUTTER_2000            0x08    /* 1/2000 second */
+#define INDYCAM_SHUTTER_1000            0x10    /* 1/1000 second */
+#define INDYCAM_SHUTTER_500             0x20    /* 1/500 second */
+#define INDYCAM_SHUTTER_250             0x3f    /* 1/250 second */
+#define INDYCAM_SHUTTER_125             0x7e    /* 1/125 second */
+#define INDYCAM_SHUTTER_100             0x9e    /* 1/100 second */
+#define INDYCAM_SHUTTER_60              0x00    /* 1/60 second */
+
+#define INDYCAM_LED_ACTIVE                      0x10
+#define INDYCAM_LED_INACTIVE                    0x30
+#define INDYCAM_ORIENTATION_BOTTOM_TO_TOP       0x40
+#define INDYCAM_BUTTON_RELEASED                 0x10
+
+#define INDYCAM_SHUTTER_MIN             0x00
+#define INDYCAM_SHUTTER_MAX             0xff
+#define INDYCAM_GAIN_MIN                0x00
+#define INDYCAM_GAIN_MAX                0xff
+#define INDYCAM_RED_BALANCE_MIN         0x00 /* the effect is the opposite? */
+#define INDYCAM_RED_BALANCE_MAX         0xff
+#define INDYCAM_BLUE_BALANCE_MIN        0x00 /* the effect is the opposite? */
+#define INDYCAM_BLUE_BALANCE_MAX        0xff
+#define INDYCAM_RED_SATURATION_MIN      0x00
+#define INDYCAM_RED_SATURATION_MAX      0xff
+#define INDYCAM_BLUE_SATURATION_MIN     0x00
+#define INDYCAM_BLUE_SATURATION_MAX     0xff
+#define INDYCAM_GAMMA_MIN               0x00
+#define INDYCAM_GAMMA_MAX               0xff
+
+/* Driver interface definitions */
+
+#define INDYCAM_VALUE_ENABLED           1
+#define INDYCAM_VALUE_DISABLED          0
+#define INDYCAM_VALUE_UNCHANGED         -1
+
+/* When setting controls, a value of -1 leaves the control unchanged. */
+struct indycam_control {
+        int agc;        /* boolean */
+        int awb;        /* boolean */
+        int shutter;
+        int gain;
+        int red_balance;
+        int blue_balance;
+        int red_saturation;
+        int blue_saturation;
+        int gamma;
+};
+
+#define DECODER_INDYCAM_GET_CONTROLS    _IOR('d', 193, struct indycam_control)
+#define DECODER_INDYCAM_SET_CONTROLS    _IOW('d', 194, struct indycam_control)
+
+/* Default values for controls */
+
+#define INDYCAM_AGC_DEFAULT             INDYCAM_VALUE_ENABLED
+#define INDYCAM_AWB_DEFAULT             INDYCAM_VALUE_ENABLED
+
+#define INDYCAM_SHUTTER_DEFAULT         INDYCAM_SHUTTER_60
+#define INDYCAM_GAIN_DEFAULT            0x80
+#define INDYCAM_RED_BALANCE_DEFAULT     0x18
+#define INDYCAM_BLUE_BALANCE_DEFAULT    0xa4
+#define INDYCAM_RED_SATURATION_DEFAULT  0x80
+#define INDYCAM_BLUE_SATURATION_DEFAULT 0xc0
+#define INDYCAM_GAMMA_DEFAULT           0x80
+
+#endif
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9fc5055e001c..1e273ff3f956 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -308,7 +308,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("unset"),
+        .name = "unset",
         .driver = &driver
 };
 
@@ -429,10 +429,10 @@ static int ir_probe(struct i2c_adapter *adap)
         struct i2c_client c; char buf; int i,rc;
 
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
                 probe = probe_bttv;
                 break;
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                 probe = probe_saa7134;
                 break;
         }
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index fe194012bccf..3f2a882bc20a 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -37,6 +37,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
+#include <linux/dma-mapping.h>
 
 #include "meye.h"
 #include <linux/meye.h>
@@ -121,7 +122,7 @@ static int ptable_alloc(void)
         memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
 
         /* give only 32 bit DMA addresses */
-        if (dma_set_mask(&meye.mchip_dev->dev, 0xffffffff))
+        if (dma_set_mask(&meye.mchip_dev->dev, DMA_32BIT_MASK))
                 return -1;
 
         meye.mchip_ptable_toc = dma_alloc_coherent(&meye.mchip_dev->dev,
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 62f1b8ddb98b..ca02f6f14b00 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1416,7 +1416,7 @@ static int msp_detach(struct i2c_client *client);
 static int msp_probe(struct i2c_adapter *adap);
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
-static int msp_suspend(struct device * dev, u32 state, u32 level);
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
 static int msp_resume(struct device * dev, u32 level);
 
 static void msp_wake_thread(struct i2c_client *client);
@@ -1437,7 +1437,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name      = "(unset)",
         .flags     = I2C_CLIENT_ALLOW_USE,
         .driver    = &driver,
 };
@@ -1509,7 +1509,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
         }
 
         /* hello world :-) */
-        printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c));
+        printk(KERN_INFO "msp34xx: init: chip=%s", c->name);
         if (HAVE_NICAM(msp))
                 printk(" +nicam");
         if (HAVE_SIMPLE(msp))
@@ -1817,7 +1817,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int msp_suspend(struct device * dev, u32 state, u32 level)
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
 {
         struct i2c_client *c = container_of(dev, struct i2c_client, dev);
 
diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
index 3433619ad93f..b3f4d266cede 100644
--- a/drivers/media/video/ovcamchip/ov6x20.c
+++ b/drivers/media/video/ovcamchip/ov6x20.c
@@ -164,10 +164,10 @@ static int ov6x20_init(struct i2c_client *c)
         DDEBUG(4, &c->dev, "entered");
 
         switch (c->adapter->id) {
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV511:
                 rc = ov_write_regvals(c, regvals_init_6x20_511);
                 break;
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OV518:
                 rc = ov_write_regvals(c, regvals_init_6x20_518);
                 break;
         default:
@@ -338,7 +338,7 @@ static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
         /******** Palette-specific regs ********/
 
         /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
-        if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+        if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                 if (win->format == VIDEO_PALETTE_GREY)
                         ov_write_mask(c, 0x13, 0x00, 0x20);
                 else
diff --git a/drivers/media/video/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c
index 44a842379b45..6eab458ab792 100644
--- a/drivers/media/video/ovcamchip/ov6x30.c
+++ b/drivers/media/video/ovcamchip/ov6x30.c
@@ -301,7 +301,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
         /******** Palette-specific regs ********/
 
         if (win->format == VIDEO_PALETTE_GREY) {
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                         /* Do nothing - we're already in 8-bit mode */
                 } else {
                         ov_write_mask(c, 0x13, 0x20, 0x20);
@@ -313,7 +313,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
                  * Therefore, the OV6630 needs to be in 8-bit multiplexed
                  * output mode */
 
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                         /* Do nothing - we want to stay in 8-bit mode */
                         /* Warning: Messing with reg 0x13 breaks OV518 color */
                 } else {
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 54dd5612d3b8..2de34ebf0673 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -296,10 +296,10 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
          * attach to adapters that are known to contain OV camera chips. */
 
         switch (adap->id) {
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OVFX2):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF):
+        case I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OVFX2:
+        case I2C_HW_SMBUS_W9968CF:
                 PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id);
                 break;
         default:
@@ -314,7 +314,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         }
         memcpy(c, &client_template, sizeof *c);
         c->adapter = adap;
-        strcpy(i2c_clientname(c), "OV????");
+        strcpy(c->name, "OV????");
 
         ov = kmalloc(sizeof *ov, GFP_KERNEL);
         if (!ov) {
@@ -328,7 +328,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         if (rc < 0)
                 goto error;
 
-        strcpy(i2c_clientname(c), chip_names[ov->subtype]);
+        strcpy(c->name, chip_names[ov->subtype]);
 
         PDEBUG(1, "Camera chip detection complete");
 
@@ -421,7 +421,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(unset)"),
+        .name =         "(unset)",
         .driver =       &driver,
 };
 
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 22d055d8a695..e116bdbed310 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -470,7 +470,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7110;
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fcd897382fcf..fe8a5e453969 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -42,7 +42,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -489,7 +488,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7111;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 2ba997f5ef1d..d9f50e2f7b92 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -45,7 +45,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -827,7 +826,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7114;
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 79d05ea1b69b..382911c6ef22 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -598,7 +598,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("saa6752hs"),
+        .name       = "saa6752hs",
         .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 1203b93a572c..eae6b529713f 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -334,7 +334,7 @@ static int attach_inform(struct i2c_client *client)
         struct tuner_setup tun_setup;
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                 client->driver->name, client->addr, client->name);
 
         if (!client->driver->command)
                 return 0;
@@ -370,8 +370,6 @@ static int attach_inform(struct i2c_client *client)
 }
 
 static struct i2c_algorithm saa7134_algo = {
-        .name          = "saa7134",
-        .id            = I2C_ALGO_SAA7134,
         .master_xfer   = saa7134_i2c_xfer,
         .algo_control  = algo_control,
         .functionality = functionality,
@@ -382,14 +380,14 @@ static struct i2c_adapter saa7134_adap_template = {
 #ifdef I2C_CLASS_TV_ANALOG
         .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("saa7134"),
-        .id            = I2C_ALGO_SAA7134,
+        .name          = "saa7134",
+        .id            = I2C_HW_SAA7134,
         .algo          = &saa7134_algo,
         .client_register = attach_inform,
 };
 
 static struct i2c_client saa7134_client_template = {
-        I2C_DEVNAME("saa7134 internal"),
+        .name   = "saa7134 internal",
 };
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 108e7a4a0273..132aa7943c16 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -39,7 +39,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -387,7 +386,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_saa7185;
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
new file mode 100644
index 000000000000..454f5c1199b4
--- /dev/null
+++ b/drivers/media/video/saa7191.c
@@ -0,0 +1,512 @@
+/*
+ *  saa7191.c - Philips SAA7191 video decoder driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/major.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+
+#include <linux/videodev.h>
+#include <linux/video_decoder.h>
+#include <linux/i2c.h>
+
+#include "saa7191.h"
+
+#define SAA7191_MODULE_VERSION "0.0.3"
+
+MODULE_DESCRIPTION("Philips SAA7191 video decoder driver");
+MODULE_VERSION(SAA7191_MODULE_VERSION);
+MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
+MODULE_LICENSE("GPL");
+
+#define VINO_ADAPTER    (I2C_ALGO_SGI | I2C_HW_SGI_VINO)
+
+struct saa7191 {
+        struct i2c_client *client;
+
+        /* the register values are stored here as the actual
+         * I2C-registers are write-only */
+        unsigned char reg[25];
+
+        unsigned char norm;
+        unsigned char input;
+};
+
+static struct i2c_driver i2c_driver_saa7191;
+
+static const unsigned char initseq[] = {
+        0,      /* Subaddress */
+        0x50,   /* SAA7191_REG_IDEL */
+        0x30,   /* SAA7191_REG_HSYB */
+        0x00,   /* SAA7191_REG_HSYS */
+        0xe8,   /* SAA7191_REG_HCLB */
+        0xb6,   /* SAA7191_REG_HCLS */
+        0xf4,   /* SAA7191_REG_HPHI */
+        0x01,   /* SAA7191_REG_LUMA - chrominance trap active (CVBS) */
+        0x00,   /* SAA7191_REG_HUEC */
+        0xf8,   /* SAA7191_REG_CKTQ */
+        0xf8,   /* SAA7191_REG_CKTS */
+        0x90,   /* SAA7191_REG_PLSE */
+        0x90,   /* SAA7191_REG_SESE */
+        0x00,   /* SAA7191_REG_GAIN */
+        0x0c,   /* SAA7191_REG_STDC - not SECAM, slow time constant */
+        0x78,   /* SAA7191_REG_IOCK - chrominance from CVBS, GPSW1 & 2 off */
+        0x99,   /* SAA7191_REG_CTL3 - automatic field detection */
+        0x00,   /* SAA7191_REG_CTL4 */
+        0x2c,   /* SAA7191_REG_CHCV */
+        0x00,   /* unused */
+        0x00,   /* unused */
+        0x34,   /* SAA7191_REG_HS6B */
+        0x0a,   /* SAA7191_REG_HS6S */
+        0xf4,   /* SAA7191_REG_HC6B */
+        0xce,   /* SAA7191_REG_HC6S */
+        0xf4,   /* SAA7191_REG_HP6I */
+};
+
+/* SAA7191 register handling */
+
+static unsigned char saa7191_read_reg(struct i2c_client *client,
+                                      unsigned char reg)
+{
+        return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg];
+}
+
+static int saa7191_read_status(struct i2c_client *client,
+                               unsigned char *value)
+{
+        int ret;
+
+        ret = i2c_master_recv(client, value, 1);
+        if (ret < 0) {
+                printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed");
+                return ret;
+        }
+
+        return 0;
+}
+
+
+static int saa7191_write_reg(struct i2c_client *client, unsigned char reg,
+                             unsigned char value)
+{
+
+        ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value;
+        return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+/* the first byte of data must be the first subaddress number (register) */
+static int saa7191_write_block(struct i2c_client *client,
+                               unsigned char length, unsigned char *data)
+{
+        int i;
+        int ret;
+
+        struct saa7191 *decoder = (struct saa7191 *)i2c_get_clientdata(client);
+        for (i = 0; i < (length - 1); i++) {
+                decoder->reg[data[0] + i] = data[i + 1];
+        }
+
+        ret = i2c_master_send(client, data, length);
+        if (ret < 0) {
+                printk(KERN_ERR "SAA7191: saa7191_write_block(): "
+                       "write failed");
+                return ret;
+        }
+
+        return 0;
+}
+
+/* Helper functions */
+
+static int saa7191_set_input(struct i2c_client *client, int input)
+{
+        unsigned char luma = saa7191_read_reg(client, SAA7191_REG_LUMA);
+        unsigned char iock = saa7191_read_reg(client, SAA7191_REG_IOCK);
+        int err;
+
+        switch (input) {
+        case SAA7191_INPUT_COMPOSITE: /* Set Composite input */
+                iock &= ~(SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW1
+                          | SAA7191_IOCK_GPSW2);
+                /* Chrominance trap active */
+                luma &= ~SAA7191_LUMA_BYPS;
+                break;
+        case SAA7191_INPUT_SVIDEO: /* Set S-Video input */
+                iock |= SAA7191_IOCK_CHRS | SAA7191_IOCK_GPSW2;
+                /* Chrominance trap bypassed */
+                luma |= SAA7191_LUMA_BYPS;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        err = saa7191_write_reg(client, SAA7191_REG_LUMA, luma);
+        if (err)
+                return -EIO;
+        err = saa7191_write_reg(client, SAA7191_REG_IOCK, iock);
+        if (err)
+                return -EIO;
+
+        return 0;
+}
+
+static int saa7191_set_norm(struct i2c_client *client, int norm)
+{
+        struct saa7191 *decoder = i2c_get_clientdata(client);
+        unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+        unsigned char ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
+        unsigned char chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
+        int err;
+
+        switch(norm) {
+        case SAA7191_NORM_AUTO: {
+                unsigned char status;
+
+                // does status depend on current norm ?
+                if (saa7191_read_status(client, &status))
+                        return -EIO;
+
+                stdc &= ~SAA7191_STDC_SECS;
+                ctl3 &= ~SAA7191_CTL3_FSEL;
+                ctl3 |= SAA7191_CTL3_AUFD;
+                chcv = (status & SAA7191_STATUS_FIDT)
+                               ? SAA7191_CHCV_NTSC : SAA7191_CHCV_PAL;
+                break;
+        }
+        case SAA7191_NORM_PAL:
+                stdc &= ~SAA7191_STDC_SECS;
+                ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
+                chcv = SAA7191_CHCV_PAL;
+                break;
+        case SAA7191_NORM_NTSC:
+                stdc &= ~SAA7191_STDC_SECS;
+                ctl3 &= ~SAA7191_CTL3_AUFD;
+                ctl3 |= SAA7191_CTL3_FSEL;
+                chcv = SAA7191_CHCV_NTSC;
+                break;
+        case SAA7191_NORM_SECAM:
+                stdc |= SAA7191_STDC_SECS;
+                ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
+                chcv = SAA7191_CHCV_PAL;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
+        if (err)
+                return -EIO;
+        err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
+        if (err)
+                return -EIO;
+        err = saa7191_write_reg(client, SAA7191_REG_CHCV, chcv);
+        if (err)
+                return -EIO;
+
+        decoder->norm = norm;
+
+        return 0;
+}
+
+static int saa7191_get_controls(struct i2c_client *client,
+                                struct saa7191_control *ctrl)
+{
+        unsigned char hue = saa7191_read_reg(client, SAA7191_REG_HUEC);
+        unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
+
+        if (hue < 0x80) {
+                hue += 0x80;
+        } else {
+                hue -= 0x80;
+        }
+        ctrl->hue = hue;
+
+        ctrl->vtrc = (stdc & SAA7191_STDC_VTRC)
+                ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+
+        return 0;
+}
+
+static int saa7191_set_controls(struct i2c_client *client,
+                                struct saa7191_control *ctrl)
+{
+        int err;
+
+        if (ctrl->hue >= 0) {
+                unsigned char hue = ctrl->hue & 0xff;
+                if (hue < 0x80) {
+                        hue += 0x80;
+                } else {
+                        hue -= 0x80;
+                }
+                err = saa7191_write_reg(client, SAA7191_REG_HUEC, hue);
+                if (err)
+                        return -EIO;
+        }
+        if (ctrl->vtrc >= 0) {
+                unsigned char stdc =
+                        saa7191_read_reg(client, SAA7191_REG_STDC);
+
+                if (ctrl->vtrc) {
+                        stdc |= SAA7191_STDC_VTRC;
+                } else {
+                        stdc &= ~SAA7191_STDC_VTRC;
+                }
+
+                err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
+                if (err)
+                        return -EIO;
+        }
+
+        return 0;
+}
+
+/* I2C-interface */
+
+static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
+{
+        int err = 0;
+        struct saa7191 *decoder;
+        struct i2c_client *client;
+
+        printk(KERN_INFO "Philips SAA7191 driver version %s\n",
+               SAA7191_MODULE_VERSION);
+
+        client = kmalloc(sizeof(*client), GFP_KERNEL);
+        if (!client)
+                return -ENOMEM;
+        decoder = kmalloc(sizeof(*decoder), GFP_KERNEL);
+        if (!decoder) {
+                err = -ENOMEM;
+                goto out_free_client;
+        }
+
+        memset(client, 0, sizeof(struct i2c_client));
+        memset(decoder, 0, sizeof(struct saa7191));
+
+        client->addr = addr;
+        client->adapter = adap;
+        client->driver = &i2c_driver_saa7191;
+        client->flags = 0;
+        strcpy(client->name, "saa7191 client");
+        i2c_set_clientdata(client, decoder);
+
+        decoder->client = client;
+
+        err = i2c_attach_client(client);
+        if (err)
+                goto out_free_decoder;
+
+        decoder->input = SAA7191_INPUT_COMPOSITE;
+        decoder->norm = SAA7191_NORM_AUTO;
+
+        err = saa7191_write_block(client, sizeof(initseq),
+                                  (unsigned char *)initseq);
+        if (err) {
+                printk(KERN_ERR "SAA7191 initialization failed\n");
+                goto out_detach_client;
+        }
+
+        printk(KERN_INFO "SAA7191 initialized\n");
+
+        return 0;
+
+out_detach_client:
+        i2c_detach_client(client);
+out_free_decoder:
+        kfree(decoder);
+out_free_client:
+        kfree(client);
+        return err;
+}
+
+static int saa7191_probe(struct i2c_adapter *adap)
+{
+        /* Always connected to VINO */
+        if (adap->id == VINO_ADAPTER)
+                return saa7191_attach(adap, SAA7191_ADDR, 0);
+        /* Feel free to add probe here :-) */
+        return -ENODEV;
+}
+
+static int saa7191_detach(struct i2c_client *client)
+{
+        struct saa7191 *decoder = i2c_get_clientdata(client);
+
+        i2c_detach_client(client);
+        kfree(decoder);
+        kfree(client);
+        return 0;
+}
+
+static int saa7191_command(struct i2c_client *client, unsigned int cmd,
+                           void *arg)
+{
+        struct saa7191 *decoder = i2c_get_clientdata(client);
+
+        switch (cmd) {
+        case DECODER_GET_CAPABILITIES: {
+                struct video_decoder_capability *cap = arg;
+
+                cap->flags  = VIDEO_DECODER_PAL | VIDEO_DECODER_NTSC |
+                              VIDEO_DECODER_SECAM | VIDEO_DECODER_AUTO;
+                cap->inputs = (client->adapter->id == VINO_ADAPTER) ? 2 : 1;
+                cap->outputs = 1;
+                break;
+        }
+        case DECODER_GET_STATUS: {
+                int *iarg = arg;
+                unsigned char status;
+                int res = 0;
+
+                if (saa7191_read_status(client, &status)) {
+                        return -EIO;
+                }
+                if ((status & SAA7191_STATUS_HLCK) == 0)
+                        res |= DECODER_STATUS_GOOD;
+                if (status & SAA7191_STATUS_CODE)
+                        res |= DECODER_STATUS_COLOR;
+                switch (decoder->norm) {
+                case SAA7191_NORM_NTSC:
+                        res |= DECODER_STATUS_NTSC;
+                        break;
+                case SAA7191_NORM_PAL:
+                        res |= DECODER_STATUS_PAL;
+                        break;
+                case SAA7191_NORM_SECAM:
+                        res |= DECODER_STATUS_SECAM;
+                        break;
+                case SAA7191_NORM_AUTO:
+                default:
+                        if (status & SAA7191_STATUS_FIDT)
+                                res |= DECODER_STATUS_NTSC;
+                        else
+                                res |= DECODER_STATUS_PAL;
+                        break;
+                }
+                *iarg = res;
+                break;
+        }
+        case DECODER_SET_NORM: {
+                int *iarg = arg;
+
+                switch (*iarg) {
+                case VIDEO_MODE_AUTO:
+                        return saa7191_set_norm(client, SAA7191_NORM_AUTO);
+                case VIDEO_MODE_PAL:
+                        return saa7191_set_norm(client, SAA7191_NORM_PAL);
+                case VIDEO_MODE_NTSC:
+                        return saa7191_set_norm(client, SAA7191_NORM_NTSC);
+                case VIDEO_MODE_SECAM:
+                        return saa7191_set_norm(client, SAA7191_NORM_SECAM);
+                default:
+                        return -EINVAL;
+                }
+                break;
+        }
+        case DECODER_SET_INPUT: {
+                int *iarg = arg;
+
+                switch (client->adapter->id) {
+                case VINO_ADAPTER:
+                        return saa7191_set_input(client, *iarg);
+                default:
+                        if (*iarg != 0)
+                                return -EINVAL;
+                }
+                break;
+        }
+        case DECODER_SET_OUTPUT: {
+                int *iarg = arg;
+
+                /* not much choice of outputs */
+                if (*iarg != 0)
+                        return -EINVAL;
+                break;
+        }
+        case DECODER_ENABLE_OUTPUT: {
+                /* Always enabled */
+                break;
+        }
+        case DECODER_SET_PICTURE: {
+                struct video_picture *pic = arg;
+                unsigned val;
+                int err;
+
+                val = (pic->hue >> 8) - 0x80;
+                err = saa7191_write_reg(client, SAA7191_REG_HUEC, val);
+                if (err)
+                        return -EIO;
+                break;
+        }
+        case DECODER_SAA7191_GET_STATUS: {
+                struct saa7191_status *status = arg;
+                unsigned char status_reg;
+
+                if (saa7191_read_status(client, &status_reg))
+                        return -EIO;
+                status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0)
+                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+                status->ntsc = (status_reg & SAA7191_STATUS_FIDT)
+                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+                status->color = (status_reg & SAA7191_STATUS_CODE)
+                        ? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
+
+                status->input = decoder->input;
+                status->norm = decoder->norm;
+        }
+        case DECODER_SAA7191_SET_NORM: {
+                int *norm = arg;
+                return saa7191_set_norm(client, *norm);
+        }
+        case DECODER_SAA7191_GET_CONTROLS: {
+                struct saa7191_control *ctrl = arg;
+                return saa7191_get_controls(client, ctrl);
+        }
+        case DECODER_SAA7191_SET_CONTROLS: {
+                struct saa7191_control *ctrl = arg;
+                return saa7191_set_controls(client, ctrl);
+        }
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct i2c_driver i2c_driver_saa7191 = {
+        .owner          = THIS_MODULE,
+        .name           = "saa7191",
+        .id             = I2C_DRIVERID_SAA7191,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = saa7191_probe,
+        .detach_client  = saa7191_detach,
+        .command        = saa7191_command
+};
+
+static int saa7191_init(void)
+{
+        return i2c_add_driver(&i2c_driver_saa7191);
+}
+
+static void saa7191_exit(void)
+{
+        i2c_del_driver(&i2c_driver_saa7191);
+}
+
+module_init(saa7191_init);
+module_exit(saa7191_exit);
diff --git a/drivers/media/video/saa7191.h b/drivers/media/video/saa7191.h
new file mode 100644
index 000000000000..272045031435
--- /dev/null
+++ b/drivers/media/video/saa7191.h
@@ -0,0 +1,139 @@
+/*
+ *  saa7191.h - Philips SAA7191 video decoder driver
+ *
+ *  Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
+ *  Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef _SAA7191_H_
+#define _SAA7191_H_
+
+/* Philips SAA7191 DMSD I2C bus address */
+#define SAA7191_ADDR            0x8a
+
+/* Register subaddresses. */
+#define SAA7191_REG_IDEL        0x00
+#define SAA7191_REG_HSYB        0x01
+#define SAA7191_REG_HSYS        0x02
+#define SAA7191_REG_HCLB        0x03
+#define SAA7191_REG_HCLS        0x04
+#define SAA7191_REG_HPHI        0x05
+#define SAA7191_REG_LUMA        0x06
+#define SAA7191_REG_HUEC        0x07
+#define SAA7191_REG_CKTQ        0x08
+#define SAA7191_REG_CKTS        0x09
+#define SAA7191_REG_PLSE        0x0a
+#define SAA7191_REG_SESE        0x0b
+#define SAA7191_REG_GAIN        0x0c
+#define SAA7191_REG_STDC        0x0d
+#define SAA7191_REG_IOCK        0x0e
+#define SAA7191_REG_CTL3        0x0f
+#define SAA7191_REG_CTL4        0x10
+#define SAA7191_REG_CHCV        0x11
+#define SAA7191_REG_HS6B        0x14
+#define SAA7191_REG_HS6S        0x15
+#define SAA7191_REG_HC6B        0x16
+#define SAA7191_REG_HC6S        0x17
+#define SAA7191_REG_HP6I        0x18
+#define SAA7191_REG_STATUS      0xff    /* not really a subaddress */
+
+/* Status Register definitions */
+#define SAA7191_STATUS_CODE     0x01    /* color detected flag */
+#define SAA7191_STATUS_FIDT     0x20    /* format type NTSC/PAL */
+#define SAA7191_STATUS_HLCK     0x40    /* PLL unlocked/locked */
+#define SAA7191_STATUS_STTC     0x80    /* tv/vtr time constant */
+
+/* Luminance Control Register definitions */
+#define SAA7191_LUMA_BYPS       0x80
+
+/* Chroma Gain Control Settings Register definitions */
+/* 0=automatic colour-killer enabled, 1=forced colour on */
+#define SAA7191_GAIN_COLO       0x80
+
+/* Standard/Mode Control Register definitions */
+/* tv/vtr mode bit: 0=TV mode (slow time constant),
+ * 1=VTR mode (fast time constant) */
+#define SAA7191_STDC_VTRC       0x80
+/* SECAM mode bit: 0=other standards, 1=SECAM */
+#define SAA7191_STDC_SECS       0x01
+/* the bit fields above must be or'd with this value */
+#define SAA7191_STDC_VALUE      0x0c
+
+/* I/O and Clock Control Register definitions */
+/* horizontal clock PLL: 0=PLL closed,
+ * 1=PLL circuit open and horizontal freq fixed */
+#define SAA7191_IOCK_HPLL       0x80
+/* S-VHS bit (chrominance from CVBS or from chrominance input):
+ * 0=controlled by BYPS-bit, 1=from chrominance input */
+#define SAA7191_IOCK_CHRS       0x04
+/* general purpose switch 2
+ * VINO-specific: 0=used with CVBS, 1=used with S-Video */
+#define SAA7191_IOCK_GPSW2      0x02
+/* general purpose switch 1 */
+/* VINO-specific: 0=always, 1=not used!*/
+#define SAA7191_IOCK_GPSW1      0x01
+
+/* Miscellaneous Control #1 Register definitions */
+/* automatic field detection (50/60Hz standard) */
+#define SAA7191_CTL3_AUFD       0x80
+/* field select: (if AUFD=0)
+ * 0=50Hz (625 lines), 1=60Hz (525 lines) */
+#define SAA7191_CTL3_FSEL       0x40
+/* the bit fields above must be or'd with this value */
+#define SAA7191_CTL3_VALUE      0x19
+
+/* Chrominance Gain Control Register definitions
+ * (nominal value for UV CCIR level) */
+#define SAA7191_CHCV_NTSC       0x2c
+#define SAA7191_CHCV_PAL        0x59
+
+/* Driver interface definitions */
+#define SAA7191_INPUT_COMPOSITE 0
+#define SAA7191_INPUT_SVIDEO    1
+
+#define SAA7191_NORM_AUTO       0
+#define SAA7191_NORM_PAL        1
+#define SAA7191_NORM_NTSC       2
+#define SAA7191_NORM_SECAM      3
+
+#define SAA7191_VALUE_ENABLED           1
+#define SAA7191_VALUE_DISABLED          0
+#define SAA7191_VALUE_UNCHANGED         -1
+
+struct saa7191_status {
+        /* 0=no signal, 1=signal active*/
+        int signal;
+        /* 0=50hz (pal) signal, 1=60hz (ntsc) signal */
+        int ntsc;
+        /* 0=no color detected, 1=color detected */
+        int color;
+
+        /* current SAA7191_INPUT_ */
+        int input;
+        /* current SAA7191_NORM_ */
+        int norm;
+};
+
+#define SAA7191_HUE_MIN         0x00
+#define SAA7191_HUE_MAX         0xff
+#define SAA7191_HUE_DEFAULT     0x80
+
+#define SAA7191_VTRC_MIN        0x00
+#define SAA7191_VTRC_MAX        0x01
+#define SAA7191_VTRC_DEFAULT    0x00
+
+struct saa7191_control {
+        int hue;
+        int vtrc;
+};
+
+#define DECODER_SAA7191_GET_STATUS      _IOR('d', 195, struct saa7191_status)
+#define DECODER_SAA7191_SET_NORM        _IOW('d', 196, int)
+#define DECODER_SAA7191_GET_CONTROLS    _IOR('d', 197, struct saa7191_control)
+#define DECODER_SAA7191_SET_CONTROLS    _IOW('d', 198, struct saa7191_control)
+
+#endif
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 7cb1fb3e66f9..255b6088ebf9 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -328,7 +328,7 @@ static int tda7432_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tda7432_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, tda7432_attach);
 #endif
         return 0;
@@ -513,7 +513,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda7432"),
+        .name       = "tda7432",
         .driver     = &driver,
 };
 
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index c29bdfc3244e..1794686612c6 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -205,7 +205,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
@@ -231,7 +231,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tda9840"),
+        .name = "tda9840",
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 566e1a5ca135..7e3dcdb262b0 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -262,7 +262,7 @@ static int tda9875_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tda9875_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, tda9875_attach);
 #endif
         return 0;
@@ -384,7 +384,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9875"),
+        .name      = "tda9875",
         .driver    = &driver,
 };
 
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 108c3ad7d622..d60fc562aecd 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -618,9 +618,9 @@ static int tda9887_probe(struct i2c_adapter *adap)
                 return i2c_probe(adap, &addr_data, tda9887_attach);
 #else
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
+        case I2C_HW_SAA7134:
                 return i2c_probe(adap, &addr_data, tda9887_attach);
                 break;
         }
@@ -760,7 +760,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int tda9887_suspend(struct device * dev, u32 state, u32 level)
+static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level)
 {
         dprintk("tda9887: suspend\n");
         return 0;
@@ -793,7 +793,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9887"),
+        .name      = "tda9887",
         .flags     = I2C_CLIENT_ALLOW_USE,
         .driver    = &driver,
 };
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index b44db8a7b94d..ee3688348b66 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -86,7 +86,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
@@ -200,7 +200,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6415c"),
+        .name = "tea6415c",
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 48d4db7d507b..17975c19da5e 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -135,7 +135,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
         /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                 dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                 return -ENODEV;
         }
@@ -177,7 +177,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6420"),
+        .name = "tea6420",
         .driver = &driver,
 };
 
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 7d825e510ffd..79203595b9c1 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -41,7 +41,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c     = normal_i2c,
         .probe          = &ignore,
         .ignore         = &ignore,
-        .force          = &ignore,
 };
 
 /* ---------------------------------------------------------------------- */
@@ -166,7 +165,7 @@ static int
 tuner_probe(struct i2c_adapter *adap)
 {
         this_adap = 0;
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_LP))
+        if (adap->id == I2C_HW_B_LP)
                 return i2c_probe(adap, &addr_data, tuner_attach);
         return 0;
 }
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index f0a579827a24..3b1893c2ae3b 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -672,7 +672,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
         return 0;
 }
 
-static int tuner_suspend(struct device *dev, u32 state, u32 level)
+static int tuner_suspend(struct device *dev, pm_message_t state, u32 level)
 {
         struct i2c_client *c = container_of (dev, struct i2c_client, dev);
         struct tuner *t = i2c_get_clientdata (c);
@@ -709,7 +709,7 @@ static struct i2c_driver driver = {
                    },
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(tuner unset)"),
+        .name = "(tuner unset)",
         .flags = I2C_CLIENT_ALLOW_USE,
         .driver = &driver,
 };
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index f42a1efa8fcf..258724b2d6d2 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -162,24 +162,23 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
         unsigned char buffer[2];
 
         if (-1 == subaddr) {
-                dprintk("%s: chip_write: 0x%x\n",
-                        i2c_clientname(&chip->c), val);
+                dprintk("%s: chip_write: 0x%x\n", chip->c.name, val);
                 chip->shadow.bytes[1] = val;
                 buffer[0] = val;
                 if (1 != i2c_master_send(&chip->c,buffer,1)) {
                         printk(KERN_WARNING "%s: I/O error (write 0x%x)\n",
-                               i2c_clientname(&chip->c), val);
+                               chip->c.name, val);
                         return -1;
                 }
         } else {
                 dprintk("%s: chip_write: reg%d=0x%x\n",
-                        i2c_clientname(&chip->c), subaddr, val);
+                        chip->c.name, subaddr, val);
                 chip->shadow.bytes[subaddr+1] = val;
                 buffer[0] = subaddr;
                 buffer[1] = val;
                 if (2 != i2c_master_send(&chip->c,buffer,2)) {
                         printk(KERN_WARNING "%s: I/O error (write reg%d=0x%x)\n",
-                               i2c_clientname(&chip->c), subaddr, val);
+                               chip->c.name, subaddr, val);
                         return -1;
                 }
         }
@@ -203,11 +202,10 @@ static int chip_read(struct CHIPSTATE *chip)
         unsigned char buffer;
 
         if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
-                printk(KERN_WARNING "%s: I/O error (read)\n",
-                       i2c_clientname(&chip->c));
+                printk(KERN_WARNING "%s: I/O error (read)\n", chip->c.name);
                 return -1;
         }
-        dprintk("%s: chip_read: 0x%x\n",i2c_clientname(&chip->c),buffer);
+        dprintk("%s: chip_read: 0x%x\n", chip->c.name, buffer);
         return buffer;
 }
 
@@ -222,12 +220,11 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
         write[0] = subaddr;
 
         if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
-                printk(KERN_WARNING "%s: I/O error (read2)\n",
-                       i2c_clientname(&chip->c));
+                printk(KERN_WARNING "%s: I/O error (read2)\n", chip->c.name);
                 return -1;
         }
         dprintk("%s: chip_read2: reg%d=0x%x\n",
-                i2c_clientname(&chip->c),subaddr,read[0]);
+                chip->c.name, subaddr, read[0]);
         return read[0];
 }
 
@@ -240,7 +237,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
         /* update our shadow register set; print bytes if (debug > 0) */
         dprintk("%s: chip_cmd(%s): reg=%d, data:",
-                i2c_clientname(&chip->c),name,cmd->bytes[0]);
+                chip->c.name, name, cmd->bytes[0]);
         for (i = 1; i < cmd->count; i++) {
                 dprintk(" 0x%x",cmd->bytes[i]);
                 chip->shadow.bytes[i+cmd->bytes[0]] = cmd->bytes[i];
@@ -249,7 +246,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
         /* send data to the chip */
         if (cmd->count != i2c_master_send(&chip->c,cmd->bytes,cmd->count)) {
-                printk(KERN_WARNING "%s: I/O error (%s)\n", i2c_clientname(&chip->c), name);
+                printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.name, name);
                 return -1;
         }
         return 0;
@@ -274,9 +271,9 @@ static int chip_thread(void *data)
         struct CHIPSTATE *chip = data;
         struct CHIPDESC  *desc = chiplist + chip->type;
 
-        daemonize("%s",i2c_clientname(&chip->c));
+        daemonize("%s", chip->c.name);
         allow_signal(SIGTERM);
-        dprintk("%s: thread started\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread started\n", chip->c.name);
 
         for (;;) {
                 add_wait_queue(&chip->wq, &wait);
@@ -288,7 +285,7 @@ static int chip_thread(void *data)
                 try_to_freeze();
                 if (chip->done || signal_pending(current))
                         break;
-                dprintk("%s: thread wakeup\n", i2c_clientname(&chip->c));
+                dprintk("%s: thread wakeup\n", chip->c.name);
 
                 /* don't do anything for radio or if mode != auto */
                 if (chip->norm == VIDEO_MODE_RADIO || chip->mode != 0)
@@ -301,7 +298,7 @@ static int chip_thread(void *data)
                 mod_timer(&chip->wt, jiffies+2*HZ);
         }
 
-        dprintk("%s: thread exiting\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread exiting\n", chip->c.name);
         complete_and_exit(&chip->texit, 0);
         return 0;
 }
@@ -314,7 +311,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
         if (mode == chip->prevmode)
             return;
 
-        dprintk("%s: thread checkmode\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread checkmode\n", chip->c.name);
         chip->prevmode = mode;
 
         if (mode & VIDEO_SOUND_STEREO)
@@ -1098,7 +1095,7 @@ static int tda8425_initialize(struct CHIPSTATE *chip)
                             /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
                             /* off      */ TDA8425_S1_OFF, /* on     */ TDA8425_S1_CH2};
 
-        if (chip->c.adapter->id == (I2C_ALGO_BIT | I2C_HW_B_RIVA)) {
+        if (chip->c.adapter->id == I2C_HW_B_RIVA) {
                 memcpy (desc->inputmap, inputmap, sizeof (inputmap));
         }
         return 0;
@@ -1501,7 +1498,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
 
         /* fill required data structures */
-        strcpy(i2c_clientname(&chip->c),desc->name);
+        strcpy(chip->c.name, desc->name);
         chip->type = desc-chiplist;
         chip->shadow.count = desc->registers+1;
         chip->prevmode = -1;
@@ -1538,7 +1535,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 chip->tpid = kernel_thread(chip_thread,(void *)chip,0);
                 if (chip->tpid < 0)
                         printk(KERN_WARNING "%s: kernel_thread() failed\n",
-                               i2c_clientname(&chip->c));
+                               chip->c.name);
                 wake_up_interruptible(&chip->wq);
         }
         return 0;
@@ -1548,16 +1545,16 @@ static int chip_probe(struct i2c_adapter *adap)
 {
         /* don't attach on saa7146 based cards,
            because dedicated drivers are used */
-        if ((adap->id & I2C_ALGO_SAA7146))
+        if (adap->id == I2C_HW_SAA7146)
                 return 0;
 #ifdef I2C_CLASS_TV_ANALOG
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, chip_attach);
 #else
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
+        case I2C_HW_SAA7134:
                 return i2c_probe(adap, &addr_data, chip_attach);
         }
 #endif
@@ -1591,7 +1588,7 @@ static int chip_command(struct i2c_client *client,
         struct CHIPSTATE *chip = i2c_get_clientdata(client);
         struct CHIPDESC  *desc = chiplist + chip->type;
 
-        dprintk("%s: chip_command 0x%x\n",i2c_clientname(&chip->c),cmd);
+        dprintk("%s: chip_command 0x%x\n", chip->c.name, cmd);
 
         switch (cmd) {
         case AUDC_SET_INPUT:
@@ -1702,7 +1699,7 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name       = "(unset)",
         .flags      = I2C_CLIENT_ALLOW_USE,
         .driver     = &driver,
 };
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 127ec38ebd60..3c3356a01cc6 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -534,7 +534,7 @@ static int
 tveeprom_attach_adapter (struct i2c_adapter *adapter)
 {
         dprintk(1,"%s: id 0x%x\n",__FUNCTION__,adapter->id);
-        if (adapter->id != (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adapter->id != I2C_HW_B_BT848)
                 return 0;
         return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
 }
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 51b99cdbf29e..a43301a154af 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -91,7 +91,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
         if (cmd == SOUND_MIXER_INFO) {
                 mixer_info info;
                 strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                 info.modify_counter = 42 /* FIXME */;
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
@@ -100,7 +100,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
         if (cmd == SOUND_OLD_MIXER_INFO) {
                 _old_mixer_info info;
                 strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
                 return 0;
@@ -276,9 +276,9 @@ static int tvmixer_clients(struct i2c_client *client)
 #else
         /* TV card ??? */
         switch (client->adapter->id) {
-        case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_SMBUS_VOODOO3:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
                 /* ok, have a look ... */
                 break;
         default:
@@ -295,7 +295,7 @@ static int tvmixer_clients(struct i2c_client *client)
                         devices[i].dev = NULL;
                         devices[i].minor = -1;
                         printk("tvmixer: %s unregistered (#1)\n",
-                               i2c_clientname(client));
+                               client->name);
                         return 0;
                 }
         }
@@ -354,7 +354,7 @@ static void __exit tvmixer_cleanup_module(void)
                 if (devices[i].minor != -1) {
                         unregister_sound_mixer(devices[i].minor);
                         printk("tvmixer: %s unregistered (#2)\n",
-                               i2c_clientname(devices[i].dev));
+                               devices[i].dev->name);
                 }
         }
 }
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 76e8681d65c6..d8a0f763ca10 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -1,80 +1,606 @@
 /*
- * (incomplete) Driver for the VINO (Video In No Out) system found in SGI Indys.
+ * Driver for the VINO (Video In No Out) system found in SGI Indys.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License version 2 as published by the Free Software Foundation.
  *
+ * Copyright (C) 2004,2005 Mikael Nousiainen <tmnousia@cc.hut.fi>
+ *
+ * Based on the previous version of the driver for 2.4 kernels by:
  * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
  */
 
-#include <linux/module.h>
+/*
+ * TODO:
+ * - remove "hacks" from memory allocation code and implement nopage()
+ * - check decimation, calculating and reporting image size when
+ *   using decimation
+ * - check vino_acquire_input(), vino_set_input() and channel
+ *   ownership handling
+ * - report VINO error-interrupts via ioctls ?
+ * - implement picture controls (all implemented?)
+ * - use macros for boolean values (?)
+ * - implement user mode buffers and overlay (?)
+ */
+
 #include <linux/init.h>
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/wrapper.h>
-#include <linux/errno.h>
-#include <linux/irq.h>
+#include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/videodev.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/time.h>
+#include <linux/moduleparam.h>
+
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
+#endif
+
 #include <linux/i2c.h>
 #include <linux/i2c-algo-sgi.h>
 
-#include <asm/addrspace.h>
-#include <asm/system.h>
-#include <asm/bootinfo.h>
-#include <asm/pgtable.h>
+#include <linux/videodev.h>
+#include <linux/videodev2.h>
+#include <linux/video_decoder.h>
+
 #include <asm/paccess.h>
 #include <asm/io.h>
 #include <asm/sgi/ip22.h>
-#include <asm/sgi/hpc3.h>
 #include <asm/sgi/mc.h>
 
 #include "vino.h"
+#include "saa7191.h"
+#include "indycam.h"
+
+/* Uncomment the following line to get lots and lots of (mostly useless)
+ * debug info.
+ * Note that the debug output also slows down the driver significantly */
+// #define VINO_DEBUG
+
+#define VINO_MODULE_VERSION "0.0.3"
+#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 3)
+
+MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
+MODULE_VERSION(VINO_MODULE_VERSION);
+MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
+MODULE_LICENSE("GPL");
 
-/* debugging? */
-#if 1
-#define DEBUG(x...)     printk(x);
+#define mem_map_reserve(p) set_bit(PG_reserved, &((p)->flags))
+#define mem_map_unreserve(p) clear_bit(PG_reserved, &((p)->flags))
+
+#ifdef VINO_DEBUG
+#define dprintk(x...) printk("VINO: " x);
 #else
-#define DEBUG(x...)
+#define dprintk(x...)
 #endif
 
+#define VINO_NO_CHANNEL                 0
+#define VINO_CHANNEL_A                  1
+#define VINO_CHANNEL_B                  2
+
+#define VINO_PAL_WIDTH                  768
+#define VINO_PAL_HEIGHT                 576
+#define VINO_NTSC_WIDTH                 640
+#define VINO_NTSC_HEIGHT                480
+
+#define VINO_MIN_WIDTH                  32
+#define VINO_MIN_HEIGHT                 32
+
+#define VINO_CLIPPING_START_ODD_D1      1
+#define VINO_CLIPPING_START_ODD_PAL     1
+#define VINO_CLIPPING_START_ODD_NTSC    1
+
+#define VINO_CLIPPING_START_EVEN_D1     2
+#define VINO_CLIPPING_START_EVEN_PAL    2
+#define VINO_CLIPPING_START_EVEN_NTSC   2
+
+#define VINO_INPUT_CHANNEL_COUNT        3
+
+#define VINO_INPUT_NONE                 -1
+#define VINO_INPUT_COMPOSITE            0
+#define VINO_INPUT_SVIDEO               1
+#define VINO_INPUT_D1                   2
+
+#define VINO_PAGE_RATIO                 (PAGE_SIZE / VINO_PAGE_SIZE)
+
+#define VINO_FIFO_THRESHOLD_DEFAULT     512
+
+/*#define VINO_FRAMEBUFFER_SIZE         (VINO_PAL_WIDTH * VINO_PAL_HEIGHT * 4 \
+  + 2 * PAGE_SIZE)*/
+#define VINO_FRAMEBUFFER_SIZE           ((VINO_PAL_WIDTH \
+                                          * VINO_PAL_HEIGHT * 4 \
+                                          + 3 * PAGE_SIZE) & ~(PAGE_SIZE - 1))
+
+#define VINO_FRAMEBUFFER_MAX_COUNT      8
+
+#define VINO_FRAMEBUFFER_UNUSED         0
+#define VINO_FRAMEBUFFER_IN_USE         1
+#define VINO_FRAMEBUFFER_READY          2
+
+#define VINO_QUEUE_ERROR                -1
+#define VINO_QUEUE_MAGIC                0x20050125
+
+#define VINO_MEMORY_NONE                0
+#define VINO_MEMORY_MMAP                1
+#define VINO_MEMORY_USERPTR             2
+
+#define VINO_DUMMY_DESC_COUNT           4
+#define VINO_DESC_FETCH_DELAY           5       /* microseconds */
+
+/* the number is the index for vino_data_formats */
+#define VINO_DATA_FMT_NONE              -1
+#define VINO_DATA_FMT_GREY              0
+#define VINO_DATA_FMT_RGB332            1
+#define VINO_DATA_FMT_RGB32             2
+#define VINO_DATA_FMT_YUV               3
+//#define VINO_DATA_FMT_RGB24           4
+
+#define VINO_DATA_FMT_COUNT             4
+
+#define VINO_DATA_NORM_NONE             -1
+#define VINO_DATA_NORM_NTSC             0
+#define VINO_DATA_NORM_PAL              1
+#define VINO_DATA_NORM_SECAM            2
+#define VINO_DATA_NORM_D1               3
+/* The following is a special entry that can be used to
+ * autodetect the norm. */
+#define VINO_DATA_NORM_AUTO             0xff
+
+#define VINO_DATA_NORM_COUNT            4
 
-/* VINO ASIC registers */
-struct sgi_vino *vino;
+/* Internal data structure definitions */
 
-static const char *vinostr = "VINO IndyCam/TV";
-static int threshold_a = 512;
-static int threshold_b = 512;
+struct vino_input {
+        char *name;
+        v4l2_std_id std;
+};
+
+struct vino_clipping {
+        unsigned int left, right, top, bottom;
+};
+
+struct vino_data_format {
+        /* the description */
+        char *description;
+        /* bytes per pixel */
+        unsigned int bpp;
+        /* V4L2 fourcc code */
+        __u32 pixelformat;
+        /* V4L2 colorspace (duh!) */
+        enum v4l2_colorspace colorspace;
+};
+
+struct vino_data_norm {
+        char *description;
+        unsigned int width, height;
+        struct vino_clipping odd;
+        struct vino_clipping even;
+
+        v4l2_std_id std;
+        unsigned int fps_min, fps_max;
+        __u32 framelines;
+};
+
+struct vino_descriptor_table {
+        /* the number of PAGE_SIZE sized pages in the buffer */
+        unsigned int page_count;
+        /* virtual (kmalloc'd) pointers to the actual data
+         * (in PAGE_SIZE chunks, used with mmap streaming) */
+        unsigned long *virtual;
+
+        /* cpu address for the VINO descriptor table
+         * (contains DMA addresses, VINO_PAGE_SIZE chunks) */
+        unsigned long *dma_cpu;
+        /* dma address for the VINO descriptor table
+         * (contains DMA addresses, VINO_PAGE_SIZE chunks) */
+        dma_addr_t dma;
+};
+
+struct vino_framebuffer {
+        /* identifier nubmer */
+        unsigned int id;
+        /* the length of the whole buffer */
+        unsigned int size;
+        /* the length of actual data in buffer */
+        unsigned int data_size;
+        /* the data format */
+        unsigned int data_format;
+        /* the state of buffer data */
+        unsigned int state;
+        /* is the buffer mapped in user space? */
+        unsigned int map_count;
+        /* memory offset for mmap() */
+        unsigned int offset;
+        /* frame counter */
+        unsigned int frame_counter;
+        /* timestamp (written when image capture finishes) */
+        struct timeval timestamp;
+
+        struct vino_descriptor_table desc_table;
+
+        spinlock_t state_lock;
+};
 
-struct vino_device {
-        struct video_device vdev;
-#define VINO_CHAN_A             1
-#define VINO_CHAN_B             2
-        int chan;
+struct vino_framebuffer_fifo {
+        unsigned int length;
+
+        unsigned int used;
+        unsigned int head;
+        unsigned int tail;
+
+        unsigned int data[VINO_FRAMEBUFFER_MAX_COUNT];
+};
+
+struct vino_framebuffer_queue {
+        unsigned int magic;
+
+        /* VINO_MEMORY_NONE, VINO_MEMORY_MMAP or VINO_MEMORY_USERPTR */
+        unsigned int type;
+        unsigned int length;
+
+        /* data field of in and out contain index numbers for buffer */
+        struct vino_framebuffer_fifo in;
+        struct vino_framebuffer_fifo out;
+
+        struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_MAX_COUNT];
+
+        spinlock_t queue_lock;
+        struct semaphore queue_sem;
+        wait_queue_head_t frame_wait_queue;
+};
+
+struct vino_channel_settings {
+        unsigned int channel;
+
+        int input;
+        unsigned int data_format;
+        unsigned int data_norm;
+        struct vino_clipping clipping;
+        unsigned int decimation;
+        unsigned int line_size;
+        unsigned int alpha;
+        unsigned int fps;
+        unsigned int framert_reg;
+
+        unsigned int fifo_threshold;
+
+        struct vino_framebuffer_queue fb_queue;
+
+        /* number of the current field */
+        unsigned int field;
+
+        /* read in progress */
+        int reading;
+        /* streaming is active */
+        int streaming;
+        /* the driver is currently processing the queue */
+        int capturing;
+
+        struct semaphore sem;
+        spinlock_t capture_lock;
+
+        unsigned int users;
+
+        /* V4L support */
+        struct video_device *v4l_device;
 };
 
 struct vino_client {
+        /* the channel which owns this client:
+         * VINO_NO_CHANNEL, VINO_CHANNEL_A or VINO_CHANNEL_B */
+        unsigned int owner;
         struct i2c_client *driver;
-        int owner;
 };
 
-struct vino_video {
-        struct vino_device chA;
-        struct vino_device chB;
+struct vino_settings {
+        struct vino_channel_settings a;
+        struct vino_channel_settings b;
 
         struct vino_client decoder;
         struct vino_client camera;
 
-        struct semaphore input_lock;
+        /* a lock for vino register access */
+        spinlock_t vino_lock;
+        /* a lock for channel input changes */
+        spinlock_t input_lock;
 
-        /* Loaded into VINO descriptors to clear End Of Descriptors table
-         * interupt condition */
         unsigned long dummy_page;
-        unsigned int dummy_buf[4] __attribute__((aligned(8)));
+        struct vino_descriptor_table dummy_desc_table;
 };
 
-static struct vino_video *Vino;
+/* Module parameters */
+
+/*
+ * Using vino_pixel_conversion the ARGB32-format pixels supplied
+ * by the VINO chip can be converted to more common formats
+ * like RGBA32 (or probably RGB24 in the future). This way we
+ * can give out data that can be specified correctly with
+ * the V4L2-definitions.
+ *
+ * The pixel format is specified as RGBA32 when no conversion
+ * is used.
+ *
+ * Note that this only affects the 32-bit bit depth.
+ *
+ * Use non-zero value to enable conversion.
+ */
+static int vino_pixel_conversion = 0;
+module_param_named(pixelconv, vino_pixel_conversion, int, 0);
+MODULE_PARM_DESC(pixelconv,
+                 "enable pixel conversion (non-zero value enables)");
+
+/* Internal data structures */
+
+static struct sgi_vino *vino;
+
+static struct vino_settings *vino_drvdata;
+
+static const char *vino_driver_name = "vino";
+static const char *vino_driver_description = "SGI VINO";
+static const char *vino_bus_name = "GIO64 bus";
+static const char *vino_v4l_device_name_a = "SGI VINO Channel A";
+static const char *vino_v4l_device_name_b = "SGI VINO Channel B";
+
+static const struct vino_input vino_inputs[] = {
+        {
+                .name           = "Composite",
+                .std            = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
+        },{
+                .name           = "S-Video",
+                .std            = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM,
+        },{
+                .name           = "D1 (IndyCam)",
+                .std            = V4L2_STD_NTSC,
+        }
+};
+
+static const struct vino_data_format vino_data_formats[] = {
+        {
+                .description    = "8-bit greyscale",
+                .bpp            = 1,
+                .pixelformat    = V4L2_PIX_FMT_GREY,
+                .colorspace     = V4L2_COLORSPACE_SMPTE170M,
+        },{
+                .description    = "8-bit dithered RGB 3-3-2",
+                .bpp            = 1,
+                .pixelformat    = V4L2_PIX_FMT_RGB332,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+        },{
+                .description    = "32-bit RGB",
+                .bpp            = 4,
+                .pixelformat    = V4L2_PIX_FMT_RGB32,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+        },{
+                .description    = "YUV 4:2:2",
+                .bpp            = 4,
+                .pixelformat    = V4L2_PIX_FMT_YUYV, // XXX: swapped?
+                .colorspace     = V4L2_COLORSPACE_SMPTE170M,
+        }/*,{
+                .description    = "24-bit RGB",
+                .bpp            = 3,
+                .pixelformat    = V4L2_PIX_FMT_RGB24,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                }*/
+};
+
+static const struct vino_data_norm vino_data_norms[] = {
+        {
+                .description    = "NTSC",
+                .std            = V4L2_STD_NTSC,
+                .fps_min        = 6,
+                .fps_max        = 30,
+                .framelines     = 525,
+                .width          = VINO_NTSC_WIDTH,
+                .height         = VINO_NTSC_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_NTSC,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_NTSC
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_NTSC,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_NTSC
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+        },{
+                .description    = "PAL",
+                .std            = V4L2_STD_PAL,
+                .fps_min        = 5,
+                .fps_max        = 25,
+                .framelines     = 625,
+                .width          = VINO_PAL_WIDTH,
+                .height         = VINO_PAL_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+        },{
+                .description    = "SECAM",
+                .std            = V4L2_STD_SECAM,
+                .fps_min        = 5,
+                .fps_max        = 25,
+                .framelines     = 625,
+                .width          = VINO_PAL_WIDTH,
+                .height         = VINO_PAL_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_PAL,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_PAL
+                        + VINO_PAL_HEIGHT / 2 - 1,
+                        .right  = VINO_PAL_WIDTH,
+                },
+        },{
+                .description    = "NTSC (D1 input)",
+                .std            = V4L2_STD_NTSC,
+                .fps_min        = 6,
+                .fps_max        = 30,
+                .framelines     = 525,
+                .width          = VINO_NTSC_WIDTH,
+                .height         = VINO_NTSC_HEIGHT,
+                .odd            = {
+                        .top    = VINO_CLIPPING_START_ODD_D1,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_ODD_D1
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+                .even           = {
+                        .top    = VINO_CLIPPING_START_EVEN_D1,
+                        .left   = 0,
+                        .bottom = VINO_CLIPPING_START_EVEN_D1
+                        + VINO_NTSC_HEIGHT / 2 - 1,
+                        .right  = VINO_NTSC_WIDTH,
+                },
+        }
+};
+
+#define VINO_INDYCAM_V4L2_CONTROL_COUNT         9
+
+struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
+        {
+                .id = V4L2_CID_AUTOGAIN,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Automatic Gain Control",
+                .minimum = 0,
+                .maximum = 1,
+                .step = 1,
+                .default_value = INDYCAM_AGC_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_AUTO_WHITE_BALANCE,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "Automatic White Balance",
+                .minimum = 0,
+                .maximum = 1,
+                .step = 1,
+                .default_value = INDYCAM_AWB_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_GAIN,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Gain",
+                .minimum = INDYCAM_GAIN_MIN,
+                .maximum = INDYCAM_GAIN_MAX,
+                .step = 1,
+                .default_value = INDYCAM_GAIN_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Red Saturation",
+                .minimum = INDYCAM_RED_SATURATION_MIN,
+                .maximum = INDYCAM_RED_SATURATION_MAX,
+                .step = 1,
+                .default_value = INDYCAM_RED_SATURATION_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE + 1,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Blue Saturation",
+                .minimum = INDYCAM_BLUE_SATURATION_MIN,
+                .maximum = INDYCAM_BLUE_SATURATION_MAX,
+                .step = 1,
+                .default_value = INDYCAM_BLUE_SATURATION_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_RED_BALANCE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Red Balance",
+                .minimum = INDYCAM_RED_BALANCE_MIN,
+                .maximum = INDYCAM_RED_BALANCE_MAX,
+                .step = 1,
+                .default_value = INDYCAM_RED_BALANCE_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_BLUE_BALANCE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Blue Balance",
+                .minimum = INDYCAM_BLUE_BALANCE_MIN,
+                .maximum = INDYCAM_BLUE_BALANCE_MAX,
+                .step = 1,
+                .default_value = INDYCAM_BLUE_BALANCE_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_EXPOSURE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Shutter Control",
+                .minimum = INDYCAM_SHUTTER_MIN,
+                .maximum = INDYCAM_SHUTTER_MAX,
+                .step = 1,
+                .default_value = INDYCAM_SHUTTER_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_GAMMA,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Gamma",
+                .minimum = INDYCAM_GAMMA_MIN,
+                .maximum = INDYCAM_GAMMA_MAX,
+                .step = 1,
+                .default_value = INDYCAM_GAMMA_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        }
+};
+
+#define VINO_SAA7191_V4L2_CONTROL_COUNT         2
+
+struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
+        {
+                .id = V4L2_CID_HUE,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Hue",
+                .minimum = SAA7191_HUE_MIN,
+                .maximum = SAA7191_HUE_MAX,
+                .step = 1,
+                .default_value = SAA7191_HUE_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        },{
+                .id = V4L2_CID_PRIVATE_BASE,
+                .type = V4L2_CTRL_TYPE_BOOLEAN,
+                .name = "VTR Time Constant",
+                .minimum = SAA7191_VTRC_MIN,
+                .maximum = SAA7191_VTRC_MAX,
+                .step = 1,
+                .default_value = SAA7191_VTRC_DEFAULT,
+                .flags = 0,
+                .reserved = { 0, 0 },
+        }
+};
+
+/* VINO I2C bus functions */
 
 unsigned i2c_vino_getctrl(void *data)
 {
@@ -112,49 +638,49 @@ static struct i2c_algo_sgi_data i2c_sgi_vino_data =
  */
 static int i2c_vino_client_reg(struct i2c_client *client)
 {
-        int res = 0;
+        int ret = 0;
 
-        down(&Vino->input_lock);
+        spin_lock(&vino_drvdata->input_lock);
         switch (client->driver->id) {
         case I2C_DRIVERID_SAA7191:
-                if (Vino->decoder.driver)
-                        res = -EBUSY;
+                if (vino_drvdata->decoder.driver)
+                        ret = -EBUSY;
                 else
-                        Vino->decoder.driver = client;
+                        vino_drvdata->decoder.driver = client;
                 break;
         case I2C_DRIVERID_INDYCAM:
-                if (Vino->camera.driver)
-                        res = -EBUSY;
+                if (vino_drvdata->camera.driver)
+                        ret = -EBUSY;
                 else
-                        Vino->camera.driver = client;
+                        vino_drvdata->camera.driver = client;
                 break;
         default:
-                res = -ENODEV;
+                ret = -ENODEV;
         }
-        up(&Vino->input_lock);
+        spin_unlock(&vino_drvdata->input_lock);
 
-        return res;
+        return ret;
 }
 
 static int i2c_vino_client_unreg(struct i2c_client *client)
 {
-        int res = 0;
+        int ret = 0;
 
-        down(&Vino->input_lock);
-        if (client == Vino->decoder.driver) {
-                if (Vino->decoder.owner)
-                        res = -EBUSY;
+        spin_lock(&vino_drvdata->input_lock);
+        if (client == vino_drvdata->decoder.driver) {
+                if (vino_drvdata->decoder.owner != VINO_NO_CHANNEL)
+                        ret = -EBUSY;
                 else
-                        Vino->decoder.driver = NULL;
-        } else if (client == Vino->camera.driver) {
-                if (Vino->camera.owner)
-                        res = -EBUSY;
+                        vino_drvdata->decoder.driver = NULL;
+        } else if (client == vino_drvdata->camera.driver) {
+                if (vino_drvdata->camera.owner != VINO_NO_CHANNEL)
+                        ret = -EBUSY;
                 else
-                        Vino->camera.driver = NULL;
+                        vino_drvdata->camera.driver = NULL;
         }
-        up(&Vino->input_lock);
+        spin_unlock(&vino_drvdata->input_lock);
 
-        return res;
+        return ret;
 }
 
 static struct i2c_adapter vino_i2c_adapter =
@@ -176,172 +702,3591 @@ static int vino_i2c_del_bus(void)
         return i2c_sgi_del_bus(&vino_i2c_adapter);
 }
 
+static int i2c_camera_command(unsigned int cmd, void *arg)
+{
+        return vino_drvdata->camera.driver->
+                driver->command(vino_drvdata->camera.driver,
+                                cmd, arg);
+}
+
+static int i2c_decoder_command(unsigned int cmd, void *arg)
+{
+        return vino_drvdata->decoder.driver->
+                driver->command(vino_drvdata->decoder.driver,
+                                cmd, arg);
+}
+
+/* VINO framebuffer/DMA descriptor management */
+
+static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
+                                               unsigned int count)
+{
+        unsigned int i;
+
+        dprintk("vino_free_buffer_with_count(): count = %d\n", count);
+
+        for (i = 0; i < count; i++) {
+                mem_map_unreserve(virt_to_page(fb->desc_table.virtual[i]));
+                dma_unmap_single(NULL,
+                                 fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
+                                 PAGE_SIZE, DMA_FROM_DEVICE);
+                free_page(fb->desc_table.virtual[i]);
+        }
+
+        dma_free_coherent(NULL,
+                          VINO_PAGE_RATIO * (fb->desc_table.page_count + 4) *
+                          sizeof(dma_addr_t), (void *)fb->desc_table.dma_cpu,
+                          fb->desc_table.dma);
+        kfree(fb->desc_table.virtual);
+
+        memset(fb, 0, sizeof(struct vino_framebuffer));
+}
+
+static void vino_free_buffer(struct vino_framebuffer *fb)
+{
+        vino_free_buffer_with_count(fb, fb->desc_table.page_count);
+}
+
+static int vino_allocate_buffer(struct vino_framebuffer *fb,
+                                unsigned int size)
+{
+        unsigned int count, i, j;
+        int ret = 0;
+
+        dprintk("vino_allocate_buffer():\n");
+
+        if (size < 1)
+                return -EINVAL;
+
+        memset(fb, 0, sizeof(struct vino_framebuffer));
+
+        count = ((size / PAGE_SIZE) + 4) & ~3;
+
+        dprintk("vino_allocate_buffer(): size = %d, count = %d\n",
+                size, count);
+
+        /* allocate memory for table with virtual (page) addresses */
+        fb->desc_table.virtual = (unsigned long *)
+                kmalloc(count * sizeof(unsigned long), GFP_KERNEL);
+        if (!fb->desc_table.virtual)
+                return -ENOMEM;
+
+        /* allocate memory for table with dma addresses
+         * (has space for four extra descriptors) */
+        fb->desc_table.dma_cpu =
+                dma_alloc_coherent(NULL, VINO_PAGE_RATIO * (count + 4) *
+                                   sizeof(dma_addr_t), &fb->desc_table.dma,
+                                   GFP_KERNEL | GFP_DMA);
+        if (!fb->desc_table.dma_cpu) {
+                ret = -ENOMEM;
+                goto out_free_virtual;
+        }
+
+        /* allocate pages for the buffer and acquire the according
+         * dma addresses */
+        for (i = 0; i < count; i++) {
+                dma_addr_t dma_data_addr;
+
+                fb->desc_table.virtual[i] =
+                        get_zeroed_page(GFP_KERNEL | GFP_DMA);
+                if (!fb->desc_table.virtual[i]) {
+                        ret = -ENOBUFS;
+                        break;
+                }
+
+                dma_data_addr =
+                        dma_map_single(NULL,
+                                       (void *)fb->desc_table.virtual[i],
+                                       PAGE_SIZE, DMA_FROM_DEVICE);
+
+                for (j = 0; j < VINO_PAGE_RATIO; j++) {
+                        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i + j] =
+                                dma_data_addr + VINO_PAGE_SIZE * j;
+                }
+
+                mem_map_reserve(virt_to_page(fb->desc_table.virtual[i]));
+        }
+
+        /* page_count needs to be set anyway, because the descriptor table has
+         * been allocated according to this number */
+        fb->desc_table.page_count = count;
+
+        if (ret) {
+                /* the descriptor with index i doesn't contain
+                 * a valid address yet */
+                vino_free_buffer_with_count(fb, i);
+                return ret;
+        }
+
+        //fb->size = size;
+        fb->size = count * PAGE_SIZE;
+        fb->data_format = VINO_DATA_FMT_NONE;
+
+        /* set the dma stop-bit for the last (count+1)th descriptor */
+        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * count] = VINO_DESC_STOP;
+        return 0;
+
+ out_free_virtual:
+        kfree(fb->desc_table.virtual);
+        return ret;
+}
+
+#if 0
+/* user buffers not fully implemented yet */
+static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
+                                     void *user,
+                                     unsigned int size)
+{
+        unsigned int count, i, j;
+        int ret = 0;
+
+        dprintk("vino_prepare_user_buffer():\n");
+
+        if (size < 1)
+                return -EINVAL;
+
+        memset(fb, 0, sizeof(struct vino_framebuffer));
+
+        count = ((size / PAGE_SIZE)) & ~3;
+
+        dprintk("vino_prepare_user_buffer(): size = %d, count = %d\n",
+                size, count);
+
+        /* allocate memory for table with virtual (page) addresses */
+        fb->desc_table.virtual = (unsigned long *)
+                kmalloc(count * sizeof(unsigned long), GFP_KERNEL);
+        if (!fb->desc_table.virtual)
+                return -ENOMEM;
+
+        /* allocate memory for table with dma addresses
+         * (has space for four extra descriptors) */
+        fb->desc_table.dma_cpu =
+                dma_alloc_coherent(NULL, VINO_PAGE_RATIO * (count + 4) *
+                                   sizeof(dma_addr_t), &fb->desc_table.dma,
+                                   GFP_KERNEL | GFP_DMA);
+        if (!fb->desc_table.dma_cpu) {
+                ret = -ENOMEM;
+                goto out_free_virtual;
+        }
+
+        /* allocate pages for the buffer and acquire the according
+         * dma addresses */
+        for (i = 0; i < count; i++) {
+                dma_addr_t dma_data_addr;
+
+                fb->desc_table.virtual[i] =
+                        get_zeroed_page(GFP_KERNEL | GFP_DMA);
+                if (!fb->desc_table.virtual[i]) {
+                        ret = -ENOBUFS;
+                        break;
+                }
+
+                dma_data_addr =
+                        dma_map_single(NULL,
+                                       (void *)fb->desc_table.virtual[i],
+                                       PAGE_SIZE, DMA_FROM_DEVICE);
+
+                for (j = 0; j < VINO_PAGE_RATIO; j++) {
+                        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i + j] =
+                                dma_data_addr + VINO_PAGE_SIZE * j;
+                }
+
+                mem_map_reserve(virt_to_page(fb->desc_table.virtual[i]));
+        }
+
+        /* page_count needs to be set anyway, because the descriptor table has
+         * been allocated according to this number */
+        fb->desc_table.page_count = count;
+
+        if (ret) {
+                /* the descriptor with index i doesn't contain
+                 * a valid address yet */
+                vino_free_buffer_with_count(fb, i);
+                return ret;
+        }
+
+        //fb->size = size;
+        fb->size = count * PAGE_SIZE;
+
+        /* set the dma stop-bit for the last (count+1)th descriptor */
+        fb->desc_table.dma_cpu[VINO_PAGE_RATIO * count] = VINO_DESC_STOP;
+        return 0;
+
+ out_free_virtual:
+        kfree(fb->desc_table.virtual);
+        return ret;
+}
+#endif
+
+static void vino_sync_buffer(struct vino_framebuffer *fb)
+{
+        int i;
+
+        dprintk("vino_sync_buffer():\n");
+
+        for (i = 0; i < fb->desc_table.page_count; i++)
+                dma_sync_single(NULL,
+                                fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
+                                PAGE_SIZE, DMA_FROM_DEVICE);
+}
+
+/* Framebuffer fifo functions (need to be locked externally) */
+
+static void vino_fifo_init(struct vino_framebuffer_fifo *f,
+                           unsigned int length)
+{
+        f->length = 0;
+        f->used = 0;
+        f->head = 0;
+        f->tail = 0;
+
+        if (length > VINO_FRAMEBUFFER_MAX_COUNT)
+                length = VINO_FRAMEBUFFER_MAX_COUNT;
+
+        f->length = length;
+}
+
+/* returns true/false */
+static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id)
+{
+        unsigned int i;
+        for (i = f->head; i == (f->tail - 1); i = (i + 1) % f->length) {
+                if (f->data[i] == id)
+                        return 1;
+        }
+
+        return 0;
+}
+
+/* returns true/false */
+static int vino_fifo_full(struct vino_framebuffer_fifo *f)
+{
+        return (f->used == f->length);
+}
+
+static unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f)
+{
+        return f->used;
+}
 
-static void vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static int vino_fifo_enqueue(struct vino_framebuffer_fifo *f, unsigned int id)
 {
+        if (id >= f->length) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        if (vino_fifo_has_id(f, id)) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        if (f->used < f->length) {
+                f->data[f->tail] = id;
+                f->tail = (f->tail + 1) % f->length;
+                f->used++;
+        } else {
+                return VINO_QUEUE_ERROR;
+        }
+
+        return 0;
 }
 
-static int vino_open(struct video_device *dev, int flags)
+static int vino_fifo_peek(struct vino_framebuffer_fifo *f, unsigned int *id)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        if (f->used > 0) {
+                *id = f->data[f->head];
+        } else {
+                return VINO_QUEUE_ERROR;
+        }
 
         return 0;
 }
 
-static void vino_close(struct video_device *dev)
+static int vino_fifo_dequeue(struct vino_framebuffer_fifo *f, unsigned int *id)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        if (f->used > 0) {
+                *id = f->data[f->head];
+                f->head = (f->head + 1) % f->length;
+                f->used--;
+        } else {
+                return VINO_QUEUE_ERROR;
+        }
+
+        return 0;
 }
 
-static int vino_mmap(struct video_device *dev, const char *adr,
-                     unsigned long size)
+/* Framebuffer queue functions */
+
+/* execute with queue_lock locked */
+static void vino_queue_free_with_count(struct vino_framebuffer_queue *q,
+                                       unsigned int length)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        unsigned int i;
 
-        return -EINVAL;
+        q->length = 0;
+        memset(&q->in, 0, sizeof(struct vino_framebuffer_fifo));
+        memset(&q->out, 0, sizeof(struct vino_framebuffer_fifo));
+        for (i = 0; i < length; i++) {
+                dprintk("vino_queue_free_with_count(): freeing buffer %d\n",
+                        i);
+                vino_free_buffer(q->buffer[i]);
+                kfree(q->buffer[i]);
+        }
+
+        q->type = VINO_MEMORY_NONE;
+        q->magic = 0;
 }
 
-static int vino_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
+static void vino_queue_free(struct vino_framebuffer_queue *q)
 {
-        struct vino_device *videv = (struct vino_device *)dev;
+        dprintk("vino_queue_free():\n");
+
+        if (q->magic != VINO_QUEUE_MAGIC)
+                return;
+        if (q->type != VINO_MEMORY_MMAP)
+                return;
+
+        down(&q->queue_sem);
+
+        vino_queue_free_with_count(q, q->length);
+
+        up(&q->queue_sem);
+}
+
+static int vino_queue_init(struct vino_framebuffer_queue *q,
+                           unsigned int *length)
+{
+        unsigned int i;
+        int ret = 0;
+
+        dprintk("vino_queue_init(): length = %d\n", *length);
+
+        if (q->magic == VINO_QUEUE_MAGIC) {
+                dprintk("vino_queue_init(): queue already initialized!\n");
+                return -EINVAL;
+        }
+
+        if (q->type != VINO_MEMORY_NONE) {
+                dprintk("vino_queue_init(): queue already initialized!\n");
+                return -EINVAL;
+        }
+
+        if (*length < 1)
+                return -EINVAL;
+
+        down(&q->queue_sem);
+
+        if (*length > VINO_FRAMEBUFFER_MAX_COUNT)
+                *length = VINO_FRAMEBUFFER_MAX_COUNT;
+
+        q->length = 0;
+
+        for (i = 0; i < *length; i++) {
+                dprintk("vino_queue_init(): allocating buffer %d\n", i);
+                q->buffer[i] = kmalloc(sizeof(struct vino_framebuffer),
+                                       GFP_KERNEL);
+                if (!q->buffer[i]) {
+                        dprintk("vino_queue_init(): kmalloc() failed\n");
+                        ret = -ENOMEM;
+                        break;
+                }
+
+                ret = vino_allocate_buffer(q->buffer[i],
+                                           VINO_FRAMEBUFFER_SIZE);
+                if (ret) {
+                        kfree(q->buffer[i]);
+                        dprintk("vino_queue_init(): "
+                                "vino_allocate_buffer() failed\n");
+                        break;
+                }
+
+                q->buffer[i]->id = i;
+                if (i > 0) {
+                        q->buffer[i]->offset = q->buffer[i - 1]->offset +
+                                q->buffer[i - 1]->size;
+                } else {
+                        q->buffer[i]->offset = 0;
+                }
+
+                spin_lock_init(&q->buffer[i]->state_lock);
+
+                dprintk("vino_queue_init(): buffer = %d, offset = %d, "
+                        "size = %d\n", i, q->buffer[i]->offset,
+                        q->buffer[i]->size);
+        }
+
+        if (ret) {
+                vino_queue_free_with_count(q, i);
+                *length = 0;
+        } else {
+                q->length = *length;
+                vino_fifo_init(&q->in, q->length);
+                vino_fifo_init(&q->out, q->length);
+                q->type = VINO_MEMORY_MMAP;
+                q->magic = VINO_QUEUE_MAGIC;
+        }
+
+        up(&q->queue_sem);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_add(struct
+                                               vino_framebuffer_queue *q,
+                                               unsigned int id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned int total;
+        unsigned long flags;
+
+        dprintk("vino_queue_add(): id = %d\n", id);
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (id >= q->length)
+                goto out;
+
+        /* not needed?: if (vino_fifo_full(&q->out)) {
+                goto out;
+                }*/
+        /* check that outgoing queue isn't already full
+         * (or that it won't become full) */
+        total = vino_fifo_get_used(&q->in) +
+                vino_fifo_get_used(&q->out);
+        if (total >= q->length)
+                goto out;
+
+        if (vino_fifo_enqueue(&q->in, id))
+                goto out;
+
+        ret = q->buffer[id];
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_transfer(struct
+                                                    vino_framebuffer_queue *q)
+{
+        struct vino_framebuffer *ret = NULL;
+        struct vino_framebuffer *fb;
+        int id;
+        unsigned long flags;
+
+        dprintk("vino_queue_transfer():\n");
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        // now this actually removes an entry from the incoming queue
+        if (vino_fifo_dequeue(&q->in, &id)) {
+                goto out;
+        }
+
+        dprintk("vino_queue_transfer(): id = %d\n", id);
+        fb = q->buffer[id];
+
+        // we have already checked that the outgoing queue is not full, but...
+        if (vino_fifo_enqueue(&q->out, id)) {
+                printk(KERN_ERR "vino_queue_transfer(): "
+                       "outgoing queue is full, this shouldn't happen!\n");
+                goto out;
+        }
+
+        ret = fb;
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+/* returns true/false */
+static int vino_queue_incoming_contains(struct vino_framebuffer_queue *q,
+                                        unsigned int id)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        ret = vino_fifo_has_id(&q->in, id);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+/* returns true/false */
+static int vino_queue_outgoing_contains(struct vino_framebuffer_queue *q,
+                                        unsigned int id)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        ret = vino_fifo_has_id(&q->out, id);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static int vino_queue_get_incoming(struct vino_framebuffer_queue *q,
+                                   unsigned int *used)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0) {
+                ret = VINO_QUEUE_ERROR;
+                goto out;
+        }
+
+        *used = vino_fifo_get_used(&q->in);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static int vino_queue_get_outgoing(struct vino_framebuffer_queue *q,
+                                   unsigned int *used)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0) {
+                ret = VINO_QUEUE_ERROR;
+                goto out;
+        }
+
+        *used = vino_fifo_get_used(&q->out);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static int vino_queue_get_total(struct vino_framebuffer_queue *q,
+                                unsigned int *total)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return VINO_QUEUE_ERROR;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0) {
+                ret = VINO_QUEUE_ERROR;
+                goto out;
+        }
+
+        *total = vino_fifo_get_used(&q->in) +
+                vino_fifo_get_used(&q->out);
+
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_peek(struct
+                                                vino_framebuffer_queue *q,
+                                                unsigned int *id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (vino_fifo_peek(&q->in, id)) {
+                goto out;
+        }
+
+        ret = q->buffer[*id];
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct vino_framebuffer *vino_queue_remove(struct
+                                                  vino_framebuffer_queue *q,
+                                                  unsigned int *id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned long flags;
+        dprintk("vino_queue_remove():\n");
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (vino_fifo_dequeue(&q->out, id)) {
+                goto out;
+        }
+
+        dprintk("vino_queue_remove(): id = %d\n", *id);
+        ret = q->buffer[*id];
+out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static struct
+vino_framebuffer *vino_queue_get_buffer(struct vino_framebuffer_queue *q,
+                                        unsigned int id)
+{
+        struct vino_framebuffer *ret = NULL;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+
+        if (q->length == 0)
+                goto out;
+
+        if (id >= q->length)
+                goto out;
+
+        ret = q->buffer[id];
+ out:
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+static unsigned int vino_queue_get_length(struct vino_framebuffer_queue *q)
+{
+        unsigned int length = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return length;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+        length = q->length;
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return length;
+}
+
+static int vino_queue_has_mapped_buffers(struct vino_framebuffer_queue *q)
+{
+        unsigned int i;
+        int ret = 0;
+        unsigned long flags;
+
+        if (q->magic != VINO_QUEUE_MAGIC) {
+                return ret;
+        }
+
+        spin_lock_irqsave(&q->queue_lock, flags);
+        for (i = 0; i < q->length; i++) {
+                if (q->buffer[i]->map_count > 0) {
+                        ret = 1;
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&q->queue_lock, flags);
+
+        return ret;
+}
+
+/* VINO functions */
+
+/* execute with input_lock locked */
+static void vino_update_line_size(struct vino_channel_settings *vcs)
+{
+        unsigned int w = vcs->clipping.right - vcs->clipping.left;
+        unsigned int d = vcs->decimation;
+        unsigned int bpp = vino_data_formats[vcs->data_format].bpp;
+        unsigned int lsize;
+
+        dprintk("update_line_size(): before: w = %d, d = %d, "
+                "line_size = %d\n", w, d, vcs->line_size);
+        /* line size must be multiple of 8 bytes */
+        lsize = (bpp * (w / d)) & ~7;
+        w = (lsize / bpp) * d;
+
+        vcs->clipping.right = vcs->clipping.left + w;
+        vcs->line_size = lsize;
+        dprintk("update_line_size(): after: w = %d, d = %d, "
+                "line_size = %d\n", w, d, vcs->line_size);
+}
+
+/* execute with input_lock locked */
+static void vino_set_clipping(struct vino_channel_settings *vcs,
+                              unsigned int x, unsigned int y,
+                              unsigned int w, unsigned int h)
+{
+        unsigned int maxwidth, maxheight;
+        unsigned int d;
+
+        maxwidth = vino_data_norms[vcs->data_norm].width;
+        maxheight = vino_data_norms[vcs->data_norm].height;
+        d = vcs->decimation;
+
+        y &= ~1;        /* odd/even fields */
+
+        if (x > maxwidth) {
+                x = 0;
+        }
+        if (y > maxheight) {
+                y = 0;
+        }
+
+        if (((w / d) < VINO_MIN_WIDTH)
+            || ((h / d) < VINO_MIN_HEIGHT)) {
+                w = VINO_MIN_WIDTH * d;
+                h = VINO_MIN_HEIGHT * d;
+        }
+
+        if ((x + w) > maxwidth) {
+                w = maxwidth - x;
+                if ((w / d) < VINO_MIN_WIDTH)
+                        x = maxwidth - VINO_MIN_WIDTH * d;
+        }
+        if ((y + h) > maxheight) {
+                h = maxheight - y;
+                if ((h / d) < VINO_MIN_HEIGHT)
+                        y = maxheight - VINO_MIN_HEIGHT * d;
+        }
+
+        vcs->clipping.left = x;
+        vcs->clipping.top = y;
+        vcs->clipping.right = x + w;
+        vcs->clipping.bottom = y + h;
+
+        vino_update_line_size(vcs);
+
+        dprintk("clipping %d, %d, %d, %d / %d - %d\n",
+                vcs->clipping.left, vcs->clipping.top, vcs->clipping.right,
+                vcs->clipping.bottom, vcs->decimation, vcs->line_size);
+}
+
+/* execute with input_lock locked */
+static void vino_set_default_clipping(struct vino_channel_settings *vcs)
+{
+        vino_set_clipping(vcs, 0, 0, vino_data_norms[vcs->data_norm].width,
+                          vino_data_norms[vcs->data_norm].height);
+}
+
+/* execute with input_lock locked */
+static void vino_set_scaling(struct vino_channel_settings *vcs,
+                             unsigned int w, unsigned int h)
+{
+        unsigned int x, y, curw, curh, d;
+
+        x = vcs->clipping.left;
+        y = vcs->clipping.top;
+        curw = vcs->clipping.right - vcs->clipping.left;
+        curh = vcs->clipping.bottom - vcs->clipping.top;
+
+        d = max(curw / w, curh / h);
+
+        dprintk("scaling w: %d, h: %d, curw: %d, curh: %d, d: %d\n",
+                w, h, curw, curh, d);
+
+        if (d < 1) {
+                d = 1;
+        }
+        if (d > 8) {
+                d = 8;
+        }
+
+        vcs->decimation = d;
+        vino_set_clipping(vcs, x, y, w * d, h * d);
+
+        dprintk("scaling %d, %d, %d, %d / %d - %d\n", vcs->clipping.left,
+                vcs->clipping.top, vcs->clipping.right, vcs->clipping.bottom,
+                vcs->decimation, vcs->line_size);
+}
+
+/* execute with input_lock locked */
+static void vino_reset_scaling(struct vino_channel_settings *vcs)
+{
+        vino_set_scaling(vcs, vcs->clipping.right - vcs->clipping.left,
+                         vcs->clipping.bottom - vcs->clipping.top);
+}
+
+/* execute with input_lock locked */
+static void vino_set_framerate(struct vino_channel_settings *vcs,
+                               unsigned int fps)
+{
+        unsigned int mask;
+
+        switch (vcs->data_norm) {
+        case VINO_DATA_NORM_NTSC:
+        case VINO_DATA_NORM_D1:
+                fps = (unsigned int)(fps / 6) * 6; // FIXME: round!
+
+                if (fps < vino_data_norms[vcs->data_norm].fps_min)
+                        fps = vino_data_norms[vcs->data_norm].fps_min;
+                if (fps > vino_data_norms[vcs->data_norm].fps_max)
+                        fps = vino_data_norms[vcs->data_norm].fps_max;
+
+                switch (fps) {
+                case 6:
+                        mask = 0x003;
+                        break;
+                case 12:
+                        mask = 0x0c3;
+                        break;
+                case 18:
+                        mask = 0x333;
+                        break;
+                case 24:
+                        mask = 0x3ff;
+                        break;
+                case 30:
+                        mask = 0xfff;
+                        break;
+                default:
+                        mask = VINO_FRAMERT_FULL;
+                }
+                vcs->framert_reg = VINO_FRAMERT_RT(mask);
+                break;
+        case VINO_DATA_NORM_PAL:
+        case VINO_DATA_NORM_SECAM:
+                fps = (unsigned int)(fps / 5) * 5; // FIXME: round!
+
+                if (fps < vino_data_norms[vcs->data_norm].fps_min)
+                        fps = vino_data_norms[vcs->data_norm].fps_min;
+                if (fps > vino_data_norms[vcs->data_norm].fps_max)
+                        fps = vino_data_norms[vcs->data_norm].fps_max;
+
+                switch (fps) {
+                case 5:
+                        mask = 0x003;
+                        break;
+                case 10:
+                        mask = 0x0c3;
+                        break;
+                case 15:
+                        mask = 0x333;
+                        break;
+                case 20:
+                        mask = 0x0ff;
+                        break;
+                case 25:
+                        mask = 0x3ff;
+                        break;
+                default:
+                        mask = VINO_FRAMERT_FULL;
+                }
+                vcs->framert_reg = VINO_FRAMERT_RT(mask) | VINO_FRAMERT_PAL;
+                break;
+        }
+
+        vcs->fps = fps;
+}
+
+/* execute with input_lock locked */
+static void vino_set_default_framerate(struct vino_channel_settings *vcs)
+{
+        vino_set_framerate(vcs, vino_data_norms[vcs->data_norm].fps_max);
+}
+
+/*
+ * Prepare VINO for DMA transfer...
+ * (execute only with vino_lock and input_lock locked)
+ */
+static int vino_dma_setup(struct vino_channel_settings *vcs,
+                          struct vino_framebuffer *fb)
+{
+        u32 ctrl, intr;
+        struct sgi_vino_channel *ch;
+        const struct vino_data_norm *norm;
+
+        dprintk("vino_dma_setup():\n");
+
+        vcs->field = 0;
+        fb->frame_counter = 0;
+
+        ch = (vcs->channel == VINO_CHANNEL_A) ? &vino->a : &vino->b;
+        norm = &vino_data_norms[vcs->data_norm];
+
+        ch->page_index = 0;
+        ch->line_count = 0;
+
+        /* VINO line size register is set 8 bytes less than actual */
+        ch->line_size = vcs->line_size - 8;
+
+        /* let VINO know where to transfer data */
+        ch->start_desc_tbl = fb->desc_table.dma;
+        ch->next_4_desc = fb->desc_table.dma;
+
+        /* give vino time to fetch the first four descriptors, 5 usec
+         * should be more than enough time */
+        udelay(VINO_DESC_FETCH_DELAY);
+
+        /* set the alpha register */
+        ch->alpha = vcs->alpha;
+
+        /* set clipping registers */
+        ch->clip_start = VINO_CLIP_ODD(norm->odd.top + vcs->clipping.top / 2) |
+                VINO_CLIP_EVEN(norm->even.top +
+                               vcs->clipping.top / 2) |
+                VINO_CLIP_X(vcs->clipping.left);
+        ch->clip_end = VINO_CLIP_ODD(norm->odd.top +
+                                     vcs->clipping.bottom / 2 - 1) |
+                VINO_CLIP_EVEN(norm->even.top +
+                               vcs->clipping.bottom / 2 - 1) |
+                VINO_CLIP_X(vcs->clipping.right);
+        /* FIXME: end-of-field bug workaround
+                       VINO_CLIP_X(VINO_PAL_WIDTH);
+         */
+
+        /* set the size of actual content in the buffer (DECIMATION !) */
+        fb->data_size = ((vcs->clipping.right - vcs->clipping.left) /
+                         vcs->decimation) *
+                ((vcs->clipping.bottom - vcs->clipping.top) /
+                 vcs->decimation) *
+                vino_data_formats[vcs->data_format].bpp;
+
+        ch->frame_rate = vcs->framert_reg;
+
+        ctrl = vino->control;
+        intr = vino->intr_status;
+
+        if (vcs->channel == VINO_CHANNEL_A) {
+                /* All interrupt conditions for this channel was cleared
+                 * so clear the interrupt status register and enable
+                 * interrupts */
+                intr &= ~VINO_INTSTAT_A;
+                ctrl |= VINO_CTRL_A_INT;
+
+                /* enable synchronization */
+                ctrl |= VINO_CTRL_A_SYNC_ENBL;
+
+                /* enable frame assembly */
+                ctrl |= VINO_CTRL_A_INTERLEAVE_ENBL;
+
+                /* set decimation used */
+                if (vcs->decimation < 2)
+                        ctrl &= ~VINO_CTRL_A_DEC_ENBL;
+                else {
+                        ctrl |= VINO_CTRL_A_DEC_ENBL;
+                        ctrl &= ~VINO_CTRL_A_DEC_SCALE_MASK;
+                        ctrl |= (vcs->decimation - 1) <<
+                                VINO_CTRL_A_DEC_SCALE_SHIFT;
+                }
+
+                /* select input interface */
+                if (vcs->input == VINO_INPUT_D1)
+                        ctrl |= VINO_CTRL_A_SELECT;
+                else
+                        ctrl &= ~VINO_CTRL_A_SELECT;
+
+                /* palette */
+                ctrl &= ~(VINO_CTRL_A_LUMA_ONLY | VINO_CTRL_A_RGB |
+                          VINO_CTRL_A_DITHER);
+        } else {
+                intr &= ~VINO_INTSTAT_B;
+                ctrl |= VINO_CTRL_B_INT;
+
+                ctrl |= VINO_CTRL_B_SYNC_ENBL;
+                ctrl |= VINO_CTRL_B_INTERLEAVE_ENBL;
+
+                if (vcs->decimation < 2)
+                        ctrl &= ~VINO_CTRL_B_DEC_ENBL;
+                else {
+                        ctrl |= VINO_CTRL_B_DEC_ENBL;
+                        ctrl &= ~VINO_CTRL_B_DEC_SCALE_MASK;
+                        ctrl |= (vcs->decimation - 1) <<
+                                VINO_CTRL_B_DEC_SCALE_SHIFT;
+
+                }
+                if (vcs->input == VINO_INPUT_D1)
+                        ctrl |= VINO_CTRL_B_SELECT;
+                else
+                        ctrl &= ~VINO_CTRL_B_SELECT;
+
+                ctrl &= ~(VINO_CTRL_B_LUMA_ONLY | VINO_CTRL_B_RGB |
+                          VINO_CTRL_B_DITHER);
+        }
+
+        /* set palette */
+        fb->data_format = vcs->data_format;
+
+        switch (vcs->data_format) {
+                case VINO_DATA_FMT_GREY:
+                        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                                VINO_CTRL_A_LUMA_ONLY : VINO_CTRL_B_LUMA_ONLY;
+                        break;
+                case VINO_DATA_FMT_RGB32:
+                        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                                VINO_CTRL_A_RGB : VINO_CTRL_B_RGB;
+                        break;
+                case VINO_DATA_FMT_YUV:
+                        /* nothing needs to be done */
+                        break;
+                case VINO_DATA_FMT_RGB332:
+                        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                                VINO_CTRL_A_RGB | VINO_CTRL_A_DITHER :
+                                VINO_CTRL_B_RGB | VINO_CTRL_B_DITHER;
+                        break;
+        }
+
+        vino->intr_status = intr;
+        vino->control = ctrl;
+
+        return 0;
+}
+
+/* (execute only with vino_lock locked) */
+static void vino_dma_start(struct vino_channel_settings *vcs)
+{
+        u32 ctrl = vino->control;
+
+        dprintk("vino_dma_start():\n");
+        ctrl |= (vcs->channel == VINO_CHANNEL_A) ?
+                VINO_CTRL_A_DMA_ENBL : VINO_CTRL_B_DMA_ENBL;
+        vino->control = ctrl;
+}
+
+/* (execute only with vino_lock locked) */
+static void vino_dma_stop(struct vino_channel_settings *vcs)
+{
+        u32 ctrl = vino->control;
+
+        ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
+                ~VINO_CTRL_A_DMA_ENBL : ~VINO_CTRL_B_DMA_ENBL;
+        vino->control = ctrl;
+        dprintk("vino_dma_stop():\n");
+}
+
+/*
+ * Load dummy page to descriptor registers. This prevents generating of
+ * spurious interrupts. (execute only with vino_lock locked)
+ */
+static void vino_clear_interrupt(struct vino_channel_settings *vcs)
+{
+        struct sgi_vino_channel *ch;
+
+        ch = (vcs->channel == VINO_CHANNEL_A) ? &vino->a : &vino->b;
+
+        ch->page_index = 0;
+        ch->line_count = 0;
+
+        ch->start_desc_tbl = vino_drvdata->dummy_desc_table.dma;
+        ch->next_4_desc = vino_drvdata->dummy_desc_table.dma;
+
+        udelay(VINO_DESC_FETCH_DELAY);
+        dprintk("channel %c clear interrupt condition\n",
+               (vcs->channel == VINO_CHANNEL_A) ? 'A':'B');
+}
+
+static int vino_capture(struct vino_channel_settings *vcs,
+                        struct vino_framebuffer *fb)
+{
+        int err = 0;
+        unsigned long flags, flags2;
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+
+        if (fb->state == VINO_FRAMEBUFFER_IN_USE)
+                err = -EBUSY;
+        fb->state = VINO_FRAMEBUFFER_IN_USE;
+
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        if (err)
+                return err;
+
+        spin_lock_irqsave(&vino_drvdata->vino_lock, flags);
+        spin_lock_irqsave(&vino_drvdata->input_lock, flags2);
+
+        vino_dma_setup(vcs, fb);
+        vino_dma_start(vcs);
+
+        spin_unlock_irqrestore(&vino_drvdata->input_lock, flags2);
+        spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags);
+
+        return err;
+}
+
+static
+struct vino_framebuffer *vino_capture_enqueue(struct
+                                              vino_channel_settings *vcs,
+                                              unsigned int index)
+{
+        struct vino_framebuffer *fb;
+        unsigned long flags;
+
+        dprintk("vino_capture_enqueue():\n");
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+
+        fb = vino_queue_add(&vcs->fb_queue, index);
+        if (fb == NULL) {
+                dprintk("vino_capture_enqueue(): vino_queue_add() failed, "
+                        "queue full?\n");
+                goto out;
+        }
+out:
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        return fb;
+}
+
+static int vino_capture_next(struct vino_channel_settings *vcs, int start)
+{
+        struct vino_framebuffer *fb;
+        unsigned int incoming, id;
+        int err = 0;
+        unsigned long flags, flags2;
+
+        dprintk("vino_capture_next():\n");
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+
+        if (start) {
+                /* start capture only if capture isn't in progress already */
+                if (vcs->capturing) {
+                        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+                        return 0;
+                }
+
+        } else {
+                /* capture next frame:
+                 * stop capture if capturing is not set */
+                if (!vcs->capturing) {
+                        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+                        return 0;
+                }
+        }
+
+        err = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
+        if (err) {
+                dprintk("vino_capture_next(): vino_queue_get_incoming() "
+                        "failed\n");
+                err = -EINVAL;
+                goto out;
+        }
+        if (incoming == 0) {
+                dprintk("vino_capture_next(): no buffers available\n");
+                goto out;
+        }
+
+        fb = vino_queue_peek(&vcs->fb_queue, &id);
+        if (fb == NULL) {
+                dprintk("vino_capture_next(): vino_queue_peek() failed\n");
+                err = -EINVAL;
+                goto out;
+        }
+
+        spin_lock_irqsave(&fb->state_lock, flags2);
+        fb->state = VINO_FRAMEBUFFER_UNUSED;
+        spin_unlock_irqrestore(&fb->state_lock, flags2);
+
+        if (start) {
+                vcs->capturing = 1;
+        }
+
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        err = vino_capture(vcs, fb);
+
+        return err;
+
+out:
+        vcs->capturing = 0;
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        return err;
+}
+
+static int vino_is_capturing(struct vino_channel_settings *vcs)
+{
+        int ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+
+        ret = vcs->capturing;
+
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        return ret;
+}
+
+/* waits until a frame is captured */
+static int vino_wait_for_frame(struct vino_channel_settings *vcs)
+{
+        wait_queue_t wait;
+        int err = 0;
+
+        dprintk("vino_wait_for_frame():\n");
+
+        init_waitqueue_entry(&wait, current);
+        /* add ourselves into wait queue */
+        add_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait);
+        /* and set current state */
+        set_current_state(TASK_INTERRUPTIBLE);
+
+        /* to ensure that schedule_timeout will return immediately
+         * if VINO interrupt was triggred meanwhile */
+        schedule_timeout(HZ / 10);
+
+        if (signal_pending(current))
+                err = -EINTR;
+
+        remove_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait);
+
+        dprintk("vino_wait_for_frame(): waiting for frame %s\n",
+                err ? "failed" : "ok");
+
+        return err;
+}
+
+/* the function assumes that PAGE_SIZE % 4 == 0 */
+static void vino_convert_to_rgba(struct vino_framebuffer *fb) {
+        unsigned char *pageptr;
+        unsigned int page, i;
+        unsigned char a;
+
+        for (page = 0; page < fb->desc_table.page_count; page++) {
+                pageptr = (unsigned char *)fb->desc_table.virtual[page];
+
+                for (i = 0; i < PAGE_SIZE; i += 4) {
+                        a = pageptr[0];
+                        pageptr[0] = pageptr[3];
+                        pageptr[1] = pageptr[2];
+                        pageptr[2] = pageptr[1];
+                        pageptr[3] = a;
+                        pageptr += 4;
+                }
+        }
+}
+
+/* checks if the buffer is in correct state and syncs data */
+static int vino_check_buffer(struct vino_channel_settings *vcs,
+                             struct vino_framebuffer *fb)
+{
+        int err = 0;
+        unsigned long flags;
+
+        dprintk("vino_check_buffer():\n");
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+        switch (fb->state) {
+        case VINO_FRAMEBUFFER_IN_USE:
+                err = -EIO;
+                break;
+        case VINO_FRAMEBUFFER_READY:
+                vino_sync_buffer(fb);
+                fb->state = VINO_FRAMEBUFFER_UNUSED;
+                break;
+        default:
+                err = -EINVAL;
+        }
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        if (!err) {
+                if (vino_pixel_conversion
+                    && (fb->data_format == VINO_DATA_FMT_RGB32)) {
+                        vino_convert_to_rgba(fb);
+                }
+        } else if (err && (err != -EINVAL)) {
+                dprintk("vino_check_buffer(): buffer not ready\n");
+
+                spin_lock_irqsave(&vino_drvdata->vino_lock, flags);
+                vino_dma_stop(vcs);
+                vino_clear_interrupt(vcs);
+                spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags);
+        }
+
+        return err;
+}
+
+/* forcefully terminates capture */
+static void vino_capture_stop(struct vino_channel_settings *vcs)
+{
+        unsigned int incoming = 0, outgoing = 0, id;
+        unsigned long flags, flags2;
+
+        dprintk("vino_capture_stop():\n");
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+        /* unset capturing to stop queue processing */
+        vcs->capturing = 0;
+
+        spin_lock_irqsave(&vino_drvdata->vino_lock, flags2);
+
+        vino_dma_stop(vcs);
+        vino_clear_interrupt(vcs);
+
+        spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags2);
+
+        /* remove all items from the queue */
+        if (vino_queue_get_incoming(&vcs->fb_queue, &incoming)) {
+                dprintk("vino_capture_stop(): "
+                        "vino_queue_get_incoming() failed\n");
+                goto out;
+        }
+        while (incoming > 0) {
+                vino_queue_transfer(&vcs->fb_queue);
+
+                if (vino_queue_get_incoming(&vcs->fb_queue, &incoming)) {
+                        dprintk("vino_capture_stop(): "
+                                "vino_queue_get_incoming() failed\n");
+                        goto out;
+                }
+        }
+
+        if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                dprintk("vino_capture_stop(): "
+                        "vino_queue_get_outgoing() failed\n");
+                goto out;
+        }
+        while (outgoing > 0) {
+                vino_queue_remove(&vcs->fb_queue, &id);
+
+                if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                        dprintk("vino_capture_stop(): "
+                                "vino_queue_get_outgoing() failed\n");
+                        goto out;
+                }
+        }
+
+out:
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+}
+
+static int vino_capture_failed(struct vino_channel_settings *vcs)
+{
+        struct vino_framebuffer *fb;
+        unsigned long flags;
+        unsigned int i;
+        int ret;
+
+        dprintk("vino_capture_failed():\n");
+
+        spin_lock_irqsave(&vino_drvdata->vino_lock, flags);
+
+        vino_dma_stop(vcs);
+        vino_clear_interrupt(vcs);
+
+        spin_unlock_irqrestore(&vino_drvdata->vino_lock, flags);
+
+        ret = vino_queue_get_incoming(&vcs->fb_queue, &i);
+        if (ret == VINO_QUEUE_ERROR) {
+                dprintk("vino_queue_get_incoming() failed\n");
+                return -EINVAL;
+        }
+        if (i == 0) {
+                /* no buffers to process */
+                return 0;
+        }
+
+        fb = vino_queue_peek(&vcs->fb_queue, &i);
+        if (fb == NULL) {
+                dprintk("vino_queue_peek() failed\n");
+                return -EINVAL;
+        }
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+        if (fb->state == VINO_FRAMEBUFFER_IN_USE) {
+                fb->state = VINO_FRAMEBUFFER_UNUSED;
+                vino_queue_transfer(&vcs->fb_queue);
+                vino_queue_remove(&vcs->fb_queue, &i);
+                /* we should actually discard the newest frame,
+                 * but who cares ... */
+        }
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        return 0;
+}
+
+static void vino_frame_done(struct vino_channel_settings *vcs,
+                            unsigned int fc)
+{
+        struct vino_framebuffer *fb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&vcs->capture_lock, flags);
+        fb = vino_queue_transfer(&vcs->fb_queue);
+        if (!fb) {
+                spin_unlock_irqrestore(&vcs->capture_lock, flags);
+                dprintk("vino_frame_done(): vino_queue_transfer() failed!\n");
+                return;
+        }
+        spin_unlock_irqrestore(&vcs->capture_lock, flags);
+
+        fb->frame_counter = fc;
+        do_gettimeofday(&fb->timestamp);
+
+        spin_lock_irqsave(&fb->state_lock, flags);
+        if (fb->state == VINO_FRAMEBUFFER_IN_USE)
+                fb->state = VINO_FRAMEBUFFER_READY;
+        spin_unlock_irqrestore(&fb->state_lock, flags);
+
+        wake_up(&vcs->fb_queue.frame_wait_queue);
+
+        vino_capture_next(vcs, 0);
+}
+
+static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        u32 intr;
+        unsigned int fc_a, fc_b;
+        int done_a = 0;
+        int done_b = 0;
+
+        spin_lock(&vino_drvdata->vino_lock);
+
+        intr = vino->intr_status;
+        fc_a = vino->a.field_counter / 2;
+        fc_b = vino->b.field_counter / 2;
+
+        // TODO: handle error-interrupts in some special way ?
+
+        if (intr & VINO_INTSTAT_A) {
+                if (intr & VINO_INTSTAT_A_EOF) {
+                        vino_drvdata->a.field++;
+                        if (vino_drvdata->a.field > 1) {
+                                vino_dma_stop(&vino_drvdata->a);
+                                vino_clear_interrupt(&vino_drvdata->a);
+                                vino_drvdata->a.field = 0;
+                                done_a = 1;
+                        }
+                        dprintk("intr: channel A end-of-field interrupt: "
+                                "%04x\n", intr);
+                } else {
+                        vino_dma_stop(&vino_drvdata->a);
+                        vino_clear_interrupt(&vino_drvdata->a);
+                        done_a = 1;
+                        dprintk("channel A error interrupt: %04x\n", intr);
+                }
+        }
+        if (intr & VINO_INTSTAT_B) {
+                if (intr & VINO_INTSTAT_B_EOF) {
+                        vino_drvdata->b.field++;
+                        if (vino_drvdata->b.field > 1) {
+                                vino_dma_stop(&vino_drvdata->b);
+                                vino_clear_interrupt(&vino_drvdata->b);
+                                vino_drvdata->b.field = 0;
+                                done_b = 1;
+                        }
+                        dprintk("intr: channel B end-of-field interrupt: "
+                                "%04x\n", intr);
+                } else {
+                        vino_dma_stop(&vino_drvdata->b);
+                        vino_clear_interrupt(&vino_drvdata->b);
+                        done_b = 1;
+                        dprintk("channel B error interrupt: %04x\n", intr);
+                }
+        }
+
+        /* always remember to clear interrupt status */
+        vino->intr_status = ~intr;
+
+        spin_unlock(&vino_drvdata->vino_lock);
+
+        if (done_a) {
+                vino_frame_done(&vino_drvdata->a, fc_a);
+                dprintk("channel A frame done, interrupt: %d\n", intr);
+        }
+        if (done_b) {
+                vino_frame_done(&vino_drvdata->b, fc_b);
+                dprintk("channel B frame done, interrupt: %d\n", intr);
+        }
 
-        return -EINVAL;
+        return IRQ_HANDLED;
 }
 
-static const struct video_device vino_device = {
+/* VINO video input management */
+
+static int vino_get_saa7191_input(int input)
+{
+        switch (input) {
+        case VINO_INPUT_COMPOSITE:
+                return SAA7191_INPUT_COMPOSITE;
+        case VINO_INPUT_SVIDEO:
+                return SAA7191_INPUT_SVIDEO;
+        default:
+                printk(KERN_ERR "VINO: vino_get_saa7191_input(): "
+                       "invalid input!\n");
+                return -1;
+        }
+}
+
+static int vino_get_saa7191_norm(int norm)
+{
+        switch (norm) {
+        case VINO_DATA_NORM_AUTO:
+                return SAA7191_NORM_AUTO;
+        case VINO_DATA_NORM_PAL:
+                return SAA7191_NORM_PAL;
+        case VINO_DATA_NORM_NTSC:
+                return SAA7191_NORM_NTSC;
+        case VINO_DATA_NORM_SECAM:
+                return SAA7191_NORM_SECAM;
+        default:
+                printk(KERN_ERR "VINO: vino_get_saa7191_norm(): "
+                       "invalid norm!\n");
+                return -1;
+        }
+}
+
+/* execute with input_lock locked */
+static int vino_is_input_owner(struct vino_channel_settings *vcs)
+{
+        switch(vcs->input) {
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                return (vino_drvdata->decoder.owner == vcs->channel);
+        case VINO_INPUT_D1:
+                return (vino_drvdata->camera.owner == vcs->channel);
+        default:
+                return 0;
+        }
+}
+
+static int vino_acquire_input(struct vino_channel_settings *vcs)
+{
+        int ret = 0;
+
+        dprintk("vino_acquire_input():\n");
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        /* First try D1 and then SAA7191 */
+        if (vino_drvdata->camera.driver
+            && (vino_drvdata->camera.owner == VINO_NO_CHANNEL)) {
+                if (i2c_use_client(vino_drvdata->camera.driver)) {
+                        ret = -ENODEV;
+                        goto out;
+                }
+
+                vino_drvdata->camera.owner = vcs->channel;
+                vcs->input = VINO_INPUT_D1;
+                vcs->data_norm = VINO_DATA_NORM_D1;
+        } else if (vino_drvdata->decoder.driver
+                   && (vino_drvdata->decoder.owner == VINO_NO_CHANNEL)) {
+                int saa7191_input;
+                int saa7191_norm;
+
+                if (i2c_use_client(vino_drvdata->decoder.driver)) {
+                        ret = -ENODEV;
+                        goto out;
+                }
+
+                vino_drvdata->decoder.owner = vcs->channel;
+                vcs->input = VINO_INPUT_COMPOSITE;
+                vcs->data_norm = VINO_DATA_NORM_PAL;
+
+                saa7191_input = vino_get_saa7191_input(vcs->input);
+                i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input);
+
+                saa7191_norm = vino_get_saa7191_norm(vcs->data_norm);
+                i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
+        } else {
+                vcs->input = (vcs->channel == VINO_CHANNEL_A) ?
+                        vino_drvdata->b.input : vino_drvdata->a.input;
+                vcs->data_norm = (vcs->channel == VINO_CHANNEL_A) ?
+                        vino_drvdata->b.data_norm : vino_drvdata->a.data_norm;
+        }
+
+        if (vcs->input == VINO_INPUT_NONE) {
+                ret = -ENODEV;
+                goto out;
+        }
+
+        if (vino_is_input_owner(vcs)) {
+                vino_set_default_clipping(vcs);
+                vino_set_default_framerate(vcs);
+        }
+
+        dprintk("vino_acquire_input(): %s\n", vino_inputs[vcs->input].name);
+
+out:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return ret;
+}
+
+static int vino_set_input(struct vino_channel_settings *vcs, int input)
+{
+        struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
+                &vino_drvdata->b : &vino_drvdata->a;
+        int ret = 0;
+
+        dprintk("vino_set_input():\n");
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        if (vcs->input == input)
+                goto out;
+
+        switch(input) {
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                if (!vino_drvdata->decoder.driver) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (vino_drvdata->decoder.owner == VINO_NO_CHANNEL) {
+                        if (i2c_use_client(vino_drvdata->decoder.driver)) {
+                                ret = -ENODEV;
+                                goto out;
+                        }
+                        vino_drvdata->decoder.owner = vcs->channel;
+                }
+
+                if (vino_drvdata->decoder.owner == vcs->channel) {
+                        int saa7191_input;
+                        int saa7191_norm;
+
+                        vcs->input = input;
+                        vcs->data_norm = VINO_DATA_NORM_PAL;
+
+                        saa7191_input = vino_get_saa7191_input(vcs->input);
+                        i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input);
+                        saa7191_norm = vino_get_saa7191_norm(vcs->data_norm);
+                        i2c_decoder_command(DECODER_SAA7191_SET_NORM,
+                                            &saa7191_norm);
+                } else {
+                        if (vcs2->input != input) {
+                                ret = -EBUSY;
+                                goto out;
+                        }
+
+                        vcs->input = input;
+                        vcs->data_norm = vcs2->data_norm;
+                }
+
+                if (vino_drvdata->camera.owner == vcs->channel) {
+                        /* Transfer the ownership or release the input */
+                        if (vcs2->input == VINO_INPUT_D1) {
+                                vino_drvdata->camera.owner = vcs2->channel;
+                        } else {
+                                i2c_release_client(vino_drvdata->
+                                                   camera.driver);
+                                vino_drvdata->camera.owner = VINO_NO_CHANNEL;
+                        }
+                }
+                break;
+        case VINO_INPUT_D1:
+                if (!vino_drvdata->camera.driver) {
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (vino_drvdata->camera.owner == VINO_NO_CHANNEL) {
+                        if (i2c_use_client(vino_drvdata->camera.driver)) {
+                                ret = -ENODEV;
+                                goto out;
+                        }
+                        vino_drvdata->camera.owner = vcs->channel;
+                }
+
+                if (vino_drvdata->decoder.owner == vcs->channel) {
+                        /* Transfer the ownership or release the input */
+                        if ((vcs2->input == VINO_INPUT_COMPOSITE) ||
+                                 (vcs2->input == VINO_INPUT_SVIDEO)) {
+                                vino_drvdata->decoder.owner = vcs2->channel;
+                        } else {
+                                i2c_release_client(vino_drvdata->
+                                                   decoder.driver);
+                                vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
+                        }
+                }
+
+                vcs->input = input;
+                vcs->data_norm = VINO_DATA_NORM_D1;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out;
+        }
+
+        vino_set_default_clipping(vcs);
+        vino_set_default_framerate(vcs);
+
+        dprintk("vino_set_input(): %s\n", vino_inputs[vcs->input].name);
+
+out:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return ret;
+}
+
+static void vino_release_input(struct vino_channel_settings *vcs)
+{
+        struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
+                &vino_drvdata->b : &vino_drvdata->a;
+
+        dprintk("vino_release_input():\n");
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        /* Release ownership of the channel
+         * and if the other channel takes input from
+         * the same source, transfer the ownership */
+        if (vino_drvdata->camera.owner == vcs->channel) {
+                if (vcs2->input == VINO_INPUT_D1) {
+                        vino_drvdata->camera.owner = vcs2->channel;
+                } else {
+                        i2c_release_client(vino_drvdata->camera.driver);
+                        vino_drvdata->camera.owner = VINO_NO_CHANNEL;
+                }
+        } else if (vino_drvdata->decoder.owner == vcs->channel) {
+                if ((vcs2->input == VINO_INPUT_COMPOSITE) ||
+                         (vcs2->input == VINO_INPUT_SVIDEO)) {
+                        vino_drvdata->decoder.owner = vcs2->channel;
+                } else {
+                        i2c_release_client(vino_drvdata->decoder.driver);
+                        vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
+                }
+        }
+        vcs->input = VINO_INPUT_NONE;
+
+        spin_unlock(&vino_drvdata->input_lock);
+}
+
+/* execute with input_lock locked */
+static int vino_set_data_norm(struct vino_channel_settings *vcs,
+                              unsigned int data_norm)
+{
+        int saa7191_norm;
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                /* only one "norm" supported */
+                if (data_norm != VINO_DATA_NORM_D1)
+                        return -EINVAL;
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+
+                saa7191_norm = vino_get_saa7191_norm(data_norm);
+
+                i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
+                vcs->data_norm = data_norm;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/* V4L2 helper functions */
+
+static int vino_find_data_format(__u32 pixelformat)
+{
+        int i;
+
+        for (i = 0; i < VINO_DATA_FMT_COUNT; i++) {
+                if (vino_data_formats[i].pixelformat == pixelformat)
+                        return i;
+        }
+
+        return VINO_DATA_FMT_NONE;
+}
+
+static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
+{
+        int data_norm = VINO_DATA_NORM_NONE;
+
+        spin_lock(&vino_drvdata->input_lock);
+        switch(vcs->input) {
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                if (index == 0) {
+                        data_norm = VINO_DATA_NORM_PAL;
+                } else if (index == 1) {
+                        data_norm = VINO_DATA_NORM_NTSC;
+                } else if (index == 2) {
+                        data_norm = VINO_DATA_NORM_SECAM;
+                }
+                break;
+        case VINO_INPUT_D1:
+                if (index == 0) {
+                        data_norm = VINO_DATA_NORM_D1;
+                }
+                break;
+        }
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return data_norm;
+}
+
+static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
+{
+        int input = VINO_INPUT_NONE;
+
+        spin_lock(&vino_drvdata->input_lock);
+        if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) {
+                switch (index) {
+                case 0:
+                        input = VINO_INPUT_COMPOSITE;
+                        break;
+                case 1:
+                        input = VINO_INPUT_SVIDEO;
+                        break;
+                case 2:
+                        input = VINO_INPUT_D1;
+                        break;
+                }
+        } else if (vino_drvdata->decoder.driver) {
+                switch (index) {
+                case 0:
+                        input = VINO_INPUT_COMPOSITE;
+                        break;
+                case 1:
+                        input = VINO_INPUT_SVIDEO;
+                        break;
+                }
+        } else if (vino_drvdata->camera.driver) {
+                switch (index) {
+                case 0:
+                        input = VINO_INPUT_D1;
+                        break;
+                }
+        }
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return input;
+}
+
+/* execute with input_lock locked */
+static __u32 vino_find_input_index(struct vino_channel_settings *vcs)
+{
+        __u32 index = 0;
+        // FIXME: detect when no inputs available
+
+        if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) {
+                switch (vcs->input) {
+                case VINO_INPUT_COMPOSITE:
+                        index = 0;
+                        break;
+                case VINO_INPUT_SVIDEO:
+                        index = 1;
+                        break;
+                case VINO_INPUT_D1:
+                        index = 2;
+                        break;
+                }
+        } else if (vino_drvdata->decoder.driver) {
+                switch (vcs->input) {
+                case VINO_INPUT_COMPOSITE:
+                        index = 0;
+                        break;
+                case VINO_INPUT_SVIDEO:
+                        index = 1;
+                        break;
+                }
+        } else if (vino_drvdata->camera.driver) {
+                switch (vcs->input) {
+                case VINO_INPUT_D1:
+                        index = 0;
+                        break;
+                }
+        }
+
+        return index;
+}
+
+/* V4L2 ioctls */
+
+static void vino_v4l2_querycap(struct v4l2_capability *cap)
+{
+        memset(cap, 0, sizeof(struct v4l2_capability));
+
+        strcpy(cap->driver, vino_driver_name);
+        strcpy(cap->card, vino_driver_description);
+        strcpy(cap->bus_info, vino_bus_name);
+        cap->version = VINO_VERSION_CODE;
+        cap->capabilities =
+                V4L2_CAP_VIDEO_CAPTURE |
+                V4L2_CAP_STREAMING;
+        // V4L2_CAP_OVERLAY, V4L2_CAP_READWRITE
+}
+
+static int vino_v4l2_enuminput(struct vino_channel_settings *vcs,
+                               struct v4l2_input *i)
+{
+        __u32 index = i->index;
+        int input;
+        dprintk("requested index = %d\n", index);
+
+        input = vino_enum_input(vcs, index);
+        if (input == VINO_INPUT_NONE)
+                return -EINVAL;
+
+        memset(i, 0, sizeof(struct v4l2_input));
+
+        i->index = index;
+        i->type = V4L2_INPUT_TYPE_CAMERA;
+        i->std = vino_inputs[input].std;
+        strcpy(i->name, vino_inputs[input].name);
+
+        if ((input == VINO_INPUT_COMPOSITE)
+            || (input == VINO_INPUT_SVIDEO)) {
+                struct saa7191_status status;
+                i2c_decoder_command(DECODER_SAA7191_GET_STATUS, &status);
+                i->status |= status.signal ? 0 : V4L2_IN_ST_NO_SIGNAL;
+                i->status |= status.color ? 0 : V4L2_IN_ST_NO_COLOR;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
+                             struct v4l2_input *i)
+{
+        __u32 index;
+        int input;
+
+        spin_lock(&vino_drvdata->input_lock);
+        input = vcs->input;
+        index = vino_find_input_index(vcs);
+        spin_unlock(&vino_drvdata->input_lock);
+
+        dprintk("input = %d\n", input);
+
+        if (input == VINO_INPUT_NONE) {
+                return -EINVAL;
+        }
+
+        memset(i, 0, sizeof(struct v4l2_input));
+
+        i->index = index;
+        i->type = V4L2_INPUT_TYPE_CAMERA;
+        i->std = vino_inputs[input].std;
+        strcpy(i->name, vino_inputs[input].name);
+
+        return 0;
+}
+
+static int vino_v4l2_s_input(struct vino_channel_settings *vcs,
+                             struct v4l2_input *i)
+{
+        int input;
+        dprintk("requested input = %d\n", i->index);
+
+        input = vino_enum_input(vcs, i->index);
+        if (input == VINO_INPUT_NONE)
+                return -EINVAL;
+
+        return vino_set_input(vcs, input);
+}
+
+static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
+                             struct v4l2_standard *s)
+{
+        int index = s->index;
+        int data_norm = vino_enum_data_norm(vcs, index);
+        dprintk("standard index = %d\n", index);
+
+        if (data_norm == VINO_DATA_NORM_NONE)
+                return -EINVAL;
+
+        dprintk("standard name = %s\n",
+               vino_data_norms[data_norm].description);
+
+        memset(s, 0, sizeof(struct v4l2_standard));
+        s->index = index;
+
+        s->id = vino_data_norms[data_norm].std;
+        s->frameperiod.numerator = 1;
+        s->frameperiod.denominator =
+                vino_data_norms[data_norm].fps_max;
+        s->framelines =
+                vino_data_norms[data_norm].framelines;
+        strcpy(s->name,
+               vino_data_norms[data_norm].description);
+
+        return 0;
+}
+
+static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
+                           v4l2_std_id *std)
+{
+        spin_lock(&vino_drvdata->input_lock);
+        dprintk("current standard = %d\n", vcs->data_norm);
+        *std = vino_data_norms[vcs->data_norm].std;
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return 0;
+}
+
+static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
+                           v4l2_std_id *std)
+{
+        int ret = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        /* check if the standard is valid for the current input */
+        if (vino_is_input_owner(vcs)
+            && (vino_inputs[vcs->input].std & (*std))) {
+                dprintk("standard accepted\n");
+
+                /* change the video norm for SAA7191
+                 * and accept NTSC for D1 (do nothing) */
+
+                if (vcs->input == VINO_INPUT_D1)
+                        goto out;
+
+                if ((*std) & V4L2_STD_PAL) {
+                        vino_set_data_norm(vcs, VINO_DATA_NORM_PAL);
+                        vcs->data_norm = VINO_DATA_NORM_PAL;
+                } else if ((*std) & V4L2_STD_NTSC) {
+                        vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC);
+                        vcs->data_norm = VINO_DATA_NORM_NTSC;
+                } else if ((*std) & V4L2_STD_SECAM) {
+                        vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM);
+                        vcs->data_norm = VINO_DATA_NORM_SECAM;
+                } else {
+                        ret = -EINVAL;
+                }
+        } else {
+                ret = -EINVAL;
+        }
+
+out:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return ret;
+}
+
+static int vino_v4l2_enum_fmt(struct vino_channel_settings *vcs,
+                              struct v4l2_fmtdesc *fd)
+{
+        enum v4l2_buf_type type = fd->type;
+        int index = fd->index;
+        dprintk("format index = %d\n", index);
+
+        switch (fd->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                if ((fd->index < 0) ||
+                    (fd->index >= VINO_DATA_FMT_COUNT))
+                        return -EINVAL;
+                dprintk("format name = %s\n",
+                       vino_data_formats[index].description);
+
+                memset(fd, 0, sizeof(struct v4l2_fmtdesc));
+                fd->index = index;
+                fd->type = type;
+                fd->pixelformat = vino_data_formats[index].pixelformat;
+                strcpy(fd->description, vino_data_formats[index].description);
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
+                             struct v4l2_format *f)
+{
+        struct vino_channel_settings tempvcs;
+
+        switch (f->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_pix_format *pf = &f->fmt.pix;
+
+                dprintk("requested: w = %d, h = %d\n",
+                       pf->width, pf->height);
+
+                spin_lock(&vino_drvdata->input_lock);
+                memcpy(&tempvcs, vcs, sizeof(struct vino_channel_settings));
+                spin_unlock(&vino_drvdata->input_lock);
+
+                tempvcs.data_format = vino_find_data_format(pf->pixelformat);
+                if (tempvcs.data_format == VINO_DATA_FMT_NONE) {
+                        tempvcs.data_format = VINO_DATA_FMT_RGB32;
+                        pf->pixelformat =
+                                vino_data_formats[tempvcs.data_format].
+                                pixelformat;
+                }
+
+                /* data format must be set before clipping/scaling */
+                vino_set_scaling(&tempvcs, pf->width, pf->height);
+
+                dprintk("data format = %s\n",
+                       vino_data_formats[tempvcs.data_format].description);
+
+                pf->width = (tempvcs.clipping.right - tempvcs.clipping.left) /
+                        tempvcs.decimation;
+                pf->height = (tempvcs.clipping.bottom - tempvcs.clipping.top) /
+                        tempvcs.decimation;
+
+                pf->field = V4L2_FIELD_INTERLACED;
+                pf->bytesperline = tempvcs.line_size;
+                pf->sizeimage = tempvcs.line_size *
+                        (tempvcs.clipping.bottom - tempvcs.clipping.top) /
+                        tempvcs.decimation;
+                pf->colorspace =
+                        vino_data_formats[tempvcs.data_format].colorspace;
+
+                pf->priv = 0;
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
+                           struct v4l2_format *f)
+{
+        switch (f->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_pix_format *pf = &f->fmt.pix;
+                spin_lock(&vino_drvdata->input_lock);
+
+                pf->width = (vcs->clipping.right - vcs->clipping.left) /
+                        vcs->decimation;
+                pf->height = (vcs->clipping.bottom - vcs->clipping.top) /
+                        vcs->decimation;
+                pf->pixelformat =
+                        vino_data_formats[vcs->data_format].pixelformat;
+
+                pf->field = V4L2_FIELD_INTERLACED;
+                pf->bytesperline = vcs->line_size;
+                pf->sizeimage = vcs->line_size *
+                        (vcs->clipping.bottom - vcs->clipping.top) /
+                        vcs->decimation;
+                pf->colorspace =
+                        vino_data_formats[vcs->data_format].colorspace;
+
+                pf->priv = 0;
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
+                           struct v4l2_format *f)
+{
+        int data_format;
+
+        switch (f->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_pix_format *pf = &f->fmt.pix;
+                spin_lock(&vino_drvdata->input_lock);
+
+                if (!vino_is_input_owner(vcs)) {
+                        spin_unlock(&vino_drvdata->input_lock);
+                        return -EINVAL;
+                }
+
+                data_format = vino_find_data_format(pf->pixelformat);
+                if (data_format == VINO_DATA_FMT_NONE) {
+                        vcs->data_format = VINO_DATA_FMT_RGB32;
+                        pf->pixelformat =
+                                vino_data_formats[vcs->data_format].
+                                pixelformat;
+                } else {
+                        vcs->data_format = data_format;
+                }
+
+                /* data format must be set before clipping/scaling */
+                vino_set_scaling(vcs, pf->width, pf->height);
+
+                dprintk("data format = %s\n",
+                       vino_data_formats[vcs->data_format].description);
+
+                pf->width = vcs->clipping.right - vcs->clipping.left;
+                pf->height = vcs->clipping.bottom - vcs->clipping.top;
+
+                pf->field = V4L2_FIELD_INTERLACED;
+                pf->bytesperline = vcs->line_size;
+                pf->sizeimage = vcs->line_size *
+                        (vcs->clipping.bottom - vcs->clipping.top) /
+                        vcs->decimation;
+                pf->colorspace =
+                        vino_data_formats[vcs->data_format].colorspace;
+
+                pf->priv = 0;
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
+                             struct v4l2_cropcap *ccap)
+{
+        const struct vino_data_norm *norm;
+
+        switch (ccap->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                spin_lock(&vino_drvdata->input_lock);
+                norm = &vino_data_norms[vcs->data_norm];
+                spin_unlock(&vino_drvdata->input_lock);
+
+                ccap->bounds.left = 0;
+                ccap->bounds.top = 0;
+                ccap->bounds.width = norm->width;
+                ccap->bounds.height = norm->height;
+                memcpy(&ccap->defrect, &ccap->bounds,
+                       sizeof(struct v4l2_rect));
+
+                ccap->pixelaspect.numerator = 1;
+                ccap->pixelaspect.denominator = 1;
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
+                            struct v4l2_crop *c)
+{
+        switch (c->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                spin_lock(&vino_drvdata->input_lock);
+
+                c->c.left = vcs->clipping.left;
+                c->c.top = vcs->clipping.top;
+                c->c.width = vcs->clipping.right - vcs->clipping.left;
+                c->c.height = vcs->clipping.bottom - vcs->clipping.top;
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
+                            struct v4l2_crop *c)
+{
+        switch (c->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                spin_lock(&vino_drvdata->input_lock);
+
+                if (!vino_is_input_owner(vcs)) {
+                        spin_unlock(&vino_drvdata->input_lock);
+                        return -EINVAL;
+                }
+                vino_set_clipping(vcs, c->c.left, c->c.top,
+                                  c->c.width, c->c.height);
+
+                spin_unlock(&vino_drvdata->input_lock);
+                break;
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
+                            struct v4l2_streamparm *sp)
+{
+        switch (sp->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_captureparm *cp = &sp->parm.capture;
+                memset(cp, 0, sizeof(struct v4l2_captureparm));
+
+                cp->capability = V4L2_CAP_TIMEPERFRAME;
+                cp->timeperframe.numerator = 1;
+
+                spin_lock(&vino_drvdata->input_lock);
+                cp->timeperframe.denominator = vcs->fps;
+                spin_unlock(&vino_drvdata->input_lock);
+
+                // TODO: cp->readbuffers = xxx;
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
+                            struct v4l2_streamparm *sp)
+{
+        switch (sp->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct v4l2_captureparm *cp = &sp->parm.capture;
+
+                spin_lock(&vino_drvdata->input_lock);
+                if (!vino_is_input_owner(vcs)) {
+                        spin_unlock(&vino_drvdata->input_lock);
+                        return -EINVAL;
+                }
+
+                if ((cp->timeperframe.numerator == 0) ||
+                    (cp->timeperframe.denominator == 0)) {
+                        /* reset framerate */
+                        vino_set_default_framerate(vcs);
+                } else {
+                        vino_set_framerate(vcs, cp->timeperframe.denominator /
+                                           cp->timeperframe.numerator);
+                }
+                spin_unlock(&vino_drvdata->input_lock);
+
+                // TODO: set buffers according to cp->readbuffers
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_reqbufs(struct vino_channel_settings *vcs,
+                             struct v4l2_requestbuffers *rb)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (rb->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                // TODO: check queue type
+                if (rb->memory != V4L2_MEMORY_MMAP) {
+                        dprintk("type not mmap\n");
+                        return -EINVAL;
+                }
+
+                if (vino_is_capturing(vcs)) {
+                        dprintk("busy, capturing\n");
+                        return -EBUSY;
+                }
+
+                dprintk("count = %d\n", rb->count);
+                if (rb->count > 0) {
+                        if (vino_queue_has_mapped_buffers(&vcs->fb_queue)) {
+                                dprintk("busy, buffers still mapped\n");
+                                return -EBUSY;
+                        } else {
+                                vino_queue_free(&vcs->fb_queue);
+                                vino_queue_init(&vcs->fb_queue, &rb->count);
+                        }
+                } else {
+                        vino_capture_stop(vcs);
+                        vino_queue_free(&vcs->fb_queue);
+                }
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static void vino_v4l2_get_buffer_status(struct vino_channel_settings *vcs,
+                                        struct vino_framebuffer *fb,
+                                        struct v4l2_buffer *b)
+{
+        if (vino_queue_outgoing_contains(&vcs->fb_queue,
+                                         fb->id)) {
+                b->flags &= ~V4L2_BUF_FLAG_QUEUED;
+                b->flags |= V4L2_BUF_FLAG_DONE;
+        } else if (vino_queue_incoming_contains(&vcs->fb_queue,
+                                       fb->id)) {
+                b->flags &= ~V4L2_BUF_FLAG_DONE;
+                b->flags |= V4L2_BUF_FLAG_QUEUED;
+        } else {
+                b->flags &= ~(V4L2_BUF_FLAG_DONE |
+                              V4L2_BUF_FLAG_QUEUED);
+        }
+
+        b->flags &= ~(V4L2_BUF_FLAG_TIMECODE);
+
+        if (fb->map_count > 0)
+                b->flags |= V4L2_BUF_FLAG_MAPPED;
+
+        b->index = fb->id;
+        b->memory = (vcs->fb_queue.type == VINO_MEMORY_MMAP) ?
+                V4L2_MEMORY_MMAP : V4L2_MEMORY_USERPTR;
+        b->m.offset = fb->offset;
+        b->bytesused = fb->data_size;
+        b->length = fb->size;
+        b->field = V4L2_FIELD_INTERLACED;
+        b->sequence = fb->frame_counter;
+        memcpy(&b->timestamp, &fb->timestamp,
+               sizeof(struct timeval));
+        // b->input ?
+
+        dprintk("buffer %d: length = %d, bytesused = %d, offset = %d\n",
+                fb->id, fb->size, fb->data_size, fb->offset);
+}
+
+static int vino_v4l2_querybuf(struct vino_channel_settings *vcs,
+                              struct v4l2_buffer *b)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (b->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct vino_framebuffer *fb;
+
+                // TODO: check queue type
+                if (b->index >= vino_queue_get_length(&vcs->fb_queue)) {
+                        dprintk("invalid index = %d\n",
+                               b->index);
+                        return -EINVAL;
+                }
+
+                fb = vino_queue_get_buffer(&vcs->fb_queue,
+                                           b->index);
+                if (fb == NULL) {
+                        dprintk("vino_queue_get_buffer() failed");
+                        return -EINVAL;
+                }
+
+                vino_v4l2_get_buffer_status(vcs, fb, b);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_qbuf(struct vino_channel_settings *vcs,
+                          struct v4l2_buffer *b)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (b->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct vino_framebuffer *fb;
+                int ret;
+
+                // TODO: check queue type
+                if (b->memory != V4L2_MEMORY_MMAP) {
+                        dprintk("type not mmap\n");
+                        return -EINVAL;
+                }
+
+                fb = vino_capture_enqueue(vcs, b->index);
+                if (fb == NULL)
+                        return -EINVAL;
+
+                vino_v4l2_get_buffer_status(vcs, fb, b);
+
+                if (vcs->streaming) {
+                        ret = vino_capture_next(vcs, 1);
+                        if (ret)
+                                return ret;
+                }
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
+                           struct v4l2_buffer *b,
+                           unsigned int nonblocking)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        switch (b->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
+                struct vino_framebuffer *fb;
+                unsigned int incoming, outgoing;
+                int err;
+
+                // TODO: check queue type
+
+                err = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
+                if (err) {
+                        dprintk("vino_queue_get_incoming() failed\n");
+                        return -EIO;
+                }
+                err = vino_queue_get_outgoing(&vcs->fb_queue, &outgoing);
+                if (err) {
+                        dprintk("vino_queue_get_outgoing() failed\n");
+                        return -EIO;
+                }
+
+                dprintk("incoming = %d, outgoing = %d\n", incoming, outgoing);
+
+                if (outgoing == 0) {
+                        if (incoming == 0) {
+                                dprintk("no incoming or outgoing buffers\n");
+                                return -EINVAL;
+                        }
+                        if (nonblocking) {
+                                dprintk("non-blocking I/O was selected and "
+                                        "there are no buffers to dequeue\n");
+                                return -EAGAIN;
+                        }
+
+                        err = vino_wait_for_frame(vcs);
+                        if (err) {
+                                err = vino_wait_for_frame(vcs);
+                                if (err) {
+                                        /* interrupted */
+                                        vino_capture_failed(vcs);
+                                        return -EIO;
+                                }
+                        }
+                }
+
+                fb = vino_queue_remove(&vcs->fb_queue, &b->index);
+                if (fb == NULL) {
+                        dprintk("vino_queue_remove() failed\n");
+                        return -EINVAL;
+                }
+
+                err = vino_check_buffer(vcs, fb);
+                if (err)
+                        return -EIO;
+
+                vino_v4l2_get_buffer_status(vcs, fb, b);
+                break;
+        }
+        case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_streamon(struct vino_channel_settings *vcs)
+{
+        unsigned int incoming;
+        int ret;
+        if (vcs->reading)
+                return -EBUSY;
+
+        if (vcs->streaming)
+                return 0;
+
+        // TODO: check queue type
+
+        if (vino_queue_get_length(&vcs->fb_queue) < 1) {
+                dprintk("no buffers allocated\n");
+                return -EINVAL;
+        }
+
+        ret = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
+        if (ret) {
+                dprintk("vino_queue_get_incoming() failed\n");
+                return -EINVAL;
+        }
+
+        vcs->streaming = 1;
+
+        if (incoming > 0) {
+                ret = vino_capture_next(vcs, 1);
+                if (ret) {
+                        vcs->streaming = 0;
+
+                        dprintk("couldn't start capture\n");
+                        return -EINVAL;
+                }
+        }
+
+        return 0;
+}
+
+static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
+{
+        if (vcs->reading)
+                return -EBUSY;
+
+        if (!vcs->streaming)
+                return 0;
+
+        vino_capture_stop(vcs);
+        vcs->streaming = 0;
+
+        return 0;
+}
+
+static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
+                               struct v4l2_queryctrl *queryctrl)
+{
+        int i;
+        int err = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_indycam_v4l2_controls[i].id ==
+                            queryctrl->id) {
+                                memcpy(queryctrl,
+                                       &vino_indycam_v4l2_controls[i],
+                                       sizeof(struct v4l2_queryctrl));
+                                goto found;
+                        }
+                }
+
+                err =  -EINVAL;
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_saa7191_v4l2_controls[i].id ==
+                            queryctrl->id) {
+                                memcpy(queryctrl,
+                                       &vino_saa7191_v4l2_controls[i],
+                                       sizeof(struct v4l2_queryctrl));
+                                goto found;
+                        }
+                }
+
+                err =  -EINVAL;
+                break;
+        default:
+                err =  -EINVAL;
+        }
+
+ found:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return err;
+}
+
+static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
+                            struct v4l2_control *control)
+{
+        struct indycam_control indycam_ctrl;
+        struct saa7191_control saa7191_ctrl;
+        int err = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                i2c_camera_command(DECODER_INDYCAM_GET_CONTROLS,
+                                   &indycam_ctrl);
+
+                switch(control->id) {
+                case V4L2_CID_AUTOGAIN:
+                        control->value = indycam_ctrl.agc;
+                        break;
+                case V4L2_CID_AUTO_WHITE_BALANCE:
+                        control->value = indycam_ctrl.awb;
+                        break;
+                case V4L2_CID_GAIN:
+                        control->value = indycam_ctrl.gain;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        control->value = indycam_ctrl.red_saturation;
+                        break;
+                case V4L2_CID_PRIVATE_BASE + 1:
+                        control->value = indycam_ctrl.blue_saturation;
+                        break;
+                case V4L2_CID_RED_BALANCE:
+                        control->value = indycam_ctrl.red_balance;
+                        break;
+                case V4L2_CID_BLUE_BALANCE:
+                        control->value = indycam_ctrl.blue_balance;
+                        break;
+                case V4L2_CID_EXPOSURE:
+                        control->value = indycam_ctrl.shutter;
+                        break;
+                case V4L2_CID_GAMMA:
+                        control->value = indycam_ctrl.gamma;
+                        break;
+                default:
+                        err = -EINVAL;
+                }
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                i2c_decoder_command(DECODER_SAA7191_GET_CONTROLS,
+                                   &saa7191_ctrl);
+
+                switch(control->id) {
+                case V4L2_CID_HUE:
+                        control->value = saa7191_ctrl.hue;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        control->value = saa7191_ctrl.vtrc;
+                        break;
+                default:
+                        err = -EINVAL;
+                }
+                break;
+        default:
+                err =  -EINVAL;
+        }
+
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return err;
+}
+
+static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
+                            struct v4l2_control *control)
+{
+        struct indycam_control indycam_ctrl;
+        struct saa7191_control saa7191_ctrl;
+        int i;
+        int err = 0;
+
+        spin_lock(&vino_drvdata->input_lock);
+
+        switch (vcs->input) {
+        case VINO_INPUT_D1:
+                for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_indycam_v4l2_controls[i].id ==
+                            control->id) {
+                                if ((control->value >=
+                                     vino_indycam_v4l2_controls[i].minimum)
+                                    && (control->value <=
+                                        vino_indycam_v4l2_controls[i].
+                                        maximum)) {
+                                        goto ok1;
+                                } else {
+                                        err = -ERANGE;
+                                        goto error;
+                                }
+                        }
+                }
+                err = -EINVAL;
+                goto error;
+
+ok1:
+                indycam_ctrl.agc = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.awb = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.shutter = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.gain = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.red_balance = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.blue_balance = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.red_saturation = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.blue_saturation = INDYCAM_VALUE_UNCHANGED;
+                indycam_ctrl.gamma = INDYCAM_VALUE_UNCHANGED;
+
+                switch(control->id) {
+                case V4L2_CID_AUTOGAIN:
+                        indycam_ctrl.agc = control->value;
+                        break;
+                case V4L2_CID_AUTO_WHITE_BALANCE:
+                        indycam_ctrl.awb = control->value;
+                        break;
+                case V4L2_CID_GAIN:
+                        indycam_ctrl.gain = control->value;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        indycam_ctrl.red_saturation = control->value;
+                        break;
+                case V4L2_CID_PRIVATE_BASE + 1:
+                        indycam_ctrl.blue_saturation = control->value;
+                        break;
+                case V4L2_CID_RED_BALANCE:
+                        indycam_ctrl.red_balance = control->value;
+                        break;
+                case V4L2_CID_BLUE_BALANCE:
+                        indycam_ctrl.blue_balance = control->value;
+                        break;
+                case V4L2_CID_EXPOSURE:
+                        indycam_ctrl.shutter = control->value;
+                        break;
+                case V4L2_CID_GAMMA:
+                        indycam_ctrl.gamma = control->value;
+                        break;
+                default:
+                        err =  -EINVAL;
+                }
+
+                if (!err)
+                        i2c_camera_command(DECODER_INDYCAM_SET_CONTROLS,
+                                           &indycam_ctrl);
+                break;
+        case VINO_INPUT_COMPOSITE:
+        case VINO_INPUT_SVIDEO:
+                for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
+                        if (vino_saa7191_v4l2_controls[i].id ==
+                            control->id) {
+                                if ((control->value >=
+                                     vino_saa7191_v4l2_controls[i].minimum)
+                                    && (control->value <=
+                                        vino_saa7191_v4l2_controls[i].
+                                        maximum)) {
+                                        goto ok2;
+                                } else {
+                                        err = -ERANGE;
+                                        goto error;
+                                }
+                        }
+                }
+                err = -EINVAL;
+                goto error;
+
+ok2:
+                saa7191_ctrl.hue = SAA7191_VALUE_UNCHANGED;
+                saa7191_ctrl.vtrc = SAA7191_VALUE_UNCHANGED;
+
+                switch(control->id) {
+                case V4L2_CID_HUE:
+                        saa7191_ctrl.hue = control->value;
+                        break;
+                case V4L2_CID_PRIVATE_BASE:
+                        saa7191_ctrl.vtrc = control->value;
+                        break;
+                default:
+                        err =  -EINVAL;
+                }
+
+                if (!err)
+                        i2c_decoder_command(DECODER_SAA7191_SET_CONTROLS,
+                                            &saa7191_ctrl);
+                break;
+        default:
+                err =  -EINVAL;
+        }
+
+error:
+        spin_unlock(&vino_drvdata->input_lock);
+
+        return err;
+}
+
+/* File operations */
+
+static int vino_open(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        int ret = 0;
+        dprintk("open(): channel = %c\n",
+               (vcs->channel == VINO_CHANNEL_A) ? 'A' : 'B');
+
+        down(&vcs->sem);
+
+        if (vcs->users) {
+                dprintk("open(): driver busy\n");
+                ret = -EBUSY;
+                goto out;
+        }
+
+        ret = vino_acquire_input(vcs);
+        if (ret) {
+                dprintk("open(): vino_acquire_input() failed\n");
+                goto out;
+        }
+
+        vcs->users++;
+
+ out:
+        up(&vcs->sem);
+
+        dprintk("open(): %s!\n", ret ? "failed" : "complete");
+
+        return ret;
+}
+
+static int vino_close(struct inode *inode, struct file *file)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        dprintk("close():\n");
+
+        down(&vcs->sem);
+
+        vcs->users--;
+
+        if (!vcs->users) {
+                vino_release_input(vcs);
+
+                /* stop DMA and free buffers */
+                vino_capture_stop(vcs);
+                vino_queue_free(&vcs->fb_queue);
+        }
+
+        up(&vcs->sem);
+
+        return 0;
+}
+
+static void vino_vm_open(struct vm_area_struct *vma)
+{
+        struct vino_framebuffer *fb = vma->vm_private_data;
+
+        fb->map_count++;
+        dprintk("vino_vm_open(): count = %d\n", fb->map_count);
+}
+
+static void vino_vm_close(struct vm_area_struct *vma)
+{
+        struct vino_framebuffer *fb = vma->vm_private_data;
+
+        fb->map_count--;
+        dprintk("vino_vm_close(): count = %d\n", fb->map_count);
+}
+
+static struct vm_operations_struct vino_vm_ops = {
+        .open   = vino_vm_open,
+        .close  = vino_vm_close,
+};
+
+static int vino_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+
+        unsigned long start = vma->vm_start;
+        unsigned long size = vma->vm_end - vma->vm_start;
+        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+
+        struct vino_framebuffer *fb = NULL;
+        unsigned int i, length;
+        int ret = 0;
+
+        dprintk("mmap():\n");
+
+        // TODO: reject mmap if already mapped
+
+        if (down_interruptible(&vcs->sem))
+                return -EINTR;
+
+        if (vcs->reading) {
+                ret = -EBUSY;
+                goto out;
+        }
+
+        // TODO: check queue type
+
+        if (!(vma->vm_flags & VM_WRITE)) {
+                dprintk("mmap(): app bug: PROT_WRITE please\n");
+                ret = -EINVAL;
+                goto out;
+        }
+        if (!(vma->vm_flags & VM_SHARED)) {
+                dprintk("mmap(): app bug: MAP_SHARED please\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /* find the correct buffer using offset */
+        length = vino_queue_get_length(&vcs->fb_queue);
+        if (length == 0) {
+                dprintk("mmap(): queue not initialized\n");
+                ret = -EINVAL;
+                goto out;
+        }
+
+        for (i = 0; i < length; i++) {
+                fb = vino_queue_get_buffer(&vcs->fb_queue, i);
+                if (fb == NULL) {
+                        dprintk("mmap(): vino_queue_get_buffer() failed\n");
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (fb->offset == offset)
+                        goto found;
+        }
+
+        dprintk("mmap(): invalid offset = %lu\n", offset);
+        ret = -EINVAL;
+        goto out;
+
+found:
+        dprintk("mmap(): buffer = %d\n", i);
+
+        if (size > (fb->desc_table.page_count * PAGE_SIZE)) {
+                dprintk("mmap(): failed: size = %lu > %lu\n",
+                        size, fb->desc_table.page_count * PAGE_SIZE);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        for (i = 0; i < fb->desc_table.page_count; i++) {
+                unsigned long pfn =
+                        virt_to_phys((void *)fb->desc_table.virtual[i]) >>
+                        PAGE_SHIFT;
+
+                if (size < PAGE_SIZE)
+                        break;
+
+                // protection was: PAGE_READONLY
+                if (remap_pfn_range(vma, start, pfn, PAGE_SIZE,
+                                    vma->vm_page_prot)) {
+                        dprintk("mmap(): remap_pfn_range() failed\n");
+                        ret = -EAGAIN;
+                        goto out;
+                }
+
+                start += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        fb->map_count = 1;
+
+        vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
+        vma->vm_flags &= ~VM_IO;
+        vma->vm_private_data = fb;
+        vma->vm_file = file;
+        vma->vm_ops = &vino_vm_ops;
+
+out:
+        up(&vcs->sem);
+
+        return ret;
+}
+
+static unsigned int vino_poll(struct file *file, poll_table *pt)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        unsigned int outgoing;
+        unsigned int ret = 0;
+
+        // lock mutex (?)
+        // TODO: this has to be corrected for different read modes
+
+        dprintk("poll():\n");
+
+        if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                dprintk("poll(): vino_queue_get_outgoing() failed\n");
+                ret = POLLERR;
+                goto error;
+        }
+        if (outgoing > 0)
+                goto over;
+
+        poll_wait(file, &vcs->fb_queue.frame_wait_queue, pt);
+
+        if (vino_queue_get_outgoing(&vcs->fb_queue, &outgoing)) {
+                dprintk("poll(): vino_queue_get_outgoing() failed\n");
+                ret = POLLERR;
+                goto error;
+        }
+
+over:
+        dprintk("poll(): data %savailable\n",
+                (outgoing > 0) ? "" : "not ");
+        if (outgoing > 0) {
+                ret = POLLIN | POLLRDNORM;
+        }
+
+error:
+
+        return ret;
+}
+
+static int vino_do_ioctl(struct inode *inode, struct file *file,
+                      unsigned int cmd, void *arg)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+
+        switch (_IOC_TYPE(cmd)) {
+        case 'v':
+                dprintk("ioctl(): V4L1 unsupported (0x%08x)\n", cmd);
+                break;
+        case 'V':
+                dprintk("ioctl(): V4L2 %s (0x%08x)\n",
+                        v4l2_ioctl_names[_IOC_NR(cmd)], cmd);
+                break;
+        default:
+                dprintk("ioctl(): unsupported command 0x%08x\n", cmd);
+        }
+
+        switch (cmd) {
+        /* TODO: V4L1 interface (use compatibility layer?) */
+        /* V4L2 interface */
+        case VIDIOC_QUERYCAP: {
+                vino_v4l2_querycap(arg);
+                break;
+        }
+        case VIDIOC_ENUMINPUT: {
+                return vino_v4l2_enuminput(vcs, arg);
+        }
+        case VIDIOC_G_INPUT: {
+                return vino_v4l2_g_input(vcs, arg);
+        }
+        case VIDIOC_S_INPUT: {
+                return vino_v4l2_s_input(vcs, arg);
+        }
+        case VIDIOC_ENUMSTD: {
+                return vino_v4l2_enumstd(vcs, arg);
+        }
+        case VIDIOC_G_STD: {
+                return vino_v4l2_g_std(vcs, arg);
+        }
+        case VIDIOC_S_STD: {
+                return vino_v4l2_s_std(vcs, arg);
+        }
+        case VIDIOC_ENUM_FMT: {
+                return vino_v4l2_enum_fmt(vcs, arg);
+        }
+        case VIDIOC_TRY_FMT: {
+                return vino_v4l2_try_fmt(vcs, arg);
+        }
+        case VIDIOC_G_FMT: {
+                return vino_v4l2_g_fmt(vcs, arg);
+        }
+        case VIDIOC_S_FMT: {
+                return vino_v4l2_s_fmt(vcs, arg);
+        }
+        case VIDIOC_CROPCAP: {
+                return vino_v4l2_cropcap(vcs, arg);
+        }
+        case VIDIOC_G_CROP: {
+                return vino_v4l2_g_crop(vcs, arg);
+        }
+        case VIDIOC_S_CROP: {
+                return vino_v4l2_s_crop(vcs, arg);
+        }
+        case VIDIOC_G_PARM: {
+                return vino_v4l2_g_parm(vcs, arg);
+        }
+        case VIDIOC_S_PARM: {
+                return vino_v4l2_s_parm(vcs, arg);
+        }
+        case VIDIOC_REQBUFS: {
+                return vino_v4l2_reqbufs(vcs, arg);
+        }
+        case VIDIOC_QUERYBUF: {
+                return vino_v4l2_querybuf(vcs, arg);
+        }
+        case VIDIOC_QBUF: {
+                return vino_v4l2_qbuf(vcs, arg);
+        }
+        case VIDIOC_DQBUF: {
+                return vino_v4l2_dqbuf(vcs, arg, file->f_flags & O_NONBLOCK);
+        }
+        case VIDIOC_STREAMON: {
+                return vino_v4l2_streamon(vcs);
+        }
+        case VIDIOC_STREAMOFF: {
+                return vino_v4l2_streamoff(vcs);
+        }
+        case VIDIOC_QUERYCTRL: {
+                return vino_v4l2_queryctrl(vcs, arg);
+        }
+        case VIDIOC_G_CTRL: {
+                return vino_v4l2_g_ctrl(vcs, arg);
+        }
+        case VIDIOC_S_CTRL: {
+                return vino_v4l2_s_ctrl(vcs, arg);
+        }
+        default:
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+
+static int vino_ioctl(struct inode *inode, struct file *file,
+                      unsigned int cmd, unsigned long arg)
+{
+        struct video_device *dev = video_devdata(file);
+        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        int ret;
+
+        if (down_interruptible(&vcs->sem))
+                return -EINTR;
+
+        ret = video_usercopy(inode, file, cmd, arg, vino_do_ioctl);
+
+        up(&vcs->sem);
+
+        return ret;
+}
+
+/* Initialization and cleanup */
+
+// __initdata
+static int vino_init_stage = 0;
+
+static struct file_operations vino_fops = {
         .owner          = THIS_MODULE,
-        .type           = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
-        .hardware       = VID_HARDWARE_VINO,
-        .name           = "VINO",
         .open           = vino_open,
-        .close          = vino_close,
+        .release        = vino_close,
         .ioctl          = vino_ioctl,
         .mmap           = vino_mmap,
+        .poll           = vino_poll,
+        .llseek         = no_llseek,
 };
 
-static int __init vino_init(void)
+static struct video_device v4l_device_template = {
+        .name           = "NOT SET",
+        //.type         = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE |
+        //      VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY
+        .hardware       = VID_HARDWARE_VINO,
+        .fops           = &vino_fops,
+        .minor          = -1,
+};
+
+static void vino_module_cleanup(int stage)
+{
+        switch(stage) {
+        case 10:
+                video_unregister_device(vino_drvdata->b.v4l_device);
+                vino_drvdata->b.v4l_device = NULL;
+        case 9:
+                video_unregister_device(vino_drvdata->a.v4l_device);
+                vino_drvdata->a.v4l_device = NULL;
+        case 8:
+                vino_i2c_del_bus();
+        case 7:
+                free_irq(SGI_VINO_IRQ, NULL);
+        case 6:
+                if (vino_drvdata->b.v4l_device) {
+                        video_device_release(vino_drvdata->b.v4l_device);
+                        vino_drvdata->b.v4l_device = NULL;
+                }
+        case 5:
+                if (vino_drvdata->a.v4l_device) {
+                        video_device_release(vino_drvdata->a.v4l_device);
+                        vino_drvdata->a.v4l_device = NULL;
+                }
+        case 4:
+                /* all entries in dma_cpu dummy table have the same address */
+                dma_unmap_single(NULL,
+                                 vino_drvdata->dummy_desc_table.dma_cpu[0],
+                                 PAGE_SIZE, DMA_FROM_DEVICE);
+                dma_free_coherent(NULL, VINO_DUMMY_DESC_COUNT
+                                  * sizeof(dma_addr_t),
+                                  (void *)vino_drvdata->
+                                  dummy_desc_table.dma_cpu,
+                                  vino_drvdata->dummy_desc_table.dma);
+        case 3:
+                free_page(vino_drvdata->dummy_page);
+        case 2:
+                kfree(vino_drvdata);
+        case 1:
+                iounmap(vino);
+        case 0:
+                break;
+        default:
+                dprintk("vino_module_cleanup(): invalid cleanup stage = %d\n",
+                        stage);
+        }
+}
+
+static int vino_probe(void)
 {
-        unsigned long rev;
-        int i, ret = 0;
+        unsigned long rev_id;
 
-        /* VINO is Indy specific beast */
-        if (ip22_is_fullhouse())
+        if (ip22_is_fullhouse()) {
+                printk(KERN_ERR "VINO doesn't exist in IP22 Fullhouse\n");
                 return -ENODEV;
+        }
 
-        /*
-         * VINO is in the EISA address space, so the sysid register will tell
-         * us if the EISA_PRESENT pin on MC has been pulled low.
-         *
-         * If EISA_PRESENT is not set we definitely don't have a VINO equiped
-         * system.
-         */
         if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) {
-                printk(KERN_ERR "VINO not found\n");
+                printk(KERN_ERR "VINO is not found (EISA BUS not present)\n");
                 return -ENODEV;
         }
 
         vino = (struct sgi_vino *)ioremap(VINO_BASE, sizeof(struct sgi_vino));
-        if (!vino)
+        if (!vino) {
+                printk(KERN_ERR "VINO: ioremap() failed\n");
                 return -EIO;
+        }
+        vino_init_stage++;
 
-        /* Okay, once we know that VINO is present we'll read its revision
-         * safe way. One never knows... */
-        if (get_dbe(rev, &(vino->rev_id))) {
-                printk(KERN_ERR "VINO: failed to read revision register\n");
-                ret = -ENODEV;
-                goto out_unmap;
+        if (get_dbe(rev_id, &(vino->rev_id))) {
+                printk(KERN_ERR "Failed to read VINO revision register\n");
+                vino_module_cleanup(vino_init_stage);
+                return -ENODEV;
         }
-        if (VINO_ID_VALUE(rev) != VINO_CHIP_ID) {
-                printk(KERN_ERR "VINO is not VINO (Rev/ID: 0x%04lx)\n", rev);
-                ret = -ENODEV;
-                goto out_unmap;
+
+        if (VINO_ID_VALUE(rev_id) != VINO_CHIP_ID) {
+                printk(KERN_ERR "Unknown VINO chip ID (Rev/ID: 0x%02lx)\n",
+                       rev_id);
+                vino_module_cleanup(vino_init_stage);
+                return -ENODEV;
         }
-        printk(KERN_INFO "VINO Rev: 0x%02lx\n", VINO_REV_NUM(rev));
 
-        Vino = (struct vino_video *)
-                kmalloc(sizeof(struct vino_video), GFP_KERNEL);
-        if (!Vino) {
-                ret = -ENOMEM;
-                goto out_unmap;
+        printk(KERN_INFO "VINO with chip ID %ld, revision %ld found\n",
+               VINO_ID_VALUE(rev_id), VINO_REV_NUM(rev_id));
+
+        return 0;
+}
+
+static int vino_init(void)
+{
+        dma_addr_t dma_dummy_address;
+        int i;
+
+        vino_drvdata = (struct vino_settings *)
+                kmalloc(sizeof(struct vino_settings), GFP_KERNEL);
+        if (!vino_drvdata) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
         }
+        memset(vino_drvdata, 0, sizeof(struct vino_settings));
+        vino_init_stage++;
 
-        Vino->dummy_page = get_zeroed_page(GFP_KERNEL | GFP_DMA);
-        if (!Vino->dummy_page) {
-                ret = -ENOMEM;
-                goto out_free_vino;
+        /* create a dummy dma descriptor */
+        vino_drvdata->dummy_page = get_zeroed_page(GFP_KERNEL | GFP_DMA);
+        if (!vino_drvdata->dummy_page) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
         }
-        for (i = 0; i < 4; i++)
-                Vino->dummy_buf[i] = PHYSADDR(Vino->dummy_page);
+        vino_init_stage++;
+
+        // TODO: use page_count in dummy_desc_table
+
+        vino_drvdata->dummy_desc_table.dma_cpu =
+                dma_alloc_coherent(NULL,
+                VINO_DUMMY_DESC_COUNT * sizeof(dma_addr_t),
+                &vino_drvdata->dummy_desc_table.dma,
+                GFP_KERNEL | GFP_DMA);
+        if (!vino_drvdata->dummy_desc_table.dma_cpu) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
+        }
+        vino_init_stage++;
+
+        dma_dummy_address = dma_map_single(NULL,
+                                           (void *)vino_drvdata->dummy_page,
+                                        PAGE_SIZE, DMA_FROM_DEVICE);
+        for (i = 0; i < VINO_DUMMY_DESC_COUNT; i++) {
+                vino_drvdata->dummy_desc_table.dma_cpu[i] = dma_dummy_address;
+        }
+
+        /* initialize VINO */
 
         vino->control = 0;
-        /* prevent VINO from throwing spurious interrupts */
-        vino->a.next_4_desc = PHYSADDR(Vino->dummy_buf);
-        vino->b.next_4_desc = PHYSADDR(Vino->dummy_buf);
-        udelay(5);
+        vino->a.next_4_desc = vino_drvdata->dummy_desc_table.dma;
+        vino->b.next_4_desc = vino_drvdata->dummy_desc_table.dma;
+        udelay(VINO_DESC_FETCH_DELAY);
+
         vino->intr_status = 0;
-        /* set threshold level */
-        vino->a.fifo_thres = threshold_a;
-        vino->b.fifo_thres = threshold_b;
 
-        init_MUTEX(&Vino->input_lock);
+        vino->a.fifo_thres = VINO_FIFO_THRESHOLD_DEFAULT;
+        vino->b.fifo_thres = VINO_FIFO_THRESHOLD_DEFAULT;
+
+        return 0;
+}
+
+static int vino_init_channel_settings(struct vino_channel_settings *vcs,
+                                 unsigned int channel, const char *name)
+{
+        vcs->channel = channel;
+        vcs->input = VINO_INPUT_NONE;
+        vcs->alpha = 0;
+        vcs->users = 0;
+        vcs->data_format = VINO_DATA_FMT_GREY;
+        vcs->data_norm = VINO_DATA_NORM_NTSC;
+        vcs->decimation = 1;
+        vino_set_default_clipping(vcs);
+        vino_set_default_framerate(vcs);
+
+        vcs->capturing = 0;
+
+        init_MUTEX(&vcs->sem);
+        spin_lock_init(&vcs->capture_lock);
+
+        init_MUTEX(&vcs->fb_queue.queue_sem);
+        spin_lock_init(&vcs->fb_queue.queue_lock);
+        init_waitqueue_head(&vcs->fb_queue.frame_wait_queue);
+
+        vcs->v4l_device = video_device_alloc();
+        if (!vcs->v4l_device) {
+                vino_module_cleanup(vino_init_stage);
+                return -ENOMEM;
+        }
+        vino_init_stage++;
+
+        memcpy(vcs->v4l_device, &v4l_device_template,
+               sizeof(struct video_device));
+        strcpy(vcs->v4l_device->name, name);
+        vcs->v4l_device->release = video_device_release;
+
+        video_set_drvdata(vcs->v4l_device, vcs);
+
+        return 0;
+}
+
+static int __init vino_module_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO "SGI VINO driver version %s\n",
+               VINO_MODULE_VERSION);
+
+        ret = vino_probe();
+        if (ret)
+                return ret;
+
+        ret = vino_init();
+        if (ret)
+                return ret;
+
+        /* initialize data structures */
 
-        if (request_irq(SGI_VINO_IRQ, vino_interrupt, 0, vinostr, NULL)) {
-                printk(KERN_ERR "VINO: irq%02d registration failed\n",
+        spin_lock_init(&vino_drvdata->vino_lock);
+        spin_lock_init(&vino_drvdata->input_lock);
+
+        ret = vino_init_channel_settings(&vino_drvdata->a, VINO_CHANNEL_A,
+                                    vino_v4l_device_name_a);
+        if (ret)
+                return ret;
+
+        ret = vino_init_channel_settings(&vino_drvdata->b, VINO_CHANNEL_B,
+                                    vino_v4l_device_name_b);
+        if (ret)
+                return ret;
+
+        /* initialize hardware and register V4L devices */
+
+        ret = request_irq(SGI_VINO_IRQ, vino_interrupt, 0,
+                vino_driver_description, NULL);
+        if (ret) {
+                printk(KERN_ERR "VINO: requesting IRQ %02d failed\n",
                        SGI_VINO_IRQ);
-                ret = -EAGAIN;
-                goto out_free_page;
+                vino_module_cleanup(vino_init_stage);
+                return -EAGAIN;
         }
+        vino_init_stage++;
 
         ret = vino_i2c_add_bus();
         if (ret) {
-                printk(KERN_ERR "VINO: I2C bus registration failed\n");
-                goto out_free_irq;
+                printk(KERN_ERR "VINO I2C bus registration failed\n");
+                vino_module_cleanup(vino_init_stage);
+                return ret;
         }
+        vino_init_stage++;
 
-        if (video_register_device(&Vino->chA.vdev, VFL_TYPE_GRABBER, -1) < 0) {
-                printk("%s, chnl %d: device registration failed.\n",
-                        Vino->chA.vdev.name, Vino->chA.chan);
-                ret = -EINVAL;
-                goto out_i2c_del_bus;
+        ret = video_register_device(vino_drvdata->a.v4l_device,
+                                    VFL_TYPE_GRABBER, -1);
+        if (ret < 0) {
+                printk(KERN_ERR "VINO channel A Video4Linux-device "
+                       "registration failed\n");
+                vino_module_cleanup(vino_init_stage);
+                return -EINVAL;
         }
-        if (video_register_device(&Vino->chB.vdev, VFL_TYPE_GRABBER, -1) < 0) {
-                printk("%s, chnl %d: device registration failed.\n",
-                        Vino->chB.vdev.name, Vino->chB.chan);
-                ret = -EINVAL;
-                goto out_unregister_vdev;
+        vino_init_stage++;
+
+        ret = video_register_device(vino_drvdata->b.v4l_device,
+                                    VFL_TYPE_GRABBER, -1);
+        if (ret < 0) {
+                printk(KERN_ERR "VINO channel B Video4Linux-device "
+                       "registration failed\n");
+                vino_module_cleanup(vino_init_stage);
+                return -EINVAL;
         }
+        vino_init_stage++;
 
-        return 0;
+#if defined(CONFIG_KMOD) && defined(MODULE)
+        request_module("saa7191");
+        request_module("indycam");
+#endif
 
-out_unregister_vdev:
-        video_unregister_device(&Vino->chA.vdev);
-out_i2c_del_bus:
-        vino_i2c_del_bus();
-out_free_irq:
-        free_irq(SGI_VINO_IRQ, NULL);
-out_free_page:
-        free_page(Vino->dummy_page);
-out_free_vino:
-        kfree(Vino);
-out_unmap:
-        iounmap(vino);
+        dprintk("init complete!\n");
 
-        return ret;
+        return 0;
 }
 
-static void __exit vino_exit(void)
+static void __exit vino_module_exit(void)
 {
-        video_unregister_device(&Vino->chA.vdev);
-        video_unregister_device(&Vino->chB.vdev);
-        vino_i2c_del_bus();
-        free_irq(SGI_VINO_IRQ, NULL);
-        free_page(Vino->dummy_page);
-        kfree(Vino);
-        iounmap(vino);
+        dprintk("exiting, stage = %d ...\n", vino_init_stage);
+        vino_module_cleanup(vino_init_stage);
+        dprintk("cleanup complete, exit!\n");
 }
 
-module_init(vino_init);
-module_exit(vino_exit);
-
-MODULE_DESCRIPTION("Video4Linux driver for SGI Indy VINO (IndyCam)");
-MODULE_LICENSE("GPL");
+module_init(vino_module_init);
+module_exit(vino_module_exit);
diff --git a/drivers/media/video/vino.h b/drivers/media/video/vino.h
index d2fce472f35a..de2d615ae7c9 100644
--- a/drivers/media/video/vino.h
+++ b/drivers/media/video/vino.h
@@ -1,13 +1,19 @@
 /*
+ * Driver for the VINO (Video In No Out) system found in SGI Indys.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License version 2 as published by the Free Software Foundation.
+ *
  * Copyright (C) 1999 Ulf Karlsson <ulfc@bun.falkenberg.se>
  * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
  */
 
-#ifndef VINO_H
-#define VINO_H
+#ifndef _VINO_H_
+#define _VINO_H_
 
 #define VINO_BASE       0x00080000      /* Vino is in the EISA address space,
                                          * but it is not an EISA bus card */
+#define VINO_PAGE_SIZE  4096
 
 struct sgi_vino_channel {
         u32 _pad_alpha;
@@ -21,8 +27,9 @@ struct sgi_vino_channel {
         u32 _pad_clip_end;
         volatile u32 clip_end;
 
+#define VINO_FRAMERT_FULL       0xfff
 #define VINO_FRAMERT_PAL        (1<<0)                  /* 0=NTSC 1=PAL */
-#define VINO_FRAMERT_RT(x)      (((x) & 0x1fff) << 1)   /* bits 1:12 */
+#define VINO_FRAMERT_RT(x)      (((x) & 0xfff) << 1)    /* bits 1:12 */
         u32 _pad_frame_rate;
         volatile u32 frame_rate;
 
@@ -67,18 +74,18 @@ struct sgi_vino {
         volatile u32 rev_id;
 
 #define VINO_CTRL_LITTLE_ENDIAN         (1<<0)
-#define VINO_CTRL_A_FIELD_TRANS_INT     (1<<1)  /* Field transferred int */
-#define VINO_CTRL_A_FIFO_OF_INT         (1<<2)  /* FIFO overflow int */
-#define VINO_CTRL_A_END_DESC_TBL_INT    (1<<3)  /* End of desc table int */
-#define VINO_CTRL_A_INT                 (VINO_CTRL_A_FIELD_TRANS_INT | \
-                                         VINO_CTRL_A_FIFO_OF_INT | \
-                                         VINO_CTRL_A_END_DESC_TBL_INT)
-#define VINO_CTRL_B_FIELD_TRANS_INT     (1<<4)  /* Field transferred int */
-#define VINO_CTRL_B_FIFO_OF_INT         (1<<5)  /* FIFO overflow int */
-#define VINO_CTRL_B_END_DESC_TBL_INT    (1<<6)  /* End of desc table int */
-#define VINO_CTRL_B_INT                 (VINO_CTRL_B_FIELD_TRANS_INT | \
-                                         VINO_CTRL_B_FIFO_OF_INT | \
-                                         VINO_CTRL_B_END_DESC_TBL_INT)
+#define VINO_CTRL_A_EOF_INT             (1<<1)  /* Field transferred int */
+#define VINO_CTRL_A_FIFO_INT            (1<<2)  /* FIFO overflow int */
+#define VINO_CTRL_A_EOD_INT             (1<<3)  /* End of desc table int */
+#define VINO_CTRL_A_INT                 (VINO_CTRL_A_EOF_INT | \
+                                         VINO_CTRL_A_FIFO_INT | \
+                                         VINO_CTRL_A_EOD_INT)
+#define VINO_CTRL_B_EOF_INT             (1<<4)  /* Field transferred int */
+#define VINO_CTRL_B_FIFO_INT            (1<<5)  /* FIFO overflow int */
+#define VINO_CTRL_B_EOD_INT             (1<<6)  /* End of desc table int */
+#define VINO_CTRL_B_INT                 (VINO_CTRL_B_EOF_INT | \
+                                         VINO_CTRL_B_FIFO_INT | \
+                                         VINO_CTRL_B_EOD_INT)
 #define VINO_CTRL_A_DMA_ENBL            (1<<7)
 #define VINO_CTRL_A_INTERLEAVE_ENBL     (1<<8)
 #define VINO_CTRL_A_SYNC_ENBL           (1<<9)
@@ -104,18 +111,18 @@ struct sgi_vino {
         u32 _pad_control;
         volatile u32 control;
 
-#define VINO_INTSTAT_A_FIELD_TRANS      (1<<0)  /* Field transferred int */
-#define VINO_INTSTAT_A_FIFO_OF          (1<<1)  /* FIFO overflow int */
-#define VINO_INTSTAT_A_END_DESC_TBL     (1<<2)  /* End of desc table int */
-#define VINO_INTSTAT_A                  (VINO_INTSTAT_A_FIELD_TRANS | \
-                                         VINO_INTSTAT_A_FIFO_OF | \
-                                         VINO_INTSTAT_A_END_DESC_TBL)
-#define VINO_INTSTAT_B_FIELD_TRANS      (1<<3)  /* Field transferred int */
-#define VINO_INTSTAT_B_FIFO_OF          (1<<4)  /* FIFO overflow int */
-#define VINO_INTSTAT_B_END_DESC_TBL     (1<<5)  /* End of desc table int */
-#define VINO_INTSTAT_B                  (VINO_INTSTAT_B_FIELD_TRANS | \
-                                         VINO_INTSTAT_B_FIFO_OF | \
-                                         VINO_INTSTAT_B_END_DESC_TBL)
+#define VINO_INTSTAT_A_EOF              (1<<0)  /* Field transferred int */
+#define VINO_INTSTAT_A_FIFO             (1<<1)  /* FIFO overflow int */
+#define VINO_INTSTAT_A_EOD              (1<<2)  /* End of desc table int */
+#define VINO_INTSTAT_A                  (VINO_INTSTAT_A_EOF | \
+                                         VINO_INTSTAT_A_FIFO | \
+                                         VINO_INTSTAT_A_EOD)
+#define VINO_INTSTAT_B_EOF              (1<<3)  /* Field transferred int */
+#define VINO_INTSTAT_B_FIFO             (1<<4)  /* FIFO overflow int */
+#define VINO_INTSTAT_B_EOD              (1<<5)  /* End of desc table int */
+#define VINO_INTSTAT_B                  (VINO_INTSTAT_B_EOF | \
+                                         VINO_INTSTAT_B_FIFO | \
+                                         VINO_INTSTAT_B_EOD)
         u32 _pad_intr_status;
         volatile u32 intr_status;
 
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 5dbd9f6bf353..4437bdebe24f 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -576,7 +576,6 @@ static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_i2c,
         .probe                  = &ignore,
         .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 
 static struct i2c_driver vpx3220_i2c_driver;
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 25743085b2d5..eed2acea1779 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -737,7 +737,7 @@ static struct i2c_algo_bit_data zoran_i2c_bit_data_template = {
 };
 
 static struct i2c_adapter zoran_i2c_adapter_template = {
-        I2C_DEVNAME("zr36057"),
+        .name = "zr36057",
         .id = I2C_HW_B_ZR36067,
         .algo = NULL,
         .client_register = zoran_i2c_client_register,
diff --git a/drivers/message/fusion/lsi/mpi.h b/drivers/message/fusion/lsi/mpi.h
index 9f98334e5076..b61e3d175070 100644
--- a/drivers/message/fusion/lsi/mpi.h
+++ b/drivers/message/fusion/lsi/mpi.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Message independent structures and definitions
  *  Creation Date:  July 27, 2000
  *
- *    mpi.h Version:  01.05.07
+ *    mpi.h Version:  01.05.08
  *
  *  Version History
  *  ---------------
@@ -71,6 +71,9 @@
  *  03-11-05  01.05.07  Removed function codes for SCSI IO 32 and
  *                      TargetAssistExtended requests.
  *                      Removed EEDP IOCStatus codes.
+ *  06-24-05  01.05.08  Added function codes for SCSI IO 32 and
+ *                      TargetAssistExtended requests.
+ *                      Added EEDP IOCStatus codes.
  *  --------------------------------------------------------------------------
  */
 
@@ -101,7 +104,7 @@
 /* Note: The major versions of 0xe0 through 0xff are reserved */
 
 /* versioning for this MPI header set */
-#define MPI_HEADER_VERSION_UNIT             (0x09)
+#define MPI_HEADER_VERSION_UNIT             (0x0A)
 #define MPI_HEADER_VERSION_DEV              (0x00)
 #define MPI_HEADER_VERSION_UNIT_MASK        (0xFF00)
 #define MPI_HEADER_VERSION_UNIT_SHIFT       (8)
@@ -292,10 +295,13 @@
 #define MPI_FUNCTION_DIAG_BUFFER_POST               (0x1D)
 #define MPI_FUNCTION_DIAG_RELEASE                   (0x1E)
 
+#define MPI_FUNCTION_SCSI_IO_32                     (0x1F)
+
 #define MPI_FUNCTION_LAN_SEND                       (0x20)
 #define MPI_FUNCTION_LAN_RECEIVE                    (0x21)
 #define MPI_FUNCTION_LAN_RESET                      (0x22)
 
+#define MPI_FUNCTION_TARGET_ASSIST_EXTENDED         (0x23)
 #define MPI_FUNCTION_TARGET_CMD_BUF_BASE_POST       (0x24)
 #define MPI_FUNCTION_TARGET_CMD_BUF_LIST_POST       (0x25)
 
@@ -681,6 +687,15 @@ typedef struct _MSG_DEFAULT_REPLY
 #define MPI_IOCSTATUS_SCSI_EXT_TERMINATED       (0x004C)
 
 /****************************************************************************/
+/*  For use by SCSI Initiator and SCSI Target end-to-end data protection    */
+/****************************************************************************/
+
+#define MPI_IOCSTATUS_EEDP_GUARD_ERROR          (0x004D)
+#define MPI_IOCSTATUS_EEDP_REF_TAG_ERROR        (0x004E)
+#define MPI_IOCSTATUS_EEDP_APP_TAG_ERROR        (0x004F)
+
+
+/****************************************************************************/
 /*  SCSI Target values                                                      */
 /****************************************************************************/
 
diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h
index 15b12b06799d..d8339896f734 100644
--- a/drivers/message/fusion/lsi/mpi_cnfg.h
+++ b/drivers/message/fusion/lsi/mpi_cnfg.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Config message, structures, and Pages
  *  Creation Date:  July 27, 2000
  *
- *    mpi_cnfg.h Version:  01.05.08
+ *    mpi_cnfg.h Version:  01.05.09
  *
  *  Version History
  *  ---------------
@@ -232,6 +232,23 @@
  *                      New physical mapping mode in SAS IO Unit Page 2.
  *                      Added CONFIG_PAGE_SAS_ENCLOSURE_0.
  *                      Added Slot and Enclosure fields to SAS Device Page 0.
+ *  06-24-05  01.05.09  Added EEDP defines to IOC Page 1.
+ *                      Added more RAID type defines to IOC Page 2.
+ *                      Added Port Enable Delay settings to BIOS Page 1.
+ *                      Added Bad Block Table Full define to RAID Volume Page 0.
+ *                      Added Previous State defines to RAID Physical Disk
+ *                      Page 0.
+ *                      Added Max Sata Targets define for DiscoveryStatus field
+ *                      of SAS IO Unit Page 0.
+ *                      Added Device Self Test to Control Flags of SAS IO Unit
+ *                      Page 1.
+ *                      Added Direct Attach Starting Slot Number define for SAS
+ *                      IO Unit Page 2.
+ *                      Added new fields in SAS Device Page 2 for enclosure
+ *                      mapping.
+ *                      Added OwnerDevHandle and Flags field to SAS PHY Page 0.
+ *                      Added IOC GPIO Flags define to SAS Enclosure Page 0.
+ *                      Fixed the value for MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT.
  *  --------------------------------------------------------------------------
  */
 
@@ -477,6 +494,7 @@ typedef struct _MSG_CONFIG_REPLY
 #define MPI_MANUFACTPAGE_DEVICEID_FC929X            (0x0626)
 #define MPI_MANUFACTPAGE_DEVICEID_FC939X            (0x0642)
 #define MPI_MANUFACTPAGE_DEVICEID_FC949X            (0x0640)
+#define MPI_MANUFACTPAGE_DEVICEID_FC949ES           (0x0646)
 /* SCSI */
 #define MPI_MANUFACTPAGE_DEVID_53C1030              (0x0030)
 #define MPI_MANUFACTPAGE_DEVID_53C1030ZC            (0x0031)
@@ -769,9 +787,13 @@ typedef struct _CONFIG_PAGE_IOC_1
 } CONFIG_PAGE_IOC_1, MPI_POINTER PTR_CONFIG_PAGE_IOC_1,
   IOCPage1_t, MPI_POINTER pIOCPage1_t;
 
-#define MPI_IOCPAGE1_PAGEVERSION                        (0x02)
+#define MPI_IOCPAGE1_PAGEVERSION                        (0x03)
 
 /* defines for the Flags field */
+#define MPI_IOCPAGE1_EEDP_MODE_MASK                     (0x07000000)
+#define MPI_IOCPAGE1_EEDP_MODE_OFF                      (0x00000000)
+#define MPI_IOCPAGE1_EEDP_MODE_T10                      (0x01000000)
+#define MPI_IOCPAGE1_EEDP_MODE_LSI_1                    (0x02000000)
 #define MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE    (0x00000010)
 #define MPI_IOCPAGE1_REPLY_COALESCING                   (0x00000001)
 
@@ -795,6 +817,11 @@ typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL
 #define MPI_RAID_VOL_TYPE_IS                        (0x00)
 #define MPI_RAID_VOL_TYPE_IME                       (0x01)
 #define MPI_RAID_VOL_TYPE_IM                        (0x02)
+#define MPI_RAID_VOL_TYPE_RAID_5                    (0x03)
+#define MPI_RAID_VOL_TYPE_RAID_6                    (0x04)
+#define MPI_RAID_VOL_TYPE_RAID_10                   (0x05)
+#define MPI_RAID_VOL_TYPE_RAID_50                   (0x06)
+#define MPI_RAID_VOL_TYPE_UNKNOWN                   (0xFF)
 
 /* IOC Page 2 Volume Flags values */
 
@@ -820,13 +847,17 @@ typedef struct _CONFIG_PAGE_IOC_2
 } CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,
   IOCPage2_t, MPI_POINTER pIOCPage2_t;
 
-#define MPI_IOCPAGE2_PAGEVERSION                        (0x02)
+#define MPI_IOCPAGE2_PAGEVERSION                        (0x03)
 
 /* IOC Page 2 Capabilities flags */
 
 #define MPI_IOCPAGE2_CAP_FLAGS_IS_SUPPORT               (0x00000001)
 #define MPI_IOCPAGE2_CAP_FLAGS_IME_SUPPORT              (0x00000002)
 #define MPI_IOCPAGE2_CAP_FLAGS_IM_SUPPORT               (0x00000004)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_5_SUPPORT           (0x00000008)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_6_SUPPORT           (0x00000010)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_10_SUPPORT          (0x00000020)
+#define MPI_IOCPAGE2_CAP_FLAGS_RAID_50_SUPPORT          (0x00000040)
 #define MPI_IOCPAGE2_CAP_FLAGS_SES_SUPPORT              (0x20000000)
 #define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT            (0x40000000)
 #define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT    (0x80000000)
@@ -945,7 +976,7 @@ typedef struct _CONFIG_PAGE_BIOS_1
 } CONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1,
   BIOSPage1_t, MPI_POINTER pBIOSPage1_t;
 
-#define MPI_BIOSPAGE1_PAGEVERSION                       (0x01)
+#define MPI_BIOSPAGE1_PAGEVERSION                       (0x02)
 
 /* values for the BiosOptions field */
 #define MPI_BIOSPAGE1_OPTIONS_SPI_ENABLE                (0x00000400)
@@ -954,6 +985,8 @@ typedef struct _CONFIG_PAGE_BIOS_1
 #define MPI_BIOSPAGE1_OPTIONS_DISABLE_BIOS              (0x00000001)
 
 /* values for the IOCSettings field */
+#define MPI_BIOSPAGE1_IOCSET_MASK_PORT_ENABLE_DELAY     (0x00F00000)
+#define MPI_BIOSPAGE1_IOCSET_SHIFT_PORT_ENABLE_DELAY    (20)
 #define MPI_BIOSPAGE1_IOCSET_MASK_BOOT_PREFERENCE       (0x00030000)
 #define MPI_BIOSPAGE1_IOCSET_ENCLOSURE_SLOT_BOOT        (0x00000000)
 #define MPI_BIOSPAGE1_IOCSET_SAS_ADDRESS_BOOT           (0x00010000)
@@ -1167,6 +1200,7 @@ typedef struct _CONFIG_PAGE_BIOS_2
 #define MPI_BIOSPAGE2_FORM_PCI_SLOT_NUMBER              (0x03)
 #define MPI_BIOSPAGE2_FORM_FC_WWN                       (0x04)
 #define MPI_BIOSPAGE2_FORM_SAS_WWN                      (0x05)
+#define MPI_BIOSPAGE2_FORM_ENCLOSURE_SLOT               (0x06)
 
 
 /****************************************************************************
@@ -1957,11 +1991,11 @@ typedef struct _RAID_VOL0_STATUS
   RaidVol0Status_t, MPI_POINTER pRaidVol0Status_t;
 
 /* RAID Volume Page 0 VolumeStatus defines */
-
 #define MPI_RAIDVOL0_STATUS_FLAG_ENABLED                (0x01)
 #define MPI_RAIDVOL0_STATUS_FLAG_QUIESCED               (0x02)
 #define MPI_RAIDVOL0_STATUS_FLAG_RESYNC_IN_PROGRESS     (0x04)
 #define MPI_RAIDVOL0_STATUS_FLAG_VOLUME_INACTIVE        (0x08)
+#define MPI_RAIDVOL0_STATUS_FLAG_BAD_BLOCK_TABLE_FULL   (0x10)
 
 #define MPI_RAIDVOL0_STATUS_STATE_OPTIMAL               (0x00)
 #define MPI_RAIDVOL0_STATUS_STATE_DEGRADED              (0x01)
@@ -2025,7 +2059,7 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0
 } CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,
   RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;
 
-#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x04)
+#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x05)
 
 /* values for RAID Volume Page 0 InactiveStatus field */
 #define MPI_RAIDVOLPAGE0_UNKNOWN_INACTIVE               (0x00)
@@ -2104,6 +2138,8 @@ typedef struct _RAID_PHYS_DISK0_STATUS
 #define MPI_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC           (0x01)
 #define MPI_PHYSDISK0_STATUS_FLAG_QUIESCED              (0x02)
 #define MPI_PHYSDISK0_STATUS_FLAG_INACTIVE_VOLUME       (0x04)
+#define MPI_PHYSDISK0_STATUS_FLAG_OPTIMAL_PREVIOUS      (0x00)
+#define MPI_PHYSDISK0_STATUS_FLAG_NOT_OPTIMAL_PREVIOUS  (0x08)
 
 #define MPI_PHYSDISK0_STATUS_ONLINE                     (0x00)
 #define MPI_PHYSDISK0_STATUS_MISSING                    (0x01)
@@ -2132,7 +2168,7 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0
 } CONFIG_PAGE_RAID_PHYS_DISK_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_0,
   RaidPhysDiskPage0_t, MPI_POINTER pRaidPhysDiskPage0_t;
 
-#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION           (0x01)
+#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION           (0x02)
 
 
 typedef struct _RAID_PHYS_DISK1_PATH
@@ -2263,7 +2299,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
 } CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,
   SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;
 
-#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x02)
+#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x03)
 
 /* values for SAS IO Unit Page 0 PortFlags */
 #define MPI_SAS_IOUNIT0_PORT_FLAGS_DISCOVERY_IN_PROGRESS    (0x08)
@@ -2299,6 +2335,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
 #define MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK                 (0x00000200)
 #define MPI_SAS_IOUNIT0_DS_TABLE_LINK                       (0x00000400)
 #define MPI_SAS_IOUNIT0_DS_UNSUPPORTED_DEVICE               (0x00000800)
+#define MPI_SAS_IOUNIT0_DS_MAX_SATA_TARGETS                 (0x00001000)
 
 
 typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA
@@ -2336,6 +2373,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
 #define MPI_SASIOUNITPAGE1_PAGEVERSION      (0x04)
 
 /* values for SAS IO Unit Page 1 ControlFlags */
+#define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST        (0x8000)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_3_0_MAX            (0x4000)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_1_5_MAX            (0x2000)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_SW_PRESERVE        (0x1000)
@@ -2345,9 +2383,8 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
 #define MPI_SAS_IOUNIT1_CONTROL_SHIFT_DEV_SUPPORT       (9)
 #define MPI_SAS_IOUNIT1_CONTROL_DEV_SUPPORT_BOTH        (0x00)
 #define MPI_SAS_IOUNIT1_CONTROL_DEV_SAS_SUPPORT         (0x01)
-#define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT        (0x10)
+#define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT        (0x02)
 
-#define MPI_SAS_IOUNIT1_CONTROL_AUTO_PORT_SAME_SAS_ADDR (0x0100)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_48BIT_LBA_REQUIRED (0x0080)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_SMART_REQUIRED     (0x0040)
 #define MPI_SAS_IOUNIT1_CONTROL_SATA_NCQ_REQUIRED       (0x0020)
@@ -2390,7 +2427,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
 } CONFIG_PAGE_SAS_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_2,
   SasIOUnitPage2_t, MPI_POINTER pSasIOUnitPage2_t;
 
-#define MPI_SASIOUNITPAGE2_PAGEVERSION      (0x03)
+#define MPI_SASIOUNITPAGE2_PAGEVERSION      (0x04)
 
 /* values for SAS IO Unit Page 2 Status field */
 #define MPI_SAS_IOUNIT2_STATUS_DISABLED_PERSISTENT_MAPPINGS (0x02)
@@ -2406,6 +2443,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
 #define MPI_SAS_IOUNIT2_FLAGS_ENCLOSURE_SLOT_PHYS_MAP       (0x02)
 
 #define MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT         (0x10)
+#define MPI_SAS_IOUNIT2_FLAGS_DA_STARTING_SLOT              (0x20)
 
 
 typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3
@@ -2584,11 +2622,19 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_2
 {
     CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
     U64                                 PhysicalIdentifier;     /* 08h */
-    U32                                 Reserved1;              /* 10h */
+    U32                                 EnclosureMapping;       /* 10h */
 } CONFIG_PAGE_SAS_DEVICE_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_2,
   SasDevicePage2_t, MPI_POINTER pSasDevicePage2_t;
 
-#define MPI_SASDEVICE2_PAGEVERSION          (0x00)
+#define MPI_SASDEVICE2_PAGEVERSION          (0x01)
+
+/* defines for SAS Device Page 2 EnclosureMapping field */
+#define MPI_SASDEVICE2_ENC_MAP_MASK_MISSING_COUNT       (0x0000000F)
+#define MPI_SASDEVICE2_ENC_MAP_SHIFT_MISSING_COUNT      (0)
+#define MPI_SASDEVICE2_ENC_MAP_MASK_NUM_SLOTS           (0x000007F0)
+#define MPI_SASDEVICE2_ENC_MAP_SHIFT_NUM_SLOTS          (4)
+#define MPI_SASDEVICE2_ENC_MAP_MASK_START_INDEX         (0x001FF800)
+#define MPI_SASDEVICE2_ENC_MAP_SHIFT_START_INDEX        (11)
 
 
 /****************************************************************************
@@ -2598,7 +2644,8 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_2
 typedef struct _CONFIG_PAGE_SAS_PHY_0
 {
     CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U32                                 Reserved1;              /* 08h */
+    U16                                 OwnerDevHandle;         /* 08h */
+    U16                                 Reserved1;              /* 0Ah */
     U64                                 SASAddress;             /* 0Ch */
     U16                                 AttachedDevHandle;      /* 14h */
     U8                                  AttachedPhyIdentifier;  /* 16h */
@@ -2607,12 +2654,12 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0
     U8                                  ProgrammedLinkRate;     /* 20h */
     U8                                  HwLinkRate;             /* 21h */
     U8                                  ChangeCount;            /* 22h */
-    U8                                  Reserved3;              /* 23h */
+    U8                                  Flags;                  /* 23h */
     U32                                 PhyInfo;                /* 24h */
 } CONFIG_PAGE_SAS_PHY_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_0,
   SasPhyPage0_t, MPI_POINTER pSasPhyPage0_t;
 
-#define MPI_SASPHY0_PAGEVERSION             (0x00)
+#define MPI_SASPHY0_PAGEVERSION             (0x01)
 
 /* values for SAS PHY Page 0 ProgrammedLinkRate field */
 #define MPI_SAS_PHY0_PRATE_MAX_RATE_MASK                        (0xF0)
@@ -2632,6 +2679,9 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0
 #define MPI_SAS_PHY0_HWRATE_MIN_RATE_1_5                        (0x08)
 #define MPI_SAS_PHY0_HWRATE_MIN_RATE_3_0                        (0x09)
 
+/* values for SAS PHY Page 0 Flags field */
+#define MPI_SAS_PHY0_FLAGS_SGPIO_DIRECT_ATTACH_ENC              (0x01)
+
 /* values for SAS PHY Page 0 PhyInfo field */
 #define MPI_SAS_PHY0_PHYINFO_SATA_PORT_ACTIVE                   (0x00004000)
 #define MPI_SAS_PHY0_PHYINFO_SATA_PORT_SELECTOR                 (0x00002000)
@@ -2690,7 +2740,7 @@ typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0
 } CONFIG_PAGE_SAS_ENCLOSURE_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_ENCLOSURE_0,
   SasEnclosurePage0_t, MPI_POINTER pSasEnclosurePage0_t;
 
-#define MPI_SASENCLOSURE0_PAGEVERSION       (0x00)
+#define MPI_SASENCLOSURE0_PAGEVERSION       (0x01)
 
 /* values for SAS Enclosure Page 0 Flags field */
 #define MPI_SAS_ENCLS0_FLAGS_SEP_BUS_ID_VALID       (0x0020)
@@ -2702,6 +2752,7 @@ typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0
 #define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_SGPIO          (0x0002)
 #define MPI_SAS_ENCLS0_FLAGS_MNG_EXP_SGPIO          (0x0003)
 #define MPI_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE      (0x0004)
+#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO           (0x0005)
 
 
 /****************************************************************************
diff --git a/drivers/message/fusion/lsi/mpi_history.txt b/drivers/message/fusion/lsi/mpi_history.txt
index c9edbee41edf..1a30ef16adb4 100644
--- a/drivers/message/fusion/lsi/mpi_history.txt
+++ b/drivers/message/fusion/lsi/mpi_history.txt
@@ -6,17 +6,17 @@
  Copyright (c) 2000-2005 LSI Logic Corporation.
 
  ---------------------------------------
- Header Set Release Version:    01.05.09
+ Header Set Release Version:    01.05.10
  Header Set Release Date:       03-11-05
  ---------------------------------------
 
  Filename               Current version     Prior version
  ----------             ---------------     -------------
- mpi.h                  01.05.07            01.05.06
- mpi_ioc.h              01.05.08            01.05.07
- mpi_cnfg.h             01.05.08            01.05.07
- mpi_init.h             01.05.04            01.05.03
- mpi_targ.h             01.05.04            01.05.03
+ mpi.h                  01.05.08            01.05.07
+ mpi_ioc.h              01.05.09            01.05.08
+ mpi_cnfg.h             01.05.09            01.05.08
+ mpi_init.h             01.05.05            01.05.04
+ mpi_targ.h             01.05.05            01.05.04
  mpi_fc.h               01.05.01            01.05.01
  mpi_lan.h              01.05.01            01.05.01
  mpi_raid.h             01.05.02            01.05.02
@@ -24,7 +24,7 @@
  mpi_inb.h              01.05.01            01.05.01
  mpi_sas.h              01.05.01            01.05.01
  mpi_type.h             01.05.01            01.05.01
- mpi_history.txt        01.05.09            01.05.08
+ mpi_history.txt        01.05.09            01.05.09
 
 
  *  Date      Version   Description
@@ -88,6 +88,9 @@ mpi.h
  *  03-11-05  01.05.07  Removed function codes for SCSI IO 32 and
  *                      TargetAssistExtended requests.
  *                      Removed EEDP IOCStatus codes.
+ *  06-24-05  01.05.08  Added function codes for SCSI IO 32 and
+ *                      TargetAssistExtended requests.
+ *                      Added EEDP IOCStatus codes.
  *  --------------------------------------------------------------------------
 
 mpi_ioc.h
@@ -159,6 +162,8 @@ mpi_ioc.h
  *                      Reply and IOC Init Request.
  *  03-11-05  01.05.08  Added family code for 1068E family.
  *                      Removed IOCFacts Reply EEDP Capability bit.
+ *  06-24-05  01.05.09  Added 5 new IOCFacts Reply IOCCapabilities bits.
+ *                      Added Max SATA Targets to SAS Discovery Error event.
  *  --------------------------------------------------------------------------
 
 mpi_cnfg.h
@@ -380,6 +385,23 @@ mpi_cnfg.h
  *                      New physical mapping mode in SAS IO Unit Page 2.
  *                      Added CONFIG_PAGE_SAS_ENCLOSURE_0.
  *                      Added Slot and Enclosure fields to SAS Device Page 0.
+ *  06-24-05  01.05.09  Added EEDP defines to IOC Page 1.
+ *                      Added more RAID type defines to IOC Page 2.
+ *                      Added Port Enable Delay settings to BIOS Page 1.
+ *                      Added Bad Block Table Full define to RAID Volume Page 0.
+ *                      Added Previous State defines to RAID Physical Disk
+ *                      Page 0.
+ *                      Added Max Sata Targets define for DiscoveryStatus field
+ *                      of SAS IO Unit Page 0.
+ *                      Added Device Self Test to Control Flags of SAS IO Unit
+ *                      Page 1.
+ *                      Added Direct Attach Starting Slot Number define for SAS
+ *                      IO Unit Page 2.
+ *                      Added new fields in SAS Device Page 2 for enclosure
+ *                      mapping.
+ *                      Added OwnerDevHandle and Flags field to SAS PHY Page 0.
+ *                      Added IOC GPIO Flags define to SAS Enclosure Page 0.
+ *                      Fixed the value for MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT.
  *  --------------------------------------------------------------------------
 
 mpi_init.h
@@ -418,6 +440,8 @@ mpi_init.h
  *                      Modified SCSI Enclosure Processor Request and Reply to
  *                      support Enclosure/Slot addressing rather than WWID
  *                      addressing.
+ *  06-24-05  01.05.05  Added SCSI IO 32 structures and defines.
+ *                      Added four new defines for SEP SlotStatus.
  *  --------------------------------------------------------------------------
 
 mpi_targ.h
@@ -461,6 +485,7 @@ mpi_targ.h
  *  10-05-04  01.05.02  MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY added.
  *  02-22-05  01.05.03  Changed a comment.
  *  03-11-05  01.05.04  Removed TargetAssistExtended Request.
+ *  06-24-05  01.05.05  Added TargetAssistExtended structures and defines.
  *  --------------------------------------------------------------------------
 
 mpi_fc.h
@@ -571,20 +596,20 @@ mpi_type.h
 
 mpi_history.txt         Parts list history
 
-Filename    01.05.09
-----------  --------
-mpi.h       01.05.07
-mpi_ioc.h   01.05.08
-mpi_cnfg.h  01.05.08
-mpi_init.h  01.05.04
-mpi_targ.h  01.05.04
-mpi_fc.h    01.05.01
-mpi_lan.h   01.05.01
-mpi_raid.h  01.05.02
-mpi_tool.h  01.05.03
-mpi_inb.h   01.05.01
-mpi_sas.h   01.05.01
-mpi_type.h  01.05.01
+Filename    01.05.10  01.05.09
+----------  --------  --------
+mpi.h       01.05.08  01.05.07
+mpi_ioc.h   01.05.09  01.05.08
+mpi_cnfg.h  01.05.09  01.05.08
+mpi_init.h  01.05.05  01.05.04
+mpi_targ.h  01.05.05  01.05.04
+mpi_fc.h    01.05.01  01.05.01
+mpi_lan.h   01.05.01  01.05.01
+mpi_raid.h  01.05.02  01.05.02
+mpi_tool.h  01.05.03  01.05.03
+mpi_inb.h   01.05.01  01.05.01
+mpi_sas.h   01.05.01  01.05.01
+mpi_type.h  01.05.01  01.05.01
 
 Filename    01.05.08   01.05.07   01.05.06   01.05.05   01.05.04   01.05.03
 ----------  --------   --------   --------   --------   --------   --------
diff --git a/drivers/message/fusion/lsi/mpi_init.h b/drivers/message/fusion/lsi/mpi_init.h
index aca035801a86..d5af75afbd94 100644
--- a/drivers/message/fusion/lsi/mpi_init.h
+++ b/drivers/message/fusion/lsi/mpi_init.h
@@ -6,7 +6,7 @@
  *          Title:  MPI initiator mode messages and structures
  *  Creation Date:  June 8, 2000
  *
- *    mpi_init.h Version:  01.05.04
+ *    mpi_init.h Version:  01.05.05
  *
  *  Version History
  *  ---------------
@@ -48,6 +48,8 @@
  *                      Modified SCSI Enclosure Processor Request and Reply to
  *                      support Enclosure/Slot addressing rather than WWID
  *                      addressing.
+ *  06-24-05  01.05.05  Added SCSI IO 32 structures and defines.
+ *                      Added four new defines for SEP SlotStatus.
  *  --------------------------------------------------------------------------
  */
 
@@ -203,6 +205,197 @@ typedef struct _MSG_SCSI_IO_REPLY
 
 
 /****************************************************************************/
+/*  SCSI IO 32 messages and associated structures                           */
+/****************************************************************************/
+
+typedef struct
+{
+    U8                      CDB[20];                    /* 00h */
+    U32                     PrimaryReferenceTag;        /* 14h */
+    U16                     PrimaryApplicationTag;      /* 18h */
+    U16                     PrimaryApplicationTagMask;  /* 1Ah */
+    U32                     TransferLength;             /* 1Ch */
+} MPI_SCSI_IO32_CDB_EEDP32, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_EEDP32,
+  MpiScsiIo32CdbEedp32_t, MPI_POINTER pMpiScsiIo32CdbEedp32_t;
+
+typedef struct
+{
+    U8                      CDB[16];                    /* 00h */
+    U32                     DataLength;                 /* 10h */
+    U32                     PrimaryReferenceTag;        /* 14h */
+    U16                     PrimaryApplicationTag;      /* 18h */
+    U16                     PrimaryApplicationTagMask;  /* 1Ah */
+    U32                     TransferLength;             /* 1Ch */
+} MPI_SCSI_IO32_CDB_EEDP16, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_EEDP16,
+  MpiScsiIo32CdbEedp16_t, MPI_POINTER pMpiScsiIo32CdbEedp16_t;
+
+typedef union
+{
+    U8                       CDB32[32];
+    MPI_SCSI_IO32_CDB_EEDP32 EEDP32;
+    MPI_SCSI_IO32_CDB_EEDP16 EEDP16;
+    SGE_SIMPLE_UNION         SGE;
+} MPI_SCSI_IO32_CDB_UNION, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_UNION,
+  MpiScsiIo32Cdb_t, MPI_POINTER pMpiScsiIo32Cdb_t;
+
+typedef struct
+{
+    U8                      TargetID;           /* 00h */
+    U8                      Bus;                /* 01h */
+    U16                     Reserved1;          /* 02h */
+    U32                     Reserved2;          /* 04h */
+} MPI_SCSI_IO32_BUS_TARGET_ID_FORM, MPI_POINTER PTR_MPI_SCSI_IO32_BUS_TARGET_ID_FORM,
+  MpiScsiIo32BusTargetIdForm_t, MPI_POINTER pMpiScsiIo32BusTargetIdForm_t;
+
+typedef union
+{
+    MPI_SCSI_IO32_BUS_TARGET_ID_FORM    SCSIID;
+    U64                                 WWID;
+} MPI_SCSI_IO32_ADDRESS, MPI_POINTER PTR_MPI_SCSI_IO32_ADDRESS,
+  MpiScsiIo32Address_t, MPI_POINTER pMpiScsiIo32Address_t;
+
+typedef struct _MSG_SCSI_IO32_REQUEST
+{
+    U8                          Port;                           /* 00h */
+    U8                          Reserved1;                      /* 01h */
+    U8                          ChainOffset;                    /* 02h */
+    U8                          Function;                       /* 03h */
+    U8                          CDBLength;                      /* 04h */
+    U8                          SenseBufferLength;              /* 05h */
+    U8                          Flags;                          /* 06h */
+    U8                          MsgFlags;                       /* 07h */
+    U32                         MsgContext;                     /* 08h */
+    U8                          LUN[8];                         /* 0Ch */
+    U32                         Control;                        /* 14h */
+    MPI_SCSI_IO32_CDB_UNION     CDB;                            /* 18h */
+    U32                         DataLength;                     /* 38h */
+    U32                         BidirectionalDataLength;        /* 3Ch */
+    U32                         SecondaryReferenceTag;          /* 40h */
+    U16                         SecondaryApplicationTag;        /* 44h */
+    U16                         Reserved2;                      /* 46h */
+    U16                         EEDPFlags;                      /* 48h */
+    U16                         ApplicationTagTranslationMask;  /* 4Ah */
+    U32                         EEDPBlockSize;                  /* 4Ch */
+    MPI_SCSI_IO32_ADDRESS       DeviceAddress;                  /* 50h */
+    U8                          SGLOffset0;                     /* 58h */
+    U8                          SGLOffset1;                     /* 59h */
+    U8                          SGLOffset2;                     /* 5Ah */
+    U8                          SGLOffset3;                     /* 5Bh */
+    U32                         Reserved3;                      /* 5Ch */
+    U32                         Reserved4;                      /* 60h */
+    U32                         SenseBufferLowAddr;             /* 64h */
+    SGE_IO_UNION                SGL;                            /* 68h */
+} MSG_SCSI_IO32_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO32_REQUEST,
+  SCSIIO32Request_t, MPI_POINTER pSCSIIO32Request_t;
+
+/* SCSI IO 32 MsgFlags bits */
+#define MPI_SCSIIO32_MSGFLGS_SENSE_WIDTH                (0x01)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_WIDTH_32             (0x00)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_WIDTH_64             (0x01)
+
+#define MPI_SCSIIO32_MSGFLGS_SENSE_LOCATION             (0x02)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_LOC_HOST             (0x00)
+#define MPI_SCSIIO32_MSGFLGS_SENSE_LOC_IOC              (0x02)
+
+#define MPI_SCSIIO32_MSGFLGS_CMD_DETERMINES_DATA_DIR    (0x04)
+#define MPI_SCSIIO32_MSGFLGS_SGL_OFFSETS_CHAINS         (0x08)
+#define MPI_SCSIIO32_MSGFLGS_MULTICAST                  (0x10)
+#define MPI_SCSIIO32_MSGFLGS_BIDIRECTIONAL              (0x20)
+#define MPI_SCSIIO32_MSGFLGS_LARGE_CDB                  (0x40)
+
+/* SCSI IO 32 Flags bits */
+#define MPI_SCSIIO32_FLAGS_FORM_MASK                    (0x03)
+#define MPI_SCSIIO32_FLAGS_FORM_SCSIID                  (0x00)
+#define MPI_SCSIIO32_FLAGS_FORM_WWID                    (0x01)
+
+/* SCSI IO 32 LUN fields */
+#define MPI_SCSIIO32_LUN_FIRST_LEVEL_ADDRESSING     (0x0000FFFF)
+#define MPI_SCSIIO32_LUN_SECOND_LEVEL_ADDRESSING    (0xFFFF0000)
+#define MPI_SCSIIO32_LUN_THIRD_LEVEL_ADDRESSING     (0x0000FFFF)
+#define MPI_SCSIIO32_LUN_FOURTH_LEVEL_ADDRESSING    (0xFFFF0000)
+#define MPI_SCSIIO32_LUN_LEVEL_1_WORD               (0xFF00)
+#define MPI_SCSIIO32_LUN_LEVEL_1_DWORD              (0x0000FF00)
+
+/* SCSI IO 32 Control bits */
+#define MPI_SCSIIO32_CONTROL_DATADIRECTION_MASK     (0x03000000)
+#define MPI_SCSIIO32_CONTROL_NODATATRANSFER         (0x00000000)
+#define MPI_SCSIIO32_CONTROL_WRITE                  (0x01000000)
+#define MPI_SCSIIO32_CONTROL_READ                   (0x02000000)
+#define MPI_SCSIIO32_CONTROL_BIDIRECTIONAL          (0x03000000)
+
+#define MPI_SCSIIO32_CONTROL_ADDCDBLEN_MASK         (0xFC000000)
+#define MPI_SCSIIO32_CONTROL_ADDCDBLEN_SHIFT        (26)
+
+#define MPI_SCSIIO32_CONTROL_TASKATTRIBUTE_MASK     (0x00000700)
+#define MPI_SCSIIO32_CONTROL_SIMPLEQ                (0x00000000)
+#define MPI_SCSIIO32_CONTROL_HEADOFQ                (0x00000100)
+#define MPI_SCSIIO32_CONTROL_ORDEREDQ               (0x00000200)
+#define MPI_SCSIIO32_CONTROL_ACAQ                   (0x00000400)
+#define MPI_SCSIIO32_CONTROL_UNTAGGED               (0x00000500)
+#define MPI_SCSIIO32_CONTROL_NO_DISCONNECT          (0x00000700)
+
+#define MPI_SCSIIO32_CONTROL_TASKMANAGE_MASK        (0x00FF0000)
+#define MPI_SCSIIO32_CONTROL_OBSOLETE               (0x00800000)
+#define MPI_SCSIIO32_CONTROL_CLEAR_ACA_RSV          (0x00400000)
+#define MPI_SCSIIO32_CONTROL_TARGET_RESET           (0x00200000)
+#define MPI_SCSIIO32_CONTROL_LUN_RESET_RSV          (0x00100000)
+#define MPI_SCSIIO32_CONTROL_RESERVED               (0x00080000)
+#define MPI_SCSIIO32_CONTROL_CLR_TASK_SET_RSV       (0x00040000)
+#define MPI_SCSIIO32_CONTROL_ABORT_TASK_SET         (0x00020000)
+#define MPI_SCSIIO32_CONTROL_RESERVED2              (0x00010000)
+
+/* SCSI IO 32 EEDPFlags */
+#define MPI_SCSIIO32_EEDPFLAGS_MASK_OP              (0x0007)
+#define MPI_SCSIIO32_EEDPFLAGS_NOOP_OP              (0x0000)
+#define MPI_SCSIIO32_EEDPFLAGS_CHK_OP               (0x0001)
+#define MPI_SCSIIO32_EEDPFLAGS_STRIP_OP             (0x0002)
+#define MPI_SCSIIO32_EEDPFLAGS_CHKRM_OP             (0x0003)
+#define MPI_SCSIIO32_EEDPFLAGS_INSERT_OP            (0x0004)
+#define MPI_SCSIIO32_EEDPFLAGS_REPLACE_OP           (0x0006)
+#define MPI_SCSIIO32_EEDPFLAGS_CHKREGEN_OP          (0x0007)
+
+#define MPI_SCSIIO32_EEDPFLAGS_PASS_REF_TAG         (0x0008)
+#define MPI_SCSIIO32_EEDPFLAGS_8_9THS_MODE          (0x0010)
+
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_MASK         (0x0700)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_GUARD        (0x0100)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_REFTAG       (0x0200)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_LBATAG       (0x0400)
+#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_SHIFT        (8)
+
+#define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_APPTAG       (0x1000)
+#define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_APPTAG       (0x2000)
+#define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_REFTAG       (0x4000)
+#define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_REFTAG       (0x8000)
+
+
+/* SCSIIO32 IO reply structure */
+typedef struct _MSG_SCSIIO32_IO_REPLY
+{
+    U8                      Port;                       /* 00h */
+    U8                      Reserved1;                  /* 01h */
+    U8                      MsgLength;                  /* 02h */
+    U8                      Function;                   /* 03h */
+    U8                      CDBLength;                  /* 04h */
+    U8                      SenseBufferLength;          /* 05h */
+    U8                      Flags;                      /* 06h */
+    U8                      MsgFlags;                   /* 07h */
+    U32                     MsgContext;                 /* 08h */
+    U8                      SCSIStatus;                 /* 0Ch */
+    U8                      SCSIState;                  /* 0Dh */
+    U16                     IOCStatus;                  /* 0Eh */
+    U32                     IOCLogInfo;                 /* 10h */
+    U32                     TransferCount;              /* 14h */
+    U32                     SenseCount;                 /* 18h */
+    U32                     ResponseInfo;               /* 1Ch */
+    U16                     TaskTag;                    /* 20h */
+    U16                     Reserved2;                  /* 22h */
+    U32                     BidirectionalTransferCount; /* 24h */
+} MSG_SCSIIO32_IO_REPLY, MPI_POINTER PTR_MSG_SCSIIO32_IO_REPLY,
+  SCSIIO32Reply_t, MPI_POINTER pSCSIIO32Reply_t;
+
+
+/****************************************************************************/
 /*  SCSI Task Management messages                                           */
 /****************************************************************************/
 
@@ -310,10 +503,14 @@ typedef struct _MSG_SEP_REQUEST
 #define MPI_SEP_REQ_SLOTSTATUS_UNCONFIGURED             (0x00000080)
 #define MPI_SEP_REQ_SLOTSTATUS_HOT_SPARE                (0x00000100)
 #define MPI_SEP_REQ_SLOTSTATUS_REBUILD_STOPPED          (0x00000200)
+#define MPI_SEP_REQ_SLOTSTATUS_REQ_CONSISTENCY_CHECK    (0x00001000)
+#define MPI_SEP_REQ_SLOTSTATUS_DISABLE                  (0x00002000)
+#define MPI_SEP_REQ_SLOTSTATUS_REQ_RESERVED_DEVICE      (0x00004000)
 #define MPI_SEP_REQ_SLOTSTATUS_IDENTIFY_REQUEST         (0x00020000)
 #define MPI_SEP_REQ_SLOTSTATUS_REQUEST_REMOVE           (0x00040000)
 #define MPI_SEP_REQ_SLOTSTATUS_REQUEST_INSERT           (0x00080000)
 #define MPI_SEP_REQ_SLOTSTATUS_DO_NOT_MOVE              (0x00400000)
+#define MPI_SEP_REQ_SLOTSTATUS_ACTIVE                   (0x00800000)
 #define MPI_SEP_REQ_SLOTSTATUS_B_ENABLE_BYPASS          (0x04000000)
 #define MPI_SEP_REQ_SLOTSTATUS_A_ENABLE_BYPASS          (0x08000000)
 #define MPI_SEP_REQ_SLOTSTATUS_DEV_OFF                  (0x10000000)
@@ -352,11 +549,15 @@ typedef struct _MSG_SEP_REPLY
 #define MPI_SEP_REPLY_SLOTSTATUS_UNCONFIGURED           (0x00000080)
 #define MPI_SEP_REPLY_SLOTSTATUS_HOT_SPARE              (0x00000100)
 #define MPI_SEP_REPLY_SLOTSTATUS_REBUILD_STOPPED        (0x00000200)
+#define MPI_SEP_REPLY_SLOTSTATUS_CONSISTENCY_CHECK      (0x00001000)
+#define MPI_SEP_REPLY_SLOTSTATUS_DISABLE                (0x00002000)
+#define MPI_SEP_REPLY_SLOTSTATUS_RESERVED_DEVICE        (0x00004000)
 #define MPI_SEP_REPLY_SLOTSTATUS_REPORT                 (0x00010000)
 #define MPI_SEP_REPLY_SLOTSTATUS_IDENTIFY_REQUEST       (0x00020000)
 #define MPI_SEP_REPLY_SLOTSTATUS_REMOVE_READY           (0x00040000)
 #define MPI_SEP_REPLY_SLOTSTATUS_INSERT_READY           (0x00080000)
 #define MPI_SEP_REPLY_SLOTSTATUS_DO_NOT_REMOVE          (0x00400000)
+#define MPI_SEP_REPLY_SLOTSTATUS_ACTIVE                 (0x00800000)
 #define MPI_SEP_REPLY_SLOTSTATUS_B_BYPASS_ENABLED       (0x01000000)
 #define MPI_SEP_REPLY_SLOTSTATUS_A_BYPASS_ENABLED       (0x02000000)
 #define MPI_SEP_REPLY_SLOTSTATUS_B_ENABLE_BYPASS        (0x04000000)
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h
index f91eb4efe8cc..93b70e2b4266 100644
--- a/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/drivers/message/fusion/lsi/mpi_ioc.h
@@ -6,7 +6,7 @@
  *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages
  *  Creation Date:  August 11, 2000
  *
- *    mpi_ioc.h Version:  01.05.08
+ *    mpi_ioc.h Version:  01.05.09
  *
  *  Version History
  *  ---------------
@@ -81,6 +81,8 @@
  *                      Reply and IOC Init Request.
  *  03-11-05  01.05.08  Added family code for 1068E family.
  *                      Removed IOCFacts Reply EEDP Capability bit.
+ *  06-24-05  01.05.09  Added 5 new IOCFacts Reply IOCCapabilities bits.
+ *                      Added Max SATA Targets to SAS Discovery Error event.
  *  --------------------------------------------------------------------------
  */
 
@@ -261,7 +263,11 @@ typedef struct _MSG_IOC_FACTS_REPLY
 #define MPI_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER       (0x00000008)
 #define MPI_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER         (0x00000010)
 #define MPI_IOCFACTS_CAPABILITY_EXTENDED_BUFFER         (0x00000020)
-
+#define MPI_IOCFACTS_CAPABILITY_EEDP                    (0x00000040)
+#define MPI_IOCFACTS_CAPABILITY_BIDIRECTIONAL           (0x00000080)
+#define MPI_IOCFACTS_CAPABILITY_MULTICAST               (0x00000100)
+#define MPI_IOCFACTS_CAPABILITY_SCSIIO32                (0x00000200)
+#define MPI_IOCFACTS_CAPABILITY_NO_SCSIIO16             (0x00000400)
 
 
 /*****************************************************************************
@@ -677,6 +683,7 @@ typedef struct _EVENT_DATA_DISCOVERY_ERROR
 #define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_SUBTRACTIVE          (0x00000200)
 #define MPI_EVENT_DSCVRY_ERR_DS_TABLE_TO_TABLE              (0x00000400)
 #define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_PATHS                (0x00000800)
+#define MPI_EVENT_DSCVRY_ERR_DS_MAX_SATA_TARGETS            (0x00001000)
 
 
 /*****************************************************************************
diff --git a/drivers/message/fusion/lsi/mpi_targ.h b/drivers/message/fusion/lsi/mpi_targ.h
index 623901fd82be..3f462859ceea 100644
--- a/drivers/message/fusion/lsi/mpi_targ.h
+++ b/drivers/message/fusion/lsi/mpi_targ.h
@@ -6,7 +6,7 @@
  *          Title:  MPI Target mode messages and structures
  *  Creation Date:  June 22, 2000
  *
- *    mpi_targ.h Version:  01.05.04
+ *    mpi_targ.h Version:  01.05.05
  *
  *  Version History
  *  ---------------
@@ -53,6 +53,7 @@
  *  10-05-04  01.05.02  MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY added.
  *  02-22-05  01.05.03  Changed a comment.
  *  03-11-05  01.05.04  Removed TargetAssistExtended Request.
+ *  06-24-05  01.05.05  Added TargetAssistExtended structures and defines.
  *  --------------------------------------------------------------------------
  */
 
@@ -371,6 +372,77 @@ typedef struct _MSG_TARGET_ERROR_REPLY
 
 
 /****************************************************************************/
+/* Target Assist Extended Request                                           */
+/****************************************************************************/
+
+typedef struct _MSG_TARGET_ASSIST_EXT_REQUEST
+{
+    U8                      StatusCode;                     /* 00h */
+    U8                      TargetAssistFlags;              /* 01h */
+    U8                      ChainOffset;                    /* 02h */
+    U8                      Function;                       /* 03h */
+    U16                     QueueTag;                       /* 04h */
+    U8                      Reserved1;                      /* 06h */
+    U8                      MsgFlags;                       /* 07h */
+    U32                     MsgContext;                     /* 08h */
+    U32                     ReplyWord;                      /* 0Ch */
+    U8                      LUN[8];                         /* 10h */
+    U32                     RelativeOffset;                 /* 18h */
+    U32                     Reserved2;                      /* 1Ch */
+    U32                     Reserved3;                      /* 20h */
+    U32                     PrimaryReferenceTag;            /* 24h */
+    U16                     PrimaryApplicationTag;          /* 28h */
+    U16                     PrimaryApplicationTagMask;      /* 2Ah */
+    U32                     Reserved4;                      /* 2Ch */
+    U32                     DataLength;                     /* 30h */
+    U32                     BidirectionalDataLength;        /* 34h */
+    U32                     SecondaryReferenceTag;          /* 38h */
+    U16                     SecondaryApplicationTag;        /* 3Ch */
+    U16                     Reserved5;                      /* 3Eh */
+    U16                     EEDPFlags;                      /* 40h */
+    U16                     ApplicationTagTranslationMask;  /* 42h */
+    U32                     EEDPBlockSize;                  /* 44h */
+    U8                      SGLOffset0;                     /* 48h */
+    U8                      SGLOffset1;                     /* 49h */
+    U8                      SGLOffset2;                     /* 4Ah */
+    U8                      SGLOffset3;                     /* 4Bh */
+    U32                     Reserved6;                      /* 4Ch */
+    SGE_IO_UNION            SGL[1];                         /* 50h */
+} MSG_TARGET_ASSIST_EXT_REQUEST, MPI_POINTER PTR_MSG_TARGET_ASSIST_EXT_REQUEST,
+  TargetAssistExtRequest_t, MPI_POINTER pTargetAssistExtRequest_t;
+
+/* see the defines after MSG_TARGET_ASSIST_REQUEST for TargetAssistFlags */
+
+/* defines for the MsgFlags field */
+#define TARGET_ASSIST_EXT_MSGFLAGS_BIDIRECTIONAL        (0x20)
+#define TARGET_ASSIST_EXT_MSGFLAGS_MULTICAST            (0x10)
+#define TARGET_ASSIST_EXT_MSGFLAGS_SGL_OFFSET_CHAINS    (0x08)
+
+/* defines for the EEDPFlags field */
+#define TARGET_ASSIST_EXT_EEDP_MASK_OP          (0x0007)
+#define TARGET_ASSIST_EXT_EEDP_NOOP_OP          (0x0000)
+#define TARGET_ASSIST_EXT_EEDP_CHK_OP           (0x0001)
+#define TARGET_ASSIST_EXT_EEDP_STRIP_OP         (0x0002)
+#define TARGET_ASSIST_EXT_EEDP_CHKRM_OP         (0x0003)
+#define TARGET_ASSIST_EXT_EEDP_INSERT_OP        (0x0004)
+#define TARGET_ASSIST_EXT_EEDP_REPLACE_OP       (0x0006)
+#define TARGET_ASSIST_EXT_EEDP_CHKREGEN_OP      (0x0007)
+
+#define TARGET_ASSIST_EXT_EEDP_PASS_REF_TAG     (0x0008)
+
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_MASK     (0x0700)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_GUARD    (0x0100)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_APPTAG   (0x0200)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_REFTAG   (0x0400)
+#define TARGET_ASSIST_EXT_EEDP_T10_CHK_SHIFT    (8)
+
+#define TARGET_ASSIST_EXT_EEDP_INC_SEC_APPTAG   (0x1000)
+#define TARGET_ASSIST_EXT_EEDP_INC_PRI_APPTAG   (0x2000)
+#define TARGET_ASSIST_EXT_EEDP_INC_SEC_REFTAG   (0x4000)
+#define TARGET_ASSIST_EXT_EEDP_INC_PRI_REFTAG   (0x8000)
+
+
+/****************************************************************************/
 /* Target Status Send Request                                               */
 /****************************************************************************/
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index ffbe6f4720e1..f517d0692d5f 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -218,8 +218,7 @@ pci_enable_io_access(struct pci_dev *pdev)
  *      (also referred to as a IO Controller or IOC).
  *      This routine must clear the interrupt from the adapter and does
  *      so by reading the reply FIFO.  Multiple replies may be processed
- *      per single call to this routine; up to MPT_MAX_REPLIES_PER_ISR
- *      which is currently set to 32 in mptbase.h.
+ *      per single call to this routine.
  *
  *      This routine handles register-level access of the adapter but
  *      dispatches (calls) a protocol-specific callback routine to handle
@@ -279,11 +278,11 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
                         cb_idx = mr->u.frame.hwhdr.msgctxu.fld.cb_idx;
                         mf = MPT_INDEX_2_MFPTR(ioc, req_idx);
 
-                        dmfprintk((MYIOC_s_INFO_FMT "Got non-TURBO reply=%p req_idx=%x\n",
-                                        ioc->name, mr, req_idx));
+                        dmfprintk((MYIOC_s_INFO_FMT "Got non-TURBO reply=%p req_idx=%x cb_idx=%x Function=%x\n",
+                                        ioc->name, mr, req_idx, cb_idx, mr->u.hdr.Function));
                         DBG_DUMP_REPLY_FRAME(mr)
 
-                        /*  Check/log IOC log info
+                         /*  Check/log IOC log info
                          */
                         ioc_stat = le16_to_cpu(mr->u.reply.IOCStatus);
                         if (ioc_stat & MPI_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE) {
@@ -345,7 +344,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
                         if ((mf) && ((mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))
                                 || (mf < ioc->req_frames)) ) {
                                 printk(MYIOC_s_WARN_FMT
-                                        "mpt_interrupt: Invalid mf (%p) req_idx (%d)!\n", ioc->name, (void *)mf, req_idx);
+                                        "mpt_interrupt: Invalid mf (%p)!\n", ioc->name, (void *)mf);
                                 cb_idx = 0;
                                 pa = 0;
                                 freeme = 0;
@@ -399,7 +398,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)
  *      @mf: Pointer to original MPT request frame
  *      @reply: Pointer to MPT reply frame (NULL if TurboReply)
  *
-        *       Returns 1 indicating original alloc'd request frame ptr
+ *      Returns 1 indicating original alloc'd request frame ptr
  *      should be freed, or 0 if it shouldn't.
  */
 static int
@@ -408,28 +407,17 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
         int freereq = 1;
         u8 func;
 
-        dprintk((MYIOC_s_INFO_FMT "mpt_base_reply() called\n", ioc->name));
-
-        if ((mf == NULL) ||
-            (mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))) {
-                printk(MYIOC_s_ERR_FMT "NULL or BAD request frame ptr! (=%p)\n",
-                                ioc->name, (void *)mf);
-                return 1;
-        }
-
-        if (reply == NULL) {
-                dprintk((MYIOC_s_ERR_FMT "Unexpected NULL Event (turbo?) reply!\n",
-                                ioc->name));
-                return 1;
-        }
+        dmfprintk((MYIOC_s_INFO_FMT "mpt_base_reply() called\n", ioc->name));
 
+#if defined(MPT_DEBUG_MSG_FRAME)
         if (!(reply->u.hdr.MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY)) {
                 dmfprintk((KERN_INFO MYNAM ": Original request frame (@%p) header\n", mf));
                 DBG_DUMP_REQUEST_FRAME_HDR(mf)
         }
+#endif
 
         func = reply->u.hdr.Function;
-        dprintk((MYIOC_s_INFO_FMT "mpt_base_reply, Function=%02Xh\n",
+        dmfprintk((MYIOC_s_INFO_FMT "mpt_base_reply, Function=%02Xh\n",
                         ioc->name, func));
 
         if (func == MPI_FUNCTION_EVENT_NOTIFICATION) {
@@ -448,8 +436,14 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
                  *      Hmmm...  It seems that EventNotificationReply is an exception
                  *      to the rule of one reply per request.
                  */
-                if (pEvReply->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY)
+                if (pEvReply->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY) {
                         freereq = 0;
+                        devtprintk((MYIOC_s_WARN_FMT "EVENT_NOTIFICATION reply %p does not return Request frame\n",
+                                ioc->name, pEvReply));
+                } else {
+                        devtprintk((MYIOC_s_WARN_FMT "EVENT_NOTIFICATION reply %p returns Request frame\n",
+                                ioc->name, pEvReply));
+                }
 
 #ifdef CONFIG_PROC_FS
 //              LogEvent(ioc, pEvReply);
@@ -491,10 +485,21 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply)
 
                                 pCfg->status = status;
                                 if (status == MPI_IOCSTATUS_SUCCESS) {
-                                        pCfg->hdr->PageVersion = pReply->Header.PageVersion;
-                                        pCfg->hdr->PageLength = pReply->Header.PageLength;
-                                        pCfg->hdr->PageNumber = pReply->Header.PageNumber;
-                                        pCfg->hdr->PageType = pReply->Header.PageType;
+                                        if ((pReply->Header.PageType &
+                                            MPI_CONFIG_PAGETYPE_MASK) ==
+                                            MPI_CONFIG_PAGETYPE_EXTENDED) {
+                                                pCfg->cfghdr.ehdr->ExtPageLength =
+                                                    le16_to_cpu(pReply->ExtPageLength);
+                                                pCfg->cfghdr.ehdr->ExtPageType =
+                                                    pReply->ExtPageType;
+                                        }
+                                        pCfg->cfghdr.hdr->PageVersion = pReply->Header.PageVersion;
+
+                                        /* If this is a regular header, save PageLength. */
+                                        /* LMP Do this better so not using a reserved field! */
+                                        pCfg->cfghdr.hdr->PageLength = pReply->Header.PageLength;
+                                        pCfg->cfghdr.hdr->PageNumber = pReply->Header.PageNumber;
+                                        pCfg->cfghdr.hdr->PageType = pReply->Header.PageType;
                                 }
                         }
 
@@ -705,7 +710,7 @@ mpt_device_driver_deregister(int cb_idx)
                 if (dd_cbfunc->remove)
                         dd_cbfunc->remove(ioc->pcidev);
         }
-        
+
         MptDeviceDriverHandlers[cb_idx] = NULL;
 }
 
@@ -818,7 +823,7 @@ mpt_put_msg_frame(int handle, MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf)
         }
 #endif
 
-        mf_dma_addr = (ioc->req_frames_low_dma + req_offset) | ioc->RequestNB[req_idx];  
+        mf_dma_addr = (ioc->req_frames_low_dma + req_offset) | ioc->RequestNB[req_idx];
         dsgprintk((MYIOC_s_INFO_FMT "mf_dma_addr=%x req_idx=%d RequestNB=%x\n", ioc->name, mf_dma_addr, req_idx, ioc->RequestNB[req_idx]));
         CHIPREG_WRITE32(&ioc->chip->RequestFifo, mf_dma_addr);
 }
@@ -920,7 +925,7 @@ mpt_send_handshake_request(int handle, MPT_ADAPTER *ioc, int reqBytes, u32 *req,
 
         /* Make sure there are no doorbells */
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
-        
+
         CHIPREG_WRITE32(&ioc->chip->Doorbell,
                         ((MPI_FUNCTION_HANDSHAKE<<MPI_DOORBELL_FUNCTION_SHIFT) |
                          ((reqBytes/4)<<MPI_DOORBELL_ADD_DWORDS_SHIFT)));
@@ -935,14 +940,14 @@ mpt_send_handshake_request(int handle, MPT_ADAPTER *ioc, int reqBytes, u32 *req,
                 return -5;
 
         dhsprintk((KERN_INFO MYNAM ": %s: mpt_send_handshake_request start, WaitCnt=%d\n",
-                        ioc->name, ii));
+                ioc->name, ii));
 
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
 
         if ((r = WaitForDoorbellAck(ioc, 5, sleepFlag)) < 0) {
                 return -2;
         }
-                
+
         /* Send request via doorbell handshake */
         req_as_bytes = (u8 *) req;
         for (ii = 0; ii < reqBytes/4; ii++) {
@@ -988,9 +993,9 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp)
                 if (ioc->id == iocid) {
                         *iocpp =ioc;
                         return iocid;
-                } 
+                }
         }
-        
+
         *iocpp = NULL;
         return -1;
 }
@@ -1032,9 +1037,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
         if (pci_enable_device(pdev))
                 return r;
-        
+
         dinitprintk((KERN_WARNING MYNAM ": mpt_adapter_install\n"));
-        
+
         if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
                 dprintk((KERN_INFO MYNAM
                         ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n"));
@@ -1059,7 +1064,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->alloc_total = sizeof(MPT_ADAPTER);
         ioc->req_sz = MPT_DEFAULT_FRAME_SIZE;           /* avoid div by zero! */
         ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
-        
+
         ioc->pcidev = pdev;
         ioc->diagPending = 0;
         spin_lock_init(&ioc->diagLock);
@@ -1088,7 +1093,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         /* Find lookup slot. */
         INIT_LIST_HEAD(&ioc->list);
         ioc->id = mpt_ids++;
-        
+
         mem_phys = msize = 0;
         port = psize = 0;
         for (ii=0; ii < DEVICE_COUNT_RESOURCE; ii++) {
@@ -1143,7 +1148,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 ioc->prod_name = "LSIFC909";
                 ioc->bus_type = FC;
         }
-        if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC929) {
+        else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC929) {
                 ioc->prod_name = "LSIFC929";
                 ioc->bus_type = FC;
         }
@@ -1322,7 +1327,7 @@ mpt_detach(struct pci_dev *pdev)
         remove_proc_entry(pname, NULL);
         sprintf(pname, MPT_PROCFS_MPTBASEDIR "/%s", ioc->name);
         remove_proc_entry(pname, NULL);
-        
+
         /* call per device driver remove entry point */
         for(ii=0; ii<MPT_MAX_PROTOCOL_DRIVERS; ii++) {
                 if(MptDeviceDriverHandlers[ii] &&
@@ -1330,7 +1335,7 @@ mpt_detach(struct pci_dev *pdev)
                         MptDeviceDriverHandlers[ii]->remove(pdev);
                 }
         }
-        
+
         /* Disable interrupts! */
         CHIPREG_WRITE32(&ioc->chip->IntMask, 0xFFFFFFFF);
 
@@ -1403,7 +1408,7 @@ mpt_resume(struct pci_dev *pdev)
         u32 device_state = pdev->current_state;
         int recovery_state;
         int ii;
-        
+
         printk(MYIOC_s_INFO_FMT
         "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
                 ioc->name, pdev, pci_name(pdev), device_state);
@@ -1534,7 +1539,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                 if ((rc = GetIocFacts(ioc, sleepFlag, reason)) == 0)
                         break;
         }
-        
+
 
         if (ii == 5) {
                 dinitprintk((MYIOC_s_INFO_FMT "Retry IocFacts failed rc=%x\n", ioc->name, rc));
@@ -1542,7 +1547,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
         } else if (reason == MPT_HOSTEVENT_IOC_BRINGUP) {
                 MptDisplayIocCapabilities(ioc);
         }
-        
+
         if (alt_ioc_ready) {
                 if ((rc = GetIocFacts(ioc->alt_ioc, sleepFlag, reason)) != 0) {
                         dinitprintk((MYIOC_s_INFO_FMT "Initial Alt IocFacts failed rc=%x\n", ioc->name, rc));
@@ -1613,7 +1618,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
 
         if (reset_alt_ioc_active && ioc->alt_ioc) {
                 /* (re)Enable alt-IOC! (reply interrupt) */
-                dprintk((KERN_INFO MYNAM ": alt-%s reply irq re-enabled\n",
+                dinitprintk((KERN_INFO MYNAM ": alt-%s reply irq re-enabled\n",
                                 ioc->alt_ioc->name));
                 CHIPREG_WRITE32(&ioc->alt_ioc->chip->IntMask, ~(MPI_HIM_RIM));
                 ioc->alt_ioc->active = 1;
@@ -1670,7 +1675,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
 
                         /* Find IM volumes
                          */
-                        if (ioc->facts.MsgVersion >= 0x0102)
+                        if (ioc->facts.MsgVersion >= MPI_VERSION_01_02)
                                 mpt_findImVolumes(ioc);
 
                         /* Check, and possibly reset, the coalescing value
@@ -1700,7 +1705,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                         }
 
                         if (alt_ioc_ready && MptResetHandlers[ii]) {
-                                dprintk((MYIOC_s_INFO_FMT "Calling alt-%s post_reset handler #%d\n",
+                                drsprintk((MYIOC_s_INFO_FMT "Calling alt-%s post_reset handler #%d\n",
                                                 ioc->name, ioc->alt_ioc->name, ii));
                                 rc += (*(MptResetHandlers[ii]))(ioc->alt_ioc, MPT_IOC_POST_RESET);
                                 handlers++;
@@ -1733,8 +1738,8 @@ mpt_detect_bound_ports(MPT_ADAPTER *ioc, struct pci_dev *pdev)
 
         dprintk((MYIOC_s_INFO_FMT "PCI device %s devfn=%x/%x,"
             " searching for devfn match on %x or %x\n",
-                ioc->name, pci_name(pdev), pdev->devfn,
-                func-1, func+1));
+                ioc->name, pci_name(pdev), pdev->bus->number,
+                pdev->devfn, func-1, func+1));
 
         peer = pci_get_slot(pdev->bus, PCI_DEVFN(slot,func-1));
         if (!peer) {
@@ -1861,36 +1866,39 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
 static void
 mpt_adapter_dispose(MPT_ADAPTER *ioc)
 {
-        if (ioc != NULL) {
-                int sz_first, sz_last;
+        int sz_first, sz_last;
 
-                sz_first = ioc->alloc_total;
+        if (ioc == NULL)
+                return;
 
-                mpt_adapter_disable(ioc);
+        sz_first = ioc->alloc_total;
 
-                if (ioc->pci_irq != -1) {
-                        free_irq(ioc->pci_irq, ioc);
-                        ioc->pci_irq = -1;
-                }
+        mpt_adapter_disable(ioc);
 
-                if (ioc->memmap != NULL)
-                        iounmap(ioc->memmap);
+        if (ioc->pci_irq != -1) {
+                free_irq(ioc->pci_irq, ioc);
+                ioc->pci_irq = -1;
+        }
+
+        if (ioc->memmap != NULL) {
+                iounmap(ioc->memmap);
+                ioc->memmap = NULL;
+        }
 
 #if defined(CONFIG_MTRR) && 0
-                if (ioc->mtrr_reg > 0) {
-                        mtrr_del(ioc->mtrr_reg, 0, 0);
-                        dprintk((KERN_INFO MYNAM ": %s: MTRR region de-registered\n", ioc->name));
-                }
+        if (ioc->mtrr_reg > 0) {
+                mtrr_del(ioc->mtrr_reg, 0, 0);
+                dprintk((KERN_INFO MYNAM ": %s: MTRR region de-registered\n", ioc->name));
+        }
 #endif
 
-                /*  Zap the adapter lookup ptr!  */
-                list_del(&ioc->list);
+        /*  Zap the adapter lookup ptr!  */
+        list_del(&ioc->list);
 
-                sz_last = ioc->alloc_total;
-                dprintk((KERN_INFO MYNAM ": %s: free'd %d of %d bytes\n",
-                                ioc->name, sz_first-sz_last+(int)sizeof(*ioc), sz_first));
-                kfree(ioc);
-        }
+        sz_last = ioc->alloc_total;
+        dprintk((KERN_INFO MYNAM ": %s: free'd %d of %d bytes\n",
+                        ioc->name, sz_first-sz_last+(int)sizeof(*ioc), sz_first));
+        kfree(ioc);
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1977,7 +1985,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag)
         }
 
         /* Is it already READY? */
-        if (!statefault && (ioc_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_READY) 
+        if (!statefault && (ioc_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_READY)
                 return 0;
 
         /*
@@ -1995,7 +2003,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag)
          *      Hmmm...  Did it get left operational?
          */
         if ((ioc_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_OPERATIONAL) {
-                dinitprintk((MYIOC_s_WARN_FMT "IOC operational unexpected\n",
+                dinitprintk((MYIOC_s_INFO_FMT "IOC operational unexpected\n",
                                 ioc->name));
 
                 /* Check WhoInit.
@@ -2004,8 +2012,8 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag)
                  * Else, fall through to KickStart case
                  */
                 whoinit = (ioc_state & MPI_DOORBELL_WHO_INIT_MASK) >> MPI_DOORBELL_WHO_INIT_SHIFT;
-                dprintk((KERN_WARNING MYNAM
-                        ": whoinit 0x%x\n statefault %d force %d\n",
+                dinitprintk((KERN_INFO MYNAM
+                        ": whoinit 0x%x statefault %d force %d\n",
                         whoinit, statefault, force));
                 if (whoinit == MPI_WHOINIT_PCI_PEER)
                         return -4;
@@ -2140,8 +2148,8 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
         get_facts.Function = MPI_FUNCTION_IOC_FACTS;
         /* Assert: All other get_facts fields are zero! */
 
-        dinitprintk((MYIOC_s_INFO_FMT 
-            "Sending get IocFacts request req_sz=%d reply_sz=%d\n", 
+        dinitprintk((MYIOC_s_INFO_FMT
+            "Sending get IocFacts request req_sz=%d reply_sz=%d\n",
             ioc->name, req_sz, reply_sz));
 
         /* No non-zero fields in the get_facts request are greater than
@@ -2174,7 +2182,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                 facts->IOCExceptions = le16_to_cpu(facts->IOCExceptions);
                 facts->IOCStatus = le16_to_cpu(facts->IOCStatus);
                 facts->IOCLogInfo = le32_to_cpu(facts->IOCLogInfo);
-                status = facts->IOCStatus & MPI_IOCSTATUS_MASK;
+                status = le16_to_cpu(facts->IOCStatus) & MPI_IOCSTATUS_MASK;
                 /* CHECKME! IOCStatus, IOCLogInfo */
 
                 facts->ReplyQueueDepth = le16_to_cpu(facts->ReplyQueueDepth);
@@ -2221,7 +2229,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                 if ( sz & 0x02 )
                         sz += 2;
                 facts->FWImageSize = sz;
-                
+
                 if (!facts->RequestFrameSize) {
                         /*  Something is wrong!  */
                         printk(MYIOC_s_ERR_FMT "IOC reported invalid 0 request size!\n",
@@ -2240,7 +2248,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                 ioc->NBShiftFactor  = shiftFactor;
                 dinitprintk((MYIOC_s_INFO_FMT "NB_for_64_byte_frame=%x NBShiftFactor=%x BlockSize=%x\n",
                                         ioc->name, vv, shiftFactor, r));
-    
+
                 if (reason == MPT_HOSTEVENT_IOC_BRINGUP) {
                         /*
                          * Set values for this IOC's request & reply frame sizes,
@@ -2261,7 +2269,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason)
                                 return r;
                 }
         } else {
-                printk(MYIOC_s_ERR_FMT 
+                printk(MYIOC_s_ERR_FMT
                      "Invalid IOC facts reply, msgLength=%d offsetof=%zd!\n",
                      ioc->name, facts->MsgLength, (offsetof(IOCFactsReply_t,
                      RequestFrameSize)/sizeof(u32)));
@@ -2413,9 +2421,11 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag)
 
         dhsprintk((MYIOC_s_INFO_FMT "Sending PortEnable (req @ %p)\n",
                         ioc->name, &ioc_init));
-        
-        if ((r = SendPortEnable(ioc, 0, sleepFlag)) != 0)
+
+        if ((r = SendPortEnable(ioc, 0, sleepFlag)) != 0) {
+                printk(MYIOC_s_ERR_FMT "Sending PortEnable failed(%d)!\n",ioc->name, r);
                 return r;
+        }
 
         /* YIKES!  SUPER IMPORTANT!!!
          *  Poll IocState until _OPERATIONAL while IOC is doing
@@ -2440,7 +2450,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag)
                 state = mpt_GetIocState(ioc, 1);
                 count++;
         }
-        dhsprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",
+        dinitprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",
                         ioc->name, count));
 
         return r;
@@ -2529,7 +2539,7 @@ mpt_free_fw_memory(MPT_ADAPTER *ioc)
         int sz;
 
         sz = ioc->facts.FWImageSize;
-        dinitprintk((KERN_WARNING MYNAM "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",
+        dinitprintk((KERN_INFO MYNAM "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",
                  ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));
         pci_free_consistent(ioc->pcidev, sz,
                         ioc->cached_fw, ioc->cached_fw_dma);
@@ -2573,9 +2583,9 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag)
 
         mpt_alloc_fw_memory(ioc, sz);
 
-        dinitprintk((KERN_WARNING MYNAM ": FW Image  @ %p[%p], sz=%d[%x] bytes\n",
+        dinitprintk((KERN_INFO MYNAM ": FW Image  @ %p[%p], sz=%d[%x] bytes\n",
                  ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));
-        
+
         if (ioc->cached_fw == NULL) {
                 /* Major Failure.
                  */
@@ -2605,14 +2615,14 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag)
         mpt_add_sge(&request[sgeoffset], flagsLength, ioc->cached_fw_dma);
 
         sgeoffset += sizeof(u32) + sizeof(dma_addr_t);
-        dinitprintk((KERN_WARNING MYNAM "Sending FW Upload (req @ %p) sgeoffset=%d \n",
+        dinitprintk((KERN_INFO MYNAM ": Sending FW Upload (req @ %p) sgeoffset=%d \n",
                         prequest, sgeoffset));
         DBG_DUMP_FW_REQUEST_FRAME(prequest)
 
         ii = mpt_handshake_req_reply_wait(ioc, sgeoffset, (u32*)prequest,
                                 reply_sz, (u16*)preply, 65 /*seconds*/, sleepFlag);
 
-        dinitprintk((KERN_WARNING MYNAM "FW Upload completed rc=%x \n", ii));
+        dinitprintk((KERN_INFO MYNAM ": FW Upload completed rc=%x \n", ii));
 
         cmdStatus = -EFAULT;
         if (ii == 0) {
@@ -2627,10 +2637,10 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag)
                                 cmdStatus = 0;
                 }
         }
-        dinitprintk((MYIOC_s_INFO_FMT ": do_upload status %d \n",
+        dinitprintk((MYIOC_s_INFO_FMT ": do_upload cmdStatus=%d \n",
                         ioc->name, cmdStatus));
 
-        
+
         if (cmdStatus) {
 
                 ddlprintk((MYIOC_s_INFO_FMT ": fw upload failed, freeing image \n",
@@ -2761,8 +2771,8 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
                 fwSize = (pExtImage->ImageSize + 3) >> 2;
                 ptrFw = (u32 *)pExtImage;
 
-                ddlprintk((MYIOC_s_INFO_FMT "Write Ext Image: 0x%x bytes @ %p load_addr=%x\n",
-                                                ioc->name, fwSize*4, ptrFw, load_addr));
+                ddlprintk((MYIOC_s_INFO_FMT "Write Ext Image: 0x%x (%d) bytes @ %p load_addr=%x\n",
+                                                ioc->name, fwSize*4, fwSize*4, ptrFw, load_addr));
                 CHIPREG_PIO_WRITE32(&ioc->pio_chip->DiagRwAddress, load_addr);
 
                 while (fwSize--) {
@@ -2845,9 +2855,9 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag)
  *                        0 else
  *
  *      Returns:
- *               1 - hard reset, READY  
- *               0 - no reset due to History bit, READY 
- *              -1 - no reset due to History bit but not READY  
+ *               1 - hard reset, READY
+ *               0 - no reset due to History bit, READY
+ *              -1 - no reset due to History bit but not READY
  *                   OR reset but failed to come READY
  *              -2 - no reset, could not enter DIAG mode
  *              -3 - reset but bad FW bit
@@ -2990,7 +3000,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
                  *
                  */
                 CHIPREG_WRITE32(&ioc->chip->Diagnostic, diag0val | MPI_DIAG_DISABLE_ARM);
-                mdelay (1);
+                mdelay(1);
 
                 /*
                  * Now hit the reset bit in the Diagnostic register
@@ -3170,7 +3180,7 @@ SendIocReset(MPT_ADAPTER *ioc, u8 reset_type, int sleepFlag)
         u32 state;
         int cntdn, count;
 
-        drsprintk((KERN_WARNING MYNAM ": %s: Sending IOC reset(0x%02x)!\n",
+        drsprintk((KERN_INFO MYNAM ": %s: Sending IOC reset(0x%02x)!\n",
                         ioc->name, reset_type));
         CHIPREG_WRITE32(&ioc->chip->Doorbell, reset_type<<MPI_DOORBELL_FUNCTION_SHIFT);
         if ((r = WaitForDoorbellAck(ioc, 5, sleepFlag)) < 0)
@@ -3374,6 +3384,9 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
                 ioc->reply_frames = (MPT_FRAME_HDR *) mem;
                 ioc->reply_frames_low_dma = (u32) (alloc_dma & 0xFFFFFFFF);
 
+                dinitprintk((KERN_INFO MYNAM ": %s ReplyBuffers @ %p[%p]\n",
+                        ioc->name, ioc->reply_frames, (void *)(ulong)alloc_dma));
+
                 alloc_dma += reply_sz;
                 mem += reply_sz;
 
@@ -3382,7 +3395,7 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
                 ioc->req_frames = (MPT_FRAME_HDR *) mem;
                 ioc->req_frames_dma = alloc_dma;
 
-                dinitprintk((KERN_INFO MYNAM ": %s.RequestBuffers @ %p[%p]\n",
+                dinitprintk((KERN_INFO MYNAM ": %s RequestBuffers @ %p[%p]\n",
                                 ioc->name, mem, (void *)(ulong)alloc_dma));
 
                 ioc->req_frames_low_dma = (u32) (alloc_dma & 0xFFFFFFFF);
@@ -3408,7 +3421,7 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
                 ioc->ChainBuffer = mem;
                 ioc->ChainBufferDMA = alloc_dma;
 
-                dinitprintk((KERN_INFO MYNAM " :%s.ChainBuffers @ %p(%p)\n",
+                dinitprintk((KERN_INFO MYNAM " :%s ChainBuffers @ %p(%p)\n",
                         ioc->name, ioc->ChainBuffer, (void *)(ulong)ioc->ChainBufferDMA));
 
                 /* Initialize the free chain Q.
@@ -3513,7 +3526,7 @@ out_fail:
  */
 static int
 mpt_handshake_req_reply_wait(MPT_ADAPTER *ioc, int reqBytes, u32 *req,
-                                int replyBytes, u16 *u16reply, int maxwait, int sleepFlag)
+                int replyBytes, u16 *u16reply, int maxwait, int sleepFlag)
 {
         MPIDefaultReply_t *mptReply;
         int failcnt = 0;
@@ -3588,7 +3601,7 @@ mpt_handshake_req_reply_wait(MPT_ADAPTER *ioc, int reqBytes, u32 *req,
                  */
                 if (!failcnt && (t = WaitForDoorbellReply(ioc, maxwait, sleepFlag)) < 0)
                         failcnt++;
-                
+
                 dhsprintk((MYIOC_s_INFO_FMT "HandShake reply count=%d%s\n",
                                 ioc->name, t, failcnt ? " - MISSING DOORBELL REPLY!" : ""));
 
@@ -3747,7 +3760,7 @@ WaitForDoorbellReply(MPT_ADAPTER *ioc, int howlong, int sleepFlag)
         }
 
         dhsprintk((MYIOC_s_INFO_FMT "WaitCnt=%d First handshake reply word=%08x%s\n",
-                        ioc->name, t, le32_to_cpu(*(u32 *)hs_reply), 
+                        ioc->name, t, le32_to_cpu(*(u32 *)hs_reply),
                         failcnt ? " - MISSING DOORBELL HANDSHAKE!" : ""));
 
         /*
@@ -3819,7 +3832,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc)
         hdr.PageLength = 0;
         hdr.PageNumber = 0;
         hdr.PageType = MPI_CONFIG_PAGETYPE_LAN;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -3863,7 +3876,7 @@ GetLanConfigPages(MPT_ADAPTER *ioc)
         hdr.PageLength = 0;
         hdr.PageNumber = 1;
         hdr.PageType = MPI_CONFIG_PAGETYPE_LAN;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -3930,7 +3943,7 @@ GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)
         hdr.PageLength = 0;
         hdr.PageNumber = 0;
         hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -4012,7 +4025,7 @@ GetIoUnitPage2(MPT_ADAPTER *ioc)
         hdr.PageLength = 0;
         hdr.PageNumber = 2;
         hdr.PageType = MPI_CONFIG_PAGETYPE_IO_UNIT;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
@@ -4102,7 +4115,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
         header.PageLength = 0;
         header.PageNumber = 0;
         header.PageType = MPI_CONFIG_PAGETYPE_SCSI_PORT;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = portnum;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4122,6 +4135,8 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                 ioc->spi_data.minSyncFactor = MPT_ASYNC;
                                 ioc->spi_data.busType = MPT_HOST_BUS_UNKNOWN;
                                 rc = 1;
+                                ddvprintk((MYIOC_s_INFO_FMT "Unable to read PortPage0 minSyncFactor=%x\n",
+                                        ioc->name, ioc->spi_data.minSyncFactor));
                         } else {
                                 /* Save the Port Page 0 data
                                  */
@@ -4131,7 +4146,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
 
                                 if ( (pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_QAS) == 0 ) {
                                         ioc->spi_data.noQas |= MPT_TARGET_NO_NEGO_QAS;
-                                        dinitprintk((KERN_INFO MYNAM " :%s noQas due to Capabilities=%x\n",
+                                        ddvprintk((KERN_INFO MYNAM " :%s noQas due to Capabilities=%x\n",
                                                 ioc->name, pPP0->Capabilities));
                                 }
                                 ioc->spi_data.maxBusWidth = pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_WIDE ? 1 : 0;
@@ -4140,6 +4155,8 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                         ioc->spi_data.maxSyncOffset = (u8) (data >> 16);
                                         data = pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK;
                                         ioc->spi_data.minSyncFactor = (u8) (data >> 8);
+                                        ddvprintk((MYIOC_s_INFO_FMT "PortPage0 minSyncFactor=%x\n",
+                                                ioc->name, ioc->spi_data.minSyncFactor));
                                 } else {
                                         ioc->spi_data.maxSyncOffset = 0;
                                         ioc->spi_data.minSyncFactor = MPT_ASYNC;
@@ -4152,8 +4169,11 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                 if ((ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_HVD) ||
                                         (ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_SE))  {
 
-                                if (ioc->spi_data.minSyncFactor < MPT_ULTRA)
+                                        if (ioc->spi_data.minSyncFactor < MPT_ULTRA) {
                                                 ioc->spi_data.minSyncFactor = MPT_ULTRA;
+                                                ddvprintk((MYIOC_s_INFO_FMT "HVD or SE detected, minSyncFactor=%x\n",
+                                                        ioc->name, ioc->spi_data.minSyncFactor));
+                                        }
                                 }
                         }
                         if (pbuf) {
@@ -4168,7 +4188,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
         header.PageLength = 0;
         header.PageNumber = 2;
         header.PageType = MPI_CONFIG_PAGETYPE_SCSI_PORT;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = portnum;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4236,7 +4256,7 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum)
         header.PageLength = 0;
         header.PageNumber = 1;
         header.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = portnum;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4245,8 +4265,8 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum)
         if (mpt_config(ioc, &cfg) != 0)
                  return -EFAULT;
 
-        ioc->spi_data.sdp1version = cfg.hdr->PageVersion;
-        ioc->spi_data.sdp1length = cfg.hdr->PageLength;
+        ioc->spi_data.sdp1version = cfg.cfghdr.hdr->PageVersion;
+        ioc->spi_data.sdp1length = cfg.cfghdr.hdr->PageLength;
 
         header.PageVersion = 0;
         header.PageLength = 0;
@@ -4255,8 +4275,8 @@ mpt_readScsiDevicePageHeaders(MPT_ADAPTER *ioc, int portnum)
         if (mpt_config(ioc, &cfg) != 0)
                  return -EFAULT;
 
-        ioc->spi_data.sdp0version = cfg.hdr->PageVersion;
-        ioc->spi_data.sdp0length = cfg.hdr->PageLength;
+        ioc->spi_data.sdp0version = cfg.cfghdr.hdr->PageVersion;
+        ioc->spi_data.sdp0length = cfg.cfghdr.hdr->PageLength;
 
         dcprintk((MYIOC_s_INFO_FMT "Headers: 0: version %d length %d\n",
                         ioc->name, ioc->spi_data.sdp0version, ioc->spi_data.sdp0length));
@@ -4298,7 +4318,7 @@ mpt_findImVolumes(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 2;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4394,7 +4414,7 @@ mpt_read_ioc_pg_3(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 3;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4446,7 +4466,7 @@ mpt_read_ioc_pg_4(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 4;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4498,7 +4518,7 @@ mpt_read_ioc_pg_1(MPT_ADAPTER *ioc)
         header.PageLength = 0;
         header.PageNumber = 1;
         header.PageType = MPI_CONFIG_PAGETYPE_IOC;
-        cfg.hdr = &header;
+        cfg.cfghdr.hdr = &header;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -4580,13 +4600,13 @@ SendEventNotification(MPT_ADAPTER *ioc, u8 EvSwitch)
 
         evnp = (EventNotification_t *) mpt_get_msg_frame(mpt_base_index, ioc);
         if (evnp == NULL) {
-                dprintk((MYIOC_s_WARN_FMT "Unable to allocate event request frame!\n",
+                devtprintk((MYIOC_s_WARN_FMT "Unable to allocate event request frame!\n",
                                 ioc->name));
                 return 0;
         }
         memset(evnp, 0, sizeof(*evnp));
 
-        dprintk((MYIOC_s_INFO_FMT "Sending EventNotification(%d)\n", ioc->name, EvSwitch));
+        devtprintk((MYIOC_s_INFO_FMT "Sending EventNotification (%d) request %p\n", ioc->name, EvSwitch, evnp));
 
         evnp->Function = MPI_FUNCTION_EVENT_NOTIFICATION;
         evnp->ChainOffset = 0;
@@ -4610,8 +4630,10 @@ SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t *evnp)
         EventAck_t      *pAck;
 
         if ((pAck = (EventAck_t *) mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {
-                printk(MYIOC_s_WARN_FMT "Unable to allocate event ACK request frame!\n",
-                                ioc->name);
+                printk(MYIOC_s_WARN_FMT "Unable to allocate event ACK "
+                        "request frame for Event=%x EventContext=%x EventData=%x!\n",
+                        ioc->name, evnp->Event, le32_to_cpu(evnp->EventContext),
+                        le32_to_cpu(evnp->Data[0]));
                 return -1;
         }
         memset(pAck, 0, sizeof(*pAck));
@@ -4647,10 +4669,11 @@ int
 mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
 {
         Config_t        *pReq;
+        ConfigExtendedPageHeader_t  *pExtHdr = NULL;
         MPT_FRAME_HDR   *mf;
         unsigned long    flags;
         int              ii, rc;
-        u32              flagsLength;
+        int              flagsLength;
         int              in_isr;
 
         /*      Prevent calling wait_event() (below), if caller happens
@@ -4675,16 +4698,30 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         pReq->Reserved = 0;
         pReq->ChainOffset = 0;
         pReq->Function = MPI_FUNCTION_CONFIG;
+
+        /* Assume page type is not extended and clear "reserved" fields. */
         pReq->ExtPageLength = 0;
         pReq->ExtPageType = 0;
         pReq->MsgFlags = 0;
+
         for (ii=0; ii < 8; ii++)
                 pReq->Reserved2[ii] = 0;
 
-        pReq->Header.PageVersion = pCfg->hdr->PageVersion;
-        pReq->Header.PageLength = pCfg->hdr->PageLength;
-        pReq->Header.PageNumber = pCfg->hdr->PageNumber;
-        pReq->Header.PageType = (pCfg->hdr->PageType & MPI_CONFIG_PAGETYPE_MASK);
+        pReq->Header.PageVersion = pCfg->cfghdr.hdr->PageVersion;
+        pReq->Header.PageLength = pCfg->cfghdr.hdr->PageLength;
+        pReq->Header.PageNumber = pCfg->cfghdr.hdr->PageNumber;
+        pReq->Header.PageType = (pCfg->cfghdr.hdr->PageType & MPI_CONFIG_PAGETYPE_MASK);
+
+        if ((pCfg->cfghdr.hdr->PageType & MPI_CONFIG_PAGETYPE_MASK) == MPI_CONFIG_PAGETYPE_EXTENDED) {
+                pExtHdr = (ConfigExtendedPageHeader_t *)pCfg->cfghdr.ehdr;
+                pReq->ExtPageLength = cpu_to_le16(pExtHdr->ExtPageLength);
+                pReq->ExtPageType = pExtHdr->ExtPageType;
+                pReq->Header.PageType = MPI_CONFIG_PAGETYPE_EXTENDED;
+
+                /* Page Length must be treated as a reserved field for the extended header. */
+                pReq->Header.PageLength = 0;
+        }
+
         pReq->PageAddress = cpu_to_le32(pCfg->pageAddr);
 
         /* Add a SGE to the config request.
@@ -4694,12 +4731,20 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         else
                 flagsLength = MPT_SGE_FLAGS_SSIMPLE_READ;
 
-        flagsLength |= pCfg->hdr->PageLength * 4;
+        if ((pCfg->cfghdr.hdr->PageType & MPI_CONFIG_PAGETYPE_MASK) == MPI_CONFIG_PAGETYPE_EXTENDED) {
+                flagsLength |= pExtHdr->ExtPageLength * 4;
 
-        mpt_add_sge((char *)&pReq->PageBufferSGE, flagsLength, pCfg->physAddr);
+                dcprintk((MYIOC_s_INFO_FMT "Sending Config request type %d, page %d and action %d\n",
+                        ioc->name, pReq->ExtPageType, pReq->Header.PageNumber, pReq->Action));
+        }
+        else {
+                flagsLength |= pCfg->cfghdr.hdr->PageLength * 4;
+
+                dcprintk((MYIOC_s_INFO_FMT "Sending Config request type %d, page %d and action %d\n",
+                        ioc->name, pReq->Header.PageType, pReq->Header.PageNumber, pReq->Action));
+        }
 
-        dcprintk((MYIOC_s_INFO_FMT "Sending Config request type %d, page %d and action %d\n",
-                ioc->name, pReq->Header.PageType, pReq->Header.PageNumber, pReq->Action));
+        mpt_add_sge((char *)&pReq->PageBufferSGE, flagsLength, pCfg->physAddr);
 
         /* Append pCfg pointer to end of mf
          */
@@ -4789,8 +4834,8 @@ mpt_toolbox(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
         pReq->Reserved3 = 0;
         pReq->NumAddressBytes = 0x01;
         pReq->Reserved4 = 0;
-        pReq->DataLength = 0x04;
-        pdev = (struct pci_dev *) ioc->pcidev;
+        pReq->DataLength = cpu_to_le16(0x04);
+        pdev = ioc->pcidev;
         if (pdev->devfn & 1)
                 pReq->DeviceAddr = 0xB2;
         else
@@ -5504,6 +5549,8 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply
          *  If needed, send (a single) EventAck.
          */
         if (pEventReply->AckRequired == MPI_EVENT_NOTIFICATION_ACK_REQUIRED) {
+                devtprintk((MYIOC_s_WARN_FMT
+                        "EventAck required\n",ioc->name));
                 if ((ii = SendEventAck(ioc, pEventReply)) != 0) {
                         devtprintk((MYIOC_s_WARN_FMT "SendEventAck returned %d\n",
                                         ioc->name, ii));
@@ -5584,7 +5631,7 @@ mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info)
         case 0x00080000:
                 desc = "Outbound DMA Overrun";
                 break;
-        
+
         case 0x00090000:
                 desc = "Task Management";
                 break;
@@ -5600,7 +5647,7 @@ mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info)
         case 0x000C0000:
                 desc = "Untagged Table Size";
                 break;
-        
+
         }
 
         printk(MYIOC_s_INFO_FMT "LogInfo(0x%08x): F/W: %s\n", ioc->name, log_info, desc);
@@ -5692,7 +5739,7 @@ mpt_sp_ioc_info(MPT_ADAPTER *ioc, u32 ioc_status, MPT_FRAME_HDR *mf)
                 break;
 
         case MPI_IOCSTATUS_SCSI_DATA_UNDERRUN: /* 0x0045 */
-                /* This error is checked in scsi_io_done(). Skip. 
+                /* This error is checked in scsi_io_done(). Skip.
                 desc = "SCSI Data Underrun";
                 */
                 break;
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 848fb236b175..f4827d923731 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -915,7 +915,10 @@ struct scsi_cmnd;
 typedef struct _x_config_parms {
         struct list_head         linkage;       /* linked list */
         struct timer_list        timer;         /* timer function for this request  */
-        ConfigPageHeader_t      *hdr;
+        union {
+                ConfigExtendedPageHeader_t      *ehdr;
+                ConfigPageHeader_t      *hdr;
+        } cfghdr;
         dma_addr_t               physAddr;
         int                      wait_done;     /* wait for this request */
         u32                      pageAddr;      /* properly formatted */
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 05ea5944c487..7577c2417e2e 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -242,7 +242,7 @@ mptctl_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply)
                 /* Set the command status to GOOD if IOC Status is GOOD
                  * OR if SCSI I/O cmd and data underrun or recovered error.
                  */
-                iocStatus = reply->u.reply.IOCStatus & MPI_IOCSTATUS_MASK;
+                iocStatus = le16_to_cpu(reply->u.reply.IOCStatus) & MPI_IOCSTATUS_MASK;
                 if (iocStatus  == MPI_IOCSTATUS_SUCCESS)
                         ioc->ioctl->status |= MPT_IOCTL_STATUS_COMMAND_GOOD;
 
@@ -2324,7 +2324,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
         hdr.PageLength = 0;
         hdr.PageNumber = 0;
         hdr.PageType = MPI_CONFIG_PAGETYPE_MANUFACTURING;
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.physAddr = -1;
         cfg.pageAddr = 0;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
@@ -2333,7 +2333,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
 
         strncpy(karg.serial_number, " ", 24);
         if (mpt_config(ioc, &cfg) == 0) {
-                if (cfg.hdr->PageLength > 0) {
+                if (cfg.cfghdr.hdr->PageLength > 0) {
                         /* Issue the second config page request */
                         cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
 
@@ -2479,7 +2479,7 @@ mptctl_hp_targetinfo(unsigned long arg)
                 hdr.PageNumber = 0;
                 hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
 
-                cfg.hdr = &hdr;
+                cfg.cfghdr.hdr = &hdr;
                 cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
                 cfg.dir = 0;
                 cfg.timeout = 0;
@@ -2527,15 +2527,15 @@ mptctl_hp_targetinfo(unsigned long arg)
         hdr.PageNumber = 3;
         hdr.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
 
-        cfg.hdr = &hdr;
+        cfg.cfghdr.hdr = &hdr;
         cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
         cfg.dir = 0;
         cfg.timeout = 0;
         cfg.physAddr = -1;
-        if ((mpt_config(ioc, &cfg) == 0) && (cfg.hdr->PageLength > 0)) {
+        if ((mpt_config(ioc, &cfg) == 0) && (cfg.cfghdr.hdr->PageLength > 0)) {
                 /* Issue the second config page request */
                 cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
-                data_sz = (int) cfg.hdr->PageLength * 4;
+                data_sz = (int) cfg.cfghdr.hdr->PageLength * 4;
                 pg3_alloc = (SCSIDevicePage3_t *) pci_alloc_consistent(
                                                         ioc->pcidev, data_sz, &page_dma);
                 if (pg3_alloc) {
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index b9d4f78725b4..4a003dc5fde8 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -281,12 +281,12 @@ mptscsih_getFreeChainBuffer(MPT_ADAPTER *ioc, int *retIndex)
                 offset = (u8 *)chainBuf - (u8 *)ioc->ChainBuffer;
                 chain_idx = offset / ioc->req_sz;
                 rc = SUCCESS;
-                dsgprintk((MYIOC_s_INFO_FMT "getFreeChainBuffer (index %d), got buf=%p\n",
-                        ioc->name, *retIndex, chainBuf));
+                dsgprintk((MYIOC_s_ERR_FMT "getFreeChainBuffer chainBuf=%p ChainBuffer=%p offset=%d chain_idx=%d\n",
+                        ioc->name, chainBuf, ioc->ChainBuffer, offset, chain_idx));
         } else {
                 rc = FAILED;
                 chain_idx = MPT_HOST_NO_CHAIN;
-                dfailprintk((MYIOC_s_ERR_FMT "getFreeChainBuffer failed\n",
+                dfailprintk((MYIOC_s_INFO_FMT "getFreeChainBuffer failed\n",
                         ioc->name));
         }
         spin_unlock_irqrestore(&ioc->FreeQlock, flags);
@@ -432,7 +432,7 @@ nextSGEset:
                          */
                         pReq->ChainOffset = 0;
                         RequestNB = (((sgeOffset - 1) >> ioc->NBShiftFactor)  + 1) & 0x03;
-                        dsgprintk((MYIOC_s_ERR_FMT 
+                        dsgprintk((MYIOC_s_INFO_FMT
                             "Single Buffer RequestNB=%x, sgeOffset=%d\n", ioc->name, RequestNB, sgeOffset));
                         ioc->RequestNB[req_idx] = RequestNB;
                 }
@@ -491,11 +491,12 @@ nextSGEset:
                 /* NOTE: psge points to the beginning of the chain element
                  * in current buffer. Get a chain buffer.
                  */
-                dsgprintk((MYIOC_s_INFO_FMT 
-                    "calling getFreeChainBuffer SCSI cmd=%02x (%p)\n",
-                    ioc->name, pReq->CDB[0], SCpnt));
-                if ((mptscsih_getFreeChainBuffer(ioc, &newIndex)) == FAILED)
+                if ((mptscsih_getFreeChainBuffer(ioc, &newIndex)) == FAILED) {
+                        dfailprintk((MYIOC_s_INFO_FMT
+                            "getFreeChainBuffer FAILED SCSI cmd=%02x (%p)\n",
+                            ioc->name, pReq->CDB[0], SCpnt));
                         return FAILED;
+                }
 
                 /* Update the tracking arrays.
                  * If chainSge == NULL, update ReqToChain, else ChainToChain
@@ -577,14 +578,20 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                 return 1;
         }
 
-        dmfprintk((MYIOC_s_INFO_FMT
-                "ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d)\n",
-                ioc->name, mf, mr, sc, req_idx));
-
         sc->result = DID_OK << 16;              /* Set default reply as OK */
         pScsiReq = (SCSIIORequest_t *) mf;
         pScsiReply = (SCSIIOReply_t *) mr;
 
+        if((ioc->facts.MsgVersion >= MPI_VERSION_01_05) && pScsiReply){
+                dmfprintk((MYIOC_s_INFO_FMT
+                        "ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d,task-tag=%d)\n",
+                        ioc->name, mf, mr, sc, req_idx, pScsiReply->TaskTag));
+        }else{
+                dmfprintk((MYIOC_s_INFO_FMT
+                        "ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d)\n",
+                        ioc->name, mf, mr, sc, req_idx));
+        }
+
         if (pScsiReply == NULL) {
                 /* special context reply handling */
                 ;
@@ -658,8 +665,8 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                                 /* Sufficient data transfer occurred */
                                 sc->result = (DID_OK << 16) | scsi_status;
                         } else if ( xfer_cnt == 0 ) {
-                                /* A CRC Error causes this condition; retry */ 
-                                sc->result = (DRIVER_SENSE << 24) | (DID_OK << 16) | 
+                                /* A CRC Error causes this condition; retry */
+                                sc->result = (DRIVER_SENSE << 24) | (DID_OK << 16) |
                                         (CHECK_CONDITION << 1);
                                 sc->sense_buffer[0] = 0x70;
                                 sc->sense_buffer[2] = NO_SENSE;
@@ -668,7 +675,9 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                         } else {
                                 sc->result = DID_SOFT_ERROR << 16;
                         }
-                        dreplyprintk((KERN_NOTICE "RESIDUAL_MISMATCH: result=%x on id=%d\n", sc->result, sc->target));
+                        dreplyprintk((KERN_NOTICE
+                            "RESIDUAL_MISMATCH: result=%x on id=%d\n",
+                            sc->result, sc->device->id));
                         break;
 
                 case MPI_IOCSTATUS_SCSI_DATA_UNDERRUN:          /* 0x0045 */
@@ -796,7 +805,6 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
         return 1;
 }
 
-
 /*
  *      mptscsih_flush_running_cmds - For each command found, search
  *              Scsi_Host instance taskQ and reply to OS.
@@ -1017,7 +1025,7 @@ mptscsih_remove(struct pci_dev *pdev)
         scsi_host_put(host);
 
         mpt_detach(pdev);
-        
+
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1072,7 +1080,7 @@ mptscsih_resume(struct pci_dev *pdev)
         MPT_SCSI_HOST           *hd;
 
         mpt_resume(pdev);
-        
+
         if(!host)
                 return 0;
 
@@ -1214,8 +1222,8 @@ mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t off
         int size = 0;
 
         if (func) {
-                /* 
-                 * write is not supported 
+                /*
+                 * write is not supported
                  */
         } else {
                 if (start)
@@ -1535,17 +1543,17 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, in
          */
         if (mptscsih_tm_pending_wait(hd) == FAILED) {
                 if (type == MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK) {
-                        dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler abort: "
+                        dtmprintk((KERN_INFO MYNAM ": %s: TMHandler abort: "
                            "Timed out waiting for last TM (%d) to complete! \n",
                            hd->ioc->name, hd->tmPending));
                         return FAILED;
                 } else if (type == MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET) {
-                        dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler target reset: "
+                        dtmprintk((KERN_INFO MYNAM ": %s: TMHandler target reset: "
                            "Timed out waiting for last TM (%d) to complete! \n",
                            hd->ioc->name, hd->tmPending));
                         return FAILED;
                 } else if (type == MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS) {
-                        dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler bus reset: "
+                        dtmprintk((KERN_INFO MYNAM ": %s: TMHandler bus reset: "
                            "Timed out waiting for last TM (%d) to complete! \n",
                            hd->ioc->name, hd->tmPending));
                         if (hd->tmPending & (1 << MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS))
@@ -1631,8 +1639,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
         if ((mf = mpt_get_msg_frame(hd->ioc->TaskCtx, hd->ioc)) == NULL) {
                 dfailprintk((MYIOC_s_ERR_FMT "IssueTaskMgmt, no msg frames!!\n",
                                 hd->ioc->name));
-                //return FAILED;
-                return -999;
+                return FAILED;
         }
         dtmprintk((MYIOC_s_INFO_FMT "IssueTaskMgmt request @ %p\n",
                         hd->ioc->name, mf));
@@ -1661,9 +1668,8 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
 
         pScsiTm->TaskMsgContext = ctx2abort;
 
-        dtmprintk((MYIOC_s_INFO_FMT
-                "IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n",
-                hd->ioc->name, ctx2abort, type));
+        dtmprintk((MYIOC_s_INFO_FMT "IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n",
+                        hd->ioc->name, ctx2abort, type));
 
         DBG_DUMP_TM_REQUEST_FRAME((u32 *)pScsiTm);
 
@@ -1902,13 +1908,13 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
 
         /*  If we can't locate the host to reset, then we failed. */
         if ((hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata) == NULL){
-                dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: "
+                dtmprintk( ( KERN_INFO MYNAM ": mptscsih_host_reset: "
                              "Can't locate host! (sc=%p)\n",
                              SCpnt ) );
                 return FAILED;
         }
 
-        printk(KERN_WARNING MYNAM ": %s: >> Attempting host reset! (sc=%p)\n",
+        printk(KERN_WARNING MYNAM ": %s: Attempting host reset! (sc=%p)\n",
                hd->ioc->name, SCpnt);
 
         /*  If our attempts to reset the host failed, then return a failed
@@ -1924,7 +1930,7 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
                 hd->tmState = TM_STATE_NONE;
         }
 
-        dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: "
+        dtmprintk( ( KERN_INFO MYNAM ": mptscsih_host_reset: "
                      "Status = %s\n",
                      (status == SUCCESS) ? "SUCCESS" : "FAILED" ) );
 
@@ -1951,8 +1957,8 @@ mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd)
                 if (hd->tmState == TM_STATE_NONE) {
                         hd->tmState = TM_STATE_IN_PROGRESS;
                         hd->tmPending = 1;
-                        status = SUCCESS;
                         spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
+                        status = SUCCESS;
                         break;
                 }
                 spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
@@ -1980,7 +1986,7 @@ mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout )
                 spin_lock_irqsave(&hd->ioc->FreeQlock, flags);
                 if(hd->tmPending == 0) {
                         status = SUCCESS;
-                        spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
+                        spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
                         break;
                 }
                 spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
@@ -2318,10 +2324,10 @@ mptscsih_slave_configure(struct scsi_device *device)
         if (pTarget == NULL) {
                 /* Driver doesn't know about this device.
                  * Kernel may generate a "Dummy Lun 0" which
-                 * may become a real Lun if a 
+                 * may become a real Lun if a
                  * "scsi add-single-device" command is executed
-                 * while the driver is active (hot-plug a 
-                 * device).  LSI Raid controllers need 
+                 * while the driver is active (hot-plug a
+                 * device).  LSI Raid controllers need
                  * queue_depth set to DEV_HIGH for this reason.
                  */
                 scsi_adjust_queue_depth(device, MSG_SIMPLE_TAG,
@@ -2691,7 +2697,7 @@ mptscsih_initTarget(MPT_SCSI_HOST *hd, int bus_id, int target_id, u8 lun, char *
          * If the peripheral qualifier filter is enabled then if the target reports a 0x1
          * (i.e. The targer is capable of supporting the specified peripheral device type
          * on this logical unit; however, the physical device is not currently connected
-         * to this logical unit) it will be converted to a 0x3 (i.e. The target is not 
+         * to this logical unit) it will be converted to a 0x3 (i.e. The target is not
          * capable of supporting a physical device on this logical unit). This is to work
          * around a bug in th emid-layer in some distributions in which the mid-layer will
          * continue to try to communicate to the LUN and evntually create a dummy LUN.
@@ -3194,8 +3200,8 @@ mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target_id, int flags)
                 /* Get a MF for this command.
                  */
                 if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {
-                        dprintk((MYIOC_s_WARN_FMT "write SDP1: no msg frames!\n",
-                                                ioc->name));
+                        dfailprintk((MYIOC_s_WARN_FMT "write SDP1: no msg frames!\n",
+                                ioc->name));
                         return -EAGAIN;
                 }
 
@@ -3289,7 +3295,7 @@ mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus)
         /* Get a MF for this command.
          */
         if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {
-                dprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",
+                dfailprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",
                                         ioc->name));
                 return -EAGAIN;
         }
@@ -3447,7 +3453,7 @@ mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                                  * some type of error occurred.
                                  */
                                 MpiRaidActionReply_t    *pr = (MpiRaidActionReply_t *)mr;
-                                if (pr->ActionStatus == MPI_RAID_ACTION_ASTATUS_SUCCESS)
+                                if (le16_to_cpu(pr->ActionStatus) == MPI_RAID_ACTION_ASTATUS_SUCCESS)
                                         completionCode = MPT_SCANDV_GOOD;
                                 else
                                         completionCode = MPT_SCANDV_SOME_ERROR;
@@ -3955,7 +3961,7 @@ mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, int portnum)
                                 header1.PageLength = ioc->spi_data.sdp1length;
                                 header1.PageNumber = 1;
                                 header1.PageType = MPI_CONFIG_PAGETYPE_SCSI_DEVICE;
-                                cfg.hdr = &header1;
+                                cfg.cfghdr.hdr = &header1;
                                 cfg.physAddr = cfg1_dma_addr;
                                 cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
                                 cfg.dir = 1;
@@ -3996,9 +4002,9 @@ mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, int portnum)
                         dnegoprintk(("syncronize cache: id=%d width=0 factor=MPT_ASYNC "
                                 "offset=0 negoFlags=%x request=%x config=%x\n",
                                 id, flags, requested, configuration));
-                        pcfg1Data->RequestedParameters = le32_to_cpu(requested);
+                        pcfg1Data->RequestedParameters = cpu_to_le32(requested);
                         pcfg1Data->Reserved = 0;
-                        pcfg1Data->Configuration = le32_to_cpu(configuration);
+                        pcfg1Data->Configuration = cpu_to_le32(configuration);
                         cfg.pageAddr = (bus<<8) | id;
                         mpt_config(hd->ioc, &cfg);
                 }
@@ -4353,7 +4359,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
         /* Prep cfg structure
          */
         cfg.pageAddr = (bus<<8) | id;
-        cfg.hdr = NULL;
+        cfg.cfghdr.hdr = NULL;
 
         /* Prep SDP0 header
          */
@@ -4399,7 +4405,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
         pcfg1Data = (SCSIDevicePage1_t *) (pDvBuf + sz);
         cfg1_dma_addr = dvbuf_dma + sz;
 
-        /* Skip this ID? Set cfg.hdr to force config page write
+        /* Skip this ID? Set cfg.cfghdr.hdr to force config page write
          */
         {
                 ScsiCfgData *pspi_data = &hd->ioc->spi_data;
@@ -4417,7 +4423,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
 
                                 dv.cmd = MPT_SET_MAX;
                                 mptscsih_dv_parms(hd, &dv, (void *)pcfg1Data);
-                                cfg.hdr = &header1;
+                                cfg.cfghdr.hdr = &header1;
 
                                 /* Save the final negotiated settings to
                                  * SCSI device page 1.
@@ -4483,7 +4489,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                 dv.cmd = MPT_SET_MIN;
                 mptscsih_dv_parms(hd, &dv, (void *)pcfg1Data);
 
-                cfg.hdr = &header1;
+                cfg.cfghdr.hdr = &header1;
                 cfg.physAddr = cfg1_dma_addr;
                 cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
                 cfg.dir = 1;
@@ -4596,8 +4602,8 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                                 if ((pbuf1[56] & 0x02) == 0) {
                                         pTarget->negoFlags |= MPT_TARGET_NO_NEGO_QAS;
                                         hd->ioc->spi_data.noQas = MPT_TARGET_NO_NEGO_QAS;
-                                        ddvprintk((MYIOC_s_NOTE_FMT 
-                                            "DV: Start Basic noQas on id=%d due to pbuf1[56]=%x\n", 
+                                        ddvprintk((MYIOC_s_NOTE_FMT
+                                            "DV: Start Basic noQas on id=%d due to pbuf1[56]=%x\n",
                                             ioc->name, id, pbuf1[56]));
                                 }
                         }
@@ -4637,7 +4643,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                                         u32 sdp0_info;
                                         u32 sdp0_nego;
 
-                                        cfg.hdr = &header0;
+                                        cfg.cfghdr.hdr = &header0;
                                         cfg.physAddr = cfg0_dma_addr;
                                         cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
                                         cfg.dir = 0;
@@ -4673,7 +4679,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
                                                 if (!firstPass)
                                                         doFallback = 1;
                                         } else {
-                                                ddvprintk((MYIOC_s_NOTE_FMT 
+                                                ddvprintk((MYIOC_s_NOTE_FMT
                                                     "DV:Inquiry compared id=%d, calling initTarget\n", ioc->name, id));
                                                 hd->ioc->spi_data.dvStatus[id] &= ~MPT_SCSICFG_DV_NOT_DONE;
                                                 mptscsih_initTarget(hd,
@@ -4689,8 +4695,8 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
 
                         } else if (rc == MPT_SCANDV_ISSUE_SENSE)
                                 doFallback = 1; /* set fallback flag */
-                        else if ((rc == MPT_SCANDV_DID_RESET) || 
-                                 (rc == MPT_SCANDV_SENSE) || 
+                        else if ((rc == MPT_SCANDV_DID_RESET) ||
+                                 (rc == MPT_SCANDV_SENSE) ||
                                  (rc == MPT_SCANDV_FALLBACK))
                                 doFallback = 1; /* set fallback flag */
                         else
@@ -4722,7 +4728,7 @@ mptscsih_doDv(MPT_SCSI_HOST *hd, int bus_number, int id)
          * 4) release
          * 5) update nego parms to target struct
          */
-        cfg.hdr = &header1;
+        cfg.cfghdr.hdr = &header1;
         cfg.physAddr = cfg1_dma_addr;
         cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
         cfg.dir = 1;
@@ -5121,12 +5127,12 @@ target_done:
 
         /* Set if cfg1_dma_addr contents is valid
          */
-        if ((cfg.hdr != NULL) && (retcode == 0)){
+        if ((cfg.cfghdr.hdr != NULL) && (retcode == 0)){
                 /* If disk, not U320, disable QAS
                  */
                 if ((inq0 == 0) && (dv.now.factor > MPT_ULTRA320)) {
                         hd->ioc->spi_data.noQas = MPT_TARGET_NO_NEGO_QAS;
-                        ddvprintk((MYIOC_s_NOTE_FMT 
+                        ddvprintk((MYIOC_s_NOTE_FMT
                             "noQas set due to id=%d has factor=%x\n", ioc->name, id, dv.now.factor));
                 }
 
@@ -5137,7 +5143,7 @@ target_done:
                  * skip save of the final negotiated settings to
                  * SCSI device page 1.
                  *
-                cfg.hdr = &header1;
+                cfg.cfghdr.hdr = &header1;
                 cfg.physAddr = cfg1_dma_addr;
                 cfg.action = MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT;
                 cfg.dir = 1;
@@ -5248,7 +5254,7 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                 /* Update tmax values with those from Device Page 0.*/
                 pPage0 = (SCSIDevicePage0_t *) pPage;
                 if (pPage0) {
-                        val = cpu_to_le32(pPage0->NegotiatedParameters);
+                        val = le32_to_cpu(pPage0->NegotiatedParameters);
                         dv->max.width = val & MPI_SCSIDEVPAGE0_NP_WIDE ? 1 : 0;
                         dv->max.offset = (val&MPI_SCSIDEVPAGE0_NP_NEG_SYNC_OFFSET_MASK) >> 16;
                         dv->max.factor = (val&MPI_SCSIDEVPAGE0_NP_NEG_SYNC_PERIOD_MASK) >> 8;
@@ -5276,12 +5282,12 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                                 dv->now.offset, &val, &configuration, dv->now.flags);
                         dnegoprintk(("Setting Max: id=%d width=%d factor=%x offset=%x negoFlags=%x request=%x config=%x\n",
                                 id, dv->now.width, dv->now.factor, dv->now.offset, dv->now.flags, val, configuration));
-                        pPage1->RequestedParameters = le32_to_cpu(val);
+                        pPage1->RequestedParameters = cpu_to_le32(val);
                         pPage1->Reserved = 0;
-                        pPage1->Configuration = le32_to_cpu(configuration);
+                        pPage1->Configuration = cpu_to_le32(configuration);
                 }
 
-                ddvprintk(("id=%d width=%d factor=%x offset=%x flags=%x request=%x configuration=%x\n",
+                ddvprintk(("id=%d width=%d factor=%x offset=%x negoFlags=%x request=%x configuration=%x\n",
                                 id, dv->now.width, dv->now.factor, dv->now.offset, dv->now.flags, val, configuration));
                 break;
 
@@ -5301,9 +5307,9 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                                 offset, &val, &configuration, negoFlags);
                         dnegoprintk(("Setting Min: id=%d width=%d factor=%x offset=%x negoFlags=%x request=%x config=%x\n",
                                 id, width, factor, offset, negoFlags, val, configuration));
-                        pPage1->RequestedParameters = le32_to_cpu(val);
+                        pPage1->RequestedParameters = cpu_to_le32(val);
                         pPage1->Reserved = 0;
-                        pPage1->Configuration = le32_to_cpu(configuration);
+                        pPage1->Configuration = cpu_to_le32(configuration);
                 }
                 ddvprintk(("id=%d width=%d factor=%x offset=%x request=%x config=%x negoFlags=%x\n",
                                 id, width, factor, offset, val, configuration, negoFlags));
@@ -5377,12 +5383,12 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVPARAMETERS *dv,void *pPage)
                 if (pPage1) {
                         mptscsih_setDevicePage1Flags (width, factor, offset, &val,
                                                 &configuration, dv->now.flags);
-                        dnegoprintk(("Finish: id=%d width=%d offset=%d factor=%x flags=%x request=%x config=%x\n",
+                        dnegoprintk(("Finish: id=%d width=%d offset=%d factor=%x negoFlags=%x request=%x config=%x\n",
                              id, width, offset, factor, dv->now.flags, val, configuration));
 
-                        pPage1->RequestedParameters = le32_to_cpu(val);
+                        pPage1->RequestedParameters = cpu_to_le32(val);
                         pPage1->Reserved = 0;
-                        pPage1->Configuration = le32_to_cpu(configuration);
+                        pPage1->Configuration = cpu_to_le32(configuration);
                 }
 
                 ddvprintk(("Finish: id=%d offset=%d factor=%x width=%d request=%x config=%x\n",
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index dfa8806b1e13..587d1274fd74 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -162,15 +162,15 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         u8                      *mem;
         int                     error=0;
         int                     r;
-        
+
         if ((r = mpt_attach(pdev,id)) != 0)
                 return r;
-        
+
         ioc = pci_get_drvdata(pdev);
         ioc->DoneCtx = mptspiDoneCtx;
         ioc->TaskCtx = mptspiTaskCtx;
         ioc->InternalCtx = mptspiInternalCtx;
-        
+
         /*  Added sanity check on readiness of the MPT adapter.
          */
         if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c
index 914804512dba..7e98434cfa37 100644
--- a/drivers/misc/ibmasm/uart.c
+++ b/drivers/misc/ibmasm/uart.c
@@ -25,15 +25,15 @@
 #include <linux/termios.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
-#include <linux/serial.h>
 #include <linux/serial_reg.h>
+#include <linux/serial_8250.h>
 #include "ibmasm.h"
 #include "lowlevel.h"
 
 
 void ibmasm_register_uart(struct service_processor *sp)
 {
-        struct serial_struct serial;
+        struct uart_port uport;
         void __iomem *iomem_base;
 
         iomem_base = sp->base_address + SCOUT_COM_B_BASE;
@@ -47,14 +47,14 @@ void ibmasm_register_uart(struct service_processor *sp)
                 return;
         }
 
-        memset(&serial, 0, sizeof(serial));
-        serial.irq              = sp->irq;
-        serial.baud_base        = 3686400 / 16;
-        serial.flags            = UPF_AUTOPROBE | UPF_SHARE_IRQ;
-        serial.io_type          = UPIO_MEM;
-        serial.iomem_base       = iomem_base;
+        memset(&uport, 0, sizeof(struct uart_port));
+        uport.irq       = sp->irq;
+        uport.uartclk   = 3686400;
+        uport.flags     = UPF_AUTOPROBE | UPF_SHARE_IRQ;
+        uport.iotype    = UPIO_MEM;
+        uport.membase   = iomem_base;
 
-        sp->serial_line = register_serial(&serial);
+        sp->serial_line = serial8250_register_port(&uport);
         if (sp->serial_line < 0) {
                 dev_err(sp->dev, "Failed to register serial port\n");
                 return;
@@ -68,5 +68,5 @@ void ibmasm_unregister_uart(struct service_processor *sp)
                 return;
 
         disable_uart_interrupts(sp->base_address);
-        unregister_serial(sp->serial_line);
+        serial8250_unregister_port(sp->serial_line);
 }
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 3c5904834fe8..0a117c61cd18 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2,6 +2,8 @@
  *  linux/drivers/mmc/mmc.c
  *
  *  Copyright (C) 2003-2004 Russell King, All Rights Reserved.
+ *  SD support Copyright (C) 2004 Ian Molton, All Rights Reserved.
+ *  SD support Copyright (C) 2005 Pierre Ossman, All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,6 +18,8 @@
 #include <linux/delay.h>
 #include <linux/pagemap.h>
 #include <linux/err.h>
+#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
@@ -172,7 +176,81 @@ int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries
 
 EXPORT_SYMBOL(mmc_wait_for_cmd);
 
+/**
+ *      mmc_wait_for_app_cmd - start an application command and wait for
+                               completion
+ *      @host: MMC host to start command
+ *      @rca: RCA to send MMC_APP_CMD to
+ *      @cmd: MMC command to start
+ *      @retries: maximum number of retries
+ *
+ *      Sends a MMC_APP_CMD, checks the card response, sends the command
+ *      in the parameter and waits for it to complete. Return any error
+ *      that occurred while the command was executing.  Do not attempt to
+ *      parse the response.
+ */
+int mmc_wait_for_app_cmd(struct mmc_host *host, unsigned int rca,
+        struct mmc_command *cmd, int retries)
+{
+        struct mmc_request mrq;
+        struct mmc_command appcmd;
+
+        int i, err;
+
+        BUG_ON(host->card_busy == NULL);
+        BUG_ON(retries < 0);
+
+        err = MMC_ERR_INVALID;
+
+        /*
+         * We have to resend MMC_APP_CMD for each attempt so
+         * we cannot use the retries field in mmc_command.
+         */
+        for (i = 0;i <= retries;i++) {
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                appcmd.opcode = MMC_APP_CMD;
+                appcmd.arg = rca << 16;
+                appcmd.flags = MMC_RSP_R1;
+                appcmd.retries = 0;
+                memset(appcmd.resp, 0, sizeof(appcmd.resp));
+                appcmd.data = NULL;
+
+                mrq.cmd = &appcmd;
+                appcmd.data = NULL;
+
+                mmc_wait_for_req(host, &mrq);
+
+                if (appcmd.error) {
+                        err = appcmd.error;
+                        continue;
+                }
+
+                /* Check that card supported application commands */
+                if (!(appcmd.resp[0] & R1_APP_CMD))
+                        return MMC_ERR_FAILED;
+
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                memset(cmd->resp, 0, sizeof(cmd->resp));
+                cmd->retries = 0;
+
+                mrq.cmd = cmd;
+                cmd->data = NULL;
+
+                mmc_wait_for_req(host, &mrq);
 
+                err = cmd->error;
+                if (cmd->error == MMC_ERR_NONE)
+                        break;
+        }
+
+        return err;
+}
+
+EXPORT_SYMBOL(mmc_wait_for_app_cmd);
+
+static int mmc_select_card(struct mmc_host *host, struct mmc_card *card);
 
 /**
  *      __mmc_claim_host - exclusively claim a host
@@ -206,16 +284,10 @@ int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card)
         spin_unlock_irqrestore(&host->lock, flags);
         remove_wait_queue(&host->wq, &wait);
 
-        if (card != (void *)-1 && host->card_selected != card) {
-                struct mmc_command cmd;
-
-                host->card_selected = card;
-
-                cmd.opcode = MMC_SELECT_CARD;
-                cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1;
-
-                err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+        if (card != (void *)-1) {
+                err = mmc_select_card(host, card);
+                if (err != MMC_ERR_NONE)
+                        return err;
         }
 
         return err;
@@ -245,6 +317,63 @@ void mmc_release_host(struct mmc_host *host)
 
 EXPORT_SYMBOL(mmc_release_host);
 
+static int mmc_select_card(struct mmc_host *host, struct mmc_card *card)
+{
+        int err;
+        struct mmc_command cmd;
+
+        BUG_ON(host->card_busy == NULL);
+
+        if (host->card_selected == card)
+                return MMC_ERR_NONE;
+
+        host->card_selected = card;
+
+        cmd.opcode = MMC_SELECT_CARD;
+        cmd.arg = card->rca << 16;
+        cmd.flags = MMC_RSP_R1;
+
+        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+        if (err != MMC_ERR_NONE)
+                return err;
+
+        /*
+         * Default bus width is 1 bit.
+         */
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
+
+        /*
+         * We can only change the bus width of the selected
+         * card so therefore we have to put the handling
+         * here.
+         */
+        if (host->caps & MMC_CAP_4_BIT_DATA) {
+                /*
+                 * The card is in 1 bit mode by default so
+                 * we only need to change if it supports the
+                 * wider version.
+                 */
+                if (mmc_card_sd(card) &&
+                        (card->scr.bus_widths & SD_SCR_BUS_WIDTH_4)) {
+                        struct mmc_command cmd;
+                        cmd.opcode = SD_APP_SET_BUS_WIDTH;
+                        cmd.arg = SD_BUS_WIDTH_4;
+                        cmd.flags = MMC_RSP_R1;
+
+                        err = mmc_wait_for_app_cmd(host, card->rca, &cmd,
+                                CMD_RETRIES);
+                        if (err != MMC_ERR_NONE)
+                                return err;
+
+                        host->ios.bus_width = MMC_BUS_WIDTH_4;
+                }
+        }
+
+        host->ops->set_ios(host, &host->ios);
+
+        return MMC_ERR_NONE;
+}
+
 /*
  * Ensure that no card is selected.
  */
@@ -322,48 +451,69 @@ static void mmc_decode_cid(struct mmc_card *card)
 
         memset(&card->cid, 0, sizeof(struct mmc_cid));
 
-        /*
-         * The selection of the format here is guesswork based upon
-         * information people have sent to date.
-         */
-        switch (card->csd.mmca_vsn) {
-        case 0: /* MMC v1.? */
-        case 1: /* MMC v1.4 */
-                card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
-                card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
-                card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
-                card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
-                card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
-                card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                break;
-
-        case 2: /* MMC v2.x ? */
-        case 3: /* MMC v3.x ? */
-                card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
-                card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
-                card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
-                card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
-                card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
-                card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
-                card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
-                card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
-                card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
-                card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
-                card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
-                break;
-
-        default:
-                printk("%s: card has unknown MMCA version %d\n",
-                        mmc_hostname(card->host), card->csd.mmca_vsn);
-                mmc_card_set_bad(card);
-                break;
+        if (mmc_card_sd(card)) {
+                /*
+                 * SD doesn't currently have a version field so we will
+                 * have to assume we can parse this.
+                 */
+                card->cid.manfid                = UNSTUFF_BITS(resp, 120, 8);
+                card->cid.oemid                 = UNSTUFF_BITS(resp, 104, 16);
+                card->cid.prod_name[0]          = UNSTUFF_BITS(resp, 96, 8);
+                card->cid.prod_name[1]          = UNSTUFF_BITS(resp, 88, 8);
+                card->cid.prod_name[2]          = UNSTUFF_BITS(resp, 80, 8);
+                card->cid.prod_name[3]          = UNSTUFF_BITS(resp, 72, 8);
+                card->cid.prod_name[4]          = UNSTUFF_BITS(resp, 64, 8);
+                card->cid.hwrev                 = UNSTUFF_BITS(resp, 60, 4);
+                card->cid.fwrev                 = UNSTUFF_BITS(resp, 56, 4);
+                card->cid.serial                = UNSTUFF_BITS(resp, 24, 32);
+                card->cid.year                  = UNSTUFF_BITS(resp, 12, 8);
+                card->cid.month                 = UNSTUFF_BITS(resp, 8, 4);
+
+                card->cid.year += 2000; /* SD cards year offset */
+        } else {
+                /*
+                 * The selection of the format here is based upon published
+                 * specs from sandisk and from what people have reported.
+                 */
+                switch (card->csd.mmca_vsn) {
+                case 0: /* MMC v1.0 - v1.2 */
+                case 1: /* MMC v1.4 */
+                        card->cid.manfid        = UNSTUFF_BITS(resp, 104, 24);
+                        card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                        card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                        card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                        card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                        card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                        card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                        card->cid.prod_name[6]  = UNSTUFF_BITS(resp, 48, 8);
+                        card->cid.hwrev         = UNSTUFF_BITS(resp, 44, 4);
+                        card->cid.fwrev         = UNSTUFF_BITS(resp, 40, 4);
+                        card->cid.serial        = UNSTUFF_BITS(resp, 16, 24);
+                        card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                        card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                        break;
+
+                case 2: /* MMC v2.0 - v2.2 */
+                case 3: /* MMC v3.1 - v3.3 */
+                        card->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
+                        card->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
+                        card->cid.prod_name[0]  = UNSTUFF_BITS(resp, 96, 8);
+                        card->cid.prod_name[1]  = UNSTUFF_BITS(resp, 88, 8);
+                        card->cid.prod_name[2]  = UNSTUFF_BITS(resp, 80, 8);
+                        card->cid.prod_name[3]  = UNSTUFF_BITS(resp, 72, 8);
+                        card->cid.prod_name[4]  = UNSTUFF_BITS(resp, 64, 8);
+                        card->cid.prod_name[5]  = UNSTUFF_BITS(resp, 56, 8);
+                        card->cid.serial        = UNSTUFF_BITS(resp, 16, 32);
+                        card->cid.month         = UNSTUFF_BITS(resp, 12, 4);
+                        card->cid.year          = UNSTUFF_BITS(resp, 8, 4) + 1997;
+                        break;
+
+                default:
+                        printk("%s: card has unknown MMCA version %d\n",
+                                mmc_hostname(card->host), card->csd.mmca_vsn);
+                        mmc_card_set_bad(card);
+                        break;
+                }
         }
 }
 
@@ -376,34 +526,86 @@ static void mmc_decode_csd(struct mmc_card *card)
         unsigned int e, m, csd_struct;
         u32 *resp = card->raw_csd;
 
-        /*
-         * We only understand CSD structure v1.1 and v2.
-         * v2 has extra information in bits 15, 11 and 10.
-         */
-        csd_struct = UNSTUFF_BITS(resp, 126, 2);
-        if (csd_struct != 1 && csd_struct != 2) {
-                printk("%s: unrecognised CSD structure version %d\n",
-                        mmc_hostname(card->host), csd_struct);
-                mmc_card_set_bad(card);
-                return;
+        if (mmc_card_sd(card)) {
+                csd_struct = UNSTUFF_BITS(resp, 126, 2);
+                if (csd_struct != 0) {
+                        printk("%s: unrecognised CSD structure version %d\n",
+                                mmc_hostname(card->host), csd_struct);
+                        mmc_card_set_bad(card);
+                        return;
+                }
+
+                m = UNSTUFF_BITS(resp, 115, 4);
+                e = UNSTUFF_BITS(resp, 112, 3);
+                csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+                csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+                m = UNSTUFF_BITS(resp, 99, 4);
+                e = UNSTUFF_BITS(resp, 96, 3);
+                csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                e = UNSTUFF_BITS(resp, 47, 3);
+                m = UNSTUFF_BITS(resp, 62, 12);
+                csd->capacity     = (1 + m) << (e + 2);
+
+                csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+        } else {
+                /*
+                 * We only understand CSD structure v1.1 and v1.2.
+                 * v1.2 has extra information in bits 15, 11 and 10.
+                 */
+                csd_struct = UNSTUFF_BITS(resp, 126, 2);
+                if (csd_struct != 1 && csd_struct != 2) {
+                        printk("%s: unrecognised CSD structure version %d\n",
+                                mmc_hostname(card->host), csd_struct);
+                        mmc_card_set_bad(card);
+                        return;
+                }
+
+                csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
+                m = UNSTUFF_BITS(resp, 115, 4);
+                e = UNSTUFF_BITS(resp, 112, 3);
+                csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
+                csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+
+                m = UNSTUFF_BITS(resp, 99, 4);
+                e = UNSTUFF_BITS(resp, 96, 3);
+                csd->max_dtr      = tran_exp[e] * tran_mant[m];
+                csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+
+                e = UNSTUFF_BITS(resp, 47, 3);
+                m = UNSTUFF_BITS(resp, 62, 12);
+                csd->capacity     = (1 + m) << (e + 2);
+
+                csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
         }
+}
+
+/*
+ * Given a 64-bit response, decode to our card SCR structure.
+ */
+static void mmc_decode_scr(struct mmc_card *card)
+{
+        struct sd_scr *scr = &card->scr;
+        unsigned int scr_struct;
+        u32 resp[4];
 
-        csd->mmca_vsn    = UNSTUFF_BITS(resp, 122, 4);
-        m = UNSTUFF_BITS(resp, 115, 4);
-        e = UNSTUFF_BITS(resp, 112, 3);
-        csd->tacc_ns     = (tacc_exp[e] * tacc_mant[m] + 9) / 10;
-        csd->tacc_clks   = UNSTUFF_BITS(resp, 104, 8) * 100;
+        BUG_ON(!mmc_card_sd(card));
 
-        m = UNSTUFF_BITS(resp, 99, 4);
-        e = UNSTUFF_BITS(resp, 96, 3);
-        csd->max_dtr      = tran_exp[e] * tran_mant[m];
-        csd->cmdclass     = UNSTUFF_BITS(resp, 84, 12);
+        resp[3] = card->raw_scr[1];
+        resp[2] = card->raw_scr[0];
 
-        e = UNSTUFF_BITS(resp, 47, 3);
-        m = UNSTUFF_BITS(resp, 62, 12);
-        csd->capacity     = (1 + m) << (e + 2);
+        scr_struct = UNSTUFF_BITS(resp, 60, 4);
+        if (scr_struct != 0) {
+                printk("%s: unrecognised SCR structure version %d\n",
+                        mmc_hostname(card->host), scr_struct);
+                mmc_card_set_bad(card);
+                return;
+        }
 
-        csd->read_blkbits = UNSTUFF_BITS(resp, 80, 4);
+        scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
+        scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
 }
 
 /*
@@ -457,6 +659,11 @@ static void mmc_idle_cards(struct mmc_host *host)
 {
         struct mmc_command cmd;
 
+        host->ios.chip_select = MMC_CS_HIGH;
+        host->ops->set_ios(host, &host->ios);
+
+        mmc_delay(1);
+
         cmd.opcode = MMC_GO_IDLE_STATE;
         cmd.arg = 0;
         cmd.flags = MMC_RSP_NONE;
@@ -464,6 +671,11 @@ static void mmc_idle_cards(struct mmc_host *host)
         mmc_wait_for_cmd(host, &cmd, 0);
 
         mmc_delay(1);
+
+        host->ios.chip_select = MMC_CS_DONTCARE;
+        host->ops->set_ios(host, &host->ios);
+
+        mmc_delay(1);
 }
 
 /*
@@ -475,7 +687,9 @@ static void mmc_power_up(struct mmc_host *host)
 
         host->ios.vdd = bit;
         host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+        host->ios.chip_select = MMC_CS_DONTCARE;
         host->ios.power_mode = MMC_POWER_UP;
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
         host->ops->set_ios(host, &host->ios);
 
         mmc_delay(1);
@@ -492,7 +706,9 @@ static void mmc_power_off(struct mmc_host *host)
         host->ios.clock = 0;
         host->ios.vdd = 0;
         host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
+        host->ios.chip_select = MMC_CS_DONTCARE;
         host->ios.power_mode = MMC_POWER_OFF;
+        host->ios.bus_width = MMC_BUS_WIDTH_1;
         host->ops->set_ios(host, &host->ios);
 }
 
@@ -524,6 +740,34 @@ static int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
         return err;
 }
 
+static int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
+{
+        struct mmc_command cmd;
+        int i, err = 0;
+
+        cmd.opcode = SD_APP_OP_COND;
+        cmd.arg = ocr;
+        cmd.flags = MMC_RSP_R3;
+
+        for (i = 100; i; i--) {
+                err = mmc_wait_for_app_cmd(host, 0, &cmd, CMD_RETRIES);
+                if (err != MMC_ERR_NONE)
+                        break;
+
+                if (cmd.resp[0] & MMC_CARD_BUSY || ocr == 0)
+                        break;
+
+                err = MMC_ERR_TIMEOUT;
+
+                mmc_delay(10);
+        }
+
+        if (rocr)
+                *rocr = cmd.resp[0];
+
+        return err;
+}
+
 /*
  * Discover cards by requesting their CID.  If this command
  * times out, it is not an error; there are no further cards
@@ -567,13 +811,38 @@ static void mmc_discover_cards(struct mmc_host *host)
 
                 card->state &= ~MMC_STATE_DEAD;
 
-                cmd.opcode = MMC_SET_RELATIVE_ADDR;
-                cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1;
+                if (host->mode == MMC_MODE_SD) {
+                        mmc_card_set_sd(card);
 
-                err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
-                if (err != MMC_ERR_NONE)
-                        mmc_card_set_dead(card);
+                        cmd.opcode = SD_SEND_RELATIVE_ADDR;
+                        cmd.arg = 0;
+                        cmd.flags = MMC_RSP_R1;
+
+                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+                        if (err != MMC_ERR_NONE)
+                                mmc_card_set_dead(card);
+                        else {
+                                card->rca = cmd.resp[0] >> 16;
+
+                                if (!host->ops->get_ro) {
+                                        printk(KERN_WARNING "%s: host does not "
+                                                "support reading read-only "
+                                                "switch. assuming write-enable.\n",
+                                                mmc_hostname(host));
+                                } else {
+                                        if (host->ops->get_ro(host))
+                                                mmc_card_set_readonly(card);
+                                }
+                        }
+                } else {
+                        cmd.opcode = MMC_SET_RELATIVE_ADDR;
+                        cmd.arg = card->rca << 16;
+                        cmd.flags = MMC_RSP_R1;
+
+                        err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
+                        if (err != MMC_ERR_NONE)
+                                mmc_card_set_dead(card);
+                }
         }
 }
 
@@ -605,6 +874,79 @@ static void mmc_read_csds(struct mmc_host *host)
         }
 }
 
+static void mmc_read_scrs(struct mmc_host *host)
+{
+        int err;
+        struct mmc_card *card;
+
+        struct mmc_request mrq;
+        struct mmc_command cmd;
+        struct mmc_data data;
+
+        struct scatterlist sg;
+
+        list_for_each_entry(card, &host->cards, node) {
+                if (card->state & (MMC_STATE_DEAD|MMC_STATE_PRESENT))
+                        continue;
+                if (!mmc_card_sd(card))
+                        continue;
+
+                err = mmc_select_card(host, card);
+                if (err != MMC_ERR_NONE) {
+                        mmc_card_set_dead(card);
+                        continue;
+                }
+
+                memset(&cmd, 0, sizeof(struct mmc_command));
+
+                cmd.opcode = MMC_APP_CMD;
+                cmd.arg = card->rca << 16;
+                cmd.flags = MMC_RSP_R1;
+
+                err = mmc_wait_for_cmd(host, &cmd, 0);
+                if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD)) {
+                        mmc_card_set_dead(card);
+                        continue;
+                }
+
+                memset(&cmd, 0, sizeof(struct mmc_command));
+
+                cmd.opcode = SD_APP_SEND_SCR;
+                cmd.arg = 0;
+                cmd.flags = MMC_RSP_R1;
+
+                memset(&data, 0, sizeof(struct mmc_data));
+
+                data.timeout_ns = card->csd.tacc_ns * 10;
+                data.timeout_clks = card->csd.tacc_clks * 10;
+                data.blksz_bits = 3;
+                data.blocks = 1;
+                data.flags = MMC_DATA_READ;
+                data.sg = &sg;
+                data.sg_len = 1;
+
+                memset(&mrq, 0, sizeof(struct mmc_request));
+
+                mrq.cmd = &cmd;
+                mrq.data = &data;
+
+                sg_init_one(&sg, (u8*)card->raw_scr, 8);
+
+                err = mmc_wait_for_req(host, &mrq);
+                if (err != MMC_ERR_NONE) {
+                        mmc_card_set_dead(card);
+                        continue;
+                }
+
+                card->raw_scr[0] = ntohl(card->raw_scr[0]);
+                card->raw_scr[1] = ntohl(card->raw_scr[1]);
+
+                mmc_decode_scr(card);
+        }
+
+        mmc_deselect_cards(host);
+}
+
 static unsigned int mmc_calculate_clock(struct mmc_host *host)
 {
         struct mmc_card *card;
@@ -657,12 +999,24 @@ static void mmc_setup(struct mmc_host *host)
                 int err;
                 u32 ocr;
 
+                host->mode = MMC_MODE_SD;
+
                 mmc_power_up(host);
                 mmc_idle_cards(host);
 
-                err = mmc_send_op_cond(host, 0, &ocr);
-                if (err != MMC_ERR_NONE)
-                        return;
+                err = mmc_send_app_op_cond(host, 0, &ocr);
+
+                /*
+                 * If we fail to detect any SD cards then try
+                 * searching for MMC cards.
+                 */
+                if (err != MMC_ERR_NONE) {
+                        host->mode = MMC_MODE_MMC;
+
+                        err = mmc_send_op_cond(host, 0, &ocr);
+                        if (err != MMC_ERR_NONE)
+                                return;
+                }
 
                 host->ocr = mmc_select_voltage(host, ocr);
 
@@ -702,7 +1056,10 @@ static void mmc_setup(struct mmc_host *host)
          * all get the idea that they should be ready for CMD2.
          * (My SanDisk card seems to need this.)
          */
-        mmc_send_op_cond(host, host->ocr, NULL);
+        if (host->mode == MMC_MODE_SD)
+                mmc_send_app_op_cond(host, host->ocr, NULL);
+        else
+                mmc_send_op_cond(host, host->ocr, NULL);
 
         mmc_discover_cards(host);
 
@@ -713,6 +1070,9 @@ static void mmc_setup(struct mmc_host *host)
         host->ops->set_ios(host, &host->ios);
 
         mmc_read_csds(host);
+
+        if (host->mode == MMC_MODE_SD)
+                mmc_read_scrs(host);
 }
 
 
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index d4eee99c2bf6..fa83f15fdf16 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -95,6 +95,10 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
                 if (md->usage == 2)
                         check_disk_change(inode->i_bdev);
                 ret = 0;
+
+                if ((filp->f_mode & FMODE_WRITE) &&
+                        mmc_card_readonly(md->queue.card))
+                        ret = -EROFS;
         }
 
         return ret;
@@ -403,9 +407,10 @@ static int mmc_blk_probe(struct mmc_card *card)
         if (err)
                 goto out;
 
-        printk(KERN_INFO "%s: %s %s %dKiB\n",
+        printk(KERN_INFO "%s: %s %s %dKiB %s\n",
                 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
-                (card->csd.capacity << card->csd.read_blkbits) / 1024);
+                (card->csd.capacity << card->csd.read_blkbits) / 1024,
+                mmc_card_readonly(card)?"(ro)":"");
 
         mmc_set_drvdata(card, md);
         add_disk(md->disk);
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
index ad8949810fc5..3f4a66ca9555 100644
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/mmc_sysfs.c
@@ -34,6 +34,7 @@ MMC_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
         card->raw_cid[2], card->raw_cid[3]);
 MMC_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
         card->raw_csd[2], card->raw_csd[3]);
+MMC_ATTR(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
 MMC_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
 MMC_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
 MMC_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
@@ -57,6 +58,8 @@ static struct device_attribute mmc_dev_attrs[] = {
         __ATTR_NULL
 };
 
+static struct device_attribute mmc_dev_attr_scr = MMC_ATTR_RO(scr);
+
 
 static void mmc_release_card(struct device *dev)
 {
@@ -207,10 +210,20 @@ void mmc_init_card(struct mmc_card *card, struct mmc_host *host)
  */
 int mmc_register_card(struct mmc_card *card)
 {
+        int ret;
+
         snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
                  "%s:%04x", mmc_hostname(card->host), card->rca);
 
-        return device_add(&card->dev);
+        ret = device_add(&card->dev);
+        if (ret == 0) {
+                if (mmc_card_sd(card)) {
+                        ret = device_create_file(&card->dev, &mmc_dev_attr_scr);
+                        if (ret)
+                                device_del(&card->dev);
+                }
+        }
+        return ret;
 }
 
 /*
@@ -219,8 +232,12 @@ int mmc_register_card(struct mmc_card *card)
  */
 void mmc_remove_card(struct mmc_card *card)
 {
-        if (mmc_card_present(card))
+        if (mmc_card_present(card)) {
+                if (mmc_card_sd(card))
+                        device_remove_file(&card->dev, &mmc_dev_attr_scr);
+
                 device_del(&card->dev);
+        }
 
         put_device(&card->dev);
 }
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index b78beb1b0159..e99a53b09e32 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -362,6 +362,16 @@ static void pxamci_request(struct mmc_host *mmc, struct mmc_request *mrq)
         pxamci_start_cmd(host, mrq->cmd, cmdat);
 }
 
+static int pxamci_get_ro(struct mmc_host *mmc)
+{
+        struct pxamci_host *host = mmc_priv(mmc);
+
+        if (host->pdata && host->pdata->get_ro)
+                return host->pdata->get_ro(mmc->dev);
+        /* Host doesn't support read only detection so assume writeable */
+        return 0;
+}
+
 static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 {
         struct pxamci_host *host = mmc_priv(mmc);
@@ -401,6 +411,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
 static struct mmc_host_ops pxamci_ops = {
         .request        = pxamci_request,
+        .get_ro         = pxamci_get_ro,
         .set_ios        = pxamci_set_ios,
 };
 
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 402c2d661fb2..dec01d38c782 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -42,7 +42,7 @@
 #include "wbsd.h"
 
 #define DRIVER_NAME "wbsd"
-#define DRIVER_VERSION "1.3"
+#define DRIVER_VERSION "1.4"
 
 #ifdef CONFIG_MMC_DEBUG
 #define DBG(x...) \
@@ -720,11 +720,28 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
          * calculate CRC.
          *
          * Space for CRC must be included in the size.
+         * Two bytes are needed for each data line.
          */
-        blksize = (1 << data->blksz_bits) + 2;
+        if (host->bus_width == MMC_BUS_WIDTH_1)
+        {
+                blksize = (1 << data->blksz_bits) + 2;
+
+                wbsd_write_index(host, WBSD_IDX_PBSMSB, (blksize >> 4) & 0xF0);
+                wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
+        }
+        else if (host->bus_width == MMC_BUS_WIDTH_4)
+        {
+                blksize = (1 << data->blksz_bits) + 2 * 4;
         
-        wbsd_write_index(host, WBSD_IDX_PBSMSB, (blksize >> 4) & 0xF0);
-        wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
+                wbsd_write_index(host, WBSD_IDX_PBSMSB, ((blksize >> 4) & 0xF0)
+                        | WBSD_DATA_WIDTH);
+                wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
+        }
+        else
+        {
+                data->error = MMC_ERR_INVALID;
+                return;
+        }
 
         /*
          * Clear the FIFO. This is needed even for DMA
@@ -960,8 +977,9 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
         struct wbsd_host* host = mmc_priv(mmc);
         u8 clk, setup, pwr;
         
-        DBGF("clock %uHz busmode %u powermode %u Vdd %u\n",
-                ios->clock, ios->bus_mode, ios->power_mode, ios->vdd);
+        DBGF("clock %uHz busmode %u powermode %u cs %u Vdd %u width %u\n",
+             ios->clock, ios->bus_mode, ios->power_mode, ios->chip_select,
+             ios->vdd, ios->bus_width);
 
         spin_lock_bh(&host->lock);
 
@@ -1003,30 +1021,63 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
 
         /*
          * MMC cards need to have pin 1 high during init.
-         * Init time corresponds rather nicely with the bus mode.
          * It wreaks havoc with the card detection though so
-         * that needs to be disabed.
+         * that needs to be disabled.
          */
         setup = wbsd_read_index(host, WBSD_IDX_SETUP);
-        if ((ios->power_mode == MMC_POWER_ON) &&
-                (ios->bus_mode == MMC_BUSMODE_OPENDRAIN))
+        if (ios->chip_select == MMC_CS_HIGH)
         {
+                BUG_ON(ios->bus_width != MMC_BUS_WIDTH_1);
                 setup |= WBSD_DAT3_H;
                 host->flags |= WBSD_FIGNORE_DETECT;
         }
         else
         {
                 setup &= ~WBSD_DAT3_H;
-                host->flags &= ~WBSD_FIGNORE_DETECT;
+
+                /*
+                 * We cannot resume card detection immediatly
+                 * because of capacitance and delays in the chip.
+                 */
+                mod_timer(&host->ignore_timer, jiffies + HZ/100);
         }
         wbsd_write_index(host, WBSD_IDX_SETUP, setup);
         
+        /*
+         * Store bus width for later. Will be used when
+         * setting up the data transfer.
+         */
+        host->bus_width = ios->bus_width;
+
+        spin_unlock_bh(&host->lock);
+}
+
+static int wbsd_get_ro(struct mmc_host* mmc)
+{
+        struct wbsd_host* host = mmc_priv(mmc);
+        u8 csr;
+
+        spin_lock_bh(&host->lock);
+
+        csr = inb(host->base + WBSD_CSR);
+        csr |= WBSD_MSLED;
+        outb(csr, host->base + WBSD_CSR);
+
+        mdelay(1);
+
+        csr = inb(host->base + WBSD_CSR);
+        csr &= ~WBSD_MSLED;
+        outb(csr, host->base + WBSD_CSR);
+
         spin_unlock_bh(&host->lock);
+
+        return csr & WBSD_WRPT;
 }
 
 static struct mmc_host_ops wbsd_ops = {
         .request        = wbsd_request,
         .set_ios        = wbsd_set_ios,
+        .get_ro         = wbsd_get_ro,
 };
 
 /*****************************************************************************\
@@ -1036,6 +1087,31 @@ static struct mmc_host_ops wbsd_ops = {
 \*****************************************************************************/
 
 /*
+ * Helper function to reset detection ignore
+ */
+
+static void wbsd_reset_ignore(unsigned long data)
+{
+        struct wbsd_host *host = (struct wbsd_host*)data;
+
+        BUG_ON(host == NULL);
+
+        DBG("Resetting card detection ignore\n");
+
+        spin_lock_bh(&host->lock);
+
+        host->flags &= ~WBSD_FIGNORE_DETECT;
+
+        /*
+         * Card status might have changed during the
+         * blackout.
+         */
+        tasklet_schedule(&host->card_tasklet);
+
+        spin_unlock_bh(&host->lock);
+}
+
+/*
  * Helper function for card detection
  */
 static void wbsd_detect_card(unsigned long data)
@@ -1097,7 +1173,7 @@ static void wbsd_tasklet_card(unsigned long param)
                          * Delay card detection to allow electrical connections
                          * to stabilise.
                          */
-                        mod_timer(&host->timer, jiffies + HZ/2);
+                        mod_timer(&host->detect_timer, jiffies + HZ/2);
                 }
                 
                 spin_unlock(&host->lock);
@@ -1124,6 +1200,8 @@ static void wbsd_tasklet_card(unsigned long param)
 
                 mmc_detect_change(host->mmc);
         }
+        else
+                spin_unlock(&host->lock);
 }
 
 static void wbsd_tasklet_fifo(unsigned long param)
@@ -1324,15 +1402,20 @@ static int __devinit wbsd_alloc_mmc(struct device* dev)
         mmc->f_min = 375000;
         mmc->f_max = 24000000;
         mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;
+        mmc->caps = MMC_CAP_4_BIT_DATA;
         
         spin_lock_init(&host->lock);
         
         /*
-         * Set up detection timer
+         * Set up timers
          */
-        init_timer(&host->timer);
-        host->timer.data = (unsigned long)host;
-        host->timer.function = wbsd_detect_card;
+        init_timer(&host->detect_timer);
+        host->detect_timer.data = (unsigned long)host;
+        host->detect_timer.function = wbsd_detect_card;
+
+        init_timer(&host->ignore_timer);
+        host->ignore_timer.data = (unsigned long)host;
+        host->ignore_timer.function = wbsd_reset_ignore;
         
         /*
          * Maximum number of segments. Worst case is one sector per segment
@@ -1370,7 +1453,8 @@ static void __devexit wbsd_free_mmc(struct device* dev)
         host = mmc_priv(mmc);
         BUG_ON(host == NULL);
         
-        del_timer_sync(&host->timer);
+        del_timer_sync(&host->ignore_timer);
+        del_timer_sync(&host->detect_timer);
         
         mmc_free_host(mmc);
         
diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/wbsd.h
index 661a9f6a6e6f..9005b5241b3c 100644
--- a/drivers/mmc/wbsd.h
+++ b/drivers/mmc/wbsd.h
@@ -106,6 +106,8 @@
 #define WBSD_CLK_16M            0x02
 #define WBSD_CLK_24M            0x03
 
+#define WBSD_DATA_WIDTH         0x01
+
 #define WBSD_DAT3_H             0x08
 #define WBSD_FIFO_RESET         0x04
 #define WBSD_SOFT_RESET         0x02
@@ -164,6 +166,7 @@ struct wbsd_host
         int                     firsterr;       /* See fifo functions */
         
         u8                      clk;            /* Current clock speed */
+        unsigned char           bus_width;      /* Current bus width */
         
         int                     config;         /* Config port */
         u8                      unlock_code;    /* Code to unlock config */
@@ -181,5 +184,6 @@ struct wbsd_host
         struct tasklet_struct   finish_tasklet;
         struct tasklet_struct   block_tasklet;
         
-        struct timer_list       timer;          /* Card detection timer */
+        struct timer_list       detect_timer;   /* Card detection timer */
+        struct timer_list       ignore_timer;   /* Ignore detection timer */
 };
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index eee5115658c8..04e54318bc6a 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -526,6 +526,7 @@ static void nand_wait_ready(struct mtd_info *mtd)
         do {
                 if (this->dev_ready(mtd))
                         return;
+                touch_softlockup_watchdog();
         } while (time_before(jiffies, timeo));  
 }
 
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 07746b95fd83..455ba915ede7 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -973,6 +973,11 @@ static int vortex_suspend (struct pci_dev *pdev, pm_message_t state)
                         netif_device_detach(dev);
                         vortex_down(dev, 1);
                 }
+                pci_save_state(pdev);
+                pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
+                free_irq(dev->irq, dev);
+                pci_disable_device(pdev);
+                pci_set_power_state(pdev, pci_choose_state(pdev, state));
         }
         return 0;
 }
@@ -980,8 +985,19 @@ static int vortex_suspend (struct pci_dev *pdev, pm_message_t state)
 static int vortex_resume (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
+        struct vortex_private *vp = netdev_priv(dev);
 
-        if (dev && dev->priv) {
+        if (dev && vp) {
+                pci_set_power_state(pdev, PCI_D0);
+                pci_restore_state(pdev);
+                pci_enable_device(pdev);
+                pci_set_master(pdev);
+                if (request_irq(dev->irq, vp->full_bus_master_rx ?
+                                &boomerang_interrupt : &vortex_interrupt, SA_SHIRQ, dev->name, dev)) {
+                        printk(KERN_WARNING "%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
+                        pci_disable_device(pdev);
+                        return -EBUSY;
+                }
                 if (netif_running(dev)) {
                         vortex_up(dev);
                         netif_device_attach(dev);
@@ -1873,6 +1889,7 @@ vortex_timer(unsigned long data)
                 {
                         spin_lock_bh(&vp->lock);
                         mii_status = mdio_read(dev, vp->phys[0], 1);
+                        mii_status = mdio_read(dev, vp->phys[0], 1);
                         ok = 1;
                         if (vortex_debug > 2)
                                 printk(KERN_DEBUG "%s: MII transceiver has status %4.4x.\n",
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 79e8aa6f2b9e..6bb9232514b4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -397,7 +397,7 @@ config SUN3LANCE
           If you're not building a kernel for a Sun 3, say N.
 
 config SUN3_82586
-        tristate "Sun3 on-board Intel 82586 support"
+        bool "Sun3 on-board Intel 82586 support"
         depends on NET_ETHERNET && SUN3
         help
           This driver enables support for the on-board Intel 82586 based
@@ -447,7 +447,7 @@ config NET_SB1250_MAC
 
 config SGI_IOC3_ETH
         bool "SGI IOC3 Ethernet"
-        depends on NET_ETHERNET && PCI && SGI_IP27
+        depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN
         select CRC32
         select MII
         help
@@ -1923,6 +1923,20 @@ config R8169_VLAN
           
           If in doubt, say Y.
 
+config SIS190
+        tristate "SiS190/SiS191 gigabit ethernet support"
+        depends on PCI
+        select CRC32
+        select MII
+        ---help---
+          Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+          a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+          appear in lan on motherboard designs which are based on SiS 965
+          and SiS 966 south bridge.
+
+          To compile this driver as a module, choose M here: the module
+          will be called sis190.  This is recommended.
+
 config SKGE
         tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
         depends on PCI && EXPERIMENTAL
@@ -2044,6 +2058,13 @@ config BNX2
           To compile this driver as a module, choose M here: the module
           will be called bnx2.  This is recommended.
 
+config SPIDER_NET
+        tristate "Spider Gigabit Ethernet driver"
+        depends on PCI && PPC_BPA
+        help
+          This driver supports the Gigabit Ethernet chips present on the
+          Cell Processor-Based Blades from IBM.
+
 config GIANFAR
         tristate "Gianfar Ethernet"
         depends on 85xx || 83xx
@@ -2093,6 +2114,25 @@ endmenu
 menu "Ethernet (10000 Mbit)"
         depends on !UML
 
+config CHELSIO_T1
+        tristate "Chelsio 10Gb Ethernet support"
+        depends on PCI
+        help
+          This driver supports Chelsio N110 and N210 models 10Gb Ethernet
+          cards. More information about adapter features and performance
+          tuning is in <file:Documentation/networking/cxgb.txt>.
+
+          For general information about Chelsio and our products, visit
+          our website at <http://www.chelsio.com>.
+
+          For customer support, please visit our customer support page at
+          <http://www.chelsio.com/support.htm>.
+
+          Please send feedback to <linux-bugs@chelsio.com>.
+
+          To compile this driver as a module, choose M here: the module
+          will be called cxgb.
+
 config IXGB
         tristate "Intel(R) PRO/10GbE support"
         depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a369ae284a9a..8645c843cf4d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -9,6 +9,7 @@ endif
 obj-$(CONFIG_E1000) += e1000/
 obj-$(CONFIG_IBM_EMAC) += ibm_emac/
 obj-$(CONFIG_IXGB) += ixgb/
+obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 
@@ -42,6 +43,7 @@ obj-$(CONFIG_EEPRO100) += eepro100.o
 obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
+obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ACENIC) += acenic.o
@@ -52,6 +54,8 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o
 obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_BNX2) += bnx2.o
+spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
 obj-$(CONFIG_SK98LIN) += sk98lin/
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index 91791ba37769..8a0af5453e21 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -275,7 +275,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
         return 0;
 out2:
         if (ei_status.reg0)
-                iounmap((void *)dev->mem_start);
+                iounmap(ei_status.mem);
 out1:
         free_irq(dev->irq, dev);
 out:
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 4f9f69e22c1b..12ef52c193a3 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c
@@ -597,7 +597,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
         struct ArcProto *proto;
         int txbuf;
         unsigned long flags;
-        int freeskb = 0;
+        int freeskb, retval;
 
         BUGMSG(D_DURING,
                "transmit requested (status=%Xh, txbufs=%d/%d, len=%d, protocol %x)\n",
@@ -615,7 +615,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
         if (skb->len - ARC_HDR_SIZE > XMTU && !proto->continue_tx) {
                 BUGMSG(D_NORMAL, "fixme: packet too large: compensating badly!\n");
                 dev_kfree_skb(skb);
-                return 0;       /* don't try again */
+                return NETDEV_TX_OK;    /* don't try again */
         }
 
         /* We're busy transmitting a packet... */
@@ -623,8 +623,11 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
 
         spin_lock_irqsave(&lp->lock, flags);
         AINTMASK(0);
-
-        txbuf = get_arcbuf(dev);
+        if(lp->next_tx == -1)
+                txbuf = get_arcbuf(dev);
+        else {
+                txbuf = -1;
+        }
         if (txbuf != -1) {
                 if (proto->prepare_tx(dev, pkt, skb->len, txbuf) &&
                     !proto->ack_tx) {
@@ -638,6 +641,8 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
                         lp->outgoing.skb = skb;
                         lp->outgoing.pkt = pkt;
 
+                        freeskb = 0;
+
                         if (proto->continue_tx &&
                             proto->continue_tx(dev, txbuf)) {
                           BUGMSG(D_NORMAL,
@@ -645,10 +650,12 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
                                  "(proto='%c')\n", proto->suffix);
                         }
                 }
-
+                retval = NETDEV_TX_OK;
+                dev->trans_start = jiffies;
                 lp->next_tx = txbuf;
         } else {
-                freeskb = 1;
+                retval = NETDEV_TX_BUSY;
+                freeskb = 0;
         }
 
         BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());
@@ -664,7 +671,7 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev)
         if (freeskb) {
                 dev_kfree_skb(skb);
         }
-        return 0;               /* no need to try again */
+        return retval;          /* no need to try again */
 }
 
 
@@ -690,7 +697,6 @@ static int go_tx(struct net_device *dev)
         /* start sending */
         ACOMMAND(TXcmd | (lp->cur_tx << 3));
 
-        dev->trans_start = jiffies;
         lp->stats.tx_packets++;
         lp->lasttrans_dest = lp->lastload_dest;
         lp->lastload_dest = 0;
@@ -917,6 +923,9 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
                         BUGMSG(D_RECON, "Network reconfiguration detected (status=%Xh)\n",
                                status);
+                        /* MYRECON bit is at bit 7 of diagstatus */
+                        if(diagstatus & 0x80)
+                                BUGMSG(D_RECON,"Put out that recon myself\n");
 
                         /* is the RECON info empty or old? */
                         if (!lp->first_recon || !lp->last_recon ||
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index ad011214c7f2..e01b6a78ec63 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -235,7 +235,7 @@ struct lance_private {
 #define MEM             lp->mem
 #define DREG    IO->data
 #define AREG    IO->addr
-#define REGA(a) ( AREG = (a), DREG )
+#define REGA(a) (*( AREG = (a), &DREG ))
 
 /* Definitions for packet buffer access: */
 #define PKT_BUF_SZ              1544
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 7babf6af4e28..55a72c7ad001 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -2004,14 +2004,14 @@ bnx2_init_cpus(struct bnx2 *bp)
 }
 
 static int
-bnx2_set_power_state(struct bnx2 *bp, int state)
+bnx2_set_power_state(struct bnx2 *bp, pci_power_t state)
 {
         u16 pmcsr;
 
         pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL, &pmcsr);
 
         switch (state) {
-        case 0: {
+        case PCI_D0: {
                 u32 val;
 
                 pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
@@ -2032,7 +2032,7 @@ bnx2_set_power_state(struct bnx2 *bp, int state)
                 REG_WR(bp, BNX2_RPM_CONFIG, val);
                 break;
         }
-        case 3: {
+        case PCI_D3hot: {
                 int i;
                 u32 val, wol_msg;
 
@@ -3886,7 +3886,7 @@ bnx2_open(struct net_device *dev)
         struct bnx2 *bp = dev->priv;
         int rc;
 
-        bnx2_set_power_state(bp, 0);
+        bnx2_set_power_state(bp, PCI_D0);
         bnx2_disable_int(bp);
 
         rc = bnx2_alloc_mem(bp);
@@ -4197,7 +4197,7 @@ bnx2_close(struct net_device *dev)
         bnx2_free_mem(bp);
         bp->link_up = 0;
         netif_carrier_off(bp->dev);
-        bnx2_set_power_state(bp, 3);
+        bnx2_set_power_state(bp, PCI_D3hot);
         return 0;
 }
 
@@ -5203,7 +5203,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                                BNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA |
                                BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP);
 
-        bnx2_set_power_state(bp, 0);
+        bnx2_set_power_state(bp, PCI_D0);
 
         bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
 
@@ -5495,7 +5495,7 @@ bnx2_remove_one(struct pci_dev *pdev)
 }
 
 static int
-bnx2_suspend(struct pci_dev *pdev, u32 state)
+bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
         struct bnx2 *bp = dev->priv;
@@ -5513,7 +5513,7 @@ bnx2_suspend(struct pci_dev *pdev, u32 state)
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
         bnx2_reset_chip(bp, reset_code);
         bnx2_free_skbs(bp);
-        bnx2_set_power_state(bp, state);
+        bnx2_set_power_state(bp, pci_choose_state(pdev, state));
         return 0;
 }
 
@@ -5526,7 +5526,7 @@ bnx2_resume(struct pci_dev *pdev)
         if (!netif_running(dev))
                 return 0;
 
-        bnx2_set_power_state(bp, 0);
+        bnx2_set_power_state(bp, PCI_D0);
         netif_device_attach(dev);
         bnx2_init_nic(bp);
         bnx2_netif_start(bp);
diff --git a/drivers/net/chelsio/Makefile b/drivers/net/chelsio/Makefile
new file mode 100644
index 000000000000..91e927827c43
--- /dev/null
+++ b/drivers/net/chelsio/Makefile
@@ -0,0 +1,11 @@
+#
+# Chelsio 10Gb NIC driver for Linux.
+#
+
+obj-$(CONFIG_CHELSIO_T1) += cxgb.o
+
+EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/chelsio $(DEBUG_FLAGS)
+
+
+cxgb-objs := cxgb2.o espi.o pm3393.o sge.o subr.o mv88x201x.o
+
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
new file mode 100644
index 000000000000..bf3e7b6a7a18
--- /dev/null
+++ b/drivers/net/chelsio/common.h
@@ -0,0 +1,314 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: common.h                                                            *
+ * $Revision: 1.21 $                                                         *
+ * $Date: 2005/06/22 00:43:25 $                                              *
+ * Description:                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_COMMON_H_
+#define _CXGB_COMMON_H_
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/types.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/crc32.h>
+#include <linux/init.h>
+#include <asm/io.h>
+#include <linux/pci_ids.h>
+
+#define DRV_DESCRIPTION "Chelsio 10Gb Ethernet Driver"
+#define DRV_NAME "cxgb"
+#define DRV_VERSION "2.1.1"
+#define PFX      DRV_NAME ": "
+
+#define CH_ERR(fmt, ...)   printk(KERN_ERR PFX fmt, ## __VA_ARGS__)
+#define CH_WARN(fmt, ...)  printk(KERN_WARNING PFX fmt, ## __VA_ARGS__)
+#define CH_ALERT(fmt, ...) printk(KERN_ALERT PFX fmt, ## __VA_ARGS__)
+
+#define CH_DEVICE(devid, ssid, idx) \
+        { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx }
+
+#define SUPPORTED_PAUSE       (1 << 13)
+#define SUPPORTED_LOOPBACK    (1 << 15)
+
+#define ADVERTISED_PAUSE      (1 << 13)
+#define ADVERTISED_ASYM_PAUSE (1 << 14)
+
+typedef struct adapter adapter_t;
+
+void t1_elmer0_ext_intr(adapter_t *adapter);
+void t1_link_changed(adapter_t *adapter, int port_id, int link_status,
+                        int speed, int duplex, int fc);
+
+struct t1_rx_mode {
+        struct net_device *dev;
+        u32 idx;
+        struct dev_mc_list *list;
+};
+
+#define t1_rx_mode_promisc(rm)  (rm->dev->flags & IFF_PROMISC)
+#define t1_rx_mode_allmulti(rm) (rm->dev->flags & IFF_ALLMULTI)
+#define t1_rx_mode_mc_cnt(rm)   (rm->dev->mc_count)
+
+static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm)
+{
+        u8 *addr = NULL;
+
+        if (rm->idx++ < rm->dev->mc_count) {
+                addr = rm->list->dmi_addr;
+                rm->list = rm->list->next;
+        }
+        return addr;
+}
+
+#define MAX_NPORTS 4
+
+#define SPEED_INVALID 0xffff
+#define DUPLEX_INVALID 0xff
+
+enum {
+        CHBT_BOARD_N110,
+        CHBT_BOARD_N210
+};
+
+enum {
+        CHBT_TERM_T1,
+        CHBT_TERM_T2
+};
+
+enum {
+        CHBT_MAC_PM3393,
+};
+
+enum {
+        CHBT_PHY_88X2010,
+};
+
+enum {
+        PAUSE_RX      = 1 << 0,
+        PAUSE_TX      = 1 << 1,
+        PAUSE_AUTONEG = 1 << 2
+};
+
+/* Revisions of T1 chip */
+enum {
+        TERM_T1A   = 0,
+        TERM_T1B   = 1,
+        TERM_T2    = 3
+};
+
+struct sge_params {
+        unsigned int cmdQ_size[2];
+        unsigned int freelQ_size[2];
+        unsigned int large_buf_capacity;
+        unsigned int rx_coalesce_usecs;
+        unsigned int last_rx_coalesce_raw;
+        unsigned int default_rx_coalesce_usecs;
+        unsigned int sample_interval_usecs;
+        unsigned int coalesce_enable;
+        unsigned int polling;
+};
+
+struct chelsio_pci_params {
+        unsigned short speed;
+        unsigned char  width;
+        unsigned char  is_pcix;
+};
+
+struct adapter_params {
+        struct sge_params sge;
+        struct chelsio_pci_params pci;
+
+        const struct board_info *brd_info;
+
+        unsigned int   nports;          /* # of ethernet ports */
+        unsigned int   stats_update_period;
+        unsigned short chip_revision;
+        unsigned char  chip_version;
+};
+
+struct link_config {
+        unsigned int   supported;        /* link capabilities */
+        unsigned int   advertising;      /* advertised capabilities */
+        unsigned short requested_speed;  /* speed user has requested */
+        unsigned short speed;            /* actual link speed */
+        unsigned char  requested_duplex; /* duplex user has requested */
+        unsigned char  duplex;           /* actual link duplex */
+        unsigned char  requested_fc;     /* flow control user has requested */
+        unsigned char  fc;               /* actual link flow control */
+        unsigned char  autoneg;          /* autonegotiating? */
+};
+
+struct cmac;
+struct cphy;
+
+struct port_info {
+        struct net_device *dev;
+        struct cmac *mac;
+        struct cphy *phy;
+        struct link_config link_config;
+        struct net_device_stats netstats;
+};
+
+struct sge;
+struct peespi;
+
+struct adapter {
+        u8 __iomem *regs;
+        struct pci_dev *pdev;
+        unsigned long registered_device_map;
+        unsigned long open_device_map;
+        unsigned long flags;
+
+        const char *name;
+        int msg_enable;
+        u32 mmio_len;
+
+        struct work_struct ext_intr_handler_task;
+        struct adapter_params params;
+
+        struct vlan_group *vlan_grp;
+
+        /* Terminator modules. */
+        struct sge    *sge;
+        struct peespi *espi;
+
+        struct port_info port[MAX_NPORTS];
+        struct work_struct stats_update_task;
+        struct timer_list stats_update_timer;
+
+        struct semaphore mib_mutex;
+        spinlock_t tpi_lock;
+        spinlock_t work_lock;
+        /* guards async operations */
+        spinlock_t async_lock ____cacheline_aligned;
+        u32 slow_intr_mask;
+};
+
+enum {                                           /* adapter flags */
+        FULL_INIT_DONE        = 1 << 0,
+        TSO_CAPABLE           = 1 << 2,
+        TCP_CSUM_CAPABLE      = 1 << 3,
+        UDP_CSUM_CAPABLE      = 1 << 4,
+        VLAN_ACCEL_CAPABLE    = 1 << 5,
+        RX_CSUM_ENABLED       = 1 << 6,
+};
+
+struct mdio_ops;
+struct gmac;
+struct gphy;
+
+struct board_info {
+        unsigned char           board;
+        unsigned char           port_number;
+        unsigned long           caps;
+        unsigned char           chip_term;
+        unsigned char           chip_mac;
+        unsigned char           chip_phy;
+        unsigned int            clock_core;
+        unsigned int            clock_mc3;
+        unsigned int            clock_mc4;
+        unsigned int            espi_nports;
+        unsigned int            clock_cspi;
+        unsigned int            clock_elmer0;
+        unsigned char           mdio_mdien;
+        unsigned char           mdio_mdiinv;
+        unsigned char           mdio_mdc;
+        unsigned char           mdio_phybaseaddr;
+        struct gmac            *gmac;
+        struct gphy            *gphy;
+        struct mdio_ops        *mdio_ops;
+        const char             *desc;
+};
+
+extern struct pci_device_id t1_pci_tbl[];
+
+static inline int adapter_matches_type(const adapter_t *adapter,
+                                       int version, int revision)
+{
+        return adapter->params.chip_version == version &&
+               adapter->params.chip_revision == revision;
+}
+
+#define t1_is_T1B(adap) adapter_matches_type(adap, CHBT_TERM_T1, TERM_T1B)
+#define is_T2(adap)     adapter_matches_type(adap, CHBT_TERM_T2, TERM_T2)
+
+/* Returns true if an adapter supports VLAN acceleration and TSO */
+static inline int vlan_tso_capable(const adapter_t *adapter)
+{
+        return !t1_is_T1B(adapter);
+}
+
+#define for_each_port(adapter, iter) \
+        for (iter = 0; iter < (adapter)->params.nports; ++iter)
+
+#define board_info(adapter) ((adapter)->params.brd_info)
+#define is_10G(adapter) (board_info(adapter)->caps & SUPPORTED_10000baseT_Full)
+
+static inline unsigned int core_ticks_per_usec(const adapter_t *adap)
+{
+        return board_info(adap)->clock_core / 1000000;
+}
+
+extern int t1_tpi_write(adapter_t *adapter, u32 addr, u32 value);
+extern int t1_tpi_read(adapter_t *adapter, u32 addr, u32 *value);
+
+extern void t1_interrupts_enable(adapter_t *adapter);
+extern void t1_interrupts_disable(adapter_t *adapter);
+extern void t1_interrupts_clear(adapter_t *adapter);
+extern int elmer0_ext_intr_handler(adapter_t *adapter);
+extern int t1_slow_intr_handler(adapter_t *adapter);
+
+extern int t1_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc);
+extern const struct board_info *t1_get_board_info(unsigned int board_id);
+extern const struct board_info *t1_get_board_info_from_ids(unsigned int devid,
+                                                    unsigned short ssid);
+extern int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data);
+extern int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,
+                     struct adapter_params *p);
+extern int t1_init_hw_modules(adapter_t *adapter);
+extern int t1_init_sw_modules(adapter_t *adapter, const struct board_info *bi);
+extern void t1_free_sw_modules(adapter_t *adapter);
+extern void t1_fatal_err(adapter_t *adapter);
+
+extern void t1_tp_set_udp_checksum_offload(adapter_t *adapter, int enable);
+extern void t1_tp_set_tcp_checksum_offload(adapter_t *adapter, int enable);
+extern void t1_tp_set_ip_checksum_offload(adapter_t *adapter, int enable);
+
+#endif /* _CXGB_COMMON_H_ */
diff --git a/drivers/net/chelsio/cphy.h b/drivers/net/chelsio/cphy.h
new file mode 100644
index 000000000000..3412342f7345
--- /dev/null
+++ b/drivers/net/chelsio/cphy.h
@@ -0,0 +1,148 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: cphy.h                                                              *
+ * $Revision: 1.7 $                                                          *
+ * $Date: 2005/06/21 18:29:47 $                                              *
+ * Description:                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_CPHY_H_
+#define _CXGB_CPHY_H_
+
+#include "common.h"
+
+struct mdio_ops {
+        void (*init)(adapter_t *adapter, const struct board_info *bi);
+        int  (*read)(adapter_t *adapter, int phy_addr, int mmd_addr,
+                     int reg_addr, unsigned int *val);
+        int  (*write)(adapter_t *adapter, int phy_addr, int mmd_addr,
+                      int reg_addr, unsigned int val);
+};
+
+/* PHY interrupt types */
+enum {
+        cphy_cause_link_change = 0x1,
+        cphy_cause_error = 0x2
+};
+
+struct cphy;
+
+/* PHY operations */
+struct cphy_ops {
+        void (*destroy)(struct cphy *);
+        int (*reset)(struct cphy *, int wait);
+
+        int (*interrupt_enable)(struct cphy *);
+        int (*interrupt_disable)(struct cphy *);
+        int (*interrupt_clear)(struct cphy *);
+        int (*interrupt_handler)(struct cphy *);
+
+        int (*autoneg_enable)(struct cphy *);
+        int (*autoneg_disable)(struct cphy *);
+        int (*autoneg_restart)(struct cphy *);
+
+        int (*advertise)(struct cphy *phy, unsigned int advertise_map);
+        int (*set_loopback)(struct cphy *, int on);
+        int (*set_speed_duplex)(struct cphy *phy, int speed, int duplex);
+        int (*get_link_status)(struct cphy *phy, int *link_ok, int *speed,
+                               int *duplex, int *fc);
+};
+
+/* A PHY instance */
+struct cphy {
+        int addr;                            /* PHY address */
+        adapter_t *adapter;                  /* associated adapter */
+        struct cphy_ops *ops;                /* PHY operations */
+        int (*mdio_read)(adapter_t *adapter, int phy_addr, int mmd_addr,
+                         int reg_addr, unsigned int *val);
+        int (*mdio_write)(adapter_t *adapter, int phy_addr, int mmd_addr,
+                          int reg_addr, unsigned int val);
+        struct cphy_instance *instance;
+};
+
+/* Convenience MDIO read/write wrappers */
+static inline int mdio_read(struct cphy *cphy, int mmd, int reg,
+                            unsigned int *valp)
+{
+        return cphy->mdio_read(cphy->adapter, cphy->addr, mmd, reg, valp);
+}
+
+static inline int mdio_write(struct cphy *cphy, int mmd, int reg,
+                             unsigned int val)
+{
+        return cphy->mdio_write(cphy->adapter, cphy->addr, mmd, reg, val);
+}
+
+static inline int simple_mdio_read(struct cphy *cphy, int reg,
+                                   unsigned int *valp)
+{
+        return mdio_read(cphy, 0, reg, valp);
+}
+
+static inline int simple_mdio_write(struct cphy *cphy, int reg,
+                                    unsigned int val)
+{
+        return mdio_write(cphy, 0, reg, val);
+}
+
+/* Convenience initializer */
+static inline void cphy_init(struct cphy *phy, adapter_t *adapter,
+                             int phy_addr, struct cphy_ops *phy_ops,
+                             struct mdio_ops *mdio_ops)
+{
+        phy->adapter = adapter;
+        phy->addr    = phy_addr;
+        phy->ops     = phy_ops;
+        if (mdio_ops) {
+                phy->mdio_read  = mdio_ops->read;
+                phy->mdio_write = mdio_ops->write;
+        }
+}
+
+/* Operations of the PHY-instance factory */
+struct gphy {
+        /* Construct a PHY instance with the given PHY address */
+        struct cphy *(*create)(adapter_t *adapter, int phy_addr,
+                               struct mdio_ops *mdio_ops);
+
+        /*
+         * Reset the PHY chip.  This resets the whole PHY chip, not individual
+         * ports.
+         */
+        int (*reset)(adapter_t *adapter);
+};
+
+extern struct gphy t1_mv88x201x_ops;
+extern struct gphy t1_dummy_phy_ops;
+
+#endif /* _CXGB_CPHY_H_ */
diff --git a/drivers/net/chelsio/cpl5_cmd.h b/drivers/net/chelsio/cpl5_cmd.h
new file mode 100644
index 000000000000..27925e487bcf
--- /dev/null
+++ b/drivers/net/chelsio/cpl5_cmd.h
@@ -0,0 +1,145 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: cpl5_cmd.h                                                          *
+ * $Revision: 1.6 $                                                          *
+ * $Date: 2005/06/21 18:29:47 $                                              *
+ * Description:                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_CPL5_CMD_H_
+#define _CXGB_CPL5_CMD_H_
+
+#include <asm/byteorder.h>
+
+#if !defined(__LITTLE_ENDIAN_BITFIELD) && !defined(__BIG_ENDIAN_BITFIELD)
+#error "Adjust your <asm/byteorder.h> defines"
+#endif
+
+enum CPL_opcode {
+        CPL_RX_PKT            = 0xAD,
+        CPL_TX_PKT            = 0xB2,
+        CPL_TX_PKT_LSO        = 0xB6,
+};
+
+enum {                /* TX_PKT_LSO ethernet types */
+        CPL_ETH_II,
+        CPL_ETH_II_VLAN,
+        CPL_ETH_802_3,
+        CPL_ETH_802_3_VLAN
+};
+
+struct cpl_rx_data {
+        u32 rsvd0;
+        u32 len;
+        u32 seq;
+        u16 urg;
+        u8  rsvd1;
+        u8  status;
+};
+
+/*
+ * We want this header's alignment to be no more stringent than 2-byte aligned.
+ * All fields are u8 or u16 except for the length.  However that field is not
+ * used so we break it into 2 16-bit parts to easily meet our alignment needs.
+ */
+struct cpl_tx_pkt {
+        u8 opcode;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        u8 iff:4;
+        u8 ip_csum_dis:1;
+        u8 l4_csum_dis:1;
+        u8 vlan_valid:1;
+        u8 rsvd:1;
+#else
+        u8 rsvd:1;
+        u8 vlan_valid:1;
+        u8 l4_csum_dis:1;
+        u8 ip_csum_dis:1;
+        u8 iff:4;
+#endif
+        u16 vlan;
+        u16 len_hi;
+        u16 len_lo;
+};
+
+struct cpl_tx_pkt_lso {
+        u8 opcode;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        u8 iff:4;
+        u8 ip_csum_dis:1;
+        u8 l4_csum_dis:1;
+        u8 vlan_valid:1;
+        u8 rsvd:1;
+#else
+        u8 rsvd:1;
+        u8 vlan_valid:1;
+        u8 l4_csum_dis:1;
+        u8 ip_csum_dis:1;
+        u8 iff:4;
+#endif
+        u16 vlan;
+        u32 len;
+
+        u32 rsvd2;
+        u8 rsvd3;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        u8 tcp_hdr_words:4;
+        u8 ip_hdr_words:4;
+#else
+        u8 ip_hdr_words:4;
+        u8 tcp_hdr_words:4;
+#endif
+        u16 eth_type_mss;
+};
+
+struct cpl_rx_pkt {
+        u8 opcode;
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        u8 iff:4;
+        u8 csum_valid:1;
+        u8 bad_pkt:1;
+        u8 vlan_valid:1;
+        u8 rsvd:1;
+#else
+        u8 rsvd:1;
+        u8 vlan_valid:1;
+        u8 bad_pkt:1;
+        u8 csum_valid:1;
+        u8 iff:4;
+#endif
+        u16 csum;
+        u16 vlan;
+        u16 len;
+};
+
+#endif /* _CXGB_CPL5_CMD_H_ */
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
new file mode 100644
index 000000000000..349ebe783ed6
--- /dev/null
+++ b/drivers/net/chelsio/cxgb2.c
@@ -0,0 +1,1256 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: cxgb2.c                                                             *
+ * $Revision: 1.25 $                                                         *
+ * $Date: 2005/06/22 00:43:25 $                                              *
+ * Description:                                                              *
+ *  Chelsio 10Gb Ethernet Driver.                                            *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#include "common.h"
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/if_vlan.h>
+#include <linux/mii.h>
+#include <linux/sockios.h>
+#include <linux/proc_fs.h>
+#include <linux/dma-mapping.h>
+#include <asm/uaccess.h>
+
+#include "cpl5_cmd.h"
+#include "regs.h"
+#include "gmac.h"
+#include "cphy.h"
+#include "sge.h"
+#include "espi.h"
+
+#ifdef work_struct
+#include <linux/tqueue.h>
+#define INIT_WORK INIT_TQUEUE
+#define schedule_work schedule_task
+#define flush_scheduled_work flush_scheduled_tasks
+
+static inline void schedule_mac_stats_update(struct adapter *ap, int secs)
+{
+        mod_timer(&ap->stats_update_timer, jiffies + secs * HZ);
+}
+
+static inline void cancel_mac_stats_update(struct adapter *ap)
+{
+        del_timer_sync(&ap->stats_update_timer);
+        flush_scheduled_tasks();
+}
+
+/*
+ * Stats update timer for 2.4.  It schedules a task to do the actual update as
+ * we need to access MAC statistics in process context.
+ */
+static void mac_stats_timer(unsigned long data)
+{
+        struct adapter *ap = (struct adapter *)data;
+
+        schedule_task(&ap->stats_update_task);
+}
+#else
+#include <linux/workqueue.h>
+
+static inline void schedule_mac_stats_update(struct adapter *ap, int secs)
+{
+        schedule_delayed_work(&ap->stats_update_task, secs * HZ);
+}
+
+static inline void cancel_mac_stats_update(struct adapter *ap)
+{
+        cancel_delayed_work(&ap->stats_update_task);
+}
+#endif
+
+#define MAX_CMDQ_ENTRIES 16384
+#define MAX_CMDQ1_ENTRIES 1024
+#define MAX_RX_BUFFERS 16384
+#define MAX_RX_JUMBO_BUFFERS 16384
+#define MAX_TX_BUFFERS_HIGH     16384U
+#define MAX_TX_BUFFERS_LOW      1536U
+#define MIN_FL_ENTRIES 32
+
+#define PORT_MASK ((1 << MAX_NPORTS) - 1)
+
+#define DFLT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK | \
+                         NETIF_MSG_TIMER | NETIF_MSG_IFDOWN | NETIF_MSG_IFUP |\
+                         NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
+
+/*
+ * The EEPROM is actually bigger but only the first few bytes are used so we
+ * only report those.
+ */
+#define EEPROM_SIZE 32
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_AUTHOR("Chelsio Communications");
+MODULE_LICENSE("GPL");
+
+static int dflt_msg_enable = DFLT_MSG_ENABLE;
+
+MODULE_PARM(dflt_msg_enable, "i");
+MODULE_PARM_DESC(dflt_msg_enable, "Chelsio T1 message enable bitmap");
+
+
+static const char pci_speed[][4] = {
+        "33", "66", "100", "133"
+};
+
+/*
+ * Setup MAC to receive the types of packets we want.
+ */
+static void t1_set_rxmode(struct net_device *dev)
+{
+        struct adapter *adapter = dev->priv;
+        struct cmac *mac = adapter->port[dev->if_port].mac;
+        struct t1_rx_mode rm;
+
+        rm.dev = dev;
+        rm.idx = 0;
+        rm.list = dev->mc_list;
+        mac->ops->set_rx_mode(mac, &rm);
+}
+
+static void link_report(struct port_info *p)
+{
+        if (!netif_carrier_ok(p->dev))
+                printk(KERN_INFO "%s: link down\n", p->dev->name);
+        else {
+                const char *s = "10Mbps";
+
+                switch (p->link_config.speed) {
+                        case SPEED_10000: s = "10Gbps"; break;
+                        case SPEED_1000:  s = "1000Mbps"; break;
+                        case SPEED_100:   s = "100Mbps"; break;
+                }
+
+        printk(KERN_INFO "%s: link up, %s, %s-duplex\n",
+                       p->dev->name, s,
+                       p->link_config.duplex == DUPLEX_FULL ? "full" : "half");
+        }
+}
+
+void t1_link_changed(struct adapter *adapter, int port_id, int link_stat,
+                        int speed, int duplex, int pause)
+{
+        struct port_info *p = &adapter->port[port_id];
+
+        if (link_stat != netif_carrier_ok(p->dev)) {
+                if (link_stat)
+                        netif_carrier_on(p->dev);
+                else
+                        netif_carrier_off(p->dev);
+                link_report(p);
+
+        }
+}
+
+static void link_start(struct port_info *p)
+{
+        struct cmac *mac = p->mac;
+
+        mac->ops->reset(mac);
+        if (mac->ops->macaddress_set)
+                mac->ops->macaddress_set(mac, p->dev->dev_addr);
+        t1_set_rxmode(p->dev);
+        t1_link_start(p->phy, mac, &p->link_config);
+        mac->ops->enable(mac, MAC_DIRECTION_RX | MAC_DIRECTION_TX);
+}
+
+static void enable_hw_csum(struct adapter *adapter)
+{
+        if (adapter->flags & TSO_CAPABLE)
+                t1_tp_set_ip_checksum_offload(adapter, 1); /* for TSO only */
+        t1_tp_set_tcp_checksum_offload(adapter, 1);
+}
+
+/*
+ * Things to do upon first use of a card.
+ * This must run with the rtnl lock held.
+ */
+static int cxgb_up(struct adapter *adapter)
+{
+        int err = 0;
+
+        if (!(adapter->flags & FULL_INIT_DONE)) {
+                err = t1_init_hw_modules(adapter);
+                if (err)
+                        goto out_err;
+
+                enable_hw_csum(adapter);
+                adapter->flags |= FULL_INIT_DONE;
+        }
+
+        t1_interrupts_clear(adapter);
+        if ((err = request_irq(adapter->pdev->irq,
+                               t1_select_intr_handler(adapter), SA_SHIRQ,
+                               adapter->name, adapter))) {
+                goto out_err;
+        }
+        t1_sge_start(adapter->sge);
+        t1_interrupts_enable(adapter);
+ out_err:
+        return err;
+}
+
+/*
+ * Release resources when all the ports have been stopped.
+ */
+static void cxgb_down(struct adapter *adapter)
+{
+        t1_sge_stop(adapter->sge);
+        t1_interrupts_disable(adapter);
+        free_irq(adapter->pdev->irq, adapter);
+}
+
+static int cxgb_open(struct net_device *dev)
+{
+        int err;
+        struct adapter *adapter = dev->priv;
+        int other_ports = adapter->open_device_map & PORT_MASK;
+
+        if (!adapter->open_device_map && (err = cxgb_up(adapter)) < 0)
+                return err;
+
+        __set_bit(dev->if_port, &adapter->open_device_map);
+        link_start(&adapter->port[dev->if_port]);
+        netif_start_queue(dev);
+        if (!other_ports && adapter->params.stats_update_period)
+                schedule_mac_stats_update(adapter,
+                                          adapter->params.stats_update_period);
+        return 0;
+}
+
+static int cxgb_close(struct net_device *dev)
+{
+        struct adapter *adapter = dev->priv;
+        struct port_info *p = &adapter->port[dev->if_port];
+        struct cmac *mac = p->mac;
+
+        netif_stop_queue(dev);
+        mac->ops->disable(mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
+        netif_carrier_off(dev);
+
+        clear_bit(dev->if_port, &adapter->open_device_map);
+        if (adapter->params.stats_update_period &&
+            !(adapter->open_device_map & PORT_MASK)) {
+                /* Stop statistics accumulation. */
+                smp_mb__after_clear_bit();
+                spin_lock(&adapter->work_lock);   /* sync with update task */
+                spin_unlock(&adapter->work_lock);
+                cancel_mac_stats_update(adapter);
+        }
+
+        if (!adapter->open_device_map)
+                cxgb_down(adapter);
+        return 0;
+}
+
+static struct net_device_stats *t1_get_stats(struct net_device *dev)
+{
+        struct adapter *adapter = dev->priv;
+        struct port_info *p = &adapter->port[dev->if_port];
+        struct net_device_stats *ns = &p->netstats;
+        const struct cmac_statistics *pstats;
+
+        /* Do a full update of the MAC stats */
+        pstats = p->mac->ops->statistics_update(p->mac,
+                                                      MAC_STATS_UPDATE_FULL);
+
+        ns->tx_packets = pstats->TxUnicastFramesOK +
+                pstats->TxMulticastFramesOK + pstats->TxBroadcastFramesOK;
+
+        ns->rx_packets = pstats->RxUnicastFramesOK +
+                pstats->RxMulticastFramesOK + pstats->RxBroadcastFramesOK;
+
+        ns->tx_bytes = pstats->TxOctetsOK;
+        ns->rx_bytes = pstats->RxOctetsOK;
+
+        ns->tx_errors = pstats->TxLateCollisions + pstats->TxLengthErrors +
+                pstats->TxUnderrun + pstats->TxFramesAbortedDueToXSCollisions;
+        ns->rx_errors = pstats->RxDataErrors + pstats->RxJabberErrors +
+                pstats->RxFCSErrors + pstats->RxAlignErrors +
+                pstats->RxSequenceErrors + pstats->RxFrameTooLongErrors +
+                pstats->RxSymbolErrors + pstats->RxRuntErrors;
+
+        ns->multicast  = pstats->RxMulticastFramesOK;
+        ns->collisions = pstats->TxTotalCollisions;
+
+        /* detailed rx_errors */
+        ns->rx_length_errors = pstats->RxFrameTooLongErrors +
+                pstats->RxJabberErrors;
+        ns->rx_over_errors   = 0;
+        ns->rx_crc_errors    = pstats->RxFCSErrors;
+        ns->rx_frame_errors  = pstats->RxAlignErrors;
+        ns->rx_fifo_errors   = 0;
+        ns->rx_missed_errors = 0;
+
+        /* detailed tx_errors */
+        ns->tx_aborted_errors   = pstats->TxFramesAbortedDueToXSCollisions;
+        ns->tx_carrier_errors   = 0;
+        ns->tx_fifo_errors      = pstats->TxUnderrun;
+        ns->tx_heartbeat_errors = 0;
+        ns->tx_window_errors    = pstats->TxLateCollisions;
+        return ns;
+}
+
+static u32 get_msglevel(struct net_device *dev)
+{
+        struct adapter *adapter = dev->priv;
+
+        return adapter->msg_enable;
+}
+
+static void set_msglevel(struct net_device *dev, u32 val)
+{
+        struct adapter *adapter = dev->priv;
+
+        adapter->msg_enable = val;
+}
+
+static char stats_strings[][ETH_GSTRING_LEN] = {
+        "TxOctetsOK",
+        "TxOctetsBad",
+        "TxUnicastFramesOK",
+        "TxMulticastFramesOK",
+        "TxBroadcastFramesOK",
+        "TxPauseFrames",
+        "TxFramesWithDeferredXmissions",
+        "TxLateCollisions",
+        "TxTotalCollisions",
+        "TxFramesAbortedDueToXSCollisions",
+        "TxUnderrun",
+        "TxLengthErrors",
+        "TxInternalMACXmitError",
+        "TxFramesWithExcessiveDeferral",
+        "TxFCSErrors",
+
+        "RxOctetsOK",
+        "RxOctetsBad",
+        "RxUnicastFramesOK",
+        "RxMulticastFramesOK",
+        "RxBroadcastFramesOK",
+        "RxPauseFrames",
+        "RxFCSErrors",
+        "RxAlignErrors",
+        "RxSymbolErrors",
+        "RxDataErrors",
+        "RxSequenceErrors",
+        "RxRuntErrors",
+        "RxJabberErrors",
+        "RxInternalMACRcvError",
+        "RxInRangeLengthErrors",
+        "RxOutOfRangeLengthField",
+        "RxFrameTooLongErrors",
+
+        "TSO",
+        "VLANextractions",
+        "VLANinsertions",
+        "RxCsumGood",
+        "TxCsumOffload",
+        "RxDrops"
+
+        "respQ_empty",
+        "respQ_overflow",
+        "freelistQ_empty",
+        "pkt_too_big",
+        "pkt_mismatch",
+        "cmdQ_full0",
+        "cmdQ_full1",
+        "tx_ipfrags",
+        "tx_reg_pkts",
+        "tx_lso_pkts",
+        "tx_do_cksum",
+        
+        "espi_DIP2ParityErr",
+        "espi_DIP4Err",
+        "espi_RxDrops",
+        "espi_TxDrops",
+        "espi_RxOvfl",
+        "espi_ParityErr"
+};
+ 
+#define T2_REGMAP_SIZE (3 * 1024)
+
+static int get_regs_len(struct net_device *dev)
+{
+        return T2_REGMAP_SIZE;
+}
+
+static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+        struct adapter *adapter = dev->priv;
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+        strcpy(info->fw_version, "N/A");
+        strcpy(info->bus_info, pci_name(adapter->pdev));
+}
+
+static int get_stats_count(struct net_device *dev)
+{
+        return ARRAY_SIZE(stats_strings);
+}
+
+static void get_strings(struct net_device *dev, u32 stringset, u8 *data)
+{
+        if (stringset == ETH_SS_STATS)
+                memcpy(data, stats_strings, sizeof(stats_strings));
+}
+
+static void get_stats(struct net_device *dev, struct ethtool_stats *stats,
+                      u64 *data)
+{
+        struct adapter *adapter = dev->priv;
+        struct cmac *mac = adapter->port[dev->if_port].mac;
+        const struct cmac_statistics *s;
+        const struct sge_port_stats *ss;
+        const struct sge_intr_counts *t;
+
+        s = mac->ops->statistics_update(mac, MAC_STATS_UPDATE_FULL);
+        ss = t1_sge_get_port_stats(adapter->sge, dev->if_port);
+        t = t1_sge_get_intr_counts(adapter->sge);
+
+        *data++ = s->TxOctetsOK;
+        *data++ = s->TxOctetsBad;
+        *data++ = s->TxUnicastFramesOK;
+        *data++ = s->TxMulticastFramesOK;
+        *data++ = s->TxBroadcastFramesOK;
+        *data++ = s->TxPauseFrames;
+        *data++ = s->TxFramesWithDeferredXmissions;
+        *data++ = s->TxLateCollisions;
+        *data++ = s->TxTotalCollisions;
+        *data++ = s->TxFramesAbortedDueToXSCollisions;
+        *data++ = s->TxUnderrun;
+        *data++ = s->TxLengthErrors;
+        *data++ = s->TxInternalMACXmitError;
+        *data++ = s->TxFramesWithExcessiveDeferral;
+        *data++ = s->TxFCSErrors;
+
+        *data++ = s->RxOctetsOK;
+        *data++ = s->RxOctetsBad;
+        *data++ = s->RxUnicastFramesOK;
+        *data++ = s->RxMulticastFramesOK;
+        *data++ = s->RxBroadcastFramesOK;
+        *data++ = s->RxPauseFrames;
+        *data++ = s->RxFCSErrors;
+        *data++ = s->RxAlignErrors;
+        *data++ = s->RxSymbolErrors;
+        *data++ = s->RxDataErrors;
+        *data++ = s->RxSequenceErrors;
+        *data++ = s->RxRuntErrors;
+        *data++ = s->RxJabberErrors;
+        *data++ = s->RxInternalMACRcvError;
+        *data++ = s->RxInRangeLengthErrors;
+        *data++ = s->RxOutOfRangeLengthField;
+        *data++ = s->RxFrameTooLongErrors;
+
+        *data++ = ss->tso;
+        *data++ = ss->vlan_xtract;
+        *data++ = ss->vlan_insert;
+        *data++ = ss->rx_cso_good;
+        *data++ = ss->tx_cso;
+        *data++ = ss->rx_drops;
+
+        *data++ = (u64)t->respQ_empty;
+        *data++ = (u64)t->respQ_overflow;
+        *data++ = (u64)t->freelistQ_empty;
+        *data++ = (u64)t->pkt_too_big;
+        *data++ = (u64)t->pkt_mismatch;
+        *data++ = (u64)t->cmdQ_full[0];
+        *data++ = (u64)t->cmdQ_full[1];
+        *data++ = (u64)t->tx_ipfrags;
+        *data++ = (u64)t->tx_reg_pkts;
+        *data++ = (u64)t->tx_lso_pkts;
+        *data++ = (u64)t->tx_do_cksum;
+}
+
+static inline void reg_block_dump(struct adapter *ap, void *buf,
+                                  unsigned int start, unsigned int end)
+{
+        u32 *p = buf + start;
+
+        for ( ; start <= end; start += sizeof(u32))
+                *p++ = readl(ap->regs + start);
+}
+
+static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
+                     void *buf)
+{
+        struct adapter *ap = dev->priv;
+
+        /*
+         * Version scheme: bits 0..9: chip version, bits 10..15: chip revision
+         */
+        regs->version = 2;
+
+        memset(buf, 0, T2_REGMAP_SIZE);
+        reg_block_dump(ap, buf, 0, A_SG_RESPACCUTIMER);
+}
+
+static int get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct adapter *adapter = dev->priv;
+        struct port_info *p = &adapter->port[dev->if_port];
+
+        cmd->supported = p->link_config.supported;
+        cmd->advertising = p->link_config.advertising;
+
+        if (netif_carrier_ok(dev)) {
+                cmd->speed = p->link_config.speed;
+                cmd->duplex = p->link_config.duplex;
+        } else {
+                cmd->speed = -1;
+                cmd->duplex = -1;
+        }
+
+        cmd->port = (cmd->supported & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE;
+        cmd->phy_address = p->phy->addr;
+        cmd->transceiver = XCVR_EXTERNAL;
+        cmd->autoneg = p->link_config.autoneg;
+        cmd->maxtxpkt = 0;
+        cmd->maxrxpkt = 0;
+        return 0;
+}
+
+static int speed_duplex_to_caps(int speed, int duplex)
+{
+        int cap = 0;
+
+        switch (speed) {
+        case SPEED_10:
+                if (duplex == DUPLEX_FULL)
+                        cap = SUPPORTED_10baseT_Full;
+                else
+                        cap = SUPPORTED_10baseT_Half;
+                break;
+        case SPEED_100:
+                if (duplex == DUPLEX_FULL)
+                        cap = SUPPORTED_100baseT_Full;
+                else
+                        cap = SUPPORTED_100baseT_Half;
+                break;
+        case SPEED_1000:
+                if (duplex == DUPLEX_FULL)
+                        cap = SUPPORTED_1000baseT_Full;
+                else
+                        cap = SUPPORTED_1000baseT_Half;
+                break;
+        case SPEED_10000:
+                if (duplex == DUPLEX_FULL)
+                        cap = SUPPORTED_10000baseT_Full;
+        }
+        return cap;
+}
+
+#define ADVERTISED_MASK (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full | \
+                      ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full | \
+                      ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full | \
+                      ADVERTISED_10000baseT_Full)
+
+static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct adapter *adapter = dev->priv;
+        struct port_info *p = &adapter->port[dev->if_port];
+        struct link_config *lc = &p->link_config;
+
+        if (!(lc->supported & SUPPORTED_Autoneg))
+                return -EOPNOTSUPP;             /* can't change speed/duplex */
+
+        if (cmd->autoneg == AUTONEG_DISABLE) {
+                int cap = speed_duplex_to_caps(cmd->speed, cmd->duplex);
+
+                if (!(lc->supported & cap) || cmd->speed == SPEED_1000)
+                        return -EINVAL;
+                lc->requested_speed = cmd->speed;
+                lc->requested_duplex = cmd->duplex;
+                lc->advertising = 0;
+        } else {
+                cmd->advertising &= ADVERTISED_MASK;
+                if (cmd->advertising & (cmd->advertising - 1))
+                        cmd->advertising = lc->supported;
+                cmd->advertising &= lc->supported;
+                if (!cmd->advertising)
+                        return -EINVAL;
+                lc->requested_speed = SPEED_INVALID;
+                lc->requested_duplex = DUPLEX_INVALID;
+                lc->advertising = cmd->advertising | ADVERTISED_Autoneg;
+        }
+        lc->autoneg = cmd->autoneg;
+        if (netif_running(dev))
+                t1_link_start(p->phy, p->mac, lc);
+        return 0;
+}
+
+static void get_pauseparam(struct net_device *dev,
+                           struct ethtool_pauseparam *epause)
+{
+        struct adapter *adapter = dev->priv;
+        struct port_info *p = &adapter->port[dev->if_port];
+
+        epause->autoneg = (p->link_config.requested_fc & PAUSE_AUTONEG) != 0;
+        epause->rx_pause = (p->link_config.fc & PAUSE_RX) != 0;
+        epause->tx_pause = (p->link_config.fc & PAUSE_TX) != 0;
+}
+
+static int set_pauseparam(struct net_device *dev,
+                          struct ethtool_pauseparam *epause)
+{
+        struct adapter *adapter = dev->priv;
+        struct port_info *p = &adapter->port[dev->if_port];
+        struct link_config *lc = &p->link_config;
+
+        if (epause->autoneg == AUTONEG_DISABLE)
+                lc->requested_fc = 0;
+        else if (lc->supported & SUPPORTED_Autoneg)
+                lc->requested_fc = PAUSE_AUTONEG;
+        else
+                return -EINVAL;
+
+        if (epause->rx_pause)
+                lc->requested_fc |= PAUSE_RX;
+        if (epause->tx_pause)
+                lc->requested_fc |= PAUSE_TX;
+        if (lc->autoneg == AUTONEG_ENABLE) {
+                if (netif_running(dev))
+                        t1_link_start(p->phy, p->mac, lc);
+        } else {
+                lc->fc = lc->requested_fc & (PAUSE_RX | PAUSE_TX);
+                if (netif_running(dev))
+                        p->mac->ops->set_speed_duplex_fc(p->mac, -1, -1,
+                                                         lc->fc);
+        }
+        return 0;
+}
+
+static u32 get_rx_csum(struct net_device *dev)
+{
+        struct adapter *adapter = dev->priv;
+
+        return (adapter->flags & RX_CSUM_ENABLED) != 0;
+}
+
+static int set_rx_csum(struct net_device *dev, u32 data)
+{
+        struct adapter *adapter = dev->priv;
+
+        if (data)
+                adapter->flags |= RX_CSUM_ENABLED;
+        else
+                adapter->flags &= ~RX_CSUM_ENABLED;
+        return 0;
+}
+
+static int set_tso(struct net_device *dev, u32 value)
+{
+        struct adapter *adapter = dev->priv;
+
+        if (!(adapter->flags & TSO_CAPABLE))
+                return value ? -EOPNOTSUPP : 0;
+        return ethtool_op_set_tso(dev, value);
+}
+
+static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
+{
+        struct adapter *adapter = dev->priv;
+        int jumbo_fl = t1_is_T1B(adapter) ? 1 : 0;
+
+        e->rx_max_pending = MAX_RX_BUFFERS;
+        e->rx_mini_max_pending = 0;
+        e->rx_jumbo_max_pending = MAX_RX_JUMBO_BUFFERS;
+        e->tx_max_pending = MAX_CMDQ_ENTRIES;
+
+        e->rx_pending = adapter->params.sge.freelQ_size[!jumbo_fl];
+        e->rx_mini_pending = 0;
+        e->rx_jumbo_pending = adapter->params.sge.freelQ_size[jumbo_fl];
+        e->tx_pending = adapter->params.sge.cmdQ_size[0];
+}
+
+static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)
+{
+        struct adapter *adapter = dev->priv;
+        int jumbo_fl = t1_is_T1B(adapter) ? 1 : 0;
+
+        if (e->rx_pending > MAX_RX_BUFFERS || e->rx_mini_pending ||
+            e->rx_jumbo_pending > MAX_RX_JUMBO_BUFFERS ||
+            e->tx_pending > MAX_CMDQ_ENTRIES ||
+            e->rx_pending < MIN_FL_ENTRIES ||
+            e->rx_jumbo_pending < MIN_FL_ENTRIES ||
+            e->tx_pending < (adapter->params.nports + 1) * (MAX_SKB_FRAGS + 1))
+                return -EINVAL;
+
+        if (adapter->flags & FULL_INIT_DONE)
+        return -EBUSY;
+
+        adapter->params.sge.freelQ_size[!jumbo_fl] = e->rx_pending;
+        adapter->params.sge.freelQ_size[jumbo_fl] = e->rx_jumbo_pending;
+        adapter->params.sge.cmdQ_size[0] = e->tx_pending;
+        adapter->params.sge.cmdQ_size[1] = e->tx_pending > MAX_CMDQ1_ENTRIES ?
+                MAX_CMDQ1_ENTRIES : e->tx_pending;
+        return 0;
+}
+
+static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
+{
+        struct adapter *adapter = dev->priv;
+
+        /*
+         * If RX coalescing is requested we use NAPI, otherwise interrupts.
+         * This choice can be made only when all ports and the TOE are off.
+         */
+        if (adapter->open_device_map == 0)
+                adapter->params.sge.polling = c->use_adaptive_rx_coalesce;
+
+        if (adapter->params.sge.polling) {
+                adapter->params.sge.rx_coalesce_usecs = 0;
+        } else {
+                adapter->params.sge.rx_coalesce_usecs = c->rx_coalesce_usecs;
+        }
+        adapter->params.sge.coalesce_enable = c->use_adaptive_rx_coalesce;
+        adapter->params.sge.sample_interval_usecs = c->rate_sample_interval;
+        t1_sge_set_coalesce_params(adapter->sge, &adapter->params.sge);
+        return 0;
+}
+
+static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
+{
+        struct adapter *adapter = dev->priv;
+
+        c->rx_coalesce_usecs = adapter->params.sge.rx_coalesce_usecs;
+        c->rate_sample_interval = adapter->params.sge.sample_interval_usecs;
+        c->use_adaptive_rx_coalesce = adapter->params.sge.coalesce_enable;
+        return 0;
+}
+
+static int get_eeprom_len(struct net_device *dev)
+{
+    return EEPROM_SIZE;
+}
+
+#define EEPROM_MAGIC(ap) \
+        (PCI_VENDOR_ID_CHELSIO | ((ap)->params.chip_version << 16))
+
+static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,
+                      u8 *data)
+{
+        int i;
+        u8 buf[EEPROM_SIZE] __attribute__((aligned(4)));
+        struct adapter *adapter = dev->priv;
+
+        e->magic = EEPROM_MAGIC(adapter);
+        for (i = e->offset & ~3; i < e->offset + e->len; i += sizeof(u32))
+                t1_seeprom_read(adapter, i, (u32 *)&buf[i]);
+        memcpy(data, buf + e->offset, e->len);
+        return 0;
+}
+
+static struct ethtool_ops t1_ethtool_ops = {
+        .get_settings      = get_settings,
+        .set_settings      = set_settings,
+        .get_drvinfo       = get_drvinfo,
+        .get_msglevel      = get_msglevel,
+        .set_msglevel      = set_msglevel,
+        .get_ringparam     = get_sge_param,
+        .set_ringparam     = set_sge_param,
+        .get_coalesce      = get_coalesce,
+        .set_coalesce      = set_coalesce,
+        .get_eeprom_len    = get_eeprom_len,
+        .get_eeprom        = get_eeprom,
+        .get_pauseparam    = get_pauseparam,
+        .set_pauseparam    = set_pauseparam,
+        .get_rx_csum       = get_rx_csum,
+        .set_rx_csum       = set_rx_csum,
+        .get_tx_csum       = ethtool_op_get_tx_csum,
+        .set_tx_csum       = ethtool_op_set_tx_csum,
+        .get_sg            = ethtool_op_get_sg,
+        .set_sg            = ethtool_op_set_sg,
+        .get_link          = ethtool_op_get_link,
+        .get_strings       = get_strings,
+        .get_stats_count   = get_stats_count,
+        .get_ethtool_stats = get_stats,
+        .get_regs_len      = get_regs_len,
+        .get_regs          = get_regs,
+        .get_tso           = ethtool_op_get_tso,
+        .set_tso           = set_tso,
+};
+
+static void cxgb_proc_cleanup(struct adapter *adapter,
+                                        struct proc_dir_entry *dir)
+{
+        const char *name;
+        name = adapter->name;
+        remove_proc_entry(name, dir);
+}
+//#define chtoe_setup_toedev(adapter) NULL
+#define update_mtu_tab(adapter)
+#define write_smt_entry(adapter, idx)
+
+static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
+{
+        struct adapter *adapter = dev->priv;
+        struct mii_ioctl_data *data = if_mii(req);
+
+        switch (cmd) {
+        case SIOCGMIIPHY:
+                data->phy_id = adapter->port[dev->if_port].phy->addr;
+                /* FALLTHRU */
+        case SIOCGMIIREG: {
+                struct cphy *phy = adapter->port[dev->if_port].phy;
+                u32 val;
+
+                if (!phy->mdio_read)
+            return -EOPNOTSUPP;
+                phy->mdio_read(adapter, data->phy_id, 0, data->reg_num & 0x1f,
+                               &val);
+                data->val_out = val;
+                break;
+        }
+        case SIOCSMIIREG: {
+                struct cphy *phy = adapter->port[dev->if_port].phy;
+
+                if (!capable(CAP_NET_ADMIN))
+                    return -EPERM;
+                if (!phy->mdio_write)
+            return -EOPNOTSUPP;
+                phy->mdio_write(adapter, data->phy_id, 0, data->reg_num & 0x1f,
+                                data->val_in);
+                break;
+        }
+
+        default:
+                return -EOPNOTSUPP;
+        }
+        return 0;
+}
+
+static int t1_change_mtu(struct net_device *dev, int new_mtu)
+{
+        int ret;
+        struct adapter *adapter = dev->priv;
+        struct cmac *mac = adapter->port[dev->if_port].mac;
+
+        if (!mac->ops->set_mtu)
+        return -EOPNOTSUPP;
+        if (new_mtu < 68)
+        return -EINVAL;
+        if ((ret = mac->ops->set_mtu(mac, new_mtu)))
+                return ret;
+        dev->mtu = new_mtu;
+        return 0;
+}
+
+static int t1_set_mac_addr(struct net_device *dev, void *p)
+{
+        struct adapter *adapter = dev->priv;
+        struct cmac *mac = adapter->port[dev->if_port].mac;
+        struct sockaddr *addr = p;
+
+        if (!mac->ops->macaddress_set)
+                return -EOPNOTSUPP;
+
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        mac->ops->macaddress_set(mac, dev->dev_addr);
+        return 0;
+}
+
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+static void vlan_rx_register(struct net_device *dev,
+                                   struct vlan_group *grp)
+{
+        struct adapter *adapter = dev->priv;
+
+        spin_lock_irq(&adapter->async_lock);
+        adapter->vlan_grp = grp;
+        t1_set_vlan_accel(adapter, grp != NULL);
+        spin_unlock_irq(&adapter->async_lock);
+}
+
+static void vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
+{
+        struct adapter *adapter = dev->priv;
+
+        spin_lock_irq(&adapter->async_lock);
+        if (adapter->vlan_grp)
+                adapter->vlan_grp->vlan_devices[vid] = NULL;
+        spin_unlock_irq(&adapter->async_lock);
+}
+#endif
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void t1_netpoll(struct net_device *dev)
+{
+        unsigned long flags;
+        struct adapter *adapter = dev->priv;
+
+        local_irq_save(flags);
+        t1_select_intr_handler(adapter)(adapter->pdev->irq, adapter, NULL);
+        local_irq_restore(flags);
+}
+#endif
+
+/*
+ * Periodic accumulation of MAC statistics.  This is used only if the MAC
+ * does not have any other way to prevent stats counter overflow.
+ */
+static void mac_stats_task(void *data)
+{
+        int i;
+        struct adapter *adapter = data;
+
+        for_each_port(adapter, i) {
+                struct port_info *p = &adapter->port[i];
+
+                if (netif_running(p->dev))
+                        p->mac->ops->statistics_update(p->mac,
+                                                       MAC_STATS_UPDATE_FAST);
+        }
+
+        /* Schedule the next statistics update if any port is active. */
+        spin_lock(&adapter->work_lock);
+        if (adapter->open_device_map & PORT_MASK)
+                schedule_mac_stats_update(adapter,
+                                          adapter->params.stats_update_period);
+        spin_unlock(&adapter->work_lock);
+}
+
+/*
+ * Processes elmer0 external interrupts in process context.
+ */
+static void ext_intr_task(void *data)
+{
+        struct adapter *adapter = data;
+
+        elmer0_ext_intr_handler(adapter);
+
+        /* Now reenable external interrupts */
+        spin_lock_irq(&adapter->async_lock);
+        adapter->slow_intr_mask |= F_PL_INTR_EXT;
+        writel(F_PL_INTR_EXT, adapter->regs + A_PL_CAUSE);
+        writel(adapter->slow_intr_mask | F_PL_INTR_SGE_DATA,
+                   adapter->regs + A_PL_ENABLE);
+        spin_unlock_irq(&adapter->async_lock);
+}
+
+/*
+ * Interrupt-context handler for elmer0 external interrupts.
+ */
+void t1_elmer0_ext_intr(struct adapter *adapter)
+{
+        /*
+         * Schedule a task to handle external interrupts as we require
+         * a process context.  We disable EXT interrupts in the interim
+         * and let the task reenable them when it's done.
+         */
+        adapter->slow_intr_mask &= ~F_PL_INTR_EXT;
+        writel(adapter->slow_intr_mask | F_PL_INTR_SGE_DATA,
+                   adapter->regs + A_PL_ENABLE);
+        schedule_work(&adapter->ext_intr_handler_task);
+}
+
+void t1_fatal_err(struct adapter *adapter)
+{
+        if (adapter->flags & FULL_INIT_DONE) {
+                t1_sge_stop(adapter->sge);
+                t1_interrupts_disable(adapter);
+        }
+        CH_ALERT("%s: encountered fatal error, operation suspended\n",
+                 adapter->name);
+}
+
+static int __devinit init_one(struct pci_dev *pdev,
+                              const struct pci_device_id *ent)
+{
+        static int version_printed;
+
+        int i, err, pci_using_dac = 0;
+        unsigned long mmio_start, mmio_len;
+        const struct board_info *bi;
+        struct adapter *adapter = NULL;
+        struct port_info *pi;
+
+        if (!version_printed) {
+                printk(KERN_INFO "%s - version %s\n", DRV_DESCRIPTION,
+                       DRV_VERSION);
+                ++version_printed;
+        }
+
+        err = pci_enable_device(pdev);
+        if (err)
+        return err;
+
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+                CH_ERR("%s: cannot find PCI device memory base address\n",
+                       pci_name(pdev));
+                err = -ENODEV;
+                goto out_disable_pdev;
+        }
+
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+                pci_using_dac = 1;
+
+                if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
+                        CH_ERR("%s: unable to obtain 64-bit DMA for"
+                               "consistent allocations\n", pci_name(pdev));
+                        err = -ENODEV;
+                        goto out_disable_pdev;
+                }
+
+        } else if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
+                CH_ERR("%s: no usable DMA configuration\n", pci_name(pdev));
+                goto out_disable_pdev;
+        }
+
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err) {
+                CH_ERR("%s: cannot obtain PCI resources\n", pci_name(pdev));
+                goto out_disable_pdev;
+        }
+
+        pci_set_master(pdev);
+
+    mmio_start = pci_resource_start(pdev, 0);
+        mmio_len = pci_resource_len(pdev, 0);
+        bi = t1_get_board_info(ent->driver_data);
+
+        for (i = 0; i < bi->port_number; ++i) {
+                struct net_device *netdev;
+
+                netdev = alloc_etherdev(adapter ? 0 : sizeof(*adapter));
+                if (!netdev) {
+                        err = -ENOMEM;
+                        goto out_free_dev;
+                }
+
+                SET_MODULE_OWNER(netdev);
+                SET_NETDEV_DEV(netdev, &pdev->dev);
+
+                if (!adapter) {
+                        adapter = netdev->priv;
+                        adapter->pdev = pdev;
+                        adapter->port[0].dev = netdev;  /* so we don't leak it */
+
+                        adapter->regs = ioremap(mmio_start, mmio_len);
+                        if (!adapter->regs) {
+                                CH_ERR("%s: cannot map device registers\n",
+                                       pci_name(pdev));
+                                err = -ENOMEM;
+                                goto out_free_dev;
+                        }
+
+                        if (t1_get_board_rev(adapter, bi, &adapter->params)) {
+                                err = -ENODEV;    /* Can't handle this chip rev */
+                                goto out_free_dev;
+                        }
+
+                        adapter->name = pci_name(pdev);
+                        adapter->msg_enable = dflt_msg_enable;
+                        adapter->mmio_len = mmio_len;
+
+                        init_MUTEX(&adapter->mib_mutex);
+                        spin_lock_init(&adapter->tpi_lock);
+                        spin_lock_init(&adapter->work_lock);
+                        spin_lock_init(&adapter->async_lock);
+
+                        INIT_WORK(&adapter->ext_intr_handler_task,
+                                  ext_intr_task, adapter);
+                        INIT_WORK(&adapter->stats_update_task, mac_stats_task,
+                                  adapter);
+#ifdef work_struct
+                        init_timer(&adapter->stats_update_timer);
+                        adapter->stats_update_timer.function = mac_stats_timer;
+                        adapter->stats_update_timer.data =
+                                (unsigned long)adapter;
+#endif
+
+                        pci_set_drvdata(pdev, netdev);
+                }
+
+                pi = &adapter->port[i];
+                pi->dev = netdev;
+                netif_carrier_off(netdev);
+                netdev->irq = pdev->irq;
+                netdev->if_port = i;
+                netdev->mem_start = mmio_start;
+                netdev->mem_end = mmio_start + mmio_len - 1;
+                netdev->priv = adapter;
+                netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
+                netdev->features |= NETIF_F_LLTX;
+
+                adapter->flags |= RX_CSUM_ENABLED | TCP_CSUM_CAPABLE;
+                if (pci_using_dac)
+                        netdev->features |= NETIF_F_HIGHDMA;
+                if (vlan_tso_capable(adapter)) {
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+                        adapter->flags |= VLAN_ACCEL_CAPABLE;
+                        netdev->features |=
+                                NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+                        netdev->vlan_rx_register = vlan_rx_register;
+                        netdev->vlan_rx_kill_vid = vlan_rx_kill_vid;
+#endif
+                        adapter->flags |= TSO_CAPABLE;
+                        netdev->features |= NETIF_F_TSO;
+                }
+
+                netdev->open = cxgb_open;
+                netdev->stop = cxgb_close;
+                netdev->hard_start_xmit = t1_start_xmit;
+                netdev->hard_header_len += (adapter->flags & TSO_CAPABLE) ?
+                        sizeof(struct cpl_tx_pkt_lso) :
+                        sizeof(struct cpl_tx_pkt);
+                netdev->get_stats = t1_get_stats;
+                netdev->set_multicast_list = t1_set_rxmode;
+                netdev->do_ioctl = t1_ioctl;
+                netdev->change_mtu = t1_change_mtu;
+                netdev->set_mac_address = t1_set_mac_addr;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+                netdev->poll_controller = t1_netpoll;
+#endif
+                netdev->weight = 64;
+
+        SET_ETHTOOL_OPS(netdev, &t1_ethtool_ops);
+        }
+
+        if (t1_init_sw_modules(adapter, bi) < 0) {
+                err = -ENODEV;
+                goto out_free_dev;
+        }
+
+        /*
+         * The card is now ready to go.  If any errors occur during device
+         * registration we do not fail the whole card but rather proceed only
+         * with the ports we manage to register successfully.  However we must
+         * register at least one net device.
+         */
+        for (i = 0; i < bi->port_number; ++i) {
+                err = register_netdev(adapter->port[i].dev);
+                if (err)
+                        CH_WARN("%s: cannot register net device %s, skipping\n",
+                                pci_name(pdev), adapter->port[i].dev->name);
+                else {
+                        /*
+                         * Change the name we use for messages to the name of
+                         * the first successfully registered interface.
+                         */
+                        if (!adapter->registered_device_map)
+                                adapter->name = adapter->port[i].dev->name;
+
+                __set_bit(i, &adapter->registered_device_map);
+                }
+        }
+        if (!adapter->registered_device_map) {
+                CH_ERR("%s: could not register any net devices\n",
+                       pci_name(pdev));
+                goto out_release_adapter_res;
+        }
+
+        printk(KERN_INFO "%s: %s (rev %d), %s %dMHz/%d-bit\n", adapter->name,
+               bi->desc, adapter->params.chip_revision,
+               adapter->params.pci.is_pcix ? "PCIX" : "PCI",
+               adapter->params.pci.speed, adapter->params.pci.width);
+        return 0;
+
+ out_release_adapter_res:
+        t1_free_sw_modules(adapter);
+ out_free_dev:
+        if (adapter) {
+                if (adapter->regs) iounmap(adapter->regs);
+                for (i = bi->port_number - 1; i >= 0; --i)
+                        if (adapter->port[i].dev) {
+                                cxgb_proc_cleanup(adapter, proc_root_driver);
+                                kfree(adapter->port[i].dev);
+                        }
+        }
+        pci_release_regions(pdev);
+ out_disable_pdev:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        return err;
+}
+
+static inline void t1_sw_reset(struct pci_dev *pdev)
+{
+        pci_write_config_dword(pdev, A_PCICFG_PM_CSR, 3);
+        pci_write_config_dword(pdev, A_PCICFG_PM_CSR, 0);
+}
+
+static void __devexit remove_one(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        if (dev) {
+                int i;
+                struct adapter *adapter = dev->priv;
+
+                for_each_port(adapter, i)
+                        if (test_bit(i, &adapter->registered_device_map))
+                                unregister_netdev(adapter->port[i].dev);
+
+                t1_free_sw_modules(adapter);
+                iounmap(adapter->regs);
+                while (--i >= 0)
+                        if (adapter->port[i].dev) {
+                                cxgb_proc_cleanup(adapter, proc_root_driver);
+                                kfree(adapter->port[i].dev);
+                        }
+                pci_release_regions(pdev);
+                pci_disable_device(pdev);
+                pci_set_drvdata(pdev, NULL);
+                t1_sw_reset(pdev);
+        }
+}
+
+static struct pci_driver driver = {
+        .name     = DRV_NAME,
+        .id_table = t1_pci_tbl,
+        .probe    = init_one,
+        .remove   = __devexit_p(remove_one),
+};
+
+static int __init t1_init_module(void)
+{
+        return pci_module_init(&driver);
+}
+
+static void __exit t1_cleanup_module(void)
+{
+        pci_unregister_driver(&driver);
+}
+
+module_init(t1_init_module);
+module_exit(t1_cleanup_module);
diff --git a/drivers/net/chelsio/elmer0.h b/drivers/net/chelsio/elmer0.h
new file mode 100644
index 000000000000..5590cb2dac19
--- /dev/null
+++ b/drivers/net/chelsio/elmer0.h
@@ -0,0 +1,151 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: elmer0.h                                                            *
+ * $Revision: 1.6 $                                                          *
+ * $Date: 2005/06/21 22:49:43 $                                              *
+ * Description:                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_ELMER0_H_
+#define _CXGB_ELMER0_H_
+
+/* ELMER0 registers */
+#define A_ELMER0_VERSION 0x100000
+#define A_ELMER0_PHY_CFG 0x100004
+#define A_ELMER0_INT_ENABLE 0x100008
+#define A_ELMER0_INT_CAUSE 0x10000c
+#define A_ELMER0_GPI_CFG 0x100010
+#define A_ELMER0_GPI_STAT 0x100014
+#define A_ELMER0_GPO 0x100018
+#define A_ELMER0_PORT0_MI1_CFG 0x400000
+
+#define S_MI1_MDI_ENABLE    0
+#define V_MI1_MDI_ENABLE(x) ((x) << S_MI1_MDI_ENABLE)
+#define F_MI1_MDI_ENABLE    V_MI1_MDI_ENABLE(1U)
+
+#define S_MI1_MDI_INVERT    1
+#define V_MI1_MDI_INVERT(x) ((x) << S_MI1_MDI_INVERT)
+#define F_MI1_MDI_INVERT    V_MI1_MDI_INVERT(1U)
+
+#define S_MI1_PREAMBLE_ENABLE    2
+#define V_MI1_PREAMBLE_ENABLE(x) ((x) << S_MI1_PREAMBLE_ENABLE)
+#define F_MI1_PREAMBLE_ENABLE    V_MI1_PREAMBLE_ENABLE(1U)
+
+#define S_MI1_SOF    3
+#define M_MI1_SOF    0x3
+#define V_MI1_SOF(x) ((x) << S_MI1_SOF)
+#define G_MI1_SOF(x) (((x) >> S_MI1_SOF) & M_MI1_SOF)
+
+#define S_MI1_CLK_DIV    5
+#define M_MI1_CLK_DIV    0xff
+#define V_MI1_CLK_DIV(x) ((x) << S_MI1_CLK_DIV)
+#define G_MI1_CLK_DIV(x) (((x) >> S_MI1_CLK_DIV) & M_MI1_CLK_DIV)
+
+#define A_ELMER0_PORT0_MI1_ADDR 0x400004
+
+#define S_MI1_REG_ADDR    0
+#define M_MI1_REG_ADDR    0x1f
+#define V_MI1_REG_ADDR(x) ((x) << S_MI1_REG_ADDR)
+#define G_MI1_REG_ADDR(x) (((x) >> S_MI1_REG_ADDR) & M_MI1_REG_ADDR)
+
+#define S_MI1_PHY_ADDR    5
+#define M_MI1_PHY_ADDR    0x1f
+#define V_MI1_PHY_ADDR(x) ((x) << S_MI1_PHY_ADDR)
+#define G_MI1_PHY_ADDR(x) (((x) >> S_MI1_PHY_ADDR) & M_MI1_PHY_ADDR)
+
+#define A_ELMER0_PORT0_MI1_DATA 0x400008
+
+#define S_MI1_DATA    0
+#define M_MI1_DATA    0xffff
+#define V_MI1_DATA(x) ((x) << S_MI1_DATA)
+#define G_MI1_DATA(x) (((x) >> S_MI1_DATA) & M_MI1_DATA)
+
+#define A_ELMER0_PORT0_MI1_OP 0x40000c
+
+#define S_MI1_OP    0
+#define M_MI1_OP    0x3
+#define V_MI1_OP(x) ((x) << S_MI1_OP)
+#define G_MI1_OP(x) (((x) >> S_MI1_OP) & M_MI1_OP)
+
+#define S_MI1_ADDR_AUTOINC    2
+#define V_MI1_ADDR_AUTOINC(x) ((x) << S_MI1_ADDR_AUTOINC)
+#define F_MI1_ADDR_AUTOINC    V_MI1_ADDR_AUTOINC(1U)
+
+#define S_MI1_OP_BUSY    31
+#define V_MI1_OP_BUSY(x) ((x) << S_MI1_OP_BUSY)
+#define F_MI1_OP_BUSY    V_MI1_OP_BUSY(1U)
+
+#define A_ELMER0_PORT1_MI1_CFG 0x500000
+#define A_ELMER0_PORT1_MI1_ADDR 0x500004
+#define A_ELMER0_PORT1_MI1_DATA 0x500008
+#define A_ELMER0_PORT1_MI1_OP 0x50000c
+#define A_ELMER0_PORT2_MI1_CFG 0x600000
+#define A_ELMER0_PORT2_MI1_ADDR 0x600004
+#define A_ELMER0_PORT2_MI1_DATA 0x600008
+#define A_ELMER0_PORT2_MI1_OP 0x60000c
+#define A_ELMER0_PORT3_MI1_CFG 0x700000
+#define A_ELMER0_PORT3_MI1_ADDR 0x700004
+#define A_ELMER0_PORT3_MI1_DATA 0x700008
+#define A_ELMER0_PORT3_MI1_OP 0x70000c
+
+/* Simple bit definition for GPI and GP0 registers. */
+#define     ELMER0_GP_BIT0              0x0001
+#define     ELMER0_GP_BIT1              0x0002
+#define     ELMER0_GP_BIT2              0x0004
+#define     ELMER0_GP_BIT3              0x0008
+#define     ELMER0_GP_BIT4              0x0010
+#define     ELMER0_GP_BIT5              0x0020
+#define     ELMER0_GP_BIT6              0x0040
+#define     ELMER0_GP_BIT7              0x0080
+#define     ELMER0_GP_BIT8              0x0100
+#define     ELMER0_GP_BIT9              0x0200
+#define     ELMER0_GP_BIT10             0x0400
+#define     ELMER0_GP_BIT11             0x0800
+#define     ELMER0_GP_BIT12             0x1000
+#define     ELMER0_GP_BIT13             0x2000
+#define     ELMER0_GP_BIT14             0x4000
+#define     ELMER0_GP_BIT15             0x8000
+#define     ELMER0_GP_BIT16             0x10000
+#define     ELMER0_GP_BIT17             0x20000
+#define     ELMER0_GP_BIT18             0x40000
+#define     ELMER0_GP_BIT19             0x80000
+
+#define MI1_OP_DIRECT_WRITE 1
+#define MI1_OP_DIRECT_READ  2
+
+#define MI1_OP_INDIRECT_ADDRESS  0
+#define MI1_OP_INDIRECT_WRITE    1
+#define MI1_OP_INDIRECT_READ_INC 2
+#define MI1_OP_INDIRECT_READ     3
+
+#endif /* _CXGB_ELMER0_H_ */
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c
new file mode 100644
index 000000000000..230642571c92
--- /dev/null
+++ b/drivers/net/chelsio/espi.c
@@ -0,0 +1,346 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: espi.c                                                              *
+ * $Revision: 1.14 $                                                         *
+ * $Date: 2005/05/14 00:59:32 $                                              *
+ * Description:                                                              *
+ *  Ethernet SPI functionality.                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#include "common.h"
+#include "regs.h"
+#include "espi.h"
+
+struct peespi {
+        adapter_t *adapter;
+        struct espi_intr_counts intr_cnt;
+        u32 misc_ctrl;
+        spinlock_t lock;
+};
+
+#define ESPI_INTR_MASK (F_DIP4ERR | F_RXDROP | F_TXDROP | F_RXOVERFLOW | \
+                        F_RAMPARITYERR | F_DIP2PARITYERR)
+#define MON_MASK  (V_MONITORED_PORT_NUM(3) | F_MONITORED_DIRECTION \
+                   | F_MONITORED_INTERFACE)
+
+#define TRICN_CNFG 14
+#define TRICN_CMD_READ  0x11
+#define TRICN_CMD_WRITE 0x21
+#define TRICN_CMD_ATTEMPTS 10
+
+static int tricn_write(adapter_t *adapter, int bundle_addr, int module_addr,
+                       int ch_addr, int reg_offset, u32 wr_data)
+{
+        int busy, attempts = TRICN_CMD_ATTEMPTS;
+
+        writel(V_WRITE_DATA(wr_data) |
+               V_REGISTER_OFFSET(reg_offset) |
+               V_CHANNEL_ADDR(ch_addr) | V_MODULE_ADDR(module_addr) |
+               V_BUNDLE_ADDR(bundle_addr) |
+               V_SPI4_COMMAND(TRICN_CMD_WRITE),
+               adapter->regs + A_ESPI_CMD_ADDR);
+        writel(0, adapter->regs + A_ESPI_GOSTAT);
+
+        do {
+                busy = readl(adapter->regs + A_ESPI_GOSTAT) & F_ESPI_CMD_BUSY;
+        } while (busy && --attempts);
+
+        if (busy)
+                CH_ERR("%s: TRICN write timed out\n", adapter->name);
+
+        return busy;
+}
+
+/* 1. Deassert rx_reset_core. */
+/* 2. Program TRICN_CNFG registers. */
+/* 3. Deassert rx_reset_link */
+static int tricn_init(adapter_t *adapter)
+{
+        int     i               = 0;
+        int     sme             = 1;
+        int     stat            = 0;
+        int     timeout         = 0;
+        int     is_ready        = 0;
+        int     dynamic_deskew  = 0;
+
+        if (dynamic_deskew)
+                sme = 0;
+
+
+        /* 1 */
+        timeout=1000;
+        do {
+                stat = readl(adapter->regs + A_ESPI_RX_RESET);
+                is_ready = (stat & 0x4);
+                timeout--;
+                udelay(5);
+        } while (!is_ready || (timeout==0));
+        writel(0x2, adapter->regs + A_ESPI_RX_RESET);
+        if (timeout==0)
+        {
+                CH_ERR("ESPI : ERROR : Timeout tricn_init() \n");
+                t1_fatal_err(adapter);
+        }
+
+        /* 2 */
+        if (sme) {
+                tricn_write(adapter, 0, 0, 0, TRICN_CNFG, 0x81);
+                tricn_write(adapter, 0, 1, 0, TRICN_CNFG, 0x81);
+                tricn_write(adapter, 0, 2, 0, TRICN_CNFG, 0x81);
+        }
+        for (i=1; i<= 8; i++) tricn_write(adapter, 0, 0, i, TRICN_CNFG, 0xf1);
+        for (i=1; i<= 2; i++) tricn_write(adapter, 0, 1, i, TRICN_CNFG, 0xf1);
+        for (i=1; i<= 3; i++) tricn_write(adapter, 0, 2, i, TRICN_CNFG, 0xe1);
+        for (i=4; i<= 4; i++) tricn_write(adapter, 0, 2, i, TRICN_CNFG, 0xf1);
+        for (i=5; i<= 5; i++) tricn_write(adapter, 0, 2, i, TRICN_CNFG, 0xe1);
+        for (i=6; i<= 6; i++) tricn_write(adapter, 0, 2, i, TRICN_CNFG, 0xf1);
+        for (i=7; i<= 7; i++) tricn_write(adapter, 0, 2, i, TRICN_CNFG, 0x80);
+        for (i=8; i<= 8; i++) tricn_write(adapter, 0, 2, i, TRICN_CNFG, 0xf1);
+
+        /* 3 */
+        writel(0x3, adapter->regs + A_ESPI_RX_RESET);
+
+        return 0;
+}
+
+void t1_espi_intr_enable(struct peespi *espi)
+{
+        u32 enable, pl_intr = readl(espi->adapter->regs + A_PL_ENABLE);
+
+        /*
+         * Cannot enable ESPI interrupts on T1B because HW asserts the
+         * interrupt incorrectly, namely the driver gets ESPI interrupts
+         * but no data is actually dropped (can verify this reading the ESPI
+         * drop registers).  Also, once the ESPI interrupt is asserted it
+         * cannot be cleared (HW bug).
+         */
+        enable = t1_is_T1B(espi->adapter) ? 0 : ESPI_INTR_MASK;
+        writel(enable, espi->adapter->regs + A_ESPI_INTR_ENABLE);
+        writel(pl_intr | F_PL_INTR_ESPI, espi->adapter->regs + A_PL_ENABLE);
+}
+
+void t1_espi_intr_clear(struct peespi *espi)
+{
+        writel(0xffffffff, espi->adapter->regs + A_ESPI_INTR_STATUS);
+        writel(F_PL_INTR_ESPI, espi->adapter->regs + A_PL_CAUSE);
+}
+
+void t1_espi_intr_disable(struct peespi *espi)
+{
+        u32 pl_intr = readl(espi->adapter->regs + A_PL_ENABLE);
+
+        writel(0, espi->adapter->regs + A_ESPI_INTR_ENABLE);
+        writel(pl_intr & ~F_PL_INTR_ESPI, espi->adapter->regs + A_PL_ENABLE);
+}
+
+int t1_espi_intr_handler(struct peespi *espi)
+{
+        u32 cnt;
+        u32 status = readl(espi->adapter->regs + A_ESPI_INTR_STATUS);
+
+        if (status & F_DIP4ERR)
+                espi->intr_cnt.DIP4_err++;
+        if (status & F_RXDROP)
+                espi->intr_cnt.rx_drops++;
+        if (status & F_TXDROP)
+                espi->intr_cnt.tx_drops++;
+        if (status & F_RXOVERFLOW)
+                espi->intr_cnt.rx_ovflw++;
+        if (status & F_RAMPARITYERR)
+                espi->intr_cnt.parity_err++;
+        if (status & F_DIP2PARITYERR) {
+                espi->intr_cnt.DIP2_parity_err++;
+
+                /*
+                 * Must read the error count to clear the interrupt
+                 * that it causes.
+                 */
+                cnt = readl(espi->adapter->regs + A_ESPI_DIP2_ERR_COUNT);
+        }
+
+        /*
+         * For T1B we need to write 1 to clear ESPI interrupts.  For T2+ we
+         * write the status as is.
+         */
+        if (status && t1_is_T1B(espi->adapter))
+                status = 1;
+        writel(status, espi->adapter->regs + A_ESPI_INTR_STATUS);
+        return 0;
+}
+
+const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi)
+{
+    return &espi->intr_cnt;
+}
+
+static void espi_setup_for_pm3393(adapter_t *adapter)
+{
+        u32 wmark = t1_is_T1B(adapter) ? 0x4000 : 0x3200;
+
+        writel(0x1f4, adapter->regs + A_ESPI_SCH_TOKEN0);
+        writel(0x1f4, adapter->regs + A_ESPI_SCH_TOKEN1);
+        writel(0x1f4, adapter->regs + A_ESPI_SCH_TOKEN2);
+        writel(0x1f4, adapter->regs + A_ESPI_SCH_TOKEN3);
+        writel(0x100, adapter->regs + A_ESPI_RX_FIFO_ALMOST_EMPTY_WATERMARK);
+        writel(wmark, adapter->regs + A_ESPI_RX_FIFO_ALMOST_FULL_WATERMARK);
+        writel(3, adapter->regs + A_ESPI_CALENDAR_LENGTH);
+        writel(0x08000008, adapter->regs + A_ESPI_TRAIN);
+        writel(V_RX_NPORTS(1) | V_TX_NPORTS(1), adapter->regs + A_PORT_CONFIG);
+}
+
+/* T2 Init part --  */
+/* 1. Set T_ESPI_MISCCTRL_ADDR */
+/* 2. Init ESPI registers. */
+/* 3. Init TriCN Hard Macro */
+int t1_espi_init(struct peespi *espi, int mac_type, int nports)
+{
+        u32 cnt;
+
+        u32 status_enable_extra = 0;
+        adapter_t *adapter = espi->adapter;
+        u32 status, burstval = 0x800100;
+
+        /* Disable ESPI training.  MACs that can handle it enable it below. */
+        writel(0, adapter->regs + A_ESPI_TRAIN);
+
+        if (is_T2(adapter)) {
+                writel(V_OUT_OF_SYNC_COUNT(4) |
+                       V_DIP2_PARITY_ERR_THRES(3) |
+                       V_DIP4_THRES(1), adapter->regs + A_ESPI_MISC_CONTROL);
+                if (nports == 4) {
+                        /* T204: maxburst1 = 0x40, maxburst2 = 0x20 */
+                        burstval = 0x200040;
+                }
+        }
+        writel(burstval, adapter->regs + A_ESPI_MAXBURST1_MAXBURST2);
+
+        switch (mac_type) {
+        case CHBT_MAC_PM3393:
+                espi_setup_for_pm3393(adapter);
+                break;
+        default:
+                return -1;
+        }
+
+        /*
+         * Make sure any pending interrupts from the SPI are
+         * Cleared before enabling the interrupt.
+         */
+        writel(ESPI_INTR_MASK, espi->adapter->regs + A_ESPI_INTR_ENABLE);
+        status = readl(espi->adapter->regs + A_ESPI_INTR_STATUS);
+        if (status & F_DIP2PARITYERR) {
+                cnt = readl(espi->adapter->regs + A_ESPI_DIP2_ERR_COUNT);
+        }
+
+        /*
+         * For T1B we need to write 1 to clear ESPI interrupts.  For T2+ we
+         * write the status as is.
+         */
+        if (status && t1_is_T1B(espi->adapter))
+                status = 1;
+        writel(status, espi->adapter->regs + A_ESPI_INTR_STATUS);
+
+        writel(status_enable_extra | F_RXSTATUSENABLE,
+               adapter->regs + A_ESPI_FIFO_STATUS_ENABLE);
+
+        if (is_T2(adapter)) {
+                tricn_init(adapter);
+                /*
+                 * Always position the control at the 1st port egress IN
+                 * (sop,eop) counter to reduce PIOs for T/N210 workaround.
+                 */
+                espi->misc_ctrl = (readl(adapter->regs + A_ESPI_MISC_CONTROL)
+                                   & ~MON_MASK) | (F_MONITORED_DIRECTION
+                                   | F_MONITORED_INTERFACE);
+                writel(espi->misc_ctrl, adapter->regs + A_ESPI_MISC_CONTROL);
+                spin_lock_init(&espi->lock);
+        }
+
+        return 0;
+}
+
+void t1_espi_destroy(struct peespi *espi)
+{
+        kfree(espi);
+}
+
+struct peespi *t1_espi_create(adapter_t *adapter)
+{
+        struct peespi *espi = kmalloc(sizeof(*espi), GFP_KERNEL);
+
+        memset(espi, 0, sizeof(*espi));
+
+        if (espi)
+                espi->adapter = adapter;
+        return espi;
+}
+
+void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val)
+{
+        struct peespi *espi = adapter->espi;
+
+        if (!is_T2(adapter))
+                return;
+        spin_lock(&espi->lock);
+        espi->misc_ctrl = (val & ~MON_MASK) |
+                          (espi->misc_ctrl & MON_MASK);
+        writel(espi->misc_ctrl, adapter->regs + A_ESPI_MISC_CONTROL);
+        spin_unlock(&espi->lock);
+}
+
+u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait)
+{
+        u32 sel;
+
+        struct peespi *espi = adapter->espi;
+
+        if (!is_T2(adapter))
+                return 0;
+        sel = V_MONITORED_PORT_NUM((addr & 0x3c) >> 2);
+        if (!wait) {
+                if (!spin_trylock(&espi->lock))
+                        return 0;
+        }
+        else
+                spin_lock(&espi->lock);
+        if ((sel != (espi->misc_ctrl & MON_MASK))) {
+                writel(((espi->misc_ctrl & ~MON_MASK) | sel),
+                       adapter->regs + A_ESPI_MISC_CONTROL);
+                sel = readl(adapter->regs + A_ESPI_SCH_TOKEN3);
+                writel(espi->misc_ctrl, adapter->regs + A_ESPI_MISC_CONTROL);
+        }
+        else
+                sel = readl(adapter->regs + A_ESPI_SCH_TOKEN3);
+        spin_unlock(&espi->lock);
+        return sel;
+}
diff --git a/drivers/net/chelsio/espi.h b/drivers/net/chelsio/espi.h
new file mode 100644
index 000000000000..c90e37f8457c
--- /dev/null
+++ b/drivers/net/chelsio/espi.h
@@ -0,0 +1,68 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: espi.h                                                              *
+ * $Revision: 1.7 $                                                          *
+ * $Date: 2005/06/21 18:29:47 $                                              *
+ * Description:                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_ESPI_H_
+#define _CXGB_ESPI_H_
+
+#include "common.h"
+
+struct espi_intr_counts {
+        unsigned int DIP4_err;
+        unsigned int rx_drops;
+        unsigned int tx_drops;
+        unsigned int rx_ovflw;
+        unsigned int parity_err;
+        unsigned int DIP2_parity_err;
+};
+
+struct peespi;
+
+struct peespi *t1_espi_create(adapter_t *adapter);
+void t1_espi_destroy(struct peespi *espi);
+int t1_espi_init(struct peespi *espi, int mac_type, int nports);
+
+void t1_espi_intr_enable(struct peespi *);
+void t1_espi_intr_clear(struct peespi *);
+void t1_espi_intr_disable(struct peespi *);
+int t1_espi_intr_handler(struct peespi *);
+const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi);
+
+void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val);
+u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait);
+
+#endif /* _CXGB_ESPI_H_ */
diff --git a/drivers/net/chelsio/gmac.h b/drivers/net/chelsio/gmac.h
new file mode 100644
index 000000000000..746b0eeea964
--- /dev/null
+++ b/drivers/net/chelsio/gmac.h
@@ -0,0 +1,134 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: gmac.h                                                              *
+ * $Revision: 1.6 $                                                          *
+ * $Date: 2005/06/21 18:29:47 $                                              *
+ * Description:                                                              *
+ *  Generic MAC functionality.                                               *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_GMAC_H_
+#define _CXGB_GMAC_H_
+
+#include "common.h"
+
+enum { MAC_STATS_UPDATE_FAST, MAC_STATS_UPDATE_FULL };
+enum { MAC_DIRECTION_RX = 1, MAC_DIRECTION_TX = 2 };
+
+struct cmac_statistics {
+        /* Transmit */
+        u64 TxOctetsOK;
+        u64 TxOctetsBad;
+        u64 TxUnicastFramesOK;
+        u64 TxMulticastFramesOK;
+        u64 TxBroadcastFramesOK;
+        u64 TxPauseFrames;
+        u64 TxFramesWithDeferredXmissions;
+        u64 TxLateCollisions;
+        u64 TxTotalCollisions;
+        u64 TxFramesAbortedDueToXSCollisions;
+        u64 TxUnderrun;
+        u64 TxLengthErrors;
+        u64 TxInternalMACXmitError;
+        u64 TxFramesWithExcessiveDeferral;
+        u64 TxFCSErrors;
+
+        /* Receive */
+        u64 RxOctetsOK;
+        u64 RxOctetsBad;
+        u64 RxUnicastFramesOK;
+        u64 RxMulticastFramesOK;
+        u64 RxBroadcastFramesOK;
+        u64 RxPauseFrames;
+        u64 RxFCSErrors;
+        u64 RxAlignErrors;
+        u64 RxSymbolErrors;
+        u64 RxDataErrors;
+        u64 RxSequenceErrors;
+        u64 RxRuntErrors;
+        u64 RxJabberErrors;
+        u64 RxInternalMACRcvError;
+        u64 RxInRangeLengthErrors;
+        u64 RxOutOfRangeLengthField;
+        u64 RxFrameTooLongErrors;
+};
+
+struct cmac_ops {
+        void (*destroy)(struct cmac *);
+        int (*reset)(struct cmac *);
+        int (*interrupt_enable)(struct cmac *);
+        int (*interrupt_disable)(struct cmac *);
+        int (*interrupt_clear)(struct cmac *);
+        int (*interrupt_handler)(struct cmac *);
+
+        int (*enable)(struct cmac *, int);
+        int (*disable)(struct cmac *, int);
+
+        int (*loopback_enable)(struct cmac *);
+        int (*loopback_disable)(struct cmac *);
+
+        int (*set_mtu)(struct cmac *, int mtu);
+        int (*set_rx_mode)(struct cmac *, struct t1_rx_mode *rm);
+
+        int (*set_speed_duplex_fc)(struct cmac *, int speed, int duplex, int fc);
+        int (*get_speed_duplex_fc)(struct cmac *, int *speed, int *duplex,
+                                   int *fc);
+
+        const struct cmac_statistics *(*statistics_update)(struct cmac *, int);
+
+        int (*macaddress_get)(struct cmac *, u8 mac_addr[6]);
+        int (*macaddress_set)(struct cmac *, u8 mac_addr[6]);
+};
+
+typedef struct _cmac_instance cmac_instance;
+
+struct cmac {
+        struct cmac_statistics stats;
+        adapter_t *adapter;
+        struct cmac_ops *ops;
+        cmac_instance *instance;
+};
+
+struct gmac {
+        unsigned int stats_update_period;
+        struct cmac *(*create)(adapter_t *adapter, int index);
+        int (*reset)(adapter_t *);
+};
+
+extern struct gmac t1_pm3393_ops;
+extern struct gmac t1_chelsio_mac_ops;
+extern struct gmac t1_vsc7321_ops;
+extern struct gmac t1_ixf1010_ops;
+extern struct gmac t1_dummy_mac_ops;
+
+#endif /* _CXGB_GMAC_H_ */
diff --git a/drivers/net/chelsio/mv88x201x.c b/drivers/net/chelsio/mv88x201x.c
new file mode 100644
index 000000000000..db5034282782
--- /dev/null
+++ b/drivers/net/chelsio/mv88x201x.c
@@ -0,0 +1,252 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: mv88x201x.c                                                         *
+ * $Revision: 1.12 $                                                         *
+ * $Date: 2005/04/15 19:27:14 $                                              *
+ * Description:                                                              *
+ *  Marvell PHY (mv88x201x) functionality.                                   *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#include "cphy.h"
+#include "elmer0.h"
+
+/*
+ * The 88x2010 Rev C. requires some link status registers * to be read
+ * twice in order to get the right values. Future * revisions will fix
+ * this problem and then this macro * can disappear.
+ */
+#define MV88x2010_LINK_STATUS_BUGS    1
+
+static int led_init(struct cphy *cphy)
+{
+        /* Setup the LED registers so we can turn on/off.
+         * Writing these bits maps control to another
+         * register. mmd(0x1) addr(0x7)
+         */
+        mdio_write(cphy, 0x3, 0x8304, 0xdddd);
+        return 0;
+}
+
+static int led_link(struct cphy *cphy, u32 do_enable)
+{
+        u32 led = 0;
+#define LINK_ENABLE_BIT 0x1
+
+        mdio_read(cphy, 0x1, 0x7, &led);
+
+        if (do_enable & LINK_ENABLE_BIT) {
+                led |= LINK_ENABLE_BIT;
+                mdio_write(cphy, 0x1, 0x7, led);
+        } else {
+                led &= ~LINK_ENABLE_BIT;
+                mdio_write(cphy, 0x1, 0x7, led);
+        }
+        return 0;
+}
+
+/* Port Reset */
+static int mv88x201x_reset(struct cphy *cphy, int wait)
+{
+        /* This can be done through registers.  It is not required since
+         * a full chip reset is used.
+         */
+        return 0;
+}
+
+static int mv88x201x_interrupt_enable(struct cphy *cphy)
+{
+        u32 elmer;
+
+        /* Enable PHY LASI interrupts. */
+        mdio_write(cphy, 0x1, 0x9002, 0x1);
+
+        /* Enable Marvell interrupts through Elmer0. */
+        t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
+        elmer |= ELMER0_GP_BIT6;
+        t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
+        return 0;
+}
+
+static int mv88x201x_interrupt_disable(struct cphy *cphy)
+{
+        u32 elmer;
+
+        /* Disable PHY LASI interrupts. */
+        mdio_write(cphy, 0x1, 0x9002, 0x0);
+
+        /* Disable Marvell interrupts through Elmer0. */
+        t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
+        elmer &= ~ELMER0_GP_BIT6;
+        t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
+        return 0;
+}
+
+static int mv88x201x_interrupt_clear(struct cphy *cphy)
+{
+        u32 elmer;
+        u32 val;
+
+#ifdef MV88x2010_LINK_STATUS_BUGS
+        /* Required to read twice before clear takes affect. */
+        mdio_read(cphy, 0x1, 0x9003, &val);
+        mdio_read(cphy, 0x1, 0x9004, &val);
+        mdio_read(cphy, 0x1, 0x9005, &val);
+
+        /* Read this register after the others above it else
+         * the register doesn't clear correctly.
+         */
+        mdio_read(cphy, 0x1, 0x1, &val);
+#endif
+
+        /* Clear link status. */
+        mdio_read(cphy, 0x1, 0x1, &val);
+        /* Clear PHY LASI interrupts. */
+        mdio_read(cphy, 0x1, 0x9005, &val);
+
+#ifdef MV88x2010_LINK_STATUS_BUGS
+        /* Do it again. */
+        mdio_read(cphy, 0x1, 0x9003, &val);
+        mdio_read(cphy, 0x1, 0x9004, &val);
+#endif
+
+        /* Clear Marvell interrupts through Elmer0. */
+        t1_tpi_read(cphy->adapter, A_ELMER0_INT_CAUSE, &elmer);
+        elmer |= ELMER0_GP_BIT6;
+        t1_tpi_write(cphy->adapter, A_ELMER0_INT_CAUSE, elmer);
+        return 0;
+}
+
+static int mv88x201x_interrupt_handler(struct cphy *cphy)
+{
+        /* Clear interrupts */
+        mv88x201x_interrupt_clear(cphy);
+
+        /* We have only enabled link change interrupts and so
+         * cphy_cause must be a link change interrupt.
+         */
+        return cphy_cause_link_change;
+}
+
+static int mv88x201x_set_loopback(struct cphy *cphy, int on)
+{
+        return 0;
+}
+
+static int mv88x201x_get_link_status(struct cphy *cphy, int *link_ok,
+                                     int *speed, int *duplex, int *fc)
+{
+        u32 val = 0;
+#define LINK_STATUS_BIT 0x4
+
+        if (link_ok) {
+                /* Read link status. */
+                mdio_read(cphy, 0x1, 0x1, &val);
+                val &= LINK_STATUS_BIT;
+                *link_ok = (val == LINK_STATUS_BIT);
+                /* Turn on/off Link LED */
+                led_link(cphy, *link_ok);
+        }
+        if (speed)
+                *speed = SPEED_10000;
+        if (duplex)
+                *duplex = DUPLEX_FULL;
+        if (fc)
+                *fc = PAUSE_RX | PAUSE_TX;
+        return 0;
+}
+
+static void mv88x201x_destroy(struct cphy *cphy)
+{
+        kfree(cphy);
+}
+
+static struct cphy_ops mv88x201x_ops = {
+        .destroy           = mv88x201x_destroy,
+        .reset             = mv88x201x_reset,
+        .interrupt_enable  = mv88x201x_interrupt_enable,
+        .interrupt_disable = mv88x201x_interrupt_disable,
+        .interrupt_clear   = mv88x201x_interrupt_clear,
+        .interrupt_handler = mv88x201x_interrupt_handler,
+        .get_link_status   = mv88x201x_get_link_status,
+        .set_loopback      = mv88x201x_set_loopback,
+};
+
+static struct cphy *mv88x201x_phy_create(adapter_t *adapter, int phy_addr,
+                                         struct mdio_ops *mdio_ops)
+{
+        u32 val;
+        struct cphy *cphy = kmalloc(sizeof(*cphy), GFP_KERNEL);
+
+        if (!cphy)
+                return NULL;
+        memset(cphy, 0, sizeof(*cphy));
+        cphy_init(cphy, adapter, phy_addr, &mv88x201x_ops, mdio_ops);
+
+        /* Commands the PHY to enable XFP's clock. */
+        mdio_read(cphy, 0x3, 0x8300, &val);
+        mdio_write(cphy, 0x3, 0x8300, val | 1);
+
+        /* Clear link status. Required because of a bug in the PHY.  */
+        mdio_read(cphy, 0x1, 0x8, &val);
+        mdio_read(cphy, 0x3, 0x8, &val);
+
+        /* Allows for Link,Ack LED turn on/off */
+        led_init(cphy);
+        return cphy;
+}
+
+/* Chip Reset */
+static int mv88x201x_phy_reset(adapter_t *adapter)
+{
+        u32 val;
+
+        t1_tpi_read(adapter, A_ELMER0_GPO, &val);
+        val &= ~4;
+        t1_tpi_write(adapter, A_ELMER0_GPO, val);
+        msleep(100);
+
+        t1_tpi_write(adapter, A_ELMER0_GPO, val | 4);
+        msleep(1000);
+
+        /* Now lets enable the Laser. Delay 100us */
+        t1_tpi_read(adapter, A_ELMER0_GPO, &val);
+        val |= 0x8000;
+        t1_tpi_write(adapter, A_ELMER0_GPO, val);
+        udelay(100);
+        return 0;
+}
+
+struct gphy t1_mv88x201x_ops = {
+        mv88x201x_phy_create,
+        mv88x201x_phy_reset
+};
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
new file mode 100644
index 000000000000..04a1404fc65e
--- /dev/null
+++ b/drivers/net/chelsio/pm3393.c
@@ -0,0 +1,826 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: pm3393.c                                                            *
+ * $Revision: 1.16 $                                                         *
+ * $Date: 2005/05/14 00:59:32 $                                              *
+ * Description:                                                              *
+ *  PMC/SIERRA (pm3393) MAC-PHY functionality.                               *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#include "common.h"
+#include "regs.h"
+#include "gmac.h"
+#include "elmer0.h"
+#include "suni1x10gexp_regs.h"
+
+/* 802.3ae 10Gb/s MDIO Manageable Device(MMD)
+ */
+enum {
+    MMD_RESERVED,
+    MMD_PMAPMD,
+    MMD_WIS,
+    MMD_PCS,
+    MMD_PHY_XGXS,       /* XGMII Extender Sublayer */
+    MMD_DTE_XGXS,
+};
+
+enum {
+    PHY_XGXS_CTRL_1,
+    PHY_XGXS_STATUS_1
+};
+
+#define OFFSET(REG_ADDR)    (REG_ADDR << 2)
+
+/* Max frame size PM3393 can handle. Includes Ethernet header and CRC. */
+#define MAX_FRAME_SIZE  9600
+
+#define IPG 12
+#define TXXG_CONF1_VAL ((IPG << SUNI1x10GEXP_BITOFF_TXXG_IPGT) | \
+        SUNI1x10GEXP_BITMSK_TXXG_32BIT_ALIGN | SUNI1x10GEXP_BITMSK_TXXG_CRCEN | \
+        SUNI1x10GEXP_BITMSK_TXXG_PADEN)
+#define RXXG_CONF1_VAL (SUNI1x10GEXP_BITMSK_RXXG_PUREP | 0x14 | \
+        SUNI1x10GEXP_BITMSK_RXXG_FLCHK | SUNI1x10GEXP_BITMSK_RXXG_CRC_STRIP)
+
+/* Update statistics every 15 minutes */
+#define STATS_TICK_SECS (15 * 60)
+
+enum {                     /* RMON registers */
+        RxOctetsReceivedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_1_LOW,
+        RxUnicastFramesReceivedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_4_LOW,
+        RxMulticastFramesReceivedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_5_LOW,
+        RxBroadcastFramesReceivedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_6_LOW,
+        RxPAUSEMACCtrlFramesReceived = SUNI1x10GEXP_REG_MSTAT_COUNTER_8_LOW,
+        RxFrameCheckSequenceErrors = SUNI1x10GEXP_REG_MSTAT_COUNTER_10_LOW,
+        RxFramesLostDueToInternalMACErrors = SUNI1x10GEXP_REG_MSTAT_COUNTER_11_LOW,
+        RxSymbolErrors = SUNI1x10GEXP_REG_MSTAT_COUNTER_12_LOW,
+        RxInRangeLengthErrors = SUNI1x10GEXP_REG_MSTAT_COUNTER_13_LOW,
+        RxFramesTooLongErrors = SUNI1x10GEXP_REG_MSTAT_COUNTER_15_LOW,
+        RxJabbers = SUNI1x10GEXP_REG_MSTAT_COUNTER_16_LOW,
+        RxFragments = SUNI1x10GEXP_REG_MSTAT_COUNTER_17_LOW,
+        RxUndersizedFrames =  SUNI1x10GEXP_REG_MSTAT_COUNTER_18_LOW,
+
+        TxOctetsTransmittedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_33_LOW,
+        TxFramesLostDueToInternalMACTransmissionError = SUNI1x10GEXP_REG_MSTAT_COUNTER_35_LOW,
+        TxTransmitSystemError = SUNI1x10GEXP_REG_MSTAT_COUNTER_36_LOW,
+        TxUnicastFramesTransmittedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_38_LOW,
+        TxMulticastFramesTransmittedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_40_LOW,
+        TxBroadcastFramesTransmittedOK = SUNI1x10GEXP_REG_MSTAT_COUNTER_42_LOW,
+        TxPAUSEMACCtrlFramesTransmitted = SUNI1x10GEXP_REG_MSTAT_COUNTER_43_LOW
+};
+
+struct _cmac_instance {
+        u8 enabled;
+        u8 fc;
+        u8 mac_addr[6];
+};
+
+static int pmread(struct cmac *cmac, u32 reg, u32 * data32)
+{
+        t1_tpi_read(cmac->adapter, OFFSET(reg), data32);
+        return 0;
+}
+
+static int pmwrite(struct cmac *cmac, u32 reg, u32 data32)
+{
+        t1_tpi_write(cmac->adapter, OFFSET(reg), data32);
+        return 0;
+}
+
+/* Port reset. */
+static int pm3393_reset(struct cmac *cmac)
+{
+        return 0;
+}
+
+/*
+ * Enable interrupts for the PM3393
+
+        1. Enable PM3393 BLOCK interrupts.
+        2. Enable PM3393 Master Interrupt bit(INTE)
+        3. Enable ELMER's PM3393 bit.
+        4. Enable Terminator external interrupt.
+*/
+static int pm3393_interrupt_enable(struct cmac *cmac)
+{
+        u32 pl_intr;
+
+        /* PM3393 - Enabling all hardware block interrupts.
+         */
+        pmwrite(cmac, SUNI1x10GEXP_REG_SERDES_3125_INTERRUPT_ENABLE, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_XRF_INTERRUPT_ENABLE, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_XRF_DIAG_INTERRUPT_ENABLE, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXOAM_INTERRUPT_ENABLE, 0xffff);
+
+        /* Don't interrupt on statistics overflow, we are polling */
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_0, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_1, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_2, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_3, 0);
+
+        pmwrite(cmac, SUNI1x10GEXP_REG_IFLX_FIFO_OVERFLOW_ENABLE, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_PL4ODP_INTERRUPT_MASK, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_XTEF_INTERRUPT_ENABLE, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXOAM_INTERRUPT_ENABLE, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_CONFIG_3, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_PL4IO_LOCK_DETECT_MASK, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_CONFIG_3, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_PL4IDU_INTERRUPT_MASK, 0xffff);
+        pmwrite(cmac, SUNI1x10GEXP_REG_EFLX_FIFO_OVERFLOW_ERROR_ENABLE, 0xffff);
+
+        /* PM3393 - Global interrupt enable
+         */
+        /* TBD XXX Disable for now until we figure out why error interrupts keep asserting. */
+        pmwrite(cmac, SUNI1x10GEXP_REG_GLOBAL_INTERRUPT_ENABLE,
+                0 /*SUNI1x10GEXP_BITMSK_TOP_INTE */ );
+
+        /* TERMINATOR - PL_INTERUPTS_EXT */
+        pl_intr = readl(cmac->adapter->regs + A_PL_ENABLE);
+        pl_intr |= F_PL_INTR_EXT;
+        writel(pl_intr, cmac->adapter->regs + A_PL_ENABLE);
+        return 0;
+}
+
+static int pm3393_interrupt_disable(struct cmac *cmac)
+{
+        u32 elmer;
+
+        /* PM3393 - Enabling HW interrupt blocks. */
+        pmwrite(cmac, SUNI1x10GEXP_REG_SERDES_3125_INTERRUPT_ENABLE, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_XRF_INTERRUPT_ENABLE, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_XRF_DIAG_INTERRUPT_ENABLE, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXOAM_INTERRUPT_ENABLE, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_0, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_1, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_2, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_3, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_IFLX_FIFO_OVERFLOW_ENABLE, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_PL4ODP_INTERRUPT_MASK, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_XTEF_INTERRUPT_ENABLE, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXOAM_INTERRUPT_ENABLE, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_CONFIG_3, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_PL4IO_LOCK_DETECT_MASK, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_CONFIG_3, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_PL4IDU_INTERRUPT_MASK, 0);
+        pmwrite(cmac, SUNI1x10GEXP_REG_EFLX_FIFO_OVERFLOW_ERROR_ENABLE, 0);
+
+        /* PM3393 - Global interrupt enable */
+        pmwrite(cmac, SUNI1x10GEXP_REG_GLOBAL_INTERRUPT_ENABLE, 0);
+
+        /* ELMER - External chip interrupts. */
+        t1_tpi_read(cmac->adapter, A_ELMER0_INT_ENABLE, &elmer);
+        elmer &= ~ELMER0_GP_BIT1;
+        t1_tpi_write(cmac->adapter, A_ELMER0_INT_ENABLE, elmer);
+
+        /* TERMINATOR - PL_INTERUPTS_EXT */
+        /* DO NOT DISABLE TERMINATOR's EXTERNAL INTERRUPTS. ANOTHER CHIP
+         * COULD WANT THEM ENABLED. We disable PM3393 at the ELMER level.
+         */
+
+        return 0;
+}
+
+static int pm3393_interrupt_clear(struct cmac *cmac)
+{
+        u32 elmer;
+        u32 pl_intr;
+        u32 val32;
+
+        /* PM3393 - Clearing HW interrupt blocks. Note, this assumes
+         *          bit WCIMODE=0 for a clear-on-read.
+         */
+        pmread(cmac, SUNI1x10GEXP_REG_SERDES_3125_INTERRUPT_STATUS, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_XRF_INTERRUPT_STATUS, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_XRF_DIAG_INTERRUPT_STATUS, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_RXOAM_INTERRUPT_STATUS, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_PL4ODP_INTERRUPT, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_XTEF_INTERRUPT_STATUS, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_IFLX_FIFO_OVERFLOW_INTERRUPT, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_TXOAM_INTERRUPT_STATUS, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_RXXG_INTERRUPT, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_TXXG_INTERRUPT, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_PL4IDU_INTERRUPT, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_EFLX_FIFO_OVERFLOW_ERROR_INDICATION,
+               &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_PL4IO_LOCK_DETECT_STATUS, &val32);
+        pmread(cmac, SUNI1x10GEXP_REG_PL4IO_LOCK_DETECT_CHANGE, &val32);
+
+        /* PM3393 - Global interrupt status
+         */
+        pmread(cmac, SUNI1x10GEXP_REG_MASTER_INTERRUPT_STATUS, &val32);
+
+        /* ELMER - External chip interrupts.
+         */
+        t1_tpi_read(cmac->adapter, A_ELMER0_INT_CAUSE, &elmer);
+        elmer |= ELMER0_GP_BIT1;
+        t1_tpi_write(cmac->adapter, A_ELMER0_INT_CAUSE, elmer);
+
+        /* TERMINATOR - PL_INTERUPTS_EXT
+         */
+        pl_intr = readl(cmac->adapter->regs + A_PL_CAUSE);
+        pl_intr |= F_PL_INTR_EXT;
+        writel(pl_intr, cmac->adapter->regs + A_PL_CAUSE);
+
+        return 0;
+}
+
+/* Interrupt handler */
+static int pm3393_interrupt_handler(struct cmac *cmac)
+{
+        u32 master_intr_status;
+/*
+        1. Read master interrupt register.
+        2. Read BLOCK's interrupt status registers.
+        3. Handle BLOCK interrupts.
+*/
+        /* Read the master interrupt status register. */
+        pmread(cmac, SUNI1x10GEXP_REG_MASTER_INTERRUPT_STATUS,
+               &master_intr_status);
+
+        /* TBD XXX Lets just clear everything for now */
+        pm3393_interrupt_clear(cmac);
+
+        return 0;
+}
+
+static int pm3393_enable(struct cmac *cmac, int which)
+{
+        if (which & MAC_DIRECTION_RX)
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_CONFIG_1,
+                        (RXXG_CONF1_VAL | SUNI1x10GEXP_BITMSK_RXXG_RXEN));
+
+        if (which & MAC_DIRECTION_TX) {
+                u32 val = TXXG_CONF1_VAL | SUNI1x10GEXP_BITMSK_TXXG_TXEN0;
+
+                if (cmac->instance->fc & PAUSE_RX)
+                        val |= SUNI1x10GEXP_BITMSK_TXXG_FCRX;
+                if (cmac->instance->fc & PAUSE_TX)
+                        val |= SUNI1x10GEXP_BITMSK_TXXG_FCTX;
+                pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_CONFIG_1, val);
+        }
+
+        cmac->instance->enabled |= which;
+        return 0;
+}
+
+static int pm3393_enable_port(struct cmac *cmac, int which)
+{
+        /* Clear port statistics */
+        pmwrite(cmac, SUNI1x10GEXP_REG_MSTAT_CONTROL,
+                SUNI1x10GEXP_BITMSK_MSTAT_CLEAR);
+        udelay(2);
+        memset(&cmac->stats, 0, sizeof(struct cmac_statistics));
+
+        pm3393_enable(cmac, which);
+
+        /*
+         * XXX This should be done by the PHY and preferrably not at all.
+         * The PHY doesn't give us link status indication on its own so have
+         * the link management code query it instead.
+         */
+        {
+                extern void link_changed(adapter_t *adapter, int port_id);
+
+                link_changed(cmac->adapter, 0);
+        }
+        return 0;
+}
+
+static int pm3393_disable(struct cmac *cmac, int which)
+{
+        if (which & MAC_DIRECTION_RX)
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_CONFIG_1, RXXG_CONF1_VAL);
+        if (which & MAC_DIRECTION_TX)
+                pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_CONFIG_1, TXXG_CONF1_VAL);
+
+        /*
+         * The disable is graceful. Give the PM3393 time.  Can't wait very
+         * long here, we may be holding locks.
+         */
+        udelay(20);
+
+        cmac->instance->enabled &= ~which;
+        return 0;
+}
+
+static int pm3393_loopback_enable(struct cmac *cmac)
+{
+        return 0;
+}
+
+static int pm3393_loopback_disable(struct cmac *cmac)
+{
+        return 0;
+}
+
+static int pm3393_set_mtu(struct cmac *cmac, int mtu)
+{
+        int enabled = cmac->instance->enabled;
+
+        /* MAX_FRAME_SIZE includes header + FCS, mtu doesn't */
+        mtu += 14 + 4;
+        if (mtu > MAX_FRAME_SIZE)
+                return -EINVAL;
+
+        /* Disable Rx/Tx MAC before configuring it. */
+        if (enabled)
+                pm3393_disable(cmac, MAC_DIRECTION_RX | MAC_DIRECTION_TX);
+
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MAX_FRAME_LENGTH, mtu);
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_MAX_FRAME_SIZE, mtu);
+
+        if (enabled)
+                pm3393_enable(cmac, enabled);
+        return 0;
+}
+
+static u32 calc_crc(u8 *b, int len)
+{
+        int i;
+        u32 crc = (u32)~0;
+
+        /* calculate crc one bit at a time */
+        while (len--) {
+                crc ^= *b++;
+                for (i = 0; i < 8; i++) {
+                        if (crc & 0x1)
+                                crc = (crc >> 1) ^ 0xedb88320;
+                        else
+                                crc = (crc >> 1);
+                }
+        }
+
+        /* reverse bits */
+        crc = ((crc >> 4) & 0x0f0f0f0f) | ((crc << 4) & 0xf0f0f0f0);
+        crc = ((crc >> 2) & 0x33333333) | ((crc << 2) & 0xcccccccc);
+        crc = ((crc >> 1) & 0x55555555) | ((crc << 1) & 0xaaaaaaaa);
+        /* swap bytes */
+        crc = (crc >> 16) | (crc << 16);
+        crc = (crc >> 8 & 0x00ff00ff) | (crc << 8 & 0xff00ff00);
+
+        return crc;
+}
+
+static int pm3393_set_rx_mode(struct cmac *cmac, struct t1_rx_mode *rm)
+{
+        int enabled = cmac->instance->enabled & MAC_DIRECTION_RX;
+        u32 rx_mode;
+
+        /* Disable MAC RX before reconfiguring it */
+        if (enabled)
+                pm3393_disable(cmac, MAC_DIRECTION_RX);
+
+        pmread(cmac, SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_2, &rx_mode);
+        rx_mode &= ~(SUNI1x10GEXP_BITMSK_RXXG_PMODE |
+                     SUNI1x10GEXP_BITMSK_RXXG_MHASH_EN);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_2,
+                (u16)rx_mode);
+
+        if (t1_rx_mode_promisc(rm)) {
+                /* Promiscuous mode. */
+                rx_mode |= SUNI1x10GEXP_BITMSK_RXXG_PMODE;
+        }
+        if (t1_rx_mode_allmulti(rm)) {
+                /* Accept all multicast. */
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_LOW, 0xffff);
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_MIDLOW, 0xffff);
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_MIDHIGH, 0xffff);
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_HIGH, 0xffff);
+                rx_mode |= SUNI1x10GEXP_BITMSK_RXXG_MHASH_EN;
+        } else if (t1_rx_mode_mc_cnt(rm)) {
+                /* Accept one or more multicast(s). */
+                u8 *addr;
+                int bit;
+                u16 mc_filter[4] = { 0, };
+
+                while ((addr = t1_get_next_mcaddr(rm))) {
+                        bit = (calc_crc(addr, ETH_ALEN) >> 23) & 0x3f;  /* bit[23:28] */
+                        mc_filter[bit >> 4] |= 1 << (bit & 0xf);
+                }
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_LOW, mc_filter[0]);
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_MIDLOW, mc_filter[1]);
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_MIDHIGH, mc_filter[2]);
+                pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_HIGH, mc_filter[3]);
+                rx_mode |= SUNI1x10GEXP_BITMSK_RXXG_MHASH_EN;
+        }
+
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_2, (u16)rx_mode);
+
+        if (enabled)
+                pm3393_enable(cmac, MAC_DIRECTION_RX);
+
+        return 0;
+}
+
+static int pm3393_get_speed_duplex_fc(struct cmac *cmac, int *speed,
+                                      int *duplex, int *fc)
+{
+        if (speed)
+                *speed = SPEED_10000;
+        if (duplex)
+                *duplex = DUPLEX_FULL;
+        if (fc)
+                *fc = cmac->instance->fc;
+        return 0;
+}
+
+static int pm3393_set_speed_duplex_fc(struct cmac *cmac, int speed, int duplex,
+                                      int fc)
+{
+        if (speed >= 0 && speed != SPEED_10000)
+                return -1;
+        if (duplex >= 0 && duplex != DUPLEX_FULL)
+                return -1;
+        if (fc & ~(PAUSE_TX | PAUSE_RX))
+                return -1;
+
+        if (fc != cmac->instance->fc) {
+                cmac->instance->fc = (u8) fc;
+                if (cmac->instance->enabled & MAC_DIRECTION_TX)
+                        pm3393_enable(cmac, MAC_DIRECTION_TX);
+        }
+        return 0;
+}
+
+#define RMON_UPDATE(mac, name, stat_name) \
+        { \
+                t1_tpi_read((mac)->adapter, OFFSET(name), &val0);       \
+                t1_tpi_read((mac)->adapter, OFFSET(((name)+1)), &val1); \
+                t1_tpi_read((mac)->adapter, OFFSET(((name)+2)), &val2); \
+                (mac)->stats.stat_name = ((u64)val0 & 0xffff) | \
+                                                (((u64)val1 & 0xffff) << 16) | \
+                                                (((u64)val2 & 0xff) << 32) | \
+                                                ((mac)->stats.stat_name & \
+                                                        (~(u64)0 << 40)); \
+                if (ro &        \
+                        ((name -  SUNI1x10GEXP_REG_MSTAT_COUNTER_0_LOW) >> 2)) \
+                        (mac)->stats.stat_name += ((u64)1 << 40); \
+        }
+
+static const struct cmac_statistics *pm3393_update_statistics(struct cmac *mac,
+                                                              int flag)
+{
+        u64     ro;
+        u32     val0, val1, val2, val3;
+
+        /* Snap the counters */
+        pmwrite(mac, SUNI1x10GEXP_REG_MSTAT_CONTROL,
+                SUNI1x10GEXP_BITMSK_MSTAT_SNAP);
+
+        /* Counter rollover, clear on read */
+        pmread(mac, SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_0, &val0);
+        pmread(mac, SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_1, &val1);
+        pmread(mac, SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_2, &val2);
+        pmread(mac, SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_3, &val3);
+        ro = ((u64)val0 & 0xffff) | (((u64)val1 & 0xffff) << 16) |
+                (((u64)val2 & 0xffff) << 32) | (((u64)val3 & 0xffff) << 48);
+
+        /* Rx stats */
+        RMON_UPDATE(mac, RxOctetsReceivedOK, RxOctetsOK);
+        RMON_UPDATE(mac, RxUnicastFramesReceivedOK, RxUnicastFramesOK);
+        RMON_UPDATE(mac, RxMulticastFramesReceivedOK, RxMulticastFramesOK);
+        RMON_UPDATE(mac, RxBroadcastFramesReceivedOK, RxBroadcastFramesOK);
+        RMON_UPDATE(mac, RxPAUSEMACCtrlFramesReceived, RxPauseFrames);
+        RMON_UPDATE(mac, RxFrameCheckSequenceErrors, RxFCSErrors);
+        RMON_UPDATE(mac, RxFramesLostDueToInternalMACErrors,
+                                RxInternalMACRcvError);
+        RMON_UPDATE(mac, RxSymbolErrors, RxSymbolErrors);
+        RMON_UPDATE(mac, RxInRangeLengthErrors, RxInRangeLengthErrors);
+        RMON_UPDATE(mac, RxFramesTooLongErrors , RxFrameTooLongErrors);
+        RMON_UPDATE(mac, RxJabbers, RxJabberErrors);
+        RMON_UPDATE(mac, RxFragments, RxRuntErrors);
+        RMON_UPDATE(mac, RxUndersizedFrames, RxRuntErrors);
+
+        /* Tx stats */
+        RMON_UPDATE(mac, TxOctetsTransmittedOK, TxOctetsOK);
+        RMON_UPDATE(mac, TxFramesLostDueToInternalMACTransmissionError,
+                                TxInternalMACXmitError);
+        RMON_UPDATE(mac, TxTransmitSystemError, TxFCSErrors);
+        RMON_UPDATE(mac, TxUnicastFramesTransmittedOK, TxUnicastFramesOK);
+        RMON_UPDATE(mac, TxMulticastFramesTransmittedOK, TxMulticastFramesOK);
+        RMON_UPDATE(mac, TxBroadcastFramesTransmittedOK, TxBroadcastFramesOK);
+        RMON_UPDATE(mac, TxPAUSEMACCtrlFramesTransmitted, TxPauseFrames);
+
+        return &mac->stats;
+}
+
+static int pm3393_macaddress_get(struct cmac *cmac, u8 mac_addr[6])
+{
+        memcpy(mac_addr, cmac->instance->mac_addr, 6);
+        return 0;
+}
+
+static int pm3393_macaddress_set(struct cmac *cmac, u8 ma[6])
+{
+        u32 val, lo, mid, hi, enabled = cmac->instance->enabled;
+
+        /*
+         * MAC addr: 00:07:43:00:13:09
+         *
+         * ma[5] = 0x09
+         * ma[4] = 0x13
+         * ma[3] = 0x00
+         * ma[2] = 0x43
+         * ma[1] = 0x07
+         * ma[0] = 0x00
+         *
+         * The PM3393 requires byte swapping and reverse order entry
+         * when programming MAC addresses:
+         *
+         * low_bits[15:0]    = ma[1]:ma[0]
+         * mid_bits[31:16]   = ma[3]:ma[2]
+         * high_bits[47:32]  = ma[5]:ma[4]
+         */
+
+        /* Store local copy */
+        memcpy(cmac->instance->mac_addr, ma, 6);
+
+        lo = ((u32) ma[1] << 8) | (u32) ma[0];
+        mid = ((u32) ma[3] << 8) | (u32) ma[2];
+        hi = ((u32) ma[5] << 8) | (u32) ma[4];
+
+        /* Disable Rx/Tx MAC before configuring it. */
+        if (enabled)
+                pm3393_disable(cmac, MAC_DIRECTION_RX | MAC_DIRECTION_TX);
+
+        /* Set RXXG Station Address */
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_SA_15_0, lo);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_SA_31_16, mid);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_SA_47_32, hi);
+
+        /* Set TXXG Station Address */
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_SA_15_0, lo);
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_SA_31_16, mid);
+        pmwrite(cmac, SUNI1x10GEXP_REG_TXXG_SA_47_32, hi);
+
+        /* Setup Exact Match Filter 1 with our MAC address
+         *
+         * Must disable exact match filter before configuring it.
+         */
+        pmread(cmac, SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_0, &val);
+        val &= 0xff0f;
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_0, val);
+
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_1_LOW, lo);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_1_MID, mid);
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_1_HIGH, hi);
+
+        val |= 0x0090;
+        pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_0, val);
+
+        if (enabled)
+                pm3393_enable(cmac, enabled);
+        return 0;
+}
+
+static void pm3393_destroy(struct cmac *cmac)
+{
+        kfree(cmac);
+}
+
+static struct cmac_ops pm3393_ops = {
+        .destroy                 = pm3393_destroy,
+        .reset                   = pm3393_reset,
+        .interrupt_enable        = pm3393_interrupt_enable,
+        .interrupt_disable       = pm3393_interrupt_disable,
+        .interrupt_clear         = pm3393_interrupt_clear,
+        .interrupt_handler       = pm3393_interrupt_handler,
+        .enable                  = pm3393_enable_port,
+        .disable                 = pm3393_disable,
+        .loopback_enable         = pm3393_loopback_enable,
+        .loopback_disable        = pm3393_loopback_disable,
+        .set_mtu                 = pm3393_set_mtu,
+        .set_rx_mode             = pm3393_set_rx_mode,
+        .get_speed_duplex_fc     = pm3393_get_speed_duplex_fc,
+        .set_speed_duplex_fc     = pm3393_set_speed_duplex_fc,
+        .statistics_update       = pm3393_update_statistics,
+        .macaddress_get          = pm3393_macaddress_get,
+        .macaddress_set          = pm3393_macaddress_set
+};
+
+static struct cmac *pm3393_mac_create(adapter_t *adapter, int index)
+{
+        struct cmac *cmac;
+
+        cmac = kmalloc(sizeof(*cmac) + sizeof(cmac_instance), GFP_KERNEL);
+        if (!cmac)
+                return NULL;
+        memset(cmac, 0, sizeof(*cmac));
+
+        cmac->ops = &pm3393_ops;
+        cmac->instance = (cmac_instance *) (cmac + 1);
+        cmac->adapter = adapter;
+        cmac->instance->fc = PAUSE_TX | PAUSE_RX;
+
+        t1_tpi_write(adapter, OFFSET(0x0001), 0x00008000);
+        t1_tpi_write(adapter, OFFSET(0x0001), 0x00000000);
+        t1_tpi_write(adapter, OFFSET(0x2308), 0x00009800);
+        t1_tpi_write(adapter, OFFSET(0x2305), 0x00001001);   /* PL4IO Enable */
+        t1_tpi_write(adapter, OFFSET(0x2320), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2321), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2322), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2323), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2324), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2325), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2326), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2327), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2328), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x2329), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x232a), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x232b), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x232c), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x232d), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x232e), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x232f), 0x00008800);
+        t1_tpi_write(adapter, OFFSET(0x230d), 0x00009c00);
+        t1_tpi_write(adapter, OFFSET(0x2304), 0x00000202);      /* PL4IO Calendar Repetitions */
+
+        t1_tpi_write(adapter, OFFSET(0x3200), 0x00008080);      /* EFLX Enable */
+        t1_tpi_write(adapter, OFFSET(0x3210), 0x00000000);      /* EFLX Channel Deprovision */
+        t1_tpi_write(adapter, OFFSET(0x3203), 0x00000000);      /* EFLX Low Limit */
+        t1_tpi_write(adapter, OFFSET(0x3204), 0x00000040);      /* EFLX High Limit */
+        t1_tpi_write(adapter, OFFSET(0x3205), 0x000002cc);      /* EFLX Almost Full */
+        t1_tpi_write(adapter, OFFSET(0x3206), 0x00000199);      /* EFLX Almost Empty */
+        t1_tpi_write(adapter, OFFSET(0x3207), 0x00000240);      /* EFLX Cut Through Threshold */
+        t1_tpi_write(adapter, OFFSET(0x3202), 0x00000000);      /* EFLX Indirect Register Update */
+        t1_tpi_write(adapter, OFFSET(0x3210), 0x00000001);      /* EFLX Channel Provision */
+        t1_tpi_write(adapter, OFFSET(0x3208), 0x0000ffff);      /* EFLX Undocumented */
+        t1_tpi_write(adapter, OFFSET(0x320a), 0x0000ffff);      /* EFLX Undocumented */
+        t1_tpi_write(adapter, OFFSET(0x320c), 0x0000ffff);      /* EFLX enable overflow interrupt The other bit are undocumented */
+        t1_tpi_write(adapter, OFFSET(0x320e), 0x0000ffff);      /* EFLX Undocumented */
+
+        t1_tpi_write(adapter, OFFSET(0x2200), 0x0000c000);      /* IFLX Configuration - enable */
+        t1_tpi_write(adapter, OFFSET(0x2201), 0x00000000);      /* IFLX Channel Deprovision */
+        t1_tpi_write(adapter, OFFSET(0x220e), 0x00000000);      /* IFLX Low Limit */
+        t1_tpi_write(adapter, OFFSET(0x220f), 0x00000100);      /* IFLX High Limit */
+        t1_tpi_write(adapter, OFFSET(0x2210), 0x00000c00);      /* IFLX Almost Full Limit */
+        t1_tpi_write(adapter, OFFSET(0x2211), 0x00000599);      /* IFLX Almost Empty Limit */
+        t1_tpi_write(adapter, OFFSET(0x220d), 0x00000000);      /* IFLX Indirect Register Update */
+        t1_tpi_write(adapter, OFFSET(0x2201), 0x00000001);      /* IFLX Channel Provision */
+        t1_tpi_write(adapter, OFFSET(0x2203), 0x0000ffff);      /* IFLX Undocumented */
+        t1_tpi_write(adapter, OFFSET(0x2205), 0x0000ffff);      /* IFLX Undocumented */
+        t1_tpi_write(adapter, OFFSET(0x2209), 0x0000ffff);      /* IFLX Enable overflow interrupt.  The other bit are undocumented */
+
+        t1_tpi_write(adapter, OFFSET(0x2241), 0xfffffffe);      /* PL4MOS Undocumented */
+        t1_tpi_write(adapter, OFFSET(0x2242), 0x0000ffff);      /* PL4MOS Undocumented */
+        t1_tpi_write(adapter, OFFSET(0x2243), 0x00000008);      /* PL4MOS Starving Burst Size */
+        t1_tpi_write(adapter, OFFSET(0x2244), 0x00000008);      /* PL4MOS Hungry Burst Size */
+        t1_tpi_write(adapter, OFFSET(0x2245), 0x00000008);      /* PL4MOS Transfer Size */
+        t1_tpi_write(adapter, OFFSET(0x2240), 0x00000005);      /* PL4MOS Disable */
+
+        t1_tpi_write(adapter, OFFSET(0x2280), 0x00002103);      /* PL4ODP Training Repeat and SOP rule */
+        t1_tpi_write(adapter, OFFSET(0x2284), 0x00000000);      /* PL4ODP MAX_T setting */
+
+        t1_tpi_write(adapter, OFFSET(0x3280), 0x00000087);      /* PL4IDU Enable data forward, port state machine. Set ALLOW_NON_ZERO_OLB */
+        t1_tpi_write(adapter, OFFSET(0x3282), 0x0000001f);      /* PL4IDU Enable Dip4 check error interrupts */
+
+        t1_tpi_write(adapter, OFFSET(0x3040), 0x0c32);  /* # TXXG Config */
+        /* For T1 use timer based Mac flow control. */
+        t1_tpi_write(adapter, OFFSET(0x304d), 0x8000);
+        t1_tpi_write(adapter, OFFSET(0x2040), 0x059c);  /* # RXXG Config */
+        t1_tpi_write(adapter, OFFSET(0x2049), 0x0001);  /* # RXXG Cut Through */
+        t1_tpi_write(adapter, OFFSET(0x2070), 0x0000);  /* # Disable promiscuous mode */
+
+        /* Setup Exact Match Filter 0 to allow broadcast packets.
+         */
+        t1_tpi_write(adapter, OFFSET(0x206e), 0x0000);  /* # Disable Match Enable bit */
+        t1_tpi_write(adapter, OFFSET(0x204a), 0xffff);  /* # low addr */
+        t1_tpi_write(adapter, OFFSET(0x204b), 0xffff);  /* # mid addr */
+        t1_tpi_write(adapter, OFFSET(0x204c), 0xffff);  /* # high addr */
+        t1_tpi_write(adapter, OFFSET(0x206e), 0x0009);  /* # Enable Match Enable bit */
+
+        t1_tpi_write(adapter, OFFSET(0x0003), 0x0000);  /* # NO SOP/ PAD_EN setup */
+        t1_tpi_write(adapter, OFFSET(0x0100), 0x0ff0);  /* # RXEQB disabled */
+        t1_tpi_write(adapter, OFFSET(0x0101), 0x0f0f);  /* # No Preemphasis */
+
+        return cmac;
+}
+
+static int pm3393_mac_reset(adapter_t * adapter)
+{
+        u32 val;
+        u32 x;
+        u32 is_pl4_reset_finished;
+        u32 is_pl4_outof_lock;
+        u32 is_xaui_mabc_pll_locked;
+        u32 successful_reset;
+        int i;
+
+        /* The following steps are required to properly reset
+         * the PM3393. This information is provided in the
+         * PM3393 datasheet (Issue 2: November 2002)
+         * section 13.1 -- Device Reset.
+         *
+         * The PM3393 has three types of components that are
+         * individually reset:
+         *
+         * DRESETB      - Digital circuitry
+         * PL4_ARESETB  - PL4 analog circuitry
+         * XAUI_ARESETB - XAUI bus analog circuitry
+         *
+         * Steps to reset PM3393 using RSTB pin:
+         *
+         * 1. Assert RSTB pin low ( write 0 )
+         * 2. Wait at least 1ms to initiate a complete initialization of device.
+         * 3. Wait until all external clocks and REFSEL are stable.
+         * 4. Wait minimum of 1ms. (after external clocks and REFEL are stable)
+         * 5. De-assert RSTB ( write 1 )
+         * 6. Wait until internal timers to expires after ~14ms.
+         *    - Allows analog clock synthesizer(PL4CSU) to stabilize to
+         *      selected reference frequency before allowing the digital
+         *      portion of the device to operate.
+         * 7. Wait at least 200us for XAUI interface to stabilize.
+         * 8. Verify the PM3393 came out of reset successfully.
+         *    Set successful reset flag if everything worked else try again
+         *    a few more times.
+         */
+
+        successful_reset = 0;
+        for (i = 0; i < 3 && !successful_reset; i++) {
+                /* 1 */
+                t1_tpi_read(adapter, A_ELMER0_GPO, &val);
+                val &= ~1;
+                t1_tpi_write(adapter, A_ELMER0_GPO, val);
+
+                /* 2 */
+                msleep(1);
+
+                /* 3 */
+                msleep(1);
+
+                /* 4 */
+                msleep(2 /*1 extra ms for safety */ );
+
+                /* 5 */
+                val |= 1;
+                t1_tpi_write(adapter, A_ELMER0_GPO, val);
+
+                /* 6 */
+                msleep(15 /*1 extra ms for safety */ );
+
+                /* 7 */
+                msleep(1);
+
+                /* 8 */
+
+                /* Has PL4 analog block come out of reset correctly? */
+                t1_tpi_read(adapter, OFFSET(SUNI1x10GEXP_REG_DEVICE_STATUS), &val);
+                is_pl4_reset_finished = (val & SUNI1x10GEXP_BITMSK_TOP_EXPIRED);
+
+                /* TBD XXX SUNI1x10GEXP_BITMSK_TOP_PL4_IS_DOOL gets locked later in the init sequence
+                 *         figure out why? */
+
+                /* Have all PL4 block clocks locked? */
+                x = (SUNI1x10GEXP_BITMSK_TOP_PL4_ID_DOOL
+                     /*| SUNI1x10GEXP_BITMSK_TOP_PL4_IS_DOOL */  |
+                     SUNI1x10GEXP_BITMSK_TOP_PL4_ID_ROOL |
+                     SUNI1x10GEXP_BITMSK_TOP_PL4_IS_ROOL |
+                     SUNI1x10GEXP_BITMSK_TOP_PL4_OUT_ROOL);
+                is_pl4_outof_lock = (val & x);
+
+                /* ??? If this fails, might be able to software reset the XAUI part
+                 *     and try to recover... thus saving us from doing another HW reset */
+                /* Has the XAUI MABC PLL circuitry stablized? */
+                is_xaui_mabc_pll_locked =
+                    (val & SUNI1x10GEXP_BITMSK_TOP_SXRA_EXPIRED);
+
+                successful_reset = (is_pl4_reset_finished && !is_pl4_outof_lock
+                                    && is_xaui_mabc_pll_locked);
+        }
+        return successful_reset ? 0 : 1;
+}
+
+struct gmac t1_pm3393_ops = {
+        STATS_TICK_SECS,
+        pm3393_mac_create,
+        pm3393_mac_reset
+};
diff --git a/drivers/net/chelsio/regs.h b/drivers/net/chelsio/regs.h
new file mode 100644
index 000000000000..b90e11f40d1f
--- /dev/null
+++ b/drivers/net/chelsio/regs.h
@@ -0,0 +1,468 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: regs.h                                                              *
+ * $Revision: 1.8 $                                                          *
+ * $Date: 2005/06/21 18:29:48 $                                              *
+ * Description:                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_REGS_H_
+#define _CXGB_REGS_H_
+
+/* SGE registers */
+#define A_SG_CONTROL 0x0
+
+#define S_CMDQ0_ENABLE    0
+#define V_CMDQ0_ENABLE(x) ((x) << S_CMDQ0_ENABLE)
+#define F_CMDQ0_ENABLE    V_CMDQ0_ENABLE(1U)
+
+#define S_CMDQ1_ENABLE    1
+#define V_CMDQ1_ENABLE(x) ((x) << S_CMDQ1_ENABLE)
+#define F_CMDQ1_ENABLE    V_CMDQ1_ENABLE(1U)
+
+#define S_FL0_ENABLE    2
+#define V_FL0_ENABLE(x) ((x) << S_FL0_ENABLE)
+#define F_FL0_ENABLE    V_FL0_ENABLE(1U)
+
+#define S_FL1_ENABLE    3
+#define V_FL1_ENABLE(x) ((x) << S_FL1_ENABLE)
+#define F_FL1_ENABLE    V_FL1_ENABLE(1U)
+
+#define S_CPL_ENABLE    4
+#define V_CPL_ENABLE(x) ((x) << S_CPL_ENABLE)
+#define F_CPL_ENABLE    V_CPL_ENABLE(1U)
+
+#define S_RESPONSE_QUEUE_ENABLE    5
+#define V_RESPONSE_QUEUE_ENABLE(x) ((x) << S_RESPONSE_QUEUE_ENABLE)
+#define F_RESPONSE_QUEUE_ENABLE    V_RESPONSE_QUEUE_ENABLE(1U)
+
+#define S_CMDQ_PRIORITY    6
+#define M_CMDQ_PRIORITY    0x3
+#define V_CMDQ_PRIORITY(x) ((x) << S_CMDQ_PRIORITY)
+#define G_CMDQ_PRIORITY(x) (((x) >> S_CMDQ_PRIORITY) & M_CMDQ_PRIORITY)
+
+#define S_DISABLE_CMDQ1_GTS    9
+#define V_DISABLE_CMDQ1_GTS(x) ((x) << S_DISABLE_CMDQ1_GTS)
+#define F_DISABLE_CMDQ1_GTS    V_DISABLE_CMDQ1_GTS(1U)
+
+#define S_DISABLE_FL0_GTS    10
+#define V_DISABLE_FL0_GTS(x) ((x) << S_DISABLE_FL0_GTS)
+#define F_DISABLE_FL0_GTS    V_DISABLE_FL0_GTS(1U)
+
+#define S_DISABLE_FL1_GTS    11
+#define V_DISABLE_FL1_GTS(x) ((x) << S_DISABLE_FL1_GTS)
+#define F_DISABLE_FL1_GTS    V_DISABLE_FL1_GTS(1U)
+
+#define S_ENABLE_BIG_ENDIAN    12
+#define V_ENABLE_BIG_ENDIAN(x) ((x) << S_ENABLE_BIG_ENDIAN)
+#define F_ENABLE_BIG_ENDIAN    V_ENABLE_BIG_ENDIAN(1U)
+
+#define S_ISCSI_COALESCE    14
+#define V_ISCSI_COALESCE(x) ((x) << S_ISCSI_COALESCE)
+#define F_ISCSI_COALESCE    V_ISCSI_COALESCE(1U)
+
+#define S_RX_PKT_OFFSET    15
+#define V_RX_PKT_OFFSET(x) ((x) << S_RX_PKT_OFFSET)
+
+#define S_VLAN_XTRACT    18
+#define V_VLAN_XTRACT(x) ((x) << S_VLAN_XTRACT)
+#define F_VLAN_XTRACT    V_VLAN_XTRACT(1U)
+
+#define A_SG_DOORBELL 0x4
+#define A_SG_CMD0BASELWR 0x8
+#define A_SG_CMD0BASEUPR 0xc
+#define A_SG_CMD1BASELWR 0x10
+#define A_SG_CMD1BASEUPR 0x14
+#define A_SG_FL0BASELWR 0x18
+#define A_SG_FL0BASEUPR 0x1c
+#define A_SG_FL1BASELWR 0x20
+#define A_SG_FL1BASEUPR 0x24
+#define A_SG_CMD0SIZE 0x28
+#define A_SG_FL0SIZE 0x2c
+#define A_SG_RSPSIZE 0x30
+#define A_SG_RSPBASELWR 0x34
+#define A_SG_RSPBASEUPR 0x38
+#define A_SG_FLTHRESHOLD 0x3c
+#define A_SG_RSPQUEUECREDIT 0x40
+#define A_SG_SLEEPING 0x48
+#define A_SG_INTRTIMER 0x4c
+#define A_SG_CMD1SIZE 0xb0
+#define A_SG_FL1SIZE 0xb4
+#define A_SG_INT_ENABLE 0xb8
+
+#define S_RESPQ_EXHAUSTED    0
+#define V_RESPQ_EXHAUSTED(x) ((x) << S_RESPQ_EXHAUSTED)
+#define F_RESPQ_EXHAUSTED    V_RESPQ_EXHAUSTED(1U)
+
+#define S_RESPQ_OVERFLOW    1
+#define V_RESPQ_OVERFLOW(x) ((x) << S_RESPQ_OVERFLOW)
+#define F_RESPQ_OVERFLOW    V_RESPQ_OVERFLOW(1U)
+
+#define S_FL_EXHAUSTED    2
+#define V_FL_EXHAUSTED(x) ((x) << S_FL_EXHAUSTED)
+#define F_FL_EXHAUSTED    V_FL_EXHAUSTED(1U)
+
+#define S_PACKET_TOO_BIG    3
+#define V_PACKET_TOO_BIG(x) ((x) << S_PACKET_TOO_BIG)
+#define F_PACKET_TOO_BIG    V_PACKET_TOO_BIG(1U)
+
+#define S_PACKET_MISMATCH    4
+#define V_PACKET_MISMATCH(x) ((x) << S_PACKET_MISMATCH)
+#define F_PACKET_MISMATCH    V_PACKET_MISMATCH(1U)
+
+#define A_SG_INT_CAUSE 0xbc
+#define A_SG_RESPACCUTIMER 0xc0
+
+/* MC3 registers */
+
+#define S_READY    1
+#define V_READY(x) ((x) << S_READY)
+#define F_READY    V_READY(1U)
+
+/* MC4 registers */
+
+#define A_MC4_CFG 0x180
+#define S_MC4_SLOW    25
+#define V_MC4_SLOW(x) ((x) << S_MC4_SLOW)
+#define F_MC4_SLOW    V_MC4_SLOW(1U)
+
+/* TPI registers */
+
+#define A_TPI_ADDR 0x280
+#define A_TPI_WR_DATA 0x284
+#define A_TPI_RD_DATA 0x288
+#define A_TPI_CSR 0x28c
+
+#define S_TPIWR    0
+#define V_TPIWR(x) ((x) << S_TPIWR)
+#define F_TPIWR    V_TPIWR(1U)
+
+#define S_TPIRDY    1
+#define V_TPIRDY(x) ((x) << S_TPIRDY)
+#define F_TPIRDY    V_TPIRDY(1U)
+
+#define A_TPI_PAR 0x29c
+
+#define S_TPIPAR    0
+#define M_TPIPAR    0x7f
+#define V_TPIPAR(x) ((x) << S_TPIPAR)
+#define G_TPIPAR(x) (((x) >> S_TPIPAR) & M_TPIPAR)
+
+/* TP registers */
+
+#define A_TP_IN_CONFIG 0x300
+
+#define S_TP_IN_CSPI_CPL    3
+#define V_TP_IN_CSPI_CPL(x) ((x) << S_TP_IN_CSPI_CPL)
+#define F_TP_IN_CSPI_CPL    V_TP_IN_CSPI_CPL(1U)
+
+#define S_TP_IN_CSPI_CHECK_IP_CSUM    5
+#define V_TP_IN_CSPI_CHECK_IP_CSUM(x) ((x) << S_TP_IN_CSPI_CHECK_IP_CSUM)
+#define F_TP_IN_CSPI_CHECK_IP_CSUM    V_TP_IN_CSPI_CHECK_IP_CSUM(1U)
+
+#define S_TP_IN_CSPI_CHECK_TCP_CSUM    6
+#define V_TP_IN_CSPI_CHECK_TCP_CSUM(x) ((x) << S_TP_IN_CSPI_CHECK_TCP_CSUM)
+#define F_TP_IN_CSPI_CHECK_TCP_CSUM    V_TP_IN_CSPI_CHECK_TCP_CSUM(1U)
+
+#define S_TP_IN_ESPI_ETHERNET    8
+#define V_TP_IN_ESPI_ETHERNET(x) ((x) << S_TP_IN_ESPI_ETHERNET)
+#define F_TP_IN_ESPI_ETHERNET    V_TP_IN_ESPI_ETHERNET(1U)
+
+#define S_TP_IN_ESPI_CHECK_IP_CSUM    12
+#define V_TP_IN_ESPI_CHECK_IP_CSUM(x) ((x) << S_TP_IN_ESPI_CHECK_IP_CSUM)
+#define F_TP_IN_ESPI_CHECK_IP_CSUM    V_TP_IN_ESPI_CHECK_IP_CSUM(1U)
+
+#define S_TP_IN_ESPI_CHECK_TCP_CSUM    13
+#define V_TP_IN_ESPI_CHECK_TCP_CSUM(x) ((x) << S_TP_IN_ESPI_CHECK_TCP_CSUM)
+#define F_TP_IN_ESPI_CHECK_TCP_CSUM    V_TP_IN_ESPI_CHECK_TCP_CSUM(1U)
+
+#define S_OFFLOAD_DISABLE    14
+#define V_OFFLOAD_DISABLE(x) ((x) << S_OFFLOAD_DISABLE)
+#define F_OFFLOAD_DISABLE    V_OFFLOAD_DISABLE(1U)
+
+#define A_TP_OUT_CONFIG 0x304
+
+#define S_TP_OUT_CSPI_CPL    2
+#define V_TP_OUT_CSPI_CPL(x) ((x) << S_TP_OUT_CSPI_CPL)
+#define F_TP_OUT_CSPI_CPL    V_TP_OUT_CSPI_CPL(1U)
+
+#define S_TP_OUT_ESPI_ETHERNET    6
+#define V_TP_OUT_ESPI_ETHERNET(x) ((x) << S_TP_OUT_ESPI_ETHERNET)
+#define F_TP_OUT_ESPI_ETHERNET    V_TP_OUT_ESPI_ETHERNET(1U)
+
+#define S_TP_OUT_ESPI_GENERATE_IP_CSUM    10
+#define V_TP_OUT_ESPI_GENERATE_IP_CSUM(x) ((x) << S_TP_OUT_ESPI_GENERATE_IP_CSUM)
+#define F_TP_OUT_ESPI_GENERATE_IP_CSUM    V_TP_OUT_ESPI_GENERATE_IP_CSUM(1U)
+
+#define S_TP_OUT_ESPI_GENERATE_TCP_CSUM    11
+#define V_TP_OUT_ESPI_GENERATE_TCP_CSUM(x) ((x) << S_TP_OUT_ESPI_GENERATE_TCP_CSUM)
+#define F_TP_OUT_ESPI_GENERATE_TCP_CSUM    V_TP_OUT_ESPI_GENERATE_TCP_CSUM(1U)
+
+#define A_TP_GLOBAL_CONFIG 0x308
+
+#define S_IP_TTL    0
+#define M_IP_TTL    0xff
+#define V_IP_TTL(x) ((x) << S_IP_TTL)
+
+#define S_TCP_CSUM    11
+#define V_TCP_CSUM(x) ((x) << S_TCP_CSUM)
+#define F_TCP_CSUM    V_TCP_CSUM(1U)
+
+#define S_UDP_CSUM    12
+#define V_UDP_CSUM(x) ((x) << S_UDP_CSUM)
+#define F_UDP_CSUM    V_UDP_CSUM(1U)
+
+#define S_IP_CSUM    13
+#define V_IP_CSUM(x) ((x) << S_IP_CSUM)
+#define F_IP_CSUM    V_IP_CSUM(1U)
+
+#define S_PATH_MTU    15
+#define V_PATH_MTU(x) ((x) << S_PATH_MTU)
+#define F_PATH_MTU    V_PATH_MTU(1U)
+
+#define S_5TUPLE_LOOKUP    17
+#define V_5TUPLE_LOOKUP(x) ((x) << S_5TUPLE_LOOKUP)
+
+#define S_SYN_COOKIE_PARAMETER    26
+#define V_SYN_COOKIE_PARAMETER(x) ((x) << S_SYN_COOKIE_PARAMETER)
+
+#define A_TP_PC_CONFIG 0x348
+#define S_DIS_TX_FILL_WIN_PUSH    12
+#define V_DIS_TX_FILL_WIN_PUSH(x) ((x) << S_DIS_TX_FILL_WIN_PUSH)
+#define F_DIS_TX_FILL_WIN_PUSH    V_DIS_TX_FILL_WIN_PUSH(1U)
+
+#define S_TP_PC_REV    30
+#define M_TP_PC_REV    0x3
+#define G_TP_PC_REV(x) (((x) >> S_TP_PC_REV) & M_TP_PC_REV)
+#define A_TP_RESET 0x44c
+#define S_TP_RESET    0
+#define V_TP_RESET(x) ((x) << S_TP_RESET)
+#define F_TP_RESET    V_TP_RESET(1U)
+
+#define A_TP_INT_ENABLE 0x470
+#define A_TP_INT_CAUSE 0x474
+#define A_TP_TX_DROP_CONFIG 0x4b8
+
+#define S_ENABLE_TX_DROP    31
+#define V_ENABLE_TX_DROP(x) ((x) << S_ENABLE_TX_DROP)
+#define F_ENABLE_TX_DROP    V_ENABLE_TX_DROP(1U)
+
+#define S_ENABLE_TX_ERROR    30
+#define V_ENABLE_TX_ERROR(x) ((x) << S_ENABLE_TX_ERROR)
+#define F_ENABLE_TX_ERROR    V_ENABLE_TX_ERROR(1U)
+
+#define S_DROP_TICKS_CNT    4
+#define V_DROP_TICKS_CNT(x) ((x) << S_DROP_TICKS_CNT)
+
+#define S_NUM_PKTS_DROPPED    0
+#define V_NUM_PKTS_DROPPED(x) ((x) << S_NUM_PKTS_DROPPED)
+
+/* CSPI registers */
+
+#define S_DIP4ERR    0
+#define V_DIP4ERR(x) ((x) << S_DIP4ERR)
+#define F_DIP4ERR    V_DIP4ERR(1U)
+
+#define S_RXDROP    1
+#define V_RXDROP(x) ((x) << S_RXDROP)
+#define F_RXDROP    V_RXDROP(1U)
+
+#define S_TXDROP    2
+#define V_TXDROP(x) ((x) << S_TXDROP)
+#define F_TXDROP    V_TXDROP(1U)
+
+#define S_RXOVERFLOW    3
+#define V_RXOVERFLOW(x) ((x) << S_RXOVERFLOW)
+#define F_RXOVERFLOW    V_RXOVERFLOW(1U)
+
+#define S_RAMPARITYERR    4
+#define V_RAMPARITYERR(x) ((x) << S_RAMPARITYERR)
+#define F_RAMPARITYERR    V_RAMPARITYERR(1U)
+
+/* ESPI registers */
+
+#define A_ESPI_SCH_TOKEN0 0x880
+#define A_ESPI_SCH_TOKEN1 0x884
+#define A_ESPI_SCH_TOKEN2 0x888
+#define A_ESPI_SCH_TOKEN3 0x88c
+#define A_ESPI_RX_FIFO_ALMOST_EMPTY_WATERMARK 0x890
+#define A_ESPI_RX_FIFO_ALMOST_FULL_WATERMARK 0x894
+#define A_ESPI_CALENDAR_LENGTH 0x898
+#define A_PORT_CONFIG 0x89c
+
+#define S_RX_NPORTS    0
+#define V_RX_NPORTS(x) ((x) << S_RX_NPORTS)
+
+#define S_TX_NPORTS    8
+#define V_TX_NPORTS(x) ((x) << S_TX_NPORTS)
+
+#define A_ESPI_FIFO_STATUS_ENABLE 0x8a0
+
+#define S_RXSTATUSENABLE    0
+#define V_RXSTATUSENABLE(x) ((x) << S_RXSTATUSENABLE)
+#define F_RXSTATUSENABLE    V_RXSTATUSENABLE(1U)
+
+#define S_INTEL1010MODE    4
+#define V_INTEL1010MODE(x) ((x) << S_INTEL1010MODE)
+#define F_INTEL1010MODE    V_INTEL1010MODE(1U)
+
+#define A_ESPI_MAXBURST1_MAXBURST2 0x8a8
+#define A_ESPI_TRAIN 0x8ac
+#define A_ESPI_INTR_STATUS 0x8c8
+
+#define S_DIP2PARITYERR    5
+#define V_DIP2PARITYERR(x) ((x) << S_DIP2PARITYERR)
+#define F_DIP2PARITYERR    V_DIP2PARITYERR(1U)
+
+#define A_ESPI_INTR_ENABLE 0x8cc
+#define A_RX_DROP_THRESHOLD 0x8d0
+#define A_ESPI_RX_RESET 0x8ec
+#define A_ESPI_MISC_CONTROL 0x8f0
+
+#define S_OUT_OF_SYNC_COUNT    0
+#define V_OUT_OF_SYNC_COUNT(x) ((x) << S_OUT_OF_SYNC_COUNT)
+
+#define S_DIP2_PARITY_ERR_THRES    5
+#define V_DIP2_PARITY_ERR_THRES(x) ((x) << S_DIP2_PARITY_ERR_THRES)
+
+#define S_DIP4_THRES    9
+#define V_DIP4_THRES(x) ((x) << S_DIP4_THRES)
+
+#define S_MONITORED_PORT_NUM    25
+#define V_MONITORED_PORT_NUM(x) ((x) << S_MONITORED_PORT_NUM)
+
+#define S_MONITORED_DIRECTION    27
+#define V_MONITORED_DIRECTION(x) ((x) << S_MONITORED_DIRECTION)
+#define F_MONITORED_DIRECTION    V_MONITORED_DIRECTION(1U)
+
+#define S_MONITORED_INTERFACE    28
+#define V_MONITORED_INTERFACE(x) ((x) << S_MONITORED_INTERFACE)
+#define F_MONITORED_INTERFACE    V_MONITORED_INTERFACE(1U)
+
+#define A_ESPI_DIP2_ERR_COUNT 0x8f4
+#define A_ESPI_CMD_ADDR 0x8f8
+
+#define S_WRITE_DATA    0
+#define V_WRITE_DATA(x) ((x) << S_WRITE_DATA)
+
+#define S_REGISTER_OFFSET    8
+#define V_REGISTER_OFFSET(x) ((x) << S_REGISTER_OFFSET)
+
+#define S_CHANNEL_ADDR    12
+#define V_CHANNEL_ADDR(x) ((x) << S_CHANNEL_ADDR)
+
+#define S_MODULE_ADDR    16
+#define V_MODULE_ADDR(x) ((x) << S_MODULE_ADDR)
+
+#define S_BUNDLE_ADDR    20
+#define V_BUNDLE_ADDR(x) ((x) << S_BUNDLE_ADDR)
+
+#define S_SPI4_COMMAND    24
+#define V_SPI4_COMMAND(x) ((x) << S_SPI4_COMMAND)
+
+#define A_ESPI_GOSTAT 0x8fc
+#define S_ESPI_CMD_BUSY    8
+#define V_ESPI_CMD_BUSY(x) ((x) << S_ESPI_CMD_BUSY)
+#define F_ESPI_CMD_BUSY    V_ESPI_CMD_BUSY(1U)
+
+/* PL registers */
+
+#define A_PL_ENABLE 0xa00
+
+#define S_PL_INTR_SGE_ERR    0
+#define V_PL_INTR_SGE_ERR(x) ((x) << S_PL_INTR_SGE_ERR)
+#define F_PL_INTR_SGE_ERR    V_PL_INTR_SGE_ERR(1U)
+
+#define S_PL_INTR_SGE_DATA    1
+#define V_PL_INTR_SGE_DATA(x) ((x) << S_PL_INTR_SGE_DATA)
+#define F_PL_INTR_SGE_DATA    V_PL_INTR_SGE_DATA(1U)
+
+#define S_PL_INTR_TP    6
+#define V_PL_INTR_TP(x) ((x) << S_PL_INTR_TP)
+#define F_PL_INTR_TP    V_PL_INTR_TP(1U)
+
+#define S_PL_INTR_ESPI    8
+#define V_PL_INTR_ESPI(x) ((x) << S_PL_INTR_ESPI)
+#define F_PL_INTR_ESPI    V_PL_INTR_ESPI(1U)
+
+#define S_PL_INTR_PCIX    10
+#define V_PL_INTR_PCIX(x) ((x) << S_PL_INTR_PCIX)
+#define F_PL_INTR_PCIX    V_PL_INTR_PCIX(1U)
+
+#define S_PL_INTR_EXT    11
+#define V_PL_INTR_EXT(x) ((x) << S_PL_INTR_EXT)
+#define F_PL_INTR_EXT    V_PL_INTR_EXT(1U)
+
+#define A_PL_CAUSE 0xa04
+
+/* MC5 registers */
+
+#define A_MC5_CONFIG 0xc04
+
+#define S_TCAM_RESET    1
+#define V_TCAM_RESET(x) ((x) << S_TCAM_RESET)
+#define F_TCAM_RESET    V_TCAM_RESET(1U)
+
+#define S_M_BUS_ENABLE    5
+#define V_M_BUS_ENABLE(x) ((x) << S_M_BUS_ENABLE)
+#define F_M_BUS_ENABLE    V_M_BUS_ENABLE(1U)
+
+/* PCICFG registers */
+
+#define A_PCICFG_PM_CSR 0x44
+#define A_PCICFG_VPD_ADDR 0x4a
+
+#define S_VPD_OP_FLAG    15
+#define V_VPD_OP_FLAG(x) ((x) << S_VPD_OP_FLAG)
+#define F_VPD_OP_FLAG    V_VPD_OP_FLAG(1U)
+
+#define A_PCICFG_VPD_DATA 0x4c
+
+#define A_PCICFG_INTR_ENABLE 0xf4
+#define A_PCICFG_INTR_CAUSE 0xf8
+
+#define A_PCICFG_MODE 0xfc
+
+#define S_PCI_MODE_64BIT    0
+#define V_PCI_MODE_64BIT(x) ((x) << S_PCI_MODE_64BIT)
+#define F_PCI_MODE_64BIT    V_PCI_MODE_64BIT(1U)
+
+#define S_PCI_MODE_PCIX    5
+#define V_PCI_MODE_PCIX(x) ((x) << S_PCI_MODE_PCIX)
+#define F_PCI_MODE_PCIX    V_PCI_MODE_PCIX(1U)
+
+#define S_PCI_MODE_CLK    6
+#define M_PCI_MODE_CLK    0x3
+#define G_PCI_MODE_CLK(x) (((x) >> S_PCI_MODE_CLK) & M_PCI_MODE_CLK)
+
+#endif /* _CXGB_REGS_H_ */
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
new file mode 100644
index 000000000000..53b41d99b00b
--- /dev/null
+++ b/drivers/net/chelsio/sge.c
@@ -0,0 +1,1684 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: sge.c                                                               *
+ * $Revision: 1.26 $                                                         *
+ * $Date: 2005/06/21 18:29:48 $                                              *
+ * Description:                                                              *
+ *  DMA engine.                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#include "common.h"
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/if_vlan.h>
+#include <linux/skbuff.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/ip.h>
+#include <linux/in.h>
+#include <linux/if_arp.h>
+
+#include "cpl5_cmd.h"
+#include "sge.h"
+#include "regs.h"
+#include "espi.h"
+
+
+#ifdef NETIF_F_TSO
+#include <linux/tcp.h>
+#endif
+
+#define SGE_CMDQ_N              2
+#define SGE_FREELQ_N            2
+#define SGE_CMDQ0_E_N           1024
+#define SGE_CMDQ1_E_N           128
+#define SGE_FREEL_SIZE          4096
+#define SGE_JUMBO_FREEL_SIZE    512
+#define SGE_FREEL_REFILL_THRESH 16
+#define SGE_RESPQ_E_N           1024
+#define SGE_INTRTIMER_NRES      1000
+#define SGE_RX_COPY_THRES       256
+#define SGE_RX_SM_BUF_SIZE      1536
+
+# define SGE_RX_DROP_THRES 2
+
+#define SGE_RESPQ_REPLENISH_THRES (SGE_RESPQ_E_N / 4)
+
+/*
+ * Period of the TX buffer reclaim timer.  This timer does not need to run
+ * frequently as TX buffers are usually reclaimed by new TX packets.
+ */
+#define TX_RECLAIM_PERIOD (HZ / 4)
+
+#ifndef NET_IP_ALIGN
+# define NET_IP_ALIGN 2
+#endif
+
+#define M_CMD_LEN       0x7fffffff
+#define V_CMD_LEN(v)    (v)
+#define G_CMD_LEN(v)    ((v) & M_CMD_LEN)
+#define V_CMD_GEN1(v)   ((v) << 31)
+#define V_CMD_GEN2(v)   (v)
+#define F_CMD_DATAVALID (1 << 1)
+#define F_CMD_SOP       (1 << 2)
+#define V_CMD_EOP(v)    ((v) << 3)
+
+/*
+ * Command queue, receive buffer list, and response queue descriptors.
+ */
+#if defined(__BIG_ENDIAN_BITFIELD)
+struct cmdQ_e {
+        u32 addr_lo;
+        u32 len_gen;
+        u32 flags;
+        u32 addr_hi;
+};
+
+struct freelQ_e {
+        u32 addr_lo;
+        u32 len_gen;
+        u32 gen2;
+        u32 addr_hi;
+};
+
+struct respQ_e {
+        u32 Qsleeping           : 4;
+        u32 Cmdq1CreditReturn   : 5;
+        u32 Cmdq1DmaComplete    : 5;
+        u32 Cmdq0CreditReturn   : 5;
+        u32 Cmdq0DmaComplete    : 5;
+        u32 FreelistQid         : 2;
+        u32 CreditValid         : 1;
+        u32 DataValid           : 1;
+        u32 Offload             : 1;
+        u32 Eop                 : 1;
+        u32 Sop                 : 1;
+        u32 GenerationBit       : 1;
+        u32 BufferLength;
+};
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+struct cmdQ_e {
+        u32 len_gen;
+        u32 addr_lo;
+        u32 addr_hi;
+        u32 flags;
+};
+
+struct freelQ_e {
+        u32 len_gen;
+        u32 addr_lo;
+        u32 addr_hi;
+        u32 gen2;
+};
+
+struct respQ_e {
+        u32 BufferLength;
+        u32 GenerationBit       : 1;
+        u32 Sop                 : 1;
+        u32 Eop                 : 1;
+        u32 Offload             : 1;
+        u32 DataValid           : 1;
+        u32 CreditValid         : 1;
+        u32 FreelistQid         : 2;
+        u32 Cmdq0DmaComplete    : 5;
+        u32 Cmdq0CreditReturn   : 5;
+        u32 Cmdq1DmaComplete    : 5;
+        u32 Cmdq1CreditReturn   : 5;
+        u32 Qsleeping           : 4;
+} ;
+#endif
+
+/*
+ * SW Context Command and Freelist Queue Descriptors
+ */
+struct cmdQ_ce {
+        struct sk_buff *skb;
+        DECLARE_PCI_UNMAP_ADDR(dma_addr);
+        DECLARE_PCI_UNMAP_LEN(dma_len);
+};
+
+struct freelQ_ce {
+        struct sk_buff *skb;
+        DECLARE_PCI_UNMAP_ADDR(dma_addr);
+        DECLARE_PCI_UNMAP_LEN(dma_len);
+};
+
+/*
+ * SW command, freelist and response rings
+ */
+struct cmdQ {
+        unsigned long   status;         /* HW DMA fetch status */
+        unsigned int    in_use;         /* # of in-use command descriptors */
+        unsigned int    size;           /* # of descriptors */
+        unsigned int    processed;      /* total # of descs HW has processed */
+        unsigned int    cleaned;        /* total # of descs SW has reclaimed */
+        unsigned int    stop_thres;     /* SW TX queue suspend threshold */
+        u16             pidx;           /* producer index (SW) */
+        u16             cidx;           /* consumer index (HW) */
+        u8              genbit;         /* current generation (=valid) bit */
+        u8              sop;            /* is next entry start of packet? */
+        struct cmdQ_e  *entries;        /* HW command descriptor Q */
+        struct cmdQ_ce *centries;       /* SW command context descriptor Q */
+        spinlock_t      lock;           /* Lock to protect cmdQ enqueuing */
+        dma_addr_t      dma_addr;       /* DMA addr HW command descriptor Q */
+};
+
+struct freelQ {
+        unsigned int    credits;        /* # of available RX buffers */
+        unsigned int    size;           /* free list capacity */
+        u16             pidx;           /* producer index (SW) */
+        u16             cidx;           /* consumer index (HW) */
+        u16             rx_buffer_size; /* Buffer size on this free list */
+        u16             dma_offset;     /* DMA offset to align IP headers */
+        u16             recycleq_idx;   /* skb recycle q to use */
+        u8              genbit;         /* current generation (=valid) bit */
+        struct freelQ_e *entries;       /* HW freelist descriptor Q */
+        struct freelQ_ce *centries;     /* SW freelist context descriptor Q */
+        dma_addr_t      dma_addr;       /* DMA addr HW freelist descriptor Q */
+};
+
+struct respQ {
+        unsigned int    credits;        /* credits to be returned to SGE */
+        unsigned int    size;           /* # of response Q descriptors */
+        u16             cidx;           /* consumer index (SW) */
+        u8              genbit;         /* current generation(=valid) bit */
+        struct respQ_e *entries;        /* HW response descriptor Q */
+        dma_addr_t      dma_addr;       /* DMA addr HW response descriptor Q */
+};
+
+/* Bit flags for cmdQ.status */
+enum {
+        CMDQ_STAT_RUNNING = 1,          /* fetch engine is running */
+        CMDQ_STAT_LAST_PKT_DB = 2       /* last packet rung the doorbell */
+};
+
+/*
+ * Main SGE data structure
+ *
+ * Interrupts are handled by a single CPU and it is likely that on a MP system
+ * the application is migrated to another CPU. In that scenario, we try to
+ * seperate the RX(in irq context) and TX state in order to decrease memory
+ * contention.
+ */
+struct sge {
+        struct adapter *adapter;        /* adapter backpointer */
+        struct net_device *netdev;      /* netdevice backpointer */
+        struct freelQ   freelQ[SGE_FREELQ_N]; /* buffer free lists */
+        struct respQ    respQ;          /* response Q */
+        unsigned long   stopped_tx_queues; /* bitmap of suspended Tx queues */
+        unsigned int    rx_pkt_pad;     /* RX padding for L2 packets */
+        unsigned int    jumbo_fl;       /* jumbo freelist Q index */
+        unsigned int    intrtimer_nres; /* no-resource interrupt timer */
+        unsigned int    fixed_intrtimer;/* non-adaptive interrupt timer */
+        struct timer_list tx_reclaim_timer; /* reclaims TX buffers */
+        struct timer_list espibug_timer;
+        unsigned int    espibug_timeout;
+        struct sk_buff  *espibug_skb;
+        u32             sge_control;    /* shadow value of sge control reg */
+        struct sge_intr_counts stats;
+        struct sge_port_stats port_stats[MAX_NPORTS];
+        struct cmdQ cmdQ[SGE_CMDQ_N] ____cacheline_aligned_in_smp;
+};
+
+/*
+ * PIO to indicate that memory mapped Q contains valid descriptor(s).
+ */
+static inline void doorbell_pio(struct adapter *adapter, u32 val)
+{
+        wmb();
+        writel(val, adapter->regs + A_SG_DOORBELL);
+}
+
+/*
+ * Frees all RX buffers on the freelist Q. The caller must make sure that
+ * the SGE is turned off before calling this function.
+ */
+static void free_freelQ_buffers(struct pci_dev *pdev, struct freelQ *q)
+{
+        unsigned int cidx = q->cidx;
+
+        while (q->credits--) {
+                struct freelQ_ce *ce = &q->centries[cidx];
+
+                pci_unmap_single(pdev, pci_unmap_addr(ce, dma_addr),
+                                 pci_unmap_len(ce, dma_len),
+                                 PCI_DMA_FROMDEVICE);
+                dev_kfree_skb(ce->skb);
+                ce->skb = NULL;
+                if (++cidx == q->size)
+                        cidx = 0;
+        }
+}
+
+/*
+ * Free RX free list and response queue resources.
+ */
+static void free_rx_resources(struct sge *sge)
+{
+        struct pci_dev *pdev = sge->adapter->pdev;
+        unsigned int size, i;
+
+        if (sge->respQ.entries) {
+                size = sizeof(struct respQ_e) * sge->respQ.size;
+                pci_free_consistent(pdev, size, sge->respQ.entries,
+                                    sge->respQ.dma_addr);
+        }
+
+        for (i = 0; i < SGE_FREELQ_N; i++) {
+                struct freelQ *q = &sge->freelQ[i];
+
+                if (q->centries) {
+                        free_freelQ_buffers(pdev, q);
+                        kfree(q->centries);
+                }
+                if (q->entries) {
+                        size = sizeof(struct freelQ_e) * q->size;
+                        pci_free_consistent(pdev, size, q->entries,
+                                            q->dma_addr);
+                }
+        }
+}
+
+/*
+ * Allocates basic RX resources, consisting of memory mapped freelist Qs and a
+ * response queue.
+ */
+static int alloc_rx_resources(struct sge *sge, struct sge_params *p)
+{
+        struct pci_dev *pdev = sge->adapter->pdev;
+        unsigned int size, i;
+
+        for (i = 0; i < SGE_FREELQ_N; i++) {
+                struct freelQ *q = &sge->freelQ[i];
+
+                q->genbit = 1;
+                q->size = p->freelQ_size[i];
+                q->dma_offset = sge->rx_pkt_pad ? 0 : NET_IP_ALIGN;
+                size = sizeof(struct freelQ_e) * q->size;
+                q->entries = (struct freelQ_e *)
+                              pci_alloc_consistent(pdev, size, &q->dma_addr);
+                if (!q->entries)
+                        goto err_no_mem;
+                memset(q->entries, 0, size);
+                size = sizeof(struct freelQ_ce) * q->size;
+                q->centries = kmalloc(size, GFP_KERNEL);
+                if (!q->centries)
+                        goto err_no_mem;
+                memset(q->centries, 0, size);
+        }
+
+        /*
+         * Calculate the buffer sizes for the two free lists.  FL0 accommodates
+         * regular sized Ethernet frames, FL1 is sized not to exceed 16K,
+         * including all the sk_buff overhead.
+         *
+         * Note: For T2 FL0 and FL1 are reversed.
+         */
+        sge->freelQ[!sge->jumbo_fl].rx_buffer_size = SGE_RX_SM_BUF_SIZE +
+                sizeof(struct cpl_rx_data) +
+                sge->freelQ[!sge->jumbo_fl].dma_offset;
+        sge->freelQ[sge->jumbo_fl].rx_buffer_size = (16 * 1024) -
+                SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+
+        /*
+         * Setup which skb recycle Q should be used when recycling buffers from
+         * each free list.
+         */
+        sge->freelQ[!sge->jumbo_fl].recycleq_idx = 0;
+        sge->freelQ[sge->jumbo_fl].recycleq_idx = 1;
+
+        sge->respQ.genbit = 1;
+        sge->respQ.size = SGE_RESPQ_E_N;
+        sge->respQ.credits = 0;
+        size = sizeof(struct respQ_e) * sge->respQ.size;
+        sge->respQ.entries = (struct respQ_e *)
+                pci_alloc_consistent(pdev, size, &sge->respQ.dma_addr);
+        if (!sge->respQ.entries)
+                goto err_no_mem;
+        memset(sge->respQ.entries, 0, size);
+        return 0;
+
+err_no_mem:
+        free_rx_resources(sge);
+        return -ENOMEM;
+}
+
+/*
+ * Reclaims n TX descriptors and frees the buffers associated with them.
+ */
+static void free_cmdQ_buffers(struct sge *sge, struct cmdQ *q, unsigned int n)
+{
+        struct cmdQ_ce *ce;
+        struct pci_dev *pdev = sge->adapter->pdev;
+        unsigned int cidx = q->cidx;
+
+        q->in_use -= n;
+        ce = &q->centries[cidx];
+        while (n--) {
+                if (q->sop)
+                        pci_unmap_single(pdev, pci_unmap_addr(ce, dma_addr),
+                                         pci_unmap_len(ce, dma_len),
+                                         PCI_DMA_TODEVICE);
+                else
+                        pci_unmap_page(pdev, pci_unmap_addr(ce, dma_addr),
+                                       pci_unmap_len(ce, dma_len),
+                                       PCI_DMA_TODEVICE);
+                q->sop = 0;
+                if (ce->skb) {
+                        dev_kfree_skb(ce->skb);
+                        q->sop = 1;
+                }
+                ce++;
+                if (++cidx == q->size) {
+                        cidx = 0;
+                        ce = q->centries;
+                }
+        }
+        q->cidx = cidx;
+}
+
+/*
+ * Free TX resources.
+ *
+ * Assumes that SGE is stopped and all interrupts are disabled.
+ */
+static void free_tx_resources(struct sge *sge)
+{
+        struct pci_dev *pdev = sge->adapter->pdev;
+        unsigned int size, i;
+
+        for (i = 0; i < SGE_CMDQ_N; i++) {
+                struct cmdQ *q = &sge->cmdQ[i];
+
+                if (q->centries) {
+                        if (q->in_use)
+                                free_cmdQ_buffers(sge, q, q->in_use);
+                        kfree(q->centries);
+                }
+                if (q->entries) {
+                        size = sizeof(struct cmdQ_e) * q->size;
+                        pci_free_consistent(pdev, size, q->entries,
+                                            q->dma_addr);
+                }
+        }
+}
+
+/*
+ * Allocates basic TX resources, consisting of memory mapped command Qs.
+ */
+static int alloc_tx_resources(struct sge *sge, struct sge_params *p)
+{
+        struct pci_dev *pdev = sge->adapter->pdev;
+        unsigned int size, i;
+
+        for (i = 0; i < SGE_CMDQ_N; i++) {
+                struct cmdQ *q = &sge->cmdQ[i];
+
+                q->genbit = 1;
+                q->sop = 1;
+                q->size = p->cmdQ_size[i];
+                q->in_use = 0;
+                q->status = 0;
+                q->processed = q->cleaned = 0;
+                q->stop_thres = 0;
+                spin_lock_init(&q->lock);
+                size = sizeof(struct cmdQ_e) * q->size;
+                q->entries = (struct cmdQ_e *)
+                              pci_alloc_consistent(pdev, size, &q->dma_addr);
+                if (!q->entries)
+                        goto err_no_mem;
+                memset(q->entries, 0, size);
+                size = sizeof(struct cmdQ_ce) * q->size;
+                q->centries = kmalloc(size, GFP_KERNEL);
+                if (!q->centries)
+                        goto err_no_mem;
+                memset(q->centries, 0, size);
+        }
+
+        /*
+         * CommandQ 0 handles Ethernet and TOE packets, while queue 1 is TOE
+         * only.  For queue 0 set the stop threshold so we can handle one more
+         * packet from each port, plus reserve an additional 24 entries for
+         * Ethernet packets only.  Queue 1 never suspends nor do we reserve
+         * space for Ethernet packets.
+         */
+        sge->cmdQ[0].stop_thres = sge->adapter->params.nports *
+                (MAX_SKB_FRAGS + 1);
+        return 0;
+
+err_no_mem:
+        free_tx_resources(sge);
+        return -ENOMEM;
+}
+
+static inline void setup_ring_params(struct adapter *adapter, u64 addr,
+                                     u32 size, int base_reg_lo,
+                                     int base_reg_hi, int size_reg)
+{
+        writel((u32)addr, adapter->regs + base_reg_lo);
+        writel(addr >> 32, adapter->regs + base_reg_hi);
+        writel(size, adapter->regs + size_reg);
+}
+
+/*
+ * Enable/disable VLAN acceleration.
+ */
+void t1_set_vlan_accel(struct adapter *adapter, int on_off)
+{
+        struct sge *sge = adapter->sge;
+
+        sge->sge_control &= ~F_VLAN_XTRACT;
+        if (on_off)
+                sge->sge_control |= F_VLAN_XTRACT;
+        if (adapter->open_device_map) {
+                writel(sge->sge_control, adapter->regs + A_SG_CONTROL);
+                readl(adapter->regs + A_SG_CONTROL); /* flush */
+        }
+}
+
+/*
+ * Programs the various SGE registers. However, the engine is not yet enabled,
+ * but sge->sge_control is setup and ready to go.
+ */
+static void configure_sge(struct sge *sge, struct sge_params *p)
+{
+        struct adapter *ap = sge->adapter;
+        
+        writel(0, ap->regs + A_SG_CONTROL);
+        setup_ring_params(ap, sge->cmdQ[0].dma_addr, sge->cmdQ[0].size,
+                          A_SG_CMD0BASELWR, A_SG_CMD0BASEUPR, A_SG_CMD0SIZE);
+        setup_ring_params(ap, sge->cmdQ[1].dma_addr, sge->cmdQ[1].size,
+                          A_SG_CMD1BASELWR, A_SG_CMD1BASEUPR, A_SG_CMD1SIZE);
+        setup_ring_params(ap, sge->freelQ[0].dma_addr,
+                          sge->freelQ[0].size, A_SG_FL0BASELWR,
+                          A_SG_FL0BASEUPR, A_SG_FL0SIZE);
+        setup_ring_params(ap, sge->freelQ[1].dma_addr,
+                          sge->freelQ[1].size, A_SG_FL1BASELWR,
+                          A_SG_FL1BASEUPR, A_SG_FL1SIZE);
+
+        /* The threshold comparison uses <. */
+        writel(SGE_RX_SM_BUF_SIZE + 1, ap->regs + A_SG_FLTHRESHOLD);
+
+        setup_ring_params(ap, sge->respQ.dma_addr, sge->respQ.size,
+                          A_SG_RSPBASELWR, A_SG_RSPBASEUPR, A_SG_RSPSIZE);
+        writel((u32)sge->respQ.size - 1, ap->regs + A_SG_RSPQUEUECREDIT);
+
+        sge->sge_control = F_CMDQ0_ENABLE | F_CMDQ1_ENABLE | F_FL0_ENABLE |
+                F_FL1_ENABLE | F_CPL_ENABLE | F_RESPONSE_QUEUE_ENABLE |
+                V_CMDQ_PRIORITY(2) | F_DISABLE_CMDQ1_GTS | F_ISCSI_COALESCE |
+                F_DISABLE_FL0_GTS | F_DISABLE_FL1_GTS |
+                V_RX_PKT_OFFSET(sge->rx_pkt_pad);
+
+#if defined(__BIG_ENDIAN_BITFIELD)
+        sge->sge_control |= F_ENABLE_BIG_ENDIAN;
+#endif
+
+        /* Initialize no-resource timer */
+        sge->intrtimer_nres = SGE_INTRTIMER_NRES * core_ticks_per_usec(ap);
+
+        t1_sge_set_coalesce_params(sge, p);
+}
+
+/*
+ * Return the payload capacity of the jumbo free-list buffers.
+ */
+static inline unsigned int jumbo_payload_capacity(const struct sge *sge)
+{
+        return sge->freelQ[sge->jumbo_fl].rx_buffer_size -
+                sge->freelQ[sge->jumbo_fl].dma_offset -
+                sizeof(struct cpl_rx_data);
+}
+
+/*
+ * Frees all SGE related resources and the sge structure itself
+ */
+void t1_sge_destroy(struct sge *sge)
+{
+        if (sge->espibug_skb)
+                kfree_skb(sge->espibug_skb);
+
+        free_tx_resources(sge);
+        free_rx_resources(sge);
+        kfree(sge);
+}
+
+/*
+ * Allocates new RX buffers on the freelist Q (and tracks them on the freelist
+ * context Q) until the Q is full or alloc_skb fails.
+ *
+ * It is possible that the generation bits already match, indicating that the
+ * buffer is already valid and nothing needs to be done. This happens when we
+ * copied a received buffer into a new sk_buff during the interrupt processing.
+ *
+ * If the SGE doesn't automatically align packets properly (!sge->rx_pkt_pad),
+ * we specify a RX_OFFSET in order to make sure that the IP header is 4B
+ * aligned.
+ */
+static void refill_free_list(struct sge *sge, struct freelQ *q)
+{
+        struct pci_dev *pdev = sge->adapter->pdev;
+        struct freelQ_ce *ce = &q->centries[q->pidx];
+        struct freelQ_e *e = &q->entries[q->pidx];
+        unsigned int dma_len = q->rx_buffer_size - q->dma_offset;
+
+
+        while (q->credits < q->size) {
+                struct sk_buff *skb;
+                dma_addr_t mapping;
+
+                skb = alloc_skb(q->rx_buffer_size, GFP_ATOMIC);
+                if (!skb)
+                        break;
+
+                skb_reserve(skb, q->dma_offset);
+                mapping = pci_map_single(pdev, skb->data, dma_len,
+                                         PCI_DMA_FROMDEVICE);
+                ce->skb = skb;
+                pci_unmap_addr_set(ce, dma_addr, mapping);
+                pci_unmap_len_set(ce, dma_len, dma_len);
+                e->addr_lo = (u32)mapping;
+                e->addr_hi = (u64)mapping >> 32;
+                e->len_gen = V_CMD_LEN(dma_len) | V_CMD_GEN1(q->genbit);
+                wmb();
+                e->gen2 = V_CMD_GEN2(q->genbit);
+
+                e++;
+                ce++;
+                if (++q->pidx == q->size) {
+                        q->pidx = 0;
+                        q->genbit ^= 1;
+                        ce = q->centries;
+                        e = q->entries;
+                }
+                q->credits++;
+        }
+
+}
+
+/*
+ * Calls refill_free_list for both free lists. If we cannot fill at least 1/4
+ * of both rings, we go into 'few interrupt mode' in order to give the system
+ * time to free up resources.
+ */
+static void freelQs_empty(struct sge *sge)
+{
+        struct adapter *adapter = sge->adapter;
+        u32 irq_reg = readl(adapter->regs + A_SG_INT_ENABLE);
+        u32 irqholdoff_reg;
+
+        refill_free_list(sge, &sge->freelQ[0]);
+        refill_free_list(sge, &sge->freelQ[1]);
+
+        if (sge->freelQ[0].credits > (sge->freelQ[0].size >> 2) &&
+            sge->freelQ[1].credits > (sge->freelQ[1].size >> 2)) {
+                irq_reg |= F_FL_EXHAUSTED;
+                irqholdoff_reg = sge->fixed_intrtimer;
+        } else {
+                /* Clear the F_FL_EXHAUSTED interrupts for now */
+                irq_reg &= ~F_FL_EXHAUSTED;
+                irqholdoff_reg = sge->intrtimer_nres;
+        }
+        writel(irqholdoff_reg, adapter->regs + A_SG_INTRTIMER);
+        writel(irq_reg, adapter->regs + A_SG_INT_ENABLE);
+
+        /* We reenable the Qs to force a freelist GTS interrupt later */
+        doorbell_pio(adapter, F_FL0_ENABLE | F_FL1_ENABLE);
+}
+
+#define SGE_PL_INTR_MASK (F_PL_INTR_SGE_ERR | F_PL_INTR_SGE_DATA)
+#define SGE_INT_FATAL (F_RESPQ_OVERFLOW | F_PACKET_TOO_BIG | F_PACKET_MISMATCH)
+#define SGE_INT_ENABLE (F_RESPQ_EXHAUSTED | F_RESPQ_OVERFLOW | \
+                        F_FL_EXHAUSTED | F_PACKET_TOO_BIG | F_PACKET_MISMATCH)
+
+/*
+ * Disable SGE Interrupts
+ */
+void t1_sge_intr_disable(struct sge *sge)
+{
+        u32 val = readl(sge->adapter->regs + A_PL_ENABLE);
+
+        writel(val & ~SGE_PL_INTR_MASK, sge->adapter->regs + A_PL_ENABLE);
+        writel(0, sge->adapter->regs + A_SG_INT_ENABLE);
+}
+
+/*
+ * Enable SGE interrupts.
+ */
+void t1_sge_intr_enable(struct sge *sge)
+{
+        u32 en = SGE_INT_ENABLE;
+        u32 val = readl(sge->adapter->regs + A_PL_ENABLE);
+
+        if (sge->adapter->flags & TSO_CAPABLE)
+                en &= ~F_PACKET_TOO_BIG;
+        writel(en, sge->adapter->regs + A_SG_INT_ENABLE);
+        writel(val | SGE_PL_INTR_MASK, sge->adapter->regs + A_PL_ENABLE);
+}
+
+/*
+ * Clear SGE interrupts.
+ */
+void t1_sge_intr_clear(struct sge *sge)
+{
+        writel(SGE_PL_INTR_MASK, sge->adapter->regs + A_PL_CAUSE);
+        writel(0xffffffff, sge->adapter->regs + A_SG_INT_CAUSE);
+}
+
+/*
+ * SGE 'Error' interrupt handler
+ */
+int t1_sge_intr_error_handler(struct sge *sge)
+{
+        struct adapter *adapter = sge->adapter;
+        u32 cause = readl(adapter->regs + A_SG_INT_CAUSE);
+
+        if (adapter->flags & TSO_CAPABLE)
+                cause &= ~F_PACKET_TOO_BIG;
+        if (cause & F_RESPQ_EXHAUSTED)
+                sge->stats.respQ_empty++;
+        if (cause & F_RESPQ_OVERFLOW) {
+                sge->stats.respQ_overflow++;
+                CH_ALERT("%s: SGE response queue overflow\n",
+                         adapter->name);
+        }
+        if (cause & F_FL_EXHAUSTED) {
+                sge->stats.freelistQ_empty++;
+                freelQs_empty(sge);
+        }
+        if (cause & F_PACKET_TOO_BIG) {
+                sge->stats.pkt_too_big++;
+                CH_ALERT("%s: SGE max packet size exceeded\n",
+                         adapter->name);
+        }
+        if (cause & F_PACKET_MISMATCH) {
+                sge->stats.pkt_mismatch++;
+                CH_ALERT("%s: SGE packet mismatch\n", adapter->name);
+        }
+        if (cause & SGE_INT_FATAL)
+                t1_fatal_err(adapter);
+
+        writel(cause, adapter->regs + A_SG_INT_CAUSE);
+        return 0;
+}
+
+const struct sge_intr_counts *t1_sge_get_intr_counts(struct sge *sge)
+{
+        return &sge->stats;
+}
+
+const struct sge_port_stats *t1_sge_get_port_stats(struct sge *sge, int port)
+{
+        return &sge->port_stats[port];
+}
+
+/**
+ *      recycle_fl_buf - recycle a free list buffer
+ *      @fl: the free list
+ *      @idx: index of buffer to recycle
+ *
+ *      Recycles the specified buffer on the given free list by adding it at
+ *      the next available slot on the list.
+ */
+static void recycle_fl_buf(struct freelQ *fl, int idx)
+{
+        struct freelQ_e *from = &fl->entries[idx];
+        struct freelQ_e *to = &fl->entries[fl->pidx];
+
+        fl->centries[fl->pidx] = fl->centries[idx];
+        to->addr_lo = from->addr_lo;
+        to->addr_hi = from->addr_hi;
+        to->len_gen = G_CMD_LEN(from->len_gen) | V_CMD_GEN1(fl->genbit);
+        wmb();
+        to->gen2 = V_CMD_GEN2(fl->genbit);
+        fl->credits++;
+
+        if (++fl->pidx == fl->size) {
+                fl->pidx = 0;
+                fl->genbit ^= 1;
+        }
+}
+
+/**
+ *      get_packet - return the next ingress packet buffer
+ *      @pdev: the PCI device that received the packet
+ *      @fl: the SGE free list holding the packet
+ *      @len: the actual packet length, excluding any SGE padding
+ *      @dma_pad: padding at beginning of buffer left by SGE DMA
+ *      @skb_pad: padding to be used if the packet is copied
+ *      @copy_thres: length threshold under which a packet should be copied
+ *      @drop_thres: # of remaining buffers before we start dropping packets
+ *
+ *      Get the next packet from a free list and complete setup of the
+ *      sk_buff.  If the packet is small we make a copy and recycle the
+ *      original buffer, otherwise we use the original buffer itself.  If a
+ *      positive drop threshold is supplied packets are dropped and their
+ *      buffers recycled if (a) the number of remaining buffers is under the
+ *      threshold and the packet is too big to copy, or (b) the packet should
+ *      be copied but there is no memory for the copy.
+ */
+static inline struct sk_buff *get_packet(struct pci_dev *pdev,
+                                         struct freelQ *fl, unsigned int len,
+                                         int dma_pad, int skb_pad,
+                                         unsigned int copy_thres,
+                                         unsigned int drop_thres)
+{
+        struct sk_buff *skb;
+        struct freelQ_ce *ce = &fl->centries[fl->cidx];
+
+        if (len < copy_thres) {
+                skb = alloc_skb(len + skb_pad, GFP_ATOMIC);
+                if (likely(skb != NULL)) {
+                        skb_reserve(skb, skb_pad);
+                        skb_put(skb, len);
+                        pci_dma_sync_single_for_cpu(pdev,
+                                            pci_unmap_addr(ce, dma_addr),
+                                            pci_unmap_len(ce, dma_len),
+                                            PCI_DMA_FROMDEVICE);
+                        memcpy(skb->data, ce->skb->data + dma_pad, len);
+                        pci_dma_sync_single_for_device(pdev,
+                                            pci_unmap_addr(ce, dma_addr),
+                                            pci_unmap_len(ce, dma_len),
+                                            PCI_DMA_FROMDEVICE);
+                } else if (!drop_thres)
+                        goto use_orig_buf;
+
+                recycle_fl_buf(fl, fl->cidx);
+                return skb;
+        }
+
+        if (fl->credits < drop_thres) {
+                recycle_fl_buf(fl, fl->cidx);
+                return NULL;
+        }
+
+use_orig_buf:
+        pci_unmap_single(pdev, pci_unmap_addr(ce, dma_addr),
+                         pci_unmap_len(ce, dma_len), PCI_DMA_FROMDEVICE);
+        skb = ce->skb;
+        skb_reserve(skb, dma_pad);
+        skb_put(skb, len);
+        return skb;
+}
+
+/**
+ *      unexpected_offload - handle an unexpected offload packet
+ *      @adapter: the adapter
+ *      @fl: the free list that received the packet
+ *
+ *      Called when we receive an unexpected offload packet (e.g., the TOE
+ *      function is disabled or the card is a NIC).  Prints a message and
+ *      recycles the buffer.
+ */
+static void unexpected_offload(struct adapter *adapter, struct freelQ *fl)
+{
+        struct freelQ_ce *ce = &fl->centries[fl->cidx];
+        struct sk_buff *skb = ce->skb;
+
+        pci_dma_sync_single_for_cpu(adapter->pdev, pci_unmap_addr(ce, dma_addr),
+                            pci_unmap_len(ce, dma_len), PCI_DMA_FROMDEVICE);
+        CH_ERR("%s: unexpected offload packet, cmd %u\n",
+               adapter->name, *skb->data);
+        recycle_fl_buf(fl, fl->cidx);
+}
+
+/*
+ * Write the command descriptors to transmit the given skb starting at
+ * descriptor pidx with the given generation.
+ */
+static inline void write_tx_descs(struct adapter *adapter, struct sk_buff *skb,
+                                  unsigned int pidx, unsigned int gen,
+                                  struct cmdQ *q)
+{
+        dma_addr_t mapping;
+        struct cmdQ_e *e, *e1;
+        struct cmdQ_ce *ce;
+        unsigned int i, flags, nfrags = skb_shinfo(skb)->nr_frags;
+
+        mapping = pci_map_single(adapter->pdev, skb->data,
+                                 skb->len - skb->data_len, PCI_DMA_TODEVICE);
+        ce = &q->centries[pidx];
+        ce->skb = NULL;
+        pci_unmap_addr_set(ce, dma_addr, mapping);
+        pci_unmap_len_set(ce, dma_len, skb->len - skb->data_len);
+
+        flags = F_CMD_DATAVALID | F_CMD_SOP | V_CMD_EOP(nfrags == 0) |
+                V_CMD_GEN2(gen);
+        e = &q->entries[pidx];
+        e->addr_lo = (u32)mapping;
+        e->addr_hi = (u64)mapping >> 32;
+        e->len_gen = V_CMD_LEN(skb->len - skb->data_len) | V_CMD_GEN1(gen);
+        for (e1 = e, i = 0; nfrags--; i++) {
+                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+
+                ce++;
+                e1++;
+                if (++pidx == q->size) {
+                        pidx = 0;
+                        gen ^= 1;
+                        ce = q->centries;
+                        e1 = q->entries;
+                }
+
+                mapping = pci_map_page(adapter->pdev, frag->page,
+                                       frag->page_offset, frag->size,
+                                       PCI_DMA_TODEVICE);
+                ce->skb = NULL;
+                pci_unmap_addr_set(ce, dma_addr, mapping);
+                pci_unmap_len_set(ce, dma_len, frag->size);
+
+                e1->addr_lo = (u32)mapping;
+                e1->addr_hi = (u64)mapping >> 32;
+                e1->len_gen = V_CMD_LEN(frag->size) | V_CMD_GEN1(gen);
+                e1->flags = F_CMD_DATAVALID | V_CMD_EOP(nfrags == 0) |
+                            V_CMD_GEN2(gen);
+        }
+
+        ce->skb = skb;
+        wmb();
+        e->flags = flags;
+}
+
+/*
+ * Clean up completed Tx buffers.
+ */
+static inline void reclaim_completed_tx(struct sge *sge, struct cmdQ *q)
+{
+        unsigned int reclaim = q->processed - q->cleaned;
+
+        if (reclaim) {
+                free_cmdQ_buffers(sge, q, reclaim);
+                q->cleaned += reclaim;
+        }
+}
+
+#ifndef SET_ETHTOOL_OPS
+# define __netif_rx_complete(dev) netif_rx_complete(dev)
+#endif
+
+/*
+ * We cannot use the standard netif_rx_schedule_prep() because we have multiple
+ * ports plus the TOE all multiplexing onto a single response queue, therefore
+ * accepting new responses cannot depend on the state of any particular port.
+ * So define our own equivalent that omits the netif_running() test.
+ */
+static inline int napi_schedule_prep(struct net_device *dev)
+{
+        return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
+}
+
+
+/**
+ *      sge_rx - process an ingress ethernet packet
+ *      @sge: the sge structure
+ *      @fl: the free list that contains the packet buffer
+ *      @len: the packet length
+ *
+ *      Process an ingress ethernet pakcet and deliver it to the stack.
+ */
+static int sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
+{
+        struct sk_buff *skb;
+        struct cpl_rx_pkt *p;
+        struct adapter *adapter = sge->adapter;
+
+        sge->stats.ethernet_pkts++;
+        skb = get_packet(adapter->pdev, fl, len - sge->rx_pkt_pad,
+                         sge->rx_pkt_pad, 2, SGE_RX_COPY_THRES,
+                         SGE_RX_DROP_THRES);
+        if (!skb) {
+                sge->port_stats[0].rx_drops++; /* charge only port 0 for now */
+                return 0;
+        }
+
+        p = (struct cpl_rx_pkt *)skb->data;
+        skb_pull(skb, sizeof(*p));
+        skb->dev = adapter->port[p->iff].dev;
+        skb->dev->last_rx = jiffies;
+        skb->protocol = eth_type_trans(skb, skb->dev);
+        if ((adapter->flags & RX_CSUM_ENABLED) && p->csum == 0xffff &&
+            skb->protocol == htons(ETH_P_IP) &&
+            (skb->data[9] == IPPROTO_TCP || skb->data[9] == IPPROTO_UDP)) {
+                sge->port_stats[p->iff].rx_cso_good++;
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+        } else
+                skb->ip_summed = CHECKSUM_NONE;
+
+        if (unlikely(adapter->vlan_grp && p->vlan_valid)) {
+                sge->port_stats[p->iff].vlan_xtract++;
+                if (adapter->params.sge.polling)
+                        vlan_hwaccel_receive_skb(skb, adapter->vlan_grp,
+                                                 ntohs(p->vlan));
+                else
+                        vlan_hwaccel_rx(skb, adapter->vlan_grp,
+                                        ntohs(p->vlan));
+        } else if (adapter->params.sge.polling)
+                netif_receive_skb(skb);
+        else
+                netif_rx(skb);
+        return 0;
+}
+
+/*
+ * Returns true if a command queue has enough available descriptors that
+ * we can resume Tx operation after temporarily disabling its packet queue.
+ */
+static inline int enough_free_Tx_descs(const struct cmdQ *q)
+{
+        unsigned int r = q->processed - q->cleaned;
+
+        return q->in_use - r < (q->size >> 1);
+}
+
+/*
+ * Called when sufficient space has become available in the SGE command queues
+ * after the Tx packet schedulers have been suspended to restart the Tx path.
+ */
+static void restart_tx_queues(struct sge *sge)
+{
+        struct adapter *adap = sge->adapter;
+
+        if (enough_free_Tx_descs(&sge->cmdQ[0])) {
+                int i;
+
+                for_each_port(adap, i) {
+                        struct net_device *nd = adap->port[i].dev;
+
+                        if (test_and_clear_bit(nd->if_port,
+                                               &sge->stopped_tx_queues) &&
+                            netif_running(nd)) {
+                                sge->stats.cmdQ_restarted[3]++;
+                                netif_wake_queue(nd);
+                        }
+                }
+        }
+}
+
+/*
+ * update_tx_info is called from the interrupt handler/NAPI to return cmdQ0 
+ * information.
+ */
+static unsigned int update_tx_info(struct adapter *adapter, 
+                                          unsigned int flags, 
+                                          unsigned int pr0)
+{
+        struct sge *sge = adapter->sge;
+        struct cmdQ *cmdq = &sge->cmdQ[0];
+
+        cmdq->processed += pr0;
+
+        if (flags & F_CMDQ0_ENABLE) {
+                clear_bit(CMDQ_STAT_RUNNING, &cmdq->status);
+        
+                if (cmdq->cleaned + cmdq->in_use != cmdq->processed &&
+                    !test_and_set_bit(CMDQ_STAT_LAST_PKT_DB, &cmdq->status)) {
+                        set_bit(CMDQ_STAT_RUNNING, &cmdq->status);
+                        writel(F_CMDQ0_ENABLE, adapter->regs + A_SG_DOORBELL);
+                }
+                flags &= ~F_CMDQ0_ENABLE;
+        }
+        
+        if (unlikely(sge->stopped_tx_queues != 0))
+                restart_tx_queues(sge);
+
+        return flags;
+}
+
+/*
+ * Process SGE responses, up to the supplied budget.  Returns the number of
+ * responses processed.  A negative budget is effectively unlimited.
+ */
+static int process_responses(struct adapter *adapter, int budget)
+{
+        struct sge *sge = adapter->sge;
+        struct respQ *q = &sge->respQ;
+        struct respQ_e *e = &q->entries[q->cidx];
+        int budget_left = budget;
+        unsigned int flags = 0;
+        unsigned int cmdq_processed[SGE_CMDQ_N] = {0, 0};
+        
+
+        while (likely(budget_left && e->GenerationBit == q->genbit)) {
+                flags |= e->Qsleeping;
+                
+                cmdq_processed[0] += e->Cmdq0CreditReturn;
+                cmdq_processed[1] += e->Cmdq1CreditReturn;
+                
+                /* We batch updates to the TX side to avoid cacheline
+                 * ping-pong of TX state information on MP where the sender
+                 * might run on a different CPU than this function...
+                 */
+                if (unlikely(flags & F_CMDQ0_ENABLE || cmdq_processed[0] > 64)) {
+                        flags = update_tx_info(adapter, flags, cmdq_processed[0]);
+                        cmdq_processed[0] = 0;
+                }
+                if (unlikely(cmdq_processed[1] > 16)) {
+                        sge->cmdQ[1].processed += cmdq_processed[1];
+                        cmdq_processed[1] = 0;
+                }
+                if (likely(e->DataValid)) {
+                        struct freelQ *fl = &sge->freelQ[e->FreelistQid];
+
+                        if (unlikely(!e->Sop || !e->Eop))
+                                BUG();
+                        if (unlikely(e->Offload))
+                                unexpected_offload(adapter, fl);
+                        else
+                                sge_rx(sge, fl, e->BufferLength);
+
+                        /*
+                         * Note: this depends on each packet consuming a
+                         * single free-list buffer; cf. the BUG above.
+                         */
+                        if (++fl->cidx == fl->size)
+                                fl->cidx = 0;
+                        if (unlikely(--fl->credits <
+                                     fl->size - SGE_FREEL_REFILL_THRESH))
+                                refill_free_list(sge, fl);
+                } else
+                        sge->stats.pure_rsps++;
+
+                e++;
+                if (unlikely(++q->cidx == q->size)) {
+                        q->cidx = 0;
+                        q->genbit ^= 1;
+                        e = q->entries;
+                }
+                prefetch(e);
+
+                if (++q->credits > SGE_RESPQ_REPLENISH_THRES) {
+                        writel(q->credits, adapter->regs + A_SG_RSPQUEUECREDIT);
+                        q->credits = 0;
+                }
+                --budget_left;
+        }
+
+        flags = update_tx_info(adapter, flags, cmdq_processed[0]); 
+        sge->cmdQ[1].processed += cmdq_processed[1];
+
+        budget -= budget_left;
+        return budget;
+}
+
+/*
+ * A simpler version of process_responses() that handles only pure (i.e.,
+ * non data-carrying) responses.  Such respones are too light-weight to justify
+ * calling a softirq when using NAPI, so we handle them specially in hard
+ * interrupt context.  The function is called with a pointer to a response,
+ * which the caller must ensure is a valid pure response.  Returns 1 if it
+ * encounters a valid data-carrying response, 0 otherwise.
+ */
+static int process_pure_responses(struct adapter *adapter, struct respQ_e *e)
+{
+        struct sge *sge = adapter->sge;
+        struct respQ *q = &sge->respQ;
+        unsigned int flags = 0;
+        unsigned int cmdq_processed[SGE_CMDQ_N] = {0, 0};
+
+        do {
+                flags |= e->Qsleeping;
+
+                cmdq_processed[0] += e->Cmdq0CreditReturn;
+                cmdq_processed[1] += e->Cmdq1CreditReturn;
+                
+                e++;
+                if (unlikely(++q->cidx == q->size)) {
+                        q->cidx = 0;
+                        q->genbit ^= 1;
+                        e = q->entries;
+                }
+                prefetch(e);
+
+                if (++q->credits > SGE_RESPQ_REPLENISH_THRES) {
+                        writel(q->credits, adapter->regs + A_SG_RSPQUEUECREDIT);
+                        q->credits = 0;
+                }
+                sge->stats.pure_rsps++;
+        } while (e->GenerationBit == q->genbit && !e->DataValid);
+
+        flags = update_tx_info(adapter, flags, cmdq_processed[0]); 
+        sge->cmdQ[1].processed += cmdq_processed[1];
+
+        return e->GenerationBit == q->genbit;
+}
+
+/*
+ * Handler for new data events when using NAPI.  This does not need any locking
+ * or protection from interrupts as data interrupts are off at this point and
+ * other adapter interrupts do not interfere.
+ */
+static int t1_poll(struct net_device *dev, int *budget)
+{
+        struct adapter *adapter = dev->priv;
+        int effective_budget = min(*budget, dev->quota);
+
+        int work_done = process_responses(adapter, effective_budget);
+        *budget -= work_done;
+        dev->quota -= work_done;
+
+        if (work_done >= effective_budget)
+                return 1;
+
+        __netif_rx_complete(dev);
+
+        /*
+         * Because we don't atomically flush the following write it is
+         * possible that in very rare cases it can reach the device in a way
+         * that races with a new response being written plus an error interrupt
+         * causing the NAPI interrupt handler below to return unhandled status
+         * to the OS.  To protect against this would require flushing the write
+         * and doing both the write and the flush with interrupts off.  Way too
+         * expensive and unjustifiable given the rarity of the race.
+         */
+        writel(adapter->sge->respQ.cidx, adapter->regs + A_SG_SLEEPING);
+        return 0;
+}
+
+/*
+ * Returns true if the device is already scheduled for polling.
+ */
+static inline int napi_is_scheduled(struct net_device *dev)
+{
+        return test_bit(__LINK_STATE_RX_SCHED, &dev->state);
+}
+
+/*
+ * NAPI version of the main interrupt handler.
+ */
+static irqreturn_t t1_interrupt_napi(int irq, void *data, struct pt_regs *regs)
+{
+        int handled;
+        struct adapter *adapter = data;
+        struct sge *sge = adapter->sge;
+        struct respQ *q = &adapter->sge->respQ;
+
+        /*
+         * Clear the SGE_DATA interrupt first thing.  Normally the NAPI
+         * handler has control of the response queue and the interrupt handler
+         * can look at the queue reliably only once it knows NAPI is off.
+         * We can't wait that long to clear the SGE_DATA interrupt because we
+         * could race with t1_poll rearming the SGE interrupt, so we need to
+         * clear the interrupt speculatively and really early on.
+         */
+        writel(F_PL_INTR_SGE_DATA, adapter->regs + A_PL_CAUSE);
+
+        spin_lock(&adapter->async_lock);
+        if (!napi_is_scheduled(sge->netdev)) {
+                struct respQ_e *e = &q->entries[q->cidx];
+
+                if (e->GenerationBit == q->genbit) {
+                        if (e->DataValid ||
+                            process_pure_responses(adapter, e)) {
+                                if (likely(napi_schedule_prep(sge->netdev)))
+                                        __netif_rx_schedule(sge->netdev);
+                                else
+                                        printk(KERN_CRIT
+                                               "NAPI schedule failure!\n");
+                        } else
+                        writel(q->cidx, adapter->regs + A_SG_SLEEPING);
+                        handled = 1;
+                        goto unlock;
+                } else
+                writel(q->cidx, adapter->regs + A_SG_SLEEPING);
+        }  else
+        if (readl(adapter->regs + A_PL_CAUSE) & F_PL_INTR_SGE_DATA)
+                printk(KERN_ERR "data interrupt while NAPI running\n");
+        
+        handled = t1_slow_intr_handler(adapter);
+        if (!handled)
+                sge->stats.unhandled_irqs++;
+ unlock:
+        spin_unlock(&adapter->async_lock);
+        return IRQ_RETVAL(handled != 0);
+}
+
+/*
+ * Main interrupt handler, optimized assuming that we took a 'DATA'
+ * interrupt.
+ *
+ * 1. Clear the interrupt
+ * 2. Loop while we find valid descriptors and process them; accumulate
+ *      information that can be processed after the loop
+ * 3. Tell the SGE at which index we stopped processing descriptors
+ * 4. Bookkeeping; free TX buffers, ring doorbell if there are any
+ *      outstanding TX buffers waiting, replenish RX buffers, potentially
+ *      reenable upper layers if they were turned off due to lack of TX
+ *      resources which are available again.
+ * 5. If we took an interrupt, but no valid respQ descriptors was found we
+ *      let the slow_intr_handler run and do error handling.
+ */
+static irqreturn_t t1_interrupt(int irq, void *cookie, struct pt_regs *regs)
+{
+        int work_done;
+        struct respQ_e *e;
+        struct adapter *adapter = cookie;
+        struct respQ *Q = &adapter->sge->respQ;
+
+        spin_lock(&adapter->async_lock);
+        e = &Q->entries[Q->cidx];
+        prefetch(e);
+
+        writel(F_PL_INTR_SGE_DATA, adapter->regs + A_PL_CAUSE);
+
+        if (likely(e->GenerationBit == Q->genbit))
+                work_done = process_responses(adapter, -1);
+        else
+                work_done = t1_slow_intr_handler(adapter);
+
+        /*
+         * The unconditional clearing of the PL_CAUSE above may have raced
+         * with DMA completion and the corresponding generation of a response
+         * to cause us to miss the resulting data interrupt.  The next write
+         * is also unconditional to recover the missed interrupt and render
+         * this race harmless.
+         */
+        writel(Q->cidx, adapter->regs + A_SG_SLEEPING);
+
+        if (!work_done)
+                adapter->sge->stats.unhandled_irqs++;
+        spin_unlock(&adapter->async_lock);
+        return IRQ_RETVAL(work_done != 0);
+}
+
+intr_handler_t t1_select_intr_handler(adapter_t *adapter)
+{
+        return adapter->params.sge.polling ? t1_interrupt_napi : t1_interrupt;
+}
+
+/*
+ * Enqueues the sk_buff onto the cmdQ[qid] and has hardware fetch it.
+ *
+ * The code figures out how many entries the sk_buff will require in the
+ * cmdQ and updates the cmdQ data structure with the state once the enqueue
+ * has complete. Then, it doesn't access the global structure anymore, but
+ * uses the corresponding fields on the stack. In conjuction with a spinlock
+ * around that code, we can make the function reentrant without holding the
+ * lock when we actually enqueue (which might be expensive, especially on
+ * architectures with IO MMUs).
+ *
+ * This runs with softirqs disabled.
+ */
+unsigned int t1_sge_tx(struct sk_buff *skb, struct adapter *adapter,
+                       unsigned int qid, struct net_device *dev)
+{
+        struct sge *sge = adapter->sge;
+        struct cmdQ *q = &sge->cmdQ[qid];
+        unsigned int credits, pidx, genbit, count;
+
+        spin_lock(&q->lock);
+        reclaim_completed_tx(sge, q);
+
+        pidx = q->pidx;
+        credits = q->size - q->in_use;
+        count = 1 + skb_shinfo(skb)->nr_frags;
+
+        {       /* Ethernet packet */
+                if (unlikely(credits < count)) {
+                        netif_stop_queue(dev);
+                        set_bit(dev->if_port, &sge->stopped_tx_queues);
+                        sge->stats.cmdQ_full[3]++;
+                        spin_unlock(&q->lock);
+                        CH_ERR("%s: Tx ring full while queue awake!\n",
+                               adapter->name);
+                        return 1;
+                }
+                if (unlikely(credits - count < q->stop_thres)) {
+                        sge->stats.cmdQ_full[3]++;
+                        netif_stop_queue(dev);
+                        set_bit(dev->if_port, &sge->stopped_tx_queues);
+                }
+        }
+        q->in_use += count;
+        genbit = q->genbit;
+        q->pidx += count;
+        if (q->pidx >= q->size) {
+                q->pidx -= q->size;
+                q->genbit ^= 1;
+        }
+        spin_unlock(&q->lock);
+
+        write_tx_descs(adapter, skb, pidx, genbit, q);
+
+        /*
+         * We always ring the doorbell for cmdQ1.  For cmdQ0, we only ring
+         * the doorbell if the Q is asleep. There is a natural race, where
+         * the hardware is going to sleep just after we checked, however,
+         * then the interrupt handler will detect the outstanding TX packet
+         * and ring the doorbell for us.
+         */
+        if (qid)
+                doorbell_pio(adapter, F_CMDQ1_ENABLE);
+        else {
+                clear_bit(CMDQ_STAT_LAST_PKT_DB, &q->status);
+                if (test_and_set_bit(CMDQ_STAT_RUNNING, &q->status) == 0) {
+                        set_bit(CMDQ_STAT_LAST_PKT_DB, &q->status);
+                        writel(F_CMDQ0_ENABLE, adapter->regs + A_SG_DOORBELL);
+                }
+        }
+        return 0;
+}
+
+#define MK_ETH_TYPE_MSS(type, mss) (((mss) & 0x3FFF) | ((type) << 14))
+
+/*
+ *      eth_hdr_len - return the length of an Ethernet header
+ *      @data: pointer to the start of the Ethernet header
+ *
+ *      Returns the length of an Ethernet header, including optional VLAN tag.
+ */
+static inline int eth_hdr_len(const void *data)
+{
+        const struct ethhdr *e = data;
+
+        return e->h_proto == htons(ETH_P_8021Q) ? VLAN_ETH_HLEN : ETH_HLEN;
+}
+
+/*
+ * Adds the CPL header to the sk_buff and passes it to t1_sge_tx.
+ */
+int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct adapter *adapter = dev->priv;
+        struct sge_port_stats *st = &adapter->sge->port_stats[dev->if_port];
+        struct sge *sge = adapter->sge;
+        struct cpl_tx_pkt *cpl;
+
+#ifdef NETIF_F_TSO
+        if (skb_shinfo(skb)->tso_size) {
+                int eth_type;
+                struct cpl_tx_pkt_lso *hdr;
+
+                st->tso++;
+
+                eth_type = skb->nh.raw - skb->data == ETH_HLEN ?
+                        CPL_ETH_II : CPL_ETH_II_VLAN;
+
+                hdr = (struct cpl_tx_pkt_lso *)skb_push(skb, sizeof(*hdr));
+                hdr->opcode = CPL_TX_PKT_LSO;
+                hdr->ip_csum_dis = hdr->l4_csum_dis = 0;
+                hdr->ip_hdr_words = skb->nh.iph->ihl;
+                hdr->tcp_hdr_words = skb->h.th->doff;
+                hdr->eth_type_mss = htons(MK_ETH_TYPE_MSS(eth_type,
+                                                skb_shinfo(skb)->tso_size));
+                hdr->len = htonl(skb->len - sizeof(*hdr));
+                cpl = (struct cpl_tx_pkt *)hdr;
+                sge->stats.tx_lso_pkts++;
+        } else
+#endif
+        {
+                /*
+                 * Packets shorter than ETH_HLEN can break the MAC, drop them
+                 * early.  Also, we may get oversized packets because some
+                 * parts of the kernel don't handle our unusual hard_header_len
+                 * right, drop those too.
+                 */
+                if (unlikely(skb->len < ETH_HLEN ||
+                             skb->len > dev->mtu + eth_hdr_len(skb->data))) {
+                        dev_kfree_skb_any(skb);
+                        return NET_XMIT_SUCCESS;
+                }
+
+                /*
+                 * We are using a non-standard hard_header_len and some kernel
+                 * components, such as pktgen, do not handle it right.
+                 * Complain when this happens but try to fix things up.
+                 */
+                if (unlikely(skb_headroom(skb) <
+                             dev->hard_header_len - ETH_HLEN)) {
+                        struct sk_buff *orig_skb = skb;
+
+                        if (net_ratelimit())
+                                printk(KERN_ERR "%s: inadequate headroom in "
+                                       "Tx packet\n", dev->name);
+                        skb = skb_realloc_headroom(skb, sizeof(*cpl));
+                        dev_kfree_skb_any(orig_skb);
+                        if (!skb)
+                                return -ENOMEM;
+                }
+
+                if (!(adapter->flags & UDP_CSUM_CAPABLE) &&
+                    skb->ip_summed == CHECKSUM_HW &&
+                    skb->nh.iph->protocol == IPPROTO_UDP)
+                        if (unlikely(skb_checksum_help(skb, 0))) {
+                                dev_kfree_skb_any(skb);
+                                return -ENOMEM;
+                        }
+
+                /* Hmmm, assuming to catch the gratious arp... and we'll use
+                 * it to flush out stuck espi packets...
+                  */
+                if (unlikely(!adapter->sge->espibug_skb)) {
+                        if (skb->protocol == htons(ETH_P_ARP) &&
+                            skb->nh.arph->ar_op == htons(ARPOP_REQUEST)) {
+                                adapter->sge->espibug_skb = skb;
+                                /* We want to re-use this skb later. We
+                                 * simply bump the reference count and it
+                                 * will not be freed...
+                                 */
+                                skb = skb_get(skb);
+                        }
+                }
+
+                cpl = (struct cpl_tx_pkt *)__skb_push(skb, sizeof(*cpl));
+                cpl->opcode = CPL_TX_PKT;
+                cpl->ip_csum_dis = 1;    /* SW calculates IP csum */
+                cpl->l4_csum_dis = skb->ip_summed == CHECKSUM_HW ? 0 : 1;
+                /* the length field isn't used so don't bother setting it */
+
+                st->tx_cso += (skb->ip_summed == CHECKSUM_HW);
+                sge->stats.tx_do_cksum += (skb->ip_summed == CHECKSUM_HW);
+                sge->stats.tx_reg_pkts++;
+        }
+        cpl->iff = dev->if_port;
+
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+        if (adapter->vlan_grp && vlan_tx_tag_present(skb)) {
+                cpl->vlan_valid = 1;
+                cpl->vlan = htons(vlan_tx_tag_get(skb));
+                st->vlan_insert++;
+        } else
+#endif
+                cpl->vlan_valid = 0;
+
+        dev->trans_start = jiffies;
+        return t1_sge_tx(skb, adapter, 0, dev);
+}
+
+/*
+ * Callback for the Tx buffer reclaim timer.  Runs with softirqs disabled.
+ */
+static void sge_tx_reclaim_cb(unsigned long data)
+{
+        int i;
+        struct sge *sge = (struct sge *)data;
+
+        for (i = 0; i < SGE_CMDQ_N; ++i) {
+                struct cmdQ *q = &sge->cmdQ[i];
+
+                if (!spin_trylock(&q->lock))
+                        continue;
+
+                reclaim_completed_tx(sge, q);
+                if (i == 0 && q->in_use)   /* flush pending credits */
+                        writel(F_CMDQ0_ENABLE,
+                                sge->adapter->regs + A_SG_DOORBELL);
+
+                spin_unlock(&q->lock);
+        }
+        mod_timer(&sge->tx_reclaim_timer, jiffies + TX_RECLAIM_PERIOD);
+}
+
+/*
+ * Propagate changes of the SGE coalescing parameters to the HW.
+ */
+int t1_sge_set_coalesce_params(struct sge *sge, struct sge_params *p)
+{
+        sge->netdev->poll = t1_poll;
+        sge->fixed_intrtimer = p->rx_coalesce_usecs *
+                core_ticks_per_usec(sge->adapter);
+        writel(sge->fixed_intrtimer, sge->adapter->regs + A_SG_INTRTIMER);
+        return 0;
+}
+
+/*
+ * Allocates both RX and TX resources and configures the SGE. However,
+ * the hardware is not enabled yet.
+ */
+int t1_sge_configure(struct sge *sge, struct sge_params *p)
+{
+        if (alloc_rx_resources(sge, p))
+                return -ENOMEM;
+        if (alloc_tx_resources(sge, p)) {
+                free_rx_resources(sge);
+                return -ENOMEM;
+        }
+        configure_sge(sge, p);
+
+        /*
+         * Now that we have sized the free lists calculate the payload
+         * capacity of the large buffers.  Other parts of the driver use
+         * this to set the max offload coalescing size so that RX packets
+         * do not overflow our large buffers.
+         */
+        p->large_buf_capacity = jumbo_payload_capacity(sge);
+        return 0;
+}
+
+/*
+ * Disables the DMA engine.
+ */
+void t1_sge_stop(struct sge *sge)
+{
+        writel(0, sge->adapter->regs + A_SG_CONTROL);
+        (void) readl(sge->adapter->regs + A_SG_CONTROL); /* flush */
+        if (is_T2(sge->adapter))
+                del_timer_sync(&sge->espibug_timer);
+        del_timer_sync(&sge->tx_reclaim_timer);
+}
+
+/*
+ * Enables the DMA engine.
+ */
+void t1_sge_start(struct sge *sge)
+{
+        refill_free_list(sge, &sge->freelQ[0]);
+        refill_free_list(sge, &sge->freelQ[1]);
+
+        writel(sge->sge_control, sge->adapter->regs + A_SG_CONTROL);
+        doorbell_pio(sge->adapter, F_FL0_ENABLE | F_FL1_ENABLE);
+        (void) readl(sge->adapter->regs + A_SG_CONTROL); /* flush */
+
+        mod_timer(&sge->tx_reclaim_timer, jiffies + TX_RECLAIM_PERIOD);
+
+        if (is_T2(sge->adapter)) 
+                mod_timer(&sge->espibug_timer, jiffies + sge->espibug_timeout);
+}
+
+/*
+ * Callback for the T2 ESPI 'stuck packet feature' workaorund
+ */
+static void espibug_workaround(void *data)
+{
+        struct adapter *adapter = (struct adapter *)data;
+        struct sge *sge = adapter->sge;
+
+        if (netif_running(adapter->port[0].dev)) {
+                struct sk_buff *skb = sge->espibug_skb;
+
+                u32 seop = t1_espi_get_mon(adapter, 0x930, 0);
+
+                if ((seop & 0xfff0fff) == 0xfff && skb) {
+                        if (!skb->cb[0]) {
+                                u8 ch_mac_addr[ETH_ALEN] =
+                                    {0x0, 0x7, 0x43, 0x0, 0x0, 0x0};
+                                memcpy(skb->data + sizeof(struct cpl_tx_pkt),
+                                    ch_mac_addr, ETH_ALEN);
+                                memcpy(skb->data + skb->len - 10, ch_mac_addr,
+                                    ETH_ALEN);
+                                skb->cb[0] = 0xff;
+                        }
+
+                        /* bump the reference count to avoid freeing of the
+                         * skb once the DMA has completed.
+                         */
+                        skb = skb_get(skb);
+                        t1_sge_tx(skb, adapter, 0, adapter->port[0].dev);
+                }
+        }
+        mod_timer(&sge->espibug_timer, jiffies + sge->espibug_timeout);
+}
+
+/*
+ * Creates a t1_sge structure and returns suggested resource parameters.
+ */
+struct sge * __devinit t1_sge_create(struct adapter *adapter,
+                                     struct sge_params *p)
+{
+        struct sge *sge = kmalloc(sizeof(*sge), GFP_KERNEL);
+
+        if (!sge)
+                return NULL;
+        memset(sge, 0, sizeof(*sge));
+
+        sge->adapter = adapter;
+        sge->netdev = adapter->port[0].dev;
+        sge->rx_pkt_pad = t1_is_T1B(adapter) ? 0 : 2;
+        sge->jumbo_fl = t1_is_T1B(adapter) ? 1 : 0;
+
+        init_timer(&sge->tx_reclaim_timer);
+        sge->tx_reclaim_timer.data = (unsigned long)sge;
+        sge->tx_reclaim_timer.function = sge_tx_reclaim_cb;
+
+        if (is_T2(sge->adapter)) {
+                init_timer(&sge->espibug_timer);
+                sge->espibug_timer.function = (void *)&espibug_workaround;
+                sge->espibug_timer.data = (unsigned long)sge->adapter;
+                sge->espibug_timeout = 1;
+        }
+         
+
+        p->cmdQ_size[0] = SGE_CMDQ0_E_N;
+        p->cmdQ_size[1] = SGE_CMDQ1_E_N;
+        p->freelQ_size[!sge->jumbo_fl] = SGE_FREEL_SIZE;
+        p->freelQ_size[sge->jumbo_fl] = SGE_JUMBO_FREEL_SIZE;
+        p->rx_coalesce_usecs =  50;
+        p->coalesce_enable = 0;
+        p->sample_interval_usecs = 0;
+        p->polling = 0;
+
+        return sge;
+}
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/chelsio/sge.h
new file mode 100644
index 000000000000..434b25586851
--- /dev/null
+++ b/drivers/net/chelsio/sge.h
@@ -0,0 +1,105 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: sge.h                                                               *
+ * $Revision: 1.11 $                                                          *
+ * $Date: 2005/06/21 22:10:55 $                                              *
+ * Description:                                                              *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_SGE_H_
+#define _CXGB_SGE_H_
+
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <asm/byteorder.h>
+
+#ifndef IRQ_RETVAL
+#define IRQ_RETVAL(x)
+typedef void irqreturn_t;
+#endif
+
+typedef irqreturn_t (*intr_handler_t)(int, void *, struct pt_regs *);
+
+struct sge_intr_counts {
+        unsigned int respQ_empty;      /* # times respQ empty */
+        unsigned int respQ_overflow;   /* # respQ overflow (fatal) */
+        unsigned int freelistQ_empty;  /* # times freelist empty */
+        unsigned int pkt_too_big;      /* packet too large (fatal) */
+        unsigned int pkt_mismatch;
+        unsigned int cmdQ_full[3];     /* not HW IRQ, host cmdQ[] full */
+        unsigned int cmdQ_restarted[3];/* # of times cmdQ X was restarted */
+        unsigned int ethernet_pkts;    /* # of Ethernet packets received */
+        unsigned int offload_pkts;     /* # of offload packets received */
+        unsigned int offload_bundles;  /* # of offload pkt bundles delivered */
+        unsigned int pure_rsps;        /* # of non-payload responses */
+        unsigned int unhandled_irqs;   /* # of unhandled interrupts */
+        unsigned int tx_ipfrags;
+        unsigned int tx_reg_pkts;
+        unsigned int tx_lso_pkts;
+        unsigned int tx_do_cksum;
+};
+
+struct sge_port_stats {
+        unsigned long rx_cso_good;     /* # of successful RX csum offloads */
+        unsigned long tx_cso;          /* # of TX checksum offloads */
+        unsigned long vlan_xtract;     /* # of VLAN tag extractions */
+        unsigned long vlan_insert;     /* # of VLAN tag extractions */
+        unsigned long tso;             /* # of TSO requests */
+        unsigned long rx_drops;        /* # of packets dropped due to no mem */
+};
+
+struct sk_buff;
+struct net_device;
+struct adapter;
+struct sge_params;
+struct sge;
+
+struct sge *t1_sge_create(struct adapter *, struct sge_params *);
+int t1_sge_configure(struct sge *, struct sge_params *);
+int t1_sge_set_coalesce_params(struct sge *, struct sge_params *);
+void t1_sge_destroy(struct sge *);
+intr_handler_t t1_select_intr_handler(adapter_t *adapter);
+unsigned int t1_sge_tx(struct sk_buff *skb, struct adapter *adapter,
+                       unsigned int qid, struct net_device *netdev);
+int t1_start_xmit(struct sk_buff *skb, struct net_device *dev);
+void t1_set_vlan_accel(struct adapter *adapter, int on_off);
+void t1_sge_start(struct sge *);
+void t1_sge_stop(struct sge *);
+int t1_sge_intr_error_handler(struct sge *);
+void t1_sge_intr_enable(struct sge *);
+void t1_sge_intr_disable(struct sge *);
+void t1_sge_intr_clear(struct sge *);
+const struct sge_intr_counts *t1_sge_get_intr_counts(struct sge *sge);
+const struct sge_port_stats *t1_sge_get_port_stats(struct sge *sge, int port);
+
+#endif /* _CXGB_SGE_H_ */
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c
new file mode 100644
index 000000000000..1ebb5d149aef
--- /dev/null
+++ b/drivers/net/chelsio/subr.c
@@ -0,0 +1,812 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: subr.c                                                              *
+ * $Revision: 1.27 $                                                         *
+ * $Date: 2005/06/22 01:08:36 $                                              *
+ * Description:                                                              *
+ *  Various subroutines (intr,pio,etc.) used by Chelsio 10G Ethernet driver. *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Copyright (c) 2003 - 2005 Chelsio Communications, Inc.                    *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: Dimitrios Michailidis   <dm@chelsio.com>                         *
+ *          Tina Yang               <tainay@chelsio.com>                     *
+ *          Felix Marti             <felix@chelsio.com>                      *
+ *          Scott Bardone           <sbardone@chelsio.com>                   *
+ *          Kurt Ottaway            <kottaway@chelsio.com>                   *
+ *          Frank DiMambro          <frank@chelsio.com>                      *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#include "common.h"
+#include "elmer0.h"
+#include "regs.h"
+#include "gmac.h"
+#include "cphy.h"
+#include "sge.h"
+#include "espi.h"
+
+/**
+ *      t1_wait_op_done - wait until an operation is completed
+ *      @adapter: the adapter performing the operation
+ *      @reg: the register to check for completion
+ *      @mask: a single-bit field within @reg that indicates completion
+ *      @polarity: the value of the field when the operation is completed
+ *      @attempts: number of check iterations
+ *      @delay: delay in usecs between iterations
+ *
+ *      Wait until an operation is completed by checking a bit in a register
+ *      up to @attempts times.  Returns %0 if the operation completes and %1
+ *      otherwise.
+ */
+static int t1_wait_op_done(adapter_t *adapter, int reg, u32 mask, int polarity,
+                    int attempts, int delay)
+{
+        while (1) {
+                u32 val = readl(adapter->regs + reg) & mask;
+
+                if (!!val == polarity)
+                        return 0;
+                if (--attempts == 0)
+                        return 1;
+                if (delay)
+                        udelay(delay);
+        }
+}
+
+#define TPI_ATTEMPTS 50
+
+/*
+ * Write a register over the TPI interface (unlocked and locked versions).
+ */
+static int __t1_tpi_write(adapter_t *adapter, u32 addr, u32 value)
+{
+        int tpi_busy;
+
+        writel(addr, adapter->regs + A_TPI_ADDR);
+        writel(value, adapter->regs + A_TPI_WR_DATA);
+        writel(F_TPIWR, adapter->regs + A_TPI_CSR);
+
+        tpi_busy = t1_wait_op_done(adapter, A_TPI_CSR, F_TPIRDY, 1,
+                                   TPI_ATTEMPTS, 3);
+        if (tpi_busy)
+                CH_ALERT("%s: TPI write to 0x%x failed\n",
+                         adapter->name, addr);
+        return tpi_busy;
+}
+
+int t1_tpi_write(adapter_t *adapter, u32 addr, u32 value)
+{
+        int ret;
+
+        spin_lock(&(adapter)->tpi_lock);
+        ret = __t1_tpi_write(adapter, addr, value);
+        spin_unlock(&(adapter)->tpi_lock);
+        return ret;
+}
+
+/*
+ * Read a register over the TPI interface (unlocked and locked versions).
+ */
+static int __t1_tpi_read(adapter_t *adapter, u32 addr, u32 *valp)
+{
+        int tpi_busy;
+
+        writel(addr, adapter->regs + A_TPI_ADDR);
+        writel(0, adapter->regs + A_TPI_CSR);
+
+        tpi_busy = t1_wait_op_done(adapter, A_TPI_CSR, F_TPIRDY, 1,
+                                   TPI_ATTEMPTS, 3);
+        if (tpi_busy)
+                CH_ALERT("%s: TPI read from 0x%x failed\n",
+                         adapter->name, addr);
+        else
+                *valp = readl(adapter->regs + A_TPI_RD_DATA);
+        return tpi_busy;
+}
+
+int t1_tpi_read(adapter_t *adapter, u32 addr, u32 *valp)
+{
+        int ret;
+
+        spin_lock(&(adapter)->tpi_lock);
+        ret = __t1_tpi_read(adapter, addr, valp);
+        spin_unlock(&(adapter)->tpi_lock);
+        return ret;
+}
+
+/*
+ * Called when a port's link settings change to propagate the new values to the
+ * associated PHY and MAC.  After performing the common tasks it invokes an
+ * OS-specific handler.
+ */
+/* static */ void link_changed(adapter_t *adapter, int port_id)
+{
+        int link_ok, speed, duplex, fc;
+        struct cphy *phy = adapter->port[port_id].phy;
+        struct link_config *lc = &adapter->port[port_id].link_config;
+
+        phy->ops->get_link_status(phy, &link_ok, &speed, &duplex, &fc);
+
+        lc->speed = speed < 0 ? SPEED_INVALID : speed;
+        lc->duplex = duplex < 0 ? DUPLEX_INVALID : duplex;
+        if (!(lc->requested_fc & PAUSE_AUTONEG))
+                fc = lc->requested_fc & (PAUSE_RX | PAUSE_TX);
+
+        if (link_ok && speed >= 0 && lc->autoneg == AUTONEG_ENABLE) {
+                /* Set MAC speed, duplex, and flow control to match PHY. */
+                struct cmac *mac = adapter->port[port_id].mac;
+
+                mac->ops->set_speed_duplex_fc(mac, speed, duplex, fc);
+                lc->fc = (unsigned char)fc;
+        }
+        t1_link_changed(adapter, port_id, link_ok, speed, duplex, fc);
+}
+
+static int t1_pci_intr_handler(adapter_t *adapter)
+{
+        u32 pcix_cause;
+
+        pci_read_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE, &pcix_cause);
+
+        if (pcix_cause) {
+                pci_write_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE,
+                                         pcix_cause);
+                t1_fatal_err(adapter);    /* PCI errors are fatal */
+        }
+        return 0;
+}
+
+
+/*
+ * Wait until Elmer's MI1 interface is ready for new operations.
+ */
+static int mi1_wait_until_ready(adapter_t *adapter, int mi1_reg)
+{
+        int attempts = 100, busy;
+
+        do {
+                u32 val;
+
+                __t1_tpi_read(adapter, mi1_reg, &val);
+                busy = val & F_MI1_OP_BUSY;
+                if (busy)
+                        udelay(10);
+        } while (busy && --attempts);
+        if (busy)
+                CH_ALERT("%s: MDIO operation timed out\n",
+                         adapter->name);
+        return busy;
+}
+
+/*
+ * MI1 MDIO initialization.
+ */
+static void mi1_mdio_init(adapter_t *adapter, const struct board_info *bi)
+{
+        u32 clkdiv = bi->clock_elmer0 / (2 * bi->mdio_mdc) - 1;
+        u32 val = F_MI1_PREAMBLE_ENABLE | V_MI1_MDI_INVERT(bi->mdio_mdiinv) |
+                V_MI1_MDI_ENABLE(bi->mdio_mdien) | V_MI1_CLK_DIV(clkdiv);
+
+        if (!(bi->caps & SUPPORTED_10000baseT_Full))
+                val |= V_MI1_SOF(1);
+        t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_CFG, val);
+}
+
+static int mi1_mdio_ext_read(adapter_t *adapter, int phy_addr, int mmd_addr,
+                             int reg_addr, unsigned int *valp)
+{
+        u32 addr = V_MI1_REG_ADDR(mmd_addr) | V_MI1_PHY_ADDR(phy_addr);
+
+        spin_lock(&(adapter)->tpi_lock);
+
+        /* Write the address we want. */
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_ADDR, addr);
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_DATA, reg_addr);
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_OP,
+                       MI1_OP_INDIRECT_ADDRESS);
+        mi1_wait_until_ready(adapter, A_ELMER0_PORT0_MI1_OP);
+
+        /* Write the operation we want. */
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_OP, MI1_OP_INDIRECT_READ);
+        mi1_wait_until_ready(adapter, A_ELMER0_PORT0_MI1_OP);
+
+        /* Read the data. */
+        __t1_tpi_read(adapter, A_ELMER0_PORT0_MI1_DATA, valp);
+        spin_unlock(&(adapter)->tpi_lock);
+        return 0;
+}
+
+static int mi1_mdio_ext_write(adapter_t *adapter, int phy_addr, int mmd_addr,
+                              int reg_addr, unsigned int val)
+{
+        u32 addr = V_MI1_REG_ADDR(mmd_addr) | V_MI1_PHY_ADDR(phy_addr);
+
+        spin_lock(&(adapter)->tpi_lock);
+
+        /* Write the address we want. */
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_ADDR, addr);
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_DATA, reg_addr);
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_OP,
+                       MI1_OP_INDIRECT_ADDRESS);
+        mi1_wait_until_ready(adapter, A_ELMER0_PORT0_MI1_OP);
+
+        /* Write the data. */
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_DATA, val);
+        __t1_tpi_write(adapter, A_ELMER0_PORT0_MI1_OP, MI1_OP_INDIRECT_WRITE);
+        mi1_wait_until_ready(adapter, A_ELMER0_PORT0_MI1_OP);
+        spin_unlock(&(adapter)->tpi_lock);
+        return 0;
+}
+
+static struct mdio_ops mi1_mdio_ext_ops = {
+        mi1_mdio_init,
+        mi1_mdio_ext_read,
+        mi1_mdio_ext_write
+};
+
+enum {
+        CH_BRD_N110_1F,
+        CH_BRD_N210_1F,
+};
+
+static struct board_info t1_board[] = {
+
+{ CHBT_BOARD_N110, 1/*ports#*/,
+  SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE /*caps*/, CHBT_TERM_T1,
+  CHBT_MAC_PM3393, CHBT_PHY_88X2010,
+  125000000/*clk-core*/, 0/*clk-mc3*/, 0/*clk-mc4*/,
+  1/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 0/*mdien*/,
+  0/*mdiinv*/, 1/*mdc*/, 0/*phybaseaddr*/, &t1_pm3393_ops,
+  &t1_mv88x201x_ops, &mi1_mdio_ext_ops,
+  "Chelsio N110 1x10GBaseX NIC" },
+
+{ CHBT_BOARD_N210, 1/*ports#*/,
+  SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE /*caps*/, CHBT_TERM_T2,
+  CHBT_MAC_PM3393, CHBT_PHY_88X2010,
+  125000000/*clk-core*/, 0/*clk-mc3*/, 0/*clk-mc4*/,
+  1/*espi-ports*/, 0/*clk-cspi*/, 44/*clk-elmer0*/, 0/*mdien*/,
+  0/*mdiinv*/, 1/*mdc*/, 0/*phybaseaddr*/, &t1_pm3393_ops,
+  &t1_mv88x201x_ops, &mi1_mdio_ext_ops,
+  "Chelsio N210 1x10GBaseX NIC" },
+
+};
+
+struct pci_device_id t1_pci_tbl[] = {
+        CH_DEVICE(7, 0, CH_BRD_N110_1F),
+        CH_DEVICE(10, 1, CH_BRD_N210_1F),
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, t1_pci_tbl);
+
+/*
+ * Return the board_info structure with a given index.  Out-of-range indices
+ * return NULL.
+ */
+const struct board_info *t1_get_board_info(unsigned int board_id)
+{
+        return board_id < ARRAY_SIZE(t1_board) ? &t1_board[board_id] : NULL;
+}
+
+struct chelsio_vpd_t {
+        u32 format_version;
+        u8 serial_number[16];
+        u8 mac_base_address[6];
+        u8 pad[2];           /* make multiple-of-4 size requirement explicit */
+};
+
+#define EEPROMSIZE        (8 * 1024)
+#define EEPROM_MAX_POLL   4
+
+/*
+ * Read SEEPROM. A zero is written to the flag register when the addres is
+ * written to the Control register. The hardware device will set the flag to a
+ * one when 4B have been transferred to the Data register.
+ */
+int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data)
+{
+        int i = EEPROM_MAX_POLL;
+        u16 val;
+
+        if (addr >= EEPROMSIZE || (addr & 3))
+                return -EINVAL;
+
+        pci_write_config_word(adapter->pdev, A_PCICFG_VPD_ADDR, (u16)addr);
+        do {
+                udelay(50);
+                pci_read_config_word(adapter->pdev, A_PCICFG_VPD_ADDR, &val);
+        } while (!(val & F_VPD_OP_FLAG) && --i);
+
+        if (!(val & F_VPD_OP_FLAG)) {
+                CH_ERR("%s: reading EEPROM address 0x%x failed\n",
+                       adapter->name, addr);
+                return -EIO;
+        }
+        pci_read_config_dword(adapter->pdev, A_PCICFG_VPD_DATA, data);
+        *data = le32_to_cpu(*data);
+        return 0;
+}
+
+static int t1_eeprom_vpd_get(adapter_t *adapter, struct chelsio_vpd_t *vpd)
+{
+        int addr, ret = 0;
+
+        for (addr = 0; !ret && addr < sizeof(*vpd); addr += sizeof(u32))
+                ret = t1_seeprom_read(adapter, addr,
+                                      (u32 *)((u8 *)vpd + addr));
+
+        return ret;
+}
+
+/*
+ * Read a port's MAC address from the VPD ROM.
+ */
+static int vpd_macaddress_get(adapter_t *adapter, int index, u8 mac_addr[])
+{
+        struct chelsio_vpd_t vpd;
+
+        if (t1_eeprom_vpd_get(adapter, &vpd))
+                return 1;
+        memcpy(mac_addr, vpd.mac_base_address, 5);
+        mac_addr[5] = vpd.mac_base_address[5] + index;
+        return 0;
+}
+
+/*
+ * Set up the MAC/PHY according to the requested link settings.
+ *
+ * If the PHY can auto-negotiate first decide what to advertise, then
+ * enable/disable auto-negotiation as desired and reset.
+ *
+ * If the PHY does not auto-negotiate we just reset it.
+ *
+ * If auto-negotiation is off set the MAC to the proper speed/duplex/FC,
+ * otherwise do it later based on the outcome of auto-negotiation.
+ */
+int t1_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc)
+{
+        unsigned int fc = lc->requested_fc & (PAUSE_RX | PAUSE_TX);
+
+        if (lc->supported & SUPPORTED_Autoneg) {
+                lc->advertising &= ~(ADVERTISED_ASYM_PAUSE | ADVERTISED_PAUSE);
+                if (fc) {
+                        lc->advertising |= ADVERTISED_ASYM_PAUSE;
+                        if (fc == (PAUSE_RX | PAUSE_TX))
+                                lc->advertising |= ADVERTISED_PAUSE;
+                }
+                phy->ops->advertise(phy, lc->advertising);
+
+                if (lc->autoneg == AUTONEG_DISABLE) {
+                        lc->speed = lc->requested_speed;
+                        lc->duplex = lc->requested_duplex;
+                        lc->fc = (unsigned char)fc;
+                        mac->ops->set_speed_duplex_fc(mac, lc->speed,
+                                                      lc->duplex, fc);
+                        /* Also disables autoneg */
+                        phy->ops->set_speed_duplex(phy, lc->speed, lc->duplex);
+                        phy->ops->reset(phy, 0);
+                } else
+                        phy->ops->autoneg_enable(phy); /* also resets PHY */
+        } else {
+                mac->ops->set_speed_duplex_fc(mac, -1, -1, fc);
+                lc->fc = (unsigned char)fc;
+                phy->ops->reset(phy, 0);
+        }
+        return 0;
+}
+
+/*
+ * External interrupt handler for boards using elmer0.
+ */
+int elmer0_ext_intr_handler(adapter_t *adapter)
+{
+        struct cphy *phy;
+        int phy_cause;
+        u32 cause;
+
+        t1_tpi_read(adapter, A_ELMER0_INT_CAUSE, &cause);
+
+        switch (board_info(adapter)->board) {
+        case CHBT_BOARD_N210:
+        case CHBT_BOARD_N110:
+                if (cause & ELMER0_GP_BIT6) { /* Marvell 88x2010 interrupt */
+                        phy = adapter->port[0].phy;
+                        phy_cause = phy->ops->interrupt_handler(phy);
+                        if (phy_cause & cphy_cause_link_change)
+                                link_changed(adapter, 0);
+                }
+                break;
+        }
+        t1_tpi_write(adapter, A_ELMER0_INT_CAUSE, cause);
+        return 0;
+}
+
+/* Enables all interrupts. */
+void t1_interrupts_enable(adapter_t *adapter)
+{
+        unsigned int i;
+        u32 pl_intr;
+
+        adapter->slow_intr_mask = F_PL_INTR_SGE_ERR;
+
+        t1_sge_intr_enable(adapter->sge);
+        if (adapter->espi) {
+                adapter->slow_intr_mask |= F_PL_INTR_ESPI;
+                t1_espi_intr_enable(adapter->espi);
+        }
+
+        /* Enable MAC/PHY interrupts for each port. */
+        for_each_port(adapter, i) {
+                adapter->port[i].mac->ops->interrupt_enable(adapter->port[i].mac);
+                adapter->port[i].phy->ops->interrupt_enable(adapter->port[i].phy);
+        }
+
+        /* Enable PCIX & external chip interrupts on ASIC boards. */
+        pl_intr = readl(adapter->regs + A_PL_ENABLE);
+
+        /* PCI-X interrupts */
+        pci_write_config_dword(adapter->pdev, A_PCICFG_INTR_ENABLE,
+                               0xffffffff);
+
+        adapter->slow_intr_mask |= F_PL_INTR_EXT | F_PL_INTR_PCIX;
+        pl_intr |= F_PL_INTR_EXT | F_PL_INTR_PCIX;
+        writel(pl_intr, adapter->regs + A_PL_ENABLE);
+}
+
+/* Disables all interrupts. */
+void t1_interrupts_disable(adapter_t* adapter)
+{
+        unsigned int i;
+
+        t1_sge_intr_disable(adapter->sge);
+        if (adapter->espi)
+                t1_espi_intr_disable(adapter->espi);
+
+        /* Disable MAC/PHY interrupts for each port. */
+        for_each_port(adapter, i) {
+                adapter->port[i].mac->ops->interrupt_disable(adapter->port[i].mac);
+                adapter->port[i].phy->ops->interrupt_disable(adapter->port[i].phy);
+        }
+
+        /* Disable PCIX & external chip interrupts. */
+        writel(0, adapter->regs + A_PL_ENABLE);
+
+        /* PCI-X interrupts */
+        pci_write_config_dword(adapter->pdev, A_PCICFG_INTR_ENABLE, 0);
+
+        adapter->slow_intr_mask = 0;
+}
+
+/* Clears all interrupts */
+void t1_interrupts_clear(adapter_t* adapter)
+{
+        unsigned int i;
+        u32 pl_intr;
+
+
+        t1_sge_intr_clear(adapter->sge);
+        if (adapter->espi)
+                t1_espi_intr_clear(adapter->espi);
+
+        /* Clear MAC/PHY interrupts for each port. */
+        for_each_port(adapter, i) {
+                adapter->port[i].mac->ops->interrupt_clear(adapter->port[i].mac);
+                adapter->port[i].phy->ops->interrupt_clear(adapter->port[i].phy);
+        }
+
+        /* Enable interrupts for external devices. */
+        pl_intr = readl(adapter->regs + A_PL_CAUSE);
+
+        writel(pl_intr | F_PL_INTR_EXT | F_PL_INTR_PCIX,
+               adapter->regs + A_PL_CAUSE);
+
+        /* PCI-X interrupts */
+        pci_write_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE, 0xffffffff);
+}
+
+/*
+ * Slow path interrupt handler for ASICs.
+ */
+int t1_slow_intr_handler(adapter_t *adapter)
+{
+        u32 cause = readl(adapter->regs + A_PL_CAUSE);
+
+        cause &= adapter->slow_intr_mask;
+        if (!cause)
+                return 0;
+        if (cause & F_PL_INTR_SGE_ERR)
+                t1_sge_intr_error_handler(adapter->sge);
+        if (cause & F_PL_INTR_ESPI)
+                t1_espi_intr_handler(adapter->espi);
+        if (cause & F_PL_INTR_PCIX)
+                t1_pci_intr_handler(adapter);
+        if (cause & F_PL_INTR_EXT)
+                t1_elmer0_ext_intr(adapter);
+
+        /* Clear the interrupts just processed. */
+        writel(cause, adapter->regs + A_PL_CAUSE);
+        (void)readl(adapter->regs + A_PL_CAUSE); /* flush writes */
+        return 1;
+}
+
+/* Pause deadlock avoidance parameters */
+#define DROP_MSEC 16
+#define DROP_PKTS_CNT  1
+
+static void set_csum_offload(adapter_t *adapter, u32 csum_bit, int enable)
+{
+        u32 val = readl(adapter->regs + A_TP_GLOBAL_CONFIG);
+
+        if (enable)
+                val |= csum_bit;
+        else
+                val &= ~csum_bit;
+        writel(val, adapter->regs + A_TP_GLOBAL_CONFIG);
+}
+
+void t1_tp_set_ip_checksum_offload(adapter_t *adapter, int enable)
+{
+        set_csum_offload(adapter, F_IP_CSUM, enable);
+}
+
+void t1_tp_set_udp_checksum_offload(adapter_t *adapter, int enable)
+{
+        set_csum_offload(adapter, F_UDP_CSUM, enable);
+}
+
+void t1_tp_set_tcp_checksum_offload(adapter_t *adapter, int enable)
+{
+        set_csum_offload(adapter, F_TCP_CSUM, enable);
+}
+
+static void t1_tp_reset(adapter_t *adapter, unsigned int tp_clk)
+{
+        u32 val;
+
+        val = F_TP_IN_CSPI_CPL | F_TP_IN_CSPI_CHECK_IP_CSUM |
+              F_TP_IN_CSPI_CHECK_TCP_CSUM | F_TP_IN_ESPI_ETHERNET;
+        val |= F_TP_IN_ESPI_CHECK_IP_CSUM |
+               F_TP_IN_ESPI_CHECK_TCP_CSUM;
+        writel(val, adapter->regs + A_TP_IN_CONFIG);
+        writel(F_TP_OUT_CSPI_CPL |
+               F_TP_OUT_ESPI_ETHERNET |
+               F_TP_OUT_ESPI_GENERATE_IP_CSUM |
+               F_TP_OUT_ESPI_GENERATE_TCP_CSUM,
+               adapter->regs + A_TP_OUT_CONFIG);
+
+        val = readl(adapter->regs + A_TP_GLOBAL_CONFIG);
+        val &= ~(F_IP_CSUM | F_UDP_CSUM | F_TCP_CSUM);
+        writel(val, adapter->regs + A_TP_GLOBAL_CONFIG);
+
+        /*
+         * Enable pause frame deadlock prevention.
+         */
+        if (is_T2(adapter)) {
+                u32 drop_ticks = DROP_MSEC * (tp_clk / 1000);
+
+                writel(F_ENABLE_TX_DROP | F_ENABLE_TX_ERROR |
+                       V_DROP_TICKS_CNT(drop_ticks) |
+                       V_NUM_PKTS_DROPPED(DROP_PKTS_CNT),
+                       adapter->regs + A_TP_TX_DROP_CONFIG);
+        }
+
+        writel(F_TP_RESET, adapter->regs + A_TP_RESET);
+}
+
+int __devinit t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,
+                               struct adapter_params *p)
+{
+        p->chip_version = bi->chip_term;
+        if (p->chip_version == CHBT_TERM_T1 ||
+            p->chip_version == CHBT_TERM_T2) {
+                u32 val = readl(adapter->regs + A_TP_PC_CONFIG);
+
+                val = G_TP_PC_REV(val);
+                if (val == 2)
+                        p->chip_revision = TERM_T1B;
+                else if (val == 3)
+                        p->chip_revision = TERM_T2;
+                else
+                        return -1;
+        } else
+                return -1;
+        return 0;
+}
+
+/*
+ * Enable board components other than the Chelsio chip, such as external MAC
+ * and PHY.
+ */
+static int board_init(adapter_t *adapter, const struct board_info *bi)
+{
+        switch (bi->board) {
+        case CHBT_BOARD_N110:
+        case CHBT_BOARD_N210:
+                writel(V_TPIPAR(0xf), adapter->regs + A_TPI_PAR);
+                t1_tpi_write(adapter, A_ELMER0_GPO, 0x800);
+                break;
+        }
+        return 0;
+}
+
+/*
+ * Initialize and configure the Terminator HW modules.  Note that external
+ * MAC and PHYs are initialized separately.
+ */
+int t1_init_hw_modules(adapter_t *adapter)
+{
+        int err = -EIO;
+        const struct board_info *bi = board_info(adapter);
+
+        if (!bi->clock_mc4) {
+                u32 val = readl(adapter->regs + A_MC4_CFG);
+
+                writel(val | F_READY | F_MC4_SLOW, adapter->regs + A_MC4_CFG);
+                writel(F_M_BUS_ENABLE | F_TCAM_RESET,
+                       adapter->regs + A_MC5_CONFIG);
+        }
+
+        if (adapter->espi && t1_espi_init(adapter->espi, bi->chip_mac,
+                                          bi->espi_nports))
+                goto out_err;
+
+        t1_tp_reset(adapter, bi->clock_core);
+
+        err = t1_sge_configure(adapter->sge, &adapter->params.sge);
+        if (err)
+                goto out_err;
+
+        err = 0;
+ out_err:
+        return err;
+}
+
+/*
+ * Determine a card's PCI mode.
+ */
+static void __devinit get_pci_mode(adapter_t *adapter, struct chelsio_pci_params *p)
+{
+        static unsigned short speed_map[] = { 33, 66, 100, 133 };
+        u32 pci_mode;
+
+        pci_read_config_dword(adapter->pdev, A_PCICFG_MODE, &pci_mode);
+        p->speed = speed_map[G_PCI_MODE_CLK(pci_mode)];
+        p->width = (pci_mode & F_PCI_MODE_64BIT) ? 64 : 32;
+        p->is_pcix = (pci_mode & F_PCI_MODE_PCIX) != 0;
+}
+
+/*
+ * Release the structures holding the SW per-Terminator-HW-module state.
+ */
+void t1_free_sw_modules(adapter_t *adapter)
+{
+        unsigned int i;
+
+        for_each_port(adapter, i) {
+                struct cmac *mac = adapter->port[i].mac;
+                struct cphy *phy = adapter->port[i].phy;
+
+                if (mac)
+                        mac->ops->destroy(mac);
+                if (phy)
+                        phy->ops->destroy(phy);
+        }
+
+        if (adapter->sge)
+                t1_sge_destroy(adapter->sge);
+        if (adapter->espi)
+                t1_espi_destroy(adapter->espi);
+}
+
+static void __devinit init_link_config(struct link_config *lc,
+                                       const struct board_info *bi)
+{
+        lc->supported = bi->caps;
+        lc->requested_speed = lc->speed = SPEED_INVALID;
+        lc->requested_duplex = lc->duplex = DUPLEX_INVALID;
+        lc->requested_fc = lc->fc = PAUSE_RX | PAUSE_TX;
+        if (lc->supported & SUPPORTED_Autoneg) {
+                lc->advertising = lc->supported;
+                lc->autoneg = AUTONEG_ENABLE;
+                lc->requested_fc |= PAUSE_AUTONEG;
+        } else {
+                lc->advertising = 0;
+                lc->autoneg = AUTONEG_DISABLE;
+        }
+}
+
+
+/*
+ * Allocate and initialize the data structures that hold the SW state of
+ * the Terminator HW modules.
+ */
+int __devinit t1_init_sw_modules(adapter_t *adapter,
+                                 const struct board_info *bi)
+{
+        unsigned int i;
+
+        adapter->params.brd_info = bi;
+        adapter->params.nports = bi->port_number;
+        adapter->params.stats_update_period = bi->gmac->stats_update_period;
+
+        adapter->sge = t1_sge_create(adapter, &adapter->params.sge);
+        if (!adapter->sge) {
+                CH_ERR("%s: SGE initialization failed\n",
+                       adapter->name);
+                goto error;
+        }
+
+        if (bi->espi_nports && !(adapter->espi = t1_espi_create(adapter))) {
+                CH_ERR("%s: ESPI initialization failed\n",
+                       adapter->name);
+                goto error;
+        }
+
+        board_init(adapter, bi);
+        bi->mdio_ops->init(adapter, bi);
+        if (bi->gphy->reset)
+                bi->gphy->reset(adapter);
+        if (bi->gmac->reset)
+                bi->gmac->reset(adapter);
+
+        for_each_port(adapter, i) {
+                u8 hw_addr[6];
+                struct cmac *mac;
+                int phy_addr = bi->mdio_phybaseaddr + i;
+
+                adapter->port[i].phy = bi->gphy->create(adapter, phy_addr,
+                                                        bi->mdio_ops);
+                if (!adapter->port[i].phy) {
+                        CH_ERR("%s: PHY %d initialization failed\n",
+                               adapter->name, i);
+                        goto error;
+                }
+
+                adapter->port[i].mac = mac = bi->gmac->create(adapter, i);
+                if (!mac) {
+                        CH_ERR("%s: MAC %d initialization failed\n",
+                               adapter->name, i);
+                        goto error;
+                }
+
+                /*
+                 * Get the port's MAC addresses either from the EEPROM if one
+                 * exists or the one hardcoded in the MAC.
+                 */
+                if (vpd_macaddress_get(adapter, i, hw_addr)) {
+                        CH_ERR("%s: could not read MAC address from VPD ROM\n",
+                               adapter->port[i].dev->name);
+                        goto error;
+                }
+                memcpy(adapter->port[i].dev->dev_addr, hw_addr, ETH_ALEN);
+                init_link_config(&adapter->port[i].link_config, bi);
+        }
+
+        get_pci_mode(adapter, &adapter->params.pci);
+        t1_interrupts_clear(adapter);
+        return 0;
+
+ error:
+        t1_free_sw_modules(adapter);
+        return -1;
+}
diff --git a/drivers/net/chelsio/suni1x10gexp_regs.h b/drivers/net/chelsio/suni1x10gexp_regs.h
new file mode 100644
index 000000000000..81816c2b708a
--- /dev/null
+++ b/drivers/net/chelsio/suni1x10gexp_regs.h
@@ -0,0 +1,213 @@
+/*****************************************************************************
+ *                                                                           *
+ * File: suni1x10gexp_regs.h                                                 *
+ * $Revision: 1.9 $                                                          *
+ * $Date: 2005/06/22 00:17:04 $                                              *
+ * Description:                                                              *
+ *  PMC/SIERRA (pm3393) MAC-PHY functionality.                               *
+ *  part of the Chelsio 10Gb Ethernet Driver.                                *
+ *                                                                           *
+ * This program is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License, version 2, as       *
+ * published by the Free Software Foundation.                                *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License along   *
+ * with this program; if not, write to the Free Software Foundation, Inc.,   *
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.                 *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *
+ *                                                                           *
+ * http://www.chelsio.com                                                    *
+ *                                                                           *
+ * Maintainers: maintainers@chelsio.com                                      *
+ *                                                                           *
+ * Authors: PMC/SIERRA                                                       *
+ *                                                                           *
+ * History:                                                                  *
+ *                                                                           *
+ ****************************************************************************/
+
+#ifndef _CXGB_SUNI1x10GEXP_REGS_H_
+#define _CXGB_SUNI1x10GEXP_REGS_H_
+
+/******************************************************************************/
+/** S/UNI-1x10GE-XP REGISTER ADDRESS MAP                                     **/
+/******************************************************************************/
+/* Refer to the Register Bit Masks bellow for the naming of each register and */
+/* to the S/UNI-1x10GE-XP Data Sheet for the signification of each bit        */
+/******************************************************************************/
+
+#define SUNI1x10GEXP_REG_DEVICE_STATUS                                   0x0004
+#define SUNI1x10GEXP_REG_MASTER_INTERRUPT_STATUS                         0x000D
+#define SUNI1x10GEXP_REG_GLOBAL_INTERRUPT_ENABLE                         0x000E
+#define SUNI1x10GEXP_REG_SERDES_3125_INTERRUPT_ENABLE                    0x0102
+#define SUNI1x10GEXP_REG_SERDES_3125_INTERRUPT_STATUS                    0x0104
+#define SUNI1x10GEXP_REG_RXXG_CONFIG_1                                   0x2040
+#define SUNI1x10GEXP_REG_RXXG_CONFIG_3                                   0x2042
+#define SUNI1x10GEXP_REG_RXXG_INTERRUPT                                  0x2043
+#define SUNI1x10GEXP_REG_RXXG_MAX_FRAME_LENGTH                           0x2045
+#define SUNI1x10GEXP_REG_RXXG_SA_15_0                                    0x2046
+#define SUNI1x10GEXP_REG_RXXG_SA_31_16                                   0x2047
+#define SUNI1x10GEXP_REG_RXXG_SA_47_32                                   0x2048
+#define SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_1_LOW                     0x204D
+#define SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_1_MID                     0x204E
+#define SUNI1x10GEXP_REG_RXXG_EXACT_MATCH_ADDR_1_HIGH                    0x204F
+#define SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_LOW                         0x206A
+#define SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_MIDLOW                      0x206B
+#define SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_MIDHIGH                     0x206C
+#define SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_HIGH                        0x206D
+#define SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_0                   0x206E
+#define SUNI1x10GEXP_REG_RXXG_ADDRESS_FILTER_CONTROL_2                   0x2070
+#define SUNI1x10GEXP_REG_XRF_INTERRUPT_ENABLE                            0x2088
+#define SUNI1x10GEXP_REG_XRF_INTERRUPT_STATUS                            0x2089
+#define SUNI1x10GEXP_REG_XRF_DIAG_INTERRUPT_ENABLE                       0x208B
+#define SUNI1x10GEXP_REG_XRF_DIAG_INTERRUPT_STATUS                       0x208C
+#define SUNI1x10GEXP_REG_RXOAM_INTERRUPT_ENABLE                          0x20C7
+#define SUNI1x10GEXP_REG_RXOAM_INTERRUPT_STATUS                          0x20C8
+#define SUNI1x10GEXP_REG_MSTAT_CONTROL                                   0x2100
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_0                        0x2101
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_1                        0x2102
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_2                        0x2103
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_ROLLOVER_3                        0x2104
+#define SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_0                          0x2105
+#define SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_1                          0x2106
+#define SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_2                          0x2107
+#define SUNI1x10GEXP_REG_MSTAT_INTERRUPT_MASK_3                          0x2108
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_0_LOW                             0x2110
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_1_LOW                             0x2114
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_4_LOW                             0x2120
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_5_LOW                             0x2124
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_6_LOW                             0x2128
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_8_LOW                             0x2130
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_10_LOW                            0x2138
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_11_LOW                            0x213C
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_12_LOW                            0x2140
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_13_LOW                            0x2144
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_15_LOW                            0x214C
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_16_LOW                            0x2150
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_17_LOW                            0x2154
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_18_LOW                            0x2158
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_33_LOW                            0x2194
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_35_LOW                            0x219C
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_36_LOW                            0x21A0
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_38_LOW                            0x21A8
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_40_LOW                            0x21B0
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_42_LOW                            0x21B8
+#define SUNI1x10GEXP_REG_MSTAT_COUNTER_43_LOW                            0x21BC
+#define SUNI1x10GEXP_REG_IFLX_FIFO_OVERFLOW_ENABLE                       0x2209
+#define SUNI1x10GEXP_REG_IFLX_FIFO_OVERFLOW_INTERRUPT                    0x220A
+#define SUNI1x10GEXP_REG_PL4ODP_INTERRUPT_MASK                           0x2282
+#define SUNI1x10GEXP_REG_PL4ODP_INTERRUPT                                0x2283
+#define SUNI1x10GEXP_REG_PL4IO_LOCK_DETECT_STATUS                        0x2300
+#define SUNI1x10GEXP_REG_PL4IO_LOCK_DETECT_CHANGE                        0x2301
+#define SUNI1x10GEXP_REG_PL4IO_LOCK_DETECT_MASK                          0x2302
+#define SUNI1x10GEXP_REG_TXXG_CONFIG_1                                   0x3040
+#define SUNI1x10GEXP_REG_TXXG_CONFIG_3                                   0x3042
+#define SUNI1x10GEXP_REG_TXXG_INTERRUPT                                  0x3043
+#define SUNI1x10GEXP_REG_TXXG_MAX_FRAME_SIZE                             0x3045
+#define SUNI1x10GEXP_REG_TXXG_SA_15_0                                    0x3047
+#define SUNI1x10GEXP_REG_TXXG_SA_31_16                                   0x3048
+#define SUNI1x10GEXP_REG_TXXG_SA_47_32                                   0x3049
+#define SUNI1x10GEXP_REG_XTEF_INTERRUPT_STATUS                           0x3084
+#define SUNI1x10GEXP_REG_XTEF_INTERRUPT_ENABLE                           0x3085
+#define SUNI1x10GEXP_REG_TXOAM_INTERRUPT_ENABLE                          0x30C6
+#define SUNI1x10GEXP_REG_TXOAM_INTERRUPT_STATUS                          0x30C7
+#define SUNI1x10GEXP_REG_EFLX_FIFO_OVERFLOW_ERROR_ENABLE                 0x320C
+#define SUNI1x10GEXP_REG_EFLX_FIFO_OVERFLOW_ERROR_INDICATION             0x320D
+#define SUNI1x10GEXP_REG_PL4IDU_INTERRUPT_MASK                           0x3282
+#define SUNI1x10GEXP_REG_PL4IDU_INTERRUPT                                0x3283
+
+/******************************************************************************/
+/*                 -- End register offset definitions --                      */
+/******************************************************************************/
+
+/******************************************************************************/
+/** SUNI-1x10GE-XP REGISTER BIT MASKS                                        **/
+/******************************************************************************/
+
+/*----------------------------------------------------------------------------
+ * Register 0x0004: S/UNI-1x10GE-XP Device Status
+ *    Bit 9 TOP_SXRA_EXPIRED
+ *    Bit 8 TOP_MDIO_BUSY
+ *    Bit 7 TOP_DTRB
+ *    Bit 6 TOP_EXPIRED
+ *    Bit 5 TOP_PAUSED
+ *    Bit 4 TOP_PL4_ID_DOOL
+ *    Bit 3 TOP_PL4_IS_DOOL
+ *    Bit 2 TOP_PL4_ID_ROOL
+ *    Bit 1 TOP_PL4_IS_ROOL
+ *    Bit 0 TOP_PL4_OUT_ROOL
+ *----------------------------------------------------------------------------*/
+#define SUNI1x10GEXP_BITMSK_TOP_SXRA_EXPIRED  0x0200
+#define SUNI1x10GEXP_BITMSK_TOP_EXPIRED       0x0040
+#define SUNI1x10GEXP_BITMSK_TOP_PL4_ID_DOOL   0x0010
+#define SUNI1x10GEXP_BITMSK_TOP_PL4_IS_DOOL   0x0008
+#define SUNI1x10GEXP_BITMSK_TOP_PL4_ID_ROOL   0x0004
+#define SUNI1x10GEXP_BITMSK_TOP_PL4_IS_ROOL   0x0002
+#define SUNI1x10GEXP_BITMSK_TOP_PL4_OUT_ROOL  0x0001
+
+/*----------------------------------------------------------------------------
+ * Register 0x000E:PM3393 Global interrupt enable
+ *    Bit 15 TOP_INTE
+ *----------------------------------------------------------------------------*/
+#define SUNI1x10GEXP_BITMSK_TOP_INTE  0x8000
+
+/*----------------------------------------------------------------------------
+ * Register 0x2040: RXXG Configuration 1
+ *    Bit 15  RXXG_RXEN
+ *    Bit 14  RXXG_ROCF
+ *    Bit 13  RXXG_PAD_STRIP
+ *    Bit 10  RXXG_PUREP
+ *    Bit 9   RXXG_LONGP
+ *    Bit 8   RXXG_PARF
+ *    Bit 7   RXXG_FLCHK
+ *    Bit 5   RXXG_PASS_CTRL
+ *    Bit 3   RXXG_CRC_STRIP
+ *    Bit 2-0 RXXG_MIFG
+ *----------------------------------------------------------------------------*/
+#define SUNI1x10GEXP_BITMSK_RXXG_RXEN       0x8000
+#define SUNI1x10GEXP_BITMSK_RXXG_PUREP      0x0400
+#define SUNI1x10GEXP_BITMSK_RXXG_FLCHK      0x0080
+#define SUNI1x10GEXP_BITMSK_RXXG_CRC_STRIP  0x0008
+
+/*----------------------------------------------------------------------------
+ * Register 0x2070: RXXG Address Filter Control 2
+ *    Bit 1 RXXG_PMODE
+ *    Bit 0 RXXG_MHASH_EN
+ *----------------------------------------------------------------------------*/
+#define SUNI1x10GEXP_BITMSK_RXXG_PMODE     0x0002
+#define SUNI1x10GEXP_BITMSK_RXXG_MHASH_EN  0x0001
+
+/*----------------------------------------------------------------------------
+ * Register 0x2100: MSTAT Control
+ *    Bit 2 MSTAT_WRITE
+ *    Bit 1 MSTAT_CLEAR
+ *    Bit 0 MSTAT_SNAP
+ *----------------------------------------------------------------------------*/
+#define SUNI1x10GEXP_BITMSK_MSTAT_CLEAR  0x0002
+#define SUNI1x10GEXP_BITMSK_MSTAT_SNAP   0x0001
+
+/*----------------------------------------------------------------------------
+ * Register 0x3040: TXXG Configuration Register 1
+ *    Bit 15   TXXG_TXEN0
+ *    Bit 13   TXXG_HOSTPAUSE
+ *    Bit 12-7 TXXG_IPGT
+ *    Bit 5    TXXG_32BIT_ALIGN
+ *    Bit 4    TXXG_CRCEN
+ *    Bit 3    TXXG_FCTX
+ *    Bit 2    TXXG_FCRX
+ *    Bit 1    TXXG_PADEN
+ *    Bit 0    TXXG_SPRE
+ *----------------------------------------------------------------------------*/
+#define SUNI1x10GEXP_BITMSK_TXXG_TXEN0        0x8000
+#define SUNI1x10GEXP_BITOFF_TXXG_IPGT         7
+#define SUNI1x10GEXP_BITMSK_TXXG_32BIT_ALIGN  0x0020
+#define SUNI1x10GEXP_BITMSK_TXXG_CRCEN        0x0010
+#define SUNI1x10GEXP_BITMSK_TXXG_FCTX         0x0008
+#define SUNI1x10GEXP_BITMSK_TXXG_FCRX         0x0004
+#define SUNI1x10GEXP_BITMSK_TXXG_PADEN        0x0002
+
+#endif /* _CXGB_SUNI1x10GEXP_REGS_H_ */
+
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 6440a892bb81..e54fc10f6846 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -1140,7 +1140,7 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
 }
 
 static int
-dm9000_drv_suspend(struct device *dev, u32 state, u32 level)
+dm9000_drv_suspend(struct device *dev, pm_message_t state, u32 level)
 {
         struct net_device *ndev = dev_get_drvdata(dev);
 
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index d0fa2448761d..25cc20e415da 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -156,7 +156,7 @@
 
 #define DRV_NAME                "e100"
 #define DRV_EXT         "-NAPI"
-#define DRV_VERSION             "3.4.8-k2"DRV_EXT
+#define DRV_VERSION             "3.4.14-k2"DRV_EXT
 #define DRV_DESCRIPTION         "Intel(R) PRO/100 Network Driver"
 #define DRV_COPYRIGHT           "Copyright(c) 1999-2005 Intel Corporation"
 #define PFX                     DRV_NAME ": "
@@ -785,6 +785,7 @@ static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
 }
 
 #define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */
+#define E100_WAIT_SCB_FAST 20       /* delay like the old code */
 static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
 {
         unsigned long flags;
@@ -798,7 +799,7 @@ static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
                 if(likely(!readb(&nic->csr->scb.cmd_lo)))
                         break;
                 cpu_relax();
-                if(unlikely(i > (E100_WAIT_SCB_TIMEOUT >> 1)))
+                if(unlikely(i > E100_WAIT_SCB_FAST))
                         udelay(5);
         }
         if(unlikely(i == E100_WAIT_SCB_TIMEOUT)) {
@@ -902,8 +903,8 @@ static void mdio_write(struct net_device *netdev, int addr, int reg, int data)
 
 static void e100_get_defaults(struct nic *nic)
 {
-        struct param_range rfds = { .min = 16, .max = 256, .count = 64 };
-        struct param_range cbs  = { .min = 64, .max = 256, .count = 64 };
+        struct param_range rfds = { .min = 16, .max = 256, .count = 256 };
+        struct param_range cbs  = { .min = 64, .max = 256, .count = 128 };
 
         pci_read_config_byte(nic->pdev, PCI_REVISION_ID, &nic->rev_id);
         /* MAC type is encoded as rev ID; exception: ICH is treated as 82559 */
@@ -1006,25 +1007,213 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
                 c[16], c[17], c[18], c[19], c[20], c[21], c[22], c[23]);
 }
 
+/********************************************************/
+/*  Micro code for 8086:1229 Rev 8                      */
+/********************************************************/
+
+/*  Parameter values for the D101M B-step  */
+#define D101M_CPUSAVER_TIMER_DWORD              78
+#define D101M_CPUSAVER_BUNDLE_DWORD             65
+#define D101M_CPUSAVER_MIN_SIZE_DWORD           126
+
+#define D101M_B_RCVBUNDLE_UCODE \
+{\
+0x00550215, 0xFFFF0437, 0xFFFFFFFF, 0x06A70789, 0xFFFFFFFF, 0x0558FFFF, \
+0x000C0001, 0x00101312, 0x000C0008, 0x00380216, \
+0x0010009C, 0x00204056, 0x002380CC, 0x00380056, \
+0x0010009C, 0x00244C0B, 0x00000800, 0x00124818, \
+0x00380438, 0x00000000, 0x00140000, 0x00380555, \
+0x00308000, 0x00100662, 0x00100561, 0x000E0408, \
+0x00134861, 0x000C0002, 0x00103093, 0x00308000, \
+0x00100624, 0x00100561, 0x000E0408, 0x00100861, \
+0x000C007E, 0x00222C21, 0x000C0002, 0x00103093, \
+0x00380C7A, 0x00080000, 0x00103090, 0x00380C7A, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x0010009C, 0x00244C2D, 0x00010004, 0x00041000, \
+0x003A0437, 0x00044010, 0x0038078A, 0x00000000, \
+0x00100099, 0x00206C7A, 0x0010009C, 0x00244C48, \
+0x00130824, 0x000C0001, 0x00101213, 0x00260C75, \
+0x00041000, 0x00010004, 0x00130826, 0x000C0006, \
+0x002206A8, 0x0013C926, 0x00101313, 0x003806A8, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00080600, 0x00101B10, 0x00050004, 0x00100826, \
+0x00101210, 0x00380C34, 0x00000000, 0x00000000, \
+0x0021155B, 0x00100099, 0x00206559, 0x0010009C, \
+0x00244559, 0x00130836, 0x000C0000, 0x00220C62, \
+0x000C0001, 0x00101B13, 0x00229C0E, 0x00210C0E, \
+0x00226C0E, 0x00216C0E, 0x0022FC0E, 0x00215C0E, \
+0x00214C0E, 0x00380555, 0x00010004, 0x00041000, \
+0x00278C67, 0x00040800, 0x00018100, 0x003A0437, \
+0x00130826, 0x000C0001, 0x00220559, 0x00101313, \
+0x00380559, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00130831, 0x0010090B, 0x00124813, \
+0x000CFF80, 0x002606AB, 0x00041000, 0x00010004, \
+0x003806A8, 0x00000000, 0x00000000, 0x00000000, \
+}
+
+/********************************************************/
+/*  Micro code for 8086:1229 Rev 9                      */
+/********************************************************/
+
+/*  Parameter values for the D101S  */
+#define D101S_CPUSAVER_TIMER_DWORD              78
+#define D101S_CPUSAVER_BUNDLE_DWORD             67
+#define D101S_CPUSAVER_MIN_SIZE_DWORD           128
+
+#define D101S_RCVBUNDLE_UCODE \
+{\
+0x00550242, 0xFFFF047E, 0xFFFFFFFF, 0x06FF0818, 0xFFFFFFFF, 0x05A6FFFF, \
+0x000C0001, 0x00101312, 0x000C0008, 0x00380243, \
+0x0010009C, 0x00204056, 0x002380D0, 0x00380056, \
+0x0010009C, 0x00244F8B, 0x00000800, 0x00124818, \
+0x0038047F, 0x00000000, 0x00140000, 0x003805A3, \
+0x00308000, 0x00100610, 0x00100561, 0x000E0408, \
+0x00134861, 0x000C0002, 0x00103093, 0x00308000, \
+0x00100624, 0x00100561, 0x000E0408, 0x00100861, \
+0x000C007E, 0x00222FA1, 0x000C0002, 0x00103093, \
+0x00380F90, 0x00080000, 0x00103090, 0x00380F90, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x0010009C, 0x00244FAD, 0x00010004, 0x00041000, \
+0x003A047E, 0x00044010, 0x00380819, 0x00000000, \
+0x00100099, 0x00206FFD, 0x0010009A, 0x0020AFFD, \
+0x0010009C, 0x00244FC8, 0x00130824, 0x000C0001, \
+0x00101213, 0x00260FF7, 0x00041000, 0x00010004, \
+0x00130826, 0x000C0006, 0x00220700, 0x0013C926, \
+0x00101313, 0x00380700, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00080600, 0x00101B10, 0x00050004, 0x00100826, \
+0x00101210, 0x00380FB6, 0x00000000, 0x00000000, \
+0x002115A9, 0x00100099, 0x002065A7, 0x0010009A, \
+0x0020A5A7, 0x0010009C, 0x002445A7, 0x00130836, \
+0x000C0000, 0x00220FE4, 0x000C0001, 0x00101B13, \
+0x00229F8E, 0x00210F8E, 0x00226F8E, 0x00216F8E, \
+0x0022FF8E, 0x00215F8E, 0x00214F8E, 0x003805A3, \
+0x00010004, 0x00041000, 0x00278FE9, 0x00040800, \
+0x00018100, 0x003A047E, 0x00130826, 0x000C0001, \
+0x002205A7, 0x00101313, 0x003805A7, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00130831, \
+0x0010090B, 0x00124813, 0x000CFF80, 0x00260703, \
+0x00041000, 0x00010004, 0x00380700  \
+}
+
+/********************************************************/
+/*  Micro code for the 8086:1229 Rev F/10               */
+/********************************************************/
+
+/*  Parameter values for the D102 E-step  */
+#define D102_E_CPUSAVER_TIMER_DWORD             42
+#define D102_E_CPUSAVER_BUNDLE_DWORD            54
+#define D102_E_CPUSAVER_MIN_SIZE_DWORD          46
+
+#define     D102_E_RCVBUNDLE_UCODE \
+{\
+0x007D028F, 0x0E4204F9, 0x14ED0C85, 0x14FA14E9, 0x0EF70E36, 0x1FFF1FFF, \
+0x00E014B9, 0x00000000, 0x00000000, 0x00000000, \
+0x00E014BD, 0x00000000, 0x00000000, 0x00000000, \
+0x00E014D5, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00E014C1, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00E014C8, 0x00000000, 0x00000000, 0x00000000, \
+0x00200600, 0x00E014EE, 0x00000000, 0x00000000, \
+0x0030FF80, 0x00940E46, 0x00038200, 0x00102000, \
+0x00E00E43, 0x00000000, 0x00000000, 0x00000000, \
+0x00300006, 0x00E014FB, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00906E41, 0x00800E3C, 0x00E00E39, 0x00000000, \
+0x00906EFD, 0x00900EFD, 0x00E00EF8, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+}
+
 static void e100_load_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 {
-        int i;
-        static const u32 ucode[UCODE_SIZE] = {
-                /* NFS packets are misinterpreted as TCO packets and
-                 * incorrectly routed to the BMC over SMBus.  This
-                 * microcode patch checks the fragmented IP bit in the
-                 * NFS/UDP header to distinguish between NFS and TCO. */
-                0x0EF70E36, 0x1FFF1FFF, 0x1FFF1FFF, 0x1FFF1FFF, 0x1FFF1FFF,
-                0x1FFF1FFF, 0x00906E41, 0x00800E3C, 0x00E00E39, 0x00000000,
-                0x00906EFD, 0x00900EFD, 0x00E00EF8,
-        };
+/* *INDENT-OFF* */
+        static struct {
+                u32 ucode[UCODE_SIZE + 1];
+                u8 mac;
+                u8 timer_dword;
+                u8 bundle_dword;
+                u8 min_size_dword;
+        } ucode_opts[] = {
+                { D101M_B_RCVBUNDLE_UCODE,
+                  mac_82559_D101M,
+                  D101M_CPUSAVER_TIMER_DWORD,
+                  D101M_CPUSAVER_BUNDLE_DWORD,
+                  D101M_CPUSAVER_MIN_SIZE_DWORD },
+                { D101S_RCVBUNDLE_UCODE,
+                  mac_82559_D101S,
+                  D101S_CPUSAVER_TIMER_DWORD,
+                  D101S_CPUSAVER_BUNDLE_DWORD,
+                  D101S_CPUSAVER_MIN_SIZE_DWORD },
+                { D102_E_RCVBUNDLE_UCODE,
+                  mac_82551_F,
+                  D102_E_CPUSAVER_TIMER_DWORD,
+                  D102_E_CPUSAVER_BUNDLE_DWORD,
+                  D102_E_CPUSAVER_MIN_SIZE_DWORD },
+                { D102_E_RCVBUNDLE_UCODE,
+                  mac_82551_10,
+                  D102_E_CPUSAVER_TIMER_DWORD,
+                  D102_E_CPUSAVER_BUNDLE_DWORD,
+                  D102_E_CPUSAVER_MIN_SIZE_DWORD },
+                { {0}, 0, 0, 0, 0}
+        }, *opts;
+/* *INDENT-ON* */
+
+#define BUNDLESMALL 1
+#define BUNDLEMAX 50
+#define INTDELAY 15000
+
+        opts = ucode_opts;
+
+        /* do not load u-code for ICH devices */
+        if (nic->flags & ich)
+                return;
+
+        /* Search for ucode match against h/w rev_id */
+        while (opts->mac) {
+                if (nic->mac == opts->mac) {
+                        int i;
+                        u32 *ucode = opts->ucode;
+
+                        /* Insert user-tunable settings */
+                        ucode[opts->timer_dword] &= 0xFFFF0000;
+                        ucode[opts->timer_dword] |=
+                                (u16) INTDELAY;
+                        ucode[opts->bundle_dword] &= 0xFFFF0000;
+                        ucode[opts->bundle_dword] |= (u16) BUNDLEMAX;
+                        ucode[opts->min_size_dword] &= 0xFFFF0000;
+                        ucode[opts->min_size_dword] |=
+                                (BUNDLESMALL) ?  0xFFFF : 0xFF80;
+
+                        for(i = 0; i < UCODE_SIZE; i++)
+                                cb->u.ucode[i] = cpu_to_le32(ucode[i]);
+                        cb->command = cpu_to_le16(cb_ucode);
+                        return;
+                }
+                opts++;
+        }
 
-        if(nic->mac == mac_82551_F || nic->mac == mac_82551_10) {
-                for(i = 0; i < UCODE_SIZE; i++)
-                        cb->u.ucode[i] = cpu_to_le32(ucode[i]);
-                cb->command = cpu_to_le16(cb_ucode);
-        } else
-                cb->command = cpu_to_le16(cb_nop);
+        cb->command = cpu_to_le16(cb_nop);
 }
 
 static void e100_setup_iaaddr(struct nic *nic, struct cb *cb,
@@ -1307,14 +1496,15 @@ static inline void e100_xmit_prepare(struct nic *nic, struct cb *cb,
 {
         cb->command = nic->tx_command;
         /* interrupt every 16 packets regardless of delay */
-        if((nic->cbs_avail & ~15) == nic->cbs_avail) cb->command |= cb_i;
+        if((nic->cbs_avail & ~15) == nic->cbs_avail)
+                cb->command |= cpu_to_le16(cb_i);
         cb->u.tcb.tbd_array = cb->dma_addr + offsetof(struct cb, u.tcb.tbd);
         cb->u.tcb.tcb_byte_count = 0;
         cb->u.tcb.threshold = nic->tx_threshold;
         cb->u.tcb.tbd_count = 1;
         cb->u.tcb.tbd.buf_addr = cpu_to_le32(pci_map_single(nic->pdev,
                 skb->data, skb->len, PCI_DMA_TODEVICE));
-        // check for mapping failure?
+        /* check for mapping failure? */
         cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
 }
 
@@ -1539,7 +1729,7 @@ static inline int e100_rx_indicate(struct nic *nic, struct rx *rx,
                 /* Don't indicate if hardware indicates errors */
                 nic->net_stats.rx_dropped++;
                 dev_kfree_skb_any(skb);
-        } else if(actual_size > nic->netdev->mtu + VLAN_ETH_HLEN) {
+        } else if(actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN) {
                 /* Don't indicate oversized frames */
                 nic->rx_over_length_errors++;
                 nic->net_stats.rx_dropped++;
@@ -1706,6 +1896,7 @@ static int e100_poll(struct net_device *netdev, int *budget)
 static void e100_netpoll(struct net_device *netdev)
 {
         struct nic *nic = netdev_priv(netdev);
+
         e100_disable_irq(nic);
         e100_intr(nic->pdev->irq, netdev, NULL);
         e100_tx_clean(nic);
@@ -2108,6 +2299,8 @@ static void e100_diag_test(struct net_device *netdev,
         }
         for(i = 0; i < E100_TEST_LEN; i++)
                 test->flags |= data[i] ? ETH_TEST_FL_FAILED : 0;
+
+        msleep_interruptible(4 * 1000);
 }
 
 static int e100_phys_id(struct net_device *netdev, u32 data)
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 93e9f8788751..51c2b3a18b6f 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -1270,7 +1270,7 @@ struct e1000_hw_stats {
 
 /* Structure containing variables used by the shared code (e1000_hw.c) */
 struct e1000_hw {
-    uint8_t *hw_addr;
+    uint8_t __iomem *hw_addr;
     uint8_t *flash_address;
     e1000_mac_type mac_type;
     e1000_phy_type phy_type;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9b596e0bbf95..7c8a0a22dcd5 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -162,7 +162,7 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
 static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);
 
-static int e1000_suspend(struct pci_dev *pdev, uint32_t state);
+static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
 #ifdef CONFIG_PM
 static int e1000_resume(struct pci_dev *pdev);
 #endif
@@ -3642,7 +3642,7 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
 }
 
 static int
-e1000_suspend(struct pci_dev *pdev, uint32_t state)
+e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -3726,9 +3726,7 @@ e1000_suspend(struct pci_dev *pdev, uint32_t state)
         }
 
         pci_disable_device(pdev);
-
-        state = (state > 0) ? 3 : 0;
-        pci_set_power_state(pdev, state);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
@@ -3741,13 +3739,13 @@ e1000_resume(struct pci_dev *pdev)
         struct e1000_adapter *adapter = netdev_priv(netdev);
         uint32_t manc, ret_val, swsm;
 
-        pci_set_power_state(pdev, 0);
+        pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
         ret_val = pci_enable_device(pdev);
         pci_set_master(pdev);
 
-        pci_enable_wake(pdev, 3, 0);
-        pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+        pci_enable_wake(pdev, PCI_D3hot, 0);
+        pci_enable_wake(pdev, PCI_D3cold, 0);
 
         e1000_reset(adapter);
         E1000_WRITE_REG(&adapter->hw, WUS, ~0);
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 7d93948aec83..d6eefdb71c17 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -1372,7 +1372,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
 
         /* synchronized against open : rtnl_lock() held by caller */
         if (netif_running(dev)) {
-                u8 *base = get_hwbase(dev);
+                u8 __iomem *base = get_hwbase(dev);
                 /*
                  * It seems that the nic preloads valid ring entries into an
                  * internal buffer. The procedure for flushing everything is
@@ -1423,7 +1423,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
 
 static void nv_copy_mac_to_hw(struct net_device *dev)
 {
-        u8 *base = get_hwbase(dev);
+        u8 __iomem *base = get_hwbase(dev);
         u32 mac[2];
 
         mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) +
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index d9df1d9a5739..bc9a3bf8d560 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -204,6 +204,10 @@ KERN_INFO "   Further modifications by Keith Underwood <keithu@parl.clemson.edu>
 
 #define RUN_AT(x) (jiffies + (x))
 
+#ifndef ADDRLEN
+#define ADDRLEN 32
+#endif
+
 /* Condensed bus+endian portability operations. */
 #if ADDRLEN == 64
 #define cpu_to_leXX(addr)       cpu_to_le64(addr)
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 10125a1dba22..dd89bda1f131 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -4,10 +4,10 @@
  * Description:   Driver for the SMC Infrared Communications Controller
  * Status:        Experimental.
  * Author:        Daniele Peri (peri@csai.unipa.it)
- * Created at:    
- * Modified at:   
- * Modified by:   
- * 
+ * Created at:
+ * Modified at:
+ * Modified by:
+ *
  *     Copyright (c) 2002      Daniele Peri
  *     All Rights Reserved.
  *     Copyright (c) 2002      Jean Tourrilhes
@@ -17,26 +17,26 @@
  *
  *     Copyright (c) 2001      Stefani Seibold
  *     Copyright (c) 1999-2001 Dag Brattli
- *     Copyright (c) 1998-1999 Thomas Davis, 
+ *     Copyright (c) 1998-1999 Thomas Davis,
  *
  *      and irport.c:
  *
  *     Copyright (c) 1997, 1998, 1999-2000 Dag Brattli, All Rights Reserved.
  *
- * 
- *     This program is free software; you can redistribute it and/or 
- *     modify it under the terms of the GNU General Public License as 
- *     published by the Free Software Foundation; either version 2 of 
+ *
+ *     This program is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License 
- *     along with this program; if not, write to the Free Software 
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *     MA 02111-1307 USA
  *
  ********************************************************************/
@@ -68,24 +68,42 @@
 #include "smsc-ircc2.h"
 #include "smsc-sio.h"
 
+
+MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
+MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
+MODULE_LICENSE("GPL");
+
+static int ircc_dma = 255;
+module_param(ircc_dma, int, 0);
+MODULE_PARM_DESC(ircc_dma, "DMA channel");
+
+static int ircc_irq = 255;
+module_param(ircc_irq, int, 0);
+MODULE_PARM_DESC(ircc_irq, "IRQ line");
+
+static int ircc_fir;
+module_param(ircc_fir, int, 0);
+MODULE_PARM_DESC(ircc_fir, "FIR Base Address");
+
+static int ircc_sir;
+module_param(ircc_sir, int, 0);
+MODULE_PARM_DESC(ircc_sir, "SIR Base Address");
+
+static int ircc_cfg;
+module_param(ircc_cfg, int, 0);
+MODULE_PARM_DESC(ircc_cfg, "Configuration register base address");
+
+static int ircc_transceiver;
+module_param(ircc_transceiver, int, 0);
+MODULE_PARM_DESC(ircc_transceiver, "Transceiver type");
+
 /* Types */
 
 struct smsc_transceiver {
         char *name;
-        void (*set_for_speed)(int fir_base, u32 speed); 
+        void (*set_for_speed)(int fir_base, u32 speed);
         int  (*probe)(int fir_base);
 };
-typedef struct smsc_transceiver smsc_transceiver_t;
-
-#if 0
-struct smc_chip {
-        char *name;
-        u16 flags;
-        u8 devid;
-        u8 rev;
-};
-typedef struct smc_chip smc_chip_t;
-#endif
 
 struct smsc_chip {
         char *name;
@@ -96,20 +114,18 @@ struct smsc_chip {
         u8 devid;
         u8 rev;
 };
-typedef struct smsc_chip smsc_chip_t;
 
 struct smsc_chip_address {
         unsigned int cfg_base;
         unsigned int type;
 };
-typedef struct smsc_chip_address smsc_chip_address_t;
 
 /* Private data for each instance */
 struct smsc_ircc_cb {
         struct net_device *netdev;     /* Yes! we are some kind of netdevice */
         struct net_device_stats stats;
         struct irlap_cb    *irlap; /* The link layer we are binded to */
-        
+
         chipio_t io;               /* IrDA controller information */
         iobuff_t tx_buff;          /* Transmit buffer */
         iobuff_t rx_buff;          /* Receive buffer */
@@ -119,7 +135,7 @@ struct smsc_ircc_cb {
         struct qos_info qos;       /* QoS capabilities for this device */
 
         spinlock_t lock;           /* For serializing operations */
-        
+
         __u32 new_speed;
         __u32 flags;               /* Interface flags */
 
@@ -127,18 +143,20 @@ struct smsc_ircc_cb {
         int tx_len;                /* Number of frames in tx_buff */
 
         int transceiver;
-        struct pm_dev *pmdev;
+        struct platform_device *pldev;
 };
 
 /* Constants */
 
-static const char *driver_name = "smsc-ircc2";
-#define DIM(x)  (sizeof(x)/(sizeof(*(x))))
+#define SMSC_IRCC2_DRIVER_NAME                  "smsc-ircc2"
+
 #define SMSC_IRCC2_C_IRDA_FALLBACK_SPEED        9600
 #define SMSC_IRCC2_C_DEFAULT_TRANSCEIVER        1
-#define SMSC_IRCC2_C_NET_TIMEOUT                        0
+#define SMSC_IRCC2_C_NET_TIMEOUT                0
 #define SMSC_IRCC2_C_SIR_STOP                   0
 
+static const char *driver_name = SMSC_IRCC2_DRIVER_NAME;
+
 /* Prototypes */
 
 static int smsc_ircc_open(unsigned int firbase, unsigned int sirbase, u8 dma, u8 irq);
@@ -147,15 +165,15 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, unsigned int fir_base,
 static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self);
 static void smsc_ircc_init_chip(struct smsc_ircc_cb *self);
 static int __exit smsc_ircc_close(struct smsc_ircc_cb *self);
-static int  smsc_ircc_dma_receive(struct smsc_ircc_cb *self, int iobase); 
-static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self, int iobase);
+static int  smsc_ircc_dma_receive(struct smsc_ircc_cb *self);
+static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self);
 static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self);
 static int  smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev);
 static int  smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev);
-static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int iobase, int bofs);
-static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self, int iobase);
-static void smsc_ircc_change_speed(void *priv, u32 speed);
-static void smsc_ircc_set_sir_speed(void *priv, u32 speed);
+static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int bofs);
+static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self);
+static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed);
+static void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, u32 speed);
 static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev);
 static void smsc_ircc_sir_start(struct smsc_ircc_cb *self);
@@ -171,7 +189,6 @@ static int  smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cm
 static void smsc_ircc_timeout(struct net_device *dev);
 #endif
 static struct net_device_stats *smsc_ircc_net_get_stats(struct net_device *dev);
-static int  smsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data);
 static int smsc_ircc_is_receiving(struct smsc_ircc_cb *self);
 static void smsc_ircc_probe_transceiver(struct smsc_ircc_cb *self);
 static void smsc_ircc_set_transceiver_for_speed(struct smsc_ircc_cb *self, u32 speed);
@@ -179,9 +196,9 @@ static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self);
 
 /* Probing */
 static int __init smsc_ircc_look_for_chips(void);
-static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type);
-static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg_base, char *type);
-static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cfg_base, char *type);
+static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type);
+static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
+static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type);
 static int __init smsc_superio_fdc(unsigned short cfg_base);
 static int __init smsc_superio_lpc(unsigned short cfg_base);
 
@@ -196,21 +213,26 @@ static int  smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base);
 
 /* Power Management */
 
-static void smsc_ircc_suspend(struct smsc_ircc_cb *self);
-static void smsc_ircc_wakeup(struct smsc_ircc_cb *self);
-static int smsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data);
+static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level);
+static int smsc_ircc_resume(struct device *dev, u32 level);
 
+static struct device_driver smsc_ircc_driver = {
+        .name           = SMSC_IRCC2_DRIVER_NAME,
+        .bus            = &platform_bus_type,
+        .suspend        = smsc_ircc_suspend,
+        .resume         = smsc_ircc_resume,
+};
 
 /* Transceivers for SMSC-ircc */
 
-static smsc_transceiver_t smsc_transceivers[]=
+static struct smsc_transceiver smsc_transceivers[] =
 {
-        { "Toshiba Satellite 1800 (GP data pin select)", smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800},
-        { "Fast pin select", smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select},
-        { "ATC IRMode", smsc_ircc_set_transceiver_smsc_ircc_atc, smsc_ircc_probe_transceiver_smsc_ircc_atc},
-        { NULL, NULL}
+        { "Toshiba Satellite 1800 (GP data pin select)", smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800 },
+        { "Fast pin select", smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select },
+        { "ATC IRMode", smsc_ircc_set_transceiver_smsc_ircc_atc, smsc_ircc_probe_transceiver_smsc_ircc_atc },
+        { NULL, NULL }
 };
-#define SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS (DIM(smsc_transceivers)-1)
+#define SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS (ARRAY_SIZE(smsc_transceivers) - 1)
 
 /*  SMC SuperIO chipsets definitions */
 
@@ -221,7 +243,7 @@ static smsc_transceiver_t smsc_transceivers[]=
 #define FIR     4       /* SuperIO Chip has fast IRDA */
 #define SERx4   8       /* SuperIO Chip supports 115,2 KBaud * 4=460,8 KBaud */
 
-static smsc_chip_t __initdata fdc_chips_flat[]=
+static struct smsc_chip __initdata fdc_chips_flat[] =
 {
         /* Base address 0x3f0 or 0x370 */
         { "37C44",      KEY55_1|NoIRDA,         0x00, 0x00 }, /* This chip cannot be detected */
@@ -235,7 +257,7 @@ static smsc_chip_t __initdata fdc_chips_flat[]=
         { NULL }
 };
 
-static smsc_chip_t __initdata fdc_chips_paged[]=
+static struct smsc_chip __initdata fdc_chips_paged[] =
 {
         /* Base address 0x3f0 or 0x370 */
         { "37B72X",     KEY55_1|SIR|SERx4,      0x4c, 0x00 },
@@ -254,7 +276,7 @@ static smsc_chip_t __initdata fdc_chips_paged[]=
         { NULL }
 };
 
-static smsc_chip_t __initdata lpc_chips_flat[]=
+static struct smsc_chip __initdata lpc_chips_flat[] =
 {
         /* Base address 0x2E or 0x4E */
         { "47N227",     KEY55_1|FIR|SERx4,      0x5a, 0x00 },
@@ -262,7 +284,7 @@ static smsc_chip_t __initdata lpc_chips_flat[]=
         { NULL }
 };
 
-static smsc_chip_t __initdata lpc_chips_paged[]=
+static struct smsc_chip __initdata lpc_chips_paged[] =
 {
         /* Base address 0x2E or 0x4E */
         { "47B27X",     KEY55_1|SIR|SERx4,      0x51, 0x00 },
@@ -281,33 +303,25 @@ static smsc_chip_t __initdata lpc_chips_paged[]=
 #define SMSCSIO_TYPE_FLAT       4
 #define SMSCSIO_TYPE_PAGED      8
 
-static smsc_chip_address_t __initdata possible_addresses[]=
+static struct smsc_chip_address __initdata possible_addresses[] =
 {
-        {0x3f0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0x370, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0xe0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0x2e, SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0x4e, SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED},
-        {0,0}
+        { 0x3f0, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0x370, SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0xe0,  SMSCSIO_TYPE_FDC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0x2e,  SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0x4e,  SMSCSIO_TYPE_LPC|SMSCSIO_TYPE_FLAT|SMSCSIO_TYPE_PAGED },
+        { 0, 0 }
 };
 
 /* Globals */
 
-static struct smsc_ircc_cb *dev_self[] = { NULL, NULL};
-
-static int ircc_irq=255;
-static int ircc_dma=255;
-static int ircc_fir=0;
-static int ircc_sir=0;
-static int ircc_cfg=0;
-static int ircc_transceiver=0;
-
-static unsigned short   dev_count=0;
+static struct smsc_ircc_cb *dev_self[] = { NULL, NULL };
+static unsigned short dev_count;
 
 static inline void register_bank(int iobase, int bank)
 {
-        outb(((inb(iobase+IRCC_MASTER) & 0xf0) | (bank & 0x07)),
-               iobase+IRCC_MASTER);
+        outb(((inb(iobase + IRCC_MASTER) & 0xf0) | (bank & 0x07)),
+               iobase + IRCC_MASTER);
 }
 
 
@@ -327,34 +341,44 @@ static inline void register_bank(int iobase, int bank)
  */
 static int __init smsc_ircc_init(void)
 {
-        int ret=-ENODEV;
+        int ret;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        dev_count=0;
- 
-        if ((ircc_fir>0)&&(ircc_sir>0)) {
+        ret = driver_register(&smsc_ircc_driver);
+        if (ret) {
+                IRDA_ERROR("%s, Can't register driver!\n", driver_name);
+                return ret;
+        }
+
+        dev_count = 0;
+
+        if (ircc_fir > 0 && ircc_sir > 0) {
                 IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir);
                 IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir);
 
-                if (smsc_ircc_open(ircc_fir, ircc_sir, ircc_dma, ircc_irq) == 0)
-                        return 0;
-
-                return -ENODEV;
-        }
+                if (smsc_ircc_open(ircc_fir, ircc_sir, ircc_dma, ircc_irq))
+                        ret = -ENODEV;
+        } else {
+                ret = -ENODEV;
+
+                /* try user provided configuration register base address */
+                if (ircc_cfg > 0) {
+                        IRDA_MESSAGE(" Overriding configuration address "
+                                     "0x%04x\n", ircc_cfg);
+                        if (!smsc_superio_fdc(ircc_cfg))
+                                ret = 0;
+                        if (!smsc_superio_lpc(ircc_cfg))
+                                ret = 0;
+                }
 
-        /* try user provided configuration register base address */
-        if (ircc_cfg>0) {
-                IRDA_MESSAGE(" Overriding configuration address 0x%04x\n",
-                             ircc_cfg);
-                if (!smsc_superio_fdc(ircc_cfg))
-                        ret = 0;
-                if (!smsc_superio_lpc(ircc_cfg))
+                if (smsc_ircc_look_for_chips() > 0)
                         ret = 0;
         }
-        
-        if(smsc_ircc_look_for_chips()>0) ret = 0;
-        
+
+        if (ret)
+                driver_unregister(&smsc_ircc_driver);
+
         return ret;
 }
 
@@ -369,15 +393,15 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         struct smsc_ircc_cb *self;
         struct net_device *dev;
         int err;
-        
+
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
         err = smsc_ircc_present(fir_base, sir_base);
-        if(err) 
+        if (err)
                 goto err_out;
-                
+
         err = -ENOMEM;
-        if (dev_count > DIM(dev_self)) {
+        if (dev_count >= ARRAY_SIZE(dev_self)) {
                 IRDA_WARNING("%s(), too many devices!\n", __FUNCTION__);
                 goto err_out1;
         }
@@ -396,14 +420,14 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         dev->hard_start_xmit = smsc_ircc_hard_xmit_sir;
 #if SMSC_IRCC2_C_NET_TIMEOUT
         dev->tx_timeout      = smsc_ircc_timeout;
-        dev->watchdog_timeo  = HZ*2;  /* Allow enough time for speed change */
+        dev->watchdog_timeo  = HZ * 2;  /* Allow enough time for speed change */
 #endif
         dev->open            = smsc_ircc_net_open;
         dev->stop            = smsc_ircc_net_close;
         dev->do_ioctl        = smsc_ircc_net_ioctl;
         dev->get_stats       = smsc_ircc_net_get_stats;
-        
-        self = dev->priv;
+
+        self = netdev_priv(dev);
         self->netdev = dev;
 
         /* Make ifconfig display some details */
@@ -411,10 +435,10 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         dev->irq = self->io.irq = irq;
 
         /* Need to store self somewhere */
-        dev_self[dev_count++] = self;
+        dev_self[dev_count] = self;
         spin_lock_init(&self->lock);
 
-        self->rx_buff.truesize = SMSC_IRCC2_RX_BUFF_TRUESIZE; 
+        self->rx_buff.truesize = SMSC_IRCC2_RX_BUFF_TRUESIZE;
         self->tx_buff.truesize = SMSC_IRCC2_TX_BUFF_TRUESIZE;
 
         self->rx_buff.head =
@@ -442,33 +466,40 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
         self->rx_buff.state = OUTSIDE_FRAME;
         self->tx_buff.data = self->tx_buff.head;
         self->rx_buff.data = self->rx_buff.head;
-           
-        smsc_ircc_setup_io(self, fir_base, sir_base, dma, irq);
 
+        smsc_ircc_setup_io(self, fir_base, sir_base, dma, irq);
         smsc_ircc_setup_qos(self);
-
         smsc_ircc_init_chip(self);
-        
-        if(ircc_transceiver > 0  && 
-           ircc_transceiver < SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS)
+
+        if (ircc_transceiver > 0  &&
+            ircc_transceiver < SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS)
                 self->transceiver = ircc_transceiver;
         else
                 smsc_ircc_probe_transceiver(self);
 
         err = register_netdev(self->netdev);
-        if(err) {
+        if (err) {
                 IRDA_ERROR("%s, Network device registration failed!\n",
                            driver_name);
                 goto err_out4;
         }
 
-        self->pmdev = pm_register(PM_SYS_DEV, PM_SYS_IRDA, smsc_ircc_pmproc);
-        if (self->pmdev)
-                self->pmdev->data = self;
+        self->pldev = platform_device_register_simple(SMSC_IRCC2_DRIVER_NAME,
+                                                      dev_count, NULL, 0);
+        if (IS_ERR(self->pldev)) {
+                err = PTR_ERR(self->pldev);
+                goto err_out5;
+        }
+        dev_set_drvdata(&self->pldev->dev, self);
 
         IRDA_MESSAGE("IrDA: Registered device %s\n", dev->name);
+        dev_count++;
 
         return 0;
+
+ err_out5:
+        unregister_netdev(self->netdev);
+
  err_out4:
         dma_free_coherent(NULL, self->tx_buff.truesize,
                           self->tx_buff.head, self->tx_buff_dma);
@@ -477,7 +508,7 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u
                           self->rx_buff.head, self->rx_buff_dma);
  err_out2:
         free_netdev(self->netdev);
-        dev_self[--dev_count] = NULL;
+        dev_self[dev_count] = NULL;
  err_out1:
         release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT);
         release_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT);
@@ -511,16 +542,16 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)
 
         register_bank(fir_base, 3);
 
-        high    = inb(fir_base+IRCC_ID_HIGH);
-        low     = inb(fir_base+IRCC_ID_LOW);
-        chip    = inb(fir_base+IRCC_CHIP_ID);
-        version = inb(fir_base+IRCC_VERSION);
-        config  = inb(fir_base+IRCC_INTERFACE);
+        high    = inb(fir_base + IRCC_ID_HIGH);
+        low     = inb(fir_base + IRCC_ID_LOW);
+        chip    = inb(fir_base + IRCC_CHIP_ID);
+        version = inb(fir_base + IRCC_VERSION);
+        config  = inb(fir_base + IRCC_INTERFACE);
         dma     = config & IRCC_INTERFACE_DMA_MASK;
         irq     = (config & IRCC_INTERFACE_IRQ_MASK) >> 4;
 
-        if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) { 
-                IRDA_WARNING("%s(), addr 0x%04x - no device found!\n",
+        if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) {
+                IRDA_WARNING("%s(), addr 0x%04x - no device found!\n",
                              __FUNCTION__, fir_base);
                 goto out3;
         }
@@ -529,6 +560,7 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)
                      chip & 0x0f, version, fir_base, sir_base, dma, irq);
 
         return 0;
+
  out3:
         release_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT);
  out2:
@@ -543,16 +575,16 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)
  *    Setup I/O
  *
  */
-static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, 
-                               unsigned int fir_base, unsigned int sir_base, 
+static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
+                               unsigned int fir_base, unsigned int sir_base,
                                u8 dma, u8 irq)
 {
         unsigned char config, chip_dma, chip_irq;
 
         register_bank(fir_base, 3);
-        config  = inb(fir_base+IRCC_INTERFACE);
-        chip_dma     = config & IRCC_INTERFACE_DMA_MASK;
-        chip_irq     = (config & IRCC_INTERFACE_IRQ_MASK) >> 4;
+        config = inb(fir_base + IRCC_INTERFACE);
+        chip_dma = config & IRCC_INTERFACE_DMA_MASK;
+        chip_irq = (config & IRCC_INTERFACE_IRQ_MASK) >> 4;
 
         self->io.fir_base  = fir_base;
         self->io.sir_base  = sir_base;
@@ -566,17 +598,15 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
                         IRDA_MESSAGE("%s, Overriding IRQ - chip says %d, using %d\n",
                                      driver_name, chip_irq, irq);
                 self->io.irq = irq;
-        }
-        else
+        } else
                 self->io.irq = chip_irq;
-        
+
         if (dma < 255) {
                 if (dma != chip_dma)
                         IRDA_MESSAGE("%s, Overriding DMA - chip says %d, using %d\n",
                                      driver_name, chip_dma, dma);
                 self->io.dma = dma;
-        }
-        else
+        } else
                 self->io.dma = chip_dma;
 
 }
@@ -591,7 +621,7 @@ static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self)
 {
         /* Initialize QoS for this device */
         irda_init_max_qos_capabilies(&self->qos);
-        
+
         self->qos.baud_rate.bits = IR_9600|IR_19200|IR_38400|IR_57600|
                 IR_115200|IR_576000|IR_1152000|(IR_4000000 << 8);
 
@@ -608,43 +638,43 @@ static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self)
  */
 static void smsc_ircc_init_chip(struct smsc_ircc_cb *self)
 {
-        int iobase, ir_mode, ctrl, fast; 
-        
-        IRDA_ASSERT( self != NULL, return; );
-        iobase = self->io.fir_base;
+        int iobase, ir_mode, ctrl, fast;
+
+        IRDA_ASSERT(self != NULL, return;);
 
+        iobase = self->io.fir_base;
         ir_mode = IRCC_CFGA_IRDA_SIR_A;
         ctrl = 0;
         fast = 0;
 
         register_bank(iobase, 0);
-        outb(IRCC_MASTER_RESET, iobase+IRCC_MASTER);
-        outb(0x00, iobase+IRCC_MASTER);
+        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
 
         register_bank(iobase, 1);
-        outb(((inb(iobase+IRCC_SCE_CFGA) & 0x87) | ir_mode), 
-             iobase+IRCC_SCE_CFGA);
+        outb(((inb(iobase + IRCC_SCE_CFGA) & 0x87) | ir_mode),
+             iobase + IRCC_SCE_CFGA);
 
 #ifdef smsc_669 /* Uses pin 88/89 for Rx/Tx */
-        outb(((inb(iobase+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM), 
-             iobase+IRCC_SCE_CFGB);
-#else   
-        outb(((inb(iobase+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
-             iobase+IRCC_SCE_CFGB);
-#endif  
-        (void) inb(iobase+IRCC_FIFO_THRESHOLD);
-        outb(SMSC_IRCC2_FIFO_THRESHOLD, iobase+IRCC_FIFO_THRESHOLD);
-        
+        outb(((inb(iobase + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM),
+             iobase + IRCC_SCE_CFGB);
+#else
+        outb(((inb(iobase + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
+             iobase + IRCC_SCE_CFGB);
+#endif
+        (void) inb(iobase + IRCC_FIFO_THRESHOLD);
+        outb(SMSC_IRCC2_FIFO_THRESHOLD, iobase + IRCC_FIFO_THRESHOLD);
+
         register_bank(iobase, 4);
-        outb((inb(iobase+IRCC_CONTROL) & 0x30) | ctrl, iobase+IRCC_CONTROL);
-        
+        outb((inb(iobase + IRCC_CONTROL) & 0x30) | ctrl, iobase + IRCC_CONTROL);
+
         register_bank(iobase, 0);
-        outb(fast, iobase+IRCC_LCR_A);
+        outb(fast, iobase + IRCC_LCR_A);
 
         smsc_ircc_set_sir_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
-        
+
         /* Power on device */
-        outb(0x00, iobase+IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
 }
 
 /*
@@ -662,12 +692,12 @@ static int smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd
 
         IRDA_ASSERT(dev != NULL, return -1;);
 
-        self = dev->priv;
+        self = netdev_priv(dev);
 
         IRDA_ASSERT(self != NULL, return -1;);
 
         IRDA_DEBUG(2, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);
-        
+
         switch (cmd) {
         case SIOCSBANDWIDTH: /* Set bandwidth */
                 if (!capable(CAP_NET_ADMIN))
@@ -703,14 +733,14 @@ static int smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd
         default:
                 ret = -EOPNOTSUPP;
         }
-        
+
         return ret;
 }
 
 static struct net_device_stats *smsc_ircc_net_get_stats(struct net_device *dev)
 {
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) dev->priv;
-        
+        struct smsc_ircc_cb *self = netdev_priv(dev);
+
         return &self->stats;
 }
 
@@ -724,11 +754,9 @@ static struct net_device_stats *smsc_ircc_net_get_stats(struct net_device *dev)
 
 static void smsc_ircc_timeout(struct net_device *dev)
 {
-        struct smsc_ircc_cb *self;
+        struct smsc_ircc_cb *self = netdev_priv(dev);
         unsigned long flags;
 
-        self = (struct smsc_ircc_cb *) dev->priv;
-        
         IRDA_WARNING("%s: transmit timed out, changing speed to: %d\n",
                      dev->name, self->io.speed);
         spin_lock_irqsave(&self->lock, flags);
@@ -751,26 +779,23 @@ int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
 {
         struct smsc_ircc_cb *self;
         unsigned long flags;
-        int iobase;
         s32 speed;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
         IRDA_ASSERT(dev != NULL, return 0;);
-        
-        self = (struct smsc_ircc_cb *) dev->priv;
-        IRDA_ASSERT(self != NULL, return 0;);
 
-        iobase = self->io.sir_base;
+        self = netdev_priv(dev);
+        IRDA_ASSERT(self != NULL, return 0;);
 
         netif_stop_queue(dev);
-        
+
         /* Make sure test of self->io.speed & speed change are atomic */
         spin_lock_irqsave(&self->lock, flags);
 
         /* Check if we need to change the speed */
         speed = irda_get_next_speed(skb);
-        if ((speed != self->io.speed) && (speed != -1)) {
+        if (speed != self->io.speed && speed != -1) {
                 /* Check for empty frame */
                 if (!skb->len) {
                         /*
@@ -787,27 +812,26 @@ int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
                         spin_unlock_irqrestore(&self->lock, flags);
                         dev_kfree_skb(skb);
                         return 0;
-                } else {
-                        self->new_speed = speed;
                 }
+                self->new_speed = speed;
         }
 
         /* Init tx buffer */
         self->tx_buff.data = self->tx_buff.head;
 
         /* Copy skb to tx_buff while wrapping, stuffing and making CRC */
-        self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data, 
+        self->tx_buff.len = async_wrap_skb(skb, self->tx_buff.data,
                                            self->tx_buff.truesize);
-        
+
         self->stats.tx_bytes += self->tx_buff.len;
 
         /* Turn on transmit finished interrupt. Will fire immediately!  */
-        outb(UART_IER_THRI, iobase+UART_IER); 
+        outb(UART_IER_THRI, self->io.sir_base + UART_IER);
 
         spin_unlock_irqrestore(&self->lock, flags);
 
         dev_kfree_skb(skb);
-        
+
         return 0;
 }
 
@@ -826,9 +850,9 @@ static void smsc_ircc_set_fir_speed(struct smsc_ircc_cb *self, u32 speed)
 
         self->io.speed = speed;
 
-        switch(speed) {
+        switch (speed) {
         default:
-        case 576000:            
+        case 576000:
                 ir_mode = IRCC_CFGA_IRDA_HDLC;
                 ctrl = IRCC_CRC;
                 fast = 0;
@@ -853,14 +877,14 @@ static void smsc_ircc_set_fir_speed(struct smsc_ircc_cb *self, u32 speed)
         Now in tranceiver!
         /* This causes an interrupt */
         register_bank(fir_base, 0);
-        outb((inb(fir_base+IRCC_LCR_A) &  0xbf) | fast, fir_base+IRCC_LCR_A);
+        outb((inb(fir_base + IRCC_LCR_A) &  0xbf) | fast, fir_base + IRCC_LCR_A);
         #endif
-        
+
         register_bank(fir_base, 1);
-        outb(((inb(fir_base+IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | ir_mode), fir_base+IRCC_SCE_CFGA);
-        
+        outb(((inb(fir_base + IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | ir_mode), fir_base + IRCC_SCE_CFGA);
+
         register_bank(fir_base, 4);
-        outb((inb(fir_base+IRCC_CONTROL) & 0x30) | ctrl, fir_base+IRCC_CONTROL);
+        outb((inb(fir_base + IRCC_CONTROL) & 0x30) | ctrl, fir_base + IRCC_CONTROL);
 }
 
 /*
@@ -885,31 +909,31 @@ static void smsc_ircc_fir_start(struct smsc_ircc_cb *self)
         /* Reset everything */
 
         /* Install FIR transmit handler */
-        dev->hard_start_xmit = smsc_ircc_hard_xmit_fir; 
+        dev->hard_start_xmit = smsc_ircc_hard_xmit_fir;
 
         /* Clear FIFO */
-        outb(inb(fir_base+IRCC_LCR_A)|IRCC_LCR_A_FIFO_RESET, fir_base+IRCC_LCR_A);
+        outb(inb(fir_base + IRCC_LCR_A) | IRCC_LCR_A_FIFO_RESET, fir_base + IRCC_LCR_A);
 
         /* Enable interrupt */
-        /*outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base+IRCC_IER);*/
+        /*outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base + IRCC_IER);*/
 
         register_bank(fir_base, 1);
 
-        /* Select the TX/RX interface */        
+        /* Select the TX/RX interface */
 #ifdef SMSC_669 /* Uses pin 88/89 for Rx/Tx */
-        outb(((inb(fir_base+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM), 
-             fir_base+IRCC_SCE_CFGB);
-#else   
-        outb(((inb(fir_base+IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
-             fir_base+IRCC_SCE_CFGB);
-#endif  
-        (void) inb(fir_base+IRCC_FIFO_THRESHOLD);
+        outb(((inb(fir_base + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_COM),
+             fir_base + IRCC_SCE_CFGB);
+#else
+        outb(((inb(fir_base + IRCC_SCE_CFGB) & 0x3f) | IRCC_CFGB_MUX_IR),
+             fir_base + IRCC_SCE_CFGB);
+#endif
+        (void) inb(fir_base + IRCC_FIFO_THRESHOLD);
 
         /* Enable SCE interrupts */
-        outb(0, fir_base+IRCC_MASTER);
+        outb(0, fir_base + IRCC_MASTER);
         register_bank(fir_base, 0);
-        outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base+IRCC_IER);
-        outb(IRCC_MASTER_INT_EN, fir_base+IRCC_MASTER);
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, fir_base + IRCC_IER);
+        outb(IRCC_MASTER_INT_EN, fir_base + IRCC_MASTER);
 }
 
 /*
@@ -923,13 +947,13 @@ static void smsc_ircc_fir_stop(struct smsc_ircc_cb *self)
         int fir_base;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
-        
+
         IRDA_ASSERT(self != NULL, return;);
 
         fir_base = self->io.fir_base;
         register_bank(fir_base, 0);
-        /*outb(IRCC_MASTER_RESET, fir_base+IRCC_MASTER);*/      
-        outb(inb(fir_base+IRCC_LCR_B) & IRCC_LCR_B_SIP_ENABLE, fir_base+IRCC_LCR_B);
+        /*outb(IRCC_MASTER_RESET, fir_base + IRCC_MASTER);*/
+        outb(inb(fir_base + IRCC_LCR_B) & IRCC_LCR_B_SIP_ENABLE, fir_base + IRCC_LCR_B);
 }
 
 
@@ -941,18 +965,15 @@ static void smsc_ircc_fir_stop(struct smsc_ircc_cb *self)
  * This function *must* be called with spinlock held, because it may
  * be called from the irq handler. - Jean II
  */
-static void smsc_ircc_change_speed(void *priv, u32 speed)
+static void smsc_ircc_change_speed(struct smsc_ircc_cb *self, u32 speed)
 {
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv;
         struct net_device *dev;
-        int iobase;
         int last_speed_was_sir;
-        
+
         IRDA_DEBUG(0, "%s() changing speed to: %d\n", __FUNCTION__, speed);
 
         IRDA_ASSERT(self != NULL, return;);
         dev = self->netdev;
-        iobase = self->io.fir_base;
 
         last_speed_was_sir = self->io.speed <= SMSC_IRCC2_MAX_SIR_SPEED;
 
@@ -961,30 +982,30 @@ static void smsc_ircc_change_speed(void *priv, u32 speed)
         speed= 1152000;
         self->io.speed = speed;
         last_speed_was_sir = 0;
-        smsc_ircc_fir_start(self);      
+        smsc_ircc_fir_start(self);
         #endif
-        
-        if(self->io.speed == 0)
+
+        if (self->io.speed == 0)
                 smsc_ircc_sir_start(self);
 
         #if 0
-        if(!last_speed_was_sir) speed = self->io.speed;
+        if (!last_speed_was_sir) speed = self->io.speed;
         #endif
 
-        if(self->io.speed != speed) smsc_ircc_set_transceiver_for_speed(self, speed);
+        if (self->io.speed != speed)
+                smsc_ircc_set_transceiver_for_speed(self, speed);
 
         self->io.speed = speed;
-        
-        if(speed <= SMSC_IRCC2_MAX_SIR_SPEED) {
-                if(!last_speed_was_sir) {
+
+        if (speed <= SMSC_IRCC2_MAX_SIR_SPEED) {
+                if (!last_speed_was_sir) {
                         smsc_ircc_fir_stop(self);
                         smsc_ircc_sir_start(self);
                 }
-                smsc_ircc_set_sir_speed(self, speed); 
-        }
-        else {
-                if(last_speed_was_sir) {
-                        #if SMSC_IRCC2_C_SIR_STOP               
+                smsc_ircc_set_sir_speed(self, speed);
+        } else {
+                if (last_speed_was_sir) {
+                        #if SMSC_IRCC2_C_SIR_STOP
                         smsc_ircc_sir_stop(self);
                         #endif
                         smsc_ircc_fir_start(self);
@@ -994,13 +1015,13 @@ static void smsc_ircc_change_speed(void *priv, u32 speed)
                 #if 0
                 self->tx_buff.len = 10;
                 self->tx_buff.data = self->tx_buff.head;
-                
-                smsc_ircc_dma_xmit(self, iobase, 4000);
+
+                smsc_ircc_dma_xmit(self, 4000);
                 #endif
                 /* Be ready for incoming frames */
-                smsc_ircc_dma_receive(self, iobase);
+                smsc_ircc_dma_receive(self);
         }
-        
+
         netif_wake_queue(dev);
 }
 
@@ -1010,10 +1031,9 @@ static void smsc_ircc_change_speed(void *priv, u32 speed)
  *    Set speed of IrDA port to specified baudrate
  *
  */
-void smsc_ircc_set_sir_speed(void *priv, __u32 speed)
+void smsc_ircc_set_sir_speed(struct smsc_ircc_cb *self, __u32 speed)
 {
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv;
-        int iobase; 
+        int iobase;
         int fcr;    /* FIFO control reg */
         int lcr;    /* Line control reg */
         int divisor;
@@ -1022,38 +1042,36 @@ void smsc_ircc_set_sir_speed(void *priv, __u32 speed)
 
         IRDA_ASSERT(self != NULL, return;);
         iobase = self->io.sir_base;
-        
+
         /* Update accounting for new speed */
         self->io.speed = speed;
 
         /* Turn off interrupts */
-        outb(0, iobase+UART_IER); 
+        outb(0, iobase + UART_IER);
+
+        divisor = SMSC_IRCC2_MAX_SIR_SPEED / speed;
 
-        divisor = SMSC_IRCC2_MAX_SIR_SPEED/speed;
-        
         fcr = UART_FCR_ENABLE_FIFO;
 
-        /* 
+        /*
          * Use trigger level 1 to avoid 3 ms. timeout delay at 9600 bps, and
          * almost 1,7 ms at 19200 bps. At speeds above that we can just forget
-         * about this timeout since it will always be fast enough. 
+         * about this timeout since it will always be fast enough.
          */
-        if (self->io.speed < 38400)
-                fcr |= UART_FCR_TRIGGER_1;
-        else 
-                fcr |= UART_FCR_TRIGGER_14;
-        
+        fcr |= self->io.speed < 38400 ?
+                UART_FCR_TRIGGER_1 : UART_FCR_TRIGGER_14;
+
         /* IrDA ports use 8N1 */
         lcr = UART_LCR_WLEN8;
-        
-        outb(UART_LCR_DLAB | lcr, iobase+UART_LCR); /* Set DLAB */
-        outb(divisor & 0xff,      iobase+UART_DLL); /* Set speed */
-        outb(divisor >> 8,        iobase+UART_DLM);
-        outb(lcr,                 iobase+UART_LCR); /* Set 8N1  */
-        outb(fcr,                 iobase+UART_FCR); /* Enable FIFO's */
+
+        outb(UART_LCR_DLAB | lcr, iobase + UART_LCR); /* Set DLAB */
+        outb(divisor & 0xff,      iobase + UART_DLL); /* Set speed */
+        outb(divisor >> 8,        iobase + UART_DLM);
+        outb(lcr,                 iobase + UART_LCR); /* Set 8N1 */
+        outb(fcr,                 iobase + UART_FCR); /* Enable FIFO's */
 
         /* Turn on interrups */
-        outb(UART_IER_RLSI|UART_IER_RDI|UART_IER_THRI, iobase+UART_IER);
+        outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER);
 
         IRDA_DEBUG(2, "%s() speed changed to: %d\n", __FUNCTION__, speed);
 }
@@ -1070,15 +1088,12 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
         struct smsc_ircc_cb *self;
         unsigned long flags;
         s32 speed;
-        int iobase;
         int mtt;
 
         IRDA_ASSERT(dev != NULL, return 0;);
-        self = (struct smsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
 
-        iobase = self->io.fir_base;
-
         netif_stop_queue(dev);
 
         /* Make sure test of self->io.speed & speed change are atomic */
@@ -1086,30 +1101,31 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
 
         /* Check if we need to change the speed after this frame */
         speed = irda_get_next_speed(skb);
-        if ((speed != self->io.speed) && (speed != -1)) {
+        if (speed != self->io.speed && speed != -1) {
                 /* Check for empty frame */
                 if (!skb->len) {
                         /* Note : you should make sure that speed changes
                          * are not going to corrupt any outgoing frame.
                          * Look at nsc-ircc for the gory details - Jean II */
-                        smsc_ircc_change_speed(self, speed); 
+                        smsc_ircc_change_speed(self, speed);
                         spin_unlock_irqrestore(&self->lock, flags);
                         dev_kfree_skb(skb);
                         return 0;
-                } else
-                        self->new_speed = speed;
+                }
+
+                self->new_speed = speed;
         }
-        
+
         memcpy(self->tx_buff.head, skb->data, skb->len);
 
         self->tx_buff.len = skb->len;
         self->tx_buff.data = self->tx_buff.head;
-        
-        mtt = irda_get_mtt(skb);        
+
+        mtt = irda_get_mtt(skb);
         if (mtt) {
                 int bofs;
 
-                /* 
+                /*
                  * Compute how many BOFs (STA or PA's) we need to waste the
                  * min turn time given the speed of the link.
                  */
@@ -1117,11 +1133,12 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
                 if (bofs > 4095)
                         bofs = 4095;
 
-                smsc_ircc_dma_xmit(self, iobase, bofs);
+                smsc_ircc_dma_xmit(self, bofs);
         } else {
                 /* Transmit frame */
-                smsc_ircc_dma_xmit(self, iobase, 0);
+                smsc_ircc_dma_xmit(self, 0);
         }
+
         spin_unlock_irqrestore(&self->lock, flags);
         dev_kfree_skb(skb);
 
@@ -1129,43 +1146,44 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
 }
 
 /*
- * Function smsc_ircc_dma_xmit (self, iobase)
+ * Function smsc_ircc_dma_xmit (self, bofs)
  *
  *    Transmit data using DMA
  *
  */
-static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int iobase, int bofs)
+static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int bofs)
 {
+        int iobase = self->io.fir_base;
         u8 ctrl;
 
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 #if 1
         /* Disable Rx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 #endif
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE, 
-             iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 
         self->io.direction = IO_XMIT;
 
         /* Set BOF additional count for generating the min turn time */
         register_bank(iobase, 4);
-        outb(bofs & 0xff, iobase+IRCC_BOF_COUNT_LO);
-        ctrl = inb(iobase+IRCC_CONTROL) & 0xf0;
-        outb(ctrl | ((bofs >> 8) & 0x0f), iobase+IRCC_BOF_COUNT_HI);
+        outb(bofs & 0xff, iobase + IRCC_BOF_COUNT_LO);
+        ctrl = inb(iobase + IRCC_CONTROL) & 0xf0;
+        outb(ctrl | ((bofs >> 8) & 0x0f), iobase + IRCC_BOF_COUNT_HI);
 
         /* Set max Tx frame size */
-        outb(self->tx_buff.len >> 8, iobase+IRCC_TX_SIZE_HI);
-        outb(self->tx_buff.len & 0xff, iobase+IRCC_TX_SIZE_LO);
+        outb(self->tx_buff.len >> 8, iobase + IRCC_TX_SIZE_HI);
+        outb(self->tx_buff.len & 0xff, iobase + IRCC_TX_SIZE_LO);
 
         /*outb(UART_MCR_OUT2, self->io.sir_base + UART_MCR);*/
-        
+
         /* Enable burst mode chip Tx DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE |
-             IRCC_CFGB_DMA_BURST, iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE |
+             IRCC_CFGB_DMA_BURST, iobase + IRCC_SCE_CFGB);
 
         /* Setup DMA controller (must be done after enabling chip DMA) */
         irda_setup_dma(self->io.dma, self->tx_buff_dma, self->tx_buff.len,
@@ -1174,50 +1192,52 @@ static void smsc_ircc_dma_xmit(struct smsc_ircc_cb *self, int iobase, int bofs)
         /* Enable interrupt */
 
         register_bank(iobase, 0);
-        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase+IRCC_IER);
-        outb(IRCC_MASTER_INT_EN, iobase+IRCC_MASTER);
-        
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase + IRCC_IER);
+        outb(IRCC_MASTER_INT_EN, iobase + IRCC_MASTER);
+
         /* Enable transmit */
-        outb(IRCC_LCR_B_SCE_TRANSMIT | IRCC_LCR_B_SIP_ENABLE, iobase+IRCC_LCR_B);
+        outb(IRCC_LCR_B_SCE_TRANSMIT | IRCC_LCR_B_SIP_ENABLE, iobase + IRCC_LCR_B);
 }
 
 /*
  * Function smsc_ircc_dma_xmit_complete (self)
  *
- *    The transfer of a frame in finished. This function will only be called 
+ *    The transfer of a frame in finished. This function will only be called
  *    by the interrupt handler
  *
  */
-static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self, int iobase)
+static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self)
 {
+        int iobase = self->io.fir_base;
+
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 #if 0
         /* Disable Tx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 #endif
-        register_bank(self->io.fir_base, 1);
-        outb(inb(self->io.fir_base+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
-             self->io.fir_base+IRCC_SCE_CFGB);
+        register_bank(iobase, 1);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 
         /* Check for underrun! */
         register_bank(iobase, 0);
-        if (inb(iobase+IRCC_LSR) & IRCC_LSR_UNDERRUN) {
+        if (inb(iobase + IRCC_LSR) & IRCC_LSR_UNDERRUN) {
                 self->stats.tx_errors++;
                 self->stats.tx_fifo_errors++;
 
                 /* Reset error condition */
                 register_bank(iobase, 0);
-                outb(IRCC_MASTER_ERROR_RESET, iobase+IRCC_MASTER);
-                outb(0x00, iobase+IRCC_MASTER);
+                outb(IRCC_MASTER_ERROR_RESET, iobase + IRCC_MASTER);
+                outb(0x00, iobase + IRCC_MASTER);
         } else {
                 self->stats.tx_packets++;
-                self->stats.tx_bytes +=  self->tx_buff.len;
+                self->stats.tx_bytes += self->tx_buff.len;
         }
 
         /* Check if it's time to change the speed */
         if (self->new_speed) {
-                smsc_ircc_change_speed(self, self->new_speed);          
+                smsc_ircc_change_speed(self, self->new_speed);
                 self->new_speed = 0;
         }
 
@@ -1231,31 +1251,32 @@ static void smsc_ircc_dma_xmit_complete(struct smsc_ircc_cb *self, int iobase)
  *    if it starts to receive a frame.
  *
  */
-static int smsc_ircc_dma_receive(struct smsc_ircc_cb *self, int iobase) 
+static int smsc_ircc_dma_receive(struct smsc_ircc_cb *self)
 {
+        int iobase = self->io.fir_base;
 #if 0
         /* Turn off chip DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE, 
-             iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 #endif
-        
+
         /* Disable Tx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 
         /* Turn off chip DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE, 
-             iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) & ~IRCC_CFGB_DMA_ENABLE,
+             iobase + IRCC_SCE_CFGB);
 
         self->io.direction = IO_RECV;
         self->rx_buff.data = self->rx_buff.head;
 
         /* Set max Rx frame size */
         register_bank(iobase, 4);
-        outb((2050 >> 8) & 0x0f, iobase+IRCC_RX_SIZE_HI);
-        outb(2050 & 0xff, iobase+IRCC_RX_SIZE_LO);
+        outb((2050 >> 8) & 0x0f, iobase + IRCC_RX_SIZE_HI);
+        outb(2050 & 0xff, iobase + IRCC_RX_SIZE_LO);
 
         /* Setup DMA controller */
         irda_setup_dma(self->io.dma, self->rx_buff_dma, self->rx_buff.truesize,
@@ -1263,83 +1284,83 @@ static int smsc_ircc_dma_receive(struct smsc_ircc_cb *self, int iobase)
 
         /* Enable burst mode chip Rx DMA */
         register_bank(iobase, 1);
-        outb(inb(iobase+IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE | 
-             IRCC_CFGB_DMA_BURST, iobase+IRCC_SCE_CFGB);
+        outb(inb(iobase + IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE |
+             IRCC_CFGB_DMA_BURST, iobase + IRCC_SCE_CFGB);
 
         /* Enable interrupt */
         register_bank(iobase, 0);
-        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase+IRCC_IER);
-        outb(IRCC_MASTER_INT_EN, iobase+IRCC_MASTER);
-
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase + IRCC_IER);
+        outb(IRCC_MASTER_INT_EN, iobase + IRCC_MASTER);
 
         /* Enable receiver */
         register_bank(iobase, 0);
-        outb(IRCC_LCR_B_SCE_RECEIVE | IRCC_LCR_B_SIP_ENABLE, 
-             iobase+IRCC_LCR_B);
-        
+        outb(IRCC_LCR_B_SCE_RECEIVE | IRCC_LCR_B_SIP_ENABLE,
+             iobase + IRCC_LCR_B);
+
         return 0;
 }
 
 /*
- * Function smsc_ircc_dma_receive_complete(self, iobase)
+ * Function smsc_ircc_dma_receive_complete(self)
  *
  *    Finished with receiving frames
  *
  */
-static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self, int iobase)
+static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self)
 {
         struct sk_buff *skb;
         int len, msgcnt, lsr;
-        
+        int iobase = self->io.fir_base;
+
         register_bank(iobase, 0);
-        
+
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 #if 0
         /* Disable Rx */
         register_bank(iobase, 0);
-        outb(0x00, iobase+IRCC_LCR_B);
+        outb(0x00, iobase + IRCC_LCR_B);
 #endif
         register_bank(iobase, 0);
-        outb(inb(iobase+IRCC_LSAR) & ~IRCC_LSAR_ADDRESS_MASK, iobase+IRCC_LSAR);
-        lsr= inb(iobase+IRCC_LSR);
-        msgcnt = inb(iobase+IRCC_LCR_B) & 0x08;
+        outb(inb(iobase + IRCC_LSAR) & ~IRCC_LSAR_ADDRESS_MASK, iobase + IRCC_LSAR);
+        lsr= inb(iobase + IRCC_LSR);
+        msgcnt = inb(iobase + IRCC_LCR_B) & 0x08;
 
         IRDA_DEBUG(2, "%s: dma count = %d\n", __FUNCTION__,
                    get_dma_residue(self->io.dma));
 
         len = self->rx_buff.truesize - get_dma_residue(self->io.dma);
 
-        /* Look for errors 
-         */     
-
-        if(lsr & (IRCC_LSR_FRAME_ERROR | IRCC_LSR_CRC_ERROR | IRCC_LSR_SIZE_ERROR)) {
+        /* Look for errors */
+        if (lsr & (IRCC_LSR_FRAME_ERROR | IRCC_LSR_CRC_ERROR | IRCC_LSR_SIZE_ERROR)) {
                 self->stats.rx_errors++;
-                if(lsr & IRCC_LSR_FRAME_ERROR) self->stats.rx_frame_errors++;
-                if(lsr & IRCC_LSR_CRC_ERROR) self->stats.rx_crc_errors++;
-                if(lsr & IRCC_LSR_SIZE_ERROR) self->stats.rx_length_errors++;
-                if(lsr & (IRCC_LSR_UNDERRUN | IRCC_LSR_OVERRUN)) self->stats.rx_length_errors++;
+                if (lsr & IRCC_LSR_FRAME_ERROR)
+                        self->stats.rx_frame_errors++;
+                if (lsr & IRCC_LSR_CRC_ERROR)
+                        self->stats.rx_crc_errors++;
+                if (lsr & IRCC_LSR_SIZE_ERROR)
+                        self->stats.rx_length_errors++;
+                if (lsr & (IRCC_LSR_UNDERRUN | IRCC_LSR_OVERRUN))
+                        self->stats.rx_length_errors++;
                 return;
         }
+
         /* Remove CRC */
-        if (self->io.speed < 4000000)
-                len -= 2;
-        else
-                len -= 4;
+        len -= self->io.speed < 4000000 ? 2 : 4;
 
-        if ((len < 2) || (len > 2050)) {
+        if (len < 2 || len > 2050) {
                 IRDA_WARNING("%s(), bogus len=%d\n", __FUNCTION__, len);
                 return;
         }
         IRDA_DEBUG(2, "%s: msgcnt = %d, len=%d\n", __FUNCTION__, msgcnt, len);
 
-        skb = dev_alloc_skb(len+1);
-        if (!skb)  {
+        skb = dev_alloc_skb(len + 1);
+        if (!skb) {
                 IRDA_WARNING("%s(), memory squeeze, dropping frame.\n",
                              __FUNCTION__);
                 return;
-        }                       
+        }
         /* Make sure IP header gets aligned */
-        skb_reserve(skb, 1); 
+        skb_reserve(skb, 1);
 
         memcpy(skb_put(skb, len), self->rx_buff.data, len);
         self->stats.rx_packets++;
@@ -1357,7 +1378,7 @@ static void smsc_ircc_dma_receive_complete(struct smsc_ircc_cb *self, int iobase
  *    Receive one frame from the infrared port
  *
  */
-static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self) 
+static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self)
 {
         int boguscount = 0;
         int iobase;
@@ -1366,20 +1387,20 @@ static void smsc_ircc_sir_receive(struct smsc_ircc_cb *self)
 
         iobase = self->io.sir_base;
 
-        /*  
-         * Receive all characters in Rx FIFO, unwrap and unstuff them. 
-         * async_unwrap_char will deliver all found frames  
+        /*
+         * Receive all characters in Rx FIFO, unwrap and unstuff them.
+         * async_unwrap_char will deliver all found frames
          */
         do {
-                async_unwrap_char(self->netdev, &self->stats, &self->rx_buff, 
-                                  inb(iobase+UART_RX));
+                async_unwrap_char(self->netdev, &self->stats, &self->rx_buff,
+                                  inb(iobase + UART_RX));
 
                 /* Make sure we don't stay here to long */
                 if (boguscount++ > 32) {
                         IRDA_DEBUG(2, "%s(), breaking!\n", __FUNCTION__);
                         break;
                 }
-        } while (inb(iobase+UART_LSR) & UART_LSR_DR);   
+        } while (inb(iobase + UART_LSR) & UART_LSR_DR);
 }
 
 
@@ -1397,18 +1418,19 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
         irqreturn_t ret = IRQ_NONE;
 
         if (dev == NULL) {
-                printk(KERN_WARNING "%s: irq %d for unknown device.\n", 
+                printk(KERN_WARNING "%s: irq %d for unknown device.\n",
                        driver_name, irq);
                 goto irq_ret;
         }
-        self = (struct smsc_ircc_cb *) dev->priv;
+
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return IRQ_NONE;);
 
         /* Serialise the interrupt handler in various CPUs, stop Tx path */
-        spin_lock(&self->lock); 
+        spin_lock(&self->lock);
 
         /* Check if we should use the SIR interrupt handler */
-        if (self->io.speed <=  SMSC_IRCC2_MAX_SIR_SPEED) {
+        if (self->io.speed <= SMSC_IRCC2_MAX_SIR_SPEED) {
                 ret = smsc_ircc_interrupt_sir(dev);
                 goto irq_ret_unlock;
         }
@@ -1416,25 +1438,25 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
         iobase = self->io.fir_base;
 
         register_bank(iobase, 0);
-        iir = inb(iobase+IRCC_IIR);
-        if (iir == 0) 
+        iir = inb(iobase + IRCC_IIR);
+        if (iir == 0)
                 goto irq_ret_unlock;
         ret = IRQ_HANDLED;
 
         /* Disable interrupts */
-        outb(0, iobase+IRCC_IER);
-        lcra = inb(iobase+IRCC_LCR_A);
-        lsr = inb(iobase+IRCC_LSR);
-        
+        outb(0, iobase + IRCC_IER);
+        lcra = inb(iobase + IRCC_LCR_A);
+        lsr = inb(iobase + IRCC_LSR);
+
         IRDA_DEBUG(2, "%s(), iir = 0x%02x\n", __FUNCTION__, iir);
 
         if (iir & IRCC_IIR_EOM) {
                 if (self->io.direction == IO_RECV)
-                        smsc_ircc_dma_receive_complete(self, iobase);
+                        smsc_ircc_dma_receive_complete(self);
                 else
-                        smsc_ircc_dma_xmit_complete(self, iobase);
-                
-                smsc_ircc_dma_receive(self, iobase);
+                        smsc_ircc_dma_xmit_complete(self);
+
+                smsc_ircc_dma_receive(self);
         }
 
         if (iir & IRCC_IIR_ACTIVE_FRAME) {
@@ -1444,7 +1466,7 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
         /* Enable interrupts again */
 
         register_bank(iobase, 0);
-        outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, iobase+IRCC_IER);
+        outb(IRCC_IER_ACTIVE_FRAME | IRCC_IER_EOM, iobase + IRCC_IER);
 
  irq_ret_unlock:
         spin_unlock(&self->lock);
@@ -1459,7 +1481,7 @@ static irqreturn_t smsc_ircc_interrupt(int irq, void *dev_id, struct pt_regs *re
  */
 static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)
 {
-        struct smsc_ircc_cb *self = dev->priv;
+        struct smsc_ircc_cb *self = netdev_priv(dev);
         int boguscount = 0;
         int iobase;
         int iir, lsr;
@@ -1469,14 +1491,14 @@ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)
 
         iobase = self->io.sir_base;
 
-        iir = inb(iobase+UART_IIR) & UART_IIR_ID;
+        iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         if (iir == 0)
                 return IRQ_NONE;
         while (iir) {
                 /* Clear interrupt */
-                lsr = inb(iobase+UART_LSR);
+                lsr = inb(iobase + UART_LSR);
 
-                IRDA_DEBUG(4, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", 
+                IRDA_DEBUG(4, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n",
                             __FUNCTION__, iir, lsr, iobase);
 
                 switch (iir) {
@@ -1496,13 +1518,13 @@ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev)
                         IRDA_DEBUG(0, "%s(), unhandled IIR=%#x\n",
                                    __FUNCTION__, iir);
                         break;
-                } 
-                
+                }
+
                 /* Make sure we don't stay here to long */
                 if (boguscount++ > 100)
                         break;
 
-                iir = inb(iobase + UART_IIR) & UART_IIR_ID;
+                iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         }
         /*spin_unlock(&self->lock);*/
         return IRQ_HANDLED;
@@ -1529,7 +1551,7 @@ static int ircc_is_receiving(struct smsc_ircc_cb *self)
                    get_dma_residue(self->io.dma));
 
         status = (self->rx_buff.state != OUTSIDE_FRAME);
-        
+
         return status;
 }
 #endif /* unused */
@@ -1544,19 +1566,16 @@ static int ircc_is_receiving(struct smsc_ircc_cb *self)
 static int smsc_ircc_net_open(struct net_device *dev)
 {
         struct smsc_ircc_cb *self;
-        int iobase;
         char hwname[16];
         unsigned long flags;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
-        
+
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct smsc_ircc_cb *) dev->priv;
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
-        
-        iobase = self->io.fir_base;
 
-        if (request_irq(self->io.irq, smsc_ircc_interrupt, 0, dev->name, 
+        if (request_irq(self->io.irq, smsc_ircc_interrupt, 0, dev->name,
                         (void *) dev)) {
                 IRDA_DEBUG(0, "%s(), unable to allocate irq=%d\n",
                            __FUNCTION__, self->io.irq);
@@ -1568,14 +1587,14 @@ static int smsc_ircc_net_open(struct net_device *dev)
         self->io.speed = 0;
         smsc_ircc_change_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
         spin_unlock_irqrestore(&self->lock, flags);
-        
+
         /* Give self a hardware name */
         /* It would be cool to offer the chip revision here - Jean II */
         sprintf(hwname, "SMSC @ 0x%03x", self->io.fir_base);
 
-        /* 
+        /*
          * Open new IrLAP layer instance, now that everything should be
-         * initialized properly 
+         * initialized properly
          */
         self->irlap = irlap_open(dev, &self->qos, hwname);
 
@@ -1590,7 +1609,7 @@ static int smsc_ircc_net_open(struct net_device *dev)
                              __FUNCTION__, self->io.dma);
                 return -EAGAIN;
         }
-        
+
         netif_start_queue(dev);
 
         return 0;
@@ -1605,73 +1624,53 @@ static int smsc_ircc_net_open(struct net_device *dev)
 static int smsc_ircc_net_close(struct net_device *dev)
 {
         struct smsc_ircc_cb *self;
-        int iobase;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
-        
+
         IRDA_ASSERT(dev != NULL, return -1;);
-        self = (struct smsc_ircc_cb *) dev->priv;       
+        self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
-        
-        iobase = self->io.fir_base;
 
         /* Stop device */
         netif_stop_queue(dev);
-        
+
         /* Stop and remove instance of IrLAP */
         if (self->irlap)
                 irlap_close(self->irlap);
         self->irlap = NULL;
 
         free_irq(self->io.irq, dev);
-
         disable_dma(self->io.dma);
-
         free_dma(self->io.dma);
 
         return 0;
 }
 
-
-static void smsc_ircc_suspend(struct smsc_ircc_cb *self)
+static int smsc_ircc_suspend(struct device *dev, pm_message_t state, u32 level)
 {
-        IRDA_MESSAGE("%s, Suspending\n", driver_name);
+        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
 
-        if (self->io.suspended)
-                return;
+        IRDA_MESSAGE("%s, Suspending\n", driver_name);
 
-        smsc_ircc_net_close(self->netdev);
+        if (level == SUSPEND_DISABLE && !self->io.suspended) {
+                smsc_ircc_net_close(self->netdev);
+                self->io.suspended = 1;
+        }
 
-        self->io.suspended = 1;
+        return 0;
 }
 
-static void smsc_ircc_wakeup(struct smsc_ircc_cb *self)
+static int smsc_ircc_resume(struct device *dev, u32 level)
 {
-        if (!self->io.suspended)
-                return;
+        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
 
-        /* The code was doing a "cli()" here, but this can't be right.
-         * If you need protection, do it in net_open with a spinlock
-         * or give a good reason. - Jean II */
+        if (level == RESUME_ENABLE && self->io.suspended) {
 
-        smsc_ircc_net_open(self->netdev);
-        
-        IRDA_MESSAGE("%s, Waking up\n", driver_name);
-}
+                smsc_ircc_net_open(self->netdev);
+                self->io.suspended = 0;
 
-static int smsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data)
-{
-        struct smsc_ircc_cb *self = (struct smsc_ircc_cb*) dev->data;
-        if (self) {
-                switch (rqst) {
-                case PM_SUSPEND:
-                        smsc_ircc_suspend(self);
-                        break;
-                case PM_RESUME:
-                        smsc_ircc_wakeup(self);
-                        break;
-                }
-        }
+                IRDA_MESSAGE("%s, Waking up\n", driver_name);
+        }
         return 0;
 }
 
@@ -1690,10 +1689,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
 
         IRDA_ASSERT(self != NULL, return -1;);
 
-        iobase = self->io.fir_base;
-
-        if (self->pmdev)
-                pm_unregister(self->pmdev);
+        platform_device_unregister(self->pldev);
 
         /* Remove netdevice */
         unregister_netdev(self->netdev);
@@ -1702,15 +1698,16 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
         spin_lock_irqsave(&self->lock, flags);
 
         /* Stop interrupts */
+        iobase = self->io.fir_base;
         register_bank(iobase, 0);
-        outb(0, iobase+IRCC_IER);
-        outb(IRCC_MASTER_RESET, iobase+IRCC_MASTER);
-        outb(0x00, iobase+IRCC_MASTER);
+        outb(0, iobase + IRCC_IER);
+        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
 #if 0
         /* Reset to SIR mode */
         register_bank(iobase, 1);
-        outb(IRCC_CFGA_IRDA_SIR_A|IRCC_CFGA_TX_POLARITY, iobase+IRCC_SCE_CFGA);
-        outb(IRCC_CFGB_IR, iobase+IRCC_SCE_CFGB);
+        outb(IRCC_CFGA_IRDA_SIR_A|IRCC_CFGA_TX_POLARITY, iobase + IRCC_SCE_CFGA);
+        outb(IRCC_CFGB_IR, iobase + IRCC_SCE_CFGB);
 #endif
         spin_unlock_irqrestore(&self->lock, flags);
 
@@ -1720,7 +1717,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
 
         release_region(self->io.fir_base, self->io.fir_ext);
 
-        IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __FUNCTION__, 
+        IRDA_DEBUG(0, "%s(), releasing 0x%03x\n", __FUNCTION__,
                    self->io.sir_base);
 
         release_region(self->io.sir_base, self->io.sir_ext);
@@ -1728,7 +1725,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
         if (self->tx_buff.head)
                 dma_free_coherent(NULL, self->tx_buff.truesize,
                                   self->tx_buff.head, self->tx_buff_dma);
-        
+
         if (self->rx_buff.head)
                 dma_free_coherent(NULL, self->rx_buff.truesize,
                                   self->rx_buff.head, self->rx_buff_dma);
@@ -1744,10 +1741,12 @@ static void __exit smsc_ircc_cleanup(void)
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        for (i=0; i < 2; i++) {
+        for (i = 0; i < 2; i++) {
                 if (dev_self[i])
                         smsc_ircc_close(dev_self[i]);
         }
+
+        driver_unregister(&smsc_ircc_driver);
 }
 
 /*
@@ -1763,34 +1762,34 @@ void smsc_ircc_sir_start(struct smsc_ircc_cb *self)
 
         IRDA_DEBUG(3, "%s\n", __FUNCTION__);
 
-        IRDA_ASSERT(self != NULL, return;);     
-        dev= self->netdev;
-        IRDA_ASSERT(dev != NULL, return;);              
+        IRDA_ASSERT(self != NULL, return;);
+        dev = self->netdev;
+        IRDA_ASSERT(dev != NULL, return;);
         dev->hard_start_xmit = &smsc_ircc_hard_xmit_sir;
 
         fir_base = self->io.fir_base;
         sir_base = self->io.sir_base;
 
         /* Reset everything */
-        outb(IRCC_MASTER_RESET, fir_base+IRCC_MASTER);
+        outb(IRCC_MASTER_RESET, fir_base + IRCC_MASTER);
 
         #if SMSC_IRCC2_C_SIR_STOP
         /*smsc_ircc_sir_stop(self);*/
         #endif
 
         register_bank(fir_base, 1);
-        outb(((inb(fir_base+IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | IRCC_CFGA_IRDA_SIR_A), fir_base+IRCC_SCE_CFGA);
+        outb(((inb(fir_base + IRCC_SCE_CFGA) & IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK) | IRCC_CFGA_IRDA_SIR_A), fir_base + IRCC_SCE_CFGA);
 
         /* Initialize UART */
-        outb(UART_LCR_WLEN8, sir_base+UART_LCR);  /* Reset DLAB */
-        outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), sir_base+UART_MCR);
-        
+        outb(UART_LCR_WLEN8, sir_base + UART_LCR);  /* Reset DLAB */
+        outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), sir_base + UART_MCR);
+
         /* Turn on interrups */
-        outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, sir_base+UART_IER);
+        outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, sir_base + UART_IER);
 
         IRDA_DEBUG(3, "%s() - exit\n", __FUNCTION__);
 
-        outb(0x00, fir_base+IRCC_MASTER);
+        outb(0x00, fir_base + IRCC_MASTER);
 }
 
 #if SMSC_IRCC2_C_SIR_STOP
@@ -1802,10 +1801,10 @@ void smsc_ircc_sir_stop(struct smsc_ircc_cb *self)
         iobase = self->io.sir_base;
 
         /* Reset UART */
-        outb(0, iobase+UART_MCR);
-        
+        outb(0, iobase + UART_MCR);
+
         /* Turn off interrupts */
-        outb(0, iobase+UART_IER);
+        outb(0, iobase + UART_IER);
 }
 #endif
 
@@ -1831,16 +1830,16 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)
         /* Finished with frame?  */
         if (self->tx_buff.len > 0)  {
                 /* Write data left in transmit buffer */
-                actual = smsc_ircc_sir_write(iobase, self->io.fifo_size, 
+                actual = smsc_ircc_sir_write(iobase, self->io.fifo_size,
                                       self->tx_buff.data, self->tx_buff.len);
                 self->tx_buff.data += actual;
                 self->tx_buff.len  -= actual;
         } else {
-        
+
         /*if (self->tx_buff.len ==0)  {*/
-                
-                /* 
-                 *  Now serial buffer is almost free & we can start 
+
+                /*
+                 *  Now serial buffer is almost free & we can start
                  *  transmission of another packet. But first we must check
                  *  if we need to change the speed of the hardware
                  */
@@ -1856,21 +1855,19 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)
                 }
                 self->stats.tx_packets++;
 
-                if(self->io.speed <= 115200) {
-                /* 
-                 * Reset Rx FIFO to make sure that all reflected transmit data
-                 * is discarded. This is needed for half duplex operation
-                 */
-                fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR;
-                if (self->io.speed < 38400)
-                        fcr |= UART_FCR_TRIGGER_1;
-                else 
-                        fcr |= UART_FCR_TRIGGER_14;
+                if (self->io.speed <= 115200) {
+                        /*
+                         * Reset Rx FIFO to make sure that all reflected transmit data
+                         * is discarded. This is needed for half duplex operation
+                         */
+                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR;
+                        fcr |= self->io.speed < 38400 ?
+                                        UART_FCR_TRIGGER_1 : UART_FCR_TRIGGER_14;
 
-                outb(fcr, iobase+UART_FCR);
+                        outb(fcr, iobase + UART_FCR);
 
-                /* Turn on receive interrupts */
-                outb(UART_IER_RDI, iobase+UART_IER);
+                        /* Turn on receive interrupts */
+                        outb(UART_IER_RDI, iobase + UART_IER);
                 }
         }
 }
@@ -1884,17 +1881,17 @@ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self)
 static int smsc_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len)
 {
         int actual = 0;
-        
+
         /* Tx FIFO should be empty! */
-        if (!(inb(iobase+UART_LSR) & UART_LSR_THRE)) {
+        if (!(inb(iobase + UART_LSR) & UART_LSR_THRE)) {
                 IRDA_WARNING("%s(), failed, fifo not empty!\n", __FUNCTION__);
                 return 0;
         }
-        
+
         /* Fill FIFO with current frame */
-        while ((fifo_size-- > 0) && (actual < len)) {
+        while (fifo_size-- > 0 && actual < len) {
                 /* Transmit next byte */
-                outb(buf[actual], iobase+UART_TX);
+                outb(buf[actual], iobase + UART_TX);
                 actual++;
         }
         return actual;
@@ -1921,20 +1918,21 @@ static int smsc_ircc_is_receiving(struct smsc_ircc_cb *self)
 static void smsc_ircc_probe_transceiver(struct smsc_ircc_cb *self)
 {
         unsigned int    i;
-        
+
         IRDA_ASSERT(self != NULL, return;);
-        
-        for(i=0; smsc_transceivers[i].name!=NULL; i++) 
-                if((*smsc_transceivers[i].probe)(self->io.fir_base)) {
+
+        for (i = 0; smsc_transceivers[i].name != NULL; i++)
+                if (smsc_transceivers[i].probe(self->io.fir_base)) {
                         IRDA_MESSAGE(" %s transceiver found\n",
                                      smsc_transceivers[i].name);
-                        self->transceiver= i+1;
+                        self->transceiver= i + 1;
                         return;
                 }
+
         IRDA_MESSAGE("No transceiver found. Defaulting to %s\n",
                      smsc_transceivers[SMSC_IRCC2_C_DEFAULT_TRANSCEIVER].name);
-                        
-        self->transceiver= SMSC_IRCC2_C_DEFAULT_TRANSCEIVER;
+
+        self->transceiver = SMSC_IRCC2_C_DEFAULT_TRANSCEIVER;
 }
 
 
@@ -1947,9 +1945,10 @@ static void smsc_ircc_probe_transceiver(struct smsc_ircc_cb *self)
 static void smsc_ircc_set_transceiver_for_speed(struct smsc_ircc_cb *self, u32 speed)
 {
         unsigned int trx;
-        
+
         trx = self->transceiver;
-        if(trx>0) (*smsc_transceivers[trx-1].set_for_speed)(self->io.fir_base, speed);
+        if (trx > 0)
+                smsc_transceivers[trx - 1].set_for_speed(self->io.fir_base, speed);
 }
 
 /*
@@ -1977,16 +1976,14 @@ static void smsc_ircc_set_transceiver_for_speed(struct smsc_ircc_cb *self, u32 s
 
 static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self)
 {
-        int iobase;
+        int iobase = self->io.sir_base;
         int count = SMSC_IRCC2_HW_TRANSMITTER_TIMEOUT_US;
-        
-        iobase = self->io.sir_base;
-        
+
         /* Calibrated busy loop */
-        while((count-- > 0) && !(inb(iobase+UART_LSR) & UART_LSR_TEMT))
+        while (count-- > 0 && !(inb(iobase + UART_LSR) & UART_LSR_TEMT))
                 udelay(1);
 
-        if(count == 0)
+        if (count == 0)
                 IRDA_DEBUG(0, "%s(): stuck transmitter\n", __FUNCTION__);
 }
 
@@ -1998,40 +1995,42 @@ static void smsc_ircc_sir_wait_hw_transmitter_finish(struct smsc_ircc_cb *self)
 
 static int __init smsc_ircc_look_for_chips(void)
 {
-        smsc_chip_address_t *address;
-        char    *type;
+        struct smsc_chip_address *address;
+        char *type;
         unsigned int cfg_base, found;
-        
+
         found = 0;
         address = possible_addresses;
-        
-        while(address->cfg_base){
+
+        while (address->cfg_base) {
                 cfg_base = address->cfg_base;
-                
+
                 /*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/
-                
-                if( address->type & SMSCSIO_TYPE_FDC){
+
+                if (address->type & SMSCSIO_TYPE_FDC) {
                         type = "FDC";
-                        if((address->type) & SMSCSIO_TYPE_FLAT) {
-                                if(!smsc_superio_flat(fdc_chips_flat,cfg_base, type)) found++;
-                        }
-                        if((address->type) & SMSCSIO_TYPE_PAGED) {
-                                if(!smsc_superio_paged(fdc_chips_paged,cfg_base, type)) found++;                
-                        }                       
+                        if (address->type & SMSCSIO_TYPE_FLAT)
+                                if (!smsc_superio_flat(fdc_chips_flat, cfg_base, type))
+                                        found++;
+
+                        if (address->type & SMSCSIO_TYPE_PAGED)
+                                if (!smsc_superio_paged(fdc_chips_paged, cfg_base, type))
+                                        found++;
                 }
-                if( address->type & SMSCSIO_TYPE_LPC){
+                if (address->type & SMSCSIO_TYPE_LPC) {
                         type = "LPC";
-                        if((address->type) & SMSCSIO_TYPE_FLAT) {
-                                if(!smsc_superio_flat(lpc_chips_flat,cfg_base,type)) found++;
-                        }
-                        if((address->type) & SMSCSIO_TYPE_PAGED) {
-                                if(!smsc_superio_paged(lpc_chips_paged,cfg_base,"LPC")) found++;                
-                        }                       
+                        if (address->type & SMSCSIO_TYPE_FLAT)
+                                if (!smsc_superio_flat(lpc_chips_flat, cfg_base, type))
+                                        found++;
+
+                        if (address->type & SMSCSIO_TYPE_PAGED)
+                                if (!smsc_superio_paged(lpc_chips_paged, cfg_base, type))
+                                        found++;
                 }
                 address++;
         }
         return found;
-} 
+}
 
 /*
  * Function smsc_superio_flat (chip, base, type)
@@ -2039,7 +2038,7 @@ static int __init smsc_ircc_look_for_chips(void)
  *    Try to get configuration of a smc SuperIO chip with flat register model
  *
  */
-static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfgbase, char *type)
+static int __init smsc_superio_flat(const struct smsc_chip *chips, unsigned short cfgbase, char *type)
 {
         unsigned short firbase, sirbase;
         u8 mode, dma, irq;
@@ -2047,39 +2046,37 @@ static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        if (smsc_ircc_probe(cfgbase, SMSCSIOFLAT_DEVICEID_REG, chips, type)==NULL)
+        if (smsc_ircc_probe(cfgbase, SMSCSIOFLAT_DEVICEID_REG, chips, type) == NULL)
                 return ret;
 
         outb(SMSCSIOFLAT_UARTMODE0C_REG, cfgbase);
-        mode = inb(cfgbase+1);
-        
+        mode = inb(cfgbase + 1);
+
         /*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/
-        
-        if(!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
+
+        if (!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
                 IRDA_WARNING("%s(): IrDA not enabled\n", __FUNCTION__);
 
         outb(SMSCSIOFLAT_UART2BASEADDR_REG, cfgbase);
-        sirbase = inb(cfgbase+1) << 2;
+        sirbase = inb(cfgbase + 1) << 2;
 
-        /* FIR iobase */
+        /* FIR iobase */
         outb(SMSCSIOFLAT_FIRBASEADDR_REG, cfgbase);
-        firbase = inb(cfgbase+1) << 3;
+        firbase = inb(cfgbase + 1) << 3;
 
         /* DMA */
         outb(SMSCSIOFLAT_FIRDMASELECT_REG, cfgbase);
-        dma = inb(cfgbase+1) & SMSCSIOFLAT_FIRDMASELECT_MASK;
-        
+        dma = inb(cfgbase + 1) & SMSCSIOFLAT_FIRDMASELECT_MASK;
+
         /* IRQ */
         outb(SMSCSIOFLAT_UARTIRQSELECT_REG, cfgbase);
-        irq = inb(cfgbase+1) & SMSCSIOFLAT_UART2IRQSELECT_MASK;
+        irq = inb(cfgbase + 1) & SMSCSIOFLAT_UART2IRQSELECT_MASK;
 
         IRDA_MESSAGE("%s(): fir: 0x%02x, sir: 0x%02x, dma: %02d, irq: %d, mode: 0x%02x\n", __FUNCTION__, firbase, sirbase, dma, irq, mode);
 
-        if (firbase) {
-                if (smsc_ircc_open(firbase, sirbase, dma, irq) == 0)
-                        ret=0; 
-        }
-        
+        if (firbase && smsc_ircc_open(firbase, sirbase, dma, irq) == 0)
+                ret = 0;
+
         /* Exit configuration */
         outb(SMSCSIO_CFGEXITKEY, cfgbase);
 
@@ -2092,26 +2089,26 @@ static int __init smsc_superio_flat(const smsc_chip_t *chips, unsigned short cfg
  *    Try  to get configuration of a smc SuperIO chip with paged register model
  *
  */
-static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cfg_base, char *type)
+static int __init smsc_superio_paged(const struct smsc_chip *chips, unsigned short cfg_base, char *type)
 {
         unsigned short fir_io, sir_io;
         int ret = -ENODEV;
-        
+
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
-        if (smsc_ircc_probe(cfg_base,0x20,chips,type)==NULL)
+        if (smsc_ircc_probe(cfg_base, 0x20, chips, type) == NULL)
                 return ret;
-        
+
         /* Select logical device (UART2) */
         outb(0x07, cfg_base);
         outb(0x05, cfg_base + 1);
-                
+
         /* SIR iobase */
         outb(0x60, cfg_base);
-        sir_io  = inb(cfg_base + 1) << 8;
+        sir_io = inb(cfg_base + 1) << 8;
         outb(0x61, cfg_base);
         sir_io |= inb(cfg_base + 1);
-                
+
         /* Read FIR base */
         outb(0x62, cfg_base);
         fir_io = inb(cfg_base + 1) << 8;
@@ -2119,11 +2116,9 @@ static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cf
         fir_io |= inb(cfg_base + 1);
         outb(0x2b, cfg_base); /* ??? */
 
-        if (fir_io) {
-                if (smsc_ircc_open(fir_io, sir_io, ircc_dma, ircc_irq) == 0)
-                        ret=0; 
-        }
-        
+        if (fir_io && smsc_ircc_open(fir_io, sir_io, ircc_dma, ircc_irq) == 0)
+                ret = 0;
+
         /* Exit configuration */
         outb(SMSCSIO_CFGEXITKEY, cfg_base);
 
@@ -2131,21 +2126,17 @@ static int __init smsc_superio_paged(const smsc_chip_t *chips, unsigned short cf
 }
 
 
-static int __init smsc_access(unsigned short cfg_base,unsigned char reg)
+static int __init smsc_access(unsigned short cfg_base, unsigned char reg)
 {
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
         outb(reg, cfg_base);
-
-        if (inb(cfg_base)!=reg)
-                return -1;
-
-        return 0;
+        return inb(cfg_base) != reg ? -1 : 0;
 }
 
-static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type)
+static const struct smsc_chip * __init smsc_ircc_probe(unsigned short cfg_base, u8 reg, const struct smsc_chip *chip, char *type)
 {
-        u8 devid,xdevid,rev; 
+        u8 devid, xdevid, rev;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
@@ -2158,7 +2149,7 @@ static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg
 
         outb(reg, cfg_base);
 
-        xdevid=inb(cfg_base+1);
+        xdevid = inb(cfg_base + 1);
 
         /* Enter configuration */
 
@@ -2168,51 +2159,49 @@ static const smsc_chip_t * __init smsc_ircc_probe(unsigned short cfg_base,u8 reg
         if (smsc_access(cfg_base,0x55)) /* send second key and check */
                 return NULL;
         #endif
-        
+
         /* probe device ID */
 
-        if (smsc_access(cfg_base,reg))
+        if (smsc_access(cfg_base, reg))
                 return NULL;
 
-        devid=inb(cfg_base+1);
-        
-        if (devid==0)                   /* typical value for unused port */
-                return NULL;
+        devid = inb(cfg_base + 1);
 
-        if (devid==0xff)                /* typical value for unused port */
+        if (devid == 0 || devid == 0xff)        /* typical values for unused port */
                 return NULL;
 
         /* probe revision ID */
 
-        if (smsc_access(cfg_base,reg+1))
+        if (smsc_access(cfg_base, reg + 1))
                 return NULL;
 
-        rev=inb(cfg_base+1);
+        rev = inb(cfg_base + 1);
 
-        if (rev>=128)                   /* i think this will make no sense */
+        if (rev >= 128)                 /* i think this will make no sense */
                 return NULL;
 
-        if (devid==xdevid)              /* protection against false positives */        
+        if (devid == xdevid)            /* protection against false positives */
                 return NULL;
 
         /* Check for expected device ID; are there others? */
 
-        while(chip->devid!=devid) {
+        while (chip->devid != devid) {
 
                 chip++;
 
-                if (chip->name==NULL)
+                if (chip->name == NULL)
                         return NULL;
         }
 
-        IRDA_MESSAGE("found SMC SuperIO Chip (devid=0x%02x rev=%02X base=0x%04x): %s%s\n",devid,rev,cfg_base,type,chip->name);
+        IRDA_MESSAGE("found SMC SuperIO Chip (devid=0x%02x rev=%02X base=0x%04x): %s%s\n",
+                     devid, rev, cfg_base, type, chip->name);
 
-        if (chip->rev>rev){
-                IRDA_MESSAGE("Revision higher than expected\n");        
+        if (chip->rev > rev) {
+                IRDA_MESSAGE("Revision higher than expected\n");
                 return NULL;
         }
-        
-        if (chip->flags&NoIRDA)
+
+        if (chip->flags & NoIRDA)
                 IRDA_MESSAGE("chipset does not support IRDA\n");
 
         return chip;
@@ -2226,8 +2215,8 @@ static int __init smsc_superio_fdc(unsigned short cfg_base)
                 IRDA_WARNING("%s: can't get cfg_base of 0x%03x\n",
                              __FUNCTION__, cfg_base);
         } else {
-                if (!smsc_superio_flat(fdc_chips_flat,cfg_base,"FDC")
-                    ||!smsc_superio_paged(fdc_chips_paged,cfg_base,"FDC"))
+                if (!smsc_superio_flat(fdc_chips_flat, cfg_base, "FDC") ||
+                    !smsc_superio_paged(fdc_chips_paged, cfg_base, "FDC"))
                         ret =  0;
 
                 release_region(cfg_base, 2);
@@ -2244,9 +2233,10 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
                 IRDA_WARNING("%s: can't get cfg_base of 0x%03x\n",
                              __FUNCTION__, cfg_base);
         } else {
-                if (!smsc_superio_flat(lpc_chips_flat,cfg_base,"LPC")
-                    ||!smsc_superio_paged(lpc_chips_paged,cfg_base,"LPC"))
+                if (!smsc_superio_flat(lpc_chips_flat, cfg_base, "LPC") ||
+                    !smsc_superio_paged(lpc_chips_paged, cfg_base, "LPC"))
                         ret = 0;
+
                 release_region(cfg_base, 2);
         }
         return ret;
@@ -2269,18 +2259,23 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
 static void smsc_ircc_set_transceiver_smsc_ircc_atc(int fir_base, u32 speed)
 {
         unsigned long jiffies_now, jiffies_timeout;
-        u8      val;
-        
-        jiffies_now= jiffies;
-        jiffies_timeout= jiffies+SMSC_IRCC2_ATC_PROGRAMMING_TIMEOUT_JIFFIES;
-        
+        u8 val;
+
+        jiffies_now = jiffies;
+        jiffies_timeout = jiffies + SMSC_IRCC2_ATC_PROGRAMMING_TIMEOUT_JIFFIES;
+
         /* ATC */
         register_bank(fir_base, 4);
-        outb((inb(fir_base+IRCC_ATC) & IRCC_ATC_MASK) |IRCC_ATC_nPROGREADY|IRCC_ATC_ENABLE, fir_base+IRCC_ATC);
-        while((val=(inb(fir_base+IRCC_ATC) & IRCC_ATC_nPROGREADY)) && !time_after(jiffies, jiffies_timeout));
-        if(val)
+        outb((inb(fir_base + IRCC_ATC) & IRCC_ATC_MASK) | IRCC_ATC_nPROGREADY|IRCC_ATC_ENABLE,
+             fir_base + IRCC_ATC);
+
+        while ((val = (inb(fir_base + IRCC_ATC) & IRCC_ATC_nPROGREADY)) &&
+                !time_after(jiffies, jiffies_timeout))
+                /* empty */;
+
+        if (val)
                 IRDA_WARNING("%s(): ATC: 0x%02x\n", __FUNCTION__,
-                             inb(fir_base+IRCC_ATC));
+                             inb(fir_base + IRCC_ATC));
 }
 
 /*
@@ -2298,34 +2293,32 @@ static int smsc_ircc_probe_transceiver_smsc_ircc_atc(int fir_base)
 /*
  * Function smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select(self, speed)
  *
- *    Set transceiver 
+ *    Set transceiver
  *
  */
 
 static void smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select(int fir_base, u32 speed)
 {
-        u8      fast_mode;
-        
-        switch(speed)
-        {
-                default:
-                case 576000 :
-                fast_mode = 0; 
+        u8 fast_mode;
+
+        switch (speed) {
+        default:
+        case 576000 :
+                fast_mode = 0;
                 break;
-                case 1152000 :
-                case 4000000 :
+        case 1152000 :
+        case 4000000 :
                 fast_mode = IRCC_LCR_A_FAST;
                 break;
-                
         }
         register_bank(fir_base, 0);
-        outb((inb(fir_base+IRCC_LCR_A) &  0xbf) | fast_mode, fir_base+IRCC_LCR_A);
+        outb((inb(fir_base + IRCC_LCR_A) & 0xbf) | fast_mode, fir_base + IRCC_LCR_A);
 }
 
 /*
  * Function smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select(fir_base)
  *
- *    Probe transceiver 
+ *    Probe transceiver
  *
  */
 
@@ -2337,35 +2330,34 @@ static int smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select(int fir_base)
 /*
  * Function smsc_ircc_set_transceiver_toshiba_sat1800(fir_base, speed)
  *
- *    Set transceiver 
+ *    Set transceiver
  *
  */
 
 static void smsc_ircc_set_transceiver_toshiba_sat1800(int fir_base, u32 speed)
 {
-        u8      fast_mode;
-        
-        switch(speed)
-        {
-                default:
-                case 576000 :
-                fast_mode = 0; 
+        u8 fast_mode;
+
+        switch (speed) {
+        default:
+        case 576000 :
+                fast_mode = 0;
                 break;
-                case 1152000 :
-                case 4000000 :
+        case 1152000 :
+        case 4000000 :
                 fast_mode = /*IRCC_LCR_A_FAST |*/ IRCC_LCR_A_GP_DATA;
                 break;
-                
+
         }
         /* This causes an interrupt */
         register_bank(fir_base, 0);
-        outb((inb(fir_base+IRCC_LCR_A) &  0xbf) | fast_mode, fir_base+IRCC_LCR_A);
+        outb((inb(fir_base + IRCC_LCR_A) &  0xbf) | fast_mode, fir_base + IRCC_LCR_A);
 }
 
 /*
  * Function smsc_ircc_probe_transceiver_toshiba_sat1800(fir_base)
  *
- *    Probe transceiver 
+ *    Probe transceiver
  *
  */
 
@@ -2377,20 +2369,3 @@ static int smsc_ircc_probe_transceiver_toshiba_sat1800(int fir_base)
 
 module_init(smsc_ircc_init);
 module_exit(smsc_ircc_cleanup);
-
-MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
-MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
-MODULE_LICENSE("GPL");
-
-module_param(ircc_dma, int, 0);
-MODULE_PARM_DESC(ircc_dma, "DMA channel");
-module_param(ircc_irq, int, 0);
-MODULE_PARM_DESC(ircc_irq, "IRQ line");
-module_param(ircc_fir, int, 0);
-MODULE_PARM_DESC(ircc_fir, "FIR Base Address");
-module_param(ircc_sir, int, 0);
-MODULE_PARM_DESC(ircc_sir, "SIR Base Address");
-module_param(ircc_cfg, int, 0);
-MODULE_PARM_DESC(ircc_cfg, "Configuration register base address");
-module_param(ircc_transceiver, int, 0);
-MODULE_PARM_DESC(ircc_transceiver, "Transceiver type");
diff --git a/drivers/net/irda/smsc-ircc2.h b/drivers/net/irda/smsc-ircc2.h
index 458611cc0d40..0c36286d87f7 100644
--- a/drivers/net/irda/smsc-ircc2.h
+++ b/drivers/net/irda/smsc-ircc2.h
@@ -1,5 +1,5 @@
 /*********************************************************************
- * $Id: smsc-ircc2.h,v 1.12.2.1 2002/10/27 10:52:37 dip Exp $               
+ * $Id: smsc-ircc2.h,v 1.12.2.1 2002/10/27 10:52:37 dip Exp $
  *
  * Description:   Definitions for the SMC IrCC chipset
  * Status:        Experimental.
@@ -9,25 +9,25 @@
  *     All Rights Reserved.
  *
  * Based on smc-ircc.h:
- * 
+ *
  *     Copyright (c) 1999-2000, Dag Brattli <dagb@cs.uit.no>
  *     Copyright (c) 1998-1999, Thomas Davis (tadavis@jps.net>
  *     All Rights Reserved
  *
- *      
- *     This program is free software; you can redistribute it and/or 
- *     modify it under the terms of the GNU General Public License as 
- *     published by the Free Software Foundation; either version 2 of 
+ *
+ *     This program is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of
  *     the License, or (at your option) any later version.
- * 
+ *
  *     This program is distributed in the hope that it will be useful,
  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License 
- *     along with this program; if not, write to the Free Software 
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *     MA 02111-1307 USA
  *
  ********************************************************************/
@@ -112,10 +112,10 @@
 
 #define   IRCC_CFGA_COM                         0x00
 #define         IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK      0x87
-#define         IRCC_CFGA_IRDA_SIR_A    0x08
-#define         IRCC_CFGA_ASK_SIR               0x10
-#define         IRCC_CFGA_IRDA_SIR_B    0x18
-#define         IRCC_CFGA_IRDA_HDLC             0x20
+#define         IRCC_CFGA_IRDA_SIR_A    0x08
+#define         IRCC_CFGA_ASK_SIR               0x10
+#define         IRCC_CFGA_IRDA_SIR_B    0x18
+#define         IRCC_CFGA_IRDA_HDLC             0x20
 #define         IRCC_CFGA_IRDA_4PPM             0x28
 #define         IRCC_CFGA_CONSUMER              0x30
 #define         IRCC_CFGA_RAW_IR                0x38
@@ -130,7 +130,7 @@
 #define IRCC_CFGB_LPBCK_TX_CRC     0x10
 #define IRCC_CFGB_NOWAIT           0x08
 #define IRCC_CFGB_STRING_MOVE      0x04
-#define IRCC_CFGB_DMA_BURST        0x02
+#define IRCC_CFGB_DMA_BURST        0x02
 #define IRCC_CFGB_DMA_ENABLE       0x01
 
 #define IRCC_CFGB_MUX_COM          0x00
@@ -141,11 +141,11 @@
 /* Register block 3 - Identification Registers! */
 #define IRCC_ID_HIGH               0x00   /* 0x10 */
 #define IRCC_ID_LOW                0x01   /* 0xB8 */
-#define IRCC_CHIP_ID               0x02   /* 0xF1 */
+#define IRCC_CHIP_ID               0x02   /* 0xF1 */
 #define IRCC_VERSION               0x03   /* 0x01 */
 #define IRCC_INTERFACE             0x04   /* low 4 = DMA, high 4 = IRQ */
-#define         IRCC_INTERFACE_DMA_MASK 0x0F   /* low 4 = DMA, high 4 = IRQ */
-#define         IRCC_INTERFACE_IRQ_MASK 0xF0   /* low 4 = DMA, high 4 = IRQ */
+#define         IRCC_INTERFACE_DMA_MASK 0x0F   /* low 4 = DMA, high 4 = IRQ */
+#define         IRCC_INTERFACE_IRQ_MASK 0xF0   /* low 4 = DMA, high 4 = IRQ */
 
 /* Register block 4 - IrDA */
 #define IRCC_CONTROL               0x00
@@ -163,10 +163,10 @@
 
 /* Register block 5 - IrDA */
 #define IRCC_ATC                                        0x00
-#define         IRCC_ATC_nPROGREADY             0x80
-#define         IRCC_ATC_SPEED                  0x40
-#define         IRCC_ATC_ENABLE                 0x20
-#define         IRCC_ATC_MASK                   0xE0
+#define         IRCC_ATC_nPROGREADY             0x80
+#define         IRCC_ATC_SPEED                  0x40
+#define         IRCC_ATC_ENABLE                 0x20
+#define         IRCC_ATC_MASK                   0xE0
 
 
 #define IRCC_IRHALFDUPLEX_TIMEOUT       0x01
@@ -178,8 +178,8 @@
  */
 
 #define SMSC_IRCC2_MAX_SIR_SPEED                115200
-#define SMSC_IRCC2_FIR_CHIP_IO_EXTENT   8
-#define SMSC_IRCC2_SIR_CHIP_IO_EXTENT   8
+#define SMSC_IRCC2_FIR_CHIP_IO_EXTENT   8
+#define SMSC_IRCC2_SIR_CHIP_IO_EXTENT   8
 #define SMSC_IRCC2_FIFO_SIZE                    16
 #define SMSC_IRCC2_FIFO_THRESHOLD               64
 /* Max DMA buffer size needed = (data_size + 6) * (window_size) + 6; */
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 006e4f575606..6d9de626c967 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1749,11 +1749,6 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
         struct net_device *ndev = pci_get_drvdata(pdev);
         vlsi_irda_dev_t *idev;
 
-        if (state < 1 || state > 3 ) {
-                IRDA_ERROR("%s - %s: invalid pm state request: %u\n",
-                           __FUNCTION__, PCIDEV_NAME(pdev), state);
-                return 0;
-        }
         if (!ndev) {
                 IRDA_ERROR("%s - %s: no netdevice \n",
                            __FUNCTION__, PCIDEV_NAME(pdev));
@@ -1762,12 +1757,12 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
         idev = ndev->priv;      
         down(&idev->sem);
         if (pdev->current_state != 0) {                 /* already suspended */
-                if (state > pdev->current_state) {      /* simply go deeper */
-                        pci_set_power_state(pdev,state);
-                        pdev->current_state = state;
+                if (state.event > pdev->current_state) {        /* simply go deeper */
+                        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+                        pdev->current_state = state.event;
                 }
                 else
-                        IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state);
+                        IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state.event);
                 up(&idev->sem);
                 return 0;
         }
@@ -1781,8 +1776,8 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
                         idev->new_baud = idev->baud;
         }
 
-        pci_set_power_state(pdev,state);
-        pdev->current_state = state;
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        pdev->current_state = state.event;
         idev->resume_ok = 1;
         up(&idev->sem);
         return 0;
@@ -1807,8 +1802,8 @@ static int vlsi_irda_resume(struct pci_dev *pdev)
                 return 0;
         }
         
-        pci_set_power_state(pdev, 0);
-        pdev->current_state = 0;
+        pci_set_power_state(pdev, PCI_D0);
+        pdev->current_state = PM_EVENT_ON;
 
         if (!idev->resume_ok) {
                 /* should be obsolete now - but used to happen due to:
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 183ba97785b0..3d56cf5a4e23 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2001 Kyle A. Lucke (klucke@us.ibm.com), IBM Corp.
  * Substantially cleaned up by:
  * Copyright (C) 2003 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
+ * Copyright (C) 2004-2005 Michael Ellerman, IBM Corporation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -79,12 +80,55 @@
 #include <asm/iommu.h>
 #include <asm/vio.h>
 
-#include "iseries_veth.h"
+#undef DEBUG
 
 MODULE_AUTHOR("Kyle Lucke <klucke@us.ibm.com>");
 MODULE_DESCRIPTION("iSeries Virtual ethernet driver");
 MODULE_LICENSE("GPL");
 
+#define VETH_EVENT_CAP  (0)
+#define VETH_EVENT_FRAMES       (1)
+#define VETH_EVENT_MONITOR      (2)
+#define VETH_EVENT_FRAMES_ACK   (3)
+
+#define VETH_MAX_ACKS_PER_MSG   (20)
+#define VETH_MAX_FRAMES_PER_MSG (6)
+
+struct veth_frames_data {
+        u32 addr[VETH_MAX_FRAMES_PER_MSG];
+        u16 len[VETH_MAX_FRAMES_PER_MSG];
+        u32 eofmask;
+};
+#define VETH_EOF_SHIFT          (32-VETH_MAX_FRAMES_PER_MSG)
+
+struct veth_frames_ack_data {
+        u16 token[VETH_MAX_ACKS_PER_MSG];
+};
+
+struct veth_cap_data {
+        u8 caps_version;
+        u8 rsvd1;
+        u16 num_buffers;
+        u16 ack_threshold;
+        u16 rsvd2;
+        u32 ack_timeout;
+        u32 rsvd3;
+        u64 rsvd4[3];
+};
+
+struct veth_lpevent {
+        struct HvLpEvent base_event;
+        union {
+                struct veth_cap_data caps_data;
+                struct veth_frames_data frames_data;
+                struct veth_frames_ack_data frames_ack_data;
+        } u;
+
+};
+
+#define DRV_NAME        "iseries_veth"
+#define DRV_VERSION     "2.0"
+
 #define VETH_NUMBUFFERS         (120)
 #define VETH_ACKTIMEOUT         (1000000) /* microseconds */
 #define VETH_MAX_MCAST          (12)
@@ -113,9 +157,9 @@ MODULE_LICENSE("GPL");
 
 struct veth_msg {
         struct veth_msg *next;
-        struct VethFramesData data;
+        struct veth_frames_data data;
         int token;
-        unsigned long in_use;
+        int in_use;
         struct sk_buff *skb;
         struct device *dev;
 };
@@ -125,23 +169,28 @@ struct veth_lpar_connection {
         struct work_struct statemachine_wq;
         struct veth_msg *msgs;
         int num_events;
-        struct VethCapData local_caps;
+        struct veth_cap_data local_caps;
 
+        struct kobject kobject;
         struct timer_list ack_timer;
 
+        struct timer_list reset_timer;
+        unsigned int reset_timeout;
+        unsigned long last_contact;
+        int outstanding_tx;
+
         spinlock_t lock;
         unsigned long state;
         HvLpInstanceId src_inst;
         HvLpInstanceId dst_inst;
-        struct VethLpEvent cap_event, cap_ack_event;
+        struct veth_lpevent cap_event, cap_ack_event;
         u16 pending_acks[VETH_MAX_ACKS_PER_MSG];
         u32 num_pending_acks;
 
         int num_ack_events;
-        struct VethCapData remote_caps;
+        struct veth_cap_data remote_caps;
         u32 ack_timeout;
 
-        spinlock_t msg_stack_lock;
         struct veth_msg *msg_stack_head;
 };
 
@@ -151,15 +200,17 @@ struct veth_port {
         u64 mac_addr;
         HvLpIndexMap lpar_map;
 
-        spinlock_t pending_gate;
-        struct sk_buff *pending_skb;
-        HvLpIndexMap pending_lpmask;
+        /* queue_lock protects the stopped_map and dev's queue. */
+        spinlock_t queue_lock;
+        HvLpIndexMap stopped_map;
 
+        /* mcast_gate protects promiscuous, num_mcast & mcast_addr. */
         rwlock_t mcast_gate;
         int promiscuous;
-        int all_mcast;
         int num_mcast;
         u64 mcast_addr[VETH_MAX_MCAST];
+
+        struct kobject kobject;
 };
 
 static HvLpIndex this_lp;
@@ -168,44 +219,56 @@ static struct net_device *veth_dev[HVMAXARCHITECTEDVIRTUALLANS]; /* = 0 */
 
 static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static void veth_recycle_msg(struct veth_lpar_connection *, struct veth_msg *);
-static void veth_flush_pending(struct veth_lpar_connection *cnx);
-static void veth_receive(struct veth_lpar_connection *, struct VethLpEvent *);
-static void veth_timed_ack(unsigned long connectionPtr);
+static void veth_wake_queues(struct veth_lpar_connection *cnx);
+static void veth_stop_queues(struct veth_lpar_connection *cnx);
+static void veth_receive(struct veth_lpar_connection *, struct veth_lpevent *);
+static void veth_release_connection(struct kobject *kobject);
+static void veth_timed_ack(unsigned long ptr);
+static void veth_timed_reset(unsigned long ptr);
 
 /*
  * Utility functions
  */
 
-#define veth_printk(prio, fmt, args...) \
-        printk(prio "%s: " fmt, __FILE__, ## args)
+#define veth_info(fmt, args...) \
+        printk(KERN_INFO DRV_NAME ": " fmt, ## args)
 
 #define veth_error(fmt, args...) \
-        printk(KERN_ERR "(%s:%3.3d) ERROR: " fmt, __FILE__, __LINE__ , ## args)
+        printk(KERN_ERR DRV_NAME ": Error: " fmt, ## args)
+
+#ifdef DEBUG
+#define veth_debug(fmt, args...) \
+        printk(KERN_DEBUG DRV_NAME ": " fmt, ## args)
+#else
+#define veth_debug(fmt, args...) do {} while (0)
+#endif
 
+/* You must hold the connection's lock when you call this function. */
 static inline void veth_stack_push(struct veth_lpar_connection *cnx,
                                    struct veth_msg *msg)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&cnx->msg_stack_lock, flags);
         msg->next = cnx->msg_stack_head;
         cnx->msg_stack_head = msg;
-        spin_unlock_irqrestore(&cnx->msg_stack_lock, flags);
 }
 
+/* You must hold the connection's lock when you call this function. */
 static inline struct veth_msg *veth_stack_pop(struct veth_lpar_connection *cnx)
 {
-        unsigned long flags;
         struct veth_msg *msg;
 
-        spin_lock_irqsave(&cnx->msg_stack_lock, flags);
         msg = cnx->msg_stack_head;
         if (msg)
                 cnx->msg_stack_head = cnx->msg_stack_head->next;
-        spin_unlock_irqrestore(&cnx->msg_stack_lock, flags);
+
         return msg;
 }
 
+/* You must hold the connection's lock when you call this function. */
+static inline int veth_stack_is_empty(struct veth_lpar_connection *cnx)
+{
+        return cnx->msg_stack_head == NULL;
+}
+
 static inline HvLpEvent_Rc
 veth_signalevent(struct veth_lpar_connection *cnx, u16 subtype,
                  HvLpEvent_AckInd ackind, HvLpEvent_AckType acktype,
@@ -249,7 +312,7 @@ static int veth_allocate_events(HvLpIndex rlp, int number)
         struct veth_allocation vc = { COMPLETION_INITIALIZER(vc.c), 0 };
 
         mf_allocate_lp_events(rlp, HvLpEvent_Type_VirtualLan,
-                            sizeof(struct VethLpEvent), number,
+                            sizeof(struct veth_lpevent), number,
                             &veth_complete_allocation, &vc);
         wait_for_completion(&vc.c);
 
@@ -257,6 +320,137 @@ static int veth_allocate_events(HvLpIndex rlp, int number)
 }
 
 /*
+ * sysfs support
+ */
+
+struct veth_cnx_attribute {
+        struct attribute attr;
+        ssize_t (*show)(struct veth_lpar_connection *, char *buf);
+        ssize_t (*store)(struct veth_lpar_connection *, const char *buf);
+};
+
+static ssize_t veth_cnx_attribute_show(struct kobject *kobj,
+                struct attribute *attr, char *buf)
+{
+        struct veth_cnx_attribute *cnx_attr;
+        struct veth_lpar_connection *cnx;
+
+        cnx_attr = container_of(attr, struct veth_cnx_attribute, attr);
+        cnx = container_of(kobj, struct veth_lpar_connection, kobject);
+
+        if (!cnx_attr->show)
+                return -EIO;
+
+        return cnx_attr->show(cnx, buf);
+}
+
+#define CUSTOM_CNX_ATTR(_name, _format, _expression)                    \
+static ssize_t _name##_show(struct veth_lpar_connection *cnx, char *buf)\
+{                                                                       \
+        return sprintf(buf, _format, _expression);                      \
+}                                                                       \
+struct veth_cnx_attribute veth_cnx_attr_##_name = __ATTR_RO(_name)
+
+#define SIMPLE_CNX_ATTR(_name)  \
+        CUSTOM_CNX_ATTR(_name, "%lu\n", (unsigned long)cnx->_name)
+
+SIMPLE_CNX_ATTR(outstanding_tx);
+SIMPLE_CNX_ATTR(remote_lp);
+SIMPLE_CNX_ATTR(num_events);
+SIMPLE_CNX_ATTR(src_inst);
+SIMPLE_CNX_ATTR(dst_inst);
+SIMPLE_CNX_ATTR(num_pending_acks);
+SIMPLE_CNX_ATTR(num_ack_events);
+CUSTOM_CNX_ATTR(ack_timeout, "%d\n", jiffies_to_msecs(cnx->ack_timeout));
+CUSTOM_CNX_ATTR(reset_timeout, "%d\n", jiffies_to_msecs(cnx->reset_timeout));
+CUSTOM_CNX_ATTR(state, "0x%.4lX\n", cnx->state);
+CUSTOM_CNX_ATTR(last_contact, "%d\n", cnx->last_contact ?
+                jiffies_to_msecs(jiffies - cnx->last_contact) : 0);
+
+#define GET_CNX_ATTR(_name)     (&veth_cnx_attr_##_name.attr)
+
+static struct attribute *veth_cnx_default_attrs[] = {
+        GET_CNX_ATTR(outstanding_tx),
+        GET_CNX_ATTR(remote_lp),
+        GET_CNX_ATTR(num_events),
+        GET_CNX_ATTR(reset_timeout),
+        GET_CNX_ATTR(last_contact),
+        GET_CNX_ATTR(state),
+        GET_CNX_ATTR(src_inst),
+        GET_CNX_ATTR(dst_inst),
+        GET_CNX_ATTR(num_pending_acks),
+        GET_CNX_ATTR(num_ack_events),
+        GET_CNX_ATTR(ack_timeout),
+        NULL
+};
+
+static struct sysfs_ops veth_cnx_sysfs_ops = {
+                .show = veth_cnx_attribute_show
+};
+
+static struct kobj_type veth_lpar_connection_ktype = {
+        .release        = veth_release_connection,
+        .sysfs_ops      = &veth_cnx_sysfs_ops,
+        .default_attrs  = veth_cnx_default_attrs
+};
+
+struct veth_port_attribute {
+        struct attribute attr;
+        ssize_t (*show)(struct veth_port *, char *buf);
+        ssize_t (*store)(struct veth_port *, const char *buf);
+};
+
+static ssize_t veth_port_attribute_show(struct kobject *kobj,
+                struct attribute *attr, char *buf)
+{
+        struct veth_port_attribute *port_attr;
+        struct veth_port *port;
+
+        port_attr = container_of(attr, struct veth_port_attribute, attr);
+        port = container_of(kobj, struct veth_port, kobject);
+
+        if (!port_attr->show)
+                return -EIO;
+
+        return port_attr->show(port, buf);
+}
+
+#define CUSTOM_PORT_ATTR(_name, _format, _expression)                   \
+static ssize_t _name##_show(struct veth_port *port, char *buf)          \
+{                                                                       \
+        return sprintf(buf, _format, _expression);                      \
+}                                                                       \
+struct veth_port_attribute veth_port_attr_##_name = __ATTR_RO(_name)
+
+#define SIMPLE_PORT_ATTR(_name) \
+        CUSTOM_PORT_ATTR(_name, "%lu\n", (unsigned long)port->_name)
+
+SIMPLE_PORT_ATTR(promiscuous);
+SIMPLE_PORT_ATTR(num_mcast);
+CUSTOM_PORT_ATTR(lpar_map, "0x%X\n", port->lpar_map);
+CUSTOM_PORT_ATTR(stopped_map, "0x%X\n", port->stopped_map);
+CUSTOM_PORT_ATTR(mac_addr, "0x%lX\n", port->mac_addr);
+
+#define GET_PORT_ATTR(_name)    (&veth_port_attr_##_name.attr)
+static struct attribute *veth_port_default_attrs[] = {
+        GET_PORT_ATTR(mac_addr),
+        GET_PORT_ATTR(lpar_map),
+        GET_PORT_ATTR(stopped_map),
+        GET_PORT_ATTR(promiscuous),
+        GET_PORT_ATTR(num_mcast),
+        NULL
+};
+
+static struct sysfs_ops veth_port_sysfs_ops = {
+        .show = veth_port_attribute_show
+};
+
+static struct kobj_type veth_port_ktype = {
+        .sysfs_ops      = &veth_port_sysfs_ops,
+        .default_attrs  = veth_port_default_attrs
+};
+
+/*
  * LPAR connection code
  */
 
@@ -266,7 +460,7 @@ static inline void veth_kick_statemachine(struct veth_lpar_connection *cnx)
 }
 
 static void veth_take_cap(struct veth_lpar_connection *cnx,
-                          struct VethLpEvent *event)
+                          struct veth_lpevent *event)
 {
         unsigned long flags;
 
@@ -278,7 +472,7 @@ static void veth_take_cap(struct veth_lpar_connection *cnx,
                                                   HvLpEvent_Type_VirtualLan);
 
         if (cnx->state & VETH_STATE_GOTCAPS) {
-                veth_error("Received a second capabilities from lpar %d\n",
+                veth_error("Received a second capabilities from LPAR %d.\n",
                            cnx->remote_lp);
                 event->base_event.xRc = HvLpEvent_Rc_BufferNotAvailable;
                 HvCallEvent_ackLpEvent((struct HvLpEvent *) event);
@@ -291,13 +485,13 @@ static void veth_take_cap(struct veth_lpar_connection *cnx,
 }
 
 static void veth_take_cap_ack(struct veth_lpar_connection *cnx,
-                              struct VethLpEvent *event)
+                              struct veth_lpevent *event)
 {
         unsigned long flags;
 
         spin_lock_irqsave(&cnx->lock, flags);
         if (cnx->state & VETH_STATE_GOTCAPACK) {
-                veth_error("Received a second capabilities ack from lpar %d\n",
+                veth_error("Received a second capabilities ack from LPAR %d.\n",
                            cnx->remote_lp);
         } else {
                 memcpy(&cnx->cap_ack_event, event,
@@ -309,19 +503,24 @@ static void veth_take_cap_ack(struct veth_lpar_connection *cnx,
 }
 
 static void veth_take_monitor_ack(struct veth_lpar_connection *cnx,
-                                  struct VethLpEvent *event)
+                                  struct veth_lpevent *event)
 {
         unsigned long flags;
 
         spin_lock_irqsave(&cnx->lock, flags);
-        veth_printk(KERN_DEBUG, "Monitor ack returned for lpar %d\n",
-                    cnx->remote_lp);
-        cnx->state |= VETH_STATE_RESET;
-        veth_kick_statemachine(cnx);
+        veth_debug("cnx %d: lost connection.\n", cnx->remote_lp);
+
+        /* Avoid kicking the statemachine once we're shutdown.
+         * It's unnecessary and it could break veth_stop_connection(). */
+
+        if (! (cnx->state & VETH_STATE_SHUTDOWN)) {
+                cnx->state |= VETH_STATE_RESET;
+                veth_kick_statemachine(cnx);
+        }
         spin_unlock_irqrestore(&cnx->lock, flags);
 }
 
-static void veth_handle_ack(struct VethLpEvent *event)
+static void veth_handle_ack(struct veth_lpevent *event)
 {
         HvLpIndex rlp = event->base_event.xTargetLp;
         struct veth_lpar_connection *cnx = veth_cnx[rlp];
@@ -329,58 +528,67 @@ static void veth_handle_ack(struct VethLpEvent *event)
         BUG_ON(! cnx);
 
         switch (event->base_event.xSubtype) {
-        case VethEventTypeCap:
+        case VETH_EVENT_CAP:
                 veth_take_cap_ack(cnx, event);
                 break;
-        case VethEventTypeMonitor:
+        case VETH_EVENT_MONITOR:
                 veth_take_monitor_ack(cnx, event);
                 break;
         default:
-                veth_error("Unknown ack type %d from lpar %d\n",
-                           event->base_event.xSubtype, rlp);
+                veth_error("Unknown ack type %d from LPAR %d.\n",
+                                event->base_event.xSubtype, rlp);
         };
 }
 
-static void veth_handle_int(struct VethLpEvent *event)
+static void veth_handle_int(struct veth_lpevent *event)
 {
         HvLpIndex rlp = event->base_event.xSourceLp;
         struct veth_lpar_connection *cnx = veth_cnx[rlp];
         unsigned long flags;
-        int i;
+        int i, acked = 0;
 
         BUG_ON(! cnx);
 
         switch (event->base_event.xSubtype) {
-        case VethEventTypeCap:
+        case VETH_EVENT_CAP:
                 veth_take_cap(cnx, event);
                 break;
-        case VethEventTypeMonitor:
+        case VETH_EVENT_MONITOR:
                 /* do nothing... this'll hang out here til we're dead,
                  * and the hypervisor will return it for us. */
                 break;
-        case VethEventTypeFramesAck:
+        case VETH_EVENT_FRAMES_ACK:
                 spin_lock_irqsave(&cnx->lock, flags);
+
                 for (i = 0; i < VETH_MAX_ACKS_PER_MSG; ++i) {
                         u16 msgnum = event->u.frames_ack_data.token[i];
 
-                        if (msgnum < VETH_NUMBUFFERS)
+                        if (msgnum < VETH_NUMBUFFERS) {
                                 veth_recycle_msg(cnx, cnx->msgs + msgnum);
+                                cnx->outstanding_tx--;
+                                acked++;
+                        }
+                }
+
+                if (acked > 0) {
+                        cnx->last_contact = jiffies;
+                        veth_wake_queues(cnx);
                 }
+
                 spin_unlock_irqrestore(&cnx->lock, flags);
-                veth_flush_pending(cnx);
                 break;
-        case VethEventTypeFrames:
+        case VETH_EVENT_FRAMES:
                 veth_receive(cnx, event);
                 break;
         default:
-                veth_error("Unknown interrupt type %d from lpar %d\n",
-                           event->base_event.xSubtype, rlp);
+                veth_error("Unknown interrupt type %d from LPAR %d.\n",
+                                event->base_event.xSubtype, rlp);
         };
 }
 
 static void veth_handle_event(struct HvLpEvent *event, struct pt_regs *regs)
 {
-        struct VethLpEvent *veth_event = (struct VethLpEvent *)event;
+        struct veth_lpevent *veth_event = (struct veth_lpevent *)event;
 
         if (event->xFlags.xFunction == HvLpEvent_Function_Ack)
                 veth_handle_ack(veth_event);
@@ -390,7 +598,7 @@ static void veth_handle_event(struct HvLpEvent *event, struct pt_regs *regs)
 
 static int veth_process_caps(struct veth_lpar_connection *cnx)
 {
-        struct VethCapData *remote_caps = &cnx->remote_caps;
+        struct veth_cap_data *remote_caps = &cnx->remote_caps;
         int num_acks_needed;
 
         /* Convert timer to jiffies */
@@ -400,8 +608,8 @@ static int veth_process_caps(struct veth_lpar_connection *cnx)
              || (remote_caps->ack_threshold > VETH_MAX_ACKS_PER_MSG)
              || (remote_caps->ack_threshold == 0)
              || (cnx->ack_timeout == 0) ) {
-                veth_error("Received incompatible capabilities from lpar %d\n",
-                           cnx->remote_lp);
+                veth_error("Received incompatible capabilities from LPAR %d.\n",
+                                cnx->remote_lp);
                 return HvLpEvent_Rc_InvalidSubtypeData;
         }
 
@@ -418,8 +626,8 @@ static int veth_process_caps(struct veth_lpar_connection *cnx)
                         cnx->num_ack_events += num;
 
                 if (cnx->num_ack_events < num_acks_needed) {
-                        veth_error("Couldn't allocate enough ack events for lpar %d\n",
-                                   cnx->remote_lp);
+                        veth_error("Couldn't allocate enough ack events "
+                                        "for LPAR %d.\n", cnx->remote_lp);
 
                         return HvLpEvent_Rc_BufferNotAvailable;
                 }
@@ -440,15 +648,15 @@ static void veth_statemachine(void *p)
 
  restart:
         if (cnx->state & VETH_STATE_RESET) {
-                int i;
-
-                del_timer(&cnx->ack_timer);
-
                 if (cnx->state & VETH_STATE_OPEN)
                         HvCallEvent_closeLpEventPath(cnx->remote_lp,
                                                      HvLpEvent_Type_VirtualLan);
 
-                /* reset ack data */
+                /*
+                 * Reset ack data. This prevents the ack_timer actually
+                 * doing anything, even if it runs one more time when
+                 * we drop the lock below.
+                 */
                 memset(&cnx->pending_acks, 0xff, sizeof (cnx->pending_acks));
                 cnx->num_pending_acks = 0;
 
@@ -458,14 +666,32 @@ static void veth_statemachine(void *p)
                                 | VETH_STATE_SENTCAPACK | VETH_STATE_READY);
 
                 /* Clean up any leftover messages */
-                if (cnx->msgs)
+                if (cnx->msgs) {
+                        int i;
                         for (i = 0; i < VETH_NUMBUFFERS; ++i)
                                 veth_recycle_msg(cnx, cnx->msgs + i);
+                }
+
+                cnx->outstanding_tx = 0;
+                veth_wake_queues(cnx);
+
+                /* Drop the lock so we can do stuff that might sleep or
+                 * take other locks. */
                 spin_unlock_irq(&cnx->lock);
-                veth_flush_pending(cnx);
+
+                del_timer_sync(&cnx->ack_timer);
+                del_timer_sync(&cnx->reset_timer);
+
                 spin_lock_irq(&cnx->lock);
+
                 if (cnx->state & VETH_STATE_RESET)
                         goto restart;
+
+                /* Hack, wait for the other end to reset itself. */
+                if (! (cnx->state & VETH_STATE_SHUTDOWN)) {
+                        schedule_delayed_work(&cnx->statemachine_wq, 5 * HZ);
+                        goto out;
+                }
         }
 
         if (cnx->state & VETH_STATE_SHUTDOWN)
@@ -488,7 +714,7 @@ static void veth_statemachine(void *p)
 
         if ( (cnx->state & VETH_STATE_OPEN)
              && !(cnx->state & VETH_STATE_SENTMON) ) {
-                rc = veth_signalevent(cnx, VethEventTypeMonitor,
+                rc = veth_signalevent(cnx, VETH_EVENT_MONITOR,
                                       HvLpEvent_AckInd_DoAck,
                                       HvLpEvent_AckType_DeferredAck,
                                       0, 0, 0, 0, 0, 0);
@@ -498,9 +724,8 @@ static void veth_statemachine(void *p)
                 } else {
                         if ( (rc != HvLpEvent_Rc_PartitionDead)
                              && (rc != HvLpEvent_Rc_PathClosed) )
-                                veth_error("Error sending monitor to "
-                                           "lpar %d, rc=%x\n",
-                                           rlp, (int) rc);
+                                veth_error("Error sending monitor to LPAR %d, "
+                                                "rc = %d\n", rlp, rc);
 
                         /* Oh well, hope we get a cap from the other
                          * end and do better when that kicks us */
@@ -512,7 +737,7 @@ static void veth_statemachine(void *p)
              && !(cnx->state & VETH_STATE_SENTCAPS)) {
                 u64 *rawcap = (u64 *)&cnx->local_caps;
 
-                rc = veth_signalevent(cnx, VethEventTypeCap,
+                rc = veth_signalevent(cnx, VETH_EVENT_CAP,
                                       HvLpEvent_AckInd_DoAck,
                                       HvLpEvent_AckType_ImmediateAck,
                                       0, rawcap[0], rawcap[1], rawcap[2],
@@ -523,9 +748,9 @@ static void veth_statemachine(void *p)
                 } else {
                         if ( (rc != HvLpEvent_Rc_PartitionDead)
                              && (rc != HvLpEvent_Rc_PathClosed) )
-                                veth_error("Error sending caps to "
-                                           "lpar %d, rc=%x\n",
-                                           rlp, (int) rc);
+                                veth_error("Error sending caps to LPAR %d, "
+                                                "rc = %d\n", rlp, rc);
+
                         /* Oh well, hope we get a cap from the other
                          * end and do better when that kicks us */
                         goto out;
@@ -534,7 +759,7 @@ static void veth_statemachine(void *p)
 
         if ((cnx->state & VETH_STATE_GOTCAPS)
             && !(cnx->state & VETH_STATE_SENTCAPACK)) {
-                struct VethCapData *remote_caps = &cnx->remote_caps;
+                struct veth_cap_data *remote_caps = &cnx->remote_caps;
 
                 memcpy(remote_caps, &cnx->cap_event.u.caps_data,
                        sizeof(*remote_caps));
@@ -565,10 +790,8 @@ static void veth_statemachine(void *p)
                         add_timer(&cnx->ack_timer);
                         cnx->state |= VETH_STATE_READY;
                 } else {
-                        veth_printk(KERN_ERR, "Caps rejected (rc=%d) by "
-                                    "lpar %d\n",
-                                    cnx->cap_ack_event.base_event.xRc,
-                                    rlp);
+                        veth_error("Caps rejected by LPAR %d, rc = %d\n",
+                                        rlp, cnx->cap_ack_event.base_event.xRc);
                         goto cant_cope;
                 }
         }
@@ -581,8 +804,8 @@ static void veth_statemachine(void *p)
         /* FIXME: we get here if something happens we really can't
          * cope with.  The link will never work once we get here, and
          * all we can do is not lock the rest of the system up */
-        veth_error("Badness on connection to lpar %d (state=%04lx) "
-                   " - shutting down\n", rlp, cnx->state);
+        veth_error("Unrecoverable error on connection to LPAR %d, shutting down"
+                        " (state = 0x%04lx)\n", rlp, cnx->state);
         cnx->state |= VETH_STATE_SHUTDOWN;
         spin_unlock_irq(&cnx->lock);
 }
@@ -591,7 +814,7 @@ static int veth_init_connection(u8 rlp)
 {
         struct veth_lpar_connection *cnx;
         struct veth_msg *msgs;
-        int i;
+        int i, rc;
 
         if ( (rlp == this_lp)
              || ! HvLpConfig_doLpsCommunicateOnVirtualLan(this_lp, rlp) )
@@ -605,22 +828,36 @@ static int veth_init_connection(u8 rlp)
         cnx->remote_lp = rlp;
         spin_lock_init(&cnx->lock);
         INIT_WORK(&cnx->statemachine_wq, veth_statemachine, cnx);
+
         init_timer(&cnx->ack_timer);
         cnx->ack_timer.function = veth_timed_ack;
         cnx->ack_timer.data = (unsigned long) cnx;
+
+        init_timer(&cnx->reset_timer);
+        cnx->reset_timer.function = veth_timed_reset;
+        cnx->reset_timer.data = (unsigned long) cnx;
+        cnx->reset_timeout = 5 * HZ * (VETH_ACKTIMEOUT / 1000000);
+
         memset(&cnx->pending_acks, 0xff, sizeof (cnx->pending_acks));
 
         veth_cnx[rlp] = cnx;
 
+        /* This gets us 1 reference, which is held on behalf of the driver
+         * infrastructure. It's released at module unload. */
+        kobject_init(&cnx->kobject);
+        cnx->kobject.ktype = &veth_lpar_connection_ktype;
+        rc = kobject_set_name(&cnx->kobject, "cnx%.2d", rlp);
+        if (rc != 0)
+                return rc;
+
         msgs = kmalloc(VETH_NUMBUFFERS * sizeof(struct veth_msg), GFP_KERNEL);
         if (! msgs) {
-                veth_error("Can't allocate buffers for lpar %d\n", rlp);
+                veth_error("Can't allocate buffers for LPAR %d.\n", rlp);
                 return -ENOMEM;
         }
 
         cnx->msgs = msgs;
         memset(msgs, 0, VETH_NUMBUFFERS * sizeof(struct veth_msg));
-        spin_lock_init(&cnx->msg_stack_lock);
 
         for (i = 0; i < VETH_NUMBUFFERS; i++) {
                 msgs[i].token = i;
@@ -630,8 +867,7 @@ static int veth_init_connection(u8 rlp)
         cnx->num_events = veth_allocate_events(rlp, 2 + VETH_NUMBUFFERS);
 
         if (cnx->num_events < (2 + VETH_NUMBUFFERS)) {
-                veth_error("Can't allocate events for lpar %d, only got %d\n",
-                           rlp, cnx->num_events);
+                veth_error("Can't allocate enough events for LPAR %d.\n", rlp);
                 return -ENOMEM;
         }
 
@@ -642,11 +878,9 @@ static int veth_init_connection(u8 rlp)
         return 0;
 }
 
-static void veth_stop_connection(u8 rlp)
+static void veth_stop_connection(struct veth_lpar_connection *cnx)
 {
-        struct veth_lpar_connection *cnx = veth_cnx[rlp];
-
-        if (! cnx)
+        if (!cnx)
                 return;
 
         spin_lock_irq(&cnx->lock);
@@ -654,12 +888,23 @@ static void veth_stop_connection(u8 rlp)
         veth_kick_statemachine(cnx);
         spin_unlock_irq(&cnx->lock);
 
+        /* There's a slim chance the reset code has just queued the
+         * statemachine to run in five seconds. If so we need to cancel
+         * that and requeue the work to run now. */
+        if (cancel_delayed_work(&cnx->statemachine_wq)) {
+                spin_lock_irq(&cnx->lock);
+                veth_kick_statemachine(cnx);
+                spin_unlock_irq(&cnx->lock);
+        }
+
+        /* Wait for the state machine to run. */
         flush_scheduled_work();
+}
 
-        /* FIXME: not sure if this is necessary - will already have
-         * been deleted by the state machine, just want to make sure
-         * its not running any more */
-        del_timer_sync(&cnx->ack_timer);
+static void veth_destroy_connection(struct veth_lpar_connection *cnx)
+{
+        if (!cnx)
+                return;
 
         if (cnx->num_events > 0)
                 mf_deallocate_lp_events(cnx->remote_lp,
@@ -671,18 +916,18 @@ static void veth_stop_connection(u8 rlp)
                                       HvLpEvent_Type_VirtualLan,
                                       cnx->num_ack_events,
                                       NULL, NULL);
-}
-
-static void veth_destroy_connection(u8 rlp)
-{
-        struct veth_lpar_connection *cnx = veth_cnx[rlp];
-
-        if (! cnx)
-                return;
 
         kfree(cnx->msgs);
+        veth_cnx[cnx->remote_lp] = NULL;
         kfree(cnx);
-        veth_cnx[rlp] = NULL;
+}
+
+static void veth_release_connection(struct kobject *kobj)
+{
+        struct veth_lpar_connection *cnx;
+        cnx = container_of(kobj, struct veth_lpar_connection, kobject);
+        veth_stop_connection(cnx);
+        veth_destroy_connection(cnx);
 }
 
 /*
@@ -726,17 +971,15 @@ static void veth_set_multicast_list(struct net_device *dev)
 
         write_lock_irqsave(&port->mcast_gate, flags);
 
-        if (dev->flags & IFF_PROMISC) { /* set promiscuous mode */
-                printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
-                       dev->name);
+        if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI) ||
+                        (dev->mc_count > VETH_MAX_MCAST)) {
                 port->promiscuous = 1;
-        } else if ( (dev->flags & IFF_ALLMULTI)
-                    || (dev->mc_count > VETH_MAX_MCAST) ) {
-                port->all_mcast = 1;
         } else {
                 struct dev_mc_list *dmi = dev->mc_list;
                 int i;
 
+                port->promiscuous = 0;
+
                 /* Update table */
                 port->num_mcast = 0;
 
@@ -758,9 +1001,10 @@ static void veth_set_multicast_list(struct net_device *dev)
 
 static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        strncpy(info->driver, "veth", sizeof(info->driver) - 1);
+        strncpy(info->driver, DRV_NAME, sizeof(info->driver) - 1);
         info->driver[sizeof(info->driver) - 1] = '\0';
-        strncpy(info->version, "1.0", sizeof(info->version) - 1);
+        strncpy(info->version, DRV_VERSION, sizeof(info->version) - 1);
+        info->version[sizeof(info->version) - 1] = '\0';
 }
 
 static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
@@ -791,49 +1035,6 @@ static struct ethtool_ops ops = {
         .get_link = veth_get_link,
 };
 
-static void veth_tx_timeout(struct net_device *dev)
-{
-        struct veth_port *port = (struct veth_port *)dev->priv;
-        struct net_device_stats *stats = &port->stats;
-        unsigned long flags;
-        int i;
-
-        stats->tx_errors++;
-
-        spin_lock_irqsave(&port->pending_gate, flags);
-
-        if (!port->pending_lpmask) {
-                spin_unlock_irqrestore(&port->pending_gate, flags);
-                return;
-        }
-
-        printk(KERN_WARNING "%s: Tx timeout!  Resetting lp connections: %08x\n",
-               dev->name, port->pending_lpmask);
-
-        for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
-                struct veth_lpar_connection *cnx = veth_cnx[i];
-
-                if (! (port->pending_lpmask & (1<<i)))
-                        continue;
-
-                /* If we're pending on it, we must be connected to it,
-                 * so we should certainly have a structure for it. */
-                BUG_ON(! cnx);
-
-                /* Theoretically we could be kicking a connection
-                 * which doesn't deserve it, but in practice if we've
-                 * had a Tx timeout, the pending_lpmask will have
-                 * exactly one bit set - the connection causing the
-                 * problem. */
-                spin_lock(&cnx->lock);
-                cnx->state |= VETH_STATE_RESET;
-                veth_kick_statemachine(cnx);
-                spin_unlock(&cnx->lock);
-        }
-
-        spin_unlock_irqrestore(&port->pending_gate, flags);
-}
-
 static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)
 {
         struct net_device *dev;
@@ -848,8 +1049,9 @@ static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)
 
         port = (struct veth_port *) dev->priv;
 
-        spin_lock_init(&port->pending_gate);
+        spin_lock_init(&port->queue_lock);
         rwlock_init(&port->mcast_gate);
+        port->stopped_map = 0;
 
         for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
                 HvLpVirtualLanIndexMap map;
@@ -882,22 +1084,24 @@ static struct net_device * __init veth_probe_one(int vlan, struct device *vdev)
         dev->set_multicast_list = veth_set_multicast_list;
         SET_ETHTOOL_OPS(dev, &ops);
 
-        dev->watchdog_timeo = 2 * (VETH_ACKTIMEOUT * HZ / 1000000);
-        dev->tx_timeout = veth_tx_timeout;
-
         SET_NETDEV_DEV(dev, vdev);
 
         rc = register_netdev(dev);
         if (rc != 0) {
-                veth_printk(KERN_ERR,
-                            "Failed to register ethernet device for vlan %d\n",
-                            vlan);
+                veth_error("Failed registering net device for vlan%d.\n", vlan);
                 free_netdev(dev);
                 return NULL;
         }
 
-        veth_printk(KERN_DEBUG, "%s attached to iSeries vlan %d (lpar_map=0x%04x)\n",
-                    dev->name, vlan, port->lpar_map);
+        kobject_init(&port->kobject);
+        port->kobject.parent = &dev->class_dev.kobj;
+        port->kobject.ktype  = &veth_port_ktype;
+        kobject_set_name(&port->kobject, "veth_port");
+        if (0 != kobject_add(&port->kobject))
+                veth_error("Failed adding port for %s to sysfs.\n", dev->name);
+
+        veth_info("%s attached to iSeries vlan %d (LPAR map = 0x%.4X)\n",
+                        dev->name, vlan, port->lpar_map);
 
         return dev;
 }
@@ -912,98 +1116,95 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
         struct veth_lpar_connection *cnx = veth_cnx[rlp];
         struct veth_port *port = (struct veth_port *) dev->priv;
         HvLpEvent_Rc rc;
-        u32 dma_address, dma_length;
         struct veth_msg *msg = NULL;
-        int err = 0;
         unsigned long flags;
 
-        if (! cnx) {
-                port->stats.tx_errors++;
-                dev_kfree_skb(skb);
+        if (! cnx)
                 return 0;
-        }
 
         spin_lock_irqsave(&cnx->lock, flags);
 
         if (! (cnx->state & VETH_STATE_READY))
-                goto drop;
+                goto no_error;
 
-        if ((skb->len - 14) > VETH_MAX_MTU)
+        if ((skb->len - ETH_HLEN) > VETH_MAX_MTU)
                 goto drop;
 
         msg = veth_stack_pop(cnx);
-
-        if (! msg) {
-                err = 1;
+        if (! msg)
                 goto drop;
-        }
 
-        dma_length = skb->len;
-        dma_address = dma_map_single(port->dev, skb->data,
-                                     dma_length, DMA_TO_DEVICE);
+        msg->in_use = 1;
+        msg->skb = skb_get(skb);
+
+        msg->data.addr[0] = dma_map_single(port->dev, skb->data,
+                                skb->len, DMA_TO_DEVICE);
 
-        if (dma_mapping_error(dma_address))
+        if (dma_mapping_error(msg->data.addr[0]))
                 goto recycle_and_drop;
 
-        /* Is it really necessary to check the length and address
-         * fields of the first entry here? */
-        msg->skb = skb;
         msg->dev = port->dev;
-        msg->data.addr[0] = dma_address;
-        msg->data.len[0] = dma_length;
+        msg->data.len[0] = skb->len;
         msg->data.eofmask = 1 << VETH_EOF_SHIFT;
-        set_bit(0, &(msg->in_use));
-        rc = veth_signaldata(cnx, VethEventTypeFrames, msg->token, &msg->data);
+
+        rc = veth_signaldata(cnx, VETH_EVENT_FRAMES, msg->token, &msg->data);
 
         if (rc != HvLpEvent_Rc_Good)
                 goto recycle_and_drop;
 
+        /* If the timer's not already running, start it now. */
+        if (0 == cnx->outstanding_tx)
+                mod_timer(&cnx->reset_timer, jiffies + cnx->reset_timeout);
+
+        cnx->last_contact = jiffies;
+        cnx->outstanding_tx++;
+
+        if (veth_stack_is_empty(cnx))
+                veth_stop_queues(cnx);
+
+ no_error:
         spin_unlock_irqrestore(&cnx->lock, flags);
         return 0;
 
  recycle_and_drop:
-        msg->skb = NULL;
-        /* need to set in use to make veth_recycle_msg in case this
-         * was a mapping failure */
-        set_bit(0, &msg->in_use);
         veth_recycle_msg(cnx, msg);
  drop:
-        port->stats.tx_errors++;
-        dev_kfree_skb(skb);
         spin_unlock_irqrestore(&cnx->lock, flags);
-        return err;
+        return 1;
 }
 
-static HvLpIndexMap veth_transmit_to_many(struct sk_buff *skb,
+static void veth_transmit_to_many(struct sk_buff *skb,
                                           HvLpIndexMap lpmask,
                                           struct net_device *dev)
 {
         struct veth_port *port = (struct veth_port *) dev->priv;
-        int i;
-        int rc;
+        int i, success, error;
+
+        success = error = 0;
 
         for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
                 if ((lpmask & (1 << i)) == 0)
                         continue;
 
-                rc = veth_transmit_to_one(skb_get(skb), i, dev);
-                if (! rc)
-                        lpmask &= ~(1<<i);
+                if (veth_transmit_to_one(skb, i, dev))
+                        error = 1;
+                else
+                        success = 1;
         }
 
-        if (! lpmask) {
+        if (error)
+                port->stats.tx_errors++;
+
+        if (success) {
                 port->stats.tx_packets++;
                 port->stats.tx_bytes += skb->len;
         }
-
-        return lpmask;
 }
 
 static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         unsigned char *frame = skb->data;
         struct veth_port *port = (struct veth_port *) dev->priv;
-        unsigned long flags;
         HvLpIndexMap lpmask;
 
         if (! (frame[0] & 0x01)) {
@@ -1020,44 +1221,27 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 lpmask = port->lpar_map;
         }
 
-        spin_lock_irqsave(&port->pending_gate, flags);
-
-        lpmask = veth_transmit_to_many(skb, lpmask, dev);
-
-        dev->trans_start = jiffies;
+        veth_transmit_to_many(skb, lpmask, dev);
 
-        if (! lpmask) {
-                dev_kfree_skb(skb);
-        } else {
-                if (port->pending_skb) {
-                        veth_error("%s: Tx while skb was pending!\n",
-                                   dev->name);
-                        dev_kfree_skb(skb);
-                        spin_unlock_irqrestore(&port->pending_gate, flags);
-                        return 1;
-                }
-
-                port->pending_skb = skb;
-                port->pending_lpmask = lpmask;
-                netif_stop_queue(dev);
-        }
-
-        spin_unlock_irqrestore(&port->pending_gate, flags);
+        dev_kfree_skb(skb);
 
         return 0;
 }
 
+/* You must hold the connection's lock when you call this function. */
 static void veth_recycle_msg(struct veth_lpar_connection *cnx,
                              struct veth_msg *msg)
 {
         u32 dma_address, dma_length;
 
-        if (test_and_clear_bit(0, &msg->in_use)) {
+        if (msg->in_use) {
+                msg->in_use = 0;
                 dma_address = msg->data.addr[0];
                 dma_length = msg->data.len[0];
 
-                dma_unmap_single(msg->dev, dma_address, dma_length,
-                                 DMA_TO_DEVICE);
+                if (!dma_mapping_error(dma_address))
+                        dma_unmap_single(msg->dev, dma_address, dma_length,
+                                        DMA_TO_DEVICE);
 
                 if (msg->skb) {
                         dev_kfree_skb_any(msg->skb);
@@ -1066,15 +1250,16 @@ static void veth_recycle_msg(struct veth_lpar_connection *cnx,
 
                 memset(&msg->data, 0, sizeof(msg->data));
                 veth_stack_push(cnx, msg);
-        } else
-                if (cnx->state & VETH_STATE_OPEN)
-                        veth_error("Bogus frames ack from lpar %d (#%d)\n",
-                                   cnx->remote_lp, msg->token);
+        } else if (cnx->state & VETH_STATE_OPEN) {
+                veth_error("Non-pending frame (# %d) acked by LPAR %d.\n",
+                                cnx->remote_lp, msg->token);
+        }
 }
 
-static void veth_flush_pending(struct veth_lpar_connection *cnx)
+static void veth_wake_queues(struct veth_lpar_connection *cnx)
 {
         int i;
+
         for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
                 struct net_device *dev = veth_dev[i];
                 struct veth_port *port;
@@ -1088,20 +1273,77 @@ static void veth_flush_pending(struct veth_lpar_connection *cnx)
                 if (! (port->lpar_map & (1<<cnx->remote_lp)))
                         continue;
 
-                spin_lock_irqsave(&port->pending_gate, flags);
-                if (port->pending_skb) {
-                        port->pending_lpmask =
-                                veth_transmit_to_many(port->pending_skb,
-                                                      port->pending_lpmask,
-                                                      dev);
-                        if (! port->pending_lpmask) {
-                                dev_kfree_skb_any(port->pending_skb);
-                                port->pending_skb = NULL;
-                                netif_wake_queue(dev);
-                        }
+                spin_lock_irqsave(&port->queue_lock, flags);
+
+                port->stopped_map &= ~(1 << cnx->remote_lp);
+
+                if (0 == port->stopped_map && netif_queue_stopped(dev)) {
+                        veth_debug("cnx %d: woke queue for %s.\n",
+                                        cnx->remote_lp, dev->name);
+                        netif_wake_queue(dev);
+                }
+                spin_unlock_irqrestore(&port->queue_lock, flags);
+        }
+}
+
+static void veth_stop_queues(struct veth_lpar_connection *cnx)
+{
+        int i;
+
+        for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
+                struct net_device *dev = veth_dev[i];
+                struct veth_port *port;
+
+                if (! dev)
+                        continue;
+
+                port = (struct veth_port *)dev->priv;
+
+                /* If this cnx is not on the vlan for this port, continue */
+                if (! (port->lpar_map & (1 << cnx->remote_lp)))
+                        continue;
+
+                spin_lock(&port->queue_lock);
+
+                netif_stop_queue(dev);
+                port->stopped_map |= (1 << cnx->remote_lp);
+
+                veth_debug("cnx %d: stopped queue for %s, map = 0x%x.\n",
+                                cnx->remote_lp, dev->name, port->stopped_map);
+
+                spin_unlock(&port->queue_lock);
+        }
+}
+
+static void veth_timed_reset(unsigned long ptr)
+{
+        struct veth_lpar_connection *cnx = (struct veth_lpar_connection *)ptr;
+        unsigned long trigger_time, flags;
+
+        /* FIXME is it possible this fires after veth_stop_connection()?
+         * That would reschedule the statemachine for 5 seconds and probably
+         * execute it after the module's been unloaded. Hmm. */
+
+        spin_lock_irqsave(&cnx->lock, flags);
+
+        if (cnx->outstanding_tx > 0) {
+                trigger_time = cnx->last_contact + cnx->reset_timeout;
+
+                if (trigger_time < jiffies) {
+                        cnx->state |= VETH_STATE_RESET;
+                        veth_kick_statemachine(cnx);
+                        veth_error("%d packets not acked by LPAR %d within %d "
+                                        "seconds, resetting.\n",
+                                        cnx->outstanding_tx, cnx->remote_lp,
+                                        cnx->reset_timeout / HZ);
+                } else {
+                        /* Reschedule the timer */
+                        trigger_time = jiffies + cnx->reset_timeout;
+                        mod_timer(&cnx->reset_timer, trigger_time);
                 }
-                spin_unlock_irqrestore(&port->pending_gate, flags);
         }
+
+        spin_unlock_irqrestore(&cnx->lock, flags);
 }
 
 /*
@@ -1117,12 +1359,9 @@ static inline int veth_frame_wanted(struct veth_port *port, u64 mac_addr)
         if ( (mac_addr == port->mac_addr) || (mac_addr == 0xffffffffffff0000) )
                 return 1;
 
-        if (! (((char *) &mac_addr)[0] & 0x01))
-                return 0;
-
         read_lock_irqsave(&port->mcast_gate, flags);
 
-        if (port->promiscuous || port->all_mcast) {
+        if (port->promiscuous) {
                 wanted = 1;
                 goto out;
         }
@@ -1175,21 +1414,21 @@ static void veth_flush_acks(struct veth_lpar_connection *cnx)
 {
         HvLpEvent_Rc rc;
 
-        rc = veth_signaldata(cnx, VethEventTypeFramesAck,
+        rc = veth_signaldata(cnx, VETH_EVENT_FRAMES_ACK,
                              0, &cnx->pending_acks);
 
         if (rc != HvLpEvent_Rc_Good)
-                veth_error("Error 0x%x acking frames from lpar %d!\n",
-                           (unsigned)rc, cnx->remote_lp);
+                veth_error("Failed acking frames from LPAR %d, rc = %d\n",
+                                cnx->remote_lp, (int)rc);
 
         cnx->num_pending_acks = 0;
         memset(&cnx->pending_acks, 0xff, sizeof(cnx->pending_acks));
 }
 
 static void veth_receive(struct veth_lpar_connection *cnx,
-                         struct VethLpEvent *event)
+                         struct veth_lpevent *event)
 {
-        struct VethFramesData *senddata = &event->u.frames_data;
+        struct veth_frames_data *senddata = &event->u.frames_data;
         int startchunk = 0;
         int nchunks;
         unsigned long flags;
@@ -1216,9 +1455,10 @@ static void veth_receive(struct veth_lpar_connection *cnx,
                 /* make sure that we have at least 1 EOF entry in the
                  * remaining entries */
                 if (! (senddata->eofmask >> (startchunk + VETH_EOF_SHIFT))) {
-                        veth_error("missing EOF frag in event "
-                                   "eofmask=0x%x startchunk=%d\n",
-                                   (unsigned) senddata->eofmask, startchunk);
+                        veth_error("Missing EOF fragment in event "
+                                        "eofmask = 0x%x startchunk = %d\n",
+                                        (unsigned)senddata->eofmask,
+                                        startchunk);
                         break;
                 }
 
@@ -1237,8 +1477,9 @@ static void veth_receive(struct veth_lpar_connection *cnx,
                 /* nchunks == # of chunks in this frame */
 
                 if ((length - ETH_HLEN) > VETH_MAX_MTU) {
-                        veth_error("Received oversize frame from lpar %d "
-                                   "(length=%d)\n", cnx->remote_lp, length);
+                        veth_error("Received oversize frame from LPAR %d "
+                                        "(length = %d)\n",
+                                        cnx->remote_lp, length);
                         continue;
                 }
 
@@ -1331,15 +1572,33 @@ static void veth_timed_ack(unsigned long ptr)
 
 static int veth_remove(struct vio_dev *vdev)
 {
-        int i = vdev->unit_address;
+        struct veth_lpar_connection *cnx;
         struct net_device *dev;
+        struct veth_port *port;
+        int i;
 
-        dev = veth_dev[i];
-        if (dev != NULL) {
-                veth_dev[i] = NULL;
-                unregister_netdev(dev);
-                free_netdev(dev);
+        dev = veth_dev[vdev->unit_address];
+
+        if (! dev)
+                return 0;
+
+        port = netdev_priv(dev);
+
+        for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
+                cnx = veth_cnx[i];
+
+                if (cnx && (port->lpar_map & (1 << i))) {
+                        /* Drop our reference to connections on our VLAN */
+                        kobject_put(&cnx->kobject);
+                }
         }
+
+        veth_dev[vdev->unit_address] = NULL;
+        kobject_del(&port->kobject);
+        kobject_put(&port->kobject);
+        unregister_netdev(dev);
+        free_netdev(dev);
+
         return 0;
 }
 
@@ -1347,6 +1606,7 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 {
         int i = vdev->unit_address;
         struct net_device *dev;
+        struct veth_port *port;
 
         dev = veth_probe_one(i, &vdev->dev);
         if (dev == NULL) {
@@ -1355,11 +1615,23 @@ static int veth_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         }
         veth_dev[i] = dev;
 
-        /* Start the state machine on each connection, to commence
-         * link negotiation */
-        for (i = 0; i < HVMAXARCHITECTEDLPS; i++)
-                if (veth_cnx[i])
-                        veth_kick_statemachine(veth_cnx[i]);
+        port = (struct veth_port*)netdev_priv(dev);
+
+        /* Start the state machine on each connection on this vlan. If we're
+         * the first dev to do so this will commence link negotiation */
+        for (i = 0; i < HVMAXARCHITECTEDLPS; i++) {
+                struct veth_lpar_connection *cnx;
+
+                if (! (port->lpar_map & (1 << i)))
+                        continue;
+
+                cnx = veth_cnx[i];
+                if (!cnx)
+                        continue;
+
+                kobject_get(&cnx->kobject);
+                veth_kick_statemachine(cnx);
+        }
 
         return 0;
 }
@@ -1375,7 +1647,7 @@ static struct vio_device_id veth_device_table[] __devinitdata = {
 MODULE_DEVICE_TABLE(vio, veth_device_table);
 
 static struct vio_driver veth_driver = {
-        .name = "iseries_veth",
+        .name = DRV_NAME,
         .id_table = veth_device_table,
         .probe = veth_probe,
         .remove = veth_remove
@@ -1388,29 +1660,29 @@ static struct vio_driver veth_driver = {
 void __exit veth_module_cleanup(void)
 {
         int i;
+        struct veth_lpar_connection *cnx;
 
-        /* Stop the queues first to stop any new packets being sent. */
-        for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++)
-                if (veth_dev[i])
-                        netif_stop_queue(veth_dev[i]);
-
-        /* Stop the connections before we unregister the driver. This
-         * ensures there's no skbs lying around holding the device open. */
-        for (i = 0; i < HVMAXARCHITECTEDLPS; ++i)
-                veth_stop_connection(i);
-
+        /* Disconnect our "irq" to stop events coming from the Hypervisor. */
         HvLpEvent_unregisterHandler(HvLpEvent_Type_VirtualLan);
 
-        /* Hypervisor callbacks may have scheduled more work while we
-         * were stoping connections. Now that we've disconnected from
-         * the hypervisor make sure everything's finished. */
+        /* Make sure any work queued from Hypervisor callbacks is finished. */
         flush_scheduled_work();
 
-        vio_unregister_driver(&veth_driver);
+        for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
+                cnx = veth_cnx[i];
+
+                if (!cnx)
+                        continue;
 
-        for (i = 0; i < HVMAXARCHITECTEDLPS; ++i)
-                veth_destroy_connection(i);
+                /* Remove the connection from sysfs */
+                kobject_del(&cnx->kobject);
+                /* Drop the driver's reference to the connection */
+                kobject_put(&cnx->kobject);
+        }
 
+        /* Unregister the driver, which will close all the netdevs and stop
+         * the connections when they're no longer referenced. */
+        vio_unregister_driver(&veth_driver);
 }
 module_exit(veth_module_cleanup);
 
@@ -1423,15 +1695,37 @@ int __init veth_module_init(void)
 
         for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
                 rc = veth_init_connection(i);
-                if (rc != 0) {
-                        veth_module_cleanup();
-                        return rc;
-                }
+                if (rc != 0)
+                        goto error;
         }
 
         HvLpEvent_registerHandler(HvLpEvent_Type_VirtualLan,
                                   &veth_handle_event);
 
-        return vio_register_driver(&veth_driver);
+        rc = vio_register_driver(&veth_driver);
+        if (rc != 0)
+                goto error;
+
+        for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
+                struct kobject *kobj;
+
+                if (!veth_cnx[i])
+                        continue;
+
+                kobj = &veth_cnx[i]->kobject;
+                kobj->parent = &veth_driver.driver.kobj;
+                /* If the add failes, complain but otherwise continue */
+                if (0 != kobject_add(kobj))
+                        veth_error("cnx %d: Failed adding to sysfs.\n", i);
+        }
+
+        return 0;
+
+error:
+        for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
+                veth_destroy_connection(veth_cnx[i]);
+        }
+
+        return rc;
 }
 module_init(veth_module_init);
diff --git a/drivers/net/iseries_veth.h b/drivers/net/iseries_veth.h
deleted file mode 100644
index d9370f79b83e..000000000000
--- a/drivers/net/iseries_veth.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* File veth.h created by Kyle A. Lucke on Mon Aug  7 2000. */
-
-#ifndef _ISERIES_VETH_H
-#define _ISERIES_VETH_H
-
-#define VethEventTypeCap        (0)
-#define VethEventTypeFrames     (1)
-#define VethEventTypeMonitor    (2)
-#define VethEventTypeFramesAck  (3)
-
-#define VETH_MAX_ACKS_PER_MSG   (20)
-#define VETH_MAX_FRAMES_PER_MSG (6)
-
-struct VethFramesData {
-        u32 addr[VETH_MAX_FRAMES_PER_MSG];
-        u16 len[VETH_MAX_FRAMES_PER_MSG];
-        u32 eofmask;
-};
-#define VETH_EOF_SHIFT          (32-VETH_MAX_FRAMES_PER_MSG)
-
-struct VethFramesAckData {
-        u16 token[VETH_MAX_ACKS_PER_MSG];
-};
-
-struct VethCapData {
-        u8 caps_version;
-        u8 rsvd1;
-        u16 num_buffers;
-        u16 ack_threshold;
-        u16 rsvd2;
-        u32 ack_timeout;
-        u32 rsvd3;
-        u64 rsvd4[3];
-};
-
-struct VethLpEvent {
-        struct HvLpEvent base_event;
-        union {
-                struct VethCapData caps_data;
-                struct VethFramesData frames_data;
-                struct VethFramesAckData frames_ack_data;
-        } u;
-
-};
-
-#endif  /* _ISERIES_VETH_H */
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index fb6b232069d6..7c9dbc8c9423 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -58,11 +58,10 @@
 
 #define INT_CAUSE_UNMASK_ALL            0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT        0x0011ffff
-#ifdef MV643XX_RX_QUEUE_FILL_ON_TASK
 #define INT_CAUSE_MASK_ALL              0x00000000
+#define INT_CAUSE_MASK_ALL_EXT          0x00000000
 #define INT_CAUSE_CHECK_BITS            INT_CAUSE_UNMASK_ALL
 #define INT_CAUSE_CHECK_BITS_EXT        INT_CAUSE_UNMASK_ALL_EXT
-#endif
 
 #ifdef MV643XX_CHECKSUM_OFFLOAD_TX
 #define MAX_DESCS_PER_SKB       (MAX_SKB_FRAGS + 1)
@@ -259,14 +258,13 @@ static void mv643xx_eth_update_mac_address(struct net_device *dev)
 static void mv643xx_eth_set_rx_mode(struct net_device *dev)
 {
         struct mv643xx_private *mp = netdev_priv(dev);
-        u32 config_reg;
 
-        config_reg = ethernet_get_config_reg(mp->port_num);
         if (dev->flags & IFF_PROMISC)
-                config_reg |= (u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
+                mp->port_config |= (u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
         else
-                config_reg &= ~(u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
-        ethernet_set_config_reg(mp->port_num, config_reg);
+                mp->port_config &= ~(u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE;
+
+        mv_write(MV643XX_ETH_PORT_CONFIG_REG(mp->port_num), mp->port_config);
 }
 
 /*
@@ -369,15 +367,6 @@ static int mv643xx_eth_free_tx_queue(struct net_device *dev,
 
                         dev_kfree_skb_irq(pkt_info.return_info);
                         released = 0;
-
-                        /*
-                         * Decrement the number of outstanding skbs counter on
-                         * the TX queue.
-                         */
-                        if (mp->tx_ring_skbs == 0)
-                                panic("ERROR - TX outstanding SKBs"
-                                                " counter is corrupted");
-                        mp->tx_ring_skbs--;
                 } else
                         dma_unmap_page(NULL, pkt_info.buf_ptr,
                                         pkt_info.byte_cnt, DMA_TO_DEVICE);
@@ -412,15 +401,13 @@ static int mv643xx_eth_receive_queue(struct net_device *dev)
         struct pkt_info pkt_info;
 
 #ifdef MV643XX_NAPI
-        while (eth_port_receive(mp, &pkt_info) == ETH_OK && budget > 0) {
+        while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
 #else
         while (eth_port_receive(mp, &pkt_info) == ETH_OK) {
 #endif
                 mp->rx_ring_skbs--;
                 received_packets++;
-#ifdef MV643XX_NAPI
-                budget--;
-#endif
+
                 /* Update statistics. Note byte count includes 4 byte CRC count */
                 stats->rx_packets++;
                 stats->rx_bytes += pkt_info.byte_cnt;
@@ -1044,9 +1031,6 @@ static void mv643xx_tx(struct net_device *dev)
                                                 DMA_TO_DEVICE);
 
                         dev_kfree_skb_irq(pkt_info.return_info);
-
-                        if (mp->tx_ring_skbs)
-                                mp->tx_ring_skbs--;
                 } else
                         dma_unmap_page(NULL, pkt_info.buf_ptr,
                                         pkt_info.byte_cnt, DMA_TO_DEVICE);
@@ -1189,7 +1173,6 @@ linear:
                 pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
                                                         DMA_TO_DEVICE);
                 pkt_info.return_info = skb;
-                mp->tx_ring_skbs++;
                 status = eth_port_send(mp, &pkt_info);
                 if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
                         printk(KERN_ERR "%s: Error on transmitting packet\n",
@@ -1274,7 +1257,6 @@ linear:
                                 pkt_info.cmd_sts |= ETH_TX_ENABLE_INTERRUPT |
                                                         ETH_TX_LAST_DESC;
                                 pkt_info.return_info = skb;
-                                mp->tx_ring_skbs++;
                         } else {
                                 pkt_info.return_info = 0;
                         }
@@ -1311,7 +1293,6 @@ linear:
         pkt_info.buf_ptr = dma_map_single(NULL, skb->data, skb->len,
                                                                 DMA_TO_DEVICE);
         pkt_info.return_info = skb;
-        mp->tx_ring_skbs++;
         status = eth_port_send(mp, &pkt_info);
         if ((status == ETH_ERROR) || (status == ETH_QUEUE_FULL))
                 printk(KERN_ERR "%s: Error on transmitting packet\n",
@@ -1356,6 +1337,43 @@ static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev)
         return &mp->stats;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static inline void mv643xx_enable_irq(struct mv643xx_private *mp)
+{
+        int port_num = mp->port_num;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mp->lock, flags);
+        mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
+                                        INT_CAUSE_UNMASK_ALL);
+        mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
+                                        INT_CAUSE_UNMASK_ALL_EXT);
+        spin_unlock_irqrestore(&mp->lock, flags);
+}
+
+static inline void mv643xx_disable_irq(struct mv643xx_private *mp)
+{
+        int port_num = mp->port_num;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mp->lock, flags);
+        mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
+                                        INT_CAUSE_MASK_ALL);
+        mv_write(MV643XX_ETH_INTERRUPT_EXTEND_MASK_REG(port_num),
+                                        INT_CAUSE_MASK_ALL_EXT);
+        spin_unlock_irqrestore(&mp->lock, flags);
+}
+
+static void mv643xx_netpoll(struct net_device *netdev)
+{
+        struct mv643xx_private *mp = netdev_priv(netdev);
+
+        mv643xx_disable_irq(mp);
+        mv643xx_eth_int_handler(netdev->irq, netdev, NULL);
+        mv643xx_enable_irq(mp);
+}
+#endif
+
 /*/
  * mv643xx_eth_probe
  *
@@ -1406,6 +1424,10 @@ static int mv643xx_eth_probe(struct device *ddev)
         dev->weight = 64;
 #endif
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = mv643xx_netpoll;
+#endif
+
         dev->watchdog_timeo = 2 * HZ;
         dev->tx_queue_len = mp->tx_ring_size;
         dev->base_addr = 0;
@@ -1883,6 +1905,9 @@ static void eth_port_start(struct mv643xx_private *mp)
         /* Enable port Rx. */
         mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
                                                 mp->port_rx_queue_command);
+
+        /* Disable port bandwidth limits by clearing MTU register */
+        mv_write(MV643XX_ETH_MAXIMUM_TRANSMIT_UNIT(port_num), 0);
 }
 
 /*
@@ -2292,34 +2317,6 @@ static void eth_port_reset(unsigned int port_num)
         mv_write(MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port_num), reg_data);
 }
 
-/*
- * ethernet_set_config_reg - Set specified bits in configuration register.
- *
- * DESCRIPTION:
- *      This function sets specified bits in the given ethernet
- *      configuration register.
- *
- * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
- *      unsigned int    value           32 bit value.
- *
- * OUTPUT:
- *      The set bits in the value parameter are set in the configuration
- *      register.
- *
- * RETURN:
- *      None.
- *
- */
-static void ethernet_set_config_reg(unsigned int eth_port_num,
-                                                        unsigned int value)
-{
-        unsigned int eth_config_reg;
-
-        eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num));
-        eth_config_reg |= value;
-        mv_write(MV643XX_ETH_PORT_CONFIG_REG(eth_port_num), eth_config_reg);
-}
 
 static int eth_port_autoneg_supported(unsigned int eth_port_num)
 {
@@ -2346,31 +2343,6 @@ static int eth_port_link_is_up(unsigned int eth_port_num)
 }
 
 /*
- * ethernet_get_config_reg - Get the port configuration register
- *
- * DESCRIPTION:
- *      This function returns the configuration register value of the given
- *      ethernet port.
- *
- * INPUT:
- *      unsigned int    eth_port_num    Ethernet Port number.
- *
- * OUTPUT:
- *      None.
- *
- * RETURN:
- *      Port configuration register value.
- */
-static unsigned int ethernet_get_config_reg(unsigned int eth_port_num)
-{
-        unsigned int eth_config_reg;
-
-        eth_config_reg = mv_read(MV643XX_ETH_PORT_CONFIG_EXTEND_REG
-                                                                (eth_port_num));
-        return eth_config_reg;
-}
-
-/*
  * eth_port_read_smi_reg - Read PHY registers
  *
  * DESCRIPTION:
@@ -2528,6 +2500,9 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
                 return ETH_ERROR;
         }
 
+        mp->tx_ring_skbs++;
+        BUG_ON(mp->tx_ring_skbs > mp->tx_ring_size);
+
         /* Get the Tx Desc ring indexes */
         tx_desc_curr = mp->tx_curr_desc_q;
         tx_desc_used = mp->tx_used_desc_q;
@@ -2594,6 +2569,9 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv643xx_private *mp,
         if (mp->tx_resource_err)
                 return ETH_QUEUE_FULL;
 
+        mp->tx_ring_skbs++;
+        BUG_ON(mp->tx_ring_skbs > mp->tx_ring_size);
+
         /* Get the Tx Desc ring indexes */
         tx_desc_curr = mp->tx_curr_desc_q;
         tx_desc_used = mp->tx_used_desc_q;
@@ -2694,6 +2672,9 @@ static ETH_FUNC_RET_STATUS eth_tx_return_desc(struct mv643xx_private *mp,
         /* Any Tx return cancels the Tx resource error status */
         mp->tx_resource_err = 0;
 
+        BUG_ON(mp->tx_ring_skbs == 0);
+        mp->tx_ring_skbs--;
+
         return ETH_OK;
 }
 
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index 7678b59c2952..bcfda5192da0 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -408,10 +408,6 @@ static void eth_port_init(struct mv643xx_private *mp);
 static void eth_port_reset(unsigned int eth_port_num);
 static void eth_port_start(struct mv643xx_private *mp);
 
-static void ethernet_set_config_reg(unsigned int eth_port_num,
-                                    unsigned int value);
-static unsigned int ethernet_get_config_reg(unsigned int eth_port_num);
-
 /* Port MAC address routines */
 static void eth_port_uc_addr_set(unsigned int eth_port_num,
                                  unsigned char *p_addr);
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index 6c92f0969015..73501d846588 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -26,9 +26,6 @@
         Updated to EISA probing API 5/2003 by Marc Zyngier.
 */
 
-static const char *version =
-        "ne3210.c: Driver revision v0.03, 30/09/98\n";
-
 #include <linux/module.h>
 #include <linux/eisa.h>
 #include <linux/kernel.h>
@@ -197,7 +194,7 @@ static int __init ne3210_eisa_probe (struct device *device)
         ei_status.priv = phys_mem;
 
         if (ei_debug > 0)
-                printk(version);
+                printk("ne3210 loaded.\n");
 
         ei_status.reset_8390 = &ne3210_reset_8390;
         ei_status.block_input = &ne3210_block_input;
@@ -360,12 +357,12 @@ MODULE_DESCRIPTION("NE3210 EISA Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(eisa, ne3210_ids);
 
-int ne3210_init(void)
+static int ne3210_init(void)
 {
         return eisa_driver_register (&ne3210_eisa_driver);
 }
 
-void ne3210_cleanup(void)
+static void ne3210_cleanup(void)
 {
         eisa_driver_unregister (&ne3210_eisa_driver);
 }
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 6a2fe3583478..14f4de1a8180 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -6,7 +6,7 @@ menu "PHY device support"
 
 config PHYLIB
         tristate "PHY Device support and infrastructure"
-        depends on NET_ETHERNET
+        depends on NET_ETHERNET && (BROKEN || !ARCH_S390)
         help
           Ethernet controllers are usually attached to PHY
           devices.  This option provides infrastructure for
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 41f62c0c5fcb..90630672703d 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -128,7 +128,7 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
 /* Suspend and resume.  Copied from platform_suspend and
  * platform_resume
  */
-static int mdio_bus_suspend(struct device * dev, u32 state)
+static int mdio_bus_suspend(struct device * dev, pm_message_t state)
 {
         int ret = 0;
         struct device_driver *drv = dev->driver;
@@ -170,7 +170,7 @@ int __init mdio_bus_init(void)
         return bus_register(&mdio_bus_type);
 }
 
-void __exit mdio_bus_exit(void)
+void mdio_bus_exit(void)
 {
         bus_unregister(&mdio_bus_type);
 }
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 2234a8f05eb2..7cefe5507b9e 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -1,5 +1,5 @@
 /************************************************************************
- * regs.h: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC
+ * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
  * Copyright(c) 2002-2005 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
@@ -713,13 +713,16 @@ typedef struct _XENA_dev_config {
         u64 mc_err_reg;
 #define MC_ERR_REG_ECC_DB_ERR_L            BIT(14)
 #define MC_ERR_REG_ECC_DB_ERR_U            BIT(15)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_0       BIT(18)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_1       BIT(20)
 #define MC_ERR_REG_MIRI_CRI_ERR_0          BIT(22)
 #define MC_ERR_REG_MIRI_CRI_ERR_1          BIT(23)
 #define MC_ERR_REG_SM_ERR                  BIT(31)
-#define MC_ERR_REG_ECC_ALL_SNG             (BIT(6) | \
-                                        BIT(7) | BIT(17) | BIT(19))
-#define MC_ERR_REG_ECC_ALL_DBL             (BIT(14) | \
-                                        BIT(15) | BIT(18) | BIT(20))
+#define MC_ERR_REG_ECC_ALL_SNG             (BIT(2) | BIT(3) | BIT(4) | BIT(5) |\
+                                            BIT(6) | BIT(7) | BIT(17) | BIT(19))
+#define MC_ERR_REG_ECC_ALL_DBL             (BIT(10) | BIT(11) | BIT(12) |\
+                                            BIT(13) | BIT(14) | BIT(15) |\
+                                            BIT(18) | BIT(20))
         u64 mc_err_mask;
         u64 mc_err_alarm;
 
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 7ca78228b104..c829e6a2e8a6 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -1,5 +1,5 @@
 /************************************************************************
- * s2io.c: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC
+ * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
  * Copyright(c) 2002-2005 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
@@ -28,7 +28,7 @@
  * explaination of all the variables.
  * rx_ring_num : This can be used to program the number of receive rings used
  * in the driver.
- * rx_ring_len: This defines the number of descriptors each ring can have. This
+ * rx_ring_sz: This defines the number of descriptors each ring can have. This
  * is also an array of size 8.
  * tx_fifo_num: This defines the number of Tx FIFOs thats used int the driver.
  * tx_fifo_len: This too is an array of 8. Each element defines the number of
@@ -67,7 +67,7 @@
 
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
-static char s2io_driver_version[] = "Version 2.0.3.1";
+static char s2io_driver_version[] = "Version 2.0.8.1";
 
 static inline int RXD_IS_UP2DT(RxD_t *rxdp)
 {
@@ -354,7 +354,7 @@ static int init_shared_mem(struct s2io_nic *nic)
         int lst_size, lst_per_page;
         struct net_device *dev = nic->dev;
 #ifdef CONFIG_2BUFF_MODE
-        u64 tmp;
+        unsigned long tmp;
         buffAdd_t *ba;
 #endif
 
@@ -404,7 +404,7 @@ static int init_shared_mem(struct s2io_nic *nic)
                     config->tx_cfg[i].fifo_len - 1;
                 mac_control->fifos[i].fifo_no = i;
                 mac_control->fifos[i].nic = nic;
-                mac_control->fifos[i].max_txds = MAX_SKB_FRAGS;
+                mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 1;
 
                 for (j = 0; j < page_num; j++) {
                         int k = 0;
@@ -418,6 +418,26 @@ static int init_shared_mem(struct s2io_nic *nic)
                                 DBG_PRINT(ERR_DBG, "failed for TxDL\n");
                                 return -ENOMEM;
                         }
+                        /* If we got a zero DMA address(can happen on
+                         * certain platforms like PPC), reallocate.
+                         * Store virtual address of page we don't want,
+                         * to be freed later.
+                         */
+                        if (!tmp_p) {
+                                mac_control->zerodma_virt_addr = tmp_v;
+                                DBG_PRINT(INIT_DBG, 
+                                "%s: Zero DMA address for TxDL. ", dev->name);
+                                DBG_PRINT(INIT_DBG, 
+                                "Virtual address %llx\n", (u64)tmp_v);
+                                tmp_v = pci_alloc_consistent(nic->pdev,
+                                                     PAGE_SIZE, &tmp_p);
+                                if (!tmp_v) {
+                                        DBG_PRINT(ERR_DBG,
+                                          "pci_alloc_consistent ");
+                                        DBG_PRINT(ERR_DBG, "failed for TxDL\n");
+                                        return -ENOMEM;
+                                }
+                        }
                         while (k < lst_per_page) {
                                 int l = (j * lst_per_page) + k;
                                 if (l == config->tx_cfg[i].fifo_len)
@@ -542,18 +562,18 @@ static int init_shared_mem(struct s2io_nic *nic)
                                     (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
                                 if (!ba->ba_0_org)
                                         return -ENOMEM;
-                                tmp = (u64) ba->ba_0_org;
+                                tmp = (unsigned long) ba->ba_0_org;
                                 tmp += ALIGN_SIZE;
-                                tmp &= ~((u64) ALIGN_SIZE);
+                                tmp &= ~((unsigned long) ALIGN_SIZE);
                                 ba->ba_0 = (void *) tmp;
 
                                 ba->ba_1_org = (void *) kmalloc
                                     (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
                                 if (!ba->ba_1_org)
                                         return -ENOMEM;
-                                tmp = (u64) ba->ba_1_org;
+                                tmp = (unsigned long) ba->ba_1_org;
                                 tmp += ALIGN_SIZE;
-                                tmp &= ~((u64) ALIGN_SIZE);
+                                tmp &= ~((unsigned long) ALIGN_SIZE);
                                 ba->ba_1 = (void *) tmp;
                                 k++;
                         }
@@ -600,7 +620,7 @@ static void free_shared_mem(struct s2io_nic *nic)
         mac_info_t *mac_control;
         struct config_param *config;
         int lst_size, lst_per_page;
-
+        struct net_device *dev = nic->dev;
 
         if (!nic)
                 return;
@@ -616,9 +636,10 @@ static void free_shared_mem(struct s2io_nic *nic)
                                                 lst_per_page);
                 for (j = 0; j < page_num; j++) {
                         int mem_blks = (j * lst_per_page);
-                        if ((!mac_control->fifos[i].list_info) ||
-                                (!mac_control->fifos[i].list_info[mem_blks].
-                                 list_virt_addr))
+                        if (!mac_control->fifos[i].list_info)
+                                return; 
+                        if (!mac_control->fifos[i].list_info[mem_blks].
+                                 list_virt_addr)
                                 break;
                         pci_free_consistent(nic->pdev, PAGE_SIZE,
                                             mac_control->fifos[i].
@@ -628,6 +649,18 @@ static void free_shared_mem(struct s2io_nic *nic)
                                             list_info[mem_blks].
                                             list_phy_addr);
                 }
+                /* If we got a zero DMA address during allocation,
+                 * free the page now
+                 */
+                if (mac_control->zerodma_virt_addr) {
+                        pci_free_consistent(nic->pdev, PAGE_SIZE,
+                                            mac_control->zerodma_virt_addr,
+                                            (dma_addr_t)0);
+                        DBG_PRINT(INIT_DBG, 
+                        "%s: Freeing TxDL with zero DMA addr. ", dev->name);
+                        DBG_PRINT(INIT_DBG, "Virtual address %llx\n",
+                        (u64)(mac_control->zerodma_virt_addr));
+                }
                 kfree(mac_control->fifos[i].list_info);
         }
 
@@ -686,7 +719,7 @@ static void free_shared_mem(struct s2io_nic *nic)
 
 static int s2io_verify_pci_mode(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
         register u64 val64 = 0;
         int     mode;
 
@@ -704,7 +737,7 @@ static int s2io_verify_pci_mode(nic_t *nic)
  */
 static int s2io_print_pci_mode(nic_t *nic)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
         register u64 val64 = 0;
         int     mode;
         struct config_param *config = &nic->config;
@@ -1403,7 +1436,7 @@ static int init_nic(struct s2io_nic *nic)
         writeq(0xffbbffbbffbbffbbULL, &bar0->mc_pause_thresh_q4q7);
 
         /* Disable RMAC PAD STRIPPING */
-        add = (void *) &bar0->mac_cfg;
+        add = &bar0->mac_cfg;
         val64 = readq(&bar0->mac_cfg);
         val64 &= ~(MAC_CFG_RMAC_STRIP_PAD);
         writeq(RMAC_CFG_KEY(0x4C0D), &bar0->rmac_cfg_key);
@@ -1934,7 +1967,7 @@ static int start_nic(struct s2io_nic *nic)
                 val64 |= 0x0000800000000000ULL;
                 writeq(val64, &bar0->gpio_control);
                 val64 = 0x0411040400000000ULL;
-                writeq(val64, (void __iomem *) ((u8 *) bar0 + 0x2700));
+                writeq(val64, (void __iomem *)bar0 + 0x2700);
         }
 
         /*
@@ -2395,7 +2428,7 @@ static int s2io_poll(struct net_device *dev, int *budget)
         int pkt_cnt = 0, org_pkts_to_process;
         mac_info_t *mac_control;
         struct config_param *config;
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+        XENA_dev_config_t __iomem *bar0 = nic->bar0;
         u64 val64;
         int i;
 
@@ -2479,9 +2512,10 @@ static void rx_intr_handler(ring_info_t *ring_data)
 #endif
         spin_lock(&nic->rx_lock);
         if (atomic_read(&nic->card_state) == CARD_DOWN) {
-                DBG_PRINT(ERR_DBG, "%s: %s going down for reset\n",
+                DBG_PRINT(INTR_DBG, "%s: %s going down for reset\n",
                           __FUNCTION__, dev->name);
                 spin_unlock(&nic->rx_lock);
+                return;
         }
 
         get_info = ring_data->rx_curr_get_info;
@@ -2596,8 +2630,14 @@ static void tx_intr_handler(fifo_info_t *fifo_data)
                 if (txdlp->Control_1 & TXD_T_CODE) {
                         unsigned long long err;
                         err = txdlp->Control_1 & TXD_T_CODE;
-                        DBG_PRINT(ERR_DBG, "***TxD error %llx\n",
-                                  err);
+                        if ((err >> 48) == 0xA) {
+                                DBG_PRINT(TX_DBG, "TxD returned due \
+                                                to loss of link\n");
+                        }
+                        else {
+                                DBG_PRINT(ERR_DBG, "***TxD error \
+                                                %llx\n", err);
+                        }
                 }
 
                 skb = (struct sk_buff *) ((unsigned long)
@@ -2689,12 +2729,16 @@ static void alarm_intr_handler(struct s2io_nic *nic)
                 if (val64 & MC_ERR_REG_ECC_ALL_DBL) {
                         nic->mac_control.stats_info->sw_stat.
                                 double_ecc_errs++;
-                        DBG_PRINT(ERR_DBG, "%s: Device indicates ",
+                        DBG_PRINT(INIT_DBG, "%s: Device indicates ",
                                   dev->name);
-                        DBG_PRINT(ERR_DBG, "double ECC error!!\n");
+                        DBG_PRINT(INIT_DBG, "double ECC error!!\n");
                         if (nic->device_type != XFRAME_II_DEVICE) {
-                                netif_stop_queue(dev);
-                                schedule_work(&nic->rst_timer_task);
+                                /* Reset XframeI only if critical error */
+                                if (val64 & (MC_ERR_REG_MIRI_ECC_DB_ERR_0 |
+                                             MC_ERR_REG_MIRI_ECC_DB_ERR_1)) {
+                                        netif_stop_queue(dev);
+                                        schedule_work(&nic->rst_timer_task);
+                                }
                         }
                 } else {
                         nic->mac_control.stats_info->sw_stat.
@@ -2706,7 +2750,8 @@ static void alarm_intr_handler(struct s2io_nic *nic)
         val64 = readq(&bar0->serr_source);
         if (val64 & SERR_SOURCE_ANY) {
                 DBG_PRINT(ERR_DBG, "%s: Device indicates ", dev->name);
-                DBG_PRINT(ERR_DBG, "serious error!!\n");
+                DBG_PRINT(ERR_DBG, "serious error %llx!!\n", 
+                          (unsigned long long)val64);
                 netif_stop_queue(dev);
                 schedule_work(&nic->rst_timer_task);
         }
@@ -2831,7 +2876,7 @@ void s2io_reset(nic_t * sp)
                 val64 |= 0x0000800000000000ULL;
                 writeq(val64, &bar0->gpio_control);
                 val64 = 0x0411040400000000ULL;
-                writeq(val64, (void __iomem *) ((u8 *) bar0 + 0x2700));
+                writeq(val64, (void __iomem *)bar0 + 0x2700);
         }
 
         /*
@@ -3130,7 +3175,7 @@ int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
         queue_len = mac_control->fifos[queue].tx_curr_put_info.fifo_len + 1;
         /* Avoid "put" pointer going beyond "get" pointer */
         if (txdp->Host_Control || (((put_off + 1) % queue_len) == get_off)) {
-                DBG_PRINT(ERR_DBG, "Error in xmit, No free TXDs.\n");
+                DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");
                 netif_stop_queue(dev);
                 dev_kfree_skb(skb);
                 spin_unlock_irqrestore(&sp->tx_lock, flags);
@@ -3234,7 +3279,7 @@ s2io_alarm_handle(unsigned long data)
 
 static void s2io_txpic_intr_handle(nic_t *sp)
 {
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0;
+        XENA_dev_config_t __iomem *bar0 = sp->bar0;
         u64 val64;
 
         val64 = readq(&bar0->pic_int_status);
@@ -3528,7 +3573,7 @@ static void s2io_set_multicast(struct net_device *dev)
 
                 val64 = readq(&bar0->mac_cfg);
                 sp->promisc_flg = 1;
-                DBG_PRINT(ERR_DBG, "%s: entered promiscuous mode\n",
+                DBG_PRINT(INFO_DBG, "%s: entered promiscuous mode\n",
                           dev->name);
         } else if (!(dev->flags & IFF_PROMISC) && (sp->promisc_flg)) {
                 /*  Remove the NIC from promiscuous mode */
@@ -3543,7 +3588,7 @@ static void s2io_set_multicast(struct net_device *dev)
 
                 val64 = readq(&bar0->mac_cfg);
                 sp->promisc_flg = 0;
-                DBG_PRINT(ERR_DBG, "%s: left promiscuous mode\n",
+                DBG_PRINT(INFO_DBG, "%s: left promiscuous mode\n",
                           dev->name);
         }
 
@@ -5325,7 +5370,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                         break;
                 }
         }
-        config->max_txds = MAX_SKB_FRAGS;
+        config->max_txds = MAX_SKB_FRAGS + 1;
 
         /* Rx side parameters. */
         if (rx_ring_sz[0] == 0)
@@ -5525,9 +5570,14 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         if (sp->device_type & XFRAME_II_DEVICE) {
                 DBG_PRINT(ERR_DBG, "%s: Neterion Xframe II 10GbE adapter ",
                           dev->name);
-                DBG_PRINT(ERR_DBG, "(rev %d), Driver %s\n",
+                DBG_PRINT(ERR_DBG, "(rev %d), %s",
                                 get_xena_rev_id(sp->pdev),
                                 s2io_driver_version);
+#ifdef CONFIG_2BUFF_MODE
+                DBG_PRINT(ERR_DBG, ", Buffer mode %d",2);
+#endif
+
+                DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");
                 DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",
                           sp->def_mac_addr[0].mac_addr[0],
                           sp->def_mac_addr[0].mac_addr[1],
@@ -5544,9 +5594,13 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         } else {
                 DBG_PRINT(ERR_DBG, "%s: Neterion Xframe I 10GbE adapter ",
                           dev->name);
-                DBG_PRINT(ERR_DBG, "(rev %d), Driver %s\n",
+                DBG_PRINT(ERR_DBG, "(rev %d), %s",
                                         get_xena_rev_id(sp->pdev),
                                         s2io_driver_version);
+#ifdef CONFIG_2BUFF_MODE
+                DBG_PRINT(ERR_DBG, ", Buffer mode %d",2);
+#endif
+                DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");
                 DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",
                           sp->def_mac_addr[0].mac_addr[0],
                           sp->def_mac_addr[0].mac_addr[1],
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index bc64d967f080..89151cb52181 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -1,5 +1,5 @@
 /************************************************************************
- * s2io.h: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC
+ * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
  * Copyright(c) 2002-2005 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
@@ -622,6 +622,9 @@ typedef struct mac_info {
         /* Fifo specific structure */
         fifo_info_t fifos[MAX_TX_FIFOS];
 
+        /* Save virtual address of TxD page with zero DMA addr(if any) */
+        void *zerodma_virt_addr;
+
 /* rx side stuff */
         /* Ring specific structure */
         ring_info_t rings[MAX_RX_RINGS];
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
new file mode 100644
index 000000000000..92f75529eff8
--- /dev/null
+++ b/drivers/net/sis190.c
@@ -0,0 +1,1884 @@
+/*
+   sis190.c: Silicon Integrated Systems SiS190 ethernet driver
+
+   Copyright (c) 2003 K.M. Liu <kmliu@sis.com>
+   Copyright (c) 2003, 2004 Jeff Garzik <jgarzik@pobox.com>
+   Copyright (c) 2003, 2004, 2005 Francois Romieu <romieu@fr.zoreil.com>
+
+   Based on r8169.c, tg3.c, 8139cp.c, skge.c, epic100.c and SiS 190/191
+   genuine driver.
+
+   This software may be used and distributed according to the terms of
+   the GNU General Public License (GPL), incorporated herein by reference.
+   Drivers based on or derived from this code fall under the GPL and must
+   retain the authorship, copyright and license notice.  This file is not
+   a complete program and may only be used when the entire operating
+   system is licensed under the GPL.
+
+   See the file COPYING in this distribution for more information.
+
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/netdevice.h>
+#include <linux/rtnetlink.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/mii.h>
+#include <linux/delay.h>
+#include <linux/crc32.h>
+#include <linux/dma-mapping.h>
+#include <asm/irq.h>
+
+#define net_drv(p, arg...)      if (netif_msg_drv(p)) \
+                                        printk(arg)
+#define net_probe(p, arg...)    if (netif_msg_probe(p)) \
+                                        printk(arg)
+#define net_link(p, arg...)     if (netif_msg_link(p)) \
+                                        printk(arg)
+#define net_intr(p, arg...)     if (netif_msg_intr(p)) \
+                                        printk(arg)
+#define net_tx_err(p, arg...)   if (netif_msg_tx_err(p)) \
+                                        printk(arg)
+
+#define PHY_MAX_ADDR            32
+#define PHY_ID_ANY              0x1f
+#define MII_REG_ANY             0x1f
+
+#ifdef CONFIG_SIS190_NAPI
+#define NAPI_SUFFIX     "-NAPI"
+#else
+#define NAPI_SUFFIX     ""
+#endif
+
+#define DRV_VERSION             "1.2" NAPI_SUFFIX
+#define DRV_NAME                "sis190"
+#define SIS190_DRIVER_NAME      DRV_NAME " Gigabit Ethernet driver " DRV_VERSION
+#define PFX DRV_NAME ": "
+
+#ifdef CONFIG_SIS190_NAPI
+#define sis190_rx_skb                   netif_receive_skb
+#define sis190_rx_quota(count, quota)   min(count, quota)
+#else
+#define sis190_rx_skb                   netif_rx
+#define sis190_rx_quota(count, quota)   count
+#endif
+
+#define MAC_ADDR_LEN            6
+
+#define NUM_TX_DESC             64      /* [8..1024] */
+#define NUM_RX_DESC             64      /* [8..8192] */
+#define TX_RING_BYTES           (NUM_TX_DESC * sizeof(struct TxDesc))
+#define RX_RING_BYTES           (NUM_RX_DESC * sizeof(struct RxDesc))
+#define RX_BUF_SIZE             1536
+#define RX_BUF_MASK             0xfff8
+
+#define SIS190_REGS_SIZE        0x80
+#define SIS190_TX_TIMEOUT       (6*HZ)
+#define SIS190_PHY_TIMEOUT      (10*HZ)
+#define SIS190_MSG_DEFAULT      (NETIF_MSG_DRV | NETIF_MSG_PROBE | \
+                                 NETIF_MSG_LINK | NETIF_MSG_IFUP | \
+                                 NETIF_MSG_IFDOWN)
+
+/* Enhanced PHY access register bit definitions */
+#define EhnMIIread              0x0000
+#define EhnMIIwrite             0x0020
+#define EhnMIIdataShift         16
+#define EhnMIIpmdShift          6       /* 7016 only */
+#define EhnMIIregShift          11
+#define EhnMIIreq               0x0010
+#define EhnMIInotDone           0x0010
+
+/* Write/read MMIO register */
+#define SIS_W8(reg, val)        writeb ((val), ioaddr + (reg))
+#define SIS_W16(reg, val)       writew ((val), ioaddr + (reg))
+#define SIS_W32(reg, val)       writel ((val), ioaddr + (reg))
+#define SIS_R8(reg)             readb (ioaddr + (reg))
+#define SIS_R16(reg)            readw (ioaddr + (reg))
+#define SIS_R32(reg)            readl (ioaddr + (reg))
+
+#define SIS_PCI_COMMIT()        SIS_R32(IntrControl)
+
+enum sis190_registers {
+        TxControl               = 0x00,
+        TxDescStartAddr         = 0x04,
+        rsv0                    = 0x08, // reserved
+        TxSts                   = 0x0c, // unused (Control/Status)
+        RxControl               = 0x10,
+        RxDescStartAddr         = 0x14,
+        rsv1                    = 0x18, // reserved
+        RxSts                   = 0x1c, // unused
+        IntrStatus              = 0x20,
+        IntrMask                = 0x24,
+        IntrControl             = 0x28,
+        IntrTimer               = 0x2c, // unused (Interupt Timer)
+        PMControl               = 0x30, // unused (Power Mgmt Control/Status)
+        rsv2                    = 0x34, // reserved
+        ROMControl              = 0x38,
+        ROMInterface            = 0x3c,
+        StationControl          = 0x40,
+        GMIIControl             = 0x44,
+        GIoCR                   = 0x48, // unused (GMAC IO Compensation)
+        GIoCtrl                 = 0x4c, // unused (GMAC IO Control)
+        TxMacControl            = 0x50,
+        TxLimit                 = 0x54, // unused (Tx MAC Timer/TryLimit)
+        RGDelay                 = 0x58, // unused (RGMII Tx Internal Delay)
+        rsv3                    = 0x5c, // reserved
+        RxMacControl            = 0x60,
+        RxMacAddr               = 0x62,
+        RxHashTable             = 0x68,
+        // Undocumented         = 0x6c,
+        RxWolCtrl               = 0x70,
+        RxWolData               = 0x74, // unused (Rx WOL Data Access)
+        RxMPSControl            = 0x78, // unused (Rx MPS Control)
+        rsv4                    = 0x7c, // reserved
+};
+
+enum sis190_register_content {
+        /* IntrStatus */
+        SoftInt                 = 0x40000000,   // unused
+        Timeup                  = 0x20000000,   // unused
+        PauseFrame              = 0x00080000,   // unused
+        MagicPacket             = 0x00040000,   // unused
+        WakeupFrame             = 0x00020000,   // unused
+        LinkChange              = 0x00010000,
+        RxQEmpty                = 0x00000080,
+        RxQInt                  = 0x00000040,
+        TxQ1Empty               = 0x00000020,   // unused
+        TxQ1Int                 = 0x00000010,
+        TxQ0Empty               = 0x00000008,   // unused
+        TxQ0Int                 = 0x00000004,
+        RxHalt                  = 0x00000002,
+        TxHalt                  = 0x00000001,
+
+        /* {Rx/Tx}CmdBits */
+        CmdReset                = 0x10,
+        CmdRxEnb                = 0x08,         // unused
+        CmdTxEnb                = 0x01,
+        RxBufEmpty              = 0x01,         // unused
+
+        /* Cfg9346Bits */
+        Cfg9346_Lock            = 0x00,         // unused
+        Cfg9346_Unlock          = 0xc0,         // unused
+
+        /* RxMacControl */
+        AcceptErr               = 0x20,         // unused
+        AcceptRunt              = 0x10,         // unused
+        AcceptBroadcast         = 0x0800,
+        AcceptMulticast         = 0x0400,
+        AcceptMyPhys            = 0x0200,
+        AcceptAllPhys           = 0x0100,
+
+        /* RxConfigBits */
+        RxCfgFIFOShift          = 13,
+        RxCfgDMAShift           = 8,            // 0x1a in RxControl ?
+
+        /* TxConfigBits */
+        TxInterFrameGapShift    = 24,
+        TxDMAShift              = 8, /* DMA burst value (0-7) is shift this many bits */
+
+        LinkStatus              = 0x02,         // unused
+        FullDup                 = 0x01,         // unused
+
+        /* TBICSRBit */
+        TBILinkOK               = 0x02000000,   // unused
+};
+
+struct TxDesc {
+        __le32 PSize;
+        __le32 status;
+        __le32 addr;
+        __le32 size;
+};
+
+struct RxDesc {
+        __le32 PSize;
+        __le32 status;
+        __le32 addr;
+        __le32 size;
+};
+
+enum _DescStatusBit {
+        /* _Desc.status */
+        OWNbit          = 0x80000000, // RXOWN/TXOWN
+        INTbit          = 0x40000000, // RXINT/TXINT
+        CRCbit          = 0x00020000, // CRCOFF/CRCEN
+        PADbit          = 0x00010000, // PREADD/PADEN
+        /* _Desc.size */
+        RingEnd         = 0x80000000,
+        /* TxDesc.status */
+        LSEN            = 0x08000000, // TSO ? -- FR
+        IPCS            = 0x04000000,
+        TCPCS           = 0x02000000,
+        UDPCS           = 0x01000000,
+        BSTEN           = 0x00800000,
+        EXTEN           = 0x00400000,
+        DEFEN           = 0x00200000,
+        BKFEN           = 0x00100000,
+        CRSEN           = 0x00080000,
+        COLEN           = 0x00040000,
+        THOL3           = 0x30000000,
+        THOL2           = 0x20000000,
+        THOL1           = 0x10000000,
+        THOL0           = 0x00000000,
+        /* RxDesc.status */
+        IPON            = 0x20000000,
+        TCPON           = 0x10000000,
+        UDPON           = 0x08000000,
+        Wakup           = 0x00400000,
+        Magic           = 0x00200000,
+        Pause           = 0x00100000,
+        DEFbit          = 0x00200000,
+        BCAST           = 0x000c0000,
+        MCAST           = 0x00080000,
+        UCAST           = 0x00040000,
+        /* RxDesc.PSize */
+        TAGON           = 0x80000000,
+        RxDescCountMask = 0x7f000000, // multi-desc pkt when > 1 ? -- FR
+        ABORT           = 0x00800000,
+        SHORT           = 0x00400000,
+        LIMIT           = 0x00200000,
+        MIIER           = 0x00100000,
+        OVRUN           = 0x00080000,
+        NIBON           = 0x00040000,
+        COLON           = 0x00020000,
+        CRCOK           = 0x00010000,
+        RxSizeMask      = 0x0000ffff
+        /*
+         * The asic could apparently do vlan, TSO, jumbo (sis191 only) and
+         * provide two (unused with Linux) Tx queues. No publically
+         * available documentation alas.
+         */
+};
+
+enum sis190_eeprom_access_register_bits {
+        EECS    = 0x00000001,   // unused
+        EECLK   = 0x00000002,   // unused
+        EEDO    = 0x00000008,   // unused
+        EEDI    = 0x00000004,   // unused
+        EEREQ   = 0x00000080,
+        EEROP   = 0x00000200,
+        EEWOP   = 0x00000100    // unused
+};
+
+/* EEPROM Addresses */
+enum sis190_eeprom_address {
+        EEPROMSignature = 0x00,
+        EEPROMCLK       = 0x01, // unused
+        EEPROMInfo      = 0x02,
+        EEPROMMACAddr   = 0x03
+};
+
+enum sis190_feature {
+        F_HAS_RGMII     = 1,
+        F_PHY_88E1111   = 2,
+        F_PHY_BCM5461   = 4
+};
+
+struct sis190_private {
+        void __iomem *mmio_addr;
+        struct pci_dev *pci_dev;
+        struct net_device_stats stats;
+        spinlock_t lock;
+        u32 rx_buf_sz;
+        u32 cur_rx;
+        u32 cur_tx;
+        u32 dirty_rx;
+        u32 dirty_tx;
+        dma_addr_t rx_dma;
+        dma_addr_t tx_dma;
+        struct RxDesc *RxDescRing;
+        struct TxDesc *TxDescRing;
+        struct sk_buff *Rx_skbuff[NUM_RX_DESC];
+        struct sk_buff *Tx_skbuff[NUM_TX_DESC];
+        struct work_struct phy_task;
+        struct timer_list timer;
+        u32 msg_enable;
+        struct mii_if_info mii_if;
+        struct list_head first_phy;
+        u32 features;
+};
+
+struct sis190_phy {
+        struct list_head list;
+        int phy_id;
+        u16 id[2];
+        u16 status;
+        u8  type;
+};
+
+enum sis190_phy_type {
+        UNKNOWN = 0x00,
+        HOME    = 0x01,
+        LAN     = 0x02,
+        MIX     = 0x03
+};
+
+static struct mii_chip_info {
+        const char *name;
+        u16 id[2];
+        unsigned int type;
+        u32 feature;
+} mii_chip_table[] = {
+        { "Broadcom PHY BCM5461", { 0x0020, 0x60c0 }, LAN, F_PHY_BCM5461 },
+        { "Agere PHY ET1101B",    { 0x0282, 0xf010 }, LAN, 0 },
+        { "Marvell PHY 88E1111",  { 0x0141, 0x0cc0 }, LAN, F_PHY_88E1111 },
+        { "Realtek PHY RTL8201",  { 0x0000, 0x8200 }, LAN, 0 },
+        { NULL, }
+};
+
+const static struct {
+        const char *name;
+} sis_chip_info[] = {
+        { "SiS 190 PCI Fast Ethernet adapter" },
+        { "SiS 191 PCI Gigabit Ethernet adapter" },
+};
+
+static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
+        { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
+        { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
+        { 0, },
+};
+
+MODULE_DEVICE_TABLE(pci, sis190_pci_tbl);
+
+static int rx_copybreak = 200;
+
+static struct {
+        u32 msg_enable;
+} debug = { -1 };
+
+MODULE_DESCRIPTION("SiS sis190 Gigabit Ethernet driver");
+module_param(rx_copybreak, int, 0);
+MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");
+module_param_named(debug, debug.msg_enable, int, 0);
+MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)");
+MODULE_AUTHOR("K.M. Liu <kmliu@sis.com>, Ueimor <romieu@fr.zoreil.com>");
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
+
+static const u32 sis190_intr_mask =
+        RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt | LinkChange;
+
+/*
+ * Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
+ * The chips use a 64 element hash table based on the Ethernet CRC.
+ */
+static int multicast_filter_limit = 32;
+
+static void __mdio_cmd(void __iomem *ioaddr, u32 ctl)
+{
+        unsigned int i;
+
+        SIS_W32(GMIIControl, ctl);
+
+        msleep(1);
+
+        for (i = 0; i < 100; i++) {
+                if (!(SIS_R32(GMIIControl) & EhnMIInotDone))
+                        break;
+                msleep(1);
+        }
+
+        if (i > 999)
+                printk(KERN_ERR PFX "PHY command failed !\n");
+}
+
+static void mdio_write(void __iomem *ioaddr, int phy_id, int reg, int val)
+{
+        __mdio_cmd(ioaddr, EhnMIIreq | EhnMIIwrite |
+                (((u32) reg) << EhnMIIregShift) | (phy_id << EhnMIIpmdShift) |
+                (((u32) val) << EhnMIIdataShift));
+}
+
+static int mdio_read(void __iomem *ioaddr, int phy_id, int reg)
+{
+        __mdio_cmd(ioaddr, EhnMIIreq | EhnMIIread |
+                (((u32) reg) << EhnMIIregShift) | (phy_id << EhnMIIpmdShift));
+
+        return (u16) (SIS_R32(GMIIControl) >> EhnMIIdataShift);
+}
+
+static void __mdio_write(struct net_device *dev, int phy_id, int reg, int val)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        mdio_write(tp->mmio_addr, phy_id, reg, val);
+}
+
+static int __mdio_read(struct net_device *dev, int phy_id, int reg)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        return mdio_read(tp->mmio_addr, phy_id, reg);
+}
+
+static u16 mdio_read_latched(void __iomem *ioaddr, int phy_id, int reg)
+{
+        mdio_read(ioaddr, phy_id, reg);
+        return mdio_read(ioaddr, phy_id, reg);
+}
+
+static u16 __devinit sis190_read_eeprom(void __iomem *ioaddr, u32 reg)
+{
+        u16 data = 0xffff;
+        unsigned int i;
+
+        if (!(SIS_R32(ROMControl) & 0x0002))
+                return 0;
+
+        SIS_W32(ROMInterface, EEREQ | EEROP | (reg << 10));
+
+        for (i = 0; i < 200; i++) {
+                if (!(SIS_R32(ROMInterface) & EEREQ)) {
+                        data = (SIS_R32(ROMInterface) & 0xffff0000) >> 16;
+                        break;
+                }
+                msleep(1);
+        }
+
+        return data;
+}
+
+static void sis190_irq_mask_and_ack(void __iomem *ioaddr)
+{
+        SIS_W32(IntrMask, 0x00);
+        SIS_W32(IntrStatus, 0xffffffff);
+        SIS_PCI_COMMIT();
+}
+
+static void sis190_asic_down(void __iomem *ioaddr)
+{
+        /* Stop the chip's Tx and Rx DMA processes. */
+
+        SIS_W32(TxControl, 0x1a00);
+        SIS_W32(RxControl, 0x1a00);
+
+        sis190_irq_mask_and_ack(ioaddr);
+}
+
+static void sis190_mark_as_last_descriptor(struct RxDesc *desc)
+{
+        desc->size |= cpu_to_le32(RingEnd);
+}
+
+static inline void sis190_give_to_asic(struct RxDesc *desc, u32 rx_buf_sz)
+{
+        u32 eor = le32_to_cpu(desc->size) & RingEnd;
+
+        desc->PSize = 0x0;
+        desc->size = cpu_to_le32((rx_buf_sz & RX_BUF_MASK) | eor);
+        wmb();
+        desc->status = cpu_to_le32(OWNbit | INTbit);
+}
+
+static inline void sis190_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,
+                                      u32 rx_buf_sz)
+{
+        desc->addr = cpu_to_le32(mapping);
+        sis190_give_to_asic(desc, rx_buf_sz);
+}
+
+static inline void sis190_make_unusable_by_asic(struct RxDesc *desc)
+{
+        desc->PSize = 0x0;
+        desc->addr = 0xdeadbeef;
+        desc->size &= cpu_to_le32(RingEnd);
+        wmb();
+        desc->status = 0x0;
+}
+
+static int sis190_alloc_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
+                               struct RxDesc *desc, u32 rx_buf_sz)
+{
+        struct sk_buff *skb;
+        dma_addr_t mapping;
+        int ret = 0;
+
+        skb = dev_alloc_skb(rx_buf_sz);
+        if (!skb)
+                goto err_out;
+
+        *sk_buff = skb;
+
+        mapping = pci_map_single(pdev, skb->data, rx_buf_sz,
+                                 PCI_DMA_FROMDEVICE);
+
+        sis190_map_to_asic(desc, mapping, rx_buf_sz);
+out:
+        return ret;
+
+err_out:
+        ret = -ENOMEM;
+        sis190_make_unusable_by_asic(desc);
+        goto out;
+}
+
+static u32 sis190_rx_fill(struct sis190_private *tp, struct net_device *dev,
+                          u32 start, u32 end)
+{
+        u32 cur;
+
+        for (cur = start; cur < end; cur++) {
+                int ret, i = cur % NUM_RX_DESC;
+
+                if (tp->Rx_skbuff[i])
+                        continue;
+
+                ret = sis190_alloc_rx_skb(tp->pci_dev, tp->Rx_skbuff + i,
+                                          tp->RxDescRing + i, tp->rx_buf_sz);
+                if (ret < 0)
+                        break;
+        }
+        return cur - start;
+}
+
+static inline int sis190_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
+                                     struct RxDesc *desc, int rx_buf_sz)
+{
+        int ret = -1;
+
+        if (pkt_size < rx_copybreak) {
+                struct sk_buff *skb;
+
+                skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN);
+                if (skb) {
+                        skb_reserve(skb, NET_IP_ALIGN);
+                        eth_copy_and_sum(skb, sk_buff[0]->data, pkt_size, 0);
+                        *sk_buff = skb;
+                        sis190_give_to_asic(desc, rx_buf_sz);
+                        ret = 0;
+                }
+        }
+        return ret;
+}
+
+static inline int sis190_rx_pkt_err(u32 status, struct net_device_stats *stats)
+{
+#define ErrMask (OVRUN | SHORT | LIMIT | MIIER | NIBON | COLON | ABORT)
+
+        if ((status & CRCOK) && !(status & ErrMask))
+                return 0;
+
+        if (!(status & CRCOK))
+                stats->rx_crc_errors++;
+        else if (status & OVRUN)
+                stats->rx_over_errors++;
+        else if (status & (SHORT | LIMIT))
+                stats->rx_length_errors++;
+        else if (status & (MIIER | NIBON | COLON))
+                stats->rx_frame_errors++;
+
+        stats->rx_errors++;
+        return -1;
+}
+
+static int sis190_rx_interrupt(struct net_device *dev,
+                               struct sis190_private *tp, void __iomem *ioaddr)
+{
+        struct net_device_stats *stats = &tp->stats;
+        u32 rx_left, cur_rx = tp->cur_rx;
+        u32 delta, count;
+
+        rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
+        rx_left = sis190_rx_quota(rx_left, (u32) dev->quota);
+
+        for (; rx_left > 0; rx_left--, cur_rx++) {
+                unsigned int entry = cur_rx % NUM_RX_DESC;
+                struct RxDesc *desc = tp->RxDescRing + entry;
+                u32 status;
+
+                if (desc->status & OWNbit)
+                        break;
+
+                status = le32_to_cpu(desc->PSize);
+
+                // net_intr(tp, KERN_INFO "%s: Rx PSize = %08x.\n", dev->name,
+                //       status);
+
+                if (sis190_rx_pkt_err(status, stats) < 0)
+                        sis190_give_to_asic(desc, tp->rx_buf_sz);
+                else {
+                        struct sk_buff *skb = tp->Rx_skbuff[entry];
+                        int pkt_size = (status & RxSizeMask) - 4;
+                        void (*pci_action)(struct pci_dev *, dma_addr_t,
+                                size_t, int) = pci_dma_sync_single_for_device;
+
+                        if (unlikely(pkt_size > tp->rx_buf_sz)) {
+                                net_intr(tp, KERN_INFO
+                                         "%s: (frag) status = %08x.\n",
+                                         dev->name, status);
+                                stats->rx_dropped++;
+                                stats->rx_length_errors++;
+                                sis190_give_to_asic(desc, tp->rx_buf_sz);
+                                continue;
+                        }
+
+                        pci_dma_sync_single_for_cpu(tp->pci_dev,
+                                le32_to_cpu(desc->addr), tp->rx_buf_sz,
+                                PCI_DMA_FROMDEVICE);
+
+                        if (sis190_try_rx_copy(&skb, pkt_size, desc,
+                                               tp->rx_buf_sz)) {
+                                pci_action = pci_unmap_single;
+                                tp->Rx_skbuff[entry] = NULL;
+                                sis190_make_unusable_by_asic(desc);
+                        }
+
+                        pci_action(tp->pci_dev, le32_to_cpu(desc->addr),
+                                   tp->rx_buf_sz, PCI_DMA_FROMDEVICE);
+
+                        skb->dev = dev;
+                        skb_put(skb, pkt_size);
+                        skb->protocol = eth_type_trans(skb, dev);
+
+                        sis190_rx_skb(skb);
+
+                        dev->last_rx = jiffies;
+                        stats->rx_packets++;
+                        stats->rx_bytes += pkt_size;
+                        if ((status & BCAST) == MCAST)
+                                stats->multicast++;
+                }
+        }
+        count = cur_rx - tp->cur_rx;
+        tp->cur_rx = cur_rx;
+
+        delta = sis190_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
+        if (!delta && count && netif_msg_intr(tp))
+                printk(KERN_INFO "%s: no Rx buffer allocated.\n", dev->name);
+        tp->dirty_rx += delta;
+
+        if (((tp->dirty_rx + NUM_RX_DESC) == tp->cur_rx) && netif_msg_intr(tp))
+                printk(KERN_EMERG "%s: Rx buffers exhausted.\n", dev->name);
+
+        return count;
+}
+
+static void sis190_unmap_tx_skb(struct pci_dev *pdev, struct sk_buff *skb,
+                                struct TxDesc *desc)
+{
+        unsigned int len;
+
+        len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
+
+        pci_unmap_single(pdev, le32_to_cpu(desc->addr), len, PCI_DMA_TODEVICE);
+
+        memset(desc, 0x00, sizeof(*desc));
+}
+
+static void sis190_tx_interrupt(struct net_device *dev,
+                                struct sis190_private *tp, void __iomem *ioaddr)
+{
+        u32 pending, dirty_tx = tp->dirty_tx;
+        /*
+         * It would not be needed if queueing was allowed to be enabled
+         * again too early (hint: think preempt and unclocked smp systems).
+         */
+        unsigned int queue_stopped;
+
+        smp_rmb();
+        pending = tp->cur_tx - dirty_tx;
+        queue_stopped = (pending == NUM_TX_DESC);
+
+        for (; pending; pending--, dirty_tx++) {
+                unsigned int entry = dirty_tx % NUM_TX_DESC;
+                struct TxDesc *txd = tp->TxDescRing + entry;
+                struct sk_buff *skb;
+
+                if (le32_to_cpu(txd->status) & OWNbit)
+                        break;
+
+                skb = tp->Tx_skbuff[entry];
+
+                tp->stats.tx_packets++;
+                tp->stats.tx_bytes += skb->len;
+
+                sis190_unmap_tx_skb(tp->pci_dev, skb, txd);
+                tp->Tx_skbuff[entry] = NULL;
+                dev_kfree_skb_irq(skb);
+        }
+
+        if (tp->dirty_tx != dirty_tx) {
+                tp->dirty_tx = dirty_tx;
+                smp_wmb();
+                if (queue_stopped)
+                        netif_wake_queue(dev);
+        }
+}
+
+/*
+ * The interrupt handler does all of the Rx thread work and cleans up after
+ * the Tx thread.
+ */
+static irqreturn_t sis190_interrupt(int irq, void *__dev, struct pt_regs *regs)
+{
+        struct net_device *dev = __dev;
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned int handled = 0;
+        u32 status;
+
+        status = SIS_R32(IntrStatus);
+
+        if ((status == 0xffffffff) || !status)
+                goto out;
+
+        handled = 1;
+
+        if (unlikely(!netif_running(dev))) {
+                sis190_asic_down(ioaddr);
+                goto out;
+        }
+
+        SIS_W32(IntrStatus, status);
+
+        // net_intr(tp, KERN_INFO "%s: status = %08x.\n", dev->name, status);
+
+        if (status & LinkChange) {
+                net_intr(tp, KERN_INFO "%s: link change.\n", dev->name);
+                schedule_work(&tp->phy_task);
+        }
+
+        if (status & RxQInt)
+                sis190_rx_interrupt(dev, tp, ioaddr);
+
+        if (status & TxQ0Int)
+                sis190_tx_interrupt(dev, tp, ioaddr);
+out:
+        return IRQ_RETVAL(handled);
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void sis190_netpoll(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        struct pci_dev *pdev = tp->pci_dev;
+
+        disable_irq(pdev->irq);
+        sis190_interrupt(pdev->irq, dev, NULL);
+        enable_irq(pdev->irq);
+}
+#endif
+
+static void sis190_free_rx_skb(struct sis190_private *tp,
+                               struct sk_buff **sk_buff, struct RxDesc *desc)
+{
+        struct pci_dev *pdev = tp->pci_dev;
+
+        pci_unmap_single(pdev, le32_to_cpu(desc->addr), tp->rx_buf_sz,
+                         PCI_DMA_FROMDEVICE);
+        dev_kfree_skb(*sk_buff);
+        *sk_buff = NULL;
+        sis190_make_unusable_by_asic(desc);
+}
+
+static void sis190_rx_clear(struct sis190_private *tp)
+{
+        unsigned int i;
+
+        for (i = 0; i < NUM_RX_DESC; i++) {
+                if (!tp->Rx_skbuff[i])
+                        continue;
+                sis190_free_rx_skb(tp, tp->Rx_skbuff + i, tp->RxDescRing + i);
+        }
+}
+
+static void sis190_init_ring_indexes(struct sis190_private *tp)
+{
+        tp->dirty_tx = tp->dirty_rx = tp->cur_tx = tp->cur_rx = 0;
+}
+
+static int sis190_init_ring(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        sis190_init_ring_indexes(tp);
+
+        memset(tp->Tx_skbuff, 0x0, NUM_TX_DESC * sizeof(struct sk_buff *));
+        memset(tp->Rx_skbuff, 0x0, NUM_RX_DESC * sizeof(struct sk_buff *));
+
+        if (sis190_rx_fill(tp, dev, 0, NUM_RX_DESC) != NUM_RX_DESC)
+                goto err_rx_clear;
+
+        sis190_mark_as_last_descriptor(tp->RxDescRing + NUM_RX_DESC - 1);
+
+        return 0;
+
+err_rx_clear:
+        sis190_rx_clear(tp);
+        return -ENOMEM;
+}
+
+static void sis190_set_rx_mode(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
+        u32 mc_filter[2];       /* Multicast hash filter */
+        u16 rx_mode;
+
+        if (dev->flags & IFF_PROMISC) {
+                /* Unconditionally log net taps. */
+                net_drv(tp, KERN_NOTICE "%s: Promiscuous mode enabled.\n",
+                        dev->name);
+                rx_mode =
+                        AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
+                        AcceptAllPhys;
+                mc_filter[1] = mc_filter[0] = 0xffffffff;
+        } else if ((dev->mc_count > multicast_filter_limit) ||
+                   (dev->flags & IFF_ALLMULTI)) {
+                /* Too many to filter perfectly -- accept all multicasts. */
+                rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
+                mc_filter[1] = mc_filter[0] = 0xffffffff;
+        } else {
+                struct dev_mc_list *mclist;
+                unsigned int i;
+
+                rx_mode = AcceptBroadcast | AcceptMyPhys;
+                mc_filter[1] = mc_filter[0] = 0;
+                for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
+                     i++, mclist = mclist->next) {
+                        int bit_nr =
+                                ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
+                        mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
+                        rx_mode |= AcceptMulticast;
+                }
+        }
+
+        spin_lock_irqsave(&tp->lock, flags);
+
+        SIS_W16(RxMacControl, rx_mode | 0x2);
+        SIS_W32(RxHashTable, mc_filter[0]);
+        SIS_W32(RxHashTable + 4, mc_filter[1]);
+
+        spin_unlock_irqrestore(&tp->lock, flags);
+}
+
+static void sis190_soft_reset(void __iomem *ioaddr)
+{
+        SIS_W32(IntrControl, 0x8000);
+        SIS_PCI_COMMIT();
+        msleep(1);
+        SIS_W32(IntrControl, 0x0);
+        sis190_asic_down(ioaddr);
+        msleep(1);
+}
+
+static void sis190_hw_start(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        sis190_soft_reset(ioaddr);
+
+        SIS_W32(TxDescStartAddr, tp->tx_dma);
+        SIS_W32(RxDescStartAddr, tp->rx_dma);
+
+        SIS_W32(IntrStatus, 0xffffffff);
+        SIS_W32(IntrMask, 0x0);
+        SIS_W32(GMIIControl, 0x0);
+        SIS_W32(TxMacControl, 0x60);
+        SIS_W16(RxMacControl, 0x02);
+        SIS_W32(RxHashTable, 0x0);
+        SIS_W32(0x6c, 0x0);
+        SIS_W32(RxWolCtrl, 0x0);
+        SIS_W32(RxWolData, 0x0);
+
+        SIS_PCI_COMMIT();
+
+        sis190_set_rx_mode(dev);
+
+        /* Enable all known interrupts by setting the interrupt mask. */
+        SIS_W32(IntrMask, sis190_intr_mask);
+
+        SIS_W32(TxControl, 0x1a00 | CmdTxEnb);
+        SIS_W32(RxControl, 0x1a1d);
+
+        netif_start_queue(dev);
+}
+
+static void sis190_phy_task(void * data)
+{
+        struct net_device *dev = data;
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        int phy_id = tp->mii_if.phy_id;
+        u16 val;
+
+        rtnl_lock();
+
+        val = mdio_read(ioaddr, phy_id, MII_BMCR);
+        if (val & BMCR_RESET) {
+                // FIXME: needlessly high ?  -- FR 02/07/2005
+                mod_timer(&tp->timer, jiffies + HZ/10);
+        } else if (!(mdio_read_latched(ioaddr, phy_id, MII_BMSR) &
+                     BMSR_ANEGCOMPLETE)) {
+                net_link(tp, KERN_WARNING "%s: PHY reset until link up.\n",
+                         dev->name);
+                netif_carrier_off(dev);
+                mdio_write(ioaddr, phy_id, MII_BMCR, val | BMCR_RESET);
+                mod_timer(&tp->timer, jiffies + SIS190_PHY_TIMEOUT);
+        } else {
+                /* Rejoice ! */
+                struct {
+                        int val;
+                        u32 ctl;
+                        const char *msg;
+                } reg31[] = {
+                        { LPA_1000XFULL | LPA_SLCT, 0x07000c00 | 0x00001000,
+                                "1000 Mbps Full Duplex" },
+                        { LPA_1000XHALF | LPA_SLCT, 0x07000c00,
+                                "1000 Mbps Half Duplex" },
+                        { LPA_100FULL, 0x04000800 | 0x00001000,
+                                "100 Mbps Full Duplex" },
+                        { LPA_100HALF, 0x04000800,
+                                "100 Mbps Half Duplex" },
+                        { LPA_10FULL, 0x04000400 | 0x00001000,
+                                "10 Mbps Full Duplex" },
+                        { LPA_10HALF, 0x04000400,
+                                "10 Mbps Half Duplex" },
+                        { 0, 0x04000400, "unknown" }
+                }, *p;
+                u16 adv;
+
+                val = mdio_read(ioaddr, phy_id, 0x1f);
+                net_link(tp, KERN_INFO "%s: mii ext = %04x.\n", dev->name, val);
+
+                val = mdio_read(ioaddr, phy_id, MII_LPA);
+                adv = mdio_read(ioaddr, phy_id, MII_ADVERTISE);
+                net_link(tp, KERN_INFO "%s: mii lpa = %04x adv = %04x.\n",
+                         dev->name, val, adv);
+
+                val &= adv;
+
+                for (p = reg31; p->val; p++) {
+                        if ((val & p->val) == p->val)
+                                break;
+                }
+
+                p->ctl |= SIS_R32(StationControl) & ~0x0f001c00;
+
+                if ((tp->features & F_HAS_RGMII) &&
+                    (tp->features & F_PHY_BCM5461)) {
+                        // Set Tx Delay in RGMII mode.
+                        mdio_write(ioaddr, phy_id, 0x18, 0xf1c7);
+                        udelay(200);
+                        mdio_write(ioaddr, phy_id, 0x1c, 0x8c00);
+                        p->ctl |= 0x03000000;
+                }
+
+                SIS_W32(StationControl, p->ctl);
+
+                if (tp->features & F_HAS_RGMII) {
+                        SIS_W32(RGDelay, 0x0441);
+                        SIS_W32(RGDelay, 0x0440);
+                }
+
+                net_link(tp, KERN_INFO "%s: link on %s mode.\n", dev->name,
+                         p->msg);
+                netif_carrier_on(dev);
+        }
+
+        rtnl_unlock();
+}
+
+static void sis190_phy_timer(unsigned long __opaque)
+{
+        struct net_device *dev = (struct net_device *)__opaque;
+        struct sis190_private *tp = netdev_priv(dev);
+
+        if (likely(netif_running(dev)))
+                schedule_work(&tp->phy_task);
+}
+
+static inline void sis190_delete_timer(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        del_timer_sync(&tp->timer);
+}
+
+static inline void sis190_request_timer(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        struct timer_list *timer = &tp->timer;
+
+        init_timer(timer);
+        timer->expires = jiffies + SIS190_PHY_TIMEOUT;
+        timer->data = (unsigned long)dev;
+        timer->function = sis190_phy_timer;
+        add_timer(timer);
+}
+
+static void sis190_set_rxbufsize(struct sis190_private *tp,
+                                 struct net_device *dev)
+{
+        unsigned int mtu = dev->mtu;
+
+        tp->rx_buf_sz = (mtu > RX_BUF_SIZE) ? mtu + ETH_HLEN + 8 : RX_BUF_SIZE;
+        /* RxDesc->size has a licence to kill the lower bits */
+        if (tp->rx_buf_sz & 0x07) {
+                tp->rx_buf_sz += 8;
+                tp->rx_buf_sz &= RX_BUF_MASK;
+        }
+}
+
+static int sis190_open(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        struct pci_dev *pdev = tp->pci_dev;
+        int rc = -ENOMEM;
+
+        sis190_set_rxbufsize(tp, dev);
+
+        /*
+         * Rx and Tx descriptors need 256 bytes alignment.
+         * pci_alloc_consistent() guarantees a stronger alignment.
+         */
+        tp->TxDescRing = pci_alloc_consistent(pdev, TX_RING_BYTES, &tp->tx_dma);
+        if (!tp->TxDescRing)
+                goto out;
+
+        tp->RxDescRing = pci_alloc_consistent(pdev, RX_RING_BYTES, &tp->rx_dma);
+        if (!tp->RxDescRing)
+                goto err_free_tx_0;
+
+        rc = sis190_init_ring(dev);
+        if (rc < 0)
+                goto err_free_rx_1;
+
+        INIT_WORK(&tp->phy_task, sis190_phy_task, dev);
+
+        sis190_request_timer(dev);
+
+        rc = request_irq(dev->irq, sis190_interrupt, SA_SHIRQ, dev->name, dev);
+        if (rc < 0)
+                goto err_release_timer_2;
+
+        sis190_hw_start(dev);
+out:
+        return rc;
+
+err_release_timer_2:
+        sis190_delete_timer(dev);
+        sis190_rx_clear(tp);
+err_free_rx_1:
+        pci_free_consistent(tp->pci_dev, RX_RING_BYTES, tp->RxDescRing,
+                tp->rx_dma);
+err_free_tx_0:
+        pci_free_consistent(tp->pci_dev, TX_RING_BYTES, tp->TxDescRing,
+                tp->tx_dma);
+        goto out;
+}
+
+static void sis190_tx_clear(struct sis190_private *tp)
+{
+        unsigned int i;
+
+        for (i = 0; i < NUM_TX_DESC; i++) {
+                struct sk_buff *skb = tp->Tx_skbuff[i];
+
+                if (!skb)
+                        continue;
+
+                sis190_unmap_tx_skb(tp->pci_dev, skb, tp->TxDescRing + i);
+                tp->Tx_skbuff[i] = NULL;
+                dev_kfree_skb(skb);
+
+                tp->stats.tx_dropped++;
+        }
+        tp->cur_tx = tp->dirty_tx = 0;
+}
+
+static void sis190_down(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned int poll_locked = 0;
+
+        sis190_delete_timer(dev);
+
+        netif_stop_queue(dev);
+
+        flush_scheduled_work();
+
+        do {
+                spin_lock_irq(&tp->lock);
+
+                sis190_asic_down(ioaddr);
+
+                spin_unlock_irq(&tp->lock);
+
+                synchronize_irq(dev->irq);
+
+                if (!poll_locked) {
+                        netif_poll_disable(dev);
+                        poll_locked++;
+                }
+
+                synchronize_sched();
+
+        } while (SIS_R32(IntrMask));
+
+        sis190_tx_clear(tp);
+        sis190_rx_clear(tp);
+}
+
+static int sis190_close(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        struct pci_dev *pdev = tp->pci_dev;
+
+        sis190_down(dev);
+
+        free_irq(dev->irq, dev);
+
+        netif_poll_enable(dev);
+
+        pci_free_consistent(pdev, TX_RING_BYTES, tp->TxDescRing, tp->tx_dma);
+        pci_free_consistent(pdev, RX_RING_BYTES, tp->RxDescRing, tp->rx_dma);
+
+        tp->TxDescRing = NULL;
+        tp->RxDescRing = NULL;
+
+        return 0;
+}
+
+static int sis190_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        u32 len, entry, dirty_tx;
+        struct TxDesc *desc;
+        dma_addr_t mapping;
+
+        if (unlikely(skb->len < ETH_ZLEN)) {
+                skb = skb_padto(skb, ETH_ZLEN);
+                if (!skb) {
+                        tp->stats.tx_dropped++;
+                        goto out;
+                }
+                len = ETH_ZLEN;
+        } else {
+                len = skb->len;
+        }
+
+        entry = tp->cur_tx % NUM_TX_DESC;
+        desc = tp->TxDescRing + entry;
+
+        if (unlikely(le32_to_cpu(desc->status) & OWNbit)) {
+                netif_stop_queue(dev);
+                net_tx_err(tp, KERN_ERR PFX
+                           "%s: BUG! Tx Ring full when queue awake!\n",
+                           dev->name);
+                return NETDEV_TX_BUSY;
+        }
+
+        mapping = pci_map_single(tp->pci_dev, skb->data, len, PCI_DMA_TODEVICE);
+
+        tp->Tx_skbuff[entry] = skb;
+
+        desc->PSize = cpu_to_le32(len);
+        desc->addr = cpu_to_le32(mapping);
+
+        desc->size = cpu_to_le32(len);
+        if (entry == (NUM_TX_DESC - 1))
+                desc->size |= cpu_to_le32(RingEnd);
+
+        wmb();
+
+        desc->status = cpu_to_le32(OWNbit | INTbit | DEFbit | CRCbit | PADbit);
+
+        tp->cur_tx++;
+
+        smp_wmb();
+
+        SIS_W32(TxControl, 0x1a00 | CmdReset | CmdTxEnb);
+
+        dev->trans_start = jiffies;
+
+        dirty_tx = tp->dirty_tx;
+        if ((tp->cur_tx - NUM_TX_DESC) == dirty_tx) {
+                netif_stop_queue(dev);
+                smp_rmb();
+                if (dirty_tx != tp->dirty_tx)
+                        netif_wake_queue(dev);
+        }
+out:
+        return NETDEV_TX_OK;
+}
+
+static struct net_device_stats *sis190_get_stats(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        return &tp->stats;
+}
+
+static void sis190_free_phy(struct list_head *first_phy)
+{
+        struct sis190_phy *cur, *next;
+
+        list_for_each_entry_safe(cur, next, first_phy, list) {
+                kfree(cur);
+        }
+}
+
+/**
+ *      sis190_default_phy - Select default PHY for sis190 mac.
+ *      @dev: the net device to probe for
+ *
+ *      Select first detected PHY with link as default.
+ *      If no one is link on, select PHY whose types is HOME as default.
+ *      If HOME doesn't exist, select LAN.
+ */
+static u16 sis190_default_phy(struct net_device *dev)
+{
+        struct sis190_phy *phy, *phy_home, *phy_default, *phy_lan;
+        struct sis190_private *tp = netdev_priv(dev);
+        struct mii_if_info *mii_if = &tp->mii_if;
+        void __iomem *ioaddr = tp->mmio_addr;
+        u16 status;
+
+        phy_home = phy_default = phy_lan = NULL;
+
+        list_for_each_entry(phy, &tp->first_phy, list) {
+                status = mdio_read_latched(ioaddr, phy->phy_id, MII_BMSR);
+
+                // Link ON & Not select default PHY & not ghost PHY.
+                if ((status & BMSR_LSTATUS) &&
+                    !phy_default &&
+                    (phy->type != UNKNOWN)) {
+                        phy_default = phy;
+                } else {
+                        status = mdio_read(ioaddr, phy->phy_id, MII_BMCR);
+                        mdio_write(ioaddr, phy->phy_id, MII_BMCR,
+                                   status | BMCR_ANENABLE | BMCR_ISOLATE);
+                        if (phy->type == HOME)
+                                phy_home = phy;
+                        else if (phy->type == LAN)
+                                phy_lan = phy;
+                }
+        }
+
+        if (!phy_default) {
+                if (phy_home)
+                        phy_default = phy_home;
+                else if (phy_lan)
+                        phy_default = phy_lan;
+                else
+                        phy_default = list_entry(&tp->first_phy,
+                                                 struct sis190_phy, list);
+        }
+
+        if (mii_if->phy_id != phy_default->phy_id) {
+                mii_if->phy_id = phy_default->phy_id;
+                net_probe(tp, KERN_INFO
+                       "%s: Using transceiver at address %d as default.\n",
+                       pci_name(tp->pci_dev), mii_if->phy_id);
+        }
+
+        status = mdio_read(ioaddr, mii_if->phy_id, MII_BMCR);
+        status &= (~BMCR_ISOLATE);
+
+        mdio_write(ioaddr, mii_if->phy_id, MII_BMCR, status);
+        status = mdio_read_latched(ioaddr, mii_if->phy_id, MII_BMSR);
+
+        return status;
+}
+
+static void sis190_init_phy(struct net_device *dev, struct sis190_private *tp,
+                            struct sis190_phy *phy, unsigned int phy_id,
+                            u16 mii_status)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+        struct mii_chip_info *p;
+
+        INIT_LIST_HEAD(&phy->list);
+        phy->status = mii_status;
+        phy->phy_id = phy_id;
+
+        phy->id[0] = mdio_read(ioaddr, phy_id, MII_PHYSID1);
+        phy->id[1] = mdio_read(ioaddr, phy_id, MII_PHYSID2);
+
+        for (p = mii_chip_table; p->type; p++) {
+                if ((p->id[0] == phy->id[0]) &&
+                    (p->id[1] == (phy->id[1] & 0xfff0))) {
+                        break;
+                }
+        }
+
+        if (p->id[1]) {
+                phy->type = (p->type == MIX) ?
+                        ((mii_status & (BMSR_100FULL | BMSR_100HALF)) ?
+                                LAN : HOME) : p->type;
+                tp->features |= p->feature;
+        } else
+                phy->type = UNKNOWN;
+
+        net_probe(tp, KERN_INFO "%s: %s transceiver at address %d.\n",
+                  pci_name(tp->pci_dev),
+                  (phy->type == UNKNOWN) ? "Unknown PHY" : p->name, phy_id);
+}
+
+static void sis190_mii_probe_88e1111_fixup(struct sis190_private *tp)
+{
+        if (tp->features & F_PHY_88E1111) {
+                void __iomem *ioaddr = tp->mmio_addr;
+                int phy_id = tp->mii_if.phy_id;
+                u16 reg[2][2] = {
+                        { 0x808b, 0x0ce1 },
+                        { 0x808f, 0x0c60 }
+                }, *p;
+
+                p = (tp->features & F_HAS_RGMII) ? reg[0] : reg[1];
+
+                mdio_write(ioaddr, phy_id, 0x1b, p[0]);
+                udelay(200);
+                mdio_write(ioaddr, phy_id, 0x14, p[1]);
+                udelay(200);
+        }
+}
+
+/**
+ *      sis190_mii_probe - Probe MII PHY for sis190
+ *      @dev: the net device to probe for
+ *
+ *      Search for total of 32 possible mii phy addresses.
+ *      Identify and set current phy if found one,
+ *      return error if it failed to found.
+ */
+static int __devinit sis190_mii_probe(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        struct mii_if_info *mii_if = &tp->mii_if;
+        void __iomem *ioaddr = tp->mmio_addr;
+        int phy_id;
+        int rc = 0;
+
+        INIT_LIST_HEAD(&tp->first_phy);
+
+        for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
+                struct sis190_phy *phy;
+                u16 status;
+
+                status = mdio_read_latched(ioaddr, phy_id, MII_BMSR);
+
+                // Try next mii if the current one is not accessible.
+                if (status == 0xffff || status == 0x0000)
+                        continue;
+
+                phy = kmalloc(sizeof(*phy), GFP_KERNEL);
+                if (!phy) {
+                        sis190_free_phy(&tp->first_phy);
+                        rc = -ENOMEM;
+                        goto out;
+                }
+
+                sis190_init_phy(dev, tp, phy, phy_id, status);
+
+                list_add(&tp->first_phy, &phy->list);
+        }
+
+        if (list_empty(&tp->first_phy)) {
+                net_probe(tp, KERN_INFO "%s: No MII transceivers found!\n",
+                          pci_name(tp->pci_dev));
+                rc = -EIO;
+                goto out;
+        }
+
+        /* Select default PHY for mac */
+        sis190_default_phy(dev);
+
+        sis190_mii_probe_88e1111_fixup(tp);
+
+        mii_if->dev = dev;
+        mii_if->mdio_read = __mdio_read;
+        mii_if->mdio_write = __mdio_write;
+        mii_if->phy_id_mask = PHY_ID_ANY;
+        mii_if->reg_num_mask = MII_REG_ANY;
+out:
+        return rc;
+}
+
+static void __devexit sis190_mii_remove(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        sis190_free_phy(&tp->first_phy);
+}
+
+static void sis190_release_board(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct sis190_private *tp = netdev_priv(dev);
+
+        iounmap(tp->mmio_addr);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        free_netdev(dev);
+}
+
+static struct net_device * __devinit sis190_init_board(struct pci_dev *pdev)
+{
+        struct sis190_private *tp;
+        struct net_device *dev;
+        void __iomem *ioaddr;
+        int rc;
+
+        dev = alloc_etherdev(sizeof(*tp));
+        if (!dev) {
+                net_drv(&debug, KERN_ERR PFX "unable to alloc new ethernet\n");
+                rc = -ENOMEM;
+                goto err_out_0;
+        }
+
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        tp = netdev_priv(dev);
+        tp->msg_enable = netif_msg_init(debug.msg_enable, SIS190_MSG_DEFAULT);
+
+        rc = pci_enable_device(pdev);
+        if (rc < 0) {
+                net_probe(tp, KERN_ERR "%s: enable failure\n", pci_name(pdev));
+                goto err_free_dev_1;
+        }
+
+        rc = -ENODEV;
+
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+                net_probe(tp, KERN_ERR "%s: region #0 is no MMIO resource.\n",
+                          pci_name(pdev));
+                goto err_pci_disable_2;
+        }
+        if (pci_resource_len(pdev, 0) < SIS190_REGS_SIZE) {
+                net_probe(tp, KERN_ERR "%s: invalid PCI region size(s).\n",
+                          pci_name(pdev));
+                goto err_pci_disable_2;
+        }
+
+        rc = pci_request_regions(pdev, DRV_NAME);
+        if (rc < 0) {
+                net_probe(tp, KERN_ERR PFX "%s: could not request regions.\n",
+                          pci_name(pdev));
+                goto err_pci_disable_2;
+        }
+
+        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (rc < 0) {
+                net_probe(tp, KERN_ERR "%s: DMA configuration failed.\n",
+                          pci_name(pdev));
+                goto err_free_res_3;
+        }
+
+        pci_set_master(pdev);
+
+        ioaddr = ioremap(pci_resource_start(pdev, 0), SIS190_REGS_SIZE);
+        if (!ioaddr) {
+                net_probe(tp, KERN_ERR "%s: cannot remap MMIO, aborting\n",
+                          pci_name(pdev));
+                rc = -EIO;
+                goto err_free_res_3;
+        }
+
+        tp->pci_dev = pdev;
+        tp->mmio_addr = ioaddr;
+
+        sis190_irq_mask_and_ack(ioaddr);
+
+        sis190_soft_reset(ioaddr);
+out:
+        return dev;
+
+err_free_res_3:
+        pci_release_regions(pdev);
+err_pci_disable_2:
+        pci_disable_device(pdev);
+err_free_dev_1:
+        free_netdev(dev);
+err_out_0:
+        dev = ERR_PTR(rc);
+        goto out;
+}
+
+static void sis190_tx_timeout(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        u8 tmp8;
+
+        /* Disable Tx, if not already */
+        tmp8 = SIS_R8(TxControl);
+        if (tmp8 & CmdTxEnb)
+                SIS_W8(TxControl, tmp8 & ~CmdTxEnb);
+
+
+        net_tx_err(tp, KERN_INFO "%s: Transmit timeout, status %08x %08x.\n",
+                   dev->name, SIS_R32(TxControl), SIS_R32(TxSts));
+
+        /* Disable interrupts by clearing the interrupt mask. */
+        SIS_W32(IntrMask, 0x0000);
+
+        /* Stop a shared interrupt from scavenging while we are. */
+        spin_lock_irq(&tp->lock);
+        sis190_tx_clear(tp);
+        spin_unlock_irq(&tp->lock);
+
+        /* ...and finally, reset everything. */
+        sis190_hw_start(dev);
+
+        netif_wake_queue(dev);
+}
+
+static void sis190_set_rgmii(struct sis190_private *tp, u8 reg)
+{
+        tp->features |= (reg & 0x80) ? F_HAS_RGMII : 0;
+}
+
+static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
+                                                     struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        u16 sig;
+        int i;
+
+        net_probe(tp, KERN_INFO "%s: Read MAC address from EEPROM\n",
+                  pci_name(pdev));
+
+        /* Check to see if there is a sane EEPROM */
+        sig = (u16) sis190_read_eeprom(ioaddr, EEPROMSignature);
+
+        if ((sig == 0xffff) || (sig == 0x0000)) {
+                net_probe(tp, KERN_INFO "%s: Error EEPROM read %x.\n",
+                          pci_name(pdev), sig);
+                return -EIO;
+        }
+
+        /* Get MAC address from EEPROM */
+        for (i = 0; i < MAC_ADDR_LEN / 2; i++) {
+                __le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i);
+
+                ((u16 *)dev->dev_addr)[0] = le16_to_cpu(w);
+        }
+
+        sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo));
+
+        return 0;
+}
+
+/**
+ *      sis190_get_mac_addr_from_apc - Get MAC address for SiS965 model
+ *      @pdev: PCI device
+ *      @dev:  network device to get address for
+ *
+ *      SiS965 model, use APC CMOS RAM to store MAC address.
+ *      APC CMOS RAM is accessed through ISA bridge.
+ *      MAC address is read into @net_dev->dev_addr.
+ */
+static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
+                                                  struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        struct pci_dev *isa_bridge;
+        u8 reg, tmp8;
+        int i;
+
+        net_probe(tp, KERN_INFO "%s: Read MAC address from APC.\n",
+                  pci_name(pdev));
+
+        isa_bridge = pci_get_device(PCI_VENDOR_ID_SI, 0x0965, NULL);
+        if (!isa_bridge) {
+                net_probe(tp, KERN_INFO "%s: Can not find ISA bridge.\n",
+                          pci_name(pdev));
+                return -EIO;
+        }
+
+        /* Enable port 78h & 79h to access APC Registers. */
+        pci_read_config_byte(isa_bridge, 0x48, &tmp8);
+        reg = (tmp8 & ~0x02);
+        pci_write_config_byte(isa_bridge, 0x48, reg);
+        udelay(50);
+        pci_read_config_byte(isa_bridge, 0x48, &reg);
+
+        for (i = 0; i < MAC_ADDR_LEN; i++) {
+                outb(0x9 + i, 0x78);
+                dev->dev_addr[i] = inb(0x79);
+        }
+
+        outb(0x12, 0x78);
+        reg = inb(0x79);
+
+        sis190_set_rgmii(tp, reg);
+
+        /* Restore the value to ISA Bridge */
+        pci_write_config_byte(isa_bridge, 0x48, tmp8);
+        pci_dev_put(isa_bridge);
+
+        return 0;
+}
+
+/**
+ *      sis190_init_rxfilter - Initialize the Rx filter
+ *      @dev: network device to initialize
+ *
+ *      Set receive filter address to our MAC address
+ *      and enable packet filtering.
+ */
+static inline void sis190_init_rxfilter(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        u16 ctl;
+        int i;
+
+        ctl = SIS_R16(RxMacControl);
+        /*
+         * Disable packet filtering before setting filter.
+         * Note: SiS's driver writes 32 bits but RxMacControl is 16 bits
+         * only and followed by RxMacAddr (6 bytes). Strange. -- FR
+         */
+        SIS_W16(RxMacControl, ctl & ~0x0f00);
+
+        for (i = 0; i < MAC_ADDR_LEN; i++)
+                SIS_W8(RxMacAddr + i, dev->dev_addr[i]);
+
+        SIS_W16(RxMacControl, ctl);
+        SIS_PCI_COMMIT();
+}
+
+static int sis190_get_mac_addr(struct pci_dev *pdev, struct net_device *dev)
+{
+        u8 from;
+
+        pci_read_config_byte(pdev, 0x73, &from);
+
+        return (from & 0x00000001) ?
+                sis190_get_mac_addr_from_apc(pdev, dev) :
+                sis190_get_mac_addr_from_eeprom(pdev, dev);
+}
+
+static void sis190_set_speed_auto(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        int phy_id = tp->mii_if.phy_id;
+        int val;
+
+        net_link(tp, KERN_INFO "%s: Enabling Auto-negotiation.\n", dev->name);
+
+        val = mdio_read(ioaddr, phy_id, MII_ADVERTISE);
+
+        // Enable 10/100 Full/Half Mode, leave MII_ADVERTISE bit4:0
+        // unchanged.
+        mdio_write(ioaddr, phy_id, MII_ADVERTISE, (val & ADVERTISE_SLCT) |
+                   ADVERTISE_100FULL | ADVERTISE_10FULL |
+                   ADVERTISE_100HALF | ADVERTISE_10HALF);
+
+        // Enable 1000 Full Mode.
+        mdio_write(ioaddr, phy_id, MII_CTRL1000, ADVERTISE_1000FULL);
+
+        // Enable auto-negotiation and restart auto-negotiation.
+        mdio_write(ioaddr, phy_id, MII_BMCR,
+                   BMCR_ANENABLE | BMCR_ANRESTART | BMCR_RESET);
+}
+
+static int sis190_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        return mii_ethtool_gset(&tp->mii_if, cmd);
+}
+
+static int sis190_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        return mii_ethtool_sset(&tp->mii_if, cmd);
+}
+
+static void sis190_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+        strcpy(info->bus_info, pci_name(tp->pci_dev));
+}
+
+static int sis190_get_regs_len(struct net_device *dev)
+{
+        return SIS190_REGS_SIZE;
+}
+
+static void sis190_get_regs(struct net_device *dev, struct ethtool_regs *regs,
+                            void *p)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+        unsigned long flags;
+
+        if (regs->len > SIS190_REGS_SIZE)
+                regs->len = SIS190_REGS_SIZE;
+
+        spin_lock_irqsave(&tp->lock, flags);
+        memcpy_fromio(p, tp->mmio_addr, regs->len);
+        spin_unlock_irqrestore(&tp->lock, flags);
+}
+
+static int sis190_nway_reset(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        return mii_nway_restart(&tp->mii_if);
+}
+
+static u32 sis190_get_msglevel(struct net_device *dev)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        return tp->msg_enable;
+}
+
+static void sis190_set_msglevel(struct net_device *dev, u32 value)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        tp->msg_enable = value;
+}
+
+static struct ethtool_ops sis190_ethtool_ops = {
+        .get_settings   = sis190_get_settings,
+        .set_settings   = sis190_set_settings,
+        .get_drvinfo    = sis190_get_drvinfo,
+        .get_regs_len   = sis190_get_regs_len,
+        .get_regs       = sis190_get_regs,
+        .get_link       = ethtool_op_get_link,
+        .get_msglevel   = sis190_get_msglevel,
+        .set_msglevel   = sis190_set_msglevel,
+        .nway_reset     = sis190_nway_reset,
+};
+
+static int sis190_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+        struct sis190_private *tp = netdev_priv(dev);
+
+        return !netif_running(dev) ? -EINVAL :
+                generic_mii_ioctl(&tp->mii_if, if_mii(ifr), cmd, NULL);
+}
+
+static int __devinit sis190_init_one(struct pci_dev *pdev,
+                                     const struct pci_device_id *ent)
+{
+        static int printed_version = 0;
+        struct sis190_private *tp;
+        struct net_device *dev;
+        void __iomem *ioaddr;
+        int rc;
+
+        if (!printed_version) {
+                net_drv(&debug, KERN_INFO SIS190_DRIVER_NAME " loaded.\n");
+                printed_version = 1;
+        }
+
+        dev = sis190_init_board(pdev);
+        if (IS_ERR(dev)) {
+                rc = PTR_ERR(dev);
+                goto out;
+        }
+
+        tp = netdev_priv(dev);
+        ioaddr = tp->mmio_addr;
+
+        rc = sis190_get_mac_addr(pdev, dev);
+        if (rc < 0)
+                goto err_release_board;
+
+        sis190_init_rxfilter(dev);
+
+        INIT_WORK(&tp->phy_task, sis190_phy_task, dev);
+
+        dev->open = sis190_open;
+        dev->stop = sis190_close;
+        dev->do_ioctl = sis190_ioctl;
+        dev->get_stats = sis190_get_stats;
+        dev->tx_timeout = sis190_tx_timeout;
+        dev->watchdog_timeo = SIS190_TX_TIMEOUT;
+        dev->hard_start_xmit = sis190_start_xmit;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = sis190_netpoll;
+#endif
+        dev->set_multicast_list = sis190_set_rx_mode;
+        SET_ETHTOOL_OPS(dev, &sis190_ethtool_ops);
+        dev->irq = pdev->irq;
+        dev->base_addr = (unsigned long) 0xdead;
+
+        spin_lock_init(&tp->lock);
+
+        rc = sis190_mii_probe(dev);
+        if (rc < 0)
+                goto err_release_board;
+
+        rc = register_netdev(dev);
+        if (rc < 0)
+                goto err_remove_mii;
+
+        pci_set_drvdata(pdev, dev);
+
+        net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), "
+               "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
+               pci_name(pdev), sis_chip_info[ent->driver_data].name,
+               ioaddr, dev->irq,
+               dev->dev_addr[0], dev->dev_addr[1],
+               dev->dev_addr[2], dev->dev_addr[3],
+               dev->dev_addr[4], dev->dev_addr[5]);
+
+        net_probe(tp, KERN_INFO "%s: %s mode.\n", dev->name,
+                  (tp->features & F_HAS_RGMII) ? "RGMII" : "GMII");
+
+        netif_carrier_off(dev);
+
+        sis190_set_speed_auto(dev);
+out:
+        return rc;
+
+err_remove_mii:
+        sis190_mii_remove(dev);
+err_release_board:
+        sis190_release_board(pdev);
+        goto out;
+}
+
+static void __devexit sis190_remove_one(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        sis190_mii_remove(dev);
+        unregister_netdev(dev);
+        sis190_release_board(pdev);
+        pci_set_drvdata(pdev, NULL);
+}
+
+static struct pci_driver sis190_pci_driver = {
+        .name           = DRV_NAME,
+        .id_table       = sis190_pci_tbl,
+        .probe          = sis190_init_one,
+        .remove         = __devexit_p(sis190_remove_one),
+};
+
+static int __init sis190_init_module(void)
+{
+        return pci_module_init(&sis190_pci_driver);
+}
+
+static void __exit sis190_cleanup_module(void)
+{
+        pci_unregister_driver(&sis190_pci_driver);
+}
+
+module_init(sis190_init_module);
+module_exit(sis190_cleanup_module);
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index a9b06b8d8e3f..ac9ce6509eee 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -986,7 +986,7 @@ static const char * chip_ids[ 16 ] =  {
         })
 #endif
 
-#if SMC_CAN_USE_DATACS
+#ifdef SMC_CAN_USE_DATACS
 #define SMC_PUSH_DATA(p, l)                                             \
         if ( lp->datacs ) {                                             \
                 unsigned char *__ptr = (p);                             \
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
new file mode 100644
index 000000000000..4e19220473d0
--- /dev/null
+++ b/drivers/net/spider_net.c
@@ -0,0 +1,2334 @@
+/*
+ * Network device driver for Cell Processor-Based Blade
+ *
+ * (C) Copyright IBM Corp. 2005
+ *
+ * Authors : Utz Bacher <utz.bacher@de.ibm.com>
+ *           Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/config.h>
+
+#include <linux/compiler.h>
+#include <linux/crc32.h>
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/firmware.h>
+#include <linux/if_vlan.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/ip.h>
+#include <linux/kernel.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/tcp.h>
+#include <linux/types.h>
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+#include <asm/bitops.h>
+#include <asm/pci-bridge.h>
+#include <net/checksum.h>
+
+#include "spider_net.h"
+
+MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and Jens Osterkamp " \
+              "<Jens.Osterkamp@de.ibm.com>");
+MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver");
+MODULE_LICENSE("GPL");
+
+static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT;
+static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT;
+
+module_param(rx_descriptors, int, 0644);
+module_param(tx_descriptors, int, 0644);
+
+MODULE_PARM_DESC(rx_descriptors, "number of descriptors used " \
+                 "in rx chains");
+MODULE_PARM_DESC(tx_descriptors, "number of descriptors used " \
+                 "in tx chain");
+
+char spider_net_driver_name[] = "spidernet";
+
+static struct pci_device_id spider_net_pci_tbl[] = {
+        { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SPIDER_NET,
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, spider_net_pci_tbl);
+
+/**
+ * spider_net_read_reg - reads an SMMIO register of a card
+ * @card: device structure
+ * @reg: register to read from
+ *
+ * returns the content of the specified SMMIO register.
+ */
+static u32
+spider_net_read_reg(struct spider_net_card *card, u32 reg)
+{
+        u32 value;
+
+        value = readl(card->regs + reg);
+        value = le32_to_cpu(value);
+
+        return value;
+}
+
+/**
+ * spider_net_write_reg - writes to an SMMIO register of a card
+ * @card: device structure
+ * @reg: register to write to
+ * @value: value to write into the specified SMMIO register
+ */
+static void
+spider_net_write_reg(struct spider_net_card *card, u32 reg, u32 value)
+{
+        value = cpu_to_le32(value);
+        writel(value, card->regs + reg);
+}
+
+/**
+ * spider_net_write_reg_sync - writes to an SMMIO register of a card
+ * @card: device structure
+ * @reg: register to write to
+ * @value: value to write into the specified SMMIO register
+ *
+ * Unlike spider_net_write_reg, this will also make sure the
+ * data arrives on the card by reading the reg again.
+ */
+static void
+spider_net_write_reg_sync(struct spider_net_card *card, u32 reg, u32 value)
+{
+        value = cpu_to_le32(value);
+        writel(value, card->regs + reg);
+        (void)readl(card->regs + reg);
+}
+
+/**
+ * spider_net_rx_irq_off - switch off rx irq on this spider card
+ * @card: device structure
+ *
+ * switches off rx irq by masking them out in the GHIINTnMSK register
+ */
+static void
+spider_net_rx_irq_off(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue &= ~SPIDER_NET_RXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/** spider_net_write_phy - write to phy register
+ * @netdev: adapter to be written to
+ * @mii_id: id of MII
+ * @reg: PHY register
+ * @val: value to be written to phy register
+ *
+ * spider_net_write_phy_register writes to an arbitrary PHY
+ * register via the spider GPCWOPCMD register. We assume the queue does
+ * not run full (not more than 15 commands outstanding).
+ **/
+static void
+spider_net_write_phy(struct net_device *netdev, int mii_id,
+                     int reg, int val)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 writevalue;
+
+        writevalue = ((u32)mii_id << 21) |
+                ((u32)reg << 16) | ((u32)val);
+
+        spider_net_write_reg(card, SPIDER_NET_GPCWOPCMD, writevalue);
+}
+
+/** spider_net_read_phy - read from phy register
+ * @netdev: network device to be read from
+ * @mii_id: id of MII
+ * @reg: PHY register
+ *
+ * Returns value read from PHY register
+ *
+ * spider_net_write_phy reads from an arbitrary PHY
+ * register via the spider GPCROPCMD register
+ **/
+static int
+spider_net_read_phy(struct net_device *netdev, int mii_id, int reg)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 readvalue;
+
+        readvalue = ((u32)mii_id << 21) | ((u32)reg << 16);
+        spider_net_write_reg(card, SPIDER_NET_GPCROPCMD, readvalue);
+
+        /* we don't use semaphores to wait for an SPIDER_NET_GPROPCMPINT
+         * interrupt, as we poll for the completion of the read operation
+         * in spider_net_read_phy. Should take about 50 us */
+        do {
+                readvalue = spider_net_read_reg(card, SPIDER_NET_GPCROPCMD);
+        } while (readvalue & SPIDER_NET_GPREXEC);
+
+        readvalue &= SPIDER_NET_GPRDAT_MASK;
+
+        return readvalue;
+}
+
+/**
+ * spider_net_rx_irq_on - switch on rx irq on this spider card
+ * @card: device structure
+ *
+ * switches on rx irq by enabling them in the GHIINTnMSK register
+ */
+static void
+spider_net_rx_irq_on(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue |= SPIDER_NET_RXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/**
+ * spider_net_tx_irq_off - switch off tx irq on this spider card
+ * @card: device structure
+ *
+ * switches off tx irq by masking them out in the GHIINTnMSK register
+ */
+static void
+spider_net_tx_irq_off(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue &= ~SPIDER_NET_TXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/**
+ * spider_net_tx_irq_on - switch on tx irq on this spider card
+ * @card: device structure
+ *
+ * switches on tx irq by enabling them in the GHIINTnMSK register
+ */
+static void
+spider_net_tx_irq_on(struct spider_net_card *card)
+{
+        u32 regvalue;
+        unsigned long flags;
+
+        spin_lock_irqsave(&card->intmask_lock, flags);
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK);
+        regvalue |= SPIDER_NET_TXINT;
+        spider_net_write_reg_sync(card, SPIDER_NET_GHIINT0MSK, regvalue);
+        spin_unlock_irqrestore(&card->intmask_lock, flags);
+}
+
+/**
+ * spider_net_set_promisc - sets the unicast address or the promiscuous mode
+ * @card: card structure
+ *
+ * spider_net_set_promisc sets the unicast destination address filter and
+ * thus either allows for non-promisc mode or promisc mode
+ */
+static void
+spider_net_set_promisc(struct spider_net_card *card)
+{
+        u32 macu, macl;
+        struct net_device *netdev = card->netdev;
+
+        if (netdev->flags & IFF_PROMISC) {
+                /* clear destination entry 0 */
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR, 0);
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR + 0x04, 0);
+                spider_net_write_reg(card, SPIDER_NET_GMRUA0FIL15R,
+                                     SPIDER_NET_PROMISC_VALUE);
+        } else {
+                macu = netdev->dev_addr[0];
+                macu <<= 8;
+                macu |= netdev->dev_addr[1];
+                memcpy(&macl, &netdev->dev_addr[2], sizeof(macl));
+
+                macu |= SPIDER_NET_UA_DESCR_VALUE;
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR, macu);
+                spider_net_write_reg(card, SPIDER_NET_GMRUAFILnR + 0x04, macl);
+                spider_net_write_reg(card, SPIDER_NET_GMRUA0FIL15R,
+                                     SPIDER_NET_NONPROMISC_VALUE);
+        }
+}
+
+/**
+ * spider_net_get_mac_address - read mac address from spider card
+ * @card: device structure
+ *
+ * reads MAC address from GMACUNIMACU and GMACUNIMACL registers
+ */
+static int
+spider_net_get_mac_address(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 macl, macu;
+
+        macl = spider_net_read_reg(card, SPIDER_NET_GMACUNIMACL);
+        macu = spider_net_read_reg(card, SPIDER_NET_GMACUNIMACU);
+
+        netdev->dev_addr[0] = (macu >> 24) & 0xff;
+        netdev->dev_addr[1] = (macu >> 16) & 0xff;
+        netdev->dev_addr[2] = (macu >> 8) & 0xff;
+        netdev->dev_addr[3] = macu & 0xff;
+        netdev->dev_addr[4] = (macl >> 8) & 0xff;
+        netdev->dev_addr[5] = macl & 0xff;
+
+        if (!is_valid_ether_addr(&netdev->dev_addr[0]))
+                return -EINVAL;
+
+        return 0;
+}
+
+/**
+ * spider_net_get_descr_status -- returns the status of a descriptor
+ * @descr: descriptor to look at
+ *
+ * returns the status as in the dmac_cmd_status field of the descriptor
+ */
+static enum spider_net_descr_status
+spider_net_get_descr_status(struct spider_net_descr *descr)
+{
+        u32 cmd_status;
+        rmb();
+        cmd_status = descr->dmac_cmd_status;
+        rmb();
+        cmd_status >>= SPIDER_NET_DESCR_IND_PROC_SHIFT;
+        /* no need to mask out any bits, as cmd_status is 32 bits wide only
+         * (and unsigned) */
+        return cmd_status;
+}
+
+/**
+ * spider_net_set_descr_status -- sets the status of a descriptor
+ * @descr: descriptor to change
+ * @status: status to set in the descriptor
+ *
+ * changes the status to the specified value. Doesn't change other bits
+ * in the status
+ */
+static void
+spider_net_set_descr_status(struct spider_net_descr *descr,
+                            enum spider_net_descr_status status)
+{
+        u32 cmd_status;
+        /* read the status */
+        mb();
+        cmd_status = descr->dmac_cmd_status;
+        /* clean the upper 4 bits */
+        cmd_status &= SPIDER_NET_DESCR_IND_PROC_MASKO;
+        /* add the status to it */
+        cmd_status |= ((u32)status)<<SPIDER_NET_DESCR_IND_PROC_SHIFT;
+        /* and write it back */
+        descr->dmac_cmd_status = cmd_status;
+        wmb();
+}
+
+/**
+ * spider_net_free_chain - free descriptor chain
+ * @card: card structure
+ * @chain: address of chain
+ *
+ */
+static void
+spider_net_free_chain(struct spider_net_card *card,
+                      struct spider_net_descr_chain *chain)
+{
+        struct spider_net_descr *descr;
+
+        for (descr = chain->tail; !descr->bus_addr; descr = descr->next) {
+                pci_unmap_single(card->pdev, descr->bus_addr,
+                                 SPIDER_NET_DESCR_SIZE, PCI_DMA_BIDIRECTIONAL);
+                descr->bus_addr = 0;
+        }
+}
+
+/**
+ * spider_net_init_chain - links descriptor chain
+ * @card: card structure
+ * @chain: address of chain
+ * @start_descr: address of descriptor array
+ * @no: number of descriptors
+ *
+ * we manage a circular list that mirrors the hardware structure,
+ * except that the hardware uses bus addresses.
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_init_chain(struct spider_net_card *card,
+                       struct spider_net_descr_chain *chain,
+                       struct spider_net_descr *start_descr, int no)
+{
+        int i;
+        struct spider_net_descr *descr;
+
+        spin_lock_init(&card->chain_lock);
+
+        descr = start_descr;
+        memset(descr, 0, sizeof(*descr) * no);
+
+        /* set up the hardware pointers in each descriptor */
+        for (i=0; i<no; i++, descr++) {
+                spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+
+                descr->bus_addr =
+                        pci_map_single(card->pdev, descr,
+                                       SPIDER_NET_DESCR_SIZE,
+                                       PCI_DMA_BIDIRECTIONAL);
+
+                if (descr->bus_addr == DMA_ERROR_CODE)
+                        goto iommu_error;
+
+                descr->next = descr + 1;
+                descr->prev = descr - 1;
+
+        }
+        /* do actual circular list */
+        (descr-1)->next = start_descr;
+        start_descr->prev = descr-1;
+
+        descr = start_descr;
+        for (i=0; i < no; i++, descr++) {
+                descr->next_descr_addr = descr->next->bus_addr;
+        }
+
+        chain->head = start_descr;
+        chain->tail = start_descr;
+
+        return 0;
+
+iommu_error:
+        descr = start_descr;
+        for (i=0; i < no; i++, descr++)
+                if (descr->bus_addr)
+                        pci_unmap_single(card->pdev, descr->bus_addr,
+                                         SPIDER_NET_DESCR_SIZE, PCI_DMA_BIDIRECTIONAL);
+        return -ENOMEM;
+}
+
+/**
+ * spider_net_free_rx_chain_contents - frees descr contents in rx chain
+ * @card: card structure
+ *
+ * returns 0 on success, <0 on failure
+ */
+static void
+spider_net_free_rx_chain_contents(struct spider_net_card *card)
+{
+        struct spider_net_descr *descr;
+
+        descr = card->rx_chain.head;
+        while (descr->next != card->rx_chain.head) {
+                if (descr->skb) {
+                        dev_kfree_skb(descr->skb);
+                        pci_unmap_single(card->pdev, descr->buf_addr,
+                                         SPIDER_NET_MAX_MTU,
+                                         PCI_DMA_BIDIRECTIONAL);
+                }
+                descr = descr->next;
+        }
+}
+
+/**
+ * spider_net_prepare_rx_descr - reinitializes a rx descriptor
+ * @card: card structure
+ * @descr: descriptor to re-init
+ *
+ * return 0 on succes, <0 on failure
+ *
+ * allocates a new rx skb, iommu-maps it and attaches it to the descriptor.
+ * Activate the descriptor state-wise
+ */
+static int
+spider_net_prepare_rx_descr(struct spider_net_card *card,
+                            struct spider_net_descr *descr)
+{
+        int error = 0;
+        int offset;
+        int bufsize;
+
+        /* we need to round up the buffer size to a multiple of 128 */
+        bufsize = (SPIDER_NET_MAX_MTU + SPIDER_NET_RXBUF_ALIGN - 1) &
+                (~(SPIDER_NET_RXBUF_ALIGN - 1));
+
+        /* and we need to have it 128 byte aligned, therefore we allocate a
+         * bit more */
+        /* allocate an skb */
+        descr->skb = dev_alloc_skb(bufsize + SPIDER_NET_RXBUF_ALIGN - 1);
+        if (!descr->skb) {
+                if (net_ratelimit())
+                        if (netif_msg_rx_err(card))
+                                pr_err("Not enough memory to allocate "
+                                        "rx buffer\n");
+                return -ENOMEM;
+        }
+        descr->buf_size = bufsize;
+        descr->result_size = 0;
+        descr->valid_size = 0;
+        descr->data_status = 0;
+        descr->data_error = 0;
+
+        offset = ((unsigned long)descr->skb->data) &
+                (SPIDER_NET_RXBUF_ALIGN - 1);
+        if (offset)
+                skb_reserve(descr->skb, SPIDER_NET_RXBUF_ALIGN - offset);
+        /* io-mmu-map the skb */
+        descr->buf_addr = pci_map_single(card->pdev, descr->skb->data,
+                                         SPIDER_NET_MAX_MTU,
+                                         PCI_DMA_BIDIRECTIONAL);
+        if (descr->buf_addr == DMA_ERROR_CODE) {
+                dev_kfree_skb_any(descr->skb);
+                if (netif_msg_rx_err(card))
+                        pr_err("Could not iommu-map rx buffer\n");
+                spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+        } else {
+                descr->dmac_cmd_status = SPIDER_NET_DMAC_RX_CARDOWNED;
+        }
+
+        return error;
+}
+
+/**
+ * spider_net_enable_rxctails - sets RX dmac chain tail addresses
+ * @card: card structure
+ *
+ * spider_net_enable_rxctails sets the RX DMAC chain tail adresses in the
+ * chip by writing to the appropriate register. DMA is enabled in
+ * spider_net_enable_rxdmac.
+ */
+static void
+spider_net_enable_rxchtails(struct spider_net_card *card)
+{
+        /* assume chain is aligned correctly */
+        spider_net_write_reg(card, SPIDER_NET_GDADCHA ,
+                             card->rx_chain.tail->bus_addr);
+}
+
+/**
+ * spider_net_enable_rxdmac - enables a receive DMA controller
+ * @card: card structure
+ *
+ * spider_net_enable_rxdmac enables the DMA controller by setting RX_DMA_EN
+ * in the GDADMACCNTR register
+ */
+static void
+spider_net_enable_rxdmac(struct spider_net_card *card)
+{
+        spider_net_write_reg(card, SPIDER_NET_GDADMACCNTR,
+                             SPIDER_NET_DMA_RX_VALUE);
+}
+
+/**
+ * spider_net_refill_rx_chain - refills descriptors/skbs in the rx chains
+ * @card: card structure
+ *
+ * refills descriptors in all chains (last used chain first): allocates skbs
+ * and iommu-maps them.
+ */
+static void
+spider_net_refill_rx_chain(struct spider_net_card *card)
+{
+        struct spider_net_descr_chain *chain;
+        int count = 0;
+        unsigned long flags;
+
+        chain = &card->rx_chain;
+
+        spin_lock_irqsave(&card->chain_lock, flags);
+        while (spider_net_get_descr_status(chain->head) ==
+                                SPIDER_NET_DESCR_NOT_IN_USE) {
+                if (spider_net_prepare_rx_descr(card, chain->head))
+                        break;
+                count++;
+                chain->head = chain->head->next;
+        }
+        spin_unlock_irqrestore(&card->chain_lock, flags);
+
+        /* could be optimized, only do that, if we know the DMA processing
+         * has terminated */
+        if (count)
+                spider_net_enable_rxdmac(card);
+}
+
+/**
+ * spider_net_alloc_rx_skbs - allocates rx skbs in rx descriptor chains
+ * @card: card structure
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_alloc_rx_skbs(struct spider_net_card *card)
+{
+        int result;
+        struct spider_net_descr_chain *chain;
+
+        result = -ENOMEM;
+
+        chain = &card->rx_chain;
+        /* put at least one buffer into the chain. if this fails,
+         * we've got a problem. if not, spider_net_refill_rx_chain
+         * will do the rest at the end of this function */
+        if (spider_net_prepare_rx_descr(card, chain->head))
+                goto error;
+        else
+                chain->head = chain->head->next;
+
+        /* this will allocate the rest of the rx buffers; if not, it's
+         * business as usual later on */
+        spider_net_refill_rx_chain(card);
+        return 0;
+
+error:
+        spider_net_free_rx_chain_contents(card);
+        return result;
+}
+
+/**
+ * spider_net_release_tx_descr - processes a used tx descriptor
+ * @card: card structure
+ * @descr: descriptor to release
+ *
+ * releases a used tx descriptor (unmapping, freeing of skb)
+ */
+static void
+spider_net_release_tx_descr(struct spider_net_card *card,
+                            struct spider_net_descr *descr)
+{
+        struct sk_buff *skb;
+
+        /* unmap the skb */
+        skb = descr->skb;
+        pci_unmap_single(card->pdev, descr->buf_addr, skb->len,
+                         PCI_DMA_BIDIRECTIONAL);
+
+        dev_kfree_skb_any(skb);
+
+        /* set status to not used */
+        spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+}
+
+/**
+ * spider_net_release_tx_chain - processes sent tx descriptors
+ * @card: adapter structure
+ * @brutal: if set, don't care about whether descriptor seems to be in use
+ *
+ * releases the tx descriptors that spider has finished with (if non-brutal)
+ * or simply release tx descriptors (if brutal)
+ */
+static void
+spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
+{
+        struct spider_net_descr_chain *tx_chain = &card->tx_chain;
+        enum spider_net_descr_status status;
+
+        spider_net_tx_irq_off(card);
+
+        /* no lock for chain needed, if this is only executed once at a time */
+again:
+        for (;;) {
+                status = spider_net_get_descr_status(tx_chain->tail);
+                switch (status) {
+                case SPIDER_NET_DESCR_CARDOWNED:
+                        if (!brutal) goto out;
+                        /* fallthrough, if we release the descriptors
+                         * brutally (then we don't care about
+                         * SPIDER_NET_DESCR_CARDOWNED) */
+                case SPIDER_NET_DESCR_RESPONSE_ERROR:
+                case SPIDER_NET_DESCR_PROTECTION_ERROR:
+                case SPIDER_NET_DESCR_FORCE_END:
+                        if (netif_msg_tx_err(card))
+                                pr_err("%s: forcing end of tx descriptor "
+                                       "with status x%02x\n",
+                                       card->netdev->name, status);
+                        card->netdev_stats.tx_dropped++;
+                        break;
+
+                case SPIDER_NET_DESCR_COMPLETE:
+                        card->netdev_stats.tx_packets++;
+                        card->netdev_stats.tx_bytes +=
+                                tx_chain->tail->skb->len;
+                        break;
+
+                default: /* any other value (== SPIDER_NET_DESCR_NOT_IN_USE) */
+                        goto out;
+                }
+                spider_net_release_tx_descr(card, tx_chain->tail);
+                tx_chain->tail = tx_chain->tail->next;
+        }
+out:
+        netif_wake_queue(card->netdev);
+
+        if (!brutal) {
+                /* switch on tx irqs (while we are still in the interrupt
+                 * handler, so we don't get an interrupt), check again
+                 * for done descriptors. This results in fewer interrupts */
+                spider_net_tx_irq_on(card);
+                status = spider_net_get_descr_status(tx_chain->tail);
+                switch (status) {
+                        case SPIDER_NET_DESCR_RESPONSE_ERROR:
+                        case SPIDER_NET_DESCR_PROTECTION_ERROR:
+                        case SPIDER_NET_DESCR_FORCE_END:
+                        case SPIDER_NET_DESCR_COMPLETE:
+                                goto again;
+                        default:
+                                break;
+                }
+        }
+
+}
+
+/**
+ * spider_net_get_multicast_hash - generates hash for multicast filter table
+ * @addr: multicast address
+ *
+ * returns the hash value.
+ *
+ * spider_net_get_multicast_hash calculates a hash value for a given multicast
+ * address, that is used to set the multicast filter tables
+ */
+static u8
+spider_net_get_multicast_hash(struct net_device *netdev, __u8 *addr)
+{
+        /* FIXME: an addr of 01:00:5e:00:00:01 must result in 0xa9,
+         * ff:ff:ff:ff:ff:ff must result in 0xfd */
+        u32 crc;
+        u8 hash;
+
+        crc = crc32_be(~0, addr, netdev->addr_len);
+
+        hash = (crc >> 27);
+        hash <<= 3;
+        hash |= crc & 7;
+
+        return hash;
+}
+
+/**
+ * spider_net_set_multi - sets multicast addresses and promisc flags
+ * @netdev: interface device structure
+ *
+ * spider_net_set_multi configures multicast addresses as needed for the
+ * netdev interface. It also sets up multicast, allmulti and promisc
+ * flags appropriately
+ */
+static void
+spider_net_set_multi(struct net_device *netdev)
+{
+        struct dev_mc_list *mc;
+        u8 hash;
+        int i;
+        u32 reg;
+        struct spider_net_card *card = netdev_priv(netdev);
+        unsigned long bitmask[SPIDER_NET_MULTICAST_HASHES / BITS_PER_LONG] =
+                {0, };
+
+        spider_net_set_promisc(card);
+
+        if (netdev->flags & IFF_ALLMULTI) {
+                for (i = 0; i < SPIDER_NET_MULTICAST_HASHES; i++) {
+                        set_bit(i, bitmask);
+                }
+                goto write_hash;
+        }
+
+        /* well, we know, what the broadcast hash value is: it's xfd
+        hash = spider_net_get_multicast_hash(netdev, netdev->broadcast); */
+        set_bit(0xfd, bitmask);
+
+        for (mc = netdev->mc_list; mc; mc = mc->next) {
+                hash = spider_net_get_multicast_hash(netdev, mc->dmi_addr);
+                set_bit(hash, bitmask);
+        }
+
+write_hash:
+        for (i = 0; i < SPIDER_NET_MULTICAST_HASHES / 4; i++) {
+                reg = 0;
+                if (test_bit(i * 4, bitmask))
+                        reg += 0x08;
+                reg <<= 8;
+                if (test_bit(i * 4 + 1, bitmask))
+                        reg += 0x08;
+                reg <<= 8;
+                if (test_bit(i * 4 + 2, bitmask))
+                        reg += 0x08;
+                reg <<= 8;
+                if (test_bit(i * 4 + 3, bitmask))
+                        reg += 0x08;
+
+                spider_net_write_reg(card, SPIDER_NET_GMRMHFILnR + i * 4, reg);
+        }
+}
+
+/**
+ * spider_net_disable_rxdmac - disables the receive DMA controller
+ * @card: card structure
+ *
+ * spider_net_disable_rxdmac terminates processing on the DMA controller by
+ * turing off DMA and issueing a force end
+ */
+static void
+spider_net_disable_rxdmac(struct spider_net_card *card)
+{
+        spider_net_write_reg(card, SPIDER_NET_GDADMACCNTR,
+                             SPIDER_NET_DMA_RX_FEND_VALUE);
+}
+
+/**
+ * spider_net_stop - called upon ifconfig down
+ * @netdev: interface device structure
+ *
+ * always returns 0
+ */
+int
+spider_net_stop(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+
+        netif_poll_disable(netdev);
+        netif_carrier_off(netdev);
+        netif_stop_queue(netdev);
+
+        /* disable/mask all interrupts */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT1MSK, 0);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK, 0);
+
+        /* free_irq(netdev->irq, netdev);*/
+        free_irq(to_pci_dev(netdev->class_dev.dev)->irq, netdev);
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
+                             SPIDER_NET_DMA_TX_FEND_VALUE);
+
+        /* turn off DMA, force end */
+        spider_net_disable_rxdmac(card);
+
+        /* release chains */
+        spider_net_release_tx_chain(card, 1);
+
+        spider_net_free_chain(card, &card->tx_chain);
+        spider_net_free_chain(card, &card->rx_chain);
+
+        return 0;
+}
+
+/**
+ * spider_net_get_next_tx_descr - returns the next available tx descriptor
+ * @card: device structure to get descriptor from
+ *
+ * returns the address of the next descriptor, or NULL if not available.
+ */
+static struct spider_net_descr *
+spider_net_get_next_tx_descr(struct spider_net_card *card)
+{
+        /* check, if head points to not-in-use descr */
+        if ( spider_net_get_descr_status(card->tx_chain.head) ==
+             SPIDER_NET_DESCR_NOT_IN_USE ) {
+                return card->tx_chain.head;
+        } else {
+                return NULL;
+        }
+}
+
+/**
+ * spider_net_set_txdescr_cmdstat - sets the tx descriptor command field
+ * @descr: descriptor structure to fill out
+ * @skb: packet to consider
+ *
+ * fills out the command and status field of the descriptor structure,
+ * depending on hardware checksum settings. This function assumes a wmb()
+ * has executed before.
+ */
+static void
+spider_net_set_txdescr_cmdstat(struct spider_net_descr *descr,
+                               struct sk_buff *skb)
+{
+        if (skb->ip_summed != CHECKSUM_HW) {
+                descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_NOCS;
+                return;
+        }
+
+        /* is packet ip?
+         * if yes: tcp? udp? */
+        if (skb->protocol == htons(ETH_P_IP)) {
+                if (skb->nh.iph->protocol == IPPROTO_TCP) {
+                        descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_TCPCS;
+                } else if (skb->nh.iph->protocol == IPPROTO_UDP) {
+                        descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_UDPCS;
+                } else { /* the stack should checksum non-tcp and non-udp
+                            packets on his own: NETIF_F_IP_CSUM */
+                        descr->dmac_cmd_status = SPIDER_NET_DMAC_CMDSTAT_NOCS;
+                }
+        }
+}
+
+/**
+ * spider_net_prepare_tx_descr - fill tx descriptor with skb data
+ * @card: card structure
+ * @descr: descriptor structure to fill out
+ * @skb: packet to use
+ *
+ * returns 0 on success, <0 on failure.
+ *
+ * fills out the descriptor structure with skb data and len. Copies data,
+ * if needed (32bit DMA!)
+ */
+static int
+spider_net_prepare_tx_descr(struct spider_net_card *card,
+                            struct spider_net_descr *descr,
+                            struct sk_buff *skb)
+{
+        descr->buf_addr = pci_map_single(card->pdev, skb->data,
+                                         skb->len, PCI_DMA_BIDIRECTIONAL);
+        if (descr->buf_addr == DMA_ERROR_CODE) {
+                if (netif_msg_tx_err(card))
+                        pr_err("could not iommu-map packet (%p, %i). "
+                                  "Dropping packet\n", skb->data, skb->len);
+                return -ENOMEM;
+        }
+
+        descr->buf_size = skb->len;
+        descr->skb = skb;
+        descr->data_status = 0;
+
+        /* make sure the above values are in memory before we change the
+         * status */
+        wmb();
+
+        spider_net_set_txdescr_cmdstat(descr,skb);
+
+        return 0;
+}
+
+/**
+ * spider_net_kick_tx_dma - enables TX DMA processing
+ * @card: card structure
+ * @descr: descriptor address to enable TX processing at
+ *
+ * spider_net_kick_tx_dma writes the current tx chain head as start address
+ * of the tx descriptor chain and enables the transmission DMA engine
+ */
+static void
+spider_net_kick_tx_dma(struct spider_net_card *card,
+                       struct spider_net_descr *descr)
+{
+        /* this is the only descriptor in the output chain.
+         * Enable TX DMA */
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDCHA,
+                             descr->bus_addr);
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
+                             SPIDER_NET_DMA_TX_VALUE);
+}
+
+/**
+ * spider_net_xmit - transmits a frame over the device
+ * @skb: packet to send out
+ * @netdev: interface device structure
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_xmit(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        struct spider_net_descr *descr;
+        int result;
+
+        descr = spider_net_get_next_tx_descr(card);
+
+        if (!descr) {
+                netif_stop_queue(netdev);
+
+                descr = spider_net_get_next_tx_descr(card);
+                if (!descr)
+                        goto error;
+                else
+                        netif_start_queue(netdev);
+        }
+
+        result = spider_net_prepare_tx_descr(card, descr, skb);
+        if (result)
+                goto error;
+
+        card->tx_chain.head = card->tx_chain.head->next;
+
+        /* make sure the status from spider_net_prepare_tx_descr is in
+         * memory before we check out the previous descriptor */
+        wmb();
+
+        if (spider_net_get_descr_status(descr->prev) !=
+            SPIDER_NET_DESCR_CARDOWNED)
+                spider_net_kick_tx_dma(card, descr);
+
+        return NETDEV_TX_OK;
+
+error:
+        card->netdev_stats.tx_dropped++;
+        return NETDEV_TX_LOCKED;
+}
+
+/**
+ * spider_net_do_ioctl - called for device ioctls
+ * @netdev: interface device structure
+ * @ifr: request parameter structure for ioctl
+ * @cmd: command code for ioctl
+ *
+ * returns 0 on success, <0 on failure. Currently, we have no special ioctls.
+ * -EOPNOTSUPP is returned, if an unknown ioctl was requested
+ */
+static int
+spider_net_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+        switch (cmd) {
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+/**
+ * spider_net_pass_skb_up - takes an skb from a descriptor and passes it on
+ * @descr: descriptor to process
+ * @card: card structure
+ *
+ * returns 1 on success, 0 if no packet was passed to the stack
+ *
+ * iommu-unmaps the skb, fills out skb structure and passes the data to the
+ * stack. The descriptor state is not changed.
+ */
+static int
+spider_net_pass_skb_up(struct spider_net_descr *descr,
+                       struct spider_net_card *card)
+{
+        struct sk_buff *skb;
+        struct net_device *netdev;
+        u32 data_status, data_error;
+
+        data_status = descr->data_status;
+        data_error = descr->data_error;
+
+        netdev = card->netdev;
+
+        /* check for errors in the data_error flag */
+        if ((data_error & SPIDER_NET_DATA_ERROR_MASK) &&
+            netif_msg_rx_err(card))
+                pr_err("error in received descriptor found, "
+                       "data_status=x%08x, data_error=x%08x\n",
+                       data_status, data_error);
+
+        /* prepare skb, unmap descriptor */
+        skb = descr->skb;
+        pci_unmap_single(card->pdev, descr->buf_addr, SPIDER_NET_MAX_MTU,
+                         PCI_DMA_BIDIRECTIONAL);
+
+        /* the cases we'll throw away the packet immediately */
+        if (data_error & SPIDER_NET_DESTROY_RX_FLAGS)
+                return 0;
+
+        skb->dev = netdev;
+        skb_put(skb, descr->valid_size);
+
+        /* the card seems to add 2 bytes of junk in front
+         * of the ethernet frame */
+#define SPIDER_MISALIGN         2
+        skb_pull(skb, SPIDER_MISALIGN);
+        skb->protocol = eth_type_trans(skb, netdev);
+
+        /* checksum offload */
+        if (card->options.rx_csum) {
+                if ( (data_status & SPIDER_NET_DATA_STATUS_CHK_MASK) &&
+                     (!(data_error & SPIDER_NET_DATA_ERROR_CHK_MASK)) )
+                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                else
+                        skb->ip_summed = CHECKSUM_NONE;
+        } else {
+                skb->ip_summed = CHECKSUM_NONE;
+        }
+
+        if (data_status & SPIDER_NET_VLAN_PACKET) {
+                /* further enhancements: HW-accel VLAN
+                 * vlan_hwaccel_receive_skb
+                 */
+        }
+
+        /* pass skb up to stack */
+        netif_receive_skb(skb);
+
+        /* update netdevice statistics */
+        card->netdev_stats.rx_packets++;
+        card->netdev_stats.rx_bytes += skb->len;
+
+        return 1;
+}
+
+/**
+ * spider_net_decode_descr - processes an rx descriptor
+ * @card: card structure
+ *
+ * returns 1 if a packet has been sent to the stack, otherwise 0
+ *
+ * processes an rx descriptor by iommu-unmapping the data buffer and passing
+ * the packet up to the stack
+ */
+static int
+spider_net_decode_one_descr(struct spider_net_card *card)
+{
+        enum spider_net_descr_status status;
+        struct spider_net_descr *descr;
+        struct spider_net_descr_chain *chain;
+        int result;
+
+        chain = &card->rx_chain;
+        descr = chain->tail;
+
+        status = spider_net_get_descr_status(descr);
+
+        if (status == SPIDER_NET_DESCR_CARDOWNED) {
+                /* nothing in the descriptor yet */
+                return 0;
+        }
+
+        if (status == SPIDER_NET_DESCR_NOT_IN_USE) {
+                /* not initialized yet, I bet chain->tail == chain->head
+                 * and the ring is empty */
+                spider_net_refill_rx_chain(card);
+                return 0;
+        }
+
+        /* descriptor definitively used -- move on head */
+        chain->tail = descr->next;
+
+        result = 0;
+        if ( (status == SPIDER_NET_DESCR_RESPONSE_ERROR) ||
+             (status == SPIDER_NET_DESCR_PROTECTION_ERROR) ||
+             (status == SPIDER_NET_DESCR_FORCE_END) ) {
+                if (netif_msg_rx_err(card))
+                        pr_err("%s: dropping RX descriptor with state %d\n",
+                               card->netdev->name, status);
+                card->netdev_stats.rx_dropped++;
+                goto refill;
+        }
+
+        if ( (status != SPIDER_NET_DESCR_COMPLETE) &&
+             (status != SPIDER_NET_DESCR_FRAME_END) ) {
+                if (netif_msg_rx_err(card))
+                        pr_err("%s: RX descriptor with state %d\n",
+                               card->netdev->name, status);
+                goto refill;
+        }
+
+        /* ok, we've got a packet in descr */
+        result = spider_net_pass_skb_up(descr, card);
+refill:
+        spider_net_set_descr_status(descr, SPIDER_NET_DESCR_NOT_IN_USE);
+        /* change the descriptor state: */
+        spider_net_refill_rx_chain(card);
+
+        return result;
+}
+
+/**
+ * spider_net_poll - NAPI poll function called by the stack to return packets
+ * @netdev: interface device structure
+ * @budget: number of packets we can pass to the stack at most
+ *
+ * returns 0 if no more packets available to the driver/stack. Returns 1,
+ * if the quota is exceeded, but the driver has still packets.
+ *
+ * spider_net_poll returns all packets from the rx descriptors to the stack
+ * (using netif_receive_skb). If all/enough packets are up, the driver
+ * reenables interrupts and returns 0. If not, 1 is returned.
+ */
+static int
+spider_net_poll(struct net_device *netdev, int *budget)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        int packets_to_do, packets_done = 0;
+        int no_more_packets = 0;
+
+        packets_to_do = min(*budget, netdev->quota);
+
+        while (packets_to_do) {
+                if (spider_net_decode_one_descr(card)) {
+                        packets_done++;
+                        packets_to_do--;
+                } else {
+                        /* no more packets for the stack */
+                        no_more_packets = 1;
+                        break;
+                }
+        }
+
+        netdev->quota -= packets_done;
+        *budget -= packets_done;
+
+        /* if all packets are in the stack, enable interrupts and return 0 */
+        /* if not, return 1 */
+        if (no_more_packets) {
+                netif_rx_complete(netdev);
+                spider_net_rx_irq_on(card);
+                return 0;
+        }
+
+        return 1;
+}
+
+/**
+ * spider_net_vlan_rx_reg - initializes VLAN structures in the driver and card
+ * @netdev: interface device structure
+ * @grp: vlan_group structure that is registered (NULL on destroying interface)
+ */
+static void
+spider_net_vlan_rx_reg(struct net_device *netdev, struct vlan_group *grp)
+{
+        /* further enhancement... yet to do */
+        return;
+}
+
+/**
+ * spider_net_vlan_rx_add - adds VLAN id to the card filter
+ * @netdev: interface device structure
+ * @vid: VLAN id to add
+ */
+static void
+spider_net_vlan_rx_add(struct net_device *netdev, uint16_t vid)
+{
+        /* further enhancement... yet to do */
+        /* add vid to card's VLAN filter table */
+        return;
+}
+
+/**
+ * spider_net_vlan_rx_kill - removes VLAN id to the card filter
+ * @netdev: interface device structure
+ * @vid: VLAN id to remove
+ */
+static void
+spider_net_vlan_rx_kill(struct net_device *netdev, uint16_t vid)
+{
+        /* further enhancement... yet to do */
+        /* remove vid from card's VLAN filter table */
+}
+
+/**
+ * spider_net_get_stats - get interface statistics
+ * @netdev: interface device structure
+ *
+ * returns the interface statistics residing in the spider_net_card struct
+ */
+static struct net_device_stats *
+spider_net_get_stats(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        struct net_device_stats *stats = &card->netdev_stats;
+        return stats;
+}
+
+/**
+ * spider_net_change_mtu - changes the MTU of an interface
+ * @netdev: interface device structure
+ * @new_mtu: new MTU value
+ *
+ * returns 0 on success, <0 on failure
+ */
+static int
+spider_net_change_mtu(struct net_device *netdev, int new_mtu)
+{
+        /* no need to re-alloc skbs or so -- the max mtu is about 2.3k
+         * and mtu is outbound only anyway */
+        if ( (new_mtu < SPIDER_NET_MIN_MTU ) ||
+                (new_mtu > SPIDER_NET_MAX_MTU) )
+                return -EINVAL;
+        netdev->mtu = new_mtu;
+        return 0;
+}
+
+/**
+ * spider_net_set_mac - sets the MAC of an interface
+ * @netdev: interface device structure
+ * @ptr: pointer to new MAC address
+ *
+ * Returns 0 on success, <0 on failure. Currently, we don't support this
+ * and will always return EOPNOTSUPP.
+ */
+static int
+spider_net_set_mac(struct net_device *netdev, void *p)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 macl, macu, regvalue;
+        struct sockaddr *addr = p;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        /* switch off GMACTPE and GMACRPE */
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GMACOPEMD);
+        regvalue &= ~((1 << 5) | (1 << 6));
+        spider_net_write_reg(card, SPIDER_NET_GMACOPEMD, regvalue);
+
+        /* write mac */
+        macu = (addr->sa_data[0]<<24) + (addr->sa_data[1]<<16) +
+                (addr->sa_data[2]<<8) + (addr->sa_data[3]);
+        macl = (addr->sa_data[4]<<8) + (addr->sa_data[5]);
+        spider_net_write_reg(card, SPIDER_NET_GMACUNIMACU, macu);
+        spider_net_write_reg(card, SPIDER_NET_GMACUNIMACL, macl);
+
+        /* switch GMACTPE and GMACRPE back on */
+        regvalue = spider_net_read_reg(card, SPIDER_NET_GMACOPEMD);
+        regvalue |= ((1 << 5) | (1 << 6));
+        spider_net_write_reg(card, SPIDER_NET_GMACOPEMD, regvalue);
+
+        spider_net_set_promisc(card);
+
+        /* look up, whether we have been successful */
+        if (spider_net_get_mac_address(netdev))
+                return -EADDRNOTAVAIL;
+        if (memcmp(netdev->dev_addr,addr->sa_data,netdev->addr_len))
+                return -EADDRNOTAVAIL;
+
+        return 0;
+}
+
+/**
+ * spider_net_enable_txdmac - enables a TX DMA controller
+ * @card: card structure
+ *
+ * spider_net_enable_txdmac enables the TX DMA controller by setting the
+ * descriptor chain tail address
+ */
+static void
+spider_net_enable_txdmac(struct spider_net_card *card)
+{
+        /* assume chain is aligned correctly */
+        spider_net_write_reg(card, SPIDER_NET_GDTDCHA,
+                             card->tx_chain.tail->bus_addr);
+}
+
+/**
+ * spider_net_handle_error_irq - handles errors raised by an interrupt
+ * @card: card structure
+ * @status_reg: interrupt status register 0 (GHIINT0STS)
+ *
+ * spider_net_handle_error_irq treats or ignores all error conditions
+ * found when an interrupt is presented
+ */
+static void
+spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
+{
+        u32 error_reg1, error_reg2;
+        u32 i;
+        int show_error = 1;
+
+        error_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1STS);
+        error_reg2 = spider_net_read_reg(card, SPIDER_NET_GHIINT2STS);
+
+        /* check GHIINT0STS ************************************/
+        if (status_reg)
+                for (i = 0; i < 32; i++)
+                        if (status_reg & (1<<i))
+                                switch (i)
+        {
+        /* let error_reg1 and error_reg2 evaluation decide, what to do
+        case SPIDER_NET_PHYINT:
+        case SPIDER_NET_GMAC2INT:
+        case SPIDER_NET_GMAC1INT:
+        case SPIDER_NET_GIPSINT:
+        case SPIDER_NET_GFIFOINT:
+        case SPIDER_NET_DMACINT:
+        case SPIDER_NET_GSYSINT:
+                break; */
+
+        case SPIDER_NET_GPWOPCMPINT:
+                /* PHY write operation completed */
+                show_error = 0;
+                break;
+        case SPIDER_NET_GPROPCMPINT:
+                /* PHY read operation completed */
+                /* we don't use semaphores, as we poll for the completion
+                 * of the read operation in spider_net_read_phy. Should take
+                 * about 50 us */
+                show_error = 0;
+                break;
+        case SPIDER_NET_GPWFFINT:
+                /* PHY command queue full */
+                if (netif_msg_intr(card))
+                        pr_err("PHY write queue full\n");
+                show_error = 0;
+                break;
+
+        /* case SPIDER_NET_GRMDADRINT: not used. print a message */
+        /* case SPIDER_NET_GRMARPINT: not used. print a message */
+        /* case SPIDER_NET_GRMMPINT: not used. print a message */
+
+        case SPIDER_NET_GDTDEN0INT:
+                /* someone has set TX_DMA_EN to 0 */
+                show_error = 0;
+                break;
+
+        case SPIDER_NET_GDDDEN0INT: /* fallthrough */
+        case SPIDER_NET_GDCDEN0INT: /* fallthrough */
+        case SPIDER_NET_GDBDEN0INT: /* fallthrough */
+        case SPIDER_NET_GDADEN0INT:
+                /* someone has set RX_DMA_EN to 0 */
+                show_error = 0;
+                break;
+
+        /* RX interrupts */
+        case SPIDER_NET_GDDFDCINT:
+        case SPIDER_NET_GDCFDCINT:
+        case SPIDER_NET_GDBFDCINT:
+        case SPIDER_NET_GDAFDCINT:
+        /* case SPIDER_NET_GDNMINT: not used. print a message */
+        /* case SPIDER_NET_GCNMINT: not used. print a message */
+        /* case SPIDER_NET_GBNMINT: not used. print a message */
+        /* case SPIDER_NET_GANMINT: not used. print a message */
+        /* case SPIDER_NET_GRFNMINT: not used. print a message */
+                show_error = 0;
+                break;
+
+        /* TX interrupts */
+        case SPIDER_NET_GDTFDCINT:
+                show_error = 0;
+                break;
+        case SPIDER_NET_GTTEDINT:
+                show_error = 0;
+                break;
+        case SPIDER_NET_GDTDCEINT:
+                /* chain end. If a descriptor should be sent, kick off
+                 * tx dma
+                if (card->tx_chain.tail == card->tx_chain.head)
+                        spider_net_kick_tx_dma(card);
+                show_error = 0; */
+                break;
+
+        /* case SPIDER_NET_G1TMCNTINT: not used. print a message */
+        /* case SPIDER_NET_GFREECNTINT: not used. print a message */
+        }
+
+        /* check GHIINT1STS ************************************/
+        if (error_reg1)
+                for (i = 0; i < 32; i++)
+                        if (error_reg1 & (1<<i))
+                                switch (i)
+        {
+        case SPIDER_NET_GTMFLLINT:
+                if (netif_msg_intr(card))
+                        pr_err("Spider TX RAM full\n");
+                show_error = 0;
+                break;
+        case SPIDER_NET_GRMFLLINT:
+                if (netif_msg_intr(card))
+                        pr_err("Spider RX RAM full, incoming packets "
+                               "might be discarded !\n");
+                netif_rx_schedule(card->netdev);
+                spider_net_enable_rxchtails(card);
+                spider_net_enable_rxdmac(card);
+                break;
+
+        /* case SPIDER_NET_GTMSHTINT: problem, print a message */
+        case SPIDER_NET_GDTINVDINT:
+                /* allrighty. tx from previous descr ok */
+                show_error = 0;
+                break;
+        /* case SPIDER_NET_GRFDFLLINT: print a message down there */
+        /* case SPIDER_NET_GRFCFLLINT: print a message down there */
+        /* case SPIDER_NET_GRFBFLLINT: print a message down there */
+        /* case SPIDER_NET_GRFAFLLINT: print a message down there */
+
+        /* chain end */
+        case SPIDER_NET_GDDDCEINT: /* fallthrough */
+        case SPIDER_NET_GDCDCEINT: /* fallthrough */
+        case SPIDER_NET_GDBDCEINT: /* fallthrough */
+        case SPIDER_NET_GDADCEINT:
+                if (netif_msg_intr(card))
+                        pr_err("got descriptor chain end interrupt, "
+                               "restarting DMAC %c.\n",
+                               'D'+i-SPIDER_NET_GDDDCEINT);
+                spider_net_refill_rx_chain(card);
+                show_error = 0;
+                break;
+
+        /* invalid descriptor */
+        case SPIDER_NET_GDDINVDINT: /* fallthrough */
+        case SPIDER_NET_GDCINVDINT: /* fallthrough */
+        case SPIDER_NET_GDBINVDINT: /* fallthrough */
+        case SPIDER_NET_GDAINVDINT:
+                /* could happen when rx chain is full */
+                spider_net_refill_rx_chain(card);
+                show_error = 0;
+                break;
+
+        /* case SPIDER_NET_GDTRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDDRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDCRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDBRSERINT: problem, print a message */
+        /* case SPIDER_NET_GDARSERINT: problem, print a message */
+        /* case SPIDER_NET_GDSERINT: problem, print a message */
+        /* case SPIDER_NET_GDTPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDDPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDCPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDBPTERINT: problem, print a message */
+        /* case SPIDER_NET_GDAPTERINT: problem, print a message */
+        default:
+                show_error = 1;
+                break;
+        }
+
+        /* check GHIINT2STS ************************************/
+        if (error_reg2)
+                for (i = 0; i < 32; i++)
+                        if (error_reg2 & (1<<i))
+                                switch (i)
+        {
+        /* there is nothing we can (want  to) do at this time. Log a
+         * message, we can switch on and off the specific values later on
+        case SPIDER_NET_GPROPERINT:
+        case SPIDER_NET_GMCTCRSNGINT:
+        case SPIDER_NET_GMCTLCOLINT:
+        case SPIDER_NET_GMCTTMOTINT:
+        case SPIDER_NET_GMCRCAERINT:
+        case SPIDER_NET_GMCRCALERINT:
+        case SPIDER_NET_GMCRALNERINT:
+        case SPIDER_NET_GMCROVRINT:
+        case SPIDER_NET_GMCRRNTINT:
+        case SPIDER_NET_GMCRRXERINT:
+        case SPIDER_NET_GTITCSERINT:
+        case SPIDER_NET_GTIFMTERINT:
+        case SPIDER_NET_GTIPKTRVKINT:
+        case SPIDER_NET_GTISPINGINT:
+        case SPIDER_NET_GTISADNGINT:
+        case SPIDER_NET_GTISPDNGINT:
+        case SPIDER_NET_GRIFMTERINT:
+        case SPIDER_NET_GRIPKTRVKINT:
+        case SPIDER_NET_GRISPINGINT:
+        case SPIDER_NET_GRISADNGINT:
+        case SPIDER_NET_GRISPDNGINT:
+                break;
+        */
+                default:
+                        break;
+        }
+
+        if ((show_error) && (netif_msg_intr(card)))
+                pr_err("Got error interrupt, GHIINT0STS = 0x%08x, "
+                       "GHIINT1STS = 0x%08x, GHIINT2STS = 0x%08x\n",
+                       status_reg, error_reg1, error_reg2);
+
+        /* clear interrupt sources */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT1STS, error_reg1);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT2STS, error_reg2);
+}
+
+/**
+ * spider_net_interrupt - interrupt handler for spider_net
+ * @irq: interupt number
+ * @ptr: pointer to net_device
+ * @regs: PU registers
+ *
+ * returns IRQ_HANDLED, if interrupt was for driver, or IRQ_NONE, if no
+ * interrupt found raised by card.
+ *
+ * This is the interrupt handler, that turns off
+ * interrupts for this device and makes the stack poll the driver
+ */
+static irqreturn_t
+spider_net_interrupt(int irq, void *ptr, struct pt_regs *regs)
+{
+        struct net_device *netdev = ptr;
+        struct spider_net_card *card = netdev_priv(netdev);
+        u32 status_reg;
+
+        status_reg = spider_net_read_reg(card, SPIDER_NET_GHIINT0STS);
+
+        if (!status_reg)
+                return IRQ_NONE;
+
+        if (status_reg & SPIDER_NET_TXINT)
+                spider_net_release_tx_chain(card, 0);
+
+        if (status_reg & SPIDER_NET_RXINT ) {
+                spider_net_rx_irq_off(card);
+                netif_rx_schedule(netdev);
+        }
+
+        /* we do this after rx and tx processing, as we want the tx chain
+         * processed to see, whether we should restart tx dma processing */
+        spider_net_handle_error_irq(card, status_reg);
+
+        /* clear interrupt sources */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT0STS, status_reg);
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/**
+ * spider_net_poll_controller - artificial interrupt for netconsole etc.
+ * @netdev: interface device structure
+ *
+ * see Documentation/networking/netconsole.txt
+ */
+static void
+spider_net_poll_controller(struct net_device *netdev)
+{
+        disable_irq(netdev->irq);
+        spider_net_interrupt(netdev->irq, netdev, NULL);
+        enable_irq(netdev->irq);
+}
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+
+/**
+ * spider_net_init_card - initializes the card
+ * @card: card structure
+ *
+ * spider_net_init_card initializes the card so that other registers can
+ * be used
+ */
+static void
+spider_net_init_card(struct spider_net_card *card)
+{
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_STOP_VALUE);
+
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_RUN_VALUE);
+}
+
+/**
+ * spider_net_enable_card - enables the card by setting all kinds of regs
+ * @card: card structure
+ *
+ * spider_net_enable_card sets a lot of SMMIO registers to enable the device
+ */
+static void
+spider_net_enable_card(struct spider_net_card *card)
+{
+        int i;
+        /* the following array consists of (register),(value) pairs
+         * that are set in this function. A register of 0 ends the list */
+        u32 regs[][2] = {
+                { SPIDER_NET_GRESUMINTNUM, 0 },
+                { SPIDER_NET_GREINTNUM, 0 },
+
+                /* set interrupt frame number registers */
+                /* clear the single DMA engine registers first */
+                { SPIDER_NET_GFAFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                { SPIDER_NET_GFBFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                { SPIDER_NET_GFCFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                { SPIDER_NET_GFDFRMNUM, SPIDER_NET_GFXFRAMES_VALUE },
+                /* then set, what we really need */
+                { SPIDER_NET_GFFRMNUM, SPIDER_NET_FRAMENUM_VALUE },
+
+                /* timer counter registers and stuff */
+                { SPIDER_NET_GFREECNNUM, 0 },
+                { SPIDER_NET_GONETIMENUM, 0 },
+                { SPIDER_NET_GTOUTFRMNUM, 0 },
+
+                /* RX mode setting */
+                { SPIDER_NET_GRXMDSET, SPIDER_NET_RXMODE_VALUE },
+                /* TX mode setting */
+                { SPIDER_NET_GTXMDSET, SPIDER_NET_TXMODE_VALUE },
+                /* IPSEC mode setting */
+                { SPIDER_NET_GIPSECINIT, SPIDER_NET_IPSECINIT_VALUE },
+
+                { SPIDER_NET_GFTRESTRT, SPIDER_NET_RESTART_VALUE },
+
+                { SPIDER_NET_GMRWOLCTRL, 0 },
+                { SPIDER_NET_GTESTMD, 0 },
+
+                { SPIDER_NET_GMACINTEN, 0 },
+
+                /* flow control stuff */
+                { SPIDER_NET_GMACAPAUSE, SPIDER_NET_MACAPAUSE_VALUE },
+                { SPIDER_NET_GMACTXPAUSE, SPIDER_NET_TXPAUSE_VALUE },
+
+                { SPIDER_NET_GMACBSTLMT, SPIDER_NET_BURSTLMT_VALUE },
+                { 0, 0}
+        };
+
+        i = 0;
+        while (regs[i][0]) {
+                spider_net_write_reg(card, regs[i][0], regs[i][1]);
+                i++;
+        }
+
+        /* clear unicast filter table entries 1 to 14 */
+        for (i = 1; i <= 14; i++) {
+                spider_net_write_reg(card,
+                                     SPIDER_NET_GMRUAFILnR + i * 8,
+                                     0x00080000);
+                spider_net_write_reg(card,
+                                     SPIDER_NET_GMRUAFILnR + i * 8 + 4,
+                                     0x00000000);
+        }
+
+        spider_net_write_reg(card, SPIDER_NET_GMRUA0FIL15R, 0x08080000);
+
+        spider_net_write_reg(card, SPIDER_NET_ECMODE, SPIDER_NET_ECMODE_VALUE);
+
+        /* set chain tail adress for RX chains and
+         * enable DMA */
+        spider_net_enable_rxchtails(card);
+        spider_net_enable_rxdmac(card);
+
+        spider_net_write_reg(card, SPIDER_NET_GRXDMAEN, SPIDER_NET_WOL_VALUE);
+
+        /* set chain tail adress for TX chain */
+        spider_net_enable_txdmac(card);
+
+        spider_net_write_reg(card, SPIDER_NET_GMACLENLMT,
+                             SPIDER_NET_LENLMT_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GMACMODE,
+                             SPIDER_NET_MACMODE_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GMACOPEMD,
+                             SPIDER_NET_OPMODE_VALUE);
+
+        /* set interrupt mask registers */
+        spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK,
+                             SPIDER_NET_INT0_MASK_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT1MSK,
+                             SPIDER_NET_INT1_MASK_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GHIINT2MSK,
+                             SPIDER_NET_INT2_MASK_VALUE);
+}
+
+/**
+ * spider_net_open - called upon ifonfig up
+ * @netdev: interface device structure
+ *
+ * returns 0 on success, <0 on failure
+ *
+ * spider_net_open allocates all the descriptors and memory needed for
+ * operation, sets up multicast list and enables interrupts
+ */
+int
+spider_net_open(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev_priv(netdev);
+        int result;
+
+        result = -ENOMEM;
+        if (spider_net_init_chain(card, &card->tx_chain,
+                          card->descr, tx_descriptors))
+                goto alloc_tx_failed;
+        if (spider_net_init_chain(card, &card->rx_chain,
+                          card->descr + tx_descriptors, rx_descriptors))
+                goto alloc_rx_failed;
+
+        /* allocate rx skbs */
+        if (spider_net_alloc_rx_skbs(card))
+                goto alloc_skbs_failed;
+
+        spider_net_set_multi(netdev);
+
+        /* further enhancement: setup hw vlan, if needed */
+
+        result = -EBUSY;
+        if (request_irq(netdev->irq, spider_net_interrupt,
+                             SA_SHIRQ, netdev->name, netdev))
+                goto register_int_failed;
+
+        spider_net_enable_card(card);
+
+        netif_start_queue(netdev);
+        netif_carrier_on(netdev);
+        netif_poll_enable(netdev);
+
+        return 0;
+
+register_int_failed:
+        spider_net_free_rx_chain_contents(card);
+alloc_skbs_failed:
+        spider_net_free_chain(card, &card->rx_chain);
+alloc_rx_failed:
+        spider_net_free_chain(card, &card->tx_chain);
+alloc_tx_failed:
+        return result;
+}
+
+/**
+ * spider_net_setup_phy - setup PHY
+ * @card: card structure
+ *
+ * returns 0 on success, <0 on failure
+ *
+ * spider_net_setup_phy is used as part of spider_net_probe. Sets
+ * the PHY to 1000 Mbps
+ **/
+static int
+spider_net_setup_phy(struct spider_net_card *card)
+{
+        struct mii_phy *phy = &card->phy;
+
+        spider_net_write_reg(card, SPIDER_NET_GDTDMASEL,
+                             SPIDER_NET_DMASEL_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_GPCCTRL,
+                             SPIDER_NET_PHY_CTRL_VALUE);
+        phy->mii_id = 1;
+        phy->dev = card->netdev;
+        phy->mdio_read = spider_net_read_phy;
+        phy->mdio_write = spider_net_write_phy;
+
+        mii_phy_probe(phy, phy->mii_id);
+
+        if (phy->def->ops->setup_forced)
+                phy->def->ops->setup_forced(phy, SPEED_1000, DUPLEX_FULL);
+
+        /* the following two writes could be moved to sungem_phy.c */
+        /* enable fiber mode */
+        spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0x9020);
+        /* LEDs active in both modes, autosense prio = fiber */
+        spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0x945f);
+
+        phy->def->ops->read_link(phy);
+        pr_info("Found %s with %i Mbps, %s-duplex.\n", phy->def->name,
+                phy->speed, phy->duplex==1 ? "Full" : "Half");
+
+        return 0;
+}
+
+/**
+ * spider_net_download_firmware - loads firmware into the adapter
+ * @card: card structure
+ * @firmware: firmware pointer
+ *
+ * spider_net_download_firmware loads the firmware opened by
+ * spider_net_init_firmware into the adapter.
+ */
+static void
+spider_net_download_firmware(struct spider_net_card *card,
+                             const struct firmware *firmware)
+{
+        int sequencer, i;
+        u32 *fw_ptr = (u32 *)firmware->data;
+
+        /* stop sequencers */
+        spider_net_write_reg(card, SPIDER_NET_GSINIT,
+                             SPIDER_NET_STOP_SEQ_VALUE);
+
+        for (sequencer = 0; sequencer < 6; sequencer++) {
+                spider_net_write_reg(card,
+                                     SPIDER_NET_GSnPRGADR + sequencer * 8, 0);
+                for (i = 0; i < SPIDER_NET_FIRMWARE_LEN; i++) {
+                        spider_net_write_reg(card, SPIDER_NET_GSnPRGDAT +
+                                             sequencer * 8, *fw_ptr);
+                        fw_ptr++;
+                }
+        }
+
+        spider_net_write_reg(card, SPIDER_NET_GSINIT,
+                             SPIDER_NET_RUN_SEQ_VALUE);
+}
+
+/**
+ * spider_net_init_firmware - reads in firmware parts
+ * @card: card structure
+ *
+ * Returns 0 on success, <0 on failure
+ *
+ * spider_net_init_firmware opens the sequencer firmware and does some basic
+ * checks. This function opens and releases the firmware structure. A call
+ * to download the firmware is performed before the release.
+ *
+ * Firmware format
+ * ===============
+ * spider_fw.bin is expected to be a file containing 6*1024*4 bytes, 4k being
+ * the program for each sequencer. Use the command
+ *    tail -q -n +2 Seq_code1_0x088.txt Seq_code2_0x090.txt              \
+ *         Seq_code3_0x098.txt Seq_code4_0x0A0.txt Seq_code5_0x0A8.txt   \
+ *         Seq_code6_0x0B0.txt | xxd -r -p -c4 > spider_fw.bin
+ *
+ * to generate spider_fw.bin, if you have sequencer programs with something
+ * like the following contents for each sequencer:
+ *    <ONE LINE COMMENT>
+ *    <FIRST 4-BYTES-WORD FOR SEQUENCER>
+ *    <SECOND 4-BYTES-WORD FOR SEQUENCER>
+ *     ...
+ *    <1024th 4-BYTES-WORD FOR SEQUENCER>
+ */
+static int
+spider_net_init_firmware(struct spider_net_card *card)
+{
+        const struct firmware *firmware;
+        int err = -EIO;
+
+        if (request_firmware(&firmware,
+                             SPIDER_NET_FIRMWARE_NAME, &card->pdev->dev) < 0) {
+                if (netif_msg_probe(card))
+                        pr_err("Couldn't read in sequencer data file %s.\n",
+                               SPIDER_NET_FIRMWARE_NAME);
+                firmware = NULL;
+                goto out;
+        }
+
+        if (firmware->size != 6 * SPIDER_NET_FIRMWARE_LEN * sizeof(u32)) {
+                if (netif_msg_probe(card))
+                        pr_err("Invalid size of sequencer data file %s.\n",
+                               SPIDER_NET_FIRMWARE_NAME);
+                goto out;
+        }
+
+        spider_net_download_firmware(card, firmware);
+
+        err = 0;
+out:
+        release_firmware(firmware);
+
+        return err;
+}
+
+/**
+ * spider_net_workaround_rxramfull - work around firmware bug
+ * @card: card structure
+ *
+ * no return value
+ **/
+static void
+spider_net_workaround_rxramfull(struct spider_net_card *card)
+{
+        int i, sequencer = 0;
+
+        /* cancel reset */
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_RUN_VALUE);
+
+        /* empty sequencer data */
+        for (sequencer = 0; sequencer < 6; sequencer++) {
+                spider_net_write_reg(card, SPIDER_NET_GSnPRGDAT +
+                                     sequencer * 8, 0x0);
+                for (i = 0; i < SPIDER_NET_FIRMWARE_LEN; i++) {
+                        spider_net_write_reg(card, SPIDER_NET_GSnPRGDAT +
+                                             sequencer * 8, 0x0);
+                }
+        }
+
+        /* set sequencer operation */
+        spider_net_write_reg(card, SPIDER_NET_GSINIT, 0x000000fe);
+
+        /* reset */
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_STOP_VALUE);
+}
+
+/**
+ * spider_net_tx_timeout_task - task scheduled by the watchdog timeout
+ * function (to be called not under interrupt status)
+ * @data: data, is interface device structure
+ *
+ * called as task when tx hangs, resets interface (if interface is up)
+ */
+static void
+spider_net_tx_timeout_task(void *data)
+{
+        struct net_device *netdev = data;
+        struct spider_net_card *card = netdev_priv(netdev);
+
+        if (!(netdev->flags & IFF_UP))
+                goto out;
+
+        netif_device_detach(netdev);
+        spider_net_stop(netdev);
+
+        spider_net_workaround_rxramfull(card);
+        spider_net_init_card(card);
+
+        if (spider_net_setup_phy(card))
+                goto out;
+        if (spider_net_init_firmware(card))
+                goto out;
+
+        spider_net_open(netdev);
+        spider_net_kick_tx_dma(card, card->tx_chain.head);
+        netif_device_attach(netdev);
+
+out:
+        atomic_dec(&card->tx_timeout_task_counter);
+}
+
+/**
+ * spider_net_tx_timeout - called when the tx timeout watchdog kicks in.
+ * @netdev: interface device structure
+ *
+ * called, if tx hangs. Schedules a task that resets the interface
+ */
+static void
+spider_net_tx_timeout(struct net_device *netdev)
+{
+        struct spider_net_card *card;
+
+        card = netdev_priv(netdev);
+        atomic_inc(&card->tx_timeout_task_counter);
+        if (netdev->flags & IFF_UP)
+                schedule_work(&card->tx_timeout_task);
+        else
+                atomic_dec(&card->tx_timeout_task_counter);
+}
+
+/**
+ * spider_net_setup_netdev_ops - initialization of net_device operations
+ * @netdev: net_device structure
+ *
+ * fills out function pointers in the net_device structure
+ */
+static void
+spider_net_setup_netdev_ops(struct net_device *netdev)
+{
+        netdev->open = &spider_net_open;
+        netdev->stop = &spider_net_stop;
+        netdev->hard_start_xmit = &spider_net_xmit;
+        netdev->get_stats = &spider_net_get_stats;
+        netdev->set_multicast_list = &spider_net_set_multi;
+        netdev->set_mac_address = &spider_net_set_mac;
+        netdev->change_mtu = &spider_net_change_mtu;
+        netdev->do_ioctl = &spider_net_do_ioctl;
+        /* tx watchdog */
+        netdev->tx_timeout = &spider_net_tx_timeout;
+        netdev->watchdog_timeo = SPIDER_NET_WATCHDOG_TIMEOUT;
+        /* NAPI */
+        netdev->poll = &spider_net_poll;
+        netdev->weight = SPIDER_NET_NAPI_WEIGHT;
+        /* HW VLAN */
+        netdev->vlan_rx_register = &spider_net_vlan_rx_reg;
+        netdev->vlan_rx_add_vid = &spider_net_vlan_rx_add;
+        netdev->vlan_rx_kill_vid = &spider_net_vlan_rx_kill;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        /* poll controller */
+        netdev->poll_controller = &spider_net_poll_controller;
+#endif /* CONFIG_NET_POLL_CONTROLLER */
+        /* ethtool ops */
+        netdev->ethtool_ops = &spider_net_ethtool_ops;
+}
+
+/**
+ * spider_net_setup_netdev - initialization of net_device
+ * @card: card structure
+ *
+ * Returns 0 on success or <0 on failure
+ *
+ * spider_net_setup_netdev initializes the net_device structure
+ **/
+static int
+spider_net_setup_netdev(struct spider_net_card *card)
+{
+        int result;
+        struct net_device *netdev = card->netdev;
+        struct device_node *dn;
+        struct sockaddr addr;
+        u8 *mac;
+
+        SET_MODULE_OWNER(netdev);
+        SET_NETDEV_DEV(netdev, &card->pdev->dev);
+
+        pci_set_drvdata(card->pdev, netdev);
+        spin_lock_init(&card->intmask_lock);
+        netdev->irq = card->pdev->irq;
+
+        card->options.rx_csum = SPIDER_NET_RX_CSUM_DEFAULT;
+
+        spider_net_setup_netdev_ops(netdev);
+
+        netdev->features = 0;
+        /* some time: NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
+         *              NETIF_F_HW_VLAN_FILTER */
+
+        netdev->irq = card->pdev->irq;
+
+        dn = pci_device_to_OF_node(card->pdev);
+        if (!dn)
+                return -EIO;
+
+        mac = (u8 *)get_property(dn, "local-mac-address", NULL);
+        if (!mac)
+                return -EIO;
+        memcpy(addr.sa_data, mac, ETH_ALEN);
+
+        result = spider_net_set_mac(netdev, &addr);
+        if ((result) && (netif_msg_probe(card)))
+                pr_err("Failed to set MAC address: %i\n", result);
+
+        result = register_netdev(netdev);
+        if (result) {
+                if (netif_msg_probe(card))
+                        pr_err("Couldn't register net_device: %i\n",
+                                  result);
+                return result;
+        }
+
+        if (netif_msg_probe(card))
+                pr_info("Initialized device %s.\n", netdev->name);
+
+        return 0;
+}
+
+/**
+ * spider_net_alloc_card - allocates net_device and card structure
+ *
+ * returns the card structure or NULL in case of errors
+ *
+ * the card and net_device structures are linked to each other
+ */
+static struct spider_net_card *
+spider_net_alloc_card(void)
+{
+        struct net_device *netdev;
+        struct spider_net_card *card;
+        size_t alloc_size;
+
+        alloc_size = sizeof (*card) +
+                sizeof (struct spider_net_descr) * rx_descriptors +
+                sizeof (struct spider_net_descr) * tx_descriptors;
+        netdev = alloc_etherdev(alloc_size);
+        if (!netdev)
+                return NULL;
+
+        card = netdev_priv(netdev);
+        card->netdev = netdev;
+        card->msg_enable = SPIDER_NET_DEFAULT_MSG;
+        INIT_WORK(&card->tx_timeout_task, spider_net_tx_timeout_task, netdev);
+        init_waitqueue_head(&card->waitq);
+        atomic_set(&card->tx_timeout_task_counter, 0);
+
+        return card;
+}
+
+/**
+ * spider_net_undo_pci_setup - releases PCI ressources
+ * @card: card structure
+ *
+ * spider_net_undo_pci_setup releases the mapped regions
+ */
+static void
+spider_net_undo_pci_setup(struct spider_net_card *card)
+{
+        iounmap(card->regs);
+        pci_release_regions(card->pdev);
+}
+
+/**
+ * spider_net_setup_pci_dev - sets up the device in terms of PCI operations
+ * @card: card structure
+ * @pdev: PCI device
+ *
+ * Returns the card structure or NULL if any errors occur
+ *
+ * spider_net_setup_pci_dev initializes pdev and together with the
+ * functions called in spider_net_open configures the device so that
+ * data can be transferred over it
+ * The net_device structure is attached to the card structure, if the
+ * function returns without error.
+ **/
+static struct spider_net_card *
+spider_net_setup_pci_dev(struct pci_dev *pdev)
+{
+        struct spider_net_card *card;
+        unsigned long mmio_start, mmio_len;
+
+        if (pci_enable_device(pdev)) {
+                pr_err("Couldn't enable PCI device\n");
+                return NULL;
+        }
+
+        if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
+                pr_err("Couldn't find proper PCI device base address.\n");
+                goto out_disable_dev;
+        }
+
+        if (pci_request_regions(pdev, spider_net_driver_name)) {
+                pr_err("Couldn't obtain PCI resources, aborting.\n");
+                goto out_disable_dev;
+        }
+
+        pci_set_master(pdev);
+
+        card = spider_net_alloc_card();
+        if (!card) {
+                pr_err("Couldn't allocate net_device structure, "
+                          "aborting.\n");
+                goto out_release_regions;
+        }
+        card->pdev = pdev;
+
+        /* fetch base address and length of first resource */
+        mmio_start = pci_resource_start(pdev, 0);
+        mmio_len = pci_resource_len(pdev, 0);
+
+        card->netdev->mem_start = mmio_start;
+        card->netdev->mem_end = mmio_start + mmio_len;
+        card->regs = ioremap(mmio_start, mmio_len);
+
+        if (!card->regs) {
+                pr_err("Couldn't obtain PCI resources, aborting.\n");
+                goto out_release_regions;
+        }
+
+        return card;
+
+out_release_regions:
+        pci_release_regions(pdev);
+out_disable_dev:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        return NULL;
+}
+
+/**
+ * spider_net_probe - initialization of a device
+ * @pdev: PCI device
+ * @ent: entry in the device id list
+ *
+ * Returns 0 on success, <0 on failure
+ *
+ * spider_net_probe initializes pdev and registers a net_device
+ * structure for it. After that, the device can be ifconfig'ed up
+ **/
+static int __devinit
+spider_net_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        int err = -EIO;
+        struct spider_net_card *card;
+
+        card = spider_net_setup_pci_dev(pdev);
+        if (!card)
+                goto out;
+
+        spider_net_workaround_rxramfull(card);
+        spider_net_init_card(card);
+
+        err = spider_net_setup_phy(card);
+        if (err)
+                goto out_undo_pci;
+
+        err = spider_net_init_firmware(card);
+        if (err)
+                goto out_undo_pci;
+
+        err = spider_net_setup_netdev(card);
+        if (err)
+                goto out_undo_pci;
+
+        return 0;
+
+out_undo_pci:
+        spider_net_undo_pci_setup(card);
+        free_netdev(card->netdev);
+out:
+        return err;
+}
+
+/**
+ * spider_net_remove - removal of a device
+ * @pdev: PCI device
+ *
+ * Returns 0 on success, <0 on failure
+ *
+ * spider_net_remove is called to remove the device and unregisters the
+ * net_device
+ **/
+static void __devexit
+spider_net_remove(struct pci_dev *pdev)
+{
+        struct net_device *netdev;
+        struct spider_net_card *card;
+
+        netdev = pci_get_drvdata(pdev);
+        card = netdev_priv(netdev);
+
+        wait_event(card->waitq,
+                   atomic_read(&card->tx_timeout_task_counter) == 0);
+
+        unregister_netdev(netdev);
+
+        /* switch off card */
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_STOP_VALUE);
+        spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
+                             SPIDER_NET_CKRCTRL_RUN_VALUE);
+
+        spider_net_undo_pci_setup(card);
+        free_netdev(netdev);
+}
+
+static struct pci_driver spider_net_driver = {
+        .owner          = THIS_MODULE,
+        .name           = spider_net_driver_name,
+        .id_table       = spider_net_pci_tbl,
+        .probe          = spider_net_probe,
+        .remove         = __devexit_p(spider_net_remove)
+};
+
+/**
+ * spider_net_init - init function when the driver is loaded
+ *
+ * spider_net_init registers the device driver
+ */
+static int __init spider_net_init(void)
+{
+        if (rx_descriptors < SPIDER_NET_RX_DESCRIPTORS_MIN) {
+                rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MIN;
+                pr_info("adjusting rx descriptors to %i.\n", rx_descriptors);
+        }
+        if (rx_descriptors > SPIDER_NET_RX_DESCRIPTORS_MAX) {
+                rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MAX;
+                pr_info("adjusting rx descriptors to %i.\n", rx_descriptors);
+        }
+        if (tx_descriptors < SPIDER_NET_TX_DESCRIPTORS_MIN) {
+                tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_MIN;
+                pr_info("adjusting tx descriptors to %i.\n", tx_descriptors);
+        }
+        if (tx_descriptors > SPIDER_NET_TX_DESCRIPTORS_MAX) {
+                tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_MAX;
+                pr_info("adjusting tx descriptors to %i.\n", tx_descriptors);
+        }
+
+        return pci_register_driver(&spider_net_driver);
+}
+
+/**
+ * spider_net_cleanup - exit function when driver is unloaded
+ *
+ * spider_net_cleanup unregisters the device driver
+ */
+static void __exit spider_net_cleanup(void)
+{
+        pci_unregister_driver(&spider_net_driver);
+}
+
+module_init(spider_net_init);
+module_exit(spider_net_cleanup);
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
new file mode 100644
index 000000000000..22b2f2347351
--- /dev/null
+++ b/drivers/net/spider_net.h
@@ -0,0 +1,469 @@
+/*
+ * Network device driver for Cell Processor-Based Blade
+ *
+ * (C) Copyright IBM Corp. 2005
+ *
+ * Authors : Utz Bacher <utz.bacher@de.ibm.com>
+ *           Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _SPIDER_NET_H
+#define _SPIDER_NET_H
+
+#include "sungem_phy.h"
+
+extern int spider_net_stop(struct net_device *netdev);
+extern int spider_net_open(struct net_device *netdev);
+
+extern struct ethtool_ops spider_net_ethtool_ops;
+
+extern char spider_net_driver_name[];
+
+#define SPIDER_NET_MAX_MTU                      2308
+#define SPIDER_NET_MIN_MTU                      64
+
+#define SPIDER_NET_RXBUF_ALIGN                  128
+
+#define SPIDER_NET_RX_DESCRIPTORS_DEFAULT       64
+#define SPIDER_NET_RX_DESCRIPTORS_MIN           16
+#define SPIDER_NET_RX_DESCRIPTORS_MAX           256
+
+#define SPIDER_NET_TX_DESCRIPTORS_DEFAULT       64
+#define SPIDER_NET_TX_DESCRIPTORS_MIN           16
+#define SPIDER_NET_TX_DESCRIPTORS_MAX           256
+
+#define SPIDER_NET_RX_CSUM_DEFAULT              1
+
+#define SPIDER_NET_WATCHDOG_TIMEOUT 5*HZ
+#define SPIDER_NET_NAPI_WEIGHT 64
+
+#define SPIDER_NET_FIRMWARE_LEN         1024
+#define SPIDER_NET_FIRMWARE_NAME        "spider_fw.bin"
+
+/** spider_net SMMIO registers */
+#define SPIDER_NET_GHIINT0STS           0x00000000
+#define SPIDER_NET_GHIINT1STS           0x00000004
+#define SPIDER_NET_GHIINT2STS           0x00000008
+#define SPIDER_NET_GHIINT0MSK           0x00000010
+#define SPIDER_NET_GHIINT1MSK           0x00000014
+#define SPIDER_NET_GHIINT2MSK           0x00000018
+
+#define SPIDER_NET_GRESUMINTNUM         0x00000020
+#define SPIDER_NET_GREINTNUM            0x00000024
+
+#define SPIDER_NET_GFFRMNUM             0x00000028
+#define SPIDER_NET_GFAFRMNUM            0x0000002c
+#define SPIDER_NET_GFBFRMNUM            0x00000030
+#define SPIDER_NET_GFCFRMNUM            0x00000034
+#define SPIDER_NET_GFDFRMNUM            0x00000038
+
+/* clear them (don't use it) */
+#define SPIDER_NET_GFREECNNUM           0x0000003c
+#define SPIDER_NET_GONETIMENUM          0x00000040
+
+#define SPIDER_NET_GTOUTFRMNUM          0x00000044
+
+#define SPIDER_NET_GTXMDSET             0x00000050
+#define SPIDER_NET_GPCCTRL              0x00000054
+#define SPIDER_NET_GRXMDSET             0x00000058
+#define SPIDER_NET_GIPSECINIT           0x0000005c
+#define SPIDER_NET_GFTRESTRT            0x00000060
+#define SPIDER_NET_GRXDMAEN             0x00000064
+#define SPIDER_NET_GMRWOLCTRL           0x00000068
+#define SPIDER_NET_GPCWOPCMD            0x0000006c
+#define SPIDER_NET_GPCROPCMD            0x00000070
+#define SPIDER_NET_GTTFRMCNT            0x00000078
+#define SPIDER_NET_GTESTMD              0x0000007c
+
+#define SPIDER_NET_GSINIT               0x00000080
+#define SPIDER_NET_GSnPRGADR            0x00000084
+#define SPIDER_NET_GSnPRGDAT            0x00000088
+
+#define SPIDER_NET_GMACOPEMD            0x00000100
+#define SPIDER_NET_GMACLENLMT           0x00000108
+#define SPIDER_NET_GMACINTEN            0x00000118
+#define SPIDER_NET_GMACPHYCTRL          0x00000120
+
+#define SPIDER_NET_GMACAPAUSE           0x00000154
+#define SPIDER_NET_GMACTXPAUSE          0x00000164
+
+#define SPIDER_NET_GMACMODE             0x000001b0
+#define SPIDER_NET_GMACBSTLMT           0x000001b4
+
+#define SPIDER_NET_GMACUNIMACU          0x000001c0
+#define SPIDER_NET_GMACUNIMACL          0x000001c8
+
+#define SPIDER_NET_GMRMHFILnR           0x00000400
+#define SPIDER_NET_MULTICAST_HASHES     256
+
+#define SPIDER_NET_GMRUAFILnR           0x00000500
+#define SPIDER_NET_GMRUA0FIL15R         0x00000578
+
+/* RX DMA controller registers, all 0x00000a.. are for DMA controller A,
+ * 0x00000b.. for DMA controller B, etc. */
+#define SPIDER_NET_GDADCHA              0x00000a00
+#define SPIDER_NET_GDADMACCNTR          0x00000a04
+#define SPIDER_NET_GDACTDPA             0x00000a08
+#define SPIDER_NET_GDACTDCNT            0x00000a0c
+#define SPIDER_NET_GDACDBADDR           0x00000a20
+#define SPIDER_NET_GDACDBSIZE           0x00000a24
+#define SPIDER_NET_GDACNEXTDA           0x00000a28
+#define SPIDER_NET_GDACCOMST            0x00000a2c
+#define SPIDER_NET_GDAWBCOMST           0x00000a30
+#define SPIDER_NET_GDAWBRSIZE           0x00000a34
+#define SPIDER_NET_GDAWBVSIZE           0x00000a38
+#define SPIDER_NET_GDAWBTRST            0x00000a3c
+#define SPIDER_NET_GDAWBTRERR           0x00000a40
+
+/* TX DMA controller registers */
+#define SPIDER_NET_GDTDCHA              0x00000e00
+#define SPIDER_NET_GDTDMACCNTR          0x00000e04
+#define SPIDER_NET_GDTCDPA              0x00000e08
+#define SPIDER_NET_GDTDMASEL            0x00000e14
+
+#define SPIDER_NET_ECMODE               0x00000f00
+/* clock and reset control register */
+#define SPIDER_NET_CKRCTRL              0x00000ff0
+
+/** SCONFIG registers */
+#define SPIDER_NET_SCONFIG_IOACTE       0x00002810
+
+/** hardcoded register values */
+#define SPIDER_NET_INT0_MASK_VALUE      0x3f7fe3ff
+#define SPIDER_NET_INT1_MASK_VALUE      0xffffffff
+/* no MAC aborts -> auto retransmission */
+#define SPIDER_NET_INT2_MASK_VALUE      0xfffffff1
+
+/* clear counter when interrupt sources are cleared
+#define SPIDER_NET_FRAMENUM_VALUE       0x0001f001 */
+/* we rely on flagged descriptor interrupts */
+#define SPIDER_NET_FRAMENUM_VALUE       0x00000000
+/* set this first, then the FRAMENUM_VALUE */
+#define SPIDER_NET_GFXFRAMES_VALUE      0x00000000
+
+#define SPIDER_NET_STOP_SEQ_VALUE       0x00000000
+#define SPIDER_NET_RUN_SEQ_VALUE        0x0000007e
+
+#define SPIDER_NET_PHY_CTRL_VALUE       0x00040040
+/* #define SPIDER_NET_PHY_CTRL_VALUE    0x01070080*/
+#define SPIDER_NET_RXMODE_VALUE         0x00000011
+/* auto retransmission in case of MAC aborts */
+#define SPIDER_NET_TXMODE_VALUE         0x00010000
+#define SPIDER_NET_RESTART_VALUE        0x00000000
+#define SPIDER_NET_WOL_VALUE            0x00001111
+#if 0
+#define SPIDER_NET_WOL_VALUE            0x00000000
+#endif
+#define SPIDER_NET_IPSECINIT_VALUE      0x00f000f8
+
+/* pause frames: automatic, no upper retransmission count */
+/* outside loopback mode: ETOMOD signal dont matter, not connected */
+#define SPIDER_NET_OPMODE_VALUE         0x00000063
+/*#define SPIDER_NET_OPMODE_VALUE               0x001b0062*/
+#define SPIDER_NET_LENLMT_VALUE         0x00000908
+
+#define SPIDER_NET_MACAPAUSE_VALUE      0x00000800 /* about 1 ms */
+#define SPIDER_NET_TXPAUSE_VALUE        0x00000000
+
+#define SPIDER_NET_MACMODE_VALUE        0x00000001
+#define SPIDER_NET_BURSTLMT_VALUE       0x00000200 /* about 16 us */
+
+/* 1(0)                                 enable r/tx dma
+ *  0000000                             fixed to 0
+ *
+ *         000000                       fixed to 0
+ *               0(1)                   en/disable descr writeback on force end
+ *                0(1)                  force end
+ *
+ *                 000000               fixed to 0
+ *                       00             burst alignment: 128 bytes
+ *
+ *                         00000        fixed to 0
+ *                              0       descr writeback size 32 bytes
+ *                               0(1)   descr chain end interrupt enable
+ *                                0(1)  descr status writeback enable */
+
+/* to set RX_DMA_EN */
+#define SPIDER_NET_DMA_RX_VALUE         0x80000000
+#define SPIDER_NET_DMA_RX_FEND_VALUE    0x00030003
+/* to set TX_DMA_EN */
+#define SPIDER_NET_DMA_TX_VALUE         0x80000000
+#define SPIDER_NET_DMA_TX_FEND_VALUE    0x00030003
+
+/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */
+#define SPIDER_NET_UA_DESCR_VALUE       0x00080000
+#define SPIDER_NET_PROMISC_VALUE        0x00080000
+#define SPIDER_NET_NONPROMISC_VALUE     0x00000000
+
+#define SPIDER_NET_DMASEL_VALUE         0x00000001
+
+#define SPIDER_NET_ECMODE_VALUE         0x00000000
+
+#define SPIDER_NET_CKRCTRL_RUN_VALUE    0x1fff010f
+#define SPIDER_NET_CKRCTRL_STOP_VALUE   0x0000010f
+
+#define SPIDER_NET_SBIMSTATE_VALUE      0x00000000
+#define SPIDER_NET_SBTMSTATE_VALUE      0x00000000
+
+/* SPIDER_NET_GHIINT0STS bits, in reverse order so that they can be used
+ * with 1 << SPIDER_NET_... */
+enum spider_net_int0_status {
+        SPIDER_NET_GPHYINT = 0,
+        SPIDER_NET_GMAC2INT,
+        SPIDER_NET_GMAC1INT,
+        SPIDER_NET_GIPSINT,
+        SPIDER_NET_GFIFOINT,
+        SPIDER_NET_GDMACINT,
+        SPIDER_NET_GSYSINT,
+        SPIDER_NET_GPWOPCMPINT,
+        SPIDER_NET_GPROPCMPINT,
+        SPIDER_NET_GPWFFINT,
+        SPIDER_NET_GRMDADRINT,
+        SPIDER_NET_GRMARPINT,
+        SPIDER_NET_GRMMPINT,
+        SPIDER_NET_GDTDEN0INT,
+        SPIDER_NET_GDDDEN0INT,
+        SPIDER_NET_GDCDEN0INT,
+        SPIDER_NET_GDBDEN0INT,
+        SPIDER_NET_GDADEN0INT,
+        SPIDER_NET_GDTFDCINT,
+        SPIDER_NET_GDDFDCINT,
+        SPIDER_NET_GDCFDCINT,
+        SPIDER_NET_GDBFDCINT,
+        SPIDER_NET_GDAFDCINT,
+        SPIDER_NET_GTTEDINT,
+        SPIDER_NET_GDTDCEINT,
+        SPIDER_NET_GRFDNMINT,
+        SPIDER_NET_GRFCNMINT,
+        SPIDER_NET_GRFBNMINT,
+        SPIDER_NET_GRFANMINT,
+        SPIDER_NET_GRFNMINT,
+        SPIDER_NET_G1TMCNTINT,
+        SPIDER_NET_GFREECNTINT
+};
+/* GHIINT1STS bits */
+enum spider_net_int1_status {
+        SPIDER_NET_GTMFLLINT = 0,
+        SPIDER_NET_GRMFLLINT,
+        SPIDER_NET_GTMSHTINT,
+        SPIDER_NET_GDTINVDINT,
+        SPIDER_NET_GRFDFLLINT,
+        SPIDER_NET_GDDDCEINT,
+        SPIDER_NET_GDDINVDINT,
+        SPIDER_NET_GRFCFLLINT,
+        SPIDER_NET_GDCDCEINT,
+        SPIDER_NET_GDCINVDINT,
+        SPIDER_NET_GRFBFLLINT,
+        SPIDER_NET_GDBDCEINT,
+        SPIDER_NET_GDBINVDINT,
+        SPIDER_NET_GRFAFLLINT,
+        SPIDER_NET_GDADCEINT,
+        SPIDER_NET_GDAINVDINT,
+        SPIDER_NET_GDTRSERINT,
+        SPIDER_NET_GDDRSERINT,
+        SPIDER_NET_GDCRSERINT,
+        SPIDER_NET_GDBRSERINT,
+        SPIDER_NET_GDARSERINT,
+        SPIDER_NET_GDSERINT,
+        SPIDER_NET_GDTPTERINT,
+        SPIDER_NET_GDDPTERINT,
+        SPIDER_NET_GDCPTERINT,
+        SPIDER_NET_GDBPTERINT,
+        SPIDER_NET_GDAPTERINT
+};
+/* GHIINT2STS bits */
+enum spider_net_int2_status {
+        SPIDER_NET_GPROPERINT = 0,
+        SPIDER_NET_GMCTCRSNGINT,
+        SPIDER_NET_GMCTLCOLINT,
+        SPIDER_NET_GMCTTMOTINT,
+        SPIDER_NET_GMCRCAERINT,
+        SPIDER_NET_GMCRCALERINT,
+        SPIDER_NET_GMCRALNERINT,
+        SPIDER_NET_GMCROVRINT,
+        SPIDER_NET_GMCRRNTINT,
+        SPIDER_NET_GMCRRXERINT,
+        SPIDER_NET_GTITCSERINT,
+        SPIDER_NET_GTIFMTERINT,
+        SPIDER_NET_GTIPKTRVKINT,
+        SPIDER_NET_GTISPINGINT,
+        SPIDER_NET_GTISADNGINT,
+        SPIDER_NET_GTISPDNGINT,
+        SPIDER_NET_GRIFMTERINT,
+        SPIDER_NET_GRIPKTRVKINT,
+        SPIDER_NET_GRISPINGINT,
+        SPIDER_NET_GRISADNGINT,
+        SPIDER_NET_GRISPDNGINT
+};
+
+#define SPIDER_NET_TXINT        ( (1 << SPIDER_NET_GTTEDINT) | \
+                                  (1 << SPIDER_NET_GDTDCEINT) | \
+                                  (1 << SPIDER_NET_GDTFDCINT) )
+
+/* we rely on flagged descriptor interrupts*/
+#define SPIDER_NET_RXINT        ( (1 << SPIDER_NET_GDAFDCINT) | \
+                                  (1 << SPIDER_NET_GRMFLLINT) )
+
+#define SPIDER_NET_GPREXEC              0x80000000
+#define SPIDER_NET_GPRDAT_MASK          0x0000ffff
+
+/* descriptor bits
+ *
+ * 1010                                 descriptor ready
+ *     0                                descr in middle of chain
+ *      000                             fixed to 0
+ *
+ *         0                            no interrupt on completion
+ *          000                         fixed to 0
+ *             1                        no ipsec processing
+ *              1                       last descriptor for this frame
+ *               00                     no checksum
+ *               10                     tcp checksum
+ *               11                     udp checksum
+ *
+ *                 00                   fixed to 0
+ *                   0                  fixed to 0
+ *                    0                 no interrupt on response errors
+ *                     0                no interrupt on invalid descr
+ *                      0               no interrupt on dma process termination
+ *                       0              no interrupt on descr chain end
+ *                        0             no interrupt on descr complete
+ *
+ *                         000          fixed to 0
+ *                            0         response error interrupt status
+ *                             0        invalid descr status
+ *                              0       dma termination status
+ *                               0      descr chain end status
+ *                                0     descr complete status */
+#define SPIDER_NET_DMAC_CMDSTAT_NOCS    0xa00c0000
+#define SPIDER_NET_DMAC_CMDSTAT_TCPCS   0xa00e0000
+#define SPIDER_NET_DMAC_CMDSTAT_UDPCS   0xa00f0000
+#define SPIDER_NET_DESCR_IND_PROC_SHIFT 28
+#define SPIDER_NET_DESCR_IND_PROC_MASKO 0x0fffffff
+
+/* descr ready, descr is in middle of chain, get interrupt on completion */
+#define SPIDER_NET_DMAC_RX_CARDOWNED    0xa0800000
+
+/* multicast is no problem */
+#define SPIDER_NET_DATA_ERROR_MASK      0xffffbfff
+
+enum spider_net_descr_status {
+        SPIDER_NET_DESCR_COMPLETE               = 0x00, /* used in rx and tx */
+        SPIDER_NET_DESCR_RESPONSE_ERROR         = 0x01, /* used in rx and tx */
+        SPIDER_NET_DESCR_PROTECTION_ERROR       = 0x02, /* used in rx and tx */
+        SPIDER_NET_DESCR_FRAME_END              = 0x04, /* used in rx */
+        SPIDER_NET_DESCR_FORCE_END              = 0x05, /* used in rx and tx */
+        SPIDER_NET_DESCR_CARDOWNED              = 0x0a, /* used in rx and tx */
+        SPIDER_NET_DESCR_NOT_IN_USE /* any other value */
+};
+
+struct spider_net_descr {
+        /* as defined by the hardware */
+        dma_addr_t buf_addr;
+        u32 buf_size;
+        dma_addr_t next_descr_addr;
+        u32 dmac_cmd_status;
+        u32 result_size;
+        u32 valid_size; /* all zeroes for tx */
+        u32 data_status;
+        u32 data_error; /* all zeroes for tx */
+
+        /* used in the driver */
+        struct sk_buff *skb;
+        dma_addr_t bus_addr;
+        struct spider_net_descr *next;
+        struct spider_net_descr *prev;
+} __attribute__((aligned(32)));
+
+struct spider_net_descr_chain {
+        /* we walk from tail to head */
+        struct spider_net_descr *head;
+        struct spider_net_descr *tail;
+};
+
+/* descriptor data_status bits */
+#define SPIDER_NET_RXIPCHK              29
+#define SPIDER_NET_TCPUDPIPCHK          28
+#define SPIDER_NET_DATA_STATUS_CHK_MASK (1 << SPIDER_NET_RXIPCHK | \
+                                         1 << SPIDER_NET_TCPUDPIPCHK)
+
+#define SPIDER_NET_VLAN_PACKET          21
+
+/* descriptor data_error bits */
+#define SPIDER_NET_RXIPCHKERR           27
+#define SPIDER_NET_RXTCPCHKERR          26
+#define SPIDER_NET_DATA_ERROR_CHK_MASK  (1 << SPIDER_NET_RXIPCHKERR | \
+                                         1 << SPIDER_NET_RXTCPCHKERR)
+
+/* the cases we don't pass the packet to the stack */
+#define SPIDER_NET_DESTROY_RX_FLAGS     0x70138000
+
+#define SPIDER_NET_DESCR_SIZE           32
+
+/* this will be bigger some time */
+struct spider_net_options {
+        int rx_csum; /* for rx: if 0 ip_summed=NONE,
+                        if 1 and hw has verified, ip_summed=UNNECESSARY */
+};
+
+#define SPIDER_NET_DEFAULT_MSG          ( NETIF_MSG_DRV | \
+                                          NETIF_MSG_PROBE | \
+                                          NETIF_MSG_LINK | \
+                                          NETIF_MSG_TIMER | \
+                                          NETIF_MSG_IFDOWN | \
+                                          NETIF_MSG_IFUP | \
+                                          NETIF_MSG_RX_ERR | \
+                                          NETIF_MSG_TX_ERR | \
+                                          NETIF_MSG_TX_QUEUED | \
+                                          NETIF_MSG_INTR | \
+                                          NETIF_MSG_TX_DONE | \
+                                          NETIF_MSG_RX_STATUS | \
+                                          NETIF_MSG_PKTDATA | \
+                                          NETIF_MSG_HW | \
+                                          NETIF_MSG_WOL )
+
+struct spider_net_card {
+        struct net_device *netdev;
+        struct pci_dev *pdev;
+        struct mii_phy phy;
+
+        void __iomem *regs;
+
+        struct spider_net_descr_chain tx_chain;
+        struct spider_net_descr_chain rx_chain;
+        spinlock_t chain_lock;
+
+        struct net_device_stats netdev_stats;
+
+        struct spider_net_options options;
+
+        spinlock_t intmask_lock;
+
+        struct work_struct tx_timeout_task;
+        atomic_t tx_timeout_task_counter;
+        wait_queue_head_t waitq;
+
+        /* for ethtool */
+        int msg_enable;
+
+        struct spider_net_descr descr[0];
+};
+
+#define pr_err(fmt,arg...) \
+        printk(KERN_ERR fmt ,##arg)
+
+#endif
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c
new file mode 100644
index 000000000000..d42e60ba74ce
--- /dev/null
+++ b/drivers/net/spider_net_ethtool.c
@@ -0,0 +1,126 @@
+/*
+ * Network device driver for Cell Processor-Based Blade
+ *
+ * (C) Copyright IBM Corp. 2005
+ *
+ * Authors : Utz Bacher <utz.bacher@de.ibm.com>
+ *           Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+
+#include "spider_net.h"
+
+static int
+spider_net_ethtool_get_settings(struct net_device *netdev,
+                               struct ethtool_cmd *cmd)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+
+        cmd->supported   = (SUPPORTED_1000baseT_Full |
+                             SUPPORTED_FIBRE);
+        cmd->advertising = (ADVERTISED_1000baseT_Full |
+                             ADVERTISED_FIBRE);
+        cmd->port = PORT_FIBRE;
+        cmd->speed = card->phy.speed;
+        cmd->duplex = DUPLEX_FULL;
+
+        return 0;
+}
+
+static void
+spider_net_ethtool_get_drvinfo(struct net_device *netdev,
+                               struct ethtool_drvinfo *drvinfo)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+
+        /* clear and fill out info */
+        memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
+        strncpy(drvinfo->driver, spider_net_driver_name, 32);
+        strncpy(drvinfo->version, "0.1", 32);
+        strcpy(drvinfo->fw_version, "no information");
+        strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
+}
+
+static void
+spider_net_ethtool_get_wol(struct net_device *netdev,
+                           struct ethtool_wolinfo *wolinfo)
+{
+        /* no support for wol */
+        wolinfo->supported = 0;
+        wolinfo->wolopts = 0;
+}
+
+static u32
+spider_net_ethtool_get_msglevel(struct net_device *netdev)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+        return card->msg_enable;
+}
+
+static void
+spider_net_ethtool_set_msglevel(struct net_device *netdev,
+                                u32 level)
+{
+        struct spider_net_card *card;
+        card = netdev_priv(netdev);
+        card->msg_enable = level;
+}
+
+static int
+spider_net_ethtool_nway_reset(struct net_device *netdev)
+{
+        if (netif_running(netdev)) {
+                spider_net_stop(netdev);
+                spider_net_open(netdev);
+        }
+        return 0;
+}
+
+static u32
+spider_net_ethtool_get_rx_csum(struct net_device *netdev)
+{
+        struct spider_net_card *card = netdev->priv;
+
+        return card->options.rx_csum;
+}
+
+static int
+spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n)
+{
+        struct spider_net_card *card = netdev->priv;
+
+        card->options.rx_csum = n;
+        return 0;
+}
+
+struct ethtool_ops spider_net_ethtool_ops = {
+        .get_settings           = spider_net_ethtool_get_settings,
+        .get_drvinfo            = spider_net_ethtool_get_drvinfo,
+        .get_wol                = spider_net_ethtool_get_wol,
+        .get_msglevel           = spider_net_ethtool_get_msglevel,
+        .set_msglevel           = spider_net_ethtool_set_msglevel,
+        .nway_reset             = spider_net_ethtool_nway_reset,
+        .get_rx_csum            = spider_net_ethtool_get_rx_csum,
+        .set_rx_csum            = spider_net_ethtool_set_rx_csum,
+};
+
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 1f43bbfbc1c7..5c8fcd40ef4d 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -162,7 +162,7 @@ struct lance_private {
 #define MEM     lp->mem
 #define DREG    lp->iobase[0]
 #define AREG    lp->iobase[1]
-#define REGA(a) ( AREG = (a), DREG )
+#define REGA(a) (*( AREG = (a), &DREG ))
 
 /* Definitions for the Lance */
 
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 2608e7a3d214..3f67a42e8503 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -948,6 +948,7 @@ static irqreturn_t gem_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 u32 gem_status = readl(gp->regs + GREG_STAT);
 
                 if (gem_status == 0) {
+                        netif_poll_enable(dev);
                         spin_unlock_irqrestore(&gp->lock, flags);
                         return IRQ_NONE;
                 }
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index 7143fd7cf3f8..ff8ae5f79970 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -1020,7 +1020,7 @@ struct gem {
                 
         struct gem_init_block   *init_block;
         struct sk_buff          *rx_skbs[RX_RING_SIZE];
-        struct sk_buff          *tx_skbs[RX_RING_SIZE];
+        struct sk_buff          *tx_skbs[TX_RING_SIZE];
         dma_addr_t              gblock_dvma;
 
         struct pci_dev          *pdev;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index af8263a1580e..dc57352e5a97 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -36,6 +36,7 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/workqueue.h>
+#include <linux/prefetch.h>
 
 #include <net/checksum.h>
 
@@ -66,8 +67,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.37"
-#define DRV_MODULE_RELDATE      "August 25, 2005"
+#define DRV_MODULE_VERSION      "3.39"
+#define DRV_MODULE_RELDATE      "September 5, 2005"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -121,12 +122,9 @@
                                    TG3_RX_RCB_RING_SIZE(tp))
 #define TG3_TX_RING_BYTES       (sizeof(struct tg3_tx_buffer_desc) * \
                                  TG3_TX_RING_SIZE)
-#define TX_RING_GAP(TP) \
-        (TG3_TX_RING_SIZE - (TP)->tx_pending)
 #define TX_BUFFS_AVAIL(TP)                                              \
-        (((TP)->tx_cons <= (TP)->tx_prod) ?                             \
-          (TP)->tx_cons + (TP)->tx_pending - (TP)->tx_prod :            \
-          (TP)->tx_cons - (TP)->tx_prod - TX_RING_GAP(TP))
+        ((TP)->tx_pending -                                             \
+         (((TP)->tx_prod - (TP)->tx_cons) & (TG3_TX_RING_SIZE - 1)))
 #define NEXT_TX(N)              (((N) + 1) & (TG3_TX_RING_SIZE - 1))
 
 #define RX_PKT_BUF_SZ           (1536 + tp->rx_offset + 64)
@@ -490,7 +488,8 @@ static void tg3_disable_ints(struct tg3 *tp)
 
 static inline void tg3_cond_int(struct tg3 *tp)
 {
-        if (tp->hw_status->status & SD_STATUS_UPDATED)
+        if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) &&
+            (tp->hw_status->status & SD_STATUS_UPDATED))
                 tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl | GRC_LCLCTRL_SETINT);
 }
 
@@ -2880,9 +2879,13 @@ static void tg3_tx(struct tg3 *tp)
 
         tp->tx_cons = sw_idx;
 
-        if (netif_queue_stopped(tp->dev) &&
-            (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH))
-                netif_wake_queue(tp->dev);
+        if (unlikely(netif_queue_stopped(tp->dev))) {
+                spin_lock(&tp->tx_lock);
+                if (netif_queue_stopped(tp->dev) &&
+                    (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH))
+                        netif_wake_queue(tp->dev);
+                spin_unlock(&tp->tx_lock);
+        }
 }
 
 /* Returns size of skb allocated or < 0 on error.
@@ -3198,9 +3201,7 @@ static int tg3_poll(struct net_device *netdev, int *budget)
 
         /* run TX completion thread */
         if (sblk->idx[0].tx_consumer != tp->tx_cons) {
-                spin_lock(&tp->tx_lock);
                 tg3_tx(tp);
-                spin_unlock(&tp->tx_lock);
         }
 
         /* run RX thread, within the bounds set by NAPI.
@@ -3220,18 +3221,17 @@ static int tg3_poll(struct net_device *netdev, int *budget)
                 netdev->quota -= work_done;
         }
 
-        if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)
+        if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) {
                 tp->last_tag = sblk->status_tag;
-        rmb();
-        sblk->status &= ~SD_STATUS_UPDATED;
+                rmb();
+        } else
+                sblk->status &= ~SD_STATUS_UPDATED;
 
         /* if no more work, tell net stack and NIC we're done */
         done = !tg3_has_work(tp);
         if (done) {
-                spin_lock(&tp->lock);
                 netif_rx_complete(netdev);
                 tg3_restart_ints(tp);
-                spin_unlock(&tp->lock);
         }
 
         return (done ? 0 : 1);
@@ -3279,8 +3279,9 @@ static irqreturn_t tg3_msi(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct net_device *dev = dev_id;
         struct tg3 *tp = netdev_priv(dev);
-        struct tg3_hw_status *sblk = tp->hw_status;
 
+        prefetch(tp->hw_status);
+        prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]);
         /*
          * Writing any value to intr-mbox-0 clears PCI INTA# and
          * chip-internal interrupt pending events.
@@ -3289,19 +3290,9 @@ static irqreturn_t tg3_msi(int irq, void *dev_id, struct pt_regs *regs)
          * event coalescing.
          */
         tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
-        tp->last_tag = sblk->status_tag;
-        rmb();
-        if (tg3_irq_sync(tp))
-                goto out;
-        sblk->status &= ~SD_STATUS_UPDATED;
-        if (likely(tg3_has_work(tp)))
+        if (likely(!tg3_irq_sync(tp)))
                 netif_rx_schedule(dev);         /* schedule NAPI poll */
-        else {
-                /* No work, re-enable interrupts.  */
-                tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
-                             tp->last_tag << 24);
-        }
-out:
+
         return IRQ_RETVAL(1);
 }
 
@@ -3331,9 +3322,10 @@ static irqreturn_t tg3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                 if (tg3_irq_sync(tp))
                         goto out;
                 sblk->status &= ~SD_STATUS_UPDATED;
-                if (likely(tg3_has_work(tp)))
+                if (likely(tg3_has_work(tp))) {
+                        prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]);
                         netif_rx_schedule(dev);         /* schedule NAPI poll */
-                else {
+                } else {
                         /* No work, shared interrupt perhaps?  re-enable
                          * interrupts, and flush that PCI write
                          */
@@ -3359,7 +3351,7 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id, struct pt_regs *r
          * Reading the PCI State register will confirm whether the
          * interrupt is ours and will flush the status block.
          */
-        if ((sblk->status & SD_STATUS_UPDATED) ||
+        if ((sblk->status_tag != tp->last_tag) ||
             !(tr32(TG3PCI_PCISTATE) & PCISTATE_INT_NOT_ACTIVE)) {
                 /*
                  * writing any value to intr-mbox-0 clears PCI INTA# and
@@ -3370,19 +3362,17 @@ static irqreturn_t tg3_interrupt_tagged(int irq, void *dev_id, struct pt_regs *r
                  */
                 tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
                              0x00000001);
-                tp->last_tag = sblk->status_tag;
-                rmb();
                 if (tg3_irq_sync(tp))
                         goto out;
-                sblk->status &= ~SD_STATUS_UPDATED;
-                if (likely(tg3_has_work(tp)))
-                        netif_rx_schedule(dev);         /* schedule NAPI poll */
-                else {
-                        /* no work, shared interrupt perhaps?  re-enable
-                         * interrupts, and flush that PCI write
+                if (netif_rx_schedule_prep(dev)) {
+                        prefetch(&tp->rx_rcb[tp->rx_rcb_ptr]);
+                        /* Update last_tag to mark that this status has been
+                         * seen. Because interrupt may be shared, we may be
+                         * racing with tg3_poll(), so only update last_tag
+                         * if tg3_poll() is not scheduled.
                          */
-                        tw32_mailbox_f(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW,
-                                       tp->last_tag << 24);
+                        tp->last_tag = sblk->status_tag;
+                        __netif_rx_schedule(dev);
                 }
         } else {        /* shared interrupt */
                 handled = 0;
@@ -3716,8 +3706,11 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);
 
         tp->tx_prod = entry;
-        if (TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1))
+        if (TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1)) {
                 netif_stop_queue(dev);
+                if (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH)
+                        netif_wake_queue(tp->dev);
+        }
 
 out_unlock:
         mmiowb();
@@ -5960,7 +5953,7 @@ static int tg3_reset_hw(struct tg3 *tp)
         tw32(MAC_LED_CTRL, tp->led_ctrl);
 
         tw32(MAC_MI_STAT, MAC_MI_STAT_LNKSTAT_ATTN_ENAB);
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
+        if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) {
                 tw32_f(MAC_RX_MODE, RX_MODE_RESET);
                 udelay(10);
         }
@@ -6242,6 +6235,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
         if (err)
                 return err;
 
+        tp->hw_status->status &= ~SD_STATUS_UPDATED;
         tg3_enable_ints(tp);
 
         tw32_f(HOSTCC_MODE, tp->coalesce_mode | HOSTCC_MODE_ENABLE |
@@ -7557,6 +7551,38 @@ static void tg3_get_strings (struct net_device *dev, u32 stringset, u8 *buf)
         }
 }
 
+static int tg3_phys_id(struct net_device *dev, u32 data)
+{
+        struct tg3 *tp = netdev_priv(dev);
+        int i;
+
+        if (!netif_running(tp->dev))
+                return -EAGAIN;
+
+        if (data == 0)
+                data = 2;
+
+        for (i = 0; i < (data * 2); i++) {
+                if ((i % 2) == 0)
+                        tw32(MAC_LED_CTRL, LED_CTRL_LNKLED_OVERRIDE |
+                                           LED_CTRL_1000MBPS_ON |
+                                           LED_CTRL_100MBPS_ON |
+                                           LED_CTRL_10MBPS_ON |
+                                           LED_CTRL_TRAFFIC_OVERRIDE |
+                                           LED_CTRL_TRAFFIC_BLINK |
+                                           LED_CTRL_TRAFFIC_LED);
+        
+                else
+                        tw32(MAC_LED_CTRL, LED_CTRL_LNKLED_OVERRIDE |
+                                           LED_CTRL_TRAFFIC_OVERRIDE);
+
+                if (msleep_interruptible(500))
+                        break;
+        }
+        tw32(MAC_LED_CTRL, tp->led_ctrl);
+        return 0;
+}
+
 static void tg3_get_ethtool_stats (struct net_device *dev,
                                    struct ethtool_stats *estats, u64 *tmp_stats)
 {
@@ -7616,7 +7642,7 @@ static int tg3_test_link(struct tg3 *tp)
         if (!netif_running(tp->dev))
                 return -ENODEV;
 
-        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+        if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)
                 max = TG3_SERDES_TIMEOUT_SEC;
         else
                 max = TG3_COPPER_TIMEOUT_SEC;
@@ -7901,9 +7927,12 @@ static int tg3_test_memory(struct tg3 *tp)
         return err;
 }
 
-static int tg3_test_loopback(struct tg3 *tp)
+#define TG3_MAC_LOOPBACK        0
+#define TG3_PHY_LOOPBACK        1
+
+static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
 {
-        u32 mac_mode, send_idx, rx_start_idx, rx_idx, tx_idx, opaque_key;
+        u32 mac_mode, rx_start_idx, rx_idx, tx_idx, opaque_key;
         u32 desc_idx;
         struct sk_buff *skb, *rx_skb;
         u8 *tx_data;
@@ -7911,18 +7940,26 @@ static int tg3_test_loopback(struct tg3 *tp)
         int num_pkts, tx_len, rx_len, i, err;
         struct tg3_rx_buffer_desc *desc;
 
-        if (!netif_running(tp->dev))
-                return -ENODEV;
+        if (loopback_mode == TG3_MAC_LOOPBACK) {
+                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
+                           MAC_MODE_PORT_INT_LPBACK | MAC_MODE_LINK_POLARITY |
+                           MAC_MODE_PORT_MODE_GMII;
+                tw32(MAC_MODE, mac_mode);
+        } else if (loopback_mode == TG3_PHY_LOOPBACK) {
+                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
+                           MAC_MODE_LINK_POLARITY | MAC_MODE_PORT_MODE_GMII;
+                if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401)
+                        mac_mode &= ~MAC_MODE_LINK_POLARITY;
+                tw32(MAC_MODE, mac_mode);
+
+                tg3_writephy(tp, MII_BMCR, BMCR_LOOPBACK | BMCR_FULLDPLX |
+                                           BMCR_SPEED1000);
+        }
+        else
+                return -EINVAL;
 
         err = -EIO;
 
-        tg3_reset_hw(tp);
-
-        mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
-                   MAC_MODE_PORT_INT_LPBACK | MAC_MODE_LINK_POLARITY |
-                   MAC_MODE_PORT_MODE_GMII;
-        tw32(MAC_MODE, mac_mode);
-
         tx_len = 1514;
         skb = dev_alloc_skb(tx_len);
         tx_data = skb_put(skb, tx_len);
@@ -7943,15 +7980,15 @@ static int tg3_test_loopback(struct tg3 *tp)
 
         rx_start_idx = tp->hw_status->idx[0].rx_producer;
 
-        send_idx = 0;
         num_pkts = 0;
 
-        tg3_set_txd(tp, send_idx, map, tx_len, 0, 1);
+        tg3_set_txd(tp, tp->tx_prod, map, tx_len, 0, 1);
 
-        send_idx++;
+        tp->tx_prod++;
         num_pkts++;
 
-        tw32_tx_mbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, send_idx);
+        tw32_tx_mbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW,
+                     tp->tx_prod);
         tr32_mailbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW);
 
         udelay(10);
@@ -7964,7 +8001,7 @@ static int tg3_test_loopback(struct tg3 *tp)
 
                 tx_idx = tp->hw_status->idx[0].tx_consumer;
                 rx_idx = tp->hw_status->idx[0].rx_producer;
-                if ((tx_idx == send_idx) &&
+                if ((tx_idx == tp->tx_prod) &&
                     (rx_idx == (rx_start_idx + num_pkts)))
                         break;
         }
@@ -7972,7 +8009,7 @@ static int tg3_test_loopback(struct tg3 *tp)
         pci_unmap_single(tp->pdev, map, tx_len, PCI_DMA_TODEVICE);
         dev_kfree_skb(skb);
 
-        if (tx_idx != send_idx)
+        if (tx_idx != tp->tx_prod)
                 goto out;
 
         if (rx_idx != rx_start_idx + num_pkts)
@@ -8008,6 +8045,30 @@ out:
         return err;
 }
 
+#define TG3_MAC_LOOPBACK_FAILED         1
+#define TG3_PHY_LOOPBACK_FAILED         2
+#define TG3_LOOPBACK_FAILED             (TG3_MAC_LOOPBACK_FAILED |      \
+                                         TG3_PHY_LOOPBACK_FAILED)
+
+static int tg3_test_loopback(struct tg3 *tp)
+{
+        int err = 0;
+
+        if (!netif_running(tp->dev))
+                return TG3_LOOPBACK_FAILED;
+
+        tg3_reset_hw(tp);
+
+        if (tg3_run_loopback(tp, TG3_MAC_LOOPBACK))
+                err |= TG3_MAC_LOOPBACK_FAILED;
+        if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) {
+                if (tg3_run_loopback(tp, TG3_PHY_LOOPBACK))
+                        err |= TG3_PHY_LOOPBACK_FAILED;
+        }
+
+        return err;
+}
+
 static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                           u64 *data)
 {
@@ -8048,10 +8109,8 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
                         etest->flags |= ETH_TEST_FL_FAILED;
                         data[3] = 1;
                 }
-                if (tg3_test_loopback(tp) != 0) {
+                if ((data[4] = tg3_test_loopback(tp)) != 0)
                         etest->flags |= ETH_TEST_FL_FAILED;
-                        data[4] = 1;
-                }
 
                 tg3_full_unlock(tp);
 
@@ -8239,6 +8298,7 @@ static struct ethtool_ops tg3_ethtool_ops = {
         .self_test_count        = tg3_get_test_count,
         .self_test              = tg3_self_test,
         .get_strings            = tg3_get_strings,
+        .phys_id                = tg3_phys_id,
         .get_stats_count        = tg3_get_stats_count,
         .get_ethtool_stats      = tg3_get_ethtool_stats,
         .get_coalesce           = tg3_get_coalesce,
@@ -8303,7 +8363,8 @@ static void __devinit tg3_get_nvram_info(struct tg3 *tp)
                 tw32(NVRAM_CFG1, nvcfg1);
         }
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) ||
+            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780)) {
                 switch (nvcfg1 & NVRAM_CFG1_VENDOR_MASK) {
                         case FLASH_VENDOR_ATMEL_FLASH_BUFFERED:
                                 tp->nvram_jedecnum = JEDEC_ATMEL;
@@ -8717,8 +8778,9 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len,
                 if (i == (len - 4))
                         nvram_cmd |= NVRAM_CMD_LAST;
 
-                if ((tp->nvram_jedecnum == JEDEC_ST) &&
-                        (nvram_cmd & NVRAM_CMD_FIRST)) {
+                if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752) &&
+                    (tp->nvram_jedecnum == JEDEC_ST) &&
+                    (nvram_cmd & NVRAM_CMD_FIRST)) {
 
                         if ((ret = tg3_nvram_exec_cmd(tp,
                                 NVRAM_CMD_WREN | NVRAM_CMD_GO |
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index e2cdaf876201..8c9634a98c11 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -135,6 +135,18 @@ config DM9102
           <file:Documentation/networking/net-modules.txt>.  The module will
           be called dmfe.
 
+config ULI526X
+        tristate "ULi M526x controller support"
+        depends on NET_TULIP && PCI
+        select CRC32
+        ---help---
+          This driver is for ULi M5261/M5263 10/100M Ethernet Controller
+          (<http://www.uli.com.tw/>).
+
+          To compile this driver as a module, choose M here and read
+          <file:Documentation/networking/net-modules.txt>.  The module will
+          be called uli526x.
+          
 config PCMCIA_XIRCOM
         tristate "Xircom CardBus support (new driver)"
         depends on NET_TULIP && CARDBUS
diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile
index 8bb9b4683979..451090d6fcca 100644
--- a/drivers/net/tulip/Makefile
+++ b/drivers/net/tulip/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_WINBOND_840)	+= winbond-840.o
 obj-$(CONFIG_DE2104X)           += de2104x.o
 obj-$(CONFIG_TULIP)             += tulip.o
 obj-$(CONFIG_DE4X5)             += de4x5.o
+obj-$(CONFIG_ULI526X)           += uli526x.o
 
 # Declare multi-part drivers.
 
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index fc353e348f9a..a22d00198e4d 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1934,7 +1934,7 @@ static int __init de_init_one (struct pci_dev *pdev,
         struct de_private *de;
         int rc;
         void __iomem *regs;
-        long pciaddr;
+        unsigned long pciaddr;
         static int board_idx = -1;
 
         board_idx++;
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c
index e26c31f944bf..f53396fe79c9 100644
--- a/drivers/net/tulip/media.c
+++ b/drivers/net/tulip/media.c
@@ -81,25 +81,6 @@ int tulip_mdio_read(struct net_device *dev, int phy_id, int location)
                 return retval & 0xffff;
         }
 
-        if(tp->chip_id == ULI526X && tp->revision >= 0x40) {
-                int value;
-                int i = 1000;
-                
-                value = ioread32(ioaddr + CSR9);
-                iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
-                
-                value = (phy_id << 21) | (location << 16) | 0x08000000;
-                iowrite32(value, ioaddr + CSR10);
-                
-                while(--i > 0) {
-                        mdio_delay();
-                        if(ioread32(ioaddr + CSR10) & 0x10000000)
-                                break;
-                }
-                retval = ioread32(ioaddr + CSR10);
-                spin_unlock_irqrestore(&tp->mii_lock, flags);
-                return retval & 0xFFFF;
-        }
         /* Establish sync by sending at least 32 logic ones. */
         for (i = 32; i >= 0; i--) {
                 iowrite32(MDIO_ENB | MDIO_DATA_WRITE1, mdio_addr);
@@ -159,23 +140,6 @@ void tulip_mdio_write(struct net_device *dev, int phy_id, int location, int val)
                 spin_unlock_irqrestore(&tp->mii_lock, flags);
                 return;
         }
-        if (tp->chip_id == ULI526X && tp->revision >= 0x40) {
-                int value;
-                int i = 1000;
-                
-                value = ioread32(ioaddr + CSR9);
-                iowrite32(value & 0xFFEFFFFF, ioaddr + CSR9);
-                
-                value = (phy_id << 21) | (location << 16) | 0x04000000 | (val & 0xFFFF);
-                iowrite32(value, ioaddr + CSR10);
-                
-                while(--i > 0) {
-                        if (ioread32(ioaddr + CSR10) & 0x10000000)
-                                break;
-                }
-                spin_unlock_irqrestore(&tp->mii_lock, flags);
-                return;
-        }
                 
         /* Establish sync by sending 32 logic ones. */
         for (i = 32; i >= 0; i--) {
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index 691568283553..e058a9fbfe88 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -39,7 +39,6 @@ void tulip_timer(unsigned long data)
         case MX98713:
         case COMPEX9881:
         case DM910X:
-        case ULI526X:
         default: {
                 struct medialeaf *mleaf;
                 unsigned char *p;
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 20346d847d9e..05d2d96f7be2 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -88,7 +88,6 @@ enum chips {
         I21145,
         DM910X,
         CONEXANT,
-        ULI526X
 };
 
 
@@ -482,11 +481,8 @@ static inline void tulip_stop_rxtx(struct tulip_private *tp)
 
 static inline void tulip_restart_rxtx(struct tulip_private *tp)
 {
-        if(!(tp->chip_id == ULI526X && 
-                (tp->revision == 0x40 || tp->revision == 0x50))) {
-                tulip_stop_rxtx(tp);
-                udelay(5);
-        }
+        tulip_stop_rxtx(tp);
+        udelay(5);
         tulip_start_rxtx(tp);
 }
 
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index d45d8f56e5b4..6266a9a7e6e3 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -199,9 +199,6 @@ struct tulip_chip_table tulip_tbl[] = {
   { "Conexant LANfinity", 256, 0x0001ebef,
         HAS_MII | HAS_ACPI, tulip_timer },
 
-   /* ULi526X */
-   { "ULi M5261/M5263", 128, 0x0001ebef,
-        HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_ACPI, tulip_timer },
 };
 
 
@@ -239,10 +236,9 @@ static struct pci_device_id tulip_pci_tbl[] = {
         { 0x1737, 0xAB09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { 0x1737, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { 0x17B3, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
-        { 0x10b9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ULI526X },      /* ALi 1563 integrated ethernet */
-        { 0x10b9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ULI526X },      /* ALi 1563 integrated ethernet */
         { 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */
         { 0x14ea, 0xab08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Planex FNW-3602-TX */
+        { 0x1414, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
         { } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, tulip_pci_tbl);
@@ -522,7 +518,7 @@ static void tulip_tx_timeout(struct net_device *dev)
                                    dev->name);
         } else if (tp->chip_id == DC21140 || tp->chip_id == DC21142
                            || tp->chip_id == MX98713 || tp->chip_id == COMPEX9881
-                           || tp->chip_id == DM910X || tp->chip_id == ULI526X) {
+                           || tp->chip_id == DM910X) {
                 printk(KERN_WARNING "%s: 21140 transmit timed out, status %8.8x, "
                            "SIA %8.8x %8.8x %8.8x %8.8x, resetting...\n",
                            dev->name, ioread32(ioaddr + CSR5), ioread32(ioaddr + CSR12),
@@ -1103,18 +1099,16 @@ static void set_rx_mode(struct net_device *dev)
                         entry = tp->cur_tx++ % TX_RING_SIZE;
 
                         if (entry != 0) {
-                                /* Avoid a chip errata by prefixing a dummy entry. Don't do
-                                   this on the ULI526X as it triggers a different problem */
-                                if (!(tp->chip_id == ULI526X && (tp->revision == 0x40 || tp->revision == 0x50))) {
-                                        tp->tx_buffers[entry].skb = NULL;
-                                        tp->tx_buffers[entry].mapping = 0;
-                                        tp->tx_ring[entry].length =
-                                                (entry == TX_RING_SIZE-1) ? cpu_to_le32(DESC_RING_WRAP) : 0;
-                                        tp->tx_ring[entry].buffer1 = 0;
-                                        /* Must set DescOwned later to avoid race with chip */
-                                        dummy = entry;
-                                        entry = tp->cur_tx++ % TX_RING_SIZE;
-                                }
+                                /* Avoid a chip errata by prefixing a dummy entry. */
+                                tp->tx_buffers[entry].skb = NULL;
+                                tp->tx_buffers[entry].mapping = 0;
+                                tp->tx_ring[entry].length =
+                                        (entry == TX_RING_SIZE-1) ? cpu_to_le32(DESC_RING_WRAP) : 0;
+                                tp->tx_ring[entry].buffer1 = 0;
+                                /* Must set DescOwned later to avoid race with chip */
+                                dummy = entry;
+                                entry = tp->cur_tx++ % TX_RING_SIZE;
+
                         }
 
                         tp->tx_buffers[entry].skb = NULL;
@@ -1235,10 +1229,6 @@ static int tulip_uli_dm_quirk(struct pci_dev *pdev)
 {
         if (pdev->vendor == 0x1282 && pdev->device == 0x9102)
                 return 1;
-        if (pdev->vendor == 0x10b9 && pdev->device == 0x5261)
-                return 1;
-        if (pdev->vendor == 0x10b9 && pdev->device == 0x5263)
-                return 1;
         return 0;
 }
 
@@ -1680,7 +1670,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         switch (chip_idx) {
         case DC21140:
         case DM910X:
-        case ULI526X:
         default:
                 if (tp->mtable)
                         iowrite32(tp->mtable->csr12dir | 0x100, ioaddr + CSR12);
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
new file mode 100644
index 000000000000..1a4316336256
--- /dev/null
+++ b/drivers/net/tulip/uli526x.c
@@ -0,0 +1,1749 @@
+/*
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    
+*/
+
+#define DRV_NAME        "uli526x"
+#define DRV_VERSION     "0.9.3"
+#define DRV_RELDATE     "2005-7-29"
+
+#include <linux/module.h>
+
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/skbuff.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/processor.h>
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <asm/uaccess.h>
+
+
+/* Board/System/Debug information/definition ---------------- */
+#define PCI_ULI5261_ID  0x526110B9      /* ULi M5261 ID*/
+#define PCI_ULI5263_ID  0x526310B9      /* ULi M5263 ID*/
+
+#define ULI526X_IO_SIZE 0x100
+#define TX_DESC_CNT     0x20            /* Allocated Tx descriptors */
+#define RX_DESC_CNT     0x30            /* Allocated Rx descriptors */
+#define TX_FREE_DESC_CNT (TX_DESC_CNT - 2)      /* Max TX packet count */
+#define TX_WAKE_DESC_CNT (TX_DESC_CNT - 3)      /* TX wakeup count */
+#define DESC_ALL_CNT    (TX_DESC_CNT + RX_DESC_CNT)
+#define TX_BUF_ALLOC    0x600
+#define RX_ALLOC_SIZE   0x620
+#define ULI526X_RESET    1
+#define CR0_DEFAULT     0
+#define CR6_DEFAULT     0x22200000
+#define CR7_DEFAULT     0x180c1
+#define CR15_DEFAULT    0x06            /* TxJabber RxWatchdog */
+#define TDES0_ERR_MASK  0x4302          /* TXJT, LC, EC, FUE */
+#define MAX_PACKET_SIZE 1514
+#define ULI5261_MAX_MULTICAST 14
+#define RX_COPY_SIZE    100
+#define MAX_CHECK_PACKET 0x8000
+
+#define ULI526X_10MHF      0
+#define ULI526X_100MHF     1
+#define ULI526X_10MFD      4
+#define ULI526X_100MFD     5
+#define ULI526X_AUTO       8
+
+#define ULI526X_TXTH_72 0x400000        /* TX TH 72 byte */
+#define ULI526X_TXTH_96 0x404000        /* TX TH 96 byte */
+#define ULI526X_TXTH_128        0x0000          /* TX TH 128 byte */
+#define ULI526X_TXTH_256        0x4000          /* TX TH 256 byte */
+#define ULI526X_TXTH_512        0x8000          /* TX TH 512 byte */
+#define ULI526X_TXTH_1K 0xC000          /* TX TH 1K  byte */
+
+#define ULI526X_TIMER_WUT  (jiffies + HZ * 1)/* timer wakeup time : 1 second */
+#define ULI526X_TX_TIMEOUT ((16*HZ)/2)  /* tx packet time-out time 8 s" */
+#define ULI526X_TX_KICK         (4*HZ/2)        /* tx packet Kick-out time 2 s" */
+
+#define ULI526X_DBUG(dbug_now, msg, value) if (uli526x_debug || (dbug_now)) printk(KERN_ERR DRV_NAME ": %s %lx\n", (msg), (long) (value))
+
+#define SHOW_MEDIA_TYPE(mode) printk(KERN_ERR DRV_NAME ": Change Speed to %sMhz %s duplex\n",mode & 1 ?"100":"10", mode & 4 ? "full":"half");
+
+
+/* CR9 definition: SROM/MII */
+#define CR9_SROM_READ   0x4800
+#define CR9_SRCS        0x1
+#define CR9_SRCLK       0x2
+#define CR9_CRDOUT      0x8
+#define SROM_DATA_0     0x0
+#define SROM_DATA_1     0x4
+#define PHY_DATA_1      0x20000
+#define PHY_DATA_0      0x00000
+#define MDCLKH          0x10000
+
+#define PHY_POWER_DOWN  0x800
+
+#define SROM_V41_CODE   0x14
+
+#define SROM_CLK_WRITE(data, ioaddr)                                    \
+                outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr);               \
+                udelay(5);                                              \
+                outl(data|CR9_SROM_READ|CR9_SRCS|CR9_SRCLK,ioaddr);     \
+                udelay(5);                                              \
+                outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr);               \
+                udelay(5);
+
+/* Structure/enum declaration ------------------------------- */
+struct tx_desc {
+        u32 tdes0, tdes1, tdes2, tdes3; /* Data for the card */
+        char *tx_buf_ptr;               /* Data for us */
+        struct tx_desc *next_tx_desc;
+} __attribute__(( aligned(32) ));
+
+struct rx_desc {
+        u32 rdes0, rdes1, rdes2, rdes3; /* Data for the card */
+        struct sk_buff *rx_skb_ptr;     /* Data for us */
+        struct rx_desc *next_rx_desc;
+} __attribute__(( aligned(32) ));
+
+struct uli526x_board_info {
+        u32 chip_id;                    /* Chip vendor/Device ID */
+        struct net_device *next_dev;    /* next device */
+        struct pci_dev *pdev;           /* PCI device */
+        spinlock_t lock;
+
+        long ioaddr;                    /* I/O base address */
+        u32 cr0_data;
+        u32 cr5_data;
+        u32 cr6_data;
+        u32 cr7_data;
+        u32 cr15_data;
+
+        /* pointer for memory physical address */
+        dma_addr_t buf_pool_dma_ptr;    /* Tx buffer pool memory */
+        dma_addr_t buf_pool_dma_start;  /* Tx buffer pool align dword */
+        dma_addr_t desc_pool_dma_ptr;   /* descriptor pool memory */
+        dma_addr_t first_tx_desc_dma;
+        dma_addr_t first_rx_desc_dma;
+
+        /* descriptor pointer */
+        unsigned char *buf_pool_ptr;    /* Tx buffer pool memory */
+        unsigned char *buf_pool_start;  /* Tx buffer pool align dword */
+        unsigned char *desc_pool_ptr;   /* descriptor pool memory */
+        struct tx_desc *first_tx_desc;
+        struct tx_desc *tx_insert_ptr;
+        struct tx_desc *tx_remove_ptr;
+        struct rx_desc *first_rx_desc;
+        struct rx_desc *rx_insert_ptr;
+        struct rx_desc *rx_ready_ptr;   /* packet come pointer */
+        unsigned long tx_packet_cnt;    /* transmitted packet count */
+        unsigned long rx_avail_cnt;     /* available rx descriptor count */
+        unsigned long interval_rx_cnt;  /* rx packet count a callback time */
+
+        u16 dbug_cnt;
+        u16 NIC_capability;             /* NIC media capability */
+        u16 PHY_reg4;                   /* Saved Phyxcer register 4 value */
+
+        u8 media_mode;                  /* user specify media mode */
+        u8 op_mode;                     /* real work media mode */
+        u8 phy_addr;
+        u8 link_failed;                 /* Ever link failed */
+        u8 wait_reset;                  /* Hardware failed, need to reset */
+        struct timer_list timer;
+
+        /* System defined statistic counter */
+        struct net_device_stats stats;
+
+        /* Driver defined statistic counter */
+        unsigned long tx_fifo_underrun;
+        unsigned long tx_loss_carrier;
+        unsigned long tx_no_carrier;
+        unsigned long tx_late_collision;
+        unsigned long tx_excessive_collision;
+        unsigned long tx_jabber_timeout;
+        unsigned long reset_count;
+        unsigned long reset_cr8;
+        unsigned long reset_fatal;
+        unsigned long reset_TXtimeout;
+
+        /* NIC SROM data */
+        unsigned char srom[128];
+        u8 init;        
+};
+
+enum uli526x_offsets {
+        DCR0 = 0x00, DCR1 = 0x08, DCR2 = 0x10, DCR3 = 0x18, DCR4 = 0x20,
+        DCR5 = 0x28, DCR6 = 0x30, DCR7 = 0x38, DCR8 = 0x40, DCR9 = 0x48,
+        DCR10 = 0x50, DCR11 = 0x58, DCR12 = 0x60, DCR13 = 0x68, DCR14 = 0x70,
+        DCR15 = 0x78
+};
+
+enum uli526x_CR6_bits {
+        CR6_RXSC = 0x2, CR6_PBF = 0x8, CR6_PM = 0x40, CR6_PAM = 0x80,
+        CR6_FDM = 0x200, CR6_TXSC = 0x2000, CR6_STI = 0x100000,
+        CR6_SFT = 0x200000, CR6_RXA = 0x40000000, CR6_NO_PURGE = 0x20000000
+};
+
+/* Global variable declaration ----------------------------- */
+static int __devinitdata printed_version;
+static char version[] __devinitdata =
+        KERN_INFO DRV_NAME ": ULi M5261/M5263 net driver, version "
+        DRV_VERSION " (" DRV_RELDATE ")\n";
+
+static int uli526x_debug;
+static unsigned char uli526x_media_mode = ULI526X_AUTO;
+static u32 uli526x_cr6_user_set;
+
+/* For module input parameter */
+static int debug;
+static u32 cr6set;
+static unsigned char mode = 8;
+
+/* function declaration ------------------------------------- */
+static int uli526x_open(struct net_device *);
+static int uli526x_start_xmit(struct sk_buff *, struct net_device *);
+static int uli526x_stop(struct net_device *);
+static struct net_device_stats * uli526x_get_stats(struct net_device *);
+static void uli526x_set_filter_mode(struct net_device *);
+static struct ethtool_ops netdev_ethtool_ops;
+static u16 read_srom_word(long, int);
+static irqreturn_t uli526x_interrupt(int, void *, struct pt_regs *);
+static void uli526x_descriptor_init(struct uli526x_board_info *, unsigned long);
+static void allocate_rx_buffer(struct uli526x_board_info *);
+static void update_cr6(u32, unsigned long);
+static void send_filter_frame(struct net_device *, int);
+static u16 phy_read(unsigned long, u8, u8, u32);
+static u16 phy_readby_cr10(unsigned long, u8, u8);
+static void phy_write(unsigned long, u8, u8, u16, u32);
+static void phy_writeby_cr10(unsigned long, u8, u8, u16);
+static void phy_write_1bit(unsigned long, u32, u32);
+static u16 phy_read_1bit(unsigned long, u32);
+static u8 uli526x_sense_speed(struct uli526x_board_info *);
+static void uli526x_process_mode(struct uli526x_board_info *);
+static void uli526x_timer(unsigned long);
+static void uli526x_rx_packet(struct net_device *, struct uli526x_board_info *);
+static void uli526x_free_tx_pkt(struct net_device *, struct uli526x_board_info *);
+static void uli526x_reuse_skb(struct uli526x_board_info *, struct sk_buff *);
+static void uli526x_dynamic_reset(struct net_device *);
+static void uli526x_free_rxbuffer(struct uli526x_board_info *);
+static void uli526x_init(struct net_device *);
+static void uli526x_set_phyxcer(struct uli526x_board_info *);
+
+/* ULI526X network board routine ---------------------------- */
+
+/*
+ *      Search ULI526X board, allocate space and register it
+ */
+
+static int __devinit uli526x_init_one (struct pci_dev *pdev,
+                                    const struct pci_device_id *ent)
+{
+        struct uli526x_board_info *db;  /* board information structure */
+        struct net_device *dev;
+        int i, err;
+        
+        ULI526X_DBUG(0, "uli526x_init_one()", 0);
+
+        if (!printed_version++)
+                printk(version);
+
+        /* Init network device */
+        dev = alloc_etherdev(sizeof(*db));
+        if (dev == NULL)
+                return -ENOMEM;
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+                printk(KERN_WARNING DRV_NAME ": 32-bit PCI DMA not available.\n");
+                err = -ENODEV;
+                goto err_out_free;
+        }
+
+        /* Enable Master/IO access, Disable memory access */
+        err = pci_enable_device(pdev);
+        if (err)
+                goto err_out_free;
+
+        if (!pci_resource_start(pdev, 0)) {
+                printk(KERN_ERR DRV_NAME ": I/O base is zero\n");
+                err = -ENODEV;
+                goto err_out_disable;
+        }
+
+        if (pci_resource_len(pdev, 0) < (ULI526X_IO_SIZE) ) {
+                printk(KERN_ERR DRV_NAME ": Allocated I/O size too small\n");
+                err = -ENODEV;
+                goto err_out_disable;
+        }
+
+        if (pci_request_regions(pdev, DRV_NAME)) {
+                printk(KERN_ERR DRV_NAME ": Failed to request PCI regions\n");
+                err = -ENODEV;
+                goto err_out_disable;
+        }
+
+        /* Init system & device */
+        db = netdev_priv(dev);
+
+        /* Allocate Tx/Rx descriptor memory */
+        db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
+        if(db->desc_pool_ptr == NULL)
+        {
+                err = -ENOMEM;
+                goto err_out_nomem;
+        }
+        db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
+        if(db->buf_pool_ptr == NULL)
+        {
+                err = -ENOMEM;
+                goto err_out_nomem;
+        }
+        
+        db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
+        db->first_tx_desc_dma = db->desc_pool_dma_ptr;
+        db->buf_pool_start = db->buf_pool_ptr;
+        db->buf_pool_dma_start = db->buf_pool_dma_ptr;
+
+        db->chip_id = ent->driver_data;
+        db->ioaddr = pci_resource_start(pdev, 0);
+        
+        db->pdev = pdev;
+        db->init = 1;
+        
+        dev->base_addr = db->ioaddr;
+        dev->irq = pdev->irq;
+        pci_set_drvdata(pdev, dev);
+        
+        /* Register some necessary functions */
+        dev->open = &uli526x_open;
+        dev->hard_start_xmit = &uli526x_start_xmit;
+        dev->stop = &uli526x_stop;
+        dev->get_stats = &uli526x_get_stats;
+        dev->set_multicast_list = &uli526x_set_filter_mode;
+        dev->ethtool_ops = &netdev_ethtool_ops;
+        spin_lock_init(&db->lock);
+
+                
+        /* read 64 word srom data */
+        for (i = 0; i < 64; i++)
+                ((u16 *) db->srom)[i] = cpu_to_le16(read_srom_word(db->ioaddr, i));
+
+        /* Set Node address */
+        if(((u16 *) db->srom)[0] == 0xffff || ((u16 *) db->srom)[0] == 0)               /* SROM absent, so read MAC address from ID Table */
+        {
+                outl(0x10000, db->ioaddr + DCR0);       //Diagnosis mode
+                outl(0x1c0, db->ioaddr + DCR13);        //Reset dianostic pointer port
+                outl(0, db->ioaddr + DCR14);            //Clear reset port
+                outl(0x10, db->ioaddr + DCR14);         //Reset ID Table pointer
+                outl(0, db->ioaddr + DCR14);            //Clear reset port
+                outl(0, db->ioaddr + DCR13);            //Clear CR13
+                outl(0x1b0, db->ioaddr + DCR13);        //Select ID Table access port
+                //Read MAC address from CR14
+                for (i = 0; i < 6; i++)
+                        dev->dev_addr[i] = inl(db->ioaddr + DCR14);
+                //Read end
+                outl(0, db->ioaddr + DCR13);    //Clear CR13
+                outl(0, db->ioaddr + DCR0);             //Clear CR0
+                udelay(10);
+        }
+        else            /*Exist SROM*/
+        {
+                for (i = 0; i < 6; i++)
+                        dev->dev_addr[i] = db->srom[20 + i];
+        }
+        err = register_netdev (dev);
+        if (err)
+                goto err_out_res;
+
+        printk(KERN_INFO "%s: ULi M%04lx at pci%s,",dev->name,ent->driver_data >> 16,pci_name(pdev));
+        
+        for (i = 0; i < 6; i++)
+                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
+        printk(", irq %d.\n", dev->irq);
+
+        pci_set_master(pdev);
+
+        return 0;
+
+err_out_res:
+        pci_release_regions(pdev);
+err_out_nomem:
+        if(db->desc_pool_ptr)
+                pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
+                        db->desc_pool_ptr, db->desc_pool_dma_ptr);
+                        
+        if(db->buf_pool_ptr != NULL)
+                pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
+                        db->buf_pool_ptr, db->buf_pool_dma_ptr);
+err_out_disable:
+        pci_disable_device(pdev);
+err_out_free:
+        pci_set_drvdata(pdev, NULL);
+        free_netdev(dev);
+
+        return err;
+}
+
+
+static void __devexit uli526x_remove_one (struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct uli526x_board_info *db = netdev_priv(dev);
+
+        ULI526X_DBUG(0, "uli526x_remove_one()", 0);
+
+        pci_free_consistent(db->pdev, sizeof(struct tx_desc) *
+                                DESC_ALL_CNT + 0x20, db->desc_pool_ptr,
+                                db->desc_pool_dma_ptr);
+        pci_free_consistent(db->pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
+                                db->buf_pool_ptr, db->buf_pool_dma_ptr);
+        unregister_netdev(dev);
+        pci_release_regions(pdev);
+        free_netdev(dev);       /* free board information */
+        pci_set_drvdata(pdev, NULL);
+        pci_disable_device(pdev);
+        ULI526X_DBUG(0, "uli526x_remove_one() exit", 0);
+}
+
+
+/*
+ *      Open the interface.
+ *      The interface is opened whenever "ifconfig" activates it.
+ */
+
+static int uli526x_open(struct net_device *dev)
+{
+        int ret;
+        struct uli526x_board_info *db = netdev_priv(dev);
+        
+        ULI526X_DBUG(0, "uli526x_open", 0);
+
+        ret = request_irq(dev->irq, &uli526x_interrupt, SA_SHIRQ, dev->name, dev);
+        if (ret)
+                return ret;
+
+        /* system variable init */
+        db->cr6_data = CR6_DEFAULT | uli526x_cr6_user_set;
+        db->tx_packet_cnt = 0;
+        db->rx_avail_cnt = 0;
+        db->link_failed = 1;
+        netif_carrier_off(dev);
+        db->wait_reset = 0;
+
+        db->NIC_capability = 0xf;       /* All capability*/
+        db->PHY_reg4 = 0x1e0;
+
+        /* CR6 operation mode decision */
+        db->cr6_data |= ULI526X_TXTH_256;
+        db->cr0_data = CR0_DEFAULT;
+        
+        /* Initialize ULI526X board */
+        uli526x_init(dev);
+
+        /* Active System Interface */
+        netif_wake_queue(dev);
+
+        /* set and active a timer process */
+        init_timer(&db->timer);
+        db->timer.expires = ULI526X_TIMER_WUT + HZ * 2;
+        db->timer.data = (unsigned long)dev;
+        db->timer.function = &uli526x_timer;
+        add_timer(&db->timer);
+
+        return 0;
+}
+
+
+/*      Initialize ULI526X board
+ *      Reset ULI526X board
+ *      Initialize TX/Rx descriptor chain structure
+ *      Send the set-up frame
+ *      Enable Tx/Rx machine
+ */
+
+static void uli526x_init(struct net_device *dev)
+{
+        struct uli526x_board_info *db = netdev_priv(dev);
+        unsigned long ioaddr = db->ioaddr;
+        u8      phy_tmp;
+        u16     phy_value;
+        u16 phy_reg_reset;
+
+        ULI526X_DBUG(0, "uli526x_init()", 0);
+
+        /* Reset M526x MAC controller */
+        outl(ULI526X_RESET, ioaddr + DCR0);     /* RESET MAC */
+        udelay(100);
+        outl(db->cr0_data, ioaddr + DCR0);
+        udelay(5);
+
+        /* Phy addr : In some boards,M5261/M5263 phy address != 1 */
+        db->phy_addr = 1;
+        for(phy_tmp=0;phy_tmp<32;phy_tmp++)
+        {
+                phy_value=phy_read(db->ioaddr,phy_tmp,3,db->chip_id);//peer add
+                if(phy_value != 0xffff&&phy_value!=0)
+                {
+                        db->phy_addr = phy_tmp;
+                        break;
+                }
+        }
+        if(phy_tmp == 32)
+                printk(KERN_WARNING "Can not find the phy address!!!");
+        /* Parser SROM and media mode */
+        db->media_mode = uli526x_media_mode;
+
+        /* Phyxcer capability setting */
+        phy_reg_reset = phy_read(db->ioaddr, db->phy_addr, 0, db->chip_id);
+        phy_reg_reset = (phy_reg_reset | 0x8000);
+        phy_write(db->ioaddr, db->phy_addr, 0, phy_reg_reset, db->chip_id);
+        udelay(500);
+
+        /* Process Phyxcer Media Mode */
+        uli526x_set_phyxcer(db);
+
+        /* Media Mode Process */
+        if ( !(db->media_mode & ULI526X_AUTO) )
+                db->op_mode = db->media_mode;   /* Force Mode */
+
+        /* Initialize Transmit/Receive decriptor and CR3/4 */
+        uli526x_descriptor_init(db, ioaddr);
+
+        /* Init CR6 to program M526X operation */
+        update_cr6(db->cr6_data, ioaddr);
+
+        /* Send setup frame */
+        send_filter_frame(dev, dev->mc_count);  /* M5261/M5263 */
+
+        /* Init CR7, interrupt active bit */
+        db->cr7_data = CR7_DEFAULT;
+        outl(db->cr7_data, ioaddr + DCR7);
+
+        /* Init CR15, Tx jabber and Rx watchdog timer */
+        outl(db->cr15_data, ioaddr + DCR15);
+
+        /* Enable ULI526X Tx/Rx function */
+        db->cr6_data |= CR6_RXSC | CR6_TXSC;
+        update_cr6(db->cr6_data, ioaddr);
+}
+
+
+/*
+ *      Hardware start transmission.
+ *      Send a packet to media from the upper layer.
+ */
+
+static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct uli526x_board_info *db = netdev_priv(dev);
+        struct tx_desc *txptr;
+        unsigned long flags;
+
+        ULI526X_DBUG(0, "uli526x_start_xmit", 0);
+
+        /* Resource flag check */
+        netif_stop_queue(dev);
+
+        /* Too large packet check */
+        if (skb->len > MAX_PACKET_SIZE) {
+                printk(KERN_ERR DRV_NAME ": big packet = %d\n", (u16)skb->len);
+                dev_kfree_skb(skb);
+                return 0;
+        }
+
+        spin_lock_irqsave(&db->lock, flags);
+
+        /* No Tx resource check, it never happen nromally */
+        if (db->tx_packet_cnt >= TX_FREE_DESC_CNT) {
+                spin_unlock_irqrestore(&db->lock, flags);
+                printk(KERN_ERR DRV_NAME ": No Tx resource %ld\n", db->tx_packet_cnt);
+                return 1;
+        }
+
+        /* Disable NIC interrupt */
+        outl(0, dev->base_addr + DCR7);
+
+        /* transmit this packet */
+        txptr = db->tx_insert_ptr;
+        memcpy(txptr->tx_buf_ptr, skb->data, skb->len);
+        txptr->tdes1 = cpu_to_le32(0xe1000000 | skb->len);
+
+        /* Point to next transmit free descriptor */
+        db->tx_insert_ptr = txptr->next_tx_desc;
+
+        /* Transmit Packet Process */
+        if ( (db->tx_packet_cnt < TX_DESC_CNT) ) {
+                txptr->tdes0 = cpu_to_le32(0x80000000); /* Set owner bit */
+                db->tx_packet_cnt++;                    /* Ready to send */
+                outl(0x1, dev->base_addr + DCR1);       /* Issue Tx polling */
+                dev->trans_start = jiffies;             /* saved time stamp */
+        }
+
+        /* Tx resource check */
+        if ( db->tx_packet_cnt < TX_FREE_DESC_CNT )
+                netif_wake_queue(dev);
+
+        /* Restore CR7 to enable interrupt */
+        spin_unlock_irqrestore(&db->lock, flags);
+        outl(db->cr7_data, dev->base_addr + DCR7);
+        
+        /* free this SKB */
+        dev_kfree_skb(skb);
+
+        return 0;
+}
+
+
+/*
+ *      Stop the interface.
+ *      The interface is stopped when it is brought.
+ */
+
+static int uli526x_stop(struct net_device *dev)
+{
+        struct uli526x_board_info *db = netdev_priv(dev);
+        unsigned long ioaddr = dev->base_addr;
+
+        ULI526X_DBUG(0, "uli526x_stop", 0);
+
+        /* disable system */
+        netif_stop_queue(dev);
+
+        /* deleted timer */
+        del_timer_sync(&db->timer);
+
+        /* Reset & stop ULI526X board */
+        outl(ULI526X_RESET, ioaddr + DCR0);
+        udelay(5);
+        phy_write(db->ioaddr, db->phy_addr, 0, 0x8000, db->chip_id);
+
+        /* free interrupt */
+        free_irq(dev->irq, dev);
+
+        /* free allocated rx buffer */
+        uli526x_free_rxbuffer(db);
+
+#if 0
+        /* show statistic counter */
+        printk(DRV_NAME ": FU:%lx EC:%lx LC:%lx NC:%lx LOC:%lx TXJT:%lx RESET:%lx RCR8:%lx FAL:%lx TT:%lx\n",
+                db->tx_fifo_underrun, db->tx_excessive_collision,
+                db->tx_late_collision, db->tx_no_carrier, db->tx_loss_carrier,
+                db->tx_jabber_timeout, db->reset_count, db->reset_cr8,
+                db->reset_fatal, db->reset_TXtimeout);
+#endif
+
+        return 0;
+}
+
+
+/*
+ *      M5261/M5263 insterrupt handler
+ *      receive the packet to upper layer, free the transmitted packet
+ */
+
+static irqreturn_t uli526x_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct net_device *dev = dev_id;
+        struct uli526x_board_info *db = netdev_priv(dev);
+        unsigned long ioaddr = dev->base_addr;
+        unsigned long flags;
+
+        if (!dev) {
+                ULI526X_DBUG(1, "uli526x_interrupt() without DEVICE arg", 0);
+                return IRQ_NONE;
+        }
+
+        spin_lock_irqsave(&db->lock, flags);
+        outl(0, ioaddr + DCR7);
+
+        /* Got ULI526X status */
+        db->cr5_data = inl(ioaddr + DCR5);
+        outl(db->cr5_data, ioaddr + DCR5);
+        if ( !(db->cr5_data & 0x180c1) ) {
+                spin_unlock_irqrestore(&db->lock, flags);
+                outl(db->cr7_data, ioaddr + DCR7);
+                return IRQ_HANDLED;
+        }
+
+        /* Check system status */
+        if (db->cr5_data & 0x2000) {
+                /* system bus error happen */
+                ULI526X_DBUG(1, "System bus error happen. CR5=", db->cr5_data);
+                db->reset_fatal++;
+                db->wait_reset = 1;     /* Need to RESET */
+                spin_unlock_irqrestore(&db->lock, flags);
+                return IRQ_HANDLED;
+        }
+
+         /* Received the coming packet */
+        if ( (db->cr5_data & 0x40) && db->rx_avail_cnt )
+                uli526x_rx_packet(dev, db);
+
+        /* reallocate rx descriptor buffer */
+        if (db->rx_avail_cnt<RX_DESC_CNT)
+                allocate_rx_buffer(db);
+
+        /* Free the transmitted descriptor */
+        if ( db->cr5_data & 0x01)
+                uli526x_free_tx_pkt(dev, db);
+
+        /* Restore CR7 to enable interrupt mask */
+        outl(db->cr7_data, ioaddr + DCR7);
+
+        spin_unlock_irqrestore(&db->lock, flags);
+        return IRQ_HANDLED;
+}
+
+
+/*
+ *      Free TX resource after TX complete
+ */
+
+static void uli526x_free_tx_pkt(struct net_device *dev, struct uli526x_board_info * db)
+{
+        struct tx_desc *txptr;
+        u32 tdes0;
+
+        txptr = db->tx_remove_ptr;
+        while(db->tx_packet_cnt) {
+                tdes0 = le32_to_cpu(txptr->tdes0);
+                /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
+                if (tdes0 & 0x80000000)
+                        break;
+
+                /* A packet sent completed */
+                db->tx_packet_cnt--;
+                db->stats.tx_packets++;
+
+                /* Transmit statistic counter */
+                if ( tdes0 != 0x7fffffff ) {
+                        /* printk(DRV_NAME ": tdes0=%x\n", tdes0); */
+                        db->stats.collisions += (tdes0 >> 3) & 0xf;
+                        db->stats.tx_bytes += le32_to_cpu(txptr->tdes1) & 0x7ff;
+                        if (tdes0 & TDES0_ERR_MASK) {
+                                db->stats.tx_errors++;
+                                if (tdes0 & 0x0002) {   /* UnderRun */
+                                        db->tx_fifo_underrun++;
+                                        if ( !(db->cr6_data & CR6_SFT) ) {
+                                                db->cr6_data = db->cr6_data | CR6_SFT;
+                                                update_cr6(db->cr6_data, db->ioaddr);
+                                        }
+                                }
+                                if (tdes0 & 0x0100)
+                                        db->tx_excessive_collision++;
+                                if (tdes0 & 0x0200)
+                                        db->tx_late_collision++;
+                                if (tdes0 & 0x0400)
+                                        db->tx_no_carrier++;
+                                if (tdes0 & 0x0800)
+                                        db->tx_loss_carrier++;
+                                if (tdes0 & 0x4000)
+                                        db->tx_jabber_timeout++;
+                        }
+                }
+
+                txptr = txptr->next_tx_desc;
+        }/* End of while */
+
+        /* Update TX remove pointer to next */
+        db->tx_remove_ptr = txptr;
+
+        /* Resource available check */
+        if ( db->tx_packet_cnt < TX_WAKE_DESC_CNT )
+                netif_wake_queue(dev);  /* Active upper layer, send again */
+}
+
+
+/*
+ *      Receive the come packet and pass to upper layer
+ */
+
+static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info * db)
+{
+        struct rx_desc *rxptr;
+        struct sk_buff *skb;
+        int rxlen;
+        u32 rdes0;
+        
+        rxptr = db->rx_ready_ptr;
+
+        while(db->rx_avail_cnt) {
+                rdes0 = le32_to_cpu(rxptr->rdes0);
+                if (rdes0 & 0x80000000) /* packet owner check */
+                {
+                        break;
+                }
+
+                db->rx_avail_cnt--;
+                db->interval_rx_cnt++;
+
+                pci_unmap_single(db->pdev, le32_to_cpu(rxptr->rdes2), RX_ALLOC_SIZE, PCI_DMA_FROMDEVICE);
+                if ( (rdes0 & 0x300) != 0x300) {
+                        /* A packet without First/Last flag */
+                        /* reuse this SKB */
+                        ULI526X_DBUG(0, "Reuse SK buffer, rdes0", rdes0);
+                        uli526x_reuse_skb(db, rxptr->rx_skb_ptr);
+                } else {
+                        /* A packet with First/Last flag */
+                        rxlen = ( (rdes0 >> 16) & 0x3fff) - 4;
+
+                        /* error summary bit check */
+                        if (rdes0 & 0x8000) {
+                                /* This is a error packet */
+                                //printk(DRV_NAME ": rdes0: %lx\n", rdes0);
+                                db->stats.rx_errors++;
+                                if (rdes0 & 1)
+                                        db->stats.rx_fifo_errors++;
+                                if (rdes0 & 2)
+                                        db->stats.rx_crc_errors++;
+                                if (rdes0 & 0x80)
+                                        db->stats.rx_length_errors++;
+                        }
+
+                        if ( !(rdes0 & 0x8000) ||
+                                ((db->cr6_data & CR6_PM) && (rxlen>6)) ) {
+                                skb = rxptr->rx_skb_ptr;
+                
+                                /* Good packet, send to upper layer */
+                                /* Shorst packet used new SKB */
+                                if ( (rxlen < RX_COPY_SIZE) &&
+                                        ( (skb = dev_alloc_skb(rxlen + 2) )
+                                        != NULL) ) {
+                                        /* size less than COPY_SIZE, allocate a rxlen SKB */
+                                        skb->dev = dev;
+                                        skb_reserve(skb, 2); /* 16byte align */
+                                        memcpy(skb_put(skb, rxlen), rxptr->rx_skb_ptr->tail, rxlen);
+                                        uli526x_reuse_skb(db, rxptr->rx_skb_ptr);
+                                } else {
+                                        skb->dev = dev;
+                                        skb_put(skb, rxlen);
+                                }
+                                skb->protocol = eth_type_trans(skb, dev);
+                                netif_rx(skb);
+                                dev->last_rx = jiffies;
+                                db->stats.rx_packets++;
+                                db->stats.rx_bytes += rxlen;
+                                
+                        } else {
+                                /* Reuse SKB buffer when the packet is error */
+                                ULI526X_DBUG(0, "Reuse SK buffer, rdes0", rdes0);
+                                uli526x_reuse_skb(db, rxptr->rx_skb_ptr);
+                        }
+                }
+
+                rxptr = rxptr->next_rx_desc;
+        }
+
+        db->rx_ready_ptr = rxptr;
+}
+
+
+/*
+ *      Get statistics from driver.
+ */
+
+static struct net_device_stats * uli526x_get_stats(struct net_device *dev)
+{
+        struct uli526x_board_info *db = netdev_priv(dev);
+
+        ULI526X_DBUG(0, "uli526x_get_stats", 0);
+        return &db->stats;
+}
+
+
+/*
+ * Set ULI526X multicast address
+ */
+
+static void uli526x_set_filter_mode(struct net_device * dev)
+{
+        struct uli526x_board_info *db = dev->priv;
+        unsigned long flags;
+
+        ULI526X_DBUG(0, "uli526x_set_filter_mode()", 0);
+        spin_lock_irqsave(&db->lock, flags);
+
+        if (dev->flags & IFF_PROMISC) {
+                ULI526X_DBUG(0, "Enable PROM Mode", 0);
+                db->cr6_data |= CR6_PM | CR6_PBF;
+                update_cr6(db->cr6_data, db->ioaddr);
+                spin_unlock_irqrestore(&db->lock, flags);
+                return;
+        }
+
+        if (dev->flags & IFF_ALLMULTI || dev->mc_count > ULI5261_MAX_MULTICAST) {
+                ULI526X_DBUG(0, "Pass all multicast address", dev->mc_count);
+                db->cr6_data &= ~(CR6_PM | CR6_PBF);
+                db->cr6_data |= CR6_PAM;
+                spin_unlock_irqrestore(&db->lock, flags);
+                return;
+        }
+
+        ULI526X_DBUG(0, "Set multicast address", dev->mc_count);
+        send_filter_frame(dev, dev->mc_count);  /* M5261/M5263 */
+        spin_unlock_irqrestore(&db->lock, flags);
+}
+
+static void
+ULi_ethtool_gset(struct uli526x_board_info *db, struct ethtool_cmd *ecmd)
+{
+        ecmd->supported = (SUPPORTED_10baseT_Half |
+                           SUPPORTED_10baseT_Full |
+                           SUPPORTED_100baseT_Half |
+                           SUPPORTED_100baseT_Full |
+                           SUPPORTED_Autoneg |
+                           SUPPORTED_MII);
+                
+        ecmd->advertising = (ADVERTISED_10baseT_Half |
+                           ADVERTISED_10baseT_Full |
+                           ADVERTISED_100baseT_Half |
+                           ADVERTISED_100baseT_Full |
+                           ADVERTISED_Autoneg |
+                           ADVERTISED_MII);
+
+
+        ecmd->port = PORT_MII;
+        ecmd->phy_address = db->phy_addr;
+
+        ecmd->transceiver = XCVR_EXTERNAL;
+                
+        ecmd->speed = 10;
+        ecmd->duplex = DUPLEX_HALF;
+        
+        if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
+        {
+                ecmd->speed = 100;               
+        }
+        if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
+        {
+                ecmd->duplex = DUPLEX_FULL;
+        }
+        if(db->link_failed)
+        {
+                ecmd->speed = -1;
+                ecmd->duplex = -1;      
+        }
+        
+        if (db->media_mode & ULI526X_AUTO)
+        {       
+                ecmd->autoneg = AUTONEG_ENABLE;
+        }
+}
+
+static void netdev_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info)
+{
+        struct uli526x_board_info *np = netdev_priv(dev);
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+        if (np->pdev)
+                strcpy(info->bus_info, pci_name(np->pdev));
+        else
+                sprintf(info->bus_info, "EISA 0x%lx %d",
+                        dev->base_addr, dev->irq);
+}
+
+static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) {
+        struct uli526x_board_info *np = netdev_priv(dev);
+        
+        ULi_ethtool_gset(np, cmd);
+        
+        return 0;
+}
+
+static u32 netdev_get_link(struct net_device *dev) {
+        struct uli526x_board_info *np = netdev_priv(dev);
+                
+        if(np->link_failed)
+                return 0;
+        else
+                return 1;
+}
+
+static void uli526x_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
+{
+        wol->supported = WAKE_PHY | WAKE_MAGIC;
+        wol->wolopts = 0;
+}
+
+static struct ethtool_ops netdev_ethtool_ops = {
+        .get_drvinfo            = netdev_get_drvinfo,
+        .get_settings           = netdev_get_settings,
+        .get_link               = netdev_get_link,
+        .get_wol                = uli526x_get_wol,
+};
+
+/*
+ *      A periodic timer routine
+ *      Dynamic media sense, allocate Rx buffer...
+ */
+
+static void uli526x_timer(unsigned long data)
+{
+        u32 tmp_cr8;
+        unsigned char tmp_cr12=0;
+        struct net_device *dev = (struct net_device *) data;
+        struct uli526x_board_info *db = netdev_priv(dev);
+        unsigned long flags;
+        u8 TmpSpeed=10;
+        
+        //ULI526X_DBUG(0, "uli526x_timer()", 0);
+        spin_lock_irqsave(&db->lock, flags);
+
+        
+        /* Dynamic reset ULI526X : system error or transmit time-out */
+        tmp_cr8 = inl(db->ioaddr + DCR8);
+        if ( (db->interval_rx_cnt==0) && (tmp_cr8) ) {
+                db->reset_cr8++;
+                db->wait_reset = 1;
+        }
+        db->interval_rx_cnt = 0;
+
+        /* TX polling kick monitor */
+        if ( db->tx_packet_cnt &&
+             time_after(jiffies, dev->trans_start + ULI526X_TX_KICK) ) {
+                outl(0x1, dev->base_addr + DCR1);   // Tx polling again 
+
+                // TX Timeout 
+                if ( time_after(jiffies, dev->trans_start + ULI526X_TX_TIMEOUT) ) {
+                        db->reset_TXtimeout++;
+                        db->wait_reset = 1;
+                        printk( "%s: Tx timeout - resetting\n",
+                               dev->name);
+                }
+        }
+
+        if (db->wait_reset) {
+                ULI526X_DBUG(0, "Dynamic Reset device", db->tx_packet_cnt);
+                db->reset_count++;
+                uli526x_dynamic_reset(dev);
+                db->timer.expires = ULI526X_TIMER_WUT;
+                add_timer(&db->timer);
+                spin_unlock_irqrestore(&db->lock, flags);
+                return;
+        }
+
+        /* Link status check, Dynamic media type change */
+        if((phy_read(db->ioaddr, db->phy_addr, 5, db->chip_id) & 0x01e0)!=0)
+                tmp_cr12 = 3;
+
+        if ( !(tmp_cr12 & 0x3) && !db->link_failed ) {
+                /* Link Failed */
+                ULI526X_DBUG(0, "Link Failed", tmp_cr12);
+                netif_carrier_off(dev);
+                printk(KERN_INFO "uli526x: %s NIC Link is Down\n",dev->name);
+                db->link_failed = 1;
+
+                /* For Force 10/100M Half/Full mode: Enable Auto-Nego mode */
+                /* AUTO don't need */
+                if ( !(db->media_mode & 0x8) )
+                        phy_write(db->ioaddr, db->phy_addr, 0, 0x1000, db->chip_id);
+
+                /* AUTO mode, if INT phyxcer link failed, select EXT device */
+                if (db->media_mode & ULI526X_AUTO) {
+                        db->cr6_data&=~0x00000200;      /* bit9=0, HD mode */
+                        update_cr6(db->cr6_data, db->ioaddr);
+                }
+        } else
+                if ((tmp_cr12 & 0x3) && db->link_failed) {
+                        ULI526X_DBUG(0, "Link link OK", tmp_cr12);
+                        db->link_failed = 0;
+
+                        /* Auto Sense Speed */
+                        if ( (db->media_mode & ULI526X_AUTO) &&
+                                uli526x_sense_speed(db) )
+                                db->link_failed = 1;
+                        uli526x_process_mode(db);
+                        
+                        if(db->link_failed==0)
+                        {
+                                if(db->op_mode==ULI526X_100MHF || db->op_mode==ULI526X_100MFD)
+                                {
+                                        TmpSpeed = 100;
+                                }
+                                if(db->op_mode==ULI526X_10MFD || db->op_mode==ULI526X_100MFD)
+                                {
+                                        printk(KERN_INFO "uli526x: %s NIC Link is Up %d Mbps Full duplex\n",dev->name,TmpSpeed);
+                                }
+                                else
+                                {
+                                        printk(KERN_INFO "uli526x: %s NIC Link is Up %d Mbps Half duplex\n",dev->name,TmpSpeed);
+                                }
+                                netif_carrier_on(dev);
+                        }
+                        /* SHOW_MEDIA_TYPE(db->op_mode); */
+                }
+                else if(!(tmp_cr12 & 0x3) && db->link_failed)
+                {
+                        if(db->init==1)
+                        {
+                                printk(KERN_INFO "uli526x: %s NIC Link is Down\n",dev->name);
+                                netif_carrier_off(dev);
+                        }
+                }
+                db->init=0;
+
+        /* Timer active again */
+        db->timer.expires = ULI526X_TIMER_WUT;
+        add_timer(&db->timer);
+        spin_unlock_irqrestore(&db->lock, flags);
+}
+
+
+/*
+ *      Dynamic reset the ULI526X board
+ *      Stop ULI526X board
+ *      Free Tx/Rx allocated memory
+ *      Reset ULI526X board
+ *      Re-initialize ULI526X board
+ */
+
+static void uli526x_dynamic_reset(struct net_device *dev)
+{
+        struct uli526x_board_info *db = netdev_priv(dev);
+
+        ULI526X_DBUG(0, "uli526x_dynamic_reset()", 0);
+
+        /* Sopt MAC controller */
+        db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); /* Disable Tx/Rx */
+        update_cr6(db->cr6_data, dev->base_addr);
+        outl(0, dev->base_addr + DCR7);         /* Disable Interrupt */
+        outl(inl(dev->base_addr + DCR5), dev->base_addr + DCR5);
+
+        /* Disable upper layer interface */
+        netif_stop_queue(dev);
+
+        /* Free Rx Allocate buffer */
+        uli526x_free_rxbuffer(db);
+
+        /* system variable init */
+        db->tx_packet_cnt = 0;
+        db->rx_avail_cnt = 0;
+        db->link_failed = 1;
+        db->init=1;
+        db->wait_reset = 0;
+
+        /* Re-initialize ULI526X board */
+        uli526x_init(dev);
+
+        /* Restart upper layer interface */
+        netif_wake_queue(dev);
+}
+
+
+/*
+ *      free all allocated rx buffer
+ */
+
+static void uli526x_free_rxbuffer(struct uli526x_board_info * db)
+{
+        ULI526X_DBUG(0, "uli526x_free_rxbuffer()", 0);
+
+        /* free allocated rx buffer */
+        while (db->rx_avail_cnt) {
+                dev_kfree_skb(db->rx_ready_ptr->rx_skb_ptr);
+                db->rx_ready_ptr = db->rx_ready_ptr->next_rx_desc;
+                db->rx_avail_cnt--;
+        }
+}
+
+
+/*
+ *      Reuse the SK buffer
+ */
+
+static void uli526x_reuse_skb(struct uli526x_board_info *db, struct sk_buff * skb)
+{
+        struct rx_desc *rxptr = db->rx_insert_ptr;
+
+        if (!(rxptr->rdes0 & cpu_to_le32(0x80000000))) {
+                rxptr->rx_skb_ptr = skb;
+                rxptr->rdes2 = cpu_to_le32( pci_map_single(db->pdev, skb->tail, RX_ALLOC_SIZE, PCI_DMA_FROMDEVICE) );
+                wmb();
+                rxptr->rdes0 = cpu_to_le32(0x80000000);
+                db->rx_avail_cnt++;
+                db->rx_insert_ptr = rxptr->next_rx_desc;
+        } else
+                ULI526X_DBUG(0, "SK Buffer reuse method error", db->rx_avail_cnt);
+}
+
+
+/*
+ *      Initialize transmit/Receive descriptor
+ *      Using Chain structure, and allocate Tx/Rx buffer
+ */
+
+static void uli526x_descriptor_init(struct uli526x_board_info *db, unsigned long ioaddr)
+{
+        struct tx_desc *tmp_tx;
+        struct rx_desc *tmp_rx;
+        unsigned char *tmp_buf;
+        dma_addr_t tmp_tx_dma, tmp_rx_dma;
+        dma_addr_t tmp_buf_dma;
+        int i;
+
+        ULI526X_DBUG(0, "uli526x_descriptor_init()", 0);
+
+        /* tx descriptor start pointer */
+        db->tx_insert_ptr = db->first_tx_desc;
+        db->tx_remove_ptr = db->first_tx_desc;
+        outl(db->first_tx_desc_dma, ioaddr + DCR4);     /* TX DESC address */
+
+        /* rx descriptor start pointer */
+        db->first_rx_desc = (void *)db->first_tx_desc + sizeof(struct tx_desc) * TX_DESC_CNT;
+        db->first_rx_desc_dma =  db->first_tx_desc_dma + sizeof(struct tx_desc) * TX_DESC_CNT;
+        db->rx_insert_ptr = db->first_rx_desc;
+        db->rx_ready_ptr = db->first_rx_desc;
+        outl(db->first_rx_desc_dma, ioaddr + DCR3);     /* RX DESC address */
+
+        /* Init Transmit chain */
+        tmp_buf = db->buf_pool_start;
+        tmp_buf_dma = db->buf_pool_dma_start;
+        tmp_tx_dma = db->first_tx_desc_dma;
+        for (tmp_tx = db->first_tx_desc, i = 0; i < TX_DESC_CNT; i++, tmp_tx++) {
+                tmp_tx->tx_buf_ptr = tmp_buf;
+                tmp_tx->tdes0 = cpu_to_le32(0);
+                tmp_tx->tdes1 = cpu_to_le32(0x81000000);        /* IC, chain */
+                tmp_tx->tdes2 = cpu_to_le32(tmp_buf_dma);
+                tmp_tx_dma += sizeof(struct tx_desc);
+                tmp_tx->tdes3 = cpu_to_le32(tmp_tx_dma);
+                tmp_tx->next_tx_desc = tmp_tx + 1;
+                tmp_buf = tmp_buf + TX_BUF_ALLOC;
+                tmp_buf_dma = tmp_buf_dma + TX_BUF_ALLOC;
+        }
+        (--tmp_tx)->tdes3 = cpu_to_le32(db->first_tx_desc_dma);
+        tmp_tx->next_tx_desc = db->first_tx_desc;
+
+         /* Init Receive descriptor chain */
+        tmp_rx_dma=db->first_rx_desc_dma;
+        for (tmp_rx = db->first_rx_desc, i = 0; i < RX_DESC_CNT; i++, tmp_rx++) {
+                tmp_rx->rdes0 = cpu_to_le32(0);
+                tmp_rx->rdes1 = cpu_to_le32(0x01000600);
+                tmp_rx_dma += sizeof(struct rx_desc);
+                tmp_rx->rdes3 = cpu_to_le32(tmp_rx_dma);
+                tmp_rx->next_rx_desc = tmp_rx + 1;
+        }
+        (--tmp_rx)->rdes3 = cpu_to_le32(db->first_rx_desc_dma);
+        tmp_rx->next_rx_desc = db->first_rx_desc;
+
+        /* pre-allocate Rx buffer */
+        allocate_rx_buffer(db);
+}
+
+
+/*
+ *      Update CR6 value
+ *      Firstly stop ULI526X, then written value and start
+ */
+
+static void update_cr6(u32 cr6_data, unsigned long ioaddr)
+{
+
+        outl(cr6_data, ioaddr + DCR6);
+        udelay(5);
+}
+
+
+/*
+ *      Send a setup frame for M5261/M5263
+ *      This setup frame initialize ULI526X address filter mode
+ */
+
+static void send_filter_frame(struct net_device *dev, int mc_cnt)
+{
+        struct uli526x_board_info *db = netdev_priv(dev);
+        struct dev_mc_list *mcptr;
+        struct tx_desc *txptr;
+        u16 * addrptr;
+        u32 * suptr;
+        int i;
+
+        ULI526X_DBUG(0, "send_filter_frame()", 0);
+
+        txptr = db->tx_insert_ptr;
+        suptr = (u32 *) txptr->tx_buf_ptr;
+
+        /* Node address */
+        addrptr = (u16 *) dev->dev_addr;
+        *suptr++ = addrptr[0];
+        *suptr++ = addrptr[1];
+        *suptr++ = addrptr[2];
+
+        /* broadcast address */
+        *suptr++ = 0xffff;
+        *suptr++ = 0xffff;
+        *suptr++ = 0xffff;
+
+        /* fit the multicast address */
+        for (mcptr = dev->mc_list, i = 0; i < mc_cnt; i++, mcptr = mcptr->next) {
+                addrptr = (u16 *) mcptr->dmi_addr;
+                *suptr++ = addrptr[0];
+                *suptr++ = addrptr[1];
+                *suptr++ = addrptr[2];
+        }
+
+        for (; i<14; i++) {
+                *suptr++ = 0xffff;
+                *suptr++ = 0xffff;
+                *suptr++ = 0xffff;
+        }
+
+        /* prepare the setup frame */
+        db->tx_insert_ptr = txptr->next_tx_desc;
+        txptr->tdes1 = cpu_to_le32(0x890000c0);
+
+        /* Resource Check and Send the setup packet */
+        if (db->tx_packet_cnt < TX_DESC_CNT) {
+                /* Resource Empty */
+                db->tx_packet_cnt++;
+                txptr->tdes0 = cpu_to_le32(0x80000000);
+                update_cr6(db->cr6_data | 0x2000, dev->base_addr);
+                outl(0x1, dev->base_addr + DCR1);       /* Issue Tx polling */
+                update_cr6(db->cr6_data, dev->base_addr);
+                dev->trans_start = jiffies;
+        } else
+                printk(KERN_ERR DRV_NAME ": No Tx resource - Send_filter_frame!\n");
+}
+
+
+/*
+ *      Allocate rx buffer,
+ *      As possible as allocate maxiumn Rx buffer
+ */
+
+static void allocate_rx_buffer(struct uli526x_board_info *db)
+{
+        struct rx_desc *rxptr;
+        struct sk_buff *skb;
+
+        rxptr = db->rx_insert_ptr;
+
+        while(db->rx_avail_cnt < RX_DESC_CNT) {
+                if ( ( skb = dev_alloc_skb(RX_ALLOC_SIZE) ) == NULL )
+                        break;
+                rxptr->rx_skb_ptr = skb; /* FIXME (?) */
+                rxptr->rdes2 = cpu_to_le32( pci_map_single(db->pdev, skb->tail, RX_ALLOC_SIZE, PCI_DMA_FROMDEVICE) );
+                wmb();
+                rxptr->rdes0 = cpu_to_le32(0x80000000);
+                rxptr = rxptr->next_rx_desc;
+                db->rx_avail_cnt++;
+        }
+
+        db->rx_insert_ptr = rxptr;
+}
+
+
+/*
+ *      Read one word data from the serial ROM
+ */
+
+static u16 read_srom_word(long ioaddr, int offset)
+{
+        int i;
+        u16 srom_data = 0;
+        long cr9_ioaddr = ioaddr + DCR9;
+
+        outl(CR9_SROM_READ, cr9_ioaddr);
+        outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+
+        /* Send the Read Command 110b */
+        SROM_CLK_WRITE(SROM_DATA_1, cr9_ioaddr);
+        SROM_CLK_WRITE(SROM_DATA_1, cr9_ioaddr);
+        SROM_CLK_WRITE(SROM_DATA_0, cr9_ioaddr);
+
+        /* Send the offset */
+        for (i = 5; i >= 0; i--) {
+                srom_data = (offset & (1 << i)) ? SROM_DATA_1 : SROM_DATA_0;
+                SROM_CLK_WRITE(srom_data, cr9_ioaddr);
+        }
+
+        outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+
+        for (i = 16; i > 0; i--) {
+                outl(CR9_SROM_READ | CR9_SRCS | CR9_SRCLK, cr9_ioaddr);
+                udelay(5);
+                srom_data = (srom_data << 1) | ((inl(cr9_ioaddr) & CR9_CRDOUT) ? 1 : 0);
+                outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr);
+                udelay(5);
+        }
+
+        outl(CR9_SROM_READ, cr9_ioaddr);
+        return srom_data;
+}
+
+
+/*
+ *      Auto sense the media mode
+ */
+
+static u8 uli526x_sense_speed(struct uli526x_board_info * db)
+{
+        u8 ErrFlag = 0;
+        u16 phy_mode;
+
+        phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id);
+        phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id);
+
+        if ( (phy_mode & 0x24) == 0x24 ) {
+                
+                phy_mode = ((phy_read(db->ioaddr, db->phy_addr, 5, db->chip_id) & 0x01e0)<<7);
+                if(phy_mode&0x8000)
+                        phy_mode = 0x8000;
+                else if(phy_mode&0x4000)
+                        phy_mode = 0x4000;
+                else if(phy_mode&0x2000)
+                        phy_mode = 0x2000;
+                else
+                        phy_mode = 0x1000;
+                
+                /* printk(DRV_NAME ": Phy_mode %x ",phy_mode); */
+                switch (phy_mode) {
+                case 0x1000: db->op_mode = ULI526X_10MHF; break;
+                case 0x2000: db->op_mode = ULI526X_10MFD; break;
+                case 0x4000: db->op_mode = ULI526X_100MHF; break;
+                case 0x8000: db->op_mode = ULI526X_100MFD; break;
+                default: db->op_mode = ULI526X_10MHF; ErrFlag = 1; break;
+                }
+        } else {
+                db->op_mode = ULI526X_10MHF;
+                ULI526X_DBUG(0, "Link Failed :", phy_mode);
+                ErrFlag = 1;
+        }
+
+        return ErrFlag;
+}
+
+
+/*
+ *      Set 10/100 phyxcer capability
+ *      AUTO mode : phyxcer register4 is NIC capability
+ *      Force mode: phyxcer register4 is the force media
+ */
+
+static void uli526x_set_phyxcer(struct uli526x_board_info *db)
+{
+        u16 phy_reg;
+        
+        /* Phyxcer capability setting */
+        phy_reg = phy_read(db->ioaddr, db->phy_addr, 4, db->chip_id) & ~0x01e0;
+
+        if (db->media_mode & ULI526X_AUTO) {
+                /* AUTO Mode */
+                phy_reg |= db->PHY_reg4;
+        } else {
+                /* Force Mode */
+                switch(db->media_mode) {
+                case ULI526X_10MHF: phy_reg |= 0x20; break;
+                case ULI526X_10MFD: phy_reg |= 0x40; break;
+                case ULI526X_100MHF: phy_reg |= 0x80; break;
+                case ULI526X_100MFD: phy_reg |= 0x100; break;
+                }
+                
+        }
+
+        /* Write new capability to Phyxcer Reg4 */
+        if ( !(phy_reg & 0x01e0)) {
+                phy_reg|=db->PHY_reg4;
+                db->media_mode|=ULI526X_AUTO;
+        }
+        phy_write(db->ioaddr, db->phy_addr, 4, phy_reg, db->chip_id);
+
+        /* Restart Auto-Negotiation */
+        phy_write(db->ioaddr, db->phy_addr, 0, 0x1200, db->chip_id);
+        udelay(50);
+}
+
+
+/*
+ *      Process op-mode
+        AUTO mode : PHY controller in Auto-negotiation Mode
+ *      Force mode: PHY controller in force mode with HUB
+ *                      N-way force capability with SWITCH
+ */
+
+static void uli526x_process_mode(struct uli526x_board_info *db)
+{
+        u16 phy_reg;
+
+        /* Full Duplex Mode Check */
+        if (db->op_mode & 0x4)
+                db->cr6_data |= CR6_FDM;        /* Set Full Duplex Bit */
+        else
+                db->cr6_data &= ~CR6_FDM;       /* Clear Full Duplex Bit */
+
+        update_cr6(db->cr6_data, db->ioaddr);
+
+        /* 10/100M phyxcer force mode need */
+        if ( !(db->media_mode & 0x8)) {
+                /* Forece Mode */
+                phy_reg = phy_read(db->ioaddr, db->phy_addr, 6, db->chip_id);
+                if ( !(phy_reg & 0x1) ) {
+                        /* parter without N-Way capability */
+                        phy_reg = 0x0;
+                        switch(db->op_mode) {
+                        case ULI526X_10MHF: phy_reg = 0x0; break;
+                        case ULI526X_10MFD: phy_reg = 0x100; break;
+                        case ULI526X_100MHF: phy_reg = 0x2000; break;
+                        case ULI526X_100MFD: phy_reg = 0x2100; break;
+                        }
+                        phy_write(db->ioaddr, db->phy_addr, 0, phy_reg, db->chip_id);
+                        phy_write(db->ioaddr, db->phy_addr, 0, phy_reg, db->chip_id);
+                }
+        }
+}
+
+
+/*
+ *      Write a word to Phy register
+ */
+
+static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data, u32 chip_id)
+{
+        u16 i;
+        unsigned long ioaddr;
+
+        if(chip_id == PCI_ULI5263_ID)
+        {
+                phy_writeby_cr10(iobase, phy_addr, offset, phy_data);
+                return;
+        }
+        /* M5261/M5263 Chip */
+        ioaddr = iobase + DCR9;
+
+        /* Send 33 synchronization clock to Phy controller */
+        for (i = 0; i < 35; i++)
+                phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+
+        /* Send start command(01) to Phy */
+        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
+        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+
+        /* Send write command(01) to Phy */
+        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
+        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+
+        /* Send Phy address */
+        for (i = 0x10; i > 0; i = i >> 1)
+                phy_write_1bit(ioaddr, phy_addr & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+
+        /* Send register address */
+        for (i = 0x10; i > 0; i = i >> 1)
+                phy_write_1bit(ioaddr, offset & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+
+        /* written trasnition */
+        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
+
+        /* Write a word data to PHY controller */
+        for ( i = 0x8000; i > 0; i >>= 1)
+                phy_write_1bit(ioaddr, phy_data & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+        
+}
+
+
+/*
+ *      Read a word data from phy register
+ */
+
+static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id)
+{
+        int i;
+        u16 phy_data;
+        unsigned long ioaddr;
+
+        if(chip_id == PCI_ULI5263_ID)
+                return phy_readby_cr10(iobase, phy_addr, offset);
+        /* M5261/M5263 Chip */
+        ioaddr = iobase + DCR9;
+        
+        /* Send 33 synchronization clock to Phy controller */
+        for (i = 0; i < 35; i++)
+                phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+
+        /* Send start command(01) to Phy */
+        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
+        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+
+        /* Send read command(10) to Phy */
+        phy_write_1bit(ioaddr, PHY_DATA_1, chip_id);
+        phy_write_1bit(ioaddr, PHY_DATA_0, chip_id);
+
+        /* Send Phy address */
+        for (i = 0x10; i > 0; i = i >> 1)
+                phy_write_1bit(ioaddr, phy_addr & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+
+        /* Send register address */
+        for (i = 0x10; i > 0; i = i >> 1)
+                phy_write_1bit(ioaddr, offset & i ? PHY_DATA_1 : PHY_DATA_0, chip_id);
+
+        /* Skip transition state */
+        phy_read_1bit(ioaddr, chip_id);
+
+        /* read 16bit data */
+        for (phy_data = 0, i = 0; i < 16; i++) {
+                phy_data <<= 1;
+                phy_data |= phy_read_1bit(ioaddr, chip_id);
+        }
+
+        return phy_data;
+}
+
+static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset)
+{
+        unsigned long ioaddr,cr10_value;
+        
+        ioaddr = iobase + DCR10;
+        cr10_value = phy_addr;
+        cr10_value = (cr10_value<<5) + offset;
+        cr10_value = (cr10_value<<16) + 0x08000000;
+        outl(cr10_value,ioaddr);
+        udelay(1);
+        while(1)
+        {
+                cr10_value = inl(ioaddr);
+                if(cr10_value&0x10000000)
+                        break;
+        }
+        return (cr10_value&0x0ffff);
+}
+
+static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data)
+{
+        unsigned long ioaddr,cr10_value;
+        
+        ioaddr = iobase + DCR10;
+        cr10_value = phy_addr;
+        cr10_value = (cr10_value<<5) + offset;
+        cr10_value = (cr10_value<<16) + 0x04000000 + phy_data;
+        outl(cr10_value,ioaddr);
+        udelay(1);
+}
+/*
+ *      Write one bit data to Phy Controller
+ */
+
+static void phy_write_1bit(unsigned long ioaddr, u32 phy_data, u32 chip_id)
+{
+        outl(phy_data , ioaddr);                        /* MII Clock Low */
+        udelay(1);
+        outl(phy_data  | MDCLKH, ioaddr);       /* MII Clock High */
+        udelay(1);
+        outl(phy_data , ioaddr);                        /* MII Clock Low */
+        udelay(1);
+}
+
+
+/*
+ *      Read one bit phy data from PHY controller
+ */
+
+static u16 phy_read_1bit(unsigned long ioaddr, u32 chip_id)
+{
+        u16 phy_data;
+        
+        outl(0x50000 , ioaddr);
+        udelay(1);
+        phy_data = ( inl(ioaddr) >> 19 ) & 0x1;
+        outl(0x40000 , ioaddr);
+        udelay(1);
+
+        return phy_data;
+}
+
+
+static struct pci_device_id uli526x_pci_tbl[] = {
+        { 0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID },
+        { 0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID },
+        { 0, }
+};
+MODULE_DEVICE_TABLE(pci, uli526x_pci_tbl);
+
+
+static struct pci_driver uli526x_driver = {
+        .name           = "uli526x",
+        .id_table       = uli526x_pci_tbl,
+        .probe          = uli526x_init_one,
+        .remove         = __devexit_p(uli526x_remove_one),
+};
+
+MODULE_AUTHOR("Peer Chen, peer.chen@uli.com.tw");
+MODULE_DESCRIPTION("ULi M5261/M5263 fast ethernet driver");
+MODULE_LICENSE("GPL");
+
+MODULE_PARM(debug, "i");
+MODULE_PARM(mode, "i");
+MODULE_PARM(cr6set, "i");
+MODULE_PARM_DESC(debug, "ULi M5261/M5263 enable debugging (0-1)");
+MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8: HomePNA");
+
+/*      Description:
+ *      when user used insmod to add module, system invoked init_module()
+ *      to register the services.
+ */
+
+static int __init uli526x_init_module(void)
+{
+        int rc;
+
+        printk(version);
+        printed_version = 1;
+
+        ULI526X_DBUG(0, "init_module() ", debug);
+
+        if (debug)
+                uli526x_debug = debug;  /* set debug flag */
+        if (cr6set)
+                uli526x_cr6_user_set = cr6set;
+
+        switch(mode) {
+        case ULI526X_10MHF:
+        case ULI526X_100MHF:
+        case ULI526X_10MFD:
+        case ULI526X_100MFD:
+                uli526x_media_mode = mode;
+                break;
+        default:uli526x_media_mode = ULI526X_AUTO;
+                break;
+        }
+
+        rc = pci_module_init(&uli526x_driver);
+        if (rc < 0)
+                return rc;
+
+        return 0;
+}
+
+
+/*
+ *      Description:
+ *      when user used rmmod to delete module, system invoked clean_module()
+ *      to un-register all registered services.
+ */
+
+static void __exit uli526x_cleanup_module(void)
+{
+        ULI526X_DBUG(0, "uli526x_clean_module() ", debug);
+        pci_unregister_driver(&uli526x_driver);
+}
+
+module_init(uli526x_init_module);
+module_exit(uli526x_cleanup_module);
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index effab0b9adca..50b8c6754b1e 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -18,6 +18,9 @@
 /*
  *  Changes:
  *
+ *  Mike Kershaw <dragorn@kismetwireless.net> 2005/08/14
+ *    Add TUNSETLINK ioctl to set the link encapsulation
+ *
  *  Mark Smith <markzzzsmith@yahoo.com.au>
  *   Use random_ether_addr() for tap MAC address.
  *
@@ -612,6 +615,18 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
                 DBG(KERN_INFO "%s: owner set to %d\n", tun->dev->name, tun->owner);
                 break;
 
+        case TUNSETLINK:
+                /* Only allow setting the type when the interface is down */
+                if (tun->dev->flags & IFF_UP) {
+                        DBG(KERN_INFO "%s: Linktype set failed because interface is up\n",
+                                tun->dev->name);
+                        return -EBUSY;
+                } else {
+                        tun->dev->type = (int) arg;
+                        DBG(KERN_INFO "%s: linktype set to %d\n", tun->dev->name, tun->dev->type);
+                }
+                break;
+
 #ifdef TUN_DEBUG
         case TUNSETDEBUG:
                 tun->debug = arg;
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index f58c794a963a..b56a7b516d24 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -1440,6 +1440,7 @@ static void sppp_print_bytes (u_char *p, u16 len)
  *      @skb:   The buffer to process
  *      @dev:   The device it arrived on
  *      @p: Unused
+ *      @orig_dev: Unused
  *
  *      Protocol glue. This drives the deferred processing mode the poorer
  *      cards use. This can be called directly by cards that do not have
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index ec3f75a030d2..00a07f32a81e 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -137,6 +137,110 @@ config PCMCIA_RAYCS
 comment "Wireless 802.11b ISA/PCI cards support"
         depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
 
+config IPW2100
+        tristate "Intel PRO/Wireless 2100 Network Connection"
+        depends on NET_RADIO && PCI && IEEE80211
+        select FW_LOADER
+        ---help---
+          A driver for the Intel PRO/Wireless 2100 Network 
+          Connection 802.11b wireless network adapter.
+
+          See <file:Documentation/networking/README.ipw2100> for information on
+          the capabilities currently enabled in this driver and for tips
+          for debugging issues and problems.
+
+          In order to use this driver, you will need a firmware image for it.
+          You can obtain the firmware from
+          <http://ipw2100.sf.net/>.  Once you have the firmware image, you 
+          will need to place it in /etc/firmware.
+
+          You will also very likely need the Wireless Tools in order to
+          configure your card:
+
+          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
+ 
+          If you want to compile the driver as a module ( = code which can be
+          inserted in and remvoed from the running kernel whenever you want),
+          say M here and read <file:Documentation/modules.txt>.  The module
+          will be called ipw2100.ko.
+        
+config IPW2100_MONITOR
+        bool "Enable promiscuous mode"
+        depends on IPW2100
+        ---help---
+          Enables promiscuous/monitor mode support for the ipw2100 driver.
+          With this feature compiled into the driver, you can switch to 
+          promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+          mode, no packets can be sent.
+
+config IPW_DEBUG
+        bool "Enable full debugging output in IPW2100 module."
+        depends on IPW2100
+        ---help---
+          This option will enable debug tracing output for the IPW2100.  
+
+          This will result in the kernel module being ~60k larger.  You can 
+          control which debug output is sent to the kernel log by setting the 
+          value in 
+
+          /sys/bus/pci/drivers/ipw2100/debug_level
+
+          This entry will only exist if this option is enabled.
+
+          If you are not trying to debug or develop the IPW2100 driver, you 
+          most likely want to say N here.
+
+config IPW2200
+        tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
+        depends on IEEE80211 && PCI
+        select FW_LOADER
+        ---help---
+          A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
+          Connection adapters. 
+
+          See <file:Documentation/networking/README.ipw2200> for 
+          information on the capabilities currently enabled in this 
+          driver and for tips for debugging issues and problems.
+
+          In order to use this driver, you will need a firmware image for it.
+          You can obtain the firmware from
+          <http://ipw2200.sf.net/>.  See the above referenced README.ipw2200 
+          for information on where to install the firmare images.
+
+          You will also very likely need the Wireless Tools in order to
+          configure your card:
+
+          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
+ 
+          If you want to compile the driver as a module ( = code which can be
+          inserted in and remvoed from the running kernel whenever you want),
+          say M here and read <file:Documentation/modules.txt>.  The module
+          will be called ipw2200.ko.
+
+config IPW_DEBUG
+        bool "Enable full debugging output in IPW2200 module."
+        depends on IPW2200
+        ---help---
+          This option will enable debug tracing output for the IPW2200.  
+
+          This will result in the kernel module being ~100k larger.  You can 
+          control which debug output is sent to the kernel log by setting the 
+          value in 
+
+          /sys/bus/pci/drivers/ipw2200/debug_level
+
+          This entry will only exist if this option is enabled.
+
+          To set a value, simply echo an 8-byte hex value to the same file:
+
+          % echo 0x00000FFO > /sys/bus/pci/drivers/ipw2200/debug_level
+
+          You can find the list of debug mask values in 
+          drivers/net/wireless/ipw2200.h
+
+          If you are not trying to debug or develop the IPW2200 driver, you 
+          most likely want to say N here.
+
 config AIRO
         tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
         depends on NET_RADIO && ISA && (PCI || BROKEN)
@@ -185,8 +289,8 @@ config APPLE_AIRPORT
           a non-standard interface
 
 config PLX_HERMES
-        tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.) (EXPERIMENTAL)"
-        depends on PCI && HERMES && EXPERIMENTAL
+        tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)"
+        depends on PCI && HERMES
         help
           Enable support for PCMCIA cards supported by the "Hermes" (aka
           orinoco) driver when used in PLX9052 based PCI adaptors.  These
@@ -195,12 +299,9 @@ config PLX_HERMES
           802.11b PCMCIA cards can be used in desktop machines.  The Netgear
           MA301 is such an adaptor.
 
-          Support for these adaptors is so far still incomplete and buggy.
-          You have been warned.
-
 config TMD_HERMES
-        tristate "Hermes in TMD7160 based PCI adaptor support (EXPERIMENTAL)"
-        depends on PCI && HERMES && EXPERIMENTAL
+        tristate "Hermes in TMD7160 based PCI adaptor support"
+        depends on PCI && HERMES
         help
           Enable support for PCMCIA cards supported by the "Hermes" (aka
           orinoco) driver when used in TMD7160 based PCI adaptors.  These
@@ -208,12 +309,18 @@ config TMD_HERMES
           PCI <-> PCMCIA bridge.  Several vendors sell such adaptors so that
           802.11b PCMCIA cards can be used in desktop machines.
 
-          Support for these adaptors is so far still incomplete and buggy.
-          You have been warned.
+config NORTEL_HERMES
+        tristate "Nortel emobility PCI adaptor support"
+        depends on PCI && HERMES
+        help
+          Enable support for PCMCIA cards supported by the "Hermes" (aka
+          orinoco) driver when used in Nortel emobility PCI adaptors.  These
+          adaptors are not full PCMCIA controllers, but act as a more limited
+          PCI <-> PCMCIA bridge.
 
 config PCI_HERMES
-        tristate "Prism 2.5 PCI 802.11b adaptor support (EXPERIMENTAL)"
-        depends on PCI && HERMES && EXPERIMENTAL
+        tristate "Prism 2.5 PCI 802.11b adaptor support"
+        depends on PCI && HERMES
         help
           Enable support for PCI and mini-PCI 802.11b wireless NICs based on
           the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b
@@ -268,6 +375,19 @@ config PCMCIA_HERMES
           configure your card and that /etc/pcmcia/wireless.opts works:
           <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
 
+config PCMCIA_SPECTRUM
+        tristate "Symbol Spectrum24 Trilogy PCMCIA card support"
+        depends on NET_RADIO && PCMCIA && HERMES
+        ---help---
+
+          This is a driver for 802.11b cards using RAM-loadable Symbol
+          firmware, such as Symbol Wireless Networker LA4100, CompactFlash
+          cards by Socket Communications and Intel PRO/Wireless 2011B.
+
+          This driver requires firmware download on startup.  Utilities
+          for downloading Symbol firmware are available at
+          <http://sourceforge.net/projects/orinoco/>
+
 config AIRO_CS
         tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
         depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
@@ -355,6 +475,8 @@ config PRISM54
           say M here and read <file:Documentation/modules.txt>.  The module
           will be called prism54.ko.
 
+source "drivers/net/wireless/hostap/Kconfig"
+
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
         bool
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 2b87841322cc..3a6f7ba326ca 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -2,6 +2,10 @@
 # Makefile for the Linux Wireless network device drivers.
 #
 
+obj-$(CONFIG_IPW2100) += ipw2100.o
+
+obj-$(CONFIG_IPW2200) += ipw2200.o
+
 obj-$(CONFIG_STRIP) += strip.o
 obj-$(CONFIG_ARLAN) += arlan.o 
 
@@ -18,6 +22,8 @@ obj-$(CONFIG_APPLE_AIRPORT)	+= airport.o
 obj-$(CONFIG_PLX_HERMES)        += orinoco_plx.o
 obj-$(CONFIG_PCI_HERMES)        += orinoco_pci.o
 obj-$(CONFIG_TMD_HERMES)        += orinoco_tmd.o
+obj-$(CONFIG_NORTEL_HERMES)     += orinoco_nortel.o
+obj-$(CONFIG_PCMCIA_SPECTRUM)   += spectrum_cs.o
 
 obj-$(CONFIG_AIRO)              += airo.o
 obj-$(CONFIG_AIRO_CS)           += airo_cs.o airo.o
@@ -28,6 +34,8 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
 
 obj-$(CONFIG_PRISM54)           += prism54/
 
+obj-$(CONFIG_HOSTAP)            += hostap/
+
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)      += ray_cs.o
 obj-$(CONFIG_PCMCIA_WL3501)     += wl3501_cs.o
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index df20adcd0730..2be65d308fbe 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1040,7 +1040,7 @@ typedef struct {
         u16 status;
 } WifiCtlHdr;
 
-WifiCtlHdr wifictlhdr8023 = {
+static WifiCtlHdr wifictlhdr8023 = {
         .ctlhdr = {
                 .ctl    = HOST_DONT_RLSE,
         }
@@ -1111,13 +1111,13 @@ static int airo_thread(void *data);
 static void timer_func( struct net_device *dev );
 static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 #ifdef WIRELESS_EXT
-struct iw_statistics *airo_get_wireless_stats (struct net_device *dev);
+static struct iw_statistics *airo_get_wireless_stats (struct net_device *dev);
 static void airo_read_wireless_stats (struct airo_info *local);
 #endif /* WIRELESS_EXT */
 #ifdef CISCO_EXT
 static int readrids(struct net_device *dev, aironet_ioctl *comp);
 static int writerids(struct net_device *dev, aironet_ioctl *comp);
-int flashcard(struct net_device *dev, aironet_ioctl *comp);
+static int flashcard(struct net_device *dev, aironet_ioctl *comp);
 #endif /* CISCO_EXT */
 #ifdef MICSUPPORT
 static void micinit(struct airo_info *ai);
@@ -1226,6 +1226,12 @@ static int setup_proc_entry( struct net_device *dev,
 static int takedown_proc_entry( struct net_device *dev,
                                 struct airo_info *apriv );
 
+static int cmdreset(struct airo_info *ai);
+static int setflashmode (struct airo_info *ai);
+static int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime);
+static int flashputbuf(struct airo_info *ai);
+static int flashrestart(struct airo_info *ai,struct net_device *dev);
+
 #ifdef MICSUPPORT
 /***********************************************************************
  *                              MIC ROUTINES                           *
@@ -1234,10 +1240,11 @@ static int takedown_proc_entry( struct net_device *dev,
 
 static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSeq);
 static void MoveWindow(miccntx *context, u32 micSeq);
-void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *);
-void emmh32_init(emmh32_context *context);
-void emmh32_update(emmh32_context *context, u8 *pOctets, int len);
-void emmh32_final(emmh32_context *context, u8 digest[4]);
+static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *);
+static void emmh32_init(emmh32_context *context);
+static void emmh32_update(emmh32_context *context, u8 *pOctets, int len);
+static void emmh32_final(emmh32_context *context, u8 digest[4]);
+static int flashpchar(struct airo_info *ai,int byte,int dwelltime);
 
 /* micinit - Initialize mic seed */
 
@@ -1301,7 +1308,7 @@ static int micsetup(struct airo_info *ai) {
         int i;
 
         if (ai->tfm == NULL)
-                ai->tfm = crypto_alloc_tfm("aes", 0);
+                ai->tfm = crypto_alloc_tfm("aes", CRYPTO_TFM_REQ_MAY_SLEEP);
 
         if (ai->tfm == NULL) {
                 printk(KERN_ERR "airo: failed to load transform for AES\n");
@@ -1315,7 +1322,7 @@ static int micsetup(struct airo_info *ai) {
         return SUCCESS;
 }
 
-char micsnap[]= {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
+static char micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
 
 /*===========================================================================
  * Description: Mic a packet
@@ -1570,7 +1577,7 @@ static void MoveWindow(miccntx *context, u32 micSeq)
 static unsigned char aes_counter[16];
 
 /* expand the key to fill the MMH coefficient array */
-void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *tfm)
+static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto_tfm *tfm)
 {
   /* take the keying material, expand if necessary, truncate at 16-bytes */
   /* run through AES counter mode to generate context->coeff[] */
@@ -1602,7 +1609,7 @@ void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct crypto
 }
 
 /* prepare for calculation of a new mic */
-void emmh32_init(emmh32_context *context)
+static void emmh32_init(emmh32_context *context)
 {
         /* prepare for new mic calculation */
         context->accum = 0;
@@ -1610,7 +1617,7 @@ void emmh32_init(emmh32_context *context)
 }
 
 /* add some bytes to the mic calculation */
-void emmh32_update(emmh32_context *context, u8 *pOctets, int len)
+static void emmh32_update(emmh32_context *context, u8 *pOctets, int len)
 {
         int     coeff_position, byte_position;
   
@@ -1652,7 +1659,7 @@ void emmh32_update(emmh32_context *context, u8 *pOctets, int len)
 static u32 mask32[4] = { 0x00000000L, 0xFF000000L, 0xFFFF0000L, 0xFFFFFF00L };
 
 /* calculate the mic */
-void emmh32_final(emmh32_context *context, u8 digest[4])
+static void emmh32_final(emmh32_context *context, u8 digest[4])
 {
         int     coeff_position, byte_position;
         u32     val;
@@ -2232,7 +2239,7 @@ static void airo_read_stats(struct airo_info *ai) {
         u32 *vals = stats_rid.vals;
 
         clear_bit(JOB_STATS, &ai->flags);
-        if (ai->power) {
+        if (ai->power.event) {
                 up(&ai->sem);
                 return;
         }
@@ -2255,7 +2262,7 @@ static void airo_read_stats(struct airo_info *ai) {
         ai->stats.rx_fifo_errors = vals[0];
 }
 
-struct net_device_stats *airo_get_stats(struct net_device *dev)
+static struct net_device_stats *airo_get_stats(struct net_device *dev)
 {
         struct airo_info *local =  dev->priv;
 
@@ -2403,8 +2410,7 @@ void stop_airo_card( struct net_device *dev, int freeres )
                 }
         }
 #ifdef MICSUPPORT
-        if (ai->tfm)
-                crypto_free_tfm(ai->tfm);
+        crypto_free_tfm(ai->tfm);
 #endif
         del_airo_dev( dev );
         free_netdev( dev );
@@ -2414,7 +2420,7 @@ EXPORT_SYMBOL(stop_airo_card);
 
 static int add_airo_dev( struct net_device *dev );
 
-int wll_header_parse(struct sk_buff *skb, unsigned char *haddr)
+static int wll_header_parse(struct sk_buff *skb, unsigned char *haddr)
 {
         memcpy(haddr, skb->mac.raw + 10, ETH_ALEN);
         return ETH_ALEN;
@@ -2681,7 +2687,7 @@ static struct net_device *init_wifidev(struct airo_info *ai,
         return dev;
 }
 
-int reset_card( struct net_device *dev , int lock) {
+static int reset_card( struct net_device *dev , int lock) {
         struct airo_info *ai = dev->priv;
 
         if (lock && down_interruptible(&ai->sem))
@@ -2696,9 +2702,9 @@ int reset_card( struct net_device *dev , int lock) {
         return 0;
 }
 
-struct net_device *_init_airo_card( unsigned short irq, int port,
-                                    int is_pcmcia, struct pci_dev *pci,
-                                    struct device *dmdev )
+static struct net_device *_init_airo_card( unsigned short irq, int port,
+                                           int is_pcmcia, struct pci_dev *pci,
+                                           struct device *dmdev )
 {
         struct net_device *dev;
         struct airo_info *ai;
@@ -2962,7 +2968,7 @@ static int airo_thread(void *data) {
                         break;
                 }
 
-                if (ai->power || test_bit(FLAG_FLASHING, &ai->flags)) {
+                if (ai->power.event || test_bit(FLAG_FLASHING, &ai->flags)) {
                         up(&ai->sem);
                         continue;
                 }
@@ -3252,7 +3258,7 @@ badrx:
                                 wstats.noise = apriv->wstats.qual.noise;
                                 wstats.updated = IW_QUAL_LEVEL_UPDATED
                                         | IW_QUAL_QUAL_UPDATED
-                                        | IW_QUAL_NOISE_UPDATED;
+                                        | IW_QUAL_DBM;
                                 /* Update spy records */
                                 wireless_spy_update(dev, sa, &wstats);
                         }
@@ -3598,7 +3604,7 @@ void mpi_receive_802_11 (struct airo_info *ai)
                 wstats.noise = ai->wstats.qual.noise;
                 wstats.updated = IW_QUAL_QUAL_UPDATED
                         | IW_QUAL_LEVEL_UPDATED
-                        | IW_QUAL_NOISE_UPDATED;
+                        | IW_QUAL_DBM;
                 /* Update spy records */
                 wireless_spy_update(ai->dev, sa, &wstats);
         }
@@ -5514,7 +5520,7 @@ static int airo_pci_resume(struct pci_dev *pdev)
         pci_restore_state(pdev);
         pci_enable_wake(pdev, pci_choose_state(pdev, ai->power), 0);
 
-        if (ai->power > 1) {
+        if (ai->power.event > 1) {
                 reset_card(dev, 0);
                 mpi_init_descriptors(ai);
                 setup_card(ai, dev->dev_addr, 0);
@@ -6483,22 +6489,20 @@ static int airo_get_range(struct net_device *dev,
                 range->max_qual.qual = 100;     /* % */
         else
                 range->max_qual.qual = airo_get_max_quality(&cap_rid);
-        range->max_qual.level = 0;      /* 0 means we use dBm  */
-        range->max_qual.noise = 0;
-        range->max_qual.updated = 0;
+        range->max_qual.level = 0x100 - 120;    /* -120 dBm */
+        range->max_qual.noise = 0x100 - 120;    /* -120 dBm */
 
         /* Experimental measurements - boundary 11/5.5 Mb/s */
         /* Note : with or without the (local->rssi), results
          * are somewhat different. - Jean II */
         if (local->rssi) {
-                range->avg_qual.qual = 50;      /* % */
-                range->avg_qual.level = 186;    /* -70 dBm */
+                range->avg_qual.qual = 50;              /* % */
+                range->avg_qual.level = 0x100 - 70;     /* -70 dBm */
         } else {
                 range->avg_qual.qual = airo_get_avg_quality(&cap_rid);
-                range->avg_qual.level = 176;    /* -80 dBm */
+                range->avg_qual.level = 0x100 - 80;     /* -80 dBm */
         }
-        range->avg_qual.noise = 0;
-        range->avg_qual.updated = 0;
+        range->avg_qual.noise = 0x100 - 85;             /* -85 dBm */
 
         for(i = 0 ; i < 8 ; i++) {
                 range->bitrate[i] = cap_rid.supportedRates[i] * 500000;
@@ -6721,15 +6725,17 @@ static int airo_get_aplist(struct net_device *dev,
                 if (local->rssi) {
                         qual[i].level = 0x100 - BSSList.dBm;
                         qual[i].qual = airo_dbm_to_pct( local->rssi, BSSList.dBm );
-                        qual[i].updated = IW_QUAL_QUAL_UPDATED;
+                        qual[i].updated = IW_QUAL_QUAL_UPDATED
+                                        | IW_QUAL_LEVEL_UPDATED
+                                        | IW_QUAL_DBM;
                 } else {
                         qual[i].level = (BSSList.dBm + 321) / 2;
                         qual[i].qual = 0;
-                        qual[i].updated = IW_QUAL_QUAL_INVALID;
+                        qual[i].updated = IW_QUAL_QUAL_INVALID
+                                        | IW_QUAL_LEVEL_UPDATED
+                                        | IW_QUAL_DBM;
                 }
                 qual[i].noise = local->wstats.qual.noise;
-                qual[i].updated = IW_QUAL_LEVEL_UPDATED
-                                | IW_QUAL_NOISE_UPDATED;
                 if (BSSList.index == 0xffff)
                         break;
         }
@@ -6855,15 +6861,17 @@ static inline char *airo_translate_scan(struct net_device *dev,
         if (ai->rssi) {
                 iwe.u.qual.level = 0x100 - bss->dBm;
                 iwe.u.qual.qual = airo_dbm_to_pct( ai->rssi, bss->dBm );
-                iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED;
+                iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED
+                                | IW_QUAL_LEVEL_UPDATED
+                                | IW_QUAL_DBM;
         } else {
                 iwe.u.qual.level = (bss->dBm + 321) / 2;
                 iwe.u.qual.qual = 0;
-                iwe.u.qual.updated = IW_QUAL_QUAL_INVALID;
+                iwe.u.qual.updated = IW_QUAL_QUAL_INVALID
+                                | IW_QUAL_LEVEL_UPDATED
+                                | IW_QUAL_DBM;
         }
         iwe.u.qual.noise = ai->wstats.qual.noise;
-        iwe.u.qual.updated = IW_QUAL_LEVEL_UPDATED
-                        | IW_QUAL_NOISE_UPDATED;
         current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
 
         /* Add encryption capability */
@@ -7116,7 +7124,7 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         int rc = 0;
         struct airo_info *ai = (struct airo_info *)dev->priv;
 
-        if (ai->power)
+        if (ai->power.event)
                 return 0;
 
         switch (cmd) {
@@ -7195,7 +7203,7 @@ static void airo_read_wireless_stats(struct airo_info *local)
 
         /* Get stats out of the card */
         clear_bit(JOB_WSTATS, &local->flags);
-        if (local->power) {
+        if (local->power.event) {
                 up(&local->sem);
                 return;
         }
@@ -7216,13 +7224,12 @@ static void airo_read_wireless_stats(struct airo_info *local)
                 local->wstats.qual.level = (status_rid.normalizedSignalStrength + 321) / 2;
                 local->wstats.qual.qual = airo_get_quality(&status_rid, &cap_rid);
         }
-        local->wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED;
         if (status_rid.len >= 124) {
                 local->wstats.qual.noise = 0x100 - status_rid.noisedBm;
-                local->wstats.qual.updated |= IW_QUAL_NOISE_UPDATED;
+                local->wstats.qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
         } else {
                 local->wstats.qual.noise = 0;
-                local->wstats.qual.updated |= IW_QUAL_NOISE_INVALID;
+                local->wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_INVALID | IW_QUAL_DBM;
         }
 
         /* Packets discarded in the wireless adapter due to wireless
@@ -7235,7 +7242,7 @@ static void airo_read_wireless_stats(struct airo_info *local)
         local->wstats.miss.beacon = vals[34];
 }
 
-struct iw_statistics *airo_get_wireless_stats(struct net_device *dev)
+static struct iw_statistics *airo_get_wireless_stats(struct net_device *dev)
 {
         struct airo_info *local =  dev->priv;
 
@@ -7450,14 +7457,8 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
  * Flash command switch table
  */
 
-int flashcard(struct net_device *dev, aironet_ioctl *comp) {
+static int flashcard(struct net_device *dev, aironet_ioctl *comp) {
         int z;
-        int cmdreset(struct airo_info *);
-        int setflashmode(struct airo_info *);
-        int flashgchar(struct airo_info *,int,int);
-        int flashpchar(struct airo_info *,int,int);
-        int flashputbuf(struct airo_info *);
-        int flashrestart(struct airo_info *,struct net_device *);
 
         /* Only super-user can modify flash */
         if (!capable(CAP_NET_ADMIN))
@@ -7515,7 +7516,7 @@ int flashcard(struct net_device *dev, aironet_ioctl *comp) {
  * card.
  */
 
-int cmdreset(struct airo_info *ai) {
+static int cmdreset(struct airo_info *ai) {
         disable_MAC(ai, 1);
 
         if(!waitbusy (ai)){
@@ -7539,7 +7540,7 @@ int cmdreset(struct airo_info *ai) {
  * mode
  */
 
-int setflashmode (struct airo_info *ai) {
+static int setflashmode (struct airo_info *ai) {
         set_bit (FLAG_FLASHING, &ai->flags);
 
         OUT4500(ai, SWS0, FLASH_COMMAND);
@@ -7566,7 +7567,7 @@ int setflashmode (struct airo_info *ai) {
  * x 50us for  echo .
  */
 
-int flashpchar(struct airo_info *ai,int byte,int dwelltime) {
+static int flashpchar(struct airo_info *ai,int byte,int dwelltime) {
         int echo;
         int waittime;
 
@@ -7606,7 +7607,7 @@ int flashpchar(struct airo_info *ai,int byte,int dwelltime) {
  * Get a character from the card matching matchbyte
  * Step 3)
  */
-int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime){
+static int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime){
         int           rchar;
         unsigned char rbyte=0;
 
@@ -7637,7 +7638,7 @@ int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime){
  * send to the card
  */
 
-int flashputbuf(struct airo_info *ai){
+static int flashputbuf(struct airo_info *ai){
         int            nwords;
 
         /* Write stuff */
@@ -7659,7 +7660,7 @@ int flashputbuf(struct airo_info *ai){
 /*
  *
  */
-int flashrestart(struct airo_info *ai,struct net_device *dev){
+static int flashrestart(struct airo_info *ai,struct net_device *dev){
         int    i,status;
 
         ssleep(1);                      /* Added 12/7/00 */
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 18a7d38d2a13..587869d86eee 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -68,7 +68,7 @@
 #include <linux/device.h>
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
-#include "ieee802_11.h"
+#include <net/ieee80211.h>
 #include "atmel.h"
 
 #define DRIVER_MAJOR 0
@@ -618,12 +618,12 @@ static int atmel_lock_mac(struct atmel_private *priv);
 static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data);
 static void atmel_command_irq(struct atmel_private *priv);
 static int atmel_validate_channel(struct atmel_private *priv, int channel);
-static void atmel_management_frame(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_hdr *header, 
                                    u16 frame_len, u8 rssi);
 static void atmel_management_timer(u_long a);
 static void atmel_send_command(struct atmel_private *priv, int command, void *cmd, int cmd_size);
 static int atmel_send_command_wait(struct atmel_private *priv, int command, void *cmd, int cmd_size);
-static void atmel_transmit_management_frame(struct atmel_private *priv, struct ieee802_11_hdr *header,
+static void atmel_transmit_management_frame(struct atmel_private *priv, struct ieee80211_hdr *header,
                                             u8 *body, int body_len);
 
 static u8 atmel_get_mib8(struct atmel_private *priv, u8 type, u8 index);
@@ -827,7 +827,7 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, u16 l
 static int start_tx (struct sk_buff *skb, struct net_device *dev)
 {
         struct atmel_private *priv = netdev_priv(dev);
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         unsigned long flags;
         u16 buff, frame_ctl, len = (ETH_ZLEN < skb->len) ? skb->len : ETH_ZLEN;
         u8 SNAP_RFC1024[6] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
@@ -863,17 +863,17 @@ static int start_tx (struct sk_buff *skb, struct net_device *dev)
                 return 1;
         }
         
-        frame_ctl = IEEE802_11_FTYPE_DATA;
+        frame_ctl = IEEE80211_FTYPE_DATA;
         header.duration_id = 0;
         header.seq_ctl = 0;
         if (priv->wep_is_on)
-                frame_ctl |= IEEE802_11_FCTL_WEP;
+                frame_ctl |= IEEE80211_FCTL_PROTECTED;
         if (priv->operating_mode == IW_MODE_ADHOC) {
                 memcpy(&header.addr1, skb->data, 6);
                 memcpy(&header.addr2, dev->dev_addr, 6);
                 memcpy(&header.addr3, priv->BSSID, 6);
         } else {
-                frame_ctl |= IEEE802_11_FCTL_TODS;
+                frame_ctl |= IEEE80211_FCTL_TODS;
                 memcpy(&header.addr1, priv->CurrentBSSID, 6);
                 memcpy(&header.addr2, dev->dev_addr, 6);
                 memcpy(&header.addr3, skb->data, 6);
@@ -902,7 +902,7 @@ static int start_tx (struct sk_buff *skb, struct net_device *dev)
 }
 
 static void atmel_transmit_management_frame(struct atmel_private *priv, 
-                                            struct ieee802_11_hdr *header,
+                                            struct ieee80211_hdr *header,
                                             u8 *body, int body_len)
 {
         u16 buff;
@@ -917,7 +917,7 @@ static void atmel_transmit_management_frame(struct atmel_private *priv,
         tx_update_descriptor(priv, header->addr1[0] & 0x01, len, buff, TX_PACKET_TYPE_MGMT);
 }
         
-static void fast_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void fast_rx_path(struct atmel_private *priv, struct ieee80211_hdr *header, 
                          u16 msdu_size, u16 rx_packet_loc, u32 crc)
 {
         /* fast path: unfragmented packet copy directly into skbuf */
@@ -955,7 +955,7 @@ static void fast_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *head
         }
         
         memcpy(skbp, header->addr1, 6); /* destination address */
-        if (le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_FROMDS) 
+        if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS) 
                 memcpy(&skbp[6], header->addr3, 6);
         else
                 memcpy(&skbp[6], header->addr2, 6); /* source address */
@@ -990,14 +990,14 @@ static int probe_crc(struct atmel_private *priv, u16 packet_loc, u16 msdu_size)
         return (crc ^ 0xffffffff) == netcrc;
 }
 
-static void frag_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void frag_rx_path(struct atmel_private *priv, struct ieee80211_hdr *header, 
                          u16 msdu_size, u16 rx_packet_loc, u32 crc, u16 seq_no, u8 frag_no, int more_frags)
 {
         u8 mac4[6]; 
         u8 source[6];
         struct sk_buff *skb;
 
-        if (le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_FROMDS) 
+        if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS) 
                 memcpy(source, header->addr3, 6);
         else
                 memcpy(source, header->addr2, 6); 
@@ -1082,7 +1082,7 @@ static void frag_rx_path(struct atmel_private *priv, struct ieee802_11_hdr *head
 static void rx_done_irq(struct atmel_private *priv)
 {
         int i;
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         
         for (i = 0; 
              atmel_rmem8(priv, atmel_rx(priv, RX_DESC_FLAGS_OFFSET, priv->rx_desc_head)) == RX_DESC_FLAG_VALID &&
@@ -1117,7 +1117,7 @@ static void rx_done_irq(struct atmel_private *priv)
                 /* probe for CRC use here if needed  once five packets have arrived with
                    the same crc status, we assume we know what's happening and stop probing */
                 if (priv->probe_crc) {
-                        if (!priv->wep_is_on || !(frame_ctl & IEEE802_11_FCTL_WEP)) {
+                        if (!priv->wep_is_on || !(frame_ctl & IEEE80211_FCTL_PROTECTED)) {
                                 priv->do_rx_crc = probe_crc(priv, rx_packet_loc, msdu_size);
                         } else {
                                 priv->do_rx_crc = probe_crc(priv, rx_packet_loc + 24, msdu_size - 24);
@@ -1132,16 +1132,16 @@ static void rx_done_irq(struct atmel_private *priv)
                 }
                     
                 /* don't CRC header when WEP in use */
-                if (priv->do_rx_crc && (!priv->wep_is_on || !(frame_ctl & IEEE802_11_FCTL_WEP))) {
+                if (priv->do_rx_crc && (!priv->wep_is_on || !(frame_ctl & IEEE80211_FCTL_PROTECTED))) {
                         crc = crc32_le(0xffffffff, (unsigned char *)&header, 24);
                 }
                 msdu_size -= 24; /* header */
 
-                if ((frame_ctl & IEEE802_11_FCTL_FTYPE) == IEEE802_11_FTYPE_DATA) { 
+                if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) { 
                         
-                        int more_fragments = frame_ctl & IEEE802_11_FCTL_MOREFRAGS;
-                        u8 packet_fragment_no = seq_control & IEEE802_11_SCTL_FRAG;
-                        u16 packet_sequence_no = (seq_control & IEEE802_11_SCTL_SEQ) >> 4;
+                        int more_fragments = frame_ctl & IEEE80211_FCTL_MOREFRAGS;
+                        u8 packet_fragment_no = seq_control & IEEE80211_SCTL_FRAG;
+                        u16 packet_sequence_no = (seq_control & IEEE80211_SCTL_SEQ) >> 4;
                         
                         if (!more_fragments && packet_fragment_no == 0 ) {
                                 fast_rx_path(priv, &header, msdu_size, rx_packet_loc, crc);
@@ -1151,7 +1151,7 @@ static void rx_done_irq(struct atmel_private *priv)
                         }
                 }
                 
-                if ((frame_ctl & IEEE802_11_FCTL_FTYPE) == IEEE802_11_FTYPE_MGMT) {
+                if ((frame_ctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {
                         /* copy rest of packet into buffer */
                         atmel_copy_to_host(priv->dev, (unsigned char *)&priv->rx_buf, rx_packet_loc + 24, msdu_size);
                         
@@ -1593,7 +1593,6 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
         dev->set_mac_address = atmel_set_mac_address;
         dev->hard_start_xmit = start_tx;
         dev->get_stats = atmel_get_stats;
-        dev->get_wireless_stats = atmel_get_wireless_stats;
         dev->wireless_handlers = (struct iw_handler_def *)&atmel_handler_def;
         dev->do_ioctl = atmel_ioctl;
         dev->irq = irq;
@@ -2411,7 +2410,8 @@ static const struct iw_handler_def	atmel_handler_def =
         .num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args), 
         .standard       = (iw_handler *) atmel_handler,
         .private        = (iw_handler *) atmel_private_handler, 
-        .private_args   = (struct iw_priv_args *) atmel_private_args
+        .private_args   = (struct iw_priv_args *) atmel_private_args,
+        .get_wireless_stats = atmel_get_wireless_stats
 };
 
 static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
@@ -2424,19 +2424,6 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         char domain[REGDOMAINSZ+1];
 
         switch (cmd) {
-        case SIOCGIWPRIV:
-                if(wrq->u.data.pointer) {
-                        /* Set the number of ioctl available */
-                        wrq->u.data.length = sizeof(atmel_private_args) / sizeof(atmel_private_args[0]);
-                        
-                        /* Copy structure to the user buffer */
-                        if (copy_to_user(wrq->u.data.pointer,
-                                         (u_char *) atmel_private_args,
-                                         sizeof(atmel_private_args)))
-                                rc = -EFAULT;
-                }
-                break;
-
         case ATMELIDIFC:
                 wrq->u.param.value = ATMELMAGIC;                
                 break;
@@ -2663,10 +2650,10 @@ static void handle_beacon_probe(struct atmel_private *priv, u16 capability, u8 c
  
 static void send_authentication_request(struct atmel_private *priv, u8 *challenge, int challenge_len)
 {
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         struct auth_body auth;
         
-        header.frame_ctl = cpu_to_le16(IEEE802_11_FTYPE_MGMT | IEEE802_11_STYPE_AUTH); 
+        header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH); 
         header.duration_id      = cpu_to_le16(0x8000);  
         header.seq_ctl = 0;
         memcpy(header.addr1, priv->CurrentBSSID, 6);
@@ -2677,7 +2664,7 @@ static void send_authentication_request(struct atmel_private *priv, u8 *challeng
                 auth.alg = cpu_to_le16(C80211_MGMT_AAN_SHAREDKEY); 
                 /* no WEP for authentication frames with TrSeqNo 1 */
                 if (priv->CurrentAuthentTransactionSeqNum != 1)
-                        header.frame_ctl |=  cpu_to_le16(IEEE802_11_FCTL_WEP); 
+                        header.frame_ctl |=  cpu_to_le16(IEEE80211_FCTL_PROTECTED);
         } else {
                 auth.alg = cpu_to_le16(C80211_MGMT_AAN_OPENSYSTEM);
         }
@@ -2701,7 +2688,7 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
 {
         u8 *ssid_el_p;
         int bodysize;
-        struct ieee802_11_hdr header;
+        struct ieee80211_hdr header;
         struct ass_req_format {
                 u16 capability;
                 u16 listen_interval; 
@@ -2714,8 +2701,8 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
                 u8 rates[4];
         } body;
                 
-        header.frame_ctl = cpu_to_le16(IEEE802_11_FTYPE_MGMT | 
-                (is_reassoc ? IEEE802_11_STYPE_REASSOC_REQ : IEEE802_11_STYPE_ASSOC_REQ));
+        header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | 
+                (is_reassoc ? IEEE80211_STYPE_REASSOC_REQ : IEEE80211_STYPE_ASSOC_REQ));
         header.duration_id = cpu_to_le16(0x8000);
         header.seq_ctl = 0;
 
@@ -2751,9 +2738,9 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
         atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize);
 }
 
-static int is_frame_from_current_bss(struct atmel_private *priv, struct ieee802_11_hdr *header)
+static int is_frame_from_current_bss(struct atmel_private *priv, struct ieee80211_hdr *header)
 {
-        if (le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_FROMDS)
+        if (le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_FROMDS)
                 return memcmp(header->addr3, priv->CurrentBSSID, 6) == 0;
         else
                 return memcmp(header->addr2, priv->CurrentBSSID, 6) == 0;
@@ -2801,7 +2788,7 @@ static int retrieve_bss(struct atmel_private *priv)
 }
 
 
-static void store_bss_info(struct atmel_private *priv, struct ieee802_11_hdr *header,
+static void store_bss_info(struct atmel_private *priv, struct ieee80211_hdr *header,
                            u16 capability, u16 beacon_period, u8 channel, u8 rssi, 
                            u8 ssid_len, u8 *ssid, int is_beacon)
 {
@@ -3085,12 +3072,12 @@ static void atmel_smooth_qual(struct atmel_private *priv)
 }
 
 /* deals with incoming managment frames. */
-static void atmel_management_frame(struct atmel_private *priv, struct ieee802_11_hdr *header, 
+static void atmel_management_frame(struct atmel_private *priv, struct ieee80211_hdr *header, 
                       u16 frame_len, u8 rssi)
 {
         u16 subtype;
         
-        switch (subtype = le16_to_cpu(header->frame_ctl) & IEEE802_11_FCTL_STYPE) {
+        switch (subtype = le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_STYPE) {
         case C80211_SUBTYPE_MGMT_BEACON :
         case C80211_SUBTYPE_MGMT_ProbeResponse:
                 
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
new file mode 100644
index 000000000000..56f41c714d38
--- /dev/null
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -0,0 +1,73 @@
+config HOSTAP
+        tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"
+        depends on NET_RADIO
+        select IEEE80211
+        select IEEE80211_CRYPT_WEP
+        ---help---
+        Shared driver code for IEEE 802.11b wireless cards based on
+        Intersil Prism2/2.5/3 chipset. This driver supports so called
+        Host AP mode that allows the card to act as an IEEE 802.11
+        access point.
+
+        See <http://hostap.epitest.fi/> for more information about the
+        Host AP driver configuration and tools. This site includes
+        information and tools (hostapd and wpa_supplicant) for WPA/WPA2
+        support.
+
+        This option includes the base Host AP driver code that is shared by
+        different hardware models. You will also need to enable support for
+        PLX/PCI/CS version of the driver to actually use the driver.
+
+        The driver can be compiled as a module and it will be called
+        "hostap.ko".
+
+config HOSTAP_FIRMWARE
+        bool "Support downloading firmware images with Host AP driver"
+        depends on HOSTAP
+        ---help---
+        Configure Host AP driver to include support for firmware image
+        download. Current version supports only downloading to volatile, i.e.,
+        RAM memory. Flash upgrade is not yet supported.
+
+        Firmware image downloading needs user space tool, prism2_srec. It is
+        available from http://hostap.epitest.fi/.
+
+config HOSTAP_PLX
+        tristate "Host AP driver for Prism2/2.5/3 in PLX9052 PCI adaptors"
+        depends on PCI && HOSTAP
+        ---help---
+        Host AP driver's version for Prism2/2.5/3 PC Cards in PLX9052 based
+        PCI adaptors.
+
+        "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
+        driver and its help text includes more information about the Host AP
+        driver.
+
+        The driver can be compiled as a module and will be named
+        "hostap_plx.ko".
+
+config HOSTAP_PCI
+        tristate "Host AP driver for Prism2.5 PCI adaptors"
+        depends on PCI && HOSTAP
+        ---help---
+        Host AP driver's version for Prism2.5 PCI adaptors.
+
+        "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
+        driver and its help text includes more information about the Host AP
+        driver.
+
+        The driver can be compiled as a module and will be named
+        "hostap_pci.ko".
+
+config HOSTAP_CS
+        tristate "Host AP driver for Prism2/2.5/3 PC Cards"
+        depends on PCMCIA!=n && HOSTAP
+        ---help---
+        Host AP driver's version for Prism2/2.5/3 PC Cards.
+
+        "Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
+        driver and its help text includes more information about the Host AP
+        driver.
+
+        The driver can be compiled as a module and will be named
+        "hostap_cs.ko".
diff --git a/drivers/net/wireless/hostap/Makefile b/drivers/net/wireless/hostap/Makefile
new file mode 100644
index 000000000000..fc62235bfc24
--- /dev/null
+++ b/drivers/net/wireless/hostap/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_HOSTAP) += hostap.o
+
+obj-$(CONFIG_HOSTAP_CS) += hostap_cs.o
+obj-$(CONFIG_HOSTAP_PLX) += hostap_plx.o
+obj-$(CONFIG_HOSTAP_PCI) += hostap_pci.o
diff --git a/drivers/net/wireless/hostap/hostap.c b/drivers/net/wireless/hostap/hostap.c
new file mode 100644
index 000000000000..e7f5821b4942
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap.c
@@ -0,0 +1,1198 @@
+/*
+ * Host AP (software wireless LAN access point) driver for
+ * Intersil Prism2/2.5/3 - hostap.o module, common routines
+ *
+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+ * <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ */
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/proc_fs.h>
+#include <linux/if_arp.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+#include <linux/workqueue.h>
+#include <linux/kmod.h>
+#include <linux/rtnetlink.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211_crypt.h>
+#include <asm/uaccess.h>
+
+#include "hostap_wlan.h"
+#include "hostap_80211.h"
+#include "hostap_ap.h"
+#include "hostap.h"
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Host AP common routines");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
+
+#define TX_TIMEOUT (2 * HZ)
+
+#define PRISM2_MAX_FRAME_SIZE 2304
+#define PRISM2_MIN_MTU 256
+/* FIX: */
+#define PRISM2_MAX_MTU (PRISM2_MAX_FRAME_SIZE - (6 /* LLC */ + 8 /* WEP */))
+
+
+/* hostap.c */
+static int prism2_wds_add(local_info_t *local, u8 *remote_addr,
+                          int rtnl_locked);
+static int prism2_wds_del(local_info_t *local, u8 *remote_addr,
+                          int rtnl_locked, int do_not_remove);
+
+/* hostap_ap.c */
+static int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
+                                  struct iw_quality qual[], int buf_size,
+                                  int aplist);
+static int prism2_ap_translate_scan(struct net_device *dev, char *buffer);
+static int prism2_hostapd(struct ap_data *ap,
+                          struct prism2_hostapd_param *param);
+static void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,
+                                struct ieee80211_crypt_data ***crypt);
+static void ap_control_kickall(struct ap_data *ap);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+static int ap_control_add_mac(struct mac_restrictions *mac_restrictions,
+                              u8 *mac);
+static int ap_control_del_mac(struct mac_restrictions *mac_restrictions,
+                              u8 *mac);
+static void ap_control_flush_macs(struct mac_restrictions *mac_restrictions);
+static int ap_control_kick_mac(struct ap_data *ap, struct net_device *dev,
+                               u8 *mac);
+#endif /* !PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+static const long freq_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
+                                  2447, 2452, 2457, 2462, 2467, 2472, 2484 };
+#define FREQ_COUNT (sizeof(freq_list) / sizeof(freq_list[0]))
+
+
+/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
+/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
+static unsigned char rfc1042_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
+static unsigned char bridge_tunnel_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
+/* No encapsulation header if EtherType < 0x600 (=length) */
+
+
+/* FIX: these could be compiled separately and linked together to hostap.o */
+#include "hostap_ap.c"
+#include "hostap_info.c"
+#include "hostap_ioctl.c"
+#include "hostap_proc.c"
+#include "hostap_80211_rx.c"
+#include "hostap_80211_tx.c"
+
+
+struct net_device * hostap_add_interface(struct local_info *local,
+                                         int type, int rtnl_locked,
+                                         const char *prefix,
+                                         const char *name)
+{
+        struct net_device *dev, *mdev;
+        struct hostap_interface *iface;
+        int ret;
+
+        dev = alloc_etherdev(sizeof(struct hostap_interface));
+        if (dev == NULL)
+                return NULL;
+
+        iface = netdev_priv(dev);
+        iface->dev = dev;
+        iface->local = local;
+        iface->type = type;
+        list_add(&iface->list, &local->hostap_interfaces);
+
+        mdev = local->dev;
+        memcpy(dev->dev_addr, mdev->dev_addr, ETH_ALEN);
+        dev->base_addr = mdev->base_addr;
+        dev->irq = mdev->irq;
+        dev->mem_start = mdev->mem_start;
+        dev->mem_end = mdev->mem_end;
+
+        hostap_setup_dev(dev, local, 0);
+        dev->destructor = free_netdev;
+
+        sprintf(dev->name, "%s%s", prefix, name);
+        if (!rtnl_locked)
+                rtnl_lock();
+
+        ret = 0;
+        if (strchr(dev->name, '%'))
+                ret = dev_alloc_name(dev, dev->name);
+
+        SET_NETDEV_DEV(dev, mdev->class_dev.dev);
+        if (ret >= 0)
+                ret = register_netdevice(dev);
+
+        if (!rtnl_locked)
+                rtnl_unlock();
+
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: failed to add new netdevice!\n",
+                       dev->name);
+                free_netdev(dev);
+                return NULL;
+        }
+
+        printk(KERN_DEBUG "%s: registered netdevice %s\n",
+               mdev->name, dev->name);
+
+        return dev;
+}
+
+
+void hostap_remove_interface(struct net_device *dev, int rtnl_locked,
+                             int remove_from_list)
+{
+        struct hostap_interface *iface;
+
+        if (!dev)
+                return;
+
+        iface = netdev_priv(dev);
+
+        if (remove_from_list) {
+                list_del(&iface->list);
+        }
+
+        if (dev == iface->local->ddev)
+                iface->local->ddev = NULL;
+        else if (dev == iface->local->apdev)
+                iface->local->apdev = NULL;
+        else if (dev == iface->local->stadev)
+                iface->local->stadev = NULL;
+
+        if (rtnl_locked)
+                unregister_netdevice(dev);
+        else
+                unregister_netdev(dev);
+
+        /* dev->destructor = free_netdev() will free the device data, including
+         * private data, when removing the device */
+}
+
+
+static inline int prism2_wds_special_addr(u8 *addr)
+{
+        if (addr[0] || addr[1] || addr[2] || addr[3] || addr[4] || addr[5])
+                return 0;
+
+        return 1;
+}
+
+
+static int prism2_wds_add(local_info_t *local, u8 *remote_addr,
+                          int rtnl_locked)
+{
+        struct net_device *dev;
+        struct list_head *ptr;
+        struct hostap_interface *iface, *empty, *match;
+
+        empty = match = NULL;
+        read_lock_bh(&local->iface_lock);
+        list_for_each(ptr, &local->hostap_interfaces) {
+                iface = list_entry(ptr, struct hostap_interface, list);
+                if (iface->type != HOSTAP_INTERFACE_WDS)
+                        continue;
+
+                if (prism2_wds_special_addr(iface->u.wds.remote_addr))
+                        empty = iface;
+                else if (memcmp(iface->u.wds.remote_addr, remote_addr,
+                                ETH_ALEN) == 0) {
+                        match = iface;
+                        break;
+                }
+        }
+        if (!match && empty && !prism2_wds_special_addr(remote_addr)) {
+                /* take pre-allocated entry into use */
+                memcpy(empty->u.wds.remote_addr, remote_addr, ETH_ALEN);
+                read_unlock_bh(&local->iface_lock);
+                printk(KERN_DEBUG "%s: using pre-allocated WDS netdevice %s\n",
+                       local->dev->name, empty->dev->name);
+                return 0;
+        }
+        read_unlock_bh(&local->iface_lock);
+
+        if (!prism2_wds_special_addr(remote_addr)) {
+                if (match)
+                        return -EEXIST;
+                hostap_add_sta(local->ap, remote_addr);
+        }
+
+        if (local->wds_connections >= local->wds_max_connections)
+                return -ENOBUFS;
+
+        /* verify that there is room for wds# postfix in the interface name */
+        if (strlen(local->dev->name) > IFNAMSIZ - 5) {
+                printk(KERN_DEBUG "'%s' too long base device name\n",
+                       local->dev->name);
+                return -EINVAL;
+        }
+
+        dev = hostap_add_interface(local, HOSTAP_INTERFACE_WDS, rtnl_locked,
+                                   local->ddev->name, "wds%d");
+        if (dev == NULL)
+                return -ENOMEM;
+
+        iface = netdev_priv(dev);
+        memcpy(iface->u.wds.remote_addr, remote_addr, ETH_ALEN);
+
+        local->wds_connections++;
+
+        return 0;
+}
+
+
+static int prism2_wds_del(local_info_t *local, u8 *remote_addr,
+                          int rtnl_locked, int do_not_remove)
+{
+        unsigned long flags;
+        struct list_head *ptr;
+        struct hostap_interface *iface, *selected = NULL;
+
+        write_lock_irqsave(&local->iface_lock, flags);
+        list_for_each(ptr, &local->hostap_interfaces) {
+                iface = list_entry(ptr, struct hostap_interface, list);
+                if (iface->type != HOSTAP_INTERFACE_WDS)
+                        continue;
+
+                if (memcmp(iface->u.wds.remote_addr, remote_addr,
+                           ETH_ALEN) == 0) {
+                        selected = iface;
+                        break;
+                }
+        }
+        if (selected && !do_not_remove)
+                list_del(&selected->list);
+        write_unlock_irqrestore(&local->iface_lock, flags);
+
+        if (selected) {
+                if (do_not_remove)
+                        memset(selected->u.wds.remote_addr, 0, ETH_ALEN);
+                else {
+                        hostap_remove_interface(selected->dev, rtnl_locked, 0);
+                        local->wds_connections--;
+                }
+        }
+
+        return selected ? 0 : -ENODEV;
+}
+
+
+u16 hostap_tx_callback_register(local_info_t *local,
+                                void (*func)(struct sk_buff *, int ok, void *),
+                                void *data)
+{
+        unsigned long flags;
+        struct hostap_tx_callback_info *entry;
+
+        entry = (struct hostap_tx_callback_info *) kmalloc(sizeof(*entry),
+                                                           GFP_ATOMIC);
+        if (entry == NULL)
+                return 0;
+
+        entry->func = func;
+        entry->data = data;
+
+        spin_lock_irqsave(&local->lock, flags);
+        entry->idx = local->tx_callback ? local->tx_callback->idx + 1 : 1;
+        entry->next = local->tx_callback;
+        local->tx_callback = entry;
+        spin_unlock_irqrestore(&local->lock, flags);
+
+        return entry->idx;
+}
+
+
+int hostap_tx_callback_unregister(local_info_t *local, u16 idx)
+{
+        unsigned long flags;
+        struct hostap_tx_callback_info *cb, *prev = NULL;
+
+        spin_lock_irqsave(&local->lock, flags);
+        cb = local->tx_callback;
+        while (cb != NULL && cb->idx != idx) {
+                prev = cb;
+                cb = cb->next;
+        }
+        if (cb) {
+                if (prev == NULL)
+                        local->tx_callback = cb->next;
+                else
+                        prev->next = cb->next;
+                kfree(cb);
+        }
+        spin_unlock_irqrestore(&local->lock, flags);
+
+        return cb ? 0 : -1;
+}
+
+
+/* val is in host byte order */
+int hostap_set_word(struct net_device *dev, int rid, u16 val)
+{
+        struct hostap_interface *iface;
+        u16 tmp = cpu_to_le16(val);
+        iface = netdev_priv(dev);
+        return iface->local->func->set_rid(dev, rid, &tmp, 2);
+}
+
+
+int hostap_set_string(struct net_device *dev, int rid, const char *val)
+{
+        struct hostap_interface *iface;
+        char buf[MAX_SSID_LEN + 2];
+        int len;
+
+        iface = netdev_priv(dev);
+        len = strlen(val);
+        if (len > MAX_SSID_LEN)
+                return -1;
+        memset(buf, 0, sizeof(buf));
+        buf[0] = len; /* little endian 16 bit word */
+        memcpy(buf + 2, val, len);
+
+        return iface->local->func->set_rid(dev, rid, &buf, MAX_SSID_LEN + 2);
+}
+
+
+u16 hostap_get_porttype(local_info_t *local)
+{
+        if (local->iw_mode == IW_MODE_ADHOC && local->pseudo_adhoc)
+                return HFA384X_PORTTYPE_PSEUDO_IBSS;
+        if (local->iw_mode == IW_MODE_ADHOC)
+                return HFA384X_PORTTYPE_IBSS;
+        if (local->iw_mode == IW_MODE_INFRA)
+                return HFA384X_PORTTYPE_BSS;
+        if (local->iw_mode == IW_MODE_REPEAT)
+                return HFA384X_PORTTYPE_WDS;
+        if (local->iw_mode == IW_MODE_MONITOR)
+                return HFA384X_PORTTYPE_PSEUDO_IBSS;
+        return HFA384X_PORTTYPE_HOSTAP;
+}
+
+
+int hostap_set_encryption(local_info_t *local)
+{
+        u16 val, old_val;
+        int i, keylen, len, idx;
+        char keybuf[WEP_KEY_LEN + 1];
+        enum { NONE, WEP, OTHER } encrypt_type;
+
+        idx = local->tx_keyidx;
+        if (local->crypt[idx] == NULL || local->crypt[idx]->ops == NULL)
+                encrypt_type = NONE;
+        else if (strcmp(local->crypt[idx]->ops->name, "WEP") == 0)
+                encrypt_type = WEP;
+        else
+                encrypt_type = OTHER;
+
+        if (local->func->get_rid(local->dev, HFA384X_RID_CNFWEPFLAGS, &val, 2,
+                                 1) < 0) {
+                printk(KERN_DEBUG "Could not read current WEP flags.\n");
+                goto fail;
+        }
+        le16_to_cpus(&val);
+        old_val = val;
+
+        if (encrypt_type != NONE || local->privacy_invoked)
+                val |= HFA384X_WEPFLAGS_PRIVACYINVOKED;
+        else
+                val &= ~HFA384X_WEPFLAGS_PRIVACYINVOKED;
+
+        if (local->open_wep || encrypt_type == NONE ||
+            ((local->ieee_802_1x || local->wpa) && local->host_decrypt))
+                val &= ~HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;
+        else
+                val |= HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED;
+
+        if ((encrypt_type != NONE || local->privacy_invoked) &&
+            (encrypt_type == OTHER || local->host_encrypt))
+                val |= HFA384X_WEPFLAGS_HOSTENCRYPT;
+        else
+                val &= ~HFA384X_WEPFLAGS_HOSTENCRYPT;
+        if ((encrypt_type != NONE || local->privacy_invoked) &&
+            (encrypt_type == OTHER || local->host_decrypt))
+                val |= HFA384X_WEPFLAGS_HOSTDECRYPT;
+        else
+                val &= ~HFA384X_WEPFLAGS_HOSTDECRYPT;
+
+        if (val != old_val &&
+            hostap_set_word(local->dev, HFA384X_RID_CNFWEPFLAGS, val)) {
+                printk(KERN_DEBUG "Could not write new WEP flags (0x%x)\n",
+                       val);
+                goto fail;
+        }
+
+        if (encrypt_type != WEP)
+                return 0;
+
+        /* 104-bit support seems to require that all the keys are set to the
+         * same keylen */
+        keylen = 6; /* first 5 octets */
+        len = local->crypt[idx]->ops->get_key(keybuf, sizeof(keybuf),
+                                              NULL, local->crypt[idx]->priv);
+        if (idx >= 0 && idx < WEP_KEYS && len > 5)
+                keylen = WEP_KEY_LEN + 1; /* first 13 octets */
+
+        for (i = 0; i < WEP_KEYS; i++) {
+                memset(keybuf, 0, sizeof(keybuf));
+                if (local->crypt[i]) {
+                        (void) local->crypt[i]->ops->get_key(
+                                keybuf, sizeof(keybuf),
+                                NULL, local->crypt[i]->priv);
+                }
+                if (local->func->set_rid(local->dev,
+                                         HFA384X_RID_CNFDEFAULTKEY0 + i,
+                                         keybuf, keylen)) {
+                        printk(KERN_DEBUG "Could not set key %d (len=%d)\n",
+                               i, keylen);
+                        goto fail;
+                }
+        }
+        if (hostap_set_word(local->dev, HFA384X_RID_CNFWEPDEFAULTKEYID, idx)) {
+                printk(KERN_DEBUG "Could not set default keyid %d\n", idx);
+                goto fail;
+        }
+
+        return 0;
+
+ fail:
+        printk(KERN_DEBUG "%s: encryption setup failed\n", local->dev->name);
+        return -1;
+}
+
+
+int hostap_set_antsel(local_info_t *local)
+{
+        u16 val;
+        int ret = 0;
+
+        if (local->antsel_tx != HOSTAP_ANTSEL_DO_NOT_TOUCH &&
+            local->func->cmd(local->dev, HFA384X_CMDCODE_READMIF,
+                             HFA386X_CR_TX_CONFIGURE,
+                             NULL, &val) == 0) {
+                val &= ~(BIT(2) | BIT(1));
+                switch (local->antsel_tx) {
+                case HOSTAP_ANTSEL_DIVERSITY:
+                        val |= BIT(1);
+                        break;
+                case HOSTAP_ANTSEL_LOW:
+                        break;
+                case HOSTAP_ANTSEL_HIGH:
+                        val |= BIT(2);
+                        break;
+                }
+
+                if (local->func->cmd(local->dev, HFA384X_CMDCODE_WRITEMIF,
+                                     HFA386X_CR_TX_CONFIGURE, &val, NULL)) {
+                        printk(KERN_INFO "%s: setting TX AntSel failed\n",
+                               local->dev->name);
+                        ret = -1;
+                }
+        }
+
+        if (local->antsel_rx != HOSTAP_ANTSEL_DO_NOT_TOUCH &&
+            local->func->cmd(local->dev, HFA384X_CMDCODE_READMIF,
+                             HFA386X_CR_RX_CONFIGURE,
+                             NULL, &val) == 0) {
+                val &= ~(BIT(1) | BIT(0));
+                switch (local->antsel_rx) {
+                case HOSTAP_ANTSEL_DIVERSITY:
+                        break;
+                case HOSTAP_ANTSEL_LOW:
+                        val |= BIT(0);
+                        break;
+                case HOSTAP_ANTSEL_HIGH:
+                        val |= BIT(0) | BIT(1);
+                        break;
+                }
+
+                if (local->func->cmd(local->dev, HFA384X_CMDCODE_WRITEMIF,
+                                     HFA386X_CR_RX_CONFIGURE, &val, NULL)) {
+                        printk(KERN_INFO "%s: setting RX AntSel failed\n",
+                               local->dev->name);
+                        ret = -1;
+                }
+        }
+
+        return ret;
+}
+
+
+int hostap_set_roaming(local_info_t *local)
+{
+        u16 val;
+
+        switch (local->host_roaming) {
+        case 1:
+                val = HFA384X_ROAMING_HOST;
+                break;
+        case 2:
+                val = HFA384X_ROAMING_DISABLED;
+                break;
+        case 0:
+        default:
+                val = HFA384X_ROAMING_FIRMWARE;
+                break;
+        }
+
+        return hostap_set_word(local->dev, HFA384X_RID_CNFROAMINGMODE, val);
+}
+
+
+int hostap_set_auth_algs(local_info_t *local)
+{
+        int val = local->auth_algs;
+        /* At least STA f/w v0.6.2 seems to have issues with cnfAuthentication
+         * set to include both Open and Shared Key flags. It tries to use
+         * Shared Key authentication in that case even if WEP keys are not
+         * configured.. STA f/w v0.7.6 is able to handle such configuration,
+         * but it is unknown when this was fixed between 0.6.2 .. 0.7.6. */
+        if (local->sta_fw_ver < PRISM2_FW_VER(0,7,0) &&
+            val != PRISM2_AUTH_OPEN && val != PRISM2_AUTH_SHARED_KEY)
+                val = PRISM2_AUTH_OPEN;
+
+        if (hostap_set_word(local->dev, HFA384X_RID_CNFAUTHENTICATION, val)) {
+                printk(KERN_INFO "%s: cnfAuthentication setting to 0x%x "
+                       "failed\n", local->dev->name, local->auth_algs);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+
+void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
+{
+        u16 status, fc;
+
+        status = __le16_to_cpu(rx->status);
+
+        printk(KERN_DEBUG "%s: RX status=0x%04x (port=%d, type=%d, "
+               "fcserr=%d) silence=%d signal=%d rate=%d rxflow=%d; "
+               "jiffies=%ld\n",
+               name, status, (status >> 8) & 0x07, status >> 13, status & 1,
+               rx->silence, rx->signal, rx->rate, rx->rxflow, jiffies);
+
+        fc = __le16_to_cpu(rx->frame_control);
+        printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "
+               "data_len=%d%s%s\n",
+               fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
+               __le16_to_cpu(rx->duration_id), __le16_to_cpu(rx->seq_ctrl),
+               __le16_to_cpu(rx->data_len),
+               fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
+               fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
+
+        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
+               MACSTR "\n",
+               MAC2STR(rx->addr1), MAC2STR(rx->addr2), MAC2STR(rx->addr3),
+               MAC2STR(rx->addr4));
+
+        printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
+               MAC2STR(rx->dst_addr), MAC2STR(rx->src_addr),
+               __be16_to_cpu(rx->len));
+}
+
+
+void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
+{
+        u16 fc;
+
+        printk(KERN_DEBUG "%s: TX status=0x%04x retry_count=%d tx_rate=%d "
+               "tx_control=0x%04x; jiffies=%ld\n",
+               name, __le16_to_cpu(tx->status), tx->retry_count, tx->tx_rate,
+               __le16_to_cpu(tx->tx_control), jiffies);
+
+        fc = __le16_to_cpu(tx->frame_control);
+        printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d) dur=0x%04x seq=0x%04x "
+               "data_len=%d%s%s\n",
+               fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
+               __le16_to_cpu(tx->duration_id), __le16_to_cpu(tx->seq_ctrl),
+               __le16_to_cpu(tx->data_len),
+               fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
+               fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
+
+        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4="
+               MACSTR "\n",
+               MAC2STR(tx->addr1), MAC2STR(tx->addr2), MAC2STR(tx->addr3),
+               MAC2STR(tx->addr4));
+
+        printk(KERN_DEBUG "   dst=" MACSTR " src=" MACSTR " len=%d\n",
+               MAC2STR(tx->dst_addr), MAC2STR(tx->src_addr),
+               __be16_to_cpu(tx->len));
+}
+
+
+int hostap_80211_header_parse(struct sk_buff *skb, unsigned char *haddr)
+{
+        memcpy(haddr, skb->mac.raw + 10, ETH_ALEN); /* addr2 */
+        return ETH_ALEN;
+}
+
+
+int hostap_80211_prism_header_parse(struct sk_buff *skb, unsigned char *haddr)
+{
+        if (*(u32 *)skb->mac.raw == LWNG_CAP_DID_BASE) {
+                memcpy(haddr, skb->mac.raw +
+                       sizeof(struct linux_wlan_ng_prism_hdr) + 10,
+                       ETH_ALEN); /* addr2 */
+        } else { /* (*(u32 *)skb->mac.raw == htonl(LWNG_CAPHDR_VERSION)) */
+                memcpy(haddr, skb->mac.raw +
+                       sizeof(struct linux_wlan_ng_cap_hdr) + 10,
+                       ETH_ALEN); /* addr2 */
+        }
+        return ETH_ALEN;
+}
+
+
+int hostap_80211_get_hdrlen(u16 fc)
+{
+        int hdrlen = 24;
+
+        switch (WLAN_FC_GET_TYPE(fc)) {
+        case IEEE80211_FTYPE_DATA:
+                if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS))
+                        hdrlen = 30; /* Addr4 */
+                break;
+        case IEEE80211_FTYPE_CTL:
+                switch (WLAN_FC_GET_STYPE(fc)) {
+                case IEEE80211_STYPE_CTS:
+                case IEEE80211_STYPE_ACK:
+                        hdrlen = 10;
+                        break;
+                default:
+                        hdrlen = 16;
+                        break;
+                }
+                break;
+        }
+
+        return hdrlen;
+}
+
+
+struct net_device_stats *hostap_get_stats(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        iface = netdev_priv(dev);
+        return &iface->stats;
+}
+
+
+static int prism2_close(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        PDEBUG(DEBUG_FLOW, "%s: prism2_close\n", dev->name);
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (dev == local->ddev) {
+                prism2_sta_deauth(local, WLAN_REASON_DEAUTH_LEAVING);
+        }
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        if (!local->hostapd && dev == local->dev &&
+            (!local->func->card_present || local->func->card_present(local)) &&
+            local->hw_ready && local->ap && local->iw_mode == IW_MODE_MASTER)
+                hostap_deauth_all_stas(dev, local->ap, 1);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        if (local->func->dev_close && local->func->dev_close(local))
+                return 0;
+
+        if (dev == local->dev) {
+                local->func->hw_shutdown(dev, HOSTAP_HW_ENABLE_CMDCOMPL);
+        }
+
+        if (netif_running(dev)) {
+                netif_stop_queue(dev);
+                netif_device_detach(dev);
+        }
+
+        flush_scheduled_work();
+
+        module_put(local->hw_module);
+
+        local->num_dev_open--;
+
+        if (dev != local->dev && local->dev->flags & IFF_UP &&
+            local->master_dev_auto_open && local->num_dev_open == 1) {
+                /* Close master radio interface automatically if it was also
+                 * opened automatically and we are now closing the last
+                 * remaining non-master device. */
+                dev_close(local->dev);
+        }
+
+        return 0;
+}
+
+
+static int prism2_open(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        PDEBUG(DEBUG_FLOW, "%s: prism2_open\n", dev->name);
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->no_pri) {
+                printk(KERN_DEBUG "%s: could not set interface UP - no PRI "
+                       "f/w\n", dev->name);
+                return 1;
+        }
+
+        if ((local->func->card_present && !local->func->card_present(local)) ||
+            local->hw_downloading)
+                return -ENODEV;
+
+        if (local->func->dev_open && local->func->dev_open(local))
+                return 1;
+
+        if (!try_module_get(local->hw_module))
+                return -ENODEV;
+        local->num_dev_open++;
+
+        if (!local->dev_enabled && local->func->hw_enable(dev, 1)) {
+                printk(KERN_WARNING "%s: could not enable MAC port\n",
+                       dev->name);
+                prism2_close(dev);
+                return 1;
+        }
+        if (!local->dev_enabled)
+                prism2_callback(local, PRISM2_CALLBACK_ENABLE);
+        local->dev_enabled = 1;
+
+        if (dev != local->dev && !(local->dev->flags & IFF_UP)) {
+                /* Master radio interface is needed for all operation, so open
+                 * it automatically when any virtual net_device is opened. */
+                local->master_dev_auto_open = 1;
+                dev_open(local->dev);
+        }
+
+        netif_device_attach(dev);
+        netif_start_queue(dev);
+
+        return 0;
+}
+
+
+static int prism2_set_mac_address(struct net_device *dev, void *p)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct list_head *ptr;
+        struct sockaddr *addr = p;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->set_rid(dev, HFA384X_RID_CNFOWNMACADDR, addr->sa_data,
+                                 ETH_ALEN) < 0 || local->func->reset_port(dev))
+                return -EINVAL;
+
+        read_lock_bh(&local->iface_lock);
+        list_for_each(ptr, &local->hostap_interfaces) {
+                iface = list_entry(ptr, struct hostap_interface, list);
+                memcpy(iface->dev->dev_addr, addr->sa_data, ETH_ALEN);
+        }
+        memcpy(local->dev->dev_addr, addr->sa_data, ETH_ALEN);
+        read_unlock_bh(&local->iface_lock);
+
+        return 0;
+}
+
+
+/* TODO: to be further implemented as soon as Prism2 fully supports
+ *       GroupAddresses and correct documentation is available */
+void hostap_set_multicast_list_queue(void *data)
+{
+        struct net_device *dev = (struct net_device *) data;
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,
+                            local->is_promisc)) {
+                printk(KERN_INFO "%s: %sabling promiscuous mode failed\n",
+                       dev->name, local->is_promisc ? "en" : "dis");
+        }
+}
+
+
+static void hostap_set_multicast_list(struct net_device *dev)
+{
+#if 0
+        /* FIX: promiscuous mode seems to be causing a lot of problems with
+         * some station firmware versions (FCSErr frames, invalid MACPort, etc.
+         * corrupted incoming frames). This code is now commented out while the
+         * problems are investigated. */
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        if ((dev->flags & IFF_ALLMULTI) || (dev->flags & IFF_PROMISC)) {
+                local->is_promisc = 1;
+        } else {
+                local->is_promisc = 0;
+        }
+
+        schedule_work(&local->set_multicast_list_queue);
+#endif
+}
+
+
+static int prism2_change_mtu(struct net_device *dev, int new_mtu)
+{
+        if (new_mtu < PRISM2_MIN_MTU || new_mtu > PRISM2_MAX_MTU)
+                return -EINVAL;
+
+        dev->mtu = new_mtu;
+        return 0;
+}
+
+
+static void prism2_tx_timeout(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hfa384x_regs regs;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        printk(KERN_WARNING "%s Tx timed out! Resetting card\n", dev->name);
+        netif_stop_queue(local->dev);
+
+        local->func->read_regs(dev, &regs);
+        printk(KERN_DEBUG "%s: CMD=%04x EVSTAT=%04x "
+               "OFFSET0=%04x OFFSET1=%04x SWSUPPORT0=%04x\n",
+               dev->name, regs.cmd, regs.evstat, regs.offset0, regs.offset1,
+               regs.swsupport0);
+
+        local->func->schedule_reset(local);
+}
+
+
+void hostap_setup_dev(struct net_device *dev, local_info_t *local,
+                      int main_dev)
+{
+        struct hostap_interface *iface;
+
+        iface = netdev_priv(dev);
+        ether_setup(dev);
+
+        /* kernel callbacks */
+        dev->get_stats = hostap_get_stats;
+        if (iface) {
+                /* Currently, we point to the proper spy_data only on
+                 * the main_dev. This could be fixed. Jean II */
+                iface->wireless_data.spy_data = &iface->spy_data;
+                dev->wireless_data = &iface->wireless_data;
+        }
+        dev->wireless_handlers =
+                (struct iw_handler_def *) &hostap_iw_handler_def;
+        dev->do_ioctl = hostap_ioctl;
+        dev->open = prism2_open;
+        dev->stop = prism2_close;
+        dev->hard_start_xmit = hostap_data_start_xmit;
+        dev->set_mac_address = prism2_set_mac_address;
+        dev->set_multicast_list = hostap_set_multicast_list;
+        dev->change_mtu = prism2_change_mtu;
+        dev->tx_timeout = prism2_tx_timeout;
+        dev->watchdog_timeo = TX_TIMEOUT;
+
+        dev->mtu = local->mtu;
+        if (!main_dev) {
+                /* use main radio device queue */
+                dev->tx_queue_len = 0;
+        }
+
+        SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops);
+
+        netif_stop_queue(dev);
+}
+
+
+static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)
+{
+        struct net_device *dev = local->dev;
+
+        if (local->apdev)
+                return -EEXIST;
+
+        printk(KERN_DEBUG "%s: enabling hostapd mode\n", dev->name);
+
+        local->apdev = hostap_add_interface(local, HOSTAP_INTERFACE_AP,
+                                            rtnl_locked, local->ddev->name,
+                                            "ap");
+        if (local->apdev == NULL)
+                return -ENOMEM;
+
+        local->apdev->hard_start_xmit = hostap_mgmt_start_xmit;
+        local->apdev->type = ARPHRD_IEEE80211;
+        local->apdev->hard_header_parse = hostap_80211_header_parse;
+
+        return 0;
+}
+
+
+static int hostap_disable_hostapd(local_info_t *local, int rtnl_locked)
+{
+        struct net_device *dev = local->dev;
+
+        printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev->name);
+
+        hostap_remove_interface(local->apdev, rtnl_locked, 1);
+        local->apdev = NULL;
+
+        return 0;
+}
+
+
+static int hostap_enable_hostapd_sta(local_info_t *local, int rtnl_locked)
+{
+        struct net_device *dev = local->dev;
+
+        if (local->stadev)
+                return -EEXIST;
+
+        printk(KERN_DEBUG "%s: enabling hostapd STA mode\n", dev->name);
+
+        local->stadev = hostap_add_interface(local, HOSTAP_INTERFACE_STA,
+                                             rtnl_locked, local->ddev->name,
+                                             "sta");
+        if (local->stadev == NULL)
+                return -ENOMEM;
+
+        return 0;
+}
+
+
+static int hostap_disable_hostapd_sta(local_info_t *local, int rtnl_locked)
+{
+        struct net_device *dev = local->dev;
+
+        printk(KERN_DEBUG "%s: disabling hostapd mode\n", dev->name);
+
+        hostap_remove_interface(local->stadev, rtnl_locked, 1);
+        local->stadev = NULL;
+
+        return 0;
+}
+
+
+int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked)
+{
+        int ret;
+
+        if (val < 0 || val > 1)
+                return -EINVAL;
+
+        if (local->hostapd == val)
+                return 0;
+
+        if (val) {
+                ret = hostap_enable_hostapd(local, rtnl_locked);
+                if (ret == 0)
+                        local->hostapd = 1;
+        } else {
+                local->hostapd = 0;
+                ret = hostap_disable_hostapd(local, rtnl_locked);
+                if (ret != 0)
+                        local->hostapd = 1;
+        }
+
+        return ret;
+}
+
+
+int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked)
+{
+        int ret;
+
+        if (val < 0 || val > 1)
+                return -EINVAL;
+
+        if (local->hostapd_sta == val)
+                return 0;
+
+        if (val) {
+                ret = hostap_enable_hostapd_sta(local, rtnl_locked);
+                if (ret == 0)
+                        local->hostapd_sta = 1;
+        } else {
+                local->hostapd_sta = 0;
+                ret = hostap_disable_hostapd_sta(local, rtnl_locked);
+                if (ret != 0)
+                        local->hostapd_sta = 1;
+        }
+
+
+        return ret;
+}
+
+
+int prism2_update_comms_qual(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret = 0;
+        struct hfa384x_comms_quality sq;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        if (!local->sta_fw_ver)
+                ret = -1;
+        else if (local->sta_fw_ver >= PRISM2_FW_VER(1,3,1)) {
+                if (local->func->get_rid(local->dev,
+                                         HFA384X_RID_DBMCOMMSQUALITY,
+                                         &sq, sizeof(sq), 1) >= 0) {
+                        local->comms_qual = (s16) le16_to_cpu(sq.comm_qual);
+                        local->avg_signal = (s16) le16_to_cpu(sq.signal_level);
+                        local->avg_noise = (s16) le16_to_cpu(sq.noise_level);
+                        local->last_comms_qual_update = jiffies;
+                } else
+                        ret = -1;
+        } else {
+                if (local->func->get_rid(local->dev, HFA384X_RID_COMMSQUALITY,
+                                         &sq, sizeof(sq), 1) >= 0) {
+                        local->comms_qual = le16_to_cpu(sq.comm_qual);
+                        local->avg_signal = HFA384X_LEVEL_TO_dBm(
+                                le16_to_cpu(sq.signal_level));
+                        local->avg_noise = HFA384X_LEVEL_TO_dBm(
+                                le16_to_cpu(sq.noise_level));
+                        local->last_comms_qual_update = jiffies;
+                } else
+                        ret = -1;
+        }
+
+        return ret;
+}
+
+
+int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,
+                         u8 *body, size_t bodylen)
+{
+        struct sk_buff *skb;
+        struct hostap_ieee80211_mgmt *mgmt;
+        struct hostap_skb_tx_data *meta;
+        struct net_device *dev = local->dev;
+
+        skb = dev_alloc_skb(IEEE80211_MGMT_HDR_LEN + bodylen);
+        if (skb == NULL)
+                return -ENOMEM;
+
+        mgmt = (struct hostap_ieee80211_mgmt *)
+                skb_put(skb, IEEE80211_MGMT_HDR_LEN);
+        memset(mgmt, 0, IEEE80211_MGMT_HDR_LEN);
+        mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype);
+        memcpy(mgmt->da, dst, ETH_ALEN);
+        memcpy(mgmt->sa, dev->dev_addr, ETH_ALEN);
+        memcpy(mgmt->bssid, dst, ETH_ALEN);
+        if (body)
+                memcpy(skb_put(skb, bodylen), body, bodylen);
+
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        memset(meta, 0, sizeof(*meta));
+        meta->magic = HOSTAP_SKB_TX_DATA_MAGIC;
+        meta->iface = netdev_priv(dev);
+
+        skb->dev = dev;
+        skb->mac.raw = skb->nh.raw = skb->data;
+        dev_queue_xmit(skb);
+
+        return 0;
+}
+
+
+int prism2_sta_deauth(local_info_t *local, u16 reason)
+{
+        union iwreq_data wrqu;
+        int ret;
+
+        if (local->iw_mode != IW_MODE_INFRA ||
+            memcmp(local->bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0 ||
+            memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0)
+                return 0;
+
+        reason = cpu_to_le16(reason);
+        ret = prism2_sta_send_mgmt(local, local->bssid, IEEE80211_STYPE_DEAUTH,
+                                   (u8 *) &reason, 2);
+        memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL);
+        return ret;
+}
+
+
+struct proc_dir_entry *hostap_proc;
+
+static int __init hostap_init(void)
+{
+        if (proc_net != NULL) {
+                hostap_proc = proc_mkdir("hostap", proc_net);
+                if (!hostap_proc)
+                        printk(KERN_WARNING "Failed to mkdir "
+                               "/proc/net/hostap\n");
+        } else
+                hostap_proc = NULL;
+
+        return 0;
+}
+
+
+static void __exit hostap_exit(void)
+{
+        if (hostap_proc != NULL) {
+                hostap_proc = NULL;
+                remove_proc_entry("hostap", proc_net);
+        }
+}
+
+
+EXPORT_SYMBOL(hostap_set_word);
+EXPORT_SYMBOL(hostap_set_string);
+EXPORT_SYMBOL(hostap_get_porttype);
+EXPORT_SYMBOL(hostap_set_encryption);
+EXPORT_SYMBOL(hostap_set_antsel);
+EXPORT_SYMBOL(hostap_set_roaming);
+EXPORT_SYMBOL(hostap_set_auth_algs);
+EXPORT_SYMBOL(hostap_dump_rx_header);
+EXPORT_SYMBOL(hostap_dump_tx_header);
+EXPORT_SYMBOL(hostap_80211_header_parse);
+EXPORT_SYMBOL(hostap_80211_prism_header_parse);
+EXPORT_SYMBOL(hostap_80211_get_hdrlen);
+EXPORT_SYMBOL(hostap_get_stats);
+EXPORT_SYMBOL(hostap_setup_dev);
+EXPORT_SYMBOL(hostap_proc);
+EXPORT_SYMBOL(hostap_set_multicast_list_queue);
+EXPORT_SYMBOL(hostap_set_hostapd);
+EXPORT_SYMBOL(hostap_set_hostapd_sta);
+EXPORT_SYMBOL(hostap_add_interface);
+EXPORT_SYMBOL(hostap_remove_interface);
+EXPORT_SYMBOL(prism2_update_comms_qual);
+
+module_init(hostap_init);
+module_exit(hostap_exit);
diff --git a/drivers/net/wireless/hostap/hostap.h b/drivers/net/wireless/hostap/hostap.h
new file mode 100644
index 000000000000..5fac89b8ce3a
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap.h
@@ -0,0 +1,57 @@
+#ifndef HOSTAP_H
+#define HOSTAP_H
+
+/* hostap.c */
+
+extern struct proc_dir_entry *hostap_proc;
+
+u16 hostap_tx_callback_register(local_info_t *local,
+                                void (*func)(struct sk_buff *, int ok, void *),
+                                void *data);
+int hostap_tx_callback_unregister(local_info_t *local, u16 idx);
+int hostap_set_word(struct net_device *dev, int rid, u16 val);
+int hostap_set_string(struct net_device *dev, int rid, const char *val);
+u16 hostap_get_porttype(local_info_t *local);
+int hostap_set_encryption(local_info_t *local);
+int hostap_set_antsel(local_info_t *local);
+int hostap_set_roaming(local_info_t *local);
+int hostap_set_auth_algs(local_info_t *local);
+void hostap_dump_rx_header(const char *name,
+                           const struct hfa384x_rx_frame *rx);
+void hostap_dump_tx_header(const char *name,
+                           const struct hfa384x_tx_frame *tx);
+int hostap_80211_header_parse(struct sk_buff *skb, unsigned char *haddr);
+int hostap_80211_prism_header_parse(struct sk_buff *skb, unsigned char *haddr);
+int hostap_80211_get_hdrlen(u16 fc);
+struct net_device_stats *hostap_get_stats(struct net_device *dev);
+void hostap_setup_dev(struct net_device *dev, local_info_t *local,
+                      int main_dev);
+void hostap_set_multicast_list_queue(void *data);
+int hostap_set_hostapd(local_info_t *local, int val, int rtnl_locked);
+int hostap_set_hostapd_sta(local_info_t *local, int val, int rtnl_locked);
+void hostap_cleanup(local_info_t *local);
+void hostap_cleanup_handler(void *data);
+struct net_device * hostap_add_interface(struct local_info *local,
+                                         int type, int rtnl_locked,
+                                         const char *prefix, const char *name);
+void hostap_remove_interface(struct net_device *dev, int rtnl_locked,
+                             int remove_from_list);
+int prism2_update_comms_qual(struct net_device *dev);
+int prism2_sta_send_mgmt(local_info_t *local, u8 *dst, u16 stype,
+                         u8 *body, size_t bodylen);
+int prism2_sta_deauth(local_info_t *local, u16 reason);
+
+
+/* hostap_proc.c */
+
+void hostap_init_proc(local_info_t *local);
+void hostap_remove_proc(local_info_t *local);
+
+
+/* hostap_info.c */
+
+void hostap_info_init(local_info_t *local);
+void hostap_info_process(local_info_t *local, struct sk_buff *skb);
+
+
+#endif /* HOSTAP_H */
diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h
new file mode 100644
index 000000000000..bf506f50d722
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_80211.h
@@ -0,0 +1,96 @@
+#ifndef HOSTAP_80211_H
+#define HOSTAP_80211_H
+
+struct hostap_ieee80211_mgmt {
+        u16 frame_control;
+        u16 duration;
+        u8 da[6];
+        u8 sa[6];
+        u8 bssid[6];
+        u16 seq_ctrl;
+        union {
+                struct {
+                        u16 auth_alg;
+                        u16 auth_transaction;
+                        u16 status_code;
+                        /* possibly followed by Challenge text */
+                        u8 variable[0];
+                } __attribute__ ((packed)) auth;
+                struct {
+                        u16 reason_code;
+                } __attribute__ ((packed)) deauth;
+                struct {
+                        u16 capab_info;
+                        u16 listen_interval;
+                        /* followed by SSID and Supported rates */
+                        u8 variable[0];
+                } __attribute__ ((packed)) assoc_req;
+                struct {
+                        u16 capab_info;
+                        u16 status_code;
+                        u16 aid;
+                        /* followed by Supported rates */
+                        u8 variable[0];
+                } __attribute__ ((packed)) assoc_resp, reassoc_resp;
+                struct {
+                        u16 capab_info;
+                        u16 listen_interval;
+                        u8 current_ap[6];
+                        /* followed by SSID and Supported rates */
+                        u8 variable[0];
+                } __attribute__ ((packed)) reassoc_req;
+                struct {
+                        u16 reason_code;
+                } __attribute__ ((packed)) disassoc;
+                struct {
+                } __attribute__ ((packed)) probe_req;
+                struct {
+                        u8 timestamp[8];
+                        u16 beacon_int;
+                        u16 capab_info;
+                        /* followed by some of SSID, Supported rates,
+                         * FH Params, DS Params, CF Params, IBSS Params, TIM */
+                        u8 variable[0];
+                } __attribute__ ((packed)) beacon, probe_resp;
+        } u;
+} __attribute__ ((packed));
+
+
+#define IEEE80211_MGMT_HDR_LEN 24
+#define IEEE80211_DATA_HDR3_LEN 24
+#define IEEE80211_DATA_HDR4_LEN 30
+
+
+struct hostap_80211_rx_status {
+        u32 mac_time;
+        u8 signal;
+        u8 noise;
+        u16 rate; /* in 100 kbps */
+};
+
+
+void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
+                     struct hostap_80211_rx_status *rx_stats);
+
+
+/* prism2_rx_80211 'type' argument */
+enum {
+        PRISM2_RX_MONITOR, PRISM2_RX_MGMT, PRISM2_RX_NON_ASSOC,
+        PRISM2_RX_NULLFUNC_ACK
+};
+
+int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,
+                    struct hostap_80211_rx_status *rx_stats, int type);
+void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
+                     struct hostap_80211_rx_status *rx_stats);
+void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
+                          struct hostap_80211_rx_status *rx_stats);
+
+void hostap_dump_tx_80211(const char *name, struct sk_buff *skb);
+int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev);
+int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev);
+struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
+                                   struct ieee80211_crypt_data *crypt);
+int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev);
+
+#endif /* HOSTAP_80211_H */
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
new file mode 100644
index 000000000000..b0501243b175
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -0,0 +1,1091 @@
+#include <linux/etherdevice.h>
+
+#include "hostap_80211.h"
+#include "hostap.h"
+
+void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
+                          struct hostap_80211_rx_status *rx_stats)
+{
+        struct ieee80211_hdr *hdr;
+        u16 fc;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+
+        printk(KERN_DEBUG "%s: RX signal=%d noise=%d rate=%d len=%d "
+               "jiffies=%ld\n",
+               name, rx_stats->signal, rx_stats->noise, rx_stats->rate,
+               skb->len, jiffies);
+
+        if (skb->len < 2)
+                return;
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d)%s%s",
+               fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
+               fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
+               fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
+
+        if (skb->len < IEEE80211_DATA_HDR3_LEN) {
+                printk("\n");
+                return;
+        }
+
+        printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
+               le16_to_cpu(hdr->seq_ctl));
+
+        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR,
+               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
+        if (skb->len >= 30)
+                printk(" A4=" MACSTR, MAC2STR(hdr->addr4));
+        printk("\n");
+}
+
+
+/* Send RX frame to netif with 802.11 (and possible prism) header.
+ * Called from hardware or software IRQ context. */
+int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb,
+                    struct hostap_80211_rx_status *rx_stats, int type)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int hdrlen, phdrlen, head_need, tail_need;
+        u16 fc;
+        int prism_header, ret;
+        struct ieee80211_hdr *hdr;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        dev->last_rx = jiffies;
+
+        if (dev->type == ARPHRD_IEEE80211_PRISM) {
+                if (local->monitor_type == PRISM2_MONITOR_PRISM) {
+                        prism_header = 1;
+                        phdrlen = sizeof(struct linux_wlan_ng_prism_hdr);
+                } else { /* local->monitor_type == PRISM2_MONITOR_CAPHDR */
+                        prism_header = 2;
+                        phdrlen = sizeof(struct linux_wlan_ng_cap_hdr);
+                }
+        } else {
+                prism_header = 0;
+                phdrlen = 0;
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+
+        if (type == PRISM2_RX_MGMT && (fc & IEEE80211_FCTL_VERS)) {
+                printk(KERN_DEBUG "%s: dropped management frame with header "
+                       "version %d\n", dev->name, fc & IEEE80211_FCTL_VERS);
+                dev_kfree_skb_any(skb);
+                return 0;
+        }
+
+        hdrlen = hostap_80211_get_hdrlen(fc);
+
+        /* check if there is enough room for extra data; if not, expand skb
+         * buffer to be large enough for the changes */
+        head_need = phdrlen;
+        tail_need = 0;
+#ifdef PRISM2_ADD_BOGUS_CRC
+        tail_need += 4;
+#endif /* PRISM2_ADD_BOGUS_CRC */
+
+        head_need -= skb_headroom(skb);
+        tail_need -= skb_tailroom(skb);
+
+        if (head_need > 0 || tail_need > 0) {
+                if (pskb_expand_head(skb, head_need > 0 ? head_need : 0,
+                                     tail_need > 0 ? tail_need : 0,
+                                     GFP_ATOMIC)) {
+                        printk(KERN_DEBUG "%s: prism2_rx_80211 failed to "
+                               "reallocate skb buffer\n", dev->name);
+                        dev_kfree_skb_any(skb);
+                        return 0;
+                }
+        }
+
+        /* We now have an skb with enough head and tail room, so just insert
+         * the extra data */
+
+#ifdef PRISM2_ADD_BOGUS_CRC
+        memset(skb_put(skb, 4), 0xff, 4); /* Prism2 strips CRC */
+#endif /* PRISM2_ADD_BOGUS_CRC */
+
+        if (prism_header == 1) {
+                struct linux_wlan_ng_prism_hdr *hdr;
+                hdr = (struct linux_wlan_ng_prism_hdr *)
+                        skb_push(skb, phdrlen);
+                memset(hdr, 0, phdrlen);
+                hdr->msgcode = LWNG_CAP_DID_BASE;
+                hdr->msglen = sizeof(*hdr);
+                memcpy(hdr->devname, dev->name, sizeof(hdr->devname));
+#define LWNG_SETVAL(f,i,s,l,d) \
+hdr->f.did = LWNG_CAP_DID_BASE | (i << 12); \
+hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
+                LWNG_SETVAL(hosttime, 1, 0, 4, jiffies);
+                LWNG_SETVAL(mactime, 2, 0, 4, rx_stats->mac_time);
+                LWNG_SETVAL(channel, 3, 1 /* no value */, 4, 0);
+                LWNG_SETVAL(rssi, 4, 1 /* no value */, 4, 0);
+                LWNG_SETVAL(sq, 5, 1 /* no value */, 4, 0);
+                LWNG_SETVAL(signal, 6, 0, 4, rx_stats->signal);
+                LWNG_SETVAL(noise, 7, 0, 4, rx_stats->noise);
+                LWNG_SETVAL(rate, 8, 0, 4, rx_stats->rate / 5);
+                LWNG_SETVAL(istx, 9, 0, 4, 0);
+                LWNG_SETVAL(frmlen, 10, 0, 4, skb->len - phdrlen);
+#undef LWNG_SETVAL
+        } else if (prism_header == 2) {
+                struct linux_wlan_ng_cap_hdr *hdr;
+                hdr = (struct linux_wlan_ng_cap_hdr *)
+                        skb_push(skb, phdrlen);
+                memset(hdr, 0, phdrlen);
+                hdr->version    = htonl(LWNG_CAPHDR_VERSION);
+                hdr->length     = htonl(phdrlen);
+                hdr->mactime    = __cpu_to_be64(rx_stats->mac_time);
+                hdr->hosttime   = __cpu_to_be64(jiffies);
+                hdr->phytype    = htonl(4); /* dss_dot11_b */
+                hdr->channel    = htonl(local->channel);
+                hdr->datarate   = htonl(rx_stats->rate);
+                hdr->antenna    = htonl(0); /* unknown */
+                hdr->priority   = htonl(0); /* unknown */
+                hdr->ssi_type   = htonl(3); /* raw */
+                hdr->ssi_signal = htonl(rx_stats->signal);
+                hdr->ssi_noise  = htonl(rx_stats->noise);
+                hdr->preamble   = htonl(0); /* unknown */
+                hdr->encoding   = htonl(1); /* cck */
+        }
+
+        ret = skb->len - phdrlen;
+        skb->dev = dev;
+        skb->mac.raw = skb->data;
+        skb_pull(skb, hdrlen);
+        if (prism_header)
+                skb_pull(skb, phdrlen);
+        skb->pkt_type = PACKET_OTHERHOST;
+        skb->protocol = __constant_htons(ETH_P_802_2);
+        memset(skb->cb, 0, sizeof(skb->cb));
+        netif_rx(skb);
+
+        return ret;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void monitor_rx(struct net_device *dev, struct sk_buff *skb,
+                       struct hostap_80211_rx_status *rx_stats)
+{
+        struct net_device_stats *stats;
+        int len;
+
+        len = prism2_rx_80211(dev, skb, rx_stats, PRISM2_RX_MONITOR);
+        stats = hostap_get_stats(dev);
+        stats->rx_packets++;
+        stats->rx_bytes += len;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static struct prism2_frag_entry *
+prism2_frag_cache_find(local_info_t *local, unsigned int seq,
+                       unsigned int frag, u8 *src, u8 *dst)
+{
+        struct prism2_frag_entry *entry;
+        int i;
+
+        for (i = 0; i < PRISM2_FRAG_CACHE_LEN; i++) {
+                entry = &local->frag_cache[i];
+                if (entry->skb != NULL &&
+                    time_after(jiffies, entry->first_frag_time + 2 * HZ)) {
+                        printk(KERN_DEBUG "%s: expiring fragment cache entry "
+                               "seq=%u last_frag=%u\n",
+                               local->dev->name, entry->seq, entry->last_frag);
+                        dev_kfree_skb(entry->skb);
+                        entry->skb = NULL;
+                }
+
+                if (entry->skb != NULL && entry->seq == seq &&
+                    (entry->last_frag + 1 == frag || frag == -1) &&
+                    memcmp(entry->src_addr, src, ETH_ALEN) == 0 &&
+                    memcmp(entry->dst_addr, dst, ETH_ALEN) == 0)
+                        return entry;
+        }
+
+        return NULL;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static struct sk_buff *
+prism2_frag_cache_get(local_info_t *local, struct ieee80211_hdr *hdr)
+{
+        struct sk_buff *skb = NULL;
+        u16 sc;
+        unsigned int frag, seq;
+        struct prism2_frag_entry *entry;
+
+        sc = le16_to_cpu(hdr->seq_ctl);
+        frag = WLAN_GET_SEQ_FRAG(sc);
+        seq = WLAN_GET_SEQ_SEQ(sc) >> 4;
+
+        if (frag == 0) {
+                /* Reserve enough space to fit maximum frame length */
+                skb = dev_alloc_skb(local->dev->mtu +
+                                    sizeof(struct ieee80211_hdr) +
+                                    8 /* LLC */ +
+                                    2 /* alignment */ +
+                                    8 /* WEP */ + ETH_ALEN /* WDS */);
+                if (skb == NULL)
+                        return NULL;
+
+                entry = &local->frag_cache[local->frag_next_idx];
+                local->frag_next_idx++;
+                if (local->frag_next_idx >= PRISM2_FRAG_CACHE_LEN)
+                        local->frag_next_idx = 0;
+
+                if (entry->skb != NULL)
+                        dev_kfree_skb(entry->skb);
+
+                entry->first_frag_time = jiffies;
+                entry->seq = seq;
+                entry->last_frag = frag;
+                entry->skb = skb;
+                memcpy(entry->src_addr, hdr->addr2, ETH_ALEN);
+                memcpy(entry->dst_addr, hdr->addr1, ETH_ALEN);
+        } else {
+                /* received a fragment of a frame for which the head fragment
+                 * should have already been received */
+                entry = prism2_frag_cache_find(local, seq, frag, hdr->addr2,
+                                               hdr->addr1);
+                if (entry != NULL) {
+                        entry->last_frag = frag;
+                        skb = entry->skb;
+                }
+        }
+
+        return skb;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static int prism2_frag_cache_invalidate(local_info_t *local,
+                                        struct ieee80211_hdr *hdr)
+{
+        u16 sc;
+        unsigned int seq;
+        struct prism2_frag_entry *entry;
+
+        sc = le16_to_cpu(hdr->seq_ctl);
+        seq = WLAN_GET_SEQ_SEQ(sc) >> 4;
+
+        entry = prism2_frag_cache_find(local, seq, -1, hdr->addr2, hdr->addr1);
+
+        if (entry == NULL) {
+                printk(KERN_DEBUG "%s: could not invalidate fragment cache "
+                       "entry (seq=%u)\n",
+                       local->dev->name, seq);
+                return -1;
+        }
+
+        entry->skb = NULL;
+        return 0;
+}
+
+
+static struct hostap_bss_info *__hostap_get_bss(local_info_t *local, u8 *bssid,
+                                                u8 *ssid, size_t ssid_len)
+{
+        struct list_head *ptr;
+        struct hostap_bss_info *bss;
+
+        list_for_each(ptr, &local->bss_list) {
+                bss = list_entry(ptr, struct hostap_bss_info, list);
+                if (memcmp(bss->bssid, bssid, ETH_ALEN) == 0 &&
+                    (ssid == NULL ||
+                     (ssid_len == bss->ssid_len &&
+                      memcmp(ssid, bss->ssid, ssid_len) == 0))) {
+                        list_move(&bss->list, &local->bss_list);
+                        return bss;
+                }
+        }
+
+        return NULL;
+}
+
+
+static struct hostap_bss_info *__hostap_add_bss(local_info_t *local, u8 *bssid,
+                                                u8 *ssid, size_t ssid_len)
+{
+        struct hostap_bss_info *bss;
+
+        if (local->num_bss_info >= HOSTAP_MAX_BSS_COUNT) {
+                bss = list_entry(local->bss_list.prev,
+                                 struct hostap_bss_info, list);
+                list_del(&bss->list);
+                local->num_bss_info--;
+        } else {
+                bss = (struct hostap_bss_info *)
+                        kmalloc(sizeof(*bss), GFP_ATOMIC);
+                if (bss == NULL)
+                        return NULL;
+        }
+
+        memset(bss, 0, sizeof(*bss));
+        memcpy(bss->bssid, bssid, ETH_ALEN);
+        memcpy(bss->ssid, ssid, ssid_len);
+        bss->ssid_len = ssid_len;
+        local->num_bss_info++;
+        list_add(&bss->list, &local->bss_list);
+        return bss;
+}
+
+
+static void __hostap_expire_bss(local_info_t *local)
+{
+        struct hostap_bss_info *bss;
+
+        while (local->num_bss_info > 0) {
+                bss = list_entry(local->bss_list.prev,
+                                 struct hostap_bss_info, list);
+                if (!time_after(jiffies, bss->last_update + 60 * HZ))
+                        break;
+
+                list_del(&bss->list);
+                local->num_bss_info--;
+                kfree(bss);
+        }
+}
+
+
+/* Both IEEE 802.11 Beacon and Probe Response frames have similar structure, so
+ * the same routine can be used to parse both of them. */
+static void hostap_rx_sta_beacon(local_info_t *local, struct sk_buff *skb,
+                                 int stype)
+{
+        struct hostap_ieee80211_mgmt *mgmt;
+        int left, chan = 0;
+        u8 *pos;
+        u8 *ssid = NULL, *wpa = NULL, *rsn = NULL;
+        size_t ssid_len = 0, wpa_len = 0, rsn_len = 0;
+        struct hostap_bss_info *bss;
+
+        if (skb->len < IEEE80211_MGMT_HDR_LEN + sizeof(mgmt->u.beacon))
+                return;
+
+        mgmt = (struct hostap_ieee80211_mgmt *) skb->data;
+        pos = mgmt->u.beacon.variable;
+        left = skb->len - (pos - skb->data);
+
+        while (left >= 2) {
+                if (2 + pos[1] > left)
+                        return; /* parse failed */
+                switch (*pos) {
+                case WLAN_EID_SSID:
+                        ssid = pos + 2;
+                        ssid_len = pos[1];
+                        break;
+                case WLAN_EID_GENERIC:
+                        if (pos[1] >= 4 &&
+                            pos[2] == 0x00 && pos[3] == 0x50 &&
+                            pos[4] == 0xf2 && pos[5] == 1) {
+                                wpa = pos;
+                                wpa_len = pos[1] + 2;
+                        }
+                        break;
+                case WLAN_EID_RSN:
+                        rsn = pos;
+                        rsn_len = pos[1] + 2;
+                        break;
+                case WLAN_EID_DS_PARAMS:
+                        if (pos[1] >= 1)
+                                chan = pos[2];
+                        break;
+                }
+                left -= 2 + pos[1];
+                pos += 2 + pos[1];
+        }
+
+        if (wpa_len > MAX_WPA_IE_LEN)
+                wpa_len = MAX_WPA_IE_LEN;
+        if (rsn_len > MAX_WPA_IE_LEN)
+                rsn_len = MAX_WPA_IE_LEN;
+        if (ssid_len > sizeof(bss->ssid))
+                ssid_len = sizeof(bss->ssid);
+
+        spin_lock(&local->lock);
+        bss = __hostap_get_bss(local, mgmt->bssid, ssid, ssid_len);
+        if (bss == NULL)
+                bss = __hostap_add_bss(local, mgmt->bssid, ssid, ssid_len);
+        if (bss) {
+                bss->last_update = jiffies;
+                bss->count++;
+                bss->capab_info = le16_to_cpu(mgmt->u.beacon.capab_info);
+                if (wpa) {
+                        memcpy(bss->wpa_ie, wpa, wpa_len);
+                        bss->wpa_ie_len = wpa_len;
+                } else
+                        bss->wpa_ie_len = 0;
+                if (rsn) {
+                        memcpy(bss->rsn_ie, rsn, rsn_len);
+                        bss->rsn_ie_len = rsn_len;
+                } else
+                        bss->rsn_ie_len = 0;
+                bss->chan = chan;
+        }
+        __hostap_expire_bss(local);
+        spin_unlock(&local->lock);
+}
+
+
+static inline int
+hostap_rx_frame_mgmt(local_info_t *local, struct sk_buff *skb,
+                     struct hostap_80211_rx_status *rx_stats, u16 type,
+                     u16 stype)
+{
+        if (local->iw_mode == IW_MODE_MASTER) {
+                hostap_update_sta_ps(local, (struct ieee80211_hdr *)
+                                     skb->data);
+        }
+
+        if (local->hostapd && type == IEEE80211_FTYPE_MGMT) {
+                if (stype == IEEE80211_STYPE_BEACON &&
+                    local->iw_mode == IW_MODE_MASTER) {
+                        struct sk_buff *skb2;
+                        /* Process beacon frames also in kernel driver to
+                         * update STA(AP) table statistics */
+                        skb2 = skb_clone(skb, GFP_ATOMIC);
+                        if (skb2)
+                                hostap_rx(skb2->dev, skb2, rx_stats);
+                }
+
+                /* send management frames to the user space daemon for
+                 * processing */
+                local->apdevstats.rx_packets++;
+                local->apdevstats.rx_bytes += skb->len;
+                if (local->apdev == NULL)
+                        return -1;
+                prism2_rx_80211(local->apdev, skb, rx_stats, PRISM2_RX_MGMT);
+                return 0;
+        }
+
+        if (local->iw_mode == IW_MODE_MASTER) {
+                if (type != IEEE80211_FTYPE_MGMT &&
+                    type != IEEE80211_FTYPE_CTL) {
+                        printk(KERN_DEBUG "%s: unknown management frame "
+                               "(type=0x%02x, stype=0x%02x) dropped\n",
+                               skb->dev->name, type >> 2, stype >> 4);
+                        return -1;
+                }
+
+                hostap_rx(skb->dev, skb, rx_stats);
+                return 0;
+        } else if (type == IEEE80211_FTYPE_MGMT &&
+                   (stype == IEEE80211_STYPE_BEACON ||
+                    stype == IEEE80211_STYPE_PROBE_RESP)) {
+                hostap_rx_sta_beacon(local, skb, stype);
+                return -1;
+        } else if (type == IEEE80211_FTYPE_MGMT &&
+                   (stype == IEEE80211_STYPE_ASSOC_RESP ||
+                    stype == IEEE80211_STYPE_REASSOC_RESP)) {
+                /* Ignore (Re)AssocResp silently since these are not currently
+                 * needed but are still received when WPA/RSN mode is enabled.
+                 */
+                return -1;
+        } else {
+                printk(KERN_DEBUG "%s: hostap_rx_frame_mgmt: dropped unhandled"
+                       " management frame in non-Host AP mode (type=%d:%d)\n",
+                       skb->dev->name, type >> 2, stype >> 4);
+                return -1;
+        }
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static inline struct net_device *prism2_rx_get_wds(local_info_t *local,
+                                                   u8 *addr)
+{
+        struct hostap_interface *iface = NULL;
+        struct list_head *ptr;
+
+        read_lock_bh(&local->iface_lock);
+        list_for_each(ptr, &local->hostap_interfaces) {
+                iface = list_entry(ptr, struct hostap_interface, list);
+                if (iface->type == HOSTAP_INTERFACE_WDS &&
+                    memcmp(iface->u.wds.remote_addr, addr, ETH_ALEN) == 0)
+                        break;
+                iface = NULL;
+        }
+        read_unlock_bh(&local->iface_lock);
+
+        return iface ? iface->dev : NULL;
+}
+
+
+static inline int
+hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr *hdr,
+                    u16 fc, struct net_device **wds)
+{
+        /* FIX: is this really supposed to accept WDS frames only in Master
+         * mode? What about Repeater or Managed with WDS frames? */
+        if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) !=
+            (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS) &&
+            (local->iw_mode != IW_MODE_MASTER || !(fc & IEEE80211_FCTL_TODS)))
+                return 0; /* not a WDS frame */
+
+        /* Possible WDS frame: either IEEE 802.11 compliant (if FromDS)
+         * or own non-standard frame with 4th address after payload */
+        if (memcmp(hdr->addr1, local->dev->dev_addr, ETH_ALEN) != 0 &&
+            (hdr->addr1[0] != 0xff || hdr->addr1[1] != 0xff ||
+             hdr->addr1[2] != 0xff || hdr->addr1[3] != 0xff ||
+             hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) {
+                /* RA (or BSSID) is not ours - drop */
+                PDEBUG(DEBUG_EXTRA, "%s: received WDS frame with "
+                       "not own or broadcast %s=" MACSTR "\n",
+                       local->dev->name,
+                       fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID",
+                       MAC2STR(hdr->addr1));
+                return -1;
+        }
+
+        /* check if the frame came from a registered WDS connection */
+        *wds = prism2_rx_get_wds(local, hdr->addr2);
+        if (*wds == NULL && fc & IEEE80211_FCTL_FROMDS &&
+            (local->iw_mode != IW_MODE_INFRA ||
+             !(local->wds_type & HOSTAP_WDS_AP_CLIENT) ||
+             memcmp(hdr->addr2, local->bssid, ETH_ALEN) != 0)) {
+                /* require that WDS link has been registered with TA or the
+                 * frame is from current AP when using 'AP client mode' */
+                PDEBUG(DEBUG_EXTRA, "%s: received WDS[4 addr] frame "
+                       "from unknown TA=" MACSTR "\n",
+                       local->dev->name, MAC2STR(hdr->addr2));
+                if (local->ap && local->ap->autom_ap_wds)
+                        hostap_wds_link_oper(local, hdr->addr2, WDS_ADD);
+                return -1;
+        }
+
+        if (*wds && !(fc & IEEE80211_FCTL_FROMDS) && local->ap &&
+            hostap_is_sta_assoc(local->ap, hdr->addr2)) {
+                /* STA is actually associated with us even though it has a
+                 * registered WDS link. Assume it is in 'AP client' mode.
+                 * Since this is a 3-addr frame, assume it is not (bogus) WDS
+                 * frame and process it like any normal ToDS frame from
+                 * associated STA. */
+                *wds = NULL;
+        }
+
+        return 0;
+}
+
+
+static int hostap_is_eapol_frame(local_info_t *local, struct sk_buff *skb)
+{
+        struct net_device *dev = local->dev;
+        u16 fc, ethertype;
+        struct ieee80211_hdr *hdr;
+        u8 *pos;
+
+        if (skb->len < 24)
+                return 0;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+
+        /* check that the frame is unicast frame to us */
+        if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+            IEEE80211_FCTL_TODS &&
+            memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0 &&
+            memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) {
+                /* ToDS frame with own addr BSSID and DA */
+        } else if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+                   IEEE80211_FCTL_FROMDS &&
+                   memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0) {
+                /* FromDS frame with own addr as DA */
+        } else
+                return 0;
+
+        if (skb->len < 24 + 8)
+                return 0;
+
+        /* check for port access entity Ethernet type */
+        pos = skb->data + 24;
+        ethertype = (pos[6] << 8) | pos[7];
+        if (ethertype == ETH_P_PAE)
+                return 1;
+
+        return 0;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static inline int
+hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
+                        struct ieee80211_crypt_data *crypt)
+{
+        struct ieee80211_hdr *hdr;
+        int res, hdrlen;
+
+        if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
+                return 0;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
+
+        if (local->tkip_countermeasures &&
+            strcmp(crypt->ops->name, "TKIP") == 0) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+                               "received packet from " MACSTR "\n",
+                               local->dev->name, MAC2STR(hdr->addr2));
+                }
+                return -1;
+        }
+
+        atomic_inc(&crypt->refcnt);
+        res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
+        atomic_dec(&crypt->refcnt);
+        if (res < 0) {
+                printk(KERN_DEBUG "%s: decryption failed (SA=" MACSTR
+                       ") res=%d\n",
+                       local->dev->name, MAC2STR(hdr->addr2), res);
+                local->comm_tallies.rx_discards_wep_undecryptable++;
+                return -1;
+        }
+
+        return res;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static inline int
+hostap_rx_frame_decrypt_msdu(local_info_t *local, struct sk_buff *skb,
+                             int keyidx, struct ieee80211_crypt_data *crypt)
+{
+        struct ieee80211_hdr *hdr;
+        int res, hdrlen;
+
+        if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
+                return 0;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
+
+        atomic_inc(&crypt->refcnt);
+        res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
+        atomic_dec(&crypt->refcnt);
+        if (res < 0) {
+                printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
+                       " (SA=" MACSTR " keyidx=%d)\n",
+                       local->dev->name, MAC2STR(hdr->addr2), keyidx);
+                return -1;
+        }
+
+        return 0;
+}
+
+
+/* All received frames are sent to this function. @skb contains the frame in
+ * IEEE 802.11 format, i.e., in the format it was sent over air.
+ * This function is called only as a tasklet (software IRQ). */
+void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
+                     struct hostap_80211_rx_status *rx_stats)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct ieee80211_hdr *hdr;
+        size_t hdrlen;
+        u16 fc, type, stype, sc;
+        struct net_device *wds = NULL;
+        struct net_device_stats *stats;
+        unsigned int frag;
+        u8 *payload;
+        struct sk_buff *skb2 = NULL;
+        u16 ethertype;
+        int frame_authorized = 0;
+        int from_assoc_ap = 0;
+        u8 dst[ETH_ALEN];
+        u8 src[ETH_ALEN];
+        struct ieee80211_crypt_data *crypt = NULL;
+        void *sta = NULL;
+        int keyidx = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        iface->stats.rx_packets++;
+        iface->stats.rx_bytes += skb->len;
+
+        /* dev is the master radio device; change this to be the default
+         * virtual interface (this may be changed to WDS device below) */
+        dev = local->ddev;
+        iface = netdev_priv(dev);
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        stats = hostap_get_stats(dev);
+
+        if (skb->len < 10)
+                goto rx_dropped;
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        type = WLAN_FC_GET_TYPE(fc);
+        stype = WLAN_FC_GET_STYPE(fc);
+        sc = le16_to_cpu(hdr->seq_ctl);
+        frag = WLAN_GET_SEQ_FRAG(sc);
+        hdrlen = hostap_80211_get_hdrlen(fc);
+
+        /* Put this code here so that we avoid duplicating it in all
+         * Rx paths. - Jean II */
+#ifdef IW_WIRELESS_SPY          /* defined in iw_handler.h */
+        /* If spy monitoring on */
+        if (iface->spy_data.spy_number > 0) {
+                struct iw_quality wstats;
+                wstats.level = rx_stats->signal;
+                wstats.noise = rx_stats->noise;
+                wstats.updated = 6;     /* No qual value */
+                /* Update spy records */
+                wireless_spy_update(dev, hdr->addr2, &wstats);
+        }
+#endif /* IW_WIRELESS_SPY */
+        hostap_update_rx_stats(local->ap, hdr, rx_stats);
+
+        if (local->iw_mode == IW_MODE_MONITOR) {
+                monitor_rx(dev, skb, rx_stats);
+                return;
+        }
+
+        if (local->host_decrypt) {
+                int idx = 0;
+                if (skb->len >= hdrlen + 3)
+                        idx = skb->data[hdrlen + 3] >> 6;
+                crypt = local->crypt[idx];
+                sta = NULL;
+
+                /* Use station specific key to override default keys if the
+                 * receiver address is a unicast address ("individual RA"). If
+                 * bcrx_sta_key parameter is set, station specific key is used
+                 * even with broad/multicast targets (this is against IEEE
+                 * 802.11, but makes it easier to use different keys with
+                 * stations that do not support WEP key mapping). */
+
+                if (!(hdr->addr1[0] & 0x01) || local->bcrx_sta_key)
+                        (void) hostap_handle_sta_crypto(local, hdr, &crypt,
+                                                        &sta);
+
+                /* allow NULL decrypt to indicate an station specific override
+                 * for default encryption */
+                if (crypt && (crypt->ops == NULL ||
+                              crypt->ops->decrypt_mpdu == NULL))
+                        crypt = NULL;
+
+                if (!crypt && (fc & IEEE80211_FCTL_PROTECTED)) {
+#if 0
+                        /* This seems to be triggered by some (multicast?)
+                         * frames from other than current BSS, so just drop the
+                         * frames silently instead of filling system log with
+                         * these reports. */
+                        printk(KERN_DEBUG "%s: WEP decryption failed (not set)"
+                               " (SA=" MACSTR ")\n",
+                               local->dev->name, MAC2STR(hdr->addr2));
+#endif
+                        local->comm_tallies.rx_discards_wep_undecryptable++;
+                        goto rx_dropped;
+                }
+        }
+
+        if (type != IEEE80211_FTYPE_DATA) {
+                if (type == IEEE80211_FTYPE_MGMT &&
+                    stype == IEEE80211_STYPE_AUTH &&
+                    fc & IEEE80211_FCTL_PROTECTED && local->host_decrypt &&
+                    (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)
+                {
+                        printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
+                               "from " MACSTR "\n", dev->name,
+                               MAC2STR(hdr->addr2));
+                        /* TODO: could inform hostapd about this so that it
+                         * could send auth failure report */
+                        goto rx_dropped;
+                }
+
+                if (hostap_rx_frame_mgmt(local, skb, rx_stats, type, stype))
+                        goto rx_dropped;
+                else
+                        goto rx_exit;
+        }
+
+        /* Data frame - extract src/dst addresses */
+        if (skb->len < IEEE80211_DATA_HDR3_LEN)
+                goto rx_dropped;
+
+        switch (fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
+        case IEEE80211_FCTL_FROMDS:
+                memcpy(dst, hdr->addr1, ETH_ALEN);
+                memcpy(src, hdr->addr3, ETH_ALEN);
+                break;
+        case IEEE80211_FCTL_TODS:
+                memcpy(dst, hdr->addr3, ETH_ALEN);
+                memcpy(src, hdr->addr2, ETH_ALEN);
+                break;
+        case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:
+                if (skb->len < IEEE80211_DATA_HDR4_LEN)
+                        goto rx_dropped;
+                memcpy(dst, hdr->addr3, ETH_ALEN);
+                memcpy(src, hdr->addr4, ETH_ALEN);
+                break;
+        case 0:
+                memcpy(dst, hdr->addr1, ETH_ALEN);
+                memcpy(src, hdr->addr2, ETH_ALEN);
+                break;
+        }
+
+        if (hostap_rx_frame_wds(local, hdr, fc, &wds))
+                goto rx_dropped;
+        if (wds) {
+                skb->dev = dev = wds;
+                stats = hostap_get_stats(dev);
+        }
+
+        if (local->iw_mode == IW_MODE_MASTER && !wds &&
+            (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+            IEEE80211_FCTL_FROMDS &&
+            local->stadev &&
+            memcmp(hdr->addr2, local->assoc_ap_addr, ETH_ALEN) == 0) {
+                /* Frame from BSSID of the AP for which we are a client */
+                skb->dev = dev = local->stadev;
+                stats = hostap_get_stats(dev);
+                from_assoc_ap = 1;
+        }
+
+        dev->last_rx = jiffies;
+
+        if ((local->iw_mode == IW_MODE_MASTER ||
+             local->iw_mode == IW_MODE_REPEAT) &&
+            !from_assoc_ap) {
+                switch (hostap_handle_sta_rx(local, dev, skb, rx_stats,
+                                             wds != NULL)) {
+                case AP_RX_CONTINUE_NOT_AUTHORIZED:
+                        frame_authorized = 0;
+                        break;
+                case AP_RX_CONTINUE:
+                        frame_authorized = 1;
+                        break;
+                case AP_RX_DROP:
+                        goto rx_dropped;
+                case AP_RX_EXIT:
+                        goto rx_exit;
+                }
+        }
+
+        /* Nullfunc frames may have PS-bit set, so they must be passed to
+         * hostap_handle_sta_rx() before being dropped here. */
+        if (stype != IEEE80211_STYPE_DATA &&
+            stype != IEEE80211_STYPE_DATA_CFACK &&
+            stype != IEEE80211_STYPE_DATA_CFPOLL &&
+            stype != IEEE80211_STYPE_DATA_CFACKPOLL) {
+                if (stype != IEEE80211_STYPE_NULLFUNC)
+                        printk(KERN_DEBUG "%s: RX: dropped data frame "
+                               "with no data (type=0x%02x, subtype=0x%02x)\n",
+                               dev->name, type >> 2, stype >> 4);
+                goto rx_dropped;
+        }
+
+        /* skb: hdr + (possibly fragmented, possibly encrypted) payload */
+
+        if (local->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
+            (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)
+                goto rx_dropped;
+        hdr = (struct ieee80211_hdr *) skb->data;
+
+        /* skb: hdr + (possibly fragmented) plaintext payload */
+
+        if (local->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
+            (frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) {
+                int flen;
+                struct sk_buff *frag_skb =
+                        prism2_frag_cache_get(local, hdr);
+                if (!frag_skb) {
+                        printk(KERN_DEBUG "%s: Rx cannot get skb from "
+                               "fragment cache (morefrag=%d seq=%u frag=%u)\n",
+                               dev->name, (fc & IEEE80211_FCTL_MOREFRAGS) != 0,
+                               WLAN_GET_SEQ_SEQ(sc) >> 4, frag);
+                        goto rx_dropped;
+                }
+
+                flen = skb->len;
+                if (frag != 0)
+                        flen -= hdrlen;
+
+                if (frag_skb->tail + flen > frag_skb->end) {
+                        printk(KERN_WARNING "%s: host decrypted and "
+                               "reassembled frame did not fit skb\n",
+                               dev->name);
+                        prism2_frag_cache_invalidate(local, hdr);
+                        goto rx_dropped;
+                }
+
+                if (frag == 0) {
+                        /* copy first fragment (including full headers) into
+                         * beginning of the fragment cache skb */
+                        memcpy(skb_put(frag_skb, flen), skb->data, flen);
+                } else {
+                        /* append frame payload to the end of the fragment
+                         * cache skb */
+                        memcpy(skb_put(frag_skb, flen), skb->data + hdrlen,
+                               flen);
+                }
+                dev_kfree_skb(skb);
+                skb = NULL;
+
+                if (fc & IEEE80211_FCTL_MOREFRAGS) {
+                        /* more fragments expected - leave the skb in fragment
+                         * cache for now; it will be delivered to upper layers
+                         * after all fragments have been received */
+                        goto rx_exit;
+                }
+
+                /* this was the last fragment and the frame will be
+                 * delivered, so remove skb from fragment cache */
+                skb = frag_skb;
+                hdr = (struct ieee80211_hdr *) skb->data;
+                prism2_frag_cache_invalidate(local, hdr);
+        }
+
+        /* skb: hdr + (possible reassembled) full MSDU payload; possibly still
+         * encrypted/authenticated */
+
+        if (local->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
+            hostap_rx_frame_decrypt_msdu(local, skb, keyidx, crypt))
+                goto rx_dropped;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !local->open_wep) {
+                if (local->ieee_802_1x &&
+                    hostap_is_eapol_frame(local, skb)) {
+                        /* pass unencrypted EAPOL frames even if encryption is
+                         * configured */
+                        PDEBUG(DEBUG_EXTRA2, "%s: RX: IEEE 802.1X - passing "
+                               "unencrypted EAPOL frame\n", local->dev->name);
+                } else {
+                        printk(KERN_DEBUG "%s: encryption configured, but RX "
+                               "frame not encrypted (SA=" MACSTR ")\n",
+                               local->dev->name, MAC2STR(hdr->addr2));
+                        goto rx_dropped;
+                }
+        }
+
+        if (local->drop_unencrypted && !(fc & IEEE80211_FCTL_PROTECTED) &&
+            !hostap_is_eapol_frame(local, skb)) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: dropped unencrypted RX data "
+                               "frame from " MACSTR " (drop_unencrypted=1)\n",
+                               dev->name, MAC2STR(hdr->addr2));
+                }
+                goto rx_dropped;
+        }
+
+        /* skb: hdr + (possible reassembled) full plaintext payload */
+
+        payload = skb->data + hdrlen;
+        ethertype = (payload[6] << 8) | payload[7];
+
+        /* If IEEE 802.1X is used, check whether the port is authorized to send
+         * the received frame. */
+        if (local->ieee_802_1x && local->iw_mode == IW_MODE_MASTER) {
+                if (ethertype == ETH_P_PAE) {
+                        PDEBUG(DEBUG_EXTRA2, "%s: RX: IEEE 802.1X frame\n",
+                               dev->name);
+                        if (local->hostapd && local->apdev) {
+                                /* Send IEEE 802.1X frames to the user
+                                 * space daemon for processing */
+                                prism2_rx_80211(local->apdev, skb, rx_stats,
+                                                PRISM2_RX_MGMT);
+                                local->apdevstats.rx_packets++;
+                                local->apdevstats.rx_bytes += skb->len;
+                                goto rx_exit;
+                        }
+                } else if (!frame_authorized) {
+                        printk(KERN_DEBUG "%s: dropped frame from "
+                               "unauthorized port (IEEE 802.1X): "
+                               "ethertype=0x%04x\n",
+                               dev->name, ethertype);
+                        goto rx_dropped;
+                }
+        }
+
+        /* convert hdr + possible LLC headers into Ethernet header */
+        if (skb->len - hdrlen >= 8 &&
+            ((memcmp(payload, rfc1042_header, 6) == 0 &&
+              ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
+             memcmp(payload, bridge_tunnel_header, 6) == 0)) {
+                /* remove RFC1042 or Bridge-Tunnel encapsulation and
+                 * replace EtherType */
+                skb_pull(skb, hdrlen + 6);
+                memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
+                memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
+        } else {
+                u16 len;
+                /* Leave Ethernet header part of hdr and full payload */
+                skb_pull(skb, hdrlen);
+                len = htons(skb->len);
+                memcpy(skb_push(skb, 2), &len, 2);
+                memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
+                memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
+        }
+
+        if (wds && ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
+                    IEEE80211_FCTL_TODS) &&
+            skb->len >= ETH_HLEN + ETH_ALEN) {
+                /* Non-standard frame: get addr4 from its bogus location after
+                 * the payload */
+                memcpy(skb->data + ETH_ALEN,
+                       skb->data + skb->len - ETH_ALEN, ETH_ALEN);
+                skb_trim(skb, skb->len - ETH_ALEN);
+        }
+
+        stats->rx_packets++;
+        stats->rx_bytes += skb->len;
+
+        if (local->iw_mode == IW_MODE_MASTER && !wds &&
+            local->ap->bridge_packets) {
+                if (dst[0] & 0x01) {
+                        /* copy multicast frame both to the higher layers and
+                         * to the wireless media */
+                        local->ap->bridged_multicast++;
+                        skb2 = skb_clone(skb, GFP_ATOMIC);
+                        if (skb2 == NULL)
+                                printk(KERN_DEBUG "%s: skb_clone failed for "
+                                       "multicast frame\n", dev->name);
+                } else if (hostap_is_sta_authorized(local->ap, dst)) {
+                        /* send frame directly to the associated STA using
+                         * wireless media and not passing to higher layers */
+                        local->ap->bridged_unicast++;
+                        skb2 = skb;
+                        skb = NULL;
+                }
+        }
+
+        if (skb2 != NULL) {
+                /* send to wireless media */
+                skb2->protocol = __constant_htons(ETH_P_802_3);
+                skb2->mac.raw = skb2->nh.raw = skb2->data;
+                /* skb2->nh.raw = skb2->data + ETH_HLEN; */
+                skb2->dev = dev;
+                dev_queue_xmit(skb2);
+        }
+
+        if (skb) {
+                skb->protocol = eth_type_trans(skb, dev);
+                memset(skb->cb, 0, sizeof(skb->cb));
+                skb->dev = dev;
+                netif_rx(skb);
+        }
+
+ rx_exit:
+        if (sta)
+                hostap_handle_sta_release(sta);
+        return;
+
+ rx_dropped:
+        dev_kfree_skb(skb);
+
+        stats->rx_dropped++;
+        goto rx_exit;
+}
+
+
+EXPORT_SYMBOL(hostap_80211_rx);
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
new file mode 100644
index 000000000000..6358015f6526
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -0,0 +1,524 @@
+void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)
+{
+        struct ieee80211_hdr *hdr;
+        u16 fc;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+
+        printk(KERN_DEBUG "%s: TX len=%d jiffies=%ld\n",
+               name, skb->len, jiffies);
+
+        if (skb->len < 2)
+                return;
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        printk(KERN_DEBUG "   FC=0x%04x (type=%d:%d)%s%s",
+               fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4,
+               fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
+               fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
+
+        if (skb->len < IEEE80211_DATA_HDR3_LEN) {
+                printk("\n");
+                return;
+        }
+
+        printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
+               le16_to_cpu(hdr->seq_ctl));
+
+        printk(KERN_DEBUG "   A1=" MACSTR " A2=" MACSTR " A3=" MACSTR,
+               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), MAC2STR(hdr->addr3));
+        if (skb->len >= 30)
+                printk(" A4=" MACSTR, MAC2STR(hdr->addr4));
+        printk("\n");
+}
+
+
+/* hard_start_xmit function for data interfaces (wlan#, wlan#wds#, wlan#sta)
+ * Convert Ethernet header into a suitable IEEE 802.11 header depending on
+ * device configuration. */
+int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int need_headroom, need_tailroom = 0;
+        struct ieee80211_hdr hdr;
+        u16 fc, ethertype = 0;
+        enum {
+                WDS_NO = 0, WDS_OWN_FRAME, WDS_COMPLIANT_FRAME
+        } use_wds = WDS_NO;
+        u8 *encaps_data;
+        int hdr_len, encaps_len, skip_header_bytes;
+        int to_assoc_ap = 0;
+        struct hostap_skb_tx_data *meta;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (skb->len < ETH_HLEN) {
+                printk(KERN_DEBUG "%s: hostap_data_start_xmit: short skb "
+                       "(len=%d)\n", dev->name, skb->len);
+                kfree_skb(skb);
+                return 0;
+        }
+
+        if (local->ddev != dev) {
+                use_wds = (local->iw_mode == IW_MODE_MASTER &&
+                           !(local->wds_type & HOSTAP_WDS_STANDARD_FRAME)) ?
+                        WDS_OWN_FRAME : WDS_COMPLIANT_FRAME;
+                if (dev == local->stadev) {
+                        to_assoc_ap = 1;
+                        use_wds = WDS_NO;
+                } else if (dev == local->apdev) {
+                        printk(KERN_DEBUG "%s: prism2_tx: trying to use "
+                               "AP device with Ethernet net dev\n", dev->name);
+                        kfree_skb(skb);
+                        return 0;
+                }
+        } else {
+                if (local->iw_mode == IW_MODE_REPEAT) {
+                        printk(KERN_DEBUG "%s: prism2_tx: trying to use "
+                               "non-WDS link in Repeater mode\n", dev->name);
+                        kfree_skb(skb);
+                        return 0;
+                } else if (local->iw_mode == IW_MODE_INFRA &&
+                           (local->wds_type & HOSTAP_WDS_AP_CLIENT) &&
+                           memcmp(skb->data + ETH_ALEN, dev->dev_addr,
+                                  ETH_ALEN) != 0) {
+                        /* AP client mode: send frames with foreign src addr
+                         * using 4-addr WDS frames */
+                        use_wds = WDS_COMPLIANT_FRAME;
+                }
+        }
+
+        /* Incoming skb->data: dst_addr[6], src_addr[6], proto[2], payload
+         * ==>
+         * Prism2 TX frame with 802.11 header:
+         * txdesc (address order depending on used mode; includes dst_addr and
+         * src_addr), possible encapsulation (RFC1042/Bridge-Tunnel;
+         * proto[2], payload {, possible addr4[6]} */
+
+        ethertype = (skb->data[12] << 8) | skb->data[13];
+
+        memset(&hdr, 0, sizeof(hdr));
+
+        /* Length of data after IEEE 802.11 header */
+        encaps_data = NULL;
+        encaps_len = 0;
+        skip_header_bytes = ETH_HLEN;
+        if (ethertype == ETH_P_AARP || ethertype == ETH_P_IPX) {
+                encaps_data = bridge_tunnel_header;
+                encaps_len = sizeof(bridge_tunnel_header);
+                skip_header_bytes -= 2;
+        } else if (ethertype >= 0x600) {
+                encaps_data = rfc1042_header;
+                encaps_len = sizeof(rfc1042_header);
+                skip_header_bytes -= 2;
+        }
+
+        fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;
+        hdr_len = IEEE80211_DATA_HDR3_LEN;
+
+        if (use_wds != WDS_NO) {
+                /* Note! Prism2 station firmware has problems with sending real
+                 * 802.11 frames with four addresses; until these problems can
+                 * be fixed or worked around, 4-addr frames needed for WDS are
+                 * using incompatible format: FromDS flag is not set and the
+                 * fourth address is added after the frame payload; it is
+                 * assumed, that the receiving station knows how to handle this
+                 * frame format */
+
+                if (use_wds == WDS_COMPLIANT_FRAME) {
+                        fc |= IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS;
+                        /* From&To DS: Addr1 = RA, Addr2 = TA, Addr3 = DA,
+                         * Addr4 = SA */
+                        memcpy(&hdr.addr4, skb->data + ETH_ALEN, ETH_ALEN);
+                        hdr_len += ETH_ALEN;
+                } else {
+                        /* bogus 4-addr format to workaround Prism2 station
+                         * f/w bug */
+                        fc |= IEEE80211_FCTL_TODS;
+                        /* From DS: Addr1 = DA (used as RA),
+                         * Addr2 = BSSID (used as TA), Addr3 = SA (used as DA),
+                         */
+
+                        /* SA from skb->data + ETH_ALEN will be added after
+                         * frame payload; use hdr.addr4 as a temporary buffer
+                         */
+                        memcpy(&hdr.addr4, skb->data + ETH_ALEN, ETH_ALEN);
+                        need_tailroom += ETH_ALEN;
+                }
+
+                /* send broadcast and multicast frames to broadcast RA, if
+                 * configured; otherwise, use unicast RA of the WDS link */
+                if ((local->wds_type & HOSTAP_WDS_BROADCAST_RA) &&
+                    skb->data[0] & 0x01)
+                        memset(&hdr.addr1, 0xff, ETH_ALEN);
+                else if (iface->type == HOSTAP_INTERFACE_WDS)
+                        memcpy(&hdr.addr1, iface->u.wds.remote_addr,
+                               ETH_ALEN);
+                else
+                        memcpy(&hdr.addr1, local->bssid, ETH_ALEN);
+                memcpy(&hdr.addr2, dev->dev_addr, ETH_ALEN);
+                memcpy(&hdr.addr3, skb->data, ETH_ALEN);
+        } else if (local->iw_mode == IW_MODE_MASTER && !to_assoc_ap) {
+                fc |= IEEE80211_FCTL_FROMDS;
+                /* From DS: Addr1 = DA, Addr2 = BSSID, Addr3 = SA */
+                memcpy(&hdr.addr1, skb->data, ETH_ALEN);
+                memcpy(&hdr.addr2, dev->dev_addr, ETH_ALEN);
+                memcpy(&hdr.addr3, skb->data + ETH_ALEN, ETH_ALEN);
+        } else if (local->iw_mode == IW_MODE_INFRA || to_assoc_ap) {
+                fc |= IEEE80211_FCTL_TODS;
+                /* To DS: Addr1 = BSSID, Addr2 = SA, Addr3 = DA */
+                memcpy(&hdr.addr1, to_assoc_ap ?
+                       local->assoc_ap_addr : local->bssid, ETH_ALEN);
+                memcpy(&hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);
+                memcpy(&hdr.addr3, skb->data, ETH_ALEN);
+        } else if (local->iw_mode == IW_MODE_ADHOC) {
+                /* not From/To DS: Addr1 = DA, Addr2 = SA, Addr3 = BSSID */
+                memcpy(&hdr.addr1, skb->data, ETH_ALEN);
+                memcpy(&hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN);
+                memcpy(&hdr.addr3, local->bssid, ETH_ALEN);
+        }
+
+        hdr.frame_ctl = cpu_to_le16(fc);
+
+        skb_pull(skb, skip_header_bytes);
+        need_headroom = local->func->need_tx_headroom + hdr_len + encaps_len;
+        if (skb_tailroom(skb) < need_tailroom) {
+                skb = skb_unshare(skb, GFP_ATOMIC);
+                if (skb == NULL) {
+                        iface->stats.tx_dropped++;
+                        return 0;
+                }
+                if (pskb_expand_head(skb, need_headroom, need_tailroom,
+                                     GFP_ATOMIC)) {
+                        kfree_skb(skb);
+                        iface->stats.tx_dropped++;
+                        return 0;
+                }
+        } else if (skb_headroom(skb) < need_headroom) {
+                struct sk_buff *tmp = skb;
+                skb = skb_realloc_headroom(skb, need_headroom);
+                kfree_skb(tmp);
+                if (skb == NULL) {
+                        iface->stats.tx_dropped++;
+                        return 0;
+                }
+        } else {
+                skb = skb_unshare(skb, GFP_ATOMIC);
+                if (skb == NULL) {
+                        iface->stats.tx_dropped++;
+                        return 0;
+                }
+        }
+
+        if (encaps_data)
+                memcpy(skb_push(skb, encaps_len), encaps_data, encaps_len);
+        memcpy(skb_push(skb, hdr_len), &hdr, hdr_len);
+        if (use_wds == WDS_OWN_FRAME) {
+                memcpy(skb_put(skb, ETH_ALEN), &hdr.addr4, ETH_ALEN);
+        }
+
+        iface->stats.tx_packets++;
+        iface->stats.tx_bytes += skb->len;
+
+        skb->mac.raw = skb->data;
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        memset(meta, 0, sizeof(*meta));
+        meta->magic = HOSTAP_SKB_TX_DATA_MAGIC;
+        if (use_wds)
+                meta->flags |= HOSTAP_TX_FLAGS_WDS;
+        meta->ethertype = ethertype;
+        meta->iface = iface;
+
+        /* Send IEEE 802.11 encapsulated frame using the master radio device */
+        skb->dev = local->dev;
+        dev_queue_xmit(skb);
+        return 0;
+}
+
+
+/* hard_start_xmit function for hostapd wlan#ap interfaces */
+int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hostap_skb_tx_data *meta;
+        struct ieee80211_hdr *hdr;
+        u16 fc;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (skb->len < 10) {
+                printk(KERN_DEBUG "%s: hostap_mgmt_start_xmit: short skb "
+                       "(len=%d)\n", dev->name, skb->len);
+                kfree_skb(skb);
+                return 0;
+        }
+
+        iface->stats.tx_packets++;
+        iface->stats.tx_bytes += skb->len;
+
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        memset(meta, 0, sizeof(*meta));
+        meta->magic = HOSTAP_SKB_TX_DATA_MAGIC;
+        meta->iface = iface;
+
+        if (skb->len >= IEEE80211_DATA_HDR3_LEN + sizeof(rfc1042_header) + 2) {
+                hdr = (struct ieee80211_hdr *) skb->data;
+                fc = le16_to_cpu(hdr->frame_ctl);
+                if (WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA &&
+                    WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_DATA) {
+                        u8 *pos = &skb->data[IEEE80211_DATA_HDR3_LEN +
+                                             sizeof(rfc1042_header)];
+                        meta->ethertype = (pos[0] << 8) | pos[1];
+                }
+        }
+
+        /* Send IEEE 802.11 encapsulated frame using the master radio device */
+        skb->dev = local->dev;
+        dev_queue_xmit(skb);
+        return 0;
+}
+
+
+/* Called only from software IRQ */
+struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
+                                   struct ieee80211_crypt_data *crypt)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct ieee80211_hdr *hdr;
+        u16 fc;
+        int hdr_len, res;
+
+        iface = netdev_priv(skb->dev);
+        local = iface->local;
+
+        if (skb->len < IEEE80211_DATA_HDR3_LEN) {
+                kfree_skb(skb);
+                return NULL;
+        }
+
+        if (local->tkip_countermeasures &&
+            crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
+                hdr = (struct ieee80211_hdr *) skb->data;
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
+                               "TX packet to " MACSTR "\n",
+                               local->dev->name, MAC2STR(hdr->addr1));
+                }
+                kfree_skb(skb);
+                return NULL;
+        }
+
+        skb = skb_unshare(skb, GFP_ATOMIC);
+        if (skb == NULL)
+                return NULL;
+
+        if ((skb_headroom(skb) < crypt->ops->extra_prefix_len ||
+             skb_tailroom(skb) < crypt->ops->extra_postfix_len) &&
+            pskb_expand_head(skb, crypt->ops->extra_prefix_len,
+                             crypt->ops->extra_postfix_len, GFP_ATOMIC)) {
+                kfree_skb(skb);
+                return NULL;
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+        hdr_len = hostap_80211_get_hdrlen(fc);
+
+        /* Host-based IEEE 802.11 fragmentation for TX is not yet supported, so
+         * call both MSDU and MPDU encryption functions from here. */
+        atomic_inc(&crypt->refcnt);
+        res = 0;
+        if (crypt->ops->encrypt_msdu)
+                res = crypt->ops->encrypt_msdu(skb, hdr_len, crypt->priv);
+        if (res == 0 && crypt->ops->encrypt_mpdu)
+                res = crypt->ops->encrypt_mpdu(skb, hdr_len, crypt->priv);
+        atomic_dec(&crypt->refcnt);
+        if (res < 0) {
+                kfree_skb(skb);
+                return NULL;
+        }
+
+        return skb;
+}
+
+
+/* hard_start_xmit function for master radio interface wifi#.
+ * AP processing (TX rate control, power save buffering, etc.).
+ * Use hardware TX function to send the frame. */
+int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret = 1;
+        u16 fc;
+        struct hostap_tx_data tx;
+        ap_tx_ret tx_ret;
+        struct hostap_skb_tx_data *meta;
+        int no_encrypt = 0;
+        struct ieee80211_hdr *hdr;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        tx.skb = skb;
+        tx.sta_ptr = NULL;
+
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        if (meta->magic != HOSTAP_SKB_TX_DATA_MAGIC) {
+                printk(KERN_DEBUG "%s: invalid skb->cb magic (0x%08x, "
+                       "expected 0x%08x)\n",
+                       dev->name, meta->magic, HOSTAP_SKB_TX_DATA_MAGIC);
+                ret = 0;
+                iface->stats.tx_dropped++;
+                goto fail;
+        }
+
+        if (local->host_encrypt) {
+                /* Set crypt to default algorithm and key; will be replaced in
+                 * AP code if STA has own alg/key */
+                tx.crypt = local->crypt[local->tx_keyidx];
+                tx.host_encrypt = 1;
+        } else {
+                tx.crypt = NULL;
+                tx.host_encrypt = 0;
+        }
+
+        if (skb->len < 24) {
+                printk(KERN_DEBUG "%s: hostap_master_start_xmit: short skb "
+                       "(len=%d)\n", dev->name, skb->len);
+                ret = 0;
+                iface->stats.tx_dropped++;
+                goto fail;
+        }
+
+        /* FIX (?):
+         * Wi-Fi 802.11b test plan suggests that AP should ignore power save
+         * bit in authentication and (re)association frames and assume tha
+         * STA remains awake for the response. */
+        tx_ret = hostap_handle_sta_tx(local, &tx);
+        skb = tx.skb;
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+        switch (tx_ret) {
+        case AP_TX_CONTINUE:
+                break;
+        case AP_TX_CONTINUE_NOT_AUTHORIZED:
+                if (local->ieee_802_1x &&
+                    WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA &&
+                    meta->ethertype != ETH_P_PAE &&
+                    !(meta->flags & HOSTAP_TX_FLAGS_WDS)) {
+                        printk(KERN_DEBUG "%s: dropped frame to unauthorized "
+                               "port (IEEE 802.1X): ethertype=0x%04x\n",
+                               dev->name, meta->ethertype);
+                        hostap_dump_tx_80211(dev->name, skb);
+
+                        ret = 0; /* drop packet */
+                        iface->stats.tx_dropped++;
+                        goto fail;
+                }
+                break;
+        case AP_TX_DROP:
+                ret = 0; /* drop packet */
+                iface->stats.tx_dropped++;
+                goto fail;
+        case AP_TX_RETRY:
+                goto fail;
+        case AP_TX_BUFFERED:
+                /* do not free skb here, it will be freed when the
+                 * buffered frame is sent/timed out */
+                ret = 0;
+                goto tx_exit;
+        }
+
+        /* Request TX callback if protocol version is 2 in 802.11 header;
+         * this version 2 is a special case used between hostapd and kernel
+         * driver */
+        if (((fc & IEEE80211_FCTL_VERS) == BIT(1)) &&
+            local->ap && local->ap->tx_callback_idx && meta->tx_cb_idx == 0) {
+                meta->tx_cb_idx = local->ap->tx_callback_idx;
+
+                /* remove special version from the frame header */
+                fc &= ~IEEE80211_FCTL_VERS;
+                hdr->frame_ctl = cpu_to_le16(fc);
+        }
+
+        if (WLAN_FC_GET_TYPE(fc) != IEEE80211_FTYPE_DATA) {
+                no_encrypt = 1;
+                tx.crypt = NULL;
+        }
+
+        if (local->ieee_802_1x && meta->ethertype == ETH_P_PAE && tx.crypt &&
+            !(fc & IEEE80211_FCTL_VERS)) {
+                no_encrypt = 1;
+                PDEBUG(DEBUG_EXTRA2, "%s: TX: IEEE 802.1X - passing "
+                       "unencrypted EAPOL frame\n", dev->name);
+                tx.crypt = NULL; /* no encryption for IEEE 802.1X frames */
+        }
+
+        if (tx.crypt && (!tx.crypt->ops || !tx.crypt->ops->encrypt_mpdu))
+                tx.crypt = NULL;
+        else if ((tx.crypt || local->crypt[local->tx_keyidx]) && !no_encrypt) {
+                /* Add ISWEP flag both for firmware and host based encryption
+                 */
+                fc |= IEEE80211_FCTL_PROTECTED;
+                hdr->frame_ctl = cpu_to_le16(fc);
+        } else if (local->drop_unencrypted &&
+                   WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA &&
+                   meta->ethertype != ETH_P_PAE) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: dropped unencrypted TX data "
+                               "frame (drop_unencrypted=1)\n", dev->name);
+                }
+                iface->stats.tx_dropped++;
+                ret = 0;
+                goto fail;
+        }
+
+        if (tx.crypt) {
+                skb = hostap_tx_encrypt(skb, tx.crypt);
+                if (skb == NULL) {
+                        printk(KERN_DEBUG "%s: TX - encryption failed\n",
+                               dev->name);
+                        ret = 0;
+                        goto fail;
+                }
+                meta = (struct hostap_skb_tx_data *) skb->cb;
+                if (meta->magic != HOSTAP_SKB_TX_DATA_MAGIC) {
+                        printk(KERN_DEBUG "%s: invalid skb->cb magic (0x%08x, "
+                               "expected 0x%08x) after hostap_tx_encrypt\n",
+                               dev->name, meta->magic,
+                               HOSTAP_SKB_TX_DATA_MAGIC);
+                        ret = 0;
+                        iface->stats.tx_dropped++;
+                        goto fail;
+                }
+        }
+
+        if (local->func->tx == NULL || local->func->tx(skb, dev)) {
+                ret = 0;
+                iface->stats.tx_dropped++;
+        } else {
+                ret = 0;
+                iface->stats.tx_packets++;
+                iface->stats.tx_bytes += skb->len;
+        }
+
+ fail:
+        if (!ret && skb)
+                dev_kfree_skb(skb);
+ tx_exit:
+        if (tx.sta_ptr)
+                hostap_handle_sta_release(tx.sta_ptr);
+        return ret;
+}
+
+
+EXPORT_SYMBOL(hostap_dump_tx_80211);
+EXPORT_SYMBOL(hostap_tx_encrypt);
+EXPORT_SYMBOL(hostap_master_start_xmit);
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
new file mode 100644
index 000000000000..930cef8367f2
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -0,0 +1,3288 @@
+/*
+ * Intersil Prism2 driver with Host AP (software access point) support
+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+ * <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * This file is to be included into hostap.c when S/W AP functionality is
+ * compiled.
+ *
+ * AP:  FIX:
+ * - if unicast Class 2 (assoc,reassoc,disassoc) frame received from
+ *   unauthenticated STA, send deauth. frame (8802.11: 5.5)
+ * - if unicast Class 3 (data with to/from DS,deauth,pspoll) frame received
+ *   from authenticated, but unassoc STA, send disassoc frame (8802.11: 5.5)
+ * - if unicast Class 3 received from unauthenticated STA, send deauth. frame
+ *   (8802.11: 5.5)
+ */
+
+static int other_ap_policy[MAX_PARM_DEVICES] = { AP_OTHER_AP_SKIP_ALL,
+                                                 DEF_INTS };
+module_param_array(other_ap_policy, int, NULL, 0444);
+MODULE_PARM_DESC(other_ap_policy, "Other AP beacon monitoring policy (0-3)");
+
+static int ap_max_inactivity[MAX_PARM_DEVICES] = { AP_MAX_INACTIVITY_SEC,
+                                                   DEF_INTS };
+module_param_array(ap_max_inactivity, int, NULL, 0444);
+MODULE_PARM_DESC(ap_max_inactivity, "AP timeout (in seconds) for station "
+                 "inactivity");
+
+static int ap_bridge_packets[MAX_PARM_DEVICES] = { 1, DEF_INTS };
+module_param_array(ap_bridge_packets, int, NULL, 0444);
+MODULE_PARM_DESC(ap_bridge_packets, "Bridge packets directly between "
+                 "stations");
+
+static int autom_ap_wds[MAX_PARM_DEVICES] = { 0, DEF_INTS };
+module_param_array(autom_ap_wds, int, NULL, 0444);
+MODULE_PARM_DESC(autom_ap_wds, "Add WDS connections to other APs "
+                 "automatically");
+
+
+static struct sta_info* ap_get_sta(struct ap_data *ap, u8 *sta);
+static void hostap_event_expired_sta(struct net_device *dev,
+                                     struct sta_info *sta);
+static void handle_add_proc_queue(void *data);
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+static void handle_wds_oper_queue(void *data);
+static void prism2_send_mgmt(struct net_device *dev,
+                             u16 type_subtype, char *body,
+                             int body_len, u8 *addr, u16 tx_cb_idx);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+static int ap_debug_proc_read(char *page, char **start, off_t off,
+                              int count, int *eof, void *data)
+{
+        char *p = page;
+        struct ap_data *ap = (struct ap_data *) data;
+
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+
+        p += sprintf(p, "BridgedUnicastFrames=%u\n", ap->bridged_unicast);
+        p += sprintf(p, "BridgedMulticastFrames=%u\n", ap->bridged_multicast);
+        p += sprintf(p, "max_inactivity=%u\n", ap->max_inactivity / HZ);
+        p += sprintf(p, "bridge_packets=%u\n", ap->bridge_packets);
+        p += sprintf(p, "nullfunc_ack=%u\n", ap->nullfunc_ack);
+        p += sprintf(p, "autom_ap_wds=%u\n", ap->autom_ap_wds);
+        p += sprintf(p, "auth_algs=%u\n", ap->local->auth_algs);
+        p += sprintf(p, "tx_drop_nonassoc=%u\n", ap->tx_drop_nonassoc);
+
+        return (p - page);
+}
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+
+
+static void ap_sta_hash_add(struct ap_data *ap, struct sta_info *sta)
+{
+        sta->hnext = ap->sta_hash[STA_HASH(sta->addr)];
+        ap->sta_hash[STA_HASH(sta->addr)] = sta;
+}
+
+static void ap_sta_hash_del(struct ap_data *ap, struct sta_info *sta)
+{
+        struct sta_info *s;
+
+        s = ap->sta_hash[STA_HASH(sta->addr)];
+        if (s == NULL) return;
+        if (memcmp(s->addr, sta->addr, ETH_ALEN) == 0) {
+                ap->sta_hash[STA_HASH(sta->addr)] = s->hnext;
+                return;
+        }
+
+        while (s->hnext != NULL && memcmp(s->hnext->addr, sta->addr, ETH_ALEN)
+               != 0)
+                s = s->hnext;
+        if (s->hnext != NULL)
+                s->hnext = s->hnext->hnext;
+        else
+                printk("AP: could not remove STA " MACSTR " from hash table\n",
+                       MAC2STR(sta->addr));
+}
+
+static void ap_free_sta(struct ap_data *ap, struct sta_info *sta)
+{
+        if (sta->ap && sta->local)
+                hostap_event_expired_sta(sta->local->dev, sta);
+
+        if (ap->proc != NULL) {
+                char name[20];
+                sprintf(name, MACSTR, MAC2STR(sta->addr));
+                remove_proc_entry(name, ap->proc);
+        }
+
+        if (sta->crypt) {
+                sta->crypt->ops->deinit(sta->crypt->priv);
+                kfree(sta->crypt);
+                sta->crypt = NULL;
+        }
+
+        skb_queue_purge(&sta->tx_buf);
+
+        ap->num_sta--;
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        if (sta->aid > 0)
+                ap->sta_aid[sta->aid - 1] = NULL;
+
+        if (!sta->ap && sta->u.sta.challenge)
+                kfree(sta->u.sta.challenge);
+        del_timer(&sta->timer);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        kfree(sta);
+}
+
+
+static void hostap_set_tim(local_info_t *local, int aid, int set)
+{
+        if (local->func->set_tim)
+                local->func->set_tim(local->dev, aid, set);
+}
+
+
+static void hostap_event_new_sta(struct net_device *dev, struct sta_info *sta)
+{
+        union iwreq_data wrqu;
+        memset(&wrqu, 0, sizeof(wrqu));
+        memcpy(wrqu.addr.sa_data, sta->addr, ETH_ALEN);
+        wrqu.addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(dev, IWEVREGISTERED, &wrqu, NULL);
+}
+
+
+static void hostap_event_expired_sta(struct net_device *dev,
+                                     struct sta_info *sta)
+{
+        union iwreq_data wrqu;
+        memset(&wrqu, 0, sizeof(wrqu));
+        memcpy(wrqu.addr.sa_data, sta->addr, ETH_ALEN);
+        wrqu.addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(dev, IWEVEXPIRED, &wrqu, NULL);
+}
+
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+
+static void ap_handle_timer(unsigned long data)
+{
+        struct sta_info *sta = (struct sta_info *) data;
+        local_info_t *local;
+        struct ap_data *ap;
+        unsigned long next_time = 0;
+        int was_assoc;
+
+        if (sta == NULL || sta->local == NULL || sta->local->ap == NULL) {
+                PDEBUG(DEBUG_AP, "ap_handle_timer() called with NULL data\n");
+                return;
+        }
+
+        local = sta->local;
+        ap = local->ap;
+        was_assoc = sta->flags & WLAN_STA_ASSOC;
+
+        if (atomic_read(&sta->users) != 0)
+                next_time = jiffies + HZ;
+        else if ((sta->flags & WLAN_STA_PERM) && !(sta->flags & WLAN_STA_AUTH))
+                next_time = jiffies + ap->max_inactivity;
+
+        if (time_before(jiffies, sta->last_rx + ap->max_inactivity)) {
+                /* station activity detected; reset timeout state */
+                sta->timeout_next = STA_NULLFUNC;
+                next_time = sta->last_rx + ap->max_inactivity;
+        } else if (sta->timeout_next == STA_DISASSOC &&
+                   !(sta->flags & WLAN_STA_PENDING_POLL)) {
+                /* STA ACKed data nullfunc frame poll */
+                sta->timeout_next = STA_NULLFUNC;
+                next_time = jiffies + ap->max_inactivity;
+        }
+
+        if (next_time) {
+                sta->timer.expires = next_time;
+                add_timer(&sta->timer);
+                return;
+        }
+
+        if (sta->ap)
+                sta->timeout_next = STA_DEAUTH;
+
+        if (sta->timeout_next == STA_DEAUTH && !(sta->flags & WLAN_STA_PERM)) {
+                spin_lock(&ap->sta_table_lock);
+                ap_sta_hash_del(ap, sta);
+                list_del(&sta->list);
+                spin_unlock(&ap->sta_table_lock);
+                sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
+        } else if (sta->timeout_next == STA_DISASSOC)
+                sta->flags &= ~WLAN_STA_ASSOC;
+
+        if (was_assoc && !(sta->flags & WLAN_STA_ASSOC) && !sta->ap)
+                hostap_event_expired_sta(local->dev, sta);
+
+        if (sta->timeout_next == STA_DEAUTH && sta->aid > 0 &&
+            !skb_queue_empty(&sta->tx_buf)) {
+                hostap_set_tim(local, sta->aid, 0);
+                sta->flags &= ~WLAN_STA_TIM;
+        }
+
+        if (sta->ap) {
+                if (ap->autom_ap_wds) {
+                        PDEBUG(DEBUG_AP, "%s: removing automatic WDS "
+                               "connection to AP " MACSTR "\n",
+                               local->dev->name, MAC2STR(sta->addr));
+                        hostap_wds_link_oper(local, sta->addr, WDS_DEL);
+                }
+        } else if (sta->timeout_next == STA_NULLFUNC) {
+                /* send data frame to poll STA and check whether this frame
+                 * is ACKed */
+                /* FIX: IEEE80211_STYPE_NULLFUNC would be more appropriate, but
+                 * it is apparently not retried so TX Exc events are not
+                 * received for it */
+                sta->flags |= WLAN_STA_PENDING_POLL;
+                prism2_send_mgmt(local->dev, IEEE80211_FTYPE_DATA |
+                                 IEEE80211_STYPE_DATA, NULL, 0,
+                                 sta->addr, ap->tx_callback_poll);
+        } else {
+                int deauth = sta->timeout_next == STA_DEAUTH;
+                u16 resp;
+                PDEBUG(DEBUG_AP, "%s: sending %s info to STA " MACSTR
+                       "(last=%lu, jiffies=%lu)\n",
+                       local->dev->name,
+                       deauth ? "deauthentication" : "disassociation",
+                       MAC2STR(sta->addr), sta->last_rx, jiffies);
+
+                resp = cpu_to_le16(deauth ? WLAN_REASON_PREV_AUTH_NOT_VALID :
+                                   WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
+                prism2_send_mgmt(local->dev, IEEE80211_FTYPE_MGMT |
+                                 (deauth ? IEEE80211_STYPE_DEAUTH :
+                                  IEEE80211_STYPE_DISASSOC),
+                                 (char *) &resp, 2, sta->addr, 0);
+        }
+
+        if (sta->timeout_next == STA_DEAUTH) {
+                if (sta->flags & WLAN_STA_PERM) {
+                        PDEBUG(DEBUG_AP, "%s: STA " MACSTR " would have been "
+                               "removed, but it has 'perm' flag\n",
+                               local->dev->name, MAC2STR(sta->addr));
+                } else
+                        ap_free_sta(ap, sta);
+                return;
+        }
+
+        if (sta->timeout_next == STA_NULLFUNC) {
+                sta->timeout_next = STA_DISASSOC;
+                sta->timer.expires = jiffies + AP_DISASSOC_DELAY;
+        } else {
+                sta->timeout_next = STA_DEAUTH;
+                sta->timer.expires = jiffies + AP_DEAUTH_DELAY;
+        }
+
+        add_timer(&sta->timer);
+}
+
+
+void hostap_deauth_all_stas(struct net_device *dev, struct ap_data *ap,
+                            int resend)
+{
+        u8 addr[ETH_ALEN];
+        u16 resp;
+        int i;
+
+        PDEBUG(DEBUG_AP, "%s: Deauthenticate all stations\n", dev->name);
+        memset(addr, 0xff, ETH_ALEN);
+
+        resp = __constant_cpu_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);
+
+        /* deauth message sent; try to resend it few times; the message is
+         * broadcast, so it may be delayed until next DTIM; there is not much
+         * else we can do at this point since the driver is going to be shut
+         * down */
+        for (i = 0; i < 5; i++) {
+                prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT |
+                                 IEEE80211_STYPE_DEAUTH,
+                                 (char *) &resp, 2, addr, 0);
+
+                if (!resend || ap->num_sta <= 0)
+                        return;
+
+                mdelay(50);
+        }
+}
+
+
+static int ap_control_proc_read(char *page, char **start, off_t off,
+                                int count, int *eof, void *data)
+{
+        char *p = page;
+        struct ap_data *ap = (struct ap_data *) data;
+        char *policy_txt;
+        struct list_head *ptr;
+        struct mac_entry *entry;
+
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+
+        switch (ap->mac_restrictions.policy) {
+        case MAC_POLICY_OPEN:
+                policy_txt = "open";
+                break;
+        case MAC_POLICY_ALLOW:
+                policy_txt = "allow";
+                break;
+        case MAC_POLICY_DENY:
+                policy_txt = "deny";
+                break;
+        default:
+                policy_txt = "unknown";
+                break;
+        };
+        p += sprintf(p, "MAC policy: %s\n", policy_txt);
+        p += sprintf(p, "MAC entries: %u\n", ap->mac_restrictions.entries);
+        p += sprintf(p, "MAC list:\n");
+        spin_lock_bh(&ap->mac_restrictions.lock);
+        for (ptr = ap->mac_restrictions.mac_list.next;
+             ptr != &ap->mac_restrictions.mac_list; ptr = ptr->next) {
+                if (p - page > PAGE_SIZE - 80) {
+                        p += sprintf(p, "All entries did not fit one page.\n");
+                        break;
+                }
+
+                entry = list_entry(ptr, struct mac_entry, list);
+                p += sprintf(p, MACSTR "\n", MAC2STR(entry->addr));
+        }
+        spin_unlock_bh(&ap->mac_restrictions.lock);
+
+        return (p - page);
+}
+
+
+static int ap_control_add_mac(struct mac_restrictions *mac_restrictions,
+                              u8 *mac)
+{
+        struct mac_entry *entry;
+
+        entry = kmalloc(sizeof(struct mac_entry), GFP_KERNEL);
+        if (entry == NULL)
+                return -1;
+
+        memcpy(entry->addr, mac, ETH_ALEN);
+
+        spin_lock_bh(&mac_restrictions->lock);
+        list_add_tail(&entry->list, &mac_restrictions->mac_list);
+        mac_restrictions->entries++;
+        spin_unlock_bh(&mac_restrictions->lock);
+
+        return 0;
+}
+
+
+static int ap_control_del_mac(struct mac_restrictions *mac_restrictions,
+                              u8 *mac)
+{
+        struct list_head *ptr;
+        struct mac_entry *entry;
+
+        spin_lock_bh(&mac_restrictions->lock);
+        for (ptr = mac_restrictions->mac_list.next;
+             ptr != &mac_restrictions->mac_list; ptr = ptr->next) {
+                entry = list_entry(ptr, struct mac_entry, list);
+
+                if (memcmp(entry->addr, mac, ETH_ALEN) == 0) {
+                        list_del(ptr);
+                        kfree(entry);
+                        mac_restrictions->entries--;
+                        spin_unlock_bh(&mac_restrictions->lock);
+                        return 0;
+                }
+        }
+        spin_unlock_bh(&mac_restrictions->lock);
+        return -1;
+}
+
+
+static int ap_control_mac_deny(struct mac_restrictions *mac_restrictions,
+                               u8 *mac)
+{
+        struct list_head *ptr;
+        struct mac_entry *entry;
+        int found = 0;
+
+        if (mac_restrictions->policy == MAC_POLICY_OPEN)
+                return 0;
+
+        spin_lock_bh(&mac_restrictions->lock);
+        for (ptr = mac_restrictions->mac_list.next;
+             ptr != &mac_restrictions->mac_list; ptr = ptr->next) {
+                entry = list_entry(ptr, struct mac_entry, list);
+
+                if (memcmp(entry->addr, mac, ETH_ALEN) == 0) {
+                        found = 1;
+                        break;
+                }
+        }
+        spin_unlock_bh(&mac_restrictions->lock);
+
+        if (mac_restrictions->policy == MAC_POLICY_ALLOW)
+                return !found;
+        else
+                return found;
+}
+
+
+static void ap_control_flush_macs(struct mac_restrictions *mac_restrictions)
+{
+        struct list_head *ptr, *n;
+        struct mac_entry *entry;
+
+        if (mac_restrictions->entries == 0)
+                return;
+
+        spin_lock_bh(&mac_restrictions->lock);
+        for (ptr = mac_restrictions->mac_list.next, n = ptr->next;
+             ptr != &mac_restrictions->mac_list;
+             ptr = n, n = ptr->next) {
+                entry = list_entry(ptr, struct mac_entry, list);
+                list_del(ptr);
+                kfree(entry);
+        }
+        mac_restrictions->entries = 0;
+        spin_unlock_bh(&mac_restrictions->lock);
+}
+
+
+static int ap_control_kick_mac(struct ap_data *ap, struct net_device *dev,
+                               u8 *mac)
+{
+        struct sta_info *sta;
+        u16 resp;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, mac);
+        if (sta) {
+                ap_sta_hash_del(ap, sta);
+                list_del(&sta->list);
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (!sta)
+                return -EINVAL;
+
+        resp = cpu_to_le16(WLAN_REASON_PREV_AUTH_NOT_VALID);
+        prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_DEAUTH,
+                         (char *) &resp, 2, sta->addr, 0);
+
+        if ((sta->flags & WLAN_STA_ASSOC) && !sta->ap)
+                hostap_event_expired_sta(dev, sta);
+
+        ap_free_sta(ap, sta);
+
+        return 0;
+}
+
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+static void ap_control_kickall(struct ap_data *ap)
+{
+        struct list_head *ptr, *n;
+        struct sta_info *sta;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        for (ptr = ap->sta_list.next, n = ptr->next; ptr != &ap->sta_list;
+             ptr = n, n = ptr->next) {
+                sta = list_entry(ptr, struct sta_info, list);
+                ap_sta_hash_del(ap, sta);
+                list_del(&sta->list);
+                if ((sta->flags & WLAN_STA_ASSOC) && !sta->ap && sta->local)
+                        hostap_event_expired_sta(sta->local->dev, sta);
+                ap_free_sta(ap, sta);
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+}
+
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+
+#define PROC_LIMIT (PAGE_SIZE - 80)
+
+static int prism2_ap_proc_read(char *page, char **start, off_t off,
+                               int count, int *eof, void *data)
+{
+        char *p = page;
+        struct ap_data *ap = (struct ap_data *) data;
+        struct list_head *ptr;
+        int i;
+
+        if (off > PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        p += sprintf(p, "# BSSID CHAN SIGNAL NOISE RATE SSID FLAGS\n");
+        spin_lock_bh(&ap->sta_table_lock);
+        for (ptr = ap->sta_list.next; ptr != &ap->sta_list; ptr = ptr->next) {
+                struct sta_info *sta = (struct sta_info *) ptr;
+
+                if (!sta->ap)
+                        continue;
+
+                p += sprintf(p, MACSTR " %d %d %d %d '", MAC2STR(sta->addr),
+                             sta->u.ap.channel, sta->last_rx_signal,
+                             sta->last_rx_silence, sta->last_rx_rate);
+                for (i = 0; i < sta->u.ap.ssid_len; i++)
+                        p += sprintf(p, ((sta->u.ap.ssid[i] >= 32 &&
+                                          sta->u.ap.ssid[i] < 127) ?
+                                         "%c" : "<%02x>"),
+                                     sta->u.ap.ssid[i]);
+                p += sprintf(p, "'");
+                if (sta->capability & WLAN_CAPABILITY_ESS)
+                        p += sprintf(p, " [ESS]");
+                if (sta->capability & WLAN_CAPABILITY_IBSS)
+                        p += sprintf(p, " [IBSS]");
+                if (sta->capability & WLAN_CAPABILITY_PRIVACY)
+                        p += sprintf(p, " [WEP]");
+                p += sprintf(p, "\n");
+
+                if ((p - page) > PROC_LIMIT) {
+                        printk(KERN_DEBUG "hostap: ap proc did not fit\n");
+                        break;
+                }
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if ((p - page) <= off) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = page + off;
+
+        return (p - page - off);
+}
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+void hostap_check_sta_fw_version(struct ap_data *ap, int sta_fw_ver)
+{
+        if (!ap)
+                return;
+
+        if (sta_fw_ver == PRISM2_FW_VER(0,8,0)) {
+                PDEBUG(DEBUG_AP, "Using data::nullfunc ACK workaround - "
+                       "firmware upgrade recommended\n");
+                ap->nullfunc_ack = 1;
+        } else
+                ap->nullfunc_ack = 0;
+
+        if (sta_fw_ver == PRISM2_FW_VER(1,4,2)) {
+                printk(KERN_WARNING "%s: Warning: secondary station firmware "
+                       "version 1.4.2 does not seem to work in Host AP mode\n",
+                       ap->local->dev->name);
+        }
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_ap_tx_cb(struct sk_buff *skb, int ok, void *data)
+{
+        struct ap_data *ap = data;
+        u16 fc;
+        struct ieee80211_hdr *hdr;
+
+        if (!ap->local->hostapd || !ap->local->apdev) {
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+
+        /* Pass the TX callback frame to the hostapd; use 802.11 header version
+         * 1 to indicate failure (no ACK) and 2 success (frame ACKed) */
+
+        fc &= ~IEEE80211_FCTL_VERS;
+        fc |= ok ? BIT(1) : BIT(0);
+        hdr->frame_ctl = cpu_to_le16(fc);
+
+        skb->dev = ap->local->apdev;
+        skb_pull(skb, hostap_80211_get_hdrlen(fc));
+        skb->pkt_type = PACKET_OTHERHOST;
+        skb->protocol = __constant_htons(ETH_P_802_2);
+        memset(skb->cb, 0, sizeof(skb->cb));
+        netif_rx(skb);
+}
+
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+/* Called only as a tasklet (software IRQ) */
+static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
+{
+        struct ap_data *ap = data;
+        struct net_device *dev = ap->local->dev;
+        struct ieee80211_hdr *hdr;
+        u16 fc, *pos, auth_alg, auth_transaction, status;
+        struct sta_info *sta = NULL;
+        char *txt = NULL;
+
+        if (ap->local->hostapd) {
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+        if (WLAN_FC_GET_TYPE(fc) != IEEE80211_FTYPE_MGMT ||
+            WLAN_FC_GET_STYPE(fc) != IEEE80211_STYPE_AUTH ||
+            skb->len < IEEE80211_MGMT_HDR_LEN + 6) {
+                printk(KERN_DEBUG "%s: hostap_ap_tx_cb_auth received invalid "
+                       "frame\n", dev->name);
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        pos = (u16 *) (skb->data + IEEE80211_MGMT_HDR_LEN);
+        auth_alg = le16_to_cpu(*pos++);
+        auth_transaction = le16_to_cpu(*pos++);
+        status = le16_to_cpu(*pos++);
+
+        if (!ok) {
+                txt = "frame was not ACKed";
+                goto done;
+        }
+
+        spin_lock(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, hdr->addr1);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock(&ap->sta_table_lock);
+
+        if (!sta) {
+                txt = "STA not found";
+                goto done;
+        }
+
+        if (status == WLAN_STATUS_SUCCESS &&
+            ((auth_alg == WLAN_AUTH_OPEN && auth_transaction == 2) ||
+             (auth_alg == WLAN_AUTH_SHARED_KEY && auth_transaction == 4))) {
+                txt = "STA authenticated";
+                sta->flags |= WLAN_STA_AUTH;
+                sta->last_auth = jiffies;
+        } else if (status != WLAN_STATUS_SUCCESS)
+                txt = "authentication failed";
+
+ done:
+        if (sta)
+                atomic_dec(&sta->users);
+        if (txt) {
+                PDEBUG(DEBUG_AP, "%s: " MACSTR " auth_cb - alg=%d trans#=%d "
+                       "status=%d - %s\n",
+                       dev->name, MAC2STR(hdr->addr1), auth_alg,
+                       auth_transaction, status, txt);
+        }
+        dev_kfree_skb(skb);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
+{
+        struct ap_data *ap = data;
+        struct net_device *dev = ap->local->dev;
+        struct ieee80211_hdr *hdr;
+        u16 fc, *pos, status;
+        struct sta_info *sta = NULL;
+        char *txt = NULL;
+
+        if (ap->local->hostapd) {
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+        if (WLAN_FC_GET_TYPE(fc) != IEEE80211_FTYPE_MGMT ||
+            (WLAN_FC_GET_STYPE(fc) != IEEE80211_STYPE_ASSOC_RESP &&
+             WLAN_FC_GET_STYPE(fc) != IEEE80211_STYPE_REASSOC_RESP) ||
+            skb->len < IEEE80211_MGMT_HDR_LEN + 4) {
+                printk(KERN_DEBUG "%s: hostap_ap_tx_cb_assoc received invalid "
+                       "frame\n", dev->name);
+                dev_kfree_skb(skb);
+                return;
+        }
+
+        if (!ok) {
+                txt = "frame was not ACKed";
+                goto done;
+        }
+
+        spin_lock(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, hdr->addr1);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock(&ap->sta_table_lock);
+
+        if (!sta) {
+                txt = "STA not found";
+                goto done;
+        }
+
+        pos = (u16 *) (skb->data + IEEE80211_MGMT_HDR_LEN);
+        pos++;
+        status = le16_to_cpu(*pos++);
+        if (status == WLAN_STATUS_SUCCESS) {
+                if (!(sta->flags & WLAN_STA_ASSOC))
+                        hostap_event_new_sta(dev, sta);
+                txt = "STA associated";
+                sta->flags |= WLAN_STA_ASSOC;
+                sta->last_assoc = jiffies;
+        } else
+                txt = "association failed";
+
+ done:
+        if (sta)
+                atomic_dec(&sta->users);
+        if (txt) {
+                PDEBUG(DEBUG_AP, "%s: " MACSTR " assoc_cb - %s\n",
+                       dev->name, MAC2STR(hdr->addr1), txt);
+        }
+        dev_kfree_skb(skb);
+}
+
+/* Called only as a tasklet (software IRQ); TX callback for poll frames used
+ * in verifying whether the STA is still present. */
+static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
+{
+        struct ap_data *ap = data;
+        struct ieee80211_hdr *hdr;
+        struct sta_info *sta;
+
+        if (skb->len < 24)
+                goto fail;
+        hdr = (struct ieee80211_hdr *) skb->data;
+        if (ok) {
+                spin_lock(&ap->sta_table_lock);
+                sta = ap_get_sta(ap, hdr->addr1);
+                if (sta)
+                        sta->flags &= ~WLAN_STA_PENDING_POLL;
+                spin_unlock(&ap->sta_table_lock);
+        } else {
+                PDEBUG(DEBUG_AP, "%s: STA " MACSTR " did not ACK activity "
+                       "poll frame\n", ap->local->dev->name,
+                       MAC2STR(hdr->addr1));
+        }
+
+ fail:
+        dev_kfree_skb(skb);
+}
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+void hostap_init_data(local_info_t *local)
+{
+        struct ap_data *ap = local->ap;
+
+        if (ap == NULL) {
+                printk(KERN_WARNING "hostap_init_data: ap == NULL\n");
+                return;
+        }
+        memset(ap, 0, sizeof(struct ap_data));
+        ap->local = local;
+
+        ap->ap_policy = GET_INT_PARM(other_ap_policy, local->card_idx);
+        ap->bridge_packets = GET_INT_PARM(ap_bridge_packets, local->card_idx);
+        ap->max_inactivity =
+                GET_INT_PARM(ap_max_inactivity, local->card_idx) * HZ;
+        ap->autom_ap_wds = GET_INT_PARM(autom_ap_wds, local->card_idx);
+
+        spin_lock_init(&ap->sta_table_lock);
+        INIT_LIST_HEAD(&ap->sta_list);
+
+        /* Initialize task queue structure for AP management */
+        INIT_WORK(&local->ap->add_sta_proc_queue, handle_add_proc_queue, ap);
+
+        ap->tx_callback_idx =
+                hostap_tx_callback_register(local, hostap_ap_tx_cb, ap);
+        if (ap->tx_callback_idx == 0)
+                printk(KERN_WARNING "%s: failed to register TX callback for "
+                       "AP\n", local->dev->name);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        INIT_WORK(&local->ap->wds_oper_queue, handle_wds_oper_queue, local);
+
+        ap->tx_callback_auth =
+                hostap_tx_callback_register(local, hostap_ap_tx_cb_auth, ap);
+        ap->tx_callback_assoc =
+                hostap_tx_callback_register(local, hostap_ap_tx_cb_assoc, ap);
+        ap->tx_callback_poll =
+                hostap_tx_callback_register(local, hostap_ap_tx_cb_poll, ap);
+        if (ap->tx_callback_auth == 0 || ap->tx_callback_assoc == 0 ||
+                ap->tx_callback_poll == 0)
+                printk(KERN_WARNING "%s: failed to register TX callback for "
+                       "AP\n", local->dev->name);
+
+        spin_lock_init(&ap->mac_restrictions.lock);
+        INIT_LIST_HEAD(&ap->mac_restrictions.mac_list);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        ap->initialized = 1;
+}
+
+
+void hostap_init_ap_proc(local_info_t *local)
+{
+        struct ap_data *ap = local->ap;
+
+        ap->proc = local->proc;
+        if (ap->proc == NULL)
+                return;
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+        create_proc_read_entry("ap_debug", 0, ap->proc,
+                               ap_debug_proc_read, ap);
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        create_proc_read_entry("ap_control", 0, ap->proc,
+                               ap_control_proc_read, ap);
+        create_proc_read_entry("ap", 0, ap->proc,
+                               prism2_ap_proc_read, ap);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+}
+
+
+void hostap_free_data(struct ap_data *ap)
+{
+        struct list_head *n, *ptr;
+
+        if (ap == NULL || !ap->initialized) {
+                printk(KERN_DEBUG "hostap_free_data: ap has not yet been "
+                       "initialized - skip resource freeing\n");
+                return;
+        }
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        if (ap->crypt)
+                ap->crypt->deinit(ap->crypt_priv);
+        ap->crypt = ap->crypt_priv = NULL;
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        list_for_each_safe(ptr, n, &ap->sta_list) {
+                struct sta_info *sta = list_entry(ptr, struct sta_info, list);
+                ap_sta_hash_del(ap, sta);
+                list_del(&sta->list);
+                if ((sta->flags & WLAN_STA_ASSOC) && !sta->ap && sta->local)
+                        hostap_event_expired_sta(sta->local->dev, sta);
+                ap_free_sta(ap, sta);
+        }
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+        if (ap->proc != NULL) {
+                remove_proc_entry("ap_debug", ap->proc);
+        }
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        if (ap->proc != NULL) {
+          remove_proc_entry("ap", ap->proc);
+                remove_proc_entry("ap_control", ap->proc);
+        }
+        ap_control_flush_macs(&ap->mac_restrictions);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        ap->initialized = 0;
+}
+
+
+/* caller should have mutex for AP STA list handling */
+static struct sta_info* ap_get_sta(struct ap_data *ap, u8 *sta)
+{
+        struct sta_info *s;
+
+        s = ap->sta_hash[STA_HASH(sta)];
+        while (s != NULL && memcmp(s->addr, sta, ETH_ALEN) != 0)
+                s = s->hnext;
+        return s;
+}
+
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+
+/* Called from timer handler and from scheduled AP queue handlers */
+static void prism2_send_mgmt(struct net_device *dev,
+                             u16 type_subtype, char *body,
+                             int body_len, u8 *addr, u16 tx_cb_idx)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct ieee80211_hdr *hdr;
+        u16 fc;
+        struct sk_buff *skb;
+        struct hostap_skb_tx_data *meta;
+        int hdrlen;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        dev = local->dev; /* always use master radio device */
+        iface = netdev_priv(dev);
+
+        if (!(dev->flags & IFF_UP)) {
+                PDEBUG(DEBUG_AP, "%s: prism2_send_mgmt - device is not UP - "
+                       "cannot send frame\n", dev->name);
+                return;
+        }
+
+        skb = dev_alloc_skb(sizeof(*hdr) + body_len);
+        if (skb == NULL) {
+                PDEBUG(DEBUG_AP, "%s: prism2_send_mgmt failed to allocate "
+                       "skb\n", dev->name);
+                return;
+        }
+
+        fc = type_subtype;
+        hdrlen = hostap_80211_get_hdrlen(fc);
+        hdr = (struct ieee80211_hdr *) skb_put(skb, hdrlen);
+        if (body)
+                memcpy(skb_put(skb, body_len), body, body_len);
+
+        memset(hdr, 0, hdrlen);
+
+        /* FIX: ctrl::ack sending used special HFA384X_TX_CTRL_802_11
+         * tx_control instead of using local->tx_control */
+
+
+        memcpy(hdr->addr1, addr, ETH_ALEN); /* DA / RA */
+        if (WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) {
+                fc |= IEEE80211_FCTL_FROMDS;
+                memcpy(hdr->addr2, dev->dev_addr, ETH_ALEN); /* BSSID */
+                memcpy(hdr->addr3, dev->dev_addr, ETH_ALEN); /* SA */
+        } else if (WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_CTL) {
+                /* control:ACK does not have addr2 or addr3 */
+                memset(hdr->addr2, 0, ETH_ALEN);
+                memset(hdr->addr3, 0, ETH_ALEN);
+        } else {
+                memcpy(hdr->addr2, dev->dev_addr, ETH_ALEN); /* SA */
+                memcpy(hdr->addr3, dev->dev_addr, ETH_ALEN); /* BSSID */
+        }
+
+        hdr->frame_ctl = cpu_to_le16(fc);
+
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        memset(meta, 0, sizeof(*meta));
+        meta->magic = HOSTAP_SKB_TX_DATA_MAGIC;
+        meta->iface = iface;
+        meta->tx_cb_idx = tx_cb_idx;
+
+        skb->dev = dev;
+        skb->mac.raw = skb->nh.raw = skb->data;
+        dev_queue_xmit(skb);
+}
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+static int prism2_sta_proc_read(char *page, char **start, off_t off,
+                                int count, int *eof, void *data)
+{
+        char *p = page;
+        struct sta_info *sta = (struct sta_info *) data;
+        int i;
+
+        /* FIX: possible race condition.. the STA data could have just expired,
+         * but proc entry was still here so that the read could have started;
+         * some locking should be done here.. */
+
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+
+        p += sprintf(p, "%s=" MACSTR "\nusers=%d\naid=%d\n"
+                     "flags=0x%04x%s%s%s%s%s%s%s\n"
+                     "capability=0x%02x\nlisten_interval=%d\nsupported_rates=",
+                     sta->ap ? "AP" : "STA",
+                     MAC2STR(sta->addr), atomic_read(&sta->users), sta->aid,
+                     sta->flags,
+                     sta->flags & WLAN_STA_AUTH ? " AUTH" : "",
+                     sta->flags & WLAN_STA_ASSOC ? " ASSOC" : "",
+                     sta->flags & WLAN_STA_PS ? " PS" : "",
+                     sta->flags & WLAN_STA_TIM ? " TIM" : "",
+                     sta->flags & WLAN_STA_PERM ? " PERM" : "",
+                     sta->flags & WLAN_STA_AUTHORIZED ? " AUTHORIZED" : "",
+                     sta->flags & WLAN_STA_PENDING_POLL ? " POLL" : "",
+                     sta->capability, sta->listen_interval);
+        /* supported_rates: 500 kbit/s units with msb ignored */
+        for (i = 0; i < sizeof(sta->supported_rates); i++)
+                if (sta->supported_rates[i] != 0)
+                        p += sprintf(p, "%d%sMbps ",
+                                     (sta->supported_rates[i] & 0x7f) / 2,
+                                     sta->supported_rates[i] & 1 ? ".5" : "");
+        p += sprintf(p, "\njiffies=%lu\nlast_auth=%lu\nlast_assoc=%lu\n"
+                     "last_rx=%lu\nlast_tx=%lu\nrx_packets=%lu\n"
+                     "tx_packets=%lu\n"
+                     "rx_bytes=%lu\ntx_bytes=%lu\nbuffer_count=%d\n"
+                     "last_rx: silence=%d dBm signal=%d dBm rate=%d%s Mbps\n"
+                     "tx_rate=%d\ntx[1M]=%d\ntx[2M]=%d\ntx[5.5M]=%d\n"
+                     "tx[11M]=%d\n"
+                     "rx[1M]=%d\nrx[2M]=%d\nrx[5.5M]=%d\nrx[11M]=%d\n",
+                     jiffies, sta->last_auth, sta->last_assoc, sta->last_rx,
+                     sta->last_tx,
+                     sta->rx_packets, sta->tx_packets, sta->rx_bytes,
+                     sta->tx_bytes, skb_queue_len(&sta->tx_buf),
+                     sta->last_rx_silence,
+                     sta->last_rx_signal, sta->last_rx_rate / 10,
+                     sta->last_rx_rate % 10 ? ".5" : "",
+                     sta->tx_rate, sta->tx_count[0], sta->tx_count[1],
+                     sta->tx_count[2], sta->tx_count[3],  sta->rx_count[0],
+                     sta->rx_count[1], sta->rx_count[2], sta->rx_count[3]);
+        if (sta->crypt && sta->crypt->ops && sta->crypt->ops->print_stats)
+                p = sta->crypt->ops->print_stats(p, sta->crypt->priv);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        if (sta->ap) {
+                if (sta->u.ap.channel >= 0)
+                        p += sprintf(p, "channel=%d\n", sta->u.ap.channel);
+                p += sprintf(p, "ssid=");
+                for (i = 0; i < sta->u.ap.ssid_len; i++)
+                        p += sprintf(p, ((sta->u.ap.ssid[i] >= 32 &&
+                                          sta->u.ap.ssid[i] < 127) ?
+                                         "%c" : "<%02x>"),
+                                     sta->u.ap.ssid[i]);
+                p += sprintf(p, "\n");
+        }
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        return (p - page);
+}
+
+
+static void handle_add_proc_queue(void *data)
+{
+        struct ap_data *ap = (struct ap_data *) data;
+        struct sta_info *sta;
+        char name[20];
+        struct add_sta_proc_data *entry, *prev;
+
+        entry = ap->add_sta_proc_entries;
+        ap->add_sta_proc_entries = NULL;
+
+        while (entry) {
+                spin_lock_bh(&ap->sta_table_lock);
+                sta = ap_get_sta(ap, entry->addr);
+                if (sta)
+                        atomic_inc(&sta->users);
+                spin_unlock_bh(&ap->sta_table_lock);
+
+                if (sta) {
+                        sprintf(name, MACSTR, MAC2STR(sta->addr));
+                        sta->proc = create_proc_read_entry(
+                                name, 0, ap->proc,
+                                prism2_sta_proc_read, sta);
+
+                        atomic_dec(&sta->users);
+                }
+
+                prev = entry;
+                entry = entry->next;
+                kfree(prev);
+        }
+}
+
+
+static struct sta_info * ap_add_sta(struct ap_data *ap, u8 *addr)
+{
+        struct sta_info *sta;
+
+        sta = (struct sta_info *)
+                kmalloc(sizeof(struct sta_info), GFP_ATOMIC);
+        if (sta == NULL) {
+                PDEBUG(DEBUG_AP, "AP: kmalloc failed\n");
+                return NULL;
+        }
+
+        /* initialize STA info data */
+        memset(sta, 0, sizeof(struct sta_info));
+        sta->local = ap->local;
+        skb_queue_head_init(&sta->tx_buf);
+        memcpy(sta->addr, addr, ETH_ALEN);
+
+        atomic_inc(&sta->users);
+        spin_lock_bh(&ap->sta_table_lock);
+        list_add(&sta->list, &ap->sta_list);
+        ap->num_sta++;
+        ap_sta_hash_add(ap, sta);
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (ap->proc) {
+                struct add_sta_proc_data *entry;
+                /* schedule a non-interrupt context process to add a procfs
+                 * entry for the STA since procfs code use GFP_KERNEL */
+                entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+                if (entry) {
+                        memcpy(entry->addr, sta->addr, ETH_ALEN);
+                        entry->next = ap->add_sta_proc_entries;
+                        ap->add_sta_proc_entries = entry;
+                        schedule_work(&ap->add_sta_proc_queue);
+                } else
+                        printk(KERN_DEBUG "Failed to add STA proc data\n");
+        }
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        init_timer(&sta->timer);
+        sta->timer.expires = jiffies + ap->max_inactivity;
+        sta->timer.data = (unsigned long) sta;
+        sta->timer.function = ap_handle_timer;
+        if (!ap->local->hostapd)
+                add_timer(&sta->timer);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        return sta;
+}
+
+
+static int ap_tx_rate_ok(int rateidx, struct sta_info *sta,
+                         local_info_t *local)
+{
+        if (rateidx > sta->tx_max_rate ||
+            !(sta->tx_supp_rates & (1 << rateidx)))
+                return 0;
+
+        if (local->tx_rate_control != 0 &&
+            !(local->tx_rate_control & (1 << rateidx)))
+                return 0;
+
+        return 1;
+}
+
+
+static void prism2_check_tx_rates(struct sta_info *sta)
+{
+        int i;
+
+        sta->tx_supp_rates = 0;
+        for (i = 0; i < sizeof(sta->supported_rates); i++) {
+                if ((sta->supported_rates[i] & 0x7f) == 2)
+                        sta->tx_supp_rates |= WLAN_RATE_1M;
+                if ((sta->supported_rates[i] & 0x7f) == 4)
+                        sta->tx_supp_rates |= WLAN_RATE_2M;
+                if ((sta->supported_rates[i] & 0x7f) == 11)
+                        sta->tx_supp_rates |= WLAN_RATE_5M5;
+                if ((sta->supported_rates[i] & 0x7f) == 22)
+                        sta->tx_supp_rates |= WLAN_RATE_11M;
+        }
+        sta->tx_max_rate = sta->tx_rate = sta->tx_rate_idx = 0;
+        if (sta->tx_supp_rates & WLAN_RATE_1M) {
+                sta->tx_max_rate = 0;
+                if (ap_tx_rate_ok(0, sta, sta->local)) {
+                        sta->tx_rate = 10;
+                        sta->tx_rate_idx = 0;
+                }
+        }
+        if (sta->tx_supp_rates & WLAN_RATE_2M) {
+                sta->tx_max_rate = 1;
+                if (ap_tx_rate_ok(1, sta, sta->local)) {
+                        sta->tx_rate = 20;
+                        sta->tx_rate_idx = 1;
+                }
+        }
+        if (sta->tx_supp_rates & WLAN_RATE_5M5) {
+                sta->tx_max_rate = 2;
+                if (ap_tx_rate_ok(2, sta, sta->local)) {
+                        sta->tx_rate = 55;
+                        sta->tx_rate_idx = 2;
+                }
+        }
+        if (sta->tx_supp_rates & WLAN_RATE_11M) {
+                sta->tx_max_rate = 3;
+                if (ap_tx_rate_ok(3, sta, sta->local)) {
+                        sta->tx_rate = 110;
+                        sta->tx_rate_idx = 3;
+                }
+        }
+}
+
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+
+static void ap_crypt_init(struct ap_data *ap)
+{
+        ap->crypt = ieee80211_get_crypto_ops("WEP");
+
+        if (ap->crypt) {
+                if (ap->crypt->init) {
+                        ap->crypt_priv = ap->crypt->init(0);
+                        if (ap->crypt_priv == NULL)
+                                ap->crypt = NULL;
+                        else {
+                                u8 key[WEP_KEY_LEN];
+                                get_random_bytes(key, WEP_KEY_LEN);
+                                ap->crypt->set_key(key, WEP_KEY_LEN, NULL,
+                                                   ap->crypt_priv);
+                        }
+                }
+        }
+
+        if (ap->crypt == NULL) {
+                printk(KERN_WARNING "AP could not initialize WEP: load module "
+                       "ieee80211_crypt_wep.ko\n");
+        }
+}
+
+
+/* Generate challenge data for shared key authentication. IEEE 802.11 specifies
+ * that WEP algorithm is used for generating challange. This should be unique,
+ * but otherwise there is not really need for randomness etc. Initialize WEP
+ * with pseudo random key and then use increasing IV to get unique challenge
+ * streams.
+ *
+ * Called only as a scheduled task for pending AP frames.
+ */
+static char * ap_auth_make_challenge(struct ap_data *ap)
+{
+        char *tmpbuf;
+        struct sk_buff *skb;
+
+        if (ap->crypt == NULL) {
+                ap_crypt_init(ap);
+                if (ap->crypt == NULL)
+                        return NULL;
+        }
+
+        tmpbuf = (char *) kmalloc(WLAN_AUTH_CHALLENGE_LEN, GFP_ATOMIC);
+        if (tmpbuf == NULL) {
+                PDEBUG(DEBUG_AP, "AP: kmalloc failed for challenge\n");
+                return NULL;
+        }
+
+        skb = dev_alloc_skb(WLAN_AUTH_CHALLENGE_LEN +
+                            ap->crypt->extra_prefix_len +
+                            ap->crypt->extra_postfix_len);
+        if (skb == NULL) {
+                kfree(tmpbuf);
+                return NULL;
+        }
+
+        skb_reserve(skb, ap->crypt->extra_prefix_len);
+        memset(skb_put(skb, WLAN_AUTH_CHALLENGE_LEN), 0,
+               WLAN_AUTH_CHALLENGE_LEN);
+        if (ap->crypt->encrypt_mpdu(skb, 0, ap->crypt_priv)) {
+                dev_kfree_skb(skb);
+                kfree(tmpbuf);
+                return NULL;
+        }
+
+        memcpy(tmpbuf, skb->data + ap->crypt->extra_prefix_len,
+               WLAN_AUTH_CHALLENGE_LEN);
+        dev_kfree_skb(skb);
+
+        return tmpbuf;
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void handle_authen(local_info_t *local, struct sk_buff *skb,
+                          struct hostap_80211_rx_status *rx_stats)
+{
+        struct net_device *dev = local->dev;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        size_t hdrlen;
+        struct ap_data *ap = local->ap;
+        char body[8 + WLAN_AUTH_CHALLENGE_LEN], *challenge = NULL;
+        int len, olen;
+        u16 auth_alg, auth_transaction, status_code, *pos;
+        u16 resp = WLAN_STATUS_SUCCESS, fc;
+        struct sta_info *sta = NULL;
+        struct ieee80211_crypt_data *crypt;
+        char *txt = "";
+
+        len = skb->len - IEEE80211_MGMT_HDR_LEN;
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        hdrlen = hostap_80211_get_hdrlen(fc);
+
+        if (len < 6) {
+                PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload "
+                       "(len=%d) from " MACSTR "\n", dev->name, len,
+                       MAC2STR(hdr->addr2));
+                return;
+        }
+
+        spin_lock_bh(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock_bh(&local->ap->sta_table_lock);
+
+        if (sta && sta->crypt)
+                crypt = sta->crypt;
+        else {
+                int idx = 0;
+                if (skb->len >= hdrlen + 3)
+                        idx = skb->data[hdrlen + 3] >> 6;
+                crypt = local->crypt[idx];
+        }
+
+        pos = (u16 *) (skb->data + IEEE80211_MGMT_HDR_LEN);
+        auth_alg = __le16_to_cpu(*pos);
+        pos++;
+        auth_transaction = __le16_to_cpu(*pos);
+        pos++;
+        status_code = __le16_to_cpu(*pos);
+        pos++;
+
+        if (memcmp(dev->dev_addr, hdr->addr2, ETH_ALEN) == 0 ||
+            ap_control_mac_deny(&ap->mac_restrictions, hdr->addr2)) {
+                txt = "authentication denied";
+                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                goto fail;
+        }
+
+        if (((local->auth_algs & PRISM2_AUTH_OPEN) &&
+             auth_alg == WLAN_AUTH_OPEN) ||
+            ((local->auth_algs & PRISM2_AUTH_SHARED_KEY) &&
+             crypt && auth_alg == WLAN_AUTH_SHARED_KEY)) {
+        } else {
+                txt = "unsupported algorithm";
+                resp = WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG;
+                goto fail;
+        }
+
+        if (len >= 8) {
+                u8 *u = (u8 *) pos;
+                if (*u == WLAN_EID_CHALLENGE) {
+                        if (*(u + 1) != WLAN_AUTH_CHALLENGE_LEN) {
+                                txt = "invalid challenge len";
+                                resp = WLAN_STATUS_CHALLENGE_FAIL;
+                                goto fail;
+                        }
+                        if (len - 8 < WLAN_AUTH_CHALLENGE_LEN) {
+                                txt = "challenge underflow";
+                                resp = WLAN_STATUS_CHALLENGE_FAIL;
+                                goto fail;
+                        }
+                        challenge = (char *) (u + 2);
+                }
+        }
+
+        if (sta && sta->ap) {
+                if (time_after(jiffies, sta->u.ap.last_beacon +
+                               (10 * sta->listen_interval * HZ) / 1024)) {
+                        PDEBUG(DEBUG_AP, "%s: no beacons received for a while,"
+                               " assuming AP " MACSTR " is now STA\n",
+                               dev->name, MAC2STR(sta->addr));
+                        sta->ap = 0;
+                        sta->flags = 0;
+                        sta->u.sta.challenge = NULL;
+                } else {
+                        txt = "AP trying to authenticate?";
+                        resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                        goto fail;
+                }
+        }
+
+        if ((auth_alg == WLAN_AUTH_OPEN && auth_transaction == 1) ||
+            (auth_alg == WLAN_AUTH_SHARED_KEY &&
+             (auth_transaction == 1 ||
+              (auth_transaction == 3 && sta != NULL &&
+               sta->u.sta.challenge != NULL)))) {
+        } else {
+                txt = "unknown authentication transaction number";
+                resp = WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION;
+                goto fail;
+        }
+
+        if (sta == NULL) {
+                txt = "new STA";
+
+                if (local->ap->num_sta >= MAX_STA_COUNT) {
+                        /* FIX: might try to remove some old STAs first? */
+                        txt = "no more room for new STAs";
+                        resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                        goto fail;
+                }
+
+                sta = ap_add_sta(local->ap, hdr->addr2);
+                if (sta == NULL) {
+                        txt = "ap_add_sta failed";
+                        resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                        goto fail;
+                }
+        }
+
+        switch (auth_alg) {
+        case WLAN_AUTH_OPEN:
+                txt = "authOK";
+                /* IEEE 802.11 standard is not completely clear about
+                 * whether STA is considered authenticated after
+                 * authentication OK frame has been send or after it
+                 * has been ACKed. In order to reduce interoperability
+                 * issues, mark the STA authenticated before ACK. */
+                sta->flags |= WLAN_STA_AUTH;
+                break;
+
+        case WLAN_AUTH_SHARED_KEY:
+                if (auth_transaction == 1) {
+                        if (sta->u.sta.challenge == NULL) {
+                                sta->u.sta.challenge =
+                                        ap_auth_make_challenge(local->ap);
+                                if (sta->u.sta.challenge == NULL) {
+                                        resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                                        goto fail;
+                                }
+                        }
+                } else {
+                        if (sta->u.sta.challenge == NULL ||
+                            challenge == NULL ||
+                            memcmp(sta->u.sta.challenge, challenge,
+                                   WLAN_AUTH_CHALLENGE_LEN) != 0 ||
+                            !(fc & IEEE80211_FCTL_PROTECTED)) {
+                                txt = "challenge response incorrect";
+                                resp = WLAN_STATUS_CHALLENGE_FAIL;
+                                goto fail;
+                        }
+
+                        txt = "challenge OK - authOK";
+                        /* IEEE 802.11 standard is not completely clear about
+                         * whether STA is considered authenticated after
+                         * authentication OK frame has been send or after it
+                         * has been ACKed. In order to reduce interoperability
+                         * issues, mark the STA authenticated before ACK. */
+                        sta->flags |= WLAN_STA_AUTH;
+                        kfree(sta->u.sta.challenge);
+                        sta->u.sta.challenge = NULL;
+                }
+                break;
+        }
+
+ fail:
+        pos = (u16 *) body;
+        *pos = cpu_to_le16(auth_alg);
+        pos++;
+        *pos = cpu_to_le16(auth_transaction + 1);
+        pos++;
+        *pos = cpu_to_le16(resp); /* status_code */
+        pos++;
+        olen = 6;
+
+        if (resp == WLAN_STATUS_SUCCESS && sta != NULL &&
+            sta->u.sta.challenge != NULL &&
+            auth_alg == WLAN_AUTH_SHARED_KEY && auth_transaction == 1) {
+                u8 *tmp = (u8 *) pos;
+                *tmp++ = WLAN_EID_CHALLENGE;
+                *tmp++ = WLAN_AUTH_CHALLENGE_LEN;
+                pos++;
+                memcpy(pos, sta->u.sta.challenge, WLAN_AUTH_CHALLENGE_LEN);
+                olen += 2 + WLAN_AUTH_CHALLENGE_LEN;
+        }
+
+        prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH,
+                         body, olen, hdr->addr2, ap->tx_callback_auth);
+
+        if (sta) {
+                sta->last_rx = jiffies;
+                atomic_dec(&sta->users);
+        }
+
+        if (resp) {
+                PDEBUG(DEBUG_AP, "%s: " MACSTR " auth (alg=%d trans#=%d "
+                       "stat=%d len=%d fc=%04x) ==> %d (%s)\n",
+                       dev->name, MAC2STR(hdr->addr2), auth_alg,
+                       auth_transaction, status_code, len, fc, resp, txt);
+        }
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void handle_assoc(local_info_t *local, struct sk_buff *skb,
+                         struct hostap_80211_rx_status *rx_stats, int reassoc)
+{
+        struct net_device *dev = local->dev;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        char body[12], *p, *lpos;
+        int len, left;
+        u16 *pos;
+        u16 resp = WLAN_STATUS_SUCCESS;
+        struct sta_info *sta = NULL;
+        int send_deauth = 0;
+        char *txt = "";
+        u8 prev_ap[ETH_ALEN];
+
+        left = len = skb->len - IEEE80211_MGMT_HDR_LEN;
+
+        if (len < (reassoc ? 10 : 4)) {
+                PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload "
+                       "(len=%d, reassoc=%d) from " MACSTR "\n",
+                       dev->name, len, reassoc, MAC2STR(hdr->addr2));
+                return;
+        }
+
+        spin_lock_bh(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta == NULL || (sta->flags & WLAN_STA_AUTH) == 0) {
+                spin_unlock_bh(&local->ap->sta_table_lock);
+                txt = "trying to associate before authentication";
+                send_deauth = 1;
+                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                sta = NULL; /* do not decrement sta->users */
+                goto fail;
+        }
+        atomic_inc(&sta->users);
+        spin_unlock_bh(&local->ap->sta_table_lock);
+
+        pos = (u16 *) (skb->data + IEEE80211_MGMT_HDR_LEN);
+        sta->capability = __le16_to_cpu(*pos);
+        pos++; left -= 2;
+        sta->listen_interval = __le16_to_cpu(*pos);
+        pos++; left -= 2;
+
+        if (reassoc) {
+                memcpy(prev_ap, pos, ETH_ALEN);
+                pos++; pos++; pos++; left -= 6;
+        } else
+                memset(prev_ap, 0, ETH_ALEN);
+
+        if (left >= 2) {
+                unsigned int ileft;
+                unsigned char *u = (unsigned char *) pos;
+
+                if (*u == WLAN_EID_SSID) {
+                        u++; left--;
+                        ileft = *u;
+                        u++; left--;
+
+                        if (ileft > left || ileft > MAX_SSID_LEN) {
+                                txt = "SSID overflow";
+                                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                                goto fail;
+                        }
+
+                        if (ileft != strlen(local->essid) ||
+                            memcmp(local->essid, u, ileft) != 0) {
+                                txt = "not our SSID";
+                                resp = WLAN_STATUS_ASSOC_DENIED_UNSPEC;
+                                goto fail;
+                        }
+
+                        u += ileft;
+                        left -= ileft;
+                }
+
+                if (left >= 2 && *u == WLAN_EID_SUPP_RATES) {
+                        u++; left--;
+                        ileft = *u;
+                        u++; left--;
+
+                        if (ileft > left || ileft == 0 ||
+                            ileft > WLAN_SUPP_RATES_MAX) {
+                                txt = "SUPP_RATES len error";
+                                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                                goto fail;
+                        }
+
+                        memset(sta->supported_rates, 0,
+                               sizeof(sta->supported_rates));
+                        memcpy(sta->supported_rates, u, ileft);
+                        prism2_check_tx_rates(sta);
+
+                        u += ileft;
+                        left -= ileft;
+                }
+
+                if (left > 0) {
+                        PDEBUG(DEBUG_AP, "%s: assoc from " MACSTR " with extra"
+                               " data (%d bytes) [",
+                               dev->name, MAC2STR(hdr->addr2), left);
+                        while (left > 0) {
+                                PDEBUG2(DEBUG_AP, "<%02x>", *u);
+                                u++; left--;
+                        }
+                        PDEBUG2(DEBUG_AP, "]\n");
+                }
+        } else {
+                txt = "frame underflow";
+                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                goto fail;
+        }
+
+        /* get a unique AID */
+        if (sta->aid > 0)
+                txt = "OK, old AID";
+        else {
+                spin_lock_bh(&local->ap->sta_table_lock);
+                for (sta->aid = 1; sta->aid <= MAX_AID_TABLE_SIZE; sta->aid++)
+                        if (local->ap->sta_aid[sta->aid - 1] == NULL)
+                                break;
+                if (sta->aid > MAX_AID_TABLE_SIZE) {
+                        sta->aid = 0;
+                        spin_unlock_bh(&local->ap->sta_table_lock);
+                        resp = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
+                        txt = "no room for more AIDs";
+                } else {
+                        local->ap->sta_aid[sta->aid - 1] = sta;
+                        spin_unlock_bh(&local->ap->sta_table_lock);
+                        txt = "OK, new AID";
+                }
+        }
+
+ fail:
+        pos = (u16 *) body;
+
+        if (send_deauth) {
+                *pos = __constant_cpu_to_le16(
+                        WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH);
+                pos++;
+        } else {
+                /* FIX: CF-Pollable and CF-PollReq should be set to match the
+                 * values in beacons/probe responses */
+                /* FIX: how about privacy and WEP? */
+                /* capability */
+                *pos = __constant_cpu_to_le16(WLAN_CAPABILITY_ESS);
+                pos++;
+
+                /* status_code */
+                *pos = __cpu_to_le16(resp);
+                pos++;
+
+                *pos = __cpu_to_le16((sta && sta->aid > 0 ? sta->aid : 0) |
+                                     BIT(14) | BIT(15)); /* AID */
+                pos++;
+
+                /* Supported rates (Information element) */
+                p = (char *) pos;
+                *p++ = WLAN_EID_SUPP_RATES;
+                lpos = p;
+                *p++ = 0; /* len */
+                if (local->tx_rate_control & WLAN_RATE_1M) {
+                        *p++ = local->basic_rates & WLAN_RATE_1M ? 0x82 : 0x02;
+                        (*lpos)++;
+                }
+                if (local->tx_rate_control & WLAN_RATE_2M) {
+                        *p++ = local->basic_rates & WLAN_RATE_2M ? 0x84 : 0x04;
+                        (*lpos)++;
+                }
+                if (local->tx_rate_control & WLAN_RATE_5M5) {
+                        *p++ = local->basic_rates & WLAN_RATE_5M5 ?
+                                0x8b : 0x0b;
+                        (*lpos)++;
+                }
+                if (local->tx_rate_control & WLAN_RATE_11M) {
+                        *p++ = local->basic_rates & WLAN_RATE_11M ?
+                                0x96 : 0x16;
+                        (*lpos)++;
+                }
+                pos = (u16 *) p;
+        }
+
+        prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT |
+                         (send_deauth ? IEEE80211_STYPE_DEAUTH :
+                          (reassoc ? IEEE80211_STYPE_REASSOC_RESP :
+                           IEEE80211_STYPE_ASSOC_RESP)),
+                         body, (u8 *) pos - (u8 *) body,
+                         hdr->addr2,
+                         send_deauth ? 0 : local->ap->tx_callback_assoc);
+
+        if (sta) {
+                if (resp == WLAN_STATUS_SUCCESS) {
+                        sta->last_rx = jiffies;
+                        /* STA will be marked associated from TX callback, if
+                         * AssocResp is ACKed */
+                }
+                atomic_dec(&sta->users);
+        }
+
+#if 0
+        PDEBUG(DEBUG_AP, "%s: " MACSTR " %sassoc (len=%d prev_ap=" MACSTR
+               ") => %d(%d) (%s)\n",
+               dev->name, MAC2STR(hdr->addr2), reassoc ? "re" : "", len,
+               MAC2STR(prev_ap), resp, send_deauth, txt);
+#endif
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void handle_deauth(local_info_t *local, struct sk_buff *skb,
+                          struct hostap_80211_rx_status *rx_stats)
+{
+        struct net_device *dev = local->dev;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        char *body = (char *) (skb->data + IEEE80211_MGMT_HDR_LEN);
+        int len;
+        u16 reason_code, *pos;
+        struct sta_info *sta = NULL;
+
+        len = skb->len - IEEE80211_MGMT_HDR_LEN;
+
+        if (len < 2) {
+                printk("handle_deauth - too short payload (len=%d)\n", len);
+                return;
+        }
+
+        pos = (u16 *) body;
+        reason_code = __le16_to_cpu(*pos);
+
+        PDEBUG(DEBUG_AP, "%s: deauthentication: " MACSTR " len=%d, "
+               "reason_code=%d\n", dev->name, MAC2STR(hdr->addr2), len,
+               reason_code);
+
+        spin_lock_bh(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta != NULL) {
+                if ((sta->flags & WLAN_STA_ASSOC) && !sta->ap)
+                        hostap_event_expired_sta(local->dev, sta);
+                sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
+        }
+        spin_unlock_bh(&local->ap->sta_table_lock);
+        if (sta == NULL) {
+                printk("%s: deauthentication from " MACSTR ", "
+               "reason_code=%d, but STA not authenticated\n", dev->name,
+                       MAC2STR(hdr->addr2), reason_code);
+        }
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
+                            struct hostap_80211_rx_status *rx_stats)
+{
+        struct net_device *dev = local->dev;
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        char *body = skb->data + IEEE80211_MGMT_HDR_LEN;
+        int len;
+        u16 reason_code, *pos;
+        struct sta_info *sta = NULL;
+
+        len = skb->len - IEEE80211_MGMT_HDR_LEN;
+
+        if (len < 2) {
+                printk("handle_disassoc - too short payload (len=%d)\n", len);
+                return;
+        }
+
+        pos = (u16 *) body;
+        reason_code = __le16_to_cpu(*pos);
+
+        PDEBUG(DEBUG_AP, "%s: disassociation: " MACSTR " len=%d, "
+               "reason_code=%d\n", dev->name, MAC2STR(hdr->addr2), len,
+               reason_code);
+
+        spin_lock_bh(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta != NULL) {
+                if ((sta->flags & WLAN_STA_ASSOC) && !sta->ap)
+                        hostap_event_expired_sta(local->dev, sta);
+                sta->flags &= ~WLAN_STA_ASSOC;
+        }
+        spin_unlock_bh(&local->ap->sta_table_lock);
+        if (sta == NULL) {
+                printk("%s: disassociation from " MACSTR ", "
+                       "reason_code=%d, but STA not authenticated\n",
+                       dev->name, MAC2STR(hdr->addr2), reason_code);
+        }
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void ap_handle_data_nullfunc(local_info_t *local,
+                                    struct ieee80211_hdr *hdr)
+{
+        struct net_device *dev = local->dev;
+
+        /* some STA f/w's seem to require control::ACK frame for
+         * data::nullfunc, but at least Prism2 station f/w version 0.8.0 does
+         * not send this..
+         * send control::ACK for the data::nullfunc */
+
+        printk(KERN_DEBUG "Sending control::ACK for data::nullfunc\n");
+        prism2_send_mgmt(dev, IEEE80211_FTYPE_CTL | IEEE80211_STYPE_ACK,
+                         NULL, 0, hdr->addr2, 0);
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void ap_handle_dropped_data(local_info_t *local,
+                                   struct ieee80211_hdr *hdr)
+{
+        struct net_device *dev = local->dev;
+        struct sta_info *sta;
+        u16 reason;
+
+        spin_lock_bh(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock_bh(&local->ap->sta_table_lock);
+
+        if (sta != NULL && (sta->flags & WLAN_STA_ASSOC)) {
+                PDEBUG(DEBUG_AP, "ap_handle_dropped_data: STA is now okay?\n");
+                atomic_dec(&sta->users);
+                return;
+        }
+
+        reason = __constant_cpu_to_le16(
+                WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
+        prism2_send_mgmt(dev, IEEE80211_FTYPE_MGMT |
+                         ((sta == NULL || !(sta->flags & WLAN_STA_ASSOC)) ?
+                          IEEE80211_STYPE_DEAUTH : IEEE80211_STYPE_DISASSOC),
+                         (char *) &reason, sizeof(reason), hdr->addr2, 0);
+
+        if (sta)
+                atomic_dec(&sta->users);
+}
+
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void pspoll_send_buffered(local_info_t *local, struct sta_info *sta,
+                                 struct sk_buff *skb)
+{
+        struct hostap_skb_tx_data *meta;
+
+        if (!(sta->flags & WLAN_STA_PS)) {
+                /* Station has moved to non-PS mode, so send all buffered
+                 * frames using normal device queue. */
+                dev_queue_xmit(skb);
+                return;
+        }
+
+        /* add a flag for hostap_handle_sta_tx() to know that this skb should
+         * be passed through even though STA is using PS */
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        meta->flags |= HOSTAP_TX_FLAGS_BUFFERED_FRAME;
+        if (!skb_queue_empty(&sta->tx_buf)) {
+                /* indicate to STA that more frames follow */
+                meta->flags |= HOSTAP_TX_FLAGS_ADD_MOREDATA;
+        }
+        dev_queue_xmit(skb);
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void handle_pspoll(local_info_t *local,
+                          struct ieee80211_hdr *hdr,
+                          struct hostap_80211_rx_status *rx_stats)
+{
+        struct net_device *dev = local->dev;
+        struct sta_info *sta;
+        u16 aid;
+        struct sk_buff *skb;
+
+        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=" MACSTR ", TA=" MACSTR
+               " PWRMGT=%d\n",
+               MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+               !!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM));
+
+        if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
+                PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=" MACSTR
+                       " not own MAC\n", MAC2STR(hdr->addr1));
+                return;
+        }
+
+        aid = __le16_to_cpu(hdr->duration_id);
+        if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14))) {
+                PDEBUG(DEBUG_PS, "   PSPOLL and AID[15:14] not set\n");
+                return;
+        }
+        aid &= ~BIT(15) & ~BIT(14);
+        if (aid == 0 || aid > MAX_AID_TABLE_SIZE) {
+                PDEBUG(DEBUG_PS, "   invalid aid=%d\n", aid);
+                return;
+        }
+        PDEBUG(DEBUG_PS2, "   aid=%d\n", aid);
+
+        spin_lock_bh(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock_bh(&local->ap->sta_table_lock);
+
+        if (sta == NULL) {
+                PDEBUG(DEBUG_PS, "   STA not found\n");
+                return;
+        }
+        if (sta->aid != aid) {
+                PDEBUG(DEBUG_PS, "   received aid=%i does not match with "
+                       "assoc.aid=%d\n", aid, sta->aid);
+                return;
+        }
+
+        /* FIX: todo:
+         * - add timeout for buffering (clear aid in TIM vector if buffer timed
+         *   out (expiry time must be longer than ListenInterval for
+         *   the corresponding STA; "8802-11: 11.2.1.9 AP aging function"
+         * - what to do, if buffered, pspolled, and sent frame is not ACKed by
+         *   sta; store buffer for later use and leave TIM aid bit set? use
+         *   TX event to check whether frame was ACKed?
+         */
+
+        while ((skb = skb_dequeue(&sta->tx_buf)) != NULL) {
+                /* send buffered frame .. */
+                PDEBUG(DEBUG_PS2, "Sending buffered frame to STA after PS POLL"
+                       " (buffer_count=%d)\n", skb_queue_len(&sta->tx_buf));
+
+                pspoll_send_buffered(local, sta, skb);
+
+                if (sta->flags & WLAN_STA_PS) {
+                        /* send only one buffered packet per PS Poll */
+                        /* FIX: should ignore further PS Polls until the
+                         * buffered packet that was just sent is acknowledged
+                         * (Tx or TxExc event) */
+                        break;
+                }
+        }
+
+        if (skb_queue_empty(&sta->tx_buf)) {
+                /* try to clear aid from TIM */
+                if (!(sta->flags & WLAN_STA_TIM))
+                        PDEBUG(DEBUG_PS2,  "Re-unsetting TIM for aid %d\n",
+                               aid);
+                hostap_set_tim(local, aid, 0);
+                sta->flags &= ~WLAN_STA_TIM;
+        }
+
+        atomic_dec(&sta->users);
+}
+
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+
+static void handle_wds_oper_queue(void *data)
+{
+        local_info_t *local = data;
+        struct wds_oper_data *entry, *prev;
+
+        spin_lock_bh(&local->lock);
+        entry = local->ap->wds_oper_entries;
+        local->ap->wds_oper_entries = NULL;
+        spin_unlock_bh(&local->lock);
+
+        while (entry) {
+                PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection "
+                       "to AP " MACSTR "\n",
+                       local->dev->name,
+                       entry->type == WDS_ADD ? "adding" : "removing",
+                       MAC2STR(entry->addr));
+                if (entry->type == WDS_ADD)
+                        prism2_wds_add(local, entry->addr, 0);
+                else if (entry->type == WDS_DEL)
+                        prism2_wds_del(local, entry->addr, 0, 1);
+
+                prev = entry;
+                entry = entry->next;
+                kfree(prev);
+        }
+}
+
+
+/* Called only as a scheduled task for pending AP frames. */
+static void handle_beacon(local_info_t *local, struct sk_buff *skb,
+                          struct hostap_80211_rx_status *rx_stats)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        char *body = skb->data + IEEE80211_MGMT_HDR_LEN;
+        int len, left;
+        u16 *pos, beacon_int, capability;
+        char *ssid = NULL;
+        unsigned char *supp_rates = NULL;
+        int ssid_len = 0, supp_rates_len = 0;
+        struct sta_info *sta = NULL;
+        int new_sta = 0, channel = -1;
+
+        len = skb->len - IEEE80211_MGMT_HDR_LEN;
+
+        if (len < 8 + 2 + 2) {
+                printk(KERN_DEBUG "handle_beacon - too short payload "
+                       "(len=%d)\n", len);
+                return;
+        }
+
+        pos = (u16 *) body;
+        left = len;
+
+        /* Timestamp (8 octets) */
+        pos += 4; left -= 8;
+        /* Beacon interval (2 octets) */
+        beacon_int = __le16_to_cpu(*pos);
+        pos++; left -= 2;
+        /* Capability information (2 octets) */
+        capability = __le16_to_cpu(*pos);
+        pos++; left -= 2;
+
+        if (local->ap->ap_policy != AP_OTHER_AP_EVEN_IBSS &&
+            capability & WLAN_CAPABILITY_IBSS)
+                return;
+
+        if (left >= 2) {
+                unsigned int ileft;
+                unsigned char *u = (unsigned char *) pos;
+
+                if (*u == WLAN_EID_SSID) {
+                        u++; left--;
+                        ileft = *u;
+                        u++; left--;
+
+                        if (ileft > left || ileft > MAX_SSID_LEN) {
+                                PDEBUG(DEBUG_AP, "SSID: overflow\n");
+                                return;
+                        }
+
+                        if (local->ap->ap_policy == AP_OTHER_AP_SAME_SSID &&
+                            (ileft != strlen(local->essid) ||
+                             memcmp(local->essid, u, ileft) != 0)) {
+                                /* not our SSID */
+                                return;
+                        }
+
+                        ssid = u;
+                        ssid_len = ileft;
+
+                        u += ileft;
+                        left -= ileft;
+                }
+
+                if (*u == WLAN_EID_SUPP_RATES) {
+                        u++; left--;
+                        ileft = *u;
+                        u++; left--;
+
+                        if (ileft > left || ileft == 0 || ileft > 8) {
+                                PDEBUG(DEBUG_AP, " - SUPP_RATES len error\n");
+                                return;
+                        }
+
+                        supp_rates = u;
+                        supp_rates_len = ileft;
+
+                        u += ileft;
+                        left -= ileft;
+                }
+
+                if (*u == WLAN_EID_DS_PARAMS) {
+                        u++; left--;
+                        ileft = *u;
+                        u++; left--;
+
+                        if (ileft > left || ileft != 1) {
+                                PDEBUG(DEBUG_AP, " - DS_PARAMS len error\n");
+                                return;
+                        }
+
+                        channel = *u;
+
+                        u += ileft;
+                        left -= ileft;
+                }
+        }
+
+        spin_lock_bh(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta != NULL)
+                atomic_inc(&sta->users);
+        spin_unlock_bh(&local->ap->sta_table_lock);
+
+        if (sta == NULL) {
+                /* add new AP */
+                new_sta = 1;
+                sta = ap_add_sta(local->ap, hdr->addr2);
+                if (sta == NULL) {
+                        printk(KERN_INFO "prism2: kmalloc failed for AP "
+                               "data structure\n");
+                        return;
+                }
+                hostap_event_new_sta(local->dev, sta);
+
+                /* mark APs authentication and associated for pseudo ad-hoc
+                 * style communication */
+                sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;
+
+                if (local->ap->autom_ap_wds) {
+                        hostap_wds_link_oper(local, sta->addr, WDS_ADD);
+                }
+        }
+
+        sta->ap = 1;
+        if (ssid) {
+                sta->u.ap.ssid_len = ssid_len;
+                memcpy(sta->u.ap.ssid, ssid, ssid_len);
+                sta->u.ap.ssid[ssid_len] = '\0';
+        } else {
+                sta->u.ap.ssid_len = 0;
+                sta->u.ap.ssid[0] = '\0';
+        }
+        sta->u.ap.channel = channel;
+        sta->rx_packets++;
+        sta->rx_bytes += len;
+        sta->u.ap.last_beacon = sta->last_rx = jiffies;
+        sta->capability = capability;
+        sta->listen_interval = beacon_int;
+
+        atomic_dec(&sta->users);
+
+        if (new_sta) {
+                memset(sta->supported_rates, 0, sizeof(sta->supported_rates));
+                memcpy(sta->supported_rates, supp_rates, supp_rates_len);
+                prism2_check_tx_rates(sta);
+        }
+}
+
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+/* Called only as a tasklet. */
+static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
+                           struct hostap_80211_rx_status *rx_stats)
+{
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        struct net_device *dev = local->dev;
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+        u16 fc, type, stype;
+        struct ieee80211_hdr *hdr;
+
+        /* FIX: should give skb->len to handler functions and check that the
+         * buffer is long enough */
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+        type = WLAN_FC_GET_TYPE(fc);
+        stype = WLAN_FC_GET_STYPE(fc);
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        if (!local->hostapd && type == IEEE80211_FTYPE_DATA) {
+                PDEBUG(DEBUG_AP, "handle_ap_item - data frame\n");
+
+                if (!(fc & IEEE80211_FCTL_TODS) ||
+                    (fc & IEEE80211_FCTL_FROMDS)) {
+                        if (stype == IEEE80211_STYPE_NULLFUNC) {
+                                /* no ToDS nullfunc seems to be used to check
+                                 * AP association; so send reject message to
+                                 * speed up re-association */
+                                ap_handle_dropped_data(local, hdr);
+                                goto done;
+                        }
+                        PDEBUG(DEBUG_AP, "   not ToDS frame (fc=0x%04x)\n",
+                               fc);
+                        goto done;
+                }
+
+                if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
+                        PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)="
+                               MACSTR " not own MAC\n",
+                               MAC2STR(hdr->addr1));
+                        goto done;
+                }
+
+                if (local->ap->nullfunc_ack &&
+                    stype == IEEE80211_STYPE_NULLFUNC)
+                        ap_handle_data_nullfunc(local, hdr);
+                else
+                        ap_handle_dropped_data(local, hdr);
+                goto done;
+        }
+
+        if (type == IEEE80211_FTYPE_MGMT && stype == IEEE80211_STYPE_BEACON) {
+                handle_beacon(local, skb, rx_stats);
+                goto done;
+        }
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+        if (type == IEEE80211_FTYPE_CTL && stype == IEEE80211_STYPE_PSPOLL) {
+                handle_pspoll(local, hdr, rx_stats);
+                goto done;
+        }
+
+        if (local->hostapd) {
+                PDEBUG(DEBUG_AP, "Unknown frame in AP queue: type=0x%02x "
+                       "subtype=0x%02x\n", type, stype);
+                goto done;
+        }
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        if (type != IEEE80211_FTYPE_MGMT) {
+                PDEBUG(DEBUG_AP, "handle_ap_item - not a management frame?\n");
+                goto done;
+        }
+
+        if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=" MACSTR
+                       " not own MAC\n", MAC2STR(hdr->addr1));
+                goto done;
+        }
+
+        if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) {
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=" MACSTR
+                       " not own MAC\n", MAC2STR(hdr->addr3));
+                goto done;
+        }
+
+        switch (stype) {
+        case IEEE80211_STYPE_ASSOC_REQ:
+                handle_assoc(local, skb, rx_stats, 0);
+                break;
+        case IEEE80211_STYPE_ASSOC_RESP:
+                PDEBUG(DEBUG_AP, "==> ASSOC RESP (ignored)\n");
+                break;
+        case IEEE80211_STYPE_REASSOC_REQ:
+                handle_assoc(local, skb, rx_stats, 1);
+                break;
+        case IEEE80211_STYPE_REASSOC_RESP:
+                PDEBUG(DEBUG_AP, "==> REASSOC RESP (ignored)\n");
+                break;
+        case IEEE80211_STYPE_ATIM:
+                PDEBUG(DEBUG_AP, "==> ATIM (ignored)\n");
+                break;
+        case IEEE80211_STYPE_DISASSOC:
+                handle_disassoc(local, skb, rx_stats);
+                break;
+        case IEEE80211_STYPE_AUTH:
+                handle_authen(local, skb, rx_stats);
+                break;
+        case IEEE80211_STYPE_DEAUTH:
+                handle_deauth(local, skb, rx_stats);
+                break;
+        default:
+                PDEBUG(DEBUG_AP, "Unknown mgmt frame subtype 0x%02x\n",
+                       stype >> 4);
+                break;
+        }
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+ done:
+        dev_kfree_skb(skb);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+void hostap_rx(struct net_device *dev, struct sk_buff *skb,
+               struct hostap_80211_rx_status *rx_stats)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 fc;
+        struct ieee80211_hdr *hdr;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (skb->len < 16)
+                goto drop;
+
+        local->stats.rx_packets++;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        fc = le16_to_cpu(hdr->frame_ctl);
+
+        if (local->ap->ap_policy == AP_OTHER_AP_SKIP_ALL &&
+            WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_MGMT &&
+            WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON)
+                goto drop;
+
+        skb->protocol = __constant_htons(ETH_P_HOSTAP);
+        handle_ap_item(local, skb, rx_stats);
+        return;
+
+ drop:
+        dev_kfree_skb(skb);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
+{
+        struct sk_buff *skb;
+        struct ieee80211_hdr *hdr;
+        struct hostap_80211_rx_status rx_stats;
+
+        if (skb_queue_empty(&sta->tx_buf))
+                return;
+
+        skb = dev_alloc_skb(16);
+        if (skb == NULL) {
+                printk(KERN_DEBUG "%s: schedule_packet_send: skb alloc "
+                       "failed\n", local->dev->name);
+                return;
+        }
+
+        hdr = (struct ieee80211_hdr *) skb_put(skb, 16);
+
+        /* Generate a fake pspoll frame to start packet delivery */
+        hdr->frame_ctl = __constant_cpu_to_le16(
+                IEEE80211_FTYPE_CTL | IEEE80211_STYPE_PSPOLL);
+        memcpy(hdr->addr1, local->dev->dev_addr, ETH_ALEN);
+        memcpy(hdr->addr2, sta->addr, ETH_ALEN);
+        hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14));
+
+        PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for "
+               "STA " MACSTR "\n", local->dev->name, MAC2STR(sta->addr));
+
+        skb->dev = local->dev;
+
+        memset(&rx_stats, 0, sizeof(rx_stats));
+        hostap_rx(local->dev, skb, &rx_stats);
+}
+
+
+static int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
+                                  struct iw_quality qual[], int buf_size,
+                                  int aplist)
+{
+        struct ap_data *ap = local->ap;
+        struct list_head *ptr;
+        int count = 0;
+
+        spin_lock_bh(&ap->sta_table_lock);
+
+        for (ptr = ap->sta_list.next; ptr != NULL && ptr != &ap->sta_list;
+             ptr = ptr->next) {
+                struct sta_info *sta = (struct sta_info *) ptr;
+
+                if (aplist && !sta->ap)
+                        continue;
+                addr[count].sa_family = ARPHRD_ETHER;
+                memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
+                if (sta->last_rx_silence == 0)
+                        qual[count].qual = sta->last_rx_signal < 27 ?
+                                0 : (sta->last_rx_signal - 27) * 92 / 127;
+                else
+                        qual[count].qual = sta->last_rx_signal -
+                                sta->last_rx_silence - 35;
+                qual[count].level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+                qual[count].noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
+                qual[count].updated = sta->last_rx_updated;
+
+                sta->last_rx_updated = 0;
+
+                count++;
+                if (count >= buf_size)
+                        break;
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        return count;
+}
+
+
+/* Translate our list of Access Points & Stations to a card independant
+ * format that the Wireless Tools will understand - Jean II */
+static int prism2_ap_translate_scan(struct net_device *dev, char *buffer)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct ap_data *ap;
+        struct list_head *ptr;
+        struct iw_event iwe;
+        char *current_ev = buffer;
+        char *end_buf = buffer + IW_SCAN_MAX_DATA;
+#if !defined(PRISM2_NO_KERNEL_IEEE80211_MGMT)
+        char buf[64];
+#endif
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        ap = local->ap;
+
+        spin_lock_bh(&ap->sta_table_lock);
+
+        for (ptr = ap->sta_list.next; ptr != NULL && ptr != &ap->sta_list;
+             ptr = ptr->next) {
+                struct sta_info *sta = (struct sta_info *) ptr;
+
+                /* First entry *MUST* be the AP MAC address */
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = SIOCGIWAP;
+                iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+                memcpy(iwe.u.ap_addr.sa_data, sta->addr, ETH_ALEN);
+                iwe.len = IW_EV_ADDR_LEN;
+                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                                  IW_EV_ADDR_LEN);
+
+                /* Use the mode to indicate if it's a station or
+                 * an Access Point */
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = SIOCGIWMODE;
+                if (sta->ap)
+                        iwe.u.mode = IW_MODE_MASTER;
+                else
+                        iwe.u.mode = IW_MODE_INFRA;
+                iwe.len = IW_EV_UINT_LEN;
+                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                                  IW_EV_UINT_LEN);
+
+                /* Some quality */
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVQUAL;
+                if (sta->last_rx_silence == 0)
+                        iwe.u.qual.qual = sta->last_rx_signal < 27 ?
+                                0 : (sta->last_rx_signal - 27) * 92 / 127;
+                else
+                        iwe.u.qual.qual = sta->last_rx_signal -
+                                sta->last_rx_silence - 35;
+                iwe.u.qual.level = HFA384X_LEVEL_TO_dBm(sta->last_rx_signal);
+                iwe.u.qual.noise = HFA384X_LEVEL_TO_dBm(sta->last_rx_silence);
+                iwe.u.qual.updated = sta->last_rx_updated;
+                iwe.len = IW_EV_QUAL_LEN;
+                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                                  IW_EV_QUAL_LEN);
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+                if (sta->ap) {
+                        memset(&iwe, 0, sizeof(iwe));
+                        iwe.cmd = SIOCGIWESSID;
+                        iwe.u.data.length = sta->u.ap.ssid_len;
+                        iwe.u.data.flags = 1;
+                        current_ev = iwe_stream_add_point(current_ev, end_buf,
+                                                          &iwe,
+                                                          sta->u.ap.ssid);
+
+                        memset(&iwe, 0, sizeof(iwe));
+                        iwe.cmd = SIOCGIWENCODE;
+                        if (sta->capability & WLAN_CAPABILITY_PRIVACY)
+                                iwe.u.data.flags =
+                                        IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+                        else
+                                iwe.u.data.flags = IW_ENCODE_DISABLED;
+                        current_ev = iwe_stream_add_point(current_ev, end_buf,
+                                                          &iwe,
+                                                          sta->u.ap.ssid
+                                                          /* 0 byte memcpy */);
+
+                        if (sta->u.ap.channel > 0 &&
+                            sta->u.ap.channel <= FREQ_COUNT) {
+                                memset(&iwe, 0, sizeof(iwe));
+                                iwe.cmd = SIOCGIWFREQ;
+                                iwe.u.freq.m = freq_list[sta->u.ap.channel - 1]
+                                        * 100000;
+                                iwe.u.freq.e = 1;
+                                current_ev = iwe_stream_add_event(
+                                        current_ev, end_buf, &iwe,
+                                        IW_EV_FREQ_LEN);
+                        }
+
+                        memset(&iwe, 0, sizeof(iwe));
+                        iwe.cmd = IWEVCUSTOM;
+                        sprintf(buf, "beacon_interval=%d",
+                                sta->listen_interval);
+                        iwe.u.data.length = strlen(buf);
+                        current_ev = iwe_stream_add_point(current_ev, end_buf,
+                                                          &iwe, buf);
+                }
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+                sta->last_rx_updated = 0;
+
+                /* To be continued, we should make good use of IWEVCUSTOM */
+        }
+
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        return current_ev - buffer;
+}
+
+
+static int prism2_hostapd_add_sta(struct ap_data *ap,
+                                  struct prism2_hostapd_param *param)
+{
+        struct sta_info *sta;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, param->sta_addr);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (sta == NULL) {
+                sta = ap_add_sta(ap, param->sta_addr);
+                if (sta == NULL)
+                        return -1;
+        }
+
+        if (!(sta->flags & WLAN_STA_ASSOC) && !sta->ap && sta->local)
+                hostap_event_new_sta(sta->local->dev, sta);
+
+        sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
+        sta->last_rx = jiffies;
+        sta->aid = param->u.add_sta.aid;
+        sta->capability = param->u.add_sta.capability;
+        sta->tx_supp_rates = param->u.add_sta.tx_supp_rates;
+        if (sta->tx_supp_rates & WLAN_RATE_1M)
+                sta->supported_rates[0] = 2;
+        if (sta->tx_supp_rates & WLAN_RATE_2M)
+                sta->supported_rates[1] = 4;
+        if (sta->tx_supp_rates & WLAN_RATE_5M5)
+                sta->supported_rates[2] = 11;
+        if (sta->tx_supp_rates & WLAN_RATE_11M)
+                sta->supported_rates[3] = 22;
+        prism2_check_tx_rates(sta);
+        atomic_dec(&sta->users);
+        return 0;
+}
+
+
+static int prism2_hostapd_remove_sta(struct ap_data *ap,
+                                     struct prism2_hostapd_param *param)
+{
+        struct sta_info *sta;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, param->sta_addr);
+        if (sta) {
+                ap_sta_hash_del(ap, sta);
+                list_del(&sta->list);
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (!sta)
+                return -ENOENT;
+
+        if ((sta->flags & WLAN_STA_ASSOC) && !sta->ap && sta->local)
+                hostap_event_expired_sta(sta->local->dev, sta);
+        ap_free_sta(ap, sta);
+
+        return 0;
+}
+
+
+static int prism2_hostapd_get_info_sta(struct ap_data *ap,
+                                       struct prism2_hostapd_param *param)
+{
+        struct sta_info *sta;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, param->sta_addr);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (!sta)
+                return -ENOENT;
+
+        param->u.get_info_sta.inactive_sec = (jiffies - sta->last_rx) / HZ;
+
+        atomic_dec(&sta->users);
+
+        return 1;
+}
+
+
+static int prism2_hostapd_set_flags_sta(struct ap_data *ap,
+                                        struct prism2_hostapd_param *param)
+{
+        struct sta_info *sta;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, param->sta_addr);
+        if (sta) {
+                sta->flags |= param->u.set_flags_sta.flags_or;
+                sta->flags &= param->u.set_flags_sta.flags_and;
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (!sta)
+                return -ENOENT;
+
+        return 0;
+}
+
+
+static int prism2_hostapd_sta_clear_stats(struct ap_data *ap,
+                                          struct prism2_hostapd_param *param)
+{
+        struct sta_info *sta;
+        int rate;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, param->sta_addr);
+        if (sta) {
+                sta->rx_packets = sta->tx_packets = 0;
+                sta->rx_bytes = sta->tx_bytes = 0;
+                for (rate = 0; rate < WLAN_RATE_COUNT; rate++) {
+                        sta->tx_count[rate] = 0;
+                        sta->rx_count[rate] = 0;
+                }
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (!sta)
+                return -ENOENT;
+
+        return 0;
+}
+
+
+static int prism2_hostapd(struct ap_data *ap,
+                          struct prism2_hostapd_param *param)
+{
+        switch (param->cmd) {
+        case PRISM2_HOSTAPD_FLUSH:
+                ap_control_kickall(ap);
+                return 0;
+        case PRISM2_HOSTAPD_ADD_STA:
+                return prism2_hostapd_add_sta(ap, param);
+        case PRISM2_HOSTAPD_REMOVE_STA:
+                return prism2_hostapd_remove_sta(ap, param);
+        case PRISM2_HOSTAPD_GET_INFO_STA:
+                return prism2_hostapd_get_info_sta(ap, param);
+        case PRISM2_HOSTAPD_SET_FLAGS_STA:
+                return prism2_hostapd_set_flags_sta(ap, param);
+        case PRISM2_HOSTAPD_STA_CLEAR_STATS:
+                return prism2_hostapd_sta_clear_stats(ap, param);
+        default:
+                printk(KERN_WARNING "prism2_hostapd: unknown cmd=%d\n",
+                       param->cmd);
+                return -EOPNOTSUPP;
+        }
+}
+
+
+/* Update station info for host-based TX rate control and return current
+ * TX rate */
+static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
+{
+        int ret = sta->tx_rate;
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        sta->tx_count[sta->tx_rate_idx]++;
+        sta->tx_since_last_failure++;
+        sta->tx_consecutive_exc = 0;
+        if (sta->tx_since_last_failure >= WLAN_RATE_UPDATE_COUNT &&
+            sta->tx_rate_idx < sta->tx_max_rate) {
+                /* use next higher rate */
+                int old_rate, new_rate;
+                old_rate = new_rate = sta->tx_rate_idx;
+                while (new_rate < sta->tx_max_rate) {
+                        new_rate++;
+                        if (ap_tx_rate_ok(new_rate, sta, local)) {
+                                sta->tx_rate_idx = new_rate;
+                                break;
+                        }
+                }
+                if (old_rate != sta->tx_rate_idx) {
+                        switch (sta->tx_rate_idx) {
+                        case 0: sta->tx_rate = 10; break;
+                        case 1: sta->tx_rate = 20; break;
+                        case 2: sta->tx_rate = 55; break;
+                        case 3: sta->tx_rate = 110; break;
+                        default: sta->tx_rate = 0; break;
+                        }
+                        PDEBUG(DEBUG_AP, "%s: STA " MACSTR " TX rate raised to"
+                               " %d\n", dev->name, MAC2STR(sta->addr),
+                               sta->tx_rate);
+                }
+                sta->tx_since_last_failure = 0;
+        }
+
+        return ret;
+}
+
+
+/* Called only from software IRQ. Called for each TX frame prior possible
+ * encryption and transmit. */
+ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
+{
+        struct sta_info *sta = NULL;
+        struct sk_buff *skb = tx->skb;
+        int set_tim, ret;
+        struct ieee80211_hdr *hdr;
+        struct hostap_skb_tx_data *meta;
+
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+        ret = AP_TX_CONTINUE;
+        if (local->ap == NULL || skb->len < 10 ||
+            meta->iface->type == HOSTAP_INTERFACE_STA)
+                goto out;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+
+        if (hdr->addr1[0] & 0x01) {
+                /* broadcast/multicast frame - no AP related processing */
+                goto out;
+        }
+
+        /* unicast packet - check whether destination STA is associated */
+        spin_lock(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr1);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock(&local->ap->sta_table_lock);
+
+        if (local->iw_mode == IW_MODE_MASTER && sta == NULL &&
+            !(meta->flags & HOSTAP_TX_FLAGS_WDS) &&
+            meta->iface->type != HOSTAP_INTERFACE_MASTER &&
+            meta->iface->type != HOSTAP_INTERFACE_AP) {
+#if 0
+                /* This can happen, e.g., when wlan0 is added to a bridge and
+                 * bridging code does not know which port is the correct target
+                 * for a unicast frame. In this case, the packet is send to all
+                 * ports of the bridge. Since this is a valid scenario, do not
+                 * print out any errors here. */
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "AP: drop packet to non-associated "
+                               "STA " MACSTR "\n", MAC2STR(hdr->addr1));
+                }
+#endif
+                local->ap->tx_drop_nonassoc++;
+                ret = AP_TX_DROP;
+                goto out;
+        }
+
+        if (sta == NULL)
+                goto out;
+
+        if (!(sta->flags & WLAN_STA_AUTHORIZED))
+                ret = AP_TX_CONTINUE_NOT_AUTHORIZED;
+
+        /* Set tx_rate if using host-based TX rate control */
+        if (!local->fw_tx_rate_control)
+                local->ap->last_tx_rate = meta->rate =
+                        ap_update_sta_tx_rate(sta, local->dev);
+
+        if (local->iw_mode != IW_MODE_MASTER)
+                goto out;
+
+        if (!(sta->flags & WLAN_STA_PS))
+                goto out;
+
+        if (meta->flags & HOSTAP_TX_FLAGS_ADD_MOREDATA) {
+                /* indicate to STA that more frames follow */
+                hdr->frame_ctl |=
+                        __constant_cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+        }
+
+        if (meta->flags & HOSTAP_TX_FLAGS_BUFFERED_FRAME) {
+                /* packet was already buffered and now send due to
+                 * PS poll, so do not rebuffer it */
+                goto out;
+        }
+
+        if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) {
+                PDEBUG(DEBUG_PS, "%s: No more space in STA (" MACSTR ")'s PS "
+                       "mode buffer\n", local->dev->name, MAC2STR(sta->addr));
+                /* Make sure that TIM is set for the station (it might not be
+                 * after AP wlan hw reset). */
+                /* FIX: should fix hw reset to restore bits based on STA
+                 * buffer state.. */
+                hostap_set_tim(local, sta->aid, 1);
+                sta->flags |= WLAN_STA_TIM;
+                ret = AP_TX_DROP;
+                goto out;
+        }
+
+        /* STA in PS mode, buffer frame for later delivery */
+        set_tim = skb_queue_empty(&sta->tx_buf);
+        skb_queue_tail(&sta->tx_buf, skb);
+        /* FIX: could save RX time to skb and expire buffered frames after
+         * some time if STA does not poll for them */
+
+        if (set_tim) {
+                if (sta->flags & WLAN_STA_TIM)
+                        PDEBUG(DEBUG_PS2, "Re-setting TIM for aid %d\n",
+                               sta->aid);
+                hostap_set_tim(local, sta->aid, 1);
+                sta->flags |= WLAN_STA_TIM;
+        }
+
+        ret = AP_TX_BUFFERED;
+
+ out:
+        if (sta != NULL) {
+                if (ret == AP_TX_CONTINUE ||
+                    ret == AP_TX_CONTINUE_NOT_AUTHORIZED) {
+                        sta->tx_packets++;
+                        sta->tx_bytes += skb->len;
+                        sta->last_tx = jiffies;
+                }
+
+                if ((ret == AP_TX_CONTINUE ||
+                     ret == AP_TX_CONTINUE_NOT_AUTHORIZED) &&
+                    sta->crypt && tx->host_encrypt) {
+                        tx->crypt = sta->crypt;
+                        tx->sta_ptr = sta; /* hostap_handle_sta_release() will
+                                            * be called to release sta info
+                                            * later */
+                } else
+                        atomic_dec(&sta->users);
+        }
+
+        return ret;
+}
+
+
+void hostap_handle_sta_release(void *ptr)
+{
+        struct sta_info *sta = ptr;
+        atomic_dec(&sta->users);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
+{
+        struct sta_info *sta;
+        struct ieee80211_hdr *hdr;
+        struct hostap_skb_tx_data *meta;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+
+        spin_lock(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr1);
+        if (!sta) {
+                spin_unlock(&local->ap->sta_table_lock);
+                PDEBUG(DEBUG_AP, "%s: Could not find STA " MACSTR " for this "
+                       "TX error (@%lu)\n",
+                       local->dev->name, MAC2STR(hdr->addr1), jiffies);
+                return;
+        }
+
+        sta->tx_since_last_failure = 0;
+        sta->tx_consecutive_exc++;
+
+        if (sta->tx_consecutive_exc >= WLAN_RATE_DECREASE_THRESHOLD &&
+            sta->tx_rate_idx > 0 && meta->rate <= sta->tx_rate) {
+                /* use next lower rate */
+                int old, rate;
+                old = rate = sta->tx_rate_idx;
+                while (rate > 0) {
+                        rate--;
+                        if (ap_tx_rate_ok(rate, sta, local)) {
+                                sta->tx_rate_idx = rate;
+                                break;
+                        }
+                }
+                if (old != sta->tx_rate_idx) {
+                        switch (sta->tx_rate_idx) {
+                        case 0: sta->tx_rate = 10; break;
+                        case 1: sta->tx_rate = 20; break;
+                        case 2: sta->tx_rate = 55; break;
+                        case 3: sta->tx_rate = 110; break;
+                        default: sta->tx_rate = 0; break;
+                        }
+                        PDEBUG(DEBUG_AP, "%s: STA " MACSTR " TX rate lowered "
+                               "to %d\n", local->dev->name, MAC2STR(sta->addr),
+                               sta->tx_rate);
+                }
+                sta->tx_consecutive_exc = 0;
+        }
+        spin_unlock(&local->ap->sta_table_lock);
+}
+
+
+static void hostap_update_sta_ps2(local_info_t *local, struct sta_info *sta,
+                                  int pwrmgt, int type, int stype)
+{
+        if (pwrmgt && !(sta->flags & WLAN_STA_PS)) {
+                sta->flags |= WLAN_STA_PS;
+                PDEBUG(DEBUG_PS2, "STA " MACSTR " changed to use PS "
+                       "mode (type=0x%02X, stype=0x%02X)\n",
+                       MAC2STR(sta->addr), type >> 2, stype >> 4);
+        } else if (!pwrmgt && (sta->flags & WLAN_STA_PS)) {
+                sta->flags &= ~WLAN_STA_PS;
+                PDEBUG(DEBUG_PS2, "STA " MACSTR " changed to not use "
+                       "PS mode (type=0x%02X, stype=0x%02X)\n",
+                       MAC2STR(sta->addr), type >> 2, stype >> 4);
+                if (type != IEEE80211_FTYPE_CTL ||
+                    stype != IEEE80211_STYPE_PSPOLL)
+                        schedule_packet_send(local, sta);
+        }
+}
+
+
+/* Called only as a tasklet (software IRQ). Called for each RX frame to update
+ * STA power saving state. pwrmgt is a flag from 802.11 frame_ctl field. */
+int hostap_update_sta_ps(local_info_t *local, struct ieee80211_hdr *hdr)
+{
+        struct sta_info *sta;
+        u16 fc;
+
+        spin_lock(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock(&local->ap->sta_table_lock);
+
+        if (!sta)
+                return -1;
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        hostap_update_sta_ps2(local, sta, fc & IEEE80211_FCTL_PM,
+                              WLAN_FC_GET_TYPE(fc), WLAN_FC_GET_STYPE(fc));
+
+        atomic_dec(&sta->users);
+        return 0;
+}
+
+
+/* Called only as a tasklet (software IRQ). Called for each RX frame after
+ * getting RX header and payload from hardware. */
+ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
+                               struct sk_buff *skb,
+                               struct hostap_80211_rx_status *rx_stats,
+                               int wds)
+{
+        int ret;
+        struct sta_info *sta;
+        u16 fc, type, stype;
+        struct ieee80211_hdr *hdr;
+
+        if (local->ap == NULL)
+                return AP_RX_CONTINUE;
+
+        hdr = (struct ieee80211_hdr *) skb->data;
+
+        fc = le16_to_cpu(hdr->frame_ctl);
+        type = WLAN_FC_GET_TYPE(fc);
+        stype = WLAN_FC_GET_STYPE(fc);
+
+        spin_lock(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock(&local->ap->sta_table_lock);
+
+        if (sta && !(sta->flags & WLAN_STA_AUTHORIZED))
+                ret = AP_RX_CONTINUE_NOT_AUTHORIZED;
+        else
+                ret = AP_RX_CONTINUE;
+
+
+        if (fc & IEEE80211_FCTL_TODS) {
+                if (!wds && (sta == NULL || !(sta->flags & WLAN_STA_ASSOC))) {
+                        if (local->hostapd) {
+                                prism2_rx_80211(local->apdev, skb, rx_stats,
+                                                PRISM2_RX_NON_ASSOC);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+                        } else {
+                                printk(KERN_DEBUG "%s: dropped received packet"
+                                       " from non-associated STA " MACSTR
+                                       " (type=0x%02x, subtype=0x%02x)\n",
+                                       dev->name, MAC2STR(hdr->addr2),
+                                       type >> 2, stype >> 4);
+                                hostap_rx(dev, skb, rx_stats);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+                        }
+                        ret = AP_RX_EXIT;
+                        goto out;
+                }
+        } else if (fc & IEEE80211_FCTL_FROMDS) {
+                if (!wds) {
+                        /* FromDS frame - not for us; probably
+                         * broadcast/multicast in another BSS - drop */
+                        if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0) {
+                                printk(KERN_DEBUG "Odd.. FromDS packet "
+                                       "received with own BSSID\n");
+                                hostap_dump_rx_80211(dev->name, skb, rx_stats);
+                        }
+                        ret = AP_RX_DROP;
+                        goto out;
+                }
+        } else if (stype == IEEE80211_STYPE_NULLFUNC && sta == NULL &&
+                   memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN) == 0) {
+
+                if (local->hostapd) {
+                        prism2_rx_80211(local->apdev, skb, rx_stats,
+                                        PRISM2_RX_NON_ASSOC);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+                } else {
+                        /* At least Lucent f/w seems to send data::nullfunc
+                         * frames with no ToDS flag when the current AP returns
+                         * after being unavailable for some time. Speed up
+                         * re-association by informing the station about it not
+                         * being associated. */
+                        printk(KERN_DEBUG "%s: rejected received nullfunc "
+                               "frame without ToDS from not associated STA "
+                               MACSTR "\n",
+                               dev->name, MAC2STR(hdr->addr2));
+                        hostap_rx(dev, skb, rx_stats);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+                }
+                ret = AP_RX_EXIT;
+                goto out;
+        } else if (stype == IEEE80211_STYPE_NULLFUNC) {
+                /* At least Lucent cards seem to send periodic nullfunc
+                 * frames with ToDS. Let these through to update SQ
+                 * stats and PS state. Nullfunc frames do not contain
+                 * any data and they will be dropped below. */
+        } else {
+                /* If BSSID (Addr3) is foreign, this frame is a normal
+                 * broadcast frame from an IBSS network. Drop it silently.
+                 * If BSSID is own, report the dropping of this frame. */
+                if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) {
+                        printk(KERN_DEBUG "%s: dropped received packet from "
+                               MACSTR " with no ToDS flag (type=0x%02x, "
+                               "subtype=0x%02x)\n", dev->name,
+                               MAC2STR(hdr->addr2), type >> 2, stype >> 4);
+                        hostap_dump_rx_80211(dev->name, skb, rx_stats);
+                }
+                ret = AP_RX_DROP;
+                goto out;
+        }
+
+        if (sta) {
+                hostap_update_sta_ps2(local, sta, fc & IEEE80211_FCTL_PM,
+                                      type, stype);
+
+                sta->rx_packets++;
+                sta->rx_bytes += skb->len;
+                sta->last_rx = jiffies;
+        }
+
+        if (local->ap->nullfunc_ack && stype == IEEE80211_STYPE_NULLFUNC &&
+            fc & IEEE80211_FCTL_TODS) {
+                if (local->hostapd) {
+                        prism2_rx_80211(local->apdev, skb, rx_stats,
+                                        PRISM2_RX_NULLFUNC_ACK);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+                } else {
+                        /* some STA f/w's seem to require control::ACK frame
+                         * for data::nullfunc, but Prism2 f/w 0.8.0 (at least
+                         * from Compaq) does not send this.. Try to generate
+                         * ACK for these frames from the host driver to make
+                         * power saving work with, e.g., Lucent WaveLAN f/w */
+                        hostap_rx(dev, skb, rx_stats);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+                }
+                ret = AP_RX_EXIT;
+                goto out;
+        }
+
+ out:
+        if (sta)
+                atomic_dec(&sta->users);
+
+        return ret;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+int hostap_handle_sta_crypto(local_info_t *local,
+                             struct ieee80211_hdr *hdr,
+                             struct ieee80211_crypt_data **crypt,
+                             void **sta_ptr)
+{
+        struct sta_info *sta;
+
+        spin_lock(&local->ap->sta_table_lock);
+        sta = ap_get_sta(local->ap, hdr->addr2);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock(&local->ap->sta_table_lock);
+
+        if (!sta)
+                return -1;
+
+        if (sta->crypt) {
+                *crypt = sta->crypt;
+                *sta_ptr = sta;
+                /* hostap_handle_sta_release() will be called to release STA
+                 * info */
+        } else
+                atomic_dec(&sta->users);
+
+        return 0;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+int hostap_is_sta_assoc(struct ap_data *ap, u8 *sta_addr)
+{
+        struct sta_info *sta;
+        int ret = 0;
+
+        spin_lock(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, sta_addr);
+        if (sta != NULL && (sta->flags & WLAN_STA_ASSOC) && !sta->ap)
+                ret = 1;
+        spin_unlock(&ap->sta_table_lock);
+
+        return ret;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+int hostap_is_sta_authorized(struct ap_data *ap, u8 *sta_addr)
+{
+        struct sta_info *sta;
+        int ret = 0;
+
+        spin_lock(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, sta_addr);
+        if (sta != NULL && (sta->flags & WLAN_STA_ASSOC) && !sta->ap &&
+            ((sta->flags & WLAN_STA_AUTHORIZED) ||
+             ap->local->ieee_802_1x == 0))
+                ret = 1;
+        spin_unlock(&ap->sta_table_lock);
+
+        return ret;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+int hostap_add_sta(struct ap_data *ap, u8 *sta_addr)
+{
+        struct sta_info *sta;
+        int ret = 1;
+
+        if (!ap)
+                return -1;
+
+        spin_lock(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, sta_addr);
+        if (sta)
+                ret = 0;
+        spin_unlock(&ap->sta_table_lock);
+
+        if (ret == 1) {
+                sta = ap_add_sta(ap, sta_addr);
+                if (!sta)
+                        ret = -1;
+                sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;
+                sta->ap = 1;
+                memset(sta->supported_rates, 0, sizeof(sta->supported_rates));
+                /* No way of knowing which rates are supported since we did not
+                 * get supported rates element from beacon/assoc req. Assume
+                 * that remote end supports all 802.11b rates. */
+                sta->supported_rates[0] = 0x82;
+                sta->supported_rates[1] = 0x84;
+                sta->supported_rates[2] = 0x0b;
+                sta->supported_rates[3] = 0x16;
+                sta->tx_supp_rates = WLAN_RATE_1M | WLAN_RATE_2M |
+                        WLAN_RATE_5M5 | WLAN_RATE_11M;
+                sta->tx_rate = 110;
+                sta->tx_max_rate = sta->tx_rate_idx = 3;
+        }
+
+        return ret;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+int hostap_update_rx_stats(struct ap_data *ap,
+                           struct ieee80211_hdr *hdr,
+                           struct hostap_80211_rx_status *rx_stats)
+{
+        struct sta_info *sta;
+
+        if (!ap)
+                return -1;
+
+        spin_lock(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, hdr->addr2);
+        if (sta) {
+                sta->last_rx_silence = rx_stats->noise;
+                sta->last_rx_signal = rx_stats->signal;
+                sta->last_rx_rate = rx_stats->rate;
+                sta->last_rx_updated = 7;
+                if (rx_stats->rate == 10)
+                        sta->rx_count[0]++;
+                else if (rx_stats->rate == 20)
+                        sta->rx_count[1]++;
+                else if (rx_stats->rate == 55)
+                        sta->rx_count[2]++;
+                else if (rx_stats->rate == 110)
+                        sta->rx_count[3]++;
+        }
+        spin_unlock(&ap->sta_table_lock);
+
+        return sta ? 0 : -1;
+}
+
+
+void hostap_update_rates(local_info_t *local)
+{
+        struct list_head *ptr;
+        struct ap_data *ap = local->ap;
+
+        if (!ap)
+                return;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        for (ptr = ap->sta_list.next; ptr != &ap->sta_list; ptr = ptr->next) {
+                struct sta_info *sta = (struct sta_info *) ptr;
+                prism2_check_tx_rates(sta);
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+}
+
+
+static void * ap_crypt_get_ptrs(struct ap_data *ap, u8 *addr, int permanent,
+                                struct ieee80211_crypt_data ***crypt)
+{
+        struct sta_info *sta;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        sta = ap_get_sta(ap, addr);
+        if (sta)
+                atomic_inc(&sta->users);
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        if (!sta && permanent)
+                sta = ap_add_sta(ap, addr);
+
+        if (!sta)
+                return NULL;
+
+        if (permanent)
+                sta->flags |= WLAN_STA_PERM;
+
+        *crypt = &sta->crypt;
+
+        return sta;
+}
+
+
+void hostap_add_wds_links(local_info_t *local)
+{
+        struct ap_data *ap = local->ap;
+        struct list_head *ptr;
+
+        spin_lock_bh(&ap->sta_table_lock);
+        list_for_each(ptr, &ap->sta_list) {
+                struct sta_info *sta = list_entry(ptr, struct sta_info, list);
+                if (sta->ap)
+                        hostap_wds_link_oper(local, sta->addr, WDS_ADD);
+        }
+        spin_unlock_bh(&ap->sta_table_lock);
+
+        schedule_work(&local->ap->wds_oper_queue);
+}
+
+
+void hostap_wds_link_oper(local_info_t *local, u8 *addr, wds_oper_type type)
+{
+        struct wds_oper_data *entry;
+
+        entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+        if (!entry)
+                return;
+        memcpy(entry->addr, addr, ETH_ALEN);
+        entry->type = type;
+        spin_lock_bh(&local->lock);
+        entry->next = local->ap->wds_oper_entries;
+        local->ap->wds_oper_entries = entry;
+        spin_unlock_bh(&local->lock);
+
+        schedule_work(&local->ap->wds_oper_queue);
+}
+
+
+EXPORT_SYMBOL(hostap_init_data);
+EXPORT_SYMBOL(hostap_init_ap_proc);
+EXPORT_SYMBOL(hostap_free_data);
+EXPORT_SYMBOL(hostap_check_sta_fw_version);
+EXPORT_SYMBOL(hostap_handle_sta_tx);
+EXPORT_SYMBOL(hostap_handle_sta_release);
+EXPORT_SYMBOL(hostap_handle_sta_tx_exc);
+EXPORT_SYMBOL(hostap_update_sta_ps);
+EXPORT_SYMBOL(hostap_handle_sta_rx);
+EXPORT_SYMBOL(hostap_is_sta_assoc);
+EXPORT_SYMBOL(hostap_is_sta_authorized);
+EXPORT_SYMBOL(hostap_add_sta);
+EXPORT_SYMBOL(hostap_update_rates);
+EXPORT_SYMBOL(hostap_add_wds_links);
+EXPORT_SYMBOL(hostap_wds_link_oper);
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+EXPORT_SYMBOL(hostap_deauth_all_stas);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
diff --git a/drivers/net/wireless/hostap/hostap_ap.h b/drivers/net/wireless/hostap/hostap_ap.h
new file mode 100644
index 000000000000..816a52bcea8f
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_ap.h
@@ -0,0 +1,261 @@
+#ifndef HOSTAP_AP_H
+#define HOSTAP_AP_H
+
+/* AP data structures for STAs */
+
+/* maximum number of frames to buffer per STA */
+#define STA_MAX_TX_BUFFER 32
+
+/* STA flags */
+#define WLAN_STA_AUTH BIT(0)
+#define WLAN_STA_ASSOC BIT(1)
+#define WLAN_STA_PS BIT(2)
+#define WLAN_STA_TIM BIT(3) /* TIM bit is on for PS stations */
+#define WLAN_STA_PERM BIT(4) /* permanent; do not remove entry on expiration */
+#define WLAN_STA_AUTHORIZED BIT(5) /* If 802.1X is used, this flag is
+                                    * controlling whether STA is authorized to
+                                    * send and receive non-IEEE 802.1X frames
+                                    */
+#define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */
+
+#define WLAN_RATE_1M BIT(0)
+#define WLAN_RATE_2M BIT(1)
+#define WLAN_RATE_5M5 BIT(2)
+#define WLAN_RATE_11M BIT(3)
+#define WLAN_RATE_COUNT 4
+
+/* Maximum size of Supported Rates info element. IEEE 802.11 has a limit of 8,
+ * but some pre-standard IEEE 802.11g products use longer elements. */
+#define WLAN_SUPP_RATES_MAX 32
+
+/* Try to increase TX rate after # successfully sent consecutive packets */
+#define WLAN_RATE_UPDATE_COUNT 50
+
+/* Decrease TX rate after # consecutive dropped packets */
+#define WLAN_RATE_DECREASE_THRESHOLD 2
+
+struct sta_info {
+        struct list_head list;
+        struct sta_info *hnext; /* next entry in hash table list */
+        atomic_t users; /* number of users (do not remove if > 0) */
+        struct proc_dir_entry *proc;
+
+        u8 addr[6];
+        u16 aid; /* STA's unique AID (1 .. 2007) or 0 if not yet assigned */
+        u32 flags;
+        u16 capability;
+        u16 listen_interval; /* or beacon_int for APs */
+        u8 supported_rates[WLAN_SUPP_RATES_MAX];
+
+        unsigned long last_auth;
+        unsigned long last_assoc;
+        unsigned long last_rx;
+        unsigned long last_tx;
+        unsigned long rx_packets, tx_packets;
+        unsigned long rx_bytes, tx_bytes;
+        struct sk_buff_head tx_buf;
+        /* FIX: timeout buffers with an expiry time somehow derived from
+         * listen_interval */
+
+        s8 last_rx_silence; /* Noise in dBm */
+        s8 last_rx_signal; /* Signal strength in dBm */
+        u8 last_rx_rate; /* TX rate in 0.1 Mbps */
+        u8 last_rx_updated; /* IWSPY's struct iw_quality::updated */
+
+        u8 tx_supp_rates; /* bit field of supported TX rates */
+        u8 tx_rate; /* current TX rate (in 0.1 Mbps) */
+        u8 tx_rate_idx; /* current TX rate (WLAN_RATE_*) */
+        u8 tx_max_rate; /* max TX rate (WLAN_RATE_*) */
+        u32 tx_count[WLAN_RATE_COUNT]; /* number of frames sent (per rate) */
+        u32 rx_count[WLAN_RATE_COUNT]; /* number of frames received (per rate)
+                                        */
+        u32 tx_since_last_failure;
+        u32 tx_consecutive_exc;
+
+        struct ieee80211_crypt_data *crypt;
+
+        int ap; /* whether this station is an AP */
+
+        local_info_t *local;
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        union {
+                struct {
+                        char *challenge; /* shared key authentication
+                                          * challenge */
+                } sta;
+                struct {
+                        int ssid_len;
+                        unsigned char ssid[MAX_SSID_LEN + 1]; /* AP's ssid */
+                        int channel;
+                        unsigned long last_beacon; /* last RX beacon time */
+                } ap;
+        } u;
+
+        struct timer_list timer;
+        enum { STA_NULLFUNC = 0, STA_DISASSOC, STA_DEAUTH } timeout_next;
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+};
+
+
+#define MAX_STA_COUNT 1024
+
+/* Maximum number of AIDs to use for STAs; must be 2007 or lower
+ * (8802.11 limitation) */
+#define MAX_AID_TABLE_SIZE 128
+
+#define STA_HASH_SIZE 256
+#define STA_HASH(sta) (sta[5])
+
+
+/* Default value for maximum station inactivity. After AP_MAX_INACTIVITY_SEC
+ * has passed since last received frame from the station, a nullfunc data
+ * frame is sent to the station. If this frame is not acknowledged and no other
+ * frames have been received, the station will be disassociated after
+ * AP_DISASSOC_DELAY. Similarily, a the station will be deauthenticated after
+ * AP_DEAUTH_DELAY. AP_TIMEOUT_RESOLUTION is the resolution that is used with
+ * max inactivity timer. */
+#define AP_MAX_INACTIVITY_SEC (5 * 60)
+#define AP_DISASSOC_DELAY (HZ)
+#define AP_DEAUTH_DELAY (HZ)
+
+/* ap_policy: whether to accept frames to/from other APs/IBSS */
+typedef enum {
+        AP_OTHER_AP_SKIP_ALL = 0,
+        AP_OTHER_AP_SAME_SSID = 1,
+        AP_OTHER_AP_ALL = 2,
+        AP_OTHER_AP_EVEN_IBSS = 3
+} ap_policy_enum;
+
+#define PRISM2_AUTH_OPEN BIT(0)
+#define PRISM2_AUTH_SHARED_KEY BIT(1)
+
+
+/* MAC address-based restrictions */
+struct mac_entry {
+        struct list_head list;
+        u8 addr[6];
+};
+
+struct mac_restrictions {
+        enum { MAC_POLICY_OPEN = 0, MAC_POLICY_ALLOW, MAC_POLICY_DENY } policy;
+        unsigned int entries;
+        struct list_head mac_list;
+        spinlock_t lock;
+};
+
+
+struct add_sta_proc_data {
+        u8 addr[ETH_ALEN];
+        struct add_sta_proc_data *next;
+};
+
+
+typedef enum { WDS_ADD, WDS_DEL } wds_oper_type;
+struct wds_oper_data {
+        wds_oper_type type;
+        u8 addr[ETH_ALEN];
+        struct wds_oper_data *next;
+};
+
+
+struct ap_data {
+        int initialized; /* whether ap_data has been initialized */
+        local_info_t *local;
+        int bridge_packets; /* send packet to associated STAs directly to the
+                             * wireless media instead of higher layers in the
+                             * kernel */
+        unsigned int bridged_unicast; /* number of unicast frames bridged on
+                                       * wireless media */
+        unsigned int bridged_multicast; /* number of non-unicast frames
+                                         * bridged on wireless media */
+        unsigned int tx_drop_nonassoc; /* number of unicast TX packets dropped
+                                        * because they were to an address that
+                                        * was not associated */
+        int nullfunc_ack; /* use workaround for nullfunc frame ACKs */
+
+        spinlock_t sta_table_lock;
+        int num_sta; /* number of entries in sta_list */
+        struct list_head sta_list; /* STA info list head */
+        struct sta_info *sta_hash[STA_HASH_SIZE];
+
+        struct proc_dir_entry *proc;
+
+        ap_policy_enum ap_policy;
+        unsigned int max_inactivity;
+        int autom_ap_wds;
+
+        struct mac_restrictions mac_restrictions; /* MAC-based auth */
+        int last_tx_rate;
+
+        struct work_struct add_sta_proc_queue;
+        struct add_sta_proc_data *add_sta_proc_entries;
+
+        struct work_struct wds_oper_queue;
+        struct wds_oper_data *wds_oper_entries;
+
+        u16 tx_callback_idx;
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        /* pointers to STA info; based on allocated AID or NULL if AID free
+         * AID is in the range 1-2007, so sta_aid[0] corresponders to AID 1
+         * and so on
+         */
+        struct sta_info *sta_aid[MAX_AID_TABLE_SIZE];
+
+        u16 tx_callback_auth, tx_callback_assoc, tx_callback_poll;
+
+        /* WEP operations for generating challenges to be used with shared key
+         * authentication */
+        struct ieee80211_crypto_ops *crypt;
+        void *crypt_priv;
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+};
+
+
+void hostap_rx(struct net_device *dev, struct sk_buff *skb,
+               struct hostap_80211_rx_status *rx_stats);
+void hostap_init_data(local_info_t *local);
+void hostap_init_ap_proc(local_info_t *local);
+void hostap_free_data(struct ap_data *ap);
+void hostap_check_sta_fw_version(struct ap_data *ap, int sta_fw_ver);
+
+typedef enum {
+        AP_TX_CONTINUE, AP_TX_DROP, AP_TX_RETRY, AP_TX_BUFFERED,
+        AP_TX_CONTINUE_NOT_AUTHORIZED
+} ap_tx_ret;
+struct hostap_tx_data {
+        struct sk_buff *skb;
+        int host_encrypt;
+        struct ieee80211_crypt_data *crypt;
+        void *sta_ptr;
+};
+ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx);
+void hostap_handle_sta_release(void *ptr);
+void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb);
+int hostap_update_sta_ps(local_info_t *local, struct ieee80211_hdr *hdr);
+typedef enum {
+        AP_RX_CONTINUE, AP_RX_DROP, AP_RX_EXIT, AP_RX_CONTINUE_NOT_AUTHORIZED
+} ap_rx_ret;
+ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
+                               struct sk_buff *skb,
+                               struct hostap_80211_rx_status *rx_stats,
+                               int wds);
+int hostap_handle_sta_crypto(local_info_t *local, struct ieee80211_hdr *hdr,
+                             struct ieee80211_crypt_data **crypt,
+                             void **sta_ptr);
+int hostap_is_sta_assoc(struct ap_data *ap, u8 *sta_addr);
+int hostap_is_sta_authorized(struct ap_data *ap, u8 *sta_addr);
+int hostap_add_sta(struct ap_data *ap, u8 *sta_addr);
+int hostap_update_rx_stats(struct ap_data *ap, struct ieee80211_hdr *hdr,
+                           struct hostap_80211_rx_status *rx_stats);
+void hostap_update_rates(local_info_t *local);
+void hostap_add_wds_links(local_info_t *local);
+void hostap_wds_link_oper(local_info_t *local, u8 *addr, wds_oper_type type);
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+void hostap_deauth_all_stas(struct net_device *dev, struct ap_data *ap,
+                            int resend);
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+#endif /* HOSTAP_AP_H */
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h
new file mode 100644
index 000000000000..6f4fa9dc308f
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_common.h
@@ -0,0 +1,435 @@
+#ifndef HOSTAP_COMMON_H
+#define HOSTAP_COMMON_H
+
+#define BIT(x) (1 << (x))
+
+#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
+#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
+
+
+/* IEEE 802.11 defines */
+
+/* Information Element IDs */
+#define WLAN_EID_SSID 0
+#define WLAN_EID_SUPP_RATES 1
+#define WLAN_EID_FH_PARAMS 2
+#define WLAN_EID_DS_PARAMS 3
+#define WLAN_EID_CF_PARAMS 4
+#define WLAN_EID_TIM 5
+#define WLAN_EID_IBSS_PARAMS 6
+#define WLAN_EID_CHALLENGE 16
+#define WLAN_EID_RSN 48
+#define WLAN_EID_GENERIC 221
+
+
+/* HFA384X Configuration RIDs */
+#define HFA384X_RID_CNFPORTTYPE 0xFC00
+#define HFA384X_RID_CNFOWNMACADDR 0xFC01
+#define HFA384X_RID_CNFDESIREDSSID 0xFC02
+#define HFA384X_RID_CNFOWNCHANNEL 0xFC03
+#define HFA384X_RID_CNFOWNSSID 0xFC04
+#define HFA384X_RID_CNFOWNATIMWINDOW 0xFC05
+#define HFA384X_RID_CNFSYSTEMSCALE 0xFC06
+#define HFA384X_RID_CNFMAXDATALEN 0xFC07
+#define HFA384X_RID_CNFWDSADDRESS 0xFC08
+#define HFA384X_RID_CNFPMENABLED 0xFC09
+#define HFA384X_RID_CNFPMEPS 0xFC0A
+#define HFA384X_RID_CNFMULTICASTRECEIVE 0xFC0B
+#define HFA384X_RID_CNFMAXSLEEPDURATION 0xFC0C
+#define HFA384X_RID_CNFPMHOLDOVERDURATION 0xFC0D
+#define HFA384X_RID_CNFOWNNAME 0xFC0E
+#define HFA384X_RID_CNFOWNDTIMPERIOD 0xFC10
+#define HFA384X_RID_CNFWDSADDRESS1 0xFC11 /* AP f/w only */
+#define HFA384X_RID_CNFWDSADDRESS2 0xFC12 /* AP f/w only */
+#define HFA384X_RID_CNFWDSADDRESS3 0xFC13 /* AP f/w only */
+#define HFA384X_RID_CNFWDSADDRESS4 0xFC14 /* AP f/w only */
+#define HFA384X_RID_CNFWDSADDRESS5 0xFC15 /* AP f/w only */
+#define HFA384X_RID_CNFWDSADDRESS6 0xFC16 /* AP f/w only */
+#define HFA384X_RID_CNFMULTICASTPMBUFFERING 0xFC17 /* AP f/w only */
+#define HFA384X_RID_UNKNOWN1 0xFC20
+#define HFA384X_RID_UNKNOWN2 0xFC21
+#define HFA384X_RID_CNFWEPDEFAULTKEYID 0xFC23
+#define HFA384X_RID_CNFDEFAULTKEY0 0xFC24
+#define HFA384X_RID_CNFDEFAULTKEY1 0xFC25
+#define HFA384X_RID_CNFDEFAULTKEY2 0xFC26
+#define HFA384X_RID_CNFDEFAULTKEY3 0xFC27
+#define HFA384X_RID_CNFWEPFLAGS 0xFC28
+#define HFA384X_RID_CNFWEPKEYMAPPINGTABLE 0xFC29
+#define HFA384X_RID_CNFAUTHENTICATION 0xFC2A
+#define HFA384X_RID_CNFMAXASSOCSTA 0xFC2B /* AP f/w only */
+#define HFA384X_RID_CNFTXCONTROL 0xFC2C
+#define HFA384X_RID_CNFROAMINGMODE 0xFC2D
+#define HFA384X_RID_CNFHOSTAUTHENTICATION 0xFC2E /* AP f/w only */
+#define HFA384X_RID_CNFRCVCRCERROR 0xFC30
+#define HFA384X_RID_CNFMMLIFE 0xFC31
+#define HFA384X_RID_CNFALTRETRYCOUNT 0xFC32
+#define HFA384X_RID_CNFBEACONINT 0xFC33
+#define HFA384X_RID_CNFAPPCFINFO 0xFC34 /* AP f/w only */
+#define HFA384X_RID_CNFSTAPCFINFO 0xFC35
+#define HFA384X_RID_CNFPRIORITYQUSAGE 0xFC37
+#define HFA384X_RID_CNFTIMCTRL 0xFC40
+#define HFA384X_RID_UNKNOWN3 0xFC41 /* added in STA f/w 0.7.x */
+#define HFA384X_RID_CNFTHIRTY2TALLY 0xFC42 /* added in STA f/w 0.8.0 */
+#define HFA384X_RID_CNFENHSECURITY 0xFC43 /* AP f/w or STA f/w >= 1.6.3 */
+#define HFA384X_RID_CNFDBMADJUST 0xFC46 /* added in STA f/w 1.3.1 */
+#define HFA384X_RID_GENERICELEMENT 0xFC48 /* added in STA f/w 1.7.0;
+                                           * write only */
+#define HFA384X_RID_PROPAGATIONDELAY 0xFC49 /* added in STA f/w 1.7.6 */
+#define HFA384X_RID_GROUPADDRESSES 0xFC80
+#define HFA384X_RID_CREATEIBSS 0xFC81
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD 0xFC82
+#define HFA384X_RID_RTSTHRESHOLD 0xFC83
+#define HFA384X_RID_TXRATECONTROL 0xFC84
+#define HFA384X_RID_PROMISCUOUSMODE 0xFC85
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD0 0xFC90 /* AP f/w only */
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD1 0xFC91 /* AP f/w only */
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD2 0xFC92 /* AP f/w only */
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD3 0xFC93 /* AP f/w only */
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD4 0xFC94 /* AP f/w only */
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD5 0xFC95 /* AP f/w only */
+#define HFA384X_RID_FRAGMENTATIONTHRESHOLD6 0xFC96 /* AP f/w only */
+#define HFA384X_RID_RTSTHRESHOLD0 0xFC97 /* AP f/w only */
+#define HFA384X_RID_RTSTHRESHOLD1 0xFC98 /* AP f/w only */
+#define HFA384X_RID_RTSTHRESHOLD2 0xFC99 /* AP f/w only */
+#define HFA384X_RID_RTSTHRESHOLD3 0xFC9A /* AP f/w only */
+#define HFA384X_RID_RTSTHRESHOLD4 0xFC9B /* AP f/w only */
+#define HFA384X_RID_RTSTHRESHOLD5 0xFC9C /* AP f/w only */
+#define HFA384X_RID_RTSTHRESHOLD6 0xFC9D /* AP f/w only */
+#define HFA384X_RID_TXRATECONTROL0 0xFC9E /* AP f/w only */
+#define HFA384X_RID_TXRATECONTROL1 0xFC9F /* AP f/w only */
+#define HFA384X_RID_TXRATECONTROL2 0xFCA0 /* AP f/w only */
+#define HFA384X_RID_TXRATECONTROL3 0xFCA1 /* AP f/w only */
+#define HFA384X_RID_TXRATECONTROL4 0xFCA2 /* AP f/w only */
+#define HFA384X_RID_TXRATECONTROL5 0xFCA3 /* AP f/w only */
+#define HFA384X_RID_TXRATECONTROL6 0xFCA4 /* AP f/w only */
+#define HFA384X_RID_CNFSHORTPREAMBLE 0xFCB0
+#define HFA384X_RID_CNFEXCLUDELONGPREAMBLE 0xFCB1
+#define HFA384X_RID_CNFAUTHENTICATIONRSPTO 0xFCB2
+#define HFA384X_RID_CNFBASICRATES 0xFCB3
+#define HFA384X_RID_CNFSUPPORTEDRATES 0xFCB4
+#define HFA384X_RID_CNFFALLBACKCTRL 0xFCB5 /* added in STA f/w 1.3.1 */
+#define HFA384X_RID_WEPKEYDISABLE 0xFCB6 /* added in STA f/w 1.3.1 */
+#define HFA384X_RID_WEPKEYMAPINDEX 0xFCB7 /* ? */
+#define HFA384X_RID_BROADCASTKEYID 0xFCB8 /* ? */
+#define HFA384X_RID_ENTSECFLAGEYID 0xFCB9 /* ? */
+#define HFA384X_RID_CNFPASSIVESCANCTRL 0xFCBA /* added in STA f/w 1.5.0 */
+#define HFA384X_RID_SSNHANDLINGMODE 0xFCBB /* added in STA f/w 1.7.0 */
+#define HFA384X_RID_MDCCONTROL 0xFCBC /* added in STA f/w 1.7.0 */
+#define HFA384X_RID_MDCCOUNTRY 0xFCBD /* added in STA f/w 1.7.0 */
+#define HFA384X_RID_TXPOWERMAX 0xFCBE /* added in STA f/w 1.7.0 */
+#define HFA384X_RID_CNFLFOENABLED 0xFCBF /* added in STA f/w 1.6.3 */
+#define HFA384X_RID_CAPINFO 0xFCC0 /* added in STA f/w 1.7.0 */
+#define HFA384X_RID_LISTENINTERVAL 0xFCC1 /* added in STA f/w 1.7.0 */
+#define HFA384X_RID_SW_ANT_DIV 0xFCC2 /* added in STA f/w 1.7.0; Prism3 */
+#define HFA384X_RID_LED_CTRL 0xFCC4 /* added in STA f/w 1.7.6 */
+#define HFA384X_RID_HFODELAY 0xFCC5 /* added in STA f/w 1.7.6 */
+#define HFA384X_RID_DISALLOWEDBSSID 0xFCC6 /* added in STA f/w 1.8.0 */
+#define HFA384X_RID_TICKTIME 0xFCE0
+#define HFA384X_RID_SCANREQUEST 0xFCE1
+#define HFA384X_RID_JOINREQUEST 0xFCE2
+#define HFA384X_RID_AUTHENTICATESTATION 0xFCE3 /* AP f/w only */
+#define HFA384X_RID_CHANNELINFOREQUEST 0xFCE4 /* AP f/w only */
+#define HFA384X_RID_HOSTSCAN 0xFCE5 /* added in STA f/w 1.3.1 */
+
+/* HFA384X Information RIDs */
+#define HFA384X_RID_MAXLOADTIME 0xFD00
+#define HFA384X_RID_DOWNLOADBUFFER 0xFD01
+#define HFA384X_RID_PRIID 0xFD02
+#define HFA384X_RID_PRISUPRANGE 0xFD03
+#define HFA384X_RID_CFIACTRANGES 0xFD04
+#define HFA384X_RID_NICSERNUM 0xFD0A
+#define HFA384X_RID_NICID 0xFD0B
+#define HFA384X_RID_MFISUPRANGE 0xFD0C
+#define HFA384X_RID_CFISUPRANGE 0xFD0D
+#define HFA384X_RID_CHANNELLIST 0xFD10
+#define HFA384X_RID_REGULATORYDOMAINS 0xFD11
+#define HFA384X_RID_TEMPTYPE 0xFD12
+#define HFA384X_RID_CIS 0xFD13
+#define HFA384X_RID_STAID 0xFD20
+#define HFA384X_RID_STASUPRANGE 0xFD21
+#define HFA384X_RID_MFIACTRANGES 0xFD22
+#define HFA384X_RID_CFIACTRANGES2 0xFD23
+#define HFA384X_RID_PRODUCTNAME 0xFD24 /* added in STA f/w 1.3.1;
+                                        * only Prism2.5(?) */
+#define HFA384X_RID_PORTSTATUS 0xFD40
+#define HFA384X_RID_CURRENTSSID 0xFD41
+#define HFA384X_RID_CURRENTBSSID 0xFD42
+#define HFA384X_RID_COMMSQUALITY 0xFD43
+#define HFA384X_RID_CURRENTTXRATE 0xFD44
+#define HFA384X_RID_CURRENTBEACONINTERVAL 0xFD45
+#define HFA384X_RID_CURRENTSCALETHRESHOLDS 0xFD46
+#define HFA384X_RID_PROTOCOLRSPTIME 0xFD47
+#define HFA384X_RID_SHORTRETRYLIMIT 0xFD48
+#define HFA384X_RID_LONGRETRYLIMIT 0xFD49
+#define HFA384X_RID_MAXTRANSMITLIFETIME 0xFD4A
+#define HFA384X_RID_MAXRECEIVELIFETIME 0xFD4B
+#define HFA384X_RID_CFPOLLABLE 0xFD4C
+#define HFA384X_RID_AUTHENTICATIONALGORITHMS 0xFD4D
+#define HFA384X_RID_PRIVACYOPTIONIMPLEMENTED 0xFD4F
+#define HFA384X_RID_DBMCOMMSQUALITY 0xFD51 /* added in STA f/w 1.3.1 */
+#define HFA384X_RID_CURRENTTXRATE1 0xFD80 /* AP f/w only */
+#define HFA384X_RID_CURRENTTXRATE2 0xFD81 /* AP f/w only */
+#define HFA384X_RID_CURRENTTXRATE3 0xFD82 /* AP f/w only */
+#define HFA384X_RID_CURRENTTXRATE4 0xFD83 /* AP f/w only */
+#define HFA384X_RID_CURRENTTXRATE5 0xFD84 /* AP f/w only */
+#define HFA384X_RID_CURRENTTXRATE6 0xFD85 /* AP f/w only */
+#define HFA384X_RID_OWNMACADDR 0xFD86 /* AP f/w only */
+#define HFA384X_RID_SCANRESULTSTABLE 0xFD88 /* added in STA f/w 0.8.3 */
+#define HFA384X_RID_HOSTSCANRESULTS 0xFD89 /* added in STA f/w 1.3.1 */
+#define HFA384X_RID_AUTHENTICATIONUSED 0xFD8A /* added in STA f/w 1.3.4 */
+#define HFA384X_RID_CNFFAASWITCHCTRL 0xFD8B /* added in STA f/w 1.6.3 */
+#define HFA384X_RID_ASSOCIATIONFAILURE 0xFD8D /* added in STA f/w 1.8.0 */
+#define HFA384X_RID_PHYTYPE 0xFDC0
+#define HFA384X_RID_CURRENTCHANNEL 0xFDC1
+#define HFA384X_RID_CURRENTPOWERSTATE 0xFDC2
+#define HFA384X_RID_CCAMODE 0xFDC3
+#define HFA384X_RID_SUPPORTEDDATARATES 0xFDC6
+#define HFA384X_RID_LFO_VOLT_REG_TEST_RES 0xFDC7 /* added in STA f/w 1.7.1 */
+#define HFA384X_RID_BUILDSEQ 0xFFFE
+#define HFA384X_RID_FWID 0xFFFF
+
+
+struct hfa384x_comp_ident
+{
+        u16 id;
+        u16 variant;
+        u16 major;
+        u16 minor;
+} __attribute__ ((packed));
+
+#define HFA384X_COMP_ID_PRI 0x15
+#define HFA384X_COMP_ID_STA 0x1f
+#define HFA384X_COMP_ID_FW_AP 0x14b
+
+struct hfa384x_sup_range
+{
+        u16 role;
+        u16 id;
+        u16 variant;
+        u16 bottom;
+        u16 top;
+} __attribute__ ((packed));
+
+
+struct hfa384x_build_id
+{
+        u16 pri_seq;
+        u16 sec_seq;
+} __attribute__ ((packed));
+
+/* FD01 - Download Buffer */
+struct hfa384x_rid_download_buffer
+{
+        u16 page;
+        u16 offset;
+        u16 length;
+} __attribute__ ((packed));
+
+/* BSS connection quality (RID FD43 range, RID FD51 dBm-normalized) */
+struct hfa384x_comms_quality {
+        u16 comm_qual; /* 0 .. 92 */
+        u16 signal_level; /* 27 .. 154 */
+        u16 noise_level; /* 27 .. 154 */
+} __attribute__ ((packed));
+
+
+/* netdevice private ioctls (used, e.g., with iwpriv from user space) */
+
+/* New wireless extensions API - SET/GET convention (even ioctl numbers are
+ * root only)
+ */
+#define PRISM2_IOCTL_PRISM2_PARAM (SIOCIWFIRSTPRIV + 0)
+#define PRISM2_IOCTL_GET_PRISM2_PARAM (SIOCIWFIRSTPRIV + 1)
+#define PRISM2_IOCTL_WRITEMIF (SIOCIWFIRSTPRIV + 2)
+#define PRISM2_IOCTL_READMIF (SIOCIWFIRSTPRIV + 3)
+#define PRISM2_IOCTL_MONITOR (SIOCIWFIRSTPRIV + 4)
+#define PRISM2_IOCTL_RESET (SIOCIWFIRSTPRIV + 6)
+#define PRISM2_IOCTL_INQUIRE (SIOCIWFIRSTPRIV + 8)
+#define PRISM2_IOCTL_WDS_ADD (SIOCIWFIRSTPRIV + 10)
+#define PRISM2_IOCTL_WDS_DEL (SIOCIWFIRSTPRIV + 12)
+#define PRISM2_IOCTL_SET_RID_WORD (SIOCIWFIRSTPRIV + 14)
+#define PRISM2_IOCTL_MACCMD (SIOCIWFIRSTPRIV + 16)
+#define PRISM2_IOCTL_ADDMAC (SIOCIWFIRSTPRIV + 18)
+#define PRISM2_IOCTL_DELMAC (SIOCIWFIRSTPRIV + 20)
+#define PRISM2_IOCTL_KICKMAC (SIOCIWFIRSTPRIV + 22)
+
+/* following are not in SIOCGIWPRIV list; check permission in the driver code
+ */
+#define PRISM2_IOCTL_DOWNLOAD (SIOCDEVPRIVATE + 13)
+#define PRISM2_IOCTL_HOSTAPD (SIOCDEVPRIVATE + 14)
+
+
+/* PRISM2_IOCTL_PRISM2_PARAM ioctl() subtypes: */
+enum {
+        /* PRISM2_PARAM_PTYPE = 1, */ /* REMOVED 2003-10-22 */
+        PRISM2_PARAM_TXRATECTRL = 2,
+        PRISM2_PARAM_BEACON_INT = 3,
+        PRISM2_PARAM_PSEUDO_IBSS = 4,
+        PRISM2_PARAM_ALC = 5,
+        /* PRISM2_PARAM_TXPOWER = 6, */ /* REMOVED 2003-10-22 */
+        PRISM2_PARAM_DUMP = 7,
+        PRISM2_PARAM_OTHER_AP_POLICY = 8,
+        PRISM2_PARAM_AP_MAX_INACTIVITY = 9,
+        PRISM2_PARAM_AP_BRIDGE_PACKETS = 10,
+        PRISM2_PARAM_DTIM_PERIOD = 11,
+        PRISM2_PARAM_AP_NULLFUNC_ACK = 12,
+        PRISM2_PARAM_MAX_WDS = 13,
+        PRISM2_PARAM_AP_AUTOM_AP_WDS = 14,
+        PRISM2_PARAM_AP_AUTH_ALGS = 15,
+        PRISM2_PARAM_MONITOR_ALLOW_FCSERR = 16,
+        PRISM2_PARAM_HOST_ENCRYPT = 17,
+        PRISM2_PARAM_HOST_DECRYPT = 18,
+        /* PRISM2_PARAM_BUS_MASTER_THRESHOLD_RX = 19, REMOVED 2005-08-14 */
+        /* PRISM2_PARAM_BUS_MASTER_THRESHOLD_TX = 20, REMOVED 2005-08-14 */
+        PRISM2_PARAM_HOST_ROAMING = 21,
+        PRISM2_PARAM_BCRX_STA_KEY = 22,
+        PRISM2_PARAM_IEEE_802_1X = 23,
+        PRISM2_PARAM_ANTSEL_TX = 24,
+        PRISM2_PARAM_ANTSEL_RX = 25,
+        PRISM2_PARAM_MONITOR_TYPE = 26,
+        PRISM2_PARAM_WDS_TYPE = 27,
+        PRISM2_PARAM_HOSTSCAN = 28,
+        PRISM2_PARAM_AP_SCAN = 29,
+        PRISM2_PARAM_ENH_SEC = 30,
+        PRISM2_PARAM_IO_DEBUG = 31,
+        PRISM2_PARAM_BASIC_RATES = 32,
+        PRISM2_PARAM_OPER_RATES = 33,
+        PRISM2_PARAM_HOSTAPD = 34,
+        PRISM2_PARAM_HOSTAPD_STA = 35,
+        PRISM2_PARAM_WPA = 36,
+        PRISM2_PARAM_PRIVACY_INVOKED = 37,
+        PRISM2_PARAM_TKIP_COUNTERMEASURES = 38,
+        PRISM2_PARAM_DROP_UNENCRYPTED = 39,
+        PRISM2_PARAM_SCAN_CHANNEL_MASK = 40,
+};
+
+enum { HOSTAP_ANTSEL_DO_NOT_TOUCH = 0, HOSTAP_ANTSEL_DIVERSITY = 1,
+       HOSTAP_ANTSEL_LOW = 2, HOSTAP_ANTSEL_HIGH = 3 };
+
+
+/* PRISM2_IOCTL_MACCMD ioctl() subcommands: */
+enum { AP_MAC_CMD_POLICY_OPEN = 0, AP_MAC_CMD_POLICY_ALLOW = 1,
+       AP_MAC_CMD_POLICY_DENY = 2, AP_MAC_CMD_FLUSH = 3,
+       AP_MAC_CMD_KICKALL = 4 };
+
+
+/* PRISM2_IOCTL_DOWNLOAD ioctl() dl_cmd: */
+enum {
+        PRISM2_DOWNLOAD_VOLATILE = 1 /* RAM */,
+        /* Note! Old versions of prism2_srec have a fatal error in CRC-16
+         * calculation, which will corrupt all non-volatile downloads.
+         * PRISM2_DOWNLOAD_NON_VOLATILE used to be 2, but it is now 3 to
+         * prevent use of old versions of prism2_srec for non-volatile
+         * download. */
+        PRISM2_DOWNLOAD_NON_VOLATILE = 3 /* FLASH */,
+        PRISM2_DOWNLOAD_VOLATILE_GENESIS = 4 /* RAM in Genesis mode */,
+        /* Persistent versions of volatile download commands (keep firmware
+         * data in memory and automatically re-download after hw_reset */
+        PRISM2_DOWNLOAD_VOLATILE_PERSISTENT = 5,
+        PRISM2_DOWNLOAD_VOLATILE_GENESIS_PERSISTENT = 6,
+};
+
+struct prism2_download_param {
+        u32 dl_cmd;
+        u32 start_addr;
+        u32 num_areas;
+        struct prism2_download_area {
+                u32 addr; /* wlan card address */
+                u32 len;
+                void __user *ptr; /* pointer to data in user space */
+        } data[0];
+};
+
+#define PRISM2_MAX_DOWNLOAD_AREA_LEN 131072
+#define PRISM2_MAX_DOWNLOAD_LEN 262144
+
+
+/* PRISM2_IOCTL_HOSTAPD ioctl() cmd: */
+enum {
+        PRISM2_HOSTAPD_FLUSH = 1,
+        PRISM2_HOSTAPD_ADD_STA = 2,
+        PRISM2_HOSTAPD_REMOVE_STA = 3,
+        PRISM2_HOSTAPD_GET_INFO_STA = 4,
+        /* REMOVED: PRISM2_HOSTAPD_RESET_TXEXC_STA = 5, */
+        PRISM2_SET_ENCRYPTION = 6,
+        PRISM2_GET_ENCRYPTION = 7,
+        PRISM2_HOSTAPD_SET_FLAGS_STA = 8,
+        PRISM2_HOSTAPD_GET_RID = 9,
+        PRISM2_HOSTAPD_SET_RID = 10,
+        PRISM2_HOSTAPD_SET_ASSOC_AP_ADDR = 11,
+        PRISM2_HOSTAPD_SET_GENERIC_ELEMENT = 12,
+        PRISM2_HOSTAPD_MLME = 13,
+        PRISM2_HOSTAPD_SCAN_REQ = 14,
+        PRISM2_HOSTAPD_STA_CLEAR_STATS = 15,
+};
+
+#define PRISM2_HOSTAPD_MAX_BUF_SIZE 1024
+#define PRISM2_HOSTAPD_RID_HDR_LEN \
+((int) (&((struct prism2_hostapd_param *) 0)->u.rid.data))
+#define PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN \
+((int) (&((struct prism2_hostapd_param *) 0)->u.generic_elem.data))
+
+/* Maximum length for algorithm names (-1 for nul termination) used in ioctl()
+ */
+#define HOSTAP_CRYPT_ALG_NAME_LEN 16
+
+
+struct prism2_hostapd_param {
+        u32 cmd;
+        u8 sta_addr[ETH_ALEN];
+        union {
+                struct {
+                        u16 aid;
+                        u16 capability;
+                        u8 tx_supp_rates;
+                } add_sta;
+                struct {
+                        u32 inactive_sec;
+                } get_info_sta;
+                struct {
+                        u8 alg[HOSTAP_CRYPT_ALG_NAME_LEN];
+                        u32 flags;
+                        u32 err;
+                        u8 idx;
+                        u8 seq[8]; /* sequence counter (set: RX, get: TX) */
+                        u16 key_len;
+                        u8 key[0];
+                } crypt;
+                struct {
+                        u32 flags_and;
+                        u32 flags_or;
+                } set_flags_sta;
+                struct {
+                        u16 rid;
+                        u16 len;
+                        u8 data[0];
+                } rid;
+                struct {
+                        u8 len;
+                        u8 data[0];
+                } generic_elem;
+                struct {
+#define MLME_STA_DEAUTH 0
+#define MLME_STA_DISASSOC 1
+                        u16 cmd;
+                        u16 reason_code;
+                } mlme;
+                struct {
+                        u8 ssid_len;
+                        u8 ssid[32];
+                } scan_req;
+        } u;
+};
+
+#define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT(0)
+#define HOSTAP_CRYPT_FLAG_PERMANENT BIT(1)
+
+#define HOSTAP_CRYPT_ERR_UNKNOWN_ALG 2
+#define HOSTAP_CRYPT_ERR_UNKNOWN_ADDR 3
+#define HOSTAP_CRYPT_ERR_CRYPT_INIT_FAILED 4
+#define HOSTAP_CRYPT_ERR_KEY_SET_FAILED 5
+#define HOSTAP_CRYPT_ERR_TX_KEY_SET_FAILED 6
+#define HOSTAP_CRYPT_ERR_CARD_CONF_FAILED 7
+
+
+#endif /* HOSTAP_COMMON_H */
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
new file mode 100644
index 000000000000..7ed3425d08c1
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -0,0 +1,55 @@
+#ifndef HOSTAP_CONFIG_H
+#define HOSTAP_CONFIG_H
+
+#define PRISM2_VERSION "0.4.4-kernel"
+
+/* In the previous versions of Host AP driver, support for user space version
+ * of IEEE 802.11 management (hostapd) used to be disabled in the default
+ * configuration. From now on, support for hostapd is always included and it is
+ * possible to disable kernel driver version of IEEE 802.11 management with a
+ * separate define, PRISM2_NO_KERNEL_IEEE80211_MGMT. */
+/* #define PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+/* Maximum number of events handler per one interrupt */
+#define PRISM2_MAX_INTERRUPT_EVENTS 20
+
+/* Include code for downloading firmware images into volatile RAM. */
+#define PRISM2_DOWNLOAD_SUPPORT
+
+/* Allow kernel configuration to enable download support. */
+#if !defined(PRISM2_DOWNLOAD_SUPPORT) && defined(CONFIG_HOSTAP_FIRMWARE)
+#define PRISM2_DOWNLOAD_SUPPORT
+#endif
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+/* Allow writing firmware images into flash, i.e., to non-volatile storage.
+ * Before you enable this option, you should make absolutely sure that you are
+ * using prism2_srec utility that comes with THIS version of the driver!
+ * In addition, please note that it is possible to kill your card with
+ * non-volatile download if you are using incorrect image. This feature has not
+ * been fully tested, so please be careful with it. */
+/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+/* Save low-level I/O for debugging. This should not be enabled in normal use.
+ */
+/* #define PRISM2_IO_DEBUG */
+
+/* Following defines can be used to remove unneeded parts of the driver, e.g.,
+ * to limit the size of the kernel module. Definitions can be added here in
+ * hostap_config.h or they can be added to make command with EXTRA_CFLAGS,
+ * e.g.,
+ * 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
+ */
+
+/* Do not include debug messages into the driver */
+/* #define PRISM2_NO_DEBUG */
+
+/* Do not include /proc/net/prism2/wlan#/{registers,debug} */
+/* #define PRISM2_NO_PROCFS_DEBUG */
+
+/* Do not include station functionality (i.e., allow only Master (Host AP) mode
+ */
+/* #define PRISM2_NO_STATION_MODES */
+
+#endif /* HOSTAP_CONFIG_H */
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
new file mode 100644
index 000000000000..faa83badf0a1
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -0,0 +1,1030 @@
+#define PRISM2_PCCARD
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/if.h>
+#include <linux/wait.h>
+#include <linux/timer.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/workqueue.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/cisreg.h>
+#include <pcmcia/ds.h>
+
+#include <asm/io.h>
+
+#include "hostap_wlan.h"
+
+
+static char *version = PRISM2_VERSION " (Jouni Malinen <jkmaline@cc.hut.fi>)";
+static dev_info_t dev_info = "hostap_cs";
+static dev_link_t *dev_list = NULL;
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
+                   "cards (PC Card).");
+MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PC Card)");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
+
+
+static int ignore_cis_vcc;
+module_param(ignore_cis_vcc, int, 0444);
+MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");
+
+
+/* struct local_info::hw_priv */
+struct hostap_cs_priv {
+        dev_node_t node;
+        dev_link_t *link;
+        int sandisk_connectplus;
+};
+
+
+#ifdef PRISM2_IO_DEBUG
+
+static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);
+        outb(v, dev->base_addr + a);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+        u8 v;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        spin_lock_irqsave(&local->lock, flags);
+        v = inb(dev->base_addr + a);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);
+        spin_unlock_irqrestore(&local->lock, flags);
+        return v;
+}
+
+static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);
+        outw(v, dev->base_addr + a);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+        u16 v;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        spin_lock_irqsave(&local->lock, flags);
+        v = inw(dev->base_addr + a);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);
+        spin_unlock_irqrestore(&local->lock, flags);
+        return v;
+}
+
+static inline void hfa384x_outsw_debug(struct net_device *dev, int a,
+                                       u8 *buf, int wc)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTSW, a, wc);
+        outsw(dev->base_addr + a, buf, wc);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline void hfa384x_insw_debug(struct net_device *dev, int a,
+                                      u8 *buf, int wc)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INSW, a, wc);
+        insw(dev->base_addr + a, buf, wc);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+#define HFA384X_OUTB(v,a) hfa384x_outb_debug(dev, (a), (v))
+#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))
+#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))
+#define HFA384X_INW(a) hfa384x_inw_debug(dev, (a))
+#define HFA384X_OUTSW(a, buf, wc) hfa384x_outsw_debug(dev, (a), (buf), (wc))
+#define HFA384X_INSW(a, buf, wc) hfa384x_insw_debug(dev, (a), (buf), (wc))
+
+#else /* PRISM2_IO_DEBUG */
+
+#define HFA384X_OUTB(v,a) outb((v), dev->base_addr + (a))
+#define HFA384X_INB(a) inb(dev->base_addr + (a))
+#define HFA384X_OUTW(v,a) outw((v), dev->base_addr + (a))
+#define HFA384X_INW(a) inw(dev->base_addr + (a))
+#define HFA384X_INSW(a, buf, wc) insw(dev->base_addr + (a), buf, wc)
+#define HFA384X_OUTSW(a, buf, wc) outsw(dev->base_addr + (a), buf, wc)
+
+#endif /* PRISM2_IO_DEBUG */
+
+
+static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf,
+                            int len)
+{
+        u16 d_off;
+        u16 *pos;
+
+        d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+        pos = (u16 *) buf;
+
+        if (len / 2)
+                HFA384X_INSW(d_off, buf, len / 2);
+        pos += len / 2;
+
+        if (len & 1)
+                *((char *) pos) = HFA384X_INB(d_off);
+
+        return 0;
+}
+
+
+static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)
+{
+        u16 d_off;
+        u16 *pos;
+
+        d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+        pos = (u16 *) buf;
+
+        if (len / 2)
+                HFA384X_OUTSW(d_off, buf, len / 2);
+        pos += len / 2;
+
+        if (len & 1)
+                HFA384X_OUTB(*((char *) pos), d_off);
+
+        return 0;
+}
+
+
+/* FIX: This might change at some point.. */
+#include "hostap_hw.c"
+
+
+
+static void prism2_detach(dev_link_t *link);
+static void prism2_release(u_long arg);
+static int prism2_event(event_t event, int priority,
+                        event_callback_args_t *args);
+
+
+static int prism2_pccard_card_present(local_info_t *local)
+{
+        struct hostap_cs_priv *hw_priv = local->hw_priv;
+        if (hw_priv != NULL && hw_priv->link != NULL &&
+            ((hw_priv->link->state & (DEV_PRESENT | DEV_CONFIG)) ==
+             (DEV_PRESENT | DEV_CONFIG)))
+                return 1;
+        return 0;
+}
+
+
+/*
+ * SanDisk CompactFlash WLAN Flashcard - Product Manual v1.0
+ * Document No. 20-10-00058, January 2004
+ * http://www.sandisk.com/pdf/industrial/ProdManualCFWLANv1.0.pdf
+ */
+#define SANDISK_WLAN_ACTIVATION_OFF 0x40
+#define SANDISK_HCR_OFF 0x42
+
+
+static void sandisk_set_iobase(local_info_t *local)
+{
+        int res;
+        conf_reg_t reg;
+        struct hostap_cs_priv *hw_priv = local->hw_priv;
+
+        reg.Function = 0;
+        reg.Action = CS_WRITE;
+        reg.Offset = 0x10; /* 0x3f0 IO base 1 */
+        reg.Value = hw_priv->link->io.BasePort1 & 0x00ff;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 0 -"
+                       " res=%d\n", res);
+        }
+        udelay(10);
+
+        reg.Function = 0;
+        reg.Action = CS_WRITE;
+        reg.Offset = 0x12; /* 0x3f2 IO base 2 */
+        reg.Value = (hw_priv->link->io.BasePort1 & 0xff00) >> 8;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "Prism3 SanDisk - failed to set I/O base 1 -"
+                       " res=%d\n", res);
+        }
+}
+
+
+static void sandisk_write_hcr(local_info_t *local, int hcr)
+{
+        struct net_device *dev = local->dev;
+        int i;
+
+        HFA384X_OUTB(0x80, SANDISK_WLAN_ACTIVATION_OFF);
+        udelay(50);
+        for (i = 0; i < 10; i++) {
+                HFA384X_OUTB(hcr, SANDISK_HCR_OFF);
+        }
+        udelay(55);
+        HFA384X_OUTB(0x45, SANDISK_WLAN_ACTIVATION_OFF);
+}
+
+
+static int sandisk_enable_wireless(struct net_device *dev)
+{
+        int res, ret = 0;
+        conf_reg_t reg;
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+        tuple_t tuple;
+        cisparse_t *parse = NULL;
+        u_char buf[64];
+        struct hostap_cs_priv *hw_priv = local->hw_priv;
+
+        if (hw_priv->link->io.NumPorts1 < 0x42) {
+                /* Not enough ports to be SanDisk multi-function card */
+                ret = -ENODEV;
+                goto done;
+        }
+
+        parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
+        if (parse == NULL) {
+                ret = -ENOMEM;
+                goto done;
+        }
+
+        tuple.DesiredTuple = CISTPL_MANFID;
+        tuple.Attributes = TUPLE_RETURN_COMMON;
+        tuple.TupleData = buf;
+        tuple.TupleDataMax = sizeof(buf);
+        tuple.TupleOffset = 0;
+        if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
+            pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
+            pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
+            parse->manfid.manf != 0xd601 || parse->manfid.card != 0x0101) {
+                /* No SanDisk manfid found */
+                ret = -ENODEV;
+                goto done;
+        }
+
+        tuple.DesiredTuple = CISTPL_LONGLINK_MFC;
+        if (pcmcia_get_first_tuple(hw_priv->link->handle, &tuple) ||
+            pcmcia_get_tuple_data(hw_priv->link->handle, &tuple) ||
+            pcmcia_parse_tuple(hw_priv->link->handle, &tuple, parse) ||
+                parse->longlink_mfc.nfn < 2) {
+                /* No multi-function links found */
+                ret = -ENODEV;
+                goto done;
+        }
+
+        printk(KERN_DEBUG "%s: Multi-function SanDisk ConnectPlus detected"
+               " - using vendor-specific initialization\n", dev->name);
+        hw_priv->sandisk_connectplus = 1;
+
+        reg.Function = 0;
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_COR;
+        reg.Value = COR_SOFT_RESET;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
+                       dev->name, res);
+                goto done;
+        }
+        mdelay(5);
+
+        reg.Function = 0;
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_COR;
+        /*
+         * Do not enable interrupts here to avoid some bogus events. Interrupts
+         * will be enabled during the first cor_sreset call.
+         */
+        reg.Value = COR_LEVEL_REQ | 0x8 | COR_ADDR_DECODE | COR_FUNC_ENA;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "%s: SanDisk - COR sreset failed (%d)\n",
+                       dev->name, res);
+                goto done;
+        }
+        mdelay(5);
+
+        sandisk_set_iobase(local);
+
+        HFA384X_OUTB(0xc5, SANDISK_WLAN_ACTIVATION_OFF);
+        udelay(10);
+        HFA384X_OUTB(0x4b, SANDISK_WLAN_ACTIVATION_OFF);
+        udelay(10);
+
+done:
+        kfree(parse);
+        return ret;
+}
+
+
+static void prism2_pccard_cor_sreset(local_info_t *local)
+{
+        int res;
+        conf_reg_t reg;
+        struct hostap_cs_priv *hw_priv = local->hw_priv;
+
+        if (!prism2_pccard_card_present(local))
+               return;
+
+        reg.Function = 0;
+        reg.Action = CS_READ;
+        reg.Offset = CISREG_COR;
+        reg.Value = 0;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 1 (%d)\n",
+                       res);
+                return;
+        }
+        printk(KERN_DEBUG "prism2_pccard_cor_sreset: original COR %02x\n",
+               reg.Value);
+
+        reg.Action = CS_WRITE;
+        reg.Value |= COR_SOFT_RESET;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 2 (%d)\n",
+                       res);
+                return;
+        }
+
+        mdelay(hw_priv->sandisk_connectplus ? 5 : 2);
+
+        reg.Value &= ~COR_SOFT_RESET;
+        if (hw_priv->sandisk_connectplus)
+                reg.Value |= COR_IREQ_ENA;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "prism2_pccard_cor_sreset failed 3 (%d)\n",
+                       res);
+                return;
+        }
+
+        mdelay(hw_priv->sandisk_connectplus ? 5 : 2);
+
+        if (hw_priv->sandisk_connectplus)
+                sandisk_set_iobase(local);
+}
+
+
+static void prism2_pccard_genesis_reset(local_info_t *local, int hcr)
+{
+        int res;
+        conf_reg_t reg;
+        int old_cor;
+        struct hostap_cs_priv *hw_priv = local->hw_priv;
+
+        if (!prism2_pccard_card_present(local))
+               return;
+
+        if (hw_priv->sandisk_connectplus) {
+                sandisk_write_hcr(local, hcr);
+                return;
+        }
+
+        reg.Function = 0;
+        reg.Action = CS_READ;
+        reg.Offset = CISREG_COR;
+        reg.Value = 0;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 1 "
+                       "(%d)\n", res);
+                return;
+        }
+        printk(KERN_DEBUG "prism2_pccard_genesis_sreset: original COR %02x\n",
+               reg.Value);
+        old_cor = reg.Value;
+
+        reg.Action = CS_WRITE;
+        reg.Value |= COR_SOFT_RESET;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 2 "
+                       "(%d)\n", res);
+                return;
+        }
+
+        mdelay(10);
+
+        /* Setup Genesis mode */
+        reg.Action = CS_WRITE;
+        reg.Value = hcr;
+        reg.Offset = CISREG_CCSR;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 3 "
+                       "(%d)\n", res);
+                return;
+        }
+        mdelay(10);
+
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_COR;
+        reg.Value = old_cor & ~COR_SOFT_RESET;
+        res = pcmcia_access_configuration_register(hw_priv->link->handle,
+                                                   &reg);
+        if (res != CS_SUCCESS) {
+                printk(KERN_DEBUG "prism2_pccard_genesis_sreset failed 4 "
+                       "(%d)\n", res);
+                return;
+        }
+
+        mdelay(10);
+}
+
+
+static int prism2_pccard_dev_open(local_info_t *local)
+{
+        struct hostap_cs_priv *hw_priv = local->hw_priv;
+        hw_priv->link->open++;
+        return 0;
+}
+
+
+static int prism2_pccard_dev_close(local_info_t *local)
+{
+        struct hostap_cs_priv *hw_priv;
+
+        if (local == NULL || local->hw_priv == NULL)
+                return 1;
+        hw_priv = local->hw_priv;
+        if (hw_priv->link == NULL)
+                return 1;
+
+        if (!hw_priv->link->open) {
+                printk(KERN_WARNING "%s: prism2_pccard_dev_close(): "
+                       "link not open?!\n", local->dev->name);
+                return 1;
+        }
+
+        hw_priv->link->open--;
+
+        return 0;
+}
+
+
+static struct prism2_helper_functions prism2_pccard_funcs =
+{
+        .card_present   = prism2_pccard_card_present,
+        .cor_sreset     = prism2_pccard_cor_sreset,
+        .dev_open       = prism2_pccard_dev_open,
+        .dev_close      = prism2_pccard_dev_close,
+        .genesis_reset  = prism2_pccard_genesis_reset,
+        .hw_type        = HOSTAP_HW_PCCARD,
+};
+
+
+/* allocate local data and register with CardServices
+ * initialize dev_link structure, but do not configure the card yet */
+static dev_link_t *prism2_attach(void)
+{
+        dev_link_t *link;
+        client_reg_t client_reg;
+        int ret;
+
+        link = kmalloc(sizeof(dev_link_t), GFP_KERNEL);
+        if (link == NULL)
+                return NULL;
+
+        memset(link, 0, sizeof(dev_link_t));
+
+        PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
+        link->conf.Vcc = 33;
+        link->conf.IntType = INT_MEMORY_AND_IO;
+
+        /* register with CardServices */
+        link->next = dev_list;
+        dev_list = link;
+        client_reg.dev_info = &dev_info;
+        client_reg.Version = 0x0210;
+        client_reg.event_callback_args.client_data = link;
+        ret = pcmcia_register_client(&link->handle, &client_reg);
+        if (ret != CS_SUCCESS) {
+                cs_error(link->handle, RegisterClient, ret);
+                prism2_detach(link);
+                return NULL;
+        }
+        return link;
+}
+
+
+static void prism2_detach(dev_link_t *link)
+{
+        dev_link_t **linkp;
+
+        PDEBUG(DEBUG_FLOW, "prism2_detach\n");
+
+        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
+                if (*linkp == link)
+                        break;
+        if (*linkp == NULL) {
+                printk(KERN_WARNING "%s: Attempt to detach non-existing "
+                       "PCMCIA client\n", dev_info);
+                return;
+        }
+
+        if (link->state & DEV_CONFIG) {
+                prism2_release((u_long)link);
+        }
+
+        if (link->handle) {
+                int res = pcmcia_deregister_client(link->handle);
+                if (res) {
+                        printk("CardService(DeregisterClient) => %d\n", res);
+                        cs_error(link->handle, DeregisterClient, res);
+                }
+        }
+
+        *linkp = link->next;
+        /* release net devices */
+        if (link->priv) {
+                struct net_device *dev;
+                struct hostap_interface *iface;
+                dev = link->priv;
+                iface = netdev_priv(dev);
+                kfree(iface->local->hw_priv);
+                iface->local->hw_priv = NULL;
+                prism2_free_local_data(dev);
+        }
+        kfree(link);
+}
+
+
+#define CS_CHECK(fn, ret) \
+do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+
+#define CFG_CHECK2(fn, retf) \
+do { int ret = (retf); \
+if (ret != 0) { \
+        PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", ret); \
+        cs_error(link->handle, fn, ret); \
+        goto next_entry; \
+} \
+} while (0)
+
+
+/* run after a CARD_INSERTION event is received to configure the PCMCIA
+ * socket and make the device available to the system */
+static int prism2_config(dev_link_t *link)
+{
+        struct net_device *dev;
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret = 1;
+        tuple_t tuple;
+        cisparse_t *parse;
+        int last_fn, last_ret;
+        u_char buf[64];
+        config_info_t conf;
+        cistpl_cftable_entry_t dflt = { 0 };
+        struct hostap_cs_priv *hw_priv;
+
+        PDEBUG(DEBUG_FLOW, "prism2_config()\n");
+
+        parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
+        hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+        if (parse == NULL || hw_priv == NULL) {
+                kfree(parse);
+                kfree(hw_priv);
+                ret = -ENOMEM;
+                goto failed;
+        }
+        memset(hw_priv, 0, sizeof(*hw_priv));
+
+        tuple.DesiredTuple = CISTPL_CONFIG;
+        tuple.Attributes = 0;
+        tuple.TupleData = buf;
+        tuple.TupleDataMax = sizeof(buf);
+        tuple.TupleOffset = 0;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link->handle, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link->handle, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link->handle, &tuple, parse));
+        link->conf.ConfigBase = parse->config.base;
+        link->conf.Present = parse->config.rmask[0];
+
+        CS_CHECK(GetConfigurationInfo,
+                 pcmcia_get_configuration_info(link->handle, &conf));
+        PDEBUG(DEBUG_HW, "%s: %s Vcc=%d (from config)\n", dev_info,
+               ignore_cis_vcc ? "ignoring" : "setting", conf.Vcc);
+        link->conf.Vcc = conf.Vcc;
+
+        /* Look for an appropriate configuration table entry in the CIS */
+        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link->handle, &tuple));
+        for (;;) {
+                cistpl_cftable_entry_t *cfg = &(parse->cftable_entry);
+                CFG_CHECK2(GetTupleData,
+                           pcmcia_get_tuple_data(link->handle, &tuple));
+                CFG_CHECK2(ParseTuple,
+                           pcmcia_parse_tuple(link->handle, &tuple, parse));
+
+                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
+                        dflt = *cfg;
+                if (cfg->index == 0)
+                        goto next_entry;
+                link->conf.ConfigIndex = cfg->index;
+                PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
+                       "(default 0x%02X)\n", cfg->index, dflt.index);
+
+                /* Does this card need audio output? */
+                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                        link->conf.Attributes |= CONF_ENABLE_SPKR;
+                        link->conf.Status = CCSR_AUDIO_ENA;
+                }
+
+                /* Use power settings for Vcc and Vpp if present */
+                /*  Note that the CIS values need to be rescaled */
+                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
+                            10000 && !ignore_cis_vcc) {
+                                PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
+                                       " this entry\n");
+                                goto next_entry;
+                        }
+                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] /
+                            10000 && !ignore_cis_vcc) {
+                                PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
+                                       "- skipping this entry\n");
+                                goto next_entry;
+                        }
+                }
+
+                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                                cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                                dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
+
+                /* Do we need to allocate an interrupt? */
+                if (cfg->irq.IRQInfo1 || dflt.irq.IRQInfo1)
+                        link->conf.Attributes |= CONF_ENABLE_IRQ;
+                else if (!(link->conf.Attributes & CONF_ENABLE_IRQ)) {
+                        /* At least Compaq WL200 does not have IRQInfo1 set,
+                         * but it does not work without interrupts.. */
+                        printk("Config has no IRQ info, but trying to enable "
+                               "IRQ anyway..\n");
+                        link->conf.Attributes |= CONF_ENABLE_IRQ;
+                }
+
+                /* IO window settings */
+                PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
+                       "dflt.io.nwin=%d\n",
+                       cfg->io.nwin, dflt.io.nwin);
+                link->io.NumPorts1 = link->io.NumPorts2 = 0;
+                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
+                        cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
+                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                        PDEBUG(DEBUG_EXTRA, "io->flags = 0x%04X, "
+                               "io.base=0x%04x, len=%d\n", io->flags,
+                               io->win[0].base, io->win[0].len);
+                        if (!(io->flags & CISTPL_IO_8BIT))
+                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                        if (!(io->flags & CISTPL_IO_16BIT))
+                                link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                        link->io.IOAddrLines = io->flags &
+                                CISTPL_IO_LINES_MASK;
+                        link->io.BasePort1 = io->win[0].base;
+                        link->io.NumPorts1 = io->win[0].len;
+                        if (io->nwin > 1) {
+                                link->io.Attributes2 = link->io.Attributes1;
+                                link->io.BasePort2 = io->win[1].base;
+                                link->io.NumPorts2 = io->win[1].len;
+                        }
+                }
+
+                /* This reserves IO space but doesn't actually enable it */
+                CFG_CHECK2(RequestIO,
+                           pcmcia_request_io(link->handle, &link->io));
+
+                /* This configuration table entry is OK */
+                break;
+
+        next_entry:
+                CS_CHECK(GetNextTuple,
+                         pcmcia_get_next_tuple(link->handle, &tuple));
+        }
+
+        /* Need to allocate net_device before requesting IRQ handler */
+        dev = prism2_init_local_data(&prism2_pccard_funcs, 0,
+                                     &handle_to_dev(link->handle));
+        if (dev == NULL)
+                goto failed;
+        link->priv = dev;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        local->hw_priv = hw_priv;
+        hw_priv->link = link;
+        strcpy(hw_priv->node.dev_name, dev->name);
+        link->dev = &hw_priv->node;
+
+        /*
+         * Allocate an interrupt line.  Note that this does not assign a
+         * handler to the interrupt, unless the 'Handler' member of the
+         * irq structure is initialized.
+         */
+        if (link->conf.Attributes & CONF_ENABLE_IRQ) {
+                link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+                link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+                link->irq.Handler = prism2_interrupt;
+                link->irq.Instance = dev;
+                CS_CHECK(RequestIRQ,
+                         pcmcia_request_irq(link->handle, &link->irq));
+        }
+
+        /*
+         * This actually configures the PCMCIA socket -- setting up
+         * the I/O windows and the interrupt mapping, and putting the
+         * card and host interface into "Memory and IO" mode.
+         */
+        CS_CHECK(RequestConfiguration,
+                 pcmcia_request_configuration(link->handle, &link->conf));
+
+        dev->irq = link->irq.AssignedIRQ;
+        dev->base_addr = link->io.BasePort1;
+
+        /* Finally, report what we've done */
+        printk(KERN_INFO "%s: index 0x%02x: Vcc %d.%d",
+               dev_info, link->conf.ConfigIndex,
+               link->conf.Vcc / 10, link->conf.Vcc % 10);
+        if (link->conf.Vpp1)
+                printk(", Vpp %d.%d", link->conf.Vpp1 / 10,
+                       link->conf.Vpp1 % 10);
+        if (link->conf.Attributes & CONF_ENABLE_IRQ)
+                printk(", irq %d", link->irq.AssignedIRQ);
+        if (link->io.NumPorts1)
+                printk(", io 0x%04x-0x%04x", link->io.BasePort1,
+                       link->io.BasePort1+link->io.NumPorts1-1);
+        if (link->io.NumPorts2)
+                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
+                       link->io.BasePort2+link->io.NumPorts2-1);
+        printk("\n");
+
+        link->state |= DEV_CONFIG;
+        link->state &= ~DEV_CONFIG_PENDING;
+
+        local->shutdown = 0;
+
+        sandisk_enable_wireless(dev);
+
+        ret = prism2_hw_config(dev, 1);
+        if (!ret) {
+                ret = hostap_hw_ready(dev);
+                if (ret == 0 && local->ddev)
+                        strcpy(hw_priv->node.dev_name, local->ddev->name);
+        }
+        kfree(parse);
+        return ret;
+
+ cs_failed:
+        cs_error(link->handle, last_fn, last_ret);
+
+ failed:
+        kfree(parse);
+        kfree(hw_priv);
+        prism2_release((u_long)link);
+        return ret;
+}
+
+
+static void prism2_release(u_long arg)
+{
+        dev_link_t *link = (dev_link_t *)arg;
+
+        PDEBUG(DEBUG_FLOW, "prism2_release\n");
+
+        if (link->priv) {
+                struct net_device *dev = link->priv;
+                struct hostap_interface *iface;
+
+                iface = netdev_priv(dev);
+                if (link->state & DEV_CONFIG)
+                        prism2_hw_shutdown(dev, 0);
+                iface->local->shutdown = 1;
+        }
+
+        if (link->win)
+                pcmcia_release_window(link->win);
+        pcmcia_release_configuration(link->handle);
+        if (link->io.NumPorts1)
+                pcmcia_release_io(link->handle, &link->io);
+        if (link->irq.AssignedIRQ)
+                pcmcia_release_irq(link->handle, &link->irq);
+
+        link->state &= ~DEV_CONFIG;
+
+        PDEBUG(DEBUG_FLOW, "release - done\n");
+}
+
+
+static int prism2_event(event_t event, int priority,
+                        event_callback_args_t *args)
+{
+        dev_link_t *link = args->client_data;
+        struct net_device *dev = (struct net_device *) link->priv;
+
+        switch (event) {
+        case CS_EVENT_CARD_INSERTION:
+                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_CARD_INSERTION\n", dev_info);
+                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+                if (prism2_config(link)) {
+                        PDEBUG(DEBUG_EXTRA, "prism2_config() failed\n");
+                }
+                break;
+
+        case CS_EVENT_CARD_REMOVAL:
+                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_CARD_REMOVAL\n", dev_info);
+                link->state &= ~DEV_PRESENT;
+                if (link->state & DEV_CONFIG) {
+                        netif_stop_queue(dev);
+                        netif_device_detach(dev);
+                        prism2_release((u_long) link);
+                }
+                break;
+
+        case CS_EVENT_PM_SUSPEND:
+                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
+                link->state |= DEV_SUSPEND;
+                /* fall through */
+
+        case CS_EVENT_RESET_PHYSICAL:
+                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_RESET_PHYSICAL\n", dev_info);
+                if (link->state & DEV_CONFIG) {
+                        if (link->open) {
+                                netif_stop_queue(dev);
+                                netif_device_detach(dev);
+                        }
+                        prism2_suspend(dev);
+                        pcmcia_release_configuration(link->handle);
+                }
+                break;
+
+        case CS_EVENT_PM_RESUME:
+                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
+                link->state &= ~DEV_SUSPEND;
+                /* fall through */
+
+        case CS_EVENT_CARD_RESET:
+                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_CARD_RESET\n", dev_info);
+                if (link->state & DEV_CONFIG) {
+                        pcmcia_request_configuration(link->handle,
+                                                     &link->conf);
+                        prism2_hw_shutdown(dev, 1);
+                        prism2_hw_config(dev, link->open ? 0 : 1);
+                        if (link->open) {
+                                netif_device_attach(dev);
+                                netif_start_queue(dev);
+                        }
+                }
+                break;
+
+        default:
+                PDEBUG(DEBUG_EXTRA, "%s: prism2_event() - unknown event %d\n",
+                       dev_info, event);
+                break;
+        }
+        return 0;
+}
+
+
+static struct pcmcia_device_id hostap_cs_ids[] = {
+        PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
+        PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
+        PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
+        PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
+        PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
+        PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
+        PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
+        PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
+        PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
+        PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
+        PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
+        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
+        PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
+        PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
+                                    0x7a954bd9, 0x74be00c6),
+        PCMCIA_DEVICE_PROD_ID1234(
+                "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
+                "Eval-RevA",
+                0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
+        PCMCIA_DEVICE_PROD_ID123(
+                "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
+                0xe6ec52ce, 0x08649af2, 0x4b74baa0),
+        PCMCIA_DEVICE_PROD_ID123(
+                "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
+                0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
+        PCMCIA_DEVICE_PROD_ID123(
+                "Instant Wireless ", " Network PC CARD", "Version 01.02",
+                0x11d901af, 0x6e9bd926, 0x4b74baa0),
+        PCMCIA_DEVICE_PROD_ID123(
+                "SMC", "SMC2632W", "Version 01.02",
+                0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
+        PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 
+                                0x2decece3, 0x82067c18),
+        PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
+                                0x54f7c49c, 0x15a75e5b),
+        PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
+                                0x74c5e40d, 0xdb472a18),
+        PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
+                                0x0733cc81, 0x0c52f395),
+        PCMCIA_DEVICE_PROD_ID12(
+                "ZoomAir 11Mbps High", "Rate wireless Networking",
+                0x273fe3db, 0x32a1eaee),
+        PCMCIA_DEVICE_NULL
+};
+MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
+
+
+static struct pcmcia_driver hostap_driver = {
+        .drv            = {
+                .name   = "hostap_cs",
+        },
+        .attach         = prism2_attach,
+        .detach         = prism2_detach,
+        .owner          = THIS_MODULE,
+        .event          = prism2_event,
+        .id_table       = hostap_cs_ids,
+};
+
+static int __init init_prism2_pccard(void)
+{
+        printk(KERN_INFO "%s: %s\n", dev_info, version);
+        return pcmcia_register_driver(&hostap_driver);
+}
+
+static void __exit exit_prism2_pccard(void)
+{
+        pcmcia_unregister_driver(&hostap_driver);
+        printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
+}
+
+
+module_init(init_prism2_pccard);
+module_exit(exit_prism2_pccard);
diff --git a/drivers/net/wireless/hostap/hostap_download.c b/drivers/net/wireless/hostap/hostap_download.c
new file mode 100644
index 000000000000..ab26b52b3e76
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_download.c
@@ -0,0 +1,766 @@
+static int prism2_enable_aux_port(struct net_device *dev, int enable)
+{
+        u16 val, reg;
+        int i, tries;
+        unsigned long flags;
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->no_pri) {
+                if (enable) {
+                        PDEBUG(DEBUG_EXTRA2, "%s: no PRI f/w - assuming Aux "
+                               "port is already enabled\n", dev->name);
+                }
+                return 0;
+        }
+
+        spin_lock_irqsave(&local->cmdlock, flags);
+
+        /* wait until busy bit is clear */
+        tries = HFA384X_CMD_BUSY_TIMEOUT;
+        while (HFA384X_INW(HFA384X_CMD_OFF) & HFA384X_CMD_BUSY && tries > 0) {
+                tries--;
+                udelay(1);
+        }
+        if (tries == 0) {
+                reg = HFA384X_INW(HFA384X_CMD_OFF);
+                spin_unlock_irqrestore(&local->cmdlock, flags);
+                printk("%s: prism2_enable_aux_port - timeout - reg=0x%04x\n",
+                       dev->name, reg);
+                return -ETIMEDOUT;
+        }
+
+        val = HFA384X_INW(HFA384X_CONTROL_OFF);
+
+        if (enable) {
+                HFA384X_OUTW(HFA384X_AUX_MAGIC0, HFA384X_PARAM0_OFF);
+                HFA384X_OUTW(HFA384X_AUX_MAGIC1, HFA384X_PARAM1_OFF);
+                HFA384X_OUTW(HFA384X_AUX_MAGIC2, HFA384X_PARAM2_OFF);
+
+                if ((val & HFA384X_AUX_PORT_MASK) != HFA384X_AUX_PORT_DISABLED)
+                        printk("prism2_enable_aux_port: was not disabled!?\n");
+                val &= ~HFA384X_AUX_PORT_MASK;
+                val |= HFA384X_AUX_PORT_ENABLE;
+        } else {
+                HFA384X_OUTW(0, HFA384X_PARAM0_OFF);
+                HFA384X_OUTW(0, HFA384X_PARAM1_OFF);
+                HFA384X_OUTW(0, HFA384X_PARAM2_OFF);
+
+                if ((val & HFA384X_AUX_PORT_MASK) != HFA384X_AUX_PORT_ENABLED)
+                        printk("prism2_enable_aux_port: was not enabled!?\n");
+                val &= ~HFA384X_AUX_PORT_MASK;
+                val |= HFA384X_AUX_PORT_DISABLE;
+        }
+        HFA384X_OUTW(val, HFA384X_CONTROL_OFF);
+
+        udelay(5);
+
+        i = 10000;
+        while (i > 0) {
+                val = HFA384X_INW(HFA384X_CONTROL_OFF);
+                val &= HFA384X_AUX_PORT_MASK;
+
+                if ((enable && val == HFA384X_AUX_PORT_ENABLED) ||
+                    (!enable && val == HFA384X_AUX_PORT_DISABLED))
+                        break;
+
+                udelay(10);
+                i--;
+        }
+
+        spin_unlock_irqrestore(&local->cmdlock, flags);
+
+        if (i == 0) {
+                printk("prism2_enable_aux_port(%d) timed out\n",
+                       enable);
+                return -ETIMEDOUT;
+        }
+
+        return 0;
+}
+
+
+static int hfa384x_from_aux(struct net_device *dev, unsigned int addr, int len,
+                            void *buf)
+{
+        u16 page, offset;
+        if (addr & 1 || len & 1)
+                return -1;
+
+        page = addr >> 7;
+        offset = addr & 0x7f;
+
+        HFA384X_OUTW(page, HFA384X_AUXPAGE_OFF);
+        HFA384X_OUTW(offset, HFA384X_AUXOFFSET_OFF);
+
+        udelay(5);
+
+#ifdef PRISM2_PCI
+        {
+                u16 *pos = (u16 *) buf;
+                while (len > 0) {
+                        *pos++ = HFA384X_INW_DATA(HFA384X_AUXDATA_OFF);
+                        len -= 2;
+                }
+        }
+#else /* PRISM2_PCI */
+        HFA384X_INSW(HFA384X_AUXDATA_OFF, buf, len / 2);
+#endif /* PRISM2_PCI */
+
+        return 0;
+}
+
+
+static int hfa384x_to_aux(struct net_device *dev, unsigned int addr, int len,
+                          void *buf)
+{
+        u16 page, offset;
+        if (addr & 1 || len & 1)
+                return -1;
+
+        page = addr >> 7;
+        offset = addr & 0x7f;
+
+        HFA384X_OUTW(page, HFA384X_AUXPAGE_OFF);
+        HFA384X_OUTW(offset, HFA384X_AUXOFFSET_OFF);
+
+        udelay(5);
+
+#ifdef PRISM2_PCI
+        {
+                u16 *pos = (u16 *) buf;
+                while (len > 0) {
+                        HFA384X_OUTW_DATA(*pos++, HFA384X_AUXDATA_OFF);
+                        len -= 2;
+                }
+        }
+#else /* PRISM2_PCI */
+        HFA384X_OUTSW(HFA384X_AUXDATA_OFF, buf, len / 2);
+#endif /* PRISM2_PCI */
+
+        return 0;
+}
+
+
+static int prism2_pda_ok(u8 *buf)
+{
+        u16 *pda = (u16 *) buf;
+        int pos;
+        u16 len, pdr;
+
+        if (buf[0] == 0xff && buf[1] == 0x00 && buf[2] == 0xff &&
+            buf[3] == 0x00)
+                return 0;
+
+        pos = 0;
+        while (pos + 1 < PRISM2_PDA_SIZE / 2) {
+                len = le16_to_cpu(pda[pos]);
+                pdr = le16_to_cpu(pda[pos + 1]);
+                if (len == 0 || pos + len > PRISM2_PDA_SIZE / 2)
+                        return 0;
+
+                if (pdr == 0x0000 && len == 2) {
+                        /* PDA end found */
+                        return 1;
+                }
+
+                pos += len + 1;
+        }
+
+        return 0;
+}
+
+
+static int prism2_download_aux_dump(struct net_device *dev,
+                                     unsigned int addr, int len, u8 *buf)
+{
+        int res;
+
+        prism2_enable_aux_port(dev, 1);
+        res = hfa384x_from_aux(dev, addr, len, buf);
+        prism2_enable_aux_port(dev, 0);
+        if (res)
+                return -1;
+
+        return 0;
+}
+
+
+static u8 * prism2_read_pda(struct net_device *dev)
+{
+        u8 *buf;
+        int res, i, found = 0;
+#define NUM_PDA_ADDRS 4
+        unsigned int pda_addr[NUM_PDA_ADDRS] = {
+                0x7f0000 /* others than HFA3841 */,
+                0x3f0000 /* HFA3841 */,
+                0x390000 /* apparently used in older cards */,
+                0x7f0002 /* Intel PRO/Wireless 2011B (PCI) */,
+        };
+
+        buf = (u8 *) kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);
+        if (buf == NULL)
+                return NULL;
+
+        /* Note: wlan card should be in initial state (just after init cmd)
+         * and no other operations should be performed concurrently. */
+
+        prism2_enable_aux_port(dev, 1);
+
+        for (i = 0; i < NUM_PDA_ADDRS; i++) {
+                PDEBUG(DEBUG_EXTRA2, "%s: trying to read PDA from 0x%08x",
+                       dev->name, pda_addr[i]);
+                res = hfa384x_from_aux(dev, pda_addr[i], PRISM2_PDA_SIZE, buf);
+                if (res)
+                        continue;
+                if (res == 0 && prism2_pda_ok(buf)) {
+                        PDEBUG2(DEBUG_EXTRA2, ": OK\n");
+                        found = 1;
+                        break;
+                } else {
+                        PDEBUG2(DEBUG_EXTRA2, ": failed\n");
+                }
+        }
+
+        prism2_enable_aux_port(dev, 0);
+
+        if (!found) {
+                printk(KERN_DEBUG "%s: valid PDA not found\n", dev->name);
+                kfree(buf);
+                buf = NULL;
+        }
+
+        return buf;
+}
+
+
+static int prism2_download_volatile(local_info_t *local,
+                                    struct prism2_download_data *param)
+{
+        struct net_device *dev = local->dev;
+        int ret = 0, i;
+        u16 param0, param1;
+
+        if (local->hw_downloading) {
+                printk(KERN_WARNING "%s: Already downloading - aborting new "
+                       "request\n", dev->name);
+                return -1;
+        }
+
+        local->hw_downloading = 1;
+        if (local->pri_only) {
+                hfa384x_disable_interrupts(dev);
+        } else {
+                prism2_hw_shutdown(dev, 0);
+
+                if (prism2_hw_init(dev, 0)) {
+                        printk(KERN_WARNING "%s: Could not initialize card for"
+                               " download\n", dev->name);
+                        ret = -1;
+                        goto out;
+                }
+        }
+
+        if (prism2_enable_aux_port(dev, 1)) {
+                printk(KERN_WARNING "%s: Could not enable AUX port\n",
+                       dev->name);
+                ret = -1;
+                goto out;
+        }
+
+        param0 = param->start_addr & 0xffff;
+        param1 = param->start_addr >> 16;
+
+        HFA384X_OUTW(0, HFA384X_PARAM2_OFF);
+        HFA384X_OUTW(param1, HFA384X_PARAM1_OFF);
+        if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |
+                             (HFA384X_PROGMODE_ENABLE_VOLATILE << 8),
+                             param0)) {
+                printk(KERN_WARNING "%s: Download command execution failed\n",
+                       dev->name);
+                ret = -1;
+                goto out;
+        }
+
+        for (i = 0; i < param->num_areas; i++) {
+                PDEBUG(DEBUG_EXTRA2, "%s: Writing %d bytes at 0x%08x\n",
+                       dev->name, param->data[i].len, param->data[i].addr);
+                if (hfa384x_to_aux(dev, param->data[i].addr,
+                                   param->data[i].len, param->data[i].data)) {
+                        printk(KERN_WARNING "%s: RAM download at 0x%08x "
+                               "(len=%d) failed\n", dev->name,
+                               param->data[i].addr, param->data[i].len);
+                        ret = -1;
+                        goto out;
+                }
+        }
+
+        HFA384X_OUTW(param1, HFA384X_PARAM1_OFF);
+        HFA384X_OUTW(0, HFA384X_PARAM2_OFF);
+        if (hfa384x_cmd_no_wait(dev, HFA384X_CMDCODE_DOWNLOAD |
+                                (HFA384X_PROGMODE_DISABLE << 8), param0)) {
+                printk(KERN_WARNING "%s: Download command execution failed\n",
+                       dev->name);
+                ret = -1;
+                goto out;
+        }
+        /* ProgMode disable causes the hardware to restart itself from the
+         * given starting address. Give hw some time and ACK command just in
+         * case restart did not happen. */
+        mdelay(5);
+        HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);
+
+        if (prism2_enable_aux_port(dev, 0)) {
+                printk(KERN_DEBUG "%s: Disabling AUX port failed\n",
+                       dev->name);
+                /* continue anyway.. restart should have taken care of this */
+        }
+
+        mdelay(5);
+        local->hw_downloading = 0;
+        if (prism2_hw_config(dev, 2)) {
+                printk(KERN_WARNING "%s: Card configuration after RAM "
+                       "download failed\n", dev->name);
+                ret = -1;
+                goto out;
+        }
+
+ out:
+        local->hw_downloading = 0;
+        return ret;
+}
+
+
+static int prism2_enable_genesis(local_info_t *local, int hcr)
+{
+        struct net_device *dev = local->dev;
+        u8 initseq[4] = { 0x00, 0xe1, 0xa1, 0xff };
+        u8 readbuf[4];
+
+        printk(KERN_DEBUG "%s: test Genesis mode with HCR 0x%02x\n",
+               dev->name, hcr);
+        local->func->cor_sreset(local);
+        hfa384x_to_aux(dev, 0x7e0038, sizeof(initseq), initseq);
+        local->func->genesis_reset(local, hcr);
+
+        /* Readback test */
+        hfa384x_from_aux(dev, 0x7e0038, sizeof(readbuf), readbuf);
+        hfa384x_to_aux(dev, 0x7e0038, sizeof(initseq), initseq);
+        hfa384x_from_aux(dev, 0x7e0038, sizeof(readbuf), readbuf);
+
+        if (memcmp(initseq, readbuf, sizeof(initseq)) == 0) {
+                printk(KERN_DEBUG "Readback test succeeded, HCR 0x%02x\n",
+                       hcr);
+                return 0;
+        } else {
+                printk(KERN_DEBUG "Readback test failed, HCR 0x%02x "
+                       "write %02x %02x %02x %02x read %02x %02x %02x %02x\n",
+                       hcr, initseq[0], initseq[1], initseq[2], initseq[3],
+                       readbuf[0], readbuf[1], readbuf[2], readbuf[3]);
+                return 1;
+        }
+}
+
+
+static int prism2_get_ram_size(local_info_t *local)
+{
+        int ret;
+
+        /* Try to enable genesis mode; 0x1F for x8 SRAM or 0x0F for x16 SRAM */
+        if (prism2_enable_genesis(local, 0x1f) == 0)
+                ret = 8;
+        else if (prism2_enable_genesis(local, 0x0f) == 0)
+                ret = 16;
+        else
+                ret = -1;
+
+        /* Disable genesis mode */
+        local->func->genesis_reset(local, ret == 16 ? 0x07 : 0x17);
+
+        return ret;
+}
+
+
+static int prism2_download_genesis(local_info_t *local,
+                                   struct prism2_download_data *param)
+{
+        struct net_device *dev = local->dev;
+        int ram16 = 0, i;
+        int ret = 0;
+
+        if (local->hw_downloading) {
+                printk(KERN_WARNING "%s: Already downloading - aborting new "
+                       "request\n", dev->name);
+                return -EBUSY;
+        }
+
+        if (!local->func->genesis_reset || !local->func->cor_sreset) {
+                printk(KERN_INFO "%s: Genesis mode downloading not supported "
+                       "with this hwmodel\n", dev->name);
+                return -EOPNOTSUPP;
+        }
+
+        local->hw_downloading = 1;
+
+        if (prism2_enable_aux_port(dev, 1)) {
+                printk(KERN_DEBUG "%s: failed to enable AUX port\n",
+                       dev->name);
+                ret = -EIO;
+                goto out;
+        }
+
+        if (local->sram_type == -1) {
+                /* 0x1F for x8 SRAM or 0x0F for x16 SRAM */
+                if (prism2_enable_genesis(local, 0x1f) == 0) {
+                        ram16 = 0;
+                        PDEBUG(DEBUG_EXTRA2, "%s: Genesis mode OK using x8 "
+                               "SRAM\n", dev->name);
+                } else if (prism2_enable_genesis(local, 0x0f) == 0) {
+                        ram16 = 1;
+                        PDEBUG(DEBUG_EXTRA2, "%s: Genesis mode OK using x16 "
+                               "SRAM\n", dev->name);
+                } else {
+                        printk(KERN_DEBUG "%s: Could not initiate genesis "
+                               "mode\n", dev->name);
+                        ret = -EIO;
+                        goto out;
+                }
+        } else {
+                if (prism2_enable_genesis(local, local->sram_type == 8 ?
+                                          0x1f : 0x0f)) {
+                        printk(KERN_DEBUG "%s: Failed to set Genesis "
+                               "mode (sram_type=%d)\n", dev->name,
+                               local->sram_type);
+                        ret = -EIO;
+                        goto out;
+                }
+                ram16 = local->sram_type != 8;
+        }
+
+        for (i = 0; i < param->num_areas; i++) {
+                PDEBUG(DEBUG_EXTRA2, "%s: Writing %d bytes at 0x%08x\n",
+                       dev->name, param->data[i].len, param->data[i].addr);
+                if (hfa384x_to_aux(dev, param->data[i].addr,
+                                   param->data[i].len, param->data[i].data)) {
+                        printk(KERN_WARNING "%s: RAM download at 0x%08x "
+                               "(len=%d) failed\n", dev->name,
+                               param->data[i].addr, param->data[i].len);
+                        ret = -EIO;
+                        goto out;
+                }
+        }
+
+        PDEBUG(DEBUG_EXTRA2, "Disable genesis mode\n");
+        local->func->genesis_reset(local, ram16 ? 0x07 : 0x17);
+        if (prism2_enable_aux_port(dev, 0)) {
+                printk(KERN_DEBUG "%s: Failed to disable AUX port\n",
+                       dev->name);
+        }
+
+        mdelay(5);
+        local->hw_downloading = 0;
+
+        PDEBUG(DEBUG_EXTRA2, "Trying to initialize card\n");
+        /*
+         * Make sure the INIT command does not generate a command completion
+         * event by disabling interrupts.
+         */
+        hfa384x_disable_interrupts(dev);
+        if (prism2_hw_init(dev, 1)) {
+                printk(KERN_DEBUG "%s: Initialization after genesis mode "
+                       "download failed\n", dev->name);
+                ret = -EIO;
+                goto out;
+        }
+
+        PDEBUG(DEBUG_EXTRA2, "Card initialized - running PRI only\n");
+        if (prism2_hw_init2(dev, 1)) {
+                printk(KERN_DEBUG "%s: Initialization(2) after genesis mode "
+                       "download failed\n", dev->name);
+                ret = -EIO;
+                goto out;
+        }
+
+ out:
+        local->hw_downloading = 0;
+        return ret;
+}
+
+
+#ifdef PRISM2_NON_VOLATILE_DOWNLOAD
+/* Note! Non-volatile downloading functionality has not yet been tested
+ * thoroughly and it may corrupt flash image and effectively kill the card that
+ * is being updated. You have been warned. */
+
+static inline int prism2_download_block(struct net_device *dev,
+                                        u32 addr, u8 *data,
+                                        u32 bufaddr, int rest_len)
+{
+        u16 param0, param1;
+        int block_len;
+
+        block_len = rest_len < 4096 ? rest_len : 4096;
+
+        param0 = addr & 0xffff;
+        param1 = addr >> 16;
+
+        HFA384X_OUTW(block_len, HFA384X_PARAM2_OFF);
+        HFA384X_OUTW(param1, HFA384X_PARAM1_OFF);
+
+        if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |
+                             (HFA384X_PROGMODE_ENABLE_NON_VOLATILE << 8),
+                             param0)) {
+                printk(KERN_WARNING "%s: Flash download command execution "
+                       "failed\n", dev->name);
+                return -1;
+        }
+
+        if (hfa384x_to_aux(dev, bufaddr, block_len, data)) {
+                printk(KERN_WARNING "%s: flash download at 0x%08x "
+                       "(len=%d) failed\n", dev->name, addr, block_len);
+                return -1;
+        }
+
+        HFA384X_OUTW(0, HFA384X_PARAM2_OFF);
+        HFA384X_OUTW(0, HFA384X_PARAM1_OFF);
+        if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |
+                             (HFA384X_PROGMODE_PROGRAM_NON_VOLATILE << 8),
+                             0)) {
+                printk(KERN_WARNING "%s: Flash write command execution "
+                       "failed\n", dev->name);
+                return -1;
+        }
+
+        return block_len;
+}
+
+
+static int prism2_download_nonvolatile(local_info_t *local,
+                                       struct prism2_download_data *dl)
+{
+        struct net_device *dev = local->dev;
+        int ret = 0, i;
+        struct {
+                u16 page;
+                u16 offset;
+                u16 len;
+        } dlbuffer;
+        u32 bufaddr;
+
+        if (local->hw_downloading) {
+                printk(KERN_WARNING "%s: Already downloading - aborting new "
+                       "request\n", dev->name);
+                return -1;
+        }
+
+        ret = local->func->get_rid(dev, HFA384X_RID_DOWNLOADBUFFER,
+                                   &dlbuffer, 6, 0);
+
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: Could not read download buffer "
+                       "parameters\n", dev->name);
+                goto out;
+        }
+
+        dlbuffer.page = le16_to_cpu(dlbuffer.page);
+        dlbuffer.offset = le16_to_cpu(dlbuffer.offset);
+        dlbuffer.len = le16_to_cpu(dlbuffer.len);
+
+        printk(KERN_DEBUG "Download buffer: %d bytes at 0x%04x:0x%04x\n",
+               dlbuffer.len, dlbuffer.page, dlbuffer.offset);
+
+        bufaddr = (dlbuffer.page << 7) + dlbuffer.offset;
+
+        local->hw_downloading = 1;
+
+        if (!local->pri_only) {
+                prism2_hw_shutdown(dev, 0);
+
+                if (prism2_hw_init(dev, 0)) {
+                        printk(KERN_WARNING "%s: Could not initialize card for"
+                               " download\n", dev->name);
+                        ret = -1;
+                        goto out;
+                }
+        }
+
+        hfa384x_disable_interrupts(dev);
+
+        if (prism2_enable_aux_port(dev, 1)) {
+                printk(KERN_WARNING "%s: Could not enable AUX port\n",
+                       dev->name);
+                ret = -1;
+                goto out;
+        }
+
+        printk(KERN_DEBUG "%s: starting flash download\n", dev->name);
+        for (i = 0; i < dl->num_areas; i++) {
+                int rest_len = dl->data[i].len;
+                int data_off = 0;
+
+                while (rest_len > 0) {
+                        int block_len;
+
+                        block_len = prism2_download_block(
+                                dev, dl->data[i].addr + data_off,
+                                dl->data[i].data + data_off, bufaddr,
+                                rest_len);
+
+                        if (block_len < 0) {
+                                ret = -1;
+                                goto out;
+                        }
+
+                        rest_len -= block_len;
+                        data_off += block_len;
+                }
+        }
+
+        HFA384X_OUTW(0, HFA384X_PARAM1_OFF);
+        HFA384X_OUTW(0, HFA384X_PARAM2_OFF);
+        if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_DOWNLOAD |
+                                (HFA384X_PROGMODE_DISABLE << 8), 0)) {
+                printk(KERN_WARNING "%s: Download command execution failed\n",
+                       dev->name);
+                ret = -1;
+                goto out;
+        }
+
+        if (prism2_enable_aux_port(dev, 0)) {
+                printk(KERN_DEBUG "%s: Disabling AUX port failed\n",
+                       dev->name);
+                /* continue anyway.. restart should have taken care of this */
+        }
+
+        mdelay(5);
+
+        local->func->hw_reset(dev);
+        local->hw_downloading = 0;
+        if (prism2_hw_config(dev, 2)) {
+                printk(KERN_WARNING "%s: Card configuration after flash "
+                       "download failed\n", dev->name);
+                ret = -1;
+        } else {
+                printk(KERN_INFO "%s: Card initialized successfully after "
+                       "flash download\n", dev->name);
+        }
+
+ out:
+        local->hw_downloading = 0;
+        return ret;
+}
+#endif /* PRISM2_NON_VOLATILE_DOWNLOAD */
+
+
+static void prism2_download_free_data(struct prism2_download_data *dl)
+{
+        int i;
+
+        if (dl == NULL)
+                return;
+
+        for (i = 0; i < dl->num_areas; i++)
+                kfree(dl->data[i].data);
+        kfree(dl);
+}
+
+
+static int prism2_download(local_info_t *local,
+                           struct prism2_download_param *param)
+{
+        int ret = 0;
+        int i;
+        u32 total_len = 0;
+        struct prism2_download_data *dl = NULL;
+
+        printk(KERN_DEBUG "prism2_download: dl_cmd=%d start_addr=0x%08x "
+               "num_areas=%d\n",
+               param->dl_cmd, param->start_addr, param->num_areas);
+
+        if (param->num_areas > 100) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        dl = kmalloc(sizeof(*dl) + param->num_areas *
+                     sizeof(struct prism2_download_data_area), GFP_KERNEL);
+        if (dl == NULL) {
+                ret = -ENOMEM;
+                goto out;
+        }
+        memset(dl, 0, sizeof(*dl) + param->num_areas *
+               sizeof(struct prism2_download_data_area));
+        dl->dl_cmd = param->dl_cmd;
+        dl->start_addr = param->start_addr;
+        dl->num_areas = param->num_areas;
+        for (i = 0; i < param->num_areas; i++) {
+                PDEBUG(DEBUG_EXTRA2,
+                       "  area %d: addr=0x%08x len=%d ptr=0x%p\n",
+                       i, param->data[i].addr, param->data[i].len,
+                       param->data[i].ptr);
+
+                dl->data[i].addr = param->data[i].addr;
+                dl->data[i].len = param->data[i].len;
+
+                total_len += param->data[i].len;
+                if (param->data[i].len > PRISM2_MAX_DOWNLOAD_AREA_LEN ||
+                    total_len > PRISM2_MAX_DOWNLOAD_LEN) {
+                        ret = -E2BIG;
+                        goto out;
+                }
+
+                dl->data[i].data = kmalloc(dl->data[i].len, GFP_KERNEL);
+                if (dl->data[i].data == NULL) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
+
+                if (copy_from_user(dl->data[i].data, param->data[i].ptr,
+                                   param->data[i].len)) {
+                        ret = -EFAULT;
+                        goto out;
+                }
+        }
+
+        switch (param->dl_cmd) {
+        case PRISM2_DOWNLOAD_VOLATILE:
+        case PRISM2_DOWNLOAD_VOLATILE_PERSISTENT:
+                ret = prism2_download_volatile(local, dl);
+                break;
+        case PRISM2_DOWNLOAD_VOLATILE_GENESIS:
+        case PRISM2_DOWNLOAD_VOLATILE_GENESIS_PERSISTENT:
+                ret = prism2_download_genesis(local, dl);
+                break;
+        case PRISM2_DOWNLOAD_NON_VOLATILE:
+#ifdef PRISM2_NON_VOLATILE_DOWNLOAD
+                ret = prism2_download_nonvolatile(local, dl);
+#else /* PRISM2_NON_VOLATILE_DOWNLOAD */
+                printk(KERN_INFO "%s: non-volatile downloading not enabled\n",
+                       local->dev->name);
+                ret = -EOPNOTSUPP;
+#endif /* PRISM2_NON_VOLATILE_DOWNLOAD */
+                break;
+        default:
+                printk(KERN_DEBUG "%s: unsupported download command %d\n",
+                       local->dev->name, param->dl_cmd);
+                ret = -EINVAL;
+                break;
+        };
+
+ out:
+        if (ret == 0 && dl &&
+            param->dl_cmd == PRISM2_DOWNLOAD_VOLATILE_GENESIS_PERSISTENT) {
+                prism2_download_free_data(local->dl_pri);
+                local->dl_pri = dl;
+        } else if (ret == 0 && dl &&
+                   param->dl_cmd == PRISM2_DOWNLOAD_VOLATILE_PERSISTENT) {
+                prism2_download_free_data(local->dl_sec);
+                local->dl_sec = dl;
+        } else
+                prism2_download_free_data(dl);
+
+        return ret;
+}
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
new file mode 100644
index 000000000000..e533a663deda
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -0,0 +1,3445 @@
+/*
+ * Host AP (software wireless LAN access point) driver for
+ * Intersil Prism2/2.5/3.
+ *
+ * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+ * <jkmaline@cc.hut.fi>
+ * Copyright (c) 2002-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation. See README and COPYING for
+ * more details.
+ *
+ * FIX:
+ * - there is currently no way of associating TX packets to correct wds device
+ *   when TX Exc/OK event occurs, so all tx_packets and some
+ *   tx_errors/tx_dropped are added to the main netdevice; using sw_support
+ *   field in txdesc might be used to fix this (using Alloc event to increment
+ *   tx_packets would need some further info in txfid table)
+ *
+ * Buffer Access Path (BAP) usage:
+ *   Prism2 cards have two separate BAPs for accessing the card memory. These
+ *   should allow concurrent access to two different frames and the driver
+ *   previously used BAP0 for sending data and BAP1 for receiving data.
+ *   However, there seems to be number of issues with concurrent access and at
+ *   least one know hardware bug in using BAP0 and BAP1 concurrently with PCI
+ *   Prism2.5. Therefore, the driver now only uses BAP0 for moving data between
+ *   host and card memories. BAP0 accesses are protected with local->baplock
+ *   (spin_lock_bh) to prevent concurrent use.
+ */
+
+
+#include <linux/config.h>
+#include <linux/version.h>
+
+#include <asm/delay.h>
+#include <asm/uaccess.h>
+
+#include <linux/slab.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/proc_fs.h>
+#include <linux/if_arp.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <linux/rtnetlink.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211_crypt.h>
+#include <asm/irq.h>
+
+#include "hostap_80211.h"
+#include "hostap.h"
+#include "hostap_ap.h"
+
+
+/* #define final_version */
+
+static int mtu = 1500;
+module_param(mtu, int, 0444);
+MODULE_PARM_DESC(mtu, "Maximum transfer unit");
+
+static int channel[MAX_PARM_DEVICES] = { 3, DEF_INTS };
+module_param_array(channel, int, NULL, 0444);
+MODULE_PARM_DESC(channel, "Initial channel");
+
+static char essid[33] = "test";
+module_param_string(essid, essid, sizeof(essid), 0444);
+MODULE_PARM_DESC(essid, "Host AP's ESSID");
+
+static int iw_mode[MAX_PARM_DEVICES] = { IW_MODE_MASTER, DEF_INTS };
+module_param_array(iw_mode, int, NULL, 0444);
+MODULE_PARM_DESC(iw_mode, "Initial operation mode");
+
+static int beacon_int[MAX_PARM_DEVICES] = { 100, DEF_INTS };
+module_param_array(beacon_int, int, NULL, 0444);
+MODULE_PARM_DESC(beacon_int, "Beacon interval (1 = 1024 usec)");
+
+static int dtim_period[MAX_PARM_DEVICES] = { 1, DEF_INTS };
+module_param_array(dtim_period, int, NULL, 0444);
+MODULE_PARM_DESC(dtim_period, "DTIM period");
+
+static char dev_template[16] = "wlan%d";
+module_param_string(dev_template, dev_template, sizeof(dev_template), 0444);
+MODULE_PARM_DESC(dev_template, "Prefix for network device name (default: "
+                 "wlan%d)");
+
+#ifdef final_version
+#define EXTRA_EVENTS_WTERR 0
+#else
+/* check WTERR events (Wait Time-out) in development versions */
+#define EXTRA_EVENTS_WTERR HFA384X_EV_WTERR
+#endif
+
+/* Events that will be using BAP0 */
+#define HFA384X_BAP0_EVENTS \
+        (HFA384X_EV_TXEXC | HFA384X_EV_RX | HFA384X_EV_INFO | HFA384X_EV_TX)
+
+/* event mask, i.e., events that will result in an interrupt */
+#define HFA384X_EVENT_MASK \
+        (HFA384X_BAP0_EVENTS | HFA384X_EV_ALLOC | HFA384X_EV_INFDROP | \
+        HFA384X_EV_CMD | HFA384X_EV_TICK | \
+        EXTRA_EVENTS_WTERR)
+
+/* Default TX control flags: use 802.11 headers and request interrupt for
+ * failed transmits. Frames that request ACK callback, will add
+ * _TX_OK flag and _ALT_RTRY flag may be used to select different retry policy.
+ */
+#define HFA384X_TX_CTRL_FLAGS \
+        (HFA384X_TX_CTRL_802_11 | HFA384X_TX_CTRL_TX_EX)
+
+
+/* ca. 1 usec */
+#define HFA384X_CMD_BUSY_TIMEOUT 5000
+#define HFA384X_BAP_BUSY_TIMEOUT 50000
+
+/* ca. 10 usec */
+#define HFA384X_CMD_COMPL_TIMEOUT 20000
+#define HFA384X_DL_COMPL_TIMEOUT 1000000
+
+/* Wait times for initialization; yield to other processes to avoid busy
+ * waiting for long time. */
+#define HFA384X_INIT_TIMEOUT (HZ / 2) /* 500 ms */
+#define HFA384X_ALLOC_COMPL_TIMEOUT (HZ / 20) /* 50 ms */
+
+
+static void prism2_hw_reset(struct net_device *dev);
+static void prism2_check_sta_fw_version(local_info_t *local);
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+/* hostap_download.c */
+static int prism2_download_aux_dump(struct net_device *dev,
+                                    unsigned int addr, int len, u8 *buf);
+static u8 * prism2_read_pda(struct net_device *dev);
+static int prism2_download(local_info_t *local,
+                           struct prism2_download_param *param);
+static void prism2_download_free_data(struct prism2_download_data *dl);
+static int prism2_download_volatile(local_info_t *local,
+                                    struct prism2_download_data *param);
+static int prism2_download_genesis(local_info_t *local,
+                                   struct prism2_download_data *param);
+static int prism2_get_ram_size(local_info_t *local);
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+
+
+
+#ifndef final_version
+/* magic value written to SWSUPPORT0 reg. for detecting whether card is still
+ * present */
+#define HFA384X_MAGIC 0x8A32
+#endif
+
+
+static u16 hfa384x_read_reg(struct net_device *dev, u16 reg)
+{
+        return HFA384X_INW(reg);
+}
+
+
+static void hfa384x_read_regs(struct net_device *dev,
+                              struct hfa384x_regs *regs)
+{
+        regs->cmd = HFA384X_INW(HFA384X_CMD_OFF);
+        regs->evstat = HFA384X_INW(HFA384X_EVSTAT_OFF);
+        regs->offset0 = HFA384X_INW(HFA384X_OFFSET0_OFF);
+        regs->offset1 = HFA384X_INW(HFA384X_OFFSET1_OFF);
+        regs->swsupport0 = HFA384X_INW(HFA384X_SWSUPPORT0_OFF);
+}
+
+
+/**
+ * __hostap_cmd_queue_free - Free Prism2 command queue entry (private)
+ * @local: pointer to private Host AP driver data
+ * @entry: Prism2 command queue entry to be freed
+ * @del_req: request the entry to be removed
+ *
+ * Internal helper function for freeing Prism2 command queue entries.
+ * Caller must have acquired local->cmdlock before calling this function.
+ */
+static inline void __hostap_cmd_queue_free(local_info_t *local,
+                                           struct hostap_cmd_queue *entry,
+                                           int del_req)
+{
+        if (del_req) {
+                entry->del_req = 1;
+                if (!list_empty(&entry->list)) {
+                        list_del_init(&entry->list);
+                        local->cmd_queue_len--;
+                }
+        }
+
+        if (atomic_dec_and_test(&entry->usecnt) && entry->del_req)
+                kfree(entry);
+}
+
+
+/**
+ * hostap_cmd_queue_free - Free Prism2 command queue entry
+ * @local: pointer to private Host AP driver data
+ * @entry: Prism2 command queue entry to be freed
+ * @del_req: request the entry to be removed
+ *
+ * Free a Prism2 command queue entry.
+ */
+static inline void hostap_cmd_queue_free(local_info_t *local,
+                                         struct hostap_cmd_queue *entry,
+                                         int del_req)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&local->cmdlock, flags);
+        __hostap_cmd_queue_free(local, entry, del_req);
+        spin_unlock_irqrestore(&local->cmdlock, flags);
+}
+
+
+/**
+ * prism2_clear_cmd_queue - Free all pending Prism2 command queue entries
+ * @local: pointer to private Host AP driver data
+ */
+static void prism2_clear_cmd_queue(local_info_t *local)
+{
+        struct list_head *ptr, *n;
+        unsigned long flags;
+        struct hostap_cmd_queue *entry;
+
+        spin_lock_irqsave(&local->cmdlock, flags);
+        list_for_each_safe(ptr, n, &local->cmd_queue) {
+                entry = list_entry(ptr, struct hostap_cmd_queue, list);
+                atomic_inc(&entry->usecnt);
+                printk(KERN_DEBUG "%s: removed pending cmd_queue entry "
+                       "(type=%d, cmd=0x%04x, param0=0x%04x)\n",
+                       local->dev->name, entry->type, entry->cmd,
+                       entry->param0);
+                __hostap_cmd_queue_free(local, entry, 1);
+        }
+        if (local->cmd_queue_len) {
+                /* This should not happen; print debug message and clear
+                 * queue length. */
+                printk(KERN_DEBUG "%s: cmd_queue_len (%d) not zero after "
+                       "flush\n", local->dev->name, local->cmd_queue_len);
+                local->cmd_queue_len = 0;
+        }
+        spin_unlock_irqrestore(&local->cmdlock, flags);
+}
+
+
+/**
+ * hfa384x_cmd_issue - Issue a Prism2 command to the hardware
+ * @dev: pointer to net_device
+ * @entry: Prism2 command queue entry to be issued
+ */
+static inline int hfa384x_cmd_issue(struct net_device *dev,
+                                    struct hostap_cmd_queue *entry)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int tries;
+        u16 reg;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->card_present && !local->func->card_present(local))
+                return -ENODEV;
+
+        if (entry->issued) {
+                printk(KERN_DEBUG "%s: driver bug - re-issuing command @%p\n",
+                       dev->name, entry);
+        }
+
+        /* wait until busy bit is clear; this should always be clear since the
+         * commands are serialized */
+        tries = HFA384X_CMD_BUSY_TIMEOUT;
+        while (HFA384X_INW(HFA384X_CMD_OFF) & HFA384X_CMD_BUSY && tries > 0) {
+                tries--;
+                udelay(1);
+        }
+#ifndef final_version
+        if (tries != HFA384X_CMD_BUSY_TIMEOUT) {
+                prism2_io_debug_error(dev, 1);
+                printk(KERN_DEBUG "%s: hfa384x_cmd_issue: cmd reg was busy "
+                       "for %d usec\n", dev->name,
+                       HFA384X_CMD_BUSY_TIMEOUT - tries);
+        }
+#endif
+        if (tries == 0) {
+                reg = HFA384X_INW(HFA384X_CMD_OFF);
+                prism2_io_debug_error(dev, 2);
+                printk(KERN_DEBUG "%s: hfa384x_cmd_issue - timeout - "
+                       "reg=0x%04x\n", dev->name, reg);
+                return -ETIMEDOUT;
+        }
+
+        /* write command */
+        spin_lock_irqsave(&local->cmdlock, flags);
+        HFA384X_OUTW(entry->param0, HFA384X_PARAM0_OFF);
+        HFA384X_OUTW(entry->param1, HFA384X_PARAM1_OFF);
+        HFA384X_OUTW(entry->cmd, HFA384X_CMD_OFF);
+        entry->issued = 1;
+        spin_unlock_irqrestore(&local->cmdlock, flags);
+
+        return 0;
+}
+
+
+/**
+ * hfa384x_cmd - Issue a Prism2 command and wait (sleep) for completion
+ * @dev: pointer to net_device
+ * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)
+ * @param0: value for Param0 register
+ * @param1: value for Param1 register (pointer; %NULL if not used)
+ * @resp0: pointer for Resp0 data or %NULL if Resp0 is not needed
+ *
+ * Issue given command (possibly after waiting in command queue) and sleep
+ * until the command is completed (or timed out or interrupted). This can be
+ * called only from user process context.
+ */
+static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
+                       u16 *param1, u16 *resp0)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int err, res, issue, issued = 0;
+        unsigned long flags;
+        struct hostap_cmd_queue *entry;
+        DECLARE_WAITQUEUE(wait, current);
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (in_interrupt()) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd called from interrupt "
+                       "context\n", dev->name);
+                return -1;
+        }
+
+        if (local->cmd_queue_len >= HOSTAP_CMD_QUEUE_MAX_LEN) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd: cmd_queue full\n",
+                       dev->name);
+                return -1;
+        }
+
+        if (signal_pending(current))
+                return -EINTR;
+
+        entry = (struct hostap_cmd_queue *)
+                kmalloc(sizeof(*entry), GFP_ATOMIC);
+        if (entry == NULL) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",
+                       dev->name);
+                return -ENOMEM;
+        }
+        memset(entry, 0, sizeof(*entry));
+        atomic_set(&entry->usecnt, 1);
+        entry->type = CMD_SLEEP;
+        entry->cmd = cmd;
+        entry->param0 = param0;
+        if (param1)
+                entry->param1 = *param1;
+        init_waitqueue_head(&entry->compl);
+
+        /* prepare to wait for command completion event, but do not sleep yet
+         */
+        add_wait_queue(&entry->compl, &wait);
+        set_current_state(TASK_INTERRUPTIBLE);
+
+        spin_lock_irqsave(&local->cmdlock, flags);
+        issue = list_empty(&local->cmd_queue);
+        if (issue)
+                entry->issuing = 1;
+        list_add_tail(&entry->list, &local->cmd_queue);
+        local->cmd_queue_len++;
+        spin_unlock_irqrestore(&local->cmdlock, flags);
+
+        err = 0;
+        if (!issue)
+                goto wait_completion;
+
+        if (signal_pending(current))
+                err = -EINTR;
+
+        if (!err) {
+                if (hfa384x_cmd_issue(dev, entry))
+                        err = -ETIMEDOUT;
+                else
+                        issued = 1;
+        }
+
+ wait_completion:
+        if (!err && entry->type != CMD_COMPLETED) {
+                /* sleep until command is completed or timed out */
+                res = schedule_timeout(2 * HZ);
+        } else
+                res = -1;
+
+        if (!err && signal_pending(current))
+                err = -EINTR;
+
+        if (err && issued) {
+                /* the command was issued, so a CmdCompl event should occur
+                 * soon; however, there's a pending signal and
+                 * schedule_timeout() would be interrupted; wait a short period
+                 * of time to avoid removing entry from the list before
+                 * CmdCompl event */
+                udelay(300);
+        }
+
+        set_current_state(TASK_RUNNING);
+        remove_wait_queue(&entry->compl, &wait);
+
+        /* If entry->list is still in the list, it must be removed
+         * first and in this case prism2_cmd_ev() does not yet have
+         * local reference to it, and the data can be kfree()'d
+         * here. If the command completion event is still generated,
+         * it will be assigned to next (possibly) pending command, but
+         * the driver will reset the card anyway due to timeout
+         *
+         * If the entry is not in the list prism2_cmd_ev() has a local
+         * reference to it, but keeps cmdlock as long as the data is
+         * needed, so the data can be kfree()'d here. */
+
+        /* FIX: if the entry->list is in the list, it has not been completed
+         * yet, so removing it here is somewhat wrong.. this could cause
+         * references to freed memory and next list_del() causing NULL pointer
+         * dereference.. it would probably be better to leave the entry in the
+         * list and the list should be emptied during hw reset */
+
+        spin_lock_irqsave(&local->cmdlock, flags);
+        if (!list_empty(&entry->list)) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd: entry still in list? "
+                       "(entry=%p, type=%d, res=%d)\n", dev->name, entry,
+                       entry->type, res);
+                list_del_init(&entry->list);
+                local->cmd_queue_len--;
+        }
+        spin_unlock_irqrestore(&local->cmdlock, flags);
+
+        if (err) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd: interrupted; err=%d\n",
+                       dev->name, err);
+                res = err;
+                goto done;
+        }
+
+        if (entry->type != CMD_COMPLETED) {
+                u16 reg = HFA384X_INW(HFA384X_EVSTAT_OFF);
+                printk(KERN_DEBUG "%s: hfa384x_cmd: command was not "
+                       "completed (res=%d, entry=%p, type=%d, cmd=0x%04x, "
+                       "param0=0x%04x, EVSTAT=%04x INTEN=%04x)\n", dev->name,
+                       res, entry, entry->type, entry->cmd, entry->param0, reg,
+                       HFA384X_INW(HFA384X_INTEN_OFF));
+                if (reg & HFA384X_EV_CMD) {
+                        /* Command completion event is pending, but the
+                         * interrupt was not delivered - probably an issue
+                         * with pcmcia-cs configuration. */
+                        printk(KERN_WARNING "%s: interrupt delivery does not "
+                               "seem to work\n", dev->name);
+                }
+                prism2_io_debug_error(dev, 3);
+                res = -ETIMEDOUT;
+                goto done;
+        }
+
+        if (resp0 != NULL)
+                *resp0 = entry->resp0;
+#ifndef final_version
+        if (entry->res) {
+                printk(KERN_DEBUG "%s: CMD=0x%04x => res=0x%02x, "
+                       "resp0=0x%04x\n",
+                       dev->name, cmd, entry->res, entry->resp0);
+        }
+#endif /* final_version */
+
+        res = entry->res;
+ done:
+        hostap_cmd_queue_free(local, entry, 1);
+        return res;
+}
+
+
+/**
+ * hfa384x_cmd_callback - Issue a Prism2 command; callback when completed
+ * @dev: pointer to net_device
+ * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)
+ * @param0: value for Param0 register
+ * @callback: command completion callback function (%NULL = no callback)
+ * @context: context data to be given to the callback function
+ *
+ * Issue given command (possibly after waiting in command queue) and use
+ * callback function to indicate command completion. This can be called both
+ * from user and interrupt context. The callback function will be called in
+ * hardware IRQ context. It can be %NULL, when no function is called when
+ * command is completed.
+ */
+static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,
+                                void (*callback)(struct net_device *dev,
+                                                 long context, u16 resp0,
+                                                 u16 status),
+                                long context)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int issue, ret;
+        unsigned long flags;
+        struct hostap_cmd_queue *entry;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->cmd_queue_len >= HOSTAP_CMD_QUEUE_MAX_LEN + 2) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd: cmd_queue full\n",
+                       dev->name);
+                return -1;
+        }
+
+        entry = (struct hostap_cmd_queue *)
+                kmalloc(sizeof(*entry), GFP_ATOMIC);
+        if (entry == NULL) {
+                printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "
+                       "failed\n", dev->name);
+                return -ENOMEM;
+        }
+        memset(entry, 0, sizeof(*entry));
+        atomic_set(&entry->usecnt, 1);
+        entry->type = CMD_CALLBACK;
+        entry->cmd = cmd;
+        entry->param0 = param0;
+        entry->callback = callback;
+        entry->context = context;
+
+        spin_lock_irqsave(&local->cmdlock, flags);
+        issue = list_empty(&local->cmd_queue);
+        if (issue)
+                entry->issuing = 1;
+        list_add_tail(&entry->list, &local->cmd_queue);
+        local->cmd_queue_len++;
+        spin_unlock_irqrestore(&local->cmdlock, flags);
+
+        if (issue && hfa384x_cmd_issue(dev, entry))
+                ret = -ETIMEDOUT;
+        else
+                ret = 0;
+
+        hostap_cmd_queue_free(local, entry, ret);
+
+        return ret;
+}
+
+
+/**
+ * __hfa384x_cmd_no_wait - Issue a Prism2 command (private)
+ * @dev: pointer to net_device
+ * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)
+ * @param0: value for Param0 register
+ * @io_debug_num: I/O debug error number
+ *
+ * Shared helper function for hfa384x_cmd_wait() and hfa384x_cmd_no_wait().
+ */
+static int __hfa384x_cmd_no_wait(struct net_device *dev, u16 cmd, u16 param0,
+                                 int io_debug_num)
+{
+        int tries;
+        u16 reg;
+
+        /* wait until busy bit is clear; this should always be clear since the
+         * commands are serialized */
+        tries = HFA384X_CMD_BUSY_TIMEOUT;
+        while (HFA384X_INW(HFA384X_CMD_OFF) & HFA384X_CMD_BUSY && tries > 0) {
+                tries--;
+                udelay(1);
+        }
+        if (tries == 0) {
+                reg = HFA384X_INW(HFA384X_CMD_OFF);
+                prism2_io_debug_error(dev, io_debug_num);
+                printk(KERN_DEBUG "%s: __hfa384x_cmd_no_wait(%d) - timeout - "
+                       "reg=0x%04x\n", dev->name, io_debug_num, reg);
+                return -ETIMEDOUT;
+        }
+
+        /* write command */
+        HFA384X_OUTW(param0, HFA384X_PARAM0_OFF);
+        HFA384X_OUTW(cmd, HFA384X_CMD_OFF);
+
+        return 0;
+}
+
+
+/**
+ * hfa384x_cmd_wait - Issue a Prism2 command and busy wait for completion
+ * @dev: pointer to net_device
+ * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)
+ * @param0: value for Param0 register
+ */
+static int hfa384x_cmd_wait(struct net_device *dev, u16 cmd, u16 param0)
+{
+        int res, tries;
+        u16 reg;
+
+        res = __hfa384x_cmd_no_wait(dev, cmd, param0, 4);
+        if (res)
+                return res;
+
+        /* wait for command completion */
+        if ((cmd & HFA384X_CMDCODE_MASK) == HFA384X_CMDCODE_DOWNLOAD)
+                tries = HFA384X_DL_COMPL_TIMEOUT;
+        else
+                tries = HFA384X_CMD_COMPL_TIMEOUT;
+
+        while (!(HFA384X_INW(HFA384X_EVSTAT_OFF) & HFA384X_EV_CMD) &&
+               tries > 0) {
+                tries--;
+                udelay(10);
+        }
+        if (tries == 0) {
+                reg = HFA384X_INW(HFA384X_EVSTAT_OFF);
+                prism2_io_debug_error(dev, 5);
+                printk(KERN_DEBUG "%s: hfa384x_cmd_wait - timeout2 - "
+                       "reg=0x%04x\n", dev->name, reg);
+                return -ETIMEDOUT;
+        }
+
+        res = (HFA384X_INW(HFA384X_STATUS_OFF) &
+               (BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) | BIT(9) |
+                BIT(8))) >> 8;
+#ifndef final_version
+        if (res) {
+                printk(KERN_DEBUG "%s: CMD=0x%04x => res=0x%02x\n",
+                       dev->name, cmd, res);
+        }
+#endif
+
+        HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);
+
+        return res;
+}
+
+
+/**
+ * hfa384x_cmd_no_wait - Issue a Prism2 command; do not wait for completion
+ * @dev: pointer to net_device
+ * @cmd: Prism2 command code (HFA384X_CMD_CODE_*)
+ * @param0: value for Param0 register
+ */
+static inline int hfa384x_cmd_no_wait(struct net_device *dev, u16 cmd,
+                                      u16 param0)
+{
+        return __hfa384x_cmd_no_wait(dev, cmd, param0, 6);
+}
+
+
+/**
+ * prism2_cmd_ev - Prism2 command completion event handler
+ * @dev: pointer to net_device
+ *
+ * Interrupt handler for command completion events. Called by the main
+ * interrupt handler in hardware IRQ context. Read Resp0 and status registers
+ * from the hardware and ACK the event. Depending on the issued command type
+ * either wake up the sleeping process that is waiting for command completion
+ * or call the callback function. Issue the next command, if one is pending.
+ */
+static void prism2_cmd_ev(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hostap_cmd_queue *entry = NULL;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock(&local->cmdlock);
+        if (!list_empty(&local->cmd_queue)) {
+                entry = list_entry(local->cmd_queue.next,
+                                   struct hostap_cmd_queue, list);
+                atomic_inc(&entry->usecnt);
+                list_del_init(&entry->list);
+                local->cmd_queue_len--;
+
+                if (!entry->issued) {
+                        printk(KERN_DEBUG "%s: Command completion event, but "
+                               "cmd not issued\n", dev->name);
+                        __hostap_cmd_queue_free(local, entry, 1);
+                        entry = NULL;
+                }
+        }
+        spin_unlock(&local->cmdlock);
+
+        if (!entry) {
+                HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);
+                printk(KERN_DEBUG "%s: Command completion event, but no "
+                       "pending commands\n", dev->name);
+                return;
+        }
+
+        entry->resp0 = HFA384X_INW(HFA384X_RESP0_OFF);
+        entry->res = (HFA384X_INW(HFA384X_STATUS_OFF) &
+                      (BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) |
+                       BIT(9) | BIT(8))) >> 8;
+        HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);
+
+        /* TODO: rest of the CmdEv handling could be moved to tasklet */
+        if (entry->type == CMD_SLEEP) {
+                entry->type = CMD_COMPLETED;
+                wake_up_interruptible(&entry->compl);
+        } else if (entry->type == CMD_CALLBACK) {
+                if (entry->callback)
+                        entry->callback(dev, entry->context, entry->resp0,
+                                        entry->res);
+        } else {
+                printk(KERN_DEBUG "%s: Invalid command completion type %d\n",
+                       dev->name, entry->type);
+        }
+        hostap_cmd_queue_free(local, entry, 1);
+
+        /* issue next command, if pending */
+        entry = NULL;
+        spin_lock(&local->cmdlock);
+        if (!list_empty(&local->cmd_queue)) {
+                entry = list_entry(local->cmd_queue.next,
+                                   struct hostap_cmd_queue, list);
+                if (entry->issuing) {
+                        /* hfa384x_cmd() has already started issuing this
+                         * command, so do not start here */
+                        entry = NULL;
+                }
+                if (entry)
+                        atomic_inc(&entry->usecnt);
+        }
+        spin_unlock(&local->cmdlock);
+
+        if (entry) {
+                /* issue next command; if command issuing fails, remove the
+                 * entry from cmd_queue */
+                int res = hfa384x_cmd_issue(dev, entry);
+                spin_lock(&local->cmdlock);
+                __hostap_cmd_queue_free(local, entry, res);
+                spin_unlock(&local->cmdlock);
+        }
+}
+
+
+static inline int hfa384x_wait_offset(struct net_device *dev, u16 o_off)
+{
+        int tries = HFA384X_BAP_BUSY_TIMEOUT;
+        int res = HFA384X_INW(o_off) & HFA384X_OFFSET_BUSY;
+
+        while (res && tries > 0) {
+                tries--;
+                udelay(1);
+                res = HFA384X_INW(o_off) & HFA384X_OFFSET_BUSY;
+        }
+        return res;
+}
+
+
+/* Offset must be even */
+static int hfa384x_setup_bap(struct net_device *dev, u16 bap, u16 id,
+                             int offset)
+{
+        u16 o_off, s_off;
+        int ret = 0;
+
+        if (offset % 2 || bap > 1)
+                return -EINVAL;
+
+        if (bap == BAP1) {
+                o_off = HFA384X_OFFSET1_OFF;
+                s_off = HFA384X_SELECT1_OFF;
+        } else {
+                o_off = HFA384X_OFFSET0_OFF;
+                s_off = HFA384X_SELECT0_OFF;
+        }
+
+        if (hfa384x_wait_offset(dev, o_off)) {
+                prism2_io_debug_error(dev, 7);
+                printk(KERN_DEBUG "%s: hfa384x_setup_bap - timeout before\n",
+                       dev->name);
+                ret = -ETIMEDOUT;
+                goto out;
+        }
+
+        HFA384X_OUTW(id, s_off);
+        HFA384X_OUTW(offset, o_off);
+
+        if (hfa384x_wait_offset(dev, o_off)) {
+                prism2_io_debug_error(dev, 8);
+                printk(KERN_DEBUG "%s: hfa384x_setup_bap - timeout after\n",
+                       dev->name);
+                ret = -ETIMEDOUT;
+                goto out;
+        }
+#ifndef final_version
+        if (HFA384X_INW(o_off) & HFA384X_OFFSET_ERR) {
+                prism2_io_debug_error(dev, 9);
+                printk(KERN_DEBUG "%s: hfa384x_setup_bap - offset error "
+                       "(%d,0x04%x,%d); reg=0x%04x\n",
+                       dev->name, bap, id, offset, HFA384X_INW(o_off));
+                ret = -EINVAL;
+        }
+#endif
+
+ out:
+        return ret;
+}
+
+
+static int hfa384x_get_rid(struct net_device *dev, u16 rid, void *buf, int len,
+                           int exact_len)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int res, rlen = 0;
+        struct hfa384x_rid_hdr rec;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->no_pri) {
+                printk(KERN_DEBUG "%s: cannot get RID %04x (len=%d) - no PRI "
+                       "f/w\n", dev->name, rid, len);
+                return -ENOTTY; /* Well.. not really correct, but return
+                                 * something unique enough.. */
+        }
+
+        if ((local->func->card_present && !local->func->card_present(local)) ||
+            local->hw_downloading)
+                return -ENODEV;
+
+        res = down_interruptible(&local->rid_bap_sem);
+        if (res)
+                return res;
+
+        res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS, rid, NULL, NULL);
+        if (res) {
+                printk(KERN_DEBUG "%s: hfa384x_get_rid: CMDCODE_ACCESS failed "
+                       "(res=%d, rid=%04x, len=%d)\n",
+                       dev->name, res, rid, len);
+                up(&local->rid_bap_sem);
+                return res;
+        }
+
+        spin_lock_bh(&local->baplock);
+
+        res = hfa384x_setup_bap(dev, BAP0, rid, 0);
+        if (!res)
+                res = hfa384x_from_bap(dev, BAP0, &rec, sizeof(rec));
+
+        if (le16_to_cpu(rec.len) == 0) {
+                /* RID not available */
+                res = -ENODATA;
+        }
+
+        rlen = (le16_to_cpu(rec.len) - 1) * 2;
+        if (!res && exact_len && rlen != len) {
+                printk(KERN_DEBUG "%s: hfa384x_get_rid - RID len mismatch: "
+                       "rid=0x%04x, len=%d (expected %d)\n",
+                       dev->name, rid, rlen, len);
+                res = -ENODATA;
+        }
+
+        if (!res)
+                res = hfa384x_from_bap(dev, BAP0, buf, len);
+
+        spin_unlock_bh(&local->baplock);
+        up(&local->rid_bap_sem);
+
+        if (res) {
+                if (res != -ENODATA)
+                        printk(KERN_DEBUG "%s: hfa384x_get_rid (rid=%04x, "
+                               "len=%d) - failed - res=%d\n", dev->name, rid,
+                               len, res);
+                if (res == -ETIMEDOUT)
+                        prism2_hw_reset(dev);
+                return res;
+        }
+
+        return rlen;
+}
+
+
+static int hfa384x_set_rid(struct net_device *dev, u16 rid, void *buf, int len)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hfa384x_rid_hdr rec;
+        int res;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->no_pri) {
+                printk(KERN_DEBUG "%s: cannot set RID %04x (len=%d) - no PRI "
+                       "f/w\n", dev->name, rid, len);
+                return -ENOTTY; /* Well.. not really correct, but return
+                                 * something unique enough.. */
+        }
+
+        if ((local->func->card_present && !local->func->card_present(local)) ||
+            local->hw_downloading)
+                return -ENODEV;
+
+        rec.rid = cpu_to_le16(rid);
+        /* RID len in words and +1 for rec.rid */
+        rec.len = cpu_to_le16(len / 2 + len % 2 + 1);
+
+        res = down_interruptible(&local->rid_bap_sem);
+        if (res)
+                return res;
+
+        spin_lock_bh(&local->baplock);
+        res = hfa384x_setup_bap(dev, BAP0, rid, 0);
+        if (!res)
+                res = hfa384x_to_bap(dev, BAP0, &rec, sizeof(rec));
+        if (!res)
+                res = hfa384x_to_bap(dev, BAP0, buf, len);
+        spin_unlock_bh(&local->baplock);
+
+        if (res) {
+                printk(KERN_DEBUG "%s: hfa384x_set_rid (rid=%04x, len=%d) - "
+                       "failed - res=%d\n", dev->name, rid, len, res);
+                up(&local->rid_bap_sem);
+                return res;
+        }
+
+        res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS_WRITE, rid, NULL, NULL);
+        up(&local->rid_bap_sem);
+        if (res) {
+                printk(KERN_DEBUG "%s: hfa384x_set_rid: CMDCODE_ACCESS_WRITE "
+                       "failed (res=%d, rid=%04x, len=%d)\n",
+                       dev->name, res, rid, len);
+                return res;
+        }
+
+        if (res == -ETIMEDOUT)
+                prism2_hw_reset(dev);
+
+        return res;
+}
+
+
+static void hfa384x_disable_interrupts(struct net_device *dev)
+{
+        /* disable interrupts and clear event status */
+        HFA384X_OUTW(0, HFA384X_INTEN_OFF);
+        HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);
+}
+
+
+static void hfa384x_enable_interrupts(struct net_device *dev)
+{
+        /* ack pending events and enable interrupts from selected events */
+        HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);
+        HFA384X_OUTW(HFA384X_EVENT_MASK, HFA384X_INTEN_OFF);
+}
+
+
+static void hfa384x_events_no_bap0(struct net_device *dev)
+{
+        HFA384X_OUTW(HFA384X_EVENT_MASK & ~HFA384X_BAP0_EVENTS,
+                     HFA384X_INTEN_OFF);
+}
+
+
+static void hfa384x_events_all(struct net_device *dev)
+{
+        HFA384X_OUTW(HFA384X_EVENT_MASK, HFA384X_INTEN_OFF);
+}
+
+
+static void hfa384x_events_only_cmd(struct net_device *dev)
+{
+        HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_INTEN_OFF);
+}
+
+
+static u16 hfa384x_allocate_fid(struct net_device *dev, int len)
+{
+        u16 fid;
+        unsigned long delay;
+
+        /* FIX: this could be replace with hfa384x_cmd() if the Alloc event
+         * below would be handled like CmdCompl event (sleep here, wake up from
+         * interrupt handler */
+        if (hfa384x_cmd_wait(dev, HFA384X_CMDCODE_ALLOC, len)) {
+                printk(KERN_DEBUG "%s: cannot allocate fid, len=%d\n",
+                       dev->name, len);
+                return 0xffff;
+        }
+
+        delay = jiffies + HFA384X_ALLOC_COMPL_TIMEOUT;
+        while (!(HFA384X_INW(HFA384X_EVSTAT_OFF) & HFA384X_EV_ALLOC) &&
+               time_before(jiffies, delay))
+                yield();
+        if (!(HFA384X_INW(HFA384X_EVSTAT_OFF) & HFA384X_EV_ALLOC)) {
+                printk("%s: fid allocate, len=%d - timeout\n", dev->name, len);
+                return 0xffff;
+        }
+
+        fid = HFA384X_INW(HFA384X_ALLOCFID_OFF);
+        HFA384X_OUTW(HFA384X_EV_ALLOC, HFA384X_EVACK_OFF);
+
+        return fid;
+}
+
+
+static int prism2_reset_port(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int res;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (!local->dev_enabled)
+                return 0;
+
+        res = hfa384x_cmd(dev, HFA384X_CMDCODE_DISABLE, 0,
+                          NULL, NULL);
+        if (res)
+                printk(KERN_DEBUG "%s: reset port failed to disable port\n",
+                       dev->name);
+        else {
+                res = hfa384x_cmd(dev, HFA384X_CMDCODE_ENABLE, 0,
+                                  NULL, NULL);
+                if (res)
+                        printk(KERN_DEBUG "%s: reset port failed to enable "
+                               "port\n", dev->name);
+        }
+
+        /* It looks like at least some STA firmware versions reset
+         * fragmentation threshold back to 2346 after enable command. Restore
+         * the configured value, if it differs from this default. */
+        if (local->fragm_threshold != 2346 &&
+            hostap_set_word(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD,
+                            local->fragm_threshold)) {
+                printk(KERN_DEBUG "%s: failed to restore fragmentation "
+                       "threshold (%d) after Port0 enable\n",
+                       dev->name, local->fragm_threshold);
+        }
+
+        return res;
+}
+
+
+static int prism2_get_version_info(struct net_device *dev, u16 rid,
+                                   const char *txt)
+{
+        struct hfa384x_comp_ident comp;
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->no_pri) {
+                /* PRI f/w not yet available - cannot read RIDs */
+                return -1;
+        }
+        if (hfa384x_get_rid(dev, rid, &comp, sizeof(comp), 1) < 0) {
+                printk(KERN_DEBUG "Could not get RID for component %s\n", txt);
+                return -1;
+        }
+
+        printk(KERN_INFO "%s: %s: id=0x%02x v%d.%d.%d\n", dev->name, txt,
+               __le16_to_cpu(comp.id), __le16_to_cpu(comp.major),
+               __le16_to_cpu(comp.minor), __le16_to_cpu(comp.variant));
+        return 0;
+}
+
+
+static int prism2_setup_rids(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 tmp;
+        int ret = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        hostap_set_word(dev, HFA384X_RID_TICKTIME, 2000);
+
+        if (!local->fw_ap) {
+                tmp = hostap_get_porttype(local);
+                ret = hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE, tmp);
+                if (ret) {
+                        printk("%s: Port type setting to %d failed\n",
+                               dev->name, tmp);
+                        goto fail;
+                }
+        }
+
+        /* Setting SSID to empty string seems to kill the card in Host AP mode
+         */
+        if (local->iw_mode != IW_MODE_MASTER || local->essid[0] != '\0') {
+                ret = hostap_set_string(dev, HFA384X_RID_CNFOWNSSID,
+                                        local->essid);
+                if (ret) {
+                        printk("%s: AP own SSID setting failed\n", dev->name);
+                        goto fail;
+                }
+        }
+
+        ret = hostap_set_word(dev, HFA384X_RID_CNFMAXDATALEN,
+                              PRISM2_DATA_MAXLEN);
+        if (ret) {
+                printk("%s: MAC data length setting to %d failed\n",
+                       dev->name, PRISM2_DATA_MAXLEN);
+                goto fail;
+        }
+
+        if (hfa384x_get_rid(dev, HFA384X_RID_CHANNELLIST, &tmp, 2, 1) < 0) {
+                printk("%s: Channel list read failed\n", dev->name);
+                ret = -EINVAL;
+                goto fail;
+        }
+        local->channel_mask = __le16_to_cpu(tmp);
+
+        if (local->channel < 1 || local->channel > 14 ||
+            !(local->channel_mask & (1 << (local->channel - 1)))) {
+                printk(KERN_WARNING "%s: Channel setting out of range "
+                       "(%d)!\n", dev->name, local->channel);
+                ret = -EBUSY;
+                goto fail;
+        }
+
+        ret = hostap_set_word(dev, HFA384X_RID_CNFOWNCHANNEL, local->channel);
+        if (ret) {
+                printk("%s: Channel setting to %d failed\n",
+                       dev->name, local->channel);
+                goto fail;
+        }
+
+        ret = hostap_set_word(dev, HFA384X_RID_CNFBEACONINT,
+                              local->beacon_int);
+        if (ret) {
+                printk("%s: Beacon interval setting to %d failed\n",
+                       dev->name, local->beacon_int);
+                /* this may fail with Symbol/Lucent firmware */
+                if (ret == -ETIMEDOUT)
+                        goto fail;
+        }
+
+        ret = hostap_set_word(dev, HFA384X_RID_CNFOWNDTIMPERIOD,
+                              local->dtim_period);
+        if (ret) {
+                printk("%s: DTIM period setting to %d failed\n",
+                       dev->name, local->dtim_period);
+                /* this may fail with Symbol/Lucent firmware */
+                if (ret == -ETIMEDOUT)
+                        goto fail;
+        }
+
+        ret = hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE,
+                              local->is_promisc);
+        if (ret)
+                printk(KERN_INFO "%s: Setting promiscuous mode (%d) failed\n",
+                       dev->name, local->is_promisc);
+
+        if (!local->fw_ap) {
+                ret = hostap_set_string(dev, HFA384X_RID_CNFDESIREDSSID,
+                                        local->essid);
+                if (ret) {
+                        printk("%s: Desired SSID setting failed\n", dev->name);
+                        goto fail;
+                }
+        }
+
+        /* Setup TXRateControl, defaults to allow use of 1, 2, 5.5, and
+         * 11 Mbps in automatic TX rate fallback and 1 and 2 Mbps as basic
+         * rates */
+        if (local->tx_rate_control == 0) {
+                local->tx_rate_control =
+                        HFA384X_RATES_1MBPS |
+                        HFA384X_RATES_2MBPS |
+                        HFA384X_RATES_5MBPS |
+                        HFA384X_RATES_11MBPS;
+        }
+        if (local->basic_rates == 0)
+                local->basic_rates = HFA384X_RATES_1MBPS | HFA384X_RATES_2MBPS;
+
+        if (!local->fw_ap) {
+                ret = hostap_set_word(dev, HFA384X_RID_TXRATECONTROL,
+                                      local->tx_rate_control);
+                if (ret) {
+                        printk("%s: TXRateControl setting to %d failed\n",
+                               dev->name, local->tx_rate_control);
+                        goto fail;
+                }
+
+                ret = hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES,
+                                      local->tx_rate_control);
+                if (ret) {
+                        printk("%s: cnfSupportedRates setting to %d failed\n",
+                               dev->name, local->tx_rate_control);
+                }
+
+                ret = hostap_set_word(dev, HFA384X_RID_CNFBASICRATES,
+                                      local->basic_rates);
+                if (ret) {
+                        printk("%s: cnfBasicRates setting to %d failed\n",
+                               dev->name, local->basic_rates);
+                }
+
+                ret = hostap_set_word(dev, HFA384X_RID_CREATEIBSS, 1);
+                if (ret) {
+                        printk("%s: Create IBSS setting to 1 failed\n",
+                               dev->name);
+                }
+        }
+
+        if (local->name_set)
+                (void) hostap_set_string(dev, HFA384X_RID_CNFOWNNAME,
+                                         local->name);
+
+        if (hostap_set_encryption(local)) {
+                printk(KERN_INFO "%s: could not configure encryption\n",
+                       dev->name);
+        }
+
+        (void) hostap_set_antsel(local);
+
+        if (hostap_set_roaming(local)) {
+                printk(KERN_INFO "%s: could not set host roaming\n",
+                       dev->name);
+        }
+
+        if (local->sta_fw_ver >= PRISM2_FW_VER(1,6,3) &&
+            hostap_set_word(dev, HFA384X_RID_CNFENHSECURITY, local->enh_sec))
+                printk(KERN_INFO "%s: cnfEnhSecurity setting to 0x%x failed\n",
+                       dev->name, local->enh_sec);
+
+        /* 32-bit tallies were added in STA f/w 0.8.0, but they were apparently
+         * not working correctly (last seven counters report bogus values).
+         * This has been fixed in 0.8.2, so enable 32-bit tallies only
+         * beginning with that firmware version. Another bug fix for 32-bit
+         * tallies in 1.4.0; should 16-bit tallies be used for some other
+         * versions, too? */
+        if (local->sta_fw_ver >= PRISM2_FW_VER(0,8,2)) {
+                if (hostap_set_word(dev, HFA384X_RID_CNFTHIRTY2TALLY, 1)) {
+                        printk(KERN_INFO "%s: cnfThirty2Tally setting "
+                               "failed\n", dev->name);
+                        local->tallies32 = 0;
+                } else
+                        local->tallies32 = 1;
+        } else
+                local->tallies32 = 0;
+
+        hostap_set_auth_algs(local);
+
+        if (hostap_set_word(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD,
+                            local->fragm_threshold)) {
+                printk(KERN_INFO "%s: setting FragmentationThreshold to %d "
+                       "failed\n", dev->name, local->fragm_threshold);
+        }
+
+        if (hostap_set_word(dev, HFA384X_RID_RTSTHRESHOLD,
+                            local->rts_threshold)) {
+                printk(KERN_INFO "%s: setting RTSThreshold to %d failed\n",
+                       dev->name, local->rts_threshold);
+        }
+
+        if (local->manual_retry_count >= 0 &&
+            hostap_set_word(dev, HFA384X_RID_CNFALTRETRYCOUNT,
+                            local->manual_retry_count)) {
+                printk(KERN_INFO "%s: setting cnfAltRetryCount to %d failed\n",
+                       dev->name, local->manual_retry_count);
+        }
+
+        if (local->sta_fw_ver >= PRISM2_FW_VER(1,3,1) &&
+            hfa384x_get_rid(dev, HFA384X_RID_CNFDBMADJUST, &tmp, 2, 1) == 2) {
+                local->rssi_to_dBm = le16_to_cpu(tmp);
+        }
+
+        if (local->sta_fw_ver >= PRISM2_FW_VER(1,7,0) && local->wpa &&
+            hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE, 1)) {
+                printk(KERN_INFO "%s: setting ssnHandlingMode to 1 failed\n",
+                       dev->name);
+        }
+
+        if (local->sta_fw_ver >= PRISM2_FW_VER(1,7,0) && local->generic_elem &&
+            hfa384x_set_rid(dev, HFA384X_RID_GENERICELEMENT,
+                            local->generic_elem, local->generic_elem_len)) {
+                printk(KERN_INFO "%s: setting genericElement failed\n",
+                       dev->name);
+        }
+
+ fail:
+        return ret;
+}
+
+
+static int prism2_hw_init(struct net_device *dev, int initial)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret, first = 1;
+        unsigned long start, delay;
+
+        PDEBUG(DEBUG_FLOW, "prism2_hw_init()\n");
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        clear_bit(HOSTAP_BITS_TRANSMIT, &local->bits);
+
+ init:
+        /* initialize HFA 384x */
+        ret = hfa384x_cmd_no_wait(dev, HFA384X_CMDCODE_INIT, 0);
+        if (ret) {
+                printk(KERN_INFO "%s: first command failed - assuming card "
+                       "does not have primary firmware\n", dev_info);
+        }
+
+        if (first && (HFA384X_INW(HFA384X_EVSTAT_OFF) & HFA384X_EV_CMD)) {
+                /* EvStat has Cmd bit set in some cases, so retry once if no
+                 * wait was needed */
+                HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);
+                printk(KERN_DEBUG "%s: init command completed too quickly - "
+                       "retrying\n", dev->name);
+                first = 0;
+                goto init;
+        }
+
+        start = jiffies;
+        delay = jiffies + HFA384X_INIT_TIMEOUT;
+        while (!(HFA384X_INW(HFA384X_EVSTAT_OFF) & HFA384X_EV_CMD) &&
+               time_before(jiffies, delay))
+                yield();
+        if (!(HFA384X_INW(HFA384X_EVSTAT_OFF) & HFA384X_EV_CMD)) {
+                printk(KERN_DEBUG "%s: assuming no Primary image in "
+                       "flash - card initialization not completed\n",
+                       dev_info);
+                local->no_pri = 1;
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+                        if (local->sram_type == -1)
+                                local->sram_type = prism2_get_ram_size(local);
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+                return 1;
+        }
+        local->no_pri = 0;
+        printk(KERN_DEBUG "prism2_hw_init: initialized in %lu ms\n",
+               (jiffies - start) * 1000 / HZ);
+        HFA384X_OUTW(HFA384X_EV_CMD, HFA384X_EVACK_OFF);
+        return 0;
+}
+
+
+static int prism2_hw_init2(struct net_device *dev, int initial)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int i;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+        kfree(local->pda);
+        if (local->no_pri)
+                local->pda = NULL;
+        else
+                local->pda = prism2_read_pda(dev);
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+        hfa384x_disable_interrupts(dev);
+
+#ifndef final_version
+        HFA384X_OUTW(HFA384X_MAGIC, HFA384X_SWSUPPORT0_OFF);
+        if (HFA384X_INW(HFA384X_SWSUPPORT0_OFF) != HFA384X_MAGIC) {
+                printk("SWSUPPORT0 write/read failed: %04X != %04X\n",
+                       HFA384X_INW(HFA384X_SWSUPPORT0_OFF), HFA384X_MAGIC);
+                goto failed;
+        }
+#endif
+
+        if (initial || local->pri_only) {
+                hfa384x_events_only_cmd(dev);
+                /* get card version information */
+                if (prism2_get_version_info(dev, HFA384X_RID_NICID, "NIC") ||
+                    prism2_get_version_info(dev, HFA384X_RID_PRIID, "PRI")) {
+                        hfa384x_disable_interrupts(dev);
+                        goto failed;
+                }
+
+                if (prism2_get_version_info(dev, HFA384X_RID_STAID, "STA")) {
+                        printk(KERN_DEBUG "%s: Failed to read STA f/w version "
+                               "- only Primary f/w present\n", dev->name);
+                        local->pri_only = 1;
+                        return 0;
+                }
+                local->pri_only = 0;
+                hfa384x_disable_interrupts(dev);
+        }
+
+        /* FIX: could convert allocate_fid to use sleeping CmdCompl wait and
+         * enable interrupts before this. This would also require some sort of
+         * sleeping AllocEv waiting */
+
+        /* allocate TX FIDs */
+        local->txfid_len = PRISM2_TXFID_LEN;
+        for (i = 0; i < PRISM2_TXFID_COUNT; i++) {
+                local->txfid[i] = hfa384x_allocate_fid(dev, local->txfid_len);
+                if (local->txfid[i] == 0xffff && local->txfid_len > 1600) {
+                        local->txfid[i] = hfa384x_allocate_fid(dev, 1600);
+                        if (local->txfid[i] != 0xffff) {
+                                printk(KERN_DEBUG "%s: Using shorter TX FID "
+                                       "(1600 bytes)\n", dev->name);
+                                local->txfid_len = 1600;
+                        }
+                }
+                if (local->txfid[i] == 0xffff)
+                        goto failed;
+                local->intransmitfid[i] = PRISM2_TXFID_EMPTY;
+        }
+
+        hfa384x_events_only_cmd(dev);
+
+        if (initial) {
+                struct list_head *ptr;
+                prism2_check_sta_fw_version(local);
+
+                if (hfa384x_get_rid(dev, HFA384X_RID_CNFOWNMACADDR,
+                                    &dev->dev_addr, 6, 1) < 0) {
+                        printk("%s: could not get own MAC address\n",
+                               dev->name);
+                }
+                list_for_each(ptr, &local->hostap_interfaces) {
+                        iface = list_entry(ptr, struct hostap_interface, list);
+                        memcpy(iface->dev->dev_addr, dev->dev_addr, ETH_ALEN);
+                }
+        } else if (local->fw_ap)
+                prism2_check_sta_fw_version(local);
+
+        prism2_setup_rids(dev);
+
+        /* MAC is now configured, but port 0 is not yet enabled */
+        return 0;
+
+ failed:
+        if (!local->no_pri)
+                printk(KERN_WARNING "%s: Initialization failed\n", dev_info);
+        return 1;
+}
+
+
+static int prism2_hw_enable(struct net_device *dev, int initial)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int was_resetting;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        was_resetting = local->hw_resetting;
+
+        if (hfa384x_cmd(dev, HFA384X_CMDCODE_ENABLE, 0, NULL, NULL)) {
+                printk("%s: MAC port 0 enabling failed\n", dev->name);
+                return 1;
+        }
+
+        local->hw_ready = 1;
+        local->hw_reset_tries = 0;
+        local->hw_resetting = 0;
+        hfa384x_enable_interrupts(dev);
+
+        /* at least D-Link DWL-650 seems to require additional port reset
+         * before it starts acting as an AP, so reset port automatically
+         * here just in case */
+        if (initial && prism2_reset_port(dev)) {
+                printk("%s: MAC port 0 reseting failed\n", dev->name);
+                return 1;
+        }
+
+        if (was_resetting && netif_queue_stopped(dev)) {
+                /* If hw_reset() was called during pending transmit, netif
+                 * queue was stopped. Wake it up now since the wlan card has
+                 * been resetted. */
+                netif_wake_queue(dev);
+        }
+
+        return 0;
+}
+
+
+static int prism2_hw_config(struct net_device *dev, int initial)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->hw_downloading)
+                return 1;
+
+        if (prism2_hw_init(dev, initial)) {
+                return local->no_pri ? 0 : 1;
+        }
+
+        if (prism2_hw_init2(dev, initial))
+                return 1;
+
+        /* Enable firmware if secondary image is loaded and at least one of the
+         * netdevices is up. */
+        if (!local->pri_only &&
+            (initial == 0 || (initial == 2 && local->num_dev_open > 0))) {
+                if (!local->dev_enabled)
+                        prism2_callback(local, PRISM2_CALLBACK_ENABLE);
+                local->dev_enabled = 1;
+                return prism2_hw_enable(dev, initial);
+        }
+
+        return 0;
+}
+
+
+static void prism2_hw_shutdown(struct net_device *dev, int no_disable)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        /* Allow only command completion events during disable */
+        hfa384x_events_only_cmd(dev);
+
+        local->hw_ready = 0;
+        if (local->dev_enabled)
+                prism2_callback(local, PRISM2_CALLBACK_DISABLE);
+        local->dev_enabled = 0;
+
+        if (local->func->card_present && !local->func->card_present(local)) {
+                printk(KERN_DEBUG "%s: card already removed or not configured "
+                       "during shutdown\n", dev->name);
+                return;
+        }
+
+        if ((no_disable & HOSTAP_HW_NO_DISABLE) == 0 &&
+            hfa384x_cmd(dev, HFA384X_CMDCODE_DISABLE, 0, NULL, NULL))
+                printk(KERN_WARNING "%s: Shutdown failed\n", dev_info);
+
+        hfa384x_disable_interrupts(dev);
+
+        if (no_disable & HOSTAP_HW_ENABLE_CMDCOMPL)
+                hfa384x_events_only_cmd(dev);
+        else
+                prism2_clear_cmd_queue(local);
+}
+
+
+static void prism2_hw_reset(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+#if 0
+        static long last_reset = 0;
+
+        /* do not reset card more than once per second to avoid ending up in a
+         * busy loop reseting the card */
+        if (time_before_eq(jiffies, last_reset + HZ))
+                return;
+        last_reset = jiffies;
+#endif
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (in_interrupt()) {
+                printk(KERN_DEBUG "%s: driver bug - prism2_hw_reset() called "
+                       "in interrupt context\n", dev->name);
+                return;
+        }
+
+        if (local->hw_downloading)
+                return;
+
+        if (local->hw_resetting) {
+                printk(KERN_WARNING "%s: %s: already resetting card - "
+                       "ignoring reset request\n", dev_info, dev->name);
+                return;
+        }
+
+        local->hw_reset_tries++;
+        if (local->hw_reset_tries > 10) {
+                printk(KERN_WARNING "%s: too many reset tries, skipping\n",
+                       dev->name);
+                return;
+        }
+
+        printk(KERN_WARNING "%s: %s: resetting card\n", dev_info, dev->name);
+        hfa384x_disable_interrupts(dev);
+        local->hw_resetting = 1;
+        if (local->func->cor_sreset) {
+                /* Host system seems to hang in some cases with high traffic
+                 * load or shared interrupts during COR sreset. Disable shared
+                 * interrupts during reset to avoid these crashes. COS sreset
+                 * takes quite a long time, so it is unfortunate that this
+                 * seems to be needed. Anyway, I do not know of any better way
+                 * of avoiding the crash. */
+                disable_irq(dev->irq);
+                local->func->cor_sreset(local);
+                enable_irq(dev->irq);
+        }
+        prism2_hw_shutdown(dev, 1);
+        prism2_hw_config(dev, 0);
+        local->hw_resetting = 0;
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+        if (local->dl_pri) {
+                printk(KERN_DEBUG "%s: persistent download of primary "
+                       "firmware\n", dev->name);
+                if (prism2_download_genesis(local, local->dl_pri) < 0)
+                        printk(KERN_WARNING "%s: download (PRI) failed\n",
+                               dev->name);
+        }
+
+        if (local->dl_sec) {
+                printk(KERN_DEBUG "%s: persistent download of secondary "
+                       "firmware\n", dev->name);
+                if (prism2_download_volatile(local, local->dl_sec) < 0)
+                        printk(KERN_WARNING "%s: download (SEC) failed\n",
+                               dev->name);
+        }
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+        /* TODO: restore beacon TIM bits for STAs that have buffered frames */
+}
+
+
+static void prism2_schedule_reset(local_info_t *local)
+{
+        schedule_work(&local->reset_queue);
+}
+
+
+/* Called only as scheduled task after noticing card timeout in interrupt
+ * context */
+static void handle_reset_queue(void *data)
+{
+        local_info_t *local = (local_info_t *) data;
+
+        printk(KERN_DEBUG "%s: scheduled card reset\n", local->dev->name);
+        prism2_hw_reset(local->dev);
+
+        if (netif_queue_stopped(local->dev)) {
+                int i;
+
+                for (i = 0; i < PRISM2_TXFID_COUNT; i++)
+                        if (local->intransmitfid[i] == PRISM2_TXFID_EMPTY) {
+                                PDEBUG(DEBUG_EXTRA, "prism2_tx_timeout: "
+                                       "wake up queue\n");
+                                netif_wake_queue(local->dev);
+                                break;
+                        }
+        }
+}
+
+
+static int prism2_get_txfid_idx(local_info_t *local)
+{
+        int idx, end;
+        unsigned long flags;
+
+        spin_lock_irqsave(&local->txfidlock, flags);
+        end = idx = local->next_txfid;
+        do {
+                if (local->intransmitfid[idx] == PRISM2_TXFID_EMPTY) {
+                        local->intransmitfid[idx] = PRISM2_TXFID_RESERVED;
+                        spin_unlock_irqrestore(&local->txfidlock, flags);
+                        return idx;
+                }
+                idx++;
+                if (idx >= PRISM2_TXFID_COUNT)
+                        idx = 0;
+        } while (idx != end);
+        spin_unlock_irqrestore(&local->txfidlock, flags);
+
+        PDEBUG(DEBUG_EXTRA2, "prism2_get_txfid_idx: no room in txfid buf: "
+               "packet dropped\n");
+        local->stats.tx_dropped++;
+
+        return -1;
+}
+
+
+/* Called only from hardware IRQ */
+static void prism2_transmit_cb(struct net_device *dev, long context,
+                               u16 resp0, u16 res)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int idx = (int) context;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (res) {
+                printk(KERN_DEBUG "%s: prism2_transmit_cb - res=0x%02x\n",
+                       dev->name, res);
+                return;
+        }
+
+        if (idx < 0 || idx >= PRISM2_TXFID_COUNT) {
+                printk(KERN_DEBUG "%s: prism2_transmit_cb called with invalid "
+                       "idx=%d\n", dev->name, idx);
+                return;
+        }
+
+        if (!test_and_clear_bit(HOSTAP_BITS_TRANSMIT, &local->bits)) {
+                printk(KERN_DEBUG "%s: driver bug: prism2_transmit_cb called "
+                       "with no pending transmit\n", dev->name);
+        }
+
+        if (netif_queue_stopped(dev)) {
+                /* ready for next TX, so wake up queue that was stopped in
+                 * prism2_transmit() */
+                netif_wake_queue(dev);
+        }
+
+        spin_lock(&local->txfidlock);
+
+        /* With reclaim, Resp0 contains new txfid for transmit; the old txfid
+         * will be automatically allocated for the next TX frame */
+        local->intransmitfid[idx] = resp0;
+
+        PDEBUG(DEBUG_FID, "%s: prism2_transmit_cb: txfid[%d]=0x%04x, "
+               "resp0=0x%04x, transmit_txfid=0x%04x\n",
+               dev->name, idx, local->txfid[idx],
+               resp0, local->intransmitfid[local->next_txfid]);
+
+        idx++;
+        if (idx >= PRISM2_TXFID_COUNT)
+                idx = 0;
+        local->next_txfid = idx;
+
+        /* check if all TX buffers are occupied */
+        do {
+                if (local->intransmitfid[idx] == PRISM2_TXFID_EMPTY) {
+                        spin_unlock(&local->txfidlock);
+                        return;
+                }
+                idx++;
+                if (idx >= PRISM2_TXFID_COUNT)
+                        idx = 0;
+        } while (idx != local->next_txfid);
+        spin_unlock(&local->txfidlock);
+
+        /* no empty TX buffers, stop queue */
+        netif_stop_queue(dev);
+}
+
+
+/* Called only from software IRQ if PCI bus master is not used (with bus master
+ * this can be called both from software and hardware IRQ) */
+static int prism2_transmit(struct net_device *dev, int idx)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int res;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        /* The driver tries to stop netif queue so that there would not be
+         * more than one attempt to transmit frames going on; check that this
+         * is really the case */
+
+        if (test_and_set_bit(HOSTAP_BITS_TRANSMIT, &local->bits)) {
+                printk(KERN_DEBUG "%s: driver bug - prism2_transmit() called "
+                       "when previous TX was pending\n", dev->name);
+                return -1;
+        }
+
+        /* stop the queue for the time that transmit is pending */
+        netif_stop_queue(dev);
+
+        /* transmit packet */
+        res = hfa384x_cmd_callback(
+                dev,
+                HFA384X_CMDCODE_TRANSMIT | HFA384X_CMD_TX_RECLAIM,
+                local->txfid[idx],
+                prism2_transmit_cb, (long) idx);
+
+        if (res) {
+                struct net_device_stats *stats;
+                printk(KERN_DEBUG "%s: prism2_transmit: CMDCODE_TRANSMIT "
+                       "failed (res=%d)\n", dev->name, res);
+                stats = hostap_get_stats(dev);
+                stats->tx_dropped++;
+                netif_wake_queue(dev);
+                return -1;
+        }
+        dev->trans_start = jiffies;
+
+        /* Since we did not wait for command completion, the card continues
+         * to process on the background and we will finish handling when
+         * command completion event is handled (prism2_cmd_ev() function) */
+
+        return 0;
+}
+
+
+/* Send IEEE 802.11 frame (convert the header into Prism2 TX descriptor and
+ * send the payload with this descriptor) */
+/* Called only from software IRQ */
+static int prism2_tx_80211(struct sk_buff *skb, struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hfa384x_tx_frame txdesc;
+        struct hostap_skb_tx_data *meta;
+        int hdr_len, data_len, idx, res, ret = -1;
+        u16 tx_control, fc;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        meta = (struct hostap_skb_tx_data *) skb->cb;
+
+        prism2_callback(local, PRISM2_CALLBACK_TX_START);
+
+        if ((local->func->card_present && !local->func->card_present(local)) ||
+            !local->hw_ready || local->hw_downloading || local->pri_only) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: prism2_tx_80211: hw not ready -"
+                               " skipping\n", dev->name);
+                }
+                goto fail;
+        }
+
+        memset(&txdesc, 0, sizeof(txdesc));
+
+        /* skb->data starts with txdesc->frame_control */
+        hdr_len = 24;
+        memcpy(&txdesc.frame_control, skb->data, hdr_len);
+        fc = le16_to_cpu(txdesc.frame_control);
+        if (WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA &&
+            (fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS) &&
+            skb->len >= 30) {
+                /* Addr4 */
+                memcpy(txdesc.addr4, skb->data + hdr_len, ETH_ALEN);
+                hdr_len += ETH_ALEN;
+        }
+
+        tx_control = local->tx_control;
+        if (meta->tx_cb_idx) {
+                tx_control |= HFA384X_TX_CTRL_TX_OK;
+                txdesc.sw_support = cpu_to_le16(meta->tx_cb_idx);
+        }
+        txdesc.tx_control = cpu_to_le16(tx_control);
+        txdesc.tx_rate = meta->rate;
+
+        data_len = skb->len - hdr_len;
+        txdesc.data_len = cpu_to_le16(data_len);
+        txdesc.len = cpu_to_be16(data_len);
+
+        idx = prism2_get_txfid_idx(local);
+        if (idx < 0)
+                goto fail;
+
+        if (local->frame_dump & PRISM2_DUMP_TX_HDR)
+                hostap_dump_tx_header(dev->name, &txdesc);
+
+        spin_lock(&local->baplock);
+        res = hfa384x_setup_bap(dev, BAP0, local->txfid[idx], 0);
+
+        if (!res)
+                res = hfa384x_to_bap(dev, BAP0, &txdesc, sizeof(txdesc));
+        if (!res)
+                res = hfa384x_to_bap(dev, BAP0, skb->data + hdr_len,
+                                     skb->len - hdr_len);
+        spin_unlock(&local->baplock);
+
+        if (!res)
+                res = prism2_transmit(dev, idx);
+        if (res) {
+                printk(KERN_DEBUG "%s: prism2_tx_80211 - to BAP0 failed\n",
+                       dev->name);
+                local->intransmitfid[idx] = PRISM2_TXFID_EMPTY;
+                schedule_work(&local->reset_queue);
+                goto fail;
+        }
+
+        ret = 0;
+
+fail:
+        prism2_callback(local, PRISM2_CALLBACK_TX_END);
+        return ret;
+}
+
+
+/* Some SMP systems have reported number of odd errors with hostap_pci. fid
+ * register has changed values between consecutive reads for an unknown reason.
+ * This should really not happen, so more debugging is needed. This test
+ * version is a big slower, but it will detect most of such register changes
+ * and will try to get the correct fid eventually. */
+#define EXTRA_FID_READ_TESTS
+
+static inline u16 prism2_read_fid_reg(struct net_device *dev, u16 reg)
+{
+#ifdef EXTRA_FID_READ_TESTS
+        u16 val, val2, val3;
+        int i;
+
+        for (i = 0; i < 10; i++) {
+                val = HFA384X_INW(reg);
+                val2 = HFA384X_INW(reg);
+                val3 = HFA384X_INW(reg);
+
+                if (val == val2 && val == val3)
+                        return val;
+
+                printk(KERN_DEBUG "%s: detected fid change (try=%d, reg=%04x):"
+                       " %04x %04x %04x\n",
+                       dev->name, i, reg, val, val2, val3);
+                if ((val == val2 || val == val3) && val != 0)
+                        return val;
+                if (val2 == val3 && val2 != 0)
+                        return val2;
+        }
+        printk(KERN_WARNING "%s: Uhhuh.. could not read good fid from reg "
+               "%04x (%04x %04x %04x)\n", dev->name, reg, val, val2, val3);
+        return val;
+#else /* EXTRA_FID_READ_TESTS */
+        return HFA384X_INW(reg);
+#endif /* EXTRA_FID_READ_TESTS */
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_rx(local_info_t *local)
+{
+        struct net_device *dev = local->dev;
+        int res, rx_pending = 0;
+        u16 len, hdr_len, rxfid, status, macport;
+        struct net_device_stats *stats;
+        struct hfa384x_rx_frame rxdesc;
+        struct sk_buff *skb = NULL;
+
+        prism2_callback(local, PRISM2_CALLBACK_RX_START);
+        stats = hostap_get_stats(dev);
+
+        rxfid = prism2_read_fid_reg(dev, HFA384X_RXFID_OFF);
+#ifndef final_version
+        if (rxfid == 0) {
+                rxfid = HFA384X_INW(HFA384X_RXFID_OFF);
+                printk(KERN_DEBUG "prism2_rx: rxfid=0 (next 0x%04x)\n",
+                       rxfid);
+                if (rxfid == 0) {
+                        schedule_work(&local->reset_queue);
+                        goto rx_dropped;
+                }
+                /* try to continue with the new rxfid value */
+        }
+#endif
+
+        spin_lock(&local->baplock);
+        res = hfa384x_setup_bap(dev, BAP0, rxfid, 0);
+        if (!res)
+                res = hfa384x_from_bap(dev, BAP0, &rxdesc, sizeof(rxdesc));
+
+        if (res) {
+                spin_unlock(&local->baplock);
+                printk(KERN_DEBUG "%s: copy from BAP0 failed %d\n", dev->name,
+                       res);
+                if (res == -ETIMEDOUT) {
+                        schedule_work(&local->reset_queue);
+                }
+                goto rx_dropped;
+        }
+
+        len = le16_to_cpu(rxdesc.data_len);
+        hdr_len = sizeof(rxdesc);
+        status = le16_to_cpu(rxdesc.status);
+        macport = (status >> 8) & 0x07;
+
+        /* Drop frames with too large reported payload length. Monitor mode
+         * seems to sometimes pass frames (e.g., ctrl::ack) with signed and
+         * negative value, so allow also values 65522 .. 65534 (-14 .. -2) for
+         * macport 7 */
+        if (len > PRISM2_DATA_MAXLEN + 8 /* WEP */) {
+                if (macport == 7 && local->iw_mode == IW_MODE_MONITOR) {
+                        if (len >= (u16) -14) {
+                                hdr_len -= 65535 - len;
+                                hdr_len--;
+                        }
+                        len = 0;
+                } else {
+                        spin_unlock(&local->baplock);
+                        printk(KERN_DEBUG "%s: Received frame with invalid "
+                               "length 0x%04x\n", dev->name, len);
+                        hostap_dump_rx_header(dev->name, &rxdesc);
+                        goto rx_dropped;
+                }
+        }
+
+        skb = dev_alloc_skb(len + hdr_len);
+        if (!skb) {
+                spin_unlock(&local->baplock);
+                printk(KERN_DEBUG "%s: RX failed to allocate skb\n",
+                       dev->name);
+                goto rx_dropped;
+        }
+        skb->dev = dev;
+        memcpy(skb_put(skb, hdr_len), &rxdesc, hdr_len);
+
+        if (len > 0)
+                res = hfa384x_from_bap(dev, BAP0, skb_put(skb, len), len);
+        spin_unlock(&local->baplock);
+        if (res) {
+                printk(KERN_DEBUG "%s: RX failed to read "
+                       "frame data\n", dev->name);
+                goto rx_dropped;
+        }
+
+        skb_queue_tail(&local->rx_list, skb);
+        tasklet_schedule(&local->rx_tasklet);
+
+ rx_exit:
+        prism2_callback(local, PRISM2_CALLBACK_RX_END);
+        if (!rx_pending) {
+                HFA384X_OUTW(HFA384X_EV_RX, HFA384X_EVACK_OFF);
+        }
+
+        return;
+
+ rx_dropped:
+        stats->rx_dropped++;
+        if (skb)
+                dev_kfree_skb(skb);
+        goto rx_exit;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_rx_skb(local_info_t *local, struct sk_buff *skb)
+{
+        struct hfa384x_rx_frame *rxdesc;
+        struct net_device *dev = skb->dev;
+        struct hostap_80211_rx_status stats;
+        int hdrlen, rx_hdrlen;
+
+        rx_hdrlen = sizeof(*rxdesc);
+        if (skb->len < sizeof(*rxdesc)) {
+                /* Allow monitor mode to receive shorter frames */
+                if (local->iw_mode == IW_MODE_MONITOR &&
+                    skb->len >= sizeof(*rxdesc) - 30) {
+                        rx_hdrlen = skb->len;
+                } else {
+                        dev_kfree_skb(skb);
+                        return;
+                }
+        }
+
+        rxdesc = (struct hfa384x_rx_frame *) skb->data;
+
+        if (local->frame_dump & PRISM2_DUMP_RX_HDR &&
+            skb->len >= sizeof(*rxdesc))
+                hostap_dump_rx_header(dev->name, rxdesc);
+
+        if (le16_to_cpu(rxdesc->status) & HFA384X_RX_STATUS_FCSERR &&
+            (!local->monitor_allow_fcserr ||
+             local->iw_mode != IW_MODE_MONITOR))
+                goto drop;
+
+        if (skb->len > PRISM2_DATA_MAXLEN) {
+                printk(KERN_DEBUG "%s: RX: len(%d) > MAX(%d)\n",
+                       dev->name, skb->len, PRISM2_DATA_MAXLEN);
+                goto drop;
+        }
+
+        stats.mac_time = le32_to_cpu(rxdesc->time);
+        stats.signal = rxdesc->signal - local->rssi_to_dBm;
+        stats.noise = rxdesc->silence - local->rssi_to_dBm;
+        stats.rate = rxdesc->rate;
+
+        /* Convert Prism2 RX structure into IEEE 802.11 header */
+        hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(rxdesc->frame_control));
+        if (hdrlen > rx_hdrlen)
+                hdrlen = rx_hdrlen;
+
+        memmove(skb_pull(skb, rx_hdrlen - hdrlen),
+                &rxdesc->frame_control, hdrlen);
+
+        hostap_80211_rx(dev, skb, &stats);
+        return;
+
+ drop:
+        dev_kfree_skb(skb);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_rx_tasklet(unsigned long data)
+{
+        local_info_t *local = (local_info_t *) data;
+        struct sk_buff *skb;
+
+        while ((skb = skb_dequeue(&local->rx_list)) != NULL)
+                hostap_rx_skb(local, skb);
+}
+
+
+/* Called only from hardware IRQ */
+static void prism2_alloc_ev(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int idx;
+        u16 fid;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        fid = prism2_read_fid_reg(dev, HFA384X_ALLOCFID_OFF);
+
+        PDEBUG(DEBUG_FID, "FID: interrupt: ALLOC - fid=0x%04x\n", fid);
+
+        spin_lock(&local->txfidlock);
+        idx = local->next_alloc;
+
+        do {
+                if (local->txfid[idx] == fid) {
+                        PDEBUG(DEBUG_FID, "FID: found matching txfid[%d]\n",
+                               idx);
+
+#ifndef final_version
+                        if (local->intransmitfid[idx] == PRISM2_TXFID_EMPTY)
+                                printk("Already released txfid found at idx "
+                                       "%d\n", idx);
+                        if (local->intransmitfid[idx] == PRISM2_TXFID_RESERVED)
+                                printk("Already reserved txfid found at idx "
+                                       "%d\n", idx);
+#endif
+                        local->intransmitfid[idx] = PRISM2_TXFID_EMPTY;
+                        idx++;
+                        local->next_alloc = idx >= PRISM2_TXFID_COUNT ? 0 :
+                                idx;
+
+                        if (!test_bit(HOSTAP_BITS_TRANSMIT, &local->bits) &&
+                            netif_queue_stopped(dev))
+                                netif_wake_queue(dev);
+
+                        spin_unlock(&local->txfidlock);
+                        return;
+                }
+
+                idx++;
+                if (idx >= PRISM2_TXFID_COUNT)
+                        idx = 0;
+        } while (idx != local->next_alloc);
+
+        printk(KERN_WARNING "%s: could not find matching txfid (0x%04x, new "
+               "read 0x%04x) for alloc event\n", dev->name, fid,
+               HFA384X_INW(HFA384X_ALLOCFID_OFF));
+        printk(KERN_DEBUG "TXFIDs:");
+        for (idx = 0; idx < PRISM2_TXFID_COUNT; idx++)
+                printk(" %04x[%04x]", local->txfid[idx],
+                       local->intransmitfid[idx]);
+        printk("\n");
+        spin_unlock(&local->txfidlock);
+
+        /* FIX: should probably schedule reset; reference to one txfid was lost
+         * completely.. Bad things will happen if we run out of txfids
+         * Actually, this will cause netdev watchdog to notice TX timeout and
+         * then card reset after all txfids have been leaked. */
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_tx_callback(local_info_t *local,
+                               struct hfa384x_tx_frame *txdesc, int ok,
+                               char *payload)
+{
+        u16 sw_support, hdrlen, len;
+        struct sk_buff *skb;
+        struct hostap_tx_callback_info *cb;
+
+        /* Make sure that frame was from us. */
+        if (memcmp(txdesc->addr2, local->dev->dev_addr, ETH_ALEN)) {
+                printk(KERN_DEBUG "%s: TX callback - foreign frame\n",
+                       local->dev->name);
+                return;
+        }
+
+        sw_support = le16_to_cpu(txdesc->sw_support);
+
+        spin_lock(&local->lock);
+        cb = local->tx_callback;
+        while (cb != NULL && cb->idx != sw_support)
+                cb = cb->next;
+        spin_unlock(&local->lock);
+
+        if (cb == NULL) {
+                printk(KERN_DEBUG "%s: could not find TX callback (idx %d)\n",
+                       local->dev->name, sw_support);
+                return;
+        }
+
+        hdrlen = hostap_80211_get_hdrlen(le16_to_cpu(txdesc->frame_control));
+        len = le16_to_cpu(txdesc->data_len);
+        skb = dev_alloc_skb(hdrlen + len);
+        if (skb == NULL) {
+                printk(KERN_DEBUG "%s: hostap_tx_callback failed to allocate "
+                       "skb\n", local->dev->name);
+                return;
+        }
+
+        memcpy(skb_put(skb, hdrlen), (void *) &txdesc->frame_control, hdrlen);
+        if (payload)
+                memcpy(skb_put(skb, len), payload, len);
+
+        skb->dev = local->dev;
+        skb->mac.raw = skb->data;
+
+        cb->func(skb, ok, cb->data);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static int hostap_tx_compl_read(local_info_t *local, int error,
+                                struct hfa384x_tx_frame *txdesc,
+                                char **payload)
+{
+        u16 fid, len;
+        int res, ret = 0;
+        struct net_device *dev = local->dev;
+
+        fid = prism2_read_fid_reg(dev, HFA384X_TXCOMPLFID_OFF);
+
+        PDEBUG(DEBUG_FID, "interrupt: TX (err=%d) - fid=0x%04x\n", fid, error);
+
+        spin_lock(&local->baplock);
+        res = hfa384x_setup_bap(dev, BAP0, fid, 0);
+        if (!res)
+                res = hfa384x_from_bap(dev, BAP0, txdesc, sizeof(*txdesc));
+        if (res) {
+                PDEBUG(DEBUG_EXTRA, "%s: TX (err=%d) - fid=0x%04x - could not "
+                       "read txdesc\n", dev->name, error, fid);
+                if (res == -ETIMEDOUT) {
+                        schedule_work(&local->reset_queue);
+                }
+                ret = -1;
+                goto fail;
+        }
+        if (txdesc->sw_support) {
+                len = le16_to_cpu(txdesc->data_len);
+                if (len < PRISM2_DATA_MAXLEN) {
+                        *payload = (char *) kmalloc(len, GFP_ATOMIC);
+                        if (*payload == NULL ||
+                            hfa384x_from_bap(dev, BAP0, *payload, len)) {
+                                PDEBUG(DEBUG_EXTRA, "%s: could not read TX "
+                                       "frame payload\n", dev->name);
+                                kfree(*payload);
+                                *payload = NULL;
+                                ret = -1;
+                                goto fail;
+                        }
+                }
+        }
+
+ fail:
+        spin_unlock(&local->baplock);
+
+        return ret;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_tx_ev(local_info_t *local)
+{
+        struct net_device *dev = local->dev;
+        char *payload = NULL;
+        struct hfa384x_tx_frame txdesc;
+
+        if (hostap_tx_compl_read(local, 0, &txdesc, &payload))
+                goto fail;
+
+        if (local->frame_dump & PRISM2_DUMP_TX_HDR) {
+                PDEBUG(DEBUG_EXTRA, "%s: TX - status=0x%04x "
+                       "retry_count=%d tx_rate=%d seq_ctrl=%d "
+                       "duration_id=%d\n",
+                       dev->name, le16_to_cpu(txdesc.status),
+                       txdesc.retry_count, txdesc.tx_rate,
+                       le16_to_cpu(txdesc.seq_ctrl),
+                       le16_to_cpu(txdesc.duration_id));
+        }
+
+        if (txdesc.sw_support)
+                hostap_tx_callback(local, &txdesc, 1, payload);
+        kfree(payload);
+
+ fail:
+        HFA384X_OUTW(HFA384X_EV_TX, HFA384X_EVACK_OFF);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_sta_tx_exc_tasklet(unsigned long data)
+{
+        local_info_t *local = (local_info_t *) data;
+        struct sk_buff *skb;
+
+        while ((skb = skb_dequeue(&local->sta_tx_exc_list)) != NULL) {
+                struct hfa384x_tx_frame *txdesc =
+                        (struct hfa384x_tx_frame *) skb->data;
+
+                if (skb->len >= sizeof(*txdesc)) {
+                        /* Convert Prism2 RX structure into IEEE 802.11 header
+                         */
+                        u16 fc = le16_to_cpu(txdesc->frame_control);
+                        int hdrlen = hostap_80211_get_hdrlen(fc);
+                        memmove(skb_pull(skb, sizeof(*txdesc) - hdrlen),
+                                &txdesc->frame_control, hdrlen);
+
+                        hostap_handle_sta_tx_exc(local, skb);
+                }
+                dev_kfree_skb(skb);
+        }
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_txexc(local_info_t *local)
+{
+        struct net_device *dev = local->dev;
+        u16 status, fc;
+        int show_dump, res;
+        char *payload = NULL;
+        struct hfa384x_tx_frame txdesc;
+
+        show_dump = local->frame_dump & PRISM2_DUMP_TXEXC_HDR;
+        local->stats.tx_errors++;
+
+        res = hostap_tx_compl_read(local, 1, &txdesc, &payload);
+        HFA384X_OUTW(HFA384X_EV_TXEXC, HFA384X_EVACK_OFF);
+        if (res)
+                return;
+
+        status = le16_to_cpu(txdesc.status);
+
+        /* We produce a TXDROP event only for retry or lifetime
+         * exceeded, because that's the only status that really mean
+         * that this particular node went away.
+         * Other errors means that *we* screwed up. - Jean II */
+        if (status & (HFA384X_TX_STATUS_RETRYERR | HFA384X_TX_STATUS_AGEDERR))
+        {
+                union iwreq_data wrqu;
+
+                /* Copy 802.11 dest address. */
+                memcpy(wrqu.addr.sa_data, txdesc.addr1, ETH_ALEN);
+                wrqu.addr.sa_family = ARPHRD_ETHER;
+                wireless_send_event(dev, IWEVTXDROP, &wrqu, NULL);
+        } else
+                show_dump = 1;
+
+        if (local->iw_mode == IW_MODE_MASTER ||
+            local->iw_mode == IW_MODE_REPEAT ||
+            local->wds_type & HOSTAP_WDS_AP_CLIENT) {
+                struct sk_buff *skb;
+                skb = dev_alloc_skb(sizeof(txdesc));
+                if (skb) {
+                        memcpy(skb_put(skb, sizeof(txdesc)), &txdesc,
+                               sizeof(txdesc));
+                        skb_queue_tail(&local->sta_tx_exc_list, skb);
+                        tasklet_schedule(&local->sta_tx_exc_tasklet);
+                }
+        }
+
+        if (txdesc.sw_support)
+                hostap_tx_callback(local, &txdesc, 0, payload);
+        kfree(payload);
+
+        if (!show_dump)
+                return;
+
+        PDEBUG(DEBUG_EXTRA, "%s: TXEXC - status=0x%04x (%s%s%s%s)"
+               " tx_control=%04x\n",
+               dev->name, status,
+               status & HFA384X_TX_STATUS_RETRYERR ? "[RetryErr]" : "",
+               status & HFA384X_TX_STATUS_AGEDERR ? "[AgedErr]" : "",
+               status & HFA384X_TX_STATUS_DISCON ? "[Discon]" : "",
+               status & HFA384X_TX_STATUS_FORMERR ? "[FormErr]" : "",
+               le16_to_cpu(txdesc.tx_control));
+
+        fc = le16_to_cpu(txdesc.frame_control);
+        PDEBUG(DEBUG_EXTRA, "   retry_count=%d tx_rate=%d fc=0x%04x "
+               "(%s%s%s::%d%s%s)\n",
+               txdesc.retry_count, txdesc.tx_rate, fc,
+               WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_MGMT ? "Mgmt" : "",
+               WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_CTL ? "Ctrl" : "",
+               WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA ? "Data" : "",
+               WLAN_FC_GET_STYPE(fc) >> 4,
+               fc & IEEE80211_FCTL_TODS ? " ToDS" : "",
+               fc & IEEE80211_FCTL_FROMDS ? " FromDS" : "");
+        PDEBUG(DEBUG_EXTRA, "   A1=" MACSTR " A2=" MACSTR " A3="
+               MACSTR " A4=" MACSTR "\n",
+               MAC2STR(txdesc.addr1), MAC2STR(txdesc.addr2),
+               MAC2STR(txdesc.addr3), MAC2STR(txdesc.addr4));
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_info_tasklet(unsigned long data)
+{
+        local_info_t *local = (local_info_t *) data;
+        struct sk_buff *skb;
+
+        while ((skb = skb_dequeue(&local->info_list)) != NULL) {
+                hostap_info_process(local, skb);
+                dev_kfree_skb(skb);
+        }
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_info(local_info_t *local)
+{
+        struct net_device *dev = local->dev;
+        u16 fid;
+        int res, left;
+        struct hfa384x_info_frame info;
+        struct sk_buff *skb;
+
+        fid = HFA384X_INW(HFA384X_INFOFID_OFF);
+
+        spin_lock(&local->baplock);
+        res = hfa384x_setup_bap(dev, BAP0, fid, 0);
+        if (!res)
+                res = hfa384x_from_bap(dev, BAP0, &info, sizeof(info));
+        if (res) {
+                spin_unlock(&local->baplock);
+                printk(KERN_DEBUG "Could not get info frame (fid=0x%04x)\n",
+                       fid);
+                if (res == -ETIMEDOUT) {
+                        schedule_work(&local->reset_queue);
+                }
+                goto out;
+        }
+
+        le16_to_cpus(&info.len);
+        le16_to_cpus(&info.type);
+        left = (info.len - 1) * 2;
+
+        if (info.len & 0x8000 || info.len == 0 || left > 2060) {
+                /* data register seems to give 0x8000 in some error cases even
+                 * though busy bit is not set in offset register;
+                 * in addition, length must be at least 1 due to type field */
+                spin_unlock(&local->baplock);
+                printk(KERN_DEBUG "%s: Received info frame with invalid "
+                       "length 0x%04x (type 0x%04x)\n", dev->name, info.len,
+                       info.type);
+                goto out;
+        }
+
+        skb = dev_alloc_skb(sizeof(info) + left);
+        if (skb == NULL) {
+                spin_unlock(&local->baplock);
+                printk(KERN_DEBUG "%s: Could not allocate skb for info "
+                       "frame\n", dev->name);
+                goto out;
+        }
+
+        memcpy(skb_put(skb, sizeof(info)), &info, sizeof(info));
+        if (left > 0 && hfa384x_from_bap(dev, BAP0, skb_put(skb, left), left))
+        {
+                spin_unlock(&local->baplock);
+                printk(KERN_WARNING "%s: Info frame read failed (fid=0x%04x, "
+                       "len=0x%04x, type=0x%04x\n",
+                       dev->name, fid, info.len, info.type);
+                dev_kfree_skb(skb);
+                goto out;
+        }
+        spin_unlock(&local->baplock);
+
+        skb_queue_tail(&local->info_list, skb);
+        tasklet_schedule(&local->info_tasklet);
+
+ out:
+        HFA384X_OUTW(HFA384X_EV_INFO, HFA384X_EVACK_OFF);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void hostap_bap_tasklet(unsigned long data)
+{
+        local_info_t *local = (local_info_t *) data;
+        struct net_device *dev = local->dev;
+        u16 ev;
+        int frames = 30;
+
+        if (local->func->card_present && !local->func->card_present(local))
+                return;
+
+        set_bit(HOSTAP_BITS_BAP_TASKLET, &local->bits);
+
+        /* Process all pending BAP events without generating new interrupts
+         * for them */
+        while (frames-- > 0) {
+                ev = HFA384X_INW(HFA384X_EVSTAT_OFF);
+                if (ev == 0xffff || !(ev & HFA384X_BAP0_EVENTS))
+                        break;
+                if (ev & HFA384X_EV_RX)
+                        prism2_rx(local);
+                if (ev & HFA384X_EV_INFO)
+                        prism2_info(local);
+                if (ev & HFA384X_EV_TX)
+                        prism2_tx_ev(local);
+                if (ev & HFA384X_EV_TXEXC)
+                        prism2_txexc(local);
+        }
+
+        set_bit(HOSTAP_BITS_BAP_TASKLET2, &local->bits);
+        clear_bit(HOSTAP_BITS_BAP_TASKLET, &local->bits);
+
+        /* Enable interrupts for new BAP events */
+        hfa384x_events_all(dev);
+        clear_bit(HOSTAP_BITS_BAP_TASKLET2, &local->bits);
+}
+
+
+/* Called only from hardware IRQ */
+static void prism2_infdrop(struct net_device *dev)
+{
+        static unsigned long last_inquire = 0;
+
+        PDEBUG(DEBUG_EXTRA, "%s: INFDROP event\n", dev->name);
+
+        /* some firmware versions seem to get stuck with
+         * full CommTallies in high traffic load cases; every
+         * packet will then cause INFDROP event and CommTallies
+         * info frame will not be sent automatically. Try to
+         * get out of this state by inquiring CommTallies. */
+        if (!last_inquire || time_after(jiffies, last_inquire + HZ)) {
+                hfa384x_cmd_callback(dev, HFA384X_CMDCODE_INQUIRE,
+                                     HFA384X_INFO_COMMTALLIES, NULL, 0);
+                last_inquire = jiffies;
+        }
+}
+
+
+/* Called only from hardware IRQ */
+static void prism2_ev_tick(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 evstat, inten;
+        static int prev_stuck = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (time_after(jiffies, local->last_tick_timer + 5 * HZ) &&
+            local->last_tick_timer) {
+                evstat = HFA384X_INW(HFA384X_EVSTAT_OFF);
+                inten = HFA384X_INW(HFA384X_INTEN_OFF);
+                if (!prev_stuck) {
+                        printk(KERN_INFO "%s: SW TICK stuck? "
+                               "bits=0x%lx EvStat=%04x IntEn=%04x\n",
+                               dev->name, local->bits, evstat, inten);
+                }
+                local->sw_tick_stuck++;
+                if ((evstat & HFA384X_BAP0_EVENTS) &&
+                    (inten & HFA384X_BAP0_EVENTS)) {
+                        printk(KERN_INFO "%s: trying to recover from IRQ "
+                               "hang\n", dev->name);
+                        hfa384x_events_no_bap0(dev);
+                }
+                prev_stuck = 1;
+        } else
+                prev_stuck = 0;
+}
+
+
+/* Called only from hardware IRQ */
+static inline void prism2_check_magic(local_info_t *local)
+{
+        /* at least PCI Prism2.5 with bus mastering seems to sometimes
+         * return 0x0000 in SWSUPPORT0 for unknown reason, but re-reading the
+         * register once or twice seems to get the correct value.. PCI cards
+         * cannot anyway be removed during normal operation, so there is not
+         * really any need for this verification with them. */
+
+#ifndef PRISM2_PCI
+#ifndef final_version
+        static unsigned long last_magic_err = 0;
+        struct net_device *dev = local->dev;
+
+        if (HFA384X_INW(HFA384X_SWSUPPORT0_OFF) != HFA384X_MAGIC) {
+                if (!local->hw_ready)
+                        return;
+                HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);
+                if (time_after(jiffies, last_magic_err + 10 * HZ)) {
+                        printk("%s: Interrupt, but SWSUPPORT0 does not match: "
+                               "%04X != %04X - card removed?\n", dev->name,
+                               HFA384X_INW(HFA384X_SWSUPPORT0_OFF),
+                               HFA384X_MAGIC);
+                        last_magic_err = jiffies;
+                } else if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: interrupt - SWSUPPORT0=%04x "
+                               "MAGIC=%04x\n", dev->name,
+                               HFA384X_INW(HFA384X_SWSUPPORT0_OFF),
+                               HFA384X_MAGIC);
+                }
+                if (HFA384X_INW(HFA384X_SWSUPPORT0_OFF) != 0xffff)
+                        schedule_work(&local->reset_queue);
+                return;
+        }
+#endif /* final_version */
+#endif /* !PRISM2_PCI */
+}
+
+
+/* Called only from hardware IRQ */
+static irqreturn_t prism2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        struct net_device *dev = (struct net_device *) dev_id;
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int events = 0;
+        u16 ev;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
+
+        if (local->func->card_present && !local->func->card_present(local)) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: Interrupt, but dev not OK\n",
+                               dev->name);
+                }
+                return IRQ_HANDLED;
+        }
+
+        prism2_check_magic(local);
+
+        for (;;) {
+                ev = HFA384X_INW(HFA384X_EVSTAT_OFF);
+                if (ev == 0xffff) {
+                        if (local->shutdown)
+                                return IRQ_HANDLED;
+                        HFA384X_OUTW(0xffff, HFA384X_EVACK_OFF);
+                        printk(KERN_DEBUG "%s: prism2_interrupt: ev=0xffff\n",
+                               dev->name);
+                        return IRQ_HANDLED;
+                }
+
+                ev &= HFA384X_INW(HFA384X_INTEN_OFF);
+                if (ev == 0)
+                        break;
+
+                if (ev & HFA384X_EV_CMD) {
+                        prism2_cmd_ev(dev);
+                }
+
+                /* Above events are needed even before hw is ready, but other
+                 * events should be skipped during initialization. This may
+                 * change for AllocEv if allocate_fid is implemented without
+                 * busy waiting. */
+                if (!local->hw_ready || local->hw_resetting ||
+                    !local->dev_enabled) {
+                        ev = HFA384X_INW(HFA384X_EVSTAT_OFF);
+                        if (ev & HFA384X_EV_CMD)
+                                goto next_event;
+                        if ((ev & HFA384X_EVENT_MASK) == 0)
+                                return IRQ_HANDLED;
+                        if (local->dev_enabled && (ev & ~HFA384X_EV_TICK) &&
+                            net_ratelimit()) {
+                                printk(KERN_DEBUG "%s: prism2_interrupt: hw "
+                                       "not ready; skipping events 0x%04x "
+                                       "(IntEn=0x%04x)%s%s%s\n",
+                                       dev->name, ev,
+                                       HFA384X_INW(HFA384X_INTEN_OFF),
+                                       !local->hw_ready ? " (!hw_ready)" : "",
+                                       local->hw_resetting ?
+                                       " (hw_resetting)" : "",
+                                       !local->dev_enabled ?
+                                       " (!dev_enabled)" : "");
+                        }
+                        HFA384X_OUTW(ev, HFA384X_EVACK_OFF);
+                        return IRQ_HANDLED;
+                }
+
+                if (ev & HFA384X_EV_TICK) {
+                        prism2_ev_tick(dev);
+                        HFA384X_OUTW(HFA384X_EV_TICK, HFA384X_EVACK_OFF);
+                }
+
+                if (ev & HFA384X_EV_ALLOC) {
+                        prism2_alloc_ev(dev);
+                        HFA384X_OUTW(HFA384X_EV_ALLOC, HFA384X_EVACK_OFF);
+                }
+
+                /* Reading data from the card is quite time consuming, so do it
+                 * in tasklets. TX, TXEXC, RX, and INFO events will be ACKed
+                 * and unmasked after needed data has been read completely. */
+                if (ev & HFA384X_BAP0_EVENTS) {
+                        hfa384x_events_no_bap0(dev);
+                        tasklet_schedule(&local->bap_tasklet);
+                }
+
+#ifndef final_version
+                if (ev & HFA384X_EV_WTERR) {
+                        PDEBUG(DEBUG_EXTRA, "%s: WTERR event\n", dev->name);
+                        HFA384X_OUTW(HFA384X_EV_WTERR, HFA384X_EVACK_OFF);
+                }
+#endif /* final_version */
+
+                if (ev & HFA384X_EV_INFDROP) {
+                        prism2_infdrop(dev);
+                        HFA384X_OUTW(HFA384X_EV_INFDROP, HFA384X_EVACK_OFF);
+                }
+
+        next_event:
+                events++;
+                if (events >= PRISM2_MAX_INTERRUPT_EVENTS) {
+                        PDEBUG(DEBUG_EXTRA, "prism2_interrupt: >%d events "
+                               "(EvStat=0x%04x)\n",
+                               PRISM2_MAX_INTERRUPT_EVENTS,
+                               HFA384X_INW(HFA384X_EVSTAT_OFF));
+                        break;
+                }
+        }
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 1);
+        return IRQ_RETVAL(events);
+}
+
+
+static void prism2_check_sta_fw_version(local_info_t *local)
+{
+        struct hfa384x_comp_ident comp;
+        int id, variant, major, minor;
+
+        if (hfa384x_get_rid(local->dev, HFA384X_RID_STAID,
+                            &comp, sizeof(comp), 1) < 0)
+                return;
+
+        local->fw_ap = 0;
+        id = le16_to_cpu(comp.id);
+        if (id != HFA384X_COMP_ID_STA) {
+                if (id == HFA384X_COMP_ID_FW_AP)
+                        local->fw_ap = 1;
+                return;
+        }
+
+        major = __le16_to_cpu(comp.major);
+        minor = __le16_to_cpu(comp.minor);
+        variant = __le16_to_cpu(comp.variant);
+        local->sta_fw_ver = PRISM2_FW_VER(major, minor, variant);
+
+        /* Station firmware versions before 1.4.x seem to have a bug in
+         * firmware-based WEP encryption when using Host AP mode, so use
+         * host_encrypt as a default for them. Firmware version 1.4.9 is the
+         * first one that has been seen to produce correct encryption, but the
+         * bug might be fixed before that (although, at least 1.4.2 is broken).
+         */
+        local->fw_encrypt_ok = local->sta_fw_ver >= PRISM2_FW_VER(1,4,9);
+
+        if (local->iw_mode == IW_MODE_MASTER && !local->host_encrypt &&
+            !local->fw_encrypt_ok) {
+                printk(KERN_DEBUG "%s: defaulting to host-based encryption as "
+                       "a workaround for firmware bug in Host AP mode WEP\n",
+                       local->dev->name);
+                local->host_encrypt = 1;
+        }
+
+        /* IEEE 802.11 standard compliant WDS frames (4 addresses) were broken
+         * in station firmware versions before 1.5.x. With these versions, the
+         * driver uses a workaround with bogus frame format (4th address after
+         * the payload). This is not compatible with other AP devices. Since
+         * the firmware bug is fixed in the latest station firmware versions,
+         * automatically enable standard compliant mode for cards using station
+         * firmware version 1.5.0 or newer. */
+        if (local->sta_fw_ver >= PRISM2_FW_VER(1,5,0))
+                local->wds_type |= HOSTAP_WDS_STANDARD_FRAME;
+        else {
+                printk(KERN_DEBUG "%s: defaulting to bogus WDS frame as a "
+                       "workaround for firmware bug in Host AP mode WDS\n",
+                       local->dev->name);
+        }
+
+        hostap_check_sta_fw_version(local->ap, local->sta_fw_ver);
+}
+
+
+static void prism2_crypt_deinit_entries(local_info_t *local, int force)
+{
+        struct list_head *ptr, *n;
+        struct ieee80211_crypt_data *entry;
+
+        for (ptr = local->crypt_deinit_list.next, n = ptr->next;
+             ptr != &local->crypt_deinit_list; ptr = n, n = ptr->next) {
+                entry = list_entry(ptr, struct ieee80211_crypt_data, list);
+
+                if (atomic_read(&entry->refcnt) != 0 && !force)
+                        continue;
+
+                list_del(ptr);
+
+                if (entry->ops)
+                        entry->ops->deinit(entry->priv);
+                kfree(entry);
+        }
+}
+
+
+static void prism2_crypt_deinit_handler(unsigned long data)
+{
+        local_info_t *local = (local_info_t *) data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_crypt_deinit_entries(local, 0);
+        if (!list_empty(&local->crypt_deinit_list)) {
+                printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
+                       "deletion list\n", local->dev->name);
+                local->crypt_deinit_timer.expires = jiffies + HZ;
+                add_timer(&local->crypt_deinit_timer);
+        }
+        spin_unlock_irqrestore(&local->lock, flags);
+
+}
+
+
+static void hostap_passive_scan(unsigned long data)
+{
+        local_info_t *local = (local_info_t *) data;
+        struct net_device *dev = local->dev;
+        u16 channel;
+
+        if (local->passive_scan_interval <= 0)
+                return;
+
+        if (local->passive_scan_state == PASSIVE_SCAN_LISTEN) {
+                int max_tries = 16;
+
+                /* Even though host system does not really know when the WLAN
+                 * MAC is sending frames, try to avoid changing channels for
+                 * passive scanning when a host-generated frame is being
+                 * transmitted */
+                if (test_bit(HOSTAP_BITS_TRANSMIT, &local->bits)) {
+                        printk(KERN_DEBUG "%s: passive scan detected pending "
+                               "TX - delaying\n", dev->name);
+                        local->passive_scan_timer.expires = jiffies + HZ / 10;
+                        add_timer(&local->passive_scan_timer);
+                        return;
+                }
+
+                do {
+                        local->passive_scan_channel++;
+                        if (local->passive_scan_channel > 14)
+                                local->passive_scan_channel = 1;
+                        max_tries--;
+                } while (!(local->channel_mask &
+                           (1 << (local->passive_scan_channel - 1))) &&
+                         max_tries > 0);
+
+                if (max_tries == 0) {
+                        printk(KERN_INFO "%s: no allowed passive scan channels"
+                               " found\n", dev->name);
+                        return;
+                }
+
+                printk(KERN_DEBUG "%s: passive scan channel %d\n",
+                       dev->name, local->passive_scan_channel);
+                channel = local->passive_scan_channel;
+                local->passive_scan_state = PASSIVE_SCAN_WAIT;
+                local->passive_scan_timer.expires = jiffies + HZ / 10;
+        } else {
+                channel = local->channel;
+                local->passive_scan_state = PASSIVE_SCAN_LISTEN;
+                local->passive_scan_timer.expires = jiffies +
+                        local->passive_scan_interval * HZ;
+        }
+
+        if (hfa384x_cmd_callback(dev, HFA384X_CMDCODE_TEST |
+                                 (HFA384X_TEST_CHANGE_CHANNEL << 8),
+                                 channel, NULL, 0))
+                printk(KERN_ERR "%s: passive scan channel set %d "
+                       "failed\n", dev->name, channel);
+
+        add_timer(&local->passive_scan_timer);
+}
+
+
+/* Called only as a scheduled task when communications quality values should
+ * be updated. */
+static void handle_comms_qual_update(void *data)
+{
+        local_info_t *local = data;
+        prism2_update_comms_qual(local->dev);
+}
+
+
+/* Software watchdog - called as a timer. Hardware interrupt (Tick event) is
+ * used to monitor that local->last_tick_timer is being updated. If not,
+ * interrupt busy-loop is assumed and driver tries to recover by masking out
+ * some events. */
+static void hostap_tick_timer(unsigned long data)
+{
+        static unsigned long last_inquire = 0;
+        local_info_t *local = (local_info_t *) data;
+        local->last_tick_timer = jiffies;
+
+        /* Inquire CommTallies every 10 seconds to keep the statistics updated
+         * more often during low load and when using 32-bit tallies. */
+        if ((!last_inquire || time_after(jiffies, last_inquire + 10 * HZ)) &&
+            !local->hw_downloading && local->hw_ready &&
+            !local->hw_resetting && local->dev_enabled) {
+                hfa384x_cmd_callback(local->dev, HFA384X_CMDCODE_INQUIRE,
+                                     HFA384X_INFO_COMMTALLIES, NULL, 0);
+                last_inquire = jiffies;
+        }
+
+        if ((local->last_comms_qual_update == 0 ||
+             time_after(jiffies, local->last_comms_qual_update + 10 * HZ)) &&
+            (local->iw_mode == IW_MODE_INFRA ||
+             local->iw_mode == IW_MODE_ADHOC)) {
+                schedule_work(&local->comms_qual_update);
+        }
+
+        local->tick_timer.expires = jiffies + 2 * HZ;
+        add_timer(&local->tick_timer);
+}
+
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+static int prism2_registers_proc_read(char *page, char **start, off_t off,
+                                      int count, int *eof, void *data)
+{
+        char *p = page;
+        local_info_t *local = (local_info_t *) data;
+
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+
+#define SHOW_REG(n) \
+p += sprintf(p, #n "=%04x\n", hfa384x_read_reg(local->dev, HFA384X_##n##_OFF))
+
+        SHOW_REG(CMD);
+        SHOW_REG(PARAM0);
+        SHOW_REG(PARAM1);
+        SHOW_REG(PARAM2);
+        SHOW_REG(STATUS);
+        SHOW_REG(RESP0);
+        SHOW_REG(RESP1);
+        SHOW_REG(RESP2);
+        SHOW_REG(INFOFID);
+        SHOW_REG(CONTROL);
+        SHOW_REG(SELECT0);
+        SHOW_REG(SELECT1);
+        SHOW_REG(OFFSET0);
+        SHOW_REG(OFFSET1);
+        SHOW_REG(RXFID);
+        SHOW_REG(ALLOCFID);
+        SHOW_REG(TXCOMPLFID);
+        SHOW_REG(SWSUPPORT0);
+        SHOW_REG(SWSUPPORT1);
+        SHOW_REG(SWSUPPORT2);
+        SHOW_REG(EVSTAT);
+        SHOW_REG(INTEN);
+        SHOW_REG(EVACK);
+        /* Do not read data registers, because they change the state of the
+         * MAC (offset += 2) */
+        /* SHOW_REG(DATA0); */
+        /* SHOW_REG(DATA1); */
+        SHOW_REG(AUXPAGE);
+        SHOW_REG(AUXOFFSET);
+        /* SHOW_REG(AUXDATA); */
+#ifdef PRISM2_PCI
+        SHOW_REG(PCICOR);
+        SHOW_REG(PCIHCR);
+        SHOW_REG(PCI_M0_ADDRH);
+        SHOW_REG(PCI_M0_ADDRL);
+        SHOW_REG(PCI_M0_LEN);
+        SHOW_REG(PCI_M0_CTL);
+        SHOW_REG(PCI_STATUS);
+        SHOW_REG(PCI_M1_ADDRH);
+        SHOW_REG(PCI_M1_ADDRL);
+        SHOW_REG(PCI_M1_LEN);
+        SHOW_REG(PCI_M1_CTL);
+#endif /* PRISM2_PCI */
+
+        return (p - page);
+}
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+
+
+struct set_tim_data {
+        struct list_head list;
+        int aid;
+        int set;
+};
+
+static int prism2_set_tim(struct net_device *dev, int aid, int set)
+{
+        struct list_head *ptr;
+        struct set_tim_data *new_entry;
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        new_entry = (struct set_tim_data *)
+                kmalloc(sizeof(*new_entry), GFP_ATOMIC);
+        if (new_entry == NULL) {
+                printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",
+                       local->dev->name);
+                return -ENOMEM;
+        }
+        memset(new_entry, 0, sizeof(*new_entry));
+        new_entry->aid = aid;
+        new_entry->set = set;
+
+        spin_lock_bh(&local->set_tim_lock);
+        list_for_each(ptr, &local->set_tim_list) {
+                struct set_tim_data *entry =
+                        list_entry(ptr, struct set_tim_data, list);
+                if (entry->aid == aid) {
+                        PDEBUG(DEBUG_PS2, "%s: prism2_set_tim: aid=%d "
+                               "set=%d ==> %d\n",
+                               local->dev->name, aid, entry->set, set);
+                        entry->set = set;
+                        kfree(new_entry);
+                        new_entry = NULL;
+                        break;
+                }
+        }
+        if (new_entry)
+                list_add_tail(&new_entry->list, &local->set_tim_list);
+        spin_unlock_bh(&local->set_tim_lock);
+
+        schedule_work(&local->set_tim_queue);
+
+        return 0;
+}
+
+
+static void handle_set_tim_queue(void *data)
+{
+        local_info_t *local = (local_info_t *) data;
+        struct set_tim_data *entry;
+        u16 val;
+
+        for (;;) {
+                entry = NULL;
+                spin_lock_bh(&local->set_tim_lock);
+                if (!list_empty(&local->set_tim_list)) {
+                        entry = list_entry(local->set_tim_list.next,
+                                           struct set_tim_data, list);
+                        list_del(&entry->list);
+                }
+                spin_unlock_bh(&local->set_tim_lock);
+                if (!entry)
+                        break;
+
+                PDEBUG(DEBUG_PS2, "%s: handle_set_tim_queue: aid=%d set=%d\n",
+                       local->dev->name, entry->aid, entry->set);
+
+                val = entry->aid;
+                if (entry->set)
+                        val |= 0x8000;
+                if (hostap_set_word(local->dev, HFA384X_RID_CNFTIMCTRL, val)) {
+                        printk(KERN_DEBUG "%s: set_tim failed (aid=%d "
+                               "set=%d)\n",
+                               local->dev->name, entry->aid, entry->set);
+                }
+
+                kfree(entry);
+        }
+}
+
+
+static void prism2_clear_set_tim_queue(local_info_t *local)
+{
+        struct list_head *ptr, *n;
+
+        list_for_each_safe(ptr, n, &local->set_tim_list) {
+                struct set_tim_data *entry;
+                entry = list_entry(ptr, struct set_tim_data, list);
+                list_del(&entry->list);
+                kfree(entry);
+        }
+}
+
+
+static struct net_device *
+prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx,
+                       struct device *sdev)
+{
+        struct net_device *dev;
+        struct hostap_interface *iface;
+        struct local_info *local;
+        int len, i, ret;
+
+        if (funcs == NULL)
+                return NULL;
+
+        len = strlen(dev_template);
+        if (len >= IFNAMSIZ || strstr(dev_template, "%d") == NULL) {
+                printk(KERN_WARNING "hostap: Invalid dev_template='%s'\n",
+                       dev_template);
+                return NULL;
+        }
+
+        len = sizeof(struct hostap_interface) +
+                3 + sizeof(struct local_info) +
+                3 + sizeof(struct ap_data);
+
+        dev = alloc_etherdev(len);
+        if (dev == NULL)
+                return NULL;
+
+        iface = netdev_priv(dev);
+        local = (struct local_info *) ((((long) (iface + 1)) + 3) & ~3);
+        local->ap = (struct ap_data *) ((((long) (local + 1)) + 3) & ~3);
+        local->dev = iface->dev = dev;
+        iface->local = local;
+        iface->type = HOSTAP_INTERFACE_MASTER;
+        INIT_LIST_HEAD(&local->hostap_interfaces);
+
+        local->hw_module = THIS_MODULE;
+
+#ifdef PRISM2_IO_DEBUG
+        local->io_debug_enabled = 1;
+#endif /* PRISM2_IO_DEBUG */
+
+        local->func = funcs;
+        local->func->cmd = hfa384x_cmd;
+        local->func->read_regs = hfa384x_read_regs;
+        local->func->get_rid = hfa384x_get_rid;
+        local->func->set_rid = hfa384x_set_rid;
+        local->func->hw_enable = prism2_hw_enable;
+        local->func->hw_config = prism2_hw_config;
+        local->func->hw_reset = prism2_hw_reset;
+        local->func->hw_shutdown = prism2_hw_shutdown;
+        local->func->reset_port = prism2_reset_port;
+        local->func->schedule_reset = prism2_schedule_reset;
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+        local->func->read_aux = prism2_download_aux_dump;
+        local->func->download = prism2_download;
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+        local->func->tx = prism2_tx_80211;
+        local->func->set_tim = prism2_set_tim;
+        local->func->need_tx_headroom = 0; /* no need to add txdesc in
+                                            * skb->data (FIX: maybe for DMA bus
+                                            * mastering? */
+
+        local->mtu = mtu;
+
+        rwlock_init(&local->iface_lock);
+        spin_lock_init(&local->txfidlock);
+        spin_lock_init(&local->cmdlock);
+        spin_lock_init(&local->baplock);
+        spin_lock_init(&local->lock);
+        init_MUTEX(&local->rid_bap_sem);
+
+        if (card_idx < 0 || card_idx >= MAX_PARM_DEVICES)
+                card_idx = 0;
+        local->card_idx = card_idx;
+
+        len = strlen(essid);
+        memcpy(local->essid, essid,
+               len > MAX_SSID_LEN ? MAX_SSID_LEN : len);
+        local->essid[MAX_SSID_LEN] = '\0';
+        i = GET_INT_PARM(iw_mode, card_idx);
+        if ((i >= IW_MODE_ADHOC && i <= IW_MODE_REPEAT) ||
+            i == IW_MODE_MONITOR) {
+                local->iw_mode = i;
+        } else {
+                printk(KERN_WARNING "prism2: Unknown iw_mode %d; using "
+                       "IW_MODE_MASTER\n", i);
+                local->iw_mode = IW_MODE_MASTER;
+        }
+        local->channel = GET_INT_PARM(channel, card_idx);
+        local->beacon_int = GET_INT_PARM(beacon_int, card_idx);
+        local->dtim_period = GET_INT_PARM(dtim_period, card_idx);
+        local->wds_max_connections = 16;
+        local->tx_control = HFA384X_TX_CTRL_FLAGS;
+        local->manual_retry_count = -1;
+        local->rts_threshold = 2347;
+        local->fragm_threshold = 2346;
+        local->rssi_to_dBm = 100; /* default; to be overriden by
+                                   * cnfDbmAdjust, if available */
+        local->auth_algs = PRISM2_AUTH_OPEN | PRISM2_AUTH_SHARED_KEY;
+        local->sram_type = -1;
+        local->scan_channel_mask = 0xffff;
+
+        /* Initialize task queue structures */
+        INIT_WORK(&local->reset_queue, handle_reset_queue, local);
+        INIT_WORK(&local->set_multicast_list_queue,
+                  hostap_set_multicast_list_queue, local->dev);
+
+        INIT_WORK(&local->set_tim_queue, handle_set_tim_queue, local);
+        INIT_LIST_HEAD(&local->set_tim_list);
+        spin_lock_init(&local->set_tim_lock);
+
+        INIT_WORK(&local->comms_qual_update, handle_comms_qual_update, local);
+
+        /* Initialize tasklets for handling hardware IRQ related operations
+         * outside hw IRQ handler */
+#define HOSTAP_TASKLET_INIT(q, f, d) \
+do { memset((q), 0, sizeof(*(q))); (q)->func = (f); (q)->data = (d); } \
+while (0)
+        HOSTAP_TASKLET_INIT(&local->bap_tasklet, hostap_bap_tasklet,
+                            (unsigned long) local);
+
+        HOSTAP_TASKLET_INIT(&local->info_tasklet, hostap_info_tasklet,
+                            (unsigned long) local);
+        hostap_info_init(local);
+
+        HOSTAP_TASKLET_INIT(&local->rx_tasklet,
+                            hostap_rx_tasklet, (unsigned long) local);
+        skb_queue_head_init(&local->rx_list);
+
+        HOSTAP_TASKLET_INIT(&local->sta_tx_exc_tasklet,
+                            hostap_sta_tx_exc_tasklet, (unsigned long) local);
+        skb_queue_head_init(&local->sta_tx_exc_list);
+
+        INIT_LIST_HEAD(&local->cmd_queue);
+        init_waitqueue_head(&local->hostscan_wq);
+        INIT_LIST_HEAD(&local->crypt_deinit_list);
+        init_timer(&local->crypt_deinit_timer);
+        local->crypt_deinit_timer.data = (unsigned long) local;
+        local->crypt_deinit_timer.function = prism2_crypt_deinit_handler;
+
+        init_timer(&local->passive_scan_timer);
+        local->passive_scan_timer.data = (unsigned long) local;
+        local->passive_scan_timer.function = hostap_passive_scan;
+
+        init_timer(&local->tick_timer);
+        local->tick_timer.data = (unsigned long) local;
+        local->tick_timer.function = hostap_tick_timer;
+        local->tick_timer.expires = jiffies + 2 * HZ;
+        add_timer(&local->tick_timer);
+
+        INIT_LIST_HEAD(&local->bss_list);
+
+        hostap_setup_dev(dev, local, 1);
+        local->saved_eth_header_parse = dev->hard_header_parse;
+
+        dev->hard_start_xmit = hostap_master_start_xmit;
+        dev->type = ARPHRD_IEEE80211;
+        dev->hard_header_parse = hostap_80211_header_parse;
+
+        rtnl_lock();
+        ret = dev_alloc_name(dev, "wifi%d");
+        SET_NETDEV_DEV(dev, sdev);
+        if (ret >= 0)
+                ret = register_netdevice(dev);
+        rtnl_unlock();
+        if (ret < 0) {
+                printk(KERN_WARNING "%s: register netdevice failed!\n",
+                       dev_info);
+                goto fail;
+        }
+        printk(KERN_INFO "%s: Registered netdevice %s\n", dev_info, dev->name);
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+        create_proc_read_entry("registers", 0, local->proc,
+                               prism2_registers_proc_read, local);
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+
+        hostap_init_data(local);
+        return dev;
+
+ fail:
+        free_netdev(dev);
+        return NULL;
+}
+
+
+static int hostap_hw_ready(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        struct local_info *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+        local->ddev = hostap_add_interface(local, HOSTAP_INTERFACE_MAIN, 0,
+                                           "", dev_template);
+
+        if (local->ddev) {
+                if (local->iw_mode == IW_MODE_INFRA ||
+                    local->iw_mode == IW_MODE_ADHOC) {
+                        netif_carrier_off(local->dev);
+                        netif_carrier_off(local->ddev);
+                }
+                hostap_init_proc(local);
+                hostap_init_ap_proc(local);
+                return 0;
+        }
+
+        return -1;
+}
+
+
+static void prism2_free_local_data(struct net_device *dev)
+{
+        struct hostap_tx_callback_info *tx_cb, *tx_cb_prev;
+        int i;
+        struct hostap_interface *iface;
+        struct local_info *local;
+        struct list_head *ptr, *n;
+
+        if (dev == NULL)
+                return;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        flush_scheduled_work();
+
+        if (timer_pending(&local->crypt_deinit_timer))
+                del_timer(&local->crypt_deinit_timer);
+        prism2_crypt_deinit_entries(local, 1);
+
+        if (timer_pending(&local->passive_scan_timer))
+                del_timer(&local->passive_scan_timer);
+
+        if (timer_pending(&local->tick_timer))
+                del_timer(&local->tick_timer);
+
+        prism2_clear_cmd_queue(local);
+
+        skb_queue_purge(&local->info_list);
+        skb_queue_purge(&local->rx_list);
+        skb_queue_purge(&local->sta_tx_exc_list);
+
+        if (local->dev_enabled)
+                prism2_callback(local, PRISM2_CALLBACK_DISABLE);
+
+        for (i = 0; i < WEP_KEYS; i++) {
+                struct ieee80211_crypt_data *crypt = local->crypt[i];
+                if (crypt) {
+                        if (crypt->ops)
+                                crypt->ops->deinit(crypt->priv);
+                        kfree(crypt);
+                        local->crypt[i] = NULL;
+                }
+        }
+
+        if (local->ap != NULL)
+                hostap_free_data(local->ap);
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+        if (local->proc != NULL)
+                remove_proc_entry("registers", local->proc);
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+        hostap_remove_proc(local);
+
+        tx_cb = local->tx_callback;
+        while (tx_cb != NULL) {
+                tx_cb_prev = tx_cb;
+                tx_cb = tx_cb->next;
+                kfree(tx_cb_prev);
+        }
+
+        hostap_set_hostapd(local, 0, 0);
+        hostap_set_hostapd_sta(local, 0, 0);
+
+        for (i = 0; i < PRISM2_FRAG_CACHE_LEN; i++) {
+                if (local->frag_cache[i].skb != NULL)
+                        dev_kfree_skb(local->frag_cache[i].skb);
+        }
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+        prism2_download_free_data(local->dl_pri);
+        prism2_download_free_data(local->dl_sec);
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+        list_for_each_safe(ptr, n, &local->hostap_interfaces) {
+                iface = list_entry(ptr, struct hostap_interface, list);
+                if (iface->type == HOSTAP_INTERFACE_MASTER) {
+                        /* special handling for this interface below */
+                        continue;
+                }
+                hostap_remove_interface(iface->dev, 0, 1);
+        }
+
+        prism2_clear_set_tim_queue(local);
+
+        list_for_each_safe(ptr, n, &local->bss_list) {
+                struct hostap_bss_info *bss =
+                        list_entry(ptr, struct hostap_bss_info, list);
+                kfree(bss);
+        }
+
+        kfree(local->pda);
+        kfree(local->last_scan_results);
+        kfree(local->generic_elem);
+
+        unregister_netdev(local->dev);
+        free_netdev(local->dev);
+}
+
+
+#ifndef PRISM2_PLX
+static void prism2_suspend(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        struct local_info *local;
+        union iwreq_data wrqu;
+
+        iface = dev->priv;
+        local = iface->local;
+
+        /* Send disconnect event, e.g., to trigger reassociation after resume
+         * if wpa_supplicant is used. */
+        memset(&wrqu, 0, sizeof(wrqu));
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL);
+
+        /* Disable hardware and firmware */
+        prism2_hw_shutdown(dev, 0);
+}
+#endif /* PRISM2_PLX */
+
+
+/* These might at some point be compiled separately and used as separate
+ * kernel modules or linked into one */
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+#include "hostap_download.c"
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+#ifdef PRISM2_CALLBACK
+/* External hostap_callback.c file can be used to, e.g., blink activity led.
+ * This can use platform specific code and must define prism2_callback()
+ * function (if PRISM2_CALLBACK is not defined, these function calls are not
+ * used. */
+#include "hostap_callback.c"
+#endif /* PRISM2_CALLBACK */
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
new file mode 100644
index 000000000000..5aa998fdf1c4
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -0,0 +1,499 @@
+/* Host AP driver Info Frame processing (part of hostap.o module) */
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_info_commtallies16(local_info_t *local, unsigned char *buf,
+                                      int left)
+{
+        struct hfa384x_comm_tallies *tallies;
+
+        if (left < sizeof(struct hfa384x_comm_tallies)) {
+                printk(KERN_DEBUG "%s: too short (len=%d) commtallies "
+                       "info frame\n", local->dev->name, left);
+                return;
+        }
+
+        tallies = (struct hfa384x_comm_tallies *) buf;
+#define ADD_COMM_TALLIES(name) \
+local->comm_tallies.name += le16_to_cpu(tallies->name)
+        ADD_COMM_TALLIES(tx_unicast_frames);
+        ADD_COMM_TALLIES(tx_multicast_frames);
+        ADD_COMM_TALLIES(tx_fragments);
+        ADD_COMM_TALLIES(tx_unicast_octets);
+        ADD_COMM_TALLIES(tx_multicast_octets);
+        ADD_COMM_TALLIES(tx_deferred_transmissions);
+        ADD_COMM_TALLIES(tx_single_retry_frames);
+        ADD_COMM_TALLIES(tx_multiple_retry_frames);
+        ADD_COMM_TALLIES(tx_retry_limit_exceeded);
+        ADD_COMM_TALLIES(tx_discards);
+        ADD_COMM_TALLIES(rx_unicast_frames);
+        ADD_COMM_TALLIES(rx_multicast_frames);
+        ADD_COMM_TALLIES(rx_fragments);
+        ADD_COMM_TALLIES(rx_unicast_octets);
+        ADD_COMM_TALLIES(rx_multicast_octets);
+        ADD_COMM_TALLIES(rx_fcs_errors);
+        ADD_COMM_TALLIES(rx_discards_no_buffer);
+        ADD_COMM_TALLIES(tx_discards_wrong_sa);
+        ADD_COMM_TALLIES(rx_discards_wep_undecryptable);
+        ADD_COMM_TALLIES(rx_message_in_msg_fragments);
+        ADD_COMM_TALLIES(rx_message_in_bad_msg_fragments);
+#undef ADD_COMM_TALLIES
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_info_commtallies32(local_info_t *local, unsigned char *buf,
+                                      int left)
+{
+        struct hfa384x_comm_tallies32 *tallies;
+
+        if (left < sizeof(struct hfa384x_comm_tallies32)) {
+                printk(KERN_DEBUG "%s: too short (len=%d) commtallies32 "
+                       "info frame\n", local->dev->name, left);
+                return;
+        }
+
+        tallies = (struct hfa384x_comm_tallies32 *) buf;
+#define ADD_COMM_TALLIES(name) \
+local->comm_tallies.name += le32_to_cpu(tallies->name)
+        ADD_COMM_TALLIES(tx_unicast_frames);
+        ADD_COMM_TALLIES(tx_multicast_frames);
+        ADD_COMM_TALLIES(tx_fragments);
+        ADD_COMM_TALLIES(tx_unicast_octets);
+        ADD_COMM_TALLIES(tx_multicast_octets);
+        ADD_COMM_TALLIES(tx_deferred_transmissions);
+        ADD_COMM_TALLIES(tx_single_retry_frames);
+        ADD_COMM_TALLIES(tx_multiple_retry_frames);
+        ADD_COMM_TALLIES(tx_retry_limit_exceeded);
+        ADD_COMM_TALLIES(tx_discards);
+        ADD_COMM_TALLIES(rx_unicast_frames);
+        ADD_COMM_TALLIES(rx_multicast_frames);
+        ADD_COMM_TALLIES(rx_fragments);
+        ADD_COMM_TALLIES(rx_unicast_octets);
+        ADD_COMM_TALLIES(rx_multicast_octets);
+        ADD_COMM_TALLIES(rx_fcs_errors);
+        ADD_COMM_TALLIES(rx_discards_no_buffer);
+        ADD_COMM_TALLIES(tx_discards_wrong_sa);
+        ADD_COMM_TALLIES(rx_discards_wep_undecryptable);
+        ADD_COMM_TALLIES(rx_message_in_msg_fragments);
+        ADD_COMM_TALLIES(rx_message_in_bad_msg_fragments);
+#undef ADD_COMM_TALLIES
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_info_commtallies(local_info_t *local, unsigned char *buf,
+                                    int left)
+{
+        if (local->tallies32)
+                prism2_info_commtallies32(local, buf, left);
+        else
+                prism2_info_commtallies16(local, buf, left);
+}
+
+
+#ifndef PRISM2_NO_STATION_MODES
+#ifndef PRISM2_NO_DEBUG
+static const char* hfa384x_linkstatus_str(u16 linkstatus)
+{
+        switch (linkstatus) {
+        case HFA384X_LINKSTATUS_CONNECTED:
+                return "Connected";
+        case HFA384X_LINKSTATUS_DISCONNECTED:
+                return "Disconnected";
+        case HFA384X_LINKSTATUS_AP_CHANGE:
+                return "Access point change";
+        case HFA384X_LINKSTATUS_AP_OUT_OF_RANGE:
+                return "Access point out of range";
+        case HFA384X_LINKSTATUS_AP_IN_RANGE:
+                return "Access point in range";
+        case HFA384X_LINKSTATUS_ASSOC_FAILED:
+                return "Association failed";
+        default:
+                return "Unknown";
+        }
+}
+#endif /* PRISM2_NO_DEBUG */
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_info_linkstatus(local_info_t *local, unsigned char *buf,
+                                    int left)
+{
+        u16 val;
+        int non_sta_mode;
+
+        /* Alloc new JoinRequests to occur since LinkStatus for the previous
+         * has been received */
+        local->last_join_time = 0;
+
+        if (left != 2) {
+                printk(KERN_DEBUG "%s: invalid linkstatus info frame "
+                       "length %d\n", local->dev->name, left);
+                return;
+        }
+
+        non_sta_mode = local->iw_mode == IW_MODE_MASTER ||
+                local->iw_mode == IW_MODE_REPEAT ||
+                local->iw_mode == IW_MODE_MONITOR;
+
+        val = buf[0] | (buf[1] << 8);
+        if (!non_sta_mode || val != HFA384X_LINKSTATUS_DISCONNECTED) {
+                PDEBUG(DEBUG_EXTRA, "%s: LinkStatus=%d (%s)\n",
+                       local->dev->name, val, hfa384x_linkstatus_str(val));
+        }
+
+        if (non_sta_mode) {
+                netif_carrier_on(local->dev);
+                netif_carrier_on(local->ddev);
+                return;
+        }
+
+        /* Get current BSSID later in scheduled task */
+        set_bit(PRISM2_INFO_PENDING_LINKSTATUS, &local->pending_info);
+        local->prev_link_status = val;
+        schedule_work(&local->info_queue);
+}
+
+
+static void prism2_host_roaming(local_info_t *local)
+{
+        struct hfa384x_join_request req;
+        struct net_device *dev = local->dev;
+        struct hfa384x_hostscan_result *selected, *entry;
+        int i;
+        unsigned long flags;
+
+        if (local->last_join_time &&
+            time_before(jiffies, local->last_join_time + 10 * HZ)) {
+                PDEBUG(DEBUG_EXTRA, "%s: last join request has not yet been "
+                       "completed - waiting for it before issuing new one\n",
+                       dev->name);
+                return;
+        }
+
+        /* ScanResults are sorted: first ESS results in decreasing signal
+         * quality then IBSS results in similar order.
+         * Trivial roaming policy: just select the first entry.
+         * This could probably be improved by adding hysteresis to limit
+         * number of handoffs, etc.
+         *
+         * Could do periodic RID_SCANREQUEST or Inquire F101 to get new
+         * ScanResults */
+        spin_lock_irqsave(&local->lock, flags);
+        if (local->last_scan_results == NULL ||
+            local->last_scan_results_count == 0) {
+                spin_unlock_irqrestore(&local->lock, flags);
+                PDEBUG(DEBUG_EXTRA, "%s: no scan results for host roaming\n",
+                       dev->name);
+                return;
+        }
+
+        selected = &local->last_scan_results[0];
+
+        if (local->preferred_ap[0] || local->preferred_ap[1] ||
+            local->preferred_ap[2] || local->preferred_ap[3] ||
+            local->preferred_ap[4] || local->preferred_ap[5]) {
+                /* Try to find preferred AP */
+                PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID " MACSTR "\n",
+                       dev->name, MAC2STR(local->preferred_ap));
+                for (i = 0; i < local->last_scan_results_count; i++) {
+                        entry = &local->last_scan_results[i];
+                        if (memcmp(local->preferred_ap, entry->bssid, 6) == 0)
+                        {
+                                PDEBUG(DEBUG_EXTRA, "%s: using preferred AP "
+                                       "selection\n", dev->name);
+                                selected = entry;
+                                break;
+                        }
+                }
+        }
+
+        memcpy(req.bssid, selected->bssid, 6);
+        req.channel = selected->chid;
+        spin_unlock_irqrestore(&local->lock, flags);
+
+        PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=" MACSTR " channel=%d\n",
+               dev->name, MAC2STR(req.bssid), le16_to_cpu(req.channel));
+        if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
+                                 sizeof(req))) {
+                printk(KERN_DEBUG "%s: JoinRequest failed\n", dev->name);
+        }
+        local->last_join_time = jiffies;
+}
+
+
+static void hostap_report_scan_complete(local_info_t *local)
+{
+        union iwreq_data wrqu;
+
+        /* Inform user space about new scan results (just empty event,
+         * SIOCGIWSCAN can be used to fetch data */
+        wrqu.data.length = 0;
+        wrqu.data.flags = 0;
+        wireless_send_event(local->dev, SIOCGIWSCAN, &wrqu, NULL);
+
+        /* Allow SIOCGIWSCAN handling to occur since we have received
+         * scanning result */
+        local->scan_timestamp = 0;
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_info_scanresults(local_info_t *local, unsigned char *buf,
+                                    int left)
+{
+        u16 *pos;
+        int new_count, i;
+        unsigned long flags;
+        struct hfa384x_scan_result *res;
+        struct hfa384x_hostscan_result *results, *prev;
+
+        if (left < 4) {
+                printk(KERN_DEBUG "%s: invalid scanresult info frame "
+                       "length %d\n", local->dev->name, left);
+                return;
+        }
+
+        pos = (u16 *) buf;
+        pos++;
+        pos++;
+        left -= 4;
+
+        new_count = left / sizeof(struct hfa384x_scan_result);
+        results = kmalloc(new_count * sizeof(struct hfa384x_hostscan_result),
+                          GFP_ATOMIC);
+        if (results == NULL)
+                return;
+
+        /* Convert to hostscan result format. */
+        res = (struct hfa384x_scan_result *) pos;
+        for (i = 0; i < new_count; i++) {
+                memcpy(&results[i], &res[i],
+                       sizeof(struct hfa384x_scan_result));
+                results[i].atim = 0;
+        }
+
+        spin_lock_irqsave(&local->lock, flags);
+        local->last_scan_type = PRISM2_SCAN;
+        prev = local->last_scan_results;
+        local->last_scan_results = results;
+        local->last_scan_results_count = new_count;
+        spin_unlock_irqrestore(&local->lock, flags);
+        kfree(prev);
+
+        hostap_report_scan_complete(local);
+
+        /* Perform rest of ScanResults handling later in scheduled task */
+        set_bit(PRISM2_INFO_PENDING_SCANRESULTS, &local->pending_info);
+        schedule_work(&local->info_queue);
+}
+
+
+/* Called only as a tasklet (software IRQ) */
+static void prism2_info_hostscanresults(local_info_t *local,
+                                        unsigned char *buf, int left)
+{
+        int i, result_size, copy_len, new_count;
+        struct hfa384x_hostscan_result *results, *prev;
+        unsigned long flags;
+        u16 *pos;
+        u8 *ptr;
+
+        wake_up_interruptible(&local->hostscan_wq);
+
+        if (left < 4) {
+                printk(KERN_DEBUG "%s: invalid hostscanresult info frame "
+                       "length %d\n", local->dev->name, left);
+                return;
+        }
+
+        pos = (u16 *) buf;
+        copy_len = result_size = le16_to_cpu(*pos);
+        if (result_size == 0) {
+                printk(KERN_DEBUG "%s: invalid result_size (0) in "
+                       "hostscanresults\n", local->dev->name);
+                return;
+        }
+        if (copy_len > sizeof(struct hfa384x_hostscan_result))
+                copy_len = sizeof(struct hfa384x_hostscan_result);
+
+        pos++;
+        pos++;
+        left -= 4;
+        ptr = (u8 *) pos;
+
+        new_count = left / result_size;
+        results = kmalloc(new_count * sizeof(struct hfa384x_hostscan_result),
+                          GFP_ATOMIC);
+        if (results == NULL)
+                return;
+        memset(results, 0, new_count * sizeof(struct hfa384x_hostscan_result));
+
+        for (i = 0; i < new_count; i++) {
+                memcpy(&results[i], ptr, copy_len);
+                ptr += result_size;
+                left -= result_size;
+        }
+
+        if (left) {
+                printk(KERN_DEBUG "%s: short HostScan result entry (%d/%d)\n",
+                       local->dev->name, left, result_size);
+        }
+
+        spin_lock_irqsave(&local->lock, flags);
+        local->last_scan_type = PRISM2_HOSTSCAN;
+        prev = local->last_scan_results;
+        local->last_scan_results = results;
+        local->last_scan_results_count = new_count;
+        spin_unlock_irqrestore(&local->lock, flags);
+        kfree(prev);
+
+        hostap_report_scan_complete(local);
+}
+#endif /* PRISM2_NO_STATION_MODES */
+
+
+/* Called only as a tasklet (software IRQ) */
+void hostap_info_process(local_info_t *local, struct sk_buff *skb)
+{
+        struct hfa384x_info_frame *info;
+        unsigned char *buf;
+        int left;
+#ifndef PRISM2_NO_DEBUG
+        int i;
+#endif /* PRISM2_NO_DEBUG */
+
+        info = (struct hfa384x_info_frame *) skb->data;
+        buf = skb->data + sizeof(*info);
+        left = skb->len - sizeof(*info);
+
+        switch (info->type) {
+        case HFA384X_INFO_COMMTALLIES:
+                prism2_info_commtallies(local, buf, left);
+                break;
+
+#ifndef PRISM2_NO_STATION_MODES
+        case HFA384X_INFO_LINKSTATUS:
+                prism2_info_linkstatus(local, buf, left);
+                break;
+
+        case HFA384X_INFO_SCANRESULTS:
+                prism2_info_scanresults(local, buf, left);
+                break;
+
+        case HFA384X_INFO_HOSTSCANRESULTS:
+                prism2_info_hostscanresults(local, buf, left);
+                break;
+#endif /* PRISM2_NO_STATION_MODES */
+
+#ifndef PRISM2_NO_DEBUG
+        default:
+                PDEBUG(DEBUG_EXTRA, "%s: INFO - len=%d type=0x%04x\n",
+                       local->dev->name, info->len, info->type);
+                PDEBUG(DEBUG_EXTRA, "Unknown info frame:");
+                for (i = 0; i < (left < 100 ? left : 100); i++)
+                        PDEBUG2(DEBUG_EXTRA, " %02x", buf[i]);
+                PDEBUG2(DEBUG_EXTRA, "\n");
+                break;
+#endif /* PRISM2_NO_DEBUG */
+        }
+}
+
+
+#ifndef PRISM2_NO_STATION_MODES
+static void handle_info_queue_linkstatus(local_info_t *local)
+{
+        int val = local->prev_link_status;
+        int connected;
+        union iwreq_data wrqu;
+
+        connected =
+                val == HFA384X_LINKSTATUS_CONNECTED ||
+                val == HFA384X_LINKSTATUS_AP_CHANGE ||
+                val == HFA384X_LINKSTATUS_AP_IN_RANGE;
+
+        if (local->func->get_rid(local->dev, HFA384X_RID_CURRENTBSSID,
+                                 local->bssid, ETH_ALEN, 1) < 0) {
+                printk(KERN_DEBUG "%s: could not read CURRENTBSSID after "
+                       "LinkStatus event\n", local->dev->name);
+        } else {
+                PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID=" MACSTR "\n",
+                       local->dev->name,
+                       MAC2STR((unsigned char *) local->bssid));
+                if (local->wds_type & HOSTAP_WDS_AP_CLIENT)
+                        hostap_add_sta(local->ap, local->bssid);
+        }
+
+        /* Get BSSID if we have a valid AP address */
+        if (connected) {
+                netif_carrier_on(local->dev);
+                netif_carrier_on(local->ddev);
+                memcpy(wrqu.ap_addr.sa_data, local->bssid, ETH_ALEN);
+        } else {
+                netif_carrier_off(local->dev);
+                netif_carrier_off(local->ddev);
+                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        }
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+
+        /*
+         * Filter out sequential disconnect events in order not to cause a
+         * flood of SIOCGIWAP events that have a race condition with EAPOL
+         * frames and can confuse wpa_supplicant about the current association
+         * status.
+         */
+        if (connected || local->prev_linkstatus_connected)
+                wireless_send_event(local->dev, SIOCGIWAP, &wrqu, NULL);
+        local->prev_linkstatus_connected = connected;
+}
+
+
+static void handle_info_queue_scanresults(local_info_t *local)
+{
+        if (local->host_roaming == 1 && local->iw_mode == IW_MODE_INFRA)
+                prism2_host_roaming(local);
+
+        if (local->host_roaming == 2 && local->iw_mode == IW_MODE_INFRA &&
+            memcmp(local->preferred_ap, "\x00\x00\x00\x00\x00\x00",
+                   ETH_ALEN) != 0) {
+                /*
+                 * Firmware seems to be getting into odd state in host_roaming
+                 * mode 2 when hostscan is used without join command, so try
+                 * to fix this by re-joining the current AP. This does not
+                 * actually trigger a new association if the current AP is
+                 * still in the scan results.
+                 */
+                prism2_host_roaming(local);
+        }
+}
+
+
+/* Called only as scheduled task after receiving info frames (used to avoid
+ * pending too much time in HW IRQ handler). */
+static void handle_info_queue(void *data)
+{
+        local_info_t *local = (local_info_t *) data;
+
+        if (test_and_clear_bit(PRISM2_INFO_PENDING_LINKSTATUS,
+                               &local->pending_info))
+                handle_info_queue_linkstatus(local);
+
+        if (test_and_clear_bit(PRISM2_INFO_PENDING_SCANRESULTS,
+                               &local->pending_info))
+                handle_info_queue_scanresults(local);
+}
+#endif /* PRISM2_NO_STATION_MODES */
+
+
+void hostap_info_init(local_info_t *local)
+{
+        skb_queue_head_init(&local->info_list);
+#ifndef PRISM2_NO_STATION_MODES
+        INIT_WORK(&local->info_queue, handle_info_queue, local);
+#endif /* PRISM2_NO_STATION_MODES */
+}
+
+
+EXPORT_SYMBOL(hostap_info_init);
+EXPORT_SYMBOL(hostap_info_process);
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
new file mode 100644
index 000000000000..e720369a3515
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -0,0 +1,4102 @@
+/* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */
+
+#ifdef in_atomic
+/* Get kernel_locked() for in_atomic() */
+#include <linux/smp_lock.h>
+#endif
+#include <linux/ethtool.h>
+
+
+static struct iw_statistics *hostap_get_wireless_stats(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct iw_statistics *wstats;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        /* Why are we doing that ? Jean II */
+        if (iface->type != HOSTAP_INTERFACE_MAIN)
+                return NULL;
+
+        wstats = &local->wstats;
+
+        wstats->status = 0;
+        wstats->discard.code =
+                local->comm_tallies.rx_discards_wep_undecryptable;
+        wstats->discard.misc =
+                local->comm_tallies.rx_fcs_errors +
+                local->comm_tallies.rx_discards_no_buffer +
+                local->comm_tallies.tx_discards_wrong_sa;
+
+        wstats->discard.retries =
+                local->comm_tallies.tx_retry_limit_exceeded;
+        wstats->discard.fragment =
+                local->comm_tallies.rx_message_in_bad_msg_fragments;
+
+        if (local->iw_mode != IW_MODE_MASTER &&
+            local->iw_mode != IW_MODE_REPEAT) {
+                int update = 1;
+#ifdef in_atomic
+                /* RID reading might sleep and it must not be called in
+                 * interrupt context or while atomic. However, this
+                 * function seems to be called while atomic (at least in Linux
+                 * 2.5.59). Update signal quality values only if in suitable
+                 * context. Otherwise, previous values read from tick timer
+                 * will be used. */
+                if (in_atomic())
+                        update = 0;
+#endif /* in_atomic */
+
+                if (update && prism2_update_comms_qual(dev) == 0)
+                        wstats->qual.updated = 7;
+
+                wstats->qual.qual = local->comms_qual;
+                wstats->qual.level = local->avg_signal;
+                wstats->qual.noise = local->avg_noise;
+        } else {
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+                wstats->qual.noise = 0;
+                wstats->qual.updated = 0;
+        }
+
+        return wstats;
+}
+
+
+static int prism2_get_datarates(struct net_device *dev, u8 *rates)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u8 buf[12];
+        int len;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        len = local->func->get_rid(dev, HFA384X_RID_SUPPORTEDDATARATES, buf,
+                                   sizeof(buf), 0);
+        if (len < 2)
+                return 0;
+
+        val = le16_to_cpu(*(u16 *) buf); /* string length */
+
+        if (len - 2 < val || val > 10)
+                return 0;
+
+        memcpy(rates, buf + 2, val);
+        return val;
+}
+
+
+static int prism2_get_name(struct net_device *dev,
+                           struct iw_request_info *info,
+                           char *name, char *extra)
+{
+        u8 rates[10];
+        int len, i, over2 = 0;
+
+        len = prism2_get_datarates(dev, rates);
+
+        for (i = 0; i < len; i++) {
+                if (rates[i] == 0x0b || rates[i] == 0x16) {
+                        over2 = 1;
+                        break;
+                }
+        }
+
+        strcpy(name, over2 ? "IEEE 802.11b" : "IEEE 802.11-DS");
+
+        return 0;
+}
+
+
+static void prism2_crypt_delayed_deinit(local_info_t *local,
+                                        struct ieee80211_crypt_data **crypt)
+{
+        struct ieee80211_crypt_data *tmp;
+        unsigned long flags;
+
+        tmp = *crypt;
+        *crypt = NULL;
+
+        if (tmp == NULL)
+                return;
+
+        /* must not run ops->deinit() while there may be pending encrypt or
+         * decrypt operations. Use a list of delayed deinits to avoid needing
+         * locking. */
+
+        spin_lock_irqsave(&local->lock, flags);
+        list_add(&tmp->list, &local->crypt_deinit_list);
+        if (!timer_pending(&local->crypt_deinit_timer)) {
+                local->crypt_deinit_timer.expires = jiffies + HZ;
+                add_timer(&local->crypt_deinit_timer);
+        }
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+
+static int prism2_ioctl_siwencode(struct net_device *dev,
+                                  struct iw_request_info *info,
+                                  struct iw_point *erq, char *keybuf)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int i;
+        struct ieee80211_crypt_data **crypt;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        i = erq->flags & IW_ENCODE_INDEX;
+        if (i < 1 || i > 4)
+                i = local->tx_keyidx;
+        else
+                i--;
+        if (i < 0 || i >= WEP_KEYS)
+                return -EINVAL;
+
+        crypt = &local->crypt[i];
+
+        if (erq->flags & IW_ENCODE_DISABLED) {
+                if (*crypt)
+                        prism2_crypt_delayed_deinit(local, crypt);
+                goto done;
+        }
+
+        if (*crypt != NULL && (*crypt)->ops != NULL &&
+            strcmp((*crypt)->ops->name, "WEP") != 0) {
+                /* changing to use WEP; deinit previously used algorithm */
+                prism2_crypt_delayed_deinit(local, crypt);
+        }
+
+        if (*crypt == NULL) {
+                struct ieee80211_crypt_data *new_crypt;
+
+                /* take WEP into use */
+                new_crypt = (struct ieee80211_crypt_data *)
+                        kmalloc(sizeof(struct ieee80211_crypt_data),
+                                GFP_KERNEL);
+                if (new_crypt == NULL)
+                        return -ENOMEM;
+                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+                new_crypt->ops = ieee80211_get_crypto_ops("WEP");
+                if (!new_crypt->ops) {
+                        request_module("ieee80211_crypt_wep");
+                        new_crypt->ops = ieee80211_get_crypto_ops("WEP");
+                }
+                if (new_crypt->ops)
+                        new_crypt->priv = new_crypt->ops->init(i);
+                if (!new_crypt->ops || !new_crypt->priv) {
+                        kfree(new_crypt);
+                        new_crypt = NULL;
+
+                        printk(KERN_WARNING "%s: could not initialize WEP: "
+                               "load module hostap_crypt_wep.o\n",
+                               dev->name);
+                        return -EOPNOTSUPP;
+                }
+                *crypt = new_crypt;
+        }
+
+        if (erq->length > 0) {
+                int len = erq->length <= 5 ? 5 : 13;
+                int first = 1, j;
+                if (len > erq->length)
+                        memset(keybuf + erq->length, 0, len - erq->length);
+                (*crypt)->ops->set_key(keybuf, len, NULL, (*crypt)->priv);
+                for (j = 0; j < WEP_KEYS; j++) {
+                        if (j != i && local->crypt[j]) {
+                                first = 0;
+                                break;
+                        }
+                }
+                if (first)
+                        local->tx_keyidx = i;
+        } else {
+                /* No key data - just set the default TX key index */
+                local->tx_keyidx = i;
+        }
+
+ done:
+        local->open_wep = erq->flags & IW_ENCODE_OPEN;
+
+        if (hostap_set_encryption(local)) {
+                printk(KERN_DEBUG "%s: set_encryption failed\n", dev->name);
+                return -EINVAL;
+        }
+
+        /* Do not reset port0 if card is in Managed mode since resetting will
+         * generate new IEEE 802.11 authentication which may end up in looping
+         * with IEEE 802.1X. Prism2 documentation seem to require port reset
+         * after WEP configuration. However, keys are apparently changed at
+         * least in Managed mode. */
+        if (local->iw_mode != IW_MODE_INFRA && local->func->reset_port(dev)) {
+                printk(KERN_DEBUG "%s: reset_port failed\n", dev->name);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+
+static int prism2_ioctl_giwencode(struct net_device *dev,
+                                  struct iw_request_info *info,
+                                  struct iw_point *erq, char *key)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int i, len;
+        u16 val;
+        struct ieee80211_crypt_data *crypt;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        i = erq->flags & IW_ENCODE_INDEX;
+        if (i < 1 || i > 4)
+                i = local->tx_keyidx;
+        else
+                i--;
+        if (i < 0 || i >= WEP_KEYS)
+                return -EINVAL;
+
+        crypt = local->crypt[i];
+        erq->flags = i + 1;
+
+        if (crypt == NULL || crypt->ops == NULL) {
+                erq->length = 0;
+                erq->flags |= IW_ENCODE_DISABLED;
+                return 0;
+        }
+
+        if (strcmp(crypt->ops->name, "WEP") != 0) {
+                /* only WEP is supported with wireless extensions, so just
+                 * report that encryption is used */
+                erq->length = 0;
+                erq->flags |= IW_ENCODE_ENABLED;
+                return 0;
+        }
+
+        /* Reads from HFA384X_RID_CNFDEFAULTKEY* return bogus values, so show
+         * the keys from driver buffer */
+        len = crypt->ops->get_key(key, WEP_KEY_LEN, NULL, crypt->priv);
+        erq->length = (len >= 0 ? len : 0);
+
+        if (local->func->get_rid(dev, HFA384X_RID_CNFWEPFLAGS, &val, 2, 1) < 0)
+        {
+                printk("CNFWEPFLAGS reading failed\n");
+                return -EOPNOTSUPP;
+        }
+        le16_to_cpus(&val);
+        if (val & HFA384X_WEPFLAGS_PRIVACYINVOKED)
+                erq->flags |= IW_ENCODE_ENABLED;
+        else
+                erq->flags |= IW_ENCODE_DISABLED;
+        if (val & HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED)
+                erq->flags |= IW_ENCODE_RESTRICTED;
+        else
+                erq->flags |= IW_ENCODE_OPEN;
+
+        return 0;
+}
+
+
+static int hostap_set_rate(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret, basic_rates;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        basic_rates = local->basic_rates & local->tx_rate_control;
+        if (!basic_rates || basic_rates != local->basic_rates) {
+                printk(KERN_INFO "%s: updating basic rate set automatically "
+                       "to match with the new supported rate set\n",
+                       dev->name);
+                if (!basic_rates)
+                        basic_rates = local->tx_rate_control;
+
+                local->basic_rates = basic_rates;
+                if (hostap_set_word(dev, HFA384X_RID_CNFBASICRATES,
+                                    basic_rates))
+                        printk(KERN_WARNING "%s: failed to set "
+                               "cnfBasicRates\n", dev->name);
+        }
+
+        ret = (hostap_set_word(dev, HFA384X_RID_TXRATECONTROL,
+                               local->tx_rate_control) ||
+               hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES,
+                               local->tx_rate_control) ||
+               local->func->reset_port(dev));
+
+        if (ret) {
+                printk(KERN_WARNING "%s: TXRateControl/cnfSupportedRates "
+                       "setting to 0x%x failed\n",
+                       dev->name, local->tx_rate_control);
+        }
+
+        /* Update TX rate configuration for all STAs based on new operational
+         * rate set. */
+        hostap_update_rates(local);
+
+        return ret;
+}
+
+
+static int prism2_ioctl_siwrate(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *rrq, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (rrq->fixed) {
+                switch (rrq->value) {
+                case 11000000:
+                        local->tx_rate_control = HFA384X_RATES_11MBPS;
+                        break;
+                case 5500000:
+                        local->tx_rate_control = HFA384X_RATES_5MBPS;
+                        break;
+                case 2000000:
+                        local->tx_rate_control = HFA384X_RATES_2MBPS;
+                        break;
+                case 1000000:
+                        local->tx_rate_control = HFA384X_RATES_1MBPS;
+                        break;
+                default:
+                        local->tx_rate_control = HFA384X_RATES_1MBPS |
+                                HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS |
+                                HFA384X_RATES_11MBPS;
+                        break;
+                }
+        } else {
+                switch (rrq->value) {
+                case 11000000:
+                        local->tx_rate_control = HFA384X_RATES_1MBPS |
+                                HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS |
+                                HFA384X_RATES_11MBPS;
+                        break;
+                case 5500000:
+                        local->tx_rate_control = HFA384X_RATES_1MBPS |
+                                HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS;
+                        break;
+                case 2000000:
+                        local->tx_rate_control = HFA384X_RATES_1MBPS |
+                                HFA384X_RATES_2MBPS;
+                        break;
+                case 1000000:
+                        local->tx_rate_control = HFA384X_RATES_1MBPS;
+                        break;
+                default:
+                        local->tx_rate_control = HFA384X_RATES_1MBPS |
+                                HFA384X_RATES_2MBPS | HFA384X_RATES_5MBPS |
+                                HFA384X_RATES_11MBPS;
+                        break;
+                }
+        }
+
+        return hostap_set_rate(dev);
+}
+
+
+static int prism2_ioctl_giwrate(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *rrq, char *extra)
+{
+        u16 val;
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->get_rid(dev, HFA384X_RID_TXRATECONTROL, &val, 2, 1) <
+            0)
+                return -EINVAL;
+
+        if ((val & 0x1) && (val > 1))
+                rrq->fixed = 0;
+        else
+                rrq->fixed = 1;
+
+        if (local->iw_mode == IW_MODE_MASTER && local->ap != NULL &&
+            !local->fw_tx_rate_control) {
+                /* HFA384X_RID_CURRENTTXRATE seems to always be 2 Mbps in
+                 * Host AP mode, so use the recorded TX rate of the last sent
+                 * frame */
+                rrq->value = local->ap->last_tx_rate > 0 ?
+                        local->ap->last_tx_rate * 100000 : 11000000;
+                return 0;
+        }
+
+        if (local->func->get_rid(dev, HFA384X_RID_CURRENTTXRATE, &val, 2, 1) <
+            0)
+                return -EINVAL;
+
+        switch (val) {
+        case HFA384X_RATES_1MBPS:
+                rrq->value = 1000000;
+                break;
+        case HFA384X_RATES_2MBPS:
+                rrq->value = 2000000;
+                break;
+        case HFA384X_RATES_5MBPS:
+                rrq->value = 5500000;
+                break;
+        case HFA384X_RATES_11MBPS:
+                rrq->value = 11000000;
+                break;
+        default:
+                /* should not happen */
+                rrq->value = 11000000;
+                ret = -EINVAL;
+                break;
+        }
+
+        return ret;
+}
+
+
+static int prism2_ioctl_siwsens(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *sens, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        /* Set the desired AP density */
+        if (sens->value < 1 || sens->value > 3)
+                return -EINVAL;
+
+        if (hostap_set_word(dev, HFA384X_RID_CNFSYSTEMSCALE, sens->value) ||
+            local->func->reset_port(dev))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int prism2_ioctl_giwsens(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *sens, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        /* Get the current AP density */
+        if (local->func->get_rid(dev, HFA384X_RID_CNFSYSTEMSCALE, &val, 2, 1) <
+            0)
+                return -EINVAL;
+
+        sens->value = __le16_to_cpu(val);
+        sens->fixed = 1;
+
+        return 0;
+}
+
+
+/* Deprecated in new wireless extension API */
+static int prism2_ioctl_giwaplist(struct net_device *dev,
+                                  struct iw_request_info *info,
+                                  struct iw_point *data, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct sockaddr *addr;
+        struct iw_quality *qual;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->iw_mode != IW_MODE_MASTER) {
+                printk(KERN_DEBUG "SIOCGIWAPLIST is currently only supported "
+                       "in Host AP mode\n");
+                data->length = 0;
+                return -EOPNOTSUPP;
+        }
+
+        addr = kmalloc(sizeof(struct sockaddr) * IW_MAX_AP, GFP_KERNEL);
+        qual = kmalloc(sizeof(struct iw_quality) * IW_MAX_AP, GFP_KERNEL);
+        if (addr == NULL || qual == NULL) {
+                kfree(addr);
+                kfree(qual);
+                data->length = 0;
+                return -ENOMEM;
+        }
+
+        data->length = prism2_ap_get_sta_qual(local, addr, qual, IW_MAX_AP, 1);
+
+        memcpy(extra, &addr, sizeof(struct sockaddr) * data->length);
+        data->flags = 1; /* has quality information */
+        memcpy(extra + sizeof(struct sockaddr) * data->length, &qual,
+               sizeof(struct iw_quality) * data->length);
+
+        kfree(addr);
+        kfree(qual);
+
+        return 0;
+}
+
+
+static int prism2_ioctl_siwrts(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_param *rts, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (rts->disabled)
+                val = __constant_cpu_to_le16(2347);
+        else if (rts->value < 0 || rts->value > 2347)
+                return -EINVAL;
+        else
+                val = __cpu_to_le16(rts->value);
+
+        if (local->func->set_rid(dev, HFA384X_RID_RTSTHRESHOLD, &val, 2) ||
+            local->func->reset_port(dev))
+                return -EINVAL;
+
+        local->rts_threshold = rts->value;
+
+        return 0;
+}
+
+static int prism2_ioctl_giwrts(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_param *rts, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->get_rid(dev, HFA384X_RID_RTSTHRESHOLD, &val, 2, 1) <
+            0)
+                return -EINVAL;
+
+        rts->value = __le16_to_cpu(val);
+        rts->disabled = (rts->value == 2347);
+        rts->fixed = 1;
+
+        return 0;
+}
+
+
+static int prism2_ioctl_siwfrag(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *rts, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (rts->disabled)
+                val = __constant_cpu_to_le16(2346);
+        else if (rts->value < 256 || rts->value > 2346)
+                return -EINVAL;
+        else
+                val = __cpu_to_le16(rts->value & ~0x1); /* even numbers only */
+
+        local->fragm_threshold = rts->value & ~0x1;
+        if (local->func->set_rid(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD, &val,
+                                 2)
+            || local->func->reset_port(dev))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int prism2_ioctl_giwfrag(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *rts, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->get_rid(dev, HFA384X_RID_FRAGMENTATIONTHRESHOLD,
+                                 &val, 2, 1) < 0)
+                return -EINVAL;
+
+        rts->value = __le16_to_cpu(val);
+        rts->disabled = (rts->value == 2346);
+        rts->fixed = 1;
+
+        return 0;
+}
+
+
+#ifndef PRISM2_NO_STATION_MODES
+static int hostap_join_ap(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hfa384x_join_request req;
+        unsigned long flags;
+        int i;
+        struct hfa384x_hostscan_result *entry;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        memcpy(req.bssid, local->preferred_ap, ETH_ALEN);
+        req.channel = 0;
+
+        spin_lock_irqsave(&local->lock, flags);
+        for (i = 0; i < local->last_scan_results_count; i++) {
+                if (!local->last_scan_results)
+                        break;
+                entry = &local->last_scan_results[i];
+                if (memcmp(local->preferred_ap, entry->bssid, ETH_ALEN) == 0) {
+                        req.channel = entry->chid;
+                        break;
+                }
+        }
+        spin_unlock_irqrestore(&local->lock, flags);
+
+        if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
+                                 sizeof(req))) {
+                printk(KERN_DEBUG "%s: JoinRequest " MACSTR
+                       " failed\n",
+                       dev->name, MAC2STR(local->preferred_ap));
+                return -1;
+        }
+
+        printk(KERN_DEBUG "%s: Trying to join BSSID " MACSTR "\n",
+               dev->name, MAC2STR(local->preferred_ap));
+
+        return 0;
+}
+#endif /* PRISM2_NO_STATION_MODES */
+
+
+static int prism2_ioctl_siwap(struct net_device *dev,
+                              struct iw_request_info *info,
+                              struct sockaddr *ap_addr, char *extra)
+{
+#ifdef PRISM2_NO_STATION_MODES
+        return -EOPNOTSUPP;
+#else /* PRISM2_NO_STATION_MODES */
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        memcpy(local->preferred_ap, &ap_addr->sa_data, ETH_ALEN);
+
+        if (local->host_roaming == 1 && local->iw_mode == IW_MODE_INFRA) {
+                struct hfa384x_scan_request scan_req;
+                memset(&scan_req, 0, sizeof(scan_req));
+                scan_req.channel_list = __constant_cpu_to_le16(0x3fff);
+                scan_req.txrate = __constant_cpu_to_le16(HFA384X_RATES_1MBPS);
+                if (local->func->set_rid(dev, HFA384X_RID_SCANREQUEST,
+                                         &scan_req, sizeof(scan_req))) {
+                        printk(KERN_DEBUG "%s: ScanResults request failed - "
+                               "preferred AP delayed to next unsolicited "
+                               "scan\n", dev->name);
+                }
+        } else if (local->host_roaming == 2 &&
+                   local->iw_mode == IW_MODE_INFRA) {
+                if (hostap_join_ap(dev))
+                        return -EINVAL;
+        } else {
+                printk(KERN_DEBUG "%s: Preferred AP (SIOCSIWAP) is used only "
+                       "in Managed mode when host_roaming is enabled\n",
+                       dev->name);
+        }
+
+        return 0;
+#endif /* PRISM2_NO_STATION_MODES */
+}
+
+static int prism2_ioctl_giwap(struct net_device *dev,
+                              struct iw_request_info *info,
+                              struct sockaddr *ap_addr, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        ap_addr->sa_family = ARPHRD_ETHER;
+        switch (iface->type) {
+        case HOSTAP_INTERFACE_AP:
+                memcpy(&ap_addr->sa_data, dev->dev_addr, ETH_ALEN);
+                break;
+        case HOSTAP_INTERFACE_STA:
+                memcpy(&ap_addr->sa_data, local->assoc_ap_addr, ETH_ALEN);
+                break;
+        case HOSTAP_INTERFACE_WDS:
+                memcpy(&ap_addr->sa_data, iface->u.wds.remote_addr, ETH_ALEN);
+                break;
+        default:
+                if (local->func->get_rid(dev, HFA384X_RID_CURRENTBSSID,
+                                         &ap_addr->sa_data, ETH_ALEN, 1) < 0)
+                        return -EOPNOTSUPP;
+
+                /* local->bssid is also updated in LinkStatus handler when in
+                 * station mode */
+                memcpy(local->bssid, &ap_addr->sa_data, ETH_ALEN);
+                break;
+        }
+
+        return 0;
+}
+
+
+static int prism2_ioctl_siwnickn(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *nickname)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        memset(local->name, 0, sizeof(local->name));
+        memcpy(local->name, nickname, data->length);
+        local->name_set = 1;
+
+        if (hostap_set_string(dev, HFA384X_RID_CNFOWNNAME, local->name) ||
+            local->func->reset_port(dev))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int prism2_ioctl_giwnickn(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *nickname)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int len;
+        char name[MAX_NAME_LEN + 3];
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        len = local->func->get_rid(dev, HFA384X_RID_CNFOWNNAME,
+                                   &name, MAX_NAME_LEN + 2, 0);
+        val = __le16_to_cpu(*(u16 *) name);
+        if (len > MAX_NAME_LEN + 2 || len < 0 || val > MAX_NAME_LEN)
+                return -EOPNOTSUPP;
+
+        name[val + 2] = '\0';
+        data->length = val + 1;
+        memcpy(nickname, name + 2, val + 1);
+
+        return 0;
+}
+
+
+static int prism2_ioctl_siwfreq(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_freq *freq, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        /* freq => chan. */
+        if (freq->e == 1 &&
+            freq->m / 100000 >= freq_list[0] &&
+            freq->m / 100000 <= freq_list[FREQ_COUNT - 1]) {
+                int ch;
+                int fr = freq->m / 100000;
+                for (ch = 0; ch < FREQ_COUNT; ch++) {
+                        if (fr == freq_list[ch]) {
+                                freq->e = 0;
+                                freq->m = ch + 1;
+                                break;
+                        }
+                }
+        }
+
+        if (freq->e != 0 || freq->m < 1 || freq->m > FREQ_COUNT ||
+            !(local->channel_mask & (1 << (freq->m - 1))))
+                return -EINVAL;
+
+        local->channel = freq->m; /* channel is used in prism2_setup_rids() */
+        if (hostap_set_word(dev, HFA384X_RID_CNFOWNCHANNEL, local->channel) ||
+            local->func->reset_port(dev))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int prism2_ioctl_giwfreq(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_freq *freq, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->get_rid(dev, HFA384X_RID_CURRENTCHANNEL, &val, 2, 1) <
+            0)
+                return -EINVAL;
+
+        le16_to_cpus(&val);
+        if (val < 1 || val > FREQ_COUNT)
+                return -EINVAL;
+
+        freq->m = freq_list[val - 1] * 100000;
+        freq->e = 1;
+
+        return 0;
+}
+
+
+static void hostap_monitor_set_type(local_info_t *local)
+{
+        struct net_device *dev = local->ddev;
+
+        if (dev == NULL)
+                return;
+
+        if (local->monitor_type == PRISM2_MONITOR_PRISM ||
+            local->monitor_type == PRISM2_MONITOR_CAPHDR) {
+                dev->type = ARPHRD_IEEE80211_PRISM;
+                dev->hard_header_parse =
+                        hostap_80211_prism_header_parse;
+        } else {
+                dev->type = ARPHRD_IEEE80211;
+                dev->hard_header_parse = hostap_80211_header_parse;
+        }
+}
+
+
+static int prism2_ioctl_siwessid(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *ssid)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (iface->type == HOSTAP_INTERFACE_WDS)
+                return -EOPNOTSUPP;
+
+        if (data->flags == 0)
+                ssid[0] = '\0'; /* ANY */
+
+        if (local->iw_mode == IW_MODE_MASTER && ssid[0] == '\0') {
+                /* Setting SSID to empty string seems to kill the card in
+                 * Host AP mode */
+                printk(KERN_DEBUG "%s: Host AP mode does not support "
+                       "'Any' essid\n", dev->name);
+                return -EINVAL;
+        }
+
+        memcpy(local->essid, ssid, data->length);
+        local->essid[data->length] = '\0';
+
+        if ((!local->fw_ap &&
+             hostap_set_string(dev, HFA384X_RID_CNFDESIREDSSID, local->essid))
+            || hostap_set_string(dev, HFA384X_RID_CNFOWNSSID, local->essid) ||
+            local->func->reset_port(dev))
+                return -EINVAL;
+
+        return 0;
+}
+
+static int prism2_ioctl_giwessid(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *essid)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (iface->type == HOSTAP_INTERFACE_WDS)
+                return -EOPNOTSUPP;
+
+        data->flags = 1; /* active */
+        if (local->iw_mode == IW_MODE_MASTER) {
+                data->length = strlen(local->essid);
+                memcpy(essid, local->essid, IW_ESSID_MAX_SIZE);
+        } else {
+                int len;
+                char ssid[MAX_SSID_LEN + 2];
+                memset(ssid, 0, sizeof(ssid));
+                len = local->func->get_rid(dev, HFA384X_RID_CURRENTSSID,
+                                           &ssid, MAX_SSID_LEN + 2, 0);
+                val = __le16_to_cpu(*(u16 *) ssid);
+                if (len > MAX_SSID_LEN + 2 || len < 0 || val > MAX_SSID_LEN) {
+                        return -EOPNOTSUPP;
+                }
+                data->length = val;
+                memcpy(essid, ssid + 2, IW_ESSID_MAX_SIZE);
+        }
+
+        return 0;
+}
+
+
+static int prism2_ioctl_giwrange(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct iw_range *range = (struct iw_range *) extra;
+        u8 rates[10];
+        u16 val;
+        int i, len, over2;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        data->length = sizeof(struct iw_range);
+        memset(range, 0, sizeof(struct iw_range));
+
+        /* TODO: could fill num_txpower and txpower array with
+         * something; however, there are 128 different values.. */
+
+        range->txpower_capa = IW_TXPOW_DBM;
+
+        if (local->iw_mode == IW_MODE_INFRA || local->iw_mode == IW_MODE_ADHOC)
+        {
+                range->min_pmp = 1 * 1024;
+                range->max_pmp = 65535 * 1024;
+                range->min_pmt = 1 * 1024;
+                range->max_pmt = 1000 * 1024;
+                range->pmp_flags = IW_POWER_PERIOD;
+                range->pmt_flags = IW_POWER_TIMEOUT;
+                range->pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT |
+                        IW_POWER_UNICAST_R | IW_POWER_ALL_R;
+        }
+
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 18;
+
+        range->retry_capa = IW_RETRY_LIMIT;
+        range->retry_flags = IW_RETRY_LIMIT;
+        range->min_retry = 0;
+        range->max_retry = 255;
+
+        range->num_channels = FREQ_COUNT;
+
+        val = 0;
+        for (i = 0; i < FREQ_COUNT; i++) {
+                if (local->channel_mask & (1 << i)) {
+                        range->freq[val].i = i + 1;
+                        range->freq[val].m = freq_list[i] * 100000;
+                        range->freq[val].e = 1;
+                        val++;
+                }
+                if (val == IW_MAX_FREQUENCIES)
+                        break;
+        }
+        range->num_frequency = val;
+
+        if (local->sta_fw_ver >= PRISM2_FW_VER(1,3,1)) {
+                range->max_qual.qual = 70; /* what is correct max? This was not
+                                            * documented exactly. At least
+                                            * 69 has been observed. */
+                range->max_qual.level = 0; /* dB */
+                range->max_qual.noise = 0; /* dB */
+
+                /* What would be suitable values for "average/typical" qual? */
+                range->avg_qual.qual = 20;
+                range->avg_qual.level = -60;
+                range->avg_qual.noise = -95;
+        } else {
+                range->max_qual.qual = 92; /* 0 .. 92 */
+                range->max_qual.level = 154; /* 27 .. 154 */
+                range->max_qual.noise = 154; /* 27 .. 154 */
+        }
+        range->sensitivity = 3;
+
+        range->max_encoding_tokens = WEP_KEYS;
+        range->num_encoding_sizes = 2;
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13;
+
+        over2 = 0;
+        len = prism2_get_datarates(dev, rates);
+        range->num_bitrates = 0;
+        for (i = 0; i < len; i++) {
+                if (range->num_bitrates < IW_MAX_BITRATES) {
+                        range->bitrate[range->num_bitrates] =
+                                rates[i] * 500000;
+                        range->num_bitrates++;
+                }
+                if (rates[i] == 0x0b || rates[i] == 0x16)
+                        over2 = 1;
+        }
+        /* estimated maximum TCP throughput values (bps) */
+        range->throughput = over2 ? 5500000 : 1500000;
+
+        range->min_rts = 0;
+        range->max_rts = 2347;
+        range->min_frag = 256;
+        range->max_frag = 2346;
+
+        /* Event capability (kernel + driver) */
+        range->event_capa[0] = (IW_EVENT_CAPA_K_0 |
+                                IW_EVENT_CAPA_MASK(SIOCGIWTHRSPY) |
+                                IW_EVENT_CAPA_MASK(SIOCGIWAP) |
+                                IW_EVENT_CAPA_MASK(SIOCGIWSCAN));
+        range->event_capa[1] = IW_EVENT_CAPA_K_1;
+        range->event_capa[4] = (IW_EVENT_CAPA_MASK(IWEVTXDROP) |
+                                IW_EVENT_CAPA_MASK(IWEVCUSTOM) |
+                                IW_EVENT_CAPA_MASK(IWEVREGISTERED) |
+                                IW_EVENT_CAPA_MASK(IWEVEXPIRED));
+
+        range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
+                IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
+        return 0;
+}
+
+
+static int hostap_monitor_mode_enable(local_info_t *local)
+{
+        struct net_device *dev = local->dev;
+
+        printk(KERN_DEBUG "Enabling monitor mode\n");
+        hostap_monitor_set_type(local);
+
+        if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,
+                            HFA384X_PORTTYPE_PSEUDO_IBSS)) {
+                printk(KERN_DEBUG "Port type setting for monitor mode "
+                       "failed\n");
+                return -EOPNOTSUPP;
+        }
+
+        /* Host decrypt is needed to get the IV and ICV fields;
+         * however, monitor mode seems to remove WEP flag from frame
+         * control field */
+        if (hostap_set_word(dev, HFA384X_RID_CNFWEPFLAGS,
+                            HFA384X_WEPFLAGS_HOSTENCRYPT |
+                            HFA384X_WEPFLAGS_HOSTDECRYPT)) {
+                printk(KERN_DEBUG "WEP flags setting failed\n");
+                return -EOPNOTSUPP;
+        }
+
+        if (local->func->reset_port(dev) ||
+            local->func->cmd(dev, HFA384X_CMDCODE_TEST |
+                             (HFA384X_TEST_MONITOR << 8),
+                             0, NULL, NULL)) {
+                printk(KERN_DEBUG "Setting monitor mode failed\n");
+                return -EOPNOTSUPP;
+        }
+
+        return 0;
+}
+
+
+static int hostap_monitor_mode_disable(local_info_t *local)
+{
+        struct net_device *dev = local->ddev;
+
+        if (dev == NULL)
+                return -1;
+
+        printk(KERN_DEBUG "%s: Disabling monitor mode\n", dev->name);
+        dev->type = ARPHRD_ETHER;
+        dev->hard_header_parse = local->saved_eth_header_parse;
+        if (local->func->cmd(dev, HFA384X_CMDCODE_TEST |
+                             (HFA384X_TEST_STOP << 8),
+                             0, NULL, NULL))
+                return -1;
+        return hostap_set_encryption(local);
+}
+
+
+static int prism2_ioctl_siwmode(struct net_device *dev,
+                                struct iw_request_info *info,
+                                __u32 *mode, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int double_reset = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (*mode != IW_MODE_ADHOC && *mode != IW_MODE_INFRA &&
+            *mode != IW_MODE_MASTER && *mode != IW_MODE_REPEAT &&
+            *mode != IW_MODE_MONITOR)
+                return -EOPNOTSUPP;
+
+#ifdef PRISM2_NO_STATION_MODES
+        if (*mode == IW_MODE_ADHOC || *mode == IW_MODE_INFRA)
+                return -EOPNOTSUPP;
+#endif /* PRISM2_NO_STATION_MODES */
+
+        if (*mode == local->iw_mode)
+                return 0;
+
+        if (*mode == IW_MODE_MASTER && local->essid[0] == '\0') {
+                printk(KERN_WARNING "%s: empty SSID not allowed in Master "
+                       "mode\n", dev->name);
+                return -EINVAL;
+        }
+
+        if (local->iw_mode == IW_MODE_MONITOR)
+                hostap_monitor_mode_disable(local);
+
+        if ((local->iw_mode == IW_MODE_ADHOC ||
+             local->iw_mode == IW_MODE_MONITOR) && *mode == IW_MODE_MASTER) {
+                /* There seems to be a firmware bug in at least STA f/w v1.5.6
+                 * that leaves beacon frames to use IBSS type when moving from
+                 * IBSS to Host AP mode. Doing double Port0 reset seems to be
+                 * enough to workaround this. */
+                double_reset = 1;
+        }
+
+        printk(KERN_DEBUG "prism2: %s: operating mode changed "
+               "%d -> %d\n", dev->name, local->iw_mode, *mode);
+        local->iw_mode = *mode;
+
+        if (local->iw_mode == IW_MODE_MONITOR)
+                hostap_monitor_mode_enable(local);
+        else if (local->iw_mode == IW_MODE_MASTER && !local->host_encrypt &&
+                 !local->fw_encrypt_ok) {
+                printk(KERN_DEBUG "%s: defaulting to host-based encryption as "
+                       "a workaround for firmware bug in Host AP mode WEP\n",
+                       dev->name);
+                local->host_encrypt = 1;
+        }
+
+        if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,
+                            hostap_get_porttype(local)))
+                return -EOPNOTSUPP;
+
+        if (local->func->reset_port(dev))
+                return -EINVAL;
+        if (double_reset && local->func->reset_port(dev))
+                return -EINVAL;
+
+        if (local->iw_mode != IW_MODE_INFRA && local->iw_mode != IW_MODE_ADHOC)
+        {
+                /* netif_carrier is used only in client modes for now, so make
+                 * sure carrier is on when moving to non-client modes. */
+                netif_carrier_on(local->dev);
+                netif_carrier_on(local->ddev);
+        }
+        return 0;
+}
+
+
+static int prism2_ioctl_giwmode(struct net_device *dev,
+                                struct iw_request_info *info,
+                                __u32 *mode, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        switch (iface->type) {
+        case HOSTAP_INTERFACE_STA:
+                *mode = IW_MODE_INFRA;
+                break;
+        case HOSTAP_INTERFACE_WDS:
+                *mode = IW_MODE_REPEAT;
+                break;
+        default:
+                *mode = local->iw_mode;
+                break;
+        }
+        return 0;
+}
+
+
+static int prism2_ioctl_siwpower(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *wrq, char *extra)
+{
+#ifdef PRISM2_NO_STATION_MODES
+        return -EOPNOTSUPP;
+#else /* PRISM2_NO_STATION_MODES */
+        int ret = 0;
+
+        if (wrq->disabled)
+                return hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 0);
+
+        switch (wrq->flags & IW_POWER_MODE) {
+        case IW_POWER_UNICAST_R:
+                ret = hostap_set_word(dev, HFA384X_RID_CNFMULTICASTRECEIVE, 0);
+                if (ret)
+                        return ret;
+                ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);
+                if (ret)
+                        return ret;
+                break;
+        case IW_POWER_ALL_R:
+                ret = hostap_set_word(dev, HFA384X_RID_CNFMULTICASTRECEIVE, 1);
+                if (ret)
+                        return ret;
+                ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);
+                if (ret)
+                        return ret;
+                break;
+        case IW_POWER_ON:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (wrq->flags & IW_POWER_TIMEOUT) {
+                ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);
+                if (ret)
+                        return ret;
+                ret = hostap_set_word(dev, HFA384X_RID_CNFPMHOLDOVERDURATION,
+                                      wrq->value / 1024);
+                if (ret)
+                        return ret;
+        }
+        if (wrq->flags & IW_POWER_PERIOD) {
+                ret = hostap_set_word(dev, HFA384X_RID_CNFPMENABLED, 1);
+                if (ret)
+                        return ret;
+                ret = hostap_set_word(dev, HFA384X_RID_CNFMAXSLEEPDURATION,
+                                      wrq->value / 1024);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+#endif /* PRISM2_NO_STATION_MODES */
+}
+
+
+static int prism2_ioctl_giwpower(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *rrq, char *extra)
+{
+#ifdef PRISM2_NO_STATION_MODES
+        return -EOPNOTSUPP;
+#else /* PRISM2_NO_STATION_MODES */
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 enable, mcast;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->get_rid(dev, HFA384X_RID_CNFPMENABLED, &enable, 2, 1)
+            < 0)
+                return -EINVAL;
+
+        if (!__le16_to_cpu(enable)) {
+                rrq->disabled = 1;
+                return 0;
+        }
+
+        rrq->disabled = 0;
+
+        if ((rrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
+                u16 timeout;
+                if (local->func->get_rid(dev,
+                                         HFA384X_RID_CNFPMHOLDOVERDURATION,
+                                         &timeout, 2, 1) < 0)
+                        return -EINVAL;
+
+                rrq->flags = IW_POWER_TIMEOUT;
+                rrq->value = __le16_to_cpu(timeout) * 1024;
+        } else {
+                u16 period;
+                if (local->func->get_rid(dev, HFA384X_RID_CNFMAXSLEEPDURATION,
+                                         &period, 2, 1) < 0)
+                        return -EINVAL;
+
+                rrq->flags = IW_POWER_PERIOD;
+                rrq->value = __le16_to_cpu(period) * 1024;
+        }
+
+        if (local->func->get_rid(dev, HFA384X_RID_CNFMULTICASTRECEIVE, &mcast,
+                                 2, 1) < 0)
+                return -EINVAL;
+
+        if (__le16_to_cpu(mcast))
+                rrq->flags |= IW_POWER_ALL_R;
+        else
+                rrq->flags |= IW_POWER_UNICAST_R;
+
+        return 0;
+#endif /* PRISM2_NO_STATION_MODES */
+}
+
+
+static int prism2_ioctl_siwretry(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *rrq, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (rrq->disabled)
+                return -EINVAL;
+
+        /* setting retry limits is not supported with the current station
+         * firmware code; simulate this with alternative retry count for now */
+        if (rrq->flags == IW_RETRY_LIMIT) {
+                if (rrq->value < 0) {
+                        /* disable manual retry count setting and use firmware
+                         * defaults */
+                        local->manual_retry_count = -1;
+                        local->tx_control &= ~HFA384X_TX_CTRL_ALT_RTRY;
+                } else {
+                        if (hostap_set_word(dev, HFA384X_RID_CNFALTRETRYCOUNT,
+                                            rrq->value)) {
+                                printk(KERN_DEBUG "%s: Alternate retry count "
+                                       "setting to %d failed\n",
+                                       dev->name, rrq->value);
+                                return -EOPNOTSUPP;
+                        }
+
+                        local->manual_retry_count = rrq->value;
+                        local->tx_control |= HFA384X_TX_CTRL_ALT_RTRY;
+                }
+                return 0;
+        }
+
+        return -EOPNOTSUPP;
+
+#if 0
+        /* what could be done, if firmware would support this.. */
+
+        if (rrq->flags & IW_RETRY_LIMIT) {
+                if (rrq->flags & IW_RETRY_MAX)
+                        HFA384X_RID_LONGRETRYLIMIT = rrq->value;
+                else if (rrq->flags & IW_RETRY_MIN)
+                        HFA384X_RID_SHORTRETRYLIMIT = rrq->value;
+                else {
+                        HFA384X_RID_LONGRETRYLIMIT = rrq->value;
+                        HFA384X_RID_SHORTRETRYLIMIT = rrq->value;
+                }
+
+        }
+
+        if (rrq->flags & IW_RETRY_LIFETIME) {
+                HFA384X_RID_MAXTRANSMITLIFETIME = rrq->value / 1024;
+        }
+
+        return 0;
+#endif /* 0 */
+}
+
+static int prism2_ioctl_giwretry(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *rrq, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 shortretry, longretry, lifetime, altretry;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->get_rid(dev, HFA384X_RID_SHORTRETRYLIMIT, &shortretry,
+                                 2, 1) < 0 ||
+            local->func->get_rid(dev, HFA384X_RID_LONGRETRYLIMIT, &longretry,
+                                 2, 1) < 0 ||
+            local->func->get_rid(dev, HFA384X_RID_MAXTRANSMITLIFETIME,
+                                 &lifetime, 2, 1) < 0)
+                return -EINVAL;
+
+        le16_to_cpus(&shortretry);
+        le16_to_cpus(&longretry);
+        le16_to_cpus(&lifetime);
+
+        rrq->disabled = 0;
+
+        if ((rrq->flags & IW_RETRY_TYPE) == IW_RETRY_LIFETIME) {
+                rrq->flags = IW_RETRY_LIFETIME;
+                rrq->value = lifetime * 1024;
+        } else {
+                if (local->manual_retry_count >= 0) {
+                        rrq->flags = IW_RETRY_LIMIT;
+                        if (local->func->get_rid(dev,
+                                                 HFA384X_RID_CNFALTRETRYCOUNT,
+                                                 &altretry, 2, 1) >= 0)
+                                rrq->value = le16_to_cpu(altretry);
+                        else
+                                rrq->value = local->manual_retry_count;
+                } else if ((rrq->flags & IW_RETRY_MAX)) {
+                        rrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
+                        rrq->value = longretry;
+                } else {
+                        rrq->flags = IW_RETRY_LIMIT;
+                        rrq->value = shortretry;
+                        if (shortretry != longretry)
+                                rrq->flags |= IW_RETRY_MIN;
+                }
+        }
+        return 0;
+}
+
+
+/* Note! This TX power controlling is experimental and should not be used in
+ * production use. It just sets raw power register and does not use any kind of
+ * feedback information from the measured TX power (CR58). This is now
+ * commented out to make sure that it is not used by accident. TX power
+ * configuration will be enabled again after proper algorithm using feedback
+ * has been implemented. */
+
+#ifdef RAW_TXPOWER_SETTING
+/* Map HFA386x's CR31 to and from dBm with some sort of ad hoc mapping..
+ * This version assumes following mapping:
+ * CR31 is 7-bit value with -64 to +63 range.
+ * -64 is mapped into +20dBm and +63 into -43dBm.
+ * This is certainly not an exact mapping for every card, but at least
+ * increasing dBm value should correspond to increasing TX power.
+ */
+
+static int prism2_txpower_hfa386x_to_dBm(u16 val)
+{
+        signed char tmp;
+
+        if (val > 255)
+                val = 255;
+
+        tmp = val;
+        tmp >>= 2;
+
+        return -12 - tmp;
+}
+
+static u16 prism2_txpower_dBm_to_hfa386x(int val)
+{
+        signed char tmp;
+
+        if (val > 20)
+                return 128;
+        else if (val < -43)
+                return 127;
+
+        tmp = val;
+        tmp = -12 - tmp;
+        tmp <<= 2;
+
+        return (unsigned char) tmp;
+}
+#endif /* RAW_TXPOWER_SETTING */
+
+
+static int prism2_ioctl_siwtxpow(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *rrq, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+#ifdef RAW_TXPOWER_SETTING
+        char *tmp;
+#endif
+        u16 val;
+        int ret = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (rrq->disabled) {
+                if (local->txpower_type != PRISM2_TXPOWER_OFF) {
+                        val = 0xff; /* use all standby and sleep modes */
+                        ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
+                                               HFA386X_CR_A_D_TEST_MODES2,
+                                               &val, NULL);
+                        printk(KERN_DEBUG "%s: Turning radio off: %s\n",
+                               dev->name, ret ? "failed" : "OK");
+                        local->txpower_type = PRISM2_TXPOWER_OFF;
+                }
+                return (ret ? -EOPNOTSUPP : 0);
+        }
+
+        if (local->txpower_type == PRISM2_TXPOWER_OFF) {
+                val = 0; /* disable all standby and sleep modes */
+                ret = local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
+                                       HFA386X_CR_A_D_TEST_MODES2, &val, NULL);
+                printk(KERN_DEBUG "%s: Turning radio on: %s\n",
+                       dev->name, ret ? "failed" : "OK");
+                local->txpower_type = PRISM2_TXPOWER_UNKNOWN;
+        }
+
+#ifdef RAW_TXPOWER_SETTING
+        if (!rrq->fixed && local->txpower_type != PRISM2_TXPOWER_AUTO) {
+                printk(KERN_DEBUG "Setting ALC on\n");
+                val = HFA384X_TEST_CFG_BIT_ALC;
+                local->func->cmd(dev, HFA384X_CMDCODE_TEST |
+                                 (HFA384X_TEST_CFG_BITS << 8), 1, &val, NULL);
+                local->txpower_type = PRISM2_TXPOWER_AUTO;
+                return 0;
+        }
+
+        if (local->txpower_type != PRISM2_TXPOWER_FIXED) {
+                printk(KERN_DEBUG "Setting ALC off\n");
+                val = HFA384X_TEST_CFG_BIT_ALC;
+                local->func->cmd(dev, HFA384X_CMDCODE_TEST |
+                                 (HFA384X_TEST_CFG_BITS << 8), 0, &val, NULL);
+                        local->txpower_type = PRISM2_TXPOWER_FIXED;
+        }
+
+        if (rrq->flags == IW_TXPOW_DBM)
+                tmp = "dBm";
+        else if (rrq->flags == IW_TXPOW_MWATT)
+                tmp = "mW";
+        else
+                tmp = "UNKNOWN";
+        printk(KERN_DEBUG "Setting TX power to %d %s\n", rrq->value, tmp);
+
+        if (rrq->flags != IW_TXPOW_DBM) {
+                printk("SIOCSIWTXPOW with mW is not supported; use dBm\n");
+                return -EOPNOTSUPP;
+        }
+
+        local->txpower = rrq->value;
+        val = prism2_txpower_dBm_to_hfa386x(local->txpower);
+        if (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF,
+                             HFA386X_CR_MANUAL_TX_POWER, &val, NULL))
+                ret = -EOPNOTSUPP;
+#else /* RAW_TXPOWER_SETTING */
+        if (rrq->fixed)
+                ret = -EOPNOTSUPP;
+#endif /* RAW_TXPOWER_SETTING */
+
+        return ret;
+}
+
+static int prism2_ioctl_giwtxpow(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_param *rrq, char *extra)
+{
+#ifdef RAW_TXPOWER_SETTING
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 resp0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        rrq->flags = IW_TXPOW_DBM;
+        rrq->disabled = 0;
+        rrq->fixed = 0;
+
+        if (local->txpower_type == PRISM2_TXPOWER_AUTO) {
+                if (local->func->cmd(dev, HFA384X_CMDCODE_READMIF,
+                                     HFA386X_CR_MANUAL_TX_POWER,
+                                     NULL, &resp0) == 0) {
+                        rrq->value = prism2_txpower_hfa386x_to_dBm(resp0);
+                } else {
+                        /* Could not get real txpower; guess 15 dBm */
+                        rrq->value = 15;
+                }
+        } else if (local->txpower_type == PRISM2_TXPOWER_OFF) {
+                rrq->value = 0;
+                rrq->disabled = 1;
+        } else if (local->txpower_type == PRISM2_TXPOWER_FIXED) {
+                rrq->value = local->txpower;
+                rrq->fixed = 1;
+        } else {
+                printk("SIOCGIWTXPOW - unknown txpower_type=%d\n",
+                       local->txpower_type);
+        }
+        return 0;
+#else /* RAW_TXPOWER_SETTING */
+        return -EOPNOTSUPP;
+#endif /* RAW_TXPOWER_SETTING */
+}
+
+
+#ifndef PRISM2_NO_STATION_MODES
+
+/* HostScan request works with and without host_roaming mode. In addition, it
+ * does not break current association. However, it requires newer station
+ * firmware version (>= 1.3.1) than scan request. */
+static int prism2_request_hostscan(struct net_device *dev,
+                                   u8 *ssid, u8 ssid_len)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hfa384x_hostscan_request scan_req;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        memset(&scan_req, 0, sizeof(scan_req));
+        scan_req.channel_list = cpu_to_le16(local->channel_mask &
+                                            local->scan_channel_mask);
+        scan_req.txrate = __constant_cpu_to_le16(HFA384X_RATES_1MBPS);
+        if (ssid) {
+                if (ssid_len > 32)
+                        return -EINVAL;
+                scan_req.target_ssid_len = cpu_to_le16(ssid_len);
+                memcpy(scan_req.target_ssid, ssid, ssid_len);
+        }
+
+        if (local->func->set_rid(dev, HFA384X_RID_HOSTSCAN, &scan_req,
+                                 sizeof(scan_req))) {
+                printk(KERN_DEBUG "%s: HOSTSCAN failed\n", dev->name);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+
+static int prism2_request_scan(struct net_device *dev)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        struct hfa384x_scan_request scan_req;
+        int ret = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        memset(&scan_req, 0, sizeof(scan_req));
+        scan_req.channel_list = cpu_to_le16(local->channel_mask &
+                                            local->scan_channel_mask);
+        scan_req.txrate = __constant_cpu_to_le16(HFA384X_RATES_1MBPS);
+
+        /* FIX:
+         * It seems to be enough to set roaming mode for a short moment to
+         * host-based and then setup scanrequest data and return the mode to
+         * firmware-based.
+         *
+         * Master mode would need to drop to Managed mode for a short while
+         * to make scanning work.. Or sweep through the different channels and
+         * use passive scan based on beacons. */
+
+        if (!local->host_roaming)
+                hostap_set_word(dev, HFA384X_RID_CNFROAMINGMODE,
+                                HFA384X_ROAMING_HOST);
+
+        if (local->func->set_rid(dev, HFA384X_RID_SCANREQUEST, &scan_req,
+                                 sizeof(scan_req))) {
+                printk(KERN_DEBUG "SCANREQUEST failed\n");
+                ret = -EINVAL;
+        }
+
+        if (!local->host_roaming)
+                hostap_set_word(dev, HFA384X_RID_CNFROAMINGMODE,
+                                HFA384X_ROAMING_FIRMWARE);
+
+        return 0;
+}
+
+#else /* !PRISM2_NO_STATION_MODES */
+
+static inline int prism2_request_hostscan(struct net_device *dev,
+                                          u8 *ssid, u8 ssid_len)
+{
+        return -EOPNOTSUPP;
+}
+
+
+static inline int prism2_request_scan(struct net_device *dev)
+{
+        return -EOPNOTSUPP;
+}
+
+#endif /* !PRISM2_NO_STATION_MODES */
+
+
+static int prism2_ioctl_siwscan(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_point *data, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret;
+        u8 *ssid = NULL, ssid_len = 0;
+        struct iw_scan_req *req = (struct iw_scan_req *) extra;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (data->length < sizeof(struct iw_scan_req))
+                req = NULL;
+
+        if (local->iw_mode == IW_MODE_MASTER) {
+                /* In master mode, we just return the results of our local
+                 * tables, so we don't need to start anything...
+                 * Jean II */
+                data->length = 0;
+                return 0;
+        }
+
+        if (!local->dev_enabled)
+                return -ENETDOWN;
+
+        if (req && data->flags & IW_SCAN_THIS_ESSID) {
+                ssid = req->essid;
+                ssid_len = req->essid_len;
+
+                if (ssid_len &&
+                    ((local->iw_mode != IW_MODE_INFRA &&
+                      local->iw_mode != IW_MODE_ADHOC) ||
+                     (local->sta_fw_ver < PRISM2_FW_VER(1,3,1))))
+                        return -EOPNOTSUPP;
+        }
+
+        if (local->sta_fw_ver >= PRISM2_FW_VER(1,3,1))
+                ret = prism2_request_hostscan(dev, ssid, ssid_len);
+        else
+                ret = prism2_request_scan(dev);
+
+        if (ret == 0)
+                local->scan_timestamp = jiffies;
+
+        /* Could inquire F101, F103 or wait for SIOCGIWSCAN and read RID */
+
+        return ret;
+}
+
+
+#ifndef PRISM2_NO_STATION_MODES
+static char * __prism2_translate_scan(local_info_t *local,
+                                      struct hfa384x_hostscan_result *scan,
+                                      struct hostap_bss_info *bss,
+                                      char *current_ev, char *end_buf)
+{
+        int i, chan;
+        struct iw_event iwe;
+        char *current_val;
+        u16 capabilities;
+        u8 *pos;
+        u8 *ssid, *bssid;
+        size_t ssid_len;
+        char *buf;
+
+        if (bss) {
+                ssid = bss->ssid;
+                ssid_len = bss->ssid_len;
+                bssid = bss->bssid;
+        } else {
+                ssid = scan->ssid;
+                ssid_len = le16_to_cpu(scan->ssid_len);
+                bssid = scan->bssid;
+        }
+        if (ssid_len > 32)
+                ssid_len = 32;
+
+        /* First entry *MUST* be the AP MAC address */
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWAP;
+        iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
+        memcpy(iwe.u.ap_addr.sa_data, bssid, ETH_ALEN);
+        /* FIX:
+         * I do not know how this is possible, but iwe_stream_add_event
+         * seems to re-order memcpy execution so that len is set only
+         * after copying.. Pre-setting len here "fixes" this, but real
+         * problems should be solved (after which these iwe.len
+         * settings could be removed from this function). */
+        iwe.len = IW_EV_ADDR_LEN;
+        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                          IW_EV_ADDR_LEN);
+
+        /* Other entries will be displayed in the order we give them */
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWESSID;
+        iwe.u.data.length = ssid_len;
+        iwe.u.data.flags = 1;
+        iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, ssid);
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWMODE;
+        if (bss) {
+                capabilities = bss->capab_info;
+        } else {
+                capabilities = le16_to_cpu(scan->capability);
+        }
+        if (capabilities & (WLAN_CAPABILITY_ESS |
+                            WLAN_CAPABILITY_IBSS)) {
+                if (capabilities & WLAN_CAPABILITY_ESS)
+                        iwe.u.mode = IW_MODE_MASTER;
+                else
+                        iwe.u.mode = IW_MODE_ADHOC;
+                iwe.len = IW_EV_UINT_LEN;
+                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                                  IW_EV_UINT_LEN);
+        }
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWFREQ;
+        if (scan) {
+                chan = scan->chid;
+        } else if (bss) {
+                chan = bss->chan;
+        } else {
+                chan = 0;
+        }
+
+        if (chan > 0) {
+                iwe.u.freq.m = freq_list[le16_to_cpu(chan - 1)] * 100000;
+                iwe.u.freq.e = 1;
+                iwe.len = IW_EV_FREQ_LEN;
+                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                                  IW_EV_FREQ_LEN);
+        }
+
+        if (scan) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVQUAL;
+                if (local->last_scan_type == PRISM2_HOSTSCAN) {
+                        iwe.u.qual.level = le16_to_cpu(scan->sl);
+                        iwe.u.qual.noise = le16_to_cpu(scan->anl);
+                } else {
+                        iwe.u.qual.level =
+                                HFA384X_LEVEL_TO_dBm(le16_to_cpu(scan->sl));
+                        iwe.u.qual.noise =
+                                HFA384X_LEVEL_TO_dBm(le16_to_cpu(scan->anl));
+                }
+                iwe.len = IW_EV_QUAL_LEN;
+                current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
+                                                  IW_EV_QUAL_LEN);
+        }
+
+        memset(&iwe, 0, sizeof(iwe));
+        iwe.cmd = SIOCGIWENCODE;
+        if (capabilities & WLAN_CAPABILITY_PRIVACY)
+                iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
+        else
+                iwe.u.data.flags = IW_ENCODE_DISABLED;
+        iwe.u.data.length = 0;
+        iwe.len = IW_EV_POINT_LEN + iwe.u.data.length;
+        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
+
+        /* TODO: add SuppRates into BSS table */
+        if (scan) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = SIOCGIWRATE;
+                current_val = current_ev + IW_EV_LCP_LEN;
+                pos = scan->sup_rates;
+                for (i = 0; i < sizeof(scan->sup_rates); i++) {
+                        if (pos[i] == 0)
+                                break;
+                        /* Bit rate given in 500 kb/s units (+ 0x80) */
+                        iwe.u.bitrate.value = ((pos[i] & 0x7f) * 500000);
+                        current_val = iwe_stream_add_value(
+                                current_ev, current_val, end_buf, &iwe,
+                                IW_EV_PARAM_LEN);
+                }
+                /* Check if we added any event */
+                if ((current_val - current_ev) > IW_EV_LCP_LEN)
+                        current_ev = current_val;
+        }
+
+        /* TODO: add BeaconInt,resp_rate,atim into BSS table */
+        buf = kmalloc(MAX_WPA_IE_LEN * 2 + 30, GFP_KERNEL);
+        if (buf && scan) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVCUSTOM;
+                sprintf(buf, "bcn_int=%d", le16_to_cpu(scan->beacon_interval));
+                iwe.u.data.length = strlen(buf);
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  buf);
+
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVCUSTOM;
+                sprintf(buf, "resp_rate=%d", le16_to_cpu(scan->rate));
+                iwe.u.data.length = strlen(buf);
+                current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+                                                  buf);
+
+                if (local->last_scan_type == PRISM2_HOSTSCAN &&
+                    (capabilities & WLAN_CAPABILITY_IBSS)) {
+                        memset(&iwe, 0, sizeof(iwe));
+                        iwe.cmd = IWEVCUSTOM;
+                        sprintf(buf, "atim=%d", le16_to_cpu(scan->atim));
+                        iwe.u.data.length = strlen(buf);
+                        current_ev = iwe_stream_add_point(current_ev, end_buf,
+                                                          &iwe, buf);
+                }
+        }
+        kfree(buf);
+
+        if (bss && bss->wpa_ie_len > 0 && bss->wpa_ie_len <= MAX_WPA_IE_LEN) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVGENIE;
+                iwe.u.data.length = bss->wpa_ie_len;
+                current_ev = iwe_stream_add_point(
+                        current_ev, end_buf, &iwe, bss->wpa_ie);
+        }
+
+        if (bss && bss->rsn_ie_len > 0 && bss->rsn_ie_len <= MAX_WPA_IE_LEN) {
+                memset(&iwe, 0, sizeof(iwe));
+                iwe.cmd = IWEVGENIE;
+                iwe.u.data.length = bss->rsn_ie_len;
+                current_ev = iwe_stream_add_point(
+                        current_ev, end_buf, &iwe, bss->rsn_ie);
+        }
+
+        return current_ev;
+}
+
+
+/* Translate scan data returned from the card to a card independant
+ * format that the Wireless Tools will understand - Jean II */
+static inline int prism2_translate_scan(local_info_t *local,
+                                        char *buffer, int buflen)
+{
+        struct hfa384x_hostscan_result *scan;
+        int entry, hostscan;
+        char *current_ev = buffer;
+        char *end_buf = buffer + buflen;
+        struct list_head *ptr;
+
+        spin_lock_bh(&local->lock);
+
+        list_for_each(ptr, &local->bss_list) {
+                struct hostap_bss_info *bss;
+                bss = list_entry(ptr, struct hostap_bss_info, list);
+                bss->included = 0;
+        }
+
+        hostscan = local->last_scan_type == PRISM2_HOSTSCAN;
+        for (entry = 0; entry < local->last_scan_results_count; entry++) {
+                int found = 0;
+                scan = &local->last_scan_results[entry];
+
+                /* Report every SSID if the AP is using multiple SSIDs. If no
+                 * BSS record is found (e.g., when WPA mode is disabled),
+                 * report the AP once. */
+                list_for_each(ptr, &local->bss_list) {
+                        struct hostap_bss_info *bss;
+                        bss = list_entry(ptr, struct hostap_bss_info, list);
+                        if (memcmp(bss->bssid, scan->bssid, ETH_ALEN) == 0) {
+                                bss->included = 1;
+                                current_ev = __prism2_translate_scan(
+                                        local, scan, bss, current_ev, end_buf);
+                                found++;
+                        }
+                }
+                if (!found) {
+                        current_ev = __prism2_translate_scan(
+                                local, scan, NULL, current_ev, end_buf);
+                }
+                /* Check if there is space for one more entry */
+                if ((end_buf - current_ev) <= IW_EV_ADDR_LEN) {
+                        /* Ask user space to try again with a bigger buffer */
+                        spin_unlock_bh(&local->lock);
+                        return -E2BIG;
+                }
+        }
+
+        /* Prism2 firmware has limits (32 at least in some versions) for number
+         * of BSSes in scan results. Extend this limit by using local BSS list.
+         */
+        list_for_each(ptr, &local->bss_list) {
+                struct hostap_bss_info *bss;
+                bss = list_entry(ptr, struct hostap_bss_info, list);
+                if (bss->included)
+                        continue;
+                current_ev = __prism2_translate_scan(local, NULL, bss,
+                                                     current_ev, end_buf);
+                /* Check if there is space for one more entry */
+                if ((end_buf - current_ev) <= IW_EV_ADDR_LEN) {
+                        /* Ask user space to try again with a bigger buffer */
+                        spin_unlock_bh(&local->lock);
+                        return -E2BIG;
+                }
+        }
+
+        spin_unlock_bh(&local->lock);
+
+        return current_ev - buffer;
+}
+#endif /* PRISM2_NO_STATION_MODES */
+
+
+static inline int prism2_ioctl_giwscan_sta(struct net_device *dev,
+                                           struct iw_request_info *info,
+                                           struct iw_point *data, char *extra)
+{
+#ifdef PRISM2_NO_STATION_MODES
+        return -EOPNOTSUPP;
+#else /* PRISM2_NO_STATION_MODES */
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int res;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        /* Wait until the scan is finished. We can probably do better
+         * than that - Jean II */
+        if (local->scan_timestamp &&
+            time_before(jiffies, local->scan_timestamp + 3 * HZ)) {
+                /* Important note : we don't want to block the caller
+                 * until results are ready for various reasons.
+                 * First, managing wait queues is complex and racy
+                 * (there may be multiple simultaneous callers).
+                 * Second, we grab some rtnetlink lock before comming
+                 * here (in dev_ioctl()).
+                 * Third, the caller can wait on the Wireless Event
+                 * - Jean II */
+                return -EAGAIN;
+        }
+        local->scan_timestamp = 0;
+
+        res = prism2_translate_scan(local, extra, data->length);
+
+        if (res >= 0) {
+                data->length = res;
+                return 0;
+        } else {
+                data->length = 0;
+                return res;
+        }
+#endif /* PRISM2_NO_STATION_MODES */
+}
+
+
+static int prism2_ioctl_giwscan(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_point *data, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int res;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->iw_mode == IW_MODE_MASTER) {
+                /* In MASTER mode, it doesn't make sense to go around
+                 * scanning the frequencies and make the stations we serve
+                 * wait when what the user is really interested about is the
+                 * list of stations and access points we are talking to.
+                 * So, just extract results from our cache...
+                 * Jean II */
+
+                /* Translate to WE format */
+                res = prism2_ap_translate_scan(dev, extra);
+                if (res >= 0) {
+                        printk(KERN_DEBUG "Scan result translation succeeded "
+                               "(length=%d)\n", res);
+                        data->length = res;
+                        return 0;
+                } else {
+                        printk(KERN_DEBUG
+                               "Scan result translation failed (res=%d)\n",
+                               res);
+                        data->length = 0;
+                        return res;
+                }
+        } else {
+                /* Station mode */
+                return prism2_ioctl_giwscan_sta(dev, info, data, extra);
+        }
+}
+
+
+static const struct iw_priv_args prism2_priv[] = {
+        { PRISM2_IOCTL_MONITOR,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "monitor" },
+        { PRISM2_IOCTL_READMIF,
+          IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1,
+          IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "readmif" },
+        { PRISM2_IOCTL_WRITEMIF,
+          IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 2, 0, "writemif" },
+        { PRISM2_IOCTL_RESET,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "reset" },
+        { PRISM2_IOCTL_INQUIRE,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "inquire" },
+        { PRISM2_IOCTL_SET_RID_WORD,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "set_rid_word" },
+        { PRISM2_IOCTL_MACCMD,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "maccmd" },
+        { PRISM2_IOCTL_WDS_ADD,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "wds_add" },
+        { PRISM2_IOCTL_WDS_DEL,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "wds_del" },
+        { PRISM2_IOCTL_ADDMAC,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "addmac" },
+        { PRISM2_IOCTL_DELMAC,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "delmac" },
+        { PRISM2_IOCTL_KICKMAC,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "kickmac" },
+        /* --- raw access to sub-ioctls --- */
+        { PRISM2_IOCTL_PRISM2_PARAM,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "prism2_param" },
+        { PRISM2_IOCTL_GET_PRISM2_PARAM,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getprism2_param" },
+        /* --- sub-ioctls handlers --- */
+        { PRISM2_IOCTL_PRISM2_PARAM,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "" },
+        { PRISM2_IOCTL_GET_PRISM2_PARAM,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "" },
+        /* --- sub-ioctls definitions --- */
+        { PRISM2_PARAM_TXRATECTRL,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "txratectrl" },
+        { PRISM2_PARAM_TXRATECTRL,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gettxratectrl" },
+        { PRISM2_PARAM_BEACON_INT,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "beacon_int" },
+        { PRISM2_PARAM_BEACON_INT,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbeacon_int" },
+#ifndef PRISM2_NO_STATION_MODES
+        { PRISM2_PARAM_PSEUDO_IBSS,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "pseudo_ibss" },
+        { PRISM2_PARAM_PSEUDO_IBSS,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getpseudo_ibss" },
+#endif /* PRISM2_NO_STATION_MODES */
+        { PRISM2_PARAM_ALC,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "alc" },
+        { PRISM2_PARAM_ALC,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getalc" },
+        { PRISM2_PARAM_DUMP,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "dump" },
+        { PRISM2_PARAM_DUMP,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getdump" },
+        { PRISM2_PARAM_OTHER_AP_POLICY,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "other_ap_policy" },
+        { PRISM2_PARAM_OTHER_AP_POLICY,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getother_ap_pol" },
+        { PRISM2_PARAM_AP_MAX_INACTIVITY,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "max_inactivity" },
+        { PRISM2_PARAM_AP_MAX_INACTIVITY,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getmax_inactivi" },
+        { PRISM2_PARAM_AP_BRIDGE_PACKETS,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "bridge_packets" },
+        { PRISM2_PARAM_AP_BRIDGE_PACKETS,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbridge_packe" },
+        { PRISM2_PARAM_DTIM_PERIOD,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "dtim_period" },
+        { PRISM2_PARAM_DTIM_PERIOD,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getdtim_period" },
+        { PRISM2_PARAM_AP_NULLFUNC_ACK,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "nullfunc_ack" },
+        { PRISM2_PARAM_AP_NULLFUNC_ACK,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getnullfunc_ack" },
+        { PRISM2_PARAM_MAX_WDS,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "max_wds" },
+        { PRISM2_PARAM_MAX_WDS,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getmax_wds" },
+        { PRISM2_PARAM_AP_AUTOM_AP_WDS,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "autom_ap_wds" },
+        { PRISM2_PARAM_AP_AUTOM_AP_WDS,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getautom_ap_wds" },
+        { PRISM2_PARAM_AP_AUTH_ALGS,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "ap_auth_algs" },
+        { PRISM2_PARAM_AP_AUTH_ALGS,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getap_auth_algs" },
+        { PRISM2_PARAM_MONITOR_ALLOW_FCSERR,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "allow_fcserr" },
+        { PRISM2_PARAM_MONITOR_ALLOW_FCSERR,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getallow_fcserr" },
+        { PRISM2_PARAM_HOST_ENCRYPT,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_encrypt" },
+        { PRISM2_PARAM_HOST_ENCRYPT,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_encrypt" },
+        { PRISM2_PARAM_HOST_DECRYPT,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_decrypt" },
+        { PRISM2_PARAM_HOST_DECRYPT,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_decrypt" },
+#ifndef PRISM2_NO_STATION_MODES
+        { PRISM2_PARAM_HOST_ROAMING,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "host_roaming" },
+        { PRISM2_PARAM_HOST_ROAMING,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethost_roaming" },
+#endif /* PRISM2_NO_STATION_MODES */
+        { PRISM2_PARAM_BCRX_STA_KEY,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "bcrx_sta_key" },
+        { PRISM2_PARAM_BCRX_STA_KEY,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbcrx_sta_key" },
+        { PRISM2_PARAM_IEEE_802_1X,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "ieee_802_1x" },
+        { PRISM2_PARAM_IEEE_802_1X,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getieee_802_1x" },
+        { PRISM2_PARAM_ANTSEL_TX,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "antsel_tx" },
+        { PRISM2_PARAM_ANTSEL_TX,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getantsel_tx" },
+        { PRISM2_PARAM_ANTSEL_RX,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "antsel_rx" },
+        { PRISM2_PARAM_ANTSEL_RX,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getantsel_rx" },
+        { PRISM2_PARAM_MONITOR_TYPE,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "monitor_type" },
+        { PRISM2_PARAM_MONITOR_TYPE,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getmonitor_type" },
+        { PRISM2_PARAM_WDS_TYPE,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wds_type" },
+        { PRISM2_PARAM_WDS_TYPE,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getwds_type" },
+        { PRISM2_PARAM_HOSTSCAN,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "hostscan" },
+        { PRISM2_PARAM_HOSTSCAN,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethostscan" },
+        { PRISM2_PARAM_AP_SCAN,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "ap_scan" },
+        { PRISM2_PARAM_AP_SCAN,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getap_scan" },
+        { PRISM2_PARAM_ENH_SEC,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "enh_sec" },
+        { PRISM2_PARAM_ENH_SEC,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getenh_sec" },
+#ifdef PRISM2_IO_DEBUG
+        { PRISM2_PARAM_IO_DEBUG,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "io_debug" },
+        { PRISM2_PARAM_IO_DEBUG,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getio_debug" },
+#endif /* PRISM2_IO_DEBUG */
+        { PRISM2_PARAM_BASIC_RATES,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "basic_rates" },
+        { PRISM2_PARAM_BASIC_RATES,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getbasic_rates" },
+        { PRISM2_PARAM_OPER_RATES,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "oper_rates" },
+        { PRISM2_PARAM_OPER_RATES,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getoper_rates" },
+        { PRISM2_PARAM_HOSTAPD,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "hostapd" },
+        { PRISM2_PARAM_HOSTAPD,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethostapd" },
+        { PRISM2_PARAM_HOSTAPD_STA,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "hostapd_sta" },
+        { PRISM2_PARAM_HOSTAPD_STA,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gethostapd_sta" },
+        { PRISM2_PARAM_WPA,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wpa" },
+        { PRISM2_PARAM_WPA,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getwpa" },
+        { PRISM2_PARAM_PRIVACY_INVOKED,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "privacy_invoked" },
+        { PRISM2_PARAM_PRIVACY_INVOKED,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getprivacy_invo" },
+        { PRISM2_PARAM_TKIP_COUNTERMEASURES,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "tkip_countermea" },
+        { PRISM2_PARAM_TKIP_COUNTERMEASURES,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "gettkip_counter" },
+        { PRISM2_PARAM_DROP_UNENCRYPTED,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "drop_unencrypte" },
+        { PRISM2_PARAM_DROP_UNENCRYPTED,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getdrop_unencry" },
+        { PRISM2_PARAM_SCAN_CHANNEL_MASK,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "scan_channels" },
+        { PRISM2_PARAM_SCAN_CHANNEL_MASK,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "getscan_channel" },
+};
+
+
+static int prism2_ioctl_priv_inquire(struct net_device *dev, int *i)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->cmd(dev, HFA384X_CMDCODE_INQUIRE, *i, NULL, NULL))
+                return -EOPNOTSUPP;
+
+        return 0;
+}
+
+
+static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
+                                          struct iw_request_info *info,
+                                          void *wrqu, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int *i = (int *) extra;
+        int param = *i;
+        int value = *(i + 1);
+        int ret = 0;
+        u16 val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        switch (param) {
+        case PRISM2_PARAM_TXRATECTRL:
+                local->fw_tx_rate_control = value;
+                break;
+
+        case PRISM2_PARAM_BEACON_INT:
+                if (hostap_set_word(dev, HFA384X_RID_CNFBEACONINT, value) ||
+                    local->func->reset_port(dev))
+                        ret = -EINVAL;
+                else
+                        local->beacon_int = value;
+                break;
+
+#ifndef PRISM2_NO_STATION_MODES
+        case PRISM2_PARAM_PSEUDO_IBSS:
+                if (value == local->pseudo_adhoc)
+                        break;
+
+                if (value != 0 && value != 1) {
+                        ret = -EINVAL;
+                        break;
+                }
+
+                printk(KERN_DEBUG "prism2: %s: pseudo IBSS change %d -> %d\n",
+                       dev->name, local->pseudo_adhoc, value);
+                local->pseudo_adhoc = value;
+                if (local->iw_mode != IW_MODE_ADHOC)
+                        break;
+
+                if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,
+                                    hostap_get_porttype(local))) {
+                        ret = -EOPNOTSUPP;
+                        break;
+                }
+
+                if (local->func->reset_port(dev))
+                        ret = -EINVAL;
+                break;
+#endif /* PRISM2_NO_STATION_MODES */
+
+        case PRISM2_PARAM_ALC:
+                printk(KERN_DEBUG "%s: %s ALC\n", dev->name,
+                       value == 0 ? "Disabling" : "Enabling");
+                val = HFA384X_TEST_CFG_BIT_ALC;
+                local->func->cmd(dev, HFA384X_CMDCODE_TEST |
+                                 (HFA384X_TEST_CFG_BITS << 8),
+                                 value == 0 ? 0 : 1, &val, NULL);
+                break;
+
+        case PRISM2_PARAM_DUMP:
+                local->frame_dump = value;
+                break;
+
+        case PRISM2_PARAM_OTHER_AP_POLICY:
+                if (value < 0 || value > 3) {
+                        ret = -EINVAL;
+                        break;
+                }
+                if (local->ap != NULL)
+                        local->ap->ap_policy = value;
+                break;
+
+        case PRISM2_PARAM_AP_MAX_INACTIVITY:
+                if (value < 0 || value > 7 * 24 * 60 * 60) {
+                        ret = -EINVAL;
+                        break;
+                }
+                if (local->ap != NULL)
+                        local->ap->max_inactivity = value * HZ;
+                break;
+
+        case PRISM2_PARAM_AP_BRIDGE_PACKETS:
+                if (local->ap != NULL)
+                        local->ap->bridge_packets = value;
+                break;
+
+        case PRISM2_PARAM_DTIM_PERIOD:
+                if (value < 0 || value > 65535) {
+                        ret = -EINVAL;
+                        break;
+                }
+                if (hostap_set_word(dev, HFA384X_RID_CNFOWNDTIMPERIOD, value)
+                    || local->func->reset_port(dev))
+                        ret = -EINVAL;
+                else
+                        local->dtim_period = value;
+                break;
+
+        case PRISM2_PARAM_AP_NULLFUNC_ACK:
+                if (local->ap != NULL)
+                        local->ap->nullfunc_ack = value;
+                break;
+
+        case PRISM2_PARAM_MAX_WDS:
+                local->wds_max_connections = value;
+                break;
+
+        case PRISM2_PARAM_AP_AUTOM_AP_WDS:
+                if (local->ap != NULL) {
+                        if (!local->ap->autom_ap_wds && value) {
+                                /* add WDS link to all APs in STA table */
+                                hostap_add_wds_links(local);
+                        }
+                        local->ap->autom_ap_wds = value;
+                }
+                break;
+
+        case PRISM2_PARAM_AP_AUTH_ALGS:
+                local->auth_algs = value;
+                if (hostap_set_auth_algs(local))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_MONITOR_ALLOW_FCSERR:
+                local->monitor_allow_fcserr = value;
+                break;
+
+        case PRISM2_PARAM_HOST_ENCRYPT:
+                local->host_encrypt = value;
+                if (hostap_set_encryption(local) ||
+                    local->func->reset_port(dev))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_HOST_DECRYPT:
+                local->host_decrypt = value;
+                if (hostap_set_encryption(local) ||
+                    local->func->reset_port(dev))
+                        ret = -EINVAL;
+                break;
+
+#ifndef PRISM2_NO_STATION_MODES
+        case PRISM2_PARAM_HOST_ROAMING:
+                if (value < 0 || value > 2) {
+                        ret = -EINVAL;
+                        break;
+                }
+                local->host_roaming = value;
+                if (hostap_set_roaming(local) || local->func->reset_port(dev))
+                        ret = -EINVAL;
+                break;
+#endif /* PRISM2_NO_STATION_MODES */
+
+        case PRISM2_PARAM_BCRX_STA_KEY:
+                local->bcrx_sta_key = value;
+                break;
+
+        case PRISM2_PARAM_IEEE_802_1X:
+                local->ieee_802_1x = value;
+                break;
+
+        case PRISM2_PARAM_ANTSEL_TX:
+                if (value < 0 || value > HOSTAP_ANTSEL_HIGH) {
+                        ret = -EINVAL;
+                        break;
+                }
+                local->antsel_tx = value;
+                hostap_set_antsel(local);
+                break;
+
+        case PRISM2_PARAM_ANTSEL_RX:
+                if (value < 0 || value > HOSTAP_ANTSEL_HIGH) {
+                        ret = -EINVAL;
+                        break;
+                }
+                local->antsel_rx = value;
+                hostap_set_antsel(local);
+                break;
+
+        case PRISM2_PARAM_MONITOR_TYPE:
+                if (value != PRISM2_MONITOR_80211 &&
+                    value != PRISM2_MONITOR_CAPHDR &&
+                    value != PRISM2_MONITOR_PRISM) {
+                        ret = -EINVAL;
+                        break;
+                }
+                local->monitor_type = value;
+                if (local->iw_mode == IW_MODE_MONITOR)
+                        hostap_monitor_set_type(local);
+                break;
+
+        case PRISM2_PARAM_WDS_TYPE:
+                local->wds_type = value;
+                break;
+
+        case PRISM2_PARAM_HOSTSCAN:
+        {
+                struct hfa384x_hostscan_request scan_req;
+                u16 rate;
+
+                memset(&scan_req, 0, sizeof(scan_req));
+                scan_req.channel_list = __constant_cpu_to_le16(0x3fff);
+                switch (value) {
+                case 1: rate = HFA384X_RATES_1MBPS; break;
+                case 2: rate = HFA384X_RATES_2MBPS; break;
+                case 3: rate = HFA384X_RATES_5MBPS; break;
+                case 4: rate = HFA384X_RATES_11MBPS; break;
+                default: rate = HFA384X_RATES_1MBPS; break;
+                }
+                scan_req.txrate = cpu_to_le16(rate);
+                /* leave SSID empty to accept all SSIDs */
+
+                if (local->iw_mode == IW_MODE_MASTER) {
+                        if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,
+                                            HFA384X_PORTTYPE_BSS) ||
+                            local->func->reset_port(dev))
+                                printk(KERN_DEBUG "Leaving Host AP mode "
+                                       "for HostScan failed\n");
+                }
+
+                if (local->func->set_rid(dev, HFA384X_RID_HOSTSCAN, &scan_req,
+                                         sizeof(scan_req))) {
+                        printk(KERN_DEBUG "HOSTSCAN failed\n");
+                        ret = -EINVAL;
+                }
+                if (local->iw_mode == IW_MODE_MASTER) {
+                        wait_queue_t __wait;
+                        init_waitqueue_entry(&__wait, current);
+                        add_wait_queue(&local->hostscan_wq, &__wait);
+                        set_current_state(TASK_INTERRUPTIBLE);
+                        schedule_timeout(HZ);
+                        if (signal_pending(current))
+                                ret = -EINTR;
+                        set_current_state(TASK_RUNNING);
+                        remove_wait_queue(&local->hostscan_wq, &__wait);
+
+                        if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,
+                                            HFA384X_PORTTYPE_HOSTAP) ||
+                            local->func->reset_port(dev))
+                                printk(KERN_DEBUG "Returning to Host AP mode "
+                                       "after HostScan failed\n");
+                }
+                break;
+        }
+
+        case PRISM2_PARAM_AP_SCAN:
+                local->passive_scan_interval = value;
+                if (timer_pending(&local->passive_scan_timer))
+                        del_timer(&local->passive_scan_timer);
+                if (value > 0) {
+                        local->passive_scan_timer.expires = jiffies +
+                                local->passive_scan_interval * HZ;
+                        add_timer(&local->passive_scan_timer);
+                }
+                break;
+
+        case PRISM2_PARAM_ENH_SEC:
+                if (value < 0 || value > 3) {
+                        ret = -EINVAL;
+                        break;
+                }
+                local->enh_sec = value;
+                if (hostap_set_word(dev, HFA384X_RID_CNFENHSECURITY,
+                                    local->enh_sec) ||
+                    local->func->reset_port(dev)) {
+                        printk(KERN_INFO "%s: cnfEnhSecurity requires STA f/w "
+                               "1.6.3 or newer\n", dev->name);
+                        ret = -EOPNOTSUPP;
+                }
+                break;
+
+#ifdef PRISM2_IO_DEBUG
+        case PRISM2_PARAM_IO_DEBUG:
+                local->io_debug_enabled = value;
+                break;
+#endif /* PRISM2_IO_DEBUG */
+
+        case PRISM2_PARAM_BASIC_RATES:
+                if ((value & local->tx_rate_control) != value || value == 0) {
+                        printk(KERN_INFO "%s: invalid basic rate set - basic "
+                               "rates must be in supported rate set\n",
+                               dev->name);
+                        ret = -EINVAL;
+                        break;
+                }
+                local->basic_rates = value;
+                if (hostap_set_word(dev, HFA384X_RID_CNFBASICRATES,
+                                    local->basic_rates) ||
+                    local->func->reset_port(dev))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_OPER_RATES:
+                local->tx_rate_control = value;
+                if (hostap_set_rate(dev))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_HOSTAPD:
+                ret = hostap_set_hostapd(local, value, 1);
+                break;
+
+        case PRISM2_PARAM_HOSTAPD_STA:
+                ret = hostap_set_hostapd_sta(local, value, 1);
+                break;
+
+        case PRISM2_PARAM_WPA:
+                local->wpa = value;
+                if (local->sta_fw_ver < PRISM2_FW_VER(1,7,0))
+                        ret = -EOPNOTSUPP;
+                else if (hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE,
+                                         value ? 1 : 0))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_PRIVACY_INVOKED:
+                local->privacy_invoked = value;
+                if (hostap_set_encryption(local) ||
+                    local->func->reset_port(dev))
+                        ret = -EINVAL;
+                break;
+
+        case PRISM2_PARAM_TKIP_COUNTERMEASURES:
+                local->tkip_countermeasures = value;
+                break;
+
+        case PRISM2_PARAM_DROP_UNENCRYPTED:
+                local->drop_unencrypted = value;
+                break;
+
+        case PRISM2_PARAM_SCAN_CHANNEL_MASK:
+                local->scan_channel_mask = value;
+                break;
+
+        default:
+                printk(KERN_DEBUG "%s: prism2_param: unknown param %d\n",
+                       dev->name, param);
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
+
+static int prism2_ioctl_priv_get_prism2_param(struct net_device *dev,
+                                              struct iw_request_info *info,
+                                              void *wrqu, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int *param = (int *) extra;
+        int ret = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        switch (*param) {
+        case PRISM2_PARAM_TXRATECTRL:
+                *param = local->fw_tx_rate_control;
+                break;
+
+        case PRISM2_PARAM_BEACON_INT:
+                *param = local->beacon_int;
+                break;
+
+        case PRISM2_PARAM_PSEUDO_IBSS:
+                *param = local->pseudo_adhoc;
+                break;
+
+        case PRISM2_PARAM_ALC:
+                ret = -EOPNOTSUPP; /* FIX */
+                break;
+
+        case PRISM2_PARAM_DUMP:
+                *param = local->frame_dump;
+                break;
+
+        case PRISM2_PARAM_OTHER_AP_POLICY:
+                if (local->ap != NULL)
+                        *param = local->ap->ap_policy;
+                else
+                        ret = -EOPNOTSUPP;
+                break;
+
+        case PRISM2_PARAM_AP_MAX_INACTIVITY:
+                if (local->ap != NULL)
+                        *param = local->ap->max_inactivity / HZ;
+                else
+                        ret = -EOPNOTSUPP;
+                break;
+
+        case PRISM2_PARAM_AP_BRIDGE_PACKETS:
+                if (local->ap != NULL)
+                        *param = local->ap->bridge_packets;
+                else
+                        ret = -EOPNOTSUPP;
+                break;
+
+        case PRISM2_PARAM_DTIM_PERIOD:
+                *param = local->dtim_period;
+                break;
+
+        case PRISM2_PARAM_AP_NULLFUNC_ACK:
+                if (local->ap != NULL)
+                        *param = local->ap->nullfunc_ack;
+                else
+                        ret = -EOPNOTSUPP;
+                break;
+
+        case PRISM2_PARAM_MAX_WDS:
+                *param = local->wds_max_connections;
+                break;
+
+        case PRISM2_PARAM_AP_AUTOM_AP_WDS:
+                if (local->ap != NULL)
+                        *param = local->ap->autom_ap_wds;
+                else
+                        ret = -EOPNOTSUPP;
+                break;
+
+        case PRISM2_PARAM_AP_AUTH_ALGS:
+                *param = local->auth_algs;
+                break;
+
+        case PRISM2_PARAM_MONITOR_ALLOW_FCSERR:
+                *param = local->monitor_allow_fcserr;
+                break;
+
+        case PRISM2_PARAM_HOST_ENCRYPT:
+                *param = local->host_encrypt;
+                break;
+
+        case PRISM2_PARAM_HOST_DECRYPT:
+                *param = local->host_decrypt;
+                break;
+
+        case PRISM2_PARAM_HOST_ROAMING:
+                *param = local->host_roaming;
+                break;
+
+        case PRISM2_PARAM_BCRX_STA_KEY:
+                *param = local->bcrx_sta_key;
+                break;
+
+        case PRISM2_PARAM_IEEE_802_1X:
+                *param = local->ieee_802_1x;
+                break;
+
+        case PRISM2_PARAM_ANTSEL_TX:
+                *param = local->antsel_tx;
+                break;
+
+        case PRISM2_PARAM_ANTSEL_RX:
+                *param = local->antsel_rx;
+                break;
+
+        case PRISM2_PARAM_MONITOR_TYPE:
+                *param = local->monitor_type;
+                break;
+
+        case PRISM2_PARAM_WDS_TYPE:
+                *param = local->wds_type;
+                break;
+
+        case PRISM2_PARAM_HOSTSCAN:
+                ret = -EOPNOTSUPP;
+                break;
+
+        case PRISM2_PARAM_AP_SCAN:
+                *param = local->passive_scan_interval;
+                break;
+
+        case PRISM2_PARAM_ENH_SEC:
+                *param = local->enh_sec;
+                break;
+
+#ifdef PRISM2_IO_DEBUG
+        case PRISM2_PARAM_IO_DEBUG:
+                *param = local->io_debug_enabled;
+                break;
+#endif /* PRISM2_IO_DEBUG */
+
+        case PRISM2_PARAM_BASIC_RATES:
+                *param = local->basic_rates;
+                break;
+
+        case PRISM2_PARAM_OPER_RATES:
+                *param = local->tx_rate_control;
+                break;
+
+        case PRISM2_PARAM_HOSTAPD:
+                *param = local->hostapd;
+                break;
+
+        case PRISM2_PARAM_HOSTAPD_STA:
+                *param = local->hostapd_sta;
+                break;
+
+        case PRISM2_PARAM_WPA:
+                if (local->sta_fw_ver < PRISM2_FW_VER(1,7,0))
+                        ret = -EOPNOTSUPP;
+                *param = local->wpa;
+                break;
+
+        case PRISM2_PARAM_PRIVACY_INVOKED:
+                *param = local->privacy_invoked;
+                break;
+
+        case PRISM2_PARAM_TKIP_COUNTERMEASURES:
+                *param = local->tkip_countermeasures;
+                break;
+
+        case PRISM2_PARAM_DROP_UNENCRYPTED:
+                *param = local->drop_unencrypted;
+                break;
+
+        case PRISM2_PARAM_SCAN_CHANNEL_MASK:
+                *param = local->scan_channel_mask;
+                break;
+
+        default:
+                printk(KERN_DEBUG "%s: get_prism2_param: unknown param %d\n",
+                       dev->name, *param);
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
+
+static int prism2_ioctl_priv_readmif(struct net_device *dev,
+                                     struct iw_request_info *info,
+                                     void *wrqu, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 resp0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        if (local->func->cmd(dev, HFA384X_CMDCODE_READMIF, *extra, NULL,
+                             &resp0))
+                return -EOPNOTSUPP;
+        else
+                *extra = resp0;
+
+        return 0;
+}
+
+
+static int prism2_ioctl_priv_writemif(struct net_device *dev,
+                                      struct iw_request_info *info,
+                                      void *wrqu, char *extra)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        u16 cr, val;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        cr = *extra;
+        val = *(extra + 1);
+        if (local->func->cmd(dev, HFA384X_CMDCODE_WRITEMIF, cr, &val, NULL))
+                return -EOPNOTSUPP;
+
+        return 0;
+}
+
+
+static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret = 0;
+        u32 mode;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        printk(KERN_DEBUG "%s: process %d (%s) used deprecated iwpriv monitor "
+               "- update software to use iwconfig mode monitor\n",
+               dev->name, current->pid, current->comm);
+
+        /* Backward compatibility code - this can be removed at some point */
+
+        if (*i == 0) {
+                /* Disable monitor mode - old mode was not saved, so go to
+                 * Master mode */
+                mode = IW_MODE_MASTER;
+                ret = prism2_ioctl_siwmode(dev, NULL, &mode, NULL);
+        } else if (*i == 1) {
+                /* netlink socket mode is not supported anymore since it did
+                 * not separate different devices from each other and was not
+                 * best method for delivering large amount of packets to
+                 * user space */
+                ret = -EOPNOTSUPP;
+        } else if (*i == 2 || *i == 3) {
+                switch (*i) {
+                case 2:
+                        local->monitor_type = PRISM2_MONITOR_80211;
+                        break;
+                case 3:
+                        local->monitor_type = PRISM2_MONITOR_PRISM;
+                        break;
+                }
+                mode = IW_MODE_MONITOR;
+                ret = prism2_ioctl_siwmode(dev, NULL, &mode, NULL);
+                hostap_monitor_mode_enable(local);
+        } else
+                ret = -EINVAL;
+
+        return ret;
+}
+
+
+static int prism2_ioctl_priv_reset(struct net_device *dev, int *i)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        printk(KERN_DEBUG "%s: manual reset request(%d)\n", dev->name, *i);
+        switch (*i) {
+        case 0:
+                /* Disable and enable card */
+                local->func->hw_shutdown(dev, 1);
+                local->func->hw_config(dev, 0);
+                break;
+
+        case 1:
+                /* COR sreset */
+                local->func->hw_reset(dev);
+                break;
+
+        case 2:
+                /* Disable and enable port 0 */
+                local->func->reset_port(dev);
+                break;
+
+        case 3:
+                prism2_sta_deauth(local, WLAN_REASON_DEAUTH_LEAVING);
+                if (local->func->cmd(dev, HFA384X_CMDCODE_DISABLE, 0, NULL,
+                                     NULL))
+                        return -EINVAL;
+                break;
+
+        case 4:
+                if (local->func->cmd(dev, HFA384X_CMDCODE_ENABLE, 0, NULL,
+                                     NULL))
+                        return -EINVAL;
+                break;
+
+        default:
+                printk(KERN_DEBUG "Unknown reset request %d\n", *i);
+                return -EOPNOTSUPP;
+        }
+
+        return 0;
+}
+
+
+static int prism2_ioctl_priv_set_rid_word(struct net_device *dev, int *i)
+{
+        int rid = *i;
+        int value = *(i + 1);
+
+        printk(KERN_DEBUG "%s: Set RID[0x%X] = %d\n", dev->name, rid, value);
+
+        if (hostap_set_word(dev, rid, value))
+                return -EINVAL;
+
+        return 0;
+}
+
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+static int ap_mac_cmd_ioctl(local_info_t *local, int *cmd)
+{
+        int ret = 0;
+
+        switch (*cmd) {
+        case AP_MAC_CMD_POLICY_OPEN:
+                local->ap->mac_restrictions.policy = MAC_POLICY_OPEN;
+                break;
+        case AP_MAC_CMD_POLICY_ALLOW:
+                local->ap->mac_restrictions.policy = MAC_POLICY_ALLOW;
+                break;
+        case AP_MAC_CMD_POLICY_DENY:
+                local->ap->mac_restrictions.policy = MAC_POLICY_DENY;
+                break;
+        case AP_MAC_CMD_FLUSH:
+                ap_control_flush_macs(&local->ap->mac_restrictions);
+                break;
+        case AP_MAC_CMD_KICKALL:
+                ap_control_kickall(local->ap);
+                hostap_deauth_all_stas(local->dev, local->ap, 0);
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+static int prism2_ioctl_priv_download(local_info_t *local, struct iw_point *p)
+{
+        struct prism2_download_param *param;
+        int ret = 0;
+
+        if (p->length < sizeof(struct prism2_download_param) ||
+            p->length > 1024 || !p->pointer)
+                return -EINVAL;
+
+        param = (struct prism2_download_param *)
+                kmalloc(p->length, GFP_KERNEL);
+        if (param == NULL)
+                return -ENOMEM;
+
+        if (copy_from_user(param, p->pointer, p->length)) {
+                ret = -EFAULT;
+                goto out;
+        }
+
+        if (p->length < sizeof(struct prism2_download_param) +
+            param->num_areas * sizeof(struct prism2_download_area)) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = local->func->download(local, param);
+
+ out:
+        if (param != NULL)
+                kfree(param);
+
+        return ret;
+}
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+
+static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
+                                     size_t len)
+{
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+        u8 *buf;
+
+        /*
+         * Add 16-bit length in the beginning of the buffer because Prism2 RID
+         * includes it.
+         */
+        buf = kmalloc(len + 2, GFP_KERNEL);
+        if (buf == NULL)
+                return -ENOMEM;
+
+        *((u16 *) buf) = cpu_to_le16(len);
+        memcpy(buf + 2, elem, len);
+
+        kfree(local->generic_elem);
+        local->generic_elem = buf;
+        local->generic_elem_len = len + 2;
+
+        return local->func->set_rid(local->dev, HFA384X_RID_GENERICELEMENT,
+                                    buf, len + 2);
+}
+
+
+static int prism2_ioctl_siwauth(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *data, char *extra)
+{
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+
+        switch (data->flags & IW_AUTH_INDEX) {
+        case IW_AUTH_WPA_VERSION:
+        case IW_AUTH_CIPHER_PAIRWISE:
+        case IW_AUTH_CIPHER_GROUP:
+        case IW_AUTH_KEY_MGMT:
+                /*
+                 * Host AP driver does not use these parameters and allows
+                 * wpa_supplicant to control them internally.
+                 */
+                break;
+        case IW_AUTH_TKIP_COUNTERMEASURES:
+                local->tkip_countermeasures = data->value;
+                break;
+        case IW_AUTH_DROP_UNENCRYPTED:
+                local->drop_unencrypted = data->value;
+                break;
+        case IW_AUTH_80211_AUTH_ALG:
+                local->auth_algs = data->value;
+                break;
+        case IW_AUTH_WPA_ENABLED:
+                if (data->value == 0) {
+                        local->wpa = 0;
+                        if (local->sta_fw_ver < PRISM2_FW_VER(1,7,0))
+                                break;
+                        prism2_set_genericelement(dev, "", 0);
+                        local->host_roaming = 0;
+                        local->privacy_invoked = 0;
+                        if (hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE,
+                                            0) ||
+                            hostap_set_roaming(local) ||
+                            hostap_set_encryption(local) ||
+                            local->func->reset_port(dev))
+                                return -EINVAL;
+                        break;
+                }
+                if (local->sta_fw_ver < PRISM2_FW_VER(1,7,0))
+                        return -EOPNOTSUPP;
+                local->host_roaming = 2;
+                local->privacy_invoked = 1;
+                local->wpa = 1;
+                if (hostap_set_word(dev, HFA384X_RID_SSNHANDLINGMODE, 1) ||
+                    hostap_set_roaming(local) ||
+                    hostap_set_encryption(local) ||
+                    local->func->reset_port(dev))
+                        return -EINVAL;
+                break;
+        case IW_AUTH_RX_UNENCRYPTED_EAPOL:
+                local->ieee_802_1x = data->value;
+                break;
+        case IW_AUTH_PRIVACY_INVOKED:
+                local->privacy_invoked = data->value;
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+        return 0;
+}
+
+
+static int prism2_ioctl_giwauth(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_param *data, char *extra)
+{
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+
+        switch (data->flags & IW_AUTH_INDEX) {
+        case IW_AUTH_WPA_VERSION:
+        case IW_AUTH_CIPHER_PAIRWISE:
+        case IW_AUTH_CIPHER_GROUP:
+        case IW_AUTH_KEY_MGMT:
+                /*
+                 * Host AP driver does not use these parameters and allows
+                 * wpa_supplicant to control them internally.
+                 */
+                return -EOPNOTSUPP;
+        case IW_AUTH_TKIP_COUNTERMEASURES:
+                data->value = local->tkip_countermeasures;
+                break;
+        case IW_AUTH_DROP_UNENCRYPTED:
+                data->value = local->drop_unencrypted;
+                break;
+        case IW_AUTH_80211_AUTH_ALG:
+                data->value = local->auth_algs;
+                break;
+        case IW_AUTH_WPA_ENABLED:
+                data->value = local->wpa;
+                break;
+        case IW_AUTH_RX_UNENCRYPTED_EAPOL:
+                data->value = local->ieee_802_1x;
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+        return 0;
+}
+
+
+static int prism2_ioctl_siwencodeext(struct net_device *dev,
+                                     struct iw_request_info *info,
+                                     struct iw_point *erq, char *extra)
+{
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+        struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;
+        int i, ret = 0;
+        struct ieee80211_crypto_ops *ops;
+        struct ieee80211_crypt_data **crypt;
+        void *sta_ptr;
+        u8 *addr;
+        const char *alg, *module;
+
+        i = erq->flags & IW_ENCODE_INDEX;
+        if (i > WEP_KEYS)
+                return -EINVAL;
+        if (i < 1 || i > WEP_KEYS)
+                i = local->tx_keyidx;
+        else
+                i--;
+        if (i < 0 || i >= WEP_KEYS)
+                return -EINVAL;
+
+        addr = ext->addr.sa_data;
+        if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff &&
+            addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {
+                sta_ptr = NULL;
+                crypt = &local->crypt[i];
+        } else {
+                if (i != 0)
+                        return -EINVAL;
+                sta_ptr = ap_crypt_get_ptrs(local->ap, addr, 0, &crypt);
+                if (sta_ptr == NULL) {
+                        if (local->iw_mode == IW_MODE_INFRA) {
+                                /*
+                                 * TODO: add STA entry for the current AP so
+                                 * that unicast key can be used. For now, this
+                                 * is emulated by using default key idx 0.
+                                 */
+                                i = 0;
+                                crypt = &local->crypt[i];
+                        } else
+                                return -EINVAL;
+                }
+        }
+
+        if ((erq->flags & IW_ENCODE_DISABLED) ||
+            ext->alg == IW_ENCODE_ALG_NONE) {
+                if (*crypt)
+                        prism2_crypt_delayed_deinit(local, crypt);
+                goto done;
+        }
+
+        switch (ext->alg) {
+        case IW_ENCODE_ALG_WEP:
+                alg = "WEP";
+                module = "ieee80211_crypt_wep";
+                break;
+        case IW_ENCODE_ALG_TKIP:
+                alg = "TKIP";
+                module = "ieee80211_crypt_tkip";
+                break;
+        case IW_ENCODE_ALG_CCMP:
+                alg = "CCMP";
+                module = "ieee80211_crypt_ccmp";
+                break;
+        default:
+                printk(KERN_DEBUG "%s: unsupported algorithm %d\n",
+                       local->dev->name, ext->alg);
+                ret = -EOPNOTSUPP;
+                goto done;
+        }
+
+        ops = ieee80211_get_crypto_ops(alg);
+        if (ops == NULL) {
+                request_module(module);
+                ops = ieee80211_get_crypto_ops(alg);
+        }
+        if (ops == NULL) {
+                printk(KERN_DEBUG "%s: unknown crypto alg '%s'\n",
+                       local->dev->name, alg);
+                ret = -EOPNOTSUPP;
+                goto done;
+        }
+
+        if (sta_ptr || ext->alg != IW_ENCODE_ALG_WEP) {
+                /*
+                 * Per station encryption and other than WEP algorithms
+                 * require host-based encryption, so force them on
+                 * automatically.
+                 */
+                local->host_decrypt = local->host_encrypt = 1;
+        }
+
+        if (*crypt == NULL || (*crypt)->ops != ops) {
+                struct ieee80211_crypt_data *new_crypt;
+
+                prism2_crypt_delayed_deinit(local, crypt);
+
+                new_crypt = (struct ieee80211_crypt_data *)
+                        kmalloc(sizeof(struct ieee80211_crypt_data),
+                                GFP_KERNEL);
+                if (new_crypt == NULL) {
+                        ret = -ENOMEM;
+                        goto done;
+                }
+                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+                new_crypt->ops = ops;
+                new_crypt->priv = new_crypt->ops->init(i);
+                if (new_crypt->priv == NULL) {
+                        kfree(new_crypt);
+                        ret = -EINVAL;
+                        goto done;
+                }
+
+                *crypt = new_crypt;
+        }
+
+        /*
+         * TODO: if ext_flags does not have IW_ENCODE_EXT_RX_SEQ_VALID, the
+         * existing seq# should not be changed.
+         * TODO: if ext_flags has IW_ENCODE_EXT_TX_SEQ_VALID, next TX seq#
+         * should be changed to something else than zero.
+         */
+        if ((!(ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) || ext->key_len > 0)
+            && (*crypt)->ops->set_key &&
+            (*crypt)->ops->set_key(ext->key, ext->key_len, ext->rx_seq,
+                                   (*crypt)->priv) < 0) {
+                printk(KERN_DEBUG "%s: key setting failed\n",
+                       local->dev->name);
+                ret = -EINVAL;
+                goto done;
+        }
+
+        if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
+                if (!sta_ptr)
+                        local->tx_keyidx = i;
+                else if (i) {
+                        ret = -EINVAL;
+                        goto done;
+                }
+        }
+
+
+        if (sta_ptr == NULL && ext->key_len > 0) {
+                int first = 1, j;
+                for (j = 0; j < WEP_KEYS; j++) {
+                        if (j != i && local->crypt[j]) {
+                                first = 0;
+                                break;
+                        }
+                }
+                if (first)
+                        local->tx_keyidx = i;
+        }
+
+ done:
+        if (sta_ptr)
+                hostap_handle_sta_release(sta_ptr);
+
+        local->open_wep = erq->flags & IW_ENCODE_OPEN;
+
+        /*
+         * Do not reset port0 if card is in Managed mode since resetting will
+         * generate new IEEE 802.11 authentication which may end up in looping
+         * with IEEE 802.1X. Prism2 documentation seem to require port reset
+         * after WEP configuration. However, keys are apparently changed at
+         * least in Managed mode.
+         */
+        if (ret == 0 &&
+            (hostap_set_encryption(local) ||
+             (local->iw_mode != IW_MODE_INFRA &&
+              local->func->reset_port(local->dev))))
+                ret = -EINVAL;
+
+        return ret;
+}
+
+
+static int prism2_ioctl_giwencodeext(struct net_device *dev,
+                                     struct iw_request_info *info,
+                                     struct iw_point *erq, char *extra)
+{
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+        struct ieee80211_crypt_data **crypt;
+        void *sta_ptr;
+        int max_key_len, i;
+        struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;
+        u8 *addr;
+
+        max_key_len = erq->length - sizeof(*ext);
+        if (max_key_len < 0)
+                return -EINVAL;
+
+        i = erq->flags & IW_ENCODE_INDEX;
+        if (i < 1 || i > WEP_KEYS)
+                i = local->tx_keyidx;
+        else
+                i--;
+
+        addr = ext->addr.sa_data;
+        if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff &&
+            addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {
+                sta_ptr = NULL;
+                crypt = &local->crypt[i];
+        } else {
+                i = 0;
+                sta_ptr = ap_crypt_get_ptrs(local->ap, addr, 0, &crypt);
+                if (sta_ptr == NULL)
+                        return -EINVAL;
+        }
+        erq->flags = i + 1;
+        memset(ext, 0, sizeof(*ext));
+
+        if (*crypt == NULL || (*crypt)->ops == NULL) {
+                ext->alg = IW_ENCODE_ALG_NONE;
+                ext->key_len = 0;
+                erq->flags |= IW_ENCODE_DISABLED;
+        } else {
+                if (strcmp((*crypt)->ops->name, "WEP") == 0)
+                        ext->alg = IW_ENCODE_ALG_WEP;
+                else if (strcmp((*crypt)->ops->name, "TKIP") == 0)
+                        ext->alg = IW_ENCODE_ALG_TKIP;
+                else if (strcmp((*crypt)->ops->name, "CCMP") == 0)
+                        ext->alg = IW_ENCODE_ALG_CCMP;
+                else
+                        return -EINVAL;
+
+                if ((*crypt)->ops->get_key) {
+                        ext->key_len =
+                                (*crypt)->ops->get_key(ext->key,
+                                                       max_key_len,
+                                                       ext->tx_seq,
+                                                       (*crypt)->priv);
+                        if (ext->key_len &&
+                            (ext->alg == IW_ENCODE_ALG_TKIP ||
+                             ext->alg == IW_ENCODE_ALG_CCMP))
+                                ext->ext_flags |= IW_ENCODE_EXT_TX_SEQ_VALID;
+                }
+        }
+
+        if (sta_ptr)
+                hostap_handle_sta_release(sta_ptr);
+
+        return 0;
+}
+
+
+static int prism2_ioctl_set_encryption(local_info_t *local,
+                                       struct prism2_hostapd_param *param,
+                                       int param_len)
+{
+        int ret = 0;
+        struct ieee80211_crypto_ops *ops;
+        struct ieee80211_crypt_data **crypt;
+        void *sta_ptr;
+
+        param->u.crypt.err = 0;
+        param->u.crypt.alg[HOSTAP_CRYPT_ALG_NAME_LEN - 1] = '\0';
+
+        if (param_len !=
+            (int) ((char *) param->u.crypt.key - (char *) param) +
+            param->u.crypt.key_len)
+                return -EINVAL;
+
+        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
+            param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
+            param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
+                if (param->u.crypt.idx >= WEP_KEYS)
+                        return -EINVAL;
+                sta_ptr = NULL;
+                crypt = &local->crypt[param->u.crypt.idx];
+        } else {
+                if (param->u.crypt.idx)
+                        return -EINVAL;
+                sta_ptr = ap_crypt_get_ptrs(
+                        local->ap, param->sta_addr,
+                        (param->u.crypt.flags & HOSTAP_CRYPT_FLAG_PERMANENT),
+                        &crypt);
+
+                if (sta_ptr == NULL) {
+                        param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR;
+                        return -EINVAL;
+                }
+        }
+
+        if (strcmp(param->u.crypt.alg, "none") == 0) {
+                if (crypt)
+                        prism2_crypt_delayed_deinit(local, crypt);
+                goto done;
+        }
+
+        ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
+                request_module("ieee80211_crypt_wep");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
+                request_module("ieee80211_crypt_tkip");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {
+                request_module("ieee80211_crypt_ccmp");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        }
+        if (ops == NULL) {
+                printk(KERN_DEBUG "%s: unknown crypto alg '%s'\n",
+                       local->dev->name, param->u.crypt.alg);
+                param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ALG;
+                ret = -EINVAL;
+                goto done;
+        }
+
+        /* station based encryption and other than WEP algorithms require
+         * host-based encryption, so force them on automatically */
+        local->host_decrypt = local->host_encrypt = 1;
+
+        if (*crypt == NULL || (*crypt)->ops != ops) {
+                struct ieee80211_crypt_data *new_crypt;
+
+                prism2_crypt_delayed_deinit(local, crypt);
+
+                new_crypt = (struct ieee80211_crypt_data *)
+                        kmalloc(sizeof(struct ieee80211_crypt_data),
+                                GFP_KERNEL);
+                if (new_crypt == NULL) {
+                        ret = -ENOMEM;
+                        goto done;
+                }
+                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+                new_crypt->ops = ops;
+                new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
+                if (new_crypt->priv == NULL) {
+                        kfree(new_crypt);
+                        param->u.crypt.err =
+                                HOSTAP_CRYPT_ERR_CRYPT_INIT_FAILED;
+                        ret = -EINVAL;
+                        goto done;
+                }
+
+                *crypt = new_crypt;
+        }
+
+        if ((!(param->u.crypt.flags & HOSTAP_CRYPT_FLAG_SET_TX_KEY) ||
+             param->u.crypt.key_len > 0) && (*crypt)->ops->set_key &&
+            (*crypt)->ops->set_key(param->u.crypt.key,
+                                   param->u.crypt.key_len, param->u.crypt.seq,
+                                   (*crypt)->priv) < 0) {
+                printk(KERN_DEBUG "%s: key setting failed\n",
+                       local->dev->name);
+                param->u.crypt.err = HOSTAP_CRYPT_ERR_KEY_SET_FAILED;
+                ret = -EINVAL;
+                goto done;
+        }
+
+        if (param->u.crypt.flags & HOSTAP_CRYPT_FLAG_SET_TX_KEY) {
+                if (!sta_ptr)
+                        local->tx_keyidx = param->u.crypt.idx;
+                else if (param->u.crypt.idx) {
+                        printk(KERN_DEBUG "%s: TX key idx setting failed\n",
+                               local->dev->name);
+                        param->u.crypt.err =
+                                HOSTAP_CRYPT_ERR_TX_KEY_SET_FAILED;
+                        ret = -EINVAL;
+                        goto done;
+                }
+        }
+
+ done:
+        if (sta_ptr)
+                hostap_handle_sta_release(sta_ptr);
+
+        /* Do not reset port0 if card is in Managed mode since resetting will
+         * generate new IEEE 802.11 authentication which may end up in looping
+         * with IEEE 802.1X. Prism2 documentation seem to require port reset
+         * after WEP configuration. However, keys are apparently changed at
+         * least in Managed mode. */
+        if (ret == 0 &&
+            (hostap_set_encryption(local) ||
+             (local->iw_mode != IW_MODE_INFRA &&
+              local->func->reset_port(local->dev)))) {
+                param->u.crypt.err = HOSTAP_CRYPT_ERR_CARD_CONF_FAILED;
+                return -EINVAL;
+        }
+
+        return ret;
+}
+
+
+static int prism2_ioctl_get_encryption(local_info_t *local,
+                                       struct prism2_hostapd_param *param,
+                                       int param_len)
+{
+        struct ieee80211_crypt_data **crypt;
+        void *sta_ptr;
+        int max_key_len;
+
+        param->u.crypt.err = 0;
+
+        max_key_len = param_len -
+                (int) ((char *) param->u.crypt.key - (char *) param);
+        if (max_key_len < 0)
+                return -EINVAL;
+
+        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
+            param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
+            param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
+                sta_ptr = NULL;
+                if (param->u.crypt.idx >= WEP_KEYS)
+                        param->u.crypt.idx = local->tx_keyidx;
+                crypt = &local->crypt[param->u.crypt.idx];
+        } else {
+                param->u.crypt.idx = 0;
+                sta_ptr = ap_crypt_get_ptrs(local->ap, param->sta_addr, 0,
+                                            &crypt);
+
+                if (sta_ptr == NULL) {
+                        param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR;
+                        return -EINVAL;
+                }
+        }
+
+        if (*crypt == NULL || (*crypt)->ops == NULL) {
+                memcpy(param->u.crypt.alg, "none", 5);
+                param->u.crypt.key_len = 0;
+                param->u.crypt.idx = 0xff;
+        } else {
+                strncpy(param->u.crypt.alg, (*crypt)->ops->name,
+                        HOSTAP_CRYPT_ALG_NAME_LEN);
+                param->u.crypt.key_len = 0;
+
+                memset(param->u.crypt.seq, 0, 8);
+                if ((*crypt)->ops->get_key) {
+                        param->u.crypt.key_len =
+                                (*crypt)->ops->get_key(param->u.crypt.key,
+                                                       max_key_len,
+                                                       param->u.crypt.seq,
+                                                       (*crypt)->priv);
+                }
+        }
+
+        if (sta_ptr)
+                hostap_handle_sta_release(sta_ptr);
+
+        return 0;
+}
+
+
+static int prism2_ioctl_get_rid(local_info_t *local,
+                                struct prism2_hostapd_param *param,
+                                int param_len)
+{
+        int max_len, res;
+
+        max_len = param_len - PRISM2_HOSTAPD_RID_HDR_LEN;
+        if (max_len < 0)
+                return -EINVAL;
+
+        res = local->func->get_rid(local->dev, param->u.rid.rid,
+                                   param->u.rid.data, param->u.rid.len, 0);
+        if (res >= 0) {
+                param->u.rid.len = res;
+                return 0;
+        }
+
+        return res;
+}
+
+
+static int prism2_ioctl_set_rid(local_info_t *local,
+                                struct prism2_hostapd_param *param,
+                                int param_len)
+{
+        int max_len;
+
+        max_len = param_len - PRISM2_HOSTAPD_RID_HDR_LEN;
+        if (max_len < 0 || max_len < param->u.rid.len)
+                return -EINVAL;
+
+        return local->func->set_rid(local->dev, param->u.rid.rid,
+                                    param->u.rid.data, param->u.rid.len);
+}
+
+
+static int prism2_ioctl_set_assoc_ap_addr(local_info_t *local,
+                                          struct prism2_hostapd_param *param,
+                                          int param_len)
+{
+        printk(KERN_DEBUG "%ssta: associated as client with AP " MACSTR "\n",
+               local->dev->name, MAC2STR(param->sta_addr));
+        memcpy(local->assoc_ap_addr, param->sta_addr, ETH_ALEN);
+        return 0;
+}
+
+
+static int prism2_ioctl_siwgenie(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *extra)
+{
+        return prism2_set_genericelement(dev, extra, data->length);
+}
+
+
+static int prism2_ioctl_giwgenie(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 struct iw_point *data, char *extra)
+{
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+        int len = local->generic_elem_len - 2;
+
+        if (len <= 0 || local->generic_elem == NULL) {
+                data->length = 0;
+                return 0;
+        }
+
+        if (data->length < len)
+                return -E2BIG;
+
+        data->length = len;
+        memcpy(extra, local->generic_elem + 2, len);
+
+        return 0;
+}
+
+
+static int prism2_ioctl_set_generic_element(local_info_t *local,
+                                            struct prism2_hostapd_param *param,
+                                            int param_len)
+{
+        int max_len, len;
+
+        len = param->u.generic_elem.len;
+        max_len = param_len - PRISM2_HOSTAPD_GENERIC_ELEMENT_HDR_LEN;
+        if (max_len < 0 || max_len < len)
+                return -EINVAL;
+
+        return prism2_set_genericelement(local->dev,
+                                         param->u.generic_elem.data, len);
+}
+
+
+static int prism2_ioctl_siwmlme(struct net_device *dev,
+                                struct iw_request_info *info,
+                                struct iw_point *data, char *extra)
+{
+        struct hostap_interface *iface = dev->priv;
+        local_info_t *local = iface->local;
+        struct iw_mlme *mlme = (struct iw_mlme *) extra;
+        u16 reason;
+
+        reason = cpu_to_le16(mlme->reason_code);
+
+        switch (mlme->cmd) {
+        case IW_MLME_DEAUTH:
+                return prism2_sta_send_mgmt(local, mlme->addr.sa_data,
+                                            IEEE80211_STYPE_DEAUTH,
+                                            (u8 *) &reason, 2);
+        case IW_MLME_DISASSOC:
+                return prism2_sta_send_mgmt(local, mlme->addr.sa_data,
+                                            IEEE80211_STYPE_DISASSOC,
+                                            (u8 *) &reason, 2);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+
+static int prism2_ioctl_mlme(local_info_t *local,
+                             struct prism2_hostapd_param *param)
+{
+        u16 reason;
+
+        reason = cpu_to_le16(param->u.mlme.reason_code);
+        switch (param->u.mlme.cmd) {
+        case MLME_STA_DEAUTH:
+                return prism2_sta_send_mgmt(local, param->sta_addr,
+                                            IEEE80211_STYPE_DEAUTH,
+                                            (u8 *) &reason, 2);
+        case MLME_STA_DISASSOC:
+                return prism2_sta_send_mgmt(local, param->sta_addr,
+                                            IEEE80211_STYPE_DISASSOC,
+                                            (u8 *) &reason, 2);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+
+static int prism2_ioctl_scan_req(local_info_t *local,
+                                 struct prism2_hostapd_param *param)
+{
+#ifndef PRISM2_NO_STATION_MODES
+        if ((local->iw_mode != IW_MODE_INFRA &&
+             local->iw_mode != IW_MODE_ADHOC) ||
+            (local->sta_fw_ver < PRISM2_FW_VER(1,3,1)))
+                return -EOPNOTSUPP;
+
+        if (!local->dev_enabled)
+                return -ENETDOWN;
+
+        return prism2_request_hostscan(local->dev, param->u.scan_req.ssid,
+                                       param->u.scan_req.ssid_len);
+#else /* PRISM2_NO_STATION_MODES */
+        return -EOPNOTSUPP;
+#endif /* PRISM2_NO_STATION_MODES */
+}
+
+
+static int prism2_ioctl_priv_hostapd(local_info_t *local, struct iw_point *p)
+{
+        struct prism2_hostapd_param *param;
+        int ret = 0;
+        int ap_ioctl = 0;
+
+        if (p->length < sizeof(struct prism2_hostapd_param) ||
+            p->length > PRISM2_HOSTAPD_MAX_BUF_SIZE || !p->pointer)
+                return -EINVAL;
+
+        param = (struct prism2_hostapd_param *) kmalloc(p->length, GFP_KERNEL);
+        if (param == NULL)
+                return -ENOMEM;
+
+        if (copy_from_user(param, p->pointer, p->length)) {
+                ret = -EFAULT;
+                goto out;
+        }
+
+        switch (param->cmd) {
+        case PRISM2_SET_ENCRYPTION:
+                ret = prism2_ioctl_set_encryption(local, param, p->length);
+                break;
+        case PRISM2_GET_ENCRYPTION:
+                ret = prism2_ioctl_get_encryption(local, param, p->length);
+                break;
+        case PRISM2_HOSTAPD_GET_RID:
+                ret = prism2_ioctl_get_rid(local, param, p->length);
+                break;
+        case PRISM2_HOSTAPD_SET_RID:
+                ret = prism2_ioctl_set_rid(local, param, p->length);
+                break;
+        case PRISM2_HOSTAPD_SET_ASSOC_AP_ADDR:
+                ret = prism2_ioctl_set_assoc_ap_addr(local, param, p->length);
+                break;
+        case PRISM2_HOSTAPD_SET_GENERIC_ELEMENT:
+                ret = prism2_ioctl_set_generic_element(local, param,
+                                                       p->length);
+                break;
+        case PRISM2_HOSTAPD_MLME:
+                ret = prism2_ioctl_mlme(local, param);
+                break;
+        case PRISM2_HOSTAPD_SCAN_REQ:
+                ret = prism2_ioctl_scan_req(local, param);
+                break;
+        default:
+                ret = prism2_hostapd(local->ap, param);
+                ap_ioctl = 1;
+                break;
+        }
+
+        if (ret == 1 || !ap_ioctl) {
+                if (copy_to_user(p->pointer, param, p->length)) {
+                        ret = -EFAULT;
+                        goto out;
+                } else if (ap_ioctl)
+                        ret = 0;
+        }
+
+ out:
+        if (param != NULL)
+                kfree(param);
+
+        return ret;
+}
+
+
+static void prism2_get_drvinfo(struct net_device *dev,
+                               struct ethtool_drvinfo *info)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        strncpy(info->driver, "hostap", sizeof(info->driver) - 1);
+        strncpy(info->version, PRISM2_VERSION,
+                sizeof(info->version) - 1);
+        snprintf(info->fw_version, sizeof(info->fw_version) - 1,
+                 "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff,
+                 (local->sta_fw_ver >> 8) & 0xff,
+                 local->sta_fw_ver & 0xff);
+}
+
+static struct ethtool_ops prism2_ethtool_ops = {
+        .get_drvinfo = prism2_get_drvinfo
+};
+
+
+/* Structures to export the Wireless Handlers */
+
+static const iw_handler prism2_handler[] =
+{
+        (iw_handler) NULL,                              /* SIOCSIWCOMMIT */
+        (iw_handler) prism2_get_name,                   /* SIOCGIWNAME */
+        (iw_handler) NULL,                              /* SIOCSIWNWID */
+        (iw_handler) NULL,                              /* SIOCGIWNWID */
+        (iw_handler) prism2_ioctl_siwfreq,              /* SIOCSIWFREQ */
+        (iw_handler) prism2_ioctl_giwfreq,              /* SIOCGIWFREQ */
+        (iw_handler) prism2_ioctl_siwmode,              /* SIOCSIWMODE */
+        (iw_handler) prism2_ioctl_giwmode,              /* SIOCGIWMODE */
+        (iw_handler) prism2_ioctl_siwsens,              /* SIOCSIWSENS */
+        (iw_handler) prism2_ioctl_giwsens,              /* SIOCGIWSENS */
+        (iw_handler) NULL /* not used */,               /* SIOCSIWRANGE */
+        (iw_handler) prism2_ioctl_giwrange,             /* SIOCGIWRANGE */
+        (iw_handler) NULL /* not used */,               /* SIOCSIWPRIV */
+        (iw_handler) NULL /* kernel code */,            /* SIOCGIWPRIV */
+        (iw_handler) NULL /* not used */,               /* SIOCSIWSTATS */
+        (iw_handler) NULL /* kernel code */,            /* SIOCGIWSTATS */
+        iw_handler_set_spy,                             /* SIOCSIWSPY */
+        iw_handler_get_spy,                             /* SIOCGIWSPY */
+        iw_handler_set_thrspy,                          /* SIOCSIWTHRSPY */
+        iw_handler_get_thrspy,                          /* SIOCGIWTHRSPY */
+        (iw_handler) prism2_ioctl_siwap,                /* SIOCSIWAP */
+        (iw_handler) prism2_ioctl_giwap,                /* SIOCGIWAP */
+        (iw_handler) prism2_ioctl_siwmlme,              /* SIOCSIWMLME */
+        (iw_handler) prism2_ioctl_giwaplist,            /* SIOCGIWAPLIST */
+        (iw_handler) prism2_ioctl_siwscan,              /* SIOCSIWSCAN */
+        (iw_handler) prism2_ioctl_giwscan,              /* SIOCGIWSCAN */
+        (iw_handler) prism2_ioctl_siwessid,             /* SIOCSIWESSID */
+        (iw_handler) prism2_ioctl_giwessid,             /* SIOCGIWESSID */
+        (iw_handler) prism2_ioctl_siwnickn,             /* SIOCSIWNICKN */
+        (iw_handler) prism2_ioctl_giwnickn,             /* SIOCGIWNICKN */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) prism2_ioctl_siwrate,              /* SIOCSIWRATE */
+        (iw_handler) prism2_ioctl_giwrate,              /* SIOCGIWRATE */
+        (iw_handler) prism2_ioctl_siwrts,               /* SIOCSIWRTS */
+        (iw_handler) prism2_ioctl_giwrts,               /* SIOCGIWRTS */
+        (iw_handler) prism2_ioctl_siwfrag,              /* SIOCSIWFRAG */
+        (iw_handler) prism2_ioctl_giwfrag,              /* SIOCGIWFRAG */
+        (iw_handler) prism2_ioctl_siwtxpow,             /* SIOCSIWTXPOW */
+        (iw_handler) prism2_ioctl_giwtxpow,             /* SIOCGIWTXPOW */
+        (iw_handler) prism2_ioctl_siwretry,             /* SIOCSIWRETRY */
+        (iw_handler) prism2_ioctl_giwretry,             /* SIOCGIWRETRY */
+        (iw_handler) prism2_ioctl_siwencode,            /* SIOCSIWENCODE */
+        (iw_handler) prism2_ioctl_giwencode,            /* SIOCGIWENCODE */
+        (iw_handler) prism2_ioctl_siwpower,             /* SIOCSIWPOWER */
+        (iw_handler) prism2_ioctl_giwpower,             /* SIOCGIWPOWER */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) NULL,                              /* -- hole -- */
+        (iw_handler) prism2_ioctl_siwgenie,             /* SIOCSIWGENIE */
+        (iw_handler) prism2_ioctl_giwgenie,             /* SIOCGIWGENIE */
+        (iw_handler) prism2_ioctl_siwauth,              /* SIOCSIWAUTH */
+        (iw_handler) prism2_ioctl_giwauth,              /* SIOCGIWAUTH */
+        (iw_handler) prism2_ioctl_siwencodeext,         /* SIOCSIWENCODEEXT */
+        (iw_handler) prism2_ioctl_giwencodeext,         /* SIOCGIWENCODEEXT */
+        (iw_handler) NULL,                              /* SIOCSIWPMKSA */
+        (iw_handler) NULL,                              /* -- hole -- */
+};
+
+static const iw_handler prism2_private_handler[] =
+{                                                       /* SIOCIWFIRSTPRIV + */
+        (iw_handler) prism2_ioctl_priv_prism2_param,    /* 0 */
+        (iw_handler) prism2_ioctl_priv_get_prism2_param, /* 1 */
+        (iw_handler) prism2_ioctl_priv_writemif,        /* 2 */
+        (iw_handler) prism2_ioctl_priv_readmif,         /* 3 */
+};
+
+static const struct iw_handler_def hostap_iw_handler_def =
+{
+        .num_standard   = sizeof(prism2_handler) / sizeof(iw_handler),
+        .num_private    = sizeof(prism2_private_handler) / sizeof(iw_handler),
+        .num_private_args = sizeof(prism2_priv) / sizeof(struct iw_priv_args),
+        .standard       = (iw_handler *) prism2_handler,
+        .private        = (iw_handler *) prism2_private_handler,
+        .private_args   = (struct iw_priv_args *) prism2_priv,
+        .get_wireless_stats = hostap_get_wireless_stats,
+};
+
+
+int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+        struct iwreq *wrq = (struct iwreq *) ifr;
+        struct hostap_interface *iface;
+        local_info_t *local;
+        int ret = 0;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        switch (cmd) {
+                /* Private ioctls (iwpriv) that have not yet been converted
+                 * into new wireless extensions API */
+
+        case PRISM2_IOCTL_INQUIRE:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_ioctl_priv_inquire(dev, (int *) wrq->u.name);
+                break;
+
+        case PRISM2_IOCTL_MONITOR:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_ioctl_priv_monitor(dev, (int *) wrq->u.name);
+                break;
+
+        case PRISM2_IOCTL_RESET:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_ioctl_priv_reset(dev, (int *) wrq->u.name);
+                break;
+
+        case PRISM2_IOCTL_WDS_ADD:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_wds_add(local, wrq->u.ap_addr.sa_data, 1);
+                break;
+
+        case PRISM2_IOCTL_WDS_DEL:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_wds_del(local, wrq->u.ap_addr.sa_data, 1, 0);
+                break;
+
+        case PRISM2_IOCTL_SET_RID_WORD:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_ioctl_priv_set_rid_word(dev,
+                                                          (int *) wrq->u.name);
+                break;
+
+#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        case PRISM2_IOCTL_MACCMD:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = ap_mac_cmd_ioctl(local, (int *) wrq->u.name);
+                break;
+
+        case PRISM2_IOCTL_ADDMAC:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = ap_control_add_mac(&local->ap->mac_restrictions,
+                                              wrq->u.ap_addr.sa_data);
+                break;
+        case PRISM2_IOCTL_DELMAC:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = ap_control_del_mac(&local->ap->mac_restrictions,
+                                              wrq->u.ap_addr.sa_data);
+                break;
+        case PRISM2_IOCTL_KICKMAC:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = ap_control_kick_mac(local->ap, local->dev,
+                                               wrq->u.ap_addr.sa_data);
+                break;
+#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+
+
+                /* Private ioctls that are not used with iwpriv;
+                 * in SIOCDEVPRIVATE range */
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+        case PRISM2_IOCTL_DOWNLOAD:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_ioctl_priv_download(local, &wrq->u.data);
+                break;
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+        case PRISM2_IOCTL_HOSTAPD:
+                if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
+                else ret = prism2_ioctl_priv_hostapd(local, &wrq->u.data);
+                break;
+
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
new file mode 100644
index 000000000000..025f8cdb5566
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -0,0 +1,473 @@
+#define PRISM2_PCI
+
+/* Host AP driver's support for Intersil Prism2.5 PCI cards is based on
+ * driver patches from Reyk Floeter <reyk@vantronix.net> and
+ * Andy Warner <andyw@pobox.com> */
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/if.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/workqueue.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+
+#include "hostap_wlan.h"
+
+
+static char *version = PRISM2_VERSION " (Jouni Malinen <jkmaline@cc.hut.fi>)";
+static char *dev_info = "hostap_pci";
+
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Support for Intersil Prism2.5-based 802.11 wireless LAN "
+                   "PCI cards.");
+MODULE_SUPPORTED_DEVICE("Intersil Prism2.5-based WLAN PCI cards");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
+
+
+/* struct local_info::hw_priv */
+struct hostap_pci_priv {
+        void __iomem *mem_start;
+};
+
+
+/* FIX: do we need mb/wmb/rmb with memory operations? */
+
+
+static struct pci_device_id prism2_pci_id_table[] __devinitdata = {
+        /* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */
+        { 0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID },
+        /* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */
+        { 0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID },
+        /* Samsung MagicLAN SWL-2210P */
+        { 0x167d, 0xa000, PCI_ANY_ID, PCI_ANY_ID },
+        { 0 }
+};
+
+
+#ifdef PRISM2_IO_DEBUG
+
+static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);
+        writeb(v, hw_priv->mem_start + a);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+        u8 v;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        v = readb(hw_priv->mem_start + a);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);
+        spin_unlock_irqrestore(&local->lock, flags);
+        return v;
+}
+
+static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);
+        writew(v, hw_priv->mem_start + a);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+        u16 v;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        v = readw(hw_priv->mem_start + a);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);
+        spin_unlock_irqrestore(&local->lock, flags);
+        return v;
+}
+
+#define HFA384X_OUTB(v,a) hfa384x_outb_debug(dev, (a), (v))
+#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))
+#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))
+#define HFA384X_INW(a) hfa384x_inw_debug(dev, (a))
+#define HFA384X_OUTW_DATA(v,a) hfa384x_outw_debug(dev, (a), cpu_to_le16((v)))
+#define HFA384X_INW_DATA(a) (u16) le16_to_cpu(hfa384x_inw_debug(dev, (a)))
+
+#else /* PRISM2_IO_DEBUG */
+
+static inline void hfa384x_outb(struct net_device *dev, int a, u8 v)
+{
+        struct hostap_interface *iface;
+        struct hostap_pci_priv *hw_priv;
+        iface = netdev_priv(dev);
+        hw_priv = iface->local->hw_priv;
+        writeb(v, hw_priv->mem_start + a);
+}
+
+static inline u8 hfa384x_inb(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        struct hostap_pci_priv *hw_priv;
+        iface = netdev_priv(dev);
+        hw_priv = iface->local->hw_priv;
+        return readb(hw_priv->mem_start + a);
+}
+
+static inline void hfa384x_outw(struct net_device *dev, int a, u16 v)
+{
+        struct hostap_interface *iface;
+        struct hostap_pci_priv *hw_priv;
+        iface = netdev_priv(dev);
+        hw_priv = iface->local->hw_priv;
+        writew(v, hw_priv->mem_start + a);
+}
+
+static inline u16 hfa384x_inw(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        struct hostap_pci_priv *hw_priv;
+        iface = netdev_priv(dev);
+        hw_priv = iface->local->hw_priv;
+        return readw(hw_priv->mem_start + a);
+}
+
+#define HFA384X_OUTB(v,a) hfa384x_outb(dev, (a), (v))
+#define HFA384X_INB(a) hfa384x_inb(dev, (a))
+#define HFA384X_OUTW(v,a) hfa384x_outw(dev, (a), (v))
+#define HFA384X_INW(a) hfa384x_inw(dev, (a))
+#define HFA384X_OUTW_DATA(v,a) hfa384x_outw(dev, (a), cpu_to_le16((v)))
+#define HFA384X_INW_DATA(a) (u16) le16_to_cpu(hfa384x_inw(dev, (a)))
+
+#endif /* PRISM2_IO_DEBUG */
+
+
+static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf,
+                            int len)
+{
+        u16 d_off;
+        u16 *pos;
+
+        d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+        pos = (u16 *) buf;
+
+        for ( ; len > 1; len -= 2)
+                *pos++ = HFA384X_INW_DATA(d_off);
+
+        if (len & 1)
+                *((char *) pos) = HFA384X_INB(d_off);
+
+        return 0;
+}
+
+
+static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)
+{
+        u16 d_off;
+        u16 *pos;
+
+        d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+        pos = (u16 *) buf;
+
+        for ( ; len > 1; len -= 2)
+                HFA384X_OUTW_DATA(*pos++, d_off);
+
+        if (len & 1)
+                HFA384X_OUTB(*((char *) pos), d_off);
+
+        return 0;
+}
+
+
+/* FIX: This might change at some point.. */
+#include "hostap_hw.c"
+
+static void prism2_pci_cor_sreset(local_info_t *local)
+{
+        struct net_device *dev = local->dev;
+        u16 reg;
+
+        reg = HFA384X_INB(HFA384X_PCICOR_OFF);
+        printk(KERN_DEBUG "%s: Original COR value: 0x%0x\n", dev->name, reg);
+
+        /* linux-wlan-ng uses extremely long hold and settle times for
+         * COR sreset. A comment in the driver code mentions that the long
+         * delays appear to be necessary. However, at least IBM 22P6901 seems
+         * to work fine with shorter delays.
+         *
+         * Longer delays can be configured by uncommenting following line: */
+/* #define PRISM2_PCI_USE_LONG_DELAYS */
+
+#ifdef PRISM2_PCI_USE_LONG_DELAYS
+        int i;
+
+        HFA384X_OUTW(reg | 0x0080, HFA384X_PCICOR_OFF);
+        mdelay(250);
+
+        HFA384X_OUTW(reg & ~0x0080, HFA384X_PCICOR_OFF);
+        mdelay(500);
+
+        /* Wait for f/w to complete initialization (CMD:BUSY == 0) */
+        i = 2000000 / 10;
+        while ((HFA384X_INW(HFA384X_CMD_OFF) & HFA384X_CMD_BUSY) && --i)
+                udelay(10);
+
+#else /* PRISM2_PCI_USE_LONG_DELAYS */
+
+        HFA384X_OUTW(reg | 0x0080, HFA384X_PCICOR_OFF);
+        mdelay(2);
+        HFA384X_OUTW(reg & ~0x0080, HFA384X_PCICOR_OFF);
+        mdelay(2);
+
+#endif /* PRISM2_PCI_USE_LONG_DELAYS */
+
+        if (HFA384X_INW(HFA384X_CMD_OFF) & HFA384X_CMD_BUSY) {
+                printk(KERN_DEBUG "%s: COR sreset timeout\n", dev->name);
+        }
+}
+
+
+static void prism2_pci_genesis_reset(local_info_t *local, int hcr)
+{
+        struct net_device *dev = local->dev;
+
+        HFA384X_OUTW(0x00C5, HFA384X_PCICOR_OFF);
+        mdelay(10);
+        HFA384X_OUTW(hcr, HFA384X_PCIHCR_OFF);
+        mdelay(10);
+        HFA384X_OUTW(0x0045, HFA384X_PCICOR_OFF);
+        mdelay(10);
+}
+
+
+static struct prism2_helper_functions prism2_pci_funcs =
+{
+        .card_present   = NULL,
+        .cor_sreset     = prism2_pci_cor_sreset,
+        .dev_open       = NULL,
+        .dev_close      = NULL,
+        .genesis_reset  = prism2_pci_genesis_reset,
+        .hw_type        = HOSTAP_HW_PCI,
+};
+
+
+static int prism2_pci_probe(struct pci_dev *pdev,
+                            const struct pci_device_id *id)
+{
+        unsigned long phymem;
+        void __iomem *mem = NULL;
+        local_info_t *local = NULL;
+        struct net_device *dev = NULL;
+        static int cards_found /* = 0 */;
+        int irq_registered = 0;
+        struct hostap_interface *iface;
+        struct hostap_pci_priv *hw_priv;
+
+        hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+        if (hw_priv == NULL)
+                return -ENOMEM;
+        memset(hw_priv, 0, sizeof(*hw_priv));
+
+        if (pci_enable_device(pdev))
+                return -EIO;
+
+        phymem = pci_resource_start(pdev, 0);
+
+        if (!request_mem_region(phymem, pci_resource_len(pdev, 0), "Prism2")) {
+                printk(KERN_ERR "prism2: Cannot reserve PCI memory region\n");
+                goto err_out_disable;
+        }
+
+        mem = ioremap(phymem, pci_resource_len(pdev, 0));
+        if (mem == NULL) {
+                printk(KERN_ERR "prism2: Cannot remap PCI memory region\n") ;
+                goto fail;
+        }
+
+        dev = prism2_init_local_data(&prism2_pci_funcs, cards_found,
+                                     &pdev->dev);
+        if (dev == NULL)
+                goto fail;
+        iface = netdev_priv(dev);
+        local = iface->local;
+        local->hw_priv = hw_priv;
+        cards_found++;
+
+        dev->irq = pdev->irq;
+        hw_priv->mem_start = mem;
+
+        prism2_pci_cor_sreset(local);
+
+        pci_set_drvdata(pdev, dev);
+
+        if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+                        dev)) {
+                printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+                goto fail;
+        } else
+                irq_registered = 1;
+
+        if (!local->pri_only && prism2_hw_config(dev, 1)) {
+                printk(KERN_DEBUG "%s: hardware initialization failed\n",
+                       dev_info);
+                goto fail;
+        }
+
+        printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "
+               "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq);
+
+        return hostap_hw_ready(dev);
+
+ fail:
+        kfree(hw_priv);
+
+        if (irq_registered && dev)
+                free_irq(dev->irq, dev);
+
+        if (mem)
+                iounmap(mem);
+
+        release_mem_region(phymem, pci_resource_len(pdev, 0));
+
+ err_out_disable:
+        pci_disable_device(pdev);
+        kfree(hw_priv);
+        if (local)
+                local->hw_priv = NULL;
+        prism2_free_local_data(dev);
+
+        return -ENODEV;
+}
+
+
+static void prism2_pci_remove(struct pci_dev *pdev)
+{
+        struct net_device *dev;
+        struct hostap_interface *iface;
+        void __iomem *mem_start;
+        struct hostap_pci_priv *hw_priv;
+
+        dev = pci_get_drvdata(pdev);
+        iface = netdev_priv(dev);
+        hw_priv = iface->local->hw_priv;
+
+        /* Reset the hardware, and ensure interrupts are disabled. */
+        prism2_pci_cor_sreset(iface->local);
+        hfa384x_disable_interrupts(dev);
+
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+
+        mem_start = hw_priv->mem_start;
+        kfree(hw_priv);
+        iface->local->hw_priv = NULL;
+        prism2_free_local_data(dev);
+
+        iounmap(mem_start);
+
+        release_mem_region(pci_resource_start(pdev, 0),
+                           pci_resource_len(pdev, 0));
+        pci_disable_device(pdev);
+}
+
+
+#ifdef CONFIG_PM
+static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        if (netif_running(dev)) {
+                netif_stop_queue(dev);
+                netif_device_detach(dev);
+        }
+        prism2_suspend(dev);
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, PCI_D3hot);
+
+        return 0;
+}
+
+static int prism2_pci_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        pci_enable_device(pdev);
+        pci_restore_state(pdev);
+        prism2_hw_config(dev, 0);
+        if (netif_running(dev)) {
+                netif_device_attach(dev);
+                netif_start_queue(dev);
+        }
+
+        return 0;
+}
+#endif /* CONFIG_PM */
+
+
+MODULE_DEVICE_TABLE(pci, prism2_pci_id_table);
+
+static struct pci_driver prism2_pci_drv_id = {
+        .name           = "prism2_pci",
+        .id_table       = prism2_pci_id_table,
+        .probe          = prism2_pci_probe,
+        .remove         = prism2_pci_remove,
+#ifdef CONFIG_PM
+        .suspend        = prism2_pci_suspend,
+        .resume         = prism2_pci_resume,
+#endif /* CONFIG_PM */
+        /* Linux 2.4.6 added save_state and enable_wake that are not used here
+         */
+};
+
+
+static int __init init_prism2_pci(void)
+{
+        printk(KERN_INFO "%s: %s\n", dev_info, version);
+
+        return pci_register_driver(&prism2_pci_drv_id);
+}
+
+
+static void __exit exit_prism2_pci(void)
+{
+        pci_unregister_driver(&prism2_pci_drv_id);
+        printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
+}
+
+
+module_init(init_prism2_pci);
+module_exit(exit_prism2_pci);
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
new file mode 100644
index 000000000000..474ef83d813e
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -0,0 +1,645 @@
+#define PRISM2_PLX
+
+/* Host AP driver's support for PC Cards on PCI adapters using PLX9052 is
+ * based on:
+ * - Host AP driver patch from james@madingley.org
+ * - linux-wlan-ng driver, Copyright (C) AbsoluteValue Systems, Inc.
+ */
+
+
+#include <linux/config.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/if.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/workqueue.h>
+#include <linux/wireless.h>
+#include <net/iw_handler.h>
+
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+
+#include "hostap_wlan.h"
+
+
+static char *version = PRISM2_VERSION " (Jouni Malinen <jkmaline@cc.hut.fi>)";
+static char *dev_info = "hostap_plx";
+
+
+MODULE_AUTHOR("Jouni Malinen");
+MODULE_DESCRIPTION("Support for Intersil Prism2-based 802.11 wireless LAN "
+                   "cards (PLX).");
+MODULE_SUPPORTED_DEVICE("Intersil Prism2-based WLAN cards (PLX)");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(PRISM2_VERSION);
+
+
+static int ignore_cis;
+module_param(ignore_cis, int, 0444);
+MODULE_PARM_DESC(ignore_cis, "Do not verify manfid information in CIS");
+
+
+/* struct local_info::hw_priv */
+struct hostap_plx_priv {
+        void __iomem *attr_mem;
+        unsigned int cor_offset;
+};
+
+
+#define PLX_MIN_ATTR_LEN 512    /* at least 2 x 256 is needed for CIS */
+#define COR_SRESET       0x80
+#define COR_LEVLREQ      0x40
+#define COR_ENABLE_FUNC  0x01
+/* PCI Configuration Registers */
+#define PLX_PCIIPR       0x3d   /* PCI Interrupt Pin */
+/* Local Configuration Registers */
+#define PLX_INTCSR       0x4c   /* Interrupt Control/Status Register */
+#define PLX_INTCSR_PCI_INTEN BIT(6) /* PCI Interrupt Enable */
+#define PLX_CNTRL        0x50
+#define PLX_CNTRL_SERIAL_EEPROM_PRESENT BIT(28)
+
+
+#define PLXDEV(vendor,dev,str) { vendor, dev, PCI_ANY_ID, PCI_ANY_ID }
+
+static struct pci_device_id prism2_plx_id_table[] __devinitdata = {
+        PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"),
+        PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"),
+        PLXDEV(0x126c, 0x8030, "Nortel emobility"),
+        PLXDEV(0x1385, 0x4100, "Netgear MA301"),
+        PLXDEV(0x15e8, 0x0130, "National Datacomm NCP130 (PLX9052)"),
+        PLXDEV(0x15e8, 0x0131, "National Datacomm NCP130 (TMD7160)"),
+        PLXDEV(0x1638, 0x1100, "Eumitcom WL11000"),
+        PLXDEV(0x16ab, 0x1101, "Global Sun Tech GL24110P (?)"),
+        PLXDEV(0x16ab, 0x1102, "Linksys WPC11 with WDT11"),
+        PLXDEV(0x16ab, 0x1103, "Longshine 8031"),
+        PLXDEV(0x16ec, 0x3685, "US Robotics USR2415"),
+        PLXDEV(0xec80, 0xec00, "Belkin F5D6000"),
+        { 0 }
+};
+
+
+/* Array of known Prism2/2.5 PC Card manufactured ids. If your card's manfid
+ * is not listed here, you will need to add it here to get the driver
+ * initialized. */
+static struct prism2_plx_manfid {
+        u16 manfid1, manfid2;
+} prism2_plx_known_manfids[] = {
+        { 0x000b, 0x7110 } /* D-Link DWL-650 Rev. P1 */,
+        { 0x000b, 0x7300 } /* Philips 802.11b WLAN PCMCIA */,
+        { 0x0101, 0x0777 } /* 3Com AirConnect PCI 777A */,
+        { 0x0126, 0x8000 } /* Proxim RangeLAN */,
+        { 0x0138, 0x0002 } /* Compaq WL100 */,
+        { 0x0156, 0x0002 } /* Intersil Prism II Ref. Design (and others) */,
+        { 0x026f, 0x030b } /* Buffalo WLI-CF-S11G */,
+        { 0x0274, 0x1612 } /* Linksys WPC11 Ver 2.5 */,
+        { 0x0274, 0x1613 } /* Linksys WPC11 Ver 3 */,
+        { 0x028a, 0x0002 } /* D-Link DRC-650 */,
+        { 0x0250, 0x0002 } /* Samsung SWL2000-N */,
+        { 0xc250, 0x0002 } /* EMTAC A2424i */,
+        { 0xd601, 0x0002 } /* Z-Com XI300 */,
+        { 0xd601, 0x0005 } /* Zcomax XI-325H 200mW */,
+        { 0, 0}
+};
+
+
+#ifdef PRISM2_IO_DEBUG
+
+static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTB, a, v);
+        outb(v, dev->base_addr + a);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u8 hfa384x_inb_debug(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+        u8 v;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        v = inb(dev->base_addr + a);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INB, a, v);
+        spin_unlock_irqrestore(&local->lock, flags);
+        return v;
+}
+
+static inline void hfa384x_outw_debug(struct net_device *dev, int a, u16 v)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTW, a, v);
+        outw(v, dev->base_addr + a);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline u16 hfa384x_inw_debug(struct net_device *dev, int a)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+        u16 v;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        v = inw(dev->base_addr + a);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INW, a, v);
+        spin_unlock_irqrestore(&local->lock, flags);
+        return v;
+}
+
+static inline void hfa384x_outsw_debug(struct net_device *dev, int a,
+                                       u8 *buf, int wc)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_OUTSW, a, wc);
+        outsw(dev->base_addr + a, buf, wc);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+static inline void hfa384x_insw_debug(struct net_device *dev, int a,
+                                      u8 *buf, int wc)
+{
+        struct hostap_interface *iface;
+        local_info_t *local;
+        unsigned long flags;
+
+        iface = netdev_priv(dev);
+        local = iface->local;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INSW, a, wc);
+        insw(dev->base_addr + a, buf, wc);
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+#define HFA384X_OUTB(v,a) hfa384x_outb_debug(dev, (a), (v))
+#define HFA384X_INB(a) hfa384x_inb_debug(dev, (a))
+#define HFA384X_OUTW(v,a) hfa384x_outw_debug(dev, (a), (v))
+#define HFA384X_INW(a) hfa384x_inw_debug(dev, (a))
+#define HFA384X_OUTSW(a, buf, wc) hfa384x_outsw_debug(dev, (a), (buf), (wc))
+#define HFA384X_INSW(a, buf, wc) hfa384x_insw_debug(dev, (a), (buf), (wc))
+
+#else /* PRISM2_IO_DEBUG */
+
+#define HFA384X_OUTB(v,a) outb((v), dev->base_addr + (a))
+#define HFA384X_INB(a) inb(dev->base_addr + (a))
+#define HFA384X_OUTW(v,a) outw((v), dev->base_addr + (a))
+#define HFA384X_INW(a) inw(dev->base_addr + (a))
+#define HFA384X_INSW(a, buf, wc) insw(dev->base_addr + (a), buf, wc)
+#define HFA384X_OUTSW(a, buf, wc) outsw(dev->base_addr + (a), buf, wc)
+
+#endif /* PRISM2_IO_DEBUG */
+
+
+static int hfa384x_from_bap(struct net_device *dev, u16 bap, void *buf,
+                            int len)
+{
+        u16 d_off;
+        u16 *pos;
+
+        d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+        pos = (u16 *) buf;
+
+        if (len / 2)
+                HFA384X_INSW(d_off, buf, len / 2);
+        pos += len / 2;
+
+        if (len & 1)
+                *((char *) pos) = HFA384X_INB(d_off);
+
+        return 0;
+}
+
+
+static int hfa384x_to_bap(struct net_device *dev, u16 bap, void *buf, int len)
+{
+        u16 d_off;
+        u16 *pos;
+
+        d_off = (bap == 1) ? HFA384X_DATA1_OFF : HFA384X_DATA0_OFF;
+        pos = (u16 *) buf;
+
+        if (len / 2)
+                HFA384X_OUTSW(d_off, buf, len / 2);
+        pos += len / 2;
+
+        if (len & 1)
+                HFA384X_OUTB(*((char *) pos), d_off);
+
+        return 0;
+}
+
+
+/* FIX: This might change at some point.. */
+#include "hostap_hw.c"
+
+
+static void prism2_plx_cor_sreset(local_info_t *local)
+{
+        unsigned char corsave;
+        struct hostap_plx_priv *hw_priv = local->hw_priv;
+
+        printk(KERN_DEBUG "%s: Doing reset via direct COR access.\n",
+               dev_info);
+
+        /* Set sreset bit of COR and clear it after hold time */
+
+        if (hw_priv->attr_mem == NULL) {
+                /* TMD7160 - COR at card's first I/O addr */
+                corsave = inb(hw_priv->cor_offset);
+                outb(corsave | COR_SRESET, hw_priv->cor_offset);
+                mdelay(2);
+                outb(corsave & ~COR_SRESET, hw_priv->cor_offset);
+                mdelay(2);
+        } else {
+                /* PLX9052 */
+                corsave = readb(hw_priv->attr_mem + hw_priv->cor_offset);
+                writeb(corsave | COR_SRESET,
+                       hw_priv->attr_mem + hw_priv->cor_offset);
+                mdelay(2);
+                writeb(corsave & ~COR_SRESET,
+                       hw_priv->attr_mem + hw_priv->cor_offset);
+                mdelay(2);
+        }
+}
+
+
+static void prism2_plx_genesis_reset(local_info_t *local, int hcr)
+{
+        unsigned char corsave;
+        struct hostap_plx_priv *hw_priv = local->hw_priv;
+
+        if (hw_priv->attr_mem == NULL) {
+                /* TMD7160 - COR at card's first I/O addr */
+                corsave = inb(hw_priv->cor_offset);
+                outb(corsave | COR_SRESET, hw_priv->cor_offset);
+                mdelay(10);
+                outb(hcr, hw_priv->cor_offset + 2);
+                mdelay(10);
+                outb(corsave & ~COR_SRESET, hw_priv->cor_offset);
+                mdelay(10);
+        } else {
+                /* PLX9052 */
+                corsave = readb(hw_priv->attr_mem + hw_priv->cor_offset);
+                writeb(corsave | COR_SRESET,
+                       hw_priv->attr_mem + hw_priv->cor_offset);
+                mdelay(10);
+                writeb(hcr, hw_priv->attr_mem + hw_priv->cor_offset + 2);
+                mdelay(10);
+                writeb(corsave & ~COR_SRESET,
+                       hw_priv->attr_mem + hw_priv->cor_offset);
+                mdelay(10);
+        }
+}
+
+
+static struct prism2_helper_functions prism2_plx_funcs =
+{
+        .card_present   = NULL,
+        .cor_sreset     = prism2_plx_cor_sreset,
+        .dev_open       = NULL,
+        .dev_close      = NULL,
+        .genesis_reset  = prism2_plx_genesis_reset,
+        .hw_type        = HOSTAP_HW_PLX,
+};
+
+
+static int prism2_plx_check_cis(void __iomem *attr_mem, int attr_len,
+                                unsigned int *cor_offset,
+                                unsigned int *cor_index)
+{
+#define CISTPL_CONFIG 0x1A
+#define CISTPL_MANFID 0x20
+#define CISTPL_END 0xFF
+#define CIS_MAX_LEN 256
+        u8 *cis;
+        int i, pos;
+        unsigned int rmsz, rasz, manfid1, manfid2;
+        struct prism2_plx_manfid *manfid;
+
+        cis = kmalloc(CIS_MAX_LEN, GFP_KERNEL);
+        if (cis == NULL)
+                return -ENOMEM;
+
+        /* read CIS; it is in even offsets in the beginning of attr_mem */
+        for (i = 0; i < CIS_MAX_LEN; i++)
+                cis[i] = readb(attr_mem + 2 * i);
+        printk(KERN_DEBUG "%s: CIS: %02x %02x %02x %02x %02x %02x ...\n",
+               dev_info, cis[0], cis[1], cis[2], cis[3], cis[4], cis[5]);
+
+        /* set reasonable defaults for Prism2 cards just in case CIS parsing
+         * fails */
+        *cor_offset = 0x3e0;
+        *cor_index = 0x01;
+        manfid1 = manfid2 = 0;
+
+        pos = 0;
+        while (pos < CIS_MAX_LEN - 1 && cis[pos] != CISTPL_END) {
+                if (pos + cis[pos + 1] >= CIS_MAX_LEN)
+                        goto cis_error;
+
+                switch (cis[pos]) {
+                case CISTPL_CONFIG:
+                        if (cis[pos + 1] < 1)
+                                goto cis_error;
+                        rmsz = (cis[pos + 2] & 0x3c) >> 2;
+                        rasz = cis[pos + 2] & 0x03;
+                        if (4 + rasz + rmsz > cis[pos + 1])
+                                goto cis_error;
+                        *cor_index = cis[pos + 3] & 0x3F;
+                        *cor_offset = 0;
+                        for (i = 0; i <= rasz; i++)
+                                *cor_offset += cis[pos + 4 + i] << (8 * i);
+                        printk(KERN_DEBUG "%s: cor_index=0x%x "
+                               "cor_offset=0x%x\n", dev_info,
+                               *cor_index, *cor_offset);
+                        if (*cor_offset > attr_len) {
+                                printk(KERN_ERR "%s: COR offset not within "
+                                       "attr_mem\n", dev_info);
+                                kfree(cis);
+                                return -1;
+                        }
+                        break;
+
+                case CISTPL_MANFID:
+                        if (cis[pos + 1] < 4)
+                                goto cis_error;
+                        manfid1 = cis[pos + 2] + (cis[pos + 3] << 8);
+                        manfid2 = cis[pos + 4] + (cis[pos + 5] << 8);
+                        printk(KERN_DEBUG "%s: manfid=0x%04x, 0x%04x\n",
+                               dev_info, manfid1, manfid2);
+                        break;
+                }
+
+                pos += cis[pos + 1] + 2;
+        }
+
+        if (pos >= CIS_MAX_LEN || cis[pos] != CISTPL_END)
+                goto cis_error;
+
+        for (manfid = prism2_plx_known_manfids; manfid->manfid1 != 0; manfid++)
+                if (manfid1 == manfid->manfid1 && manfid2 == manfid->manfid2) {
+                        kfree(cis);
+                        return 0;
+                }
+
+        printk(KERN_INFO "%s: unknown manfid 0x%04x, 0x%04x - assuming this is"
+               " not supported card\n", dev_info, manfid1, manfid2);
+        goto fail;
+
+ cis_error:
+        printk(KERN_WARNING "%s: invalid CIS data\n", dev_info);
+
+ fail:
+        kfree(cis);
+        if (ignore_cis) {
+                printk(KERN_INFO "%s: ignore_cis parameter set - ignoring "
+                       "errors during CIS verification\n", dev_info);
+                return 0;
+        }
+        return -1;
+}
+
+
+static int prism2_plx_probe(struct pci_dev *pdev,
+                            const struct pci_device_id *id)
+{
+        unsigned int pccard_ioaddr, plx_ioaddr;
+        unsigned long pccard_attr_mem;
+        unsigned int pccard_attr_len;
+        void __iomem *attr_mem = NULL;
+        unsigned int cor_offset, cor_index;
+        u32 reg;
+        local_info_t *local = NULL;
+        struct net_device *dev = NULL;
+        struct hostap_interface *iface;
+        static int cards_found /* = 0 */;
+        int irq_registered = 0;
+        int tmd7160;
+        struct hostap_plx_priv *hw_priv;
+
+        hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
+        if (hw_priv == NULL)
+                return -ENOMEM;
+        memset(hw_priv, 0, sizeof(*hw_priv));
+
+        if (pci_enable_device(pdev))
+                return -EIO;
+
+        /* National Datacomm NCP130 based on TMD7160, not PLX9052. */
+        tmd7160 = (pdev->vendor == 0x15e8) && (pdev->device == 0x0131);
+
+        plx_ioaddr = pci_resource_start(pdev, 1);
+        pccard_ioaddr = pci_resource_start(pdev, tmd7160 ? 2 : 3);
+
+        if (tmd7160) {
+                /* TMD7160 */
+                attr_mem = NULL; /* no access to PC Card attribute memory */
+
+                printk(KERN_INFO "TMD7160 PCI/PCMCIA adapter: io=0x%x, "
+                       "irq=%d, pccard_io=0x%x\n",
+                       plx_ioaddr, pdev->irq, pccard_ioaddr);
+
+                cor_offset = plx_ioaddr;
+                cor_index = 0x04;
+
+                outb(cor_index | COR_LEVLREQ | COR_ENABLE_FUNC, plx_ioaddr);
+                mdelay(1);
+                reg = inb(plx_ioaddr);
+                if (reg != (cor_index | COR_LEVLREQ | COR_ENABLE_FUNC)) {
+                        printk(KERN_ERR "%s: Error setting COR (expected="
+                               "0x%02x, was=0x%02x)\n", dev_info,
+                               cor_index | COR_LEVLREQ | COR_ENABLE_FUNC, reg);
+                        goto fail;
+                }
+        } else {
+                /* PLX9052 */
+                pccard_attr_mem = pci_resource_start(pdev, 2);
+                pccard_attr_len = pci_resource_len(pdev, 2);
+                if (pccard_attr_len < PLX_MIN_ATTR_LEN)
+                        goto fail;
+
+
+                attr_mem = ioremap(pccard_attr_mem, pccard_attr_len);
+                if (attr_mem == NULL) {
+                        printk(KERN_ERR "%s: cannot remap attr_mem\n",
+                               dev_info);
+                        goto fail;
+                }
+
+                printk(KERN_INFO "PLX9052 PCI/PCMCIA adapter: "
+                       "mem=0x%lx, plx_io=0x%x, irq=%d, pccard_io=0x%x\n",
+                       pccard_attr_mem, plx_ioaddr, pdev->irq, pccard_ioaddr);
+
+                if (prism2_plx_check_cis(attr_mem, pccard_attr_len,
+                                         &cor_offset, &cor_index)) {
+                        printk(KERN_INFO "Unknown PC Card CIS - not a "
+                               "Prism2/2.5 card?\n");
+                        goto fail;
+                }
+
+                printk(KERN_DEBUG "Prism2/2.5 PC Card detected in PLX9052 "
+                       "adapter\n");
+
+                /* Write COR to enable PC Card */
+                writeb(cor_index | COR_LEVLREQ | COR_ENABLE_FUNC,
+                       attr_mem + cor_offset);
+
+                /* Enable PCI interrupts if they are not already enabled */
+                reg = inl(plx_ioaddr + PLX_INTCSR);
+                printk(KERN_DEBUG "PLX_INTCSR=0x%x\n", reg);
+                if (!(reg & PLX_INTCSR_PCI_INTEN)) {
+                        outl(reg | PLX_INTCSR_PCI_INTEN,
+                             plx_ioaddr + PLX_INTCSR);
+                        if (!(inl(plx_ioaddr + PLX_INTCSR) &
+                              PLX_INTCSR_PCI_INTEN)) {
+                                printk(KERN_WARNING "%s: Could not enable "
+                                       "Local Interrupts\n", dev_info);
+                                goto fail;
+                        }
+                }
+
+                reg = inl(plx_ioaddr + PLX_CNTRL);
+                printk(KERN_DEBUG "PLX_CNTRL=0x%x (Serial EEPROM "
+                       "present=%d)\n",
+                       reg, (reg & PLX_CNTRL_SERIAL_EEPROM_PRESENT) != 0);
+                /* should set PLX_PCIIPR to 0x01 (INTA#) if Serial EEPROM is
+                 * not present; but are there really such cards in use(?) */
+        }
+
+        dev = prism2_init_local_data(&prism2_plx_funcs, cards_found,
+                                     &pdev->dev);
+        if (dev == NULL)
+                goto fail;
+        iface = netdev_priv(dev);
+        local = iface->local;
+        local->hw_priv = hw_priv;
+        cards_found++;
+
+        dev->irq = pdev->irq;
+        dev->base_addr = pccard_ioaddr;
+        hw_priv->attr_mem = attr_mem;
+        hw_priv->cor_offset = cor_offset;
+
+        pci_set_drvdata(pdev, dev);
+
+        if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+                        dev)) {
+                printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+                goto fail;
+        } else
+                irq_registered = 1;
+
+        if (prism2_hw_config(dev, 1)) {
+                printk(KERN_DEBUG "%s: hardware initialization failed\n",
+                       dev_info);
+                goto fail;
+        }
+
+        return hostap_hw_ready(dev);
+
+ fail:
+        kfree(hw_priv);
+        if (local)
+                local->hw_priv = NULL;
+        prism2_free_local_data(dev);
+
+        if (irq_registered && dev)
+                free_irq(dev->irq, dev);
+
+        if (attr_mem)
+                iounmap(attr_mem);
+
+        pci_disable_device(pdev);
+
+        return -ENODEV;
+}
+
+
+static void prism2_plx_remove(struct pci_dev *pdev)
+{
+        struct net_device *dev;
+        struct hostap_interface *iface;
+        struct hostap_plx_priv *hw_priv;
+
+        dev = pci_get_drvdata(pdev);
+        iface = netdev_priv(dev);
+        hw_priv = iface->local->hw_priv;
+
+        /* Reset the hardware, and ensure interrupts are disabled. */
+        prism2_plx_cor_sreset(iface->local);
+        hfa384x_disable_interrupts(dev);
+
+        if (hw_priv->attr_mem)
+                iounmap(hw_priv->attr_mem);
+        if (dev->irq)
+                free_irq(dev->irq, dev);
+
+        kfree(iface->local->hw_priv);
+        iface->local->hw_priv = NULL;
+        prism2_free_local_data(dev);
+        pci_disable_device(pdev);
+}
+
+
+MODULE_DEVICE_TABLE(pci, prism2_plx_id_table);
+
+static struct pci_driver prism2_plx_drv_id = {
+        .name           = "prism2_plx",
+        .id_table       = prism2_plx_id_table,
+        .probe          = prism2_plx_probe,
+        .remove         = prism2_plx_remove,
+        .suspend        = NULL,
+        .resume         = NULL,
+        .enable_wake    = NULL
+};
+
+
+static int __init init_prism2_plx(void)
+{
+        printk(KERN_INFO "%s: %s\n", dev_info, version);
+
+        return pci_register_driver(&prism2_plx_drv_id);
+}
+
+
+static void __exit exit_prism2_plx(void)
+{
+        pci_unregister_driver(&prism2_plx_drv_id);
+        printk(KERN_INFO "%s: Driver unloaded\n", dev_info);
+}
+
+
+module_init(init_prism2_plx);
+module_exit(exit_prism2_plx);
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
new file mode 100644
index 000000000000..a0a4cbd4937a
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -0,0 +1,448 @@
+/* /proc routines for Host AP driver */
+
+#define PROC_LIMIT (PAGE_SIZE - 80)
+
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+static int prism2_debug_proc_read(char *page, char **start, off_t off,
+                                  int count, int *eof, void *data)
+{
+        char *p = page;
+        local_info_t *local = (local_info_t *) data;
+        int i;
+
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+
+        p += sprintf(p, "next_txfid=%d next_alloc=%d\n",
+                     local->next_txfid, local->next_alloc);
+        for (i = 0; i < PRISM2_TXFID_COUNT; i++)
+                p += sprintf(p, "FID: tx=%04X intransmit=%04X\n",
+                             local->txfid[i], local->intransmitfid[i]);
+        p += sprintf(p, "FW TX rate control: %d\n", local->fw_tx_rate_control);
+        p += sprintf(p, "beacon_int=%d\n", local->beacon_int);
+        p += sprintf(p, "dtim_period=%d\n", local->dtim_period);
+        p += sprintf(p, "wds_max_connections=%d\n",
+                     local->wds_max_connections);
+        p += sprintf(p, "dev_enabled=%d\n", local->dev_enabled);
+        p += sprintf(p, "sw_tick_stuck=%d\n", local->sw_tick_stuck);
+        for (i = 0; i < WEP_KEYS; i++) {
+                if (local->crypt[i] && local->crypt[i]->ops) {
+                        p += sprintf(p, "crypt[%d]=%s\n",
+                                     i, local->crypt[i]->ops->name);
+                }
+        }
+        p += sprintf(p, "pri_only=%d\n", local->pri_only);
+        p += sprintf(p, "pci=%d\n", local->func->hw_type == HOSTAP_HW_PCI);
+        p += sprintf(p, "sram_type=%d\n", local->sram_type);
+        p += sprintf(p, "no_pri=%d\n", local->no_pri);
+
+        return (p - page);
+}
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+
+
+static int prism2_stats_proc_read(char *page, char **start, off_t off,
+                                  int count, int *eof, void *data)
+{
+        char *p = page;
+        local_info_t *local = (local_info_t *) data;
+        struct comm_tallies_sums *sums = (struct comm_tallies_sums *)
+                &local->comm_tallies;
+
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+
+        p += sprintf(p, "TxUnicastFrames=%u\n", sums->tx_unicast_frames);
+        p += sprintf(p, "TxMulticastframes=%u\n", sums->tx_multicast_frames);
+        p += sprintf(p, "TxFragments=%u\n", sums->tx_fragments);
+        p += sprintf(p, "TxUnicastOctets=%u\n", sums->tx_unicast_octets);
+        p += sprintf(p, "TxMulticastOctets=%u\n", sums->tx_multicast_octets);
+        p += sprintf(p, "TxDeferredTransmissions=%u\n",
+                     sums->tx_deferred_transmissions);
+        p += sprintf(p, "TxSingleRetryFrames=%u\n",
+                     sums->tx_single_retry_frames);
+        p += sprintf(p, "TxMultipleRetryFrames=%u\n",
+                     sums->tx_multiple_retry_frames);
+        p += sprintf(p, "TxRetryLimitExceeded=%u\n",
+                     sums->tx_retry_limit_exceeded);
+        p += sprintf(p, "TxDiscards=%u\n", sums->tx_discards);
+        p += sprintf(p, "RxUnicastFrames=%u\n", sums->rx_unicast_frames);
+        p += sprintf(p, "RxMulticastFrames=%u\n", sums->rx_multicast_frames);
+        p += sprintf(p, "RxFragments=%u\n", sums->rx_fragments);
+        p += sprintf(p, "RxUnicastOctets=%u\n", sums->rx_unicast_octets);
+        p += sprintf(p, "RxMulticastOctets=%u\n", sums->rx_multicast_octets);
+        p += sprintf(p, "RxFCSErrors=%u\n", sums->rx_fcs_errors);
+        p += sprintf(p, "RxDiscardsNoBuffer=%u\n",
+                     sums->rx_discards_no_buffer);
+        p += sprintf(p, "TxDiscardsWrongSA=%u\n", sums->tx_discards_wrong_sa);
+        p += sprintf(p, "RxDiscardsWEPUndecryptable=%u\n",
+                     sums->rx_discards_wep_undecryptable);
+        p += sprintf(p, "RxMessageInMsgFragments=%u\n",
+                     sums->rx_message_in_msg_fragments);
+        p += sprintf(p, "RxMessageInBadMsgFragments=%u\n",
+                     sums->rx_message_in_bad_msg_fragments);
+        /* FIX: this may grow too long for one page(?) */
+
+        return (p - page);
+}
+
+
+static int prism2_wds_proc_read(char *page, char **start, off_t off,
+                                int count, int *eof, void *data)
+{
+        char *p = page;
+        local_info_t *local = (local_info_t *) data;
+        struct list_head *ptr;
+        struct hostap_interface *iface;
+
+        if (off > PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        read_lock_bh(&local->iface_lock);
+        list_for_each(ptr, &local->hostap_interfaces) {
+                iface = list_entry(ptr, struct hostap_interface, list);
+                if (iface->type != HOSTAP_INTERFACE_WDS)
+                        continue;
+                p += sprintf(p, "%s\t" MACSTR "\n",
+                             iface->dev->name,
+                             MAC2STR(iface->u.wds.remote_addr));
+                if ((p - page) > PROC_LIMIT) {
+                        printk(KERN_DEBUG "%s: wds proc did not fit\n",
+                               local->dev->name);
+                        break;
+                }
+        }
+        read_unlock_bh(&local->iface_lock);
+
+        if ((p - page) <= off) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = page + off;
+
+        return (p - page - off);
+}
+
+
+static int prism2_bss_list_proc_read(char *page, char **start, off_t off,
+                                     int count, int *eof, void *data)
+{
+        char *p = page;
+        local_info_t *local = (local_info_t *) data;
+        struct list_head *ptr;
+        struct hostap_bss_info *bss;
+        int i;
+
+        if (off > PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        p += sprintf(p, "#BSSID\tlast_update\tcount\tcapab_info\tSSID(txt)\t"
+                     "SSID(hex)\tWPA IE\n");
+        spin_lock_bh(&local->lock);
+        list_for_each(ptr, &local->bss_list) {
+                bss = list_entry(ptr, struct hostap_bss_info, list);
+                p += sprintf(p, MACSTR "\t%lu\t%u\t0x%x\t",
+                             MAC2STR(bss->bssid), bss->last_update,
+                             bss->count, bss->capab_info);
+                for (i = 0; i < bss->ssid_len; i++) {
+                        p += sprintf(p, "%c",
+                                     bss->ssid[i] >= 32 && bss->ssid[i] < 127 ?
+                                     bss->ssid[i] : '_');
+                }
+                p += sprintf(p, "\t");
+                for (i = 0; i < bss->ssid_len; i++) {
+                        p += sprintf(p, "%02x", bss->ssid[i]);
+                }
+                p += sprintf(p, "\t");
+                for (i = 0; i < bss->wpa_ie_len; i++) {
+                        p += sprintf(p, "%02x", bss->wpa_ie[i]);
+                }
+                p += sprintf(p, "\n");
+                if ((p - page) > PROC_LIMIT) {
+                        printk(KERN_DEBUG "%s: BSS proc did not fit\n",
+                               local->dev->name);
+                        break;
+                }
+        }
+        spin_unlock_bh(&local->lock);
+
+        if ((p - page) <= off) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = page + off;
+
+        return (p - page - off);
+}
+
+
+static int prism2_crypt_proc_read(char *page, char **start, off_t off,
+                                  int count, int *eof, void *data)
+{
+        char *p = page;
+        local_info_t *local = (local_info_t *) data;
+        int i;
+
+        if (off > PROC_LIMIT) {
+                *eof = 1;
+                return 0;
+        }
+
+        p += sprintf(p, "tx_keyidx=%d\n", local->tx_keyidx);
+        for (i = 0; i < WEP_KEYS; i++) {
+                if (local->crypt[i] && local->crypt[i]->ops &&
+                    local->crypt[i]->ops->print_stats) {
+                        p = local->crypt[i]->ops->print_stats(
+                                p, local->crypt[i]->priv);
+                }
+        }
+
+        if ((p - page) <= off) {
+                *eof = 1;
+                return 0;
+        }
+
+        *start = page + off;
+
+        return (p - page - off);
+}
+
+
+static int prism2_pda_proc_read(char *page, char **start, off_t off,
+                                int count, int *eof, void *data)
+{
+        local_info_t *local = (local_info_t *) data;
+
+        if (local->pda == NULL || off >= PRISM2_PDA_SIZE) {
+                *eof = 1;
+                return 0;
+        }
+
+        if (off + count > PRISM2_PDA_SIZE)
+                count = PRISM2_PDA_SIZE - off;
+
+        memcpy(page, local->pda + off, count);
+        return count;
+}
+
+
+static int prism2_aux_dump_proc_read(char *page, char **start, off_t off,
+                                     int count, int *eof, void *data)
+{
+        local_info_t *local = (local_info_t *) data;
+
+        if (local->func->read_aux == NULL) {
+                *eof = 1;
+                return 0;
+        }
+
+        if (local->func->read_aux(local->dev, off, count, page)) {
+                *eof = 1;
+                return 0;
+        }
+        *start = page;
+
+        return count;
+}
+
+
+#ifdef PRISM2_IO_DEBUG
+static int prism2_io_debug_proc_read(char *page, char **start, off_t off,
+                                     int count, int *eof, void *data)
+{
+        local_info_t *local = (local_info_t *) data;
+        int head = local->io_debug_head;
+        int start_bytes, left, copy, copied;
+
+        if (off + count > PRISM2_IO_DEBUG_SIZE * 4) {
+                *eof = 1;
+                if (off >= PRISM2_IO_DEBUG_SIZE * 4)
+                        return 0;
+                count = PRISM2_IO_DEBUG_SIZE * 4 - off;
+        }
+
+        copied = 0;
+        start_bytes = (PRISM2_IO_DEBUG_SIZE - head) * 4;
+        left = count;
+
+        if (off < start_bytes) {
+                copy = start_bytes - off;
+                if (copy > count)
+                        copy = count;
+                memcpy(page, ((u8 *) &local->io_debug[head]) + off, copy);
+                left -= copy;
+                if (left > 0)
+                        memcpy(&page[copy], local->io_debug, left);
+        } else {
+                memcpy(page, ((u8 *) local->io_debug) + (off - start_bytes),
+                       left);
+        }
+
+        *start = page;
+
+        return count;
+}
+#endif /* PRISM2_IO_DEBUG */
+
+
+#ifndef PRISM2_NO_STATION_MODES
+static int prism2_scan_results_proc_read(char *page, char **start, off_t off,
+                                         int count, int *eof, void *data)
+{
+        char *p = page;
+        local_info_t *local = (local_info_t *) data;
+        int entry, i, len, total = 0;
+        struct hfa384x_hostscan_result *scanres;
+        u8 *pos;
+
+        p += sprintf(p, "CHID ANL SL BcnInt Capab Rate BSSID ATIM SupRates "
+                     "SSID\n");
+
+        spin_lock_bh(&local->lock);
+        for (entry = 0; entry < local->last_scan_results_count; entry++) {
+                scanres = &local->last_scan_results[entry];
+
+                if (total + (p - page) <= off) {
+                        total += p - page;
+                        p = page;
+                }
+                if (total + (p - page) > off + count)
+                        break;
+                if ((p - page) > (PAGE_SIZE - 200))
+                        break;
+
+                p += sprintf(p, "%d %d %d %d 0x%02x %d " MACSTR " %d ",
+                             le16_to_cpu(scanres->chid),
+                             (s16) le16_to_cpu(scanres->anl),
+                             (s16) le16_to_cpu(scanres->sl),
+                             le16_to_cpu(scanres->beacon_interval),
+                             le16_to_cpu(scanres->capability),
+                             le16_to_cpu(scanres->rate),
+                             MAC2STR(scanres->bssid),
+                             le16_to_cpu(scanres->atim));
+
+                pos = scanres->sup_rates;
+                for (i = 0; i < sizeof(scanres->sup_rates); i++) {
+                        if (pos[i] == 0)
+                                break;
+                        p += sprintf(p, "<%02x>", pos[i]);
+                }
+                p += sprintf(p, " ");
+
+                pos = scanres->ssid;
+                len = le16_to_cpu(scanres->ssid_len);
+                if (len > 32)
+                        len = 32;
+                for (i = 0; i < len; i++) {
+                        unsigned char c = pos[i];
+                        if (c >= 32 && c < 127)
+                                p += sprintf(p, "%c", c);
+                        else
+                                p += sprintf(p, "<%02x>", c);
+                }
+                p += sprintf(p, "\n");
+        }
+        spin_unlock_bh(&local->lock);
+
+        total += (p - page);
+        if (total >= off + count)
+                *eof = 1;
+
+        if (total < off) {
+                *eof = 1;
+                return 0;
+        }
+
+        len = total - off;
+        if (len > (p - page))
+                len = p - page;
+        *start = p - len;
+        if (len > count)
+                len = count;
+
+        return len;
+}
+#endif /* PRISM2_NO_STATION_MODES */
+
+
+void hostap_init_proc(local_info_t *local)
+{
+        local->proc = NULL;
+
+        if (hostap_proc == NULL) {
+                printk(KERN_WARNING "%s: hostap proc directory not created\n",
+                       local->dev->name);
+                return;
+        }
+
+        local->proc = proc_mkdir(local->ddev->name, hostap_proc);
+        if (local->proc == NULL) {
+                printk(KERN_INFO "/proc/net/hostap/%s creation failed\n",
+                       local->ddev->name);
+                return;
+        }
+
+#ifndef PRISM2_NO_PROCFS_DEBUG
+        create_proc_read_entry("debug", 0, local->proc,
+                               prism2_debug_proc_read, local);
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+        create_proc_read_entry("stats", 0, local->proc,
+                               prism2_stats_proc_read, local);
+        create_proc_read_entry("wds", 0, local->proc,
+                               prism2_wds_proc_read, local);
+        create_proc_read_entry("pda", 0, local->proc,
+                               prism2_pda_proc_read, local);
+        create_proc_read_entry("aux_dump", 0, local->proc,
+                               prism2_aux_dump_proc_read, local);
+        create_proc_read_entry("bss_list", 0, local->proc,
+                               prism2_bss_list_proc_read, local);
+        create_proc_read_entry("crypt", 0, local->proc,
+                               prism2_crypt_proc_read, local);
+#ifdef PRISM2_IO_DEBUG
+        create_proc_read_entry("io_debug", 0, local->proc,
+                               prism2_io_debug_proc_read, local);
+#endif /* PRISM2_IO_DEBUG */
+#ifndef PRISM2_NO_STATION_MODES
+        create_proc_read_entry("scan_results", 0, local->proc,
+                               prism2_scan_results_proc_read, local);
+#endif /* PRISM2_NO_STATION_MODES */
+}
+
+
+void hostap_remove_proc(local_info_t *local)
+{
+        if (local->proc != NULL) {
+#ifndef PRISM2_NO_STATION_MODES
+                remove_proc_entry("scan_results", local->proc);
+#endif /* PRISM2_NO_STATION_MODES */
+#ifdef PRISM2_IO_DEBUG
+                remove_proc_entry("io_debug", local->proc);
+#endif /* PRISM2_IO_DEBUG */
+                remove_proc_entry("pda", local->proc);
+                remove_proc_entry("aux_dump", local->proc);
+                remove_proc_entry("wds", local->proc);
+                remove_proc_entry("stats", local->proc);
+                remove_proc_entry("bss_list", local->proc);
+                remove_proc_entry("crypt", local->proc);
+#ifndef PRISM2_NO_PROCFS_DEBUG
+                remove_proc_entry("debug", local->proc);
+#endif /* PRISM2_NO_PROCFS_DEBUG */
+                if (hostap_proc != NULL)
+                        remove_proc_entry(local->proc->name, hostap_proc);
+        }
+}
+
+
+EXPORT_SYMBOL(hostap_init_proc);
+EXPORT_SYMBOL(hostap_remove_proc);
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
new file mode 100644
index 000000000000..cc061e1560d3
--- /dev/null
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -0,0 +1,1033 @@
+#ifndef HOSTAP_WLAN_H
+#define HOSTAP_WLAN_H
+
+#include "hostap_config.h"
+#include "hostap_common.h"
+
+#define MAX_PARM_DEVICES 8
+#define PARM_MIN_MAX "1-" __MODULE_STRING(MAX_PARM_DEVICES)
+#define DEF_INTS -1, -1, -1, -1, -1, -1, -1
+#define GET_INT_PARM(var,idx) var[var[idx] < 0 ? 0 : idx]
+
+
+/* Specific skb->protocol value that indicates that the packet already contains
+ * txdesc header.
+ * FIX: This might need own value that would be allocated especially for Prism2
+ * txdesc; ETH_P_CONTROL is commented as "Card specific control frames".
+ * However, these skb's should have only minimal path in the kernel side since
+ * prism2_send_mgmt() sends these with dev_queue_xmit() to prism2_tx(). */
+#define ETH_P_HOSTAP ETH_P_CONTROL
+
+/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
+ * (from linux-wlan-ng) */
+struct linux_wlan_ng_val {
+        u32 did;
+        u16 status, len;
+        u32 data;
+} __attribute__ ((packed));
+
+struct linux_wlan_ng_prism_hdr {
+        u32 msgcode, msglen;
+        char devname[16];
+        struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
+                noise, rate, istx, frmlen;
+} __attribute__ ((packed));
+
+struct linux_wlan_ng_cap_hdr {
+        u32 version;
+        u32 length;
+        u64 mactime;
+        u64 hosttime;
+        u32 phytype;
+        u32 channel;
+        u32 datarate;
+        u32 antenna;
+        u32 priority;
+        u32 ssi_type;
+        s32 ssi_signal;
+        s32 ssi_noise;
+        u32 preamble;
+        u32 encoding;
+} __attribute__ ((packed));
+
+#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
+#define LWNG_CAPHDR_VERSION 0x80211001
+
+struct hfa384x_rx_frame {
+        /* HFA384X RX frame descriptor */
+        u16 status; /* HFA384X_RX_STATUS_ flags */
+        u32 time; /* timestamp, 1 microsecond resolution */
+        u8 silence; /* 27 .. 154; seems to be 0 */
+        u8 signal; /* 27 .. 154 */
+        u8 rate; /* 10, 20, 55, or 110 */
+        u8 rxflow;
+        u32 reserved;
+
+        /* 802.11 */
+        u16 frame_control;
+        u16 duration_id;
+        u8 addr1[6];
+        u8 addr2[6];
+        u8 addr3[6];
+        u16 seq_ctrl;
+        u8 addr4[6];
+        u16 data_len;
+
+        /* 802.3 */
+        u8 dst_addr[6];
+        u8 src_addr[6];
+        u16 len;
+
+        /* followed by frame data; max 2304 bytes */
+} __attribute__ ((packed));
+
+
+struct hfa384x_tx_frame {
+        /* HFA384X TX frame descriptor */
+        u16 status; /* HFA384X_TX_STATUS_ flags */
+        u16 reserved1;
+        u16 reserved2;
+        u32 sw_support;
+        u8 retry_count; /* not yet implemented */
+        u8 tx_rate; /* Host AP only; 0 = firmware, or 10, 20, 55, 110 */
+        u16 tx_control; /* HFA384X_TX_CTRL_ flags */
+
+        /* 802.11 */
+        u16 frame_control; /* parts not used */
+        u16 duration_id;
+        u8 addr1[6];
+        u8 addr2[6]; /* filled by firmware */
+        u8 addr3[6];
+        u16 seq_ctrl; /* filled by firmware */
+        u8 addr4[6];
+        u16 data_len;
+
+        /* 802.3 */
+        u8 dst_addr[6];
+        u8 src_addr[6];
+        u16 len;
+
+        /* followed by frame data; max 2304 bytes */
+} __attribute__ ((packed));
+
+
+struct hfa384x_rid_hdr
+{
+        u16 len;
+        u16 rid;
+} __attribute__ ((packed));
+
+
+/* Macro for converting signal levels (range 27 .. 154) to wireless ext
+ * dBm value with some accuracy */
+#define HFA384X_LEVEL_TO_dBm(v) 0x100 + (v) * 100 / 255 - 100
+
+#define HFA384X_LEVEL_TO_dBm_sign(v) (v) * 100 / 255 - 100
+
+struct hfa384x_scan_request {
+        u16 channel_list;
+        u16 txrate; /* HFA384X_RATES_* */
+} __attribute__ ((packed));
+
+struct hfa384x_hostscan_request {
+        u16 channel_list;
+        u16 txrate;
+        u16 target_ssid_len;
+        u8 target_ssid[32];
+} __attribute__ ((packed));
+
+struct hfa384x_join_request {
+        u8 bssid[6];
+        u16 channel;
+} __attribute__ ((packed));
+
+struct hfa384x_info_frame {
+        u16 len;
+        u16 type;
+} __attribute__ ((packed));
+
+struct hfa384x_comm_tallies {
+        u16 tx_unicast_frames;
+        u16 tx_multicast_frames;
+        u16 tx_fragments;
+        u16 tx_unicast_octets;
+        u16 tx_multicast_octets;
+        u16 tx_deferred_transmissions;
+        u16 tx_single_retry_frames;
+        u16 tx_multiple_retry_frames;
+        u16 tx_retry_limit_exceeded;
+        u16 tx_discards;
+        u16 rx_unicast_frames;
+        u16 rx_multicast_frames;
+        u16 rx_fragments;
+        u16 rx_unicast_octets;
+        u16 rx_multicast_octets;
+        u16 rx_fcs_errors;
+        u16 rx_discards_no_buffer;
+        u16 tx_discards_wrong_sa;
+        u16 rx_discards_wep_undecryptable;
+        u16 rx_message_in_msg_fragments;
+        u16 rx_message_in_bad_msg_fragments;
+} __attribute__ ((packed));
+
+struct hfa384x_comm_tallies32 {
+        u32 tx_unicast_frames;
+        u32 tx_multicast_frames;
+        u32 tx_fragments;
+        u32 tx_unicast_octets;
+        u32 tx_multicast_octets;
+        u32 tx_deferred_transmissions;
+        u32 tx_single_retry_frames;
+        u32 tx_multiple_retry_frames;
+        u32 tx_retry_limit_exceeded;
+        u32 tx_discards;
+        u32 rx_unicast_frames;
+        u32 rx_multicast_frames;
+        u32 rx_fragments;
+        u32 rx_unicast_octets;
+        u32 rx_multicast_octets;
+        u32 rx_fcs_errors;
+        u32 rx_discards_no_buffer;
+        u32 tx_discards_wrong_sa;
+        u32 rx_discards_wep_undecryptable;
+        u32 rx_message_in_msg_fragments;
+        u32 rx_message_in_bad_msg_fragments;
+} __attribute__ ((packed));
+
+struct hfa384x_scan_result_hdr {
+        u16 reserved;
+        u16 scan_reason;
+#define HFA384X_SCAN_IN_PROGRESS 0 /* no results available yet */
+#define HFA384X_SCAN_HOST_INITIATED 1
+#define HFA384X_SCAN_FIRMWARE_INITIATED 2
+#define HFA384X_SCAN_INQUIRY_FROM_HOST 3
+} __attribute__ ((packed));
+
+#define HFA384X_SCAN_MAX_RESULTS 32
+
+struct hfa384x_scan_result {
+        u16 chid;
+        u16 anl;
+        u16 sl;
+        u8 bssid[6];
+        u16 beacon_interval;
+        u16 capability;
+        u16 ssid_len;
+        u8 ssid[32];
+        u8 sup_rates[10];
+        u16 rate;
+} __attribute__ ((packed));
+
+struct hfa384x_hostscan_result {
+        u16 chid;
+        u16 anl;
+        u16 sl;
+        u8 bssid[6];
+        u16 beacon_interval;
+        u16 capability;
+        u16 ssid_len;
+        u8 ssid[32];
+        u8 sup_rates[10];
+        u16 rate;
+        u16 atim;
+} __attribute__ ((packed));
+
+struct comm_tallies_sums {
+        unsigned int tx_unicast_frames;
+        unsigned int tx_multicast_frames;
+        unsigned int tx_fragments;
+        unsigned int tx_unicast_octets;
+        unsigned int tx_multicast_octets;
+        unsigned int tx_deferred_transmissions;
+        unsigned int tx_single_retry_frames;
+        unsigned int tx_multiple_retry_frames;
+        unsigned int tx_retry_limit_exceeded;
+        unsigned int tx_discards;
+        unsigned int rx_unicast_frames;
+        unsigned int rx_multicast_frames;
+        unsigned int rx_fragments;
+        unsigned int rx_unicast_octets;
+        unsigned int rx_multicast_octets;
+        unsigned int rx_fcs_errors;
+        unsigned int rx_discards_no_buffer;
+        unsigned int tx_discards_wrong_sa;
+        unsigned int rx_discards_wep_undecryptable;
+        unsigned int rx_message_in_msg_fragments;
+        unsigned int rx_message_in_bad_msg_fragments;
+};
+
+
+struct hfa384x_regs {
+        u16 cmd;
+        u16 evstat;
+        u16 offset0;
+        u16 offset1;
+        u16 swsupport0;
+};
+
+
+#if defined(PRISM2_PCCARD) || defined(PRISM2_PLX)
+/* I/O ports for HFA384X Controller access */
+#define HFA384X_CMD_OFF 0x00
+#define HFA384X_PARAM0_OFF 0x02
+#define HFA384X_PARAM1_OFF 0x04
+#define HFA384X_PARAM2_OFF 0x06
+#define HFA384X_STATUS_OFF 0x08
+#define HFA384X_RESP0_OFF 0x0A
+#define HFA384X_RESP1_OFF 0x0C
+#define HFA384X_RESP2_OFF 0x0E
+#define HFA384X_INFOFID_OFF 0x10
+#define HFA384X_CONTROL_OFF 0x14
+#define HFA384X_SELECT0_OFF 0x18
+#define HFA384X_SELECT1_OFF 0x1A
+#define HFA384X_OFFSET0_OFF 0x1C
+#define HFA384X_OFFSET1_OFF 0x1E
+#define HFA384X_RXFID_OFF 0x20
+#define HFA384X_ALLOCFID_OFF 0x22
+#define HFA384X_TXCOMPLFID_OFF 0x24
+#define HFA384X_SWSUPPORT0_OFF 0x28
+#define HFA384X_SWSUPPORT1_OFF 0x2A
+#define HFA384X_SWSUPPORT2_OFF 0x2C
+#define HFA384X_EVSTAT_OFF 0x30
+#define HFA384X_INTEN_OFF 0x32
+#define HFA384X_EVACK_OFF 0x34
+#define HFA384X_DATA0_OFF 0x36
+#define HFA384X_DATA1_OFF 0x38
+#define HFA384X_AUXPAGE_OFF 0x3A
+#define HFA384X_AUXOFFSET_OFF 0x3C
+#define HFA384X_AUXDATA_OFF 0x3E
+#endif /* PRISM2_PCCARD || PRISM2_PLX */
+
+#ifdef PRISM2_PCI
+/* Memory addresses for ISL3874 controller access */
+#define HFA384X_CMD_OFF 0x00
+#define HFA384X_PARAM0_OFF 0x04
+#define HFA384X_PARAM1_OFF 0x08
+#define HFA384X_PARAM2_OFF 0x0C
+#define HFA384X_STATUS_OFF 0x10
+#define HFA384X_RESP0_OFF 0x14
+#define HFA384X_RESP1_OFF 0x18
+#define HFA384X_RESP2_OFF 0x1C
+#define HFA384X_INFOFID_OFF 0x20
+#define HFA384X_CONTROL_OFF 0x28
+#define HFA384X_SELECT0_OFF 0x30
+#define HFA384X_SELECT1_OFF 0x34
+#define HFA384X_OFFSET0_OFF 0x38
+#define HFA384X_OFFSET1_OFF 0x3C
+#define HFA384X_RXFID_OFF 0x40
+#define HFA384X_ALLOCFID_OFF 0x44
+#define HFA384X_TXCOMPLFID_OFF 0x48
+#define HFA384X_PCICOR_OFF 0x4C
+#define HFA384X_SWSUPPORT0_OFF 0x50
+#define HFA384X_SWSUPPORT1_OFF 0x54
+#define HFA384X_SWSUPPORT2_OFF 0x58
+#define HFA384X_PCIHCR_OFF 0x5C
+#define HFA384X_EVSTAT_OFF 0x60
+#define HFA384X_INTEN_OFF 0x64
+#define HFA384X_EVACK_OFF 0x68
+#define HFA384X_DATA0_OFF 0x6C
+#define HFA384X_DATA1_OFF 0x70
+#define HFA384X_AUXPAGE_OFF 0x74
+#define HFA384X_AUXOFFSET_OFF 0x78
+#define HFA384X_AUXDATA_OFF 0x7C
+#define HFA384X_PCI_M0_ADDRH_OFF 0x80
+#define HFA384X_PCI_M0_ADDRL_OFF 0x84
+#define HFA384X_PCI_M0_LEN_OFF 0x88
+#define HFA384X_PCI_M0_CTL_OFF 0x8C
+#define HFA384X_PCI_STATUS_OFF 0x98
+#define HFA384X_PCI_M1_ADDRH_OFF 0xA0
+#define HFA384X_PCI_M1_ADDRL_OFF 0xA4
+#define HFA384X_PCI_M1_LEN_OFF 0xA8
+#define HFA384X_PCI_M1_CTL_OFF 0xAC
+
+/* PCI bus master control bits (these are undocumented; based on guessing and
+ * experimenting..) */
+#define HFA384X_PCI_CTL_FROM_BAP (BIT(5) | BIT(1) | BIT(0))
+#define HFA384X_PCI_CTL_TO_BAP (BIT(5) | BIT(0))
+
+#endif /* PRISM2_PCI */
+
+
+/* Command codes for CMD reg. */
+#define HFA384X_CMDCODE_INIT 0x00
+#define HFA384X_CMDCODE_ENABLE 0x01
+#define HFA384X_CMDCODE_DISABLE 0x02
+#define HFA384X_CMDCODE_ALLOC 0x0A
+#define HFA384X_CMDCODE_TRANSMIT 0x0B
+#define HFA384X_CMDCODE_INQUIRE 0x11
+#define HFA384X_CMDCODE_ACCESS 0x21
+#define HFA384X_CMDCODE_ACCESS_WRITE (0x21 | BIT(8))
+#define HFA384X_CMDCODE_DOWNLOAD 0x22
+#define HFA384X_CMDCODE_READMIF 0x30
+#define HFA384X_CMDCODE_WRITEMIF 0x31
+#define HFA384X_CMDCODE_TEST 0x38
+
+#define HFA384X_CMDCODE_MASK 0x3F
+
+/* Test mode operations */
+#define HFA384X_TEST_CHANGE_CHANNEL 0x08
+#define HFA384X_TEST_MONITOR 0x0B
+#define HFA384X_TEST_STOP 0x0F
+#define HFA384X_TEST_CFG_BITS 0x15
+#define HFA384X_TEST_CFG_BIT_ALC BIT(3)
+
+#define HFA384X_CMD_BUSY BIT(15)
+
+#define HFA384X_CMD_TX_RECLAIM BIT(8)
+
+#define HFA384X_OFFSET_ERR BIT(14)
+#define HFA384X_OFFSET_BUSY BIT(15)
+
+
+/* ProgMode for download command */
+#define HFA384X_PROGMODE_DISABLE 0
+#define HFA384X_PROGMODE_ENABLE_VOLATILE 1
+#define HFA384X_PROGMODE_ENABLE_NON_VOLATILE 2
+#define HFA384X_PROGMODE_PROGRAM_NON_VOLATILE 3
+
+#define HFA384X_AUX_MAGIC0 0xfe01
+#define HFA384X_AUX_MAGIC1 0xdc23
+#define HFA384X_AUX_MAGIC2 0xba45
+
+#define HFA384X_AUX_PORT_DISABLED 0
+#define HFA384X_AUX_PORT_DISABLE BIT(14)
+#define HFA384X_AUX_PORT_ENABLE BIT(15)
+#define HFA384X_AUX_PORT_ENABLED (BIT(14) | BIT(15))
+#define HFA384X_AUX_PORT_MASK (BIT(14) | BIT(15))
+
+#define PRISM2_PDA_SIZE 1024
+
+
+/* Events; EvStat, Interrupt mask (IntEn), and acknowledge bits (EvAck) */
+#define HFA384X_EV_TICK BIT(15)
+#define HFA384X_EV_WTERR BIT(14)
+#define HFA384X_EV_INFDROP BIT(13)
+#ifdef PRISM2_PCI
+#define HFA384X_EV_PCI_M1 BIT(9)
+#define HFA384X_EV_PCI_M0 BIT(8)
+#endif /* PRISM2_PCI */
+#define HFA384X_EV_INFO BIT(7)
+#define HFA384X_EV_DTIM BIT(5)
+#define HFA384X_EV_CMD BIT(4)
+#define HFA384X_EV_ALLOC BIT(3)
+#define HFA384X_EV_TXEXC BIT(2)
+#define HFA384X_EV_TX BIT(1)
+#define HFA384X_EV_RX BIT(0)
+
+
+/* HFA384X Information frames */
+#define HFA384X_INFO_HANDOVERADDR 0xF000 /* AP f/w ? */
+#define HFA384X_INFO_HANDOVERDEAUTHADDR 0xF001 /* AP f/w 1.3.7 */
+#define HFA384X_INFO_COMMTALLIES 0xF100
+#define HFA384X_INFO_SCANRESULTS 0xF101
+#define HFA384X_INFO_CHANNELINFORESULTS 0xF102 /* AP f/w only */
+#define HFA384X_INFO_HOSTSCANRESULTS 0xF103
+#define HFA384X_INFO_LINKSTATUS 0xF200
+#define HFA384X_INFO_ASSOCSTATUS 0xF201 /* ? */
+#define HFA384X_INFO_AUTHREQ 0xF202 /* ? */
+#define HFA384X_INFO_PSUSERCNT 0xF203 /* ? */
+#define HFA384X_INFO_KEYIDCHANGED 0xF204 /* ? */
+
+enum { HFA384X_LINKSTATUS_CONNECTED = 1,
+       HFA384X_LINKSTATUS_DISCONNECTED = 2,
+       HFA384X_LINKSTATUS_AP_CHANGE = 3,
+       HFA384X_LINKSTATUS_AP_OUT_OF_RANGE = 4,
+       HFA384X_LINKSTATUS_AP_IN_RANGE = 5,
+       HFA384X_LINKSTATUS_ASSOC_FAILED = 6 };
+
+enum { HFA384X_PORTTYPE_BSS = 1, HFA384X_PORTTYPE_WDS = 2,
+       HFA384X_PORTTYPE_PSEUDO_IBSS = 3, HFA384X_PORTTYPE_IBSS = 0,
+       HFA384X_PORTTYPE_HOSTAP = 6 };
+
+#define HFA384X_RATES_1MBPS BIT(0)
+#define HFA384X_RATES_2MBPS BIT(1)
+#define HFA384X_RATES_5MBPS BIT(2)
+#define HFA384X_RATES_11MBPS BIT(3)
+
+#define HFA384X_ROAMING_FIRMWARE 1
+#define HFA384X_ROAMING_HOST 2
+#define HFA384X_ROAMING_DISABLED 3
+
+#define HFA384X_WEPFLAGS_PRIVACYINVOKED BIT(0)
+#define HFA384X_WEPFLAGS_EXCLUDEUNENCRYPTED BIT(1)
+#define HFA384X_WEPFLAGS_HOSTENCRYPT BIT(4)
+#define HFA384X_WEPFLAGS_HOSTDECRYPT BIT(7)
+
+#define HFA384X_RX_STATUS_MSGTYPE (BIT(15) | BIT(14) | BIT(13))
+#define HFA384X_RX_STATUS_PCF BIT(12)
+#define HFA384X_RX_STATUS_MACPORT (BIT(10) | BIT(9) | BIT(8))
+#define HFA384X_RX_STATUS_UNDECR BIT(1)
+#define HFA384X_RX_STATUS_FCSERR BIT(0)
+
+#define HFA384X_RX_STATUS_GET_MSGTYPE(s) \
+(((s) & HFA384X_RX_STATUS_MSGTYPE) >> 13)
+#define HFA384X_RX_STATUS_GET_MACPORT(s) \
+(((s) & HFA384X_RX_STATUS_MACPORT) >> 8)
+
+enum { HFA384X_RX_MSGTYPE_NORMAL = 0, HFA384X_RX_MSGTYPE_RFC1042 = 1,
+       HFA384X_RX_MSGTYPE_BRIDGETUNNEL = 2, HFA384X_RX_MSGTYPE_MGMT = 4 };
+
+
+#define HFA384X_TX_CTRL_ALT_RTRY BIT(5)
+#define HFA384X_TX_CTRL_802_11 BIT(3)
+#define HFA384X_TX_CTRL_802_3 0
+#define HFA384X_TX_CTRL_TX_EX BIT(2)
+#define HFA384X_TX_CTRL_TX_OK BIT(1)
+
+#define HFA384X_TX_STATUS_RETRYERR BIT(0)
+#define HFA384X_TX_STATUS_AGEDERR BIT(1)
+#define HFA384X_TX_STATUS_DISCON BIT(2)
+#define HFA384X_TX_STATUS_FORMERR BIT(3)
+
+/* HFA3861/3863 (BBP) Control Registers */
+#define HFA386X_CR_TX_CONFIGURE 0x12 /* CR9 */
+#define HFA386X_CR_RX_CONFIGURE 0x14 /* CR10 */
+#define HFA386X_CR_A_D_TEST_MODES2 0x1A /* CR13 */
+#define HFA386X_CR_MANUAL_TX_POWER 0x3E /* CR31 */
+#define HFA386X_CR_MEASURED_TX_POWER 0x74 /* CR58 */
+
+
+#ifdef __KERNEL__
+
+#define PRISM2_TXFID_COUNT 8
+#define PRISM2_DATA_MAXLEN 2304
+#define PRISM2_TXFID_LEN (PRISM2_DATA_MAXLEN + sizeof(struct hfa384x_tx_frame))
+#define PRISM2_TXFID_EMPTY 0xffff
+#define PRISM2_TXFID_RESERVED 0xfffe
+#define PRISM2_DUMMY_FID 0xffff
+#define MAX_SSID_LEN 32
+#define MAX_NAME_LEN 32 /* this is assumed to be equal to MAX_SSID_LEN */
+
+#define PRISM2_DUMP_RX_HDR BIT(0)
+#define PRISM2_DUMP_TX_HDR BIT(1)
+#define PRISM2_DUMP_TXEXC_HDR BIT(2)
+
+struct hostap_tx_callback_info {
+        u16 idx;
+        void (*func)(struct sk_buff *, int ok, void *);
+        void *data;
+        struct hostap_tx_callback_info *next;
+};
+
+
+/* IEEE 802.11 requires that STA supports concurrent reception of at least
+ * three fragmented frames. This define can be increased to support more
+ * concurrent frames, but it should be noted that each entry can consume about
+ * 2 kB of RAM and increasing cache size will slow down frame reassembly. */
+#define PRISM2_FRAG_CACHE_LEN 4
+
+struct prism2_frag_entry {
+        unsigned long first_frag_time;
+        unsigned int seq;
+        unsigned int last_frag;
+        struct sk_buff *skb;
+        u8 src_addr[ETH_ALEN];
+        u8 dst_addr[ETH_ALEN];
+};
+
+
+struct hostap_cmd_queue {
+        struct list_head list;
+        wait_queue_head_t compl;
+        volatile enum { CMD_SLEEP, CMD_CALLBACK, CMD_COMPLETED } type;
+        void (*callback)(struct net_device *dev, long context, u16 resp0,
+                         u16 res);
+        long context;
+        u16 cmd, param0, param1;
+        u16 resp0, res;
+        volatile int issued, issuing;
+
+        atomic_t usecnt;
+        int del_req;
+};
+
+/* options for hw_shutdown */
+#define HOSTAP_HW_NO_DISABLE BIT(0)
+#define HOSTAP_HW_ENABLE_CMDCOMPL BIT(1)
+
+typedef struct local_info local_info_t;
+
+struct prism2_helper_functions {
+        /* these functions are defined in hardware model specific files
+         * (hostap_{cs,plx,pci}.c */
+        int (*card_present)(local_info_t *local);
+        void (*cor_sreset)(local_info_t *local);
+        int (*dev_open)(local_info_t *local);
+        int (*dev_close)(local_info_t *local);
+        void (*genesis_reset)(local_info_t *local, int hcr);
+
+        /* the following functions are from hostap_hw.c, but they may have some
+         * hardware model specific code */
+
+        /* FIX: low-level commands like cmd might disappear at some point to
+         * make it easier to change them if needed (e.g., cmd would be replaced
+         * with write_mif/read_mif/testcmd/inquire); at least get_rid and
+         * set_rid might move to hostap_{cs,plx,pci}.c */
+        int (*cmd)(struct net_device *dev, u16 cmd, u16 param0, u16 *param1,
+                   u16 *resp0);
+        void (*read_regs)(struct net_device *dev, struct hfa384x_regs *regs);
+        int (*get_rid)(struct net_device *dev, u16 rid, void *buf, int len,
+                       int exact_len);
+        int (*set_rid)(struct net_device *dev, u16 rid, void *buf, int len);
+        int (*hw_enable)(struct net_device *dev, int initial);
+        int (*hw_config)(struct net_device *dev, int initial);
+        void (*hw_reset)(struct net_device *dev);
+        void (*hw_shutdown)(struct net_device *dev, int no_disable);
+        int (*reset_port)(struct net_device *dev);
+        void (*schedule_reset)(local_info_t *local);
+        int (*download)(local_info_t *local,
+                        struct prism2_download_param *param);
+        int (*tx)(struct sk_buff *skb, struct net_device *dev);
+        int (*set_tim)(struct net_device *dev, int aid, int set);
+        int (*read_aux)(struct net_device *dev, unsigned addr, int len,
+                        u8 *buf);
+
+        int need_tx_headroom; /* number of bytes of headroom needed before
+                               * IEEE 802.11 header */
+        enum { HOSTAP_HW_PCCARD, HOSTAP_HW_PLX, HOSTAP_HW_PCI } hw_type;
+};
+
+
+struct prism2_download_data {
+        u32 dl_cmd;
+        u32 start_addr;
+        u32 num_areas;
+        struct prism2_download_data_area {
+                u32 addr; /* wlan card address */
+                u32 len;
+                u8 *data; /* allocated data */
+        } data[0];
+};
+
+
+#define HOSTAP_MAX_BSS_COUNT 64
+#define MAX_WPA_IE_LEN 64
+
+struct hostap_bss_info {
+        struct list_head list;
+        unsigned long last_update;
+        unsigned int count;
+        u8 bssid[ETH_ALEN];
+        u16 capab_info;
+        u8 ssid[32];
+        size_t ssid_len;
+        u8 wpa_ie[MAX_WPA_IE_LEN];
+        size_t wpa_ie_len;
+        u8 rsn_ie[MAX_WPA_IE_LEN];
+        size_t rsn_ie_len;
+        int chan;
+        int included;
+};
+
+
+/* Per radio private Host AP data - shared by all net devices interfaces used
+ * by each radio (wlan#, wlan#ap, wlan#sta, WDS).
+ * ((struct hostap_interface *) netdev_priv(dev))->local points to this
+ * structure. */
+struct local_info {
+        struct module *hw_module;
+        int card_idx;
+        int dev_enabled;
+        int master_dev_auto_open; /* was master device opened automatically */
+        int num_dev_open; /* number of open devices */
+        struct net_device *dev; /* master radio device */
+        struct net_device *ddev; /* main data device */
+        struct list_head hostap_interfaces; /* Host AP interface list (contains
+                                             * struct hostap_interface entries)
+                                             */
+        rwlock_t iface_lock; /* hostap_interfaces read lock; use write lock
+                              * when removing entries from the list.
+                              * TX and RX paths can use read lock. */
+        spinlock_t cmdlock, baplock, lock;
+        struct semaphore rid_bap_sem;
+        u16 infofid; /* MAC buffer id for info frame */
+        /* txfid, intransmitfid, next_txtid, and next_alloc are protected by
+         * txfidlock */
+        spinlock_t txfidlock;
+        int txfid_len; /* length of allocated TX buffers */
+        u16 txfid[PRISM2_TXFID_COUNT]; /* buffer IDs for TX frames */
+        /* buffer IDs for intransmit frames or PRISM2_TXFID_EMPTY if
+         * corresponding txfid is free for next TX frame */
+        u16 intransmitfid[PRISM2_TXFID_COUNT];
+        int next_txfid; /* index to the next txfid to be checked for
+                         * availability */
+        int next_alloc; /* index to the next intransmitfid to be checked for
+                         * allocation events */
+
+        /* bitfield for atomic bitops */
+#define HOSTAP_BITS_TRANSMIT 0
+#define HOSTAP_BITS_BAP_TASKLET 1
+#define HOSTAP_BITS_BAP_TASKLET2 2
+        long bits;
+
+        struct ap_data *ap;
+
+        char essid[MAX_SSID_LEN + 1];
+        char name[MAX_NAME_LEN + 1];
+        int name_set;
+        u16 channel_mask; /* mask of allowed channels */
+        u16 scan_channel_mask; /* mask of channels to be scanned */
+        struct comm_tallies_sums comm_tallies;
+        struct net_device_stats stats;
+        struct proc_dir_entry *proc;
+        int iw_mode; /* operating mode (IW_MODE_*) */
+        int pseudo_adhoc; /* 0: IW_MODE_ADHOC is real 802.11 compliant IBSS
+                           * 1: IW_MODE_ADHOC is "pseudo IBSS" */
+        char bssid[ETH_ALEN];
+        int channel;
+        int beacon_int;
+        int dtim_period;
+        int mtu;
+        int frame_dump; /* dump RX/TX frame headers, PRISM2_DUMP_ flags */
+        int fw_tx_rate_control;
+        u16 tx_rate_control;
+        u16 basic_rates;
+        int hw_resetting;
+        int hw_ready;
+        int hw_reset_tries; /* how many times reset has been tried */
+        int hw_downloading;
+        int shutdown;
+        int pri_only;
+        int no_pri; /* no PRI f/w present */
+        int sram_type; /* 8 = x8 SRAM, 16 = x16 SRAM, -1 = unknown */
+
+        enum {
+                PRISM2_TXPOWER_AUTO = 0, PRISM2_TXPOWER_OFF,
+                PRISM2_TXPOWER_FIXED, PRISM2_TXPOWER_UNKNOWN
+        } txpower_type;
+        int txpower; /* if txpower_type == PRISM2_TXPOWER_FIXED */
+
+        /* command queue for hfa384x_cmd(); protected with cmdlock */
+        struct list_head cmd_queue;
+        /* max_len for cmd_queue; in addition, cmd_callback can use two
+         * additional entries to prevent sleeping commands from stopping
+         * transmits */
+#define HOSTAP_CMD_QUEUE_MAX_LEN 16
+        int cmd_queue_len; /* number of entries in cmd_queue */
+
+        /* if card timeout is detected in interrupt context, reset_queue is
+         * used to schedule card reseting to be done in user context */
+        struct work_struct reset_queue;
+
+        /* For scheduling a change of the promiscuous mode RID */
+        int is_promisc;
+        struct work_struct set_multicast_list_queue;
+
+        struct work_struct set_tim_queue;
+        struct list_head set_tim_list;
+        spinlock_t set_tim_lock;
+
+        int wds_max_connections;
+        int wds_connections;
+#define HOSTAP_WDS_BROADCAST_RA BIT(0)
+#define HOSTAP_WDS_AP_CLIENT BIT(1)
+#define HOSTAP_WDS_STANDARD_FRAME BIT(2)
+        u32 wds_type;
+        u16 tx_control; /* flags to be used in TX description */
+        int manual_retry_count; /* -1 = use f/w default; otherwise retry count
+                                 * to be used with all frames */
+
+        struct iw_statistics wstats;
+        unsigned long scan_timestamp; /* Time started to scan */
+        enum {
+                PRISM2_MONITOR_80211 = 0, PRISM2_MONITOR_PRISM = 1,
+                PRISM2_MONITOR_CAPHDR = 2
+        } monitor_type;
+        int (*saved_eth_header_parse)(struct sk_buff *skb,
+                                      unsigned char *haddr);
+        int monitor_allow_fcserr;
+
+        int hostapd; /* whether user space daemon, hostapd, is used for AP
+                      * management */
+        int hostapd_sta; /* whether hostapd is used with an extra STA interface
+                          */
+        struct net_device *apdev;
+        struct net_device_stats apdevstats;
+
+        char assoc_ap_addr[ETH_ALEN];
+        struct net_device *stadev;
+        struct net_device_stats stadevstats;
+
+#define WEP_KEYS 4
+#define WEP_KEY_LEN 13
+        struct ieee80211_crypt_data *crypt[WEP_KEYS];
+        int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */
+        struct timer_list crypt_deinit_timer;
+        struct list_head crypt_deinit_list;
+
+        int open_wep; /* allow unencrypted frames */
+        int host_encrypt;
+        int host_decrypt;
+        int privacy_invoked; /* force privacy invoked flag even if no keys are
+                              * configured */
+        int fw_encrypt_ok; /* whether firmware-based WEP encrypt is working
+                            * in Host AP mode (STA f/w 1.4.9 or newer) */
+        int bcrx_sta_key; /* use individual keys to override default keys even
+                           * with RX of broad/multicast frames */
+
+        struct prism2_frag_entry frag_cache[PRISM2_FRAG_CACHE_LEN];
+        unsigned int frag_next_idx;
+
+        int ieee_802_1x; /* is IEEE 802.1X used */
+
+        int antsel_tx, antsel_rx;
+        int rts_threshold; /* dot11RTSThreshold */
+        int fragm_threshold; /* dot11FragmentationThreshold */
+        int auth_algs; /* PRISM2_AUTH_ flags */
+
+        int enh_sec; /* cnfEnhSecurity options (broadcast SSID hide/ignore) */
+        int tallies32; /* 32-bit tallies in use */
+
+        struct prism2_helper_functions *func;
+
+        u8 *pda;
+        int fw_ap;
+#define PRISM2_FW_VER(major, minor, variant) \
+(((major) << 16) | ((minor) << 8) | variant)
+        u32 sta_fw_ver;
+
+        /* Tasklets for handling hardware IRQ related operations outside hw IRQ
+         * handler */
+        struct tasklet_struct bap_tasklet;
+
+        struct tasklet_struct info_tasklet;
+        struct sk_buff_head info_list; /* info frames as skb's for
+                                        * info_tasklet */
+
+        struct hostap_tx_callback_info *tx_callback; /* registered TX callbacks
+                                                      */
+
+        struct tasklet_struct rx_tasklet;
+        struct sk_buff_head rx_list;
+
+        struct tasklet_struct sta_tx_exc_tasklet;
+        struct sk_buff_head sta_tx_exc_list;
+
+        int host_roaming;
+        unsigned long last_join_time; /* time of last JoinRequest */
+        struct hfa384x_hostscan_result *last_scan_results;
+        int last_scan_results_count;
+        enum { PRISM2_SCAN, PRISM2_HOSTSCAN } last_scan_type;
+        struct work_struct info_queue;
+        long pending_info; /* bit field of pending info_queue items */
+#define PRISM2_INFO_PENDING_LINKSTATUS 0
+#define PRISM2_INFO_PENDING_SCANRESULTS 1
+        int prev_link_status; /* previous received LinkStatus info */
+        int prev_linkstatus_connected;
+        u8 preferred_ap[6]; /* use this AP if possible */
+
+#ifdef PRISM2_CALLBACK
+        void *callback_data; /* Can be used in callbacks; e.g., allocate
+                              * on enable event and free on disable event.
+                              * Host AP driver code does not touch this. */
+#endif /* PRISM2_CALLBACK */
+
+        wait_queue_head_t hostscan_wq;
+
+        /* Passive scan in Host AP mode */
+        struct timer_list passive_scan_timer;
+        int passive_scan_interval; /* in seconds, 0 = disabled */
+        int passive_scan_channel;
+        enum { PASSIVE_SCAN_WAIT, PASSIVE_SCAN_LISTEN } passive_scan_state;
+
+        struct timer_list tick_timer;
+        unsigned long last_tick_timer;
+        unsigned int sw_tick_stuck;
+
+        /* commsQuality / dBmCommsQuality data from periodic polling; only
+         * valid for Managed and Ad-hoc modes */
+        unsigned long last_comms_qual_update;
+        int comms_qual; /* in some odd unit.. */
+        int avg_signal; /* in dB (note: negative) */
+        int avg_noise; /* in dB (note: negative) */
+        struct work_struct comms_qual_update;
+
+        /* RSSI to dBm adjustment (for RX descriptor fields) */
+        int rssi_to_dBm; /* substract from RSSI to get approximate dBm value */
+
+        /* BSS list / protected by local->lock */
+        struct list_head bss_list;
+        int num_bss_info;
+        int wpa; /* WPA support enabled */
+        int tkip_countermeasures;
+        int drop_unencrypted;
+        /* Generic IEEE 802.11 info element to be added to
+         * ProbeResp/Beacon/(Re)AssocReq */
+        u8 *generic_elem;
+        size_t generic_elem_len;
+
+#ifdef PRISM2_DOWNLOAD_SUPPORT
+        /* Persistent volatile download data */
+        struct prism2_download_data *dl_pri;
+        struct prism2_download_data *dl_sec;
+#endif /* PRISM2_DOWNLOAD_SUPPORT */
+
+#ifdef PRISM2_IO_DEBUG
+#define PRISM2_IO_DEBUG_SIZE 10000
+        u32 io_debug[PRISM2_IO_DEBUG_SIZE];
+        int io_debug_head;
+        int io_debug_enabled;
+#endif /* PRISM2_IO_DEBUG */
+
+        /* Pointer to hardware model specific (cs,pci,plx) private data. */
+        void *hw_priv;
+};
+
+
+/* Per interface private Host AP data
+ * Allocated for each net device that Host AP uses (wlan#, wlan#ap, wlan#sta,
+ * WDS) and netdev_priv(dev) points to this structure. */
+struct hostap_interface {
+        struct list_head list; /* list entry in Host AP interface list */
+        struct net_device *dev; /* pointer to this device */
+        struct local_info *local; /* pointer to shared private data */
+        struct net_device_stats stats;
+        struct iw_spy_data spy_data; /* iwspy support */
+        struct iw_public_data wireless_data;
+
+        enum {
+                HOSTAP_INTERFACE_MASTER,
+                HOSTAP_INTERFACE_MAIN,
+                HOSTAP_INTERFACE_AP,
+                HOSTAP_INTERFACE_STA,
+                HOSTAP_INTERFACE_WDS,
+        } type;
+
+        union {
+                struct hostap_interface_wds {
+                        u8 remote_addr[ETH_ALEN];
+                } wds;
+        } u;
+};
+
+
+#define HOSTAP_SKB_TX_DATA_MAGIC 0xf08a36a2
+
+/*
+ * TX meta data - stored in skb->cb buffer, so this must not be increased over
+ * the 40-byte limit
+ */
+struct hostap_skb_tx_data {
+        u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */
+        u8 rate; /* transmit rate */
+#define HOSTAP_TX_FLAGS_WDS BIT(0)
+#define HOSTAP_TX_FLAGS_BUFFERED_FRAME BIT(1)
+#define HOSTAP_TX_FLAGS_ADD_MOREDATA BIT(2)
+        u8 flags; /* HOSTAP_TX_FLAGS_* */
+        u16 tx_cb_idx;
+        struct hostap_interface *iface;
+        unsigned long jiffies; /* queueing timestamp */
+        unsigned short ethertype;
+};
+
+
+#ifndef PRISM2_NO_DEBUG
+
+#define DEBUG_FID BIT(0)
+#define DEBUG_PS BIT(1)
+#define DEBUG_FLOW BIT(2)
+#define DEBUG_AP BIT(3)
+#define DEBUG_HW BIT(4)
+#define DEBUG_EXTRA BIT(5)
+#define DEBUG_EXTRA2 BIT(6)
+#define DEBUG_PS2 BIT(7)
+#define DEBUG_MASK (DEBUG_PS | DEBUG_AP | DEBUG_HW | DEBUG_EXTRA)
+#define PDEBUG(n, args...) \
+do { if ((n) & DEBUG_MASK) printk(KERN_DEBUG args); } while (0)
+#define PDEBUG2(n, args...) \
+do { if ((n) & DEBUG_MASK) printk(args); } while (0)
+
+#else /* PRISM2_NO_DEBUG */
+
+#define PDEBUG(n, args...)
+#define PDEBUG2(n, args...)
+
+#endif /* PRISM2_NO_DEBUG */
+
+enum { BAP0 = 0, BAP1 = 1 };
+
+#define PRISM2_IO_DEBUG_CMD_INB 0
+#define PRISM2_IO_DEBUG_CMD_INW 1
+#define PRISM2_IO_DEBUG_CMD_INSW 2
+#define PRISM2_IO_DEBUG_CMD_OUTB 3
+#define PRISM2_IO_DEBUG_CMD_OUTW 4
+#define PRISM2_IO_DEBUG_CMD_OUTSW 5
+#define PRISM2_IO_DEBUG_CMD_ERROR 6
+#define PRISM2_IO_DEBUG_CMD_INTERRUPT 7
+
+#ifdef PRISM2_IO_DEBUG
+
+#define PRISM2_IO_DEBUG_ENTRY(cmd, reg, value) \
+(((cmd) << 24) | ((reg) << 16) | value)
+
+static inline void prism2_io_debug_add(struct net_device *dev, int cmd,
+                                       int reg, int value)
+{
+        struct hostap_interface *iface = netdev_priv(dev);
+        local_info_t *local = iface->local;
+
+        if (!local->io_debug_enabled)
+                return;
+
+        local->io_debug[local->io_debug_head] = jiffies & 0xffffffff;
+        if (++local->io_debug_head >= PRISM2_IO_DEBUG_SIZE)
+                local->io_debug_head = 0;
+        local->io_debug[local->io_debug_head] =
+                PRISM2_IO_DEBUG_ENTRY(cmd, reg, value);
+        if (++local->io_debug_head >= PRISM2_IO_DEBUG_SIZE)
+                local->io_debug_head = 0;
+}
+
+
+static inline void prism2_io_debug_error(struct net_device *dev, int err)
+{
+        struct hostap_interface *iface = netdev_priv(dev);
+        local_info_t *local = iface->local;
+        unsigned long flags;
+
+        if (!local->io_debug_enabled)
+                return;
+
+        spin_lock_irqsave(&local->lock, flags);
+        prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_ERROR, 0, err);
+        if (local->io_debug_enabled == 1) {
+                local->io_debug_enabled = 0;
+                printk(KERN_DEBUG "%s: I/O debug stopped\n", dev->name);
+        }
+        spin_unlock_irqrestore(&local->lock, flags);
+}
+
+#else /* PRISM2_IO_DEBUG */
+
+static inline void prism2_io_debug_add(struct net_device *dev, int cmd,
+                                       int reg, int value)
+{
+}
+
+static inline void prism2_io_debug_error(struct net_device *dev, int err)
+{
+}
+
+#endif /* PRISM2_IO_DEBUG */
+
+
+#ifdef PRISM2_CALLBACK
+enum {
+        /* Called when card is enabled */
+        PRISM2_CALLBACK_ENABLE,
+
+        /* Called when card is disabled */
+        PRISM2_CALLBACK_DISABLE,
+
+        /* Called when RX/TX starts/ends */
+        PRISM2_CALLBACK_RX_START, PRISM2_CALLBACK_RX_END,
+        PRISM2_CALLBACK_TX_START, PRISM2_CALLBACK_TX_END
+};
+void prism2_callback(local_info_t *local, int event);
+#else /* PRISM2_CALLBACK */
+#define prism2_callback(d, e) do { } while (0)
+#endif /* PRISM2_CALLBACK */
+
+#endif /* __KERNEL__ */
+
+#endif /* HOSTAP_WLAN_H */
diff --git a/drivers/net/wireless/ieee802_11.h b/drivers/net/wireless/ieee802_11.h
deleted file mode 100644
index 53dd5248f9f1..000000000000
--- a/drivers/net/wireless/ieee802_11.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _IEEE802_11_H
-#define _IEEE802_11_H
-
-#define IEEE802_11_DATA_LEN             2304
-/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
-   6.2.1.1.2.
-
-   The figure in section 7.1.2 suggests a body size of up to 2312
-   bytes is allowed, which is a bit confusing, I suspect this
-   represents the 2304 bytes of real data, plus a possible 8 bytes of
-   WEP IV and ICV. (this interpretation suggested by Ramiro Barreiro) */
-
-
-#define IEEE802_11_HLEN                 30
-#define IEEE802_11_FRAME_LEN            (IEEE802_11_DATA_LEN + IEEE802_11_HLEN)
-
-struct ieee802_11_hdr {
-        u16 frame_ctl;
-        u16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 addr3[ETH_ALEN];
-        u16 seq_ctl;
-        u8 addr4[ETH_ALEN];
-} __attribute__ ((packed));
-
-/* Frame control field constants */
-#define IEEE802_11_FCTL_VERS            0x0002
-#define IEEE802_11_FCTL_FTYPE           0x000c
-#define IEEE802_11_FCTL_STYPE           0x00f0
-#define IEEE802_11_FCTL_TODS            0x0100
-#define IEEE802_11_FCTL_FROMDS          0x0200
-#define IEEE802_11_FCTL_MOREFRAGS       0x0400
-#define IEEE802_11_FCTL_RETRY           0x0800
-#define IEEE802_11_FCTL_PM              0x1000
-#define IEEE802_11_FCTL_MOREDATA        0x2000
-#define IEEE802_11_FCTL_WEP             0x4000
-#define IEEE802_11_FCTL_ORDER           0x8000
-
-#define IEEE802_11_FTYPE_MGMT           0x0000
-#define IEEE802_11_FTYPE_CTL            0x0004
-#define IEEE802_11_FTYPE_DATA           0x0008
-
-/* management */
-#define IEEE802_11_STYPE_ASSOC_REQ      0x0000
-#define IEEE802_11_STYPE_ASSOC_RESP     0x0010
-#define IEEE802_11_STYPE_REASSOC_REQ    0x0020
-#define IEEE802_11_STYPE_REASSOC_RESP   0x0030
-#define IEEE802_11_STYPE_PROBE_REQ      0x0040
-#define IEEE802_11_STYPE_PROBE_RESP     0x0050
-#define IEEE802_11_STYPE_BEACON         0x0080
-#define IEEE802_11_STYPE_ATIM           0x0090
-#define IEEE802_11_STYPE_DISASSOC       0x00A0
-#define IEEE802_11_STYPE_AUTH           0x00B0
-#define IEEE802_11_STYPE_DEAUTH         0x00C0
-
-/* control */
-#define IEEE802_11_STYPE_PSPOLL         0x00A0
-#define IEEE802_11_STYPE_RTS            0x00B0
-#define IEEE802_11_STYPE_CTS            0x00C0
-#define IEEE802_11_STYPE_ACK            0x00D0
-#define IEEE802_11_STYPE_CFEND          0x00E0
-#define IEEE802_11_STYPE_CFENDACK       0x00F0
-
-/* data */
-#define IEEE802_11_STYPE_DATA           0x0000
-#define IEEE802_11_STYPE_DATA_CFACK     0x0010
-#define IEEE802_11_STYPE_DATA_CFPOLL    0x0020
-#define IEEE802_11_STYPE_DATA_CFACKPOLL 0x0030
-#define IEEE802_11_STYPE_NULLFUNC       0x0040
-#define IEEE802_11_STYPE_CFACK          0x0050
-#define IEEE802_11_STYPE_CFPOLL         0x0060
-#define IEEE802_11_STYPE_CFACKPOLL      0x0070
-
-#define IEEE802_11_SCTL_FRAG            0x000F
-#define IEEE802_11_SCTL_SEQ             0xFFF0
-
-#endif /* _IEEE802_11_H */
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
new file mode 100644
index 000000000000..2414e6493aa5
--- /dev/null
+++ b/drivers/net/wireless/ipw2100.c
@@ -0,0 +1,8680 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+  Portions of this file are based on the sample_* files provided by Wireless
+  Extensions 0.26 package and copyright (c) 1997-2003 Jean Tourrilhes
+  <jt@hpl.hp.com>
+
+  Portions of this file are based on the Host AP project,
+  Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
+    <jkmaline@cc.hut.fi>
+  Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi>
+
+  Portions of ipw2100_mod_firmware_load, ipw2100_do_mod_firmware_load, and
+  ipw2100_fw_load are loosely based on drivers/sound/sound_firmware.c
+  available in the 2.4.25 kernel sources, and are copyright (c) Alan Cox
+
+******************************************************************************/
+/*
+
+ Initial driver on which this is based was developed by Janusz Gorycki,
+ Maciej Urbaniak, and Maciej Sosnowski.
+
+ Promiscuous mode support added by Jacek Wysoczynski and Maciej Urbaniak.
+
+Theory of Operation
+
+Tx - Commands and Data
+
+Firmware and host share a circular queue of Transmit Buffer Descriptors (TBDs)
+Each TBD contains a pointer to the physical (dma_addr_t) address of data being
+sent to the firmware as well as the length of the data.
+
+The host writes to the TBD queue at the WRITE index.  The WRITE index points
+to the _next_ packet to be written and is advanced when after the TBD has been
+filled.
+
+The firmware pulls from the TBD queue at the READ index.  The READ index points
+to the currently being read entry, and is advanced once the firmware is
+done with a packet.
+
+When data is sent to the firmware, the first TBD is used to indicate to the
+firmware if a Command or Data is being sent.  If it is Command, all of the
+command information is contained within the physical address referred to by the
+TBD.  If it is Data, the first TBD indicates the type of data packet, number
+of fragments, etc.  The next TBD then referrs to the actual packet location.
+
+The Tx flow cycle is as follows:
+
+1) ipw2100_tx() is called by kernel with SKB to transmit
+2) Packet is move from the tx_free_list and appended to the transmit pending
+   list (tx_pend_list)
+3) work is scheduled to move pending packets into the shared circular queue.
+4) when placing packet in the circular queue, the incoming SKB is DMA mapped
+   to a physical address.  That address is entered into a TBD.  Two TBDs are
+   filled out.  The first indicating a data packet, the second referring to the
+   actual payload data.
+5) the packet is removed from tx_pend_list and placed on the end of the
+   firmware pending list (fw_pend_list)
+6) firmware is notified that the WRITE index has
+7) Once the firmware has processed the TBD, INTA is triggered.
+8) For each Tx interrupt received from the firmware, the READ index is checked
+   to see which TBDs are done being processed.
+9) For each TBD that has been processed, the ISR pulls the oldest packet
+   from the fw_pend_list.
+10)The packet structure contained in the fw_pend_list is then used
+   to unmap the DMA address and to free the SKB originally passed to the driver
+   from the kernel.
+11)The packet structure is placed onto the tx_free_list
+
+The above steps are the same for commands, only the msg_free_list/msg_pend_list
+are used instead of tx_free_list/tx_pend_list
+
+...
+
+Critical Sections / Locking :
+
+There are two locks utilized.  The first is the low level lock (priv->low_lock)
+that protects the following:
+
+- Access to the Tx/Rx queue lists via priv->low_lock. The lists are as follows:
+
+  tx_free_list : Holds pre-allocated Tx buffers.
+    TAIL modified in __ipw2100_tx_process()
+    HEAD modified in ipw2100_tx()
+
+  tx_pend_list : Holds used Tx buffers waiting to go into the TBD ring
+    TAIL modified ipw2100_tx()
+    HEAD modified by ipw2100_tx_send_data()
+
+  msg_free_list : Holds pre-allocated Msg (Command) buffers
+    TAIL modified in __ipw2100_tx_process()
+    HEAD modified in ipw2100_hw_send_command()
+
+  msg_pend_list : Holds used Msg buffers waiting to go into the TBD ring
+    TAIL modified in ipw2100_hw_send_command()
+    HEAD modified in ipw2100_tx_send_commands()
+
+  The flow of data on the TX side is as follows:
+
+  MSG_FREE_LIST + COMMAND => MSG_PEND_LIST => TBD => MSG_FREE_LIST
+  TX_FREE_LIST + DATA => TX_PEND_LIST => TBD => TX_FREE_LIST
+
+  The methods that work on the TBD ring are protected via priv->low_lock.
+
+- The internal data state of the device itself
+- Access to the firmware read/write indexes for the BD queues
+  and associated logic
+
+All external entry functions are locked with the priv->action_lock to ensure
+that only one external action is invoked at a time.
+
+
+*/
+
+#include <linux/compiler.h>
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/if_arp.h>
+#include <linux/in6.h>
+#include <linux/in.h>
+#include <linux/ip.h>
+#include <linux/kernel.h>
+#include <linux/kmod.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/proc_fs.h>
+#include <linux/skbuff.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#define __KERNEL_SYSCALLS__
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/unistd.h>
+#include <linux/stringify.h>
+#include <linux/tcp.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include <linux/time.h>
+#include <linux/firmware.h>
+#include <linux/acpi.h>
+#include <linux/ctype.h>
+
+#include "ipw2100.h"
+
+#define IPW2100_VERSION "1.1.0"
+
+#define DRV_NAME        "ipw2100"
+#define DRV_VERSION     IPW2100_VERSION
+#define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2004 Intel Corporation"
+
+
+/* Debugging stuff */
+#ifdef CONFIG_IPW_DEBUG
+#define CONFIG_IPW2100_RX_DEBUG   /* Reception debugging */
+#endif
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+static int debug = 0;
+static int mode = 0;
+static int channel = 0;
+static int associate = 1;
+static int disable = 0;
+#ifdef CONFIG_PM
+static struct ipw2100_fw ipw2100_firmware;
+#endif
+
+#include <linux/moduleparam.h>
+module_param(debug, int, 0444);
+module_param(mode, int, 0444);
+module_param(channel, int, 0444);
+module_param(associate, int, 0444);
+module_param(disable, int, 0444);
+
+MODULE_PARM_DESC(debug, "debug level");
+MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS,2=Monitor)");
+MODULE_PARM_DESC(channel, "channel");
+MODULE_PARM_DESC(associate, "auto associate when scanning (default on)");
+MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
+
+static u32 ipw2100_debug_level = IPW_DL_NONE;
+
+#ifdef CONFIG_IPW_DEBUG
+#define IPW_DEBUG(level, message...) \
+do { \
+        if (ipw2100_debug_level & (level)) { \
+                printk(KERN_DEBUG "ipw2100: %c %s ", \
+                       in_interrupt() ? 'I' : 'U',  __FUNCTION__); \
+                printk(message); \
+        } \
+} while (0)
+#else
+#define IPW_DEBUG(level, message...) do {} while (0)
+#endif /* CONFIG_IPW_DEBUG */
+
+#ifdef CONFIG_IPW_DEBUG
+static const char *command_types[] = {
+        "undefined",
+        "unused", /* HOST_ATTENTION */
+        "HOST_COMPLETE",
+        "unused", /* SLEEP */
+        "unused", /* HOST_POWER_DOWN */
+        "unused",
+        "SYSTEM_CONFIG",
+        "unused", /* SET_IMR */
+        "SSID",
+        "MANDATORY_BSSID",
+        "AUTHENTICATION_TYPE",
+        "ADAPTER_ADDRESS",
+        "PORT_TYPE",
+        "INTERNATIONAL_MODE",
+        "CHANNEL",
+        "RTS_THRESHOLD",
+        "FRAG_THRESHOLD",
+        "POWER_MODE",
+        "TX_RATES",
+        "BASIC_TX_RATES",
+        "WEP_KEY_INFO",
+        "unused",
+        "unused",
+        "unused",
+        "unused",
+        "WEP_KEY_INDEX",
+        "WEP_FLAGS",
+        "ADD_MULTICAST",
+        "CLEAR_ALL_MULTICAST",
+        "BEACON_INTERVAL",
+        "ATIM_WINDOW",
+        "CLEAR_STATISTICS",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "TX_POWER_INDEX",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "undefined",
+        "BROADCAST_SCAN",
+        "CARD_DISABLE",
+        "PREFERRED_BSSID",
+        "SET_SCAN_OPTIONS",
+        "SCAN_DWELL_TIME",
+        "SWEEP_TABLE",
+        "AP_OR_STATION_TABLE",
+        "GROUP_ORDINALS",
+        "SHORT_RETRY_LIMIT",
+        "LONG_RETRY_LIMIT",
+        "unused", /* SAVE_CALIBRATION */
+        "unused", /* RESTORE_CALIBRATION */
+        "undefined",
+        "undefined",
+        "undefined",
+        "HOST_PRE_POWER_DOWN",
+        "unused", /* HOST_INTERRUPT_COALESCING */
+        "undefined",
+        "CARD_DISABLE_PHY_OFF",
+        "MSDU_TX_RATES"
+        "undefined",
+        "undefined",
+        "SET_STATION_STAT_BITS",
+        "CLEAR_STATIONS_STAT_BITS",
+        "LEAP_ROGUE_MODE",
+        "SET_SECURITY_INFORMATION",
+        "DISASSOCIATION_BSSID",
+        "SET_WPA_ASS_IE"
+};
+#endif
+
+
+/* Pre-decl until we get the code solid and then we can clean it up */
+static void ipw2100_tx_send_commands(struct ipw2100_priv *priv);
+static void ipw2100_tx_send_data(struct ipw2100_priv *priv);
+static int ipw2100_adapter_setup(struct ipw2100_priv *priv);
+
+static void ipw2100_queues_initialize(struct ipw2100_priv *priv);
+static void ipw2100_queues_free(struct ipw2100_priv *priv);
+static int ipw2100_queues_allocate(struct ipw2100_priv *priv);
+
+static int ipw2100_fw_download(struct ipw2100_priv *priv,
+                               struct ipw2100_fw *fw);
+static int ipw2100_get_firmware(struct ipw2100_priv *priv,
+                                struct ipw2100_fw *fw);
+static int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf,
+                                 size_t max);
+static int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf,
+                                    size_t max);
+static void ipw2100_release_firmware(struct ipw2100_priv *priv,
+                                     struct ipw2100_fw *fw);
+static int ipw2100_ucode_download(struct ipw2100_priv *priv,
+                                  struct ipw2100_fw *fw);
+static void ipw2100_wx_event_work(struct ipw2100_priv *priv);
+static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev);
+static struct iw_handler_def ipw2100_wx_handler_def;
+
+
+static inline void read_register(struct net_device *dev, u32 reg, u32 *val)
+{
+        *val = readl((void __iomem *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("r: 0x%08X => 0x%08X\n", reg, *val);
+}
+
+static inline void write_register(struct net_device *dev, u32 reg, u32 val)
+{
+        writel(val, (void __iomem *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("w: 0x%08X <= 0x%08X\n", reg, val);
+}
+
+static inline void read_register_word(struct net_device *dev, u32 reg, u16 *val)
+{
+        *val = readw((void __iomem *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("r: 0x%08X => %04X\n", reg, *val);
+}
+
+static inline void read_register_byte(struct net_device *dev, u32 reg, u8 *val)
+{
+        *val = readb((void __iomem *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("r: 0x%08X => %02X\n", reg, *val);
+}
+
+static inline void write_register_word(struct net_device *dev, u32 reg, u16 val)
+{
+        writew(val, (void __iomem *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("w: 0x%08X <= %04X\n", reg, val);
+}
+
+
+static inline void write_register_byte(struct net_device *dev, u32 reg, u8 val)
+{
+        writeb(val, (void __iomem *)(dev->base_addr + reg));
+        IPW_DEBUG_IO("w: 0x%08X =< %02X\n", reg, val);
+}
+
+static inline void read_nic_dword(struct net_device *dev, u32 addr, u32 *val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        read_register(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_dword(struct net_device *dev, u32 addr, u32 val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void read_nic_word(struct net_device *dev, u32 addr, u16 *val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        read_register_word(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_word(struct net_device *dev, u32 addr, u16 val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        write_register_word(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void read_nic_byte(struct net_device *dev, u32 addr, u8 *val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        read_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_byte(struct net_device *dev, u32 addr, u8 val)
+{
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+        write_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA, val);
+}
+
+static inline void write_nic_auto_inc_address(struct net_device *dev, u32 addr)
+{
+        write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
+                       addr & IPW_REG_INDIRECT_ADDR_MASK);
+}
+
+static inline void write_nic_dword_auto_inc(struct net_device *dev, u32 val)
+{
+        write_register(dev, IPW_REG_AUTOINCREMENT_DATA, val);
+}
+
+static inline void write_nic_memory(struct net_device *dev, u32 addr, u32 len,
+                                    const u8 *buf)
+{
+        u32 aligned_addr;
+        u32 aligned_len;
+        u32 dif_len;
+        u32 i;
+
+        /* read first nibble byte by byte */
+        aligned_addr = addr & (~0x3);
+        dif_len = addr - aligned_addr;
+        if (dif_len) {
+                /* Start reading at aligned_addr + dif_len */
+                write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                               aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        write_register_byte(
+                                dev, IPW_REG_INDIRECT_ACCESS_DATA + i,
+                                *buf);
+
+                len -= dif_len;
+                aligned_addr += 4;
+        }
+
+        /* read DWs through autoincrement registers */
+        write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
+                       aligned_addr);
+        aligned_len = len & (~0x3);
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                write_register(
+                        dev, IPW_REG_AUTOINCREMENT_DATA, *(u32 *)buf);
+
+        /* copy the last nibble */
+        dif_len = len - aligned_len;
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS, aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                write_register_byte(
+                        dev, IPW_REG_INDIRECT_ACCESS_DATA + i, *buf);
+}
+
+static inline void read_nic_memory(struct net_device *dev, u32 addr, u32 len,
+                                   u8 *buf)
+{
+        u32 aligned_addr;
+        u32 aligned_len;
+        u32 dif_len;
+        u32 i;
+
+        /* read first nibble byte by byte */
+        aligned_addr = addr & (~0x3);
+        dif_len = addr - aligned_addr;
+        if (dif_len) {
+                /* Start reading at aligned_addr + dif_len */
+                write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                               aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        read_register_byte(
+                                dev, IPW_REG_INDIRECT_ACCESS_DATA + i, buf);
+
+                len -= dif_len;
+                aligned_addr += 4;
+        }
+
+        /* read DWs through autoincrement registers */
+        write_register(dev, IPW_REG_AUTOINCREMENT_ADDRESS,
+                       aligned_addr);
+        aligned_len = len & (~0x3);
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                read_register(dev, IPW_REG_AUTOINCREMENT_DATA,
+                              (u32 *)buf);
+
+        /* copy the last nibble */
+        dif_len = len - aligned_len;
+        write_register(dev, IPW_REG_INDIRECT_ACCESS_ADDRESS,
+                       aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                read_register_byte(dev, IPW_REG_INDIRECT_ACCESS_DATA +
+                                   i, buf);
+}
+
+static inline int ipw2100_hw_is_adapter_in_system(struct net_device *dev)
+{
+        return (dev->base_addr &&
+                (readl((void __iomem *)(dev->base_addr + IPW_REG_DOA_DEBUG_AREA_START))
+                 == IPW_DATA_DOA_DEBUG_VALUE));
+}
+
+static int ipw2100_get_ordinal(struct ipw2100_priv *priv, u32 ord,
+                               void *val, u32 *len)
+{
+        struct ipw2100_ordinals *ordinals = &priv->ordinals;
+        u32 addr;
+        u32 field_info;
+        u16 field_len;
+        u16 field_count;
+        u32 total_length;
+
+        if (ordinals->table1_addr == 0) {
+                printk(KERN_WARNING DRV_NAME ": attempt to use fw ordinals "
+                       "before they have been loaded.\n");
+                return -EINVAL;
+        }
+
+        if (IS_ORDINAL_TABLE_ONE(ordinals, ord)) {
+                if (*len < IPW_ORD_TAB_1_ENTRY_SIZE) {
+                        *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+
+                        printk(KERN_WARNING DRV_NAME
+                               ": ordinal buffer length too small, need %zd\n",
+                               IPW_ORD_TAB_1_ENTRY_SIZE);
+
+                        return -EINVAL;
+                }
+
+                read_nic_dword(priv->net_dev, ordinals->table1_addr + (ord << 2),
+                               &addr);
+                read_nic_dword(priv->net_dev, addr, val);
+
+                *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+
+                return 0;
+        }
+
+        if (IS_ORDINAL_TABLE_TWO(ordinals, ord)) {
+
+                ord -= IPW_START_ORD_TAB_2;
+
+                /* get the address of statistic */
+                read_nic_dword(priv->net_dev, ordinals->table2_addr + (ord << 3),
+                               &addr);
+
+                /* get the second DW of statistics ;
+                 * two 16-bit words - first is length, second is count */
+                read_nic_dword(priv->net_dev,
+                               ordinals->table2_addr + (ord << 3) + sizeof(u32),
+                               &field_info);
+
+                /* get each entry length */
+                field_len = *((u16 *)&field_info);
+
+                /* get number of entries */
+                field_count = *(((u16 *)&field_info) + 1);
+
+                /* abort if no enought memory */
+                total_length = field_len * field_count;
+                if (total_length > *len) {
+                        *len = total_length;
+                        return -EINVAL;
+                }
+
+                *len = total_length;
+                if (!total_length)
+                        return 0;
+
+                /* read the ordinal data from the SRAM */
+                read_nic_memory(priv->net_dev, addr, total_length, val);
+
+                return 0;
+        }
+
+        printk(KERN_WARNING DRV_NAME ": ordinal %d neither in table 1 nor "
+               "in table 2\n", ord);
+
+        return -EINVAL;
+}
+
+static int ipw2100_set_ordinal(struct ipw2100_priv *priv, u32 ord, u32 *val,
+                               u32 *len)
+{
+        struct ipw2100_ordinals *ordinals = &priv->ordinals;
+        u32 addr;
+
+        if (IS_ORDINAL_TABLE_ONE(ordinals, ord)) {
+                if (*len != IPW_ORD_TAB_1_ENTRY_SIZE) {
+                        *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+                        IPW_DEBUG_INFO("wrong size\n");
+                        return -EINVAL;
+                }
+
+                read_nic_dword(priv->net_dev, ordinals->table1_addr + (ord << 2),
+                               &addr);
+
+                write_nic_dword(priv->net_dev, addr, *val);
+
+                *len = IPW_ORD_TAB_1_ENTRY_SIZE;
+
+                return 0;
+        }
+
+        IPW_DEBUG_INFO("wrong table\n");
+        if (IS_ORDINAL_TABLE_TWO(ordinals, ord))
+                return -EINVAL;
+
+        return -EINVAL;
+}
+
+static char *snprint_line(char *buf, size_t count,
+                          const u8 *data, u32 len, u32 ofs)
+{
+        int out, i, j, l;
+        char c;
+
+        out = snprintf(buf, count, "%08X", ofs);
+
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++)
+                        out += snprintf(buf + out, count - out, "%02X ",
+                                        data[(i * 8 + j)]);
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, "   ");
+        }
+
+        out += snprintf(buf + out, count - out, " ");
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++) {
+                        c = data[(i * 8 + j)];
+                        if (!isascii(c) || !isprint(c))
+                                c = '.';
+
+                        out += snprintf(buf + out, count - out, "%c", c);
+                }
+
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, " ");
+        }
+
+        return buf;
+}
+
+static void printk_buf(int level, const u8 *data, u32 len)
+{
+        char line[81];
+        u32 ofs = 0;
+        if (!(ipw2100_debug_level & level))
+                return;
+
+        while (len) {
+                printk(KERN_DEBUG "%s\n",
+                       snprint_line(line, sizeof(line), &data[ofs],
+                                    min(len, 16U), ofs));
+                ofs += 16;
+                len -= min(len, 16U);
+        }
+}
+
+
+
+#define MAX_RESET_BACKOFF 10
+
+static inline void schedule_reset(struct ipw2100_priv *priv)
+{
+        unsigned long now = get_seconds();
+
+        /* If we haven't received a reset request within the backoff period,
+         * then we can reset the backoff interval so this reset occurs
+         * immediately */
+        if (priv->reset_backoff &&
+            (now - priv->last_reset > priv->reset_backoff))
+                priv->reset_backoff = 0;
+
+        priv->last_reset = get_seconds();
+
+        if (!(priv->status & STATUS_RESET_PENDING)) {
+                IPW_DEBUG_INFO("%s: Scheduling firmware restart (%ds).\n",
+                               priv->net_dev->name, priv->reset_backoff);
+                netif_carrier_off(priv->net_dev);
+                netif_stop_queue(priv->net_dev);
+                priv->status |= STATUS_RESET_PENDING;
+                if (priv->reset_backoff)
+                        queue_delayed_work(priv->workqueue, &priv->reset_work,
+                                           priv->reset_backoff * HZ);
+                else
+                        queue_work(priv->workqueue, &priv->reset_work);
+
+                if (priv->reset_backoff < MAX_RESET_BACKOFF)
+                        priv->reset_backoff++;
+
+                wake_up_interruptible(&priv->wait_command_queue);
+        } else
+                IPW_DEBUG_INFO("%s: Firmware restart already in progress.\n",
+                               priv->net_dev->name);
+
+}
+
+#define HOST_COMPLETE_TIMEOUT (2 * HZ)
+static int ipw2100_hw_send_command(struct ipw2100_priv *priv,
+                                   struct host_command * cmd)
+{
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        unsigned long flags;
+        int err = 0;
+
+        IPW_DEBUG_HC("Sending %s command (#%d), %d bytes\n",
+                     command_types[cmd->host_command], cmd->host_command,
+                     cmd->host_command_length);
+        printk_buf(IPW_DL_HC, (u8*)cmd->host_command_parameters,
+                   cmd->host_command_length);
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (priv->fatal_error) {
+                IPW_DEBUG_INFO("Attempt to send command while hardware in fatal error condition.\n");
+                err = -EIO;
+                goto fail_unlock;
+        }
+
+        if (!(priv->status & STATUS_RUNNING)) {
+                IPW_DEBUG_INFO("Attempt to send command while hardware is not running.\n");
+                err = -EIO;
+                goto fail_unlock;
+        }
+
+        if (priv->status & STATUS_CMD_ACTIVE) {
+                IPW_DEBUG_INFO("Attempt to send command while another command is pending.\n");
+                err = -EBUSY;
+                goto fail_unlock;
+        }
+
+        if (list_empty(&priv->msg_free_list)) {
+                IPW_DEBUG_INFO("no available msg buffers\n");
+                goto fail_unlock;
+        }
+
+        priv->status |= STATUS_CMD_ACTIVE;
+        priv->messages_sent++;
+
+        element = priv->msg_free_list.next;
+
+        packet = list_entry(element, struct ipw2100_tx_packet, list);
+        packet->jiffy_start = jiffies;
+
+        /* initialize the firmware command packet */
+        packet->info.c_struct.cmd->host_command_reg = cmd->host_command;
+        packet->info.c_struct.cmd->host_command_reg1 = cmd->host_command1;
+        packet->info.c_struct.cmd->host_command_len_reg = cmd->host_command_length;
+        packet->info.c_struct.cmd->sequence = cmd->host_command_sequence;
+
+        memcpy(packet->info.c_struct.cmd->host_command_params_reg,
+               cmd->host_command_parameters,
+               sizeof(packet->info.c_struct.cmd->host_command_params_reg));
+
+        list_del(element);
+        DEC_STAT(&priv->msg_free_stat);
+
+        list_add_tail(element, &priv->msg_pend_list);
+        INC_STAT(&priv->msg_pend_stat);
+
+        ipw2100_tx_send_commands(priv);
+        ipw2100_tx_send_data(priv);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        /*
+         * We must wait for this command to complete before another
+         * command can be sent...  but if we wait more than 3 seconds
+         * then there is a problem.
+         */
+
+        err = wait_event_interruptible_timeout(
+                priv->wait_command_queue, !(priv->status & STATUS_CMD_ACTIVE),
+                HOST_COMPLETE_TIMEOUT);
+
+        if (err == 0) {
+                IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
+                               HOST_COMPLETE_TIMEOUT / (HZ / 100));
+                priv->fatal_error = IPW2100_ERR_MSG_TIMEOUT;
+                priv->status &= ~STATUS_CMD_ACTIVE;
+                schedule_reset(priv);
+                return -EIO;
+        }
+
+        if (priv->fatal_error) {
+                printk(KERN_WARNING DRV_NAME ": %s: firmware fatal error\n",
+                       priv->net_dev->name);
+                return -EIO;
+        }
+
+        /* !!!!! HACK TEST !!!!!
+         * When lots of debug trace statements are enabled, the driver
+         * doesn't seem to have as many firmware restart cycles...
+         *
+         * As a test, we're sticking in a 1/100s delay here */
+        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout(HZ / 100);
+
+        return 0;
+
+ fail_unlock:
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        return err;
+}
+
+
+/*
+ * Verify the values and data access of the hardware
+ * No locks needed or used.  No functions called.
+ */
+static int ipw2100_verify(struct ipw2100_priv *priv)
+{
+        u32 data1, data2;
+        u32 address;
+
+        u32 val1 = 0x76543210;
+        u32 val2 = 0xFEDCBA98;
+
+        /* Domain 0 check - all values should be DOA_DEBUG */
+        for (address = IPW_REG_DOA_DEBUG_AREA_START;
+             address < IPW_REG_DOA_DEBUG_AREA_END;
+             address += sizeof(u32)) {
+                read_register(priv->net_dev, address, &data1);
+                if (data1 != IPW_DATA_DOA_DEBUG_VALUE)
+                        return -EIO;
+        }
+
+        /* Domain 1 check - use arbitrary read/write compare  */
+        for (address = 0; address < 5; address++) {
+                /* The memory area is not used now */
+                write_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x32,
+                               val1);
+                write_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x36,
+                               val2);
+                read_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x32,
+                              &data1);
+                read_register(priv->net_dev, IPW_REG_DOMAIN_1_OFFSET + 0x36,
+                              &data2);
+                if (val1 == data1 && val2 == data2)
+                        return 0;
+        }
+
+        return -EIO;
+}
+
+/*
+ *
+ * Loop until the CARD_DISABLED bit is the same value as the
+ * supplied parameter
+ *
+ * TODO: See if it would be more efficient to do a wait/wake
+ *       cycle and have the completion event trigger the wakeup
+ *
+ */
+#define IPW_CARD_DISABLE_COMPLETE_WAIT              100 // 100 milli
+static int ipw2100_wait_for_card_state(struct ipw2100_priv *priv, int state)
+{
+        int i;
+        u32 card_state;
+        u32 len = sizeof(card_state);
+        int err;
+
+        for (i = 0; i <= IPW_CARD_DISABLE_COMPLETE_WAIT * 1000; i += 50) {
+                err = ipw2100_get_ordinal(priv, IPW_ORD_CARD_DISABLED,
+                                          &card_state, &len);
+                if (err) {
+                        IPW_DEBUG_INFO("Query of CARD_DISABLED ordinal "
+                                       "failed.\n");
+                        return 0;
+                }
+
+                /* We'll break out if either the HW state says it is
+                 * in the state we want, or if HOST_COMPLETE command
+                 * finishes */
+                if ((card_state == state) ||
+                    ((priv->status & STATUS_ENABLED) ?
+                     IPW_HW_STATE_ENABLED : IPW_HW_STATE_DISABLED) == state) {
+                        if (state == IPW_HW_STATE_ENABLED)
+                                priv->status |= STATUS_ENABLED;
+                        else
+                                priv->status &= ~STATUS_ENABLED;
+
+                        return 0;
+                }
+
+                udelay(50);
+        }
+
+        IPW_DEBUG_INFO("ipw2100_wait_for_card_state to %s state timed out\n",
+                       state ? "DISABLED" : "ENABLED");
+        return -EIO;
+}
+
+
+/*********************************************************************
+    Procedure   :   sw_reset_and_clock
+    Purpose     :   Asserts s/w reset, asserts clock initialization
+                    and waits for clock stabilization
+ ********************************************************************/
+static int sw_reset_and_clock(struct ipw2100_priv *priv)
+{
+        int i;
+        u32 r;
+
+        // assert s/w reset
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_SW_RESET);
+
+        // wait for clock stabilization
+        for (i = 0; i < 1000; i++) {
+                udelay(IPW_WAIT_RESET_ARC_COMPLETE_DELAY);
+
+                // check clock ready bit
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &r);
+                if (r & IPW_AUX_HOST_RESET_REG_PRINCETON_RESET)
+                        break;
+        }
+
+        if (i == 1000)
+                return -EIO;    // TODO: better error value
+
+        /* set "initialization complete" bit to move adapter to
+         * D0 state */
+        write_register(priv->net_dev, IPW_REG_GP_CNTRL,
+                       IPW_AUX_HOST_GP_CNTRL_BIT_INIT_DONE);
+
+        /* wait for clock stabilization */
+        for (i = 0; i < 10000; i++) {
+                udelay(IPW_WAIT_CLOCK_STABILIZATION_DELAY * 4);
+
+                /* check clock ready bit */
+                read_register(priv->net_dev, IPW_REG_GP_CNTRL, &r);
+                if (r & IPW_AUX_HOST_GP_CNTRL_BIT_CLOCK_READY)
+                        break;
+        }
+
+        if (i == 10000)
+                return -EIO;    /* TODO: better error value */
+
+        /* set D0 standby bit */
+        read_register(priv->net_dev, IPW_REG_GP_CNTRL, &r);
+        write_register(priv->net_dev, IPW_REG_GP_CNTRL,
+                       r | IPW_AUX_HOST_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY);
+
+        return 0;
+}
+
+/*********************************************************************
+    Procedure   :   ipw2100_download_firmware
+    Purpose     :   Initiaze adapter after power on.
+                    The sequence is:
+                    1. assert s/w reset first!
+                    2. awake clocks & wait for clock stabilization
+                    3. hold ARC (don't ask me why...)
+                    4. load Dino ucode and reset/clock init again
+                    5. zero-out shared mem
+                    6. download f/w
+ *******************************************************************/
+static int ipw2100_download_firmware(struct ipw2100_priv *priv)
+{
+        u32 address;
+        int err;
+
+#ifndef CONFIG_PM
+        /* Fetch the firmware and microcode */
+        struct ipw2100_fw ipw2100_firmware;
+#endif
+
+        if (priv->fatal_error) {
+                IPW_DEBUG_ERROR("%s: ipw2100_download_firmware called after "
+                       "fatal error %d.  Interface must be brought down.\n",
+                       priv->net_dev->name, priv->fatal_error);
+                return -EINVAL;
+        }
+
+#ifdef CONFIG_PM
+        if (!ipw2100_firmware.version) {
+                err = ipw2100_get_firmware(priv, &ipw2100_firmware);
+                if (err) {
+                        IPW_DEBUG_ERROR("%s: ipw2100_get_firmware failed: %d\n",
+                               priv->net_dev->name, err);
+                        priv->fatal_error = IPW2100_ERR_FW_LOAD;
+                        goto fail;
+                }
+        }
+#else
+        err = ipw2100_get_firmware(priv, &ipw2100_firmware);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: ipw2100_get_firmware failed: %d\n",
+                       priv->net_dev->name, err);
+                priv->fatal_error = IPW2100_ERR_FW_LOAD;
+                goto fail;
+        }
+#endif
+        priv->firmware_version = ipw2100_firmware.version;
+
+        /* s/w reset and clock stabilization */
+        err = sw_reset_and_clock(priv);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: sw_reset_and_clock failed: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        err = ipw2100_verify(priv);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: ipw2100_verify failed: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        /* Hold ARC */
+        write_nic_dword(priv->net_dev,
+                        IPW_INTERNAL_REGISTER_HALT_AND_RESET,
+                        0x80000000);
+
+        /* allow ARC to run */
+        write_register(priv->net_dev, IPW_REG_RESET_REG, 0);
+
+        /* load microcode */
+        err = ipw2100_ucode_download(priv, &ipw2100_firmware);
+        if (err) {
+                printk(KERN_ERR DRV_NAME ": %s: Error loading microcode: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        /* release ARC */
+        write_nic_dword(priv->net_dev,
+                        IPW_INTERNAL_REGISTER_HALT_AND_RESET,
+                        0x00000000);
+
+        /* s/w reset and clock stabilization (again!!!) */
+        err = sw_reset_and_clock(priv);
+        if (err) {
+                printk(KERN_ERR DRV_NAME ": %s: sw_reset_and_clock failed: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+        /* load f/w */
+        err = ipw2100_fw_download(priv, &ipw2100_firmware);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: Error loading firmware: %d\n",
+                       priv->net_dev->name, err);
+                goto fail;
+        }
+
+#ifndef CONFIG_PM
+        /*
+         * When the .resume method of the driver is called, the other
+         * part of the system, i.e. the ide driver could still stay in
+         * the suspend stage. This prevents us from loading the firmware
+         * from the disk.  --YZ
+         */
+
+        /* free any storage allocated for firmware image */
+        ipw2100_release_firmware(priv, &ipw2100_firmware);
+#endif
+
+        /* zero out Domain 1 area indirectly (Si requirement) */
+        for (address = IPW_HOST_FW_SHARED_AREA0;
+             address < IPW_HOST_FW_SHARED_AREA0_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_SHARED_AREA1;
+             address < IPW_HOST_FW_SHARED_AREA1_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_SHARED_AREA2;
+             address < IPW_HOST_FW_SHARED_AREA2_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_SHARED_AREA3;
+             address < IPW_HOST_FW_SHARED_AREA3_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+        for (address = IPW_HOST_FW_INTERRUPT_AREA;
+             address < IPW_HOST_FW_INTERRUPT_AREA_END; address += 4)
+                write_nic_dword(priv->net_dev, address, 0);
+
+        return 0;
+
+ fail:
+        ipw2100_release_firmware(priv, &ipw2100_firmware);
+        return err;
+}
+
+static inline void ipw2100_enable_interrupts(struct ipw2100_priv *priv)
+{
+        if (priv->status & STATUS_INT_ENABLED)
+                return;
+        priv->status |= STATUS_INT_ENABLED;
+        write_register(priv->net_dev, IPW_REG_INTA_MASK, IPW_INTERRUPT_MASK);
+}
+
+static inline void ipw2100_disable_interrupts(struct ipw2100_priv *priv)
+{
+        if (!(priv->status & STATUS_INT_ENABLED))
+                return;
+        priv->status &= ~STATUS_INT_ENABLED;
+        write_register(priv->net_dev, IPW_REG_INTA_MASK, 0x0);
+}
+
+
+static void ipw2100_initialize_ordinals(struct ipw2100_priv *priv)
+{
+        struct ipw2100_ordinals *ord = &priv->ordinals;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_ORDINALS_TABLE_1,
+                      &ord->table1_addr);
+
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_ORDINALS_TABLE_2,
+                      &ord->table2_addr);
+
+        read_nic_dword(priv->net_dev, ord->table1_addr, &ord->table1_size);
+        read_nic_dword(priv->net_dev, ord->table2_addr, &ord->table2_size);
+
+        ord->table2_size &= 0x0000FFFF;
+
+        IPW_DEBUG_INFO("table 1 size: %d\n", ord->table1_size);
+        IPW_DEBUG_INFO("table 2 size: %d\n", ord->table2_size);
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static inline void ipw2100_hw_set_gpio(struct ipw2100_priv *priv)
+{
+        u32 reg = 0;
+        /*
+         * Set GPIO 3 writable by FW; GPIO 1 writable
+         * by driver and enable clock
+         */
+        reg = (IPW_BIT_GPIO_GPIO3_MASK | IPW_BIT_GPIO_GPIO1_ENABLE |
+               IPW_BIT_GPIO_LED_OFF);
+        write_register(priv->net_dev, IPW_REG_GPIO, reg);
+}
+
+static inline int rf_kill_active(struct ipw2100_priv *priv)
+{
+#define MAX_RF_KILL_CHECKS 5
+#define RF_KILL_CHECK_DELAY 40
+
+        unsigned short value = 0;
+        u32 reg = 0;
+        int i;
+
+        if (!(priv->hw_features & HW_FEATURE_RFKILL)) {
+                priv->status &= ~STATUS_RF_KILL_HW;
+                return 0;
+        }
+
+        for (i = 0; i < MAX_RF_KILL_CHECKS; i++) {
+                udelay(RF_KILL_CHECK_DELAY);
+                read_register(priv->net_dev, IPW_REG_GPIO, &reg);
+                value = (value << 1) | ((reg & IPW_BIT_GPIO_RF_KILL) ? 0 : 1);
+        }
+
+        if (value == 0)
+                priv->status |= STATUS_RF_KILL_HW;
+        else
+                priv->status &= ~STATUS_RF_KILL_HW;
+
+        return (value == 0);
+}
+
+static int ipw2100_get_hw_features(struct ipw2100_priv *priv)
+{
+        u32 addr, len;
+        u32 val;
+
+        /*
+         * EEPROM_SRAM_DB_START_ADDRESS using ordinal in ordinal table 1
+         */
+        len = sizeof(addr);
+        if (ipw2100_get_ordinal(
+                    priv, IPW_ORD_EEPROM_SRAM_DB_BLOCK_START_ADDRESS,
+                    &addr, &len)) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                       __LINE__);
+                return -EIO;
+        }
+
+        IPW_DEBUG_INFO("EEPROM address: %08X\n", addr);
+
+        /*
+         * EEPROM version is the byte at offset 0xfd in firmware
+         * We read 4 bytes, then shift out the byte we actually want */
+        read_nic_dword(priv->net_dev, addr + 0xFC, &val);
+        priv->eeprom_version = (val >> 24) & 0xFF;
+        IPW_DEBUG_INFO("EEPROM version: %d\n", priv->eeprom_version);
+
+        /*
+         *  HW RF Kill enable is bit 0 in byte at offset 0x21 in firmware
+         *
+         *  notice that the EEPROM bit is reverse polarity, i.e.
+         *     bit = 0  signifies HW RF kill switch is supported
+         *     bit = 1  signifies HW RF kill switch is NOT supported
+         */
+        read_nic_dword(priv->net_dev, addr + 0x20, &val);
+        if (!((val >> 24) & 0x01))
+                priv->hw_features |= HW_FEATURE_RFKILL;
+
+        IPW_DEBUG_INFO("HW RF Kill: %ssupported.\n",
+                           (priv->hw_features & HW_FEATURE_RFKILL) ?
+                           "" : "not ");
+
+        return 0;
+}
+
+/*
+ * Start firmware execution after power on and intialization
+ * The sequence is:
+ *  1. Release ARC
+ *  2. Wait for f/w initialization completes;
+ */
+static int ipw2100_start_adapter(struct ipw2100_priv *priv)
+{
+        int i;
+        u32 inta, inta_mask, gpio;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->status & STATUS_RUNNING)
+                return 0;
+
+        /*
+         * Initialize the hw - drive adapter to DO state by setting
+         * init_done bit. Wait for clk_ready bit and Download
+         * fw & dino ucode
+         */
+        if (ipw2100_download_firmware(priv)) {
+                printk(KERN_ERR DRV_NAME ": %s: Failed to power on the adapter.\n",
+                       priv->net_dev->name);
+                return -EIO;
+        }
+
+        /* Clear the Tx, Rx and Msg queues and the r/w indexes
+         * in the firmware RBD and TBD ring queue */
+        ipw2100_queues_initialize(priv);
+
+        ipw2100_hw_set_gpio(priv);
+
+        /* TODO -- Look at disabling interrupts here to make sure none
+         * get fired during FW initialization */
+
+        /* Release ARC - clear reset bit */
+        write_register(priv->net_dev, IPW_REG_RESET_REG, 0);
+
+        /* wait for f/w intialization complete */
+        IPW_DEBUG_FW("Waiting for f/w initialization to complete...\n");
+        i = 5000;
+        do {
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(40 * HZ / 1000);
+                /* Todo... wait for sync command ... */
+
+                read_register(priv->net_dev, IPW_REG_INTA, &inta);
+
+                /* check "init done" bit */
+                if (inta & IPW2100_INTA_FW_INIT_DONE) {
+                        /* reset "init done" bit */
+                        write_register(priv->net_dev, IPW_REG_INTA,
+                                       IPW2100_INTA_FW_INIT_DONE);
+                        break;
+                }
+
+                /* check error conditions : we check these after the firmware
+                 * check so that if there is an error, the interrupt handler
+                 * will see it and the adapter will be reset */
+                if (inta &
+                    (IPW2100_INTA_FATAL_ERROR | IPW2100_INTA_PARITY_ERROR)) {
+                        /* clear error conditions */
+                        write_register(priv->net_dev, IPW_REG_INTA,
+                                       IPW2100_INTA_FATAL_ERROR |
+                                       IPW2100_INTA_PARITY_ERROR);
+                }
+        } while (i--);
+
+        /* Clear out any pending INTAs since we aren't supposed to have
+         * interrupts enabled at this point... */
+        read_register(priv->net_dev, IPW_REG_INTA, &inta);
+        read_register(priv->net_dev, IPW_REG_INTA_MASK, &inta_mask);
+        inta &= IPW_INTERRUPT_MASK;
+        /* Clear out any pending interrupts */
+        if (inta & inta_mask)
+                write_register(priv->net_dev, IPW_REG_INTA, inta);
+
+        IPW_DEBUG_FW("f/w initialization complete: %s\n",
+                     i ? "SUCCESS" : "FAILED");
+
+        if (!i) {
+                printk(KERN_WARNING DRV_NAME ": %s: Firmware did not initialize.\n",
+                       priv->net_dev->name);
+                return -EIO;
+        }
+
+        /* allow firmware to write to GPIO1 & GPIO3 */
+        read_register(priv->net_dev, IPW_REG_GPIO, &gpio);
+
+        gpio |= (IPW_BIT_GPIO_GPIO1_MASK | IPW_BIT_GPIO_GPIO3_MASK);
+
+        write_register(priv->net_dev, IPW_REG_GPIO, gpio);
+
+        /* Ready to receive commands */
+        priv->status |= STATUS_RUNNING;
+
+        /* The adapter has been reset; we are not associated */
+        priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+static inline void ipw2100_reset_fatalerror(struct ipw2100_priv *priv)
+{
+        if (!priv->fatal_error)
+                return;
+
+        priv->fatal_errors[priv->fatal_index++] = priv->fatal_error;
+        priv->fatal_index %= IPW2100_ERROR_QUEUE;
+        priv->fatal_error = 0;
+}
+
+
+/* NOTE: Our interrupt is disabled when this method is called */
+static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
+{
+        u32 reg;
+        int i;
+
+        IPW_DEBUG_INFO("Power cycling the hardware.\n");
+
+        ipw2100_hw_set_gpio(priv);
+
+        /* Step 1. Stop Master Assert */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
+
+        /* Step 2. Wait for stop Master Assert
+         *         (not more then 50us, otherwise ret error */
+        i = 5;
+        do {
+                udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY);
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &reg);
+
+                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
+                        break;
+        }  while(i--);
+
+        priv->status &= ~STATUS_RESET_PENDING;
+
+        if (!i) {
+                IPW_DEBUG_INFO("exit - waited too long for master assert stop\n");
+                return -EIO;
+        }
+
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_SW_RESET);
+
+
+        /* Reset any fatal_error conditions */
+        ipw2100_reset_fatalerror(priv);
+
+        /* At this point, the adapter is now stopped and disabled */
+        priv->status &= ~(STATUS_RUNNING | STATUS_ASSOCIATING |
+                          STATUS_ASSOCIATED | STATUS_ENABLED);
+
+        return 0;
+}
+
+/*
+ * Send the CARD_DISABLE_PHY_OFF comamnd to the card to disable it
+ *
+ * After disabling, if the card was associated, a STATUS_ASSN_LOST will be sent.
+ *
+ * STATUS_CARD_DISABLE_NOTIFICATION will be sent regardless of
+ * if STATUS_ASSN_LOST is sent.
+ */
+static int ipw2100_hw_phy_off(struct ipw2100_priv *priv)
+{
+
+#define HW_PHY_OFF_LOOP_DELAY (HZ / 5000)
+
+        struct host_command cmd = {
+                .host_command = CARD_DISABLE_PHY_OFF,
+                .host_command_sequence = 0,
+                .host_command_length = 0,
+        };
+        int err, i;
+        u32 val1, val2;
+
+        IPW_DEBUG_HC("CARD_DISABLE_PHY_OFF\n");
+
+        /* Turn off the radio */
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        for (i = 0; i < 2500; i++) {
+                read_nic_dword(priv->net_dev, IPW2100_CONTROL_REG, &val1);
+                read_nic_dword(priv->net_dev, IPW2100_COMMAND, &val2);
+
+                if ((val1 & IPW2100_CONTROL_PHY_OFF) &&
+                    (val2 & IPW2100_COMMAND_PHY_OFF))
+                        return 0;
+
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(HW_PHY_OFF_LOOP_DELAY);
+        }
+
+        return -EIO;
+}
+
+
+static int ipw2100_enable_adapter(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = HOST_COMPLETE,
+                .host_command_sequence = 0,
+                .host_command_length = 0
+        };
+        int err = 0;
+
+        IPW_DEBUG_HC("HOST_COMPLETE\n");
+
+        if (priv->status & STATUS_ENABLED)
+                return 0;
+
+        down(&priv->adapter_sem);
+
+        if (rf_kill_active(priv)) {
+                IPW_DEBUG_HC("Command aborted due to RF kill active.\n");
+                goto fail_up;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err) {
+                IPW_DEBUG_INFO("Failed to send HOST_COMPLETE command\n");
+                goto fail_up;
+        }
+
+        err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_ENABLED);
+        if (err) {
+                IPW_DEBUG_INFO(
+                       "%s: card not responding to init command.\n",
+                       priv->net_dev->name);
+                goto fail_up;
+        }
+
+        if (priv->stop_hang_check) {
+                priv->stop_hang_check = 0;
+                queue_delayed_work(priv->workqueue, &priv->hang_check, HZ / 2);
+        }
+
+fail_up:
+        up(&priv->adapter_sem);
+        return err;
+}
+
+static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
+{
+#define HW_POWER_DOWN_DELAY (HZ / 10)
+
+        struct host_command cmd = {
+                .host_command = HOST_PRE_POWER_DOWN,
+                .host_command_sequence = 0,
+                .host_command_length = 0,
+        };
+        int err, i;
+        u32 reg;
+
+        if (!(priv->status & STATUS_RUNNING))
+                return 0;
+
+        priv->status |= STATUS_STOPPING;
+
+        /* We can only shut down the card if the firmware is operational.  So,
+         * if we haven't reset since a fatal_error, then we can not send the
+         * shutdown commands. */
+        if (!priv->fatal_error) {
+                /* First, make sure the adapter is enabled so that the PHY_OFF
+                 * command can shut it down */
+                ipw2100_enable_adapter(priv);
+
+                err = ipw2100_hw_phy_off(priv);
+                if (err)
+                        printk(KERN_WARNING DRV_NAME ": Error disabling radio %d\n", err);
+
+                /*
+                 * If in D0-standby mode going directly to D3 may cause a
+                 * PCI bus violation.  Therefore we must change out of the D0
+                 * state.
+                 *
+                 * Sending the PREPARE_FOR_POWER_DOWN will restrict the
+                 * hardware from going into standby mode and will transition
+                 * out of D0-standy if it is already in that state.
+                 *
+                 * STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the
+                 * driver upon completion.  Once received, the driver can
+                 * proceed to the D3 state.
+                 *
+                 * Prepare for power down command to fw.  This command would
+                 * take HW out of D0-standby and prepare it for D3 state.
+                 *
+                 * Currently FW does not support event notification for this
+                 * event. Therefore, skip waiting for it.  Just wait a fixed
+                 * 100ms
+                 */
+                IPW_DEBUG_HC("HOST_PRE_POWER_DOWN\n");
+
+                err = ipw2100_hw_send_command(priv, &cmd);
+                if (err)
+                        printk(KERN_WARNING DRV_NAME ": "
+                               "%s: Power down command failed: Error %d\n",
+                               priv->net_dev->name, err);
+                else {
+                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        schedule_timeout(HW_POWER_DOWN_DELAY);
+                }
+        }
+
+        priv->status &= ~STATUS_ENABLED;
+
+        /*
+         * Set GPIO 3 writable by FW; GPIO 1 writable
+         * by driver and enable clock
+         */
+        ipw2100_hw_set_gpio(priv);
+
+        /*
+         * Power down adapter.  Sequence:
+         * 1. Stop master assert (RESET_REG[9]=1)
+         * 2. Wait for stop master (RESET_REG[8]==1)
+         * 3. S/w reset assert (RESET_REG[7] = 1)
+         */
+
+        /* Stop master assert */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
+
+        /* wait stop master not more than 50 usec.
+         * Otherwise return error. */
+        for (i = 5; i > 0; i--) {
+                udelay(10);
+
+                /* Check master stop bit */
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &reg);
+
+                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
+                        break;
+        }
+
+        if (i == 0)
+                printk(KERN_WARNING DRV_NAME
+                       ": %s: Could now power down adapter.\n",
+                       priv->net_dev->name);
+
+        /* assert s/w reset */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_SW_RESET);
+
+        priv->status &= ~(STATUS_RUNNING | STATUS_STOPPING);
+
+        return 0;
+}
+
+
+static int ipw2100_disable_adapter(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = CARD_DISABLE,
+                .host_command_sequence = 0,
+                .host_command_length = 0
+        };
+        int err = 0;
+
+        IPW_DEBUG_HC("CARD_DISABLE\n");
+
+        if (!(priv->status & STATUS_ENABLED))
+                return 0;
+
+        /* Make sure we clear the associated state */
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+
+        if (!priv->stop_hang_check) {
+                priv->stop_hang_check = 1;
+                cancel_delayed_work(&priv->hang_check);
+        }
+
+        down(&priv->adapter_sem);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME ": exit - failed to send CARD_DISABLE command\n");
+                goto fail_up;
+        }
+
+        err = ipw2100_wait_for_card_state(priv, IPW_HW_STATE_DISABLED);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME ": exit - card failed to change to DISABLED\n");
+                goto fail_up;
+        }
+
+        IPW_DEBUG_INFO("TODO: implement scan state machine\n");
+
+fail_up:
+        up(&priv->adapter_sem);
+        return err;
+}
+
+static int ipw2100_set_scan_options(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = SET_SCAN_OPTIONS,
+                .host_command_sequence = 0,
+                .host_command_length = 8
+        };
+        int err;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        IPW_DEBUG_SCAN("setting scan options\n");
+
+        cmd.host_command_parameters[0] = 0;
+
+        if (!(priv->config & CFG_ASSOCIATE))
+                cmd.host_command_parameters[0] |= IPW_SCAN_NOASSOCIATE;
+        if ((priv->sec.flags & SEC_ENABLED) && priv->sec.enabled)
+                cmd.host_command_parameters[0] |= IPW_SCAN_MIXED_CELL;
+        if (priv->config & CFG_PASSIVE_SCAN)
+                cmd.host_command_parameters[0] |= IPW_SCAN_PASSIVE;
+
+        cmd.host_command_parameters[1] = priv->channel_mask;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        IPW_DEBUG_HC("SET_SCAN_OPTIONS 0x%04X\n",
+                     cmd.host_command_parameters[0]);
+
+        return err;
+}
+
+static int ipw2100_start_scan(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = BROADCAST_SCAN,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        IPW_DEBUG_HC("START_SCAN\n");
+
+        cmd.host_command_parameters[0] = 0;
+
+        /* No scanning if in monitor mode */
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR)
+                return 1;
+
+        if (priv->status & STATUS_SCANNING) {
+                IPW_DEBUG_SCAN("Scan requested while already in scan...\n");
+                return 0;
+        }
+
+        IPW_DEBUG_INFO("enter\n");
+
+        /* Not clearing here; doing so makes iwlist always return nothing...
+         *
+         * We should modify the table logic to use aging tables vs. clearing
+         * the table on each scan start.
+         */
+        IPW_DEBUG_SCAN("starting scan\n");
+
+        priv->status |= STATUS_SCANNING;
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                priv->status &= ~STATUS_SCANNING;
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return err;
+}
+
+static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
+{
+        unsigned long flags;
+        int rc = 0;
+        u32 lock;
+        u32 ord_len = sizeof(lock);
+
+        /* Quite if manually disabled. */
+        if (priv->status & STATUS_RF_KILL_SW) {
+                IPW_DEBUG_INFO("%s: Radio is disabled by Manual Disable "
+                               "switch\n", priv->net_dev->name);
+                return 0;
+        }
+
+        /* If the interrupt is enabled, turn it off... */
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_disable_interrupts(priv);
+
+        /* Reset any fatal_error conditions */
+        ipw2100_reset_fatalerror(priv);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        if (priv->status & STATUS_POWERED ||
+            (priv->status & STATUS_RESET_PENDING)) {
+                /* Power cycle the card ... */
+                if (ipw2100_power_cycle_adapter(priv)) {
+                        printk(KERN_WARNING DRV_NAME ": %s: Could not cycle adapter.\n",
+                                          priv->net_dev->name);
+                        rc = 1;
+                        goto exit;
+                }
+        } else
+                priv->status |= STATUS_POWERED;
+
+        /* Load the firmware, start the clocks, etc. */
+        if (ipw2100_start_adapter(priv)) {
+                printk(KERN_ERR DRV_NAME ": %s: Failed to start the firmware.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        ipw2100_initialize_ordinals(priv);
+
+        /* Determine capabilities of this particular HW configuration */
+        if (ipw2100_get_hw_features(priv)) {
+                printk(KERN_ERR DRV_NAME ": %s: Failed to determine HW features.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        lock = LOCK_NONE;
+        if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {
+                printk(KERN_ERR DRV_NAME ": %s: Failed to clear ordinal lock.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        priv->status &= ~STATUS_SCANNING;
+
+        if (rf_kill_active(priv)) {
+                printk(KERN_INFO "%s: Radio is disabled by RF switch.\n",
+                       priv->net_dev->name);
+
+                if (priv->stop_rf_kill) {
+                        priv->stop_rf_kill = 0;
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
+                }
+
+                deferred = 1;
+        }
+
+        /* Turn on the interrupt so that commands can be processed */
+        ipw2100_enable_interrupts(priv);
+
+        /* Send all of the commands that must be sent prior to
+         * HOST_COMPLETE */
+        if (ipw2100_adapter_setup(priv)) {
+                printk(KERN_ERR DRV_NAME ": %s: Failed to start the card.\n",
+                                priv->net_dev->name);
+                rc = 1;
+                goto exit;
+        }
+
+        if (!deferred) {
+                /* Enable the adapter - sends HOST_COMPLETE */
+                if (ipw2100_enable_adapter(priv)) {
+                        printk(KERN_ERR DRV_NAME ": "
+                                "%s: failed in call to enable adapter.\n",
+                                priv->net_dev->name);
+                        ipw2100_hw_stop_adapter(priv);
+                        rc = 1;
+                        goto exit;
+                }
+
+
+                /* Start a scan . . . */
+                ipw2100_set_scan_options(priv);
+                ipw2100_start_scan(priv);
+        }
+
+ exit:
+        return rc;
+}
+
+/* Called by register_netdev() */
+static int ipw2100_net_init(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ipw2100_up(priv, 1);
+}
+
+static void ipw2100_down(struct ipw2100_priv *priv)
+{
+        unsigned long flags;
+        union iwreq_data wrqu = {
+                .ap_addr = {
+                        .sa_family = ARPHRD_ETHER
+                }
+        };
+        int associated = priv->status & STATUS_ASSOCIATED;
+
+        /* Kill the RF switch timer */
+        if (!priv->stop_rf_kill) {
+                priv->stop_rf_kill = 1;
+                cancel_delayed_work(&priv->rf_kill);
+        }
+
+        /* Kill the firmare hang check timer */
+        if (!priv->stop_hang_check) {
+                priv->stop_hang_check = 1;
+                cancel_delayed_work(&priv->hang_check);
+        }
+
+        /* Kill any pending resets */
+        if (priv->status & STATUS_RESET_PENDING)
+                cancel_delayed_work(&priv->reset_work);
+
+        /* Make sure the interrupt is on so that FW commands will be
+         * processed correctly */
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_enable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        if (ipw2100_hw_stop_adapter(priv))
+                printk(KERN_ERR DRV_NAME ": %s: Error stopping adapter.\n",
+                       priv->net_dev->name);
+
+        /* Do not disable the interrupt until _after_ we disable
+         * the adaptor.  Otherwise the CARD_DISABLE command will never
+         * be ack'd by the firmware */
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_disable_interrupts(priv);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        if (priv->config & CFG_C3_DISABLED) {
+                IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n");
+                acpi_set_cstate_limit(priv->cstate_limit);
+                priv->config &= ~CFG_C3_DISABLED;
+        }
+#endif
+
+        /* We have to signal any supplicant if we are disassociating */
+        if (associated)
+                wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+        netif_carrier_off(priv->net_dev);
+        netif_stop_queue(priv->net_dev);
+}
+
+static void ipw2100_reset_adapter(struct ipw2100_priv *priv)
+{
+        unsigned long flags;
+        union iwreq_data wrqu = {
+                .ap_addr = {
+                        .sa_family = ARPHRD_ETHER
+                }
+        };
+        int associated = priv->status & STATUS_ASSOCIATED;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+        IPW_DEBUG_INFO(DRV_NAME ": %s: Restarting adapter.\n",
+                       priv->net_dev->name);
+        priv->resets++;
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+        priv->status |= STATUS_SECURITY_UPDATED;
+
+        /* Force a power cycle even if interface hasn't been opened
+         * yet */
+        cancel_delayed_work(&priv->reset_work);
+        priv->status |= STATUS_RESET_PENDING;
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        down(&priv->action_sem);
+        /* stop timed checks so that they don't interfere with reset */
+        priv->stop_hang_check = 1;
+        cancel_delayed_work(&priv->hang_check);
+
+        /* We have to signal any supplicant if we are disassociating */
+        if (associated)
+                wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+
+        ipw2100_up(priv, 0);
+        up(&priv->action_sem);
+
+}
+
+
+static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
+{
+
+#define MAC_ASSOCIATION_READ_DELAY (HZ)
+        int ret, len, essid_len;
+        char essid[IW_ESSID_MAX_SIZE];
+        u32 txrate;
+        u32 chan;
+        char *txratename;
+        u8 bssid[ETH_ALEN];
+
+        /*
+         * TBD: BSSID is usually 00:00:00:00:00:00 here and not
+         *      an actual MAC of the AP. Seems like FW sets this
+         *      address too late. Read it later and expose through
+         *      /proc or schedule a later task to query and update
+         */
+
+        essid_len = IW_ESSID_MAX_SIZE;
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_SSID,
+                                  essid, &essid_len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+
+        len = sizeof(u32);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE,
+                                  &txrate, &len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+
+        len = sizeof(u32);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_OUR_FREQ, &chan, &len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+        len = ETH_ALEN;
+        ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, &bssid,  &len);
+        if (ret) {
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                                   __LINE__);
+                return;
+        }
+        memcpy(priv->ieee->bssid, bssid, ETH_ALEN);
+
+
+        switch (txrate) {
+        case TX_RATE_1_MBIT:
+                txratename = "1Mbps";
+                break;
+        case TX_RATE_2_MBIT:
+                txratename = "2Mbsp";
+                break;
+        case TX_RATE_5_5_MBIT:
+                txratename = "5.5Mbps";
+                break;
+        case TX_RATE_11_MBIT:
+                txratename = "11Mbps";
+                break;
+        default:
+                IPW_DEBUG_INFO("Unknown rate: %d\n", txrate);
+                txratename = "unknown rate";
+                break;
+        }
+
+        IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID="
+                       MAC_FMT ")\n",
+                       priv->net_dev->name, escape_essid(essid, essid_len),
+                       txratename, chan, MAC_ARG(bssid));
+
+        /* now we copy read ssid into dev */
+        if (!(priv->config & CFG_STATIC_ESSID)) {
+                priv->essid_len = min((u8)essid_len, (u8)IW_ESSID_MAX_SIZE);
+                memcpy(priv->essid, essid, priv->essid_len);
+        }
+        priv->channel = chan;
+        memcpy(priv->bssid, bssid, ETH_ALEN);
+
+        priv->status |= STATUS_ASSOCIATING;
+        priv->connect_start = get_seconds();
+
+        queue_delayed_work(priv->workqueue, &priv->wx_event_work, HZ / 10);
+}
+
+
+static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
+                             int length, int batch_mode)
+{
+        int ssid_len = min(length, IW_ESSID_MAX_SIZE);
+        struct host_command cmd = {
+                .host_command = SSID,
+                .host_command_sequence = 0,
+                .host_command_length = ssid_len
+        };
+        int err;
+
+        IPW_DEBUG_HC("SSID: '%s'\n", escape_essid(essid, ssid_len));
+
+        if (ssid_len)
+                memcpy((char*)cmd.host_command_parameters,
+                       essid, ssid_len);
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        /* Bug in FW currently doesn't honor bit 0 in SET_SCAN_OPTIONS to
+         * disable auto association -- so we cheat by setting a bogus SSID */
+        if (!ssid_len && !(priv->config & CFG_ASSOCIATE)) {
+                int i;
+                u8 *bogus = (u8*)cmd.host_command_parameters;
+                for (i = 0; i < IW_ESSID_MAX_SIZE; i++)
+                        bogus[i] = 0x18 + i;
+                cmd.host_command_length = IW_ESSID_MAX_SIZE;
+        }
+
+        /* NOTE:  We always send the SSID command even if the provided ESSID is
+         * the same as what we currently think is set. */
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (!err) {
+                memset(priv->essid + ssid_len, 0,
+                       IW_ESSID_MAX_SIZE - ssid_len);
+                memcpy(priv->essid, essid, ssid_len);
+                priv->essid_len = ssid_len;
+        }
+
+        if (!batch_mode) {
+                if (ipw2100_enable_adapter(priv))
+                        err = -EIO;
+        }
+
+        return err;
+}
+
+static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
+                  "disassociated: '%s' " MAC_FMT " \n",
+                  escape_essid(priv->essid, priv->essid_len),
+                  MAC_ARG(priv->bssid));
+
+        priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
+
+        if (priv->status & STATUS_STOPPING) {
+                IPW_DEBUG_INFO("Card is stopping itself, discard ASSN_LOST.\n");
+                return;
+        }
+
+        memset(priv->bssid, 0, ETH_ALEN);
+        memset(priv->ieee->bssid, 0, ETH_ALEN);
+
+        netif_carrier_off(priv->net_dev);
+        netif_stop_queue(priv->net_dev);
+
+        if (!(priv->status & STATUS_RUNNING))
+                return;
+
+        if (priv->status & STATUS_SECURITY_UPDATED)
+                queue_work(priv->workqueue, &priv->security_work);
+
+        queue_work(priv->workqueue, &priv->wx_event_work);
+}
+
+static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG_INFO("%s: RF Kill state changed to radio OFF.\n",
+               priv->net_dev->name);
+
+        /* RF_KILL is now enabled (else we wouldn't be here) */
+        priv->status |= STATUS_RF_KILL_HW;
+
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        if (priv->config & CFG_C3_DISABLED) {
+                IPW_DEBUG_INFO(DRV_NAME ": Resetting C3 transitions.\n");
+                acpi_set_cstate_limit(priv->cstate_limit);
+                priv->config &= ~CFG_C3_DISABLED;
+        }
+#endif
+
+        /* Make sure the RF Kill check timer is running */
+        priv->stop_rf_kill = 0;
+        cancel_delayed_work(&priv->rf_kill);
+        queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
+}
+
+static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG_SCAN("scan complete\n");
+        /* Age the scan results... */
+        priv->ieee->scans++;
+        priv->status &= ~STATUS_SCANNING;
+}
+
+#ifdef CONFIG_IPW_DEBUG
+#define IPW2100_HANDLER(v, f) { v, f, # v }
+struct ipw2100_status_indicator {
+        int status;
+        void (*cb)(struct ipw2100_priv *priv, u32 status);
+        char *name;
+};
+#else
+#define IPW2100_HANDLER(v, f) { v, f }
+struct ipw2100_status_indicator {
+        int status;
+        void (*cb)(struct ipw2100_priv *priv, u32 status);
+};
+#endif /* CONFIG_IPW_DEBUG */
+
+static void isr_indicate_scanning(struct ipw2100_priv *priv, u32 status)
+{
+        IPW_DEBUG_SCAN("Scanning...\n");
+        priv->status |= STATUS_SCANNING;
+}
+
+static const struct ipw2100_status_indicator status_handlers[] = {
+        IPW2100_HANDLER(IPW_STATE_INITIALIZED, NULL),
+        IPW2100_HANDLER(IPW_STATE_COUNTRY_FOUND, NULL),
+        IPW2100_HANDLER(IPW_STATE_ASSOCIATED, isr_indicate_associated),
+        IPW2100_HANDLER(IPW_STATE_ASSN_LOST, isr_indicate_association_lost),
+        IPW2100_HANDLER(IPW_STATE_ASSN_CHANGED, NULL),
+        IPW2100_HANDLER(IPW_STATE_SCAN_COMPLETE, isr_scan_complete),
+        IPW2100_HANDLER(IPW_STATE_ENTERED_PSP, NULL),
+        IPW2100_HANDLER(IPW_STATE_LEFT_PSP, NULL),
+        IPW2100_HANDLER(IPW_STATE_RF_KILL, isr_indicate_rf_kill),
+        IPW2100_HANDLER(IPW_STATE_DISABLED, NULL),
+        IPW2100_HANDLER(IPW_STATE_POWER_DOWN, NULL),
+        IPW2100_HANDLER(IPW_STATE_SCANNING, isr_indicate_scanning),
+        IPW2100_HANDLER(-1, NULL)
+};
+
+
+static void isr_status_change(struct ipw2100_priv *priv, int status)
+{
+        int i;
+
+        if (status == IPW_STATE_SCANNING &&
+            priv->status & STATUS_ASSOCIATED &&
+            !(priv->status & STATUS_SCANNING)) {
+                IPW_DEBUG_INFO("Scan detected while associated, with "
+                               "no scan request.  Restarting firmware.\n");
+
+                /* Wake up any sleeping jobs */
+                schedule_reset(priv);
+        }
+
+        for (i = 0; status_handlers[i].status != -1; i++) {
+                if (status == status_handlers[i].status) {
+                        IPW_DEBUG_NOTIF("Status change: %s\n",
+                                         status_handlers[i].name);
+                        if (status_handlers[i].cb)
+                                status_handlers[i].cb(priv, status);
+                        priv->wstats.status = status;
+                        return;
+                }
+        }
+
+        IPW_DEBUG_NOTIF("unknown status received: %04x\n", status);
+}
+
+static void isr_rx_complete_command(
+        struct ipw2100_priv *priv,
+        struct ipw2100_cmd_header *cmd)
+{
+#ifdef CONFIG_IPW_DEBUG
+        if (cmd->host_command_reg < ARRAY_SIZE(command_types)) {
+                IPW_DEBUG_HC("Command completed '%s (%d)'\n",
+                             command_types[cmd->host_command_reg],
+                             cmd->host_command_reg);
+        }
+#endif
+        if (cmd->host_command_reg == HOST_COMPLETE)
+                priv->status |= STATUS_ENABLED;
+
+        if (cmd->host_command_reg == CARD_DISABLE)
+                priv->status &= ~STATUS_ENABLED;
+
+        priv->status &= ~STATUS_CMD_ACTIVE;
+
+        wake_up_interruptible(&priv->wait_command_queue);
+}
+
+#ifdef CONFIG_IPW_DEBUG
+static const char *frame_types[] = {
+        "COMMAND_STATUS_VAL",
+        "STATUS_CHANGE_VAL",
+        "P80211_DATA_VAL",
+        "P8023_DATA_VAL",
+        "HOST_NOTIFICATION_VAL"
+};
+#endif
+
+
+static inline int ipw2100_alloc_skb(
+        struct ipw2100_priv *priv,
+        struct ipw2100_rx_packet *packet)
+{
+        packet->skb = dev_alloc_skb(sizeof(struct ipw2100_rx));
+        if (!packet->skb)
+                return -ENOMEM;
+
+        packet->rxp = (struct ipw2100_rx *)packet->skb->data;
+        packet->dma_addr = pci_map_single(priv->pci_dev, packet->skb->data,
+                                          sizeof(struct ipw2100_rx),
+                                          PCI_DMA_FROMDEVICE);
+        /* NOTE: pci_map_single does not return an error code, and 0 is a valid
+         *       dma_addr */
+
+        return 0;
+}
+
+
+#define SEARCH_ERROR   0xffffffff
+#define SEARCH_FAIL    0xfffffffe
+#define SEARCH_SUCCESS 0xfffffff0
+#define SEARCH_DISCARD 0
+#define SEARCH_SNAPSHOT 1
+
+#define SNAPSHOT_ADDR(ofs) (priv->snapshot[((ofs) >> 12) & 0xff] + ((ofs) & 0xfff))
+static inline int ipw2100_snapshot_alloc(struct ipw2100_priv *priv)
+{
+        int i;
+        if (priv->snapshot[0])
+                return 1;
+        for (i = 0; i < 0x30; i++) {
+                priv->snapshot[i] = (u8*)kmalloc(0x1000, GFP_ATOMIC);
+                if (!priv->snapshot[i]) {
+                        IPW_DEBUG_INFO("%s: Error allocating snapshot "
+                               "buffer %d\n", priv->net_dev->name, i);
+                        while (i > 0)
+                                kfree(priv->snapshot[--i]);
+                        priv->snapshot[0] = NULL;
+                        return 0;
+                }
+        }
+
+        return 1;
+}
+
+static inline void ipw2100_snapshot_free(struct ipw2100_priv *priv)
+{
+        int i;
+        if (!priv->snapshot[0])
+                return;
+        for (i = 0; i < 0x30; i++)
+                kfree(priv->snapshot[i]);
+        priv->snapshot[0] = NULL;
+}
+
+static inline u32 ipw2100_match_buf(struct ipw2100_priv *priv, u8 *in_buf,
+                                    size_t len, int mode)
+{
+        u32 i, j;
+        u32 tmp;
+        u8 *s, *d;
+        u32 ret;
+
+        s = in_buf;
+        if (mode == SEARCH_SNAPSHOT) {
+                if (!ipw2100_snapshot_alloc(priv))
+                        mode = SEARCH_DISCARD;
+        }
+
+        for (ret = SEARCH_FAIL, i = 0; i < 0x30000; i += 4) {
+                read_nic_dword(priv->net_dev, i, &tmp);
+                if (mode == SEARCH_SNAPSHOT)
+                        *(u32 *)SNAPSHOT_ADDR(i) = tmp;
+                if (ret == SEARCH_FAIL) {
+                        d = (u8*)&tmp;
+                        for (j = 0; j < 4; j++) {
+                                if (*s != *d) {
+                                        s = in_buf;
+                                        continue;
+                                }
+
+                                s++;
+                                d++;
+
+                                if ((s - in_buf) == len)
+                                        ret = (i + j) - len + 1;
+                        }
+                } else if (mode == SEARCH_DISCARD)
+                        return ret;
+        }
+
+        return ret;
+}
+
+/*
+ *
+ * 0) Disconnect the SKB from the firmware (just unmap)
+ * 1) Pack the ETH header into the SKB
+ * 2) Pass the SKB to the network stack
+ *
+ * When packet is provided by the firmware, it contains the following:
+ *
+ * .  ieee80211_hdr
+ * .  ieee80211_snap_hdr
+ *
+ * The size of the constructed ethernet
+ *
+ */
+#ifdef CONFIG_IPW2100_RX_DEBUG
+static u8 packet_data[IPW_RX_NIC_BUFFER_LENGTH];
+#endif
+
+static inline void ipw2100_corruption_detected(struct ipw2100_priv *priv,
+                                               int i)
+{
+#ifdef CONFIG_IPW_DEBUG_C3
+        struct ipw2100_status *status = &priv->status_queue.drv[i];
+        u32 match, reg;
+        int j;
+#endif
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        int limit;
+#endif
+
+        IPW_DEBUG_INFO(DRV_NAME ": PCI latency error detected at "
+                       "0x%04zX.\n", i * sizeof(struct ipw2100_status));
+
+#ifdef ACPI_CSTATE_LIMIT_DEFINED
+        IPW_DEBUG_INFO(DRV_NAME ": Disabling C3 transitions.\n");
+        limit = acpi_get_cstate_limit();
+        if (limit > 2) {
+                priv->cstate_limit = limit;
+                acpi_set_cstate_limit(2);
+                priv->config |= CFG_C3_DISABLED;
+        }
+#endif
+
+#ifdef CONFIG_IPW_DEBUG_C3
+        /* Halt the fimrware so we can get a good image */
+        write_register(priv->net_dev, IPW_REG_RESET_REG,
+                       IPW_AUX_HOST_RESET_REG_STOP_MASTER);
+        j = 5;
+        do {
+                udelay(IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY);
+                read_register(priv->net_dev, IPW_REG_RESET_REG, &reg);
+
+                if (reg & IPW_AUX_HOST_RESET_REG_MASTER_DISABLED)
+                        break;
+        }  while (j--);
+
+        match = ipw2100_match_buf(priv, (u8*)status,
+                                  sizeof(struct ipw2100_status),
+                                  SEARCH_SNAPSHOT);
+        if (match < SEARCH_SUCCESS)
+                IPW_DEBUG_INFO("%s: DMA status match in Firmware at "
+                               "offset 0x%06X, length %d:\n",
+                               priv->net_dev->name, match,
+                               sizeof(struct ipw2100_status));
+        else
+                IPW_DEBUG_INFO("%s: No DMA status match in "
+                               "Firmware.\n", priv->net_dev->name);
+
+        printk_buf((u8*)priv->status_queue.drv,
+                   sizeof(struct ipw2100_status) * RX_QUEUE_LENGTH);
+#endif
+
+        priv->fatal_error = IPW2100_ERR_C3_CORRUPTION;
+        priv->ieee->stats.rx_errors++;
+        schedule_reset(priv);
+}
+
+static inline void isr_rx(struct ipw2100_priv *priv, int i,
+                          struct ieee80211_rx_stats *stats)
+{
+        struct ipw2100_status *status = &priv->status_queue.drv[i];
+        struct ipw2100_rx_packet *packet = &priv->rx_buffers[i];
+
+        IPW_DEBUG_RX("Handler...\n");
+
+        if (unlikely(status->frame_size > skb_tailroom(packet->skb))) {
+                IPW_DEBUG_INFO("%s: frame_size (%u) > skb_tailroom (%u)!"
+                               "  Dropping.\n",
+                               priv->net_dev->name,
+                               status->frame_size, skb_tailroom(packet->skb));
+                priv->ieee->stats.rx_errors++;
+                return;
+        }
+
+        if (unlikely(!netif_running(priv->net_dev))) {
+                priv->ieee->stats.rx_errors++;
+                priv->wstats.discard.misc++;
+                IPW_DEBUG_DROP("Dropping packet while interface is not up.\n");
+                return;
+        }
+
+        if (unlikely(priv->ieee->iw_mode == IW_MODE_MONITOR &&
+                     status->flags & IPW_STATUS_FLAG_CRC_ERROR)) {
+                IPW_DEBUG_RX("CRC error in packet.  Dropping.\n");
+                priv->ieee->stats.rx_errors++;
+                return;
+        }
+
+        if (unlikely(priv->ieee->iw_mode != IW_MODE_MONITOR &&
+                !(priv->status & STATUS_ASSOCIATED))) {
+                IPW_DEBUG_DROP("Dropping packet while not associated.\n");
+                priv->wstats.discard.misc++;
+                return;
+        }
+
+
+        pci_unmap_single(priv->pci_dev,
+                         packet->dma_addr,
+                         sizeof(struct ipw2100_rx),
+                         PCI_DMA_FROMDEVICE);
+
+        skb_put(packet->skb, status->frame_size);
+
+#ifdef CONFIG_IPW2100_RX_DEBUG
+        /* Make a copy of the frame so we can dump it to the logs if
+         * ieee80211_rx fails */
+        memcpy(packet_data, packet->skb->data,
+               min_t(u32, status->frame_size, IPW_RX_NIC_BUFFER_LENGTH));
+#endif
+
+        if (!ieee80211_rx(priv->ieee, packet->skb, stats)) {
+#ifdef CONFIG_IPW2100_RX_DEBUG
+                IPW_DEBUG_DROP("%s: Non consumed packet:\n",
+                               priv->net_dev->name);
+                printk_buf(IPW_DL_DROP, packet_data, status->frame_size);
+#endif
+                priv->ieee->stats.rx_errors++;
+
+                /* ieee80211_rx failed, so it didn't free the SKB */
+                dev_kfree_skb_any(packet->skb);
+                packet->skb = NULL;
+        }
+
+        /* We need to allocate a new SKB and attach it to the RDB. */
+        if (unlikely(ipw2100_alloc_skb(priv, packet))) {
+                printk(KERN_WARNING DRV_NAME ": "
+                        "%s: Unable to allocate SKB onto RBD ring - disabling "
+                        "adapter.\n", priv->net_dev->name);
+                /* TODO: schedule adapter shutdown */
+                IPW_DEBUG_INFO("TODO: Shutdown adapter...\n");
+        }
+
+        /* Update the RDB entry */
+        priv->rx_queue.drv[i].host_addr = packet->dma_addr;
+}
+
+static inline int ipw2100_corruption_check(struct ipw2100_priv *priv, int i)
+{
+        struct ipw2100_status *status = &priv->status_queue.drv[i];
+        struct ipw2100_rx *u = priv->rx_buffers[i].rxp;
+        u16 frame_type = status->status_fields & STATUS_TYPE_MASK;
+
+        switch (frame_type) {
+        case COMMAND_STATUS_VAL:
+                return (status->frame_size != sizeof(u->rx_data.command));
+        case STATUS_CHANGE_VAL:
+                return (status->frame_size != sizeof(u->rx_data.status));
+        case HOST_NOTIFICATION_VAL:
+                return (status->frame_size < sizeof(u->rx_data.notification));
+        case P80211_DATA_VAL:
+        case P8023_DATA_VAL:
+#ifdef CONFIG_IPW2100_MONITOR
+                return 0;
+#else
+                switch (WLAN_FC_GET_TYPE(u->rx_data.header.frame_ctl)) {
+                case IEEE80211_FTYPE_MGMT:
+                case IEEE80211_FTYPE_CTL:
+                        return 0;
+                case IEEE80211_FTYPE_DATA:
+                        return (status->frame_size >
+                                IPW_MAX_802_11_PAYLOAD_LENGTH);
+                }
+#endif
+        }
+
+        return 1;
+}
+
+/*
+ * ipw2100 interrupts are disabled at this point, and the ISR
+ * is the only code that calls this method.  So, we do not need
+ * to play with any locks.
+ *
+ * RX Queue works as follows:
+ *
+ * Read index - firmware places packet in entry identified by the
+ *              Read index and advances Read index.  In this manner,
+ *              Read index will always point to the next packet to
+ *              be filled--but not yet valid.
+ *
+ * Write index - driver fills this entry with an unused RBD entry.
+ *               This entry has not filled by the firmware yet.
+ *
+ * In between the W and R indexes are the RBDs that have been received
+ * but not yet processed.
+ *
+ * The process of handling packets will start at WRITE + 1 and advance
+ * until it reaches the READ index.
+ *
+ * The WRITE index is cached in the variable 'priv->rx_queue.next'.
+ *
+ */
+static inline void __ipw2100_rx_process(struct ipw2100_priv *priv)
+{
+        struct ipw2100_bd_queue *rxq = &priv->rx_queue;
+        struct ipw2100_status_queue *sq = &priv->status_queue;
+        struct ipw2100_rx_packet *packet;
+        u16 frame_type;
+        u32 r, w, i, s;
+        struct ipw2100_rx *u;
+        struct ieee80211_rx_stats stats = {
+                .mac_time = jiffies,
+        };
+
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_RX_READ_INDEX, &r);
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_RX_WRITE_INDEX, &w);
+
+        if (r >= rxq->entries) {
+                IPW_DEBUG_RX("exit - bad read index\n");
+                return;
+        }
+
+        i = (rxq->next + 1) % rxq->entries;
+        s = i;
+        while (i != r) {
+                /* IPW_DEBUG_RX("r = %d : w = %d : processing = %d\n",
+                   r, rxq->next, i); */
+
+                packet = &priv->rx_buffers[i];
+
+                /* Sync the DMA for the STATUS buffer so CPU is sure to get
+                 * the correct values */
+                pci_dma_sync_single_for_cpu(
+                        priv->pci_dev,
+                        sq->nic + sizeof(struct ipw2100_status) * i,
+                        sizeof(struct ipw2100_status),
+                        PCI_DMA_FROMDEVICE);
+
+                /* Sync the DMA for the RX buffer so CPU is sure to get
+                 * the correct values */
+                pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr,
+                                            sizeof(struct ipw2100_rx),
+                                            PCI_DMA_FROMDEVICE);
+
+                if (unlikely(ipw2100_corruption_check(priv, i))) {
+                        ipw2100_corruption_detected(priv, i);
+                        goto increment;
+                }
+
+                u = packet->rxp;
+                frame_type = sq->drv[i].status_fields &
+                        STATUS_TYPE_MASK;
+                stats.rssi = sq->drv[i].rssi + IPW2100_RSSI_TO_DBM;
+                stats.len = sq->drv[i].frame_size;
+
+                stats.mask = 0;
+                if (stats.rssi != 0)
+                        stats.mask |= IEEE80211_STATMASK_RSSI;
+                stats.freq = IEEE80211_24GHZ_BAND;
+
+                IPW_DEBUG_RX(
+                        "%s: '%s' frame type received (%d).\n",
+                        priv->net_dev->name, frame_types[frame_type],
+                        stats.len);
+
+                switch (frame_type) {
+                case COMMAND_STATUS_VAL:
+                        /* Reset Rx watchdog */
+                        isr_rx_complete_command(
+                                priv, &u->rx_data.command);
+                        break;
+
+                case STATUS_CHANGE_VAL:
+                        isr_status_change(priv, u->rx_data.status);
+                        break;
+
+                case P80211_DATA_VAL:
+                case P8023_DATA_VAL:
+#ifdef CONFIG_IPW2100_MONITOR
+                        if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                                isr_rx(priv, i, &stats);
+                                break;
+                        }
+#endif
+                        if (stats.len < sizeof(u->rx_data.header))
+                                break;
+                        switch (WLAN_FC_GET_TYPE(u->rx_data.header.
+                                                 frame_ctl)) {
+                        case IEEE80211_FTYPE_MGMT:
+                                ieee80211_rx_mgt(priv->ieee,
+                                                 &u->rx_data.header,
+                                                 &stats);
+                                break;
+
+                        case IEEE80211_FTYPE_CTL:
+                                break;
+
+                        case IEEE80211_FTYPE_DATA:
+                                isr_rx(priv, i, &stats);
+                                break;
+
+                        }
+                        break;
+                }
+
+        increment:
+                /* clear status field associated with this RBD */
+                rxq->drv[i].status.info.field = 0;
+
+                i = (i + 1) % rxq->entries;
+        }
+
+        if (i != s) {
+                /* backtrack one entry, wrapping to end if at 0 */
+                rxq->next = (i ? i : rxq->entries) - 1;
+
+                write_register(priv->net_dev,
+                               IPW_MEM_HOST_SHARED_RX_WRITE_INDEX,
+                               rxq->next);
+        }
+}
+
+
+/*
+ * __ipw2100_tx_process
+ *
+ * This routine will determine whether the next packet on
+ * the fw_pend_list has been processed by the firmware yet.
+ *
+ * If not, then it does nothing and returns.
+ *
+ * If so, then it removes the item from the fw_pend_list, frees
+ * any associated storage, and places the item back on the
+ * free list of its source (either msg_free_list or tx_free_list)
+ *
+ * TX Queue works as follows:
+ *
+ * Read index - points to the next TBD that the firmware will
+ *              process.  The firmware will read the data, and once
+ *              done processing, it will advance the Read index.
+ *
+ * Write index - driver fills this entry with an constructed TBD
+ *               entry.  The Write index is not advanced until the
+ *               packet has been configured.
+ *
+ * In between the W and R indexes are the TBDs that have NOT been
+ * processed.  Lagging behind the R index are packets that have
+ * been processed but have not been freed by the driver.
+ *
+ * In order to free old storage, an internal index will be maintained
+ * that points to the next packet to be freed.  When all used
+ * packets have been freed, the oldest index will be the same as the
+ * firmware's read index.
+ *
+ * The OLDEST index is cached in the variable 'priv->tx_queue.oldest'
+ *
+ * Because the TBD structure can not contain arbitrary data, the
+ * driver must keep an internal queue of cached allocations such that
+ * it can put that data back into the tx_free_list and msg_free_list
+ * for use by future command and data packets.
+ *
+ */
+static inline int __ipw2100_tx_process(struct ipw2100_priv *priv)
+{
+        struct ipw2100_bd_queue *txq = &priv->tx_queue;
+        struct ipw2100_bd *tbd;
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        int descriptors_used;
+        int e, i;
+        u32 r, w, frag_num = 0;
+
+        if (list_empty(&priv->fw_pend_list))
+                return 0;
+
+        element = priv->fw_pend_list.next;
+
+        packet = list_entry(element, struct ipw2100_tx_packet, list);
+        tbd = &txq->drv[packet->index];
+
+        /* Determine how many TBD entries must be finished... */
+        switch (packet->type) {
+        case COMMAND:
+                /* COMMAND uses only one slot; don't advance */
+                descriptors_used = 1;
+                e = txq->oldest;
+                break;
+
+        case DATA:
+                /* DATA uses two slots; advance and loop position. */
+                descriptors_used = tbd->num_fragments;
+                frag_num = tbd->num_fragments - 1;
+                e = txq->oldest + frag_num;
+                e %= txq->entries;
+                break;
+
+        default:
+                printk(KERN_WARNING DRV_NAME ": %s: Bad fw_pend_list entry!\n",
+                                   priv->net_dev->name);
+                return 0;
+        }
+
+        /* if the last TBD is not done by NIC yet, then packet is
+         * not ready to be released.
+         *
+         */
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_TX_QUEUE_READ_INDEX,
+                      &r);
+        read_register(priv->net_dev, IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
+                      &w);
+        if (w != txq->next)
+                printk(KERN_WARNING DRV_NAME ": %s: write index mismatch\n",
+                       priv->net_dev->name);
+
+        /*
+         * txq->next is the index of the last packet written txq->oldest is
+         * the index of the r is the index of the next packet to be read by
+         * firmware
+         */
+
+
+        /*
+         * Quick graphic to help you visualize the following
+         * if / else statement
+         *
+         * ===>|                     s---->|===============
+         *                               e>|
+         * | a | b | c | d | e | f | g | h | i | j | k | l
+         *       r---->|
+         *               w
+         *
+         * w - updated by driver
+         * r - updated by firmware
+         * s - start of oldest BD entry (txq->oldest)
+         * e - end of oldest BD entry
+         *
+         */
+        if (!((r <= w && (e < r || e >= w)) || (e < r && e >= w))) {
+                IPW_DEBUG_TX("exit - no processed packets ready to release.\n");
+                return 0;
+        }
+
+        list_del(element);
+        DEC_STAT(&priv->fw_pend_stat);
+
+#ifdef CONFIG_IPW_DEBUG
+        {
+                int i = txq->oldest;
+                IPW_DEBUG_TX(
+                        "TX%d V=%p P=%04X T=%04X L=%d\n", i,
+                        &txq->drv[i],
+                        (u32)(txq->nic + i * sizeof(struct ipw2100_bd)),
+                        txq->drv[i].host_addr,
+                        txq->drv[i].buf_length);
+
+                if (packet->type == DATA) {
+                        i = (i + 1) % txq->entries;
+
+                        IPW_DEBUG_TX(
+                                "TX%d V=%p P=%04X T=%04X L=%d\n", i,
+                                &txq->drv[i],
+                                (u32)(txq->nic + i *
+                                sizeof(struct ipw2100_bd)),
+                                (u32)txq->drv[i].host_addr,
+                                txq->drv[i].buf_length);
+                }
+        }
+#endif
+
+        switch (packet->type) {
+        case DATA:
+                if (txq->drv[txq->oldest].status.info.fields.txType != 0)
+                        printk(KERN_WARNING DRV_NAME ": %s: Queue mismatch.  "
+                               "Expecting DATA TBD but pulled "
+                               "something else: ids %d=%d.\n",
+                               priv->net_dev->name, txq->oldest, packet->index);
+
+                /* DATA packet; we have to unmap and free the SKB */
+                priv->ieee->stats.tx_packets++;
+                for (i = 0; i < frag_num; i++) {
+                        tbd = &txq->drv[(packet->index + 1 + i) %
+                                        txq->entries];
+
+                        IPW_DEBUG_TX(
+                                "TX%d P=%08x L=%d\n",
+                                (packet->index + 1 + i) % txq->entries,
+                                tbd->host_addr, tbd->buf_length);
+
+                        pci_unmap_single(priv->pci_dev,
+                                         tbd->host_addr,
+                                         tbd->buf_length,
+                                         PCI_DMA_TODEVICE);
+                }
+
+                priv->ieee->stats.tx_bytes += packet->info.d_struct.txb->payload_size;
+                ieee80211_txb_free(packet->info.d_struct.txb);
+                packet->info.d_struct.txb = NULL;
+
+                list_add_tail(element, &priv->tx_free_list);
+                INC_STAT(&priv->tx_free_stat);
+
+                /* We have a free slot in the Tx queue, so wake up the
+                 * transmit layer if it is stopped. */
+                if (priv->status & STATUS_ASSOCIATED &&
+                    netif_queue_stopped(priv->net_dev)) {
+                        IPW_DEBUG_INFO(KERN_INFO
+                                           "%s: Waking net queue.\n",
+                                           priv->net_dev->name);
+                        netif_wake_queue(priv->net_dev);
+                }
+
+                /* A packet was processed by the hardware, so update the
+                 * watchdog */
+                priv->net_dev->trans_start = jiffies;
+
+                break;
+
+        case COMMAND:
+                if (txq->drv[txq->oldest].status.info.fields.txType != 1)
+                        printk(KERN_WARNING DRV_NAME ": %s: Queue mismatch.  "
+                               "Expecting COMMAND TBD but pulled "
+                               "something else: ids %d=%d.\n",
+                               priv->net_dev->name, txq->oldest, packet->index);
+
+#ifdef CONFIG_IPW_DEBUG
+                if (packet->info.c_struct.cmd->host_command_reg <
+                    sizeof(command_types) / sizeof(*command_types))
+                        IPW_DEBUG_TX(
+                                "Command '%s (%d)' processed: %d.\n",
+                                command_types[packet->info.c_struct.cmd->host_command_reg],
+                                packet->info.c_struct.cmd->host_command_reg,
+                                packet->info.c_struct.cmd->cmd_status_reg);
+#endif
+
+                list_add_tail(element, &priv->msg_free_list);
+                INC_STAT(&priv->msg_free_stat);
+                break;
+        }
+
+        /* advance oldest used TBD pointer to start of next entry */
+        txq->oldest = (e + 1) % txq->entries;
+        /* increase available TBDs number */
+        txq->available += descriptors_used;
+        SET_STAT(&priv->txq_stat, txq->available);
+
+        IPW_DEBUG_TX("packet latency (send to process)  %ld jiffies\n",
+                         jiffies - packet->jiffy_start);
+
+        return (!list_empty(&priv->fw_pend_list));
+}
+
+
+static inline void __ipw2100_tx_complete(struct ipw2100_priv *priv)
+{
+        int i = 0;
+
+        while (__ipw2100_tx_process(priv) && i < 200) i++;
+
+        if (i == 200) {
+                printk(KERN_WARNING DRV_NAME ": "
+                       "%s: Driver is running slow (%d iters).\n",
+                       priv->net_dev->name, i);
+        }
+}
+
+
+static void ipw2100_tx_send_commands(struct ipw2100_priv *priv)
+{
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        struct ipw2100_bd_queue *txq = &priv->tx_queue;
+        struct ipw2100_bd *tbd;
+        int next = txq->next;
+
+        while (!list_empty(&priv->msg_pend_list)) {
+                /* if there isn't enough space in TBD queue, then
+                 * don't stuff a new one in.
+                 * NOTE: 3 are needed as a command will take one,
+                 *       and there is a minimum of 2 that must be
+                 *       maintained between the r and w indexes
+                 */
+                if (txq->available <= 3) {
+                        IPW_DEBUG_TX("no room in tx_queue\n");
+                        break;
+                }
+
+                element = priv->msg_pend_list.next;
+                list_del(element);
+                DEC_STAT(&priv->msg_pend_stat);
+
+                packet = list_entry(element,
+                                    struct ipw2100_tx_packet, list);
+
+                IPW_DEBUG_TX("using TBD at virt=%p, phys=%p\n",
+                                 &txq->drv[txq->next],
+                                 (void*)(txq->nic + txq->next *
+                                         sizeof(struct ipw2100_bd)));
+
+                packet->index = txq->next;
+
+                tbd = &txq->drv[txq->next];
+
+                /* initialize TBD */
+                tbd->host_addr = packet->info.c_struct.cmd_phys;
+                tbd->buf_length = sizeof(struct ipw2100_cmd_header);
+                /* not marking number of fragments causes problems
+                 * with f/w debug version */
+                tbd->num_fragments = 1;
+                tbd->status.info.field =
+                        IPW_BD_STATUS_TX_FRAME_COMMAND |
+                        IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
+
+                /* update TBD queue counters */
+                txq->next++;
+                txq->next %= txq->entries;
+                txq->available--;
+                DEC_STAT(&priv->txq_stat);
+
+                list_add_tail(element, &priv->fw_pend_list);
+                INC_STAT(&priv->fw_pend_stat);
+        }
+
+        if (txq->next != next) {
+                /* kick off the DMA by notifying firmware the
+                 * write index has moved; make sure TBD stores are sync'd */
+                wmb();
+                write_register(priv->net_dev,
+                               IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
+                               txq->next);
+        }
+}
+
+
+/*
+ * ipw2100_tx_send_data
+ *
+ */
+static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
+{
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        struct ipw2100_bd_queue *txq = &priv->tx_queue;
+        struct ipw2100_bd *tbd;
+        int next = txq->next;
+        int i = 0;
+        struct ipw2100_data_header *ipw_hdr;
+        struct ieee80211_hdr *hdr;
+
+        while (!list_empty(&priv->tx_pend_list)) {
+                /* if there isn't enough space in TBD queue, then
+                 * don't stuff a new one in.
+                 * NOTE: 4 are needed as a data will take two,
+                 *       and there is a minimum of 2 that must be
+                 *       maintained between the r and w indexes
+                 */
+                element = priv->tx_pend_list.next;
+                packet = list_entry(element, struct ipw2100_tx_packet, list);
+
+                if (unlikely(1 + packet->info.d_struct.txb->nr_frags >
+                             IPW_MAX_BDS)) {
+                        /* TODO: Support merging buffers if more than
+                         * IPW_MAX_BDS are used */
+                        IPW_DEBUG_INFO(
+                               "%s: Maximum BD theshold exceeded.  "
+                               "Increase fragmentation level.\n",
+                               priv->net_dev->name);
+                }
+
+                if (txq->available <= 3 +
+                    packet->info.d_struct.txb->nr_frags) {
+                        IPW_DEBUG_TX("no room in tx_queue\n");
+                        break;
+                }
+
+                list_del(element);
+                DEC_STAT(&priv->tx_pend_stat);
+
+                tbd = &txq->drv[txq->next];
+
+                packet->index = txq->next;
+
+                ipw_hdr = packet->info.d_struct.data;
+                hdr = (struct ieee80211_hdr *)packet->info.d_struct.txb->
+                        fragments[0]->data;
+
+                if (priv->ieee->iw_mode == IW_MODE_INFRA) {
+                        /* To DS: Addr1 = BSSID, Addr2 = SA,
+                           Addr3 = DA */
+                        memcpy(ipw_hdr->src_addr, hdr->addr2, ETH_ALEN);
+                        memcpy(ipw_hdr->dst_addr, hdr->addr3, ETH_ALEN);
+                } else if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                        /* not From/To DS: Addr1 = DA, Addr2 = SA,
+                           Addr3 = BSSID */
+                        memcpy(ipw_hdr->src_addr, hdr->addr2, ETH_ALEN);
+                        memcpy(ipw_hdr->dst_addr, hdr->addr1, ETH_ALEN);
+                }
+
+                ipw_hdr->host_command_reg = SEND;
+                ipw_hdr->host_command_reg1 = 0;
+
+                /* For now we only support host based encryption */
+                ipw_hdr->needs_encryption = 0;
+                ipw_hdr->encrypted = packet->info.d_struct.txb->encrypted;
+                if (packet->info.d_struct.txb->nr_frags > 1)
+                        ipw_hdr->fragment_size =
+                                packet->info.d_struct.txb->frag_size - IEEE80211_3ADDR_LEN;
+                else
+                        ipw_hdr->fragment_size = 0;
+
+                tbd->host_addr = packet->info.d_struct.data_phys;
+                tbd->buf_length = sizeof(struct ipw2100_data_header);
+                tbd->num_fragments = 1 + packet->info.d_struct.txb->nr_frags;
+                tbd->status.info.field =
+                        IPW_BD_STATUS_TX_FRAME_802_3 |
+                        IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
+                txq->next++;
+                txq->next %= txq->entries;
+
+                IPW_DEBUG_TX(
+                        "data header tbd TX%d P=%08x L=%d\n",
+                        packet->index, tbd->host_addr,
+                        tbd->buf_length);
+#ifdef CONFIG_IPW_DEBUG
+                if (packet->info.d_struct.txb->nr_frags > 1)
+                        IPW_DEBUG_FRAG("fragment Tx: %d frames\n",
+                                       packet->info.d_struct.txb->nr_frags);
+#endif
+
+                for (i = 0; i < packet->info.d_struct.txb->nr_frags; i++) {
+                        tbd = &txq->drv[txq->next];
+                        if (i == packet->info.d_struct.txb->nr_frags - 1)
+                                tbd->status.info.field =
+                                        IPW_BD_STATUS_TX_FRAME_802_3 |
+                                        IPW_BD_STATUS_TX_INTERRUPT_ENABLE;
+                        else
+                                tbd->status.info.field =
+                                        IPW_BD_STATUS_TX_FRAME_802_3 |
+                                        IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT;
+
+                        tbd->buf_length = packet->info.d_struct.txb->
+                                fragments[i]->len - IEEE80211_3ADDR_LEN;
+
+                        tbd->host_addr = pci_map_single(
+                                priv->pci_dev,
+                                packet->info.d_struct.txb->fragments[i]->data +
+                                IEEE80211_3ADDR_LEN,
+                                tbd->buf_length,
+                                PCI_DMA_TODEVICE);
+
+                        IPW_DEBUG_TX(
+                                "data frag tbd TX%d P=%08x L=%d\n",
+                                txq->next, tbd->host_addr, tbd->buf_length);
+
+                        pci_dma_sync_single_for_device(
+                                priv->pci_dev, tbd->host_addr,
+                                tbd->buf_length,
+                                PCI_DMA_TODEVICE);
+
+                        txq->next++;
+                        txq->next %= txq->entries;
+                }
+
+                txq->available -= 1 + packet->info.d_struct.txb->nr_frags;
+                SET_STAT(&priv->txq_stat, txq->available);
+
+                list_add_tail(element, &priv->fw_pend_list);
+                INC_STAT(&priv->fw_pend_stat);
+        }
+
+        if (txq->next != next) {
+                /* kick off the DMA by notifying firmware the
+                 * write index has moved; make sure TBD stores are sync'd */
+                write_register(priv->net_dev,
+                               IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX,
+                               txq->next);
+        }
+        return;
+}
+
+static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
+{
+        struct net_device *dev = priv->net_dev;
+        unsigned long flags;
+        u32 inta, tmp;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+        ipw2100_disable_interrupts(priv);
+
+        read_register(dev, IPW_REG_INTA, &inta);
+
+        IPW_DEBUG_ISR("enter - INTA: 0x%08lX\n",
+                      (unsigned long)inta & IPW_INTERRUPT_MASK);
+
+        priv->in_isr++;
+        priv->interrupts++;
+
+        /* We do not loop and keep polling for more interrupts as this
+         * is frowned upon and doesn't play nicely with other potentially
+         * chained IRQs */
+        IPW_DEBUG_ISR("INTA: 0x%08lX\n",
+                      (unsigned long)inta & IPW_INTERRUPT_MASK);
+
+        if (inta & IPW2100_INTA_FATAL_ERROR) {
+                printk(KERN_WARNING DRV_NAME
+                                  ": Fatal interrupt. Scheduling firmware restart.\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_FATAL_ERROR);
+
+                read_nic_dword(dev, IPW_NIC_FATAL_ERROR, &priv->fatal_error);
+                IPW_DEBUG_INFO("%s: Fatal error value: 0x%08X\n",
+                               priv->net_dev->name, priv->fatal_error);
+
+                read_nic_dword(dev, IPW_ERROR_ADDR(priv->fatal_error), &tmp);
+                IPW_DEBUG_INFO("%s: Fatal error address value: 0x%08X\n",
+                               priv->net_dev->name, tmp);
+
+                /* Wake up any sleeping jobs */
+                schedule_reset(priv);
+        }
+
+        if (inta & IPW2100_INTA_PARITY_ERROR) {
+                printk(KERN_ERR DRV_NAME ": ***** PARITY ERROR INTERRUPT !!!! \n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_PARITY_ERROR);
+        }
+
+        if (inta & IPW2100_INTA_RX_TRANSFER) {
+                IPW_DEBUG_ISR("RX interrupt\n");
+
+                priv->rx_interrupts++;
+
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_RX_TRANSFER);
+
+                __ipw2100_rx_process(priv);
+                __ipw2100_tx_complete(priv);
+        }
+
+        if (inta & IPW2100_INTA_TX_TRANSFER) {
+                IPW_DEBUG_ISR("TX interrupt\n");
+
+                priv->tx_interrupts++;
+
+                write_register(dev, IPW_REG_INTA,
+                               IPW2100_INTA_TX_TRANSFER);
+
+                __ipw2100_tx_complete(priv);
+                ipw2100_tx_send_commands(priv);
+                ipw2100_tx_send_data(priv);
+        }
+
+        if (inta & IPW2100_INTA_TX_COMPLETE) {
+                IPW_DEBUG_ISR("TX complete\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_TX_COMPLETE);
+
+                __ipw2100_tx_complete(priv);
+        }
+
+        if (inta & IPW2100_INTA_EVENT_INTERRUPT) {
+                /* ipw2100_handle_event(dev); */
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_EVENT_INTERRUPT);
+        }
+
+        if (inta & IPW2100_INTA_FW_INIT_DONE) {
+                IPW_DEBUG_ISR("FW init done interrupt\n");
+                priv->inta_other++;
+
+                read_register(dev, IPW_REG_INTA, &tmp);
+                if (tmp & (IPW2100_INTA_FATAL_ERROR |
+                           IPW2100_INTA_PARITY_ERROR)) {
+                        write_register(
+                                dev, IPW_REG_INTA,
+                                IPW2100_INTA_FATAL_ERROR |
+                                IPW2100_INTA_PARITY_ERROR);
+                }
+
+                write_register(dev, IPW_REG_INTA,
+                               IPW2100_INTA_FW_INIT_DONE);
+        }
+
+        if (inta & IPW2100_INTA_STATUS_CHANGE) {
+                IPW_DEBUG_ISR("Status change interrupt\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_STATUS_CHANGE);
+        }
+
+        if (inta & IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE) {
+                IPW_DEBUG_ISR("slave host mode interrupt\n");
+                priv->inta_other++;
+                write_register(
+                        dev, IPW_REG_INTA,
+                        IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE);
+        }
+
+        priv->in_isr--;
+        ipw2100_enable_interrupts(priv);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        IPW_DEBUG_ISR("exit\n");
+}
+
+
+static irqreturn_t ipw2100_interrupt(int irq, void *data,
+                                     struct pt_regs *regs)
+{
+        struct ipw2100_priv *priv = data;
+        u32 inta, inta_mask;
+
+        if (!data)
+                return IRQ_NONE;
+
+        spin_lock(&priv->low_lock);
+
+        /* We check to see if we should be ignoring interrupts before
+         * we touch the hardware.  During ucode load if we try and handle
+         * an interrupt we can cause keyboard problems as well as cause
+         * the ucode to fail to initialize */
+        if (!(priv->status & STATUS_INT_ENABLED)) {
+                /* Shared IRQ */
+                goto none;
+        }
+
+        read_register(priv->net_dev, IPW_REG_INTA_MASK, &inta_mask);
+        read_register(priv->net_dev, IPW_REG_INTA, &inta);
+
+        if (inta == 0xFFFFFFFF) {
+                /* Hardware disappeared */
+                printk(KERN_WARNING DRV_NAME ": IRQ INTA == 0xFFFFFFFF\n");
+                goto none;
+        }
+
+        inta &= IPW_INTERRUPT_MASK;
+
+        if (!(inta & inta_mask)) {
+                /* Shared interrupt */
+                goto none;
+        }
+
+        /* We disable the hardware interrupt here just to prevent unneeded
+         * calls to be made.  We disable this again within the actual
+         * work tasklet, so if another part of the code re-enables the
+         * interrupt, that is fine */
+        ipw2100_disable_interrupts(priv);
+
+        tasklet_schedule(&priv->irq_tasklet);
+        spin_unlock(&priv->low_lock);
+
+        return IRQ_HANDLED;
+ none:
+        spin_unlock(&priv->low_lock);
+        return IRQ_NONE;
+}
+
+static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                IPW_DEBUG_INFO("Can not transmit when not connected.\n");
+                priv->ieee->stats.tx_carrier_errors++;
+                netif_stop_queue(dev);
+                goto fail_unlock;
+        }
+
+        if (list_empty(&priv->tx_free_list))
+                goto fail_unlock;
+
+        element = priv->tx_free_list.next;
+        packet = list_entry(element, struct ipw2100_tx_packet, list);
+
+        packet->info.d_struct.txb = txb;
+
+        IPW_DEBUG_TX("Sending fragment (%d bytes):\n",
+                         txb->fragments[0]->len);
+        printk_buf(IPW_DL_TX, txb->fragments[0]->data,
+                   txb->fragments[0]->len);
+
+        packet->jiffy_start = jiffies;
+
+        list_del(element);
+        DEC_STAT(&priv->tx_free_stat);
+
+        list_add_tail(element, &priv->tx_pend_list);
+        INC_STAT(&priv->tx_pend_stat);
+
+        ipw2100_tx_send_data(priv);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+        return 0;
+
+ fail_unlock:
+        netif_stop_queue(dev);
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+        return 1;
+}
+
+
+static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
+{
+        int i, j, err = -EINVAL;
+        void *v;
+        dma_addr_t p;
+
+        priv->msg_buffers = (struct ipw2100_tx_packet *)kmalloc(
+                IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
+                GFP_KERNEL);
+        if (!priv->msg_buffers) {
+                printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg "
+                       "buffers.\n", priv->net_dev->name);
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {
+                v = pci_alloc_consistent(
+                        priv->pci_dev,
+                        sizeof(struct ipw2100_cmd_header),
+                        &p);
+                if (!v) {
+                        printk(KERN_ERR DRV_NAME ": "
+                               "%s: PCI alloc failed for msg "
+                               "buffers.\n",
+                               priv->net_dev->name);
+                        err = -ENOMEM;
+                        break;
+                }
+
+                memset(v, 0, sizeof(struct ipw2100_cmd_header));
+
+                priv->msg_buffers[i].type = COMMAND;
+                priv->msg_buffers[i].info.c_struct.cmd =
+                        (struct ipw2100_cmd_header*)v;
+                priv->msg_buffers[i].info.c_struct.cmd_phys = p;
+        }
+
+        if (i == IPW_COMMAND_POOL_SIZE)
+                return 0;
+
+        for (j = 0; j < i; j++) {
+                pci_free_consistent(
+                        priv->pci_dev,
+                        sizeof(struct ipw2100_cmd_header),
+                        priv->msg_buffers[j].info.c_struct.cmd,
+                        priv->msg_buffers[j].info.c_struct.cmd_phys);
+        }
+
+        kfree(priv->msg_buffers);
+        priv->msg_buffers = NULL;
+
+        return err;
+}
+
+static int ipw2100_msg_initialize(struct ipw2100_priv *priv)
+{
+        int i;
+
+        INIT_LIST_HEAD(&priv->msg_free_list);
+        INIT_LIST_HEAD(&priv->msg_pend_list);
+
+        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++)
+                list_add_tail(&priv->msg_buffers[i].list, &priv->msg_free_list);
+        SET_STAT(&priv->msg_free_stat, i);
+
+        return 0;
+}
+
+static void ipw2100_msg_free(struct ipw2100_priv *priv)
+{
+        int i;
+
+        if (!priv->msg_buffers)
+                return;
+
+        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {
+                pci_free_consistent(priv->pci_dev,
+                                    sizeof(struct ipw2100_cmd_header),
+                                    priv->msg_buffers[i].info.c_struct.cmd,
+                                    priv->msg_buffers[i].info.c_struct.cmd_phys);
+        }
+
+        kfree(priv->msg_buffers);
+        priv->msg_buffers = NULL;
+}
+
+static ssize_t show_pci(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct pci_dev *pci_dev = container_of(d, struct pci_dev, dev);
+        char *out = buf;
+        int i, j;
+        u32 val;
+
+        for (i = 0; i < 16; i++) {
+                out += sprintf(out, "[%08X] ", i * 16);
+                for (j = 0; j < 16; j += 4) {
+                        pci_read_config_dword(pci_dev, i * 16 + j, &val);
+                        out += sprintf(out, "%08X ", val);
+                }
+                out += sprintf(out, "\n");
+        }
+
+        return out - buf;
+}
+static DEVICE_ATTR(pci, S_IRUGO, show_pci, NULL);
+
+static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct ipw2100_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->config);
+}
+static DEVICE_ATTR(cfg, S_IRUGO, show_cfg, NULL);
+
+static ssize_t show_status(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct ipw2100_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->status);
+}
+static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
+
+static ssize_t show_capability(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->capability);
+}
+static DEVICE_ATTR(capability, S_IRUGO, show_capability, NULL);
+
+
+#define IPW2100_REG(x) { IPW_ ##x, #x }
+static const struct {
+        u32 addr;
+        const char *name;
+} hw_data[] = {
+        IPW2100_REG(REG_GP_CNTRL),
+        IPW2100_REG(REG_GPIO),
+        IPW2100_REG(REG_INTA),
+        IPW2100_REG(REG_INTA_MASK),
+        IPW2100_REG(REG_RESET_REG),
+};
+#define IPW2100_NIC(x, s) { x, #x, s }
+static const struct {
+        u32 addr;
+        const char *name;
+        size_t size;
+} nic_data[] = {
+        IPW2100_NIC(IPW2100_CONTROL_REG, 2),
+        IPW2100_NIC(0x210014, 1),
+        IPW2100_NIC(0x210000, 1),
+};
+#define IPW2100_ORD(x, d) { IPW_ORD_ ##x, #x, d }
+static const struct {
+        u8 index;
+        const char *name;
+        const char *desc;
+} ord_data[] = {
+        IPW2100_ORD(STAT_TX_HOST_REQUESTS, "requested Host Tx's (MSDU)"),
+        IPW2100_ORD(STAT_TX_HOST_COMPLETE, "successful Host Tx's (MSDU)"),
+        IPW2100_ORD(STAT_TX_DIR_DATA,      "successful Directed Tx's (MSDU)"),
+        IPW2100_ORD(STAT_TX_DIR_DATA1,     "successful Directed Tx's (MSDU) @ 1MB"),
+        IPW2100_ORD(STAT_TX_DIR_DATA2,     "successful Directed Tx's (MSDU) @ 2MB"),
+        IPW2100_ORD(STAT_TX_DIR_DATA5_5,   "successful Directed Tx's (MSDU) @ 5_5MB"),
+        IPW2100_ORD(STAT_TX_DIR_DATA11,    "successful Directed Tx's (MSDU) @ 11MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA1,   "successful Non_Directed Tx's (MSDU) @ 1MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA2,   "successful Non_Directed Tx's (MSDU) @ 2MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA5_5, "successful Non_Directed Tx's (MSDU) @ 5.5MB"),
+        IPW2100_ORD(STAT_TX_NODIR_DATA11,  "successful Non_Directed Tx's (MSDU) @ 11MB"),
+        IPW2100_ORD(STAT_NULL_DATA,        "successful NULL data Tx's"),
+        IPW2100_ORD(STAT_TX_RTS,           "successful Tx RTS"),
+        IPW2100_ORD(STAT_TX_CTS,           "successful Tx CTS"),
+        IPW2100_ORD(STAT_TX_ACK,           "successful Tx ACK"),
+        IPW2100_ORD(STAT_TX_ASSN,          "successful Association Tx's"),
+        IPW2100_ORD(STAT_TX_ASSN_RESP,     "successful Association response Tx's"),
+        IPW2100_ORD(STAT_TX_REASSN,        "successful Reassociation Tx's"),
+        IPW2100_ORD(STAT_TX_REASSN_RESP,   "successful Reassociation response Tx's"),
+        IPW2100_ORD(STAT_TX_PROBE,         "probes successfully transmitted"),
+        IPW2100_ORD(STAT_TX_PROBE_RESP,    "probe responses successfully transmitted"),
+        IPW2100_ORD(STAT_TX_BEACON,        "tx beacon"),
+        IPW2100_ORD(STAT_TX_ATIM,          "Tx ATIM"),
+        IPW2100_ORD(STAT_TX_DISASSN,       "successful Disassociation TX"),
+        IPW2100_ORD(STAT_TX_AUTH,          "successful Authentication Tx"),
+        IPW2100_ORD(STAT_TX_DEAUTH,        "successful Deauthentication TX"),
+        IPW2100_ORD(STAT_TX_TOTAL_BYTES,   "Total successful Tx data bytes"),
+        IPW2100_ORD(STAT_TX_RETRIES,       "Tx retries"),
+        IPW2100_ORD(STAT_TX_RETRY1,        "Tx retries at 1MBPS"),
+        IPW2100_ORD(STAT_TX_RETRY2,        "Tx retries at 2MBPS"),
+        IPW2100_ORD(STAT_TX_RETRY5_5,      "Tx retries at 5.5MBPS"),
+        IPW2100_ORD(STAT_TX_RETRY11,       "Tx retries at 11MBPS"),
+        IPW2100_ORD(STAT_TX_FAILURES,      "Tx Failures"),
+        IPW2100_ORD(STAT_TX_MAX_TRIES_IN_HOP,"times max tries in a hop failed"),
+        IPW2100_ORD(STAT_TX_DISASSN_FAIL,       "times disassociation failed"),
+        IPW2100_ORD(STAT_TX_ERR_CTS,         "missed/bad CTS frames"),
+        IPW2100_ORD(STAT_TX_ERR_ACK,    "tx err due to acks"),
+        IPW2100_ORD(STAT_RX_HOST,       "packets passed to host"),
+        IPW2100_ORD(STAT_RX_DIR_DATA,   "directed packets"),
+        IPW2100_ORD(STAT_RX_DIR_DATA1,  "directed packets at 1MB"),
+        IPW2100_ORD(STAT_RX_DIR_DATA2,  "directed packets at 2MB"),
+        IPW2100_ORD(STAT_RX_DIR_DATA5_5,        "directed packets at 5.5MB"),
+        IPW2100_ORD(STAT_RX_DIR_DATA11, "directed packets at 11MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA,"nondirected packets"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA1,        "nondirected packets at 1MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA2,        "nondirected packets at 2MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA5_5,      "nondirected packets at 5.5MB"),
+        IPW2100_ORD(STAT_RX_NODIR_DATA11,       "nondirected packets at 11MB"),
+        IPW2100_ORD(STAT_RX_NULL_DATA,  "null data rx's"),
+        IPW2100_ORD(STAT_RX_RTS,        "Rx RTS"),
+        IPW2100_ORD(STAT_RX_CTS,        "Rx CTS"),
+        IPW2100_ORD(STAT_RX_ACK,        "Rx ACK"),
+        IPW2100_ORD(STAT_RX_CFEND,      "Rx CF End"),
+        IPW2100_ORD(STAT_RX_CFEND_ACK,  "Rx CF End + CF Ack"),
+        IPW2100_ORD(STAT_RX_ASSN,       "Association Rx's"),
+        IPW2100_ORD(STAT_RX_ASSN_RESP,  "Association response Rx's"),
+        IPW2100_ORD(STAT_RX_REASSN,     "Reassociation Rx's"),
+        IPW2100_ORD(STAT_RX_REASSN_RESP,        "Reassociation response Rx's"),
+        IPW2100_ORD(STAT_RX_PROBE,      "probe Rx's"),
+        IPW2100_ORD(STAT_RX_PROBE_RESP, "probe response Rx's"),
+        IPW2100_ORD(STAT_RX_BEACON,     "Rx beacon"),
+        IPW2100_ORD(STAT_RX_ATIM,       "Rx ATIM"),
+        IPW2100_ORD(STAT_RX_DISASSN,    "disassociation Rx"),
+        IPW2100_ORD(STAT_RX_AUTH,       "authentication Rx"),
+        IPW2100_ORD(STAT_RX_DEAUTH,     "deauthentication Rx"),
+        IPW2100_ORD(STAT_RX_TOTAL_BYTES,"Total rx data bytes received"),
+        IPW2100_ORD(STAT_RX_ERR_CRC,     "packets with Rx CRC error"),
+        IPW2100_ORD(STAT_RX_ERR_CRC1,    "Rx CRC errors at 1MB"),
+        IPW2100_ORD(STAT_RX_ERR_CRC2,    "Rx CRC errors at 2MB"),
+        IPW2100_ORD(STAT_RX_ERR_CRC5_5,  "Rx CRC errors at 5.5MB"),
+        IPW2100_ORD(STAT_RX_ERR_CRC11,   "Rx CRC errors at 11MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE1, "duplicate rx packets at 1MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE2,  "duplicate rx packets at 2MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE5_5,        "duplicate rx packets at 5.5MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE11,         "duplicate rx packets at 11MB"),
+        IPW2100_ORD(STAT_RX_DUPLICATE, "duplicate rx packets"),
+        IPW2100_ORD(PERS_DB_LOCK,       "locking fw permanent  db"),
+        IPW2100_ORD(PERS_DB_SIZE,       "size of fw permanent  db"),
+        IPW2100_ORD(PERS_DB_ADDR,       "address of fw permanent  db"),
+        IPW2100_ORD(STAT_RX_INVALID_PROTOCOL,   "rx frames with invalid protocol"),
+        IPW2100_ORD(SYS_BOOT_TIME,      "Boot time"),
+        IPW2100_ORD(STAT_RX_NO_BUFFER,  "rx frames rejected due to no buffer"),
+        IPW2100_ORD(STAT_RX_MISSING_FRAG,       "rx frames dropped due to missing fragment"),
+        IPW2100_ORD(STAT_RX_ORPHAN_FRAG,        "rx frames dropped due to non-sequential fragment"),
+        IPW2100_ORD(STAT_RX_ORPHAN_FRAME,       "rx frames dropped due to unmatched 1st frame"),
+        IPW2100_ORD(STAT_RX_FRAG_AGEOUT,        "rx frames dropped due to uncompleted frame"),
+        IPW2100_ORD(STAT_RX_ICV_ERRORS, "ICV errors during decryption"),
+        IPW2100_ORD(STAT_PSP_SUSPENSION,"times adapter suspended"),
+        IPW2100_ORD(STAT_PSP_BCN_TIMEOUT,       "beacon timeout"),
+        IPW2100_ORD(STAT_PSP_POLL_TIMEOUT,      "poll response timeouts"),
+        IPW2100_ORD(STAT_PSP_NONDIR_TIMEOUT, "timeouts waiting for last {broad,multi}cast pkt"),
+        IPW2100_ORD(STAT_PSP_RX_DTIMS,  "PSP DTIMs received"),
+        IPW2100_ORD(STAT_PSP_RX_TIMS,   "PSP TIMs received"),
+        IPW2100_ORD(STAT_PSP_STATION_ID,"PSP Station ID"),
+        IPW2100_ORD(LAST_ASSN_TIME,     "RTC time of last association"),
+        IPW2100_ORD(STAT_PERCENT_MISSED_BCNS,"current calculation of % missed beacons"),
+        IPW2100_ORD(STAT_PERCENT_RETRIES,"current calculation of % missed tx retries"),
+        IPW2100_ORD(ASSOCIATED_AP_PTR,  "0 if not associated, else pointer to AP table entry"),
+        IPW2100_ORD(AVAILABLE_AP_CNT,   "AP's decsribed in the AP table"),
+        IPW2100_ORD(AP_LIST_PTR,        "Ptr to list of available APs"),
+        IPW2100_ORD(STAT_AP_ASSNS,      "associations"),
+        IPW2100_ORD(STAT_ASSN_FAIL,     "association failures"),
+        IPW2100_ORD(STAT_ASSN_RESP_FAIL,"failures due to response fail"),
+        IPW2100_ORD(STAT_FULL_SCANS,    "full scans"),
+        IPW2100_ORD(CARD_DISABLED,      "Card Disabled"),
+        IPW2100_ORD(STAT_ROAM_INHIBIT,  "times roaming was inhibited due to activity"),
+        IPW2100_ORD(RSSI_AT_ASSN,       "RSSI of associated AP at time of association"),
+        IPW2100_ORD(STAT_ASSN_CAUSE1,   "reassociation: no probe response or TX on hop"),
+        IPW2100_ORD(STAT_ASSN_CAUSE2,   "reassociation: poor tx/rx quality"),
+        IPW2100_ORD(STAT_ASSN_CAUSE3,   "reassociation: tx/rx quality (excessive AP load"),
+        IPW2100_ORD(STAT_ASSN_CAUSE4,   "reassociation: AP RSSI level"),
+        IPW2100_ORD(STAT_ASSN_CAUSE5,   "reassociations due to load leveling"),
+        IPW2100_ORD(STAT_AUTH_FAIL,     "times authentication failed"),
+        IPW2100_ORD(STAT_AUTH_RESP_FAIL,"times authentication response failed"),
+        IPW2100_ORD(STATION_TABLE_CNT,  "entries in association table"),
+        IPW2100_ORD(RSSI_AVG_CURR,      "Current avg RSSI"),
+        IPW2100_ORD(POWER_MGMT_MODE,    "Power mode - 0=CAM, 1=PSP"),
+        IPW2100_ORD(COUNTRY_CODE,       "IEEE country code as recv'd from beacon"),
+        IPW2100_ORD(COUNTRY_CHANNELS,   "channels suported by country"),
+        IPW2100_ORD(RESET_CNT,  "adapter resets (warm)"),
+        IPW2100_ORD(BEACON_INTERVAL,    "Beacon interval"),
+        IPW2100_ORD(ANTENNA_DIVERSITY,  "TRUE if antenna diversity is disabled"),
+        IPW2100_ORD(DTIM_PERIOD,        "beacon intervals between DTIMs"),
+        IPW2100_ORD(OUR_FREQ,   "current radio freq lower digits - channel ID"),
+        IPW2100_ORD(RTC_TIME,   "current RTC time"),
+        IPW2100_ORD(PORT_TYPE,  "operating mode"),
+        IPW2100_ORD(CURRENT_TX_RATE,    "current tx rate"),
+        IPW2100_ORD(SUPPORTED_RATES,    "supported tx rates"),
+        IPW2100_ORD(ATIM_WINDOW,        "current ATIM Window"),
+        IPW2100_ORD(BASIC_RATES,        "basic tx rates"),
+        IPW2100_ORD(NIC_HIGHEST_RATE,   "NIC highest tx rate"),
+        IPW2100_ORD(AP_HIGHEST_RATE,    "AP highest tx rate"),
+        IPW2100_ORD(CAPABILITIES,       "Management frame capability field"),
+        IPW2100_ORD(AUTH_TYPE,  "Type of authentication"),
+        IPW2100_ORD(RADIO_TYPE, "Adapter card platform type"),
+        IPW2100_ORD(RTS_THRESHOLD,      "Min packet length for RTS handshaking"),
+        IPW2100_ORD(INT_MODE,   "International mode"),
+        IPW2100_ORD(FRAGMENTATION_THRESHOLD,    "protocol frag threshold"),
+        IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_START_ADDRESS, "EEPROM offset in SRAM"),
+        IPW2100_ORD(EEPROM_SRAM_DB_BLOCK_SIZE,  "EEPROM size in SRAM"),
+        IPW2100_ORD(EEPROM_SKU_CAPABILITY,      "EEPROM SKU Capability"),
+        IPW2100_ORD(EEPROM_IBSS_11B_CHANNELS,   "EEPROM IBSS 11b channel set"),
+        IPW2100_ORD(MAC_VERSION,        "MAC Version"),
+        IPW2100_ORD(MAC_REVISION,       "MAC Revision"),
+        IPW2100_ORD(RADIO_VERSION,      "Radio Version"),
+        IPW2100_ORD(NIC_MANF_DATE_TIME, "MANF Date/Time STAMP"),
+        IPW2100_ORD(UCODE_VERSION,      "Ucode Version"),
+};
+
+
+static ssize_t show_registers(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        int i;
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        char * out = buf;
+        u32 val = 0;
+
+        out += sprintf(out, "%30s [Address ] : Hex\n", "Register");
+
+        for (i = 0; i < (sizeof(hw_data) / sizeof(*hw_data)); i++) {
+                read_register(dev, hw_data[i].addr, &val);
+                out += sprintf(out, "%30s [%08X] : %08X\n",
+                               hw_data[i].name, hw_data[i].addr, val);
+        }
+
+        return out - buf;
+}
+static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);
+
+
+static ssize_t show_hardware(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        char * out = buf;
+        int i;
+
+        out += sprintf(out, "%30s [Address ] : Hex\n", "NIC entry");
+
+        for (i = 0; i < (sizeof(nic_data) / sizeof(*nic_data)); i++) {
+                u8 tmp8;
+                u16 tmp16;
+                u32 tmp32;
+
+                switch (nic_data[i].size) {
+                case 1:
+                        read_nic_byte(dev, nic_data[i].addr, &tmp8);
+                        out += sprintf(out, "%30s [%08X] : %02X\n",
+                                       nic_data[i].name, nic_data[i].addr,
+                                       tmp8);
+                        break;
+                case 2:
+                        read_nic_word(dev, nic_data[i].addr, &tmp16);
+                        out += sprintf(out, "%30s [%08X] : %04X\n",
+                                       nic_data[i].name, nic_data[i].addr,
+                                       tmp16);
+                        break;
+                case 4:
+                        read_nic_dword(dev, nic_data[i].addr, &tmp32);
+                        out += sprintf(out, "%30s [%08X] : %08X\n",
+                                       nic_data[i].name, nic_data[i].addr,
+                                       tmp32);
+                        break;
+                }
+        }
+        return out - buf;
+}
+static DEVICE_ATTR(hardware, S_IRUGO, show_hardware, NULL);
+
+
+static ssize_t show_memory(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        static unsigned long loop = 0;
+        int len = 0;
+        u32 buffer[4];
+        int i;
+        char line[81];
+
+        if (loop >= 0x30000)
+                loop = 0;
+
+        /* sysfs provides us PAGE_SIZE buffer */
+        while (len < PAGE_SIZE - 128 && loop < 0x30000) {
+
+                if (priv->snapshot[0]) for (i = 0; i < 4; i++)
+                        buffer[i] = *(u32 *)SNAPSHOT_ADDR(loop + i * 4);
+                else for (i = 0; i < 4; i++)
+                        read_nic_dword(dev, loop + i * 4, &buffer[i]);
+
+                if (priv->dump_raw)
+                        len += sprintf(buf + len,
+                                       "%c%c%c%c"
+                                       "%c%c%c%c"
+                                       "%c%c%c%c"
+                                       "%c%c%c%c",
+                                       ((u8*)buffer)[0x0],
+                                       ((u8*)buffer)[0x1],
+                                       ((u8*)buffer)[0x2],
+                                       ((u8*)buffer)[0x3],
+                                       ((u8*)buffer)[0x4],
+                                       ((u8*)buffer)[0x5],
+                                       ((u8*)buffer)[0x6],
+                                       ((u8*)buffer)[0x7],
+                                       ((u8*)buffer)[0x8],
+                                       ((u8*)buffer)[0x9],
+                                       ((u8*)buffer)[0xa],
+                                       ((u8*)buffer)[0xb],
+                                       ((u8*)buffer)[0xc],
+                                       ((u8*)buffer)[0xd],
+                                       ((u8*)buffer)[0xe],
+                                       ((u8*)buffer)[0xf]);
+                else
+                        len += sprintf(buf + len, "%s\n",
+                                       snprint_line(line, sizeof(line),
+                                                    (u8*)buffer, 16, loop));
+                loop += 16;
+        }
+
+        return len;
+}
+
+static ssize_t store_memory(struct device *d, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        const char *p = buf;
+
+        if (count < 1)
+                return count;
+
+        if (p[0] == '1' ||
+            (count >= 2 && tolower(p[0]) == 'o' && tolower(p[1]) == 'n')) {
+                IPW_DEBUG_INFO("%s: Setting memory dump to RAW mode.\n",
+                       dev->name);
+                priv->dump_raw = 1;
+
+        } else if (p[0] == '0' || (count >= 2 && tolower(p[0]) == 'o' &&
+                                  tolower(p[1]) == 'f')) {
+                IPW_DEBUG_INFO("%s: Setting memory dump to HEX mode.\n",
+                       dev->name);
+                priv->dump_raw = 0;
+
+        } else if (tolower(p[0]) == 'r') {
+                IPW_DEBUG_INFO("%s: Resetting firmware snapshot.\n",
+                       dev->name);
+                ipw2100_snapshot_free(priv);
+
+        } else
+                IPW_DEBUG_INFO("%s: Usage: 0|on = HEX, 1|off = RAW, "
+                       "reset = clear memory snapshot\n",
+                       dev->name);
+
+        return count;
+}
+static DEVICE_ATTR(memory, S_IWUSR|S_IRUGO, show_memory, store_memory);
+
+
+static ssize_t show_ordinals(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        u32 val = 0;
+        int len = 0;
+        u32 val_len;
+        static int loop = 0;
+
+        if (loop >= sizeof(ord_data) / sizeof(*ord_data))
+                loop = 0;
+
+        /* sysfs provides us PAGE_SIZE buffer */
+        while (len < PAGE_SIZE - 128 &&
+               loop < (sizeof(ord_data) / sizeof(*ord_data))) {
+
+                val_len = sizeof(u32);
+
+                if (ipw2100_get_ordinal(priv, ord_data[loop].index, &val,
+                                        &val_len))
+                        len += sprintf(buf + len, "[0x%02X] = ERROR    %s\n",
+                                       ord_data[loop].index,
+                                       ord_data[loop].desc);
+                else
+                        len += sprintf(buf + len, "[0x%02X] = 0x%08X %s\n",
+                                       ord_data[loop].index, val,
+                                       ord_data[loop].desc);
+                loop++;
+        }
+
+        return len;
+}
+static DEVICE_ATTR(ordinals, S_IRUGO, show_ordinals, NULL);
+
+
+static ssize_t show_stats(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        char * out = buf;
+
+        out += sprintf(out, "interrupts: %d {tx: %d, rx: %d, other: %d}\n",
+                       priv->interrupts, priv->tx_interrupts,
+                       priv->rx_interrupts, priv->inta_other);
+        out += sprintf(out, "firmware resets: %d\n", priv->resets);
+        out += sprintf(out, "firmware hangs: %d\n", priv->hangs);
+#ifdef CONFIG_IPW_DEBUG
+        out += sprintf(out, "packet mismatch image: %s\n",
+                       priv->snapshot[0] ? "YES" : "NO");
+#endif
+
+        return out - buf;
+}
+static DEVICE_ATTR(stats, S_IRUGO, show_stats, NULL);
+
+
+static int ipw2100_switch_mode(struct ipw2100_priv *priv, u32 mode)
+{
+        int err;
+
+        if (mode == priv->ieee->iw_mode)
+                return 0;
+
+        err = ipw2100_disable_adapter(priv);
+        if (err) {
+                printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                       priv->net_dev->name, err);
+                return err;
+        }
+
+        switch (mode) {
+        case IW_MODE_INFRA:
+                priv->net_dev->type = ARPHRD_ETHER;
+                break;
+        case IW_MODE_ADHOC:
+                priv->net_dev->type = ARPHRD_ETHER;
+                break;
+#ifdef CONFIG_IPW2100_MONITOR
+        case IW_MODE_MONITOR:
+                priv->last_mode = priv->ieee->iw_mode;
+                priv->net_dev->type = ARPHRD_IEEE80211;
+                break;
+#endif /* CONFIG_IPW2100_MONITOR */
+        }
+
+        priv->ieee->iw_mode = mode;
+
+#ifdef CONFIG_PM
+        /* Indicate ipw2100_download_firmware download firmware
+         * from disk instead of memory. */
+        ipw2100_firmware.version = 0;
+#endif
+
+        printk(KERN_INFO "%s: Reseting on mode change.\n",
+                priv->net_dev->name);
+        priv->reset_backoff = 0;
+        schedule_reset(priv);
+
+        return 0;
+}
+
+static ssize_t show_internals(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        int len = 0;
+
+#define DUMP_VAR(x,y) len += sprintf(buf + len, # x ": %" # y "\n", priv-> x)
+
+        if (priv->status & STATUS_ASSOCIATED)
+                len += sprintf(buf + len, "connected: %lu\n",
+                               get_seconds() - priv->connect_start);
+        else
+                len += sprintf(buf + len, "not connected\n");
+
+        DUMP_VAR(ieee->crypt[priv->ieee->tx_keyidx], p);
+        DUMP_VAR(status, 08lx);
+        DUMP_VAR(config, 08lx);
+        DUMP_VAR(capability, 08lx);
+
+        len += sprintf(buf + len, "last_rtc: %lu\n", (unsigned long)priv->last_rtc);
+
+        DUMP_VAR(fatal_error, d);
+        DUMP_VAR(stop_hang_check, d);
+        DUMP_VAR(stop_rf_kill, d);
+        DUMP_VAR(messages_sent, d);
+
+        DUMP_VAR(tx_pend_stat.value, d);
+        DUMP_VAR(tx_pend_stat.hi, d);
+
+        DUMP_VAR(tx_free_stat.value, d);
+        DUMP_VAR(tx_free_stat.lo, d);
+
+        DUMP_VAR(msg_free_stat.value, d);
+        DUMP_VAR(msg_free_stat.lo, d);
+
+        DUMP_VAR(msg_pend_stat.value, d);
+        DUMP_VAR(msg_pend_stat.hi, d);
+
+        DUMP_VAR(fw_pend_stat.value, d);
+        DUMP_VAR(fw_pend_stat.hi, d);
+
+        DUMP_VAR(txq_stat.value, d);
+        DUMP_VAR(txq_stat.lo, d);
+
+        DUMP_VAR(ieee->scans, d);
+        DUMP_VAR(reset_backoff, d);
+
+        return len;
+}
+static DEVICE_ATTR(internals, S_IRUGO, show_internals, NULL);
+
+
+static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        char essid[IW_ESSID_MAX_SIZE + 1];
+        u8 bssid[ETH_ALEN];
+        u32 chan = 0;
+        char * out = buf;
+        int length;
+        int ret;
+
+        memset(essid, 0, sizeof(essid));
+        memset(bssid, 0, sizeof(bssid));
+
+        length = IW_ESSID_MAX_SIZE;
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_SSID, essid, &length);
+        if (ret)
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                               __LINE__);
+
+        length = sizeof(bssid);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID,
+                                  bssid, &length);
+        if (ret)
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                               __LINE__);
+
+        length = sizeof(u32);
+        ret = ipw2100_get_ordinal(priv, IPW_ORD_OUR_FREQ, &chan, &length);
+        if (ret)
+                IPW_DEBUG_INFO("failed querying ordinals at line %d\n",
+                               __LINE__);
+
+        out += sprintf(out, "ESSID: %s\n", essid);
+        out += sprintf(out, "BSSID:   %02x:%02x:%02x:%02x:%02x:%02x\n",
+                       bssid[0], bssid[1], bssid[2],
+                       bssid[3], bssid[4], bssid[5]);
+        out += sprintf(out, "Channel: %d\n", chan);
+
+        return out - buf;
+}
+static DEVICE_ATTR(bssinfo, S_IRUGO, show_bssinfo, NULL);
+
+
+#ifdef CONFIG_IPW_DEBUG
+static ssize_t show_debug_level(struct device_driver *d, char *buf)
+{
+        return sprintf(buf, "0x%08X\n", ipw2100_debug_level);
+}
+
+static ssize_t store_debug_level(struct device_driver *d, const char *buf,
+                                 size_t count)
+{
+        char *p = (char *)buf;
+        u32 val;
+
+        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
+                p++;
+                if (p[0] == 'x' || p[0] == 'X')
+                        p++;
+                val = simple_strtoul(p, &p, 16);
+        } else
+                val = simple_strtoul(p, &p, 10);
+        if (p == buf)
+                IPW_DEBUG_INFO(DRV_NAME
+                       ": %s is not in hex or decimal form.\n", buf);
+        else
+                ipw2100_debug_level = val;
+
+        return strnlen(buf, count);
+}
+static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, show_debug_level,
+                   store_debug_level);
+#endif /* CONFIG_IPW_DEBUG */
+
+
+static ssize_t show_fatal_error(struct device *d,
+                        struct device_attribute *attr, char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        char *out = buf;
+        int i;
+
+        if (priv->fatal_error)
+                out += sprintf(out, "0x%08X\n",
+                               priv->fatal_error);
+        else
+                out += sprintf(out, "0\n");
+
+        for (i = 1; i <= IPW2100_ERROR_QUEUE; i++) {
+                if (!priv->fatal_errors[(priv->fatal_index - i) %
+                                        IPW2100_ERROR_QUEUE])
+                        continue;
+
+                out += sprintf(out, "%d. 0x%08X\n", i,
+                               priv->fatal_errors[(priv->fatal_index - i) %
+                                                  IPW2100_ERROR_QUEUE]);
+        }
+
+        return out - buf;
+}
+
+static ssize_t store_fatal_error(struct device *d,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        schedule_reset(priv);
+        return count;
+}
+static DEVICE_ATTR(fatal_error, S_IWUSR|S_IRUGO, show_fatal_error, store_fatal_error);
+
+
+static ssize_t show_scan_age(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        return sprintf(buf, "%d\n", priv->ieee->scan_age);
+}
+
+static ssize_t store_scan_age(struct device *d, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        struct net_device *dev = priv->net_dev;
+        char buffer[] = "00000000";
+        unsigned long len =
+            (sizeof(buffer) - 1) > count ? count : sizeof(buffer) - 1;
+        unsigned long val;
+        char *p = buffer;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        strncpy(buffer, buf, len);
+        buffer[len] = 0;
+
+        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
+                p++;
+                if (p[0] == 'x' || p[0] == 'X')
+                        p++;
+                val = simple_strtoul(p, &p, 16);
+        } else
+                val = simple_strtoul(p, &p, 10);
+        if (p == buffer) {
+                IPW_DEBUG_INFO("%s: user supplied invalid value.\n",
+                       dev->name);
+        } else {
+                priv->ieee->scan_age = val;
+                IPW_DEBUG_INFO("set scan_age = %u\n", priv->ieee->scan_age);
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+        return len;
+}
+static DEVICE_ATTR(scan_age, S_IWUSR | S_IRUGO, show_scan_age, store_scan_age);
+
+
+static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
+                                char *buf)
+{
+        /* 0 - RF kill not enabled
+           1 - SW based RF kill active (sysfs)
+           2 - HW based RF kill active
+           3 - Both HW and SW baed RF kill active */
+        struct ipw2100_priv *priv = (struct ipw2100_priv *)d->driver_data;
+        int val = ((priv->status & STATUS_RF_KILL_SW) ? 0x1 : 0x0) |
+                (rf_kill_active(priv) ? 0x2 : 0x0);
+        return sprintf(buf, "%i\n", val);
+}
+
+static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)
+{
+        if ((disable_radio ? 1 : 0) ==
+            (priv->status & STATUS_RF_KILL_SW ? 1 : 0))
+                return 0 ;
+
+        IPW_DEBUG_RF_KILL("Manual SW RF Kill set to: RADIO  %s\n",
+                          disable_radio ? "OFF" : "ON");
+
+        down(&priv->action_sem);
+
+        if (disable_radio) {
+                priv->status |= STATUS_RF_KILL_SW;
+                ipw2100_down(priv);
+        } else {
+                priv->status &= ~STATUS_RF_KILL_SW;
+                if (rf_kill_active(priv)) {
+                        IPW_DEBUG_RF_KILL("Can not turn radio back on - "
+                                          "disabled by HW switch\n");
+                        /* Make sure the RF_KILL check timer is running */
+                        priv->stop_rf_kill = 0;
+                        cancel_delayed_work(&priv->rf_kill);
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
+                                           HZ);
+                } else
+                        schedule_reset(priv);
+        }
+
+        up(&priv->action_sem);
+        return 1;
+}
+
+static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct ipw2100_priv *priv = dev_get_drvdata(d);
+        ipw_radio_kill_sw(priv, buf[0] == '1');
+        return count;
+}
+static DEVICE_ATTR(rf_kill, S_IWUSR|S_IRUGO, show_rf_kill, store_rf_kill);
+
+
+static struct attribute *ipw2100_sysfs_entries[] = {
+        &dev_attr_hardware.attr,
+        &dev_attr_registers.attr,
+        &dev_attr_ordinals.attr,
+        &dev_attr_pci.attr,
+        &dev_attr_stats.attr,
+        &dev_attr_internals.attr,
+        &dev_attr_bssinfo.attr,
+        &dev_attr_memory.attr,
+        &dev_attr_scan_age.attr,
+        &dev_attr_fatal_error.attr,
+        &dev_attr_rf_kill.attr,
+        &dev_attr_cfg.attr,
+        &dev_attr_status.attr,
+        &dev_attr_capability.attr,
+        NULL,
+};
+
+static struct attribute_group ipw2100_attribute_group = {
+        .attrs = ipw2100_sysfs_entries,
+};
+
+
+static int status_queue_allocate(struct ipw2100_priv *priv, int entries)
+{
+        struct ipw2100_status_queue *q = &priv->status_queue;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        q->size = entries * sizeof(struct ipw2100_status);
+        q->drv = (struct ipw2100_status *)pci_alloc_consistent(
+                priv->pci_dev, q->size, &q->nic);
+        if (!q->drv) {
+                IPW_DEBUG_WARNING(
+                       "Can not allocate status queue.\n");
+                return -ENOMEM;
+        }
+
+        memset(q->drv, 0, q->size);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+static void status_queue_free(struct ipw2100_priv *priv)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->status_queue.drv) {
+                pci_free_consistent(
+                        priv->pci_dev, priv->status_queue.size,
+                        priv->status_queue.drv, priv->status_queue.nic);
+                priv->status_queue.drv = NULL;
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static int bd_queue_allocate(struct ipw2100_priv *priv,
+                             struct ipw2100_bd_queue *q, int entries)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        memset(q, 0, sizeof(struct ipw2100_bd_queue));
+
+        q->entries = entries;
+        q->size = entries * sizeof(struct ipw2100_bd);
+        q->drv = pci_alloc_consistent(priv->pci_dev, q->size, &q->nic);
+        if (!q->drv) {
+                IPW_DEBUG_INFO("can't allocate shared memory for buffer descriptors\n");
+                return -ENOMEM;
+        }
+        memset(q->drv, 0, q->size);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+static void bd_queue_free(struct ipw2100_priv *priv,
+                          struct ipw2100_bd_queue *q)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        if (!q)
+                return;
+
+        if (q->drv) {
+                pci_free_consistent(priv->pci_dev,
+                                    q->size, q->drv, q->nic);
+                q->drv = NULL;
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static void bd_queue_initialize(
+        struct ipw2100_priv *priv, struct ipw2100_bd_queue * q,
+        u32 base, u32 size, u32 r, u32 w)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        IPW_DEBUG_INFO("initializing bd queue at virt=%p, phys=%08x\n", q->drv, (u32)q->nic);
+
+        write_register(priv->net_dev, base, q->nic);
+        write_register(priv->net_dev, size, q->entries);
+        write_register(priv->net_dev, r, q->oldest);
+        write_register(priv->net_dev, w, q->next);
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static void ipw2100_kill_workqueue(struct ipw2100_priv *priv)
+{
+        if (priv->workqueue) {
+                priv->stop_rf_kill = 1;
+                priv->stop_hang_check = 1;
+                cancel_delayed_work(&priv->reset_work);
+                cancel_delayed_work(&priv->security_work);
+                cancel_delayed_work(&priv->wx_event_work);
+                cancel_delayed_work(&priv->hang_check);
+                cancel_delayed_work(&priv->rf_kill);
+                destroy_workqueue(priv->workqueue);
+                priv->workqueue = NULL;
+        }
+}
+
+static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
+{
+        int i, j, err = -EINVAL;
+        void *v;
+        dma_addr_t p;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        err = bd_queue_allocate(priv, &priv->tx_queue, TX_QUEUE_LENGTH);
+        if (err) {
+                IPW_DEBUG_ERROR("%s: failed bd_queue_allocate\n",
+                       priv->net_dev->name);
+                return err;
+        }
+
+        priv->tx_buffers = (struct ipw2100_tx_packet *)kmalloc(
+                TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet),
+                GFP_ATOMIC);
+        if (!priv->tx_buffers) {
+                printk(KERN_ERR DRV_NAME ": %s: alloc failed form tx buffers.\n",
+                       priv->net_dev->name);
+                bd_queue_free(priv, &priv->tx_queue);
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
+                v = pci_alloc_consistent(
+                        priv->pci_dev, sizeof(struct ipw2100_data_header), &p);
+                if (!v) {
+                        printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for tx "
+                               "buffers.\n", priv->net_dev->name);
+                        err = -ENOMEM;
+                        break;
+                }
+
+                priv->tx_buffers[i].type = DATA;
+                priv->tx_buffers[i].info.d_struct.data = (struct ipw2100_data_header*)v;
+                priv->tx_buffers[i].info.d_struct.data_phys = p;
+                priv->tx_buffers[i].info.d_struct.txb = NULL;
+        }
+
+        if (i == TX_PENDED_QUEUE_LENGTH)
+                return 0;
+
+        for (j = 0; j < i; j++) {
+                pci_free_consistent(
+                        priv->pci_dev,
+                        sizeof(struct ipw2100_data_header),
+                        priv->tx_buffers[j].info.d_struct.data,
+                        priv->tx_buffers[j].info.d_struct.data_phys);
+        }
+
+        kfree(priv->tx_buffers);
+        priv->tx_buffers = NULL;
+
+        return err;
+}
+
+static void ipw2100_tx_initialize(struct ipw2100_priv *priv)
+{
+        int i;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        /*
+         * reinitialize packet info lists
+         */
+        INIT_LIST_HEAD(&priv->fw_pend_list);
+        INIT_STAT(&priv->fw_pend_stat);
+
+        /*
+         * reinitialize lists
+         */
+        INIT_LIST_HEAD(&priv->tx_pend_list);
+        INIT_LIST_HEAD(&priv->tx_free_list);
+        INIT_STAT(&priv->tx_pend_stat);
+        INIT_STAT(&priv->tx_free_stat);
+
+        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
+                /* We simply drop any SKBs that have been queued for
+                 * transmit */
+                if (priv->tx_buffers[i].info.d_struct.txb) {
+                        ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.txb);
+                        priv->tx_buffers[i].info.d_struct.txb = NULL;
+                }
+
+                list_add_tail(&priv->tx_buffers[i].list, &priv->tx_free_list);
+        }
+
+        SET_STAT(&priv->tx_free_stat, i);
+
+        priv->tx_queue.oldest = 0;
+        priv->tx_queue.available = priv->tx_queue.entries;
+        priv->tx_queue.next = 0;
+        INIT_STAT(&priv->txq_stat);
+        SET_STAT(&priv->txq_stat, priv->tx_queue.available);
+
+        bd_queue_initialize(priv, &priv->tx_queue,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_BD_BASE,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_BD_SIZE,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_READ_INDEX,
+                            IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX);
+
+        IPW_DEBUG_INFO("exit\n");
+
+}
+
+static void ipw2100_tx_free(struct ipw2100_priv *priv)
+{
+        int i;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        bd_queue_free(priv, &priv->tx_queue);
+
+        if (!priv->tx_buffers)
+                return;
+
+        for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) {
+                if (priv->tx_buffers[i].info.d_struct.txb) {
+                        ieee80211_txb_free(priv->tx_buffers[i].info.d_struct.txb);
+                        priv->tx_buffers[i].info.d_struct.txb = NULL;
+                }
+                if (priv->tx_buffers[i].info.d_struct.data)
+                        pci_free_consistent(
+                                priv->pci_dev,
+                                sizeof(struct ipw2100_data_header),
+                                priv->tx_buffers[i].info.d_struct.data,
+                                priv->tx_buffers[i].info.d_struct.data_phys);
+        }
+
+        kfree(priv->tx_buffers);
+        priv->tx_buffers = NULL;
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+
+
+static int ipw2100_rx_allocate(struct ipw2100_priv *priv)
+{
+        int i, j, err = -EINVAL;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        err = bd_queue_allocate(priv, &priv->rx_queue, RX_QUEUE_LENGTH);
+        if (err) {
+                IPW_DEBUG_INFO("failed bd_queue_allocate\n");
+                return err;
+        }
+
+        err = status_queue_allocate(priv, RX_QUEUE_LENGTH);
+        if (err) {
+                IPW_DEBUG_INFO("failed status_queue_allocate\n");
+                bd_queue_free(priv, &priv->rx_queue);
+                return err;
+        }
+
+        /*
+         * allocate packets
+         */
+        priv->rx_buffers = (struct ipw2100_rx_packet *)
+            kmalloc(RX_QUEUE_LENGTH * sizeof(struct ipw2100_rx_packet),
+                    GFP_KERNEL);
+        if (!priv->rx_buffers) {
+                IPW_DEBUG_INFO("can't allocate rx packet buffer table\n");
+
+                bd_queue_free(priv, &priv->rx_queue);
+
+                status_queue_free(priv);
+
+                return -ENOMEM;
+        }
+
+        for (i = 0; i < RX_QUEUE_LENGTH; i++) {
+                struct ipw2100_rx_packet *packet = &priv->rx_buffers[i];
+
+                err = ipw2100_alloc_skb(priv, packet);
+                if (unlikely(err)) {
+                        err = -ENOMEM;
+                        break;
+                }
+
+                /* The BD holds the cache aligned address */
+                priv->rx_queue.drv[i].host_addr = packet->dma_addr;
+                priv->rx_queue.drv[i].buf_length = IPW_RX_NIC_BUFFER_LENGTH;
+                priv->status_queue.drv[i].status_fields = 0;
+        }
+
+        if (i == RX_QUEUE_LENGTH)
+                return 0;
+
+        for (j = 0; j < i; j++) {
+                pci_unmap_single(priv->pci_dev, priv->rx_buffers[j].dma_addr,
+                                 sizeof(struct ipw2100_rx_packet),
+                                 PCI_DMA_FROMDEVICE);
+                dev_kfree_skb(priv->rx_buffers[j].skb);
+        }
+
+        kfree(priv->rx_buffers);
+        priv->rx_buffers = NULL;
+
+        bd_queue_free(priv, &priv->rx_queue);
+
+        status_queue_free(priv);
+
+        return err;
+}
+
+static void ipw2100_rx_initialize(struct ipw2100_priv *priv)
+{
+        IPW_DEBUG_INFO("enter\n");
+
+        priv->rx_queue.oldest = 0;
+        priv->rx_queue.available = priv->rx_queue.entries - 1;
+        priv->rx_queue.next = priv->rx_queue.entries - 1;
+
+        INIT_STAT(&priv->rxq_stat);
+        SET_STAT(&priv->rxq_stat, priv->rx_queue.available);
+
+        bd_queue_initialize(priv, &priv->rx_queue,
+                            IPW_MEM_HOST_SHARED_RX_BD_BASE,
+                            IPW_MEM_HOST_SHARED_RX_BD_SIZE,
+                            IPW_MEM_HOST_SHARED_RX_READ_INDEX,
+                            IPW_MEM_HOST_SHARED_RX_WRITE_INDEX);
+
+        /* set up the status queue */
+        write_register(priv->net_dev, IPW_MEM_HOST_SHARED_RX_STATUS_BASE,
+                       priv->status_queue.nic);
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static void ipw2100_rx_free(struct ipw2100_priv *priv)
+{
+        int i;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        bd_queue_free(priv, &priv->rx_queue);
+        status_queue_free(priv);
+
+        if (!priv->rx_buffers)
+                return;
+
+        for (i = 0; i < RX_QUEUE_LENGTH; i++) {
+                if (priv->rx_buffers[i].rxp) {
+                        pci_unmap_single(priv->pci_dev,
+                                         priv->rx_buffers[i].dma_addr,
+                                         sizeof(struct ipw2100_rx),
+                                         PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(priv->rx_buffers[i].skb);
+                }
+        }
+
+        kfree(priv->rx_buffers);
+        priv->rx_buffers = NULL;
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
+{
+        u32 length = ETH_ALEN;
+        u8 mac[ETH_ALEN];
+
+        int err;
+
+        err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC,
+                                  mac, &length);
+        if (err) {
+                IPW_DEBUG_INFO("MAC address read failed\n");
+                return -EIO;
+        }
+        IPW_DEBUG_INFO("card MAC is %02X:%02X:%02X:%02X:%02X:%02X\n",
+               mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+        memcpy(priv->net_dev->dev_addr, mac, ETH_ALEN);
+
+        return 0;
+}
+
+/********************************************************************
+ *
+ * Firmware Commands
+ *
+ ********************************************************************/
+
+static int ipw2100_set_mac_address(struct ipw2100_priv *priv, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = ADAPTER_ADDRESS,
+                .host_command_sequence = 0,
+                .host_command_length = ETH_ALEN
+        };
+        int err;
+
+        IPW_DEBUG_HC("SET_MAC_ADDRESS\n");
+
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->config & CFG_CUSTOM_MAC) {
+                memcpy(cmd.host_command_parameters, priv->mac_addr,
+                       ETH_ALEN);
+                memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+        } else
+                memcpy(cmd.host_command_parameters, priv->net_dev->dev_addr,
+                       ETH_ALEN);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        IPW_DEBUG_INFO("exit\n");
+        return err;
+}
+
+static int ipw2100_set_port_type(struct ipw2100_priv *priv, u32 port_type,
+                                 int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = PORT_TYPE,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(u32)
+        };
+        int err;
+
+        switch (port_type) {
+        case IW_MODE_INFRA:
+                cmd.host_command_parameters[0] = IPW_BSS;
+                break;
+        case IW_MODE_ADHOC:
+                cmd.host_command_parameters[0] = IPW_IBSS;
+                break;
+        }
+
+        IPW_DEBUG_HC("PORT_TYPE: %s\n",
+                     port_type == IPW_IBSS ? "Ad-Hoc" : "Managed");
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err) {
+                        printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+
+static int ipw2100_set_channel(struct ipw2100_priv *priv, u32 channel,
+                               int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = CHANNEL,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(u32)
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = channel;
+
+        IPW_DEBUG_HC("CHANNEL: %d\n", channel);
+
+        /* If BSS then we don't support channel selection */
+        if (priv->ieee->iw_mode == IW_MODE_INFRA)
+                return 0;
+
+        if ((channel != 0) &&
+            ((channel < REG_MIN_CHANNEL) || (channel > REG_MAX_CHANNEL)))
+                return -EINVAL;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err) {
+                IPW_DEBUG_INFO("Failed to set channel to %d",
+                               channel);
+                return err;
+        }
+
+        if (channel)
+                priv->config |= CFG_STATIC_CHANNEL;
+        else
+                priv->config &= ~CFG_STATIC_CHANNEL;
+
+        priv->channel = channel;
+
+        if (!batch_mode) {
+                err = ipw2100_enable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+static int ipw2100_system_config(struct ipw2100_priv *priv, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = SYSTEM_CONFIG,
+                .host_command_sequence = 0,
+                .host_command_length = 12,
+        };
+        u32 ibss_mask, len = sizeof(u32);
+        int err;
+
+        /* Set system configuration */
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC)
+                cmd.host_command_parameters[0] |= IPW_CFG_IBSS_AUTO_START;
+
+        cmd.host_command_parameters[0] |= IPW_CFG_IBSS_MASK |
+                IPW_CFG_BSS_MASK |
+                IPW_CFG_802_1x_ENABLE;
+
+        if (!(priv->config & CFG_LONG_PREAMBLE))
+                cmd.host_command_parameters[0] |= IPW_CFG_PREAMBLE_AUTO;
+
+        err = ipw2100_get_ordinal(priv,
+                                  IPW_ORD_EEPROM_IBSS_11B_CHANNELS,
+                                  &ibss_mask,  &len);
+        if (err)
+                ibss_mask = IPW_IBSS_11B_DEFAULT_MASK;
+
+        cmd.host_command_parameters[1] = REG_CHANNEL_MASK;
+        cmd.host_command_parameters[2] = REG_CHANNEL_MASK & ibss_mask;
+
+        /* 11b only */
+        /*cmd.host_command_parameters[0] |= DIVERSITY_ANTENNA_A;*/
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+/* If IPv6 is configured in the kernel then we don't want to filter out all
+ * of the multicast packets as IPv6 needs some. */
+#if !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)
+        cmd.host_command = ADD_MULTICAST;
+        cmd.host_command_sequence = 0;
+        cmd.host_command_length = 0;
+
+        ipw2100_hw_send_command(priv, &cmd);
+#endif
+        if (!batch_mode) {
+                err = ipw2100_enable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+
+static int ipw2100_set_tx_rates(struct ipw2100_priv *priv, u32 rate,
+                                int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = BASIC_TX_RATES,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = rate & TX_RATE_MASK;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        /* Set BASIC TX Rate first */
+        ipw2100_hw_send_command(priv, &cmd);
+
+        /* Set TX Rate */
+        cmd.host_command = TX_RATES;
+        ipw2100_hw_send_command(priv, &cmd);
+
+        /* Set MSDU TX Rate */
+        cmd.host_command = MSDU_TX_RATES;
+        ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode) {
+                err = ipw2100_enable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        priv->tx_rates = rate;
+
+        return 0;
+}
+
+static int ipw2100_set_power_mode(struct ipw2100_priv *priv,
+                                  int power_level)
+{
+        struct host_command cmd = {
+                .host_command = POWER_MODE,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = power_level;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        if (power_level == IPW_POWER_MODE_CAM)
+                priv->power_mode = IPW_POWER_LEVEL(priv->power_mode);
+        else
+                priv->power_mode = IPW_POWER_ENABLED | power_level;
+
+#ifdef CONFIG_IPW2100_TX_POWER
+        if (priv->port_type == IBSS &&
+            priv->adhoc_power != DFTL_IBSS_TX_POWER) {
+                /* Set beacon interval */
+                cmd.host_command = TX_POWER_INDEX;
+                cmd.host_command_parameters[0] = (u32)priv->adhoc_power;
+
+                err = ipw2100_hw_send_command(priv, &cmd);
+                if (err)
+                        return err;
+        }
+#endif
+
+        return 0;
+}
+
+
+static int ipw2100_set_rts_threshold(struct ipw2100_priv *priv, u32 threshold)
+{
+        struct host_command cmd = {
+                .host_command = RTS_THRESHOLD,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        if (threshold & RTS_DISABLED)
+                cmd.host_command_parameters[0] = MAX_RTS_THRESHOLD;
+        else
+                cmd.host_command_parameters[0] = threshold & ~RTS_DISABLED;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        priv->rts_threshold = threshold;
+
+        return 0;
+}
+
+#if 0
+int ipw2100_set_fragmentation_threshold(struct ipw2100_priv *priv,
+                                        u32 threshold, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = FRAG_THRESHOLD,
+                .host_command_sequence = 0,
+                .host_command_length = 4,
+                .host_command_parameters[0] = 0,
+        };
+        int err;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        if (threshold == 0)
+                threshold = DEFAULT_FRAG_THRESHOLD;
+        else {
+                threshold = max(threshold, MIN_FRAG_THRESHOLD);
+                threshold = min(threshold, MAX_FRAG_THRESHOLD);
+        }
+
+        cmd.host_command_parameters[0] = threshold;
+
+        IPW_DEBUG_HC("FRAG_THRESHOLD: %u\n", threshold);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        if (!err)
+                priv->frag_threshold = threshold;
+
+        return err;
+}
+#endif
+
+static int ipw2100_set_short_retry(struct ipw2100_priv *priv, u32 retry)
+{
+        struct host_command cmd = {
+                .host_command = SHORT_RETRY_LIMIT,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = retry;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        priv->short_retry_limit = retry;
+
+        return 0;
+}
+
+static int ipw2100_set_long_retry(struct ipw2100_priv *priv, u32 retry)
+{
+        struct host_command cmd = {
+                .host_command = LONG_RETRY_LIMIT,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = retry;
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+        if (err)
+                return err;
+
+        priv->long_retry_limit = retry;
+
+        return 0;
+}
+
+
+static int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 *bssid,
+                                       int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = MANDATORY_BSSID,
+                .host_command_sequence = 0,
+                .host_command_length = (bssid == NULL) ? 0 : ETH_ALEN
+        };
+        int err;
+
+#ifdef CONFIG_IPW_DEBUG
+        if (bssid != NULL)
+                IPW_DEBUG_HC(
+                        "MANDATORY_BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
+                        bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
+                        bssid[5]);
+        else
+                IPW_DEBUG_HC("MANDATORY_BSSID: <clear>\n");
+#endif
+        /* if BSSID is empty then we disable mandatory bssid mode */
+        if (bssid != NULL)
+                memcpy((u8 *)cmd.host_command_parameters, bssid, ETH_ALEN);
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+#ifdef CONFIG_IEEE80211_WPA
+static int ipw2100_disassociate_bssid(struct ipw2100_priv *priv)
+{
+        struct host_command cmd = {
+                .host_command = DISASSOCIATION_BSSID,
+                .host_command_sequence = 0,
+                .host_command_length = ETH_ALEN
+        };
+        int err;
+        int len;
+
+        IPW_DEBUG_HC("DISASSOCIATION_BSSID\n");
+
+        len = ETH_ALEN;
+        /* The Firmware currently ignores the BSSID and just disassociates from
+         * the currently associated AP -- but in the off chance that a future
+         * firmware does use the BSSID provided here, we go ahead and try and
+         * set it to the currently associated AP's BSSID */
+        memcpy(cmd.host_command_parameters, priv->bssid, ETH_ALEN);
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        return err;
+}
+#endif
+
+/*
+ * Pseudo code for setting up wpa_frame:
+ */
+#if 0
+void x(struct ieee80211_assoc_frame *wpa_assoc)
+{
+        struct ipw2100_wpa_assoc_frame frame;
+        frame->fixed_ie_mask = IPW_WPA_CAPABILTIES |
+                IPW_WPA_LISTENINTERVAL |
+                IPW_WPA_AP_ADDRESS;
+        frame->capab_info = wpa_assoc->capab_info;
+        frame->lisen_interval = wpa_assoc->listent_interval;
+        memcpy(frame->current_ap, wpa_assoc->current_ap, ETH_ALEN);
+
+        /* UNKNOWN -- I'm not postivive about this part; don't have any WPA
+         * setup here to test it with.
+         *
+         * Walk the IEs in the wpa_assoc and figure out the total size of all
+         * that data.  Stick that into frame->var_ie_len.  Then memcpy() all of
+         * the IEs from wpa_frame into frame.
+         */
+        frame->var_ie_len = calculate_ie_len(wpa_assoc);
+        memcpy(frame->var_ie,  wpa_assoc->variable, frame->var_ie_len);
+
+        ipw2100_set_wpa_ie(priv, &frame, 0);
+}
+#endif
+
+
+
+
+static int ipw2100_set_wpa_ie(struct ipw2100_priv *,
+                              struct ipw2100_wpa_assoc_frame *, int)
+__attribute__ ((unused));
+
+static int ipw2100_set_wpa_ie(struct ipw2100_priv *priv,
+                              struct ipw2100_wpa_assoc_frame *wpa_frame,
+                              int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = SET_WPA_IE,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(struct ipw2100_wpa_assoc_frame),
+        };
+        int err;
+
+        IPW_DEBUG_HC("SET_WPA_IE\n");
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        memcpy(cmd.host_command_parameters, wpa_frame,
+               sizeof(struct ipw2100_wpa_assoc_frame));
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode) {
+                if (ipw2100_enable_adapter(priv))
+                        err = -EIO;
+        }
+
+        return err;
+}
+
+struct security_info_params {
+        u32 allowed_ciphers;
+        u16 version;
+        u8 auth_mode;
+        u8 replay_counters_number;
+        u8 unicast_using_group;
+} __attribute__ ((packed));
+
+static int ipw2100_set_security_information(struct ipw2100_priv *priv,
+                                            int auth_mode,
+                                            int security_level,
+                                            int unicast_using_group,
+                                            int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = SET_SECURITY_INFORMATION,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(struct security_info_params)
+        };
+        struct security_info_params *security =
+                (struct security_info_params *)&cmd.host_command_parameters;
+        int err;
+        memset(security, 0, sizeof(*security));
+
+        /* If shared key AP authentication is turned on, then we need to
+         * configure the firmware to try and use it.
+         *
+         * Actual data encryption/decryption is handled by the host. */
+        security->auth_mode = auth_mode;
+        security->unicast_using_group = unicast_using_group;
+
+        switch (security_level) {
+        default:
+        case SEC_LEVEL_0:
+                security->allowed_ciphers = IPW_NONE_CIPHER;
+                break;
+        case SEC_LEVEL_1:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER;
+                break;
+        case SEC_LEVEL_2:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER | IPW_TKIP_CIPHER;
+                break;
+        case SEC_LEVEL_2_CKIP:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER | IPW_CKIP_CIPHER;
+                break;
+        case SEC_LEVEL_3:
+                security->allowed_ciphers = IPW_WEP40_CIPHER |
+                        IPW_WEP104_CIPHER | IPW_TKIP_CIPHER | IPW_CCMP_CIPHER;
+                break;
+        }
+
+        IPW_DEBUG_HC(
+                "SET_SECURITY_INFORMATION: auth:%d cipher:0x%02X (level %d)\n",
+                security->auth_mode, security->allowed_ciphers, security_level);
+
+        security->replay_counters_number = 0;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+static int ipw2100_set_tx_power(struct ipw2100_priv *priv,
+                                u32 tx_power)
+{
+        struct host_command cmd = {
+                .host_command = TX_POWER_INDEX,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err = 0;
+
+        cmd.host_command_parameters[0] = tx_power;
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC)
+                err = ipw2100_hw_send_command(priv, &cmd);
+        if (!err)
+                priv->tx_power = tx_power;
+
+        return 0;
+}
+
+static int ipw2100_set_ibss_beacon_interval(struct ipw2100_priv *priv,
+                                            u32 interval, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = BEACON_INTERVAL,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = interval;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                if (!batch_mode) {
+                        err = ipw2100_disable_adapter(priv);
+                        if (err)
+                                return err;
+                }
+
+                ipw2100_hw_send_command(priv, &cmd);
+
+                if (!batch_mode) {
+                        err = ipw2100_enable_adapter(priv);
+                        if (err)
+                                return err;
+                }
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+
+void ipw2100_queues_initialize(struct ipw2100_priv *priv)
+{
+        ipw2100_tx_initialize(priv);
+        ipw2100_rx_initialize(priv);
+        ipw2100_msg_initialize(priv);
+}
+
+void ipw2100_queues_free(struct ipw2100_priv *priv)
+{
+        ipw2100_tx_free(priv);
+        ipw2100_rx_free(priv);
+        ipw2100_msg_free(priv);
+}
+
+int ipw2100_queues_allocate(struct ipw2100_priv *priv)
+{
+        if (ipw2100_tx_allocate(priv) ||
+            ipw2100_rx_allocate(priv) ||
+            ipw2100_msg_allocate(priv))
+                goto fail;
+
+        return 0;
+
+ fail:
+        ipw2100_tx_free(priv);
+        ipw2100_rx_free(priv);
+        ipw2100_msg_free(priv);
+        return -ENOMEM;
+}
+
+#define IPW_PRIVACY_CAPABLE 0x0008
+
+static int ipw2100_set_wep_flags(struct ipw2100_priv *priv, u32 flags,
+                                 int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = WEP_FLAGS,
+                .host_command_sequence = 0,
+                .host_command_length = 4
+        };
+        int err;
+
+        cmd.host_command_parameters[0] = flags;
+
+        IPW_DEBUG_HC("WEP_FLAGS: flags = 0x%08X\n", flags);
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err) {
+                        printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+struct ipw2100_wep_key {
+        u8 idx;
+        u8 len;
+        u8 key[13];
+};
+
+/* Macros to ease up priting WEP keys */
+#define WEP_FMT_64  "%02X%02X%02X%02X-%02X"
+#define WEP_FMT_128 "%02X%02X%02X%02X-%02X%02X%02X%02X-%02X%02X%02X"
+#define WEP_STR_64(x) x[0],x[1],x[2],x[3],x[4]
+#define WEP_STR_128(x) x[0],x[1],x[2],x[3],x[4],x[5],x[6],x[7],x[8],x[9],x[10]
+
+
+/**
+ * Set a the wep key
+ *
+ * @priv: struct to work on
+ * @idx: index of the key we want to set
+ * @key: ptr to the key data to set
+ * @len: length of the buffer at @key
+ * @batch_mode: FIXME perform the operation in batch mode, not
+ *              disabling the device.
+ *
+ * @returns 0 if OK, < 0 errno code on error.
+ *
+ * Fill out a command structure with the new wep key, length an
+ * index and send it down the wire.
+ */
+static int ipw2100_set_key(struct ipw2100_priv *priv,
+                           int idx, char *key, int len, int batch_mode)
+{
+        int keylen = len ? (len <= 5 ? 5 : 13) : 0;
+        struct host_command cmd = {
+                .host_command = WEP_KEY_INFO,
+                .host_command_sequence = 0,
+                .host_command_length = sizeof(struct ipw2100_wep_key),
+        };
+        struct ipw2100_wep_key *wep_key = (void*)cmd.host_command_parameters;
+        int err;
+
+        IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
+                                 idx, keylen, len);
+
+        /* NOTE: We don't check cached values in case the firmware was reset
+         * or some other problem is occuring.  If the user is setting the key,
+         * then we push the change */
+
+        wep_key->idx = idx;
+        wep_key->len = keylen;
+
+        if (keylen) {
+                memcpy(wep_key->key, key, len);
+                memset(wep_key->key + len, 0, keylen - len);
+        }
+
+        /* Will be optimized out on debug not being configured in */
+        if (keylen == 0)
+                IPW_DEBUG_WEP("%s: Clearing key %d\n",
+                                  priv->net_dev->name, wep_key->idx);
+        else if (keylen == 5)
+                IPW_DEBUG_WEP("%s: idx: %d, len: %d key: " WEP_FMT_64 "\n",
+                                  priv->net_dev->name, wep_key->idx, wep_key->len,
+                                  WEP_STR_64(wep_key->key));
+        else
+                IPW_DEBUG_WEP("%s: idx: %d, len: %d key: " WEP_FMT_128
+                                  "\n",
+                                  priv->net_dev->name, wep_key->idx, wep_key->len,
+                                  WEP_STR_128(wep_key->key));
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                /* FIXME: IPG: shouldn't this prink be in _disable_adapter()? */
+                if (err) {
+                        printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode) {
+                int err2 = ipw2100_enable_adapter(priv);
+                if (err == 0)
+                        err = err2;
+        }
+        return err;
+}
+
+static int ipw2100_set_key_index(struct ipw2100_priv *priv,
+                                 int idx, int batch_mode)
+{
+        struct host_command cmd = {
+                .host_command = WEP_KEY_INDEX,
+                .host_command_sequence = 0,
+                .host_command_length = 4,
+                .host_command_parameters = { idx },
+        };
+        int err;
+
+        IPW_DEBUG_HC("WEP_KEY_INDEX: index = %d\n", idx);
+
+        if (idx < 0 || idx > 3)
+                return -EINVAL;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err) {
+                        printk(KERN_ERR DRV_NAME ": %s: Could not disable adapter %d\n",
+                               priv->net_dev->name, err);
+                        return err;
+                }
+        }
+
+        /* send cmd to firmware */
+        err = ipw2100_hw_send_command(priv, &cmd);
+
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+
+static int ipw2100_configure_security(struct ipw2100_priv *priv,
+                                      int batch_mode)
+{
+        int i, err, auth_mode, sec_level, use_group;
+
+        if (!(priv->status & STATUS_RUNNING))
+                return 0;
+
+        if (!batch_mode) {
+                err = ipw2100_disable_adapter(priv);
+                if (err)
+                        return err;
+        }
+
+        if (!priv->sec.enabled) {
+                err = ipw2100_set_security_information(
+                        priv, IPW_AUTH_OPEN, SEC_LEVEL_0, 0, 1);
+        } else {
+                auth_mode = IPW_AUTH_OPEN;
+                if ((priv->sec.flags & SEC_AUTH_MODE) &&
+                    (priv->sec.auth_mode == WLAN_AUTH_SHARED_KEY))
+                        auth_mode = IPW_AUTH_SHARED;
+
+                sec_level = SEC_LEVEL_0;
+                if (priv->sec.flags & SEC_LEVEL)
+                        sec_level = priv->sec.level;
+
+                use_group = 0;
+                if (priv->sec.flags & SEC_UNICAST_GROUP)
+                        use_group = priv->sec.unicast_uses_group;
+
+                err = ipw2100_set_security_information(
+                            priv, auth_mode, sec_level, use_group, 1);
+        }
+
+        if (err)
+                goto exit;
+
+        if (priv->sec.enabled) {
+                for (i = 0; i < 4; i++) {
+                        if (!(priv->sec.flags & (1 << i))) {
+                                memset(priv->sec.keys[i], 0, WEP_KEY_LEN);
+                                priv->sec.key_sizes[i] = 0;
+                        } else {
+                                err = ipw2100_set_key(priv, i,
+                                                      priv->sec.keys[i],
+                                                      priv->sec.key_sizes[i],
+                                                      1);
+                                if (err)
+                                        goto exit;
+                        }
+                }
+
+                ipw2100_set_key_index(priv, priv->ieee->tx_keyidx, 1);
+        }
+
+        /* Always enable privacy so the Host can filter WEP packets if
+         * encrypted data is sent up */
+        err = ipw2100_set_wep_flags(
+                priv, priv->sec.enabled ? IPW_PRIVACY_CAPABLE : 0, 1);
+        if (err)
+                goto exit;
+
+        priv->status &= ~STATUS_SECURITY_UPDATED;
+
+ exit:
+        if (!batch_mode)
+                ipw2100_enable_adapter(priv);
+
+        return err;
+}
+
+static void ipw2100_security_work(struct ipw2100_priv *priv)
+{
+        /* If we happen to have reconnected before we get a chance to
+         * process this, then update the security settings--which causes
+         * a disassociation to occur */
+        if (!(priv->status & STATUS_ASSOCIATED) &&
+            priv->status & STATUS_SECURITY_UPDATED)
+                ipw2100_configure_security(priv, 0);
+}
+
+static void shim__set_security(struct net_device *dev,
+                               struct ieee80211_security *sec)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int i, force_update = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED))
+                goto done;
+
+        for (i = 0; i < 4; i++) {
+                if (sec->flags & (1 << i)) {
+                        priv->sec.key_sizes[i] = sec->key_sizes[i];
+                        if (sec->key_sizes[i] == 0)
+                                priv->sec.flags &= ~(1 << i);
+                        else
+                                memcpy(priv->sec.keys[i], sec->keys[i],
+                                       sec->key_sizes[i]);
+                        priv->sec.flags |= (1 << i);
+                        priv->status |= STATUS_SECURITY_UPDATED;
+                }
+        }
+
+        if ((sec->flags & SEC_ACTIVE_KEY) &&
+            priv->sec.active_key != sec->active_key) {
+                if (sec->active_key <= 3) {
+                        priv->sec.active_key = sec->active_key;
+                        priv->sec.flags |= SEC_ACTIVE_KEY;
+                } else
+                        priv->sec.flags &= ~SEC_ACTIVE_KEY;
+
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        if ((sec->flags & SEC_AUTH_MODE) &&
+            (priv->sec.auth_mode != sec->auth_mode)) {
+                priv->sec.auth_mode = sec->auth_mode;
+                priv->sec.flags |= SEC_AUTH_MODE;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        if (sec->flags & SEC_ENABLED &&
+            priv->sec.enabled != sec->enabled) {
+                priv->sec.flags |= SEC_ENABLED;
+                priv->sec.enabled = sec->enabled;
+                priv->status |= STATUS_SECURITY_UPDATED;
+                force_update = 1;
+        }
+
+        if (sec->flags & SEC_LEVEL &&
+            priv->sec.level != sec->level) {
+                priv->sec.level = sec->level;
+                priv->sec.flags |= SEC_LEVEL;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        IPW_DEBUG_WEP("Security flags: %c %c%c%c%c %c%c%c%c\n",
+                          priv->sec.flags & (1<<8) ? '1' : '0',
+                          priv->sec.flags & (1<<7) ? '1' : '0',
+                          priv->sec.flags & (1<<6) ? '1' : '0',
+                          priv->sec.flags & (1<<5) ? '1' : '0',
+                          priv->sec.flags & (1<<4) ? '1' : '0',
+                          priv->sec.flags & (1<<3) ? '1' : '0',
+                          priv->sec.flags & (1<<2) ? '1' : '0',
+                          priv->sec.flags & (1<<1) ? '1' : '0',
+                          priv->sec.flags & (1<<0) ? '1' : '0');
+
+/* As a temporary work around to enable WPA until we figure out why
+ * wpa_supplicant toggles the security capability of the driver, which
+ * forces a disassocation with force_update...
+ *
+ *      if (force_update || !(priv->status & STATUS_ASSOCIATED))*/
+        if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)))
+                ipw2100_configure_security(priv, 0);
+done:
+        up(&priv->action_sem);
+}
+
+static int ipw2100_adapter_setup(struct ipw2100_priv *priv)
+{
+        int err;
+        int batch_mode = 1;
+        u8 *bssid;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        err = ipw2100_disable_adapter(priv);
+        if (err)
+                return err;
+#ifdef CONFIG_IPW2100_MONITOR
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                err = ipw2100_set_channel(priv, priv->channel, batch_mode);
+                if (err)
+                        return err;
+
+                IPW_DEBUG_INFO("exit\n");
+
+                return 0;
+        }
+#endif /* CONFIG_IPW2100_MONITOR */
+
+        err = ipw2100_read_mac_address(priv);
+        if (err)
+                return -EIO;
+
+        err = ipw2100_set_mac_address(priv, batch_mode);
+        if (err)
+                return err;
+
+        err = ipw2100_set_port_type(priv, priv->ieee->iw_mode, batch_mode);
+        if (err)
+                return err;
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                err = ipw2100_set_channel(priv, priv->channel, batch_mode);
+                if (err)
+                        return err;
+        }
+
+        err  = ipw2100_system_config(priv, batch_mode);
+        if (err)
+                return err;
+
+        err = ipw2100_set_tx_rates(priv, priv->tx_rates, batch_mode);
+        if (err)
+                return err;
+
+        /* Default to power mode OFF */
+        err = ipw2100_set_power_mode(priv, IPW_POWER_MODE_CAM);
+        if (err)
+                return err;
+
+        err = ipw2100_set_rts_threshold(priv, priv->rts_threshold);
+        if (err)
+                return err;
+
+        if (priv->config & CFG_STATIC_BSSID)
+                bssid = priv->bssid;
+        else
+                bssid = NULL;
+        err = ipw2100_set_mandatory_bssid(priv, bssid, batch_mode);
+        if (err)
+                return err;
+
+        if (priv->config & CFG_STATIC_ESSID)
+                err = ipw2100_set_essid(priv, priv->essid, priv->essid_len,
+                                        batch_mode);
+        else
+                err = ipw2100_set_essid(priv, NULL, 0, batch_mode);
+        if (err)
+                return err;
+
+        err = ipw2100_configure_security(priv, batch_mode);
+        if (err)
+                return err;
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                err = ipw2100_set_ibss_beacon_interval(
+                        priv, priv->beacon_interval, batch_mode);
+                if (err)
+                        return err;
+
+                err = ipw2100_set_tx_power(priv, priv->tx_power);
+                if (err)
+                        return err;
+        }
+
+        /*
+          err = ipw2100_set_fragmentation_threshold(
+          priv, priv->frag_threshold, batch_mode);
+          if (err)
+          return err;
+        */
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+
+/*************************************************************************
+ *
+ * EXTERNALLY CALLED METHODS
+ *
+ *************************************************************************/
+
+/* This method is called by the network layer -- not to be confused with
+ * ipw2100_set_mac_address() declared above called by this driver (and this
+ * method as well) to talk to the firmware */
+static int ipw2100_set_address(struct net_device *dev, void *p)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct sockaddr *addr = p;
+        int err = 0;
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+
+        down(&priv->action_sem);
+
+        priv->config |= CFG_CUSTOM_MAC;
+        memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
+
+        err = ipw2100_set_mac_address(priv, 0);
+        if (err)
+                goto done;
+
+        priv->reset_backoff = 0;
+        up(&priv->action_sem);
+        ipw2100_reset_adapter(priv);
+        return 0;
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_open(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        unsigned long flags;
+        IPW_DEBUG_INFO("dev->open\n");
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+        if (priv->status & STATUS_ASSOCIATED) {
+                netif_carrier_on(dev);
+                netif_start_queue(dev);
+        }
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        return 0;
+}
+
+static int ipw2100_close(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        unsigned long flags;
+        struct list_head *element;
+        struct ipw2100_tx_packet *packet;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (priv->status & STATUS_ASSOCIATED)
+                netif_carrier_off(dev);
+        netif_stop_queue(dev);
+
+        /* Flush the TX queue ... */
+        while (!list_empty(&priv->tx_pend_list)) {
+                element = priv->tx_pend_list.next;
+                packet = list_entry(element, struct ipw2100_tx_packet, list);
+
+                list_del(element);
+                DEC_STAT(&priv->tx_pend_stat);
+
+                ieee80211_txb_free(packet->info.d_struct.txb);
+                packet->info.d_struct.txb = NULL;
+
+                list_add_tail(element, &priv->tx_free_list);
+                INC_STAT(&priv->tx_free_stat);
+        }
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+
+        IPW_DEBUG_INFO("exit\n");
+
+        return 0;
+}
+
+
+
+/*
+ * TODO:  Fix this function... its just wrong
+ */
+static void ipw2100_tx_timeout(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        priv->ieee->stats.tx_errors++;
+
+#ifdef CONFIG_IPW2100_MONITOR
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR)
+                return;
+#endif
+
+        IPW_DEBUG_INFO("%s: TX timed out.  Scheduling firmware restart.\n",
+                       dev->name);
+        schedule_reset(priv);
+}
+
+
+/*
+ * TODO: reimplement it so that it reads statistics
+ *       from the adapter using ordinal tables
+ *       instead of/in addition to collecting them
+ *       in the driver
+ */
+static struct net_device_stats *ipw2100_stats(struct net_device *dev)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        return &priv->ieee->stats;
+}
+
+/* Support for wpa_supplicant. Will be replaced with WEXT once
+ * they get WPA support. */
+#ifdef CONFIG_IEEE80211_WPA
+
+/* following definitions must match definitions in driver_ipw2100.c */
+
+#define IPW2100_IOCTL_WPA_SUPPLICANT            SIOCIWFIRSTPRIV+30
+
+#define IPW2100_CMD_SET_WPA_PARAM               1
+#define IPW2100_CMD_SET_WPA_IE                  2
+#define IPW2100_CMD_SET_ENCRYPTION              3
+#define IPW2100_CMD_MLME                        4
+
+#define IPW2100_PARAM_WPA_ENABLED               1
+#define IPW2100_PARAM_TKIP_COUNTERMEASURES      2
+#define IPW2100_PARAM_DROP_UNENCRYPTED          3
+#define IPW2100_PARAM_PRIVACY_INVOKED           4
+#define IPW2100_PARAM_AUTH_ALGS                 5
+#define IPW2100_PARAM_IEEE_802_1X               6
+
+#define IPW2100_MLME_STA_DEAUTH                 1
+#define IPW2100_MLME_STA_DISASSOC               2
+
+#define IPW2100_CRYPT_ERR_UNKNOWN_ALG           2
+#define IPW2100_CRYPT_ERR_UNKNOWN_ADDR          3
+#define IPW2100_CRYPT_ERR_CRYPT_INIT_FAILED     4
+#define IPW2100_CRYPT_ERR_KEY_SET_FAILED        5
+#define IPW2100_CRYPT_ERR_TX_KEY_SET_FAILED     6
+#define IPW2100_CRYPT_ERR_CARD_CONF_FAILED      7
+
+#define IPW2100_CRYPT_ALG_NAME_LEN              16
+
+struct ipw2100_param {
+        u32 cmd;
+        u8 sta_addr[ETH_ALEN];
+        union {
+                struct {
+                        u8 name;
+                        u32 value;
+                } wpa_param;
+                struct {
+                        u32 len;
+                        u8 *data;
+                } wpa_ie;
+                struct{
+                        int command;
+                        int reason_code;
+                } mlme;
+                struct {
+                        u8 alg[IPW2100_CRYPT_ALG_NAME_LEN];
+                        u8 set_tx;
+                        u32 err;
+                        u8 idx;
+                        u8 seq[8]; /* sequence counter (set: RX, get: TX) */
+                        u16 key_len;
+                        u8 key[0];
+                } crypt;
+
+        } u;
+};
+
+/* end of driver_ipw2100.c code */
+
+static int ipw2100_wpa_enable(struct ipw2100_priv *priv, int value){
+
+        struct ieee80211_device *ieee = priv->ieee;
+        struct ieee80211_security sec = {
+                .flags = SEC_LEVEL | SEC_ENABLED,
+        };
+        int ret = 0;
+
+        ieee->wpa_enabled = value;
+
+        if (value){
+                sec.level = SEC_LEVEL_3;
+                sec.enabled = 1;
+        } else {
+                sec.level = SEC_LEVEL_0;
+                sec.enabled = 0;
+        }
+
+        if (ieee->set_security)
+                ieee->set_security(ieee->dev, &sec);
+        else
+                ret = -EOPNOTSUPP;
+
+        return ret;
+}
+
+#define AUTH_ALG_OPEN_SYSTEM                    0x1
+#define AUTH_ALG_SHARED_KEY                     0x2
+
+static int ipw2100_wpa_set_auth_algs(struct ipw2100_priv *priv, int value){
+
+        struct ieee80211_device *ieee = priv->ieee;
+        struct ieee80211_security sec = {
+                .flags = SEC_AUTH_MODE,
+        };
+        int ret = 0;
+
+        if (value & AUTH_ALG_SHARED_KEY){
+                sec.auth_mode = WLAN_AUTH_SHARED_KEY;
+                ieee->open_wep = 0;
+        } else {
+                sec.auth_mode = WLAN_AUTH_OPEN;
+                ieee->open_wep = 1;
+        }
+
+        if (ieee->set_security)
+                ieee->set_security(ieee->dev, &sec);
+        else
+                ret = -EOPNOTSUPP;
+
+        return ret;
+}
+
+
+static int ipw2100_wpa_set_param(struct net_device *dev, u8 name, u32 value){
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int ret=0;
+
+        switch(name){
+                case IPW2100_PARAM_WPA_ENABLED:
+                        ret = ipw2100_wpa_enable(priv, value);
+                        break;
+
+                case IPW2100_PARAM_TKIP_COUNTERMEASURES:
+                        priv->ieee->tkip_countermeasures=value;
+                        break;
+
+                case IPW2100_PARAM_DROP_UNENCRYPTED:
+                        priv->ieee->drop_unencrypted=value;
+                        break;
+
+                case IPW2100_PARAM_PRIVACY_INVOKED:
+                        priv->ieee->privacy_invoked=value;
+                        break;
+
+                case IPW2100_PARAM_AUTH_ALGS:
+                        ret = ipw2100_wpa_set_auth_algs(priv, value);
+                        break;
+
+                case IPW2100_PARAM_IEEE_802_1X:
+                        priv->ieee->ieee802_1x=value;
+                        break;
+
+                default:
+                        printk(KERN_ERR DRV_NAME ": %s: Unknown WPA param: %d\n",
+                                            dev->name, name);
+                        ret = -EOPNOTSUPP;
+        }
+
+        return ret;
+}
+
+static int ipw2100_wpa_mlme(struct net_device *dev, int command, int reason){
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int ret=0;
+
+        switch(command){
+                case IPW2100_MLME_STA_DEAUTH:
+                        // silently ignore
+                        break;
+
+                case IPW2100_MLME_STA_DISASSOC:
+                        ipw2100_disassociate_bssid(priv);
+                        break;
+
+                default:
+                        printk(KERN_ERR DRV_NAME ": %s: Unknown MLME request: %d\n",
+                                            dev->name, command);
+                        ret = -EOPNOTSUPP;
+        }
+
+        return ret;
+}
+
+
+void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
+                             char *wpa_ie, int wpa_ie_len){
+
+        struct ipw2100_wpa_assoc_frame frame;
+
+        frame.fixed_ie_mask = 0;
+
+        /* copy WPA IE */
+        memcpy(frame.var_ie, wpa_ie, wpa_ie_len);
+        frame.var_ie_len = wpa_ie_len;
+
+        /* make sure WPA is enabled */
+        ipw2100_wpa_enable(priv, 1);
+        ipw2100_set_wpa_ie(priv, &frame, 0);
+}
+
+
+static int ipw2100_wpa_set_wpa_ie(struct net_device *dev,
+                                struct ipw2100_param *param, int plen){
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ieee80211_device *ieee = priv->ieee;
+        u8 *buf;
+
+        if (! ieee->wpa_enabled)
+            return -EOPNOTSUPP;
+
+        if (param->u.wpa_ie.len > MAX_WPA_IE_LEN ||
+           (param->u.wpa_ie.len &&
+                param->u.wpa_ie.data==NULL))
+                return -EINVAL;
+
+        if (param->u.wpa_ie.len){
+                buf = kmalloc(param->u.wpa_ie.len, GFP_KERNEL);
+                if (buf == NULL)
+                        return -ENOMEM;
+
+                memcpy(buf, param->u.wpa_ie.data, param->u.wpa_ie.len);
+
+                kfree(ieee->wpa_ie);
+                ieee->wpa_ie = buf;
+                ieee->wpa_ie_len = param->u.wpa_ie.len;
+
+        } else {
+                kfree(ieee->wpa_ie);
+                ieee->wpa_ie = NULL;
+                ieee->wpa_ie_len = 0;
+        }
+
+        ipw2100_wpa_assoc_frame(priv, ieee->wpa_ie, ieee->wpa_ie_len);
+
+        return 0;
+}
+
+/* implementation borrowed from hostap driver */
+
+static int ipw2100_wpa_set_encryption(struct net_device *dev,
+                                struct ipw2100_param *param, int param_len){
+
+        int ret = 0;
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct ieee80211_device *ieee = priv->ieee;
+        struct ieee80211_crypto_ops *ops;
+        struct ieee80211_crypt_data **crypt;
+
+        struct ieee80211_security sec = {
+                .flags = 0,
+        };
+
+        param->u.crypt.err = 0;
+        param->u.crypt.alg[IPW2100_CRYPT_ALG_NAME_LEN - 1] = '\0';
+
+        if (param_len !=
+            (int) ((char *) param->u.crypt.key - (char *) param) +
+            param->u.crypt.key_len){
+                IPW_DEBUG_INFO("Len mismatch %d, %d\n", param_len, param->u.crypt.key_len);
+                return -EINVAL;
+        }
+        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
+            param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
+            param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
+                if (param->u.crypt.idx >= WEP_KEYS)
+                        return -EINVAL;
+                crypt = &ieee->crypt[param->u.crypt.idx];
+        } else {
+                return -EINVAL;
+        }
+
+        if (strcmp(param->u.crypt.alg, "none") == 0) {
+                if (crypt){
+                        sec.enabled = 0;
+                        sec.level = SEC_LEVEL_0;
+                        sec.flags |= SEC_ENABLED | SEC_LEVEL;
+                        ieee80211_crypt_delayed_deinit(ieee, crypt);
+                }
+                goto done;
+        }
+        sec.enabled = 1;
+        sec.flags |= SEC_ENABLED;
+
+        ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
+                request_module("ieee80211_crypt_wep");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
+                request_module("ieee80211_crypt_tkip");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {
+                request_module("ieee80211_crypt_ccmp");
+                ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
+        }
+        if (ops == NULL) {
+                IPW_DEBUG_INFO("%s: unknown crypto alg '%s'\n",
+                       dev->name, param->u.crypt.alg);
+                param->u.crypt.err = IPW2100_CRYPT_ERR_UNKNOWN_ALG;
+                ret = -EINVAL;
+                goto done;
+        }
+
+        if (*crypt == NULL || (*crypt)->ops != ops) {
+                struct ieee80211_crypt_data *new_crypt;
+
+                ieee80211_crypt_delayed_deinit(ieee, crypt);
+
+                new_crypt = (struct ieee80211_crypt_data *)
+                        kmalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL);
+                if (new_crypt == NULL) {
+                        ret = -ENOMEM;
+                        goto done;
+                }
+                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+                new_crypt->ops = ops;
+                if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
+                        new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
+
+                if (new_crypt->priv == NULL) {
+                        kfree(new_crypt);
+                        param->u.crypt.err =
+                                IPW2100_CRYPT_ERR_CRYPT_INIT_FAILED;
+                        ret = -EINVAL;
+                        goto done;
+                }
+
+                *crypt = new_crypt;
+        }
+
+        if (param->u.crypt.key_len > 0 && (*crypt)->ops->set_key &&
+            (*crypt)->ops->set_key(param->u.crypt.key,
+                                   param->u.crypt.key_len, param->u.crypt.seq,
+                                   (*crypt)->priv) < 0) {
+                IPW_DEBUG_INFO("%s: key setting failed\n",
+                       dev->name);
+                param->u.crypt.err = IPW2100_CRYPT_ERR_KEY_SET_FAILED;
+                ret = -EINVAL;
+                goto done;
+        }
+
+        if (param->u.crypt.set_tx){
+                ieee->tx_keyidx = param->u.crypt.idx;
+                sec.active_key = param->u.crypt.idx;
+                sec.flags |= SEC_ACTIVE_KEY;
+        }
+
+        if (ops->name != NULL){
+
+                if (strcmp(ops->name, "WEP") == 0) {
+                        memcpy(sec.keys[param->u.crypt.idx], param->u.crypt.key, param->u.crypt.key_len);
+                        sec.key_sizes[param->u.crypt.idx] = param->u.crypt.key_len;
+                        sec.flags |= (1 << param->u.crypt.idx);
+                        sec.flags |= SEC_LEVEL;
+                        sec.level = SEC_LEVEL_1;
+                } else if (strcmp(ops->name, "TKIP") == 0) {
+                        sec.flags |= SEC_LEVEL;
+                        sec.level = SEC_LEVEL_2;
+                } else if (strcmp(ops->name, "CCMP") == 0) {
+                        sec.flags |= SEC_LEVEL;
+                        sec.level = SEC_LEVEL_3;
+                }
+        }
+ done:
+        if (ieee->set_security)
+                ieee->set_security(ieee->dev, &sec);
+
+        /* Do not reset port if card is in Managed mode since resetting will
+         * generate new IEEE 802.11 authentication which may end up in looping
+         * with IEEE 802.1X.  If your hardware requires a reset after WEP
+         * configuration (for example... Prism2), implement the reset_port in
+         * the callbacks structures used to initialize the 802.11 stack. */
+        if (ieee->reset_on_keychange &&
+            ieee->iw_mode != IW_MODE_INFRA &&
+            ieee->reset_port &&
+            ieee->reset_port(dev)) {
+                IPW_DEBUG_INFO("%s: reset_port failed\n", dev->name);
+                param->u.crypt.err = IPW2100_CRYPT_ERR_CARD_CONF_FAILED;
+                return -EINVAL;
+        }
+
+        return ret;
+}
+
+
+static int ipw2100_wpa_supplicant(struct net_device *dev, struct iw_point *p){
+
+        struct ipw2100_param *param;
+        int ret=0;
+
+        IPW_DEBUG_IOCTL("wpa_supplicant: len=%d\n", p->length);
+
+        if (p->length < sizeof(struct ipw2100_param) || !p->pointer)
+                return -EINVAL;
+
+        param = (struct ipw2100_param *)kmalloc(p->length, GFP_KERNEL);
+        if (param == NULL)
+                return -ENOMEM;
+
+        if (copy_from_user(param, p->pointer, p->length)){
+                kfree(param);
+                return -EFAULT;
+        }
+
+        switch (param->cmd){
+
+        case IPW2100_CMD_SET_WPA_PARAM:
+                ret = ipw2100_wpa_set_param(dev, param->u.wpa_param.name,
+                                            param->u.wpa_param.value);
+                break;
+
+        case IPW2100_CMD_SET_WPA_IE:
+                ret = ipw2100_wpa_set_wpa_ie(dev, param, p->length);
+                break;
+
+        case IPW2100_CMD_SET_ENCRYPTION:
+                ret = ipw2100_wpa_set_encryption(dev, param, p->length);
+                break;
+
+        case IPW2100_CMD_MLME:
+                ret = ipw2100_wpa_mlme(dev, param->u.mlme.command,
+                                       param->u.mlme.reason_code);
+                break;
+
+        default:
+                printk(KERN_ERR DRV_NAME ": %s: Unknown WPA supplicant request: %d\n",
+                                dev->name, param->cmd);
+                ret = -EOPNOTSUPP;
+
+        }
+
+        if (ret == 0 && copy_to_user(p->pointer, param, p->length))
+                ret = -EFAULT;
+
+        kfree(param);
+        return ret;
+}
+#endif /* CONFIG_IEEE80211_WPA */
+
+static int ipw2100_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+#ifdef CONFIG_IEEE80211_WPA
+        struct iwreq *wrq = (struct iwreq *) rq;
+        int ret=-1;
+        switch (cmd){
+            case IPW2100_IOCTL_WPA_SUPPLICANT:
+                ret = ipw2100_wpa_supplicant(dev, &wrq->u.data);
+                return ret;
+
+            default:
+                return -EOPNOTSUPP;
+        }
+
+#endif /* CONFIG_IEEE80211_WPA */
+
+        return -EOPNOTSUPP;
+}
+
+
+static void ipw_ethtool_get_drvinfo(struct net_device *dev,
+                                    struct ethtool_drvinfo *info)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        char fw_ver[64], ucode_ver[64];
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+
+        ipw2100_get_fwversion(priv, fw_ver, sizeof(fw_ver));
+        ipw2100_get_ucodeversion(priv, ucode_ver, sizeof(ucode_ver));
+
+        snprintf(info->fw_version, sizeof(info->fw_version), "%s:%d:%s",
+                 fw_ver, priv->eeprom_version, ucode_ver);
+
+        strcpy(info->bus_info, pci_name(priv->pci_dev));
+}
+
+static u32 ipw2100_ethtool_get_link(struct net_device *dev)
+{
+    struct ipw2100_priv *priv = ieee80211_priv(dev);
+    return (priv->status & STATUS_ASSOCIATED) ? 1 : 0;
+}
+
+
+static struct ethtool_ops ipw2100_ethtool_ops = {
+    .get_link        = ipw2100_ethtool_get_link,
+    .get_drvinfo     = ipw_ethtool_get_drvinfo,
+};
+
+static void ipw2100_hang_check(void *adapter)
+{
+        struct ipw2100_priv *priv = adapter;
+        unsigned long flags;
+        u32 rtc = 0xa5a5a5a5;
+        u32 len = sizeof(rtc);
+        int restart = 0;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (priv->fatal_error != 0) {
+                /* If fatal_error is set then we need to restart */
+                IPW_DEBUG_INFO("%s: Hardware fatal error detected.\n",
+                               priv->net_dev->name);
+
+                restart = 1;
+        } else if (ipw2100_get_ordinal(priv, IPW_ORD_RTC_TIME, &rtc, &len) ||
+                   (rtc == priv->last_rtc)) {
+                /* Check if firmware is hung */
+                IPW_DEBUG_INFO("%s: Firmware RTC stalled.\n",
+                               priv->net_dev->name);
+
+                restart = 1;
+        }
+
+        if (restart) {
+                /* Kill timer */
+                priv->stop_hang_check = 1;
+                priv->hangs++;
+
+                /* Restart the NIC */
+                schedule_reset(priv);
+        }
+
+        priv->last_rtc = rtc;
+
+        if (!priv->stop_hang_check)
+                queue_delayed_work(priv->workqueue, &priv->hang_check, HZ / 2);
+
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+}
+
+
+static void ipw2100_rf_kill(void *adapter)
+{
+        struct ipw2100_priv *priv = adapter;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->low_lock, flags);
+
+        if (rf_kill_active(priv)) {
+                IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
+                if (!priv->stop_rf_kill)
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
+                goto exit_unlock;
+        }
+
+        /* RF Kill is now disabled, so bring the device back up */
+
+        if (!(priv->status & STATUS_RF_KILL_MASK)) {
+                IPW_DEBUG_RF_KILL("HW RF Kill no longer active, restarting "
+                                  "device\n");
+                schedule_reset(priv);
+        } else
+                IPW_DEBUG_RF_KILL("HW RF Kill deactivated.  SW RF Kill still "
+                                  "enabled\n");
+
+ exit_unlock:
+        spin_unlock_irqrestore(&priv->low_lock, flags);
+}
+
+static void ipw2100_irq_tasklet(struct ipw2100_priv *priv);
+
+/* Look into using netdev destructor to shutdown ieee80211? */
+
+static struct net_device *ipw2100_alloc_device(
+        struct pci_dev *pci_dev,
+        void __iomem *base_addr,
+        unsigned long mem_start,
+        unsigned long mem_len)
+{
+        struct ipw2100_priv *priv;
+        struct net_device *dev;
+
+        dev = alloc_ieee80211(sizeof(struct ipw2100_priv));
+        if (!dev)
+                return NULL;
+        priv = ieee80211_priv(dev);
+        priv->ieee = netdev_priv(dev);
+        priv->pci_dev = pci_dev;
+        priv->net_dev = dev;
+
+        priv->ieee->hard_start_xmit = ipw2100_tx;
+        priv->ieee->set_security = shim__set_security;
+
+        dev->open = ipw2100_open;
+        dev->stop = ipw2100_close;
+        dev->init = ipw2100_net_init;
+        dev->do_ioctl = ipw2100_ioctl;
+        dev->get_stats = ipw2100_stats;
+        dev->ethtool_ops = &ipw2100_ethtool_ops;
+        dev->tx_timeout = ipw2100_tx_timeout;
+        dev->wireless_handlers = &ipw2100_wx_handler_def;
+        dev->get_wireless_stats = ipw2100_wx_wireless_stats;
+        dev->set_mac_address = ipw2100_set_address;
+        dev->watchdog_timeo = 3*HZ;
+        dev->irq = 0;
+
+        dev->base_addr = (unsigned long)base_addr;
+        dev->mem_start = mem_start;
+        dev->mem_end = dev->mem_start + mem_len - 1;
+
+        /* NOTE: We don't use the wireless_handlers hook
+         * in dev as the system will start throwing WX requests
+         * to us before we're actually initialized and it just
+         * ends up causing problems.  So, we just handle
+         * the WX extensions through the ipw2100_ioctl interface */
+
+
+        /* memset() puts everything to 0, so we only have explicitely set
+         * those values that need to be something else */
+
+        /* If power management is turned on, default to AUTO mode */
+        priv->power_mode = IPW_POWER_AUTO;
+
+
+
+#ifdef CONFIG_IEEE80211_WPA
+        priv->ieee->wpa_enabled = 0;
+        priv->ieee->tkip_countermeasures = 0;
+        priv->ieee->drop_unencrypted = 0;
+        priv->ieee->privacy_invoked = 0;
+        priv->ieee->ieee802_1x = 1;
+#endif /* CONFIG_IEEE80211_WPA */
+
+        /* Set module parameters */
+        switch (mode) {
+        case 1:
+                priv->ieee->iw_mode = IW_MODE_ADHOC;
+                break;
+#ifdef CONFIG_IPW2100_MONITOR
+        case 2:
+                priv->ieee->iw_mode = IW_MODE_MONITOR;
+                break;
+#endif
+        default:
+        case 0:
+                priv->ieee->iw_mode = IW_MODE_INFRA;
+                break;
+        }
+
+        if (disable == 1)
+                priv->status |= STATUS_RF_KILL_SW;
+
+        if (channel != 0 &&
+            ((channel >= REG_MIN_CHANNEL) &&
+             (channel <= REG_MAX_CHANNEL))) {
+                priv->config |= CFG_STATIC_CHANNEL;
+                priv->channel = channel;
+        }
+
+        if (associate)
+                priv->config |= CFG_ASSOCIATE;
+
+        priv->beacon_interval = DEFAULT_BEACON_INTERVAL;
+        priv->short_retry_limit = DEFAULT_SHORT_RETRY_LIMIT;
+        priv->long_retry_limit = DEFAULT_LONG_RETRY_LIMIT;
+        priv->rts_threshold = DEFAULT_RTS_THRESHOLD | RTS_DISABLED;
+        priv->frag_threshold = DEFAULT_FTS | FRAG_DISABLED;
+        priv->tx_power = IPW_TX_POWER_DEFAULT;
+        priv->tx_rates = DEFAULT_TX_RATES;
+
+        strcpy(priv->nick, "ipw2100");
+
+        spin_lock_init(&priv->low_lock);
+        sema_init(&priv->action_sem, 1);
+        sema_init(&priv->adapter_sem, 1);
+
+        init_waitqueue_head(&priv->wait_command_queue);
+
+        netif_carrier_off(dev);
+
+        INIT_LIST_HEAD(&priv->msg_free_list);
+        INIT_LIST_HEAD(&priv->msg_pend_list);
+        INIT_STAT(&priv->msg_free_stat);
+        INIT_STAT(&priv->msg_pend_stat);
+
+        INIT_LIST_HEAD(&priv->tx_free_list);
+        INIT_LIST_HEAD(&priv->tx_pend_list);
+        INIT_STAT(&priv->tx_free_stat);
+        INIT_STAT(&priv->tx_pend_stat);
+
+        INIT_LIST_HEAD(&priv->fw_pend_list);
+        INIT_STAT(&priv->fw_pend_stat);
+
+
+#ifdef CONFIG_SOFTWARE_SUSPEND2
+        priv->workqueue = create_workqueue(DRV_NAME, 0);
+#else
+        priv->workqueue = create_workqueue(DRV_NAME);
+#endif
+        INIT_WORK(&priv->reset_work,
+                  (void (*)(void *))ipw2100_reset_adapter, priv);
+        INIT_WORK(&priv->security_work,
+                  (void (*)(void *))ipw2100_security_work, priv);
+        INIT_WORK(&priv->wx_event_work,
+                  (void (*)(void *))ipw2100_wx_event_work, priv);
+        INIT_WORK(&priv->hang_check, ipw2100_hang_check, priv);
+        INIT_WORK(&priv->rf_kill, ipw2100_rf_kill, priv);
+
+        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
+                     ipw2100_irq_tasklet, (unsigned long)priv);
+
+        /* NOTE:  We do not start the deferred work for status checks yet */
+        priv->stop_rf_kill = 1;
+        priv->stop_hang_check = 1;
+
+        return dev;
+}
+
+static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
+                                const struct pci_device_id *ent)
+{
+        unsigned long mem_start, mem_len, mem_flags;
+        void __iomem *base_addr = NULL;
+        struct net_device *dev = NULL;
+        struct ipw2100_priv *priv = NULL;
+        int err = 0;
+        int registered = 0;
+        u32 val;
+
+        IPW_DEBUG_INFO("enter\n");
+
+        mem_start = pci_resource_start(pci_dev, 0);
+        mem_len = pci_resource_len(pci_dev, 0);
+        mem_flags = pci_resource_flags(pci_dev, 0);
+
+        if ((mem_flags & IORESOURCE_MEM) != IORESOURCE_MEM) {
+                IPW_DEBUG_INFO("weird - resource type is not memory\n");
+                err = -ENODEV;
+                goto fail;
+        }
+
+        base_addr = ioremap_nocache(mem_start, mem_len);
+        if (!base_addr) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling ioremap_nocache.\n");
+                err = -EIO;
+                goto fail;
+        }
+
+        /* allocate and initialize our net_device */
+        dev = ipw2100_alloc_device(pci_dev, base_addr, mem_start, mem_len);
+        if (!dev) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling ipw2100_alloc_device.\n");
+                err = -ENOMEM;
+                goto fail;
+        }
+
+        /* set up PCI mappings for device */
+        err = pci_enable_device(pci_dev);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling pci_enable_device.\n");
+                return err;
+        }
+
+        priv = ieee80211_priv(dev);
+
+        pci_set_master(pci_dev);
+        pci_set_drvdata(pci_dev, priv);
+
+        err = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling pci_set_dma_mask.\n");
+                pci_disable_device(pci_dev);
+                return err;
+        }
+
+        err = pci_request_regions(pci_dev, DRV_NAME);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling pci_request_regions.\n");
+                pci_disable_device(pci_dev);
+                return err;
+        }
+
+        /* We disable the RETRY_TIMEOUT register (0x41) to keep
+         * PCI Tx retries from interfering with C3 CPU state */
+        pci_read_config_dword(pci_dev, 0x40, &val);
+        if ((val & 0x0000ff00) != 0)
+                pci_write_config_dword(pci_dev, 0x40, val & 0xffff00ff);
+
+        pci_set_power_state(pci_dev, PCI_D0);
+
+        if (!ipw2100_hw_is_adapter_in_system(dev)) {
+                printk(KERN_WARNING DRV_NAME
+                       "Device not found via register read.\n");
+                err = -ENODEV;
+                goto fail;
+        }
+
+        SET_NETDEV_DEV(dev, &pci_dev->dev);
+
+        /* Force interrupts to be shut off on the device */
+        priv->status |= STATUS_INT_ENABLED;
+        ipw2100_disable_interrupts(priv);
+
+        /* Allocate and initialize the Tx/Rx queues and lists */
+        if (ipw2100_queues_allocate(priv)) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calilng ipw2100_queues_allocate.\n");
+                err = -ENOMEM;
+                goto fail;
+        }
+        ipw2100_queues_initialize(priv);
+
+        err = request_irq(pci_dev->irq,
+                          ipw2100_interrupt, SA_SHIRQ,
+                          dev->name, priv);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling request_irq: %d.\n",
+                       pci_dev->irq);
+                goto fail;
+        }
+        dev->irq = pci_dev->irq;
+
+        IPW_DEBUG_INFO("Attempting to register device...\n");
+
+        SET_MODULE_OWNER(dev);
+
+        printk(KERN_INFO DRV_NAME
+               ": Detected Intel PRO/Wireless 2100 Network Connection\n");
+
+        /* Bring up the interface.  Pre 0.46, after we registered the
+         * network device we would call ipw2100_up.  This introduced a race
+         * condition with newer hotplug configurations (network was coming
+         * up and making calls before the device was initialized).
+         *
+         * If we called ipw2100_up before we registered the device, then the
+         * device name wasn't registered.  So, we instead use the net_dev->init
+         * member to call a function that then just turns and calls ipw2100_up.
+         * net_dev->init is called after name allocation but before the
+         * notifier chain is called */
+        down(&priv->action_sem);
+        err = register_netdev(dev);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME
+                       "Error calling register_netdev.\n");
+                goto fail_unlock;
+        }
+        registered = 1;
+
+        IPW_DEBUG_INFO("%s: Bound to %s\n", dev->name, pci_name(pci_dev));
+
+        /* perform this after register_netdev so that dev->name is set */
+        sysfs_create_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+        netif_carrier_off(dev);
+
+        /* If the RF Kill switch is disabled, go ahead and complete the
+         * startup sequence */
+        if (!(priv->status & STATUS_RF_KILL_MASK)) {
+                /* Enable the adapter - sends HOST_COMPLETE */
+                if (ipw2100_enable_adapter(priv)) {
+                        printk(KERN_WARNING DRV_NAME
+                               ": %s: failed in call to enable adapter.\n",
+                               priv->net_dev->name);
+                        ipw2100_hw_stop_adapter(priv);
+                        err = -EIO;
+                        goto fail_unlock;
+                }
+
+                /* Start a scan . . . */
+                ipw2100_set_scan_options(priv);
+                ipw2100_start_scan(priv);
+        }
+
+        IPW_DEBUG_INFO("exit\n");
+
+        priv->status |= STATUS_INITIALIZED;
+
+        up(&priv->action_sem);
+
+        return 0;
+
+ fail_unlock:
+        up(&priv->action_sem);
+
+ fail:
+        if (dev) {
+                if (registered)
+                        unregister_netdev(dev);
+
+                ipw2100_hw_stop_adapter(priv);
+
+                ipw2100_disable_interrupts(priv);
+
+                if (dev->irq)
+                        free_irq(dev->irq, priv);
+
+                ipw2100_kill_workqueue(priv);
+
+                /* These are safe to call even if they weren't allocated */
+                ipw2100_queues_free(priv);
+                sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+
+                free_ieee80211(dev);
+                pci_set_drvdata(pci_dev, NULL);
+        }
+
+        if (base_addr)
+                iounmap(base_addr);
+
+        pci_release_regions(pci_dev);
+        pci_disable_device(pci_dev);
+
+        return err;
+}
+
+static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
+{
+        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
+        struct net_device *dev;
+
+        if (priv) {
+                down(&priv->action_sem);
+
+                priv->status &= ~STATUS_INITIALIZED;
+
+                dev = priv->net_dev;
+                sysfs_remove_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+
+#ifdef CONFIG_PM
+                if (ipw2100_firmware.version)
+                        ipw2100_release_firmware(priv, &ipw2100_firmware);
+#endif
+                /* Take down the hardware */
+                ipw2100_down(priv);
+
+                /* Release the semaphore so that the network subsystem can
+                 * complete any needed calls into the driver... */
+                up(&priv->action_sem);
+
+                /* Unregister the device first - this results in close()
+                 * being called if the device is open.  If we free storage
+                 * first, then close() will crash. */
+                unregister_netdev(dev);
+
+                /* ipw2100_down will ensure that there is no more pending work
+                 * in the workqueue's, so we can safely remove them now. */
+                ipw2100_kill_workqueue(priv);
+
+                ipw2100_queues_free(priv);
+
+                /* Free potential debugging firmware snapshot */
+                ipw2100_snapshot_free(priv);
+
+                if (dev->irq)
+                        free_irq(dev->irq, priv);
+
+                if (dev->base_addr)
+                        iounmap((void __iomem *)dev->base_addr);
+
+                free_ieee80211(dev);
+        }
+
+        pci_release_regions(pci_dev);
+        pci_disable_device(pci_dev);
+
+        IPW_DEBUG_INFO("exit\n");
+}
+
+
+#ifdef CONFIG_PM
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
+static int ipw2100_suspend(struct pci_dev *pci_dev, u32 state)
+#else
+static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
+#endif
+{
+        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
+        struct net_device *dev = priv->net_dev;
+
+        IPW_DEBUG_INFO("%s: Going into suspend...\n",
+               dev->name);
+
+        down(&priv->action_sem);
+        if (priv->status & STATUS_INITIALIZED) {
+                /* Take down the device; powers it off, etc. */
+                ipw2100_down(priv);
+        }
+
+        /* Remove the PRESENT state of the device */
+        netif_device_detach(dev);
+
+        pci_save_state(pci_dev);
+        pci_disable_device (pci_dev);
+        pci_set_power_state(pci_dev, PCI_D3hot);
+
+        up(&priv->action_sem);
+
+        return 0;
+}
+
+static int ipw2100_resume(struct pci_dev *pci_dev)
+{
+        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
+        struct net_device *dev = priv->net_dev;
+        u32 val;
+
+        if (IPW2100_PM_DISABLED)
+                return 0;
+
+        down(&priv->action_sem);
+
+        IPW_DEBUG_INFO("%s: Coming out of suspend...\n",
+               dev->name);
+
+        pci_set_power_state(pci_dev, PCI_D0);
+        pci_enable_device(pci_dev);
+        pci_restore_state(pci_dev);
+
+        /*
+         * Suspend/Resume resets the PCI configuration space, so we have to
+         * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
+         * from interfering with C3 CPU state. pci_restore_state won't help
+         * here since it only restores the first 64 bytes pci config header.
+         */
+        pci_read_config_dword(pci_dev, 0x40, &val);
+        if ((val & 0x0000ff00) != 0)
+                pci_write_config_dword(pci_dev, 0x40, val & 0xffff00ff);
+
+        /* Set the device back into the PRESENT state; this will also wake
+         * the queue of needed */
+        netif_device_attach(dev);
+
+        /* Bring the device back up */
+        if (!(priv->status & STATUS_RF_KILL_SW))
+                ipw2100_up(priv, 0);
+
+        up(&priv->action_sem);
+
+        return 0;
+}
+#endif
+
+
+#define IPW2100_DEV_ID(x) { PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, x }
+
+static struct pci_device_id ipw2100_pci_id_table[] __devinitdata = {
+        IPW2100_DEV_ID(0x2520), /* IN 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2521), /* IN 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2524), /* IN 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2525), /* IN 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2526), /* IN 2100A mPCI Gen A3 */
+        IPW2100_DEV_ID(0x2522), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2523), /* IN 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2527), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2528), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2529), /* IN 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x252B), /* IN 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x252C), /* IN 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x252D), /* IN 2100 mPCI 3A */
+
+        IPW2100_DEV_ID(0x2550), /* IB 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2551), /* IB 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2553), /* IB 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2554), /* IB 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2555), /* IB 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x2560), /* DE 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2562), /* DE 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2563), /* DE 2100A mPCI 3A */
+        IPW2100_DEV_ID(0x2561), /* DE 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2565), /* DE 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2566), /* DE 2100 mPCI 3A */
+        IPW2100_DEV_ID(0x2567), /* DE 2100 mPCI 3A */
+
+        IPW2100_DEV_ID(0x2570), /* GA 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x2580), /* TO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2582), /* TO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2583), /* TO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2581), /* TO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2585), /* TO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2586), /* TO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2587), /* TO 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x2590), /* SO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2592), /* SO 2100A mPCI 3B */
+        IPW2100_DEV_ID(0x2591), /* SO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2593), /* SO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2596), /* SO 2100 mPCI 3B */
+        IPW2100_DEV_ID(0x2598), /* SO 2100 mPCI 3B */
+
+        IPW2100_DEV_ID(0x25A0), /* HP 2100 mPCI 3B */
+        {0,},
+};
+
+MODULE_DEVICE_TABLE(pci, ipw2100_pci_id_table);
+
+static struct pci_driver ipw2100_pci_driver = {
+        .name = DRV_NAME,
+        .id_table = ipw2100_pci_id_table,
+        .probe = ipw2100_pci_init_one,
+        .remove = __devexit_p(ipw2100_pci_remove_one),
+#ifdef CONFIG_PM
+        .suspend = ipw2100_suspend,
+        .resume = ipw2100_resume,
+#endif
+};
+
+
+/**
+ * Initialize the ipw2100 driver/module
+ *
+ * @returns 0 if ok, < 0 errno node con error.
+ *
+ * Note: we cannot init the /proc stuff until the PCI driver is there,
+ * or we risk an unlikely race condition on someone accessing
+ * uninitialized data in the PCI dev struct through /proc.
+ */
+static int __init ipw2100_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
+        printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
+
+#ifdef CONFIG_IEEE80211_NOWEP
+        IPW_DEBUG_INFO(DRV_NAME ": Compiled with WEP disabled.\n");
+#endif
+
+        ret = pci_module_init(&ipw2100_pci_driver);
+
+#ifdef CONFIG_IPW_DEBUG
+        ipw2100_debug_level = debug;
+        driver_create_file(&ipw2100_pci_driver.driver,
+                           &driver_attr_debug_level);
+#endif
+
+        return ret;
+}
+
+
+/**
+ * Cleanup ipw2100 driver registration
+ */
+static void __exit ipw2100_exit(void)
+{
+        /* FIXME: IPG: check that we have no instances of the devices open */
+#ifdef CONFIG_IPW_DEBUG
+        driver_remove_file(&ipw2100_pci_driver.driver,
+                           &driver_attr_debug_level);
+#endif
+        pci_unregister_driver(&ipw2100_pci_driver);
+}
+
+module_init(ipw2100_init);
+module_exit(ipw2100_exit);
+
+#define WEXT_USECHANNELS 1
+
+static const long ipw2100_frequencies[] = {
+        2412, 2417, 2422, 2427,
+        2432, 2437, 2442, 2447,
+        2452, 2457, 2462, 2467,
+        2472, 2484
+};
+
+#define FREQ_COUNT (sizeof(ipw2100_frequencies) / \
+                    sizeof(ipw2100_frequencies[0]))
+
+static const long ipw2100_rates_11b[] = {
+        1000000,
+        2000000,
+        5500000,
+        11000000
+};
+
+#define RATE_COUNT (sizeof(ipw2100_rates_11b) / sizeof(ipw2100_rates_11b[0]))
+
+static int ipw2100_wx_get_name(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        if (!(priv->status & STATUS_ASSOCIATED))
+                strcpy(wrqu->name, "unassociated");
+        else
+                snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11b");
+
+        IPW_DEBUG_WX("Name: %s\n", wrqu->name);
+        return 0;
+}
+
+
+static int ipw2100_wx_set_freq(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct iw_freq *fwrq = &wrqu->freq;
+        int err = 0;
+
+        if (priv->ieee->iw_mode == IW_MODE_INFRA)
+                return -EOPNOTSUPP;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        /* if setting by freq convert to channel */
+        if (fwrq->e == 1) {
+                if ((fwrq->m >= (int) 2.412e8 &&
+                     fwrq->m <= (int) 2.487e8)) {
+                        int f = fwrq->m / 100000;
+                        int c = 0;
+
+                        while ((c < REG_MAX_CHANNEL) &&
+                               (f != ipw2100_frequencies[c]))
+                                c++;
+
+                        /* hack to fall through */
+                        fwrq->e = 0;
+                        fwrq->m = c + 1;
+                }
+        }
+
+        if (fwrq->e > 0 || fwrq->m > 1000)
+                return -EOPNOTSUPP;
+        else { /* Set the channel */
+                IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
+                err = ipw2100_set_channel(priv, fwrq->m, 0);
+        }
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+
+static int ipw2100_wx_get_freq(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->freq.e = 0;
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured CHANNEL then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_CHANNEL ||
+            priv->status & STATUS_ASSOCIATED)
+                wrqu->freq.m = priv->channel;
+        else
+                wrqu->freq.m = 0;
+
+        IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel);
+        return 0;
+
+}
+
+static int ipw2100_wx_set_mode(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode);
+
+        if (wrqu->mode == priv->ieee->iw_mode)
+                return 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        switch (wrqu->mode) {
+#ifdef CONFIG_IPW2100_MONITOR
+        case IW_MODE_MONITOR:
+                err = ipw2100_switch_mode(priv, IW_MODE_MONITOR);
+                break;
+#endif /* CONFIG_IPW2100_MONITOR */
+        case IW_MODE_ADHOC:
+                err = ipw2100_switch_mode(priv, IW_MODE_ADHOC);
+                break;
+        case IW_MODE_INFRA:
+        case IW_MODE_AUTO:
+        default:
+                err = ipw2100_switch_mode(priv, IW_MODE_INFRA);
+                break;
+        }
+
+done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_mode(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->mode = priv->ieee->iw_mode;
+        IPW_DEBUG_WX("GET Mode -> %d\n", wrqu->mode);
+
+        return 0;
+}
+
+
+#define POWER_MODES 5
+
+/* Values are in microsecond */
+static const s32 timeout_duration[POWER_MODES] = {
+        350000,
+        250000,
+        75000,
+        37000,
+        25000,
+};
+
+static const s32 period_duration[POWER_MODES] = {
+        400000,
+        700000,
+        1000000,
+        1000000,
+        1000000
+};
+
+static int ipw2100_wx_get_range(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct iw_range *range = (struct iw_range *)extra;
+        u16 val;
+        int i, level;
+
+        wrqu->data.length = sizeof(*range);
+        memset(range, 0, sizeof(*range));
+
+        /* Let's try to keep this struct in the same order as in
+         * linux/include/wireless.h
+         */
+
+        /* TODO: See what values we can set, and remove the ones we can't
+         * set, or fill them with some default data.
+         */
+
+        /* ~5 Mb/s real (802.11b) */
+        range->throughput = 5 * 1000 * 1000;
+
+//      range->sensitivity;     /* signal level threshold range */
+
+        range->max_qual.qual = 100;
+        /* TODO: Find real max RSSI and stick here */
+        range->max_qual.level = 0;
+        range->max_qual.noise = 0;
+        range->max_qual.updated = 7; /* Updated all three */
+
+        range->avg_qual.qual = 70; /* > 8% missed beacons is 'bad' */
+        /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
+        range->avg_qual.level = 20 + IPW2100_RSSI_TO_DBM;
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = 7; /* Updated all three */
+
+        range->num_bitrates = RATE_COUNT;
+
+        for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) {
+                range->bitrate[i] = ipw2100_rates_11b[i];
+        }
+
+        range->min_rts = MIN_RTS_THRESHOLD;
+        range->max_rts = MAX_RTS_THRESHOLD;
+        range->min_frag = MIN_FRAG_THRESHOLD;
+        range->max_frag = MAX_FRAG_THRESHOLD;
+
+        range->min_pmp = period_duration[0];    /* Minimal PM period */
+        range->max_pmp = period_duration[POWER_MODES-1];/* Maximal PM period */
+        range->min_pmt = timeout_duration[POWER_MODES-1];       /* Minimal PM timeout */
+        range->max_pmt = timeout_duration[0];/* Maximal PM timeout */
+
+        /* How to decode max/min PM period */
+        range->pmp_flags = IW_POWER_PERIOD;
+        /* How to decode max/min PM period */
+        range->pmt_flags = IW_POWER_TIMEOUT;
+        /* What PM options are supported */
+        range->pm_capa = IW_POWER_TIMEOUT | IW_POWER_PERIOD;
+
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13;           /* Different token sizes */
+        range->num_encoding_sizes = 2;          /* Number of entry in the list */
+        range->max_encoding_tokens = WEP_KEYS;  /* Max number of tokens */
+//      range->encoding_login_index;            /* token index for login token */
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                range->txpower_capa = IW_TXPOW_DBM;
+                range->num_txpower = IW_MAX_TXPOWER;
+                for (i = 0, level = (IPW_TX_POWER_MAX_DBM * 16); i < IW_MAX_TXPOWER;
+                     i++, level -= ((IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM) * 16) /
+                             (IW_MAX_TXPOWER - 1))
+                        range->txpower[i] = level / 16;
+        } else {
+                range->txpower_capa = 0;
+                range->num_txpower = 0;
+        }
+
+
+        /* Set the Wireless Extension versions */
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 16;
+
+//      range->retry_capa;      /* What retry options are supported */
+//      range->retry_flags;     /* How to decode max/min retry limit */
+//      range->r_time_flags;    /* How to decode max/min retry life */
+//      range->min_retry;       /* Minimal number of retries */
+//      range->max_retry;       /* Maximal number of retries */
+//      range->min_r_time;      /* Minimal retry lifetime */
+//      range->max_r_time;      /* Maximal retry lifetime */
+
+        range->num_channels = FREQ_COUNT;
+
+        val = 0;
+        for (i = 0; i < FREQ_COUNT; i++) {
+                // TODO: Include only legal frequencies for some countries
+//              if (local->channel_mask & (1 << i)) {
+                        range->freq[val].i = i + 1;
+                        range->freq[val].m = ipw2100_frequencies[i] * 100000;
+                        range->freq[val].e = 1;
+                        val++;
+//              }
+                if (val == IW_MAX_FREQUENCIES)
+                break;
+        }
+        range->num_frequency = val;
+
+        IPW_DEBUG_WX("GET Range\n");
+
+        return 0;
+}
+
+static int ipw2100_wx_set_wap(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        static const unsigned char any[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
+        static const unsigned char off[] = {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+
+        // sanity checks
+        if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
+                return -EINVAL;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (!memcmp(any, wrqu->ap_addr.sa_data, ETH_ALEN) ||
+            !memcmp(off, wrqu->ap_addr.sa_data, ETH_ALEN)) {
+                /* we disable mandatory BSSID association */
+                IPW_DEBUG_WX("exit - disable mandatory BSSID\n");
+                priv->config &= ~CFG_STATIC_BSSID;
+                err = ipw2100_set_mandatory_bssid(priv, NULL, 0);
+                goto done;
+        }
+
+        priv->config |= CFG_STATIC_BSSID;
+        memcpy(priv->mandatory_bssid_mac, wrqu->ap_addr.sa_data, ETH_ALEN);
+
+        err = ipw2100_set_mandatory_bssid(priv, wrqu->ap_addr.sa_data, 0);
+
+        IPW_DEBUG_WX("SET BSSID -> %02X:%02X:%02X:%02X:%02X:%02X\n",
+                     wrqu->ap_addr.sa_data[0] & 0xff,
+                     wrqu->ap_addr.sa_data[1] & 0xff,
+                     wrqu->ap_addr.sa_data[2] & 0xff,
+                     wrqu->ap_addr.sa_data[3] & 0xff,
+                     wrqu->ap_addr.sa_data[4] & 0xff,
+                     wrqu->ap_addr.sa_data[5] & 0xff);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_wap(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured BSSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_BSSID ||
+            priv->status & STATUS_ASSOCIATED) {
+                wrqu->ap_addr.sa_family = ARPHRD_ETHER;
+                memcpy(wrqu->ap_addr.sa_data, &priv->bssid, ETH_ALEN);
+        } else
+                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+
+        IPW_DEBUG_WX("Getting WAP BSSID: " MAC_FMT "\n",
+                     MAC_ARG(wrqu->ap_addr.sa_data));
+        return 0;
+}
+
+static int ipw2100_wx_set_essid(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        char *essid = ""; /* ANY */
+        int length = 0;
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->essid.flags && wrqu->essid.length) {
+                length = wrqu->essid.length - 1;
+                essid = extra;
+        }
+
+        if (length == 0) {
+                IPW_DEBUG_WX("Setting ESSID to ANY\n");
+                priv->config &= ~CFG_STATIC_ESSID;
+                err = ipw2100_set_essid(priv, NULL, 0, 0);
+                goto done;
+        }
+
+        length = min(length, IW_ESSID_MAX_SIZE);
+
+        priv->config |= CFG_STATIC_ESSID;
+
+        if (priv->essid_len == length && !memcmp(priv->essid, extra, length)) {
+                IPW_DEBUG_WX("ESSID set to current ESSID.\n");
+                err = 0;
+                goto done;
+        }
+
+        IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(essid, length),
+                     length);
+
+        priv->essid_len = length;
+        memcpy(priv->essid, essid, priv->essid_len);
+
+        err = ipw2100_set_essid(priv, essid, length, 0);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_essid(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured ESSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_ESSID ||
+            priv->status & STATUS_ASSOCIATED) {
+                IPW_DEBUG_WX("Getting essid: '%s'\n",
+                             escape_essid(priv->essid, priv->essid_len));
+                memcpy(extra, priv->essid, priv->essid_len);
+                wrqu->essid.length = priv->essid_len;
+                wrqu->essid.flags = 1; /* active */
+        } else {
+                IPW_DEBUG_WX("Getting essid: ANY\n");
+                wrqu->essid.length = 0;
+                wrqu->essid.flags = 0; /* active */
+        }
+
+        return 0;
+}
+
+static int ipw2100_wx_set_nick(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (wrqu->data.length > IW_ESSID_MAX_SIZE)
+                return -E2BIG;
+
+        wrqu->data.length = min((size_t)wrqu->data.length, sizeof(priv->nick));
+        memset(priv->nick, 0, sizeof(priv->nick));
+        memcpy(priv->nick, extra,  wrqu->data.length);
+
+        IPW_DEBUG_WX("SET Nickname -> %s \n", priv->nick);
+
+        return 0;
+}
+
+static int ipw2100_wx_get_nick(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->data.length = strlen(priv->nick) + 1;
+        memcpy(extra, priv->nick, wrqu->data.length);
+        wrqu->data.flags = 1; /* active */
+
+        IPW_DEBUG_WX("GET Nickname -> %s \n", extra);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_rate(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        u32 target_rate = wrqu->bitrate.value;
+        u32 rate;
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        rate = 0;
+
+        if (target_rate == 1000000 ||
+            (!wrqu->bitrate.fixed && target_rate > 1000000))
+                rate |= TX_RATE_1_MBIT;
+        if (target_rate == 2000000 ||
+            (!wrqu->bitrate.fixed && target_rate > 2000000))
+                rate |= TX_RATE_2_MBIT;
+        if (target_rate == 5500000 ||
+            (!wrqu->bitrate.fixed && target_rate > 5500000))
+                rate |= TX_RATE_5_5_MBIT;
+        if (target_rate == 11000000 ||
+            (!wrqu->bitrate.fixed && target_rate > 11000000))
+                rate |= TX_RATE_11_MBIT;
+        if (rate == 0)
+                rate = DEFAULT_TX_RATES;
+
+        err = ipw2100_set_tx_rates(priv, rate, 0);
+
+        IPW_DEBUG_WX("SET Rate -> %04X \n", rate);
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+
+static int ipw2100_wx_get_rate(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int val;
+        int len = sizeof(val);
+        int err = 0;
+
+        if (!(priv->status & STATUS_ENABLED) ||
+            priv->status & STATUS_RF_KILL_MASK ||
+            !(priv->status & STATUS_ASSOCIATED)) {
+                wrqu->bitrate.value = 0;
+                return 0;
+        }
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        err = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE, &val, &len);
+        if (err) {
+                IPW_DEBUG_WX("failed querying ordinals.\n");
+                return err;
+        }
+
+        switch (val & TX_RATE_MASK) {
+        case TX_RATE_1_MBIT:
+                wrqu->bitrate.value = 1000000;
+                break;
+        case TX_RATE_2_MBIT:
+                wrqu->bitrate.value = 2000000;
+                break;
+        case TX_RATE_5_5_MBIT:
+                wrqu->bitrate.value = 5500000;
+                break;
+        case TX_RATE_11_MBIT:
+                wrqu->bitrate.value = 11000000;
+                break;
+        default:
+                wrqu->bitrate.value = 0;
+        }
+
+        IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_set_rts(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int value, err;
+
+        /* Auto RTS not yet supported */
+        if (wrqu->rts.fixed == 0)
+                return -EINVAL;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->rts.disabled)
+                value = priv->rts_threshold | RTS_DISABLED;
+        else {
+                if (wrqu->rts.value < 1 ||
+                    wrqu->rts.value > 2304) {
+                        err = -EINVAL;
+                        goto done;
+                }
+                value = wrqu->rts.value;
+        }
+
+        err = ipw2100_set_rts_threshold(priv, value);
+
+        IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X \n", value);
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_rts(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->rts.value = priv->rts_threshold & ~RTS_DISABLED;
+        wrqu->rts.fixed = 1; /* no auto select */
+
+        /* If RTS is set to the default value, then it is disabled */
+        wrqu->rts.disabled = (priv->rts_threshold & RTS_DISABLED) ? 1 : 0;
+
+        IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X \n", wrqu->rts.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_txpow(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0, value;
+
+        if (priv->ieee->iw_mode != IW_MODE_ADHOC)
+                return -EINVAL;
+
+        if (wrqu->txpower.disabled == 1 || wrqu->txpower.fixed == 0)
+                value = IPW_TX_POWER_DEFAULT;
+        else {
+                if (wrqu->txpower.value < IPW_TX_POWER_MIN_DBM ||
+                    wrqu->txpower.value > IPW_TX_POWER_MAX_DBM)
+                        return -EINVAL;
+
+                value = (wrqu->txpower.value - IPW_TX_POWER_MIN_DBM) * 16 /
+                        (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
+        }
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        err = ipw2100_set_tx_power(priv, value);
+
+        IPW_DEBUG_WX("SET TX Power -> %d \n", value);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_txpow(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (priv->ieee->iw_mode != IW_MODE_ADHOC) {
+                wrqu->power.disabled = 1;
+                return 0;
+        }
+
+        if (priv->tx_power == IPW_TX_POWER_DEFAULT) {
+                wrqu->power.fixed = 0;
+                wrqu->power.value = IPW_TX_POWER_MAX_DBM;
+                wrqu->power.disabled = 1;
+        } else {
+                wrqu->power.disabled = 0;
+                wrqu->power.fixed = 1;
+                wrqu->power.value =
+                        (priv->tx_power *
+                         (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM)) /
+                        (IPW_TX_POWER_MAX - IPW_TX_POWER_MIN) +
+                        IPW_TX_POWER_MIN_DBM;
+        }
+
+        wrqu->power.flags = IW_TXPOW_DBM;
+
+        IPW_DEBUG_WX("GET TX Power -> %d \n", wrqu->power.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_frag(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (!wrqu->frag.fixed)
+                return -EINVAL;
+
+        if (wrqu->frag.disabled) {
+                priv->frag_threshold |= FRAG_DISABLED;
+                priv->ieee->fts = DEFAULT_FTS;
+        } else {
+                if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||
+                    wrqu->frag.value > MAX_FRAG_THRESHOLD)
+                        return -EINVAL;
+
+                priv->ieee->fts = wrqu->frag.value & ~0x1;
+                priv->frag_threshold = priv->ieee->fts;
+        }
+
+        IPW_DEBUG_WX("SET Frag Threshold -> %d \n", priv->ieee->fts);
+
+        return 0;
+}
+
+static int ipw2100_wx_get_frag(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        wrqu->frag.value = priv->frag_threshold & ~FRAG_DISABLED;
+        wrqu->frag.fixed = 0;   /* no auto select */
+        wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;
+
+        IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_retry(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        if (wrqu->retry.flags & IW_RETRY_LIFETIME ||
+            wrqu->retry.disabled)
+                return -EINVAL;
+
+        if (!(wrqu->retry.flags & IW_RETRY_LIMIT))
+                return 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->retry.flags & IW_RETRY_MIN) {
+                err = ipw2100_set_short_retry(priv, wrqu->retry.value);
+                IPW_DEBUG_WX("SET Short Retry Limit -> %d \n",
+                       wrqu->retry.value);
+                goto done;
+        }
+
+        if (wrqu->retry.flags & IW_RETRY_MAX) {
+                err = ipw2100_set_long_retry(priv, wrqu->retry.value);
+                IPW_DEBUG_WX("SET Long Retry Limit -> %d \n",
+                       wrqu->retry.value);
+                goto done;
+        }
+
+        err = ipw2100_set_short_retry(priv, wrqu->retry.value);
+        if (!err)
+                err = ipw2100_set_long_retry(priv, wrqu->retry.value);
+
+        IPW_DEBUG_WX("SET Both Retry Limits -> %d \n", wrqu->retry.value);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_retry(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        wrqu->retry.disabled = 0; /* can't be disabled */
+
+        if ((wrqu->retry.flags & IW_RETRY_TYPE) ==
+            IW_RETRY_LIFETIME)
+                return -EINVAL;
+
+        if (wrqu->retry.flags & IW_RETRY_MAX) {
+                wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MAX;
+                wrqu->retry.value = priv->long_retry_limit;
+        } else {
+                wrqu->retry.flags =
+                    (priv->short_retry_limit !=
+                     priv->long_retry_limit) ?
+                    IW_RETRY_LIMIT & IW_RETRY_MIN : IW_RETRY_LIMIT;
+
+                wrqu->retry.value = priv->short_retry_limit;
+        }
+
+        IPW_DEBUG_WX("GET Retry -> %d \n", wrqu->retry.value);
+
+        return 0;
+}
+
+static int ipw2100_wx_set_scan(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        IPW_DEBUG_WX("Initiating scan...\n");
+        if (ipw2100_set_scan_options(priv) ||
+            ipw2100_start_scan(priv)) {
+                IPW_DEBUG_WX("Start scan failed.\n");
+
+                /* TODO: Mark a scan as pending so when hardware initialized
+                 *       a scan starts */
+        }
+
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_scan(struct net_device *dev,
+                               struct iw_request_info *info,
+                               union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra);
+}
+
+
+/*
+ * Implementation based on code in hostap-driver v0.1.3 hostap_ioctl.c
+ */
+static int ipw2100_wx_set_encode(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 union iwreq_data *wrqu, char *key)
+{
+        /*
+         * No check of STATUS_INITIALIZED required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw2100_wx_get_encode(struct net_device *dev,
+                                 struct iw_request_info *info,
+                                 union iwreq_data *wrqu, char *key)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw2100_wx_set_power(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (wrqu->power.disabled) {
+                priv->power_mode = IPW_POWER_LEVEL(priv->power_mode);
+                err = ipw2100_set_power_mode(priv, IPW_POWER_MODE_CAM);
+                IPW_DEBUG_WX("SET Power Management Mode -> off\n");
+                goto done;
+        }
+
+        switch (wrqu->power.flags & IW_POWER_MODE) {
+        case IW_POWER_ON:    /* If not specified */
+        case IW_POWER_MODE:  /* If set all mask */
+        case IW_POWER_ALL_R: /* If explicitely state all */
+                break;
+        default: /* Otherwise we don't support it */
+                IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
+                             wrqu->power.flags);
+                err = -EOPNOTSUPP;
+                goto done;
+        }
+
+        /* If the user hasn't specified a power management mode yet, default
+         * to BATTERY */
+        priv->power_mode = IPW_POWER_ENABLED | priv->power_mode;
+        err = ipw2100_set_power_mode(priv, IPW_POWER_LEVEL(priv->power_mode));
+
+        IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n",
+                     priv->power_mode);
+
+ done:
+        up(&priv->action_sem);
+        return err;
+
+}
+
+static int ipw2100_wx_get_power(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED)) {
+                wrqu->power.disabled = 1;
+        } else {
+                wrqu->power.disabled = 0;
+                wrqu->power.flags = 0;
+        }
+
+        IPW_DEBUG_WX("GET Power Management Mode -> %02X\n", priv->power_mode);
+
+        return 0;
+}
+
+
+/*
+ *
+ * IWPRIV handlers
+ *
+ */
+#ifdef CONFIG_IPW2100_MONITOR
+static int ipw2100_wx_set_promisc(struct net_device *dev,
+                                  struct iw_request_info *info,
+                                  union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int *parms = (int *)extra;
+        int enable = (parms[0] > 0);
+        int err = 0;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (enable) {
+                if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                        err = ipw2100_set_channel(priv, parms[1], 0);
+                        goto done;
+                }
+                priv->channel = parms[1];
+                err = ipw2100_switch_mode(priv, IW_MODE_MONITOR);
+        } else {
+                if (priv->ieee->iw_mode == IW_MODE_MONITOR)
+                        err = ipw2100_switch_mode(priv, priv->last_mode);
+        }
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_reset(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        if (priv->status & STATUS_INITIALIZED)
+                schedule_reset(priv);
+        return 0;
+}
+
+#endif
+
+static int ipw2100_wx_set_powermode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err = 0, mode = *(int *)extra;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if ((mode < 1) || (mode > POWER_MODES))
+                mode = IPW_POWER_AUTO;
+
+        if (priv->power_mode != mode)
+                err = ipw2100_set_power_mode(priv, mode);
+ done:
+        up(&priv->action_sem);
+        return err;
+}
+
+#define MAX_POWER_STRING 80
+static int ipw2100_wx_get_powermode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int level = IPW_POWER_LEVEL(priv->power_mode);
+        s32 timeout, period;
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED)) {
+                snprintf(extra, MAX_POWER_STRING,
+                         "Power save level: %d (Off)", level);
+        } else {
+                switch (level) {
+                case IPW_POWER_MODE_CAM:
+                        snprintf(extra, MAX_POWER_STRING,
+                                 "Power save level: %d (None)", level);
+                        break;
+                case IPW_POWER_AUTO:
+                snprintf(extra, MAX_POWER_STRING,
+                         "Power save level: %d (Auto)", 0);
+                        break;
+                default:
+                        timeout = timeout_duration[level - 1] / 1000;
+                        period = period_duration[level - 1] / 1000;
+                        snprintf(extra, MAX_POWER_STRING,
+                                 "Power save level: %d "
+                                 "(Timeout %dms, Period %dms)",
+                                 level, timeout, period);
+                }
+        }
+
+        wrqu->data.length = strlen(extra) + 1;
+
+        return 0;
+}
+
+
+static int ipw2100_wx_set_preamble(struct net_device *dev,
+                                   struct iw_request_info *info,
+                                   union iwreq_data *wrqu, char *extra)
+{
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        int err, mode = *(int *)extra;
+
+        down(&priv->action_sem);
+        if (!(priv->status & STATUS_INITIALIZED)) {
+                err = -EIO;
+                goto done;
+        }
+
+        if (mode == 1)
+                priv->config |= CFG_LONG_PREAMBLE;
+        else if (mode == 0)
+                priv->config &= ~CFG_LONG_PREAMBLE;
+        else {
+                err = -EINVAL;
+                goto done;
+        }
+
+        err = ipw2100_system_config(priv, 0);
+
+done:
+        up(&priv->action_sem);
+        return err;
+}
+
+static int ipw2100_wx_get_preamble(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        /*
+         * This can be called at any time.  No action lock required
+         */
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+
+        if (priv->config & CFG_LONG_PREAMBLE)
+                snprintf(wrqu->name, IFNAMSIZ, "long (1)");
+        else
+                snprintf(wrqu->name, IFNAMSIZ, "auto (0)");
+
+        return 0;
+}
+
+static iw_handler ipw2100_wx_handlers[] =
+{
+        NULL,                     /* SIOCSIWCOMMIT */
+        ipw2100_wx_get_name,      /* SIOCGIWNAME */
+        NULL,                     /* SIOCSIWNWID */
+        NULL,                     /* SIOCGIWNWID */
+        ipw2100_wx_set_freq,      /* SIOCSIWFREQ */
+        ipw2100_wx_get_freq,      /* SIOCGIWFREQ */
+        ipw2100_wx_set_mode,      /* SIOCSIWMODE */
+        ipw2100_wx_get_mode,      /* SIOCGIWMODE */
+        NULL,                     /* SIOCSIWSENS */
+        NULL,                     /* SIOCGIWSENS */
+        NULL,                     /* SIOCSIWRANGE */
+        ipw2100_wx_get_range,     /* SIOCGIWRANGE */
+        NULL,                     /* SIOCSIWPRIV */
+        NULL,                     /* SIOCGIWPRIV */
+        NULL,                     /* SIOCSIWSTATS */
+        NULL,                     /* SIOCGIWSTATS */
+        NULL,                     /* SIOCSIWSPY */
+        NULL,                     /* SIOCGIWSPY */
+        NULL,                     /* SIOCGIWTHRSPY */
+        NULL,                     /* SIOCWIWTHRSPY */
+        ipw2100_wx_set_wap,       /* SIOCSIWAP */
+        ipw2100_wx_get_wap,       /* SIOCGIWAP */
+        NULL,                     /* -- hole -- */
+        NULL,                     /* SIOCGIWAPLIST -- deprecated */
+        ipw2100_wx_set_scan,      /* SIOCSIWSCAN */
+        ipw2100_wx_get_scan,      /* SIOCGIWSCAN */
+        ipw2100_wx_set_essid,     /* SIOCSIWESSID */
+        ipw2100_wx_get_essid,     /* SIOCGIWESSID */
+        ipw2100_wx_set_nick,      /* SIOCSIWNICKN */
+        ipw2100_wx_get_nick,      /* SIOCGIWNICKN */
+        NULL,                     /* -- hole -- */
+        NULL,                     /* -- hole -- */
+        ipw2100_wx_set_rate,      /* SIOCSIWRATE */
+        ipw2100_wx_get_rate,      /* SIOCGIWRATE */
+        ipw2100_wx_set_rts,       /* SIOCSIWRTS */
+        ipw2100_wx_get_rts,       /* SIOCGIWRTS */
+        ipw2100_wx_set_frag,      /* SIOCSIWFRAG */
+        ipw2100_wx_get_frag,      /* SIOCGIWFRAG */
+        ipw2100_wx_set_txpow,     /* SIOCSIWTXPOW */
+        ipw2100_wx_get_txpow,     /* SIOCGIWTXPOW */
+        ipw2100_wx_set_retry,     /* SIOCSIWRETRY */
+        ipw2100_wx_get_retry,     /* SIOCGIWRETRY */
+        ipw2100_wx_set_encode,    /* SIOCSIWENCODE */
+        ipw2100_wx_get_encode,    /* SIOCGIWENCODE */
+        ipw2100_wx_set_power,     /* SIOCSIWPOWER */
+        ipw2100_wx_get_power,     /* SIOCGIWPOWER */
+};
+
+#define IPW2100_PRIV_SET_MONITOR        SIOCIWFIRSTPRIV
+#define IPW2100_PRIV_RESET              SIOCIWFIRSTPRIV+1
+#define IPW2100_PRIV_SET_POWER          SIOCIWFIRSTPRIV+2
+#define IPW2100_PRIV_GET_POWER          SIOCIWFIRSTPRIV+3
+#define IPW2100_PRIV_SET_LONGPREAMBLE   SIOCIWFIRSTPRIV+4
+#define IPW2100_PRIV_GET_LONGPREAMBLE   SIOCIWFIRSTPRIV+5
+
+static const struct iw_priv_args ipw2100_private_args[] = {
+
+#ifdef CONFIG_IPW2100_MONITOR
+        {
+                IPW2100_PRIV_SET_MONITOR,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor"
+        },
+        {
+                IPW2100_PRIV_RESET,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset"
+        },
+#endif /* CONFIG_IPW2100_MONITOR */
+
+        {
+                IPW2100_PRIV_SET_POWER,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_power"
+        },
+        {
+                IPW2100_PRIV_GET_POWER,
+                0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_POWER_STRING, "get_power"
+        },
+        {
+                IPW2100_PRIV_SET_LONGPREAMBLE,
+                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"
+        },
+        {
+                IPW2100_PRIV_GET_LONGPREAMBLE,
+                0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | IFNAMSIZ, "get_preamble"
+        },
+};
+
+static iw_handler ipw2100_private_handler[] = {
+#ifdef CONFIG_IPW2100_MONITOR
+        ipw2100_wx_set_promisc,
+        ipw2100_wx_reset,
+#else /* CONFIG_IPW2100_MONITOR */
+        NULL,
+        NULL,
+#endif /* CONFIG_IPW2100_MONITOR */
+        ipw2100_wx_set_powermode,
+        ipw2100_wx_get_powermode,
+        ipw2100_wx_set_preamble,
+        ipw2100_wx_get_preamble,
+};
+
+static struct iw_handler_def ipw2100_wx_handler_def =
+{
+        .standard = ipw2100_wx_handlers,
+        .num_standard = sizeof(ipw2100_wx_handlers) / sizeof(iw_handler),
+        .num_private = sizeof(ipw2100_private_handler) / sizeof(iw_handler),
+        .num_private_args = sizeof(ipw2100_private_args) /
+        sizeof(struct iw_priv_args),
+        .private = (iw_handler *)ipw2100_private_handler,
+        .private_args = (struct iw_priv_args *)ipw2100_private_args,
+};
+
+/*
+ * Get wireless statistics.
+ * Called by /proc/net/wireless
+ * Also called by SIOCGIWSTATS
+ */
+static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device * dev)
+{
+        enum {
+                POOR = 30,
+                FAIR = 60,
+                GOOD = 80,
+                VERY_GOOD = 90,
+                EXCELLENT = 95,
+                PERFECT = 100
+        };
+        int rssi_qual;
+        int tx_qual;
+        int beacon_qual;
+
+        struct ipw2100_priv *priv = ieee80211_priv(dev);
+        struct iw_statistics *wstats;
+        u32 rssi, quality, tx_retries, missed_beacons, tx_failures;
+        u32 ord_len = sizeof(u32);
+
+        if (!priv)
+                return (struct iw_statistics *) NULL;
+
+        wstats = &priv->wstats;
+
+        /* if hw is disabled, then ipw2100_get_ordinal() can't be called.
+         * ipw2100_wx_wireless_stats seems to be called before fw is
+         * initialized.  STATUS_ASSOCIATED will only be set if the hw is up
+         * and associated; if not associcated, the values are all meaningless
+         * anyway, so set them all to NULL and INVALID */
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                wstats->miss.beacon = 0;
+                wstats->discard.retries = 0;
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+                wstats->qual.noise = 0;
+                wstats->qual.updated = 7;
+                wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
+                        IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+                return wstats;
+        }
+
+        if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_PERCENT_MISSED_BCNS,
+                                &missed_beacons, &ord_len))
+                goto fail_get_ordinal;
+
+        /* If we don't have a connection the quality and level is 0*/
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+        } else {
+                if (ipw2100_get_ordinal(priv, IPW_ORD_RSSI_AVG_CURR,
+                                        &rssi, &ord_len))
+                        goto fail_get_ordinal;
+                wstats->qual.level = rssi + IPW2100_RSSI_TO_DBM;
+                if (rssi < 10)
+                        rssi_qual = rssi * POOR / 10;
+                else if (rssi < 15)
+                        rssi_qual = (rssi - 10) * (FAIR - POOR) / 5 + POOR;
+                else if (rssi < 20)
+                        rssi_qual = (rssi - 15) * (GOOD - FAIR) / 5 + FAIR;
+                else if (rssi < 30)
+                        rssi_qual = (rssi - 20) * (VERY_GOOD - GOOD) /
+                                10 + GOOD;
+                else
+                        rssi_qual = (rssi - 30) * (PERFECT - VERY_GOOD) /
+                                10 + VERY_GOOD;
+
+                if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_PERCENT_RETRIES,
+                                        &tx_retries, &ord_len))
+                        goto fail_get_ordinal;
+
+                if (tx_retries > 75)
+                        tx_qual = (90 - tx_retries) * POOR / 15;
+                else if (tx_retries > 70)
+                        tx_qual = (75 - tx_retries) * (FAIR - POOR) / 5 + POOR;
+                else if (tx_retries > 65)
+                        tx_qual = (70 - tx_retries) * (GOOD - FAIR) / 5 + FAIR;
+                else if (tx_retries > 50)
+                        tx_qual = (65 - tx_retries) * (VERY_GOOD - GOOD) /
+                                15 + GOOD;
+                else
+                        tx_qual = (50 - tx_retries) *
+                                (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
+
+                if (missed_beacons > 50)
+                        beacon_qual = (60 - missed_beacons) * POOR / 10;
+                else if (missed_beacons > 40)
+                        beacon_qual = (50 - missed_beacons) * (FAIR - POOR) /
+                                10 + POOR;
+                else if (missed_beacons > 32)
+                        beacon_qual = (40 - missed_beacons) * (GOOD - FAIR) /
+                                18 + FAIR;
+                else if (missed_beacons > 20)
+                        beacon_qual = (32 - missed_beacons) *
+                                (VERY_GOOD - GOOD) / 20 + GOOD;
+                else
+                        beacon_qual = (20 - missed_beacons) *
+                                (PERFECT - VERY_GOOD) / 20 + VERY_GOOD;
+
+                quality = min(beacon_qual, min(tx_qual, rssi_qual));
+
+#ifdef CONFIG_IPW_DEBUG
+                if (beacon_qual == quality)
+                        IPW_DEBUG_WX("Quality clamped by Missed Beacons\n");
+                else if (tx_qual == quality)
+                        IPW_DEBUG_WX("Quality clamped by Tx Retries\n");
+                else if (quality != 100)
+                        IPW_DEBUG_WX("Quality clamped by Signal Strength\n");
+                else
+                        IPW_DEBUG_WX("Quality not clamped.\n");
+#endif
+
+                wstats->qual.qual = quality;
+                wstats->qual.level = rssi + IPW2100_RSSI_TO_DBM;
+        }
+
+        wstats->qual.noise = 0;
+        wstats->qual.updated = 7;
+        wstats->qual.updated |= IW_QUAL_NOISE_INVALID;
+
+        /* FIXME: this is percent and not a # */
+        wstats->miss.beacon = missed_beacons;
+
+        if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_TX_FAILURES,
+                                &tx_failures, &ord_len))
+                goto fail_get_ordinal;
+        wstats->discard.retries = tx_failures;
+
+        return wstats;
+
+ fail_get_ordinal:
+        IPW_DEBUG_WX("failed querying ordinals.\n");
+
+        return (struct iw_statistics *) NULL;
+}
+
+static void ipw2100_wx_event_work(struct ipw2100_priv *priv)
+{
+        union iwreq_data wrqu;
+        int len = ETH_ALEN;
+
+        if (priv->status & STATUS_STOPPING)
+                return;
+
+        down(&priv->action_sem);
+
+        IPW_DEBUG_WX("enter\n");
+
+        up(&priv->action_sem);
+
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+
+        /* Fetch BSSID from the hardware */
+        if (!(priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED)) ||
+            priv->status & STATUS_RF_KILL_MASK ||
+            ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID,
+                                &priv->bssid,  &len)) {
+                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        } else {
+                /* We now have the BSSID, so can finish setting to the full
+                 * associated state */
+                memcpy(wrqu.ap_addr.sa_data, priv->bssid, ETH_ALEN);
+                memcpy(&priv->ieee->bssid, priv->bssid, ETH_ALEN);
+                priv->status &= ~STATUS_ASSOCIATING;
+                priv->status |= STATUS_ASSOCIATED;
+                netif_carrier_on(priv->net_dev);
+                if (netif_queue_stopped(priv->net_dev)) {
+                        IPW_DEBUG_INFO("Waking net queue.\n");
+                        netif_wake_queue(priv->net_dev);
+                } else {
+                        IPW_DEBUG_INFO("Starting net queue.\n");
+                        netif_start_queue(priv->net_dev);
+                }
+        }
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                IPW_DEBUG_WX("Configuring ESSID\n");
+                down(&priv->action_sem);
+                /* This is a disassociation event, so kick the firmware to
+                 * look for another AP */
+                if (priv->config & CFG_STATIC_ESSID)
+                        ipw2100_set_essid(priv, priv->essid, priv->essid_len, 0);
+                else
+                        ipw2100_set_essid(priv, NULL, 0, 0);
+                up(&priv->action_sem);
+        }
+
+        wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+}
+
+#define IPW2100_FW_MAJOR_VERSION 1
+#define IPW2100_FW_MINOR_VERSION 3
+
+#define IPW2100_FW_MINOR(x) ((x & 0xff) >> 8)
+#define IPW2100_FW_MAJOR(x) (x & 0xff)
+
+#define IPW2100_FW_VERSION ((IPW2100_FW_MINOR_VERSION << 8) | \
+                             IPW2100_FW_MAJOR_VERSION)
+
+#define IPW2100_FW_PREFIX "ipw2100-" __stringify(IPW2100_FW_MAJOR_VERSION) \
+"." __stringify(IPW2100_FW_MINOR_VERSION)
+
+#define IPW2100_FW_NAME(x) IPW2100_FW_PREFIX "" x ".fw"
+
+
+/*
+
+BINARY FIRMWARE HEADER FORMAT
+
+offset      length   desc
+0           2        version
+2           2        mode == 0:BSS,1:IBSS,2:MONITOR
+4           4        fw_len
+8           4        uc_len
+C           fw_len   firmware data
+12 + fw_len uc_len   microcode data
+
+*/
+
+struct ipw2100_fw_header {
+        short version;
+        short mode;
+        unsigned int fw_size;
+        unsigned int uc_size;
+} __attribute__ ((packed));
+
+
+
+static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
+{
+        struct ipw2100_fw_header *h =
+                (struct ipw2100_fw_header *)fw->fw_entry->data;
+
+        if (IPW2100_FW_MAJOR(h->version) != IPW2100_FW_MAJOR_VERSION) {
+                printk(KERN_WARNING DRV_NAME ": Firmware image not compatible "
+                       "(detected version id of %u). "
+                       "See Documentation/networking/README.ipw2100\n",
+                       h->version);
+                return 1;
+        }
+
+        fw->version = h->version;
+        fw->fw.data = fw->fw_entry->data + sizeof(struct ipw2100_fw_header);
+        fw->fw.size = h->fw_size;
+        fw->uc.data = fw->fw.data + h->fw_size;
+        fw->uc.size = h->uc_size;
+
+        return 0;
+}
+
+
+static int ipw2100_get_firmware(struct ipw2100_priv *priv,
+                                struct ipw2100_fw *fw)
+{
+        char *fw_name;
+        int rc;
+
+        IPW_DEBUG_INFO("%s: Using hotplug firmware load.\n",
+               priv->net_dev->name);
+
+        switch (priv->ieee->iw_mode) {
+        case IW_MODE_ADHOC:
+                fw_name = IPW2100_FW_NAME("-i");
+                break;
+#ifdef CONFIG_IPW2100_MONITOR
+        case IW_MODE_MONITOR:
+                fw_name = IPW2100_FW_NAME("-p");
+                break;
+#endif
+        case IW_MODE_INFRA:
+        default:
+                fw_name = IPW2100_FW_NAME("");
+                break;
+        }
+
+        rc = request_firmware(&fw->fw_entry, fw_name, &priv->pci_dev->dev);
+
+        if (rc < 0) {
+                printk(KERN_ERR DRV_NAME ": "
+                       "%s: Firmware '%s' not available or load failed.\n",
+                       priv->net_dev->name, fw_name);
+                return rc;
+        }
+        IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data,
+                           fw->fw_entry->size);
+
+        ipw2100_mod_firmware_load(fw);
+
+        return 0;
+}
+
+static void ipw2100_release_firmware(struct ipw2100_priv *priv,
+                                     struct ipw2100_fw *fw)
+{
+        fw->version = 0;
+        if (fw->fw_entry)
+                release_firmware(fw->fw_entry);
+        fw->fw_entry = NULL;
+}
+
+
+static int ipw2100_get_fwversion(struct ipw2100_priv *priv, char *buf,
+                                 size_t max)
+{
+        char ver[MAX_FW_VERSION_LEN];
+        u32 len = MAX_FW_VERSION_LEN;
+        u32 tmp;
+        int i;
+        /* firmware version is an ascii string (max len of 14) */
+        if (ipw2100_get_ordinal(priv, IPW_ORD_STAT_FW_VER_NUM,
+                                ver, &len))
+                return -EIO;
+        tmp = max;
+        if (len >= max)
+                len = max - 1;
+        for (i = 0; i < len; i++)
+                buf[i] = ver[i];
+        buf[i] = '\0';
+        return tmp;
+}
+
+static int ipw2100_get_ucodeversion(struct ipw2100_priv *priv, char *buf,
+                                    size_t max)
+{
+        u32 ver;
+        u32 len = sizeof(ver);
+        /* microcode version is a 32 bit integer */
+        if (ipw2100_get_ordinal(priv, IPW_ORD_UCODE_VERSION,
+                                &ver, &len))
+                return -EIO;
+        return snprintf(buf, max, "%08X", ver);
+}
+
+/*
+ * On exit, the firmware will have been freed from the fw list
+ */
+static int ipw2100_fw_download(struct ipw2100_priv *priv,
+                               struct ipw2100_fw *fw)
+{
+        /* firmware is constructed of N contiguous entries, each entry is
+         * structured as:
+         *
+         * offset    sie         desc
+         * 0         4           address to write to
+         * 4         2           length of data run
+         * 6         length      data
+         */
+        unsigned int addr;
+        unsigned short len;
+
+        const unsigned char *firmware_data = fw->fw.data;
+        unsigned int firmware_data_left = fw->fw.size;
+
+        while (firmware_data_left > 0) {
+                addr = *(u32 *)(firmware_data);
+                firmware_data      += 4;
+                firmware_data_left -= 4;
+
+                len = *(u16 *)(firmware_data);
+                firmware_data      += 2;
+                firmware_data_left -= 2;
+
+                if (len > 32) {
+                        printk(KERN_ERR DRV_NAME ": "
+                               "Invalid firmware run-length of %d bytes\n",
+                               len);
+                        return -EINVAL;
+                }
+
+                write_nic_memory(priv->net_dev, addr, len, firmware_data);
+                firmware_data      += len;
+                firmware_data_left -= len;
+        }
+
+        return 0;
+}
+
+struct symbol_alive_response {
+        u8 cmd_id;
+        u8 seq_num;
+        u8 ucode_rev;
+        u8 eeprom_valid;
+        u16 valid_flags;
+        u8 IEEE_addr[6];
+        u16 flags;
+        u16 pcb_rev;
+        u16 clock_settle_time;  // 1us LSB
+        u16 powerup_settle_time;        // 1us LSB
+        u16 hop_settle_time;    // 1us LSB
+        u8 date[3];             // month, day, year
+        u8 time[2];             // hours, minutes
+        u8 ucode_valid;
+};
+
+static int ipw2100_ucode_download(struct ipw2100_priv *priv,
+                                  struct ipw2100_fw *fw)
+{
+        struct net_device *dev = priv->net_dev;
+        const unsigned char *microcode_data = fw->uc.data;
+        unsigned int microcode_data_left = fw->uc.size;
+        void __iomem *reg = (void __iomem *)dev->base_addr;
+
+        struct symbol_alive_response response;
+        int i, j;
+        u8 data;
+
+        /* Symbol control */
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x703);
+        readl(reg);
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x707);
+        readl(reg);
+
+        /* HW config */
+        write_nic_byte(dev, 0x210014, 0x72);    /* fifo width =16 */
+        readl(reg);
+        write_nic_byte(dev, 0x210014, 0x72);    /* fifo width =16 */
+        readl(reg);
+
+        /* EN_CS_ACCESS bit to reset control store pointer */
+        write_nic_byte(dev, 0x210000, 0x40);
+        readl(reg);
+        write_nic_byte(dev, 0x210000, 0x0);
+        readl(reg);
+        write_nic_byte(dev, 0x210000, 0x40);
+        readl(reg);
+
+        /* copy microcode from buffer into Symbol */
+
+        while (microcode_data_left > 0) {
+                write_nic_byte(dev, 0x210010, *microcode_data++);
+                write_nic_byte(dev, 0x210010, *microcode_data++);
+                microcode_data_left -= 2;
+        }
+
+        /* EN_CS_ACCESS bit to reset the control store pointer */
+        write_nic_byte(dev, 0x210000, 0x0);
+        readl(reg);
+
+        /* Enable System (Reg 0)
+         * first enable causes garbage in RX FIFO */
+        write_nic_byte(dev, 0x210000, 0x0);
+        readl(reg);
+        write_nic_byte(dev, 0x210000, 0x80);
+        readl(reg);
+
+        /* Reset External Baseband Reg */
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x703);
+        readl(reg);
+        write_nic_word(dev, IPW2100_CONTROL_REG, 0x707);
+        readl(reg);
+
+        /* HW Config (Reg 5) */
+        write_nic_byte(dev, 0x210014, 0x72);    // fifo width =16
+        readl(reg);
+        write_nic_byte(dev, 0x210014, 0x72);    // fifo width =16
+        readl(reg);
+
+        /* Enable System (Reg 0)
+         * second enable should be OK */
+        write_nic_byte(dev, 0x210000, 0x00);    // clear enable system
+        readl(reg);
+        write_nic_byte(dev, 0x210000, 0x80);    // set enable system
+
+        /* check Symbol is enabled - upped this from 5 as it wasn't always
+         * catching the update */
+        for (i = 0; i < 10; i++) {
+                udelay(10);
+
+                /* check Dino is enabled bit */
+                read_nic_byte(dev, 0x210000, &data);
+                if (data & 0x1)
+                        break;
+        }
+
+        if (i == 10) {
+                printk(KERN_ERR DRV_NAME ": %s: Error initializing Symbol\n",
+                       dev->name);
+                return -EIO;
+        }
+
+        /* Get Symbol alive response */
+        for (i = 0; i < 30; i++) {
+                /* Read alive response structure */
+                for (j = 0;
+                     j < (sizeof(struct symbol_alive_response) >> 1);
+                     j++)
+                        read_nic_word(dev, 0x210004,
+                                      ((u16 *)&response) + j);
+
+                if ((response.cmd_id == 1) &&
+                    (response.ucode_valid == 0x1))
+                        break;
+                udelay(10);
+        }
+
+        if (i == 30) {
+                printk(KERN_ERR DRV_NAME ": %s: No response from Symbol - hw not alive\n",
+                       dev->name);
+                printk_buf(IPW_DL_ERROR, (u8*)&response, sizeof(response));
+                return -EIO;
+        }
+
+        return 0;
+}
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
new file mode 100644
index 000000000000..2a3cdbd50168
--- /dev/null
+++ b/drivers/net/wireless/ipw2100.h
@@ -0,0 +1,1167 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+#ifndef _IPW2100_H
+#define _IPW2100_H
+
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/skbuff.h>
+#include <asm/io.h>
+#include <linux/socket.h>
+#include <linux/if_arp.h>
+#include <linux/wireless.h>
+#include <linux/version.h>
+#include <net/iw_handler.h>     // new driver API
+
+#include <net/ieee80211.h>
+
+#include <linux/workqueue.h>
+
+struct ipw2100_priv;
+struct ipw2100_tx_packet;
+struct ipw2100_rx_packet;
+
+#define IPW_DL_UNINIT    0x80000000
+#define IPW_DL_NONE      0x00000000
+#define IPW_DL_ALL       0x7FFFFFFF
+
+/*
+ * To use the debug system;
+ *
+ * If you are defining a new debug classification, simply add it to the #define
+ * list here in the form of:
+ *
+ * #define IPW_DL_xxxx VALUE
+ *
+ * shifting value to the left one bit from the previous entry.  xxxx should be
+ * the name of the classification (for example, WEP)
+ *
+ * You then need to either add a IPW2100_xxxx_DEBUG() macro definition for your
+ * classification, or use IPW_DEBUG(IPW_DL_xxxx, ...) whenever you want
+ * to send output to that classification.
+ *
+ * To add your debug level to the list of levels seen when you perform
+ *
+ * % cat /proc/net/ipw2100/debug_level
+ *
+ * you simply need to add your entry to the ipw2100_debug_levels array.
+ *
+ * If you do not see debug_level in /proc/net/ipw2100 then you do not have
+ * CONFIG_IPW_DEBUG defined in your kernel configuration
+ *
+ */
+
+#define IPW_DL_ERROR         (1<<0)
+#define IPW_DL_WARNING       (1<<1)
+#define IPW_DL_INFO          (1<<2)
+#define IPW_DL_WX            (1<<3)
+#define IPW_DL_HC            (1<<5)
+#define IPW_DL_STATE         (1<<6)
+
+#define IPW_DL_NOTIF         (1<<10)
+#define IPW_DL_SCAN          (1<<11)
+#define IPW_DL_ASSOC         (1<<12)
+#define IPW_DL_DROP          (1<<13)
+
+#define IPW_DL_IOCTL         (1<<14)
+#define IPW_DL_RF_KILL       (1<<17)
+
+
+#define IPW_DL_MANAGE        (1<<15)
+#define IPW_DL_FW            (1<<16)
+
+#define IPW_DL_FRAG          (1<<21)
+#define IPW_DL_WEP           (1<<22)
+#define IPW_DL_TX            (1<<23)
+#define IPW_DL_RX            (1<<24)
+#define IPW_DL_ISR           (1<<25)
+#define IPW_DL_IO            (1<<26)
+#define IPW_DL_TRACE         (1<<28)
+
+#define IPW_DEBUG_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+#define IPW_DEBUG_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
+#define IPW_DEBUG_INFO(f...)    IPW_DEBUG(IPW_DL_INFO, ## f)
+#define IPW_DEBUG_WX(f...)     IPW_DEBUG(IPW_DL_WX, ## f)
+#define IPW_DEBUG_SCAN(f...)   IPW_DEBUG(IPW_DL_SCAN, ## f)
+#define IPW_DEBUG_NOTIF(f...) IPW_DEBUG(IPW_DL_NOTIF, ## f)
+#define IPW_DEBUG_TRACE(f...)  IPW_DEBUG(IPW_DL_TRACE, ## f)
+#define IPW_DEBUG_RX(f...)     IPW_DEBUG(IPW_DL_RX, ## f)
+#define IPW_DEBUG_TX(f...)     IPW_DEBUG(IPW_DL_TX, ## f)
+#define IPW_DEBUG_ISR(f...)    IPW_DEBUG(IPW_DL_ISR, ## f)
+#define IPW_DEBUG_MANAGEMENT(f...) IPW_DEBUG(IPW_DL_MANAGE, ## f)
+#define IPW_DEBUG_WEP(f...)    IPW_DEBUG(IPW_DL_WEP, ## f)
+#define IPW_DEBUG_HC(f...) IPW_DEBUG(IPW_DL_HC, ## f)
+#define IPW_DEBUG_FRAG(f...) IPW_DEBUG(IPW_DL_FRAG, ## f)
+#define IPW_DEBUG_FW(f...) IPW_DEBUG(IPW_DL_FW, ## f)
+#define IPW_DEBUG_RF_KILL(f...) IPW_DEBUG(IPW_DL_RF_KILL, ## f)
+#define IPW_DEBUG_DROP(f...) IPW_DEBUG(IPW_DL_DROP, ## f)
+#define IPW_DEBUG_IO(f...) IPW_DEBUG(IPW_DL_IO, ## f)
+#define IPW_DEBUG_IOCTL(f...) IPW_DEBUG(IPW_DL_IOCTL, ## f)
+#define IPW_DEBUG_STATE(f, a...) IPW_DEBUG(IPW_DL_STATE | IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+#define IPW_DEBUG_ASSOC(f, a...) IPW_DEBUG(IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+
+enum {
+        IPW_HW_STATE_DISABLED = 1,
+        IPW_HW_STATE_ENABLED = 0
+};
+
+struct ssid_context {
+        char ssid[IW_ESSID_MAX_SIZE + 1];
+        int ssid_len;
+        unsigned char bssid[ETH_ALEN];
+        int port_type;
+        int channel;
+
+};
+
+extern const char *port_type_str[];
+extern const char *band_str[];
+
+#define NUMBER_OF_BD_PER_COMMAND_PACKET         1
+#define NUMBER_OF_BD_PER_DATA_PACKET            2
+
+#define IPW_MAX_BDS 6
+#define NUMBER_OF_OVERHEAD_BDS_PER_PACKETR      2
+#define NUMBER_OF_BDS_TO_LEAVE_FOR_COMMANDS     1
+
+#define REQUIRED_SPACE_IN_RING_FOR_COMMAND_PACKET \
+    (IPW_BD_QUEUE_W_R_MIN_SPARE + NUMBER_OF_BD_PER_COMMAND_PACKET)
+
+struct bd_status {
+        union {
+                struct { u8 nlf:1, txType:2, intEnabled:1, reserved:4;} fields;
+                u8 field;
+        } info;
+} __attribute__ ((packed));
+
+struct ipw2100_bd {
+        u32 host_addr;
+        u32 buf_length;
+        struct bd_status status;
+        /* number of fragments for frame (should be set only for
+         * 1st TBD) */
+        u8 num_fragments;
+        u8 reserved[6];
+} __attribute__ ((packed));
+
+#define IPW_BD_QUEUE_LENGTH(n) (1<<n)
+#define IPW_BD_ALIGNMENT(L)    (L*sizeof(struct ipw2100_bd))
+
+#define IPW_BD_STATUS_TX_FRAME_802_3             0x00
+#define IPW_BD_STATUS_TX_FRAME_NOT_LAST_FRAGMENT 0x01
+#define IPW_BD_STATUS_TX_FRAME_COMMAND           0x02
+#define IPW_BD_STATUS_TX_FRAME_802_11            0x04
+#define IPW_BD_STATUS_TX_INTERRUPT_ENABLE        0x08
+
+struct ipw2100_bd_queue {
+        /* driver (virtual) pointer to queue */
+        struct ipw2100_bd *drv;
+
+        /* firmware (physical) pointer to queue */
+        dma_addr_t nic;
+
+        /* Length of phy memory allocated for BDs */
+        u32 size;
+
+        /* Number of BDs in queue (and in array) */
+        u32 entries;
+
+        /* Number of available BDs (invalid for NIC BDs) */
+        u32 available;
+
+        /* Offset of oldest used BD in array (next one to
+         * check for completion) */
+        u32 oldest;
+
+        /* Offset of next available (unused) BD */
+        u32 next;
+};
+
+#define RX_QUEUE_LENGTH 256
+#define TX_QUEUE_LENGTH 256
+#define HW_QUEUE_LENGTH 256
+
+#define TX_PENDED_QUEUE_LENGTH (TX_QUEUE_LENGTH / NUMBER_OF_BD_PER_DATA_PACKET)
+
+#define STATUS_TYPE_MASK        0x0000000f
+#define COMMAND_STATUS_VAL      0
+#define STATUS_CHANGE_VAL       1
+#define P80211_DATA_VAL         2
+#define P8023_DATA_VAL          3
+#define HOST_NOTIFICATION_VAL   4
+
+#define IPW2100_RSSI_TO_DBM (-98)
+
+struct ipw2100_status {
+        u32 frame_size;
+        u16 status_fields;
+        u8 flags;
+#define IPW_STATUS_FLAG_DECRYPTED       (1<<0)
+#define IPW_STATUS_FLAG_WEP_ENCRYPTED   (1<<1)
+#define IPW_STATUS_FLAG_CRC_ERROR       (1<<2)
+        u8 rssi;
+} __attribute__ ((packed));
+
+struct ipw2100_status_queue {
+        /* driver (virtual) pointer to queue */
+        struct ipw2100_status *drv;
+
+        /* firmware (physical) pointer to queue */
+        dma_addr_t nic;
+
+        /* Length of phy memory allocated for BDs */
+        u32 size;
+};
+
+#define HOST_COMMAND_PARAMS_REG_LEN     100
+#define CMD_STATUS_PARAMS_REG_LEN       3
+
+#define IPW_WPA_CAPABILITIES   0x1
+#define IPW_WPA_LISTENINTERVAL 0x2
+#define IPW_WPA_AP_ADDRESS     0x4
+
+#define IPW_MAX_VAR_IE_LEN ((HOST_COMMAND_PARAMS_REG_LEN - 4) * sizeof(u32))
+
+struct ipw2100_wpa_assoc_frame {
+        u16 fixed_ie_mask;
+        struct {
+                u16 capab_info;
+                u16 listen_interval;
+                u8 current_ap[ETH_ALEN];
+        } fixed_ies;
+        u32 var_ie_len;
+        u8 var_ie[IPW_MAX_VAR_IE_LEN];
+};
+
+#define IPW_BSS     1
+#define IPW_MONITOR 2
+#define IPW_IBSS    3
+
+/**
+ * @struct _tx_cmd - HWCommand
+ * @brief H/W command structure.
+ */
+struct ipw2100_cmd_header {
+        u32 host_command_reg;
+        u32 host_command_reg1;
+        u32 sequence;
+        u32 host_command_len_reg;
+        u32 host_command_params_reg[HOST_COMMAND_PARAMS_REG_LEN];
+        u32 cmd_status_reg;
+        u32 cmd_status_params_reg[CMD_STATUS_PARAMS_REG_LEN];
+        u32 rxq_base_ptr;
+        u32 rxq_next_ptr;
+        u32 rxq_host_ptr;
+        u32 txq_base_ptr;
+        u32 txq_next_ptr;
+        u32 txq_host_ptr;
+        u32 tx_status_reg;
+        u32 reserved;
+        u32 status_change_reg;
+        u32 reserved1[3];
+        u32 *ordinal1_ptr;
+        u32 *ordinal2_ptr;
+} __attribute__ ((packed));
+
+struct ipw2100_data_header {
+        u32 host_command_reg;
+        u32 host_command_reg1;
+        u8 encrypted;   // BOOLEAN in win! TRUE if frame is enc by driver
+        u8 needs_encryption;    // BOOLEAN in win! TRUE if frma need to be enc in NIC
+        u8 wep_index;           // 0 no key, 1-4 key index, 0xff immediate key
+        u8 key_size;    // 0 no imm key, 0x5 64bit encr, 0xd 128bit encr, 0x10 128bit encr and 128bit IV
+        u8 key[16];
+        u8 reserved[10];        // f/w reserved
+        u8 src_addr[ETH_ALEN];
+        u8 dst_addr[ETH_ALEN];
+        u16 fragment_size;
+} __attribute__ ((packed));
+
+/* Host command data structure */
+struct host_command {
+        u32 host_command;               // COMMAND ID
+        u32 host_command1;              // COMMAND ID
+        u32 host_command_sequence;      // UNIQUE COMMAND NUMBER (ID)
+        u32 host_command_length;        // LENGTH
+        u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN];       // COMMAND PARAMETERS
+} __attribute__ ((packed));
+
+
+typedef enum {
+        POWER_ON_RESET,
+        EXIT_POWER_DOWN_RESET,
+        SW_RESET,
+        EEPROM_RW,
+        SW_RE_INIT
+} ipw2100_reset_event;
+
+enum {
+        COMMAND = 0xCAFE,
+        DATA,
+        RX
+};
+
+
+struct ipw2100_tx_packet {
+        int type;
+        int index;
+        union {
+                struct { /* COMMAND */
+                        struct ipw2100_cmd_header* cmd;
+                        dma_addr_t cmd_phys;
+                } c_struct;
+                struct { /* DATA */
+                        struct ipw2100_data_header* data;
+                        dma_addr_t data_phys;
+                        struct ieee80211_txb *txb;
+                } d_struct;
+        } info;
+        int jiffy_start;
+
+        struct list_head list;
+};
+
+
+struct ipw2100_rx_packet {
+        struct ipw2100_rx *rxp;
+        dma_addr_t dma_addr;
+        int jiffy_start;
+        struct sk_buff *skb;
+        struct list_head list;
+};
+
+#define FRAG_DISABLED             (1<<31)
+#define RTS_DISABLED              (1<<31)
+#define MAX_RTS_THRESHOLD         2304U
+#define MIN_RTS_THRESHOLD         1U
+#define DEFAULT_RTS_THRESHOLD     1000U
+
+#define DEFAULT_BEACON_INTERVAL   100U
+#define DEFAULT_SHORT_RETRY_LIMIT 7U
+#define DEFAULT_LONG_RETRY_LIMIT  4U
+
+struct ipw2100_ordinals {
+        u32 table1_addr;
+        u32 table2_addr;
+        u32 table1_size;
+        u32 table2_size;
+};
+
+/* Host Notification header */
+struct ipw2100_notification {
+        u32 hnhdr_subtype;      /* type of host notification */
+        u32 hnhdr_size;         /* size in bytes of data
+                                   or number of entries, if table.
+                                   Does NOT include header */
+} __attribute__ ((packed));
+
+#define MAX_KEY_SIZE    16
+#define MAX_KEYS        8
+
+#define IPW2100_WEP_ENABLE     (1<<1)
+#define IPW2100_WEP_DROP_CLEAR (1<<2)
+
+#define IPW_NONE_CIPHER   (1<<0)
+#define IPW_WEP40_CIPHER  (1<<1)
+#define IPW_TKIP_CIPHER   (1<<2)
+#define IPW_CCMP_CIPHER   (1<<4)
+#define IPW_WEP104_CIPHER (1<<5)
+#define IPW_CKIP_CIPHER   (1<<6)
+
+#define IPW_AUTH_OPEN     0
+#define IPW_AUTH_SHARED   1
+
+struct statistic {
+        int value;
+        int hi;
+        int lo;
+};
+
+#define INIT_STAT(x) do {  \
+  (x)->value = (x)->hi = 0; \
+  (x)->lo = 0x7fffffff; \
+} while (0)
+#define SET_STAT(x,y) do { \
+  (x)->value = y; \
+  if ((x)->value > (x)->hi) (x)->hi = (x)->value; \
+  if ((x)->value < (x)->lo) (x)->lo = (x)->value; \
+} while (0)
+#define INC_STAT(x) do { if (++(x)->value > (x)->hi) (x)->hi = (x)->value; } \
+while (0)
+#define DEC_STAT(x) do { if (--(x)->value < (x)->lo) (x)->lo = (x)->value; } \
+while (0)
+
+#define IPW2100_ERROR_QUEUE 5
+
+/* Power management code: enable or disable? */
+enum {
+#ifdef CONFIG_PM
+        IPW2100_PM_DISABLED = 0,
+        PM_STATE_SIZE = 16,
+#else
+        IPW2100_PM_DISABLED = 1,
+        PM_STATE_SIZE = 0,
+#endif
+};
+
+#define STATUS_POWERED          (1<<0)
+#define STATUS_CMD_ACTIVE       (1<<1)  /**< host command in progress */
+#define STATUS_RUNNING          (1<<2)  /* Card initialized, but not enabled */
+#define STATUS_ENABLED          (1<<3)  /* Card enabled -- can scan,Tx,Rx */
+#define STATUS_STOPPING         (1<<4)  /* Card is in shutdown phase */
+#define STATUS_INITIALIZED      (1<<5)  /* Card is ready for external calls */
+#define STATUS_ASSOCIATING      (1<<9)  /* Associated, but no BSSID yet */
+#define STATUS_ASSOCIATED       (1<<10) /* Associated and BSSID valid */
+#define STATUS_INT_ENABLED      (1<<11)
+#define STATUS_RF_KILL_HW       (1<<12)
+#define STATUS_RF_KILL_SW       (1<<13)
+#define STATUS_RF_KILL_MASK     (STATUS_RF_KILL_HW | STATUS_RF_KILL_SW)
+#define STATUS_EXIT_PENDING     (1<<14)
+
+#define STATUS_SCAN_PENDING     (1<<23)
+#define STATUS_SCANNING         (1<<24)
+#define STATUS_SCAN_ABORTING    (1<<25)
+#define STATUS_SCAN_COMPLETE    (1<<26)
+#define STATUS_WX_EVENT_PENDING (1<<27)
+#define STATUS_RESET_PENDING    (1<<29)
+#define STATUS_SECURITY_UPDATED (1<<30) /* Security sync needed */
+
+
+
+/* Internal NIC states */
+#define IPW_STATE_INITIALIZED   (1<<0)
+#define IPW_STATE_COUNTRY_FOUND (1<<1)
+#define IPW_STATE_ASSOCIATED    (1<<2)
+#define IPW_STATE_ASSN_LOST     (1<<3)
+#define IPW_STATE_ASSN_CHANGED  (1<<4)
+#define IPW_STATE_SCAN_COMPLETE (1<<5)
+#define IPW_STATE_ENTERED_PSP   (1<<6)
+#define IPW_STATE_LEFT_PSP      (1<<7)
+#define IPW_STATE_RF_KILL       (1<<8)
+#define IPW_STATE_DISABLED      (1<<9)
+#define IPW_STATE_POWER_DOWN    (1<<10)
+#define IPW_STATE_SCANNING      (1<<11)
+
+
+
+#define CFG_STATIC_CHANNEL      (1<<0) /* Restrict assoc. to single channel */
+#define CFG_STATIC_ESSID        (1<<1) /* Restrict assoc. to single SSID */
+#define CFG_STATIC_BSSID        (1<<2) /* Restrict assoc. to single BSSID */
+#define CFG_CUSTOM_MAC          (1<<3)
+#define CFG_LONG_PREAMBLE       (1<<4)
+#define CFG_ASSOCIATE           (1<<6)
+#define CFG_FIXED_RATE          (1<<7)
+#define CFG_ADHOC_CREATE        (1<<8)
+#define CFG_C3_DISABLED         (1<<9)
+#define CFG_PASSIVE_SCAN        (1<<10)
+
+#define CAP_SHARED_KEY          (1<<0) /* Off = OPEN */
+#define CAP_PRIVACY_ON          (1<<1) /* Off = No privacy */
+
+struct ipw2100_priv {
+
+        int stop_hang_check; /* Set 1 when shutting down to kill hang_check */
+        int stop_rf_kill; /* Set 1 when shutting down to kill rf_kill */
+
+        struct ieee80211_device *ieee;
+        unsigned long status;
+        unsigned long config;
+        unsigned long capability;
+
+        /* Statistics */
+        int resets;
+        int reset_backoff;
+
+        /* Context */
+        u8 essid[IW_ESSID_MAX_SIZE];
+        u8 essid_len;
+        u8 bssid[ETH_ALEN];
+        u8 channel;
+        int last_mode;
+        int cstate_limit;
+
+        unsigned long connect_start;
+        unsigned long last_reset;
+
+        u32 channel_mask;
+        u32 fatal_error;
+        u32 fatal_errors[IPW2100_ERROR_QUEUE];
+        u32 fatal_index;
+        int eeprom_version;
+        int firmware_version;
+        unsigned long hw_features;
+        int hangs;
+        u32 last_rtc;
+        int dump_raw; /* 1 to dump raw bytes in /sys/.../memory */
+        u8* snapshot[0x30];
+
+        u8 mandatory_bssid_mac[ETH_ALEN];
+        u8 mac_addr[ETH_ALEN];
+
+        int power_mode;
+
+        /* WEP data */
+        struct ieee80211_security sec;
+        int messages_sent;
+
+
+        int short_retry_limit;
+        int long_retry_limit;
+
+        u32 rts_threshold;
+        u32 frag_threshold;
+
+        int in_isr;
+
+        u32 tx_rates;
+        int tx_power;
+        u32 beacon_interval;
+
+        char nick[IW_ESSID_MAX_SIZE + 1];
+
+        struct ipw2100_status_queue status_queue;
+
+        struct statistic txq_stat;
+        struct statistic rxq_stat;
+        struct ipw2100_bd_queue rx_queue;
+        struct ipw2100_bd_queue tx_queue;
+        struct ipw2100_rx_packet *rx_buffers;
+
+        struct statistic fw_pend_stat;
+        struct list_head fw_pend_list;
+
+        struct statistic msg_free_stat;
+        struct statistic msg_pend_stat;
+        struct list_head msg_free_list;
+        struct list_head msg_pend_list;
+        struct ipw2100_tx_packet *msg_buffers;
+
+        struct statistic tx_free_stat;
+        struct statistic tx_pend_stat;
+        struct list_head tx_free_list;
+        struct list_head tx_pend_list;
+        struct ipw2100_tx_packet *tx_buffers;
+
+        struct ipw2100_ordinals ordinals;
+
+        struct pci_dev *pci_dev;
+
+        struct proc_dir_entry *dir_dev;
+
+        struct net_device *net_dev;
+        struct iw_statistics wstats;
+
+        struct tasklet_struct irq_tasklet;
+
+        struct workqueue_struct *workqueue;
+        struct work_struct reset_work;
+        struct work_struct security_work;
+        struct work_struct wx_event_work;
+        struct work_struct hang_check;
+        struct work_struct rf_kill;
+
+        u32 interrupts;
+        int tx_interrupts;
+        int rx_interrupts;
+        int inta_other;
+
+        spinlock_t low_lock;
+        struct semaphore action_sem;
+        struct semaphore adapter_sem;
+
+        wait_queue_head_t wait_command_queue;
+};
+
+
+/*********************************************************
+ * Host Command -> From Driver to FW
+ *********************************************************/
+
+/**
+ * Host command identifiers
+ */
+#define HOST_COMPLETE           2
+#define SYSTEM_CONFIG           6
+#define SSID                    8
+#define MANDATORY_BSSID         9
+#define AUTHENTICATION_TYPE    10
+#define ADAPTER_ADDRESS        11
+#define PORT_TYPE              12
+#define INTERNATIONAL_MODE     13
+#define CHANNEL                14
+#define RTS_THRESHOLD          15
+#define FRAG_THRESHOLD         16
+#define POWER_MODE             17
+#define TX_RATES               18
+#define BASIC_TX_RATES         19
+#define WEP_KEY_INFO           20
+#define WEP_KEY_INDEX          25
+#define WEP_FLAGS              26
+#define ADD_MULTICAST          27
+#define CLEAR_ALL_MULTICAST    28
+#define BEACON_INTERVAL        29
+#define ATIM_WINDOW            30
+#define CLEAR_STATISTICS       31
+#define SEND                   33
+#define TX_POWER_INDEX         36
+#define BROADCAST_SCAN         43
+#define CARD_DISABLE           44
+#define PREFERRED_BSSID        45
+#define SET_SCAN_OPTIONS       46
+#define SCAN_DWELL_TIME        47
+#define SWEEP_TABLE            48
+#define AP_OR_STATION_TABLE    49
+#define GROUP_ORDINALS         50
+#define SHORT_RETRY_LIMIT      51
+#define LONG_RETRY_LIMIT       52
+
+#define HOST_PRE_POWER_DOWN    58
+#define CARD_DISABLE_PHY_OFF   61
+#define MSDU_TX_RATES          62
+
+
+/* Rogue AP Detection */
+#define SET_STATION_STAT_BITS      64
+#define CLEAR_STATIONS_STAT_BITS   65
+#define LEAP_ROGUE_MODE            66   //TODO tbw replaced by CFG_LEAP_ROGUE_AP
+#define SET_SECURITY_INFORMATION   67
+#define DISASSOCIATION_BSSID       68
+#define SET_WPA_IE                 69
+
+
+
+/* system configuration bit mask: */
+#define IPW_CFG_MONITOR               0x00004
+#define IPW_CFG_PREAMBLE_AUTO        0x00010
+#define IPW_CFG_IBSS_AUTO_START     0x00020
+#define IPW_CFG_LOOPBACK            0x00100
+#define IPW_CFG_ANSWER_BCSSID_PROBE 0x00800
+#define IPW_CFG_BT_SIDEBAND_SIGNAL      0x02000
+#define IPW_CFG_802_1x_ENABLE       0x04000
+#define IPW_CFG_BSS_MASK                0x08000
+#define IPW_CFG_IBSS_MASK               0x10000
+
+#define IPW_SCAN_NOASSOCIATE (1<<0)
+#define IPW_SCAN_MIXED_CELL (1<<1)
+/* RESERVED (1<<2) */
+#define IPW_SCAN_PASSIVE (1<<3)
+
+#define IPW_NIC_FATAL_ERROR 0x2A7F0
+#define IPW_ERROR_ADDR(x) (x & 0x3FFFF)
+#define IPW_ERROR_CODE(x) ((x & 0xFF000000) >> 24)
+#define IPW2100_ERR_C3_CORRUPTION (0x10 << 24)
+#define IPW2100_ERR_MSG_TIMEOUT   (0x11 << 24)
+#define IPW2100_ERR_FW_LOAD       (0x12 << 24)
+
+#define IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND                    0x200
+#define IPW_MEM_SRAM_HOST_INTERRUPT_AREA_LOWER_BOUND    IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x0D80
+
+#define IPW_MEM_HOST_SHARED_RX_BD_BASE                  (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x40)
+#define IPW_MEM_HOST_SHARED_RX_STATUS_BASE              (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x44)
+#define IPW_MEM_HOST_SHARED_RX_BD_SIZE                  (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x48)
+#define IPW_MEM_HOST_SHARED_RX_READ_INDEX               (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0xa0)
+
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_BD_BASE          (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x00)
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_BD_SIZE          (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x04)
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_READ_INDEX       (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x80)
+
+#define IPW_MEM_HOST_SHARED_RX_WRITE_INDEX \
+    (IPW_MEM_SRAM_HOST_INTERRUPT_AREA_LOWER_BOUND + 0x20)
+
+#define IPW_MEM_HOST_SHARED_TX_QUEUE_WRITE_INDEX \
+    (IPW_MEM_SRAM_HOST_INTERRUPT_AREA_LOWER_BOUND)
+
+#define IPW_MEM_HOST_SHARED_ORDINALS_TABLE_1   (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x180)
+#define IPW_MEM_HOST_SHARED_ORDINALS_TABLE_2   (IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND + 0x184)
+
+#define IPW2100_INTA_TX_TRANSFER               (0x00000001)     // Bit 0 (LSB)
+#define IPW2100_INTA_RX_TRANSFER               (0x00000002)     // Bit 1
+#define IPW2100_INTA_TX_COMPLETE               (0x00000004)     // Bit 2
+#define IPW2100_INTA_EVENT_INTERRUPT           (0x00000008)     // Bit 3
+#define IPW2100_INTA_STATUS_CHANGE             (0x00000010)     // Bit 4
+#define IPW2100_INTA_BEACON_PERIOD_EXPIRED     (0x00000020)     // Bit 5
+#define IPW2100_INTA_SLAVE_MODE_HOST_COMMAND_DONE  (0x00010000) // Bit 16
+#define IPW2100_INTA_FW_INIT_DONE              (0x01000000)     // Bit 24
+#define IPW2100_INTA_FW_CALIBRATION_CALC       (0x02000000)     // Bit 25
+#define IPW2100_INTA_FATAL_ERROR               (0x40000000)     // Bit 30
+#define IPW2100_INTA_PARITY_ERROR              (0x80000000)     // Bit 31 (MSB)
+
+#define IPW_AUX_HOST_RESET_REG_PRINCETON_RESET              (0x00000001)
+#define IPW_AUX_HOST_RESET_REG_FORCE_NMI                    (0x00000002)
+#define IPW_AUX_HOST_RESET_REG_PCI_HOST_CLUSTER_FATAL_NMI   (0x00000004)
+#define IPW_AUX_HOST_RESET_REG_CORE_FATAL_NMI               (0x00000008)
+#define IPW_AUX_HOST_RESET_REG_SW_RESET                     (0x00000080)
+#define IPW_AUX_HOST_RESET_REG_MASTER_DISABLED              (0x00000100)
+#define IPW_AUX_HOST_RESET_REG_STOP_MASTER                  (0x00000200)
+
+#define IPW_AUX_HOST_GP_CNTRL_BIT_CLOCK_READY           (0x00000001)    // Bit 0 (LSB)
+#define IPW_AUX_HOST_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY   (0x00000002)    // Bit 1
+#define IPW_AUX_HOST_GP_CNTRL_BIT_INIT_DONE             (0x00000004)    // Bit 2
+#define IPW_AUX_HOST_GP_CNTRL_BITS_SYS_CONFIG           (0x000007c0)    // Bits 6-10
+#define IPW_AUX_HOST_GP_CNTRL_BIT_BUS_TYPE              (0x00000200)    // Bit 9
+#define IPW_AUX_HOST_GP_CNTRL_BIT_BAR0_BLOCK_SIZE       (0x00000400)    // Bit 10
+#define IPW_AUX_HOST_GP_CNTRL_BIT_USB_MODE              (0x20000000)    // Bit 29
+#define IPW_AUX_HOST_GP_CNTRL_BIT_HOST_FORCES_SYS_CLK   (0x40000000)    // Bit 30
+#define IPW_AUX_HOST_GP_CNTRL_BIT_FW_FORCES_SYS_CLK     (0x80000000)    // Bit 31 (MSB)
+
+#define IPW_BIT_GPIO_GPIO1_MASK         0x0000000C
+#define IPW_BIT_GPIO_GPIO3_MASK         0x000000C0
+#define IPW_BIT_GPIO_GPIO1_ENABLE       0x00000008
+#define IPW_BIT_GPIO_RF_KILL            0x00010000
+
+#define IPW_BIT_GPIO_LED_OFF            0x00002000      // Bit 13 = 1
+
+#define IPW_REG_DOMAIN_0_OFFSET         0x0000
+#define IPW_REG_DOMAIN_1_OFFSET         IPW_MEM_SRAM_HOST_SHARED_LOWER_BOUND
+
+#define IPW_REG_INTA                    IPW_REG_DOMAIN_0_OFFSET + 0x0008
+#define IPW_REG_INTA_MASK               IPW_REG_DOMAIN_0_OFFSET + 0x000C
+#define IPW_REG_INDIRECT_ACCESS_ADDRESS IPW_REG_DOMAIN_0_OFFSET + 0x0010
+#define IPW_REG_INDIRECT_ACCESS_DATA    IPW_REG_DOMAIN_0_OFFSET + 0x0014
+#define IPW_REG_AUTOINCREMENT_ADDRESS   IPW_REG_DOMAIN_0_OFFSET + 0x0018
+#define IPW_REG_AUTOINCREMENT_DATA      IPW_REG_DOMAIN_0_OFFSET + 0x001C
+#define IPW_REG_RESET_REG               IPW_REG_DOMAIN_0_OFFSET + 0x0020
+#define IPW_REG_GP_CNTRL                IPW_REG_DOMAIN_0_OFFSET + 0x0024
+#define IPW_REG_GPIO                    IPW_REG_DOMAIN_0_OFFSET + 0x0030
+#define IPW_REG_FW_TYPE                 IPW_REG_DOMAIN_1_OFFSET + 0x0188
+#define IPW_REG_FW_VERSION              IPW_REG_DOMAIN_1_OFFSET + 0x018C
+#define IPW_REG_FW_COMPATABILITY_VERSION IPW_REG_DOMAIN_1_OFFSET + 0x0190
+
+#define IPW_REG_INDIRECT_ADDR_MASK      0x00FFFFFC
+
+#define IPW_INTERRUPT_MASK              0xC1010013
+
+#define IPW2100_CONTROL_REG             0x220000
+#define IPW2100_CONTROL_PHY_OFF         0x8
+
+#define IPW2100_COMMAND                 0x00300004
+#define IPW2100_COMMAND_PHY_ON          0x0
+#define IPW2100_COMMAND_PHY_OFF         0x1
+
+/* in DEBUG_AREA, values of memory always 0xd55555d5 */
+#define IPW_REG_DOA_DEBUG_AREA_START    IPW_REG_DOMAIN_0_OFFSET + 0x0090
+#define IPW_REG_DOA_DEBUG_AREA_END      IPW_REG_DOMAIN_0_OFFSET + 0x00FF
+#define IPW_DATA_DOA_DEBUG_VALUE        0xd55555d5
+
+#define IPW_INTERNAL_REGISTER_HALT_AND_RESET    0x003000e0
+
+#define IPW_WAIT_CLOCK_STABILIZATION_DELAY          50  // micro seconds
+#define IPW_WAIT_RESET_ARC_COMPLETE_DELAY           10  // micro seconds
+#define IPW_WAIT_RESET_MASTER_ASSERT_COMPLETE_DELAY 10  // micro seconds
+
+// BD ring queue read/write difference
+#define IPW_BD_QUEUE_W_R_MIN_SPARE 2
+
+#define IPW_CACHE_LINE_LENGTH_DEFAULT               0x80
+
+#define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT      100 // 100 milli
+#define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT        100 // 100 milli
+
+
+
+
+#define IPW_HEADER_802_11_SIZE           sizeof(struct ieee80211_hdr_3addr)
+#define IPW_MAX_80211_PAYLOAD_SIZE              2304U
+#define IPW_MAX_802_11_PAYLOAD_LENGTH           2312
+#define IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH      1536
+#define IPW_MIN_ACCEPTABLE_RX_FRAME_LENGTH      60
+#define IPW_MAX_ACCEPTABLE_RX_FRAME_LENGTH \
+        (IPW_MAX_ACCEPTABLE_TX_FRAME_LENGTH + IPW_HEADER_802_11_SIZE - \
+        sizeof(struct ethhdr))
+
+#define IPW_802_11_FCS_LENGTH 4
+#define IPW_RX_NIC_BUFFER_LENGTH \
+        (IPW_MAX_802_11_PAYLOAD_LENGTH + IPW_HEADER_802_11_SIZE + \
+                IPW_802_11_FCS_LENGTH)
+
+#define IPW_802_11_PAYLOAD_OFFSET \
+        (sizeof(struct ieee80211_hdr_3addr) + \
+         sizeof(struct ieee80211_snap_hdr))
+
+struct ipw2100_rx {
+        union {
+                unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH];
+                struct ieee80211_hdr header;
+                u32 status;
+                struct ipw2100_notification notification;
+                struct ipw2100_cmd_header command;
+        } rx_data;
+} __attribute__ ((packed));
+
+/* Bit 0-7 are for 802.11b tx rates - .  Bit 5-7 are reserved */
+#define TX_RATE_1_MBIT              0x0001
+#define TX_RATE_2_MBIT              0x0002
+#define TX_RATE_5_5_MBIT            0x0004
+#define TX_RATE_11_MBIT             0x0008
+#define TX_RATE_MASK                0x000F
+#define DEFAULT_TX_RATES            0x000F
+
+#define IPW_POWER_MODE_CAM           0x00       //(always on)
+#define IPW_POWER_INDEX_1            0x01
+#define IPW_POWER_INDEX_2            0x02
+#define IPW_POWER_INDEX_3            0x03
+#define IPW_POWER_INDEX_4            0x04
+#define IPW_POWER_INDEX_5            0x05
+#define IPW_POWER_AUTO               0x06
+#define IPW_POWER_MASK               0x0F
+#define IPW_POWER_ENABLED            0x10
+#define IPW_POWER_LEVEL(x)           ((x) & IPW_POWER_MASK)
+
+#define IPW_TX_POWER_AUTO            0
+#define IPW_TX_POWER_ENHANCED        1
+
+#define IPW_TX_POWER_DEFAULT         32
+#define IPW_TX_POWER_MIN             0
+#define IPW_TX_POWER_MAX             16
+#define IPW_TX_POWER_MIN_DBM         (-12)
+#define IPW_TX_POWER_MAX_DBM         16
+
+#define FW_SCAN_DONOT_ASSOCIATE     0x0001 // Dont Attempt to Associate after Scan
+#define FW_SCAN_PASSIVE             0x0008 // Force PASSSIVE Scan
+
+#define REG_MIN_CHANNEL             0
+#define REG_MAX_CHANNEL             14
+
+#define REG_CHANNEL_MASK            0x00003FFF
+#define IPW_IBSS_11B_DEFAULT_MASK   0x87ff
+
+#define DIVERSITY_EITHER            0   // Use both antennas
+#define DIVERSITY_ANTENNA_A         1   // Use antenna A
+#define DIVERSITY_ANTENNA_B         2   // Use antenna B
+
+
+#define HOST_COMMAND_WAIT 0
+#define HOST_COMMAND_NO_WAIT 1
+
+#define LOCK_NONE 0
+#define LOCK_DRIVER 1
+#define LOCK_FW 2
+
+#define TYPE_SWEEP_ORD                  0x000D
+#define TYPE_IBSS_STTN_ORD              0x000E
+#define TYPE_BSS_AP_ORD                 0x000F
+#define TYPE_RAW_BEACON_ENTRY           0x0010
+#define TYPE_CALIBRATION_DATA           0x0011
+#define TYPE_ROGUE_AP_DATA              0x0012
+#define TYPE_ASSOCIATION_REQUEST        0x0013
+#define TYPE_REASSOCIATION_REQUEST      0x0014
+
+
+#define HW_FEATURE_RFKILL (0x0001)
+#define RF_KILLSWITCH_OFF (1)
+#define RF_KILLSWITCH_ON  (0)
+
+#define IPW_COMMAND_POOL_SIZE        40
+
+#define IPW_START_ORD_TAB_1                     1
+#define IPW_START_ORD_TAB_2                     1000
+
+#define IPW_ORD_TAB_1_ENTRY_SIZE                sizeof(u32)
+
+#define IS_ORDINAL_TABLE_ONE(mgr,id) \
+    ((id >= IPW_START_ORD_TAB_1) && (id < mgr->table1_size))
+#define IS_ORDINAL_TABLE_TWO(mgr,id) \
+    ((id >= IPW_START_ORD_TAB_2) && (id < (mgr->table2_size + IPW_START_ORD_TAB_2)))
+
+#define BSS_ID_LENGTH               6
+
+// Fixed size data: Ordinal Table 1
+typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
+// Transmit statistics
+        IPW_ORD_STAT_TX_HOST_REQUESTS = 1,// # of requested Host Tx's (MSDU)
+        IPW_ORD_STAT_TX_HOST_COMPLETE,  // # of successful Host Tx's (MSDU)
+        IPW_ORD_STAT_TX_DIR_DATA,       // # of successful Directed Tx's (MSDU)
+
+        IPW_ORD_STAT_TX_DIR_DATA1 = 4,  // # of successful Directed Tx's (MSDU) @ 1MB
+        IPW_ORD_STAT_TX_DIR_DATA2,      // # of successful Directed Tx's (MSDU) @ 2MB
+        IPW_ORD_STAT_TX_DIR_DATA5_5,    // # of successful Directed Tx's (MSDU) @ 5_5MB
+        IPW_ORD_STAT_TX_DIR_DATA11,     // # of successful Directed Tx's (MSDU) @ 11MB
+        IPW_ORD_STAT_TX_DIR_DATA22,     // # of successful Directed Tx's (MSDU) @ 22MB
+
+        IPW_ORD_STAT_TX_NODIR_DATA1 = 13,// # of successful Non_Directed Tx's (MSDU) @ 1MB
+        IPW_ORD_STAT_TX_NODIR_DATA2,    // # of successful Non_Directed Tx's (MSDU) @ 2MB
+        IPW_ORD_STAT_TX_NODIR_DATA5_5,  // # of successful Non_Directed Tx's (MSDU) @ 5.5MB
+        IPW_ORD_STAT_TX_NODIR_DATA11,   // # of successful Non_Directed Tx's (MSDU) @ 11MB
+
+        IPW_ORD_STAT_NULL_DATA = 21,    // # of successful NULL data Tx's
+        IPW_ORD_STAT_TX_RTS,            // # of successful Tx RTS
+        IPW_ORD_STAT_TX_CTS,            // # of successful Tx CTS
+        IPW_ORD_STAT_TX_ACK,            // # of successful Tx ACK
+        IPW_ORD_STAT_TX_ASSN,           // # of successful Association Tx's
+        IPW_ORD_STAT_TX_ASSN_RESP,      // # of successful Association response Tx's
+        IPW_ORD_STAT_TX_REASSN,         // # of successful Reassociation Tx's
+        IPW_ORD_STAT_TX_REASSN_RESP,    // # of successful Reassociation response Tx's
+        IPW_ORD_STAT_TX_PROBE,          // # of probes successfully transmitted
+        IPW_ORD_STAT_TX_PROBE_RESP,     // # of probe responses successfully transmitted
+        IPW_ORD_STAT_TX_BEACON,         // # of tx beacon
+        IPW_ORD_STAT_TX_ATIM,           // # of Tx ATIM
+        IPW_ORD_STAT_TX_DISASSN,        // # of successful Disassociation TX
+        IPW_ORD_STAT_TX_AUTH,           // # of successful Authentication Tx
+        IPW_ORD_STAT_TX_DEAUTH,         // # of successful Deauthentication TX
+
+        IPW_ORD_STAT_TX_TOTAL_BYTES = 41,// Total successful Tx data bytes
+        IPW_ORD_STAT_TX_RETRIES,         // # of Tx retries
+        IPW_ORD_STAT_TX_RETRY1,          // # of Tx retries at 1MBPS
+        IPW_ORD_STAT_TX_RETRY2,          // # of Tx retries at 2MBPS
+        IPW_ORD_STAT_TX_RETRY5_5,        // # of Tx retries at 5.5MBPS
+        IPW_ORD_STAT_TX_RETRY11,         // # of Tx retries at 11MBPS
+
+        IPW_ORD_STAT_TX_FAILURES = 51,  // # of Tx Failures
+        IPW_ORD_STAT_TX_ABORT_AT_HOP,   //NS // # of Tx's aborted at hop time
+        IPW_ORD_STAT_TX_MAX_TRIES_IN_HOP,// # of times max tries in a hop failed
+        IPW_ORD_STAT_TX_ABORT_LATE_DMA, //NS // # of times tx aborted due to late dma setup
+        IPW_ORD_STAT_TX_ABORT_STX,      //NS // # of times backoff aborted
+        IPW_ORD_STAT_TX_DISASSN_FAIL,   // # of times disassociation failed
+        IPW_ORD_STAT_TX_ERR_CTS,         // # of missed/bad CTS frames
+        IPW_ORD_STAT_TX_BPDU,           //NS // # of spanning tree BPDUs sent
+        IPW_ORD_STAT_TX_ERR_ACK,        // # of tx err due to acks
+
+        // Receive statistics
+        IPW_ORD_STAT_RX_HOST = 61,      // # of packets passed to host
+        IPW_ORD_STAT_RX_DIR_DATA,       // # of directed packets
+        IPW_ORD_STAT_RX_DIR_DATA1,      // # of directed packets at 1MB
+        IPW_ORD_STAT_RX_DIR_DATA2,      // # of directed packets at 2MB
+        IPW_ORD_STAT_RX_DIR_DATA5_5,    // # of directed packets at 5.5MB
+        IPW_ORD_STAT_RX_DIR_DATA11,     // # of directed packets at 11MB
+        IPW_ORD_STAT_RX_DIR_DATA22,     // # of directed packets at 22MB
+
+        IPW_ORD_STAT_RX_NODIR_DATA = 71,// # of nondirected packets
+        IPW_ORD_STAT_RX_NODIR_DATA1,    // # of nondirected packets at 1MB
+        IPW_ORD_STAT_RX_NODIR_DATA2,    // # of nondirected packets at 2MB
+        IPW_ORD_STAT_RX_NODIR_DATA5_5,  // # of nondirected packets at 5.5MB
+        IPW_ORD_STAT_RX_NODIR_DATA11,   // # of nondirected packets at 11MB
+
+        IPW_ORD_STAT_RX_NULL_DATA = 80, // # of null data rx's
+        IPW_ORD_STAT_RX_POLL,   //NS // # of poll rx
+        IPW_ORD_STAT_RX_RTS,    // # of Rx RTS
+        IPW_ORD_STAT_RX_CTS,    // # of Rx CTS
+        IPW_ORD_STAT_RX_ACK,    // # of Rx ACK
+        IPW_ORD_STAT_RX_CFEND,  // # of Rx CF End
+        IPW_ORD_STAT_RX_CFEND_ACK,      // # of Rx CF End + CF Ack
+        IPW_ORD_STAT_RX_ASSN,   // # of Association Rx's
+        IPW_ORD_STAT_RX_ASSN_RESP,      // # of Association response Rx's
+        IPW_ORD_STAT_RX_REASSN, // # of Reassociation Rx's
+        IPW_ORD_STAT_RX_REASSN_RESP,    // # of Reassociation response Rx's
+        IPW_ORD_STAT_RX_PROBE,  // # of probe Rx's
+        IPW_ORD_STAT_RX_PROBE_RESP,     // # of probe response Rx's
+        IPW_ORD_STAT_RX_BEACON, // # of Rx beacon
+        IPW_ORD_STAT_RX_ATIM,   // # of Rx ATIM
+        IPW_ORD_STAT_RX_DISASSN,        // # of disassociation Rx
+        IPW_ORD_STAT_RX_AUTH,   // # of authentication Rx
+        IPW_ORD_STAT_RX_DEAUTH, // # of deauthentication Rx
+
+        IPW_ORD_STAT_RX_TOTAL_BYTES = 101,// Total rx data bytes received
+        IPW_ORD_STAT_RX_ERR_CRC,         // # of packets with Rx CRC error
+        IPW_ORD_STAT_RX_ERR_CRC1,        // # of Rx CRC errors at 1MB
+        IPW_ORD_STAT_RX_ERR_CRC2,        // # of Rx CRC errors at 2MB
+        IPW_ORD_STAT_RX_ERR_CRC5_5,      // # of Rx CRC errors at 5.5MB
+        IPW_ORD_STAT_RX_ERR_CRC11,       // # of Rx CRC errors at 11MB
+
+        IPW_ORD_STAT_RX_DUPLICATE1 = 112, // # of duplicate rx packets at 1MB
+        IPW_ORD_STAT_RX_DUPLICATE2,      // # of duplicate rx packets at 2MB
+        IPW_ORD_STAT_RX_DUPLICATE5_5,    // # of duplicate rx packets at 5.5MB
+        IPW_ORD_STAT_RX_DUPLICATE11,     // # of duplicate rx packets at 11MB
+        IPW_ORD_STAT_RX_DUPLICATE = 119, // # of duplicate rx packets
+
+        IPW_ORD_PERS_DB_LOCK = 120,     // # locking fw permanent  db
+        IPW_ORD_PERS_DB_SIZE,   // # size of fw permanent  db
+        IPW_ORD_PERS_DB_ADDR,   // # address of fw permanent  db
+        IPW_ORD_STAT_RX_INVALID_PROTOCOL,       // # of rx frames with invalid protocol
+        IPW_ORD_SYS_BOOT_TIME,  // # Boot time
+        IPW_ORD_STAT_RX_NO_BUFFER,      // # of rx frames rejected due to no buffer
+        IPW_ORD_STAT_RX_ABORT_LATE_DMA, //NS // # of rx frames rejected due to dma setup too late
+        IPW_ORD_STAT_RX_ABORT_AT_HOP,   //NS // # of rx frames aborted due to hop
+        IPW_ORD_STAT_RX_MISSING_FRAG,   // # of rx frames dropped due to missing fragment
+        IPW_ORD_STAT_RX_ORPHAN_FRAG,    // # of rx frames dropped due to non-sequential fragment
+        IPW_ORD_STAT_RX_ORPHAN_FRAME,   // # of rx frames dropped due to unmatched 1st frame
+        IPW_ORD_STAT_RX_FRAG_AGEOUT,    // # of rx frames dropped due to uncompleted frame
+        IPW_ORD_STAT_RX_BAD_SSID,       //NS // Bad SSID (unused)
+        IPW_ORD_STAT_RX_ICV_ERRORS,     // # of ICV errors during decryption
+
+// PSP Statistics
+        IPW_ORD_STAT_PSP_SUSPENSION = 137,// # of times adapter suspended
+        IPW_ORD_STAT_PSP_BCN_TIMEOUT,   // # of beacon timeout
+        IPW_ORD_STAT_PSP_POLL_TIMEOUT,  // # of poll response timeouts
+        IPW_ORD_STAT_PSP_NONDIR_TIMEOUT,// # of timeouts waiting for last broadcast/muticast pkt
+        IPW_ORD_STAT_PSP_RX_DTIMS,      // # of PSP DTIMs received
+        IPW_ORD_STAT_PSP_RX_TIMS,       // # of PSP TIMs received
+        IPW_ORD_STAT_PSP_STATION_ID,    // PSP Station ID
+
+// Association and roaming
+        IPW_ORD_LAST_ASSN_TIME = 147,   // RTC time of last association
+        IPW_ORD_STAT_PERCENT_MISSED_BCNS,// current calculation of % missed beacons
+        IPW_ORD_STAT_PERCENT_RETRIES,   // current calculation of % missed tx retries
+        IPW_ORD_ASSOCIATED_AP_PTR,      // If associated, this is ptr to the associated
+        // AP table entry. set to 0 if not associated
+        IPW_ORD_AVAILABLE_AP_CNT,       // # of AP's decsribed in the AP table
+        IPW_ORD_AP_LIST_PTR,    // Ptr to list of available APs
+        IPW_ORD_STAT_AP_ASSNS,  // # of associations
+        IPW_ORD_STAT_ASSN_FAIL, // # of association failures
+        IPW_ORD_STAT_ASSN_RESP_FAIL,    // # of failuresdue to response fail
+        IPW_ORD_STAT_FULL_SCANS,        // # of full scans
+
+        IPW_ORD_CARD_DISABLED,  // # Card Disabled
+        IPW_ORD_STAT_ROAM_INHIBIT,      // # of times roaming was inhibited due to ongoing activity
+        IPW_FILLER_40,
+        IPW_ORD_RSSI_AT_ASSN = 160,     // RSSI of associated AP at time of association
+        IPW_ORD_STAT_ASSN_CAUSE1,       // # of reassociations due to no tx from AP in last N
+        // hops or no prob_ responses in last 3 minutes
+        IPW_ORD_STAT_ASSN_CAUSE2,       // # of reassociations due to poor tx/rx quality
+        IPW_ORD_STAT_ASSN_CAUSE3,       // # of reassociations due to tx/rx quality with excessive
+        // load at the AP
+        IPW_ORD_STAT_ASSN_CAUSE4,       // # of reassociations due to AP RSSI level fell below
+        // eligible group
+        IPW_ORD_STAT_ASSN_CAUSE5,       // # of reassociations due to load leveling
+        IPW_ORD_STAT_ASSN_CAUSE6,       //NS // # of reassociations due to dropped by Ap
+        IPW_FILLER_41,
+        IPW_FILLER_42,
+        IPW_FILLER_43,
+        IPW_ORD_STAT_AUTH_FAIL, // # of times authentication failed
+        IPW_ORD_STAT_AUTH_RESP_FAIL,    // # of times authentication response failed
+        IPW_ORD_STATION_TABLE_CNT,      // # of entries in association table
+
+// Other statistics
+        IPW_ORD_RSSI_AVG_CURR = 173,    // Current avg RSSI
+        IPW_ORD_STEST_RESULTS_CURR,     //NS // Current self test results word
+        IPW_ORD_STEST_RESULTS_CUM,      //NS // Cummulative self test results word
+        IPW_ORD_SELF_TEST_STATUS,       //NS //
+        IPW_ORD_POWER_MGMT_MODE,        // Power mode - 0=CAM, 1=PSP
+        IPW_ORD_POWER_MGMT_INDEX,       //NS //
+        IPW_ORD_COUNTRY_CODE,   // IEEE country code as recv'd from beacon
+        IPW_ORD_COUNTRY_CHANNELS,       // channels suported by country
+// IPW_ORD_COUNTRY_CHANNELS:
+// For 11b the lower 2-byte are used for channels from 1-14
+//   and the higher 2-byte are not used.
+        IPW_ORD_RESET_CNT,      // # of adapter resets (warm)
+        IPW_ORD_BEACON_INTERVAL,        // Beacon interval
+
+        IPW_ORD_PRINCETON_VERSION = 184,        //NS // Princeton Version
+        IPW_ORD_ANTENNA_DIVERSITY,      // TRUE if antenna diversity is disabled
+        IPW_ORD_CCA_RSSI,       //NS // CCA RSSI value (factory programmed)
+        IPW_ORD_STAT_EEPROM_UPDATE,     //NS // # of times config EEPROM updated
+        IPW_ORD_DTIM_PERIOD,    // # of beacon intervals between DTIMs
+        IPW_ORD_OUR_FREQ,       // current radio freq lower digits - channel ID
+
+        IPW_ORD_RTC_TIME = 190, // current RTC time
+        IPW_ORD_PORT_TYPE,      // operating mode
+        IPW_ORD_CURRENT_TX_RATE,        // current tx rate
+        IPW_ORD_SUPPORTED_RATES,        // Bitmap of supported tx rates
+        IPW_ORD_ATIM_WINDOW,    // current ATIM Window
+        IPW_ORD_BASIC_RATES,    // bitmap of basic tx rates
+        IPW_ORD_NIC_HIGHEST_RATE,       // bitmap of basic tx rates
+        IPW_ORD_AP_HIGHEST_RATE,        // bitmap of basic tx rates
+        IPW_ORD_CAPABILITIES,   // Management frame capability field
+        IPW_ORD_AUTH_TYPE,      // Type of authentication
+        IPW_ORD_RADIO_TYPE,     // Adapter card platform type
+        IPW_ORD_RTS_THRESHOLD = 201,    // Min length of packet after which RTS handshaking is used
+        IPW_ORD_INT_MODE,       // International mode
+        IPW_ORD_FRAGMENTATION_THRESHOLD,        // protocol frag threshold
+        IPW_ORD_EEPROM_SRAM_DB_BLOCK_START_ADDRESS,     // EEPROM offset in SRAM
+        IPW_ORD_EEPROM_SRAM_DB_BLOCK_SIZE,      // EEPROM size in SRAM
+        IPW_ORD_EEPROM_SKU_CAPABILITY,  // EEPROM SKU Capability    206 =
+        IPW_ORD_EEPROM_IBSS_11B_CHANNELS,       // EEPROM IBSS 11b channel set
+
+        IPW_ORD_MAC_VERSION = 209,      // MAC Version
+        IPW_ORD_MAC_REVISION,   // MAC Revision
+        IPW_ORD_RADIO_VERSION,  // Radio Version
+        IPW_ORD_NIC_MANF_DATE_TIME,     // MANF Date/Time STAMP
+        IPW_ORD_UCODE_VERSION,  // Ucode Version
+        IPW_ORD_HW_RF_SWITCH_STATE = 214,       // HW RF Kill Switch State
+} ORDINALTABLE1;
+
+// ordinal table 2
+// Variable length data:
+#define IPW_FIRST_VARIABLE_LENGTH_ORDINAL   1001
+
+typedef enum _ORDINAL_TABLE_2 { // NS - means Not Supported by FW
+        IPW_ORD_STAT_BASE = 1000,       // contains number of variable ORDs
+        IPW_ORD_STAT_ADAPTER_MAC = 1001,        // 6 bytes: our adapter MAC address
+        IPW_ORD_STAT_PREFERRED_BSSID = 1002,    // 6 bytes: BSSID of the preferred AP
+        IPW_ORD_STAT_MANDATORY_BSSID = 1003,    // 6 bytes: BSSID of the mandatory AP
+        IPW_FILL_1,             //NS //
+        IPW_ORD_STAT_COUNTRY_TEXT = 1005,       // 36 bytes: Country name text, First two bytes are Country code
+        IPW_ORD_STAT_ASSN_SSID = 1006,  // 32 bytes: ESSID String
+        IPW_ORD_STATION_TABLE = 1007,   // ? bytes: Station/AP table (via Direct SSID Scans)
+        IPW_ORD_STAT_SWEEP_TABLE = 1008,        // ? bytes: Sweep/Host Table table (via Broadcast Scans)
+        IPW_ORD_STAT_ROAM_LOG = 1009,   // ? bytes: Roaming log
+        IPW_ORD_STAT_RATE_LOG = 1010,   //NS // 0 bytes: Rate log
+        IPW_ORD_STAT_FIFO = 1011,       //NS // 0 bytes: Fifo buffer data structures
+        IPW_ORD_STAT_FW_VER_NUM = 1012, // 14 bytes: fw version ID string as in (a.bb.ccc; "0.08.011")
+        IPW_ORD_STAT_FW_DATE = 1013,    // 14 bytes: fw date string (mmm dd yyyy; "Mar 13 2002")
+        IPW_ORD_STAT_ASSN_AP_BSSID = 1014,      // 6 bytes: MAC address of associated AP
+        IPW_ORD_STAT_DEBUG = 1015,      //NS // ? bytes:
+        IPW_ORD_STAT_NIC_BPA_NUM = 1016,        // 11 bytes: NIC BPA number in ASCII
+        IPW_ORD_STAT_UCODE_DATE = 1017, // 5 bytes: uCode date
+        IPW_ORD_SECURITY_NGOTIATION_RESULT = 1018,
+} ORDINALTABLE2;                // NS - means Not Supported by FW
+
+#define IPW_LAST_VARIABLE_LENGTH_ORDINAL   1018
+
+#ifndef WIRELESS_SPY
+#define WIRELESS_SPY            // enable iwspy support
+#endif
+
+#define IPW_HOST_FW_SHARED_AREA0        0x0002f200
+#define IPW_HOST_FW_SHARED_AREA0_END    0x0002f510      // 0x310 bytes
+
+#define IPW_HOST_FW_SHARED_AREA1        0x0002f610
+#define IPW_HOST_FW_SHARED_AREA1_END    0x0002f630      // 0x20 bytes
+
+#define IPW_HOST_FW_SHARED_AREA2        0x0002fa00
+#define IPW_HOST_FW_SHARED_AREA2_END    0x0002fa20      // 0x20 bytes
+
+#define IPW_HOST_FW_SHARED_AREA3        0x0002fc00
+#define IPW_HOST_FW_SHARED_AREA3_END    0x0002fc10      // 0x10 bytes
+
+#define IPW_HOST_FW_INTERRUPT_AREA      0x0002ff80
+#define IPW_HOST_FW_INTERRUPT_AREA_END  0x00030000      // 0x80 bytes
+
+struct ipw2100_fw_chunk {
+        unsigned char *buf;
+        long len;
+        long pos;
+        struct list_head list;
+};
+
+struct ipw2100_fw_chunk_set {
+        const void *data;
+        unsigned long size;
+};
+
+struct ipw2100_fw {
+        int version;
+        struct ipw2100_fw_chunk_set fw;
+        struct ipw2100_fw_chunk_set uc;
+        const struct firmware *fw_entry;
+};
+
+#define MAX_FW_VERSION_LEN 14
+
+#endif /* _IPW2100_H */
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
new file mode 100644
index 000000000000..b7f275c00de3
--- /dev/null
+++ b/drivers/net/wireless/ipw2200.c
@@ -0,0 +1,7383 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
+
+  802.11 status code portion of this file from ethereal-0.10.6:
+    Copyright 2000, Axis Communications AB
+    Ethereal - Network traffic analyzer
+    By Gerald Combs <gerald@ethereal.com>
+    Copyright 1998 Gerald Combs
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+#include "ipw2200.h"
+
+#define IPW2200_VERSION "1.0.0"
+#define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2200/2915 Network Driver"
+#define DRV_COPYRIGHT   "Copyright(c) 2003-2004 Intel Corporation"
+#define DRV_VERSION     IPW2200_VERSION
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT);
+MODULE_LICENSE("GPL");
+
+static int debug = 0;
+static int channel = 0;
+static char *ifname;
+static int mode = 0;
+
+static u32 ipw_debug_level;
+static int associate = 1;
+static int auto_create = 1;
+static int disable = 0;
+static const char ipw_modes[] = {
+        'a', 'b', 'g', '?'
+};
+
+static void ipw_rx(struct ipw_priv *priv);
+static int ipw_queue_tx_reclaim(struct ipw_priv *priv,
+                                struct clx2_tx_queue *txq, int qindex);
+static int ipw_queue_reset(struct ipw_priv *priv);
+
+static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,
+                             int len, int sync);
+
+static void ipw_tx_queue_free(struct ipw_priv *);
+
+static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *);
+static void ipw_rx_queue_free(struct ipw_priv *, struct ipw_rx_queue *);
+static void ipw_rx_queue_replenish(void *);
+
+static int ipw_up(struct ipw_priv *);
+static void ipw_down(struct ipw_priv *);
+static int ipw_config(struct ipw_priv *);
+static int init_supported_rates(struct ipw_priv *priv,
+                                struct ipw_supported_rates *prates);
+
+static u8 band_b_active_channel[MAX_B_CHANNELS] = {
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0
+};
+static u8 band_a_active_channel[MAX_A_CHANNELS] = {
+        36, 40, 44, 48, 149, 153, 157, 161, 165, 52, 56, 60, 64, 0
+};
+
+static int is_valid_channel(int mode_mask, int channel)
+{
+        int i;
+
+        if (!channel)
+                return 0;
+
+        if (mode_mask & IEEE_A)
+                for (i = 0; i < MAX_A_CHANNELS; i++)
+                        if (band_a_active_channel[i] == channel)
+                                return IEEE_A;
+
+        if (mode_mask & (IEEE_B | IEEE_G))
+                for (i = 0; i < MAX_B_CHANNELS; i++)
+                        if (band_b_active_channel[i] == channel)
+                                return mode_mask & (IEEE_B | IEEE_G);
+
+        return 0;
+}
+
+static char *snprint_line(char *buf, size_t count,
+                          const u8 * data, u32 len, u32 ofs)
+{
+        int out, i, j, l;
+        char c;
+
+        out = snprintf(buf, count, "%08X", ofs);
+
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++)
+                        out += snprintf(buf + out, count - out, "%02X ",
+                                        data[(i * 8 + j)]);
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, "   ");
+        }
+
+        out += snprintf(buf + out, count - out, " ");
+        for (l = 0, i = 0; i < 2; i++) {
+                out += snprintf(buf + out, count - out, " ");
+                for (j = 0; j < 8 && l < len; j++, l++) {
+                        c = data[(i * 8 + j)];
+                        if (!isascii(c) || !isprint(c))
+                                c = '.';
+
+                        out += snprintf(buf + out, count - out, "%c", c);
+                }
+
+                for (; j < 8; j++)
+                        out += snprintf(buf + out, count - out, " ");
+        }
+
+        return buf;
+}
+
+static void printk_buf(int level, const u8 * data, u32 len)
+{
+        char line[81];
+        u32 ofs = 0;
+        if (!(ipw_debug_level & level))
+                return;
+
+        while (len) {
+                printk(KERN_DEBUG "%s\n",
+                       snprint_line(line, sizeof(line), &data[ofs],
+                                    min(len, 16U), ofs));
+                ofs += 16;
+                len -= min(len, 16U);
+        }
+}
+
+static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg);
+#define ipw_read_reg32(a, b) _ipw_read_reg32(a, b)
+
+static u8 _ipw_read_reg8(struct ipw_priv *ipw, u32 reg);
+#define ipw_read_reg8(a, b) _ipw_read_reg8(a, b)
+
+static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value);
+static inline void ipw_write_reg8(struct ipw_priv *a, u32 b, u8 c)
+{
+        IPW_DEBUG_IO("%s %d: write_indirect8(0x%08X, 0x%08X)\n", __FILE__,
+                     __LINE__, (u32) (b), (u32) (c));
+        _ipw_write_reg8(a, b, c);
+}
+
+static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value);
+static inline void ipw_write_reg16(struct ipw_priv *a, u32 b, u16 c)
+{
+        IPW_DEBUG_IO("%s %d: write_indirect16(0x%08X, 0x%08X)\n", __FILE__,
+                     __LINE__, (u32) (b), (u32) (c));
+        _ipw_write_reg16(a, b, c);
+}
+
+static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value);
+static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c)
+{
+        IPW_DEBUG_IO("%s %d: write_indirect32(0x%08X, 0x%08X)\n", __FILE__,
+                     __LINE__, (u32) (b), (u32) (c));
+        _ipw_write_reg32(a, b, c);
+}
+
+#define _ipw_write8(ipw, ofs, val) writeb((val), (ipw)->hw_base + (ofs))
+#define ipw_write8(ipw, ofs, val) \
+ IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
+ _ipw_write8(ipw, ofs, val)
+
+#define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs))
+#define ipw_write16(ipw, ofs, val) \
+ IPW_DEBUG_IO("%s %d: write_direct16(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
+ _ipw_write16(ipw, ofs, val)
+
+#define _ipw_write32(ipw, ofs, val) writel((val), (ipw)->hw_base + (ofs))
+#define ipw_write32(ipw, ofs, val) \
+ IPW_DEBUG_IO("%s %d: write_direct32(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
+ _ipw_write32(ipw, ofs, val)
+
+#define _ipw_read8(ipw, ofs) readb((ipw)->hw_base + (ofs))
+static inline u8 __ipw_read8(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
+{
+        IPW_DEBUG_IO("%s %d: read_direct8(0x%08X)\n", f, l, (u32) (ofs));
+        return _ipw_read8(ipw, ofs);
+}
+
+#define ipw_read8(ipw, ofs) __ipw_read8(__FILE__, __LINE__, ipw, ofs)
+
+#define _ipw_read16(ipw, ofs) readw((ipw)->hw_base + (ofs))
+static inline u16 __ipw_read16(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
+{
+        IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", f, l, (u32) (ofs));
+        return _ipw_read16(ipw, ofs);
+}
+
+#define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)
+
+#define _ipw_read32(ipw, ofs) readl((ipw)->hw_base + (ofs))
+static inline u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
+{
+        IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32) (ofs));
+        return _ipw_read32(ipw, ofs);
+}
+
+#define ipw_read32(ipw, ofs) __ipw_read32(__FILE__, __LINE__, ipw, ofs)
+
+static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);
+#define ipw_read_indirect(a, b, c, d) \
+        IPW_DEBUG_IO("%s %d: read_inddirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \
+        _ipw_read_indirect(a, b, c, d)
+
+static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * data,
+                                int num);
+#define ipw_write_indirect(a, b, c, d) \
+        IPW_DEBUG_IO("%s %d: write_indirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \
+        _ipw_write_indirect(a, b, c, d)
+
+/* indirect write s */
+static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value)
+{
+        IPW_DEBUG_IO(" %p : reg = 0x%8X : value = 0x%8X\n", priv, reg, value);
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg);
+        _ipw_write32(priv, CX2_INDIRECT_DATA, value);
+}
+
+static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value)
+{
+        IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
+        _ipw_write8(priv, CX2_INDIRECT_DATA, value);
+        IPW_DEBUG_IO(" reg = 0x%8lX : value = 0x%8X\n",
+                     (unsigned long)(priv->hw_base + CX2_INDIRECT_DATA), value);
+}
+
+static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value)
+{
+        IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
+        _ipw_write16(priv, CX2_INDIRECT_DATA, value);
+}
+
+/* indirect read s */
+
+static u8 _ipw_read_reg8(struct ipw_priv *priv, u32 reg)
+{
+        u32 word;
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg & CX2_INDIRECT_ADDR_MASK);
+        IPW_DEBUG_IO(" reg = 0x%8X : \n", reg);
+        word = _ipw_read32(priv, CX2_INDIRECT_DATA);
+        return (word >> ((reg & 0x3) * 8)) & 0xff;
+}
+
+static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg)
+{
+        u32 value;
+
+        IPW_DEBUG_IO("%p : reg = 0x%08x\n", priv, reg);
+
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, reg);
+        value = _ipw_read32(priv, CX2_INDIRECT_DATA);
+        IPW_DEBUG_IO(" reg = 0x%4X : value = 0x%4x \n", reg, value);
+        return value;
+}
+
+/* iterative/auto-increment 32 bit reads and writes */
+static void _ipw_read_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
+                               int num)
+{
+        u32 aligned_addr = addr & CX2_INDIRECT_ADDR_MASK;
+        u32 dif_len = addr - aligned_addr;
+        u32 aligned_len;
+        u32 i;
+
+        IPW_DEBUG_IO("addr = %i, buf = %p, num = %i\n", addr, buf, num);
+
+        /* Read the first nibble byte by byte */
+        if (unlikely(dif_len)) {
+                /* Start reading at aligned_addr + dif_len */
+                _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        *buf = _ipw_read8(priv, CX2_INDIRECT_DATA + i);
+                num -= dif_len;
+                aligned_addr += 4;
+        }
+
+        /* Read DWs through autoinc register */
+        _ipw_write32(priv, CX2_AUTOINC_ADDR, aligned_addr);
+        aligned_len = num & CX2_INDIRECT_ADDR_MASK;
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                *(u32 *) buf = ipw_read32(priv, CX2_AUTOINC_DATA);
+
+        /* Copy the last nibble */
+        dif_len = num - aligned_len;
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                *buf = ipw_read8(priv, CX2_INDIRECT_DATA + i);
+}
+
+static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
+                                int num)
+{
+        u32 aligned_addr = addr & CX2_INDIRECT_ADDR_MASK;
+        u32 dif_len = addr - aligned_addr;
+        u32 aligned_len;
+        u32 i;
+
+        IPW_DEBUG_IO("addr = %i, buf = %p, num = %i\n", addr, buf, num);
+
+        /* Write the first nibble byte by byte */
+        if (unlikely(dif_len)) {
+                /* Start writing at aligned_addr + dif_len */
+                _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+                for (i = dif_len; i < 4; i++, buf++)
+                        _ipw_write8(priv, CX2_INDIRECT_DATA + i, *buf);
+                num -= dif_len;
+                aligned_addr += 4;
+        }
+
+        /* Write DWs through autoinc register */
+        _ipw_write32(priv, CX2_AUTOINC_ADDR, aligned_addr);
+        aligned_len = num & CX2_INDIRECT_ADDR_MASK;
+        for (i = 0; i < aligned_len; i += 4, buf += 4, aligned_addr += 4)
+                _ipw_write32(priv, CX2_AUTOINC_DATA, *(u32 *) buf);
+
+        /* Copy the last nibble */
+        dif_len = num - aligned_len;
+        _ipw_write32(priv, CX2_INDIRECT_ADDR, aligned_addr);
+        for (i = 0; i < dif_len; i++, buf++)
+                _ipw_write8(priv, CX2_INDIRECT_DATA + i, *buf);
+}
+
+static void ipw_write_direct(struct ipw_priv *priv, u32 addr, void *buf,
+                             int num)
+{
+        memcpy_toio((priv->hw_base + addr), buf, num);
+}
+
+static inline void ipw_set_bit(struct ipw_priv *priv, u32 reg, u32 mask)
+{
+        ipw_write32(priv, reg, ipw_read32(priv, reg) | mask);
+}
+
+static inline void ipw_clear_bit(struct ipw_priv *priv, u32 reg, u32 mask)
+{
+        ipw_write32(priv, reg, ipw_read32(priv, reg) & ~mask);
+}
+
+static inline void ipw_enable_interrupts(struct ipw_priv *priv)
+{
+        if (priv->status & STATUS_INT_ENABLED)
+                return;
+        priv->status |= STATUS_INT_ENABLED;
+        ipw_write32(priv, CX2_INTA_MASK_R, CX2_INTA_MASK_ALL);
+}
+
+static inline void ipw_disable_interrupts(struct ipw_priv *priv)
+{
+        if (!(priv->status & STATUS_INT_ENABLED))
+                return;
+        priv->status &= ~STATUS_INT_ENABLED;
+        ipw_write32(priv, CX2_INTA_MASK_R, ~CX2_INTA_MASK_ALL);
+}
+
+static char *ipw_error_desc(u32 val)
+{
+        switch (val) {
+        case IPW_FW_ERROR_OK:
+                return "ERROR_OK";
+        case IPW_FW_ERROR_FAIL:
+                return "ERROR_FAIL";
+        case IPW_FW_ERROR_MEMORY_UNDERFLOW:
+                return "MEMORY_UNDERFLOW";
+        case IPW_FW_ERROR_MEMORY_OVERFLOW:
+                return "MEMORY_OVERFLOW";
+        case IPW_FW_ERROR_BAD_PARAM:
+                return "ERROR_BAD_PARAM";
+        case IPW_FW_ERROR_BAD_CHECKSUM:
+                return "ERROR_BAD_CHECKSUM";
+        case IPW_FW_ERROR_NMI_INTERRUPT:
+                return "ERROR_NMI_INTERRUPT";
+        case IPW_FW_ERROR_BAD_DATABASE:
+                return "ERROR_BAD_DATABASE";
+        case IPW_FW_ERROR_ALLOC_FAIL:
+                return "ERROR_ALLOC_FAIL";
+        case IPW_FW_ERROR_DMA_UNDERRUN:
+                return "ERROR_DMA_UNDERRUN";
+        case IPW_FW_ERROR_DMA_STATUS:
+                return "ERROR_DMA_STATUS";
+        case IPW_FW_ERROR_DINOSTATUS_ERROR:
+                return "ERROR_DINOSTATUS_ERROR";
+        case IPW_FW_ERROR_EEPROMSTATUS_ERROR:
+                return "ERROR_EEPROMSTATUS_ERROR";
+        case IPW_FW_ERROR_SYSASSERT:
+                return "ERROR_SYSASSERT";
+        case IPW_FW_ERROR_FATAL_ERROR:
+                return "ERROR_FATALSTATUS_ERROR";
+        default:
+                return "UNKNOWNSTATUS_ERROR";
+        }
+}
+
+static void ipw_dump_nic_error_log(struct ipw_priv *priv)
+{
+        u32 desc, time, blink1, blink2, ilink1, ilink2, idata, i, count, base;
+
+        base = ipw_read32(priv, IPWSTATUS_ERROR_LOG);
+        count = ipw_read_reg32(priv, base);
+
+        if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
+                IPW_ERROR("Start IPW Error Log Dump:\n");
+                IPW_ERROR("Status: 0x%08X, Config: %08X\n",
+                          priv->status, priv->config);
+        }
+
+        for (i = ERROR_START_OFFSET;
+             i <= count * ERROR_ELEM_SIZE; i += ERROR_ELEM_SIZE) {
+                desc = ipw_read_reg32(priv, base + i);
+                time = ipw_read_reg32(priv, base + i + 1 * sizeof(u32));
+                blink1 = ipw_read_reg32(priv, base + i + 2 * sizeof(u32));
+                blink2 = ipw_read_reg32(priv, base + i + 3 * sizeof(u32));
+                ilink1 = ipw_read_reg32(priv, base + i + 4 * sizeof(u32));
+                ilink2 = ipw_read_reg32(priv, base + i + 5 * sizeof(u32));
+                idata = ipw_read_reg32(priv, base + i + 6 * sizeof(u32));
+
+                IPW_ERROR("%s %i 0x%08x  0x%08x  0x%08x  0x%08x  0x%08x\n",
+                          ipw_error_desc(desc), time, blink1, blink2,
+                          ilink1, ilink2, idata);
+        }
+}
+
+static void ipw_dump_nic_event_log(struct ipw_priv *priv)
+{
+        u32 ev, time, data, i, count, base;
+
+        base = ipw_read32(priv, IPW_EVENT_LOG);
+        count = ipw_read_reg32(priv, base);
+
+        if (EVENT_START_OFFSET <= count * EVENT_ELEM_SIZE)
+                IPW_ERROR("Start IPW Event Log Dump:\n");
+
+        for (i = EVENT_START_OFFSET;
+             i <= count * EVENT_ELEM_SIZE; i += EVENT_ELEM_SIZE) {
+                ev = ipw_read_reg32(priv, base + i);
+                time = ipw_read_reg32(priv, base + i + 1 * sizeof(u32));
+                data = ipw_read_reg32(priv, base + i + 2 * sizeof(u32));
+
+#ifdef CONFIG_IPW_DEBUG
+                IPW_ERROR("%i\t0x%08x\t%i\n", time, data, ev);
+#endif
+        }
+}
+
+static int ipw_get_ordinal(struct ipw_priv *priv, u32 ord, void *val, u32 * len)
+{
+        u32 addr, field_info, field_len, field_count, total_len;
+
+        IPW_DEBUG_ORD("ordinal = %i\n", ord);
+
+        if (!priv || !val || !len) {
+                IPW_DEBUG_ORD("Invalid argument\n");
+                return -EINVAL;
+        }
+
+        /* verify device ordinal tables have been initialized */
+        if (!priv->table0_addr || !priv->table1_addr || !priv->table2_addr) {
+                IPW_DEBUG_ORD("Access ordinals before initialization\n");
+                return -EINVAL;
+        }
+
+        switch (IPW_ORD_TABLE_ID_MASK & ord) {
+        case IPW_ORD_TABLE_0_MASK:
+                /*
+                 * TABLE 0: Direct access to a table of 32 bit values
+                 *
+                 * This is a very simple table with the data directly
+                 * read from the table
+                 */
+
+                /* remove the table id from the ordinal */
+                ord &= IPW_ORD_TABLE_VALUE_MASK;
+
+                /* boundary check */
+                if (ord > priv->table0_len) {
+                        IPW_DEBUG_ORD("ordinal value (%i) longer then "
+                                      "max (%i)\n", ord, priv->table0_len);
+                        return -EINVAL;
+                }
+
+                /* verify we have enough room to store the value */
+                if (*len < sizeof(u32)) {
+                        IPW_DEBUG_ORD("ordinal buffer length too small, "
+                                      "need %zd\n", sizeof(u32));
+                        return -EINVAL;
+                }
+
+                IPW_DEBUG_ORD("Reading TABLE0[%i] from offset 0x%08x\n",
+                              ord, priv->table0_addr + (ord << 2));
+
+                *len = sizeof(u32);
+                ord <<= 2;
+                *((u32 *) val) = ipw_read32(priv, priv->table0_addr + ord);
+                break;
+
+        case IPW_ORD_TABLE_1_MASK:
+                /*
+                 * TABLE 1: Indirect access to a table of 32 bit values
+                 *
+                 * This is a fairly large table of u32 values each
+                 * representing starting addr for the data (which is
+                 * also a u32)
+                 */
+
+                /* remove the table id from the ordinal */
+                ord &= IPW_ORD_TABLE_VALUE_MASK;
+
+                /* boundary check */
+                if (ord > priv->table1_len) {
+                        IPW_DEBUG_ORD("ordinal value too long\n");
+                        return -EINVAL;
+                }
+
+                /* verify we have enough room to store the value */
+                if (*len < sizeof(u32)) {
+                        IPW_DEBUG_ORD("ordinal buffer length too small, "
+                                      "need %zd\n", sizeof(u32));
+                        return -EINVAL;
+                }
+
+                *((u32 *) val) =
+                    ipw_read_reg32(priv, (priv->table1_addr + (ord << 2)));
+                *len = sizeof(u32);
+                break;
+
+        case IPW_ORD_TABLE_2_MASK:
+                /*
+                 * TABLE 2: Indirect access to a table of variable sized values
+                 *
+                 * This table consist of six values, each containing
+                 *     - dword containing the starting offset of the data
+                 *     - dword containing the lengh in the first 16bits
+                 *       and the count in the second 16bits
+                 */
+
+                /* remove the table id from the ordinal */
+                ord &= IPW_ORD_TABLE_VALUE_MASK;
+
+                /* boundary check */
+                if (ord > priv->table2_len) {
+                        IPW_DEBUG_ORD("ordinal value too long\n");
+                        return -EINVAL;
+                }
+
+                /* get the address of statistic */
+                addr = ipw_read_reg32(priv, priv->table2_addr + (ord << 3));
+
+                /* get the second DW of statistics ;
+                 * two 16-bit words - first is length, second is count */
+                field_info =
+                    ipw_read_reg32(priv,
+                                   priv->table2_addr + (ord << 3) +
+                                   sizeof(u32));
+
+                /* get each entry length */
+                field_len = *((u16 *) & field_info);
+
+                /* get number of entries */
+                field_count = *(((u16 *) & field_info) + 1);
+
+                /* abort if not enought memory */
+                total_len = field_len * field_count;
+                if (total_len > *len) {
+                        *len = total_len;
+                        return -EINVAL;
+                }
+
+                *len = total_len;
+                if (!total_len)
+                        return 0;
+
+                IPW_DEBUG_ORD("addr = 0x%08x, total_len = %i, "
+                              "field_info = 0x%08x\n",
+                              addr, total_len, field_info);
+                ipw_read_indirect(priv, addr, val, total_len);
+                break;
+
+        default:
+                IPW_DEBUG_ORD("Invalid ordinal!\n");
+                return -EINVAL;
+
+        }
+
+        return 0;
+}
+
+static void ipw_init_ordinals(struct ipw_priv *priv)
+{
+        priv->table0_addr = IPW_ORDINALS_TABLE_LOWER;
+        priv->table0_len = ipw_read32(priv, priv->table0_addr);
+
+        IPW_DEBUG_ORD("table 0 offset at 0x%08x, len = %i\n",
+                      priv->table0_addr, priv->table0_len);
+
+        priv->table1_addr = ipw_read32(priv, IPW_ORDINALS_TABLE_1);
+        priv->table1_len = ipw_read_reg32(priv, priv->table1_addr);
+
+        IPW_DEBUG_ORD("table 1 offset at 0x%08x, len = %i\n",
+                      priv->table1_addr, priv->table1_len);
+
+        priv->table2_addr = ipw_read32(priv, IPW_ORDINALS_TABLE_2);
+        priv->table2_len = ipw_read_reg32(priv, priv->table2_addr);
+        priv->table2_len &= 0x0000ffff; /* use first two bytes */
+
+        IPW_DEBUG_ORD("table 2 offset at 0x%08x, len = %i\n",
+                      priv->table2_addr, priv->table2_len);
+
+}
+
+/*
+ * The following adds a new attribute to the sysfs representation
+ * of this device driver (i.e. a new file in /sys/bus/pci/drivers/ipw/)
+ * used for controling the debug level.
+ *
+ * See the level definitions in ipw for details.
+ */
+static ssize_t show_debug_level(struct device_driver *d, char *buf)
+{
+        return sprintf(buf, "0x%08X\n", ipw_debug_level);
+}
+static ssize_t store_debug_level(struct device_driver *d,
+                                 const char *buf, size_t count)
+{
+        char *p = (char *)buf;
+        u32 val;
+
+        if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
+                p++;
+                if (p[0] == 'x' || p[0] == 'X')
+                        p++;
+                val = simple_strtoul(p, &p, 16);
+        } else
+                val = simple_strtoul(p, &p, 10);
+        if (p == buf)
+                printk(KERN_INFO DRV_NAME
+                       ": %s is not in hex or decimal form.\n", buf);
+        else
+                ipw_debug_level = val;
+
+        return strnlen(buf, count);
+}
+
+static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
+                   show_debug_level, store_debug_level);
+
+static ssize_t show_status(struct device *d,
+                           struct device_attribute *attr, char *buf)
+{
+        struct ipw_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->status);
+}
+
+static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
+
+static ssize_t show_cfg(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        struct ipw_priv *p = d->driver_data;
+        return sprintf(buf, "0x%08x\n", (int)p->config);
+}
+
+static DEVICE_ATTR(cfg, S_IRUGO, show_cfg, NULL);
+
+static ssize_t show_nic_type(struct device *d,
+                             struct device_attribute *attr, char *buf)
+{
+        struct ipw_priv *p = d->driver_data;
+        u8 type = p->eeprom[EEPROM_NIC_TYPE];
+
+        switch (type) {
+        case EEPROM_NIC_TYPE_STANDARD:
+                return sprintf(buf, "STANDARD\n");
+        case EEPROM_NIC_TYPE_DELL:
+                return sprintf(buf, "DELL\n");
+        case EEPROM_NIC_TYPE_FUJITSU:
+                return sprintf(buf, "FUJITSU\n");
+        case EEPROM_NIC_TYPE_IBM:
+                return sprintf(buf, "IBM\n");
+        case EEPROM_NIC_TYPE_HP:
+                return sprintf(buf, "HP\n");
+        }
+
+        return sprintf(buf, "UNKNOWN\n");
+}
+
+static DEVICE_ATTR(nic_type, S_IRUGO, show_nic_type, NULL);
+
+static ssize_t dump_error_log(struct device *d,
+                              struct device_attribute *attr, const char *buf,
+                              size_t count)
+{
+        char *p = (char *)buf;
+
+        if (p[0] == '1')
+                ipw_dump_nic_error_log((struct ipw_priv *)d->driver_data);
+
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, dump_error_log);
+
+static ssize_t dump_event_log(struct device *d,
+                              struct device_attribute *attr, const char *buf,
+                              size_t count)
+{
+        char *p = (char *)buf;
+
+        if (p[0] == '1')
+                ipw_dump_nic_event_log((struct ipw_priv *)d->driver_data);
+
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
+
+static ssize_t show_ucode_version(struct device *d,
+                                  struct device_attribute *attr, char *buf)
+{
+        u32 len = sizeof(u32), tmp = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        if (ipw_get_ordinal(p, IPW_ORD_STAT_UCODE_VERSION, &tmp, &len))
+                return 0;
+
+        return sprintf(buf, "0x%08x\n", tmp);
+}
+
+static DEVICE_ATTR(ucode_version, S_IWUSR | S_IRUGO, show_ucode_version, NULL);
+
+static ssize_t show_rtc(struct device *d, struct device_attribute *attr,
+                        char *buf)
+{
+        u32 len = sizeof(u32), tmp = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        if (ipw_get_ordinal(p, IPW_ORD_STAT_RTC, &tmp, &len))
+                return 0;
+
+        return sprintf(buf, "0x%08x\n", tmp);
+}
+
+static DEVICE_ATTR(rtc, S_IWUSR | S_IRUGO, show_rtc, NULL);
+
+/*
+ * Add a device attribute to view/control the delay between eeprom
+ * operations.
+ */
+static ssize_t show_eeprom_delay(struct device *d,
+                                 struct device_attribute *attr, char *buf)
+{
+        int n = ((struct ipw_priv *)d->driver_data)->eeprom_delay;
+        return sprintf(buf, "%i\n", n);
+}
+static ssize_t store_eeprom_delay(struct device *d,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct ipw_priv *p = d->driver_data;
+        sscanf(buf, "%i", &p->eeprom_delay);
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(eeprom_delay, S_IWUSR | S_IRUGO,
+                   show_eeprom_delay, store_eeprom_delay);
+
+static ssize_t show_command_event_reg(struct device *d,
+                                      struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        reg = ipw_read_reg32(p, CX2_INTERNAL_CMD_EVENT);
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_command_event_reg(struct device *d,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
+{
+        u32 reg;
+        struct ipw_priv *p = d->driver_data;
+
+        sscanf(buf, "%x", &reg);
+        ipw_write_reg32(p, CX2_INTERNAL_CMD_EVENT, reg);
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(command_event_reg, S_IWUSR | S_IRUGO,
+                   show_command_event_reg, store_command_event_reg);
+
+static ssize_t show_mem_gpio_reg(struct device *d,
+                                 struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *p = d->driver_data;
+
+        reg = ipw_read_reg32(p, 0x301100);
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_mem_gpio_reg(struct device *d,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        u32 reg;
+        struct ipw_priv *p = d->driver_data;
+
+        sscanf(buf, "%x", &reg);
+        ipw_write_reg32(p, 0x301100, reg);
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(mem_gpio_reg, S_IWUSR | S_IRUGO,
+                   show_mem_gpio_reg, store_mem_gpio_reg);
+
+static ssize_t show_indirect_dword(struct device *d,
+                                   struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *priv = d->driver_data;
+        if (priv->status & STATUS_INDIRECT_DWORD)
+                reg = ipw_read_reg32(priv, priv->indirect_dword);
+        else
+                reg = 0;
+
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_indirect_dword(struct device *d,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+
+        sscanf(buf, "%x", &priv->indirect_dword);
+        priv->status |= STATUS_INDIRECT_DWORD;
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(indirect_dword, S_IWUSR | S_IRUGO,
+                   show_indirect_dword, store_indirect_dword);
+
+static ssize_t show_indirect_byte(struct device *d,
+                                  struct device_attribute *attr, char *buf)
+{
+        u8 reg = 0;
+        struct ipw_priv *priv = d->driver_data;
+        if (priv->status & STATUS_INDIRECT_BYTE)
+                reg = ipw_read_reg8(priv, priv->indirect_byte);
+        else
+                reg = 0;
+
+        return sprintf(buf, "0x%02x\n", reg);
+}
+static ssize_t store_indirect_byte(struct device *d,
+                                   struct device_attribute *attr,
+                                   const char *buf, size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+
+        sscanf(buf, "%x", &priv->indirect_byte);
+        priv->status |= STATUS_INDIRECT_BYTE;
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(indirect_byte, S_IWUSR | S_IRUGO,
+                   show_indirect_byte, store_indirect_byte);
+
+static ssize_t show_direct_dword(struct device *d,
+                                 struct device_attribute *attr, char *buf)
+{
+        u32 reg = 0;
+        struct ipw_priv *priv = d->driver_data;
+
+        if (priv->status & STATUS_DIRECT_DWORD)
+                reg = ipw_read32(priv, priv->direct_dword);
+        else
+                reg = 0;
+
+        return sprintf(buf, "0x%08x\n", reg);
+}
+static ssize_t store_direct_dword(struct device *d,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+
+        sscanf(buf, "%x", &priv->direct_dword);
+        priv->status |= STATUS_DIRECT_DWORD;
+        return strnlen(buf, count);
+}
+
+static DEVICE_ATTR(direct_dword, S_IWUSR | S_IRUGO,
+                   show_direct_dword, store_direct_dword);
+
+static inline int rf_kill_active(struct ipw_priv *priv)
+{
+        if (0 == (ipw_read32(priv, 0x30) & 0x10000))
+                priv->status |= STATUS_RF_KILL_HW;
+        else
+                priv->status &= ~STATUS_RF_KILL_HW;
+
+        return (priv->status & STATUS_RF_KILL_HW) ? 1 : 0;
+}
+
+static ssize_t show_rf_kill(struct device *d, struct device_attribute *attr,
+                            char *buf)
+{
+        /* 0 - RF kill not enabled
+           1 - SW based RF kill active (sysfs)
+           2 - HW based RF kill active
+           3 - Both HW and SW baed RF kill active */
+        struct ipw_priv *priv = d->driver_data;
+        int val = ((priv->status & STATUS_RF_KILL_SW) ? 0x1 : 0x0) |
+            (rf_kill_active(priv) ? 0x2 : 0x0);
+        return sprintf(buf, "%i\n", val);
+}
+
+static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)
+{
+        if ((disable_radio ? 1 : 0) ==
+            (priv->status & STATUS_RF_KILL_SW ? 1 : 0))
+                return 0;
+
+        IPW_DEBUG_RF_KILL("Manual SW RF Kill set to: RADIO  %s\n",
+                          disable_radio ? "OFF" : "ON");
+
+        if (disable_radio) {
+                priv->status |= STATUS_RF_KILL_SW;
+
+                if (priv->workqueue) {
+                        cancel_delayed_work(&priv->request_scan);
+                }
+                wake_up_interruptible(&priv->wait_command_queue);
+                queue_work(priv->workqueue, &priv->down);
+        } else {
+                priv->status &= ~STATUS_RF_KILL_SW;
+                if (rf_kill_active(priv)) {
+                        IPW_DEBUG_RF_KILL("Can not turn radio back on - "
+                                          "disabled by HW switch\n");
+                        /* Make sure the RF_KILL check timer is running */
+                        cancel_delayed_work(&priv->rf_kill);
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
+                                           2 * HZ);
+                } else
+                        queue_work(priv->workqueue, &priv->up);
+        }
+
+        return 1;
+}
+
+static ssize_t store_rf_kill(struct device *d, struct device_attribute *attr,
+                             const char *buf, size_t count)
+{
+        struct ipw_priv *priv = d->driver_data;
+
+        ipw_radio_kill_sw(priv, buf[0] == '1');
+
+        return count;
+}
+
+static DEVICE_ATTR(rf_kill, S_IWUSR | S_IRUGO, show_rf_kill, store_rf_kill);
+
+static void ipw_irq_tasklet(struct ipw_priv *priv)
+{
+        u32 inta, inta_mask, handled = 0;
+        unsigned long flags;
+        int rc = 0;
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        inta = ipw_read32(priv, CX2_INTA_RW);
+        inta_mask = ipw_read32(priv, CX2_INTA_MASK_R);
+        inta &= (CX2_INTA_MASK_ALL & inta_mask);
+
+        /* Add any cached INTA values that need to be handled */
+        inta |= priv->isr_inta;
+
+        /* handle all the justifications for the interrupt */
+        if (inta & CX2_INTA_BIT_RX_TRANSFER) {
+                ipw_rx(priv);
+                handled |= CX2_INTA_BIT_RX_TRANSFER;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_CMD_QUEUE) {
+                IPW_DEBUG_HC("Command completed.\n");
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq_cmd, -1);
+                priv->status &= ~STATUS_HCMD_ACTIVE;
+                wake_up_interruptible(&priv->wait_command_queue);
+                handled |= CX2_INTA_BIT_TX_CMD_QUEUE;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_1) {
+                IPW_DEBUG_TX("TX_QUEUE_1\n");
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[0], 0);
+                handled |= CX2_INTA_BIT_TX_QUEUE_1;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_2) {
+                IPW_DEBUG_TX("TX_QUEUE_2\n");
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[1], 1);
+                handled |= CX2_INTA_BIT_TX_QUEUE_2;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_3) {
+                IPW_DEBUG_TX("TX_QUEUE_3\n");
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[2], 2);
+                handled |= CX2_INTA_BIT_TX_QUEUE_3;
+        }
+
+        if (inta & CX2_INTA_BIT_TX_QUEUE_4) {
+                IPW_DEBUG_TX("TX_QUEUE_4\n");
+                rc = ipw_queue_tx_reclaim(priv, &priv->txq[3], 3);
+                handled |= CX2_INTA_BIT_TX_QUEUE_4;
+        }
+
+        if (inta & CX2_INTA_BIT_STATUS_CHANGE) {
+                IPW_WARNING("STATUS_CHANGE\n");
+                handled |= CX2_INTA_BIT_STATUS_CHANGE;
+        }
+
+        if (inta & CX2_INTA_BIT_BEACON_PERIOD_EXPIRED) {
+                IPW_WARNING("TX_PERIOD_EXPIRED\n");
+                handled |= CX2_INTA_BIT_BEACON_PERIOD_EXPIRED;
+        }
+
+        if (inta & CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE) {
+                IPW_WARNING("HOST_CMD_DONE\n");
+                handled |= CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE;
+        }
+
+        if (inta & CX2_INTA_BIT_FW_INITIALIZATION_DONE) {
+                IPW_WARNING("FW_INITIALIZATION_DONE\n");
+                handled |= CX2_INTA_BIT_FW_INITIALIZATION_DONE;
+        }
+
+        if (inta & CX2_INTA_BIT_FW_CARD_DISABLE_PHY_OFF_DONE) {
+                IPW_WARNING("PHY_OFF_DONE\n");
+                handled |= CX2_INTA_BIT_FW_CARD_DISABLE_PHY_OFF_DONE;
+        }
+
+        if (inta & CX2_INTA_BIT_RF_KILL_DONE) {
+                IPW_DEBUG_RF_KILL("RF_KILL_DONE\n");
+                priv->status |= STATUS_RF_KILL_HW;
+                wake_up_interruptible(&priv->wait_command_queue);
+                netif_carrier_off(priv->net_dev);
+                netif_stop_queue(priv->net_dev);
+                cancel_delayed_work(&priv->request_scan);
+                queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ);
+                handled |= CX2_INTA_BIT_RF_KILL_DONE;
+        }
+
+        if (inta & CX2_INTA_BIT_FATAL_ERROR) {
+                IPW_ERROR("Firmware error detected.  Restarting.\n");
+#ifdef CONFIG_IPW_DEBUG
+                if (ipw_debug_level & IPW_DL_FW_ERRORS) {
+                        ipw_dump_nic_error_log(priv);
+                        ipw_dump_nic_event_log(priv);
+                }
+#endif
+                queue_work(priv->workqueue, &priv->adapter_restart);
+                handled |= CX2_INTA_BIT_FATAL_ERROR;
+        }
+
+        if (inta & CX2_INTA_BIT_PARITY_ERROR) {
+                IPW_ERROR("Parity error\n");
+                handled |= CX2_INTA_BIT_PARITY_ERROR;
+        }
+
+        if (handled != inta) {
+                IPW_ERROR("Unhandled INTA bits 0x%08x\n", inta & ~handled);
+        }
+
+        /* enable all interrupts */
+        ipw_enable_interrupts(priv);
+
+        spin_unlock_irqrestore(&priv->lock, flags);
+}
+
+#ifdef CONFIG_IPW_DEBUG
+#define IPW_CMD(x) case IPW_CMD_ ## x : return #x
+static char *get_cmd_string(u8 cmd)
+{
+        switch (cmd) {
+                IPW_CMD(HOST_COMPLETE);
+                IPW_CMD(POWER_DOWN);
+                IPW_CMD(SYSTEM_CONFIG);
+                IPW_CMD(MULTICAST_ADDRESS);
+                IPW_CMD(SSID);
+                IPW_CMD(ADAPTER_ADDRESS);
+                IPW_CMD(PORT_TYPE);
+                IPW_CMD(RTS_THRESHOLD);
+                IPW_CMD(FRAG_THRESHOLD);
+                IPW_CMD(POWER_MODE);
+                IPW_CMD(WEP_KEY);
+                IPW_CMD(TGI_TX_KEY);
+                IPW_CMD(SCAN_REQUEST);
+                IPW_CMD(SCAN_REQUEST_EXT);
+                IPW_CMD(ASSOCIATE);
+                IPW_CMD(SUPPORTED_RATES);
+                IPW_CMD(SCAN_ABORT);
+                IPW_CMD(TX_FLUSH);
+                IPW_CMD(QOS_PARAMETERS);
+                IPW_CMD(DINO_CONFIG);
+                IPW_CMD(RSN_CAPABILITIES);
+                IPW_CMD(RX_KEY);
+                IPW_CMD(CARD_DISABLE);
+                IPW_CMD(SEED_NUMBER);
+                IPW_CMD(TX_POWER);
+                IPW_CMD(COUNTRY_INFO);
+                IPW_CMD(AIRONET_INFO);
+                IPW_CMD(AP_TX_POWER);
+                IPW_CMD(CCKM_INFO);
+                IPW_CMD(CCX_VER_INFO);
+                IPW_CMD(SET_CALIBRATION);
+                IPW_CMD(SENSITIVITY_CALIB);
+                IPW_CMD(RETRY_LIMIT);
+                IPW_CMD(IPW_PRE_POWER_DOWN);
+                IPW_CMD(VAP_BEACON_TEMPLATE);
+                IPW_CMD(VAP_DTIM_PERIOD);
+                IPW_CMD(EXT_SUPPORTED_RATES);
+                IPW_CMD(VAP_LOCAL_TX_PWR_CONSTRAINT);
+                IPW_CMD(VAP_QUIET_INTERVALS);
+                IPW_CMD(VAP_CHANNEL_SWITCH);
+                IPW_CMD(VAP_MANDATORY_CHANNELS);
+                IPW_CMD(VAP_CELL_PWR_LIMIT);
+                IPW_CMD(VAP_CF_PARAM_SET);
+                IPW_CMD(VAP_SET_BEACONING_STATE);
+                IPW_CMD(MEASUREMENT);
+                IPW_CMD(POWER_CAPABILITY);
+                IPW_CMD(SUPPORTED_CHANNELS);
+                IPW_CMD(TPC_REPORT);
+                IPW_CMD(WME_INFO);
+                IPW_CMD(PRODUCTION_COMMAND);
+        default:
+                return "UNKNOWN";
+        }
+}
+#endif                          /* CONFIG_IPW_DEBUG */
+
+#define HOST_COMPLETE_TIMEOUT HZ
+static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
+{
+        int rc = 0;
+
+        if (priv->status & STATUS_HCMD_ACTIVE) {
+                IPW_ERROR("Already sending a command\n");
+                return -1;
+        }
+
+        priv->status |= STATUS_HCMD_ACTIVE;
+
+        IPW_DEBUG_HC("Sending %s command (#%d), %d bytes\n",
+                     get_cmd_string(cmd->cmd), cmd->cmd, cmd->len);
+        printk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);
+
+        rc = ipw_queue_tx_hcmd(priv, cmd->cmd, &cmd->param, cmd->len, 0);
+        if (rc)
+                return rc;
+
+        rc = wait_event_interruptible_timeout(priv->wait_command_queue,
+                                              !(priv->
+                                                status & STATUS_HCMD_ACTIVE),
+                                              HOST_COMPLETE_TIMEOUT);
+        if (rc == 0) {
+                IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
+                               jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
+                priv->status &= ~STATUS_HCMD_ACTIVE;
+                return -EIO;
+        }
+        if (priv->status & STATUS_RF_KILL_MASK) {
+                IPW_DEBUG_INFO("Command aborted due to RF Kill Switch\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int ipw_send_host_complete(struct ipw_priv *priv)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_HOST_COMPLETE,
+                .len = 0
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send HOST_COMPLETE command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_system_config(struct ipw_priv *priv,
+                                  struct ipw_sys_config *config)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SYSTEM_CONFIG,
+                .len = sizeof(*config)
+        };
+
+        if (!priv || !config) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, config, sizeof(*config));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SYSTEM_CONFIG command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_ssid(struct ipw_priv *priv, u8 * ssid, int len)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SSID,
+                .len = min(len, IW_ESSID_MAX_SIZE)
+        };
+
+        if (!priv || !ssid) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, ssid, cmd.len);
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SSID command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_ADAPTER_ADDRESS,
+                .len = ETH_ALEN
+        };
+
+        if (!priv || !mac) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        IPW_DEBUG_INFO("%s: Setting MAC to " MAC_FMT "\n",
+                       priv->net_dev->name, MAC_ARG(mac));
+
+        memcpy(&cmd.param, mac, ETH_ALEN);
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send ADAPTER_ADDRESS command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static void ipw_adapter_restart(void *adapter)
+{
+        struct ipw_priv *priv = adapter;
+
+        if (priv->status & STATUS_RF_KILL_MASK)
+                return;
+
+        ipw_down(priv);
+        if (ipw_up(priv)) {
+                IPW_ERROR("Failed to up device\n");
+                return;
+        }
+}
+
+#define IPW_SCAN_CHECK_WATCHDOG (5 * HZ)
+
+static void ipw_scan_check(void *data)
+{
+        struct ipw_priv *priv = data;
+        if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) {
+                IPW_DEBUG_SCAN("Scan completion watchdog resetting "
+                               "adapter (%dms).\n",
+                               IPW_SCAN_CHECK_WATCHDOG / 100);
+                ipw_adapter_restart(priv);
+        }
+}
+
+static int ipw_send_scan_request_ext(struct ipw_priv *priv,
+                                     struct ipw_scan_request_ext *request)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SCAN_REQUEST_EXT,
+                .len = sizeof(*request)
+        };
+
+        if (!priv || !request) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, request, sizeof(*request));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SCAN_REQUEST_EXT command\n");
+                return -1;
+        }
+
+        queue_delayed_work(priv->workqueue, &priv->scan_check,
+                           IPW_SCAN_CHECK_WATCHDOG);
+        return 0;
+}
+
+static int ipw_send_scan_abort(struct ipw_priv *priv)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SCAN_ABORT,
+                .len = 0
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SCAN_ABORT command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_set_sensitivity(struct ipw_priv *priv, u16 sens)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SENSITIVITY_CALIB,
+                .len = sizeof(struct ipw_sensitivity_calib)
+        };
+        struct ipw_sensitivity_calib *calib = (struct ipw_sensitivity_calib *)
+            &cmd.param;
+        calib->beacon_rssi_raw = sens;
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SENSITIVITY CALIB command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_associate(struct ipw_priv *priv,
+                              struct ipw_associate *associate)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_ASSOCIATE,
+                .len = sizeof(*associate)
+        };
+
+        if (!priv || !associate) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, associate, sizeof(*associate));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send ASSOCIATE command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_supported_rates(struct ipw_priv *priv,
+                                    struct ipw_supported_rates *rates)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SUPPORTED_RATES,
+                .len = sizeof(*rates)
+        };
+
+        if (!priv || !rates) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, rates, sizeof(*rates));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SUPPORTED_RATES command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_set_random_seed(struct ipw_priv *priv)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_SEED_NUMBER,
+                .len = sizeof(u32)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        get_random_bytes(&cmd.param, sizeof(u32));
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send SEED_NUMBER command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+#if 0
+static int ipw_send_card_disable(struct ipw_priv *priv, u32 phy_off)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_CARD_DISABLE,
+                .len = sizeof(u32)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        *((u32 *) & cmd.param) = phy_off;
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send CARD_DISABLE command\n");
+                return -1;
+        }
+
+        return 0;
+}
+#endif
+
+static int ipw_send_tx_power(struct ipw_priv *priv, struct ipw_tx_power *power)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_TX_POWER,
+                .len = sizeof(*power)
+        };
+
+        if (!priv || !power) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, power, sizeof(*power));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send TX_POWER command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_rts_threshold(struct ipw_priv *priv, u16 rts)
+{
+        struct ipw_rts_threshold rts_threshold = {
+                .rts_threshold = rts,
+        };
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_RTS_THRESHOLD,
+                .len = sizeof(rts_threshold)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, &rts_threshold, sizeof(rts_threshold));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send RTS_THRESHOLD command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_frag_threshold(struct ipw_priv *priv, u16 frag)
+{
+        struct ipw_frag_threshold frag_threshold = {
+                .frag_threshold = frag,
+        };
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_FRAG_THRESHOLD,
+                .len = sizeof(frag_threshold)
+        };
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        memcpy(&cmd.param, &frag_threshold, sizeof(frag_threshold));
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send FRAG_THRESHOLD command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+static int ipw_send_power_mode(struct ipw_priv *priv, u32 mode)
+{
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_POWER_MODE,
+                .len = sizeof(u32)
+        };
+        u32 *param = (u32 *) (&cmd.param);
+
+        if (!priv) {
+                IPW_ERROR("Invalid args\n");
+                return -1;
+        }
+
+        /* If on battery, set to 3, if AC set to CAM, else user
+         * level */
+        switch (mode) {
+        case IPW_POWER_BATTERY:
+                *param = IPW_POWER_INDEX_3;
+                break;
+        case IPW_POWER_AC:
+                *param = IPW_POWER_MODE_CAM;
+                break;
+        default:
+                *param = mode;
+                break;
+        }
+
+        if (ipw_send_cmd(priv, &cmd)) {
+                IPW_ERROR("failed to send POWER_MODE command\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * The IPW device contains a Microwire compatible EEPROM that stores
+ * various data like the MAC address.  Usually the firmware has exclusive
+ * access to the eeprom, but during device initialization (before the
+ * device driver has sent the HostComplete command to the firmware) the
+ * device driver has read access to the EEPROM by way of indirect addressing
+ * through a couple of memory mapped registers.
+ *
+ * The following is a simplified implementation for pulling data out of the
+ * the eeprom, along with some helper functions to find information in
+ * the per device private data's copy of the eeprom.
+ *
+ * NOTE: To better understand how these functions work (i.e what is a chip
+ *       select and why do have to keep driving the eeprom clock?), read
+ *       just about any data sheet for a Microwire compatible EEPROM.
+ */
+
+/* write a 32 bit value into the indirect accessor register */
+static inline void eeprom_write_reg(struct ipw_priv *p, u32 data)
+{
+        ipw_write_reg32(p, FW_MEM_REG_EEPROM_ACCESS, data);
+
+        /* the eeprom requires some time to complete the operation */
+        udelay(p->eeprom_delay);
+
+        return;
+}
+
+/* perform a chip select operation */
+static inline void eeprom_cs(struct ipw_priv *priv)
+{
+        eeprom_write_reg(priv, 0);
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
+        eeprom_write_reg(priv, EEPROM_BIT_CS | EEPROM_BIT_SK);
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
+}
+
+/* perform a chip select operation */
+static inline void eeprom_disable_cs(struct ipw_priv *priv)
+{
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
+        eeprom_write_reg(priv, 0);
+        eeprom_write_reg(priv, EEPROM_BIT_SK);
+}
+
+/* push a single bit down to the eeprom */
+static inline void eeprom_write_bit(struct ipw_priv *p, u8 bit)
+{
+        int d = (bit ? EEPROM_BIT_DI : 0);
+        eeprom_write_reg(p, EEPROM_BIT_CS | d);
+        eeprom_write_reg(p, EEPROM_BIT_CS | d | EEPROM_BIT_SK);
+}
+
+/* push an opcode followed by an address down to the eeprom */
+static void eeprom_op(struct ipw_priv *priv, u8 op, u8 addr)
+{
+        int i;
+
+        eeprom_cs(priv);
+        eeprom_write_bit(priv, 1);
+        eeprom_write_bit(priv, op & 2);
+        eeprom_write_bit(priv, op & 1);
+        for (i = 7; i >= 0; i--) {
+                eeprom_write_bit(priv, addr & (1 << i));
+        }
+}
+
+/* pull 16 bits off the eeprom, one bit at a time */
+static u16 eeprom_read_u16(struct ipw_priv *priv, u8 addr)
+{
+        int i;
+        u16 r = 0;
+
+        /* Send READ Opcode */
+        eeprom_op(priv, EEPROM_CMD_READ, addr);
+
+        /* Send dummy bit */
+        eeprom_write_reg(priv, EEPROM_BIT_CS);
+
+        /* Read the byte off the eeprom one bit at a time */
+        for (i = 0; i < 16; i++) {
+                u32 data = 0;
+                eeprom_write_reg(priv, EEPROM_BIT_CS | EEPROM_BIT_SK);
+                eeprom_write_reg(priv, EEPROM_BIT_CS);
+                data = ipw_read_reg32(priv, FW_MEM_REG_EEPROM_ACCESS);
+                r = (r << 1) | ((data & EEPROM_BIT_DO) ? 1 : 0);
+        }
+
+        /* Send another dummy bit */
+        eeprom_write_reg(priv, 0);
+        eeprom_disable_cs(priv);
+
+        return r;
+}
+
+/* helper function for pulling the mac address out of the private */
+/* data's copy of the eeprom data                                 */
+static void eeprom_parse_mac(struct ipw_priv *priv, u8 * mac)
+{
+        u8 *ee = (u8 *) priv->eeprom;
+        memcpy(mac, &ee[EEPROM_MAC_ADDRESS], 6);
+}
+
+/*
+ * Either the device driver (i.e. the host) or the firmware can
+ * load eeprom data into the designated region in SRAM.  If neither
+ * happens then the FW will shutdown with a fatal error.
+ *
+ * In order to signal the FW to load the EEPROM, the EEPROM_LOAD_DISABLE
+ * bit needs region of shared SRAM needs to be non-zero.
+ */
+static void ipw_eeprom_init_sram(struct ipw_priv *priv)
+{
+        int i;
+        u16 *eeprom = (u16 *) priv->eeprom;
+
+        IPW_DEBUG_TRACE(">>\n");
+
+        /* read entire contents of eeprom into private buffer */
+        for (i = 0; i < 128; i++)
+                eeprom[i] = eeprom_read_u16(priv, (u8) i);
+
+        /*
+           If the data looks correct, then copy it to our private
+           copy.  Otherwise let the firmware know to perform the operation
+           on it's own
+         */
+        if ((priv->eeprom + EEPROM_VERSION) != 0) {
+                IPW_DEBUG_INFO("Writing EEPROM data into SRAM\n");
+
+                /* write the eeprom data to sram */
+                for (i = 0; i < CX2_EEPROM_IMAGE_SIZE; i++)
+                        ipw_write8(priv, IPW_EEPROM_DATA + i, priv->eeprom[i]);
+
+                /* Do not load eeprom data on fatal error or suspend */
+                ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 0);
+        } else {
+                IPW_DEBUG_INFO("Enabling FW initializationg of SRAM\n");
+
+                /* Load eeprom data on fatal error or suspend */
+                ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 1);
+        }
+
+        IPW_DEBUG_TRACE("<<\n");
+}
+
+static inline void ipw_zero_memory(struct ipw_priv *priv, u32 start, u32 count)
+{
+        count >>= 2;
+        if (!count)
+                return;
+        _ipw_write32(priv, CX2_AUTOINC_ADDR, start);
+        while (count--)
+                _ipw_write32(priv, CX2_AUTOINC_DATA, 0);
+}
+
+static inline void ipw_fw_dma_reset_command_blocks(struct ipw_priv *priv)
+{
+        ipw_zero_memory(priv, CX2_SHARED_SRAM_DMA_CONTROL,
+                        CB_NUMBER_OF_ELEMENTS_SMALL *
+                        sizeof(struct command_block));
+}
+
+static int ipw_fw_dma_enable(struct ipw_priv *priv)
+{                               /* start dma engine but no transfers yet */
+
+        IPW_DEBUG_FW(">> : \n");
+
+        /* Start the dma */
+        ipw_fw_dma_reset_command_blocks(priv);
+
+        /* Write CB base address */
+        ipw_write_reg32(priv, CX2_DMA_I_CB_BASE, CX2_SHARED_SRAM_DMA_CONTROL);
+
+        IPW_DEBUG_FW("<< : \n");
+        return 0;
+}
+
+static void ipw_fw_dma_abort(struct ipw_priv *priv)
+{
+        u32 control = 0;
+
+        IPW_DEBUG_FW(">> :\n");
+
+        //set the Stop and Abort bit
+        control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_STOP_AND_ABORT;
+        ipw_write_reg32(priv, CX2_DMA_I_DMA_CONTROL, control);
+        priv->sram_desc.last_cb_index = 0;
+
+        IPW_DEBUG_FW("<< \n");
+}
+
+static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index,
+                                          struct command_block *cb)
+{
+        u32 address =
+            CX2_SHARED_SRAM_DMA_CONTROL +
+            (sizeof(struct command_block) * index);
+        IPW_DEBUG_FW(">> :\n");
+
+        ipw_write_indirect(priv, address, (u8 *) cb,
+                           (int)sizeof(struct command_block));
+
+        IPW_DEBUG_FW("<< :\n");
+        return 0;
+
+}
+
+static int ipw_fw_dma_kick(struct ipw_priv *priv)
+{
+        u32 control = 0;
+        u32 index = 0;
+
+        IPW_DEBUG_FW(">> :\n");
+
+        for (index = 0; index < priv->sram_desc.last_cb_index; index++)
+                ipw_fw_dma_write_command_block(priv, index,
+                                               &priv->sram_desc.cb_list[index]);
+
+        /* Enable the DMA in the CSR register */
+        ipw_clear_bit(priv, CX2_RESET_REG,
+                      CX2_RESET_REG_MASTER_DISABLED |
+                      CX2_RESET_REG_STOP_MASTER);
+
+        /* Set the Start bit. */
+        control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_START;
+        ipw_write_reg32(priv, CX2_DMA_I_DMA_CONTROL, control);
+
+        IPW_DEBUG_FW("<< :\n");
+        return 0;
+}
+
+static void ipw_fw_dma_dump_command_block(struct ipw_priv *priv)
+{
+        u32 address;
+        u32 register_value = 0;
+        u32 cb_fields_address = 0;
+
+        IPW_DEBUG_FW(">> :\n");
+        address = ipw_read_reg32(priv, CX2_DMA_I_CURRENT_CB);
+        IPW_DEBUG_FW_INFO("Current CB is 0x%x \n", address);
+
+        /* Read the DMA Controlor register */
+        register_value = ipw_read_reg32(priv, CX2_DMA_I_DMA_CONTROL);
+        IPW_DEBUG_FW_INFO("CX2_DMA_I_DMA_CONTROL is 0x%x \n", register_value);
+
+        /* Print the CB values */
+        cb_fields_address = address;
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB ControlField is 0x%x \n", register_value);
+
+        cb_fields_address += sizeof(u32);
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x \n", register_value);
+
+        cb_fields_address += sizeof(u32);
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB Destination Field is 0x%x \n",
+                          register_value);
+
+        cb_fields_address += sizeof(u32);
+        register_value = ipw_read_reg32(priv, cb_fields_address);
+        IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x \n", register_value);
+
+        IPW_DEBUG_FW(">> :\n");
+}
+
+static int ipw_fw_dma_command_block_index(struct ipw_priv *priv)
+{
+        u32 current_cb_address = 0;
+        u32 current_cb_index = 0;
+
+        IPW_DEBUG_FW("<< :\n");
+        current_cb_address = ipw_read_reg32(priv, CX2_DMA_I_CURRENT_CB);
+
+        current_cb_index = (current_cb_address - CX2_SHARED_SRAM_DMA_CONTROL) /
+            sizeof(struct command_block);
+
+        IPW_DEBUG_FW_INFO("Current CB index 0x%x address = 0x%X \n",
+                          current_cb_index, current_cb_address);
+
+        IPW_DEBUG_FW(">> :\n");
+        return current_cb_index;
+
+}
+
+static int ipw_fw_dma_add_command_block(struct ipw_priv *priv,
+                                        u32 src_address,
+                                        u32 dest_address,
+                                        u32 length,
+                                        int interrupt_enabled, int is_last)
+{
+
+        u32 control = CB_VALID | CB_SRC_LE | CB_DEST_LE | CB_SRC_AUTOINC |
+            CB_SRC_IO_GATED | CB_DEST_AUTOINC | CB_SRC_SIZE_LONG |
+            CB_DEST_SIZE_LONG;
+        struct command_block *cb;
+        u32 last_cb_element = 0;
+
+        IPW_DEBUG_FW_INFO("src_address=0x%x dest_address=0x%x length=0x%x\n",
+                          src_address, dest_address, length);
+
+        if (priv->sram_desc.last_cb_index >= CB_NUMBER_OF_ELEMENTS_SMALL)
+                return -1;
+
+        last_cb_element = priv->sram_desc.last_cb_index;
+        cb = &priv->sram_desc.cb_list[last_cb_element];
+        priv->sram_desc.last_cb_index++;
+
+        /* Calculate the new CB control word */
+        if (interrupt_enabled)
+                control |= CB_INT_ENABLED;
+
+        if (is_last)
+                control |= CB_LAST_VALID;
+
+        control |= length;
+
+        /* Calculate the CB Element's checksum value */
+        cb->status = control ^ src_address ^ dest_address;
+
+        /* Copy the Source and Destination addresses */
+        cb->dest_addr = dest_address;
+        cb->source_addr = src_address;
+
+        /* Copy the Control Word last */
+        cb->control = control;
+
+        return 0;
+}
+
+static int ipw_fw_dma_add_buffer(struct ipw_priv *priv,
+                                 u32 src_phys, u32 dest_address, u32 length)
+{
+        u32 bytes_left = length;
+        u32 src_offset = 0;
+        u32 dest_offset = 0;
+        int status = 0;
+        IPW_DEBUG_FW(">> \n");
+        IPW_DEBUG_FW_INFO("src_phys=0x%x dest_address=0x%x length=0x%x\n",
+                          src_phys, dest_address, length);
+        while (bytes_left > CB_MAX_LENGTH) {
+                status = ipw_fw_dma_add_command_block(priv,
+                                                      src_phys + src_offset,
+                                                      dest_address +
+                                                      dest_offset,
+                                                      CB_MAX_LENGTH, 0, 0);
+                if (status) {
+                        IPW_DEBUG_FW_INFO(": Failed\n");
+                        return -1;
+                } else
+                        IPW_DEBUG_FW_INFO(": Added new cb\n");
+
+                src_offset += CB_MAX_LENGTH;
+                dest_offset += CB_MAX_LENGTH;
+                bytes_left -= CB_MAX_LENGTH;
+        }
+
+        /* add the buffer tail */
+        if (bytes_left > 0) {
+                status =
+                    ipw_fw_dma_add_command_block(priv, src_phys + src_offset,
+                                                 dest_address + dest_offset,
+                                                 bytes_left, 0, 0);
+                if (status) {
+                        IPW_DEBUG_FW_INFO(": Failed on the buffer tail\n");
+                        return -1;
+                } else
+                        IPW_DEBUG_FW_INFO
+                            (": Adding new cb - the buffer tail\n");
+        }
+
+        IPW_DEBUG_FW("<< \n");
+        return 0;
+}
+
+static int ipw_fw_dma_wait(struct ipw_priv *priv)
+{
+        u32 current_index = 0;
+        u32 watchdog = 0;
+
+        IPW_DEBUG_FW(">> : \n");
+
+        current_index = ipw_fw_dma_command_block_index(priv);
+        IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%8X\n",
+                          (int)priv->sram_desc.last_cb_index);
+
+        while (current_index < priv->sram_desc.last_cb_index) {
+                udelay(50);
+                current_index = ipw_fw_dma_command_block_index(priv);
+
+                watchdog++;
+
+                if (watchdog > 400) {
+                        IPW_DEBUG_FW_INFO("Timeout\n");
+                        ipw_fw_dma_dump_command_block(priv);
+                        ipw_fw_dma_abort(priv);
+                        return -1;
+                }
+        }
+
+        ipw_fw_dma_abort(priv);
+
+        /*Disable the DMA in the CSR register */
+        ipw_set_bit(priv, CX2_RESET_REG,
+                    CX2_RESET_REG_MASTER_DISABLED | CX2_RESET_REG_STOP_MASTER);
+
+        IPW_DEBUG_FW("<< dmaWaitSync \n");
+        return 0;
+}
+
+static void ipw_remove_current_network(struct ipw_priv *priv)
+{
+        struct list_head *element, *safe;
+        struct ieee80211_network *network = NULL;
+        list_for_each_safe(element, safe, &priv->ieee->network_list) {
+                network = list_entry(element, struct ieee80211_network, list);
+                if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
+                        list_del(element);
+                        list_add_tail(&network->list,
+                                      &priv->ieee->network_free_list);
+                }
+        }
+}
+
+/**
+ * Check that card is still alive.
+ * Reads debug register from domain0.
+ * If card is present, pre-defined value should
+ * be found there.
+ *
+ * @param priv
+ * @return 1 if card is present, 0 otherwise
+ */
+static inline int ipw_alive(struct ipw_priv *priv)
+{
+        return ipw_read32(priv, 0x90) == 0xd55555d5;
+}
+
+static inline int ipw_poll_bit(struct ipw_priv *priv, u32 addr, u32 mask,
+                               int timeout)
+{
+        int i = 0;
+
+        do {
+                if ((ipw_read32(priv, addr) & mask) == mask)
+                        return i;
+                mdelay(10);
+                i += 10;
+        } while (i < timeout);
+
+        return -ETIME;
+}
+
+/* These functions load the firmware and micro code for the operation of
+ * the ipw hardware.  It assumes the buffer has all the bits for the
+ * image and the caller is handling the memory allocation and clean up.
+ */
+
+static int ipw_stop_master(struct ipw_priv *priv)
+{
+        int rc;
+
+        IPW_DEBUG_TRACE(">> \n");
+        /* stop master. typical delay - 0 */
+        ipw_set_bit(priv, CX2_RESET_REG, CX2_RESET_REG_STOP_MASTER);
+
+        rc = ipw_poll_bit(priv, CX2_RESET_REG,
+                          CX2_RESET_REG_MASTER_DISABLED, 100);
+        if (rc < 0) {
+                IPW_ERROR("stop master failed in 10ms\n");
+                return -1;
+        }
+
+        IPW_DEBUG_INFO("stop master %dms\n", rc);
+
+        return rc;
+}
+
+static void ipw_arc_release(struct ipw_priv *priv)
+{
+        IPW_DEBUG_TRACE(">> \n");
+        mdelay(5);
+
+        ipw_clear_bit(priv, CX2_RESET_REG, CBD_RESET_REG_PRINCETON_RESET);
+
+        /* no one knows timing, for safety add some delay */
+        mdelay(5);
+}
+
+struct fw_header {
+        u32 version;
+        u32 mode;
+};
+
+struct fw_chunk {
+        u32 address;
+        u32 length;
+};
+
+#define IPW_FW_MAJOR_VERSION 2
+#define IPW_FW_MINOR_VERSION 2
+
+#define IPW_FW_MINOR(x) ((x & 0xff) >> 8)
+#define IPW_FW_MAJOR(x) (x & 0xff)
+
+#define IPW_FW_VERSION ((IPW_FW_MINOR_VERSION << 8) | \
+                         IPW_FW_MAJOR_VERSION)
+
+#define IPW_FW_PREFIX "ipw-" __stringify(IPW_FW_MAJOR_VERSION) \
+"." __stringify(IPW_FW_MINOR_VERSION) "-"
+
+#if IPW_FW_MAJOR_VERSION >= 2 && IPW_FW_MINOR_VERSION > 0
+#define IPW_FW_NAME(x) IPW_FW_PREFIX "" x ".fw"
+#else
+#define IPW_FW_NAME(x) "ipw2200_" x ".fw"
+#endif
+
+static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len)
+{
+        int rc = 0, i, addr;
+        u8 cr = 0;
+        u16 *image;
+
+        image = (u16 *) data;
+
+        IPW_DEBUG_TRACE(">> \n");
+
+        rc = ipw_stop_master(priv);
+
+        if (rc < 0)
+                return rc;
+
+//      spin_lock_irqsave(&priv->lock, flags);
+
+        for (addr = CX2_SHARED_LOWER_BOUND;
+             addr < CX2_REGISTER_DOMAIN1_END; addr += 4) {
+                ipw_write32(priv, addr, 0);
+        }
+
+        /* no ucode (yet) */
+        memset(&priv->dino_alive, 0, sizeof(priv->dino_alive));
+        /* destroy DMA queues */
+        /* reset sequence */
+
+        ipw_write_reg32(priv, CX2_MEM_HALT_AND_RESET, CX2_BIT_HALT_RESET_ON);
+        ipw_arc_release(priv);
+        ipw_write_reg32(priv, CX2_MEM_HALT_AND_RESET, CX2_BIT_HALT_RESET_OFF);
+        mdelay(1);
+
+        /* reset PHY */
+        ipw_write_reg32(priv, CX2_INTERNAL_CMD_EVENT, CX2_BASEBAND_POWER_DOWN);
+        mdelay(1);
+
+        ipw_write_reg32(priv, CX2_INTERNAL_CMD_EVENT, 0);
+        mdelay(1);
+
+        /* enable ucode store */
+        ipw_write_reg8(priv, DINO_CONTROL_REG, 0x0);
+        ipw_write_reg8(priv, DINO_CONTROL_REG, DINO_ENABLE_CS);
+        mdelay(1);
+
+        /* write ucode */
+        /**
+         * @bug
+         * Do NOT set indirect address register once and then
+         * store data to indirect data register in the loop.
+         * It seems very reasonable, but in this case DINO do not
+         * accept ucode. It is essential to set address each time.
+         */
+        /* load new ipw uCode */
+        for (i = 0; i < len / 2; i++)
+                ipw_write_reg16(priv, CX2_BASEBAND_CONTROL_STORE, image[i]);
+
+        /* enable DINO */
+        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, 0);
+        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, DINO_ENABLE_SYSTEM);
+
+        /* this is where the igx / win driver deveates from the VAP driver. */
+
+        /* wait for alive response */
+        for (i = 0; i < 100; i++) {
+                /* poll for incoming data */
+                cr = ipw_read_reg8(priv, CX2_BASEBAND_CONTROL_STATUS);
+                if (cr & DINO_RXFIFO_DATA)
+                        break;
+                mdelay(1);
+        }
+
+        if (cr & DINO_RXFIFO_DATA) {
+                /* alive_command_responce size is NOT multiple of 4 */
+                u32 response_buffer[(sizeof(priv->dino_alive) + 3) / 4];
+
+                for (i = 0; i < ARRAY_SIZE(response_buffer); i++)
+                        response_buffer[i] =
+                            ipw_read_reg32(priv, CX2_BASEBAND_RX_FIFO_READ);
+                memcpy(&priv->dino_alive, response_buffer,
+                       sizeof(priv->dino_alive));
+                if (priv->dino_alive.alive_command == 1
+                    && priv->dino_alive.ucode_valid == 1) {
+                        rc = 0;
+                        IPW_DEBUG_INFO
+                            ("Microcode OK, rev. %d (0x%x) dev. %d (0x%x) "
+                             "of %02d/%02d/%02d %02d:%02d\n",
+                             priv->dino_alive.software_revision,
+                             priv->dino_alive.software_revision,
+                             priv->dino_alive.device_identifier,
+                             priv->dino_alive.device_identifier,
+                             priv->dino_alive.time_stamp[0],
+                             priv->dino_alive.time_stamp[1],
+                             priv->dino_alive.time_stamp[2],
+                             priv->dino_alive.time_stamp[3],
+                             priv->dino_alive.time_stamp[4]);
+                } else {
+                        IPW_DEBUG_INFO("Microcode is not alive\n");
+                        rc = -EINVAL;
+                }
+        } else {
+                IPW_DEBUG_INFO("No alive response from DINO\n");
+                rc = -ETIME;
+        }
+
+        /* disable DINO, otherwise for some reason
+           firmware have problem getting alive resp. */
+        ipw_write_reg8(priv, CX2_BASEBAND_CONTROL_STATUS, 0);
+
+//      spin_unlock_irqrestore(&priv->lock, flags);
+
+        return rc;
+}
+
+static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
+{
+        int rc = -1;
+        int offset = 0;
+        struct fw_chunk *chunk;
+        dma_addr_t shared_phys;
+        u8 *shared_virt;
+
+        IPW_DEBUG_TRACE("<< : \n");
+        shared_virt = pci_alloc_consistent(priv->pci_dev, len, &shared_phys);
+
+        if (!shared_virt)
+                return -ENOMEM;
+
+        memmove(shared_virt, data, len);
+
+        /* Start the Dma */
+        rc = ipw_fw_dma_enable(priv);
+
+        if (priv->sram_desc.last_cb_index > 0) {
+                /* the DMA is already ready this would be a bug. */
+                BUG();
+                goto out;
+        }
+
+        do {
+                chunk = (struct fw_chunk *)(data + offset);
+                offset += sizeof(struct fw_chunk);
+                /* build DMA packet and queue up for sending */
+                /* dma to chunk->address, the chunk->length bytes from data +
+                 * offeset*/
+                /* Dma loading */
+                rc = ipw_fw_dma_add_buffer(priv, shared_phys + offset,
+                                           chunk->address, chunk->length);
+                if (rc) {
+                        IPW_DEBUG_INFO("dmaAddBuffer Failed\n");
+                        goto out;
+                }
+
+                offset += chunk->length;
+        } while (offset < len);
+
+        /* Run the DMA and wait for the answer */
+        rc = ipw_fw_dma_kick(priv);
+        if (rc) {
+                IPW_ERROR("dmaKick Failed\n");
+                goto out;
+        }
+
+        rc = ipw_fw_dma_wait(priv);
+        if (rc) {
+                IPW_ERROR("dmaWaitSync Failed\n");
+                goto out;
+        }
+      out:
+        pci_free_consistent(priv->pci_dev, len, shared_virt, shared_phys);
+        return rc;
+}
+
+/* stop nic */
+static int ipw_stop_nic(struct ipw_priv *priv)
+{
+        int rc = 0;
+
+        /* stop */
+        ipw_write32(priv, CX2_RESET_REG, CX2_RESET_REG_STOP_MASTER);
+
+        rc = ipw_poll_bit(priv, CX2_RESET_REG,
+                          CX2_RESET_REG_MASTER_DISABLED, 500);
+        if (rc < 0) {
+                IPW_ERROR("wait for reg master disabled failed\n");
+                return rc;
+        }
+
+        ipw_set_bit(priv, CX2_RESET_REG, CBD_RESET_REG_PRINCETON_RESET);
+
+        return rc;
+}
+
+static void ipw_start_nic(struct ipw_priv *priv)
+{
+        IPW_DEBUG_TRACE(">>\n");
+
+        /* prvHwStartNic  release ARC */
+        ipw_clear_bit(priv, CX2_RESET_REG,
+                      CX2_RESET_REG_MASTER_DISABLED |
+                      CX2_RESET_REG_STOP_MASTER |
+                      CBD_RESET_REG_PRINCETON_RESET);
+
+        /* enable power management */
+        ipw_set_bit(priv, CX2_GP_CNTRL_RW,
+                    CX2_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY);
+
+        IPW_DEBUG_TRACE("<<\n");
+}
+
+static int ipw_init_nic(struct ipw_priv *priv)
+{
+        int rc;
+
+        IPW_DEBUG_TRACE(">>\n");
+        /* reset */
+        /*prvHwInitNic */
+        /* set "initialization complete" bit to move adapter to D0 state */
+        ipw_set_bit(priv, CX2_GP_CNTRL_RW, CX2_GP_CNTRL_BIT_INIT_DONE);
+
+        /* low-level PLL activation */
+        ipw_write32(priv, CX2_READ_INT_REGISTER,
+                    CX2_BIT_INT_HOST_SRAM_READ_INT_REGISTER);
+
+        /* wait for clock stabilization */
+        rc = ipw_poll_bit(priv, CX2_GP_CNTRL_RW,
+                          CX2_GP_CNTRL_BIT_CLOCK_READY, 250);
+        if (rc < 0)
+                IPW_DEBUG_INFO("FAILED wait for clock stablization\n");
+
+        /* assert SW reset */
+        ipw_set_bit(priv, CX2_RESET_REG, CX2_RESET_REG_SW_RESET);
+
+        udelay(10);
+
+        /* set "initialization complete" bit to move adapter to D0 state */
+        ipw_set_bit(priv, CX2_GP_CNTRL_RW, CX2_GP_CNTRL_BIT_INIT_DONE);
+
+        IPW_DEBUG_TRACE(">>\n");
+        return 0;
+}
+
+/* Call this function from process context, it will sleep in request_firmware.
+ * Probe is an ok place to call this from.
+ */
+static int ipw_reset_nic(struct ipw_priv *priv)
+{
+        int rc = 0;
+
+        IPW_DEBUG_TRACE(">>\n");
+
+        rc = ipw_init_nic(priv);
+
+        /* Clear the 'host command active' bit... */
+        priv->status &= ~STATUS_HCMD_ACTIVE;
+        wake_up_interruptible(&priv->wait_command_queue);
+
+        IPW_DEBUG_TRACE("<<\n");
+        return rc;
+}
+
+static int ipw_get_fw(struct ipw_priv *priv,
+                      const struct firmware **fw, const char *name)
+{
+        struct fw_header *header;
+        int rc;
+
+        /* ask firmware_class module to get the boot firmware off disk */
+        rc = request_firmware(fw, name, &priv->pci_dev->dev);
+        if (rc < 0) {
+                IPW_ERROR("%s load failed: Reason %d\n", name, rc);
+                return rc;
+        }
+
+        header = (struct fw_header *)(*fw)->data;
+        if (IPW_FW_MAJOR(header->version) != IPW_FW_MAJOR_VERSION) {
+                IPW_ERROR("'%s' firmware version not compatible (%d != %d)\n",
+                          name,
+                          IPW_FW_MAJOR(header->version), IPW_FW_MAJOR_VERSION);
+                return -EINVAL;
+        }
+
+        IPW_DEBUG_INFO("Loading firmware '%s' file v%d.%d (%zd bytes)\n",
+                       name,
+                       IPW_FW_MAJOR(header->version),
+                       IPW_FW_MINOR(header->version),
+                       (*fw)->size - sizeof(struct fw_header));
+        return 0;
+}
+
+#define CX2_RX_BUF_SIZE (3000)
+
+static inline void ipw_rx_queue_reset(struct ipw_priv *priv,
+                                      struct ipw_rx_queue *rxq)
+{
+        unsigned long flags;
+        int i;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+
+        INIT_LIST_HEAD(&rxq->rx_free);
+        INIT_LIST_HEAD(&rxq->rx_used);
+
+        /* Fill the rx_used queue with _all_ of the Rx buffers */
+        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++) {
+                /* In the reset function, these buffers may have been allocated
+                 * to an SKB, so we need to unmap and free potential storage */
+                if (rxq->pool[i].skb != NULL) {
+                        pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr,
+                                         CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(rxq->pool[i].skb);
+                }
+                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
+        }
+
+        /* Set us so that we have processed and used all buffers, but have
+         * not restocked the Rx queue with fresh buffers */
+        rxq->read = rxq->write = 0;
+        rxq->processed = RX_QUEUE_SIZE - 1;
+        rxq->free_count = 0;
+        spin_unlock_irqrestore(&rxq->lock, flags);
+}
+
+#ifdef CONFIG_PM
+static int fw_loaded = 0;
+static const struct firmware *bootfw = NULL;
+static const struct firmware *firmware = NULL;
+static const struct firmware *ucode = NULL;
+#endif
+
+static int ipw_load(struct ipw_priv *priv)
+{
+#ifndef CONFIG_PM
+        const struct firmware *bootfw = NULL;
+        const struct firmware *firmware = NULL;
+        const struct firmware *ucode = NULL;
+#endif
+        int rc = 0, retries = 3;
+
+#ifdef CONFIG_PM
+        if (!fw_loaded) {
+#endif
+                rc = ipw_get_fw(priv, &bootfw, IPW_FW_NAME("boot"));
+                if (rc)
+                        goto error;
+
+                switch (priv->ieee->iw_mode) {
+                case IW_MODE_ADHOC:
+                        rc = ipw_get_fw(priv, &ucode,
+                                        IPW_FW_NAME("ibss_ucode"));
+                        if (rc)
+                                goto error;
+
+                        rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("ibss"));
+                        break;
+
+#ifdef CONFIG_IPW_PROMISC
+                case IW_MODE_MONITOR:
+                        rc = ipw_get_fw(priv, &ucode,
+                                        IPW_FW_NAME("ibss_ucode"));
+                        if (rc)
+                                goto error;
+
+                        rc = ipw_get_fw(priv, &firmware,
+                                        IPW_FW_NAME("sniffer"));
+                        break;
+#endif
+                case IW_MODE_INFRA:
+                        rc = ipw_get_fw(priv, &ucode, IPW_FW_NAME("bss_ucode"));
+                        if (rc)
+                                goto error;
+
+                        rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("bss"));
+                        break;
+
+                default:
+                        rc = -EINVAL;
+                }
+
+                if (rc)
+                        goto error;
+
+#ifdef CONFIG_PM
+                fw_loaded = 1;
+        }
+#endif
+
+        if (!priv->rxq)
+                priv->rxq = ipw_rx_queue_alloc(priv);
+        else
+                ipw_rx_queue_reset(priv, priv->rxq);
+        if (!priv->rxq) {
+                IPW_ERROR("Unable to initialize Rx queue\n");
+                goto error;
+        }
+
+      retry:
+        /* Ensure interrupts are disabled */
+        ipw_write32(priv, CX2_INTA_MASK_R, ~CX2_INTA_MASK_ALL);
+        priv->status &= ~STATUS_INT_ENABLED;
+
+        /* ack pending interrupts */
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_MASK_ALL);
+
+        ipw_stop_nic(priv);
+
+        rc = ipw_reset_nic(priv);
+        if (rc) {
+                IPW_ERROR("Unable to reset NIC\n");
+                goto error;
+        }
+
+        ipw_zero_memory(priv, CX2_NIC_SRAM_LOWER_BOUND,
+                        CX2_NIC_SRAM_UPPER_BOUND - CX2_NIC_SRAM_LOWER_BOUND);
+
+        /* DMA the initial boot firmware into the device */
+        rc = ipw_load_firmware(priv, bootfw->data + sizeof(struct fw_header),
+                               bootfw->size - sizeof(struct fw_header));
+        if (rc < 0) {
+                IPW_ERROR("Unable to load boot firmware\n");
+                goto error;
+        }
+
+        /* kick start the device */
+        ipw_start_nic(priv);
+
+        /* wait for the device to finish it's initial startup sequence */
+        rc = ipw_poll_bit(priv, CX2_INTA_RW,
+                          CX2_INTA_BIT_FW_INITIALIZATION_DONE, 500);
+        if (rc < 0) {
+                IPW_ERROR("device failed to boot initial fw image\n");
+                goto error;
+        }
+        IPW_DEBUG_INFO("initial device response after %dms\n", rc);
+
+        /* ack fw init done interrupt */
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_BIT_FW_INITIALIZATION_DONE);
+
+        /* DMA the ucode into the device */
+        rc = ipw_load_ucode(priv, ucode->data + sizeof(struct fw_header),
+                            ucode->size - sizeof(struct fw_header));
+        if (rc < 0) {
+                IPW_ERROR("Unable to load ucode\n");
+                goto error;
+        }
+
+        /* stop nic */
+        ipw_stop_nic(priv);
+
+        /* DMA bss firmware into the device */
+        rc = ipw_load_firmware(priv, firmware->data +
+                               sizeof(struct fw_header),
+                               firmware->size - sizeof(struct fw_header));
+        if (rc < 0) {
+                IPW_ERROR("Unable to load firmware\n");
+                goto error;
+        }
+
+        ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 0);
+
+        rc = ipw_queue_reset(priv);
+        if (rc) {
+                IPW_ERROR("Unable to initialize queues\n");
+                goto error;
+        }
+
+        /* Ensure interrupts are disabled */
+        ipw_write32(priv, CX2_INTA_MASK_R, ~CX2_INTA_MASK_ALL);
+
+        /* kick start the device */
+        ipw_start_nic(priv);
+
+        if (ipw_read32(priv, CX2_INTA_RW) & CX2_INTA_BIT_PARITY_ERROR) {
+                if (retries > 0) {
+                        IPW_WARNING("Parity error.  Retrying init.\n");
+                        retries--;
+                        goto retry;
+                }
+
+                IPW_ERROR("TODO: Handle parity error -- schedule restart?\n");
+                rc = -EIO;
+                goto error;
+        }
+
+        /* wait for the device */
+        rc = ipw_poll_bit(priv, CX2_INTA_RW,
+                          CX2_INTA_BIT_FW_INITIALIZATION_DONE, 500);
+        if (rc < 0) {
+                IPW_ERROR("device failed to start after 500ms\n");
+                goto error;
+        }
+        IPW_DEBUG_INFO("device response after %dms\n", rc);
+
+        /* ack fw init done interrupt */
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_BIT_FW_INITIALIZATION_DONE);
+
+        /* read eeprom data and initialize the eeprom region of sram */
+        priv->eeprom_delay = 1;
+        ipw_eeprom_init_sram(priv);
+
+        /* enable interrupts */
+        ipw_enable_interrupts(priv);
+
+        /* Ensure our queue has valid packets */
+        ipw_rx_queue_replenish(priv);
+
+        ipw_write32(priv, CX2_RX_READ_INDEX, priv->rxq->read);
+
+        /* ack pending interrupts */
+        ipw_write32(priv, CX2_INTA_RW, CX2_INTA_MASK_ALL);
+
+#ifndef CONFIG_PM
+        release_firmware(bootfw);
+        release_firmware(ucode);
+        release_firmware(firmware);
+#endif
+        return 0;
+
+      error:
+        if (priv->rxq) {
+                ipw_rx_queue_free(priv, priv->rxq);
+                priv->rxq = NULL;
+        }
+        ipw_tx_queue_free(priv);
+        if (bootfw)
+                release_firmware(bootfw);
+        if (ucode)
+                release_firmware(ucode);
+        if (firmware)
+                release_firmware(firmware);
+#ifdef CONFIG_PM
+        fw_loaded = 0;
+        bootfw = ucode = firmware = NULL;
+#endif
+
+        return rc;
+}
+
+/**
+ * DMA services
+ *
+ * Theory of operation
+ *
+ * A queue is a circular buffers with 'Read' and 'Write' pointers.
+ * 2 empty entries always kept in the buffer to protect from overflow.
+ *
+ * For Tx queue, there are low mark and high mark limits. If, after queuing
+ * the packet for Tx, free space become < low mark, Tx queue stopped. When
+ * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
+ * Tx queue resumed.
+ *
+ * The IPW operates with six queues, one receive queue in the device's
+ * sram, one transmit queue for sending commands to the device firmware,
+ * and four transmit queues for data.
+ *
+ * The four transmit queues allow for performing quality of service (qos)
+ * transmissions as per the 802.11 protocol.  Currently Linux does not
+ * provide a mechanism to the user for utilizing prioritized queues, so
+ * we only utilize the first data transmit queue (queue1).
+ */
+
+/**
+ * Driver allocates buffers of this size for Rx
+ */
+
+static inline int ipw_queue_space(const struct clx2_queue *q)
+{
+        int s = q->last_used - q->first_empty;
+        if (s <= 0)
+                s += q->n_bd;
+        s -= 2;                 /* keep some reserve to not confuse empty and full situations */
+        if (s < 0)
+                s = 0;
+        return s;
+}
+
+static inline int ipw_queue_inc_wrap(int index, int n_bd)
+{
+        return (++index == n_bd) ? 0 : index;
+}
+
+/**
+ * Initialize common DMA queue structure
+ *
+ * @param q                queue to init
+ * @param count            Number of BD's to allocate. Should be power of 2
+ * @param read_register    Address for 'read' register
+ *                         (not offset within BAR, full address)
+ * @param write_register   Address for 'write' register
+ *                         (not offset within BAR, full address)
+ * @param base_register    Address for 'base' register
+ *                         (not offset within BAR, full address)
+ * @param size             Address for 'size' register
+ *                         (not offset within BAR, full address)
+ */
+static void ipw_queue_init(struct ipw_priv *priv, struct clx2_queue *q,
+                           int count, u32 read, u32 write, u32 base, u32 size)
+{
+        q->n_bd = count;
+
+        q->low_mark = q->n_bd / 4;
+        if (q->low_mark < 4)
+                q->low_mark = 4;
+
+        q->high_mark = q->n_bd / 8;
+        if (q->high_mark < 2)
+                q->high_mark = 2;
+
+        q->first_empty = q->last_used = 0;
+        q->reg_r = read;
+        q->reg_w = write;
+
+        ipw_write32(priv, base, q->dma_addr);
+        ipw_write32(priv, size, count);
+        ipw_write32(priv, read, 0);
+        ipw_write32(priv, write, 0);
+
+        _ipw_read32(priv, 0x90);
+}
+
+static int ipw_queue_tx_init(struct ipw_priv *priv,
+                             struct clx2_tx_queue *q,
+                             int count, u32 read, u32 write, u32 base, u32 size)
+{
+        struct pci_dev *dev = priv->pci_dev;
+
+        q->txb = kmalloc(sizeof(q->txb[0]) * count, GFP_KERNEL);
+        if (!q->txb) {
+                IPW_ERROR("vmalloc for auxilary BD structures failed\n");
+                return -ENOMEM;
+        }
+
+        q->bd =
+            pci_alloc_consistent(dev, sizeof(q->bd[0]) * count, &q->q.dma_addr);
+        if (!q->bd) {
+                IPW_ERROR("pci_alloc_consistent(%zd) failed\n",
+                          sizeof(q->bd[0]) * count);
+                kfree(q->txb);
+                q->txb = NULL;
+                return -ENOMEM;
+        }
+
+        ipw_queue_init(priv, &q->q, count, read, write, base, size);
+        return 0;
+}
+
+/**
+ * Free one TFD, those at index [txq->q.last_used].
+ * Do NOT advance any indexes
+ *
+ * @param dev
+ * @param txq
+ */
+static void ipw_queue_tx_free_tfd(struct ipw_priv *priv,
+                                  struct clx2_tx_queue *txq)
+{
+        struct tfd_frame *bd = &txq->bd[txq->q.last_used];
+        struct pci_dev *dev = priv->pci_dev;
+        int i;
+
+        /* classify bd */
+        if (bd->control_flags.message_type == TX_HOST_COMMAND_TYPE)
+                /* nothing to cleanup after for host commands */
+                return;
+
+        /* sanity check */
+        if (bd->u.data.num_chunks > NUM_TFD_CHUNKS) {
+                IPW_ERROR("Too many chunks: %i\n", bd->u.data.num_chunks);
+                /** @todo issue fatal error, it is quite serious situation */
+                return;
+        }
+
+        /* unmap chunks if any */
+        for (i = 0; i < bd->u.data.num_chunks; i++) {
+                pci_unmap_single(dev, bd->u.data.chunk_ptr[i],
+                                 bd->u.data.chunk_len[i], PCI_DMA_TODEVICE);
+                if (txq->txb[txq->q.last_used]) {
+                        ieee80211_txb_free(txq->txb[txq->q.last_used]);
+                        txq->txb[txq->q.last_used] = NULL;
+                }
+        }
+}
+
+/**
+ * Deallocate DMA queue.
+ *
+ * Empty queue by removing and destroying all BD's.
+ * Free all buffers.
+ *
+ * @param dev
+ * @param q
+ */
+static void ipw_queue_tx_free(struct ipw_priv *priv, struct clx2_tx_queue *txq)
+{
+        struct clx2_queue *q = &txq->q;
+        struct pci_dev *dev = priv->pci_dev;
+
+        if (q->n_bd == 0)
+                return;
+
+        /* first, empty all BD's */
+        for (; q->first_empty != q->last_used;
+             q->last_used = ipw_queue_inc_wrap(q->last_used, q->n_bd)) {
+                ipw_queue_tx_free_tfd(priv, txq);
+        }
+
+        /* free buffers belonging to queue itself */
+        pci_free_consistent(dev, sizeof(txq->bd[0]) * q->n_bd, txq->bd,
+                            q->dma_addr);
+        kfree(txq->txb);
+
+        /* 0 fill whole structure */
+        memset(txq, 0, sizeof(*txq));
+}
+
+/**
+ * Destroy all DMA queues and structures
+ *
+ * @param priv
+ */
+static void ipw_tx_queue_free(struct ipw_priv *priv)
+{
+        /* Tx CMD queue */
+        ipw_queue_tx_free(priv, &priv->txq_cmd);
+
+        /* Tx queues */
+        ipw_queue_tx_free(priv, &priv->txq[0]);
+        ipw_queue_tx_free(priv, &priv->txq[1]);
+        ipw_queue_tx_free(priv, &priv->txq[2]);
+        ipw_queue_tx_free(priv, &priv->txq[3]);
+}
+
+static void inline __maybe_wake_tx(struct ipw_priv *priv)
+{
+        if (netif_running(priv->net_dev)) {
+                switch (priv->port_type) {
+                case DCR_TYPE_MU_BSS:
+                case DCR_TYPE_MU_IBSS:
+                        if (!(priv->status & STATUS_ASSOCIATED)) {
+                                return;
+                        }
+                }
+                netif_wake_queue(priv->net_dev);
+        }
+
+}
+
+static inline void ipw_create_bssid(struct ipw_priv *priv, u8 * bssid)
+{
+        /* First 3 bytes are manufacturer */
+        bssid[0] = priv->mac_addr[0];
+        bssid[1] = priv->mac_addr[1];
+        bssid[2] = priv->mac_addr[2];
+
+        /* Last bytes are random */
+        get_random_bytes(&bssid[3], ETH_ALEN - 3);
+
+        bssid[0] &= 0xfe;       /* clear multicast bit */
+        bssid[0] |= 0x02;       /* set local assignment bit (IEEE802) */
+}
+
+static inline u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
+{
+        struct ipw_station_entry entry;
+        int i;
+
+        for (i = 0; i < priv->num_stations; i++) {
+                if (!memcmp(priv->stations[i], bssid, ETH_ALEN)) {
+                        /* Another node is active in network */
+                        priv->missed_adhoc_beacons = 0;
+                        if (!(priv->config & CFG_STATIC_CHANNEL))
+                                /* when other nodes drop out, we drop out */
+                                priv->config &= ~CFG_ADHOC_PERSIST;
+
+                        return i;
+                }
+        }
+
+        if (i == MAX_STATIONS)
+                return IPW_INVALID_STATION;
+
+        IPW_DEBUG_SCAN("Adding AdHoc station: " MAC_FMT "\n", MAC_ARG(bssid));
+
+        entry.reserved = 0;
+        entry.support_mode = 0;
+        memcpy(entry.mac_addr, bssid, ETH_ALEN);
+        memcpy(priv->stations[i], bssid, ETH_ALEN);
+        ipw_write_direct(priv, IPW_STATION_TABLE_LOWER + i * sizeof(entry),
+                         &entry, sizeof(entry));
+        priv->num_stations++;
+
+        return i;
+}
+
+static inline u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid)
+{
+        int i;
+
+        for (i = 0; i < priv->num_stations; i++)
+                if (!memcmp(priv->stations[i], bssid, ETH_ALEN))
+                        return i;
+
+        return IPW_INVALID_STATION;
+}
+
+static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
+{
+        int err;
+
+        if (!(priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED))) {
+                IPW_DEBUG_ASSOC("Disassociating while not associated.\n");
+                return;
+        }
+
+        IPW_DEBUG_ASSOC("Disassocation attempt from " MAC_FMT " "
+                        "on channel %d.\n",
+                        MAC_ARG(priv->assoc_request.bssid),
+                        priv->assoc_request.channel);
+
+        priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
+        priv->status |= STATUS_DISASSOCIATING;
+
+        if (quiet)
+                priv->assoc_request.assoc_type = HC_DISASSOC_QUIET;
+        else
+                priv->assoc_request.assoc_type = HC_DISASSOCIATE;
+        err = ipw_send_associate(priv, &priv->assoc_request);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send [dis]associate command "
+                             "failed.\n");
+                return;
+        }
+
+}
+
+static void ipw_disassociate(void *data)
+{
+        ipw_send_disassociate(data, 0);
+}
+
+static void notify_wx_assoc_event(struct ipw_priv *priv)
+{
+        union iwreq_data wrqu;
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        if (priv->status & STATUS_ASSOCIATED)
+                memcpy(wrqu.ap_addr.sa_data, priv->bssid, ETH_ALEN);
+        else
+                memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        wireless_send_event(priv->net_dev, SIOCGIWAP, &wrqu, NULL);
+}
+
+struct ipw_status_code {
+        u16 status;
+        const char *reason;
+};
+
+static const struct ipw_status_code ipw_status_codes[] = {
+        {0x00, "Successful"},
+        {0x01, "Unspecified failure"},
+        {0x0A, "Cannot support all requested capabilities in the "
+         "Capability information field"},
+        {0x0B, "Reassociation denied due to inability to confirm that "
+         "association exists"},
+        {0x0C, "Association denied due to reason outside the scope of this "
+         "standard"},
+        {0x0D,
+         "Responding station does not support the specified authentication "
+         "algorithm"},
+        {0x0E,
+         "Received an Authentication frame with authentication sequence "
+         "transaction sequence number out of expected sequence"},
+        {0x0F, "Authentication rejected because of challenge failure"},
+        {0x10, "Authentication rejected due to timeout waiting for next "
+         "frame in sequence"},
+        {0x11, "Association denied because AP is unable to handle additional "
+         "associated stations"},
+        {0x12,
+         "Association denied due to requesting station not supporting all "
+         "of the datarates in the BSSBasicServiceSet Parameter"},
+        {0x13,
+         "Association denied due to requesting station not supporting "
+         "short preamble operation"},
+        {0x14,
+         "Association denied due to requesting station not supporting "
+         "PBCC encoding"},
+        {0x15,
+         "Association denied due to requesting station not supporting "
+         "channel agility"},
+        {0x19,
+         "Association denied due to requesting station not supporting "
+         "short slot operation"},
+        {0x1A,
+         "Association denied due to requesting station not supporting "
+         "DSSS-OFDM operation"},
+        {0x28, "Invalid Information Element"},
+        {0x29, "Group Cipher is not valid"},
+        {0x2A, "Pairwise Cipher is not valid"},
+        {0x2B, "AKMP is not valid"},
+        {0x2C, "Unsupported RSN IE version"},
+        {0x2D, "Invalid RSN IE Capabilities"},
+        {0x2E, "Cipher suite is rejected per security policy"},
+};
+
+#ifdef CONFIG_IPW_DEBUG
+static const char *ipw_get_status_code(u16 status)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ipw_status_codes); i++)
+                if (ipw_status_codes[i].status == status)
+                        return ipw_status_codes[i].reason;
+        return "Unknown status value.";
+}
+#endif
+
+static void inline average_init(struct average *avg)
+{
+        memset(avg, 0, sizeof(*avg));
+}
+
+static void inline average_add(struct average *avg, s16 val)
+{
+        avg->sum -= avg->entries[avg->pos];
+        avg->sum += val;
+        avg->entries[avg->pos++] = val;
+        if (unlikely(avg->pos == AVG_ENTRIES)) {
+                avg->init = 1;
+                avg->pos = 0;
+        }
+}
+
+static s16 inline average_value(struct average *avg)
+{
+        if (!unlikely(avg->init)) {
+                if (avg->pos)
+                        return avg->sum / avg->pos;
+                return 0;
+        }
+
+        return avg->sum / AVG_ENTRIES;
+}
+
+static void ipw_reset_stats(struct ipw_priv *priv)
+{
+        u32 len = sizeof(u32);
+
+        priv->quality = 0;
+
+        average_init(&priv->average_missed_beacons);
+        average_init(&priv->average_rssi);
+        average_init(&priv->average_noise);
+
+        priv->last_rate = 0;
+        priv->last_missed_beacons = 0;
+        priv->last_rx_packets = 0;
+        priv->last_tx_packets = 0;
+        priv->last_tx_failures = 0;
+
+        /* Firmware managed, reset only when NIC is restarted, so we have to
+         * normalize on the current value */
+        ipw_get_ordinal(priv, IPW_ORD_STAT_RX_ERR_CRC,
+                        &priv->last_rx_err, &len);
+        ipw_get_ordinal(priv, IPW_ORD_STAT_TX_FAILURE,
+                        &priv->last_tx_failures, &len);
+
+        /* Driver managed, reset with each association */
+        priv->missed_adhoc_beacons = 0;
+        priv->missed_beacons = 0;
+        priv->tx_packets = 0;
+        priv->rx_packets = 0;
+
+}
+
+static inline u32 ipw_get_max_rate(struct ipw_priv *priv)
+{
+        u32 i = 0x80000000;
+        u32 mask = priv->rates_mask;
+        /* If currently associated in B mode, restrict the maximum
+         * rate match to B rates */
+        if (priv->assoc_request.ieee_mode == IPW_B_MODE)
+                mask &= IEEE80211_CCK_RATES_MASK;
+
+        /* TODO: Verify that the rate is supported by the current rates
+         * list. */
+
+        while (i && !(mask & i))
+                i >>= 1;
+        switch (i) {
+        case IEEE80211_CCK_RATE_1MB_MASK:       return 1000000;
+        case IEEE80211_CCK_RATE_2MB_MASK:       return 2000000;
+        case IEEE80211_CCK_RATE_5MB_MASK:       return 5500000;
+        case IEEE80211_OFDM_RATE_6MB_MASK:      return 6000000;
+        case IEEE80211_OFDM_RATE_9MB_MASK:      return 9000000;
+        case IEEE80211_CCK_RATE_11MB_MASK:      return 11000000;
+        case IEEE80211_OFDM_RATE_12MB_MASK:     return 12000000;
+        case IEEE80211_OFDM_RATE_18MB_MASK:     return 18000000;
+        case IEEE80211_OFDM_RATE_24MB_MASK:     return 24000000;
+        case IEEE80211_OFDM_RATE_36MB_MASK:     return 36000000;
+        case IEEE80211_OFDM_RATE_48MB_MASK:     return 48000000;
+        case IEEE80211_OFDM_RATE_54MB_MASK:     return 54000000;
+        }
+
+        if (priv->ieee->mode == IEEE_B)
+                return 11000000;
+        else
+                return 54000000;
+}
+
+static u32 ipw_get_current_rate(struct ipw_priv *priv)
+{
+        u32 rate, len = sizeof(rate);
+        int err;
+
+        if (!(priv->status & STATUS_ASSOCIATED))
+                return 0;
+
+        if (priv->tx_packets > IPW_REAL_RATE_RX_PACKET_THRESHOLD) {
+                err = ipw_get_ordinal(priv, IPW_ORD_STAT_TX_CURR_RATE, &rate,
+                                      &len);
+                if (err) {
+                        IPW_DEBUG_INFO("failed querying ordinals.\n");
+                        return 0;
+                }
+        } else
+                return ipw_get_max_rate(priv);
+
+        switch (rate) {
+        case IPW_TX_RATE_1MB:   return 1000000;
+        case IPW_TX_RATE_2MB:   return 2000000;
+        case IPW_TX_RATE_5MB:   return 5500000;
+        case IPW_TX_RATE_6MB:   return 6000000;
+        case IPW_TX_RATE_9MB:   return 9000000;
+        case IPW_TX_RATE_11MB:  return 11000000;
+        case IPW_TX_RATE_12MB:  return 12000000;
+        case IPW_TX_RATE_18MB:  return 18000000;
+        case IPW_TX_RATE_24MB:  return 24000000;
+        case IPW_TX_RATE_36MB:  return 36000000;
+        case IPW_TX_RATE_48MB:  return 48000000;
+        case IPW_TX_RATE_54MB:  return 54000000;
+        }
+
+        return 0;
+}
+
+#define PERFECT_RSSI (-50)
+#define WORST_RSSI   (-85)
+#define IPW_STATS_INTERVAL (2 * HZ)
+static void ipw_gather_stats(struct ipw_priv *priv)
+{
+        u32 rx_err, rx_err_delta, rx_packets_delta;
+        u32 tx_failures, tx_failures_delta, tx_packets_delta;
+        u32 missed_beacons_percent, missed_beacons_delta;
+        u32 quality = 0;
+        u32 len = sizeof(u32);
+        s16 rssi;
+        u32 beacon_quality, signal_quality, tx_quality, rx_quality,
+            rate_quality;
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                priv->quality = 0;
+                return;
+        }
+
+        /* Update the statistics */
+        ipw_get_ordinal(priv, IPW_ORD_STAT_MISSED_BEACONS,
+                        &priv->missed_beacons, &len);
+        missed_beacons_delta = priv->missed_beacons - priv->last_missed_beacons;
+        priv->last_missed_beacons = priv->missed_beacons;
+        if (priv->assoc_request.beacon_interval) {
+                missed_beacons_percent = missed_beacons_delta *
+                    (HZ * priv->assoc_request.beacon_interval) /
+                    (IPW_STATS_INTERVAL * 10);
+        } else {
+                missed_beacons_percent = 0;
+        }
+        average_add(&priv->average_missed_beacons, missed_beacons_percent);
+
+        ipw_get_ordinal(priv, IPW_ORD_STAT_RX_ERR_CRC, &rx_err, &len);
+        rx_err_delta = rx_err - priv->last_rx_err;
+        priv->last_rx_err = rx_err;
+
+        ipw_get_ordinal(priv, IPW_ORD_STAT_TX_FAILURE, &tx_failures, &len);
+        tx_failures_delta = tx_failures - priv->last_tx_failures;
+        priv->last_tx_failures = tx_failures;
+
+        rx_packets_delta = priv->rx_packets - priv->last_rx_packets;
+        priv->last_rx_packets = priv->rx_packets;
+
+        tx_packets_delta = priv->tx_packets - priv->last_tx_packets;
+        priv->last_tx_packets = priv->tx_packets;
+
+        /* Calculate quality based on the following:
+         *
+         * Missed beacon: 100% = 0, 0% = 70% missed
+         * Rate: 60% = 1Mbs, 100% = Max
+         * Rx and Tx errors represent a straight % of total Rx/Tx
+         * RSSI: 100% = > -50,  0% = < -80
+         * Rx errors: 100% = 0, 0% = 50% missed
+         *
+         * The lowest computed quality is used.
+         *
+         */
+#define BEACON_THRESHOLD 5
+        beacon_quality = 100 - missed_beacons_percent;
+        if (beacon_quality < BEACON_THRESHOLD)
+                beacon_quality = 0;
+        else
+                beacon_quality = (beacon_quality - BEACON_THRESHOLD) * 100 /
+                    (100 - BEACON_THRESHOLD);
+        IPW_DEBUG_STATS("Missed beacon: %3d%% (%d%%)\n",
+                        beacon_quality, missed_beacons_percent);
+
+        priv->last_rate = ipw_get_current_rate(priv);
+        rate_quality = priv->last_rate * 40 / priv->last_rate + 60;
+        IPW_DEBUG_STATS("Rate quality : %3d%% (%dMbs)\n",
+                        rate_quality, priv->last_rate / 1000000);
+
+        if (rx_packets_delta > 100 && rx_packets_delta + rx_err_delta)
+                rx_quality = 100 - (rx_err_delta * 100) /
+                    (rx_packets_delta + rx_err_delta);
+        else
+                rx_quality = 100;
+        IPW_DEBUG_STATS("Rx quality   : %3d%% (%u errors, %u packets)\n",
+                        rx_quality, rx_err_delta, rx_packets_delta);
+
+        if (tx_packets_delta > 100 && tx_packets_delta + tx_failures_delta)
+                tx_quality = 100 - (tx_failures_delta * 100) /
+                    (tx_packets_delta + tx_failures_delta);
+        else
+                tx_quality = 100;
+        IPW_DEBUG_STATS("Tx quality   : %3d%% (%u errors, %u packets)\n",
+                        tx_quality, tx_failures_delta, tx_packets_delta);
+
+        rssi = average_value(&priv->average_rssi);
+        if (rssi > PERFECT_RSSI)
+                signal_quality = 100;
+        else if (rssi < WORST_RSSI)
+                signal_quality = 0;
+        else
+                signal_quality = (rssi - WORST_RSSI) * 100 /
+                    (PERFECT_RSSI - WORST_RSSI);
+        IPW_DEBUG_STATS("Signal level : %3d%% (%d dBm)\n",
+                        signal_quality, rssi);
+
+        quality = min(beacon_quality,
+                      min(rate_quality,
+                          min(tx_quality, min(rx_quality, signal_quality))));
+        if (quality == beacon_quality)
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to missed beacons.\n",
+                                quality);
+        if (quality == rate_quality)
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to rate quality.\n",
+                                quality);
+        if (quality == tx_quality)
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to Tx quality.\n",
+                                quality);
+        if (quality == rx_quality)
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to Rx quality.\n",
+                                quality);
+        if (quality == signal_quality)
+                IPW_DEBUG_STATS("Quality (%d%%): Clamped to signal quality.\n",
+                                quality);
+
+        priv->quality = quality;
+
+        queue_delayed_work(priv->workqueue, &priv->gather_stats,
+                           IPW_STATS_INTERVAL);
+}
+
+/**
+ * Handle host notification packet.
+ * Called from interrupt routine
+ */
+static inline void ipw_rx_notification(struct ipw_priv *priv,
+                                       struct ipw_rx_notification *notif)
+{
+        IPW_DEBUG_NOTIF("type = %i (%d bytes)\n", notif->subtype, notif->size);
+
+        switch (notif->subtype) {
+        case HOST_NOTIFICATION_STATUS_ASSOCIATED:{
+                        struct notif_association *assoc = &notif->u.assoc;
+
+                        switch (assoc->state) {
+                        case CMAS_ASSOCIATED:{
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "associated: '%s' " MAC_FMT
+                                                  " \n",
+                                                  escape_essid(priv->essid,
+                                                               priv->essid_len),
+                                                  MAC_ARG(priv->bssid));
+
+                                        switch (priv->ieee->iw_mode) {
+                                        case IW_MODE_INFRA:
+                                                memcpy(priv->ieee->bssid,
+                                                       priv->bssid, ETH_ALEN);
+                                                break;
+
+                                        case IW_MODE_ADHOC:
+                                                memcpy(priv->ieee->bssid,
+                                                       priv->bssid, ETH_ALEN);
+
+                                                /* clear out the station table */
+                                                priv->num_stations = 0;
+
+                                                IPW_DEBUG_ASSOC
+                                                    ("queueing adhoc check\n");
+                                                queue_delayed_work(priv->
+                                                                   workqueue,
+                                                                   &priv->
+                                                                   adhoc_check,
+                                                                   priv->
+                                                                   assoc_request.
+                                                                   beacon_interval);
+                                                break;
+                                        }
+
+                                        priv->status &= ~STATUS_ASSOCIATING;
+                                        priv->status |= STATUS_ASSOCIATED;
+
+                                        netif_carrier_on(priv->net_dev);
+                                        if (netif_queue_stopped(priv->net_dev)) {
+                                                IPW_DEBUG_NOTIF
+                                                    ("waking queue\n");
+                                                netif_wake_queue(priv->net_dev);
+                                        } else {
+                                                IPW_DEBUG_NOTIF
+                                                    ("starting queue\n");
+                                                netif_start_queue(priv->
+                                                                  net_dev);
+                                        }
+
+                                        ipw_reset_stats(priv);
+                                        /* Ensure the rate is updated immediately */
+                                        priv->last_rate =
+                                            ipw_get_current_rate(priv);
+                                        schedule_work(&priv->gather_stats);
+                                        notify_wx_assoc_event(priv);
+
+/*                      queue_delayed_work(priv->workqueue,
+                                           &priv->request_scan,
+                                           SCAN_ASSOCIATED_INTERVAL);
+*/
+                                        break;
+                                }
+
+                        case CMAS_AUTHENTICATED:{
+                                        if (priv->
+                                            status & (STATUS_ASSOCIATED |
+                                                      STATUS_AUTH)) {
+#ifdef CONFIG_IPW_DEBUG
+                                                struct notif_authenticate *auth
+                                                    = &notif->u.auth;
+                                                IPW_DEBUG(IPW_DL_NOTIF |
+                                                          IPW_DL_STATE |
+                                                          IPW_DL_ASSOC,
+                                                          "deauthenticated: '%s' "
+                                                          MAC_FMT
+                                                          ": (0x%04X) - %s \n",
+                                                          escape_essid(priv->
+                                                                       essid,
+                                                                       priv->
+                                                                       essid_len),
+                                                          MAC_ARG(priv->bssid),
+                                                          ntohs(auth->status),
+                                                          ipw_get_status_code
+                                                          (ntohs
+                                                           (auth->status)));
+#endif
+
+                                                priv->status &=
+                                                    ~(STATUS_ASSOCIATING |
+                                                      STATUS_AUTH |
+                                                      STATUS_ASSOCIATED);
+
+                                                netif_carrier_off(priv->
+                                                                  net_dev);
+                                                netif_stop_queue(priv->net_dev);
+                                                queue_work(priv->workqueue,
+                                                           &priv->request_scan);
+                                                notify_wx_assoc_event(priv);
+                                                break;
+                                        }
+
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "authenticated: '%s' " MAC_FMT
+                                                  "\n",
+                                                  escape_essid(priv->essid,
+                                                               priv->essid_len),
+                                                  MAC_ARG(priv->bssid));
+                                        break;
+                                }
+
+                        case CMAS_INIT:{
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "disassociated: '%s' " MAC_FMT
+                                                  " \n",
+                                                  escape_essid(priv->essid,
+                                                               priv->essid_len),
+                                                  MAC_ARG(priv->bssid));
+
+                                        priv->status &=
+                                            ~(STATUS_DISASSOCIATING |
+                                              STATUS_ASSOCIATING |
+                                              STATUS_ASSOCIATED | STATUS_AUTH);
+
+                                        netif_stop_queue(priv->net_dev);
+                                        if (!(priv->status & STATUS_ROAMING)) {
+                                                netif_carrier_off(priv->
+                                                                  net_dev);
+                                                notify_wx_assoc_event(priv);
+
+                                                /* Cancel any queued work ... */
+                                                cancel_delayed_work(&priv->
+                                                                    request_scan);
+                                                cancel_delayed_work(&priv->
+                                                                    adhoc_check);
+
+                                                /* Queue up another scan... */
+                                                queue_work(priv->workqueue,
+                                                           &priv->request_scan);
+
+                                                cancel_delayed_work(&priv->
+                                                                    gather_stats);
+                                        } else {
+                                                priv->status |= STATUS_ROAMING;
+                                                queue_work(priv->workqueue,
+                                                           &priv->request_scan);
+                                        }
+
+                                        ipw_reset_stats(priv);
+                                        break;
+                                }
+
+                        default:
+                                IPW_ERROR("assoc: unknown (%d)\n",
+                                          assoc->state);
+                                break;
+                        }
+
+                        break;
+                }
+
+        case HOST_NOTIFICATION_STATUS_AUTHENTICATE:{
+                        struct notif_authenticate *auth = &notif->u.auth;
+                        switch (auth->state) {
+                        case CMAS_AUTHENTICATED:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                          "authenticated: '%s' " MAC_FMT " \n",
+                                          escape_essid(priv->essid,
+                                                       priv->essid_len),
+                                          MAC_ARG(priv->bssid));
+                                priv->status |= STATUS_AUTH;
+                                break;
+
+                        case CMAS_INIT:
+                                if (priv->status & STATUS_AUTH) {
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                                  IPW_DL_ASSOC,
+                                                  "authentication failed (0x%04X): %s\n",
+                                                  ntohs(auth->status),
+                                                  ipw_get_status_code(ntohs
+                                                                      (auth->
+                                                                       status)));
+                                }
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC,
+                                          "deauthenticated: '%s' " MAC_FMT "\n",
+                                          escape_essid(priv->essid,
+                                                       priv->essid_len),
+                                          MAC_ARG(priv->bssid));
+
+                                priv->status &= ~(STATUS_ASSOCIATING |
+                                                  STATUS_AUTH |
+                                                  STATUS_ASSOCIATED);
+
+                                netif_carrier_off(priv->net_dev);
+                                netif_stop_queue(priv->net_dev);
+                                queue_work(priv->workqueue,
+                                           &priv->request_scan);
+                                notify_wx_assoc_event(priv);
+                                break;
+
+                        case CMAS_TX_AUTH_SEQ_1:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_1\n");
+                                break;
+                        case CMAS_RX_AUTH_SEQ_2:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_2\n");
+                                break;
+                        case CMAS_AUTH_SEQ_1_PASS:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_1_PASS\n");
+                                break;
+                        case CMAS_AUTH_SEQ_1_FAIL:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_1_FAIL\n");
+                                break;
+                        case CMAS_TX_AUTH_SEQ_3:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_3\n");
+                                break;
+                        case CMAS_RX_AUTH_SEQ_4:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "RX_AUTH_SEQ_4\n");
+                                break;
+                        case CMAS_AUTH_SEQ_2_PASS:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUTH_SEQ_2_PASS\n");
+                                break;
+                        case CMAS_AUTH_SEQ_2_FAIL:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "AUT_SEQ_2_FAIL\n");
+                                break;
+                        case CMAS_TX_ASSOC:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "TX_ASSOC\n");
+                                break;
+                        case CMAS_RX_ASSOC_RESP:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "RX_ASSOC_RESP\n");
+                                break;
+                        case CMAS_ASSOCIATED:
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
+                                          IPW_DL_ASSOC, "ASSOCIATED\n");
+                                break;
+                        default:
+                                IPW_DEBUG_NOTIF("auth: failure - %d\n",
+                                                auth->state);
+                                break;
+                        }
+                        break;
+                }
+
+        case HOST_NOTIFICATION_STATUS_SCAN_CHANNEL_RESULT:{
+                        struct notif_channel_result *x =
+                            &notif->u.channel_result;
+
+                        if (notif->size == sizeof(*x)) {
+                                IPW_DEBUG_SCAN("Scan result for channel %d\n",
+                                               x->channel_num);
+                        } else {
+                                IPW_DEBUG_SCAN("Scan result of wrong size %d "
+                                               "(should be %zd)\n",
+                                               notif->size, sizeof(*x));
+                        }
+                        break;
+                }
+
+        case HOST_NOTIFICATION_STATUS_SCAN_COMPLETED:{
+                        struct notif_scan_complete *x = &notif->u.scan_complete;
+                        if (notif->size == sizeof(*x)) {
+                                IPW_DEBUG_SCAN
+                                    ("Scan completed: type %d, %d channels, "
+                                     "%d status\n", x->scan_type,
+                                     x->num_channels, x->status);
+                        } else {
+                                IPW_ERROR("Scan completed of wrong size %d "
+                                          "(should be %zd)\n",
+                                          notif->size, sizeof(*x));
+                        }
+
+                        priv->status &=
+                            ~(STATUS_SCANNING | STATUS_SCAN_ABORTING);
+
+                        cancel_delayed_work(&priv->scan_check);
+
+                        if (!(priv->status & (STATUS_ASSOCIATED |
+                                              STATUS_ASSOCIATING |
+                                              STATUS_ROAMING |
+                                              STATUS_DISASSOCIATING)))
+                                queue_work(priv->workqueue, &priv->associate);
+                        else if (priv->status & STATUS_ROAMING) {
+                                /* If a scan completed and we are in roam mode, then
+                                 * the scan that completed was the one requested as a
+                                 * result of entering roam... so, schedule the
+                                 * roam work */
+                                queue_work(priv->workqueue, &priv->roam);
+                        } else if (priv->status & STATUS_SCAN_PENDING)
+                                queue_work(priv->workqueue,
+                                           &priv->request_scan);
+
+                        priv->ieee->scans++;
+                        break;
+                }
+
+        case HOST_NOTIFICATION_STATUS_FRAG_LENGTH:{
+                        struct notif_frag_length *x = &notif->u.frag_len;
+
+                        if (notif->size == sizeof(*x)) {
+                                IPW_ERROR("Frag length: %d\n", x->frag_length);
+                        } else {
+                                IPW_ERROR("Frag length of wrong size %d "
+                                          "(should be %zd)\n",
+                                          notif->size, sizeof(*x));
+                        }
+                        break;
+                }
+
+        case HOST_NOTIFICATION_STATUS_LINK_DETERIORATION:{
+                        struct notif_link_deterioration *x =
+                            &notif->u.link_deterioration;
+                        if (notif->size == sizeof(*x)) {
+                                IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                          "link deterioration: '%s' " MAC_FMT
+                                          " \n", escape_essid(priv->essid,
+                                                              priv->essid_len),
+                                          MAC_ARG(priv->bssid));
+                                memcpy(&priv->last_link_deterioration, x,
+                                       sizeof(*x));
+                        } else {
+                                IPW_ERROR("Link Deterioration of wrong size %d "
+                                          "(should be %zd)\n",
+                                          notif->size, sizeof(*x));
+                        }
+                        break;
+                }
+
+        case HOST_NOTIFICATION_DINO_CONFIG_RESPONSE:{
+                        IPW_ERROR("Dino config\n");
+                        if (priv->hcmd
+                            && priv->hcmd->cmd == HOST_CMD_DINO_CONFIG) {
+                                /* TODO: Do anything special? */
+                        } else {
+                                IPW_ERROR("Unexpected DINO_CONFIG_RESPONSE\n");
+                        }
+                        break;
+                }
+
+        case HOST_NOTIFICATION_STATUS_BEACON_STATE:{
+                        struct notif_beacon_state *x = &notif->u.beacon_state;
+                        if (notif->size != sizeof(*x)) {
+                                IPW_ERROR
+                                    ("Beacon state of wrong size %d (should "
+                                     "be %zd)\n", notif->size, sizeof(*x));
+                                break;
+                        }
+
+                        if (x->state == HOST_NOTIFICATION_STATUS_BEACON_MISSING) {
+                                if (priv->status & STATUS_SCANNING) {
+                                        /* Stop scan to keep fw from getting
+                                         * stuck... */
+                                        queue_work(priv->workqueue,
+                                                   &priv->abort_scan);
+                                }
+
+                                if (x->number > priv->missed_beacon_threshold &&
+                                    priv->status & STATUS_ASSOCIATED) {
+                                        IPW_DEBUG(IPW_DL_INFO | IPW_DL_NOTIF |
+                                                  IPW_DL_STATE,
+                                                  "Missed beacon: %d - disassociate\n",
+                                                  x->number);
+                                        queue_work(priv->workqueue,
+                                                   &priv->disassociate);
+                                } else if (x->number > priv->roaming_threshold) {
+                                        IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
+                                                  "Missed beacon: %d - initiate "
+                                                  "roaming\n", x->number);
+                                        queue_work(priv->workqueue,
+                                                   &priv->roam);
+                                } else {
+                                        IPW_DEBUG_NOTIF("Missed beacon: %d\n",
+                                                        x->number);
+                                }
+
+                                priv->notif_missed_beacons = x->number;
+
+                        }
+
+                        break;
+                }
+
+        case HOST_NOTIFICATION_STATUS_TGI_TX_KEY:{
+                        struct notif_tgi_tx_key *x = &notif->u.tgi_tx_key;
+                        if (notif->size == sizeof(*x)) {
+                                IPW_ERROR("TGi Tx Key: state 0x%02x sec type "
+                                          "0x%02x station %d\n",
+                                          x->key_state, x->security_type,
+                                          x->station_index);
+                                break;
+                        }
+
+                        IPW_ERROR
+                            ("TGi Tx Key of wrong size %d (should be %zd)\n",
+                             notif->size, sizeof(*x));
+                        break;
+                }
+
+        case HOST_NOTIFICATION_CALIB_KEEP_RESULTS:{
+                        struct notif_calibration *x = &notif->u.calibration;
+
+                        if (notif->size == sizeof(*x)) {
+                                memcpy(&priv->calib, x, sizeof(*x));
+                                IPW_DEBUG_INFO("TODO: Calibration\n");
+                                break;
+                        }
+
+                        IPW_ERROR
+                            ("Calibration of wrong size %d (should be %zd)\n",
+                             notif->size, sizeof(*x));
+                        break;
+                }
+
+        case HOST_NOTIFICATION_NOISE_STATS:{
+                        if (notif->size == sizeof(u32)) {
+                                priv->last_noise =
+                                    (u8) (notif->u.noise.value & 0xff);
+                                average_add(&priv->average_noise,
+                                            priv->last_noise);
+                                break;
+                        }
+
+                        IPW_ERROR
+                            ("Noise stat is wrong size %d (should be %zd)\n",
+                             notif->size, sizeof(u32));
+                        break;
+                }
+
+        default:
+                IPW_ERROR("Unknown notification: "
+                          "subtype=%d,flags=0x%2x,size=%d\n",
+                          notif->subtype, notif->flags, notif->size);
+        }
+}
+
+/**
+ * Destroys all DMA structures and initialise them again
+ *
+ * @param priv
+ * @return error code
+ */
+static int ipw_queue_reset(struct ipw_priv *priv)
+{
+        int rc = 0;
+        /** @todo customize queue sizes */
+        int nTx = 64, nTxCmd = 8;
+        ipw_tx_queue_free(priv);
+        /* Tx CMD queue */
+        rc = ipw_queue_tx_init(priv, &priv->txq_cmd, nTxCmd,
+                               CX2_TX_CMD_QUEUE_READ_INDEX,
+                               CX2_TX_CMD_QUEUE_WRITE_INDEX,
+                               CX2_TX_CMD_QUEUE_BD_BASE,
+                               CX2_TX_CMD_QUEUE_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx Cmd queue init failed\n");
+                goto error;
+        }
+        /* Tx queue(s) */
+        rc = ipw_queue_tx_init(priv, &priv->txq[0], nTx,
+                               CX2_TX_QUEUE_0_READ_INDEX,
+                               CX2_TX_QUEUE_0_WRITE_INDEX,
+                               CX2_TX_QUEUE_0_BD_BASE, CX2_TX_QUEUE_0_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 0 queue init failed\n");
+                goto error;
+        }
+        rc = ipw_queue_tx_init(priv, &priv->txq[1], nTx,
+                               CX2_TX_QUEUE_1_READ_INDEX,
+                               CX2_TX_QUEUE_1_WRITE_INDEX,
+                               CX2_TX_QUEUE_1_BD_BASE, CX2_TX_QUEUE_1_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 1 queue init failed\n");
+                goto error;
+        }
+        rc = ipw_queue_tx_init(priv, &priv->txq[2], nTx,
+                               CX2_TX_QUEUE_2_READ_INDEX,
+                               CX2_TX_QUEUE_2_WRITE_INDEX,
+                               CX2_TX_QUEUE_2_BD_BASE, CX2_TX_QUEUE_2_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 2 queue init failed\n");
+                goto error;
+        }
+        rc = ipw_queue_tx_init(priv, &priv->txq[3], nTx,
+                               CX2_TX_QUEUE_3_READ_INDEX,
+                               CX2_TX_QUEUE_3_WRITE_INDEX,
+                               CX2_TX_QUEUE_3_BD_BASE, CX2_TX_QUEUE_3_BD_SIZE);
+        if (rc) {
+                IPW_ERROR("Tx 3 queue init failed\n");
+                goto error;
+        }
+        /* statistics */
+        priv->rx_bufs_min = 0;
+        priv->rx_pend_max = 0;
+        return rc;
+
+      error:
+        ipw_tx_queue_free(priv);
+        return rc;
+}
+
+/**
+ * Reclaim Tx queue entries no more used by NIC.
+ *
+ * When FW adwances 'R' index, all entries between old and
+ * new 'R' index need to be reclaimed. As result, some free space
+ * forms. If there is enough free space (> low mark), wake Tx queue.
+ *
+ * @note Need to protect against garbage in 'R' index
+ * @param priv
+ * @param txq
+ * @param qindex
+ * @return Number of used entries remains in the queue
+ */
+static int ipw_queue_tx_reclaim(struct ipw_priv *priv,
+                                struct clx2_tx_queue *txq, int qindex)
+{
+        u32 hw_tail;
+        int used;
+        struct clx2_queue *q = &txq->q;
+
+        hw_tail = ipw_read32(priv, q->reg_r);
+        if (hw_tail >= q->n_bd) {
+                IPW_ERROR
+                    ("Read index for DMA queue (%d) is out of range [0-%d)\n",
+                     hw_tail, q->n_bd);
+                goto done;
+        }
+        for (; q->last_used != hw_tail;
+             q->last_used = ipw_queue_inc_wrap(q->last_used, q->n_bd)) {
+                ipw_queue_tx_free_tfd(priv, txq);
+                priv->tx_packets++;
+        }
+      done:
+        if (ipw_queue_space(q) > q->low_mark && qindex >= 0) {
+                __maybe_wake_tx(priv);
+        }
+        used = q->first_empty - q->last_used;
+        if (used < 0)
+                used += q->n_bd;
+
+        return used;
+}
+
+static int ipw_queue_tx_hcmd(struct ipw_priv *priv, int hcmd, void *buf,
+                             int len, int sync)
+{
+        struct clx2_tx_queue *txq = &priv->txq_cmd;
+        struct clx2_queue *q = &txq->q;
+        struct tfd_frame *tfd;
+
+        if (ipw_queue_space(q) < (sync ? 1 : 2)) {
+                IPW_ERROR("No space for Tx\n");
+                return -EBUSY;
+        }
+
+        tfd = &txq->bd[q->first_empty];
+        txq->txb[q->first_empty] = NULL;
+
+        memset(tfd, 0, sizeof(*tfd));
+        tfd->control_flags.message_type = TX_HOST_COMMAND_TYPE;
+        tfd->control_flags.control_bits = TFD_NEED_IRQ_MASK;
+        priv->hcmd_seq++;
+        tfd->u.cmd.index = hcmd;
+        tfd->u.cmd.length = len;
+        memcpy(tfd->u.cmd.payload, buf, len);
+        q->first_empty = ipw_queue_inc_wrap(q->first_empty, q->n_bd);
+        ipw_write32(priv, q->reg_w, q->first_empty);
+        _ipw_read32(priv, 0x90);
+
+        return 0;
+}
+
+/*
+ * Rx theory of operation
+ *
+ * The host allocates 32 DMA target addresses and passes the host address
+ * to the firmware at register CX2_RFDS_TABLE_LOWER + N * RFD_SIZE where N is
+ * 0 to 31
+ *
+ * Rx Queue Indexes
+ * The host/firmware share two index registers for managing the Rx buffers.
+ *
+ * The READ index maps to the first position that the firmware may be writing
+ * to -- the driver can read up to (but not including) this position and get
+ * good data.
+ * The READ index is managed by the firmware once the card is enabled.
+ *
+ * The WRITE index maps to the last position the driver has read from -- the
+ * position preceding WRITE is the last slot the firmware can place a packet.
+ *
+ * The queue is empty (no good data) if WRITE = READ - 1, and is full if
+ * WRITE = READ.
+ *
+ * During initialization the host sets up the READ queue position to the first
+ * INDEX position, and WRITE to the last (READ - 1 wrapped)
+ *
+ * When the firmware places a packet in a buffer it will advance the READ index
+ * and fire the RX interrupt.  The driver can then query the READ index and
+ * process as many packets as possible, moving the WRITE index forward as it
+ * resets the Rx queue buffers with new memory.
+ *
+ * The management in the driver is as follows:
+ * + A list of pre-allocated SKBs is stored in ipw->rxq->rx_free.  When
+ *   ipw->rxq->free_count drops to or below RX_LOW_WATERMARK, work is scheduled
+ *   to replensish the ipw->rxq->rx_free.
+ * + In ipw_rx_queue_replenish (scheduled) if 'processed' != 'read' then the
+ *   ipw->rxq is replenished and the READ INDEX is updated (updating the
+ *   'processed' and 'read' driver indexes as well)
+ * + A received packet is processed and handed to the kernel network stack,
+ *   detached from the ipw->rxq.  The driver 'processed' index is updated.
+ * + The Host/Firmware ipw->rxq is replenished at tasklet time from the rx_free
+ *   list. If there are no allocated buffers in ipw->rxq->rx_free, the READ
+ *   INDEX is not incremented and ipw->status(RX_STALLED) is set.  If there
+ *   were enough free buffers and RX_STALLED is set it is cleared.
+ *
+ *
+ * Driver sequence:
+ *
+ * ipw_rx_queue_alloc()       Allocates rx_free
+ * ipw_rx_queue_replenish()   Replenishes rx_free list from rx_used, and calls
+ *                            ipw_rx_queue_restock
+ * ipw_rx_queue_restock()     Moves available buffers from rx_free into Rx
+ *                            queue, updates firmware pointers, and updates
+ *                            the WRITE index.  If insufficient rx_free buffers
+ *                            are available, schedules ipw_rx_queue_replenish
+ *
+ * -- enable interrupts --
+ * ISR - ipw_rx()             Detach ipw_rx_mem_buffers from pool up to the
+ *                            READ INDEX, detaching the SKB from the pool.
+ *                            Moves the packet buffer from queue to rx_used.
+ *                            Calls ipw_rx_queue_restock to refill any empty
+ *                            slots.
+ * ...
+ *
+ */
+
+/*
+ * If there are slots in the RX queue that  need to be restocked,
+ * and we have free pre-allocated buffers, fill the ranks as much
+ * as we can pulling from rx_free.
+ *
+ * This moves the 'write' index forward to catch up with 'processed', and
+ * also updates the memory address in the firmware to reference the new
+ * target buffer.
+ */
+static void ipw_rx_queue_restock(struct ipw_priv *priv)
+{
+        struct ipw_rx_queue *rxq = priv->rxq;
+        struct list_head *element;
+        struct ipw_rx_mem_buffer *rxb;
+        unsigned long flags;
+        int write;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+        write = rxq->write;
+        while ((rxq->write != rxq->processed) && (rxq->free_count)) {
+                element = rxq->rx_free.next;
+                rxb = list_entry(element, struct ipw_rx_mem_buffer, list);
+                list_del(element);
+
+                ipw_write32(priv, CX2_RFDS_TABLE_LOWER + rxq->write * RFD_SIZE,
+                            rxb->dma_addr);
+                rxq->queue[rxq->write] = rxb;
+                rxq->write = (rxq->write + 1) % RX_QUEUE_SIZE;
+                rxq->free_count--;
+        }
+        spin_unlock_irqrestore(&rxq->lock, flags);
+
+        /* If the pre-allocated buffer pool is dropping low, schedule to
+         * refill it */
+        if (rxq->free_count <= RX_LOW_WATERMARK)
+                queue_work(priv->workqueue, &priv->rx_replenish);
+
+        /* If we've added more space for the firmware to place data, tell it */
+        if (write != rxq->write)
+                ipw_write32(priv, CX2_RX_WRITE_INDEX, rxq->write);
+}
+
+/*
+ * Move all used packet from rx_used to rx_free, allocating a new SKB for each.
+ * Also restock the Rx queue via ipw_rx_queue_restock.
+ *
+ * This is called as a scheduled work item (except for during intialization)
+ */
+static void ipw_rx_queue_replenish(void *data)
+{
+        struct ipw_priv *priv = data;
+        struct ipw_rx_queue *rxq = priv->rxq;
+        struct list_head *element;
+        struct ipw_rx_mem_buffer *rxb;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rxq->lock, flags);
+        while (!list_empty(&rxq->rx_used)) {
+                element = rxq->rx_used.next;
+                rxb = list_entry(element, struct ipw_rx_mem_buffer, list);
+                rxb->skb = alloc_skb(CX2_RX_BUF_SIZE, GFP_ATOMIC);
+                if (!rxb->skb) {
+                        printk(KERN_CRIT "%s: Can not allocate SKB buffers.\n",
+                               priv->net_dev->name);
+                        /* We don't reschedule replenish work here -- we will
+                         * call the restock method and if it still needs
+                         * more buffers it will schedule replenish */
+                        break;
+                }
+                list_del(element);
+
+                rxb->rxb = (struct ipw_rx_buffer *)rxb->skb->data;
+                rxb->dma_addr =
+                    pci_map_single(priv->pci_dev, rxb->skb->data,
+                                   CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+
+                list_add_tail(&rxb->list, &rxq->rx_free);
+                rxq->free_count++;
+        }
+        spin_unlock_irqrestore(&rxq->lock, flags);
+
+        ipw_rx_queue_restock(priv);
+}
+
+/* Assumes that the skb field of the buffers in 'pool' is kept accurate.
+ * If an SKB has been detached, the POOL needs to have it's SKB set to NULL
+ * This free routine walks the list of POOL entries and if SKB is set to
+ * non NULL it is unmapped and freed
+ */
+static void ipw_rx_queue_free(struct ipw_priv *priv, struct ipw_rx_queue *rxq)
+{
+        int i;
+
+        if (!rxq)
+                return;
+
+        for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
+                if (rxq->pool[i].skb != NULL) {
+                        pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr,
+                                         CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb(rxq->pool[i].skb);
+                }
+        }
+
+        kfree(rxq);
+}
+
+static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv)
+{
+        struct ipw_rx_queue *rxq;
+        int i;
+
+        rxq = (struct ipw_rx_queue *)kmalloc(sizeof(*rxq), GFP_KERNEL);
+        memset(rxq, 0, sizeof(*rxq));
+        spin_lock_init(&rxq->lock);
+        INIT_LIST_HEAD(&rxq->rx_free);
+        INIT_LIST_HEAD(&rxq->rx_used);
+
+        /* Fill the rx_used queue with _all_ of the Rx buffers */
+        for (i = 0; i < RX_FREE_BUFFERS + RX_QUEUE_SIZE; i++)
+                list_add_tail(&rxq->pool[i].list, &rxq->rx_used);
+
+        /* Set us so that we have processed and used all buffers, but have
+         * not restocked the Rx queue with fresh buffers */
+        rxq->read = rxq->write = 0;
+        rxq->processed = RX_QUEUE_SIZE - 1;
+        rxq->free_count = 0;
+
+        return rxq;
+}
+
+static int ipw_is_rate_in_mask(struct ipw_priv *priv, int ieee_mode, u8 rate)
+{
+        rate &= ~IEEE80211_BASIC_RATE_MASK;
+        if (ieee_mode == IEEE_A) {
+                switch (rate) {
+                case IEEE80211_OFDM_RATE_6MB:
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ?
+                            1 : 0;
+                case IEEE80211_OFDM_RATE_9MB:
+                        return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ?
+                            1 : 0;
+                case IEEE80211_OFDM_RATE_12MB:
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0;
+                case IEEE80211_OFDM_RATE_18MB:
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0;
+                case IEEE80211_OFDM_RATE_24MB:
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0;
+                case IEEE80211_OFDM_RATE_36MB:
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0;
+                case IEEE80211_OFDM_RATE_48MB:
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0;
+                case IEEE80211_OFDM_RATE_54MB:
+                        return priv->
+                            rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0;
+                default:
+                        return 0;
+                }
+        }
+
+        /* B and G mixed */
+        switch (rate) {
+        case IEEE80211_CCK_RATE_1MB:
+                return priv->rates_mask & IEEE80211_CCK_RATE_1MB_MASK ? 1 : 0;
+        case IEEE80211_CCK_RATE_2MB:
+                return priv->rates_mask & IEEE80211_CCK_RATE_2MB_MASK ? 1 : 0;
+        case IEEE80211_CCK_RATE_5MB:
+                return priv->rates_mask & IEEE80211_CCK_RATE_5MB_MASK ? 1 : 0;
+        case IEEE80211_CCK_RATE_11MB:
+                return priv->rates_mask & IEEE80211_CCK_RATE_11MB_MASK ? 1 : 0;
+        }
+
+        /* If we are limited to B modulations, bail at this point */
+        if (ieee_mode == IEEE_B)
+                return 0;
+
+        /* G */
+        switch (rate) {
+        case IEEE80211_OFDM_RATE_6MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_6MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_9MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_9MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_12MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_12MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_18MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_18MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_24MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_24MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_36MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_36MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_48MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_48MB_MASK ? 1 : 0;
+        case IEEE80211_OFDM_RATE_54MB:
+                return priv->rates_mask & IEEE80211_OFDM_RATE_54MB_MASK ? 1 : 0;
+        }
+
+        return 0;
+}
+
+static int ipw_compatible_rates(struct ipw_priv *priv,
+                                const struct ieee80211_network *network,
+                                struct ipw_supported_rates *rates)
+{
+        int num_rates, i;
+
+        memset(rates, 0, sizeof(*rates));
+        num_rates = min(network->rates_len, (u8) IPW_MAX_RATES);
+        rates->num_rates = 0;
+        for (i = 0; i < num_rates; i++) {
+                if (!ipw_is_rate_in_mask
+                    (priv, network->mode, network->rates[i])) {
+                        IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
+                                       network->rates[i], priv->rates_mask);
+                        continue;
+                }
+
+                rates->supported_rates[rates->num_rates++] = network->rates[i];
+        }
+
+        num_rates =
+            min(network->rates_ex_len, (u8) (IPW_MAX_RATES - num_rates));
+        for (i = 0; i < num_rates; i++) {
+                if (!ipw_is_rate_in_mask
+                    (priv, network->mode, network->rates_ex[i])) {
+                        IPW_DEBUG_SCAN("Rate %02X masked : 0x%08X\n",
+                                       network->rates_ex[i], priv->rates_mask);
+                        continue;
+                }
+
+                rates->supported_rates[rates->num_rates++] =
+                    network->rates_ex[i];
+        }
+
+        return rates->num_rates;
+}
+
+static inline void ipw_copy_rates(struct ipw_supported_rates *dest,
+                                  const struct ipw_supported_rates *src)
+{
+        u8 i;
+        for (i = 0; i < src->num_rates; i++)
+                dest->supported_rates[i] = src->supported_rates[i];
+        dest->num_rates = src->num_rates;
+}
+
+/* TODO: Look at sniffed packets in the air to determine if the basic rate
+ * mask should ever be used -- right now all callers to add the scan rates are
+ * set with the modulation = CCK, so BASIC_RATE_MASK is never set... */
+static void ipw_add_cck_scan_rates(struct ipw_supported_rates *rates,
+                                   u8 modulation, u32 rate_mask)
+{
+        u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ?
+            IEEE80211_BASIC_RATE_MASK : 0;
+
+        if (rate_mask & IEEE80211_CCK_RATE_1MB_MASK)
+                rates->supported_rates[rates->num_rates++] =
+                    IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB;
+
+        if (rate_mask & IEEE80211_CCK_RATE_2MB_MASK)
+                rates->supported_rates[rates->num_rates++] =
+                    IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
+
+        if (rate_mask & IEEE80211_CCK_RATE_5MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask |
+                    IEEE80211_CCK_RATE_5MB;
+
+        if (rate_mask & IEEE80211_CCK_RATE_11MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask |
+                    IEEE80211_CCK_RATE_11MB;
+}
+
+static void ipw_add_ofdm_scan_rates(struct ipw_supported_rates *rates,
+                                    u8 modulation, u32 rate_mask)
+{
+        u8 basic_mask = (IEEE80211_OFDM_MODULATION == modulation) ?
+            IEEE80211_BASIC_RATE_MASK : 0;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_6MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask |
+                    IEEE80211_OFDM_RATE_6MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_9MB_MASK)
+                rates->supported_rates[rates->num_rates++] =
+                    IEEE80211_OFDM_RATE_9MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_12MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask |
+                    IEEE80211_OFDM_RATE_12MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_18MB_MASK)
+                rates->supported_rates[rates->num_rates++] =
+                    IEEE80211_OFDM_RATE_18MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_24MB_MASK)
+                rates->supported_rates[rates->num_rates++] = basic_mask |
+                    IEEE80211_OFDM_RATE_24MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_36MB_MASK)
+                rates->supported_rates[rates->num_rates++] =
+                    IEEE80211_OFDM_RATE_36MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_48MB_MASK)
+                rates->supported_rates[rates->num_rates++] =
+                    IEEE80211_OFDM_RATE_48MB;
+
+        if (rate_mask & IEEE80211_OFDM_RATE_54MB_MASK)
+                rates->supported_rates[rates->num_rates++] =
+                    IEEE80211_OFDM_RATE_54MB;
+}
+
+struct ipw_network_match {
+        struct ieee80211_network *network;
+        struct ipw_supported_rates rates;
+};
+
+static int ipw_best_network(struct ipw_priv *priv,
+                            struct ipw_network_match *match,
+                            struct ieee80211_network *network, int roaming)
+{
+        struct ipw_supported_rates rates;
+
+        /* Verify that this network's capability is compatible with the
+         * current mode (AdHoc or Infrastructure) */
+        if ((priv->ieee->iw_mode == IW_MODE_INFRA &&
+             !(network->capability & WLAN_CAPABILITY_ESS)) ||
+            (priv->ieee->iw_mode == IW_MODE_ADHOC &&
+             !(network->capability & WLAN_CAPABILITY_IBSS))) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "
+                                "capability mismatch.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+
+        /* If we do not have an ESSID for this AP, we can not associate with
+         * it */
+        if (network->flags & NETWORK_EMPTY_ESSID) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of hidden ESSID.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+
+        if (unlikely(roaming)) {
+                /* If we are roaming, then ensure check if this is a valid
+                 * network to try and roam to */
+                if ((network->ssid_len != match->network->ssid_len) ||
+                    memcmp(network->ssid, match->network->ssid,
+                           network->ssid_len)) {
+                        IPW_DEBUG_ASSOC("Netowrk '%s (" MAC_FMT ")' excluded "
+                                        "because of non-network ESSID.\n",
+                                        escape_essid(network->ssid,
+                                                     network->ssid_len),
+                                        MAC_ARG(network->bssid));
+                        return 0;
+                }
+        } else {
+                /* If an ESSID has been configured then compare the broadcast
+                 * ESSID to ours */
+                if ((priv->config & CFG_STATIC_ESSID) &&
+                    ((network->ssid_len != priv->essid_len) ||
+                     memcmp(network->ssid, priv->essid,
+                            min(network->ssid_len, priv->essid_len)))) {
+                        char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
+                        strncpy(escaped,
+                                escape_essid(network->ssid, network->ssid_len),
+                                sizeof(escaped));
+                        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                        "because of ESSID mismatch: '%s'.\n",
+                                        escaped, MAC_ARG(network->bssid),
+                                        escape_essid(priv->essid,
+                                                     priv->essid_len));
+                        return 0;
+                }
+        }
+
+        /* If the old network rate is better than this one, don't bother
+         * testing everything else. */
+        if (match->network && match->network->stats.rssi > network->stats.rssi) {
+                char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
+                strncpy(escaped,
+                        escape_essid(network->ssid, network->ssid_len),
+                        sizeof(escaped));
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded because "
+                                "'%s (" MAC_FMT ")' has a stronger signal.\n",
+                                escaped, MAC_ARG(network->bssid),
+                                escape_essid(match->network->ssid,
+                                             match->network->ssid_len),
+                                MAC_ARG(match->network->bssid));
+                return 0;
+        }
+
+        /* If this network has already had an association attempt within the
+         * last 3 seconds, do not try and associate again... */
+        if (network->last_associate &&
+            time_after(network->last_associate + (HZ * 5UL), jiffies)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of storming (%lu since last "
+                                "assoc attempt).\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                (jiffies - network->last_associate) / HZ);
+                return 0;
+        }
+
+        /* Now go through and see if the requested network is valid... */
+        if (priv->ieee->scan_age != 0 &&
+            jiffies - network->last_scanned > priv->ieee->scan_age) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of age: %lums.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                (jiffies - network->last_scanned) / (HZ / 100));
+                return 0;
+        }
+
+        if ((priv->config & CFG_STATIC_CHANNEL) &&
+            (network->channel != priv->channel)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of channel mismatch: %d != %d.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                network->channel, priv->channel);
+                return 0;
+        }
+
+        /* Verify privacy compatability */
+        if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
+            ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of privacy mismatch: %s != %s.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid),
+                                priv->capability & CAP_PRIVACY_ON ? "on" :
+                                "off",
+                                network->capability &
+                                WLAN_CAPABILITY_PRIVACY ? "on" : "off");
+                return 0;
+        }
+
+        if ((priv->config & CFG_STATIC_BSSID) &&
+            memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of BSSID mismatch: " MAC_FMT ".\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid), MAC_ARG(priv->bssid));
+                return 0;
+        }
+
+        /* Filter out any incompatible freq / mode combinations */
+        if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of invalid frequency/mode "
+                                "combination.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+
+        ipw_compatible_rates(priv, network, &rates);
+        if (rates.num_rates == 0) {
+                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                                "because of no compatible rates.\n",
+                                escape_essid(network->ssid, network->ssid_len),
+                                MAC_ARG(network->bssid));
+                return 0;
+        }
+
+        /* TODO: Perform any further minimal comparititive tests.  We do not
+         * want to put too much policy logic here; intelligent scan selection
+         * should occur within a generic IEEE 802.11 user space tool.  */
+
+        /* Set up 'new' AP to this network */
+        ipw_copy_rates(&match->rates, &rates);
+        match->network = network;
+
+        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' is a viable match.\n",
+                        escape_essid(network->ssid, network->ssid_len),
+                        MAC_ARG(network->bssid));
+
+        return 1;
+}
+
+static void ipw_adhoc_create(struct ipw_priv *priv,
+                             struct ieee80211_network *network)
+{
+        /*
+         * For the purposes of scanning, we can set our wireless mode
+         * to trigger scans across combinations of bands, but when it
+         * comes to creating a new ad-hoc network, we have tell the FW
+         * exactly which band to use.
+         *
+         * We also have the possibility of an invalid channel for the
+         * chossen band.  Attempting to create a new ad-hoc network
+         * with an invalid channel for wireless mode will trigger a
+         * FW fatal error.
+         */
+        network->mode = is_valid_channel(priv->ieee->mode, priv->channel);
+        if (network->mode) {
+                network->channel = priv->channel;
+        } else {
+                IPW_WARNING("Overriding invalid channel\n");
+                if (priv->ieee->mode & IEEE_A) {
+                        network->mode = IEEE_A;
+                        priv->channel = band_a_active_channel[0];
+                } else if (priv->ieee->mode & IEEE_G) {
+                        network->mode = IEEE_G;
+                        priv->channel = band_b_active_channel[0];
+                } else {
+                        network->mode = IEEE_B;
+                        priv->channel = band_b_active_channel[0];
+                }
+        }
+
+        network->channel = priv->channel;
+        priv->config |= CFG_ADHOC_PERSIST;
+        ipw_create_bssid(priv, network->bssid);
+        network->ssid_len = priv->essid_len;
+        memcpy(network->ssid, priv->essid, priv->essid_len);
+        memset(&network->stats, 0, sizeof(network->stats));
+        network->capability = WLAN_CAPABILITY_IBSS;
+        if (priv->capability & CAP_PRIVACY_ON)
+                network->capability |= WLAN_CAPABILITY_PRIVACY;
+        network->rates_len = min(priv->rates.num_rates, MAX_RATES_LENGTH);
+        memcpy(network->rates, priv->rates.supported_rates, network->rates_len);
+        network->rates_ex_len = priv->rates.num_rates - network->rates_len;
+        memcpy(network->rates_ex,
+               &priv->rates.supported_rates[network->rates_len],
+               network->rates_ex_len);
+        network->last_scanned = 0;
+        network->flags = 0;
+        network->last_associate = 0;
+        network->time_stamp[0] = 0;
+        network->time_stamp[1] = 0;
+        network->beacon_interval = 100; /* Default */
+        network->listen_interval = 10;  /* Default */
+        network->atim_window = 0;       /* Default */
+#ifdef CONFIG_IEEE80211_WPA
+        network->wpa_ie_len = 0;
+        network->rsn_ie_len = 0;
+#endif                          /* CONFIG_IEEE80211_WPA */
+}
+
+static void ipw_send_wep_keys(struct ipw_priv *priv)
+{
+        struct ipw_wep_key *key;
+        int i;
+        struct host_cmd cmd = {
+                .cmd = IPW_CMD_WEP_KEY,
+                .len = sizeof(*key)
+        };
+
+        key = (struct ipw_wep_key *)&cmd.param;
+        key->cmd_id = DINO_CMD_WEP_KEY;
+        key->seq_num = 0;
+
+        for (i = 0; i < 4; i++) {
+                key->key_index = i;
+                if (!(priv->sec.flags & (1 << i))) {
+                        key->key_size = 0;
+                } else {
+                        key->key_size = priv->sec.key_sizes[i];
+                        memcpy(key->key, priv->sec.keys[i], key->key_size);
+                }
+
+                if (ipw_send_cmd(priv, &cmd)) {
+                        IPW_ERROR("failed to send WEP_KEY command\n");
+                        return;
+                }
+        }
+}
+
+static void ipw_adhoc_check(void *data)
+{
+        struct ipw_priv *priv = data;
+
+        if (priv->missed_adhoc_beacons++ > priv->missed_beacon_threshold &&
+            !(priv->config & CFG_ADHOC_PERSIST)) {
+                IPW_DEBUG_SCAN("Disassociating due to missed beacons\n");
+                ipw_remove_current_network(priv);
+                ipw_disassociate(priv);
+                return;
+        }
+
+        queue_delayed_work(priv->workqueue, &priv->adhoc_check,
+                           priv->assoc_request.beacon_interval);
+}
+
+#ifdef CONFIG_IPW_DEBUG
+static void ipw_debug_config(struct ipw_priv *priv)
+{
+        IPW_DEBUG_INFO("Scan completed, no valid APs matched "
+                       "[CFG 0x%08X]\n", priv->config);
+        if (priv->config & CFG_STATIC_CHANNEL)
+                IPW_DEBUG_INFO("Channel locked to %d\n", priv->channel);
+        else
+                IPW_DEBUG_INFO("Channel unlocked.\n");
+        if (priv->config & CFG_STATIC_ESSID)
+                IPW_DEBUG_INFO("ESSID locked to '%s'\n",
+                               escape_essid(priv->essid, priv->essid_len));
+        else
+                IPW_DEBUG_INFO("ESSID unlocked.\n");
+        if (priv->config & CFG_STATIC_BSSID)
+                IPW_DEBUG_INFO("BSSID locked to %d\n", priv->channel);
+        else
+                IPW_DEBUG_INFO("BSSID unlocked.\n");
+        if (priv->capability & CAP_PRIVACY_ON)
+                IPW_DEBUG_INFO("PRIVACY on\n");
+        else
+                IPW_DEBUG_INFO("PRIVACY off\n");
+        IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask);
+}
+#else
+#define ipw_debug_config(x) do {} while (0)
+#endif
+
+static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
+                                      struct ieee80211_network *network)
+{
+        /* TODO: Verify that this works... */
+        struct ipw_fixed_rate fr = {
+                .tx_rates = priv->rates_mask
+        };
+        u32 reg;
+        u16 mask = 0;
+
+        /* Identify 'current FW band' and match it with the fixed
+         * Tx rates */
+
+        switch (priv->ieee->freq_band) {
+        case IEEE80211_52GHZ_BAND:      /* A only */
+                /* IEEE_A */
+                if (priv->rates_mask & ~IEEE80211_OFDM_RATES_MASK) {
+                        /* Invalid fixed rate mask */
+                        fr.tx_rates = 0;
+                        break;
+                }
+
+                fr.tx_rates >>= IEEE80211_OFDM_SHIFT_MASK_A;
+                break;
+
+        default:                /* 2.4Ghz or Mixed */
+                /* IEEE_B */
+                if (network->mode == IEEE_B) {
+                        if (fr.tx_rates & ~IEEE80211_CCK_RATES_MASK) {
+                                /* Invalid fixed rate mask */
+                                fr.tx_rates = 0;
+                        }
+                        break;
+                }
+
+                /* IEEE_G */
+                if (fr.tx_rates & ~(IEEE80211_CCK_RATES_MASK |
+                                    IEEE80211_OFDM_RATES_MASK)) {
+                        /* Invalid fixed rate mask */
+                        fr.tx_rates = 0;
+                        break;
+                }
+
+                if (IEEE80211_OFDM_RATE_6MB_MASK & fr.tx_rates) {
+                        mask |= (IEEE80211_OFDM_RATE_6MB_MASK >> 1);
+                        fr.tx_rates &= ~IEEE80211_OFDM_RATE_6MB_MASK;
+                }
+
+                if (IEEE80211_OFDM_RATE_9MB_MASK & fr.tx_rates) {
+                        mask |= (IEEE80211_OFDM_RATE_9MB_MASK >> 1);
+                        fr.tx_rates &= ~IEEE80211_OFDM_RATE_9MB_MASK;
+                }
+
+                if (IEEE80211_OFDM_RATE_12MB_MASK & fr.tx_rates) {
+                        mask |= (IEEE80211_OFDM_RATE_12MB_MASK >> 1);
+                        fr.tx_rates &= ~IEEE80211_OFDM_RATE_12MB_MASK;
+                }
+
+                fr.tx_rates |= mask;
+                break;
+        }
+
+        reg = ipw_read32(priv, IPW_MEM_FIXED_OVERRIDE);
+        ipw_write_reg32(priv, reg, *(u32 *) & fr);
+}
+
+static int ipw_associate_network(struct ipw_priv *priv,
+                                 struct ieee80211_network *network,
+                                 struct ipw_supported_rates *rates, int roaming)
+{
+        int err;
+
+        if (priv->config & CFG_FIXED_RATE)
+                ipw_set_fixed_rate(priv, network);
+
+        if (!(priv->config & CFG_STATIC_ESSID)) {
+                priv->essid_len = min(network->ssid_len,
+                                      (u8) IW_ESSID_MAX_SIZE);
+                memcpy(priv->essid, network->ssid, priv->essid_len);
+        }
+
+        network->last_associate = jiffies;
+
+        memset(&priv->assoc_request, 0, sizeof(priv->assoc_request));
+        priv->assoc_request.channel = network->channel;
+        if ((priv->capability & CAP_PRIVACY_ON) &&
+            (priv->capability & CAP_SHARED_KEY)) {
+                priv->assoc_request.auth_type = AUTH_SHARED_KEY;
+                priv->assoc_request.auth_key = priv->sec.active_key;
+        } else {
+                priv->assoc_request.auth_type = AUTH_OPEN;
+                priv->assoc_request.auth_key = 0;
+        }
+
+        if (priv->capability & CAP_PRIVACY_ON)
+                ipw_send_wep_keys(priv);
+
+        /*
+         * It is valid for our ieee device to support multiple modes, but
+         * when it comes to associating to a given network we have to choose
+         * just one mode.
+         */
+        if (network->mode & priv->ieee->mode & IEEE_A)
+                priv->assoc_request.ieee_mode = IPW_A_MODE;
+        else if (network->mode & priv->ieee->mode & IEEE_G)
+                priv->assoc_request.ieee_mode = IPW_G_MODE;
+        else if (network->mode & priv->ieee->mode & IEEE_B)
+                priv->assoc_request.ieee_mode = IPW_B_MODE;
+
+        IPW_DEBUG_ASSOC("%sssocation attempt: '%s', channel %d, "
+                        "802.11%c [%d], enc=%s%s%s%c%c\n",
+                        roaming ? "Rea" : "A",
+                        escape_essid(priv->essid, priv->essid_len),
+                        network->channel,
+                        ipw_modes[priv->assoc_request.ieee_mode],
+                        rates->num_rates,
+                        priv->capability & CAP_PRIVACY_ON ? "on " : "off",
+                        priv->capability & CAP_PRIVACY_ON ?
+                        (priv->capability & CAP_SHARED_KEY ? "(shared)" :
+                         "(open)") : "",
+                        priv->capability & CAP_PRIVACY_ON ? " key=" : "",
+                        priv->capability & CAP_PRIVACY_ON ?
+                        '1' + priv->sec.active_key : '.',
+                        priv->capability & CAP_PRIVACY_ON ? '.' : ' ');
+
+        priv->assoc_request.beacon_interval = network->beacon_interval;
+        if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
+            (network->time_stamp[0] == 0) && (network->time_stamp[1] == 0)) {
+                priv->assoc_request.assoc_type = HC_IBSS_START;
+                priv->assoc_request.assoc_tsf_msw = 0;
+                priv->assoc_request.assoc_tsf_lsw = 0;
+        } else {
+                if (unlikely(roaming))
+                        priv->assoc_request.assoc_type = HC_REASSOCIATE;
+                else
+                        priv->assoc_request.assoc_type = HC_ASSOCIATE;
+                priv->assoc_request.assoc_tsf_msw = network->time_stamp[1];
+                priv->assoc_request.assoc_tsf_lsw = network->time_stamp[0];
+        }
+
+        memcpy(&priv->assoc_request.bssid, network->bssid, ETH_ALEN);
+
+        if (priv->ieee->iw_mode == IW_MODE_ADHOC) {
+                memset(&priv->assoc_request.dest, 0xFF, ETH_ALEN);
+                priv->assoc_request.atim_window = network->atim_window;
+        } else {
+                memcpy(&priv->assoc_request.dest, network->bssid, ETH_ALEN);
+                priv->assoc_request.atim_window = 0;
+        }
+
+        priv->assoc_request.capability = network->capability;
+        priv->assoc_request.listen_interval = network->listen_interval;
+
+        err = ipw_send_ssid(priv, priv->essid, priv->essid_len);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send SSID command failed.\n");
+                return err;
+        }
+
+        rates->ieee_mode = priv->assoc_request.ieee_mode;
+        rates->purpose = IPW_RATE_CONNECT;
+        ipw_send_supported_rates(priv, rates);
+
+        if (priv->assoc_request.ieee_mode == IPW_G_MODE)
+                priv->sys_config.dot11g_auto_detection = 1;
+        else
+                priv->sys_config.dot11g_auto_detection = 0;
+        err = ipw_send_system_config(priv, &priv->sys_config);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send sys config command failed.\n");
+                return err;
+        }
+
+        IPW_DEBUG_ASSOC("Association sensitivity: %d\n", network->stats.rssi);
+        err = ipw_set_sensitivity(priv, network->stats.rssi);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send associate command failed.\n");
+                return err;
+        }
+
+        /*
+         * If preemption is enabled, it is possible for the association
+         * to complete before we return from ipw_send_associate.  Therefore
+         * we have to be sure and update our priviate data first.
+         */
+        priv->channel = network->channel;
+        memcpy(priv->bssid, network->bssid, ETH_ALEN);
+        priv->status |= STATUS_ASSOCIATING;
+        priv->status &= ~STATUS_SECURITY_UPDATED;
+
+        priv->assoc_network = network;
+
+        err = ipw_send_associate(priv, &priv->assoc_request);
+        if (err) {
+                IPW_DEBUG_HC("Attempt to send associate command failed.\n");
+                return err;
+        }
+
+        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' " MAC_FMT " \n",
+                  escape_essid(priv->essid, priv->essid_len),
+                  MAC_ARG(priv->bssid));
+
+        return 0;
+}
+
+static void ipw_roam(void *data)
+{
+        struct ipw_priv *priv = data;
+        struct ieee80211_network *network = NULL;
+        struct ipw_network_match match = {
+                .network = priv->assoc_network
+        };
+
+        /* The roaming process is as follows:
+         *
+         * 1.  Missed beacon threshold triggers the roaming process by
+         *     setting the status ROAM bit and requesting a scan.
+         * 2.  When the scan completes, it schedules the ROAM work
+         * 3.  The ROAM work looks at all of the known networks for one that
+         *     is a better network than the currently associated.  If none
+         *     found, the ROAM process is over (ROAM bit cleared)
+         * 4.  If a better network is found, a disassociation request is
+         *     sent.
+         * 5.  When the disassociation completes, the roam work is again
+         *     scheduled.  The second time through, the driver is no longer
+         *     associated, and the newly selected network is sent an
+         *     association request.
+         * 6.  At this point ,the roaming process is complete and the ROAM
+         *     status bit is cleared.
+         */
+
+        /* If we are no longer associated, and the roaming bit is no longer
+         * set, then we are not actively roaming, so just return */
+        if (!(priv->status & (STATUS_ASSOCIATED | STATUS_ROAMING)))
+                return;
+
+        if (priv->status & STATUS_ASSOCIATED) {
+                /* First pass through ROAM process -- look for a better
+                 * network */
+                u8 rssi = priv->assoc_network->stats.rssi;
+                priv->assoc_network->stats.rssi = -128;
+                list_for_each_entry(network, &priv->ieee->network_list, list) {
+                        if (network != priv->assoc_network)
+                                ipw_best_network(priv, &match, network, 1);
+                }
+                priv->assoc_network->stats.rssi = rssi;
+
+                if (match.network == priv->assoc_network) {
+                        IPW_DEBUG_ASSOC("No better APs in this network to "
+                                        "roam to.\n");
+                        priv->status &= ~STATUS_ROAMING;
+                        ipw_debug_config(priv);
+                        return;
+                }
+
+                ipw_send_disassociate(priv, 1);
+                priv->assoc_network = match.network;
+
+                return;
+        }
+
+        /* Second pass through ROAM process -- request association */
+        ipw_compatible_rates(priv, priv->assoc_network, &match.rates);
+        ipw_associate_network(priv, priv->assoc_network, &match.rates, 1);
+        priv->status &= ~STATUS_ROAMING;
+}
+
+static void ipw_associate(void *data)
+{
+        struct ipw_priv *priv = data;
+
+        struct ieee80211_network *network = NULL;
+        struct ipw_network_match match = {
+                .network = NULL
+        };
+        struct ipw_supported_rates *rates;
+        struct list_head *element;
+
+        if (!(priv->config & CFG_ASSOCIATE) &&
+            !(priv->config & (CFG_STATIC_ESSID |
+                              CFG_STATIC_CHANNEL | CFG_STATIC_BSSID))) {
+                IPW_DEBUG_ASSOC("Not attempting association (associate=0)\n");
+                return;
+        }
+
+        list_for_each_entry(network, &priv->ieee->network_list, list)
+            ipw_best_network(priv, &match, network, 0);
+
+        network = match.network;
+        rates = &match.rates;
+
+        if (network == NULL &&
+            priv->ieee->iw_mode == IW_MODE_ADHOC &&
+            priv->config & CFG_ADHOC_CREATE &&
+            priv->config & CFG_STATIC_ESSID &&
+            !list_empty(&priv->ieee->network_free_list)) {
+                element = priv->ieee->network_free_list.next;
+                network = list_entry(element, struct ieee80211_network, list);
+                ipw_adhoc_create(priv, network);
+                rates = &priv->rates;
+                list_del(element);
+                list_add_tail(&network->list, &priv->ieee->network_list);
+        }
+
+        /* If we reached the end of the list, then we don't have any valid
+         * matching APs */
+        if (!network) {
+                ipw_debug_config(priv);
+
+                queue_delayed_work(priv->workqueue, &priv->request_scan,
+                                   SCAN_INTERVAL);
+
+                return;
+        }
+
+        ipw_associate_network(priv, network, rates, 0);
+}
+
+static inline void ipw_handle_data_packet(struct ipw_priv *priv,
+                                          struct ipw_rx_mem_buffer *rxb,
+                                          struct ieee80211_rx_stats *stats)
+{
+        struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data;
+
+        /* We received data from the HW, so stop the watchdog */
+        priv->net_dev->trans_start = jiffies;
+
+        /* We only process data packets if the
+         * interface is open */
+        if (unlikely((pkt->u.frame.length + IPW_RX_FRAME_SIZE) >
+                     skb_tailroom(rxb->skb))) {
+                priv->ieee->stats.rx_errors++;
+                priv->wstats.discard.misc++;
+                IPW_DEBUG_DROP("Corruption detected! Oh no!\n");
+                return;
+        } else if (unlikely(!netif_running(priv->net_dev))) {
+                priv->ieee->stats.rx_dropped++;
+                priv->wstats.discard.misc++;
+                IPW_DEBUG_DROP("Dropping packet while interface is not up.\n");
+                return;
+        }
+
+        /* Advance skb->data to the start of the actual payload */
+        skb_reserve(rxb->skb, offsetof(struct ipw_rx_packet, u.frame.data));
+
+        /* Set the size of the skb to the size of the frame */
+        skb_put(rxb->skb, pkt->u.frame.length);
+
+        IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len);
+
+        if (!ieee80211_rx(priv->ieee, rxb->skb, stats))
+                priv->ieee->stats.rx_errors++;
+        else                    /* ieee80211_rx succeeded, so it now owns the SKB */
+                rxb->skb = NULL;
+}
+
+/*
+ * Main entry function for recieving a packet with 80211 headers.  This
+ * should be called when ever the FW has notified us that there is a new
+ * skb in the recieve queue.
+ */
+static void ipw_rx(struct ipw_priv *priv)
+{
+        struct ipw_rx_mem_buffer *rxb;
+        struct ipw_rx_packet *pkt;
+        struct ieee80211_hdr *header;
+        u32 r, w, i;
+        u8 network_packet;
+
+        r = ipw_read32(priv, CX2_RX_READ_INDEX);
+        w = ipw_read32(priv, CX2_RX_WRITE_INDEX);
+        i = (priv->rxq->processed + 1) % RX_QUEUE_SIZE;
+
+        while (i != r) {
+                rxb = priv->rxq->queue[i];
+#ifdef CONFIG_IPW_DEBUG
+                if (unlikely(rxb == NULL)) {
+                        printk(KERN_CRIT "Queue not allocated!\n");
+                        break;
+                }
+#endif
+                priv->rxq->queue[i] = NULL;
+
+                pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->dma_addr,
+                                            CX2_RX_BUF_SIZE,
+                                            PCI_DMA_FROMDEVICE);
+
+                pkt = (struct ipw_rx_packet *)rxb->skb->data;
+                IPW_DEBUG_RX("Packet: type=%02X seq=%02X bits=%02X\n",
+                             pkt->header.message_type,
+                             pkt->header.rx_seq_num, pkt->header.control_bits);
+
+                switch (pkt->header.message_type) {
+                case RX_FRAME_TYPE:     /* 802.11 frame */  {
+                                struct ieee80211_rx_stats stats = {
+                                        .rssi = pkt->u.frame.rssi_dbm -
+                                            IPW_RSSI_TO_DBM,
+                                        .signal = pkt->u.frame.signal,
+                                        .rate = pkt->u.frame.rate,
+                                        .mac_time = jiffies,
+                                        .received_channel =
+                                            pkt->u.frame.received_channel,
+                                        .freq =
+                                            (pkt->u.frame.
+                                             control & (1 << 0)) ?
+                                            IEEE80211_24GHZ_BAND :
+                                            IEEE80211_52GHZ_BAND,
+                                        .len = pkt->u.frame.length,
+                                };
+
+                                if (stats.rssi != 0)
+                                        stats.mask |= IEEE80211_STATMASK_RSSI;
+                                if (stats.signal != 0)
+                                        stats.mask |= IEEE80211_STATMASK_SIGNAL;
+                                if (stats.rate != 0)
+                                        stats.mask |= IEEE80211_STATMASK_RATE;
+
+                                priv->rx_packets++;
+
+#ifdef CONFIG_IPW_PROMISC
+                                if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
+                                        ipw_handle_data_packet(priv, rxb,
+                                                               &stats);
+                                        break;
+                                }
+#endif
+
+                                header =
+                                    (struct ieee80211_hdr *)(rxb->skb->data +
+                                                             IPW_RX_FRAME_SIZE);
+                                /* TODO: Check Ad-Hoc dest/source and make sure
+                                 * that we are actually parsing these packets
+                                 * correctly -- we should probably use the
+                                 * frame control of the packet and disregard
+                                 * the current iw_mode */
+                                switch (priv->ieee->iw_mode) {
+                                case IW_MODE_ADHOC:
+                                        network_packet =
+                                            !memcmp(header->addr1,
+                                                    priv->net_dev->dev_addr,
+                                                    ETH_ALEN) ||
+                                            !memcmp(header->addr3,
+                                                    priv->bssid, ETH_ALEN) ||
+                                            is_broadcast_ether_addr(header->
+                                                                    addr1)
+                                            || is_multicast_ether_addr(header->
+                                                                       addr1);
+                                        break;
+
+                                case IW_MODE_INFRA:
+                                default:
+                                        network_packet =
+                                            !memcmp(header->addr3,
+                                                    priv->bssid, ETH_ALEN) ||
+                                            !memcmp(header->addr1,
+                                                    priv->net_dev->dev_addr,
+                                                    ETH_ALEN) ||
+                                            is_broadcast_ether_addr(header->
+                                                                    addr1)
+                                            || is_multicast_ether_addr(header->
+                                                                       addr1);
+                                        break;
+                                }
+
+                                if (network_packet && priv->assoc_network) {
+                                        priv->assoc_network->stats.rssi =
+                                            stats.rssi;
+                                        average_add(&priv->average_rssi,
+                                                    stats.rssi);
+                                        priv->last_rx_rssi = stats.rssi;
+                                }
+
+                                IPW_DEBUG_RX("Frame: len=%u\n",
+                                             pkt->u.frame.length);
+
+                                if (pkt->u.frame.length < frame_hdr_len(header)) {
+                                        IPW_DEBUG_DROP
+                                            ("Received packet is too small. "
+                                             "Dropping.\n");
+                                        priv->ieee->stats.rx_errors++;
+                                        priv->wstats.discard.misc++;
+                                        break;
+                                }
+
+                                switch (WLAN_FC_GET_TYPE(header->frame_ctl)) {
+                                case IEEE80211_FTYPE_MGMT:
+                                        ieee80211_rx_mgt(priv->ieee, header,
+                                                         &stats);
+                                        if (priv->ieee->iw_mode == IW_MODE_ADHOC
+                                            &&
+                                            ((WLAN_FC_GET_STYPE
+                                              (header->frame_ctl) ==
+                                              IEEE80211_STYPE_PROBE_RESP)
+                                             ||
+                                             (WLAN_FC_GET_STYPE
+                                              (header->frame_ctl) ==
+                                              IEEE80211_STYPE_BEACON))
+                                            && !memcmp(header->addr3,
+                                                       priv->bssid, ETH_ALEN))
+                                                ipw_add_station(priv,
+                                                                header->addr2);
+                                        break;
+
+                                case IEEE80211_FTYPE_CTL:
+                                        break;
+
+                                case IEEE80211_FTYPE_DATA:
+                                        if (network_packet)
+                                                ipw_handle_data_packet(priv,
+                                                                       rxb,
+                                                                       &stats);
+                                        else
+                                                IPW_DEBUG_DROP("Dropping: "
+                                                               MAC_FMT ", "
+                                                               MAC_FMT ", "
+                                                               MAC_FMT "\n",
+                                                               MAC_ARG(header->
+                                                                       addr1),
+                                                               MAC_ARG(header->
+                                                                       addr2),
+                                                               MAC_ARG(header->
+                                                                       addr3));
+                                        break;
+                                }
+                                break;
+                        }
+
+                case RX_HOST_NOTIFICATION_TYPE:{
+                                IPW_DEBUG_RX
+                                    ("Notification: subtype=%02X flags=%02X size=%d\n",
+                                     pkt->u.notification.subtype,
+                                     pkt->u.notification.flags,
+                                     pkt->u.notification.size);
+                                ipw_rx_notification(priv, &pkt->u.notification);
+                                break;
+                        }
+
+                default:
+                        IPW_DEBUG_RX("Bad Rx packet of type %d\n",
+                                     pkt->header.message_type);
+                        break;
+                }
+
+                /* For now we just don't re-use anything.  We can tweak this
+                 * later to try and re-use notification packets and SKBs that
+                 * fail to Rx correctly */
+                if (rxb->skb != NULL) {
+                        dev_kfree_skb_any(rxb->skb);
+                        rxb->skb = NULL;
+                }
+
+                pci_unmap_single(priv->pci_dev, rxb->dma_addr,
+                                 CX2_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                list_add_tail(&rxb->list, &priv->rxq->rx_used);
+
+                i = (i + 1) % RX_QUEUE_SIZE;
+        }
+
+        /* Backtrack one entry */
+        priv->rxq->processed = (i ? i : RX_QUEUE_SIZE) - 1;
+
+        ipw_rx_queue_restock(priv);
+}
+
+static void ipw_abort_scan(struct ipw_priv *priv)
+{
+        int err;
+
+        if (priv->status & STATUS_SCAN_ABORTING) {
+                IPW_DEBUG_HC("Ignoring concurrent scan abort request.\n");
+                return;
+        }
+        priv->status |= STATUS_SCAN_ABORTING;
+
+        err = ipw_send_scan_abort(priv);
+        if (err)
+                IPW_DEBUG_HC("Request to abort scan failed.\n");
+}
+
+static int ipw_request_scan(struct ipw_priv *priv)
+{
+        struct ipw_scan_request_ext scan;
+        int channel_index = 0;
+        int i, err, scan_type;
+
+        if (priv->status & STATUS_EXIT_PENDING) {
+                IPW_DEBUG_SCAN("Aborting scan due to device shutdown\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                return 0;
+        }
+
+        if (priv->status & STATUS_SCANNING) {
+                IPW_DEBUG_HC("Concurrent scan requested.  Aborting first.\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                ipw_abort_scan(priv);
+                return 0;
+        }
+
+        if (priv->status & STATUS_SCAN_ABORTING) {
+                IPW_DEBUG_HC("Scan request while abort pending.  Queuing.\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                return 0;
+        }
+
+        if (priv->status & STATUS_RF_KILL_MASK) {
+                IPW_DEBUG_HC("Aborting scan due to RF Kill activation\n");
+                priv->status |= STATUS_SCAN_PENDING;
+                return 0;
+        }
+
+        memset(&scan, 0, sizeof(scan));
+
+        scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_SCAN] = 20;
+        scan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN] = 20;
+        scan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = 20;
+
+        scan.full_scan_index = ieee80211_get_scans(priv->ieee);
+        /* If we are roaming, then make this a directed scan for the current
+         * network.  Otherwise, ensure that every other scan is a fast
+         * channel hop scan */
+        if ((priv->status & STATUS_ROAMING)
+            || (!(priv->status & STATUS_ASSOCIATED)
+                && (priv->config & CFG_STATIC_ESSID)
+                && (scan.full_scan_index % 2))) {
+                err = ipw_send_ssid(priv, priv->essid, priv->essid_len);
+                if (err) {
+                        IPW_DEBUG_HC("Attempt to send SSID command failed.\n");
+                        return err;
+                }
+
+                scan_type = IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN;
+        } else {
+                scan_type = IPW_SCAN_ACTIVE_BROADCAST_SCAN;
+        }
+
+        if (priv->ieee->freq_band & IEEE80211_52GHZ_BAND) {
+                int start = channel_index;
+                for (i = 0; i < MAX_A_CHANNELS; i++) {
+                        if (band_a_active_channel[i] == 0)
+                                break;
+                        if ((priv->status & STATUS_ASSOCIATED) &&
+                            band_a_active_channel[i] == priv->channel)
+                                continue;
+                        channel_index++;
+                        scan.channels_list[channel_index] =
+                            band_a_active_channel[i];
+                        ipw_set_scan_type(&scan, channel_index, scan_type);
+                }
+
+                if (start != channel_index) {
+                        scan.channels_list[start] = (u8) (IPW_A_MODE << 6) |
+                            (channel_index - start);
+                        channel_index++;
+                }
+        }
+
+        if (priv->ieee->freq_band & IEEE80211_24GHZ_BAND) {
+                int start = channel_index;
+                for (i = 0; i < MAX_B_CHANNELS; i++) {
+                        if (band_b_active_channel[i] == 0)
+                                break;
+                        if ((priv->status & STATUS_ASSOCIATED) &&
+                            band_b_active_channel[i] == priv->channel)
+                                continue;
+                        channel_index++;
+                        scan.channels_list[channel_index] =
+                            band_b_active_channel[i];
+                        ipw_set_scan_type(&scan, channel_index, scan_type);
+                }
+
+                if (start != channel_index) {
+                        scan.channels_list[start] = (u8) (IPW_B_MODE << 6) |
+                            (channel_index - start);
+                }
+        }
+
+        err = ipw_send_scan_request_ext(priv, &scan);
+        if (err) {
+                IPW_DEBUG_HC("Sending scan command failed: %08X\n", err);
+                return -EIO;
+        }
+
+        priv->status |= STATUS_SCANNING;
+        priv->status &= ~STATUS_SCAN_PENDING;
+
+        return 0;
+}
+
+/*
+ * This file defines the Wireless Extension handlers.  It does not
+ * define any methods of hardware manipulation and relies on the
+ * functions defined in ipw_main to provide the HW interaction.
+ *
+ * The exception to this is the use of the ipw_get_ordinal()
+ * function used to poll the hardware vs. making unecessary calls.
+ *
+ */
+
+static int ipw_wx_get_name(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        if (!(priv->status & STATUS_ASSOCIATED))
+                strcpy(wrqu->name, "unassociated");
+        else
+                snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11%c",
+                         ipw_modes[priv->assoc_request.ieee_mode]);
+        IPW_DEBUG_WX("Name: %s\n", wrqu->name);
+        return 0;
+}
+
+static int ipw_set_channel(struct ipw_priv *priv, u8 channel)
+{
+        if (channel == 0) {
+                IPW_DEBUG_INFO("Setting channel to ANY (0)\n");
+                priv->config &= ~CFG_STATIC_CHANNEL;
+                if (!(priv->status & (STATUS_SCANNING | STATUS_ASSOCIATED |
+                                      STATUS_ASSOCIATING))) {
+                        IPW_DEBUG_ASSOC("Attempting to associate with new "
+                                        "parameters.\n");
+                        ipw_associate(priv);
+                }
+
+                return 0;
+        }
+
+        priv->config |= CFG_STATIC_CHANNEL;
+
+        if (priv->channel == channel) {
+                IPW_DEBUG_INFO("Request to set channel to current value (%d)\n",
+                               channel);
+                return 0;
+        }
+
+        IPW_DEBUG_INFO("Setting channel to %i\n", (int)channel);
+        priv->channel = channel;
+
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new channel (causing us to disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                IPW_DEBUG_ASSOC("Disassociating due to channel change.\n");
+                ipw_disassociate(priv);
+        } else {
+                ipw_associate(priv);
+        }
+
+        return 0;
+}
+
+static int ipw_wx_set_freq(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct iw_freq *fwrq = &wrqu->freq;
+
+        /* if setting by freq convert to channel */
+        if (fwrq->e == 1) {
+                if ((fwrq->m >= (int)2.412e8 && fwrq->m <= (int)2.487e8)) {
+                        int f = fwrq->m / 100000;
+                        int c = 0;
+
+                        while ((c < REG_MAX_CHANNEL) &&
+                               (f != ipw_frequencies[c]))
+                                c++;
+
+                        /* hack to fall through */
+                        fwrq->e = 0;
+                        fwrq->m = c + 1;
+                }
+        }
+
+        if (fwrq->e > 0 || fwrq->m > 1000)
+                return -EOPNOTSUPP;
+
+        IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m);
+        return ipw_set_channel(priv, (u8) fwrq->m);
+
+        return 0;
+}
+
+static int ipw_wx_get_freq(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        wrqu->freq.e = 0;
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured CHANNEL then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_CHANNEL ||
+            priv->status & (STATUS_ASSOCIATING | STATUS_ASSOCIATED))
+                wrqu->freq.m = priv->channel;
+        else
+                wrqu->freq.m = 0;
+
+        IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel);
+        return 0;
+}
+
+static int ipw_wx_set_mode(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int err = 0;
+
+        IPW_DEBUG_WX("Set MODE: %d\n", wrqu->mode);
+
+        if (wrqu->mode == priv->ieee->iw_mode)
+                return 0;
+
+        switch (wrqu->mode) {
+#ifdef CONFIG_IPW_PROMISC
+        case IW_MODE_MONITOR:
+#endif
+        case IW_MODE_ADHOC:
+        case IW_MODE_INFRA:
+                break;
+        case IW_MODE_AUTO:
+                wrqu->mode = IW_MODE_INFRA;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+#ifdef CONFIG_IPW_PROMISC
+        if (priv->ieee->iw_mode == IW_MODE_MONITOR)
+                priv->net_dev->type = ARPHRD_ETHER;
+
+        if (wrqu->mode == IW_MODE_MONITOR)
+                priv->net_dev->type = ARPHRD_IEEE80211;
+#endif                          /* CONFIG_IPW_PROMISC */
+
+#ifdef CONFIG_PM
+        /* Free the existing firmware and reset the fw_loaded
+         * flag so ipw_load() will bring in the new firmawre */
+        if (fw_loaded) {
+                fw_loaded = 0;
+        }
+
+        release_firmware(bootfw);
+        release_firmware(ucode);
+        release_firmware(firmware);
+        bootfw = ucode = firmware = NULL;
+#endif
+
+        priv->ieee->iw_mode = wrqu->mode;
+        ipw_adapter_restart(priv);
+
+        return err;
+}
+
+static int ipw_wx_get_mode(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        wrqu->mode = priv->ieee->iw_mode;
+        IPW_DEBUG_WX("Get MODE -> %d\n", wrqu->mode);
+
+        return 0;
+}
+
+#define DEFAULT_RTS_THRESHOLD     2304U
+#define MIN_RTS_THRESHOLD         1U
+#define MAX_RTS_THRESHOLD         2304U
+#define DEFAULT_BEACON_INTERVAL   100U
+#define DEFAULT_SHORT_RETRY_LIMIT 7U
+#define DEFAULT_LONG_RETRY_LIMIT  4U
+
+/* Values are in microsecond */
+static const s32 timeout_duration[] = {
+        350000,
+        250000,
+        75000,
+        37000,
+        25000,
+};
+
+static const s32 period_duration[] = {
+        400000,
+        700000,
+        1000000,
+        1000000,
+        1000000
+};
+
+static int ipw_wx_get_range(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct iw_range *range = (struct iw_range *)extra;
+        u16 val;
+        int i;
+
+        wrqu->data.length = sizeof(*range);
+        memset(range, 0, sizeof(*range));
+
+        /* 54Mbs == ~27 Mb/s real (802.11g) */
+        range->throughput = 27 * 1000 * 1000;
+
+        range->max_qual.qual = 100;
+        /* TODO: Find real max RSSI and stick here */
+        range->max_qual.level = 0;
+        range->max_qual.noise = 0;
+        range->max_qual.updated = 7;    /* Updated all three */
+
+        range->avg_qual.qual = 70;
+        /* TODO: Find real 'good' to 'bad' threshol value for RSSI */
+        range->avg_qual.level = 0;      /* FIXME to real average level */
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = 7;    /* Updated all three */
+
+        range->num_bitrates = min(priv->rates.num_rates, (u8) IW_MAX_BITRATES);
+
+        for (i = 0; i < range->num_bitrates; i++)
+                range->bitrate[i] = (priv->rates.supported_rates[i] & 0x7F) *
+                    500000;
+
+        range->max_rts = DEFAULT_RTS_THRESHOLD;
+        range->min_frag = MIN_FRAG_THRESHOLD;
+        range->max_frag = MAX_FRAG_THRESHOLD;
+
+        range->encoding_size[0] = 5;
+        range->encoding_size[1] = 13;
+        range->num_encoding_sizes = 2;
+        range->max_encoding_tokens = WEP_KEYS;
+
+        /* Set the Wireless Extension versions */
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 16;
+
+        range->num_channels = FREQ_COUNT;
+
+        val = 0;
+        for (i = 0; i < FREQ_COUNT; i++) {
+                range->freq[val].i = i + 1;
+                range->freq[val].m = ipw_frequencies[i] * 100000;
+                range->freq[val].e = 1;
+                val++;
+
+                if (val == IW_MAX_FREQUENCIES)
+                        break;
+        }
+        range->num_frequency = val;
+
+        IPW_DEBUG_WX("GET Range\n");
+        return 0;
+}
+
+static int ipw_wx_set_wap(struct net_device *dev,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        static const unsigned char any[] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
+        static const unsigned char off[] = {
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+
+        if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
+                return -EINVAL;
+
+        if (!memcmp(any, wrqu->ap_addr.sa_data, ETH_ALEN) ||
+            !memcmp(off, wrqu->ap_addr.sa_data, ETH_ALEN)) {
+                /* we disable mandatory BSSID association */
+                IPW_DEBUG_WX("Setting AP BSSID to ANY\n");
+                priv->config &= ~CFG_STATIC_BSSID;
+                if (!(priv->status & (STATUS_SCANNING | STATUS_ASSOCIATED |
+                                      STATUS_ASSOCIATING))) {
+                        IPW_DEBUG_ASSOC("Attempting to associate with new "
+                                        "parameters.\n");
+                        ipw_associate(priv);
+                }
+
+                return 0;
+        }
+
+        priv->config |= CFG_STATIC_BSSID;
+        if (!memcmp(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN)) {
+                IPW_DEBUG_WX("BSSID set to current BSSID.\n");
+                return 0;
+        }
+
+        IPW_DEBUG_WX("Setting mandatory BSSID to " MAC_FMT "\n",
+                     MAC_ARG(wrqu->ap_addr.sa_data));
+
+        memcpy(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
+
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new BSSID (causing us to disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                IPW_DEBUG_ASSOC("Disassociating due to BSSID change.\n");
+                ipw_disassociate(priv);
+        } else {
+                ipw_associate(priv);
+        }
+
+        return 0;
+}
+
+static int ipw_wx_get_wap(struct net_device *dev,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        /* If we are associated, trying to associate, or have a statically
+         * configured BSSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_BSSID ||
+            priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                wrqu->ap_addr.sa_family = ARPHRD_ETHER;
+                memcpy(wrqu->ap_addr.sa_data, &priv->bssid, ETH_ALEN);
+        } else
+                memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+
+        IPW_DEBUG_WX("Getting WAP BSSID: " MAC_FMT "\n",
+                     MAC_ARG(wrqu->ap_addr.sa_data));
+        return 0;
+}
+
+static int ipw_wx_set_essid(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        char *essid = "";       /* ANY */
+        int length = 0;
+
+        if (wrqu->essid.flags && wrqu->essid.length) {
+                length = wrqu->essid.length - 1;
+                essid = extra;
+        }
+        if (length == 0) {
+                IPW_DEBUG_WX("Setting ESSID to ANY\n");
+                priv->config &= ~CFG_STATIC_ESSID;
+                if (!(priv->status & (STATUS_SCANNING | STATUS_ASSOCIATED |
+                                      STATUS_ASSOCIATING))) {
+                        IPW_DEBUG_ASSOC("Attempting to associate with new "
+                                        "parameters.\n");
+                        ipw_associate(priv);
+                }
+
+                return 0;
+        }
+
+        length = min(length, IW_ESSID_MAX_SIZE);
+
+        priv->config |= CFG_STATIC_ESSID;
+
+        if (priv->essid_len == length && !memcmp(priv->essid, extra, length)) {
+                IPW_DEBUG_WX("ESSID set to current ESSID.\n");
+                return 0;
+        }
+
+        IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(essid, length),
+                     length);
+
+        priv->essid_len = length;
+        memcpy(priv->essid, essid, priv->essid_len);
+
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new ESSID (causing us to disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                IPW_DEBUG_ASSOC("Disassociating due to ESSID change.\n");
+                ipw_disassociate(priv);
+        } else {
+                ipw_associate(priv);
+        }
+
+        return 0;
+}
+
+static int ipw_wx_get_essid(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        /* If we are associated, trying to associate, or have a statically
+         * configured ESSID then return that; otherwise return ANY */
+        if (priv->config & CFG_STATIC_ESSID ||
+            priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                IPW_DEBUG_WX("Getting essid: '%s'\n",
+                             escape_essid(priv->essid, priv->essid_len));
+                memcpy(extra, priv->essid, priv->essid_len);
+                wrqu->essid.length = priv->essid_len;
+                wrqu->essid.flags = 1;  /* active */
+        } else {
+                IPW_DEBUG_WX("Getting essid: ANY\n");
+                wrqu->essid.length = 0;
+                wrqu->essid.flags = 0;  /* active */
+        }
+
+        return 0;
+}
+
+static int ipw_wx_set_nick(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        IPW_DEBUG_WX("Setting nick to '%s'\n", extra);
+        if (wrqu->data.length > IW_ESSID_MAX_SIZE)
+                return -E2BIG;
+
+        wrqu->data.length = min((size_t) wrqu->data.length, sizeof(priv->nick));
+        memset(priv->nick, 0, sizeof(priv->nick));
+        memcpy(priv->nick, extra, wrqu->data.length);
+        IPW_DEBUG_TRACE("<<\n");
+        return 0;
+
+}
+
+static int ipw_wx_get_nick(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_WX("Getting nick\n");
+        wrqu->data.length = strlen(priv->nick) + 1;
+        memcpy(extra, priv->nick, wrqu->data.length);
+        wrqu->data.flags = 1;   /* active */
+        return 0;
+}
+
+static int ipw_wx_set_rate(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        IPW_DEBUG_WX("0x%p, 0x%p, 0x%p\n", dev, info, wrqu);
+        return -EOPNOTSUPP;
+}
+
+static int ipw_wx_get_rate(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        wrqu->bitrate.value = priv->last_rate;
+
+        IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value);
+        return 0;
+}
+
+static int ipw_wx_set_rts(struct net_device *dev,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (wrqu->rts.disabled)
+                priv->rts_threshold = DEFAULT_RTS_THRESHOLD;
+        else {
+                if (wrqu->rts.value < MIN_RTS_THRESHOLD ||
+                    wrqu->rts.value > MAX_RTS_THRESHOLD)
+                        return -EINVAL;
+
+                priv->rts_threshold = wrqu->rts.value;
+        }
+
+        ipw_send_rts_threshold(priv, priv->rts_threshold);
+        IPW_DEBUG_WX("SET RTS Threshold -> %d \n", priv->rts_threshold);
+        return 0;
+}
+
+static int ipw_wx_get_rts(struct net_device *dev,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        wrqu->rts.value = priv->rts_threshold;
+        wrqu->rts.fixed = 0;    /* no auto select */
+        wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD);
+
+        IPW_DEBUG_WX("GET RTS Threshold -> %d \n", wrqu->rts.value);
+        return 0;
+}
+
+static int ipw_wx_set_txpow(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct ipw_tx_power tx_power;
+        int i;
+
+        if (ipw_radio_kill_sw(priv, wrqu->power.disabled))
+                return -EINPROGRESS;
+
+        if (wrqu->power.flags != IW_TXPOW_DBM)
+                return -EINVAL;
+
+        if ((wrqu->power.value > 20) || (wrqu->power.value < -12))
+                return -EINVAL;
+
+        priv->tx_power = wrqu->power.value;
+
+        memset(&tx_power, 0, sizeof(tx_power));
+
+        /* configure device for 'G' band */
+        tx_power.ieee_mode = IPW_G_MODE;
+        tx_power.num_channels = 11;
+        for (i = 0; i < 11; i++) {
+                tx_power.channels_tx_power[i].channel_number = i + 1;
+                tx_power.channels_tx_power[i].tx_power = priv->tx_power;
+        }
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        /* configure device to also handle 'B' band */
+        tx_power.ieee_mode = IPW_B_MODE;
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        return 0;
+
+      error:
+        return -EIO;
+}
+
+static int ipw_wx_get_txpow(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        wrqu->power.value = priv->tx_power;
+        wrqu->power.fixed = 1;
+        wrqu->power.flags = IW_TXPOW_DBM;
+        wrqu->power.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;
+
+        IPW_DEBUG_WX("GET TX Power -> %s %d \n",
+                     wrqu->power.disabled ? "ON" : "OFF", wrqu->power.value);
+
+        return 0;
+}
+
+static int ipw_wx_set_frag(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (wrqu->frag.disabled)
+                priv->ieee->fts = DEFAULT_FTS;
+        else {
+                if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||
+                    wrqu->frag.value > MAX_FRAG_THRESHOLD)
+                        return -EINVAL;
+
+                priv->ieee->fts = wrqu->frag.value & ~0x1;
+        }
+
+        ipw_send_frag_threshold(priv, wrqu->frag.value);
+        IPW_DEBUG_WX("SET Frag Threshold -> %d \n", wrqu->frag.value);
+        return 0;
+}
+
+static int ipw_wx_get_frag(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        wrqu->frag.value = priv->ieee->fts;
+        wrqu->frag.fixed = 0;   /* no auto select */
+        wrqu->frag.disabled = (wrqu->frag.value == DEFAULT_FTS);
+
+        IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value);
+
+        return 0;
+}
+
+static int ipw_wx_set_retry(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        IPW_DEBUG_WX("0x%p, 0x%p, 0x%p\n", dev, info, wrqu);
+        return -EOPNOTSUPP;
+}
+
+static int ipw_wx_get_retry(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        IPW_DEBUG_WX("0x%p, 0x%p, 0x%p\n", dev, info, wrqu);
+        return -EOPNOTSUPP;
+}
+
+static int ipw_wx_set_scan(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_WX("Start scan\n");
+        if (ipw_request_scan(priv))
+                return -EIO;
+        return 0;
+}
+
+static int ipw_wx_get_scan(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_scan(priv->ieee, info, wrqu, extra);
+}
+
+static int ipw_wx_set_encode(struct net_device *dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *wrqu, char *key)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_set_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw_wx_get_encode(struct net_device *dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *wrqu, char *key)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return ieee80211_wx_get_encode(priv->ieee, info, wrqu, key);
+}
+
+static int ipw_wx_set_power(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int err;
+
+        if (wrqu->power.disabled) {
+                priv->power_mode = IPW_POWER_LEVEL(priv->power_mode);
+                err = ipw_send_power_mode(priv, IPW_POWER_MODE_CAM);
+                if (err) {
+                        IPW_DEBUG_WX("failed setting power mode.\n");
+                        return err;
+                }
+
+                IPW_DEBUG_WX("SET Power Management Mode -> off\n");
+
+                return 0;
+        }
+
+        switch (wrqu->power.flags & IW_POWER_MODE) {
+        case IW_POWER_ON:       /* If not specified */
+        case IW_POWER_MODE:     /* If set all mask */
+        case IW_POWER_ALL_R:    /* If explicitely state all */
+                break;
+        default:                /* Otherwise we don't support it */
+                IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
+                             wrqu->power.flags);
+                return -EOPNOTSUPP;
+        }
+
+        /* If the user hasn't specified a power management mode yet, default
+         * to BATTERY */
+        if (IPW_POWER_LEVEL(priv->power_mode) == IPW_POWER_AC)
+                priv->power_mode = IPW_POWER_ENABLED | IPW_POWER_BATTERY;
+        else
+                priv->power_mode = IPW_POWER_ENABLED | priv->power_mode;
+        err = ipw_send_power_mode(priv, IPW_POWER_LEVEL(priv->power_mode));
+        if (err) {
+                IPW_DEBUG_WX("failed setting power mode.\n");
+                return err;
+        }
+
+        IPW_DEBUG_WX("SET Power Management Mode -> 0x%02X\n", priv->power_mode);
+
+        return 0;
+}
+
+static int ipw_wx_get_power(struct net_device *dev,
+                            struct iw_request_info *info,
+                            union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED)) {
+                wrqu->power.disabled = 1;
+        } else {
+                wrqu->power.disabled = 0;
+        }
+
+        IPW_DEBUG_WX("GET Power Management Mode -> %02X\n", priv->power_mode);
+
+        return 0;
+}
+
+static int ipw_wx_set_powermode(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int mode = *(int *)extra;
+        int err;
+
+        if ((mode < 1) || (mode > IPW_POWER_LIMIT)) {
+                mode = IPW_POWER_AC;
+                priv->power_mode = mode;
+        } else {
+                priv->power_mode = IPW_POWER_ENABLED | mode;
+        }
+
+        if (priv->power_mode != mode) {
+                err = ipw_send_power_mode(priv, mode);
+
+                if (err) {
+                        IPW_DEBUG_WX("failed setting power mode.\n");
+                        return err;
+                }
+        }
+
+        return 0;
+}
+
+#define MAX_WX_STRING 80
+static int ipw_wx_get_powermode(struct net_device *dev,
+                                struct iw_request_info *info,
+                                union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int level = IPW_POWER_LEVEL(priv->power_mode);
+        char *p = extra;
+
+        p += snprintf(p, MAX_WX_STRING, "Power save level: %d ", level);
+
+        switch (level) {
+        case IPW_POWER_AC:
+                p += snprintf(p, MAX_WX_STRING - (p - extra), "(AC)");
+                break;
+        case IPW_POWER_BATTERY:
+                p += snprintf(p, MAX_WX_STRING - (p - extra), "(BATTERY)");
+                break;
+        default:
+                p += snprintf(p, MAX_WX_STRING - (p - extra),
+                              "(Timeout %dms, Period %dms)",
+                              timeout_duration[level - 1] / 1000,
+                              period_duration[level - 1] / 1000);
+        }
+
+        if (!(priv->power_mode & IPW_POWER_ENABLED))
+                p += snprintf(p, MAX_WX_STRING - (p - extra), " OFF");
+
+        wrqu->data.length = p - extra + 1;
+
+        return 0;
+}
+
+static int ipw_wx_set_wireless_mode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int mode = *(int *)extra;
+        u8 band = 0, modulation = 0;
+
+        if (mode == 0 || mode & ~IEEE_MODE_MASK) {
+                IPW_WARNING("Attempt to set invalid wireless mode: %d\n", mode);
+                return -EINVAL;
+        }
+
+        if (priv->adapter == IPW_2915ABG) {
+                priv->ieee->abg_ture = 1;
+                if (mode & IEEE_A) {
+                        band |= IEEE80211_52GHZ_BAND;
+                        modulation |= IEEE80211_OFDM_MODULATION;
+                } else
+                        priv->ieee->abg_ture = 0;
+        } else {
+                if (mode & IEEE_A) {
+                        IPW_WARNING("Attempt to set 2200BG into "
+                                    "802.11a mode\n");
+                        return -EINVAL;
+                }
+
+                priv->ieee->abg_ture = 0;
+        }
+
+        if (mode & IEEE_B) {
+                band |= IEEE80211_24GHZ_BAND;
+                modulation |= IEEE80211_CCK_MODULATION;
+        } else
+                priv->ieee->abg_ture = 0;
+
+        if (mode & IEEE_G) {
+                band |= IEEE80211_24GHZ_BAND;
+                modulation |= IEEE80211_OFDM_MODULATION;
+        } else
+                priv->ieee->abg_ture = 0;
+
+        priv->ieee->mode = mode;
+        priv->ieee->freq_band = band;
+        priv->ieee->modulation = modulation;
+        init_supported_rates(priv, &priv->rates);
+
+        /* If we are currently associated, or trying to associate
+         * then see if this is a new configuration (causing us to
+         * disassociate) */
+        if (priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
+                /* The resulting association will trigger
+                 * the new rates to be sent to the device */
+                IPW_DEBUG_ASSOC("Disassociating due to mode change.\n");
+                ipw_disassociate(priv);
+        } else
+                ipw_send_supported_rates(priv, &priv->rates);
+
+        IPW_DEBUG_WX("PRIV SET MODE: %c%c%c\n",
+                     mode & IEEE_A ? 'a' : '.',
+                     mode & IEEE_B ? 'b' : '.', mode & IEEE_G ? 'g' : '.');
+        return 0;
+}
+
+static int ipw_wx_get_wireless_mode(struct net_device *dev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        switch (priv->ieee->freq_band) {
+        case IEEE80211_24GHZ_BAND:
+                switch (priv->ieee->modulation) {
+                case IEEE80211_CCK_MODULATION:
+                        strncpy(extra, "802.11b (2)", MAX_WX_STRING);
+                        break;
+                case IEEE80211_OFDM_MODULATION:
+                        strncpy(extra, "802.11g (4)", MAX_WX_STRING);
+                        break;
+                default:
+                        strncpy(extra, "802.11bg (6)", MAX_WX_STRING);
+                        break;
+                }
+                break;
+
+        case IEEE80211_52GHZ_BAND:
+                strncpy(extra, "802.11a (1)", MAX_WX_STRING);
+                break;
+
+        default:                /* Mixed Band */
+                switch (priv->ieee->modulation) {
+                case IEEE80211_CCK_MODULATION:
+                        strncpy(extra, "802.11ab (3)", MAX_WX_STRING);
+                        break;
+                case IEEE80211_OFDM_MODULATION:
+                        strncpy(extra, "802.11ag (5)", MAX_WX_STRING);
+                        break;
+                default:
+                        strncpy(extra, "802.11abg (7)", MAX_WX_STRING);
+                        break;
+                }
+                break;
+        }
+
+        IPW_DEBUG_WX("PRIV GET MODE: %s\n", extra);
+
+        wrqu->data.length = strlen(extra) + 1;
+
+        return 0;
+}
+
+#ifdef CONFIG_IPW_PROMISC
+static int ipw_wx_set_promisc(struct net_device *dev,
+                              struct iw_request_info *info,
+                              union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int *parms = (int *)extra;
+        int enable = (parms[0] > 0);
+
+        IPW_DEBUG_WX("SET PROMISC: %d %d\n", enable, parms[1]);
+        if (enable) {
+                if (priv->ieee->iw_mode != IW_MODE_MONITOR) {
+                        priv->net_dev->type = ARPHRD_IEEE80211;
+                        ipw_adapter_restart(priv);
+                }
+
+                ipw_set_channel(priv, parms[1]);
+        } else {
+                if (priv->ieee->iw_mode != IW_MODE_MONITOR)
+                        return 0;
+                priv->net_dev->type = ARPHRD_ETHER;
+                ipw_adapter_restart(priv);
+        }
+        return 0;
+}
+
+static int ipw_wx_reset(struct net_device *dev,
+                        struct iw_request_info *info,
+                        union iwreq_data *wrqu, char *extra)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_WX("RESET\n");
+        ipw_adapter_restart(priv);
+        return 0;
+}
+#endif                          // CONFIG_IPW_PROMISC
+
+/* Rebase the WE IOCTLs to zero for the handler array */
+#define IW_IOCTL(x) [(x)-SIOCSIWCOMMIT]
+static iw_handler ipw_wx_handlers[] = {
+        IW_IOCTL(SIOCGIWNAME)   = ipw_wx_get_name,
+        IW_IOCTL(SIOCSIWFREQ)   = ipw_wx_set_freq,
+        IW_IOCTL(SIOCGIWFREQ)   = ipw_wx_get_freq,
+        IW_IOCTL(SIOCSIWMODE)   = ipw_wx_set_mode,
+        IW_IOCTL(SIOCGIWMODE)   = ipw_wx_get_mode,
+        IW_IOCTL(SIOCGIWRANGE)  = ipw_wx_get_range,
+        IW_IOCTL(SIOCSIWAP)     = ipw_wx_set_wap,
+        IW_IOCTL(SIOCGIWAP)     = ipw_wx_get_wap,
+        IW_IOCTL(SIOCSIWSCAN)   = ipw_wx_set_scan,
+        IW_IOCTL(SIOCGIWSCAN)   = ipw_wx_get_scan,
+        IW_IOCTL(SIOCSIWESSID)  = ipw_wx_set_essid,
+        IW_IOCTL(SIOCGIWESSID)  = ipw_wx_get_essid,
+        IW_IOCTL(SIOCSIWNICKN)  = ipw_wx_set_nick,
+        IW_IOCTL(SIOCGIWNICKN)  = ipw_wx_get_nick,
+        IW_IOCTL(SIOCSIWRATE)   = ipw_wx_set_rate,
+        IW_IOCTL(SIOCGIWRATE)   = ipw_wx_get_rate,
+        IW_IOCTL(SIOCSIWRTS)    = ipw_wx_set_rts,
+        IW_IOCTL(SIOCGIWRTS)    = ipw_wx_get_rts,
+        IW_IOCTL(SIOCSIWFRAG)   = ipw_wx_set_frag,
+        IW_IOCTL(SIOCGIWFRAG)   = ipw_wx_get_frag,
+        IW_IOCTL(SIOCSIWTXPOW)  = ipw_wx_set_txpow,
+        IW_IOCTL(SIOCGIWTXPOW)  = ipw_wx_get_txpow,
+        IW_IOCTL(SIOCSIWRETRY)  = ipw_wx_set_retry,
+        IW_IOCTL(SIOCGIWRETRY)  = ipw_wx_get_retry,
+        IW_IOCTL(SIOCSIWENCODE) = ipw_wx_set_encode,
+        IW_IOCTL(SIOCGIWENCODE) = ipw_wx_get_encode,
+        IW_IOCTL(SIOCSIWPOWER)  = ipw_wx_set_power,
+        IW_IOCTL(SIOCGIWPOWER)  = ipw_wx_get_power,
+};
+
+#define IPW_PRIV_SET_POWER      SIOCIWFIRSTPRIV
+#define IPW_PRIV_GET_POWER      SIOCIWFIRSTPRIV+1
+#define IPW_PRIV_SET_MODE       SIOCIWFIRSTPRIV+2
+#define IPW_PRIV_GET_MODE       SIOCIWFIRSTPRIV+3
+#define IPW_PRIV_SET_PROMISC    SIOCIWFIRSTPRIV+4
+#define IPW_PRIV_RESET          SIOCIWFIRSTPRIV+5
+
+static struct iw_priv_args ipw_priv_args[] = {
+        {
+         .cmd = IPW_PRIV_SET_POWER,
+         .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         .name = "set_power"},
+        {
+         .cmd = IPW_PRIV_GET_POWER,
+         .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+         .name = "get_power"},
+        {
+         .cmd = IPW_PRIV_SET_MODE,
+         .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+         .name = "set_mode"},
+        {
+         .cmd = IPW_PRIV_GET_MODE,
+         .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+         .name = "get_mode"},
+#ifdef CONFIG_IPW_PROMISC
+        {
+         IPW_PRIV_SET_PROMISC,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "monitor"},
+        {
+         IPW_PRIV_RESET,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 0, 0, "reset"},
+#endif                          /* CONFIG_IPW_PROMISC */
+};
+
+static iw_handler ipw_priv_handler[] = {
+        ipw_wx_set_powermode,
+        ipw_wx_get_powermode,
+        ipw_wx_set_wireless_mode,
+        ipw_wx_get_wireless_mode,
+#ifdef CONFIG_IPW_PROMISC
+        ipw_wx_set_promisc,
+        ipw_wx_reset,
+#endif
+};
+
+static struct iw_handler_def ipw_wx_handler_def = {
+        .standard               = ipw_wx_handlers,
+        .num_standard           = ARRAY_SIZE(ipw_wx_handlers),
+        .num_private            = ARRAY_SIZE(ipw_priv_handler),
+        .num_private_args       = ARRAY_SIZE(ipw_priv_args),
+        .private                = ipw_priv_handler,
+        .private_args           = ipw_priv_args,
+};
+
+/*
+ * Get wireless statistics.
+ * Called by /proc/net/wireless
+ * Also called by SIOCGIWSTATS
+ */
+static struct iw_statistics *ipw_get_wireless_stats(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct iw_statistics *wstats;
+
+        wstats = &priv->wstats;
+
+        /* if hw is disabled, then ipw2100_get_ordinal() can't be called.
+         * ipw2100_wx_wireless_stats seems to be called before fw is
+         * initialized.  STATUS_ASSOCIATED will only be set if the hw is up
+         * and associated; if not associcated, the values are all meaningless
+         * anyway, so set them all to NULL and INVALID */
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                wstats->miss.beacon = 0;
+                wstats->discard.retries = 0;
+                wstats->qual.qual = 0;
+                wstats->qual.level = 0;
+                wstats->qual.noise = 0;
+                wstats->qual.updated = 7;
+                wstats->qual.updated |= IW_QUAL_NOISE_INVALID |
+                    IW_QUAL_QUAL_INVALID | IW_QUAL_LEVEL_INVALID;
+                return wstats;
+        }
+
+        wstats->qual.qual = priv->quality;
+        wstats->qual.level = average_value(&priv->average_rssi);
+        wstats->qual.noise = average_value(&priv->average_noise);
+        wstats->qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED |
+            IW_QUAL_NOISE_UPDATED;
+
+        wstats->miss.beacon = average_value(&priv->average_missed_beacons);
+        wstats->discard.retries = priv->last_tx_failures;
+        wstats->discard.code = priv->ieee->ieee_stats.rx_discards_undecryptable;
+
+/*      if (ipw_get_ordinal(priv, IPW_ORD_STAT_TX_RETRY, &tx_retry, &len))
+        goto fail_get_ordinal;
+        wstats->discard.retries += tx_retry; */
+
+        return wstats;
+}
+
+/* net device stuff */
+
+static inline void init_sys_config(struct ipw_sys_config *sys_config)
+{
+        memset(sys_config, 0, sizeof(struct ipw_sys_config));
+        sys_config->bt_coexistence = 1; /* We may need to look into prvStaBtConfig */
+        sys_config->answer_broadcast_ssid_probe = 0;
+        sys_config->accept_all_data_frames = 0;
+        sys_config->accept_non_directed_frames = 1;
+        sys_config->exclude_unicast_unencrypted = 0;
+        sys_config->disable_unicast_decryption = 1;
+        sys_config->exclude_multicast_unencrypted = 0;
+        sys_config->disable_multicast_decryption = 1;
+        sys_config->antenna_diversity = CFG_SYS_ANTENNA_BOTH;
+        sys_config->pass_crc_to_host = 0;       /* TODO: See if 1 gives us FCS */
+        sys_config->dot11g_auto_detection = 0;
+        sys_config->enable_cts_to_self = 0;
+        sys_config->bt_coexist_collision_thr = 0;
+        sys_config->pass_noise_stats_to_host = 1;
+}
+
+static int ipw_net_open(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        IPW_DEBUG_INFO("dev->open\n");
+        /* we should be verifying the device is ready to be opened */
+        if (!(priv->status & STATUS_RF_KILL_MASK) &&
+            (priv->status & STATUS_ASSOCIATED))
+                netif_start_queue(dev);
+        return 0;
+}
+
+static int ipw_net_stop(struct net_device *dev)
+{
+        IPW_DEBUG_INFO("dev->close\n");
+        netif_stop_queue(dev);
+        return 0;
+}
+
+/*
+todo:
+
+modify to send one tfd per fragment instead of using chunking.  otherwise
+we need to heavily modify the ieee80211_skb_to_txb.
+*/
+
+static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
+{
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)
+            txb->fragments[0]->data;
+        int i = 0;
+        struct tfd_frame *tfd;
+        struct clx2_tx_queue *txq = &priv->txq[0];
+        struct clx2_queue *q = &txq->q;
+        u8 id, hdr_len, unicast;
+        u16 remaining_bytes;
+
+        switch (priv->ieee->iw_mode) {
+        case IW_MODE_ADHOC:
+                hdr_len = IEEE80211_3ADDR_LEN;
+                unicast = !is_broadcast_ether_addr(hdr->addr1) &&
+                    !is_multicast_ether_addr(hdr->addr1);
+                id = ipw_find_station(priv, hdr->addr1);
+                if (id == IPW_INVALID_STATION) {
+                        id = ipw_add_station(priv, hdr->addr1);
+                        if (id == IPW_INVALID_STATION) {
+                                IPW_WARNING("Attempt to send data to "
+                                            "invalid cell: " MAC_FMT "\n",
+                                            MAC_ARG(hdr->addr1));
+                                goto drop;
+                        }
+                }
+                break;
+
+        case IW_MODE_INFRA:
+        default:
+                unicast = !is_broadcast_ether_addr(hdr->addr3) &&
+                    !is_multicast_ether_addr(hdr->addr3);
+                hdr_len = IEEE80211_3ADDR_LEN;
+                id = 0;
+                break;
+        }
+
+        tfd = &txq->bd[q->first_empty];
+        txq->txb[q->first_empty] = txb;
+        memset(tfd, 0, sizeof(*tfd));
+        tfd->u.data.station_number = id;
+
+        tfd->control_flags.message_type = TX_FRAME_TYPE;
+        tfd->control_flags.control_bits = TFD_NEED_IRQ_MASK;
+
+        tfd->u.data.cmd_id = DINO_CMD_TX;
+        tfd->u.data.len = txb->payload_size;
+        remaining_bytes = txb->payload_size;
+        if (unlikely(!unicast))
+                tfd->u.data.tx_flags = DCT_FLAG_NO_WEP;
+        else
+                tfd->u.data.tx_flags = DCT_FLAG_NO_WEP | DCT_FLAG_ACK_REQD;
+
+        if (priv->assoc_request.ieee_mode == IPW_B_MODE)
+                tfd->u.data.tx_flags_ext = DCT_FLAG_EXT_MODE_CCK;
+        else
+                tfd->u.data.tx_flags_ext = DCT_FLAG_EXT_MODE_OFDM;
+
+        if (priv->config & CFG_PREAMBLE)
+                tfd->u.data.tx_flags |= DCT_FLAG_SHORT_PREMBL;
+
+        memcpy(&tfd->u.data.tfd.tfd_24.mchdr, hdr, hdr_len);
+
+        /* payload */
+        tfd->u.data.num_chunks = min((u8) (NUM_TFD_CHUNKS - 2), txb->nr_frags);
+        for (i = 0; i < tfd->u.data.num_chunks; i++) {
+                IPW_DEBUG_TX("Dumping TX packet frag %i of %i (%d bytes):\n",
+                             i, tfd->u.data.num_chunks,
+                             txb->fragments[i]->len - hdr_len);
+                printk_buf(IPW_DL_TX, txb->fragments[i]->data + hdr_len,
+                           txb->fragments[i]->len - hdr_len);
+
+                tfd->u.data.chunk_ptr[i] =
+                    pci_map_single(priv->pci_dev,
+                                   txb->fragments[i]->data + hdr_len,
+                                   txb->fragments[i]->len - hdr_len,
+                                   PCI_DMA_TODEVICE);
+                tfd->u.data.chunk_len[i] = txb->fragments[i]->len - hdr_len;
+        }
+
+        if (i != txb->nr_frags) {
+                struct sk_buff *skb;
+                u16 remaining_bytes = 0;
+                int j;
+
+                for (j = i; j < txb->nr_frags; j++)
+                        remaining_bytes += txb->fragments[j]->len - hdr_len;
+
+                printk(KERN_INFO "Trying to reallocate for %d bytes\n",
+                       remaining_bytes);
+                skb = alloc_skb(remaining_bytes, GFP_ATOMIC);
+                if (skb != NULL) {
+                        tfd->u.data.chunk_len[i] = remaining_bytes;
+                        for (j = i; j < txb->nr_frags; j++) {
+                                int size = txb->fragments[j]->len - hdr_len;
+                                printk(KERN_INFO "Adding frag %d %d...\n",
+                                       j, size);
+                                memcpy(skb_put(skb, size),
+                                       txb->fragments[j]->data + hdr_len, size);
+                        }
+                        dev_kfree_skb_any(txb->fragments[i]);
+                        txb->fragments[i] = skb;
+                        tfd->u.data.chunk_ptr[i] =
+                            pci_map_single(priv->pci_dev, skb->data,
+                                           tfd->u.data.chunk_len[i],
+                                           PCI_DMA_TODEVICE);
+                        tfd->u.data.num_chunks++;
+                }
+        }
+
+        /* kick DMA */
+        q->first_empty = ipw_queue_inc_wrap(q->first_empty, q->n_bd);
+        ipw_write32(priv, q->reg_w, q->first_empty);
+
+        if (ipw_queue_space(q) < q->high_mark)
+                netif_stop_queue(priv->net_dev);
+
+        return;
+
+      drop:
+        IPW_DEBUG_DROP("Silently dropping Tx packet.\n");
+        ieee80211_txb_free(txb);
+}
+
+static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb,
+                                   struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        unsigned long flags;
+
+        IPW_DEBUG_TX("dev->xmit(%d bytes)\n", txb->payload_size);
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        if (!(priv->status & STATUS_ASSOCIATED)) {
+                IPW_DEBUG_INFO("Tx attempt while not associated.\n");
+                priv->ieee->stats.tx_carrier_errors++;
+                netif_stop_queue(dev);
+                goto fail_unlock;
+        }
+
+        ipw_tx_skb(priv, txb);
+
+        spin_unlock_irqrestore(&priv->lock, flags);
+        return 0;
+
+      fail_unlock:
+        spin_unlock_irqrestore(&priv->lock, flags);
+        return 1;
+}
+
+static struct net_device_stats *ipw_net_get_stats(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        priv->ieee->stats.tx_packets = priv->tx_packets;
+        priv->ieee->stats.rx_packets = priv->rx_packets;
+        return &priv->ieee->stats;
+}
+
+static void ipw_net_set_multicast_list(struct net_device *dev)
+{
+
+}
+
+static int ipw_net_set_mac_address(struct net_device *dev, void *p)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        struct sockaddr *addr = p;
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EADDRNOTAVAIL;
+        priv->config |= CFG_CUSTOM_MAC;
+        memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
+        printk(KERN_INFO "%s: Setting MAC to " MAC_FMT "\n",
+               priv->net_dev->name, MAC_ARG(priv->mac_addr));
+        ipw_adapter_restart(priv);
+        return 0;
+}
+
+static void ipw_ethtool_get_drvinfo(struct net_device *dev,
+                                    struct ethtool_drvinfo *info)
+{
+        struct ipw_priv *p = ieee80211_priv(dev);
+        char vers[64];
+        char date[32];
+        u32 len;
+
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+
+        len = sizeof(vers);
+        ipw_get_ordinal(p, IPW_ORD_STAT_FW_VERSION, vers, &len);
+        len = sizeof(date);
+        ipw_get_ordinal(p, IPW_ORD_STAT_FW_DATE, date, &len);
+
+        snprintf(info->fw_version, sizeof(info->fw_version), "%s (%s)",
+                 vers, date);
+        strcpy(info->bus_info, pci_name(p->pci_dev));
+        info->eedump_len = CX2_EEPROM_IMAGE_SIZE;
+}
+
+static u32 ipw_ethtool_get_link(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        return (priv->status & STATUS_ASSOCIATED) != 0;
+}
+
+static int ipw_ethtool_get_eeprom_len(struct net_device *dev)
+{
+        return CX2_EEPROM_IMAGE_SIZE;
+}
+
+static int ipw_ethtool_get_eeprom(struct net_device *dev,
+                                  struct ethtool_eeprom *eeprom, u8 * bytes)
+{
+        struct ipw_priv *p = ieee80211_priv(dev);
+
+        if (eeprom->offset + eeprom->len > CX2_EEPROM_IMAGE_SIZE)
+                return -EINVAL;
+
+        memcpy(bytes, &((u8 *) p->eeprom)[eeprom->offset], eeprom->len);
+        return 0;
+}
+
+static int ipw_ethtool_set_eeprom(struct net_device *dev,
+                                  struct ethtool_eeprom *eeprom, u8 * bytes)
+{
+        struct ipw_priv *p = ieee80211_priv(dev);
+        int i;
+
+        if (eeprom->offset + eeprom->len > CX2_EEPROM_IMAGE_SIZE)
+                return -EINVAL;
+
+        memcpy(&((u8 *) p->eeprom)[eeprom->offset], bytes, eeprom->len);
+        for (i = IPW_EEPROM_DATA;
+             i < IPW_EEPROM_DATA + CX2_EEPROM_IMAGE_SIZE; i++)
+                ipw_write8(p, i, p->eeprom[i]);
+
+        return 0;
+}
+
+static struct ethtool_ops ipw_ethtool_ops = {
+        .get_link       = ipw_ethtool_get_link,
+        .get_drvinfo    = ipw_ethtool_get_drvinfo,
+        .get_eeprom_len = ipw_ethtool_get_eeprom_len,
+        .get_eeprom     = ipw_ethtool_get_eeprom,
+        .set_eeprom     = ipw_ethtool_set_eeprom,
+};
+
+static irqreturn_t ipw_isr(int irq, void *data, struct pt_regs *regs)
+{
+        struct ipw_priv *priv = data;
+        u32 inta, inta_mask;
+
+        if (!priv)
+                return IRQ_NONE;
+
+        spin_lock(&priv->lock);
+
+        if (!(priv->status & STATUS_INT_ENABLED)) {
+                /* Shared IRQ */
+                goto none;
+        }
+
+        inta = ipw_read32(priv, CX2_INTA_RW);
+        inta_mask = ipw_read32(priv, CX2_INTA_MASK_R);
+
+        if (inta == 0xFFFFFFFF) {
+                /* Hardware disappeared */
+                IPW_WARNING("IRQ INTA == 0xFFFFFFFF\n");
+                goto none;
+        }
+
+        if (!(inta & (CX2_INTA_MASK_ALL & inta_mask))) {
+                /* Shared interrupt */
+                goto none;
+        }
+
+        /* tell the device to stop sending interrupts */
+        ipw_disable_interrupts(priv);
+
+        /* ack current interrupts */
+        inta &= (CX2_INTA_MASK_ALL & inta_mask);
+        ipw_write32(priv, CX2_INTA_RW, inta);
+
+        /* Cache INTA value for our tasklet */
+        priv->isr_inta = inta;
+
+        tasklet_schedule(&priv->irq_tasklet);
+
+        spin_unlock(&priv->lock);
+
+        return IRQ_HANDLED;
+      none:
+        spin_unlock(&priv->lock);
+        return IRQ_NONE;
+}
+
+static void ipw_rf_kill(void *adapter)
+{
+        struct ipw_priv *priv = adapter;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        if (rf_kill_active(priv)) {
+                IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
+                if (priv->workqueue)
+                        queue_delayed_work(priv->workqueue,
+                                           &priv->rf_kill, 2 * HZ);
+                goto exit_unlock;
+        }
+
+        /* RF Kill is now disabled, so bring the device back up */
+
+        if (!(priv->status & STATUS_RF_KILL_MASK)) {
+                IPW_DEBUG_RF_KILL("HW RF Kill no longer active, restarting "
+                                  "device\n");
+
+                /* we can not do an adapter restart while inside an irq lock */
+                queue_work(priv->workqueue, &priv->adapter_restart);
+        } else
+                IPW_DEBUG_RF_KILL("HW RF Kill deactivated.  SW RF Kill still "
+                                  "enabled\n");
+
+      exit_unlock:
+        spin_unlock_irqrestore(&priv->lock, flags);
+}
+
+static int ipw_setup_deferred_work(struct ipw_priv *priv)
+{
+        int ret = 0;
+
+        priv->workqueue = create_workqueue(DRV_NAME);
+        init_waitqueue_head(&priv->wait_command_queue);
+
+        INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv);
+        INIT_WORK(&priv->associate, ipw_associate, priv);
+        INIT_WORK(&priv->disassociate, ipw_disassociate, priv);
+        INIT_WORK(&priv->rx_replenish, ipw_rx_queue_replenish, priv);
+        INIT_WORK(&priv->adapter_restart, ipw_adapter_restart, priv);
+        INIT_WORK(&priv->rf_kill, ipw_rf_kill, priv);
+        INIT_WORK(&priv->up, (void (*)(void *))ipw_up, priv);
+        INIT_WORK(&priv->down, (void (*)(void *))ipw_down, priv);
+        INIT_WORK(&priv->request_scan,
+                  (void (*)(void *))ipw_request_scan, priv);
+        INIT_WORK(&priv->gather_stats,
+                  (void (*)(void *))ipw_gather_stats, priv);
+        INIT_WORK(&priv->abort_scan, (void (*)(void *))ipw_abort_scan, priv);
+        INIT_WORK(&priv->roam, ipw_roam, priv);
+        INIT_WORK(&priv->scan_check, ipw_scan_check, priv);
+
+        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
+                     ipw_irq_tasklet, (unsigned long)priv);
+
+        return ret;
+}
+
+static void shim__set_security(struct net_device *dev,
+                               struct ieee80211_security *sec)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+        int i;
+
+        for (i = 0; i < 4; i++) {
+                if (sec->flags & (1 << i)) {
+                        priv->sec.key_sizes[i] = sec->key_sizes[i];
+                        if (sec->key_sizes[i] == 0)
+                                priv->sec.flags &= ~(1 << i);
+                        else
+                                memcpy(priv->sec.keys[i], sec->keys[i],
+                                       sec->key_sizes[i]);
+                        priv->sec.flags |= (1 << i);
+                        priv->status |= STATUS_SECURITY_UPDATED;
+                }
+        }
+
+        if ((sec->flags & SEC_ACTIVE_KEY) &&
+            priv->sec.active_key != sec->active_key) {
+                if (sec->active_key <= 3) {
+                        priv->sec.active_key = sec->active_key;
+                        priv->sec.flags |= SEC_ACTIVE_KEY;
+                } else
+                        priv->sec.flags &= ~SEC_ACTIVE_KEY;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        if ((sec->flags & SEC_AUTH_MODE) &&
+            (priv->sec.auth_mode != sec->auth_mode)) {
+                priv->sec.auth_mode = sec->auth_mode;
+                priv->sec.flags |= SEC_AUTH_MODE;
+                if (sec->auth_mode == WLAN_AUTH_SHARED_KEY)
+                        priv->capability |= CAP_SHARED_KEY;
+                else
+                        priv->capability &= ~CAP_SHARED_KEY;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        if (sec->flags & SEC_ENABLED && priv->sec.enabled != sec->enabled) {
+                priv->sec.flags |= SEC_ENABLED;
+                priv->sec.enabled = sec->enabled;
+                priv->status |= STATUS_SECURITY_UPDATED;
+                if (sec->enabled)
+                        priv->capability |= CAP_PRIVACY_ON;
+                else
+                        priv->capability &= ~CAP_PRIVACY_ON;
+        }
+
+        if (sec->flags & SEC_LEVEL && priv->sec.level != sec->level) {
+                priv->sec.level = sec->level;
+                priv->sec.flags |= SEC_LEVEL;
+                priv->status |= STATUS_SECURITY_UPDATED;
+        }
+
+        /* To match current functionality of ipw2100 (which works well w/
+         * various supplicants, we don't force a disassociate if the
+         * privacy capability changes ... */
+#if 0
+        if ((priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) &&
+            (((priv->assoc_request.capability &
+               WLAN_CAPABILITY_PRIVACY) && !sec->enabled) ||
+             (!(priv->assoc_request.capability &
+                WLAN_CAPABILITY_PRIVACY) && sec->enabled))) {
+                IPW_DEBUG_ASSOC("Disassociating due to capability "
+                                "change.\n");
+                ipw_disassociate(priv);
+        }
+#endif
+}
+
+static int init_supported_rates(struct ipw_priv *priv,
+                                struct ipw_supported_rates *rates)
+{
+        /* TODO: Mask out rates based on priv->rates_mask */
+
+        memset(rates, 0, sizeof(*rates));
+        /* configure supported rates */
+        switch (priv->ieee->freq_band) {
+        case IEEE80211_52GHZ_BAND:
+                rates->ieee_mode = IPW_A_MODE;
+                rates->purpose = IPW_RATE_CAPABILITIES;
+                ipw_add_ofdm_scan_rates(rates, IEEE80211_CCK_MODULATION,
+                                        IEEE80211_OFDM_DEFAULT_RATES_MASK);
+                break;
+
+        default:                /* Mixed or 2.4Ghz */
+                rates->ieee_mode = IPW_G_MODE;
+                rates->purpose = IPW_RATE_CAPABILITIES;
+                ipw_add_cck_scan_rates(rates, IEEE80211_CCK_MODULATION,
+                                       IEEE80211_CCK_DEFAULT_RATES_MASK);
+                if (priv->ieee->modulation & IEEE80211_OFDM_MODULATION) {
+                        ipw_add_ofdm_scan_rates(rates, IEEE80211_CCK_MODULATION,
+                                                IEEE80211_OFDM_DEFAULT_RATES_MASK);
+                }
+                break;
+        }
+
+        return 0;
+}
+
+static int ipw_config(struct ipw_priv *priv)
+{
+        int i;
+        struct ipw_tx_power tx_power;
+
+        memset(&priv->sys_config, 0, sizeof(priv->sys_config));
+        memset(&tx_power, 0, sizeof(tx_power));
+
+        /* This is only called from ipw_up, which resets/reloads the firmware
+           so, we don't need to first disable the card before we configure
+           it */
+
+        /* configure device for 'G' band */
+        tx_power.ieee_mode = IPW_G_MODE;
+        tx_power.num_channels = 11;
+        for (i = 0; i < 11; i++) {
+                tx_power.channels_tx_power[i].channel_number = i + 1;
+                tx_power.channels_tx_power[i].tx_power = priv->tx_power;
+        }
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        /* configure device to also handle 'B' band */
+        tx_power.ieee_mode = IPW_B_MODE;
+        if (ipw_send_tx_power(priv, &tx_power))
+                goto error;
+
+        /* initialize adapter address */
+        if (ipw_send_adapter_address(priv, priv->net_dev->dev_addr))
+                goto error;
+
+        /* set basic system config settings */
+        init_sys_config(&priv->sys_config);
+        if (ipw_send_system_config(priv, &priv->sys_config))
+                goto error;
+
+        init_supported_rates(priv, &priv->rates);
+        if (ipw_send_supported_rates(priv, &priv->rates))
+                goto error;
+
+        /* Set request-to-send threshold */
+        if (priv->rts_threshold) {
+                if (ipw_send_rts_threshold(priv, priv->rts_threshold))
+                        goto error;
+        }
+
+        if (ipw_set_random_seed(priv))
+                goto error;
+
+        /* final state transition to the RUN state */
+        if (ipw_send_host_complete(priv))
+                goto error;
+
+        /* If configured to try and auto-associate, kick off a scan */
+        if ((priv->config & CFG_ASSOCIATE) && ipw_request_scan(priv))
+                goto error;
+
+        return 0;
+
+      error:
+        return -EIO;
+}
+
+#define MAX_HW_RESTARTS 5
+static int ipw_up(struct ipw_priv *priv)
+{
+        int rc, i;
+
+        if (priv->status & STATUS_EXIT_PENDING)
+                return -EIO;
+
+        for (i = 0; i < MAX_HW_RESTARTS; i++) {
+                /* Load the microcode, firmware, and eeprom.
+                 * Also start the clocks. */
+                rc = ipw_load(priv);
+                if (rc) {
+                        IPW_ERROR("Unable to load firmware: 0x%08X\n", rc);
+                        return rc;
+                }
+
+                ipw_init_ordinals(priv);
+                if (!(priv->config & CFG_CUSTOM_MAC))
+                        eeprom_parse_mac(priv, priv->mac_addr);
+                memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
+
+                if (priv->status & STATUS_RF_KILL_MASK)
+                        return 0;
+
+                rc = ipw_config(priv);
+                if (!rc) {
+                        IPW_DEBUG_INFO("Configured device on count %i\n", i);
+                        priv->notif_missed_beacons = 0;
+                        netif_start_queue(priv->net_dev);
+                        return 0;
+                } else {
+                        IPW_DEBUG_INFO("Device configuration failed: 0x%08X\n",
+                                       rc);
+                }
+
+                IPW_DEBUG_INFO("Failed to config device on retry %d of %d\n",
+                               i, MAX_HW_RESTARTS);
+
+                /* We had an error bringing up the hardware, so take it
+                 * all the way back down so we can try again */
+                ipw_down(priv);
+        }
+
+        /* tried to restart and config the device for as long as our
+         * patience could withstand */
+        IPW_ERROR("Unable to initialize device after %d attempts.\n", i);
+        return -EIO;
+}
+
+static void ipw_down(struct ipw_priv *priv)
+{
+        /* Attempt to disable the card */
+#if 0
+        ipw_send_card_disable(priv, 0);
+#endif
+
+        /* tell the device to stop sending interrupts */
+        ipw_disable_interrupts(priv);
+
+        /* Clear all bits but the RF Kill */
+        priv->status &= STATUS_RF_KILL_MASK;
+
+        netif_carrier_off(priv->net_dev);
+        netif_stop_queue(priv->net_dev);
+
+        ipw_stop_nic(priv);
+}
+
+/* Called by register_netdev() */
+static int ipw_net_init(struct net_device *dev)
+{
+        struct ipw_priv *priv = ieee80211_priv(dev);
+
+        if (priv->status & STATUS_RF_KILL_SW) {
+                IPW_WARNING("Radio disabled by module parameter.\n");
+                return 0;
+        } else if (rf_kill_active(priv)) {
+                IPW_WARNING("Radio Frequency Kill Switch is On:\n"
+                            "Kill switch must be turned off for "
+                            "wireless networking to work.\n");
+                queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ);
+                return 0;
+        }
+
+        if (ipw_up(priv))
+                return -EIO;
+
+        return 0;
+}
+
+/* PCI driver stuff */
+static struct pci_device_id card_ids[] = {
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2701, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2702, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2711, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2712, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2721, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2722, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2731, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2732, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2741, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x103c, 0x2741, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2742, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2751, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2752, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2753, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2754, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x104f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_INTEL, 0x4220, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
+        {PCI_VENDOR_ID_INTEL, 0x4221, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* 2225BG */
+        {PCI_VENDOR_ID_INTEL, 0x4223, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+        {PCI_VENDOR_ID_INTEL, 0x4224, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+
+        /* required last entry */
+        {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, card_ids);
+
+static struct attribute *ipw_sysfs_entries[] = {
+        &dev_attr_rf_kill.attr,
+        &dev_attr_direct_dword.attr,
+        &dev_attr_indirect_byte.attr,
+        &dev_attr_indirect_dword.attr,
+        &dev_attr_mem_gpio_reg.attr,
+        &dev_attr_command_event_reg.attr,
+        &dev_attr_nic_type.attr,
+        &dev_attr_status.attr,
+        &dev_attr_cfg.attr,
+        &dev_attr_dump_errors.attr,
+        &dev_attr_dump_events.attr,
+        &dev_attr_eeprom_delay.attr,
+        &dev_attr_ucode_version.attr,
+        &dev_attr_rtc.attr,
+        NULL
+};
+
+static struct attribute_group ipw_attribute_group = {
+        .name = NULL,           /* put in device directory */
+        .attrs = ipw_sysfs_entries,
+};
+
+static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        int err = 0;
+        struct net_device *net_dev;
+        void __iomem *base;
+        u32 length, val;
+        struct ipw_priv *priv;
+        int band, modulation;
+
+        net_dev = alloc_ieee80211(sizeof(struct ipw_priv));
+        if (net_dev == NULL) {
+                err = -ENOMEM;
+                goto out;
+        }
+
+        priv = ieee80211_priv(net_dev);
+        priv->ieee = netdev_priv(net_dev);
+        priv->net_dev = net_dev;
+        priv->pci_dev = pdev;
+#ifdef CONFIG_IPW_DEBUG
+        ipw_debug_level = debug;
+#endif
+        spin_lock_init(&priv->lock);
+
+        if (pci_enable_device(pdev)) {
+                err = -ENODEV;
+                goto out_free_ieee80211;
+        }
+
+        pci_set_master(pdev);
+
+        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (!err)
+                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+        if (err) {
+                printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n");
+                goto out_pci_disable_device;
+        }
+
+        pci_set_drvdata(pdev, priv);
+
+        err = pci_request_regions(pdev, DRV_NAME);
+        if (err)
+                goto out_pci_disable_device;
+
+        /* We disable the RETRY_TIMEOUT register (0x41) to keep
+         * PCI Tx retries from interfering with C3 CPU state */
+        pci_read_config_dword(pdev, 0x40, &val);
+        if ((val & 0x0000ff00) != 0)
+                pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+
+        length = pci_resource_len(pdev, 0);
+        priv->hw_len = length;
+
+        base = ioremap_nocache(pci_resource_start(pdev, 0), length);
+        if (!base) {
+                err = -ENODEV;
+                goto out_pci_release_regions;
+        }
+
+        priv->hw_base = base;
+        IPW_DEBUG_INFO("pci_resource_len = 0x%08x\n", length);
+        IPW_DEBUG_INFO("pci_resource_base = %p\n", base);
+
+        err = ipw_setup_deferred_work(priv);
+        if (err) {
+                IPW_ERROR("Unable to setup deferred work\n");
+                goto out_iounmap;
+        }
+
+        /* Initialize module parameter values here */
+        if (ifname)
+                strncpy(net_dev->name, ifname, IFNAMSIZ);
+
+        if (associate)
+                priv->config |= CFG_ASSOCIATE;
+        else
+                IPW_DEBUG_INFO("Auto associate disabled.\n");
+
+        if (auto_create)
+                priv->config |= CFG_ADHOC_CREATE;
+        else
+                IPW_DEBUG_INFO("Auto adhoc creation disabled.\n");
+
+        if (disable) {
+                priv->status |= STATUS_RF_KILL_SW;
+                IPW_DEBUG_INFO("Radio disabled.\n");
+        }
+
+        if (channel != 0) {
+                priv->config |= CFG_STATIC_CHANNEL;
+                priv->channel = channel;
+                IPW_DEBUG_INFO("Bind to static channel %d\n", channel);
+                IPW_DEBUG_INFO("Bind to static channel %d\n", channel);
+                /* TODO: Validate that provided channel is in range */
+        }
+
+        switch (mode) {
+        case 1:
+                priv->ieee->iw_mode = IW_MODE_ADHOC;
+                break;
+#ifdef CONFIG_IPW_PROMISC
+        case 2:
+                priv->ieee->iw_mode = IW_MODE_MONITOR;
+                break;
+#endif
+        default:
+        case 0:
+                priv->ieee->iw_mode = IW_MODE_INFRA;
+                break;
+        }
+
+        if ((priv->pci_dev->device == 0x4223) ||
+            (priv->pci_dev->device == 0x4224)) {
+                printk(KERN_INFO DRV_NAME
+                       ": Detected Intel PRO/Wireless 2915ABG Network "
+                       "Connection\n");
+                priv->ieee->abg_ture = 1;
+                band = IEEE80211_52GHZ_BAND | IEEE80211_24GHZ_BAND;
+                modulation = IEEE80211_OFDM_MODULATION |
+                    IEEE80211_CCK_MODULATION;
+                priv->adapter = IPW_2915ABG;
+                priv->ieee->mode = IEEE_A | IEEE_G | IEEE_B;
+        } else {
+                if (priv->pci_dev->device == 0x4221)
+                        printk(KERN_INFO DRV_NAME
+                               ": Detected Intel PRO/Wireless 2225BG Network "
+                               "Connection\n");
+                else
+                        printk(KERN_INFO DRV_NAME
+                               ": Detected Intel PRO/Wireless 2200BG Network "
+                               "Connection\n");
+
+                priv->ieee->abg_ture = 0;
+                band = IEEE80211_24GHZ_BAND;
+                modulation = IEEE80211_OFDM_MODULATION |
+                    IEEE80211_CCK_MODULATION;
+                priv->adapter = IPW_2200BG;
+                priv->ieee->mode = IEEE_G | IEEE_B;
+        }
+
+        priv->ieee->freq_band = band;
+        priv->ieee->modulation = modulation;
+
+        priv->rates_mask = IEEE80211_DEFAULT_RATES_MASK;
+
+        priv->missed_beacon_threshold = IPW_MB_DISASSOCIATE_THRESHOLD_DEFAULT;
+        priv->roaming_threshold = IPW_MB_ROAMING_THRESHOLD_DEFAULT;
+
+        priv->rts_threshold = DEFAULT_RTS_THRESHOLD;
+
+        /* If power management is turned on, default to AC mode */
+        priv->power_mode = IPW_POWER_AC;
+        priv->tx_power = IPW_DEFAULT_TX_POWER;
+
+        err = request_irq(pdev->irq, ipw_isr, SA_SHIRQ, DRV_NAME, priv);
+        if (err) {
+                IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
+                goto out_destroy_workqueue;
+        }
+
+        SET_MODULE_OWNER(net_dev);
+        SET_NETDEV_DEV(net_dev, &pdev->dev);
+
+        priv->ieee->hard_start_xmit = ipw_net_hard_start_xmit;
+        priv->ieee->set_security = shim__set_security;
+
+        net_dev->open = ipw_net_open;
+        net_dev->stop = ipw_net_stop;
+        net_dev->init = ipw_net_init;
+        net_dev->get_stats = ipw_net_get_stats;
+        net_dev->set_multicast_list = ipw_net_set_multicast_list;
+        net_dev->set_mac_address = ipw_net_set_mac_address;
+        net_dev->get_wireless_stats = ipw_get_wireless_stats;
+        net_dev->wireless_handlers = &ipw_wx_handler_def;
+        net_dev->ethtool_ops = &ipw_ethtool_ops;
+        net_dev->irq = pdev->irq;
+        net_dev->base_addr = (unsigned long)priv->hw_base;
+        net_dev->mem_start = pci_resource_start(pdev, 0);
+        net_dev->mem_end = net_dev->mem_start + pci_resource_len(pdev, 0) - 1;
+
+        err = sysfs_create_group(&pdev->dev.kobj, &ipw_attribute_group);
+        if (err) {
+                IPW_ERROR("failed to create sysfs device attributes\n");
+                goto out_release_irq;
+        }
+
+        err = register_netdev(net_dev);
+        if (err) {
+                IPW_ERROR("failed to register network device\n");
+                goto out_remove_group;
+        }
+
+        return 0;
+
+      out_remove_group:
+        sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
+      out_release_irq:
+        free_irq(pdev->irq, priv);
+      out_destroy_workqueue:
+        destroy_workqueue(priv->workqueue);
+        priv->workqueue = NULL;
+      out_iounmap:
+        iounmap(priv->hw_base);
+      out_pci_release_regions:
+        pci_release_regions(pdev);
+      out_pci_disable_device:
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+      out_free_ieee80211:
+        free_ieee80211(priv->net_dev);
+      out:
+        return err;
+}
+
+static void ipw_pci_remove(struct pci_dev *pdev)
+{
+        struct ipw_priv *priv = pci_get_drvdata(pdev);
+        if (!priv)
+                return;
+
+        priv->status |= STATUS_EXIT_PENDING;
+
+        sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
+
+        ipw_down(priv);
+
+        unregister_netdev(priv->net_dev);
+
+        if (priv->rxq) {
+                ipw_rx_queue_free(priv, priv->rxq);
+                priv->rxq = NULL;
+        }
+        ipw_tx_queue_free(priv);
+
+        /* ipw_down will ensure that there is no more pending work
+         * in the workqueue's, so we can safely remove them now. */
+        if (priv->workqueue) {
+                cancel_delayed_work(&priv->adhoc_check);
+                cancel_delayed_work(&priv->gather_stats);
+                cancel_delayed_work(&priv->request_scan);
+                cancel_delayed_work(&priv->rf_kill);
+                cancel_delayed_work(&priv->scan_check);
+                destroy_workqueue(priv->workqueue);
+                priv->workqueue = NULL;
+        }
+
+        free_irq(pdev->irq, priv);
+        iounmap(priv->hw_base);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+        pci_set_drvdata(pdev, NULL);
+        free_ieee80211(priv->net_dev);
+
+#ifdef CONFIG_PM
+        if (fw_loaded) {
+                release_firmware(bootfw);
+                release_firmware(ucode);
+                release_firmware(firmware);
+                fw_loaded = 0;
+        }
+#endif
+}
+
+#ifdef CONFIG_PM
+static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct ipw_priv *priv = pci_get_drvdata(pdev);
+        struct net_device *dev = priv->net_dev;
+
+        printk(KERN_INFO "%s: Going into suspend...\n", dev->name);
+
+        /* Take down the device; powers it off, etc. */
+        ipw_down(priv);
+
+        /* Remove the PRESENT state of the device */
+        netif_device_detach(dev);
+
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        return 0;
+}
+
+static int ipw_pci_resume(struct pci_dev *pdev)
+{
+        struct ipw_priv *priv = pci_get_drvdata(pdev);
+        struct net_device *dev = priv->net_dev;
+        u32 val;
+
+        printk(KERN_INFO "%s: Coming out of suspend...\n", dev->name);
+
+        pci_set_power_state(pdev, 0);
+        pci_enable_device(pdev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+        pci_restore_state(pdev, priv->pm_state);
+#else
+        pci_restore_state(pdev);
+#endif
+        /*
+         * Suspend/Resume resets the PCI configuration space, so we have to
+         * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries
+         * from interfering with C3 CPU state. pci_restore_state won't help
+         * here since it only restores the first 64 bytes pci config header.
+         */
+        pci_read_config_dword(pdev, 0x40, &val);
+        if ((val & 0x0000ff00) != 0)
+                pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+
+        /* Set the device back into the PRESENT state; this will also wake
+         * the queue of needed */
+        netif_device_attach(dev);
+
+        /* Bring the device back up */
+        queue_work(priv->workqueue, &priv->up);
+
+        return 0;
+}
+#endif
+
+/* driver initialization stuff */
+static struct pci_driver ipw_driver = {
+        .name = DRV_NAME,
+        .id_table = card_ids,
+        .probe = ipw_pci_probe,
+        .remove = __devexit_p(ipw_pci_remove),
+#ifdef CONFIG_PM
+        .suspend = ipw_pci_suspend,
+        .resume = ipw_pci_resume,
+#endif
+};
+
+static int __init ipw_init(void)
+{
+        int ret;
+
+        printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
+
+        ret = pci_module_init(&ipw_driver);
+        if (ret) {
+                IPW_ERROR("Unable to initialize PCI module\n");
+                return ret;
+        }
+
+        ret = driver_create_file(&ipw_driver.driver, &driver_attr_debug_level);
+        if (ret) {
+                IPW_ERROR("Unable to create driver sysfs file\n");
+                pci_unregister_driver(&ipw_driver);
+                return ret;
+        }
+
+        return ret;
+}
+
+static void __exit ipw_exit(void)
+{
+        driver_remove_file(&ipw_driver.driver, &driver_attr_debug_level);
+        pci_unregister_driver(&ipw_driver);
+}
+
+module_param(disable, int, 0444);
+MODULE_PARM_DESC(disable, "manually disable the radio (default 0 [radio on])");
+
+module_param(associate, int, 0444);
+MODULE_PARM_DESC(associate, "auto associate when scanning (default on)");
+
+module_param(auto_create, int, 0444);
+MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");
+
+module_param(debug, int, 0444);
+MODULE_PARM_DESC(debug, "debug output mask");
+
+module_param(channel, int, 0444);
+MODULE_PARM_DESC(channel, "channel to limit associate to (default 0 [ANY])");
+
+module_param(ifname, charp, 0444);
+MODULE_PARM_DESC(ifname, "network device name (default eth%d)");
+
+#ifdef CONFIG_IPW_PROMISC
+module_param(mode, int, 0444);
+MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS,2=Monitor)");
+#else
+module_param(mode, int, 0444);
+MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS)");
+#endif
+
+module_exit(ipw_exit);
+module_init(ipw_init);
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
new file mode 100644
index 000000000000..5b00882133f9
--- /dev/null
+++ b/drivers/net/wireless/ipw2200.h
@@ -0,0 +1,1680 @@
+/******************************************************************************
+
+  Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc., 59
+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+  The full GNU General Public License is included in this distribution in the
+  file called LICENSE.
+
+  Contact Information:
+  James P. Ketrenos <ipw2100-admin@linux.intel.com>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+******************************************************************************/
+
+#ifndef __ipw2200_h__
+#define __ipw2200_h__
+
+#define WEXT_USECHANNELS 1
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/config.h>
+#include <linux/init.h>
+
+#include <linux/version.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/skbuff.h>
+#include <linux/etherdevice.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+#include <linux/dma-mapping.h>
+
+#include <linux/firmware.h>
+#include <linux/wireless.h>
+#include <linux/dma-mapping.h>
+#include <asm/io.h>
+
+#include <net/ieee80211.h>
+
+#define DRV_NAME        "ipw2200"
+
+#include <linux/workqueue.h>
+
+/* Authentication  and Association States */
+enum connection_manager_assoc_states {
+        CMAS_INIT = 0,
+        CMAS_TX_AUTH_SEQ_1,
+        CMAS_RX_AUTH_SEQ_2,
+        CMAS_AUTH_SEQ_1_PASS,
+        CMAS_AUTH_SEQ_1_FAIL,
+        CMAS_TX_AUTH_SEQ_3,
+        CMAS_RX_AUTH_SEQ_4,
+        CMAS_AUTH_SEQ_2_PASS,
+        CMAS_AUTH_SEQ_2_FAIL,
+        CMAS_AUTHENTICATED,
+        CMAS_TX_ASSOC,
+        CMAS_RX_ASSOC_RESP,
+        CMAS_ASSOCIATED,
+        CMAS_LAST
+};
+
+#define IPW_WAIT                     (1<<0)
+#define IPW_QUIET                    (1<<1)
+#define IPW_ROAMING                  (1<<2)
+
+#define IPW_POWER_MODE_CAM           0x00       //(always on)
+#define IPW_POWER_INDEX_1            0x01
+#define IPW_POWER_INDEX_2            0x02
+#define IPW_POWER_INDEX_3            0x03
+#define IPW_POWER_INDEX_4            0x04
+#define IPW_POWER_INDEX_5            0x05
+#define IPW_POWER_AC                 0x06
+#define IPW_POWER_BATTERY            0x07
+#define IPW_POWER_LIMIT              0x07
+#define IPW_POWER_MASK               0x0F
+#define IPW_POWER_ENABLED            0x10
+#define IPW_POWER_LEVEL(x)           ((x) & IPW_POWER_MASK)
+
+#define IPW_CMD_HOST_COMPLETE                 2
+#define IPW_CMD_POWER_DOWN                    4
+#define IPW_CMD_SYSTEM_CONFIG                 6
+#define IPW_CMD_MULTICAST_ADDRESS             7
+#define IPW_CMD_SSID                          8
+#define IPW_CMD_ADAPTER_ADDRESS              11
+#define IPW_CMD_PORT_TYPE                    12
+#define IPW_CMD_RTS_THRESHOLD                15
+#define IPW_CMD_FRAG_THRESHOLD               16
+#define IPW_CMD_POWER_MODE                   17
+#define IPW_CMD_WEP_KEY                      18
+#define IPW_CMD_TGI_TX_KEY                   19
+#define IPW_CMD_SCAN_REQUEST                 20
+#define IPW_CMD_ASSOCIATE                    21
+#define IPW_CMD_SUPPORTED_RATES              22
+#define IPW_CMD_SCAN_ABORT                   23
+#define IPW_CMD_TX_FLUSH                     24
+#define IPW_CMD_QOS_PARAMETERS               25
+#define IPW_CMD_SCAN_REQUEST_EXT             26
+#define IPW_CMD_DINO_CONFIG                  30
+#define IPW_CMD_RSN_CAPABILITIES             31
+#define IPW_CMD_RX_KEY                       32
+#define IPW_CMD_CARD_DISABLE                 33
+#define IPW_CMD_SEED_NUMBER                  34
+#define IPW_CMD_TX_POWER                     35
+#define IPW_CMD_COUNTRY_INFO                 36
+#define IPW_CMD_AIRONET_INFO                 37
+#define IPW_CMD_AP_TX_POWER                  38
+#define IPW_CMD_CCKM_INFO                    39
+#define IPW_CMD_CCX_VER_INFO                 40
+#define IPW_CMD_SET_CALIBRATION              41
+#define IPW_CMD_SENSITIVITY_CALIB            42
+#define IPW_CMD_RETRY_LIMIT                  51
+#define IPW_CMD_IPW_PRE_POWER_DOWN           58
+#define IPW_CMD_VAP_BEACON_TEMPLATE          60
+#define IPW_CMD_VAP_DTIM_PERIOD              61
+#define IPW_CMD_EXT_SUPPORTED_RATES          62
+#define IPW_CMD_VAP_LOCAL_TX_PWR_CONSTRAINT  63
+#define IPW_CMD_VAP_QUIET_INTERVALS          64
+#define IPW_CMD_VAP_CHANNEL_SWITCH           65
+#define IPW_CMD_VAP_MANDATORY_CHANNELS       66
+#define IPW_CMD_VAP_CELL_PWR_LIMIT           67
+#define IPW_CMD_VAP_CF_PARAM_SET             68
+#define IPW_CMD_VAP_SET_BEACONING_STATE      69
+#define IPW_CMD_MEASUREMENT                  80
+#define IPW_CMD_POWER_CAPABILITY             81
+#define IPW_CMD_SUPPORTED_CHANNELS           82
+#define IPW_CMD_TPC_REPORT                   83
+#define IPW_CMD_WME_INFO                     84
+#define IPW_CMD_PRODUCTION_COMMAND           85
+#define IPW_CMD_LINKSYS_EOU_INFO             90
+
+#define RFD_SIZE                              4
+#define NUM_TFD_CHUNKS                        6
+
+#define TX_QUEUE_SIZE                        32
+#define RX_QUEUE_SIZE                        32
+
+#define DINO_CMD_WEP_KEY                   0x08
+#define DINO_CMD_TX                        0x0B
+#define DCT_ANTENNA_A                      0x01
+#define DCT_ANTENNA_B                      0x02
+
+#define IPW_A_MODE                         0
+#define IPW_B_MODE                         1
+#define IPW_G_MODE                         2
+
+/*
+ * TX Queue Flag Definitions
+ */
+
+/* abort attempt if mgmt frame is rx'd */
+#define DCT_FLAG_ABORT_MGMT                0x01
+
+/* require CTS */
+#define DCT_FLAG_CTS_REQUIRED              0x02
+
+/* use short preamble */
+#define DCT_FLAG_SHORT_PREMBL              0x04
+
+/* RTS/CTS first */
+#define DCT_FLAG_RTS_REQD                  0x08
+
+/* dont calculate duration field */
+#define DCT_FLAG_DUR_SET                   0x10
+
+/* even if MAC WEP set (allows pre-encrypt) */
+#define DCT_FLAG_NO_WEP              0x20
+
+/* overwrite TSF field */
+#define DCT_FLAG_TSF_REQD                  0x40
+
+/* ACK rx is expected to follow */
+#define DCT_FLAG_ACK_REQD                  0x80
+
+#define DCT_FLAG_EXT_MODE_CCK  0x01
+#define DCT_FLAG_EXT_MODE_OFDM 0x00
+
+#define TX_RX_TYPE_MASK                    0xFF
+#define TX_FRAME_TYPE                      0x00
+#define TX_HOST_COMMAND_TYPE               0x01
+#define RX_FRAME_TYPE                      0x09
+#define RX_HOST_NOTIFICATION_TYPE          0x03
+#define RX_HOST_CMD_RESPONSE_TYPE          0x04
+#define RX_TX_FRAME_RESPONSE_TYPE          0x05
+#define TFD_NEED_IRQ_MASK                  0x04
+
+#define HOST_CMD_DINO_CONFIG               30
+
+#define HOST_NOTIFICATION_STATUS_ASSOCIATED             10
+#define HOST_NOTIFICATION_STATUS_AUTHENTICATE           11
+#define HOST_NOTIFICATION_STATUS_SCAN_CHANNEL_RESULT    12
+#define HOST_NOTIFICATION_STATUS_SCAN_COMPLETED         13
+#define HOST_NOTIFICATION_STATUS_FRAG_LENGTH            14
+#define HOST_NOTIFICATION_STATUS_LINK_DETERIORATION     15
+#define HOST_NOTIFICATION_DINO_CONFIG_RESPONSE          16
+#define HOST_NOTIFICATION_STATUS_BEACON_STATE           17
+#define HOST_NOTIFICATION_STATUS_TGI_TX_KEY             18
+#define HOST_NOTIFICATION_TX_STATUS                     19
+#define HOST_NOTIFICATION_CALIB_KEEP_RESULTS            20
+#define HOST_NOTIFICATION_MEASUREMENT_STARTED           21
+#define HOST_NOTIFICATION_MEASUREMENT_ENDED             22
+#define HOST_NOTIFICATION_CHANNEL_SWITCHED              23
+#define HOST_NOTIFICATION_RX_DURING_QUIET_PERIOD        24
+#define HOST_NOTIFICATION_NOISE_STATS                   25
+#define HOST_NOTIFICATION_S36_MEASUREMENT_ACCEPTED      30
+#define HOST_NOTIFICATION_S36_MEASUREMENT_REFUSED       31
+
+#define HOST_NOTIFICATION_STATUS_BEACON_MISSING         1
+#define IPW_MB_DISASSOCIATE_THRESHOLD_DEFAULT           24
+#define IPW_MB_ROAMING_THRESHOLD_DEFAULT                8
+#define IPW_REAL_RATE_RX_PACKET_THRESHOLD               300
+
+#define MACADRR_BYTE_LEN                     6
+
+#define DCR_TYPE_AP                       0x01
+#define DCR_TYPE_WLAP                     0x02
+#define DCR_TYPE_MU_ESS                   0x03
+#define DCR_TYPE_MU_IBSS                  0x04
+#define DCR_TYPE_MU_PIBSS                 0x05
+#define DCR_TYPE_SNIFFER                  0x06
+#define DCR_TYPE_MU_BSS        DCR_TYPE_MU_ESS
+
+/**
+ * Generic queue structure
+ *
+ * Contains common data for Rx and Tx queues
+ */
+struct clx2_queue {
+        int n_bd;                      /**< number of BDs in this queue */
+        int first_empty;               /**< 1-st empty entry (index) */
+        int last_used;                 /**< last used entry (index) */
+        u32 reg_w;                   /**< 'write' reg (queue head), addr in domain 1 */
+        u32 reg_r;                   /**< 'read' reg (queue tail), addr in domain 1 */
+        dma_addr_t dma_addr;            /**< physical addr for BD's */
+        int low_mark;                  /**< low watermark, resume queue if free space more than this */
+        int high_mark;                 /**< high watermark, stop queue if free space less than this */
+} __attribute__ ((packed));
+
+struct machdr32 {
+        u16 frame_ctl;
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
+        u8 addr4[MACADRR_BYTE_LEN];
+        u16 qos_ctrl;
+} __attribute__ ((packed));
+
+struct machdr30 {
+        u16 frame_ctl;
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
+        u8 addr4[MACADRR_BYTE_LEN];
+} __attribute__ ((packed));
+
+struct machdr26 {
+        u16 frame_ctl;
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
+        u16 qos_ctrl;
+} __attribute__ ((packed));
+
+struct machdr24 {
+        u16 frame_ctl;
+        u16 duration;           // watch out for endians!
+        u8 addr1[MACADRR_BYTE_LEN];
+        u8 addr2[MACADRR_BYTE_LEN];
+        u8 addr3[MACADRR_BYTE_LEN];
+        u16 seq_ctrl;           // more endians!
+} __attribute__ ((packed));
+
+// TX TFD with 32 byte MAC Header
+struct tx_tfd_32 {
+        struct machdr32 mchdr;  // 32
+        u32 uivplaceholder[2];  // 8
+} __attribute__ ((packed));
+
+// TX TFD with 30 byte MAC Header
+struct tx_tfd_30 {
+        struct machdr30 mchdr;  // 30
+        u8 reserved[2];         // 2
+        u32 uivplaceholder[2];  // 8
+} __attribute__ ((packed));
+
+// tx tfd with 26 byte mac header
+struct tx_tfd_26 {
+        struct machdr26 mchdr;  // 26
+        u8 reserved1[2];        // 2
+        u32 uivplaceholder[2];  // 8
+        u8 reserved2[4];        // 4
+} __attribute__ ((packed));
+
+// tx tfd with 24 byte mac header
+struct tx_tfd_24 {
+        struct machdr24 mchdr;  // 24
+        u32 uivplaceholder[2];  // 8
+        u8 reserved[8];         // 8
+} __attribute__ ((packed));
+
+#define DCT_WEP_KEY_FIELD_LENGTH 16
+
+struct tfd_command {
+        u8 index;
+        u8 length;
+        u16 reserved;
+        u8 payload[0];
+} __attribute__ ((packed));
+
+struct tfd_data {
+        /* Header */
+        u32 work_area_ptr;
+        u8 station_number;      /* 0 for BSS */
+        u8 reserved1;
+        u16 reserved2;
+
+        /* Tx Parameters */
+        u8 cmd_id;
+        u8 seq_num;
+        u16 len;
+        u8 priority;
+        u8 tx_flags;
+        u8 tx_flags_ext;
+        u8 key_index;
+        u8 wepkey[DCT_WEP_KEY_FIELD_LENGTH];
+        u8 rate;
+        u8 antenna;
+        u16 next_packet_duration;
+        u16 next_frag_len;
+        u16 back_off_counter;   //////txop;
+        u8 retrylimit;
+        u16 cwcurrent;
+        u8 reserved3;
+
+        /* 802.11 MAC Header */
+        union {
+                struct tx_tfd_24 tfd_24;
+                struct tx_tfd_26 tfd_26;
+                struct tx_tfd_30 tfd_30;
+                struct tx_tfd_32 tfd_32;
+        } tfd;
+
+        /* Payload DMA info */
+        u32 num_chunks;
+        u32 chunk_ptr[NUM_TFD_CHUNKS];
+        u16 chunk_len[NUM_TFD_CHUNKS];
+} __attribute__ ((packed));
+
+struct txrx_control_flags {
+        u8 message_type;
+        u8 rx_seq_num;
+        u8 control_bits;
+        u8 reserved;
+} __attribute__ ((packed));
+
+#define  TFD_SIZE                           128
+#define  TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH   (TFD_SIZE - sizeof(struct txrx_control_flags))
+
+struct tfd_frame {
+        struct txrx_control_flags control_flags;
+        union {
+                struct tfd_data data;
+                struct tfd_command cmd;
+                u8 raw[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
+        } u;
+} __attribute__ ((packed));
+
+typedef void destructor_func(const void *);
+
+/**
+ * Tx Queue for DMA. Queue consists of circular buffer of
+ * BD's and required locking structures.
+ */
+struct clx2_tx_queue {
+        struct clx2_queue q;
+        struct tfd_frame *bd;
+        struct ieee80211_txb **txb;
+};
+
+/*
+ * RX related structures and functions
+ */
+#define RX_FREE_BUFFERS 32
+#define RX_LOW_WATERMARK 8
+
+#define SUP_RATE_11A_MAX_NUM_CHANNELS  (8)
+#define SUP_RATE_11B_MAX_NUM_CHANNELS  (4)
+#define SUP_RATE_11G_MAX_NUM_CHANNELS  (12)
+
+// Used for passing to driver number of successes and failures per rate
+struct rate_histogram {
+        union {
+                u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+                u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+                u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+        } success;
+        union {
+                u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
+                u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
+                u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
+        } failed;
+} __attribute__ ((packed));
+
+/* statistics command response */
+struct ipw_cmd_stats {
+        u8 cmd_id;
+        u8 seq_num;
+        u16 good_sfd;
+        u16 bad_plcp;
+        u16 wrong_bssid;
+        u16 valid_mpdu;
+        u16 bad_mac_header;
+        u16 reserved_frame_types;
+        u16 rx_ina;
+        u16 bad_crc32;
+        u16 invalid_cts;
+        u16 invalid_acks;
+        u16 long_distance_ina_fina;
+        u16 dsp_silence_unreachable;
+        u16 accumulated_rssi;
+        u16 rx_ovfl_frame_tossed;
+        u16 rssi_silence_threshold;
+        u16 rx_ovfl_frame_supplied;
+        u16 last_rx_frame_signal;
+        u16 last_rx_frame_noise;
+        u16 rx_autodetec_no_ofdm;
+        u16 rx_autodetec_no_barker;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct notif_channel_result {
+        u8 channel_num;
+        struct ipw_cmd_stats stats;
+        u8 uReserved;
+} __attribute__ ((packed));
+
+struct notif_scan_complete {
+        u8 scan_type;
+        u8 num_channels;
+        u8 status;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct notif_frag_length {
+        u16 frag_length;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct notif_beacon_state {
+        u32 state;
+        u32 number;
+} __attribute__ ((packed));
+
+struct notif_tgi_tx_key {
+        u8 key_state;
+        u8 security_type;
+        u8 station_index;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct notif_link_deterioration {
+        struct ipw_cmd_stats stats;
+        u8 rate;
+        u8 modulation;
+        struct rate_histogram histogram;
+        u8 reserved1;
+        u16 reserved2;
+} __attribute__ ((packed));
+
+struct notif_association {
+        u8 state;
+} __attribute__ ((packed));
+
+struct notif_authenticate {
+        u8 state;
+        struct machdr24 addr;
+        u16 status;
+} __attribute__ ((packed));
+
+struct notif_calibration {
+        u8 data[104];
+} __attribute__ ((packed));
+
+struct notif_noise {
+        u32 value;
+} __attribute__ ((packed));
+
+struct ipw_rx_notification {
+        u8 reserved[8];
+        u8 subtype;
+        u8 flags;
+        u16 size;
+        union {
+                struct notif_association assoc;
+                struct notif_authenticate auth;
+                struct notif_channel_result channel_result;
+                struct notif_scan_complete scan_complete;
+                struct notif_frag_length frag_len;
+                struct notif_beacon_state beacon_state;
+                struct notif_tgi_tx_key tgi_tx_key;
+                struct notif_link_deterioration link_deterioration;
+                struct notif_calibration calibration;
+                struct notif_noise noise;
+                u8 raw[0];
+        } u;
+} __attribute__ ((packed));
+
+struct ipw_rx_frame {
+        u32 reserved1;
+        u8 parent_tsf[4];       // fw_use[0] is boolean for OUR_TSF_IS_GREATER
+        u8 received_channel;    // The channel that this frame was received on.
+        // Note that for .11b this does not have to be
+        // the same as the channel that it was sent.
+        // Filled by LMAC
+        u8 frameStatus;
+        u8 rate;
+        u8 rssi;
+        u8 agc;
+        u8 rssi_dbm;
+        u16 signal;
+        u16 noise;
+        u8 antennaAndPhy;
+        u8 control;             // control bit should be on in bg
+        u8 rtscts_rate;         // rate of rts or cts (in rts cts sequence rate
+        // is identical)
+        u8 rtscts_seen;         // 0x1 RTS seen ; 0x2 CTS seen
+        u16 length;
+        u8 data[0];
+} __attribute__ ((packed));
+
+struct ipw_rx_header {
+        u8 message_type;
+        u8 rx_seq_num;
+        u8 control_bits;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct ipw_rx_packet {
+        struct ipw_rx_header header;
+        union {
+                struct ipw_rx_frame frame;
+                struct ipw_rx_notification notification;
+        } u;
+} __attribute__ ((packed));
+
+#define IPW_RX_NOTIFICATION_SIZE sizeof(struct ipw_rx_header) + 12
+#define IPW_RX_FRAME_SIZE        sizeof(struct ipw_rx_header) + \
+                                 sizeof(struct ipw_rx_frame)
+
+struct ipw_rx_mem_buffer {
+        dma_addr_t dma_addr;
+        struct ipw_rx_buffer *rxb;
+        struct sk_buff *skb;
+        struct list_head list;
+};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
+
+struct ipw_rx_queue {
+        struct ipw_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
+        struct ipw_rx_mem_buffer *queue[RX_QUEUE_SIZE];
+        u32 processed;          /* Internal index to last handled Rx packet */
+        u32 read;               /* Shared index to newest available Rx buffer */
+        u32 write;              /* Shared index to oldest written Rx packet */
+        u32 free_count;         /* Number of pre-allocated buffers in rx_free */
+        /* Each of these lists is used as a FIFO for ipw_rx_mem_buffers */
+        struct list_head rx_free;       /* Own an SKBs */
+        struct list_head rx_used;       /* No SKB allocated */
+        spinlock_t lock;
+};                              /* Not transferred over network, so not  __attribute__ ((packed)) */
+
+struct alive_command_responce {
+        u8 alive_command;
+        u8 sequence_number;
+        u16 software_revision;
+        u8 device_identifier;
+        u8 reserved1[5];
+        u16 reserved2;
+        u16 reserved3;
+        u16 clock_settle_time;
+        u16 powerup_settle_time;
+        u16 reserved4;
+        u8 time_stamp[5];       /* month, day, year, hours, minutes */
+        u8 ucode_valid;
+} __attribute__ ((packed));
+
+#define IPW_MAX_RATES 12
+
+struct ipw_rates {
+        u8 num_rates;
+        u8 rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct command_block {
+        unsigned int control;
+        u32 source_addr;
+        u32 dest_addr;
+        unsigned int status;
+} __attribute__ ((packed));
+
+#define CB_NUMBER_OF_ELEMENTS_SMALL 64
+struct fw_image_desc {
+        unsigned long last_cb_index;
+        unsigned long current_cb_index;
+        struct command_block cb_list[CB_NUMBER_OF_ELEMENTS_SMALL];
+        void *v_addr;
+        unsigned long p_addr;
+        unsigned long len;
+};
+
+struct ipw_sys_config {
+        u8 bt_coexistence;
+        u8 reserved1;
+        u8 answer_broadcast_ssid_probe;
+        u8 accept_all_data_frames;
+        u8 accept_non_directed_frames;
+        u8 exclude_unicast_unencrypted;
+        u8 disable_unicast_decryption;
+        u8 exclude_multicast_unencrypted;
+        u8 disable_multicast_decryption;
+        u8 antenna_diversity;
+        u8 pass_crc_to_host;
+        u8 dot11g_auto_detection;
+        u8 enable_cts_to_self;
+        u8 enable_multicast_filtering;
+        u8 bt_coexist_collision_thr;
+        u8 reserved2;
+        u8 accept_all_mgmt_bcpr;
+        u8 accept_all_mgtm_frames;
+        u8 pass_noise_stats_to_host;
+        u8 reserved3;
+} __attribute__ ((packed));
+
+struct ipw_multicast_addr {
+        u8 num_of_multicast_addresses;
+        u8 reserved[3];
+        u8 mac1[6];
+        u8 mac2[6];
+        u8 mac3[6];
+        u8 mac4[6];
+} __attribute__ ((packed));
+
+struct ipw_wep_key {
+        u8 cmd_id;
+        u8 seq_num;
+        u8 key_index;
+        u8 key_size;
+        u8 key[16];
+} __attribute__ ((packed));
+
+struct ipw_tgi_tx_key {
+        u8 key_id;
+        u8 security_type;
+        u8 station_index;
+        u8 flags;
+        u8 key[16];
+        u32 tx_counter[2];
+} __attribute__ ((packed));
+
+#define IPW_SCAN_CHANNELS 54
+
+struct ipw_scan_request {
+        u8 scan_type;
+        u16 dwell_time;
+        u8 channels_list[IPW_SCAN_CHANNELS];
+        u8 channels_reserved[3];
+} __attribute__ ((packed));
+
+enum {
+        IPW_SCAN_PASSIVE_TILL_FIRST_BEACON_SCAN = 0,
+        IPW_SCAN_PASSIVE_FULL_DWELL_SCAN,
+        IPW_SCAN_ACTIVE_DIRECT_SCAN,
+        IPW_SCAN_ACTIVE_BROADCAST_SCAN,
+        IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN,
+        IPW_SCAN_TYPES
+};
+
+struct ipw_scan_request_ext {
+        u32 full_scan_index;
+        u8 channels_list[IPW_SCAN_CHANNELS];
+        u8 scan_type[IPW_SCAN_CHANNELS / 2];
+        u8 reserved;
+        u16 dwell_time[IPW_SCAN_TYPES];
+} __attribute__ ((packed));
+
+extern inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index)
+{
+        if (index % 2)
+                return scan->scan_type[index / 2] & 0x0F;
+        else
+                return (scan->scan_type[index / 2] & 0xF0) >> 4;
+}
+
+extern inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan,
+                                     u8 index, u8 scan_type)
+{
+        if (index % 2)
+                scan->scan_type[index / 2] =
+                    (scan->scan_type[index / 2] & 0xF0) | (scan_type & 0x0F);
+        else
+                scan->scan_type[index / 2] =
+                    (scan->scan_type[index / 2] & 0x0F) |
+                    ((scan_type & 0x0F) << 4);
+}
+
+struct ipw_associate {
+        u8 channel;
+        u8 auth_type:4, auth_key:4;
+        u8 assoc_type;
+        u8 reserved;
+        u16 policy_support;
+        u8 preamble_length;
+        u8 ieee_mode;
+        u8 bssid[ETH_ALEN];
+        u32 assoc_tsf_msw;
+        u32 assoc_tsf_lsw;
+        u16 capability;
+        u16 listen_interval;
+        u16 beacon_interval;
+        u8 dest[ETH_ALEN];
+        u16 atim_window;
+        u8 smr;
+        u8 reserved1;
+        u16 reserved2;
+} __attribute__ ((packed));
+
+struct ipw_supported_rates {
+        u8 ieee_mode;
+        u8 num_rates;
+        u8 purpose;
+        u8 reserved;
+        u8 supported_rates[IPW_MAX_RATES];
+} __attribute__ ((packed));
+
+struct ipw_rts_threshold {
+        u16 rts_threshold;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_frag_threshold {
+        u16 frag_threshold;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_retry_limit {
+        u8 short_retry_limit;
+        u8 long_retry_limit;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_dino_config {
+        u32 dino_config_addr;
+        u16 dino_config_size;
+        u8 dino_response;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct ipw_aironet_info {
+        u8 id;
+        u8 length;
+        u16 reserved;
+} __attribute__ ((packed));
+
+struct ipw_rx_key {
+        u8 station_index;
+        u8 key_type;
+        u8 key_id;
+        u8 key_flag;
+        u8 key[16];
+        u8 station_address[6];
+        u8 key_index;
+        u8 reserved;
+} __attribute__ ((packed));
+
+struct ipw_country_channel_info {
+        u8 first_channel;
+        u8 no_channels;
+        s8 max_tx_power;
+} __attribute__ ((packed));
+
+struct ipw_country_info {
+        u8 id;
+        u8 length;
+        u8 country_str[3];
+        struct ipw_country_channel_info groups[7];
+} __attribute__ ((packed));
+
+struct ipw_channel_tx_power {
+        u8 channel_number;
+        s8 tx_power;
+} __attribute__ ((packed));
+
+#define SCAN_ASSOCIATED_INTERVAL (HZ)
+#define SCAN_INTERVAL (HZ / 10)
+#define MAX_A_CHANNELS  37
+#define MAX_B_CHANNELS  14
+
+struct ipw_tx_power {
+        u8 num_channels;
+        u8 ieee_mode;
+        struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
+} __attribute__ ((packed));
+
+struct ipw_qos_parameters {
+        u16 cw_min[4];
+        u16 cw_max[4];
+        u8 aifs[4];
+        u8 flag[4];
+        u16 tx_op_limit[4];
+} __attribute__ ((packed));
+
+struct ipw_rsn_capabilities {
+        u8 id;
+        u8 length;
+        u16 version;
+} __attribute__ ((packed));
+
+struct ipw_sensitivity_calib {
+        u16 beacon_rssi_raw;
+        u16 reserved;
+} __attribute__ ((packed));
+
+/**
+ * Host command structure.
+ *
+ * On input, the following fields should be filled:
+ * - cmd
+ * - len
+ * - status_len
+ * - param (if needed)
+ *
+ * On output,
+ * - \a status contains status;
+ * - \a param filled with status parameters.
+ */
+struct ipw_cmd {
+        u32 cmd;   /**< Host command */
+        u32 status;/**< Status */
+        u32 status_len;
+                   /**< How many 32 bit parameters in the status */
+        u32 len;   /**< incoming parameters length, bytes */
+  /**
+   * command parameters.
+   * There should be enough space for incoming and
+   * outcoming parameters.
+   * Incoming parameters listed 1-st, followed by outcoming params.
+   * nParams=(len+3)/4+status_len
+   */
+        u32 param[0];
+} __attribute__ ((packed));
+
+#define STATUS_HCMD_ACTIVE      (1<<0)  /**< host command in progress */
+
+#define STATUS_INT_ENABLED      (1<<1)
+#define STATUS_RF_KILL_HW       (1<<2)
+#define STATUS_RF_KILL_SW       (1<<3)
+#define STATUS_RF_KILL_MASK     (STATUS_RF_KILL_HW | STATUS_RF_KILL_SW)
+
+#define STATUS_INIT             (1<<5)
+#define STATUS_AUTH             (1<<6)
+#define STATUS_ASSOCIATED       (1<<7)
+#define STATUS_STATE_MASK       (STATUS_INIT | STATUS_AUTH | STATUS_ASSOCIATED)
+
+#define STATUS_ASSOCIATING      (1<<8)
+#define STATUS_DISASSOCIATING   (1<<9)
+#define STATUS_ROAMING          (1<<10)
+#define STATUS_EXIT_PENDING     (1<<11)
+#define STATUS_DISASSOC_PENDING (1<<12)
+#define STATUS_STATE_PENDING    (1<<13)
+
+#define STATUS_SCAN_PENDING     (1<<20)
+#define STATUS_SCANNING         (1<<21)
+#define STATUS_SCAN_ABORTING    (1<<22)
+
+#define STATUS_INDIRECT_BYTE    (1<<28) /* sysfs entry configured for access */
+#define STATUS_INDIRECT_DWORD   (1<<29) /* sysfs entry configured for access */
+#define STATUS_DIRECT_DWORD     (1<<30) /* sysfs entry configured for access */
+
+#define STATUS_SECURITY_UPDATED (1<<31) /* Security sync needed */
+
+#define CFG_STATIC_CHANNEL      (1<<0)  /* Restrict assoc. to single channel */
+#define CFG_STATIC_ESSID        (1<<1)  /* Restrict assoc. to single SSID */
+#define CFG_STATIC_BSSID        (1<<2)  /* Restrict assoc. to single BSSID */
+#define CFG_CUSTOM_MAC          (1<<3)
+#define CFG_PREAMBLE            (1<<4)
+#define CFG_ADHOC_PERSIST       (1<<5)
+#define CFG_ASSOCIATE           (1<<6)
+#define CFG_FIXED_RATE          (1<<7)
+#define CFG_ADHOC_CREATE        (1<<8)
+
+#define CAP_SHARED_KEY          (1<<0)  /* Off = OPEN */
+#define CAP_PRIVACY_ON          (1<<1)  /* Off = No privacy */
+
+#define MAX_STATIONS            32
+#define IPW_INVALID_STATION     (0xff)
+
+struct ipw_station_entry {
+        u8 mac_addr[ETH_ALEN];
+        u8 reserved;
+        u8 support_mode;
+};
+
+#define AVG_ENTRIES 8
+struct average {
+        s16 entries[AVG_ENTRIES];
+        u8 pos;
+        u8 init;
+        s32 sum;
+};
+
+struct ipw_priv {
+        /* ieee device used by generic ieee processing code */
+        struct ieee80211_device *ieee;
+        struct ieee80211_security sec;
+
+        /* spinlock */
+        spinlock_t lock;
+
+        /* basic pci-network driver stuff */
+        struct pci_dev *pci_dev;
+        struct net_device *net_dev;
+
+        /* pci hardware address support */
+        void __iomem *hw_base;
+        unsigned long hw_len;
+
+        struct fw_image_desc sram_desc;
+
+        /* result of ucode download */
+        struct alive_command_responce dino_alive;
+
+        wait_queue_head_t wait_command_queue;
+        wait_queue_head_t wait_state;
+
+        /* Rx and Tx DMA processing queues */
+        struct ipw_rx_queue *rxq;
+        struct clx2_tx_queue txq_cmd;
+        struct clx2_tx_queue txq[4];
+        u32 status;
+        u32 config;
+        u32 capability;
+
+        u8 last_rx_rssi;
+        u8 last_noise;
+        struct average average_missed_beacons;
+        struct average average_rssi;
+        struct average average_noise;
+        u32 port_type;
+        int rx_bufs_min;          /**< minimum number of bufs in Rx queue */
+        int rx_pend_max;          /**< maximum pending buffers for one IRQ */
+        u32 hcmd_seq;             /**< sequence number for hcmd */
+        u32 missed_beacon_threshold;
+        u32 roaming_threshold;
+
+        struct ipw_associate assoc_request;
+        struct ieee80211_network *assoc_network;
+
+        unsigned long ts_scan_abort;
+        struct ipw_supported_rates rates;
+        struct ipw_rates phy[3];           /**< PHY restrictions, per band */
+        struct ipw_rates supp;             /**< software defined */
+        struct ipw_rates extended;         /**< use for corresp. IE, AP only */
+
+        struct notif_link_deterioration last_link_deterioration; /** for statistics */
+        struct ipw_cmd *hcmd; /**< host command currently executed */
+
+        wait_queue_head_t hcmd_wq;     /**< host command waits for execution */
+        u32 tsf_bcn[2];              /**< TSF from latest beacon */
+
+        struct notif_calibration calib; /**< last calibration */
+
+        /* ordinal interface with firmware */
+        u32 table0_addr;
+        u32 table0_len;
+        u32 table1_addr;
+        u32 table1_len;
+        u32 table2_addr;
+        u32 table2_len;
+
+        /* context information */
+        u8 essid[IW_ESSID_MAX_SIZE];
+        u8 essid_len;
+        u8 nick[IW_ESSID_MAX_SIZE];
+        u16 rates_mask;
+        u8 channel;
+        struct ipw_sys_config sys_config;
+        u32 power_mode;
+        u8 bssid[ETH_ALEN];
+        u16 rts_threshold;
+        u8 mac_addr[ETH_ALEN];
+        u8 num_stations;
+        u8 stations[MAX_STATIONS][ETH_ALEN];
+
+        u32 notif_missed_beacons;
+
+        /* Statistics and counters normalized with each association */
+        u32 last_missed_beacons;
+        u32 last_tx_packets;
+        u32 last_rx_packets;
+        u32 last_tx_failures;
+        u32 last_rx_err;
+        u32 last_rate;
+
+        u32 missed_adhoc_beacons;
+        u32 missed_beacons;
+        u32 rx_packets;
+        u32 tx_packets;
+        u32 quality;
+
+        /* eeprom */
+        u8 eeprom[0x100];       /* 256 bytes of eeprom */
+        int eeprom_delay;
+
+        struct iw_statistics wstats;
+
+        struct workqueue_struct *workqueue;
+
+        struct work_struct adhoc_check;
+        struct work_struct associate;
+        struct work_struct disassociate;
+        struct work_struct rx_replenish;
+        struct work_struct request_scan;
+        struct work_struct adapter_restart;
+        struct work_struct rf_kill;
+        struct work_struct up;
+        struct work_struct down;
+        struct work_struct gather_stats;
+        struct work_struct abort_scan;
+        struct work_struct roam;
+        struct work_struct scan_check;
+
+        struct tasklet_struct irq_tasklet;
+
+#define IPW_2200BG  1
+#define IPW_2915ABG 2
+        u8 adapter;
+
+#define IPW_DEFAULT_TX_POWER 0x14
+        u8 tx_power;
+
+#ifdef CONFIG_PM
+        u32 pm_state[16];
+#endif
+
+        /* network state */
+
+        /* Used to pass the current INTA value from ISR to Tasklet */
+        u32 isr_inta;
+
+        /* debugging info */
+        u32 indirect_dword;
+        u32 direct_dword;
+        u32 indirect_byte;
+};                              /*ipw_priv */
+
+/* debug macros */
+
+#ifdef CONFIG_IPW_DEBUG
+#define IPW_DEBUG(level, fmt, args...) \
+do { if (ipw_debug_level & (level)) \
+  printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \
+         in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
+#else
+#define IPW_DEBUG(level, fmt, args...) do {} while (0)
+#endif                          /* CONFIG_IPW_DEBUG */
+
+/*
+ * To use the debug system;
+ *
+ * If you are defining a new debug classification, simply add it to the #define
+ * list here in the form of:
+ *
+ * #define IPW_DL_xxxx VALUE
+ *
+ * shifting value to the left one bit from the previous entry.  xxxx should be
+ * the name of the classification (for example, WEP)
+ *
+ * You then need to either add a IPW_xxxx_DEBUG() macro definition for your
+ * classification, or use IPW_DEBUG(IPW_DL_xxxx, ...) whenever you want
+ * to send output to that classification.
+ *
+ * To add your debug level to the list of levels seen when you perform
+ *
+ * % cat /proc/net/ipw/debug_level
+ *
+ * you simply need to add your entry to the ipw_debug_levels array.
+ *
+ * If you do not see debug_level in /proc/net/ipw then you do not have
+ * CONFIG_IPW_DEBUG defined in your kernel configuration
+ *
+ */
+
+#define IPW_DL_ERROR         (1<<0)
+#define IPW_DL_WARNING       (1<<1)
+#define IPW_DL_INFO          (1<<2)
+#define IPW_DL_WX            (1<<3)
+#define IPW_DL_HOST_COMMAND  (1<<5)
+#define IPW_DL_STATE         (1<<6)
+
+#define IPW_DL_NOTIF         (1<<10)
+#define IPW_DL_SCAN          (1<<11)
+#define IPW_DL_ASSOC         (1<<12)
+#define IPW_DL_DROP          (1<<13)
+#define IPW_DL_IOCTL         (1<<14)
+
+#define IPW_DL_MANAGE        (1<<15)
+#define IPW_DL_FW            (1<<16)
+#define IPW_DL_RF_KILL       (1<<17)
+#define IPW_DL_FW_ERRORS     (1<<18)
+
+#define IPW_DL_ORD           (1<<20)
+
+#define IPW_DL_FRAG          (1<<21)
+#define IPW_DL_WEP           (1<<22)
+#define IPW_DL_TX            (1<<23)
+#define IPW_DL_RX            (1<<24)
+#define IPW_DL_ISR           (1<<25)
+#define IPW_DL_FW_INFO       (1<<26)
+#define IPW_DL_IO            (1<<27)
+#define IPW_DL_TRACE         (1<<28)
+
+#define IPW_DL_STATS         (1<<29)
+
+#define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
+#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
+#define IPW_DEBUG_INFO(f, a...)    IPW_DEBUG(IPW_DL_INFO, f, ## a)
+
+#define IPW_DEBUG_WX(f, a...)     IPW_DEBUG(IPW_DL_WX, f, ## a)
+#define IPW_DEBUG_SCAN(f, a...)   IPW_DEBUG(IPW_DL_SCAN, f, ## a)
+#define IPW_DEBUG_STATUS(f, a...) IPW_DEBUG(IPW_DL_STATUS, f, ## a)
+#define IPW_DEBUG_TRACE(f, a...)  IPW_DEBUG(IPW_DL_TRACE, f, ## a)
+#define IPW_DEBUG_RX(f, a...)     IPW_DEBUG(IPW_DL_RX, f, ## a)
+#define IPW_DEBUG_TX(f, a...)     IPW_DEBUG(IPW_DL_TX, f, ## a)
+#define IPW_DEBUG_ISR(f, a...)    IPW_DEBUG(IPW_DL_ISR, f, ## a)
+#define IPW_DEBUG_MANAGEMENT(f, a...) IPW_DEBUG(IPW_DL_MANAGE, f, ## a)
+#define IPW_DEBUG_WEP(f, a...)    IPW_DEBUG(IPW_DL_WEP, f, ## a)
+#define IPW_DEBUG_HC(f, a...) IPW_DEBUG(IPW_DL_HOST_COMMAND, f, ## a)
+#define IPW_DEBUG_FRAG(f, a...) IPW_DEBUG(IPW_DL_FRAG, f, ## a)
+#define IPW_DEBUG_FW(f, a...) IPW_DEBUG(IPW_DL_FW, f, ## a)
+#define IPW_DEBUG_RF_KILL(f, a...) IPW_DEBUG(IPW_DL_RF_KILL, f, ## a)
+#define IPW_DEBUG_DROP(f, a...) IPW_DEBUG(IPW_DL_DROP, f, ## a)
+#define IPW_DEBUG_IO(f, a...) IPW_DEBUG(IPW_DL_IO, f, ## a)
+#define IPW_DEBUG_ORD(f, a...) IPW_DEBUG(IPW_DL_ORD, f, ## a)
+#define IPW_DEBUG_FW_INFO(f, a...) IPW_DEBUG(IPW_DL_FW_INFO, f, ## a)
+#define IPW_DEBUG_NOTIF(f, a...) IPW_DEBUG(IPW_DL_NOTIF, f, ## a)
+#define IPW_DEBUG_STATE(f, a...) IPW_DEBUG(IPW_DL_STATE | IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+#define IPW_DEBUG_ASSOC(f, a...) IPW_DEBUG(IPW_DL_ASSOC | IPW_DL_INFO, f, ## a)
+#define IPW_DEBUG_STATS(f, a...) IPW_DEBUG(IPW_DL_STATS, f, ## a)
+
+#include <linux/ctype.h>
+
+/*
+* Register bit definitions
+*/
+
+/* Dino control registers bits */
+
+#define DINO_ENABLE_SYSTEM 0x80
+#define DINO_ENABLE_CS     0x40
+#define DINO_RXFIFO_DATA   0x01
+#define DINO_CONTROL_REG   0x00200000
+
+#define CX2_INTA_RW       0x00000008
+#define CX2_INTA_MASK_R   0x0000000C
+#define CX2_INDIRECT_ADDR 0x00000010
+#define CX2_INDIRECT_DATA 0x00000014
+#define CX2_AUTOINC_ADDR  0x00000018
+#define CX2_AUTOINC_DATA  0x0000001C
+#define CX2_RESET_REG     0x00000020
+#define CX2_GP_CNTRL_RW   0x00000024
+
+#define CX2_READ_INT_REGISTER 0xFF4
+
+#define CX2_GP_CNTRL_BIT_INIT_DONE      0x00000004
+
+#define CX2_REGISTER_DOMAIN1_END        0x00001000
+#define CX2_SRAM_READ_INT_REGISTER      0x00000ff4
+
+#define CX2_SHARED_LOWER_BOUND          0x00000200
+#define CX2_INTERRUPT_AREA_LOWER_BOUND  0x00000f80
+
+#define CX2_NIC_SRAM_LOWER_BOUND        0x00000000
+#define CX2_NIC_SRAM_UPPER_BOUND        0x00030000
+
+#define CX2_BIT_INT_HOST_SRAM_READ_INT_REGISTER (1 << 29)
+#define CX2_GP_CNTRL_BIT_CLOCK_READY    0x00000001
+#define CX2_GP_CNTRL_BIT_HOST_ALLOWS_STANDBY 0x00000002
+
+/*
+ * RESET Register Bit Indexes
+ */
+#define CBD_RESET_REG_PRINCETON_RESET 0x00000001        /* Bit 0 (LSB) */
+#define CX2_RESET_REG_SW_RESET        0x00000080        /* Bit 7       */
+#define CX2_RESET_REG_MASTER_DISABLED 0x00000100        /* Bit 8       */
+#define CX2_RESET_REG_STOP_MASTER     0x00000200        /* Bit 9       */
+#define CX2_ARC_KESHET_CONFIG         0x08000000        /* Bit 27      */
+#define CX2_START_STANDBY             0x00000004        /* Bit 2       */
+
+#define CX2_CSR_CIS_UPPER_BOUND 0x00000200
+#define CX2_DOMAIN_0_END 0x1000
+#define CLX_MEM_BAR_SIZE 0x1000
+
+#define CX2_BASEBAND_CONTROL_STATUS     0X00200000
+#define CX2_BASEBAND_TX_FIFO_WRITE      0X00200004
+#define CX2_BASEBAND_RX_FIFO_READ       0X00200004
+#define CX2_BASEBAND_CONTROL_STORE      0X00200010
+
+#define CX2_INTERNAL_CMD_EVENT  0X00300004
+#define CX2_BASEBAND_POWER_DOWN 0x00000001
+
+#define CX2_MEM_HALT_AND_RESET  0x003000e0
+
+/* defgroup bits_halt_reset MEM_HALT_AND_RESET register bits */
+#define CX2_BIT_HALT_RESET_ON   0x80000000
+#define CX2_BIT_HALT_RESET_OFF  0x00000000
+
+#define CB_LAST_VALID     0x20000000
+#define CB_INT_ENABLED    0x40000000
+#define CB_VALID          0x80000000
+#define CB_SRC_LE         0x08000000
+#define CB_DEST_LE        0x04000000
+#define CB_SRC_AUTOINC    0x00800000
+#define CB_SRC_IO_GATED   0x00400000
+#define CB_DEST_AUTOINC   0x00080000
+#define CB_SRC_SIZE_LONG  0x00200000
+#define CB_DEST_SIZE_LONG 0x00020000
+
+/* DMA DEFINES */
+
+#define DMA_CONTROL_SMALL_CB_CONST_VALUE 0x00540000
+#define DMA_CB_STOP_AND_ABORT            0x00000C00
+#define DMA_CB_START                     0x00000100
+
+#define CX2_SHARED_SRAM_SIZE               0x00030000
+#define CX2_SHARED_SRAM_DMA_CONTROL        0x00027000
+#define CB_MAX_LENGTH                      0x1FFF
+
+#define CX2_HOST_EEPROM_DATA_SRAM_SIZE 0xA18
+#define CX2_EEPROM_IMAGE_SIZE          0x100
+
+/* DMA defs */
+#define CX2_DMA_I_CURRENT_CB  0x003000D0
+#define CX2_DMA_O_CURRENT_CB  0x003000D4
+#define CX2_DMA_I_DMA_CONTROL 0x003000A4
+#define CX2_DMA_I_CB_BASE     0x003000A0
+
+#define CX2_TX_CMD_QUEUE_BD_BASE        (0x00000200)
+#define CX2_TX_CMD_QUEUE_BD_SIZE        (0x00000204)
+#define CX2_TX_QUEUE_0_BD_BASE          (0x00000208)
+#define CX2_TX_QUEUE_0_BD_SIZE          (0x0000020C)
+#define CX2_TX_QUEUE_1_BD_BASE          (0x00000210)
+#define CX2_TX_QUEUE_1_BD_SIZE          (0x00000214)
+#define CX2_TX_QUEUE_2_BD_BASE          (0x00000218)
+#define CX2_TX_QUEUE_2_BD_SIZE          (0x0000021C)
+#define CX2_TX_QUEUE_3_BD_BASE          (0x00000220)
+#define CX2_TX_QUEUE_3_BD_SIZE          (0x00000224)
+#define CX2_RX_BD_BASE                  (0x00000240)
+#define CX2_RX_BD_SIZE                  (0x00000244)
+#define CX2_RFDS_TABLE_LOWER            (0x00000500)
+
+#define CX2_TX_CMD_QUEUE_READ_INDEX     (0x00000280)
+#define CX2_TX_QUEUE_0_READ_INDEX       (0x00000284)
+#define CX2_TX_QUEUE_1_READ_INDEX       (0x00000288)
+#define CX2_TX_QUEUE_2_READ_INDEX       (0x0000028C)
+#define CX2_TX_QUEUE_3_READ_INDEX       (0x00000290)
+#define CX2_RX_READ_INDEX               (0x000002A0)
+
+#define CX2_TX_CMD_QUEUE_WRITE_INDEX    (0x00000F80)
+#define CX2_TX_QUEUE_0_WRITE_INDEX      (0x00000F84)
+#define CX2_TX_QUEUE_1_WRITE_INDEX      (0x00000F88)
+#define CX2_TX_QUEUE_2_WRITE_INDEX      (0x00000F8C)
+#define CX2_TX_QUEUE_3_WRITE_INDEX      (0x00000F90)
+#define CX2_RX_WRITE_INDEX              (0x00000FA0)
+
+/*
+ * EEPROM Related Definitions
+ */
+
+#define IPW_EEPROM_DATA_SRAM_ADDRESS (CX2_SHARED_LOWER_BOUND + 0x814)
+#define IPW_EEPROM_DATA_SRAM_SIZE    (CX2_SHARED_LOWER_BOUND + 0x818)
+#define IPW_EEPROM_LOAD_DISABLE      (CX2_SHARED_LOWER_BOUND + 0x81C)
+#define IPW_EEPROM_DATA              (CX2_SHARED_LOWER_BOUND + 0x820)
+#define IPW_EEPROM_UPPER_ADDRESS     (CX2_SHARED_LOWER_BOUND + 0x9E0)
+
+#define IPW_STATION_TABLE_LOWER      (CX2_SHARED_LOWER_BOUND + 0xA0C)
+#define IPW_STATION_TABLE_UPPER      (CX2_SHARED_LOWER_BOUND + 0xB0C)
+#define IPW_REQUEST_ATIM             (CX2_SHARED_LOWER_BOUND + 0xB0C)
+#define IPW_ATIM_SENT                (CX2_SHARED_LOWER_BOUND + 0xB10)
+#define IPW_WHO_IS_AWAKE             (CX2_SHARED_LOWER_BOUND + 0xB14)
+#define IPW_DURING_ATIM_WINDOW       (CX2_SHARED_LOWER_BOUND + 0xB18)
+
+#define MSB                             1
+#define LSB                             0
+#define WORD_TO_BYTE(_word)             ((_word) * sizeof(u16))
+
+#define GET_EEPROM_ADDR(_wordoffset,_byteoffset) \
+    ( WORD_TO_BYTE(_wordoffset) + (_byteoffset) )
+
+/* EEPROM access by BYTE */
+#define EEPROM_PME_CAPABILITY   (GET_EEPROM_ADDR(0x09,MSB))     /* 1 byte   */
+#define EEPROM_MAC_ADDRESS      (GET_EEPROM_ADDR(0x21,LSB))     /* 6 byte   */
+#define EEPROM_VERSION          (GET_EEPROM_ADDR(0x24,MSB))     /* 1 byte   */
+#define EEPROM_NIC_TYPE         (GET_EEPROM_ADDR(0x25,LSB))     /* 1 byte   */
+#define EEPROM_SKU_CAPABILITY   (GET_EEPROM_ADDR(0x25,MSB))     /* 1 byte   */
+#define EEPROM_COUNTRY_CODE     (GET_EEPROM_ADDR(0x26,LSB))     /* 3 bytes  */
+#define EEPROM_IBSS_CHANNELS_BG (GET_EEPROM_ADDR(0x28,LSB))     /* 2 bytes  */
+#define EEPROM_IBSS_CHANNELS_A  (GET_EEPROM_ADDR(0x29,MSB))     /* 5 bytes  */
+#define EEPROM_BSS_CHANNELS_BG  (GET_EEPROM_ADDR(0x2c,LSB))     /* 2 bytes  */
+#define EEPROM_HW_VERSION       (GET_EEPROM_ADDR(0x72,LSB))     /* 2 bytes  */
+
+/* NIC type as found in the one byte EEPROM_NIC_TYPE  offset*/
+#define EEPROM_NIC_TYPE_STANDARD        0
+#define EEPROM_NIC_TYPE_DELL            1
+#define EEPROM_NIC_TYPE_FUJITSU         2
+#define EEPROM_NIC_TYPE_IBM             3
+#define EEPROM_NIC_TYPE_HP              4
+
+#define FW_MEM_REG_LOWER_BOUND          0x00300000
+#define FW_MEM_REG_EEPROM_ACCESS        (FW_MEM_REG_LOWER_BOUND + 0x40)
+
+#define EEPROM_BIT_SK                   (1<<0)
+#define EEPROM_BIT_CS                   (1<<1)
+#define EEPROM_BIT_DI                   (1<<2)
+#define EEPROM_BIT_DO                   (1<<4)
+
+#define EEPROM_CMD_READ                 0x2
+
+/* Interrupts masks */
+#define CX2_INTA_NONE   0x00000000
+
+#define CX2_INTA_BIT_RX_TRANSFER                   0x00000002
+#define CX2_INTA_BIT_STATUS_CHANGE                 0x00000010
+#define CX2_INTA_BIT_BEACON_PERIOD_EXPIRED         0x00000020
+
+//Inta Bits for CF
+#define CX2_INTA_BIT_TX_CMD_QUEUE                  0x00000800
+#define CX2_INTA_BIT_TX_QUEUE_1                    0x00001000
+#define CX2_INTA_BIT_TX_QUEUE_2                    0x00002000
+#define CX2_INTA_BIT_TX_QUEUE_3                    0x00004000
+#define CX2_INTA_BIT_TX_QUEUE_4                    0x00008000
+
+#define CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE      0x00010000
+
+#define CX2_INTA_BIT_PREPARE_FOR_POWER_DOWN        0x00100000
+#define CX2_INTA_BIT_POWER_DOWN                    0x00200000
+
+#define CX2_INTA_BIT_FW_INITIALIZATION_DONE        0x01000000
+#define CX2_INTA_BIT_FW_CARD_DISABLE_PHY_OFF_DONE  0x02000000
+#define CX2_INTA_BIT_RF_KILL_DONE                  0x04000000
+#define CX2_INTA_BIT_FATAL_ERROR             0x40000000
+#define CX2_INTA_BIT_PARITY_ERROR            0x80000000
+
+/* Interrupts enabled at init time. */
+#define CX2_INTA_MASK_ALL                        \
+        (CX2_INTA_BIT_TX_QUEUE_1               | \
+         CX2_INTA_BIT_TX_QUEUE_2               | \
+         CX2_INTA_BIT_TX_QUEUE_3               | \
+         CX2_INTA_BIT_TX_QUEUE_4               | \
+         CX2_INTA_BIT_TX_CMD_QUEUE             | \
+         CX2_INTA_BIT_RX_TRANSFER              | \
+         CX2_INTA_BIT_FATAL_ERROR              | \
+         CX2_INTA_BIT_PARITY_ERROR             | \
+         CX2_INTA_BIT_STATUS_CHANGE            | \
+         CX2_INTA_BIT_FW_INITIALIZATION_DONE   | \
+         CX2_INTA_BIT_BEACON_PERIOD_EXPIRED    | \
+         CX2_INTA_BIT_SLAVE_MODE_HOST_CMD_DONE | \
+         CX2_INTA_BIT_PREPARE_FOR_POWER_DOWN   | \
+         CX2_INTA_BIT_POWER_DOWN               | \
+         CX2_INTA_BIT_RF_KILL_DONE )
+
+#define IPWSTATUS_ERROR_LOG     (CX2_SHARED_LOWER_BOUND + 0x410)
+#define IPW_EVENT_LOG     (CX2_SHARED_LOWER_BOUND + 0x414)
+
+/* FW event log definitions */
+#define EVENT_ELEM_SIZE     (3 * sizeof(u32))
+#define EVENT_START_OFFSET  (1 * sizeof(u32) + 2 * sizeof(u16))
+
+/* FW error log definitions */
+#define ERROR_ELEM_SIZE     (7 * sizeof(u32))
+#define ERROR_START_OFFSET  (1 * sizeof(u32))
+
+enum {
+        IPW_FW_ERROR_OK = 0,
+        IPW_FW_ERROR_FAIL,
+        IPW_FW_ERROR_MEMORY_UNDERFLOW,
+        IPW_FW_ERROR_MEMORY_OVERFLOW,
+        IPW_FW_ERROR_BAD_PARAM,
+        IPW_FW_ERROR_BAD_CHECKSUM,
+        IPW_FW_ERROR_NMI_INTERRUPT,
+        IPW_FW_ERROR_BAD_DATABASE,
+        IPW_FW_ERROR_ALLOC_FAIL,
+        IPW_FW_ERROR_DMA_UNDERRUN,
+        IPW_FW_ERROR_DMA_STATUS,
+        IPW_FW_ERROR_DINOSTATUS_ERROR,
+        IPW_FW_ERROR_EEPROMSTATUS_ERROR,
+        IPW_FW_ERROR_SYSASSERT,
+        IPW_FW_ERROR_FATAL_ERROR
+};
+
+#define AUTH_OPEN       0
+#define AUTH_SHARED_KEY 1
+#define AUTH_IGNORE     3
+
+#define HC_ASSOCIATE      0
+#define HC_REASSOCIATE    1
+#define HC_DISASSOCIATE   2
+#define HC_IBSS_START     3
+#define HC_IBSS_RECONF    4
+#define HC_DISASSOC_QUIET 5
+
+#define IPW_RATE_CAPABILITIES 1
+#define IPW_RATE_CONNECT      0
+
+/*
+ * Rate values and masks
+ */
+#define IPW_TX_RATE_1MB  0x0A
+#define IPW_TX_RATE_2MB  0x14
+#define IPW_TX_RATE_5MB  0x37
+#define IPW_TX_RATE_6MB  0x0D
+#define IPW_TX_RATE_9MB  0x0F
+#define IPW_TX_RATE_11MB 0x6E
+#define IPW_TX_RATE_12MB 0x05
+#define IPW_TX_RATE_18MB 0x07
+#define IPW_TX_RATE_24MB 0x09
+#define IPW_TX_RATE_36MB 0x0B
+#define IPW_TX_RATE_48MB 0x01
+#define IPW_TX_RATE_54MB 0x03
+
+#define IPW_ORD_TABLE_ID_MASK             0x0000FF00
+#define IPW_ORD_TABLE_VALUE_MASK          0x000000FF
+
+#define IPW_ORD_TABLE_0_MASK              0x0000F000
+#define IPW_ORD_TABLE_1_MASK              0x0000F100
+#define IPW_ORD_TABLE_2_MASK              0x0000F200
+#define IPW_ORD_TABLE_3_MASK              0x0000F300
+#define IPW_ORD_TABLE_4_MASK              0x0000F400
+#define IPW_ORD_TABLE_5_MASK              0x0000F500
+#define IPW_ORD_TABLE_6_MASK              0x0000F600
+#define IPW_ORD_TABLE_7_MASK              0x0000F700
+
+/*
+ * Table 0 Entries (all entries are 32 bits)
+ */
+enum {
+        IPW_ORD_STAT_TX_CURR_RATE = IPW_ORD_TABLE_0_MASK + 1,
+        IPW_ORD_STAT_FRAG_TRESHOLD,
+        IPW_ORD_STAT_RTS_THRESHOLD,
+        IPW_ORD_STAT_TX_HOST_REQUESTS,
+        IPW_ORD_STAT_TX_HOST_COMPLETE,
+        IPW_ORD_STAT_TX_DIR_DATA,
+        IPW_ORD_STAT_TX_DIR_DATA_B_1,
+        IPW_ORD_STAT_TX_DIR_DATA_B_2,
+        IPW_ORD_STAT_TX_DIR_DATA_B_5_5,
+        IPW_ORD_STAT_TX_DIR_DATA_B_11,
+        /* Hole */
+
+        IPW_ORD_STAT_TX_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 19,
+        IPW_ORD_STAT_TX_DIR_DATA_G_2,
+        IPW_ORD_STAT_TX_DIR_DATA_G_5_5,
+        IPW_ORD_STAT_TX_DIR_DATA_G_6,
+        IPW_ORD_STAT_TX_DIR_DATA_G_9,
+        IPW_ORD_STAT_TX_DIR_DATA_G_11,
+        IPW_ORD_STAT_TX_DIR_DATA_G_12,
+        IPW_ORD_STAT_TX_DIR_DATA_G_18,
+        IPW_ORD_STAT_TX_DIR_DATA_G_24,
+        IPW_ORD_STAT_TX_DIR_DATA_G_36,
+        IPW_ORD_STAT_TX_DIR_DATA_G_48,
+        IPW_ORD_STAT_TX_DIR_DATA_G_54,
+        IPW_ORD_STAT_TX_NON_DIR_DATA,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_1,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_2,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_5_5,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_B_11,
+        /* Hole */
+
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 44,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_2,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_5_5,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_6,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_9,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_11,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_12,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_18,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_24,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_36,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_48,
+        IPW_ORD_STAT_TX_NON_DIR_DATA_G_54,
+        IPW_ORD_STAT_TX_RETRY,
+        IPW_ORD_STAT_TX_FAILURE,
+        IPW_ORD_STAT_RX_ERR_CRC,
+        IPW_ORD_STAT_RX_ERR_ICV,
+        IPW_ORD_STAT_RX_NO_BUFFER,
+        IPW_ORD_STAT_FULL_SCANS,
+        IPW_ORD_STAT_PARTIAL_SCANS,
+        IPW_ORD_STAT_TGH_ABORTED_SCANS,
+        IPW_ORD_STAT_TX_TOTAL_BYTES,
+        IPW_ORD_STAT_CURR_RSSI_RAW,
+        IPW_ORD_STAT_RX_BEACON,
+        IPW_ORD_STAT_MISSED_BEACONS,
+        IPW_ORD_TABLE_0_LAST
+};
+
+#define IPW_RSSI_TO_DBM 112
+
+/* Table 1 Entries
+ */
+enum {
+        IPW_ORD_TABLE_1_LAST = IPW_ORD_TABLE_1_MASK | 1,
+};
+
+/*
+ * Table 2 Entries
+ *
+ * FW_VERSION:    16 byte string
+ * FW_DATE:       16 byte string (only 14 bytes used)
+ * UCODE_VERSION: 4 byte version code
+ * UCODE_DATE:    5 bytes code code
+ * ADDAPTER_MAC:  6 byte MAC address
+ * RTC:           4 byte clock
+ */
+enum {
+        IPW_ORD_STAT_FW_VERSION = IPW_ORD_TABLE_2_MASK | 1,
+        IPW_ORD_STAT_FW_DATE,
+        IPW_ORD_STAT_UCODE_VERSION,
+        IPW_ORD_STAT_UCODE_DATE,
+        IPW_ORD_STAT_ADAPTER_MAC,
+        IPW_ORD_STAT_RTC,
+        IPW_ORD_TABLE_2_LAST
+};
+
+/* Table 3 */
+enum {
+        IPW_ORD_STAT_TX_PACKET = IPW_ORD_TABLE_3_MASK | 0,
+        IPW_ORD_STAT_TX_PACKET_FAILURE,
+        IPW_ORD_STAT_TX_PACKET_SUCCESS,
+        IPW_ORD_STAT_TX_PACKET_ABORTED,
+        IPW_ORD_TABLE_3_LAST
+};
+
+/* Table 4 */
+enum {
+        IPW_ORD_TABLE_4_LAST = IPW_ORD_TABLE_4_MASK
+};
+
+/* Table 5 */
+enum {
+        IPW_ORD_STAT_AVAILABLE_AP_COUNT = IPW_ORD_TABLE_5_MASK,
+        IPW_ORD_STAT_AP_ASSNS,
+        IPW_ORD_STAT_ROAM,
+        IPW_ORD_STAT_ROAM_CAUSE_MISSED_BEACONS,
+        IPW_ORD_STAT_ROAM_CAUSE_UNASSOC,
+        IPW_ORD_STAT_ROAM_CAUSE_RSSI,
+        IPW_ORD_STAT_ROAM_CAUSE_LINK_QUALITY,
+        IPW_ORD_STAT_ROAM_CAUSE_AP_LOAD_BALANCE,
+        IPW_ORD_STAT_ROAM_CAUSE_AP_NO_TX,
+        IPW_ORD_STAT_LINK_UP,
+        IPW_ORD_STAT_LINK_DOWN,
+        IPW_ORD_ANTENNA_DIVERSITY,
+        IPW_ORD_CURR_FREQ,
+        IPW_ORD_TABLE_5_LAST
+};
+
+/* Table 6 */
+enum {
+        IPW_ORD_COUNTRY_CODE = IPW_ORD_TABLE_6_MASK,
+        IPW_ORD_CURR_BSSID,
+        IPW_ORD_CURR_SSID,
+        IPW_ORD_TABLE_6_LAST
+};
+
+/* Table 7 */
+enum {
+        IPW_ORD_STAT_PERCENT_MISSED_BEACONS = IPW_ORD_TABLE_7_MASK,
+        IPW_ORD_STAT_PERCENT_TX_RETRIES,
+        IPW_ORD_STAT_PERCENT_LINK_QUALITY,
+        IPW_ORD_STAT_CURR_RSSI_DBM,
+        IPW_ORD_TABLE_7_LAST
+};
+
+#define IPW_ORDINALS_TABLE_LOWER        (CX2_SHARED_LOWER_BOUND + 0x500)
+#define IPW_ORDINALS_TABLE_0            (CX2_SHARED_LOWER_BOUND + 0x180)
+#define IPW_ORDINALS_TABLE_1            (CX2_SHARED_LOWER_BOUND + 0x184)
+#define IPW_ORDINALS_TABLE_2            (CX2_SHARED_LOWER_BOUND + 0x188)
+#define IPW_MEM_FIXED_OVERRIDE          (CX2_SHARED_LOWER_BOUND + 0x41C)
+
+struct ipw_fixed_rate {
+        u16 tx_rates;
+        u16 reserved;
+} __attribute__ ((packed));
+
+#define CX2_INDIRECT_ADDR_MASK (~0x3ul)
+
+struct host_cmd {
+        u8 cmd;
+        u8 len;
+        u16 reserved;
+        u32 param[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
+} __attribute__ ((packed));
+
+#define CFG_BT_COEXISTENCE_MIN                  0x00
+#define CFG_BT_COEXISTENCE_DEFER                0x02
+#define CFG_BT_COEXISTENCE_KILL                 0x04
+#define CFG_BT_COEXISTENCE_WME_OVER_BT          0x08
+#define CFG_BT_COEXISTENCE_OOB                  0x10
+#define CFG_BT_COEXISTENCE_MAX                  0xFF
+#define CFG_BT_COEXISTENCE_DEF                  0x80    /* read Bt from EEPROM */
+
+#define CFG_CTS_TO_ITSELF_ENABLED_MIN   0x0
+#define CFG_CTS_TO_ITSELF_ENABLED_MAX   0x1
+#define CFG_CTS_TO_ITSELF_ENABLED_DEF   CFG_CTS_TO_ITSELF_ENABLED_MIN
+
+#define CFG_SYS_ANTENNA_BOTH                      0x000
+#define CFG_SYS_ANTENNA_A                         0x001
+#define CFG_SYS_ANTENNA_B                         0x003
+
+/*
+ * The definitions below were lifted off the ipw2100 driver, which only
+ * supports 'b' mode, so I'm sure these are not exactly correct.
+ *
+ * Somebody fix these!!
+ */
+#define REG_MIN_CHANNEL             0
+#define REG_MAX_CHANNEL             14
+
+#define REG_CHANNEL_MASK            0x00003FFF
+#define IPW_IBSS_11B_DEFAULT_MASK   0x87ff
+
+static const long ipw_frequencies[] = {
+        2412, 2417, 2422, 2427,
+        2432, 2437, 2442, 2447,
+        2452, 2457, 2462, 2467,
+        2472, 2484
+};
+
+#define FREQ_COUNT ARRAY_SIZE(ipw_frequencies)
+
+#define IPW_MAX_CONFIG_RETRIES 10
+
+static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr)
+{
+        u32 retval;
+        u16 fc;
+
+        retval = sizeof(struct ieee80211_hdr);
+        fc = le16_to_cpu(hdr->frame_ctl);
+
+        /*
+         * Function     ToDS    FromDS
+         * IBSS         0       0
+         * To AP        1       0
+         * From AP      0       1
+         * WDS (bridge) 1       1
+         *
+         * Only WDS frames use Address4 among them. --YZ
+         */
+        if (!(fc & IEEE80211_FCTL_TODS) || !(fc & IEEE80211_FCTL_FROMDS))
+                retval -= ETH_ALEN;
+
+        return retval;
+}
+
+#endif                          /* __ipw2200_h__ */
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 5f507c49907b..ca6c03c89926 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -471,12 +471,12 @@ static dev_link_t *netwave_attach(void)
     dev->get_stats  = &netwave_get_stats;
     dev->set_multicast_list = &set_multicast_list;
     /* wireless extensions */
-#ifdef WIRELESS_EXT
+#if WIRELESS_EXT <= 16
     dev->get_wireless_stats = &netwave_get_wireless_stats;
+#endif /* WIRELESS_EXT <= 16 */
 #if WIRELESS_EXT > 12
     dev->wireless_handlers = (struct iw_handler_def *)&netwave_handler_def;
 #endif /* WIRELESS_EXT > 12 */
-#endif /* WIRELESS_EXT */
     dev->do_ioctl = &netwave_ioctl;
 
     dev->tx_timeout = &netwave_watchdog;
@@ -839,6 +839,9 @@ static const struct iw_handler_def	netwave_handler_def =
         .standard       = (iw_handler *) netwave_handler,
         .private        = (iw_handler *) netwave_private_handler,
         .private_args   = (struct iw_priv_args *) netwave_private_args,
+#if WIRELESS_EXT > 16
+        .get_wireless_stats = netwave_get_wireless_stats,
+#endif /* WIRELESS_EXT > 16 */
 };
 #endif /* WIRELESS_EXT > 12 */
 
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 9c2d07cde010..8de49fe57233 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -94,6 +94,8 @@
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
 
+#include <net/ieee80211.h>
+
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
@@ -101,7 +103,6 @@
 #include "hermes.h"
 #include "hermes_rid.h"
 #include "orinoco.h"
-#include "ieee802_11.h"
 
 /********************************************************************/
 /* Module information                                               */
@@ -150,7 +151,7 @@ static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
 #define ENCAPS_OVERHEAD         (sizeof(encaps_hdr) + 2)
 
 #define ORINOCO_MIN_MTU         256
-#define ORINOCO_MAX_MTU         (IEEE802_11_DATA_LEN - ENCAPS_OVERHEAD)
+#define ORINOCO_MAX_MTU         (IEEE80211_DATA_LEN - ENCAPS_OVERHEAD)
 
 #define SYMBOL_MAX_VER_LEN      (14)
 #define USER_BAP                0
@@ -442,7 +443,7 @@ static int orinoco_change_mtu(struct net_device *dev, int new_mtu)
         if ( (new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU) )
                 return -EINVAL;
 
-        if ( (new_mtu + ENCAPS_OVERHEAD + IEEE802_11_HLEN) >
+        if ( (new_mtu + ENCAPS_OVERHEAD + IEEE80211_HLEN) >
              (priv->nicbuf_size - ETH_HLEN) )
                 return -EINVAL;
 
@@ -918,7 +919,7 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)
                    data. */
                 return;
         }
-        if (length > IEEE802_11_DATA_LEN) {
+        if (length > IEEE80211_DATA_LEN) {
                 printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",
                        dev->name, length);
                 stats->rx_length_errors++;
@@ -1052,8 +1053,9 @@ static void orinoco_join_ap(struct net_device *dev)
                 u16 channel;
         } __attribute__ ((packed)) req;
         const int atom_len = offsetof(struct prism2_scan_apinfo, atim);
-        struct prism2_scan_apinfo *atom;
+        struct prism2_scan_apinfo *atom = NULL;
         int offset = 4;
+        int found = 0;
         u8 *buf;
         u16 len;
 
@@ -1088,15 +1090,18 @@ static void orinoco_join_ap(struct net_device *dev)
          * we were requested to join */
         for (; offset + atom_len <= len; offset += atom_len) {
                 atom = (struct prism2_scan_apinfo *) (buf + offset);
-                if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0)
-                        goto found;
+                if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0) {
+                        found = 1;
+                        break;
+                }
         }
 
-        DEBUG(1, "%s: Requested AP not found in scan results\n",
-              dev->name);
-        goto out;
+        if (! found) {
+                DEBUG(1, "%s: Requested AP not found in scan results\n",
+                      dev->name);
+                goto out;
+        }
 
- found:
         memcpy(req.bssid, priv->desired_bssid, ETH_ALEN);
         req.channel = atom->channel;    /* both are little-endian */
         err = HERMES_WRITE_RECORD(hw, USER_BAP, HERMES_RID_CNFJOINREQUEST,
@@ -1283,8 +1288,10 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw)
                 /* Read scan data */
                 err = hermes_bap_pread(hw, IRQ_BAP, (void *) buf, len,
                                        infofid, sizeof(info));
-                if (err)
+                if (err) {
+                        kfree(buf);
                         break;
+                }
 
 #ifdef ORINOCO_DEBUG
                 {
@@ -2272,7 +2279,7 @@ static int orinoco_init(struct net_device *dev)
 
         /* No need to lock, the hw_unavailable flag is already set in
          * alloc_orinocodev() */
-        priv->nicbuf_size = IEEE802_11_FRAME_LEN + ETH_HLEN;
+        priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN;
 
         /* Initialize the firmware */
         err = orinoco_reinit_firmware(dev);
@@ -4020,7 +4027,8 @@ static int orinoco_ioctl_setscan(struct net_device *dev,
 }
 
 /* Translate scan data returned from the card to a card independant
- * format that the Wireless Tools will understand - Jean II */
+ * format that the Wireless Tools will understand - Jean II
+ * Return message length or -errno for fatal errors */
 static inline int orinoco_translate_scan(struct net_device *dev,
                                          char *buffer,
                                          char *scan,
@@ -4060,13 +4068,19 @@ static inline int orinoco_translate_scan(struct net_device *dev,
                 break;
         case FIRMWARE_TYPE_INTERSIL:
                 offset = 4;
-                if (priv->has_hostscan)
-                        atom_len = scan[0] + (scan[1] << 8);
-                else
+                if (priv->has_hostscan) {
+                        atom_len = le16_to_cpup((u16 *)scan);
+                        /* Sanity check for atom_len */
+                        if (atom_len < sizeof(struct prism2_scan_apinfo)) {
+                                printk(KERN_ERR "%s: Invalid atom_len in scan data: %d\n",
+                                dev->name, atom_len);
+                                return -EIO;
+                        }
+                } else
                         atom_len = offsetof(struct prism2_scan_apinfo, atim);
                 break;
         default:
-                return 0;
+                return -EOPNOTSUPP;
         }
 
         /* Check that we got an whole number of atoms */
@@ -4074,7 +4088,7 @@ static inline int orinoco_translate_scan(struct net_device *dev,
                 printk(KERN_ERR "%s: Unexpected scan data length %d, "
                        "atom_len %d, offset %d\n", dev->name, scan_len,
                        atom_len, offset);
-                return 0;
+                return -EIO;
         }
 
         /* Read the entries one by one */
@@ -4209,33 +4223,41 @@ static int orinoco_ioctl_getscan(struct net_device *dev,
                 /* We have some results to push back to user space */
 
                 /* Translate to WE format */
-                srq->length = orinoco_translate_scan(dev, extra,
-                                                     priv->scan_result,
-                                                     priv->scan_len);
-
-                /* Return flags */
-                srq->flags = (__u16) priv->scan_mode;
+                int ret = orinoco_translate_scan(dev, extra,
+                                                 priv->scan_result,
+                                                 priv->scan_len);
+
+                if (ret < 0) {
+                        err = ret;
+                        kfree(priv->scan_result);
+                        priv->scan_result = NULL;
+                } else {
+                        srq->length = ret;
 
-                /* Results are here, so scan no longer in progress */
-                priv->scan_inprogress = 0;
+                        /* Return flags */
+                        srq->flags = (__u16) priv->scan_mode;
 
-                /* In any case, Scan results will be cleaned up in the
-                 * reset function and when exiting the driver.
-                 * The person triggering the scanning may never come to
-                 * pick the results, so we need to do it in those places.
-                 * Jean II */
+                        /* In any case, Scan results will be cleaned up in the
+                         * reset function and when exiting the driver.
+                         * The person triggering the scanning may never come to
+                         * pick the results, so we need to do it in those places.
+                         * Jean II */
 
 #ifdef SCAN_SINGLE_READ
-                /* If you enable this option, only one client (the first
-                 * one) will be able to read the result (and only one
-                 * time). If there is multiple concurent clients that
-                 * want to read scan results, this behavior is not
-                 * advisable - Jean II */
-                kfree(priv->scan_result);
-                priv->scan_result = NULL;
+                        /* If you enable this option, only one client (the first
+                         * one) will be able to read the result (and only one
+                         * time). If there is multiple concurent clients that
+                         * want to read scan results, this behavior is not
+                         * advisable - Jean II */
+                        kfree(priv->scan_result);
+                        priv->scan_result = NULL;
 #endif /* SCAN_SINGLE_READ */
-                /* Here, if too much time has elapsed since last scan,
-                 * we may want to clean up scan results... - Jean II */
+                        /* Here, if too much time has elapsed since last scan,
+                         * we may want to clean up scan results... - Jean II */
+                }
+
+                /* Scan is no longer in progress */
+                priv->scan_inprogress = 0;
         }
           
         orinoco_unlock(priv, &flags);
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 1cc1492083c9..d1fb1bab8aa8 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -604,7 +604,6 @@ static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
 
 static struct pcmcia_device_id orinoco_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
-        PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001),
         PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
         PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
         PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a),
diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
new file mode 100644
index 000000000000..86fa58e5cfac
--- /dev/null
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -0,0 +1,324 @@
+/* orinoco_nortel.c
+ * 
+ * Driver for Prism II devices which would usually be driven by orinoco_cs,
+ * but are connected to the PCI bus by a Nortel PCI-PCMCIA-Adapter. 
+ *
+ * Copyright (C) 2002 Tobias Hoffmann
+ *           (C) 2003 Christoph Jungegger <disdos@traum404.de>
+ *
+ * Some of this code is borrowed from orinoco_plx.c
+ *      Copyright (C) 2001 Daniel Barlow
+ * Some of this code is borrowed from orinoco_pci.c 
+ *  Copyright (C) 2001 Jean Tourrilhes
+ * Some of this code is "inspired" by linux-wlan-ng-0.1.10, but nothing
+ * has been copied from it. linux-wlan-ng-0.1.10 is originally :
+ *      Copyright (C) 1999 AbsoluteValue Systems, Inc.  All Rights Reserved.
+ * 
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License
+ * at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License version 2 (the "GPL"), in
+ * which case the provisions of the GPL are applicable instead of the
+ * above.  If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use your
+ * version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the GPL.  If you do not delete the
+ * provisions above, a recipient may use your version of this file
+ * under either the MPL or the GPL.
+ */
+
+#define DRIVER_NAME "orinoco_nortel"
+#define PFX DRIVER_NAME ": "
+
+#include <linux/config.h>
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/ioport.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/etherdevice.h>
+#include <linux/list.h>
+#include <linux/pci.h>
+#include <linux/fcntl.h>
+
+#include <pcmcia/cisreg.h>
+
+#include "hermes.h"
+#include "orinoco.h"
+
+#define COR_OFFSET    (0xe0)    /* COR attribute offset of Prism2 PC card */
+#define COR_VALUE     (COR_LEVEL_REQ | COR_FUNC_ENA)    /* Enable PC card with interrupt in level trigger */
+
+
+/* Nortel specific data */
+struct nortel_pci_card {
+        unsigned long iobase1;
+        unsigned long iobase2;
+};
+
+/*
+ * Do a soft reset of the PCI card using the Configuration Option Register
+ * We need this to get going...
+ * This is the part of the code that is strongly inspired from wlan-ng
+ *
+ * Note bis : Don't try to access HERMES_CMD during the reset phase.
+ * It just won't work !
+ */
+static int nortel_pci_cor_reset(struct orinoco_private *priv)
+{
+        struct nortel_pci_card *card = priv->card;
+
+        /* Assert the reset until the card notice */
+        outw_p(8, card->iobase1 + 2);
+        inw(card->iobase2 + COR_OFFSET);
+        outw_p(0x80, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+
+        /* Give time for the card to recover from this hard effort */
+        outw_p(0, card->iobase2 + COR_OFFSET);
+        outw_p(0, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+
+        /* set COR as usual */
+        outw_p(COR_VALUE, card->iobase2 + COR_OFFSET);
+        outw_p(COR_VALUE, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+
+        outw_p(0x228, card->iobase1 + 2);
+
+        return 0;
+}
+
+int nortel_pci_hw_init(struct nortel_pci_card *card)
+{
+        int i;
+        u32 reg;
+
+        /* setup bridge */
+        if (inw(card->iobase1) & 1) {
+                printk(KERN_ERR PFX "brg1 answer1 wrong\n");
+                return -EBUSY;
+        }
+        outw_p(0x118, card->iobase1 + 2);
+        outw_p(0x108, card->iobase1 + 2);
+        mdelay(30);
+        outw_p(0x8, card->iobase1 + 2);
+        for (i = 0; i < 30; i++) {
+                mdelay(30);
+                if (inw(card->iobase1) & 0x10) {
+                        break;
+                }
+        }
+        if (i == 30) {
+                printk(KERN_ERR PFX "brg1 timed out\n");
+                return -EBUSY;
+        }
+        if (inw(card->iobase2 + 0xe0) & 1) {
+                printk(KERN_ERR PFX "brg2 answer1 wrong\n");
+                return -EBUSY;
+        }
+        if (inw(card->iobase2 + 0xe2) & 1) {
+                printk(KERN_ERR PFX "brg2 answer2 wrong\n");
+                return -EBUSY;
+        }
+        if (inw(card->iobase2 + 0xe4) & 1) {
+                printk(KERN_ERR PFX "brg2 answer3 wrong\n");
+                return -EBUSY;
+        }
+
+        /* set the PCMCIA COR-Register */
+        outw_p(COR_VALUE, card->iobase2 + COR_OFFSET);
+        mdelay(1);
+        reg = inw(card->iobase2 + COR_OFFSET);
+        if (reg != COR_VALUE) {
+                printk(KERN_ERR PFX "Error setting COR value (reg=%x)\n",
+                       reg);
+                return -EBUSY;
+        }
+
+        /* set leds */
+        outw_p(1, card->iobase1 + 10);
+        return 0;
+}
+
+static int nortel_pci_init_one(struct pci_dev *pdev,
+                               const struct pci_device_id *ent)
+{
+        int err;
+        struct orinoco_private *priv;
+        struct nortel_pci_card *card;
+        struct net_device *dev;
+        void __iomem *iomem;
+
+        err = pci_enable_device(pdev);
+        if (err) {
+                printk(KERN_ERR PFX "Cannot enable PCI device\n");
+                return err;
+        }
+
+        err = pci_request_regions(pdev, DRIVER_NAME);
+        if (err != 0) {
+                printk(KERN_ERR PFX "Cannot obtain PCI resources\n");
+                goto fail_resources;
+        }
+
+        iomem = pci_iomap(pdev, 3, 0);
+        if (!iomem) {
+                err = -ENOMEM;
+                goto fail_map_io;
+        }
+
+        /* Allocate network device */
+        dev = alloc_orinocodev(sizeof(*card), nortel_pci_cor_reset);
+        if (!dev) {
+                printk(KERN_ERR PFX "Cannot allocate network device\n");
+                err = -ENOMEM;
+                goto fail_alloc;
+        }
+
+        priv = netdev_priv(dev);
+        card = priv->card;
+        card->iobase1 = pci_resource_start(pdev, 0);
+        card->iobase2 = pci_resource_start(pdev, 1);
+        dev->base_addr = pci_resource_start(pdev, 2);
+        SET_MODULE_OWNER(dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+
+        hermes_struct_init(&priv->hw, iomem, HERMES_16BIT_REGSPACING);
+
+        printk(KERN_DEBUG PFX "Detected Nortel PCI device at %s irq:%d, "
+               "io addr:0x%lx\n", pci_name(pdev), pdev->irq, dev->base_addr);
+
+        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+                          dev->name, dev);
+        if (err) {
+                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
+                err = -EBUSY;
+                goto fail_irq;
+        }
+        dev->irq = pdev->irq;
+
+        err = nortel_pci_hw_init(card);
+        if (err) {
+                printk(KERN_ERR PFX "Hardware initialization failed\n");
+                goto fail;
+        }
+
+        err = nortel_pci_cor_reset(priv);
+        if (err) {
+                printk(KERN_ERR PFX "Initial reset failed\n");
+                goto fail;
+        }
+
+
+        err = register_netdev(dev);
+        if (err) {
+                printk(KERN_ERR PFX "Cannot register network device\n");
+                goto fail;
+        }
+
+        pci_set_drvdata(pdev, dev);
+
+        return 0;
+
+ fail:
+        free_irq(pdev->irq, dev);
+
+ fail_irq:
+        pci_set_drvdata(pdev, NULL);
+        free_orinocodev(dev);
+
+ fail_alloc:
+        pci_iounmap(pdev, iomem);
+
+ fail_map_io:
+        pci_release_regions(pdev);
+
+ fail_resources:
+        pci_disable_device(pdev);
+
+        return err;
+}
+
+static void __devexit nortel_pci_remove_one(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct orinoco_private *priv = netdev_priv(dev);
+        struct nortel_pci_card *card = priv->card;
+
+        /* clear leds */
+        outw_p(0, card->iobase1 + 10);
+
+        unregister_netdev(dev);
+        free_irq(dev->irq, dev);
+        pci_set_drvdata(pdev, NULL);
+        free_orinocodev(dev);
+        pci_iounmap(pdev, priv->hw.iobase);
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+}
+
+
+static struct pci_device_id nortel_pci_id_table[] = {
+        /* Nortel emobility PCI */
+        {0x126c, 0x8030, PCI_ANY_ID, PCI_ANY_ID,},
+        {0,},
+};
+
+MODULE_DEVICE_TABLE(pci, nortel_pci_id_table);
+
+static struct pci_driver nortel_pci_driver = {
+        .name = DRIVER_NAME,
+        .id_table = nortel_pci_id_table,
+        .probe = nortel_pci_init_one,
+        .remove = __devexit_p(nortel_pci_remove_one),
+};
+
+static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
+        " (Tobias Hoffmann & Christoph Jungegger <disdos@traum404.de>)";
+MODULE_AUTHOR("Christoph Jungegger <disdos@traum404.de>");
+MODULE_DESCRIPTION
+    ("Driver for wireless LAN cards using the Nortel PCI bridge");
+MODULE_LICENSE("Dual MPL/GPL");
+
+static int __init nortel_pci_init(void)
+{
+        printk(KERN_DEBUG "%s\n", version);
+        return pci_module_init(&nortel_pci_driver);
+}
+
+static void __exit nortel_pci_exit(void)
+{
+        pci_unregister_driver(&nortel_pci_driver);
+        ssleep(1);
+}
+
+module_init(nortel_pci_init);
+module_exit(nortel_pci_exit);
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ *  tab-width: 8
+ * End:
+ */
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c
index 7a6f52ea7faa..42e03438291b 100644
--- a/drivers/net/wireless/orinoco_pci.c
+++ b/drivers/net/wireless/orinoco_pci.c
@@ -301,8 +301,6 @@ static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         unsigned long flags;
         int err;
         
-        printk(KERN_DEBUG "%s: Orinoco-PCI entering sleep mode (state=%d)\n",
-               dev->name, state);
 
         err = orinoco_lock(priv, &flags);
         if (err) {
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 0f29a9c7bc2c..9a8790e3580c 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2727,6 +2727,9 @@ const struct iw_handler_def prism54_handler_def = {
         .standard = (iw_handler *) prism54_handler,
         .private = (iw_handler *) prism54_private_handler,
         .private_args = (struct iw_priv_args *) prism54_private_args,
+#if WIRELESS_EXT > 16
+        .get_wireless_stats = prism54_get_wireless_stats,
+#endif /* WIRELESS_EXT > 16 */
 #if WIRELESS_EXT == 16
         .spy_offset = offsetof(islpci_private, spy_data),
 #endif /* WIRELESS_EXT == 16 */
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
index efab07e9e24e..6f13d4a8e2d3 100644
--- a/drivers/net/wireless/prism54/islpci_dev.c
+++ b/drivers/net/wireless/prism54/islpci_dev.c
@@ -815,7 +815,6 @@ islpci_setup(struct pci_dev *pdev)
         ndev->open = &islpci_open;
         ndev->stop = &islpci_close;
         ndev->get_stats = &islpci_statistics;
-        ndev->get_wireless_stats = &prism54_get_wireless_stats;
         ndev->do_ioctl = &prism54_ioctl;
         ndev->wireless_handlers =
             (struct iw_handler_def *) &prism54_handler_def;
@@ -844,6 +843,8 @@ islpci_setup(struct pci_dev *pdev)
         /* Add pointers to enable iwspy support. */
         priv->wireless_data.spy_data = &priv->spy_data;
         ndev->wireless_data = &priv->wireless_data;
+#else  /* WIRELESS_EXT > 16 */
+        ndev->get_wireless_stats = &prism54_get_wireless_stats;
 #endif /* WIRELESS_EXT > 16 */
 
         /* save the start and end address of the PCI memory area */
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index c17391d947f3..dc040caab7d7 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -267,8 +267,6 @@ prism54_suspend(struct pci_dev *pdev, pm_message_t state)
         islpci_private *priv = ndev ? netdev_priv(ndev) : NULL;
         BUG_ON(!priv);
 
-        printk(KERN_NOTICE "%s: got suspend request (state %d)\n",
-               ndev->name, state);
 
         pci_save_state(pdev);
 
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 0e0ba614259a..e9c5ea0f5535 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -53,6 +53,7 @@
 #include <pcmcia/ds.h>
 #include <pcmcia/mem_op.h>
 
+#include <net/ieee80211.h>
 #include <linux/wireless.h>
 
 #include <asm/io.h>
@@ -64,7 +65,6 @@
 #define WIRELESS_SPY            /* Enable spying addresses */
 /* Definitions we need for spy */
 typedef struct iw_statistics    iw_stats;
-typedef struct iw_quality       iw_qual;
 typedef u_char  mac_addr[ETH_ALEN];     /* Hardware address */
 
 #include "rayctl.h"
@@ -101,7 +101,6 @@ static int ray_dev_close(struct net_device *dev);
 static int ray_dev_config(struct net_device *dev, struct ifmap *map);
 static struct net_device_stats *ray_get_stats(struct net_device *dev);
 static int ray_dev_init(struct net_device *dev);
-static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 
 static struct ethtool_ops netdev_ethtool_ops;
 
@@ -114,9 +113,8 @@ static int translate_frame(ray_dev_t *local, struct tx_msg __iomem *ptx,
 static void ray_build_header(ray_dev_t *local, struct tx_msg __iomem *ptx, UCHAR msg_type,
                 unsigned char *data);
 static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len);
-#if WIRELESS_EXT > 7    /* If wireless extension exist in the kernel */
 static iw_stats * ray_get_wireless_stats(struct net_device *    dev);
-#endif  /* WIRELESS_EXT > 7 */
+static const struct iw_handler_def      ray_handler_def;
 
 /***** Prototypes for raylink functions **************************************/
 static int asc_to_int(char a);
@@ -373,11 +371,12 @@ static dev_link_t *ray_attach(void)
     dev->hard_start_xmit = &ray_dev_start_xmit;
     dev->set_config = &ray_dev_config;
     dev->get_stats  = &ray_get_stats;
-    dev->do_ioctl = &ray_dev_ioctl;
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
-#if WIRELESS_EXT > 7    /* If wireless extension exist in the kernel */
-    dev->get_wireless_stats = ray_get_wireless_stats;
-#endif
+    dev->wireless_handlers = &ray_handler_def;
+#ifdef WIRELESS_SPY
+    local->wireless_data.spy_data = &local->spy_data;
+    dev->wireless_data = &local->wireless_data;
+#endif  /* WIRELESS_SPY */
 
     dev->set_multicast_list = &set_multicast_list;
 
@@ -1201,436 +1200,420 @@ static struct ethtool_ops netdev_ethtool_ops = {
 
 /*====================================================================*/
 
-static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get protocol name
+ */
+static int ray_get_name(struct net_device *dev,
+                        struct iw_request_info *info,
+                        char *cwrq,
+                        char *extra)
 {
-    ray_dev_t *local = (ray_dev_t *)dev->priv;
-    dev_link_t *link = local->finder;
-    int err = 0;
-#if WIRELESS_EXT > 7
-    struct iwreq *wrq = (struct iwreq *) ifr;
-#endif  /* WIRELESS_EXT > 7 */
-#ifdef WIRELESS_SPY
-    struct sockaddr     address[IW_MAX_SPY];
-#endif  /* WIRELESS_SPY */
+        strcpy(cwrq, "IEEE 802.11-FH");
+        return 0;
+}
 
-    if (!(link->state & DEV_PRESENT)) {
-        DEBUG(2,"ray_dev_ioctl - device not present\n");
-        return -1;
-    }
-    DEBUG(2,"ray_cs IOCTL dev=%p, ifr=%p, cmd = 0x%x\n",dev,ifr,cmd);
-    /* Validate the command */
-    switch (cmd)
-    {
-#if WIRELESS_EXT > 7
-      /* --------------- WIRELESS EXTENSIONS --------------- */
-      /* Get name */
-    case SIOCGIWNAME:
-      strcpy(wrq->u.name, "IEEE 802.11-FH");
-      break;
-
-      /* Get frequency/channel */
-    case SIOCGIWFREQ:
-      wrq->u.freq.m = local->sparm.b5.a_hop_pattern;
-      wrq->u.freq.e = 0;
-      break;
-
-      /* Set frequency/channel */
-    case SIOCSIWFREQ:
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set frequency
+ */
+static int ray_set_freq(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_freq *fwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int err = -EINPROGRESS;         /* Call commit handler */
 
-      /* Setting by channel number */
-      if ((wrq->u.freq.m > USA_HOP_MOD) || (wrq->u.freq.e > 0))
-        err = -EOPNOTSUPP;
-      else
-          local->sparm.b5.a_hop_pattern = wrq->u.freq.m;
-      break;
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
 
-      /* Get current network name (ESSID) */
-    case SIOCGIWESSID:
-      if (wrq->u.data.pointer)
-        {
-          char essid[IW_ESSID_MAX_SIZE + 1];
-          /* Get the essid that was set */
-          memcpy(essid, local->sparm.b5.a_current_ess_id,
-                 IW_ESSID_MAX_SIZE);
-          essid[IW_ESSID_MAX_SIZE] = '\0';
-
-          /* Push it out ! */
-          wrq->u.data.length = strlen(essid) + 1;
-          wrq->u.data.flags = 1; /* active */
-          if (copy_to_user(wrq->u.data.pointer, essid, sizeof(essid)))
-                  err = -EFAULT;
-        }
-      break;
+        /* Setting by channel number */
+        if ((fwrq->m > USA_HOP_MOD) || (fwrq->e > 0))
+                err = -EOPNOTSUPP;
+        else
+                local->sparm.b5.a_hop_pattern = fwrq->m;
 
-      /* Set desired network name (ESSID) */
-    case SIOCSIWESSID:
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+        return err;
+}
+ 
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get frequency
+ */
+static int ray_get_freq(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_freq *fwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
 
-        if (wrq->u.data.pointer)
-        {
-            char        card_essid[IW_ESSID_MAX_SIZE + 1];
-            
-            /* Check if we asked for `any' */
-            if(wrq->u.data.flags == 0)
-            {
+        fwrq->m = local->sparm.b5.a_hop_pattern;
+        fwrq->e = 0;
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set ESSID
+ */
+static int ray_set_essid(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_point *dwrq,
+                         char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        /* Check if we asked for `any' */
+        if(dwrq->flags == 0) {
                 /* Corey : can you do that ? */
-                err = -EOPNOTSUPP;
-            }
-            else
-            {
+                return -EOPNOTSUPP;
+        } else {
                 /* Check the size of the string */
-                if(wrq->u.data.length >
-                   IW_ESSID_MAX_SIZE + 1)
-                {
-                    err = -E2BIG;
-                    break;
-                }
-                if (copy_from_user(card_essid,
-                                   wrq->u.data.pointer,
-                                   wrq->u.data.length)) {
-                        err = -EFAULT;
-                        break;
+                if(dwrq->length > IW_ESSID_MAX_SIZE + 1) {
+                        return -E2BIG;
                 }
-                card_essid[IW_ESSID_MAX_SIZE] = '\0';
 
                 /* Set the ESSID in the card */
-                memcpy(local->sparm.b5.a_current_ess_id, card_essid,
-                       IW_ESSID_MAX_SIZE);
-            }
+                memset(local->sparm.b5.a_current_ess_id, 0, IW_ESSID_MAX_SIZE);
+                memcpy(local->sparm.b5.a_current_ess_id, extra, dwrq->length);
         }
-        break;
-
-      /* Get current Access Point (BSSID in our case) */
-    case SIOCGIWAP:
-      memcpy(wrq->u.ap_addr.sa_data, local->bss_id, ETH_ALEN);
-      wrq->u.ap_addr.sa_family = ARPHRD_ETHER;
-      break;
-
-      /* Get the current bit-rate */
-    case SIOCGIWRATE:
-      if(local->net_default_tx_rate == 3)
-        wrq->u.bitrate.value = 2000000;         /* Hum... */
-      else
-        wrq->u.bitrate.value = local->net_default_tx_rate * 500000;
-      wrq->u.bitrate.fixed = 0;         /* We are in auto mode */
-      break;
-
-      /* Set the desired bit-rate */
-    case SIOCSIWRATE:
-      /* Check if rate is in range */
-      if((wrq->u.bitrate.value != 1000000) &&
-         (wrq->u.bitrate.value != 2000000))
-        {
-          err = -EINVAL;
-          break;
-        }
-      /* Hack for 1.5 Mb/s instead of 2 Mb/s */
-      if((local->fw_ver == 0x55) &&             /* Please check */
-         (wrq->u.bitrate.value == 2000000))
-        local->net_default_tx_rate = 3;
-      else
-        local->net_default_tx_rate = wrq->u.bitrate.value/500000;
-      break;
-
-      /* Get the current RTS threshold */
-    case SIOCGIWRTS:
-      wrq->u.rts.value = (local->sparm.b5.a_rts_threshold[0] << 8)
-        + local->sparm.b5.a_rts_threshold[1];
-#if WIRELESS_EXT > 8
-      wrq->u.rts.disabled = (wrq->u.rts.value == 32767);
-#endif /* WIRELESS_EXT > 8 */
-      wrq->u.rts.fixed = 1;
-      break;
-
-      /* Set the desired RTS threshold */
-    case SIOCSIWRTS:
-    {
-        int rthr = wrq->u.rts.value;
 
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+        return -EINPROGRESS;            /* Call commit handler */
+}
 
-        /* if(wrq->u.rts.fixed == 0) we should complain */
-#if WIRELESS_EXT > 8
-        if(wrq->u.rts.disabled)
-            rthr = 32767;
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get ESSID
+ */
+static int ray_get_essid(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_point *dwrq,
+                         char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        /* Get the essid that was set */
+        memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE);
+        extra[IW_ESSID_MAX_SIZE] = '\0';
+
+        /* Push it out ! */
+        dwrq->length = strlen(extra) + 1;
+        dwrq->flags = 1; /* active */
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get AP address
+ */
+static int ray_get_wap(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct sockaddr *awrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        memcpy(awrq->sa_data, local->bss_id, ETH_ALEN);
+        awrq->sa_family = ARPHRD_ETHER;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set Bit-Rate
+ */
+static int ray_set_rate(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        /* Check if rate is in range */
+        if((vwrq->value != 1000000) && (vwrq->value != 2000000))
+                return -EINVAL;
+
+        /* Hack for 1.5 Mb/s instead of 2 Mb/s */
+        if((local->fw_ver == 0x55) &&           /* Please check */
+           (vwrq->value == 2000000))
+                local->net_default_tx_rate = 3;
         else
-#endif /* WIRELESS_EXT > 8 */
-            if((rthr < 0) || (rthr > 2347)) /* What's the max packet size ??? */
-            {
-                err = -EINVAL;
-                break;
-            }
+                local->net_default_tx_rate = vwrq->value/500000;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get Bit-Rate
+ */
+static int ray_get_rate(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        if(local->net_default_tx_rate == 3)
+                vwrq->value = 2000000;          /* Hum... */
+        else
+                vwrq->value = local->net_default_tx_rate * 500000;
+        vwrq->fixed = 0;                /* We are in auto mode */
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set RTS threshold
+ */
+static int ray_set_rts(struct net_device *dev,
+                       struct iw_request_info *info,
+                       struct iw_param *vwrq,
+                       char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int rthr = vwrq->value;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        /* if(wrq->u.rts.fixed == 0) we should complain */
+        if(vwrq->disabled)
+                rthr = 32767;
+        else {
+                if((rthr < 0) || (rthr > 2347)) /* What's the max packet size ??? */
+                        return -EINVAL;
+        }
         local->sparm.b5.a_rts_threshold[0] = (rthr >> 8) & 0xFF;
         local->sparm.b5.a_rts_threshold[1] = rthr & 0xFF;
-    }
-    break;
 
-      /* Get the current fragmentation threshold */
-    case SIOCGIWFRAG:
-      wrq->u.frag.value = (local->sparm.b5.a_frag_threshold[0] << 8)
-        + local->sparm.b5.a_frag_threshold[1];
-#if WIRELESS_EXT > 8
-      wrq->u.frag.disabled = (wrq->u.frag.value == 32767);
-#endif /* WIRELESS_EXT > 8 */
-      wrq->u.frag.fixed = 1;
-      break;
+        return -EINPROGRESS;            /* Call commit handler */
+}
 
-      /* Set the desired fragmentation threshold */
-    case SIOCSIWFRAG:
-    {
-        int fthr = wrq->u.frag.value;
 
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get RTS threshold
+ */
+static int ray_get_rts(struct net_device *dev,
+                       struct iw_request_info *info,
+                       struct iw_param *vwrq,
+                       char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+
+        vwrq->value = (local->sparm.b5.a_rts_threshold[0] << 8)
+                + local->sparm.b5.a_rts_threshold[1];
+        vwrq->disabled = (vwrq->value == 32767);
+        vwrq->fixed = 1;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set Fragmentation threshold
+ */
+static int ray_set_frag(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int fthr = vwrq->value;
+
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
 
         /* if(wrq->u.frag.fixed == 0) should complain */
-#if WIRELESS_EXT > 8
-        if(wrq->u.frag.disabled)
-            fthr = 32767;
-        else
-#endif /* WIRELESS_EXT > 8 */
-            if((fthr < 256) || (fthr > 2347)) /* To check out ! */
-            {
-                err = -EINVAL;
-                break;
-            }
+        if(vwrq->disabled)
+                fthr = 32767;
+        else {
+                if((fthr < 256) || (fthr > 2347)) /* To check out ! */
+                        return -EINVAL;
+        }
         local->sparm.b5.a_frag_threshold[0] = (fthr >> 8) & 0xFF;
         local->sparm.b5.a_frag_threshold[1] = fthr & 0xFF;
-    }
-    break;
 
-#endif  /* WIRELESS_EXT > 7 */
-#if WIRELESS_EXT > 8
+        return -EINPROGRESS;            /* Call commit handler */
+}
 
-      /* Get the current mode of operation */
-    case SIOCGIWMODE:
-      if(local->sparm.b5.a_network_type)
-        wrq->u.mode = IW_MODE_INFRA;
-      else
-        wrq->u.mode = IW_MODE_ADHOC;
-      break;
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get Fragmentation threshold
+ */
+static int ray_get_frag(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct iw_param *vwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
 
-      /* Set the current mode of operation */
-    case SIOCSIWMODE:
-    {
+        vwrq->value = (local->sparm.b5.a_frag_threshold[0] << 8)
+                + local->sparm.b5.a_frag_threshold[1];
+        vwrq->disabled = (vwrq->value == 32767);
+        vwrq->fixed = 1;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set Mode of Operation
+ */
+static int ray_set_mode(struct net_device *dev,
+                        struct iw_request_info *info,
+                        __u32 *uwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
+        int err = -EINPROGRESS;         /* Call commit handler */
         char card_mode = 1;
-        
-      /* Reject if card is already initialised */
-      if(local->card_status != CARD_AWAITING_PARAM)
-        {
-          err = -EBUSY;
-          break;
-        }
 
-        switch (wrq->u.mode)
+        /* Reject if card is already initialised */
+        if(local->card_status != CARD_AWAITING_PARAM)
+                return -EBUSY;
+
+        switch (*uwrq)
         {
         case IW_MODE_ADHOC:
-            card_mode = 0;
-            // Fall through
+                card_mode = 0;
+                // Fall through
         case IW_MODE_INFRA:
-            local->sparm.b5.a_network_type = card_mode;
-            break;
+                local->sparm.b5.a_network_type = card_mode;
+                break;
         default:
-            err = -EINVAL;
+                err = -EINVAL;
         }
-    }
-    break;
 
-#endif /* WIRELESS_EXT > 8 */
-#if WIRELESS_EXT > 7
-      /* ------------------ IWSPY SUPPORT ------------------ */
-      /* Define the range (variations) of above parameters */
-    case SIOCGIWRANGE:
-      /* Basic checking... */
-      if(wrq->u.data.pointer != (caddr_t) 0)
-        {
-          struct iw_range       range;
-          memset((char *) &range, 0, sizeof(struct iw_range));
-
-          /* Set the length (very important for backward compatibility) */
-          wrq->u.data.length = sizeof(struct iw_range);
-
-#if WIRELESS_EXT > 10
-          /* Set the Wireless Extension versions */
-          range.we_version_compiled = WIRELESS_EXT;
-          range.we_version_source = 9;
-#endif /* WIRELESS_EXT > 10 */
-
-          /* Set information in the range struct */
-          range.throughput = 1.1 * 1000 * 1000; /* Put the right number here */
-          range.num_channels = hop_pattern_length[(int)country]; 
-          range.num_frequency = 0;
-          range.max_qual.qual = 0;
-          range.max_qual.level = 255;   /* What's the correct value ? */
-          range.max_qual.noise = 255;   /* Idem */
-          range.num_bitrates = 2;
-          range.bitrate[0] = 1000000;   /* 1 Mb/s */
-          range.bitrate[1] = 2000000;   /* 2 Mb/s */
-
-          /* Copy structure to the user buffer */
-          if(copy_to_user(wrq->u.data.pointer, &range,
-                          sizeof(struct iw_range)))
-            err = -EFAULT;
-        }
-      break;
+        return err;
+}
 
-#ifdef WIRELESS_SPY
-      /* Set addresses to spy */
-    case SIOCSIWSPY:
-      /* Check the number of addresses */
-      if(wrq->u.data.length > IW_MAX_SPY)
-        {
-          err = -E2BIG;
-          break;
-        }
-      local->spy_number = wrq->u.data.length;
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get Mode of Operation
+ */
+static int ray_get_mode(struct net_device *dev,
+                        struct iw_request_info *info,
+                        __u32 *uwrq,
+                        char *extra)
+{
+        ray_dev_t *local = (ray_dev_t *)dev->priv;
 
-      /* If there is some addresses to copy */
-      if(local->spy_number > 0)
-        {
-          int                   i;
-
-          /* Copy addresses to the driver */
-          if(copy_from_user(address, wrq->u.data.pointer,
-                            sizeof(struct sockaddr) * local->spy_number))
-            {
-              err = -EFAULT;
-              break;
-            }
-
-          /* Copy addresses to the lp structure */
-          for(i = 0; i < local->spy_number; i++)
-            memcpy(local->spy_address[i], address[i].sa_data, ETH_ALEN);
-
-          /* Reset structure... */
-          memset(local->spy_stat, 0x00, sizeof(iw_qual) * IW_MAX_SPY);
-
-#ifdef DEBUG_IOCTL_INFO
-          printk(KERN_DEBUG "SetSpy - Set of new addresses is :\n");
-          for(i = 0; i < local->spy_number; i++)
-            printk(KERN_DEBUG "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                   local->spy_address[i][0],
-                   local->spy_address[i][1],
-                   local->spy_address[i][2],
-                   local->spy_address[i][3],
-                   local->spy_address[i][4],
-                   local->spy_address[i][5]);
-#endif  /* DEBUG_IOCTL_INFO */
-        }
-      break;
+        if(local->sparm.b5.a_network_type)
+                *uwrq = IW_MODE_INFRA;
+        else
+                *uwrq = IW_MODE_ADHOC;
 
-      /* Get the spy list and spy stats */
-    case SIOCGIWSPY:
-      /* Set the number of addresses */
-      wrq->u.data.length = local->spy_number;
+        return 0;
+}
 
-      /* If the user want to have the addresses back... */
-      if((local->spy_number > 0) && (wrq->u.data.pointer != (caddr_t) 0))
-        {
-          int                   i;
-
-          /* Copy addresses from the lp structure */
-          for(i = 0; i < local->spy_number; i++)
-            {
-              memcpy(address[i].sa_data, local->spy_address[i], ETH_ALEN);
-              address[i].sa_family = ARPHRD_ETHER;
-            }
-
-          /* Copy addresses to the user buffer */
-          if(copy_to_user(wrq->u.data.pointer, address,
-                       sizeof(struct sockaddr) * local->spy_number))
-            {
-              err = -EFAULT;
-              break;
-            }
-
-          /* Copy stats to the user buffer (just after) */
-          if(copy_to_user(wrq->u.data.pointer +
-                       (sizeof(struct sockaddr) * local->spy_number),
-                       local->spy_stat, sizeof(iw_qual) * local->spy_number))
-            {
-              err = -EFAULT;
-              break;
-            }
-
-          /* Reset updated flags */
-          for(i = 0; i < local->spy_number; i++)
-            local->spy_stat[i].updated = 0x0;
-        }       /* if(pointer != NULL) */
-
-      break;
-#endif  /* WIRELESS_SPY */
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get range info
+ */
+static int ray_get_range(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_point *dwrq,
+                         char *extra)
+{
+        struct iw_range *range = (struct iw_range *) extra;
+
+        memset((char *) range, 0, sizeof(struct iw_range));
+
+        /* Set the length (very important for backward compatibility) */
+        dwrq->length = sizeof(struct iw_range);
+
+        /* Set the Wireless Extension versions */
+        range->we_version_compiled = WIRELESS_EXT;
+        range->we_version_source = 9;
+
+        /* Set information in the range struct */
+        range->throughput = 1.1 * 1000 * 1000;  /* Put the right number here */
+        range->num_channels = hop_pattern_length[(int)country]; 
+        range->num_frequency = 0;
+        range->max_qual.qual = 0;
+        range->max_qual.level = 255;    /* What's the correct value ? */
+        range->max_qual.noise = 255;    /* Idem */
+        range->num_bitrates = 2;
+        range->bitrate[0] = 1000000;    /* 1 Mb/s */
+        range->bitrate[1] = 2000000;    /* 2 Mb/s */
+        return 0;
+}
 
-      /* ------------------ PRIVATE IOCTL ------------------ */
-#ifndef SIOCIWFIRSTPRIV
-#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
-#endif /* SIOCIWFIRSTPRIV */
-#define SIOCSIPFRAMING  SIOCIWFIRSTPRIV         /* Set framing mode */
-#define SIOCGIPFRAMING  SIOCIWFIRSTPRIV + 1     /* Get framing mode */
-#define SIOCGIPCOUNTRY  SIOCIWFIRSTPRIV + 3     /* Get country code */
-    case SIOCSIPFRAMING:
-      if(!capable(CAP_NET_ADMIN))       /* For private IOCTLs, we need to check permissions */
-        {
-          err = -EPERM;
-          break;
-        }
-      translate = *(wrq->u.name);       /* Set framing mode */
-      break;
-    case SIOCGIPFRAMING:
-      *(wrq->u.name) = translate;
-      break;
-    case SIOCGIPCOUNTRY:
-      *(wrq->u.name) = country;
-      break;
-    case SIOCGIWPRIV:
-      /* Export our "private" intercace */
-      if(wrq->u.data.pointer != (caddr_t) 0)
-        {
-          struct iw_priv_args   priv[] =
-          {     /* cmd,         set_args,       get_args,       name */
-            { SIOCSIPFRAMING, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, 0, "set_framing" },
-            { SIOCGIPFRAMING, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_framing" },
-            { SIOCGIPCOUNTRY, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_country" },
-          };
-          /* Set the number of ioctl available */
-          wrq->u.data.length = 3;
-          /* Copy structure to the user buffer */
-          if(copy_to_user(wrq->u.data.pointer, (u_char *) priv,
-                       sizeof(priv)))
-            err = -EFAULT;
-        }
-      break;
-#endif  /* WIRELESS_EXT > 7 */
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Private Handler : set framing mode
+ */
+static int ray_set_framing(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu,
+                           char *extra)
+{
+        translate = *(extra);   /* Set framing mode */
 
+        return 0;
+}
 
-        default:
-            DEBUG(0,"ray_dev_ioctl cmd = 0x%x\n", cmd);
-            err = -EOPNOTSUPP;
-    }
-    return err;
-} /* end ray_dev_ioctl */
-/*===========================================================================*/
-#if WIRELESS_EXT > 7    /* If wireless extension exist in the kernel */
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Private Handler : get framing mode
+ */
+static int ray_get_framing(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu,
+                           char *extra)
+{
+        *(extra) = translate;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Private Handler : get country
+ */
+static int ray_get_country(struct net_device *dev,
+                           struct iw_request_info *info,
+                           union iwreq_data *wrqu,
+                           char *extra)
+{
+        *(extra) = country;
+
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Commit handler : called after a bunch of SET operations
+ */
+static int ray_commit(struct net_device *dev,
+                      struct iw_request_info *info,     /* NULL */
+                      void *zwrq,                       /* NULL */
+                      char *extra)                      /* NULL */
+{
+        return 0;
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Stats handler : return Wireless Stats
+ */
 static iw_stats * ray_get_wireless_stats(struct net_device *    dev)
 {
   ray_dev_t *   local = (ray_dev_t *) dev->priv;
@@ -1642,13 +1625,13 @@ static iw_stats * ray_get_wireless_stats(struct net_device *	dev)
 
   local->wstats.status = local->card_status;
 #ifdef WIRELESS_SPY
-  if((local->spy_number > 0) && (local->sparm.b5.a_network_type == 0))
+  if((local->spy_data.spy_number > 0) && (local->sparm.b5.a_network_type == 0))
     {
       /* Get it from the first node in spy list */
-      local->wstats.qual.qual = local->spy_stat[0].qual;
-      local->wstats.qual.level = local->spy_stat[0].level;
-      local->wstats.qual.noise = local->spy_stat[0].noise;
-      local->wstats.qual.updated = local->spy_stat[0].updated;
+      local->wstats.qual.qual = local->spy_data.spy_stat[0].qual;
+      local->wstats.qual.level = local->spy_data.spy_stat[0].level;
+      local->wstats.qual.noise = local->spy_data.spy_stat[0].noise;
+      local->wstats.qual.updated = local->spy_data.spy_stat[0].updated;
     }
 #endif /* WIRELESS_SPY */
 
@@ -1659,7 +1642,65 @@ static iw_stats * ray_get_wireless_stats(struct net_device *	dev)
 
   return &local->wstats;
 } /* end ray_get_wireless_stats */
-#endif  /* WIRELESS_EXT > 7 */
+
+/*------------------------------------------------------------------*/
+/*
+ * Structures to export the Wireless Handlers
+ */
+
+static const iw_handler ray_handler[] = {
+        [SIOCSIWCOMMIT-SIOCIWFIRST] (iw_handler) ray_commit,
+        [SIOCGIWNAME  -SIOCIWFIRST] (iw_handler) ray_get_name,
+        [SIOCSIWFREQ  -SIOCIWFIRST] (iw_handler) ray_set_freq,
+        [SIOCGIWFREQ  -SIOCIWFIRST] (iw_handler) ray_get_freq,
+        [SIOCSIWMODE  -SIOCIWFIRST] (iw_handler) ray_set_mode,
+        [SIOCGIWMODE  -SIOCIWFIRST] (iw_handler) ray_get_mode,
+        [SIOCGIWRANGE -SIOCIWFIRST] (iw_handler) ray_get_range,
+#ifdef WIRELESS_SPY
+        [SIOCSIWSPY   -SIOCIWFIRST] (iw_handler) iw_handler_set_spy,
+        [SIOCGIWSPY   -SIOCIWFIRST] (iw_handler) iw_handler_get_spy,
+        [SIOCSIWTHRSPY-SIOCIWFIRST] (iw_handler) iw_handler_set_thrspy,
+        [SIOCGIWTHRSPY-SIOCIWFIRST] (iw_handler) iw_handler_get_thrspy,
+#endif  /* WIRELESS_SPY */
+        [SIOCGIWAP    -SIOCIWFIRST] (iw_handler) ray_get_wap,
+        [SIOCSIWESSID -SIOCIWFIRST] (iw_handler) ray_set_essid,
+        [SIOCGIWESSID -SIOCIWFIRST] (iw_handler) ray_get_essid,
+        [SIOCSIWRATE  -SIOCIWFIRST] (iw_handler) ray_set_rate,
+        [SIOCGIWRATE  -SIOCIWFIRST] (iw_handler) ray_get_rate,
+        [SIOCSIWRTS   -SIOCIWFIRST] (iw_handler) ray_set_rts,
+        [SIOCGIWRTS   -SIOCIWFIRST] (iw_handler) ray_get_rts,
+        [SIOCSIWFRAG  -SIOCIWFIRST] (iw_handler) ray_set_frag,
+        [SIOCGIWFRAG  -SIOCIWFIRST] (iw_handler) ray_get_frag,
+};
+
+#define SIOCSIPFRAMING  SIOCIWFIRSTPRIV         /* Set framing mode */
+#define SIOCGIPFRAMING  SIOCIWFIRSTPRIV + 1     /* Get framing mode */
+#define SIOCGIPCOUNTRY  SIOCIWFIRSTPRIV + 3     /* Get country code */
+
+static const iw_handler ray_private_handler[] = {
+        [0] (iw_handler) ray_set_framing,
+        [1] (iw_handler) ray_get_framing,
+        [3] (iw_handler) ray_get_country,
+};
+
+static const struct iw_priv_args        ray_private_args[] = {
+/* cmd,         set_args,       get_args,       name */
+{ SIOCSIPFRAMING, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, 0, "set_framing" },
+{ SIOCGIPFRAMING, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_framing" },
+{ SIOCGIPCOUNTRY, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_country" },
+};
+
+static const struct iw_handler_def      ray_handler_def =
+{
+        .num_standard   = sizeof(ray_handler)/sizeof(iw_handler),
+        .num_private    = sizeof(ray_private_handler)/sizeof(iw_handler),
+        .num_private_args = sizeof(ray_private_args)/sizeof(struct iw_priv_args),
+        .standard       = ray_handler,
+        .private        = ray_private_handler,
+        .private_args   = ray_private_args,
+        .get_wireless_stats = ray_get_wireless_stats,
+};
+
 /*===========================================================================*/
 static int ray_open(struct net_device *dev)
 {
@@ -2392,20 +2433,15 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, unsigned i
         /*local->wstats.qual.noise = none ? */
         local->wstats.qual.updated = 0x2;
       }
-    /* Now, for the addresses in the spy list */
+    /* Now, update the spy stuff */
     {
-      int       i;
-      /* Look all addresses */
-      for(i = 0; i < local->spy_number; i++)
-        /* If match */
-        if(!memcmp(linksrcaddr, local->spy_address[i], ETH_ALEN))
-          {
-            /* Update statistics */
-            /*local->spy_stat[i].qual = none ? */
-            local->spy_stat[i].level = siglev;
-            /*local->spy_stat[i].noise = none ? */
-            local->spy_stat[i].updated = 0x2;
-          }
+        struct iw_quality wstats;
+        wstats.level = siglev;
+        /* wstats.noise = none ? */
+        /* wstats.qual = none ? */
+        wstats.updated = 0x2;
+        /* Update spy records */
+        wireless_spy_update(dev, linksrcaddr, &wstats);
     }
 #endif  /* WIRELESS_SPY */
 } /* end rx_data */
diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h
index c77afa14fa86..42660fe64bfd 100644
--- a/drivers/net/wireless/ray_cs.h
+++ b/drivers/net/wireless/ray_cs.h
@@ -63,13 +63,10 @@ typedef struct ray_dev_t {
     UCHAR last_rsl;
     int beacon_rxed;
     struct beacon_rx last_bcn;
-#ifdef WIRELESS_EXT
     iw_stats    wstats;         /* Wireless specific stats */
-#endif
 #ifdef WIRELESS_SPY
-    int         spy_number;             /* Number of addresses to spy */
-    mac_addr    spy_address[IW_MAX_SPY + 1];    /* The addresses to spy */
-    iw_qual     spy_stat[IW_MAX_SPY + 1];       /* Statistics gathered */
+    struct iw_spy_data          spy_data;
+    struct iw_public_data       wireless_data;
 #endif  /* WIRELESS_SPY */
 
 } ray_dev_t;
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
new file mode 100644
index 000000000000..39c6cdf7f3f7
--- /dev/null
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -0,0 +1,1120 @@
+/*
+ * Driver for 802.11b cards using RAM-loadable Symbol firmware, such as
+ * Symbol Wireless Networker LA4100, CompactFlash cards by Socket
+ * Communications and Intel PRO/Wireless 2011B.
+ *
+ * The driver implements Symbol firmware download.  The rest is handled
+ * in hermes.c and orinoco.c.
+ *
+ * Utilities for downloading the Symbol firmware are available at
+ * http://sourceforge.net/projects/orinoco/
+ *
+ * Copyright (C) 2002-2005 Pavel Roskin <proski@gnu.org>
+ * Portions based on orinoco_cs.c:
+ *      Copyright (C) David Gibson, Linuxcare Australia
+ * Portions based on Spectrum24tDnld.c from original spectrum24 driver:
+ *      Copyright (C) Symbol Technologies.
+ *
+ * See copyright notice in file orinoco.c.
+ */
+
+#define DRIVER_NAME "spectrum_cs"
+#define PFX DRIVER_NAME ": "
+
+#include <linux/config.h>
+#ifdef  __IN_PCMCIA_PACKAGE__
+#include <pcmcia/k_compat.h>
+#endif /* __IN_PCMCIA_PACKAGE__ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/ioport.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/etherdevice.h>
+#include <linux/wireless.h>
+
+#include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/cisreg.h>
+#include <pcmcia/ds.h>
+
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
+#include "orinoco.h"
+
+/*
+ * If SPECTRUM_FW_INCLUDED is defined, the firmware is hardcoded into
+ * the driver.  Use get_symbol_fw script to generate spectrum_fw.h and
+ * copy it to the same directory as spectrum_cs.c.
+ *
+ * If SPECTRUM_FW_INCLUDED is not defined, the firmware is loaded at the
+ * runtime using hotplug.  Use the same get_symbol_fw script to generate
+ * files symbol_sp24t_prim_fw symbol_sp24t_sec_fw, copy them to the
+ * hotplug firmware directory (typically /usr/lib/hotplug/firmware) and
+ * make sure that you have hotplug installed and enabled in the kernel.
+ */
+/* #define SPECTRUM_FW_INCLUDED 1 */
+
+#ifdef SPECTRUM_FW_INCLUDED
+/* Header with the firmware */
+#include "spectrum_fw.h"
+#else   /* !SPECTRUM_FW_INCLUDED */
+#include <linux/firmware.h>
+static unsigned char *primsym;
+static unsigned char *secsym;
+static const char primary_fw_name[] = "symbol_sp24t_prim_fw";
+static const char secondary_fw_name[] = "symbol_sp24t_sec_fw";
+#endif  /* !SPECTRUM_FW_INCLUDED */
+
+/********************************************************************/
+/* Module stuff                                                     */
+/********************************************************************/
+
+MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>");
+MODULE_DESCRIPTION("Driver for Symbol Spectrum24 Trilogy cards with firmware downloader");
+MODULE_LICENSE("Dual MPL/GPL");
+
+/* Module parameters */
+
+/* Some D-Link cards have buggy CIS. They do work at 5v properly, but
+ * don't have any CIS entry for it. This workaround it... */
+static int ignore_cis_vcc; /* = 0 */
+module_param(ignore_cis_vcc, int, 0);
+MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket");
+
+/********************************************************************/
+/* Magic constants                                                  */
+/********************************************************************/
+
+/*
+ * The dev_info variable is the "key" that is used to match up this
+ * device driver with appropriate cards, through the card
+ * configuration database.
+ */
+static dev_info_t dev_info = DRIVER_NAME;
+
+/********************************************************************/
+/* Data structures                                                  */
+/********************************************************************/
+
+/* PCMCIA specific device information (goes in the card field of
+ * struct orinoco_private */
+struct orinoco_pccard {
+        dev_link_t link;
+        dev_node_t node;
+};
+
+/*
+ * A linked list of "instances" of the device.  Each actual PCMCIA
+ * card corresponds to one device instance, and is described by one
+ * dev_link_t structure (defined in ds.h).
+ */
+static dev_link_t *dev_list; /* = NULL */
+
+/********************************************************************/
+/* Function prototypes                                              */
+/********************************************************************/
+
+/* device methods */
+static int spectrum_cs_hard_reset(struct orinoco_private *priv);
+
+/* PCMCIA gumpf */
+static void spectrum_cs_config(dev_link_t * link);
+static void spectrum_cs_release(dev_link_t * link);
+static int spectrum_cs_event(event_t event, int priority,
+                            event_callback_args_t * args);
+
+static dev_link_t *spectrum_cs_attach(void);
+static void spectrum_cs_detach(dev_link_t *);
+
+/********************************************************************/
+/* Firmware downloader                                              */
+/********************************************************************/
+
+/* Position of PDA in the adapter memory */
+#define EEPROM_ADDR     0x3000
+#define EEPROM_LEN      0x200
+#define PDA_OFFSET      0x100
+
+#define PDA_ADDR        (EEPROM_ADDR + PDA_OFFSET)
+#define PDA_WORDS       ((EEPROM_LEN - PDA_OFFSET) / 2)
+
+/* Constants for the CISREG_CCSR register */
+#define HCR_RUN         0x07    /* run firmware after reset */
+#define HCR_IDLE        0x0E    /* don't run firmware after reset */
+#define HCR_MEM16       0x10    /* memory width bit, should be preserved */
+
+/*
+ * AUX port access.  To unlock the AUX port write the access keys to the
+ * PARAM0-2 registers, then write HERMES_AUX_ENABLE to the HERMES_CONTROL
+ * register.  Then read it and make sure it's HERMES_AUX_ENABLED.
+ */
+#define HERMES_AUX_ENABLE       0x8000  /* Enable auxiliary port access */
+#define HERMES_AUX_DISABLE      0x4000  /* Disable to auxiliary port access */
+#define HERMES_AUX_ENABLED      0xC000  /* Auxiliary port is open */
+
+#define HERMES_AUX_PW0  0xFE01
+#define HERMES_AUX_PW1  0xDC23
+#define HERMES_AUX_PW2  0xBA45
+
+/* End markers */
+#define PDI_END         0x00000000      /* End of PDA */
+#define BLOCK_END       0xFFFFFFFF      /* Last image block */
+#define TEXT_END        0x1A            /* End of text header */
+
+/*
+ * The following structures have little-endian fields denoted by
+ * the leading underscore.  Don't access them directly - use inline
+ * functions defined below.
+ */
+
+/*
+ * The binary image to be downloaded consists of series of data blocks.
+ * Each block has the following structure.
+ */
+struct dblock {
+        u32 _addr;              /* adapter address where to write the block */
+        u16 _len;               /* length of the data only, in bytes */
+        char data[0];           /* data to be written */
+} __attribute__ ((packed));
+
+/*
+ * Plug Data References are located in in the image after the last data
+ * block.  They refer to areas in the adapter memory where the plug data
+ * items with matching ID should be written.
+ */
+struct pdr {
+        u32 _id;                /* record ID */
+        u32 _addr;              /* adapter address where to write the data */
+        u32 _len;               /* expected length of the data, in bytes */
+        char next[0];           /* next PDR starts here */
+} __attribute__ ((packed));
+
+
+/*
+ * Plug Data Items are located in the EEPROM read from the adapter by
+ * primary firmware.  They refer to the device-specific data that should
+ * be plugged into the secondary firmware.
+ */
+struct pdi {
+        u16 _len;               /* length of ID and data, in words */
+        u16 _id;                /* record ID */
+        char data[0];           /* plug data */
+} __attribute__ ((packed));;
+
+
+/* Functions for access to little-endian data */
+static inline u32
+dblock_addr(const struct dblock *blk)
+{
+        return le32_to_cpu(blk->_addr);
+}
+
+static inline u32
+dblock_len(const struct dblock *blk)
+{
+        return le16_to_cpu(blk->_len);
+}
+
+static inline u32
+pdr_id(const struct pdr *pdr)
+{
+        return le32_to_cpu(pdr->_id);
+}
+
+static inline u32
+pdr_addr(const struct pdr *pdr)
+{
+        return le32_to_cpu(pdr->_addr);
+}
+
+static inline u32
+pdr_len(const struct pdr *pdr)
+{
+        return le32_to_cpu(pdr->_len);
+}
+
+static inline u32
+pdi_id(const struct pdi *pdi)
+{
+        return le16_to_cpu(pdi->_id);
+}
+
+/* Return length of the data only, in bytes */
+static inline u32
+pdi_len(const struct pdi *pdi)
+{
+        return 2 * (le16_to_cpu(pdi->_len) - 1);
+}
+
+
+/* Set address of the auxiliary port */
+static inline void
+spectrum_aux_setaddr(hermes_t *hw, u32 addr)
+{
+        hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr >> 7));
+        hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr & 0x7F));
+}
+
+
+/* Open access to the auxiliary port */
+static int
+spectrum_aux_open(hermes_t *hw)
+{
+        int i;
+
+        /* Already open? */
+        if (hermes_read_reg(hw, HERMES_CONTROL) == HERMES_AUX_ENABLED)
+                return 0;
+
+        hermes_write_reg(hw, HERMES_PARAM0, HERMES_AUX_PW0);
+        hermes_write_reg(hw, HERMES_PARAM1, HERMES_AUX_PW1);
+        hermes_write_reg(hw, HERMES_PARAM2, HERMES_AUX_PW2);
+        hermes_write_reg(hw, HERMES_CONTROL, HERMES_AUX_ENABLE);
+
+        for (i = 0; i < 20; i++) {
+                udelay(10);
+                if (hermes_read_reg(hw, HERMES_CONTROL) ==
+                    HERMES_AUX_ENABLED)
+                        return 0;
+        }
+
+        return -EBUSY;
+}
+
+
+#define CS_CHECK(fn, ret) \
+  do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+
+/*
+ * Reset the card using configuration registers COR and CCSR.
+ * If IDLE is 1, stop the firmware, so that it can be safely rewritten.
+ */
+static int
+spectrum_reset(dev_link_t *link, int idle)
+{
+        int last_ret, last_fn;
+        conf_reg_t reg;
+        u_int save_cor;
+
+        /* Doing it if hardware is gone is guaranteed crash */
+        if (!(link->state & DEV_CONFIG))
+                return -ENODEV;
+
+        /* Save original COR value */
+        reg.Function = 0;
+        reg.Action = CS_READ;
+        reg.Offset = CISREG_COR;
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        save_cor = reg.Value;
+
+        /* Soft-Reset card */
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_COR;
+        reg.Value = (save_cor | COR_SOFT_RESET);
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        udelay(1000);
+
+        /* Read CCSR */
+        reg.Action = CS_READ;
+        reg.Offset = CISREG_CCSR;
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+
+        /*
+         * Start or stop the firmware.  Memory width bit should be
+         * preserved from the value we've just read.
+         */
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_CCSR;
+        reg.Value = (idle ? HCR_IDLE : HCR_RUN) | (reg.Value & HCR_MEM16);
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        udelay(1000);
+
+        /* Restore original COR configuration index */
+        reg.Action = CS_WRITE;
+        reg.Offset = CISREG_COR;
+        reg.Value = (save_cor & ~COR_SOFT_RESET);
+        CS_CHECK(AccessConfigurationRegister,
+                 pcmcia_access_configuration_register(link->handle, &reg));
+        udelay(1000);
+        return 0;
+
+      cs_failed:
+        cs_error(link->handle, last_fn, last_ret);
+        return -ENODEV;
+}
+
+
+/*
+ * Scan PDR for the record with the specified RECORD_ID.
+ * If it's not found, return NULL.
+ */
+static struct pdr *
+spectrum_find_pdr(struct pdr *first_pdr, u32 record_id)
+{
+        struct pdr *pdr = first_pdr;
+
+        while (pdr_id(pdr) != PDI_END) {
+                /*
+                 * PDR area is currently not terminated by PDI_END.
+                 * It's followed by CRC records, which have the type
+                 * field where PDR has length.  The type can be 0 or 1.
+                 */
+                if (pdr_len(pdr) < 2)
+                        return NULL;
+
+                /* If the record ID matches, we are done */
+                if (pdr_id(pdr) == record_id)
+                        return pdr;
+
+                pdr = (struct pdr *) pdr->next;
+        }
+        return NULL;
+}
+
+
+/* Process one Plug Data Item - find corresponding PDR and plug it */
+static int
+spectrum_plug_pdi(hermes_t *hw, struct pdr *first_pdr, struct pdi *pdi)
+{
+        struct pdr *pdr;
+
+        /* Find the PDI corresponding to this PDR */
+        pdr = spectrum_find_pdr(first_pdr, pdi_id(pdi));
+
+        /* No match is found, safe to ignore */
+        if (!pdr)
+                return 0;
+
+        /* Lengths of the data in PDI and PDR must match */
+        if (pdi_len(pdi) != pdr_len(pdr))
+                return -EINVAL;
+
+        /* do the actual plugging */
+        spectrum_aux_setaddr(hw, pdr_addr(pdr));
+        hermes_write_words(hw, HERMES_AUXDATA, pdi->data,
+                           pdi_len(pdi) / 2);
+
+        return 0;
+}
+
+
+/* Read PDA from the adapter */
+static int
+spectrum_read_pda(hermes_t *hw, u16 *pda, int pda_len)
+{
+        int ret;
+        int pda_size;
+
+        /* Issue command to read EEPROM */
+        ret = hermes_docmd_wait(hw, HERMES_CMD_READMIF, 0, NULL);
+        if (ret)
+                return ret;
+
+        /* Open auxiliary port */
+        ret = spectrum_aux_open(hw);
+        if (ret)
+                return ret;
+
+        /* read PDA from EEPROM */
+        spectrum_aux_setaddr(hw, PDA_ADDR);
+        hermes_read_words(hw, HERMES_AUXDATA, pda, pda_len / 2);
+
+        /* Check PDA length */
+        pda_size = le16_to_cpu(pda[0]);
+        if (pda_size > pda_len)
+                return -EINVAL;
+
+        return 0;
+}
+
+
+/* Parse PDA and write the records into the adapter */
+static int
+spectrum_apply_pda(hermes_t *hw, const struct dblock *first_block,
+                   u16 *pda)
+{
+        int ret;
+        struct pdi *pdi;
+        struct pdr *first_pdr;
+        const struct dblock *blk = first_block;
+
+        /* Skip all blocks to locate Plug Data References */
+        while (dblock_addr(blk) != BLOCK_END)
+                blk = (struct dblock *) &blk->data[dblock_len(blk)];
+
+        first_pdr = (struct pdr *) blk;
+
+        /* Go through every PDI and plug them into the adapter */
+        pdi = (struct pdi *) (pda + 2);
+        while (pdi_id(pdi) != PDI_END) {
+                ret = spectrum_plug_pdi(hw, first_pdr, pdi);
+                if (ret)
+                        return ret;
+
+                /* Increment to the next PDI */
+                pdi = (struct pdi *) &pdi->data[pdi_len(pdi)];
+        }
+        return 0;
+}
+
+
+/* Load firmware blocks into the adapter */
+static int
+spectrum_load_blocks(hermes_t *hw, const struct dblock *first_block)
+{
+        const struct dblock *blk;
+        u32 blkaddr;
+        u32 blklen;
+
+        blk = first_block;
+        blkaddr = dblock_addr(blk);
+        blklen = dblock_len(blk);
+
+        while (dblock_addr(blk) != BLOCK_END) {
+                spectrum_aux_setaddr(hw, blkaddr);
+                hermes_write_words(hw, HERMES_AUXDATA, blk->data,
+                                   blklen / 2);
+
+                blk = (struct dblock *) &blk->data[blklen];
+                blkaddr = dblock_addr(blk);
+                blklen = dblock_len(blk);
+        }
+        return 0;
+}
+
+
+/*
+ * Process a firmware image - stop the card, load the firmware, reset
+ * the card and make sure it responds.  For the secondary firmware take
+ * care of the PDA - read it and then write it on top of the firmware.
+ */
+static int
+spectrum_dl_image(hermes_t *hw, dev_link_t *link,
+                  const unsigned char *image)
+{
+        int ret;
+        const unsigned char *ptr;
+        const struct dblock *first_block;
+
+        /* Plug Data Area (PDA) */
+        u16 pda[PDA_WORDS];
+
+        /* Binary block begins after the 0x1A marker */
+        ptr = image;
+        while (*ptr++ != TEXT_END);
+        first_block = (const struct dblock *) ptr;
+
+        /* Read the PDA */
+        if (image != primsym) {
+                ret = spectrum_read_pda(hw, pda, sizeof(pda));
+                if (ret)
+                        return ret;
+        }
+
+        /* Stop the firmware, so that it can be safely rewritten */
+        ret = spectrum_reset(link, 1);
+        if (ret)
+                return ret;
+
+        /* Program the adapter with new firmware */
+        ret = spectrum_load_blocks(hw, first_block);
+        if (ret)
+                return ret;
+
+        /* Write the PDA to the adapter */
+        if (image != primsym) {
+                ret = spectrum_apply_pda(hw, first_block, pda);
+                if (ret)
+                        return ret;
+        }
+
+        /* Run the firmware */
+        ret = spectrum_reset(link, 0);
+        if (ret)
+                return ret;
+
+        /* Reset hermes chip and make sure it responds */
+        ret = hermes_init(hw);
+
+        /* hermes_reset() should return 0 with the secondary firmware */
+        if (image != primsym && ret != 0)
+                return -ENODEV;
+
+        /* And this should work with any firmware */
+        if (!hermes_present(hw))
+                return -ENODEV;
+
+        return 0;
+}
+
+
+/*
+ * Download the firmware into the card, this also does a PCMCIA soft
+ * reset on the card, to make sure it's in a sane state.
+ */
+static int
+spectrum_dl_firmware(hermes_t *hw, dev_link_t *link)
+{
+        int ret;
+        client_handle_t handle = link->handle;
+
+#ifndef SPECTRUM_FW_INCLUDED
+        const struct firmware *fw_entry;
+
+        if (request_firmware(&fw_entry, primary_fw_name,
+                             &handle_to_dev(handle)) == 0) {
+                primsym = fw_entry->data;
+        } else {
+                printk(KERN_ERR PFX "Cannot find firmware: %s\n",
+                       primary_fw_name);
+                return -ENOENT;
+        }
+
+        if (request_firmware(&fw_entry, secondary_fw_name,
+                             &handle_to_dev(handle)) == 0) {
+                secsym = fw_entry->data;
+        } else {
+                printk(KERN_ERR PFX "Cannot find firmware: %s\n",
+                       secondary_fw_name);
+                return -ENOENT;
+        }
+#endif
+
+        /* Load primary firmware */
+        ret = spectrum_dl_image(hw, link, primsym);
+        if (ret) {
+                printk(KERN_ERR PFX "Primary firmware download failed\n");
+                return ret;
+        }
+
+        /* Load secondary firmware */
+        ret = spectrum_dl_image(hw, link, secsym);
+
+        if (ret) {
+                printk(KERN_ERR PFX "Secondary firmware download failed\n");
+        }
+
+        return ret;
+}
+
+/********************************************************************/
+/* Device methods                                                   */
+/********************************************************************/
+
+static int
+spectrum_cs_hard_reset(struct orinoco_private *priv)
+{
+        struct orinoco_pccard *card = priv->card;
+        dev_link_t *link = &card->link;
+        int err;
+
+        if (!hermes_present(&priv->hw)) {
+                /* The firmware needs to be reloaded */
+                if (spectrum_dl_firmware(&priv->hw, &card->link) != 0) {
+                        printk(KERN_ERR PFX "Firmware download failed\n");
+                        err = -ENODEV;
+                }
+        } else {
+                /* Soft reset using COR and HCR */
+                spectrum_reset(link, 0);
+        }
+
+        return 0;
+}
+
+/********************************************************************/
+/* PCMCIA stuff                                                     */
+/********************************************************************/
+
+/*
+ * This creates an "instance" of the driver, allocating local data
+ * structures for one device.  The device is registered with Card
+ * Services.
+ * 
+ * The dev_link structure is initialized, but we don't actually
+ * configure the card at this point -- we wait until we receive a card
+ * insertion event.  */
+static dev_link_t *
+spectrum_cs_attach(void)
+{
+        struct net_device *dev;
+        struct orinoco_private *priv;
+        struct orinoco_pccard *card;
+        dev_link_t *link;
+        client_reg_t client_reg;
+        int ret;
+
+        dev = alloc_orinocodev(sizeof(*card), spectrum_cs_hard_reset);
+        if (! dev)
+                return NULL;
+        priv = netdev_priv(dev);
+        card = priv->card;
+
+        /* Link both structures together */
+        link = &card->link;
+        link->priv = dev;
+
+        /* Interrupt setup */
+        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
+        link->irq.Handler = orinoco_interrupt;
+        link->irq.Instance = dev; 
+
+        /* General socket configuration defaults can go here.  In this
+         * client, we assume very little, and rely on the CIS for
+         * almost everything.  In most clients, many details (i.e.,
+         * number, sizes, and attributes of IO windows) are fixed by
+         * the nature of the device, and can be hard-wired here. */
+        link->conf.Attributes = 0;
+        link->conf.IntType = INT_MEMORY_AND_IO;
+
+        /* Register with Card Services */
+        /* FIXME: need a lock? */
+        link->next = dev_list;
+        dev_list = link;
+
+        client_reg.dev_info = &dev_info;
+        client_reg.Version = 0x0210; /* FIXME: what does this mean? */
+        client_reg.event_callback_args.client_data = link;
+
+        ret = pcmcia_register_client(&link->handle, &client_reg);
+        if (ret != CS_SUCCESS) {
+                cs_error(link->handle, RegisterClient, ret);
+                spectrum_cs_detach(link);
+                return NULL;
+        }
+
+        return link;
+}                               /* spectrum_cs_attach */
+
+/*
+ * This deletes a driver "instance".  The device is de-registered with
+ * Card Services.  If it has been released, all local data structures
+ * are freed.  Otherwise, the structures will be freed when the device
+ * is released.
+ */
+static void spectrum_cs_detach(dev_link_t *link)
+{
+        dev_link_t **linkp;
+        struct net_device *dev = link->priv;
+
+        /* Locate device structure */
+        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
+                if (*linkp == link)
+                        break;
+
+        BUG_ON(*linkp == NULL);
+
+        if (link->state & DEV_CONFIG)
+                spectrum_cs_release(link);
+
+        /* Break the link with Card Services */
+        if (link->handle)
+                pcmcia_deregister_client(link->handle);
+
+        /* Unlink device structure, and free it */
+        *linkp = link->next;
+        DEBUG(0, PFX "detach: link=%p link->dev=%p\n", link, link->dev);
+        if (link->dev) {
+                DEBUG(0, PFX "About to unregister net device %p\n",
+                      dev);
+                unregister_netdev(dev);
+        }
+        free_orinocodev(dev);
+}                               /* spectrum_cs_detach */
+
+/*
+ * spectrum_cs_config() is scheduled to run after a CARD_INSERTION
+ * event is received, to configure the PCMCIA socket, and to make the
+ * device available to the system.
+ */
+
+static void
+spectrum_cs_config(dev_link_t *link)
+{
+        struct net_device *dev = link->priv;
+        client_handle_t handle = link->handle;
+        struct orinoco_private *priv = netdev_priv(dev);
+        struct orinoco_pccard *card = priv->card;
+        hermes_t *hw = &priv->hw;
+        int last_fn, last_ret;
+        u_char buf[64];
+        config_info_t conf;
+        cisinfo_t info;
+        tuple_t tuple;
+        cisparse_t parse;
+        void __iomem *mem;
+
+        CS_CHECK(ValidateCIS, pcmcia_validate_cis(handle, &info));
+
+        /*
+         * This reads the card's CONFIG tuple to find its
+         * configuration registers.
+         */
+        tuple.DesiredTuple = CISTPL_CONFIG;
+        tuple.Attributes = 0;
+        tuple.TupleData = buf;
+        tuple.TupleDataMax = sizeof(buf);
+        tuple.TupleOffset = 0;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        link->conf.ConfigBase = parse.config.base;
+        link->conf.Present = parse.config.rmask[0];
+
+        /* Configure card */
+        link->state |= DEV_CONFIG;
+
+        /* Look up the current Vcc */
+        CS_CHECK(GetConfigurationInfo,
+                 pcmcia_get_configuration_info(handle, &conf));
+        link->conf.Vcc = conf.Vcc;
+
+        /*
+         * In this loop, we scan the CIS for configuration table
+         * entries, each of which describes a valid card
+         * configuration, including voltage, IO window, memory window,
+         * and interrupt settings.
+         *
+         * We make no assumptions about the card to be configured: we
+         * use just the information available in the CIS.  In an ideal
+         * world, this would work for any PCMCIA card, but it requires
+         * a complete and accurate CIS.  In practice, a driver usually
+         * "knows" most of these things without consulting the CIS,
+         * and most client drivers will only use the CIS to fill in
+         * implementation-defined details.
+         */
+        tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        while (1) {
+                cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+                cistpl_cftable_entry_t dflt = { .index = 0 };
+
+                if ( (pcmcia_get_tuple_data(handle, &tuple) != 0)
+                    || (pcmcia_parse_tuple(handle, &tuple, &parse) != 0))
+                        goto next_entry;
+
+                if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
+                        dflt = *cfg;
+                if (cfg->index == 0)
+                        goto next_entry;
+                link->conf.ConfigIndex = cfg->index;
+
+                /* Does this card need audio output? */
+                if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
+                        link->conf.Attributes |= CONF_ENABLE_SPKR;
+                        link->conf.Status = CCSR_AUDIO_ENA;
+                }
+
+                /* Use power settings for Vcc and Vpp if present */
+                /* Note that the CIS values need to be rescaled */
+                if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+                                if (!ignore_cis_vcc)
+                                        goto next_entry;
+                        }
+                } else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
+                        if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
+                                DEBUG(2, "spectrum_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
+                                if(!ignore_cis_vcc)
+                                        goto next_entry;
+                        }
+                }
+
+                if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                            cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                else if (dflt.vpp1.present & (1 << CISTPL_POWER_VNOM))
+                        link->conf.Vpp1 = link->conf.Vpp2 =
+                            dflt.vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                
+                /* Do we need to allocate an interrupt? */
+                link->conf.Attributes |= CONF_ENABLE_IRQ;
+
+                /* IO window settings */
+                link->io.NumPorts1 = link->io.NumPorts2 = 0;
+                if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
+                        cistpl_io_t *io =
+                            (cfg->io.nwin) ? &cfg->io : &dflt.io;
+                        link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                        if (!(io->flags & CISTPL_IO_8BIT))
+                                link->io.Attributes1 =
+                                    IO_DATA_PATH_WIDTH_16;
+                        if (!(io->flags & CISTPL_IO_16BIT))
+                                link->io.Attributes1 =
+                                    IO_DATA_PATH_WIDTH_8;
+                        link->io.IOAddrLines =
+                            io->flags & CISTPL_IO_LINES_MASK;
+                        link->io.BasePort1 = io->win[0].base;
+                        link->io.NumPorts1 = io->win[0].len;
+                        if (io->nwin > 1) {
+                                link->io.Attributes2 =
+                                    link->io.Attributes1;
+                                link->io.BasePort2 = io->win[1].base;
+                                link->io.NumPorts2 = io->win[1].len;
+                        }
+
+                        /* This reserves IO space but doesn't actually enable it */
+                        if (pcmcia_request_io(link->handle, &link->io) != 0)
+                                goto next_entry;
+                }
+
+
+                /* If we got this far, we're cool! */
+
+                break;
+                
+        next_entry:
+                if (link->io.NumPorts1)
+                        pcmcia_release_io(link->handle, &link->io);
+                last_ret = pcmcia_get_next_tuple(handle, &tuple);
+                if (last_ret  == CS_NO_MORE_ITEMS) {
+                        printk(KERN_ERR PFX "GetNextTuple(): No matching "
+                               "CIS configuration.  Maybe you need the "
+                               "ignore_cis_vcc=1 parameter.\n");
+                        goto cs_failed;
+                }
+        }
+
+        /*
+         * Allocate an interrupt line.  Note that this does not assign
+         * a handler to the interrupt, unless the 'Handler' member of
+         * the irq structure is initialized.
+         */
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+
+        /* We initialize the hermes structure before completing PCMCIA
+         * configuration just in case the interrupt handler gets
+         * called. */
+        mem = ioport_map(link->io.BasePort1, link->io.NumPorts1);
+        if (!mem)
+                goto cs_failed;
+
+        hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
+
+        /*
+         * This actually configures the PCMCIA socket -- setting up
+         * the I/O windows and the interrupt mapping, and putting the
+         * card and host interface into "Memory and IO" mode.
+         */
+        CS_CHECK(RequestConfiguration,
+                 pcmcia_request_configuration(link->handle, &link->conf));
+
+        /* Ok, we have the configuration, prepare to register the netdev */
+        dev->base_addr = link->io.BasePort1;
+        dev->irq = link->irq.AssignedIRQ;
+        SET_MODULE_OWNER(dev);
+        card->node.major = card->node.minor = 0;
+
+        /* Reset card and download firmware */
+        if (spectrum_cs_hard_reset(priv) != 0) {
+                goto failed;
+        }
+
+        SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+        /* Tell the stack we exist */
+        if (register_netdev(dev) != 0) {
+                printk(KERN_ERR PFX "register_netdev() failed\n");
+                goto failed;
+        }
+
+        /* At this point, the dev_node_t structure(s) needs to be
+         * initialized and arranged in a linked list at link->dev. */
+        strcpy(card->node.dev_name, dev->name);
+        link->dev = &card->node; /* link->dev being non-NULL is also
+                                    used to indicate that the
+                                    net_device has been registered */
+        link->state &= ~DEV_CONFIG_PENDING;
+
+        /* Finally, report what we've done */
+        printk(KERN_DEBUG "%s: index 0x%02x: Vcc %d.%d",
+               dev->name, link->conf.ConfigIndex,
+               link->conf.Vcc / 10, link->conf.Vcc % 10);
+        if (link->conf.Vpp1)
+                printk(", Vpp %d.%d", link->conf.Vpp1 / 10,
+                       link->conf.Vpp1 % 10);
+        printk(", irq %d", link->irq.AssignedIRQ);
+        if (link->io.NumPorts1)
+                printk(", io 0x%04x-0x%04x", link->io.BasePort1,
+                       link->io.BasePort1 + link->io.NumPorts1 - 1);
+        if (link->io.NumPorts2)
+                printk(" & 0x%04x-0x%04x", link->io.BasePort2,
+                       link->io.BasePort2 + link->io.NumPorts2 - 1);
+        printk("\n");
+
+        return;
+
+ cs_failed:
+        cs_error(link->handle, last_fn, last_ret);
+
+ failed:
+        spectrum_cs_release(link);
+}                               /* spectrum_cs_config */
+
+/*
+ * After a card is removed, spectrum_cs_release() will unregister the
+ * device, and release the PCMCIA configuration.  If the device is
+ * still open, this will be postponed until it is closed.
+ */
+static void
+spectrum_cs_release(dev_link_t *link)
+{
+        struct net_device *dev = link->priv;
+        struct orinoco_private *priv = netdev_priv(dev);
+        unsigned long flags;
+
+        /* We're committed to taking the device away now, so mark the
+         * hardware as unavailable */
+        spin_lock_irqsave(&priv->lock, flags);
+        priv->hw_unavailable++;
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        /* Don't bother checking to see if these succeed or not */
+        pcmcia_release_configuration(link->handle);
+        if (link->io.NumPorts1)
+                pcmcia_release_io(link->handle, &link->io);
+        if (link->irq.AssignedIRQ)
+                pcmcia_release_irq(link->handle, &link->irq);
+        link->state &= ~DEV_CONFIG;
+        if (priv->hw.iobase)
+                ioport_unmap(priv->hw.iobase);
+}                               /* spectrum_cs_release */
+
+/*
+ * The card status event handler.  Mostly, this schedules other stuff
+ * to run after an event is received.
+ */
+static int
+spectrum_cs_event(event_t event, int priority,
+                       event_callback_args_t * args)
+{
+        dev_link_t *link = args->client_data;
+        struct net_device *dev = link->priv;
+        struct orinoco_private *priv = netdev_priv(dev);
+        int err = 0;
+        unsigned long flags;
+
+        switch (event) {
+        case CS_EVENT_CARD_REMOVAL:
+                link->state &= ~DEV_PRESENT;
+                if (link->state & DEV_CONFIG) {
+                        unsigned long flags;
+
+                        spin_lock_irqsave(&priv->lock, flags);
+                        netif_device_detach(dev);
+                        priv->hw_unavailable++;
+                        spin_unlock_irqrestore(&priv->lock, flags);
+                }
+                break;
+
+        case CS_EVENT_CARD_INSERTION:
+                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+                spectrum_cs_config(link);
+                break;
+
+        case CS_EVENT_PM_SUSPEND:
+                link->state |= DEV_SUSPEND;
+                /* Fall through... */
+        case CS_EVENT_RESET_PHYSICAL:
+                /* Mark the device as stopped, to block IO until later */
+                if (link->state & DEV_CONFIG) {
+                        /* This is probably racy, but I can't think of
+                           a better way, short of rewriting the PCMCIA
+                           layer to not suck :-( */
+                        spin_lock_irqsave(&priv->lock, flags);
+
+                        err = __orinoco_down(dev);
+                        if (err)
+                                printk(KERN_WARNING "%s: %s: Error %d downing interface\n",
+                                       dev->name,
+                                       event == CS_EVENT_PM_SUSPEND ? "SUSPEND" : "RESET_PHYSICAL",
+                                       err);
+
+                        netif_device_detach(dev);
+                        priv->hw_unavailable++;
+
+                        spin_unlock_irqrestore(&priv->lock, flags);
+
+                        pcmcia_release_configuration(link->handle);
+                }
+                break;
+
+        case CS_EVENT_PM_RESUME:
+                link->state &= ~DEV_SUSPEND;
+                /* Fall through... */
+        case CS_EVENT_CARD_RESET:
+                if (link->state & DEV_CONFIG) {
+                        /* FIXME: should we double check that this is
+                         * the same card as we had before */
+                        pcmcia_request_configuration(link->handle, &link->conf);
+                        netif_device_attach(dev);
+                        priv->hw_unavailable--;
+                        schedule_work(&priv->reset_work);
+                }
+                break;
+        }
+
+        return err;
+}                               /* spectrum_cs_event */
+
+/********************************************************************/
+/* Module initialization                                            */
+/********************************************************************/
+
+/* Can't be declared "const" or the whole __initdata section will
+ * become const */
+static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
+        " (Pavel Roskin <proski@gnu.org>,"
+        " David Gibson <hermes@gibson.dropbear.id.au>, et al)";
+
+static struct pcmcia_device_id spectrum_cs_ids[] = {
+        PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4100 */
+        PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */
+        PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), /* Intel PRO/Wireless 2011B */
+        PCMCIA_DEVICE_NULL,
+};
+MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids);
+
+static struct pcmcia_driver orinoco_driver = {
+        .owner          = THIS_MODULE,
+        .drv            = {
+                .name   = DRIVER_NAME,
+        },
+        .attach         = spectrum_cs_attach,
+        .event          = spectrum_cs_event,
+        .detach         = spectrum_cs_detach,
+        .id_table       = spectrum_cs_ids,
+};
+
+static int __init
+init_spectrum_cs(void)
+{
+        printk(KERN_DEBUG "%s\n", version);
+
+        return pcmcia_register_driver(&orinoco_driver);
+}
+
+static void __exit
+exit_spectrum_cs(void)
+{
+        pcmcia_unregister_driver(&orinoco_driver);
+        BUG_ON(dev_list != NULL);
+}
+
+module_init(init_spectrum_cs);
+module_exit(exit_spectrum_cs);
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 6c42b573a95a..4b0acae22b0d 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -209,7 +209,7 @@ enum {
         NoStructure = 0,        /* Really old firmware */
         StructuredMessages = 1, /* Parsable AT response msgs */
         ChecksummedMessages = 2 /* Parsable AT response msgs with checksums */
-} FirmwareLevel;
+};
 
 struct strip {
         int magic;
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index f6130a53b796..183c4732ef65 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -59,6 +59,12 @@
 /* Do *NOT* add other headers here, you are guaranteed to be wrong - Jean II */
 #include "wavelan_cs.p.h"               /* Private header */
 
+#ifdef WAVELAN_ROAMING
+static void wl_cell_expiry(unsigned long data);
+static void wl_del_wavepoint(wavepoint_history *wavepoint, struct net_local *lp);
+static void wv_nwid_filter(unsigned char mode, net_local *lp);
+#endif  /*  WAVELAN_ROAMING  */
+
 /************************* MISC SUBROUTINES **************************/
 /*
  * Subroutines which won't fit in one of the following category
@@ -500,9 +506,9 @@ fee_write(u_long	base,	/* i/o port of the card */
 
 #ifdef WAVELAN_ROAMING  /* Conditional compile, see wavelan_cs.h */
 
-unsigned char WAVELAN_BEACON_ADDRESS[]= {0x09,0x00,0x0e,0x20,0x03,0x00};
+static unsigned char WAVELAN_BEACON_ADDRESS[] = {0x09,0x00,0x0e,0x20,0x03,0x00};
   
-void wv_roam_init(struct net_device *dev)
+static void wv_roam_init(struct net_device *dev)
 {
   net_local  *lp= netdev_priv(dev);
 
@@ -531,7 +537,7 @@ void wv_roam_init(struct net_device *dev)
   printk(KERN_DEBUG "WaveLAN: Roaming enabled on device %s\n",dev->name);
 }
  
-void wv_roam_cleanup(struct net_device *dev)
+static void wv_roam_cleanup(struct net_device *dev)
 {
   wavepoint_history *ptr,*old_ptr;
   net_local *lp= netdev_priv(dev);
@@ -550,7 +556,7 @@ void wv_roam_cleanup(struct net_device *dev)
 }
 
 /* Enable/Disable NWID promiscuous mode on a given device */
-void wv_nwid_filter(unsigned char mode, net_local *lp)
+static void wv_nwid_filter(unsigned char mode, net_local *lp)
 {
   mm_t                  m;
   unsigned long         flags;
@@ -575,7 +581,7 @@ void wv_nwid_filter(unsigned char mode, net_local *lp)
 }
 
 /* Find a record in the WavePoint table matching a given NWID */
-wavepoint_history *wl_roam_check(unsigned short nwid, net_local *lp)
+static wavepoint_history *wl_roam_check(unsigned short nwid, net_local *lp)
 {
   wavepoint_history     *ptr=lp->wavepoint_table.head;
   
@@ -588,7 +594,7 @@ wavepoint_history *wl_roam_check(unsigned short nwid, net_local *lp)
 }
 
 /* Create a new wavepoint table entry */
-wavepoint_history *wl_new_wavepoint(unsigned short nwid, unsigned char seq, net_local* lp)
+static wavepoint_history *wl_new_wavepoint(unsigned short nwid, unsigned char seq, net_local* lp)
 {
   wavepoint_history *new_wavepoint;
 
@@ -624,7 +630,7 @@ wavepoint_history *wl_new_wavepoint(unsigned short nwid, unsigned char seq, net_
 }
 
 /* Remove a wavepoint entry from WavePoint table */
-void wl_del_wavepoint(wavepoint_history *wavepoint, struct net_local *lp)
+static void wl_del_wavepoint(wavepoint_history *wavepoint, struct net_local *lp)
 {
   if(wavepoint==NULL)
     return;
@@ -646,7 +652,7 @@ void wl_del_wavepoint(wavepoint_history *wavepoint, struct net_local *lp)
 }
 
 /* Timer callback function - checks WavePoint table for stale entries */ 
-void wl_cell_expiry(unsigned long data)
+static void wl_cell_expiry(unsigned long data)
 {
   net_local *lp=(net_local *)data;
   wavepoint_history *wavepoint=lp->wavepoint_table.head,*old_point;
@@ -686,7 +692,7 @@ void wl_cell_expiry(unsigned long data)
 }
 
 /* Update SNR history of a wavepoint */
-void wl_update_history(wavepoint_history *wavepoint, unsigned char sigqual, unsigned char seq)  
+static void wl_update_history(wavepoint_history *wavepoint, unsigned char sigqual, unsigned char seq)   
 {
   int i=0,num_missed=0,ptr=0;
   int average_fast=0,average_slow=0;
@@ -723,7 +729,7 @@ void wl_update_history(wavepoint_history *wavepoint, unsigned char sigqual, unsi
 }
 
 /* Perform a handover to a new WavePoint */
-void wv_roam_handover(wavepoint_history *wavepoint, net_local *lp)
+static void wv_roam_handover(wavepoint_history *wavepoint, net_local *lp)
 {
   kio_addr_t            base = lp->dev->base_addr;
   mm_t                  m;
diff --git a/drivers/net/wireless/wavelan_cs.h b/drivers/net/wireless/wavelan_cs.h
index 29cff6daf860..fabc63ee153c 100644
--- a/drivers/net/wireless/wavelan_cs.h
+++ b/drivers/net/wireless/wavelan_cs.h
@@ -62,7 +62,7 @@
  * like DEC RoamAbout, or Digital Ocean, Epson, ...), you must modify this
  * part to accommodate your hardware...
  */
-const unsigned char     MAC_ADDRESSES[][3] =
+static const unsigned char      MAC_ADDRESSES[][3] =
 {
   { 0x08, 0x00, 0x0E },         /* AT&T Wavelan (standard) & DEC RoamAbout */
   { 0x08, 0x00, 0x6A },         /* AT&T Wavelan (alternate) */
@@ -79,14 +79,14 @@ const unsigned char	MAC_ADDRESSES[][3] =
  * (as read in the offset register of the dac area).
  * Used to map channel numbers used by `wfreqsel' to frequencies
  */
-const short     channel_bands[] = { 0x30, 0x58, 0x64, 0x7A, 0x80, 0xA8,
+static const short      channel_bands[] = { 0x30, 0x58, 0x64, 0x7A, 0x80, 0xA8,
                                     0xD0, 0xF0, 0xF8, 0x150 };
 
 /* Frequencies of the 1.0 modem (fixed frequencies).
  * Use to map the PSA `subband' to a frequency
  * Note : all frequencies apart from the first one need to be multiplied by 10
  */
-const int       fixed_bands[] = { 915e6, 2.425e8, 2.46e8, 2.484e8, 2.4305e8 };
+static const int        fixed_bands[] = { 915e6, 2.425e8, 2.46e8, 2.484e8, 2.4305e8 };
 
 
 /*************************** PC INTERFACE ****************************/
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 677ff71883cb..01d882be8790 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -647,23 +647,6 @@ struct net_local
   void __iomem *mem;
 };
 
-/**************************** PROTOTYPES ****************************/
-
-#ifdef WAVELAN_ROAMING
-/* ---------------------- ROAMING SUBROUTINES -----------------------*/
-
-wavepoint_history *wl_roam_check(unsigned short nwid, net_local *lp);
-wavepoint_history *wl_new_wavepoint(unsigned short nwid, unsigned char seq, net_local *lp);
-void wl_del_wavepoint(wavepoint_history *wavepoint, net_local *lp);
-void wl_cell_expiry(unsigned long data);
-wavepoint_history *wl_best_sigqual(int fast_search, net_local *lp);
-void wl_update_history(wavepoint_history *wavepoint, unsigned char sigqual, unsigned char seq);
-void wv_roam_handover(wavepoint_history *wavepoint, net_local *lp);
-void wv_nwid_filter(unsigned char mode, net_local *lp);
-void wv_roam_init(struct net_device *dev);
-void wv_roam_cleanup(struct net_device *dev);
-#endif  /* WAVELAN_ROAMING */
-
 /* ----------------- MODEM MANAGEMENT SUBROUTINES ----------------- */
 static inline u_char            /* data */
         hasr_read(u_long);      /* Read the host interface : base address */
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index 8636d9306785..7fcbe589c3f2 100644
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -2,7 +2,7 @@
 #define __WL3501_H__
 
 #include <linux/spinlock.h>
-#include "ieee802_11.h"
+#include <net/ieee80211.h>
 
 /* define for WLA 2.0 */
 #define WL3501_BLKSZ 256
@@ -548,7 +548,7 @@ struct wl3501_80211_tx_plcp_hdr {
 
 struct wl3501_80211_tx_hdr {
         struct wl3501_80211_tx_plcp_hdr pclp_hdr;
-        struct ieee802_11_hdr           mac_hdr;
+        struct ieee80211_hdr            mac_hdr;
 } __attribute__ ((packed));
 
 /*
@@ -609,6 +609,7 @@ struct wl3501_card {
         struct net_device_stats         stats;
         struct iw_statistics            wstats;
         struct iw_spy_data              spy_data;
+        struct iw_public_data           wireless_data;
         struct dev_node_t               node;
 };
 #endif
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index dd902126d018..3f8c27f0871b 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -296,7 +296,8 @@ static int wl3501_get_flash_mac_addr(struct wl3501_card *this)
  *
  * Move 'size' bytes from PC to card. (Shouldn't be interrupted)
  */
-void wl3501_set_to_wla(struct wl3501_card *this, u16 dest, void *src, int size)
+static void wl3501_set_to_wla(struct wl3501_card *this, u16 dest, void *src,
+                              int size)
 {
         /* switch to SRAM Page 0 */
         wl3501_switch_page(this, (dest & 0x8000) ? WL3501_BSS_SPAGE1 :
@@ -317,8 +318,8 @@ void wl3501_set_to_wla(struct wl3501_card *this, u16 dest, void *src, int size)
  *
  * Move 'size' bytes from card to PC. (Shouldn't be interrupted)
  */
-void wl3501_get_from_wla(struct wl3501_card *this, u16 src, void *dest,
-                         int size)
+static void wl3501_get_from_wla(struct wl3501_card *this, u16 src, void *dest,
+                                int size)
 {
         /* switch to SRAM Page 0 */
         wl3501_switch_page(this, (src & 0x8000) ? WL3501_BSS_SPAGE1 :
@@ -1438,14 +1439,14 @@ fail:
         goto out;
 }
 
-struct net_device_stats *wl3501_get_stats(struct net_device *dev)
+static struct net_device_stats *wl3501_get_stats(struct net_device *dev)
 {
         struct wl3501_card *this = dev->priv;
 
         return &this->stats;
 }
 
-struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)
+static struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)
 {
         struct wl3501_card *this = dev->priv;
         struct iw_statistics *wstats = &this->wstats;
@@ -1943,7 +1944,7 @@ static const iw_handler	wl3501_handler[] = {
 static const struct iw_handler_def wl3501_handler_def = {
         .num_standard   = sizeof(wl3501_handler) / sizeof(iw_handler),
         .standard       = (iw_handler *)wl3501_handler,
-        .spy_offset     = offsetof(struct wl3501_card, spy_data),
+        .get_wireless_stats = wl3501_get_wireless_stats,
 };
 
 /**
@@ -1960,6 +1961,7 @@ static dev_link_t *wl3501_attach(void)
         client_reg_t client_reg;
         dev_link_t *link;
         struct net_device *dev;
+        struct wl3501_card *this;
         int ret;
 
         /* Initialize the dev_link_t structure */
@@ -1994,7 +1996,9 @@ static dev_link_t *wl3501_attach(void)
         dev->tx_timeout         = wl3501_tx_timeout;
         dev->watchdog_timeo     = 5 * HZ;
         dev->get_stats          = wl3501_get_stats;
-        dev->get_wireless_stats = wl3501_get_wireless_stats;
+        this = dev->priv;
+        this->wireless_data.spy_data = &this->spy_data;
+        dev->wireless_data      = &this->wireless_data;
         dev->wireless_handlers  = (struct iw_handler_def *)&wl3501_handler_def;
         SET_ETHTOOL_OPS(dev, &ops);
         netif_stop_queue(dev);
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 4598c6a9212d..97f723179f62 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2739,6 +2739,7 @@ enum parport_pc_pci_cards {
         syba_2p_epp,
         syba_1p_ecp,
         titan_010l,
+        titan_1284p1,
         titan_1284p2,
         avlab_1p,
         avlab_2p,
@@ -2811,6 +2812,7 @@ static struct parport_pc_pci {
         /* syba_2p_epp AP138B */        { 2, { { 0, 0x078 }, { 0, 0x178 }, } },
         /* syba_1p_ecp W83787 */        { 1, { { 0, 0x078 }, } },
         /* titan_010l */                { 1, { { 3, -1 }, } },
+        /* titan_1284p1 */              { 1, { { 0, 1 }, } },
         /* titan_1284p2 */              { 2, { { 0, 1 }, { 2, 3 }, } },
         /* avlab_1p             */      { 1, { { 0, 1}, } },
         /* avlab_2p             */      { 2, { { 0, 1}, { 2, 3 },} },
@@ -2884,6 +2886,7 @@ static struct pci_device_id parport_pc_pci_tbl[] = {
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_1p_ecp },
         { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_010L,
           PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_010l },
+        { 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 },
         { 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 },
         /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
         { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p}, /* AFAVLAB_TK9902 */
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 2b85aa39f954..532f73bb2224 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -91,6 +91,7 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
 {
         struct msi_desc *entry;
         struct msg_address address;
+        unsigned int irq = vector;
 
         entry = (struct msi_desc *)msi_desc[vector];
         if (!entry || !entry->dev)
@@ -112,6 +113,7 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                 entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
                 pci_write_config_dword(entry->dev, msi_lower_address_reg(pos),
                         address.lo_address.value);
+                set_native_irq_info(irq, cpu_mask);
                 break;
         }
         case PCI_CAP_ID_MSIX:
@@ -125,22 +127,13 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                         MSI_TARGET_CPU_SHIFT);
                 entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
                 writel(address.lo_address.value, entry->mask_base + offset);
+                set_native_irq_info(irq, cpu_mask);
                 break;
         }
         default:
                 break;
         }
 }
-
-#ifdef CONFIG_IRQBALANCE
-static inline void move_msi(int vector)
-{
-        if (!cpus_empty(pending_irq_balance_cpumask[vector])) {
-                set_msi_affinity(vector, pending_irq_balance_cpumask[vector]);
-                cpus_clear(pending_irq_balance_cpumask[vector]);
-        }
-}
-#endif /* CONFIG_IRQBALANCE */
 #endif /* CONFIG_SMP */
 
 static void mask_MSI_irq(unsigned int vector)
@@ -191,13 +184,13 @@ static void shutdown_msi_irq(unsigned int vector)
 
 static void end_msi_irq_wo_maskbit(unsigned int vector)
 {
-        move_msi(vector);
+        move_native_irq(vector);
         ack_APIC_irq();
 }
 
 static void end_msi_irq_w_maskbit(unsigned int vector)
 {
-        move_msi(vector);
+        move_native_irq(vector);
         unmask_MSI_irq(vector);
         ack_APIC_irq();
 }
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index 390f1851c0f1..402136a5c9e4 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -19,7 +19,6 @@
 #define NR_HP_RESERVED_VECTORS  20
 
 extern int vector_irq[NR_VECTORS];
-extern cpumask_t pending_irq_balance_cpumask[NR_IRQS];
 extern void (*interrupt[NR_IRQS])(void);
 extern int pci_vector_resources(int last, int nr_released);
 
@@ -29,10 +28,6 @@ extern int pci_vector_resources(int last, int nr_released);
 #define set_msi_irq_affinity    NULL
 #endif
 
-#ifndef CONFIG_IRQBALANCE
-static inline void move_msi(int vector) {}
-#endif
-
 /*
  * MSI-X Address Register
  */
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1b34fc56067e..c62d2f043397 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -333,13 +333,17 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
         if (platform_pci_choose_state) {
                 ret = platform_pci_choose_state(dev, state);
                 if (ret >= 0)
-                        state = ret;
+                        state.event = ret;
         }
-        switch (state) {
-        case 0: return PCI_D0;
-        case 3: return PCI_D3hot;
+
+        switch (state.event) {
+        case PM_EVENT_ON:
+                return PCI_D0;
+        case PM_EVENT_FREEZE:
+        case PM_EVENT_SUSPEND:
+                return PCI_D3hot;
         default:
-                printk("They asked me for state %d\n", state);
+                printk("They asked me for state %d\n", state.event);
                 BUG();
         }
         return PCI_D0;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index bb36bb69803f..140354a2aa72 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -422,6 +422,25 @@ static void __devinit quirk_via_ioapic(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic );
 
 /*
+ * VIA 8237: Some BIOSs don't set the 'Bypass APIC De-Assert Message' Bit.
+ * This leads to doubled level interrupt rates.
+ * Set this bit to get rid of cycle wastage.
+ * Otherwise uncritical.
+ */
+static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
+{
+        u8 misc_control2;
+#define BYPASS_APIC_DEASSERT 8
+
+        pci_read_config_byte(dev, 0x5B, &misc_control2);
+        if (!(misc_control2 & BYPASS_APIC_DEASSERT)) {
+                printk(KERN_INFO "PCI: Bypassing VIA 8237 APIC De-Assert Message\n");
+                pci_write_config_byte(dev, 0x5B, misc_control2|BYPASS_APIC_DEASSERT);
+        }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
+
+/*
  * The AMD io apic can hang the box when an apic irq is masked.
  * We check all revs >= B0 (yet not in the pre production!) as the bug
  * is currently marked NoFix
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 713c78f3a65d..49bd21702314 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -21,13 +21,21 @@
  * between the ROM and other resources, so enabling it may disable access
  * to MMIO registers or other card memory.
  */
-static void pci_enable_rom(struct pci_dev *pdev)
+static int pci_enable_rom(struct pci_dev *pdev)
 {
+        struct resource *res = pdev->resource + PCI_ROM_RESOURCE;
+        struct pci_bus_region region;
         u32 rom_addr;
 
+        if (!res->flags)
+                return -1;
+
+        pcibios_resource_to_bus(pdev, &region, res);
         pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);
-        rom_addr |= PCI_ROM_ADDRESS_ENABLE;
+        rom_addr &= ~PCI_ROM_ADDRESS_MASK;
+        rom_addr |= region.start | PCI_ROM_ADDRESS_ENABLE;
         pci_write_config_dword(pdev, pdev->rom_base_reg, rom_addr);
+        return 0;
 }
 
 /**
@@ -71,19 +79,21 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
         } else {
                 if (res->flags & IORESOURCE_ROM_COPY) {
                         *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
-                        return (void __iomem *)pci_resource_start(pdev, PCI_ROM_RESOURCE);
+                        return (void __iomem *)pci_resource_start(pdev,
+                                                             PCI_ROM_RESOURCE);
                 } else {
                         /* assign the ROM an address if it doesn't have one */
-                        if (res->parent == NULL)
-                                pci_assign_resource(pdev, PCI_ROM_RESOURCE);
-
+                        if (res->parent == NULL &&
+                            pci_assign_resource(pdev,PCI_ROM_RESOURCE))
+                                return NULL;
                         start = pci_resource_start(pdev, PCI_ROM_RESOURCE);
                         *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
                         if (*size == 0)
                                 return NULL;
 
                         /* Enable ROM space decodes */
-                        pci_enable_rom(pdev);
+                        if (pci_enable_rom(pdev))
+                                return NULL;
                 }
         }
 
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 6d864c502a1f..6b0e6464eb39 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -40,7 +40,7 @@
  * FIXME: IO should be max 256 bytes.  However, since we may
  * have a P2P bridge below a cardbus bridge, we need 4K.
  */
-#define CARDBUS_IO_SIZE         (256)
+#define CARDBUS_IO_SIZE         (4*1024)
 #define CARDBUS_MEM_SIZE        (32*1024*1024)
 
 static void __devinit
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 3e23cd461fb1..325c992f7d8f 100644
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -246,7 +246,7 @@ static void __exit pxa2xx_pcmcia_exit(void)
         driver_unregister(&pxa2xx_pcmcia_driver);
 }
 
-module_init(pxa2xx_pcmcia_init);
+fs_initcall(pxa2xx_pcmcia_init);
 module_exit(pxa2xx_pcmcia_exit);
 
 MODULE_AUTHOR("Stefan Eletzhofer <stefan.eletzhofer@inquant.de> and Ian Molton <spyro@f2s.com>");
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index 5309734e1687..bbe69b07ce50 100644
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -196,7 +196,7 @@ static void __exit mst_pcmcia_exit(void)
         platform_device_unregister(mst_pcmcia_device);
 }
 
-module_init(mst_pcmcia_init);
+fs_initcall(mst_pcmcia_init);
 module_exit(mst_pcmcia_exit);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index 42efe218867a..a1178a600e3c 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -20,27 +20,18 @@
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
-
 #include <asm/hardware/scoop.h>
-#include <asm/arch/corgi.h>
 #include <asm/arch/pxa-regs.h>
 
 #include "soc_common.h"
 
 #define NO_KEEP_VS 0x0001
 
-static unsigned char keep_vs;
-static unsigned char keep_rd;
-
-static struct pcmcia_irqs irqs[] = {
-        { 0, CORGI_IRQ_GPIO_CF_CD, "PCMCIA0 CD"},
-};
-
-static void sharpsl_pcmcia_init_reset(void)
+static void sharpsl_pcmcia_init_reset(struct scoop_pcmcia_dev *scoopdev)
 {
-        reset_scoop(&corgiscoop_device.dev);
-        keep_vs = NO_KEEP_VS;
-        keep_rd = 0;
+        reset_scoop(scoopdev->dev);
+        scoopdev->keep_vs = NO_KEEP_VS;
+        scoopdev->keep_rd = 0;
 }
 
 static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
@@ -71,29 +62,35 @@ static int sharpsl_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         pxa_gpio_mode(GPIO57_nIOIS16_MD);
 
         /* Register interrupts */
-        ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
-
-        if (ret) {
-                printk(KERN_ERR "Request for Compact Flash IRQ failed\n");
-                return ret;
+        if (scoop_devs[skt->nr].cd_irq >= 0) {
+                struct pcmcia_irqs cd_irq;
+
+                cd_irq.sock = skt->nr;
+                cd_irq.irq  = scoop_devs[skt->nr].cd_irq;
+                cd_irq.str  = scoop_devs[skt->nr].cd_irq_str;
+                ret = soc_pcmcia_request_irqs(skt, &cd_irq, 1);
+
+                if (ret) {
+                        printk(KERN_ERR "Request for Compact Flash IRQ failed\n");
+                        return ret;
+                }
         }
 
-        /* Enable interrupt */
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_IMR, 0x00C0);
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_MCR, 0x0101);
-        keep_vs = NO_KEEP_VS;
-
-        skt->irq = CORGI_IRQ_GPIO_CF_IRQ;
+        skt->irq = scoop_devs[skt->nr].irq;
 
         return 0;
 }
 
 static void sharpsl_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 {
-        soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+        if (scoop_devs[skt->nr].cd_irq >= 0) {
+                struct pcmcia_irqs cd_irq;
 
-        /* CF_BUS_OFF */
-        sharpsl_pcmcia_init_reset();
+                cd_irq.sock = skt->nr;
+                cd_irq.irq  = scoop_devs[skt->nr].cd_irq;
+                cd_irq.str  = scoop_devs[skt->nr].cd_irq_str;
+                soc_pcmcia_free_irqs(skt, &cd_irq, 1);
+        }
 }
 
 
@@ -101,31 +98,32 @@ static void sharpsl_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                     struct pcmcia_state *state)
 {
         unsigned short cpr, csr;
+        struct device *scoop = scoop_devs[skt->nr].dev;
 
-        cpr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CPR);
+        cpr = read_scoop_reg(scoop_devs[skt->nr].dev, SCOOP_CPR);
 
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_IRM, 0x00FF);
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_ISR, 0x0000);
-        write_scoop_reg(&corgiscoop_device.dev, SCOOP_IRM, 0x0000);
-        csr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CSR);
+        write_scoop_reg(scoop, SCOOP_IRM, 0x00FF);
+        write_scoop_reg(scoop, SCOOP_ISR, 0x0000);
+        write_scoop_reg(scoop, SCOOP_IRM, 0x0000);
+        csr = read_scoop_reg(scoop, SCOOP_CSR);
         if (csr & 0x0004) {
                 /* card eject */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0000);
-                keep_vs = NO_KEEP_VS;
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0000);
+                scoop_devs[skt->nr].keep_vs = NO_KEEP_VS;
         }
-        else if (!(keep_vs & NO_KEEP_VS)) {
+        else if (!(scoop_devs[skt->nr].keep_vs & NO_KEEP_VS)) {
                 /* keep vs1,vs2 */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0000);
-                csr |= keep_vs;
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0000);
+                csr |= scoop_devs[skt->nr].keep_vs;
         }
         else if (cpr & 0x0003) {
                 /* power on */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0000);
-                keep_vs = (csr & 0x00C0);
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0000);
+                scoop_devs[skt->nr].keep_vs = (csr & 0x00C0);
         }
         else {
                 /* card detect */
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CDR, 0x0002);
+                write_scoop_reg(scoop, SCOOP_CDR, 0x0002);
         }
 
         state->detect = (csr & 0x0004) ? 0 : 1;
@@ -147,6 +145,7 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                                        const socket_state_t *state)
 {
         unsigned long flags;
+        struct device *scoop = scoop_devs[skt->nr].dev;
 
         unsigned short cpr, ncpr, ccr, nccr, mcr, nmcr, imr, nimr;
 
@@ -166,10 +165,10 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
 
         local_irq_save(flags);
 
-        nmcr = (mcr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_MCR)) & ~0x0010;
-        ncpr = (cpr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CPR)) & ~0x0083;
-        nccr = (ccr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_CCR)) & ~0x0080;
-        nimr = (imr = read_scoop_reg(&corgiscoop_device.dev, SCOOP_IMR)) & ~0x003E;
+        nmcr = (mcr = read_scoop_reg(scoop, SCOOP_MCR)) & ~0x0010;
+        ncpr = (cpr = read_scoop_reg(scoop, SCOOP_CPR)) & ~0x0083;
+        nccr = (ccr = read_scoop_reg(scoop, SCOOP_CCR)) & ~0x0080;
+        nimr = (imr = read_scoop_reg(scoop, SCOOP_IMR)) & ~0x003E;
 
         ncpr |= (state->Vcc == 33) ? 0x0001 :
                                 (state->Vcc == 50) ? 0x0002 : 0;
@@ -184,22 +183,22 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                         ((skt->status&SS_WRPROT) ? 0x0008 : 0);
 
         if (!(ncpr & 0x0003)) {
-                keep_rd = 0;
-        } else if (!keep_rd) {
+                scoop_devs[skt->nr].keep_rd = 0;
+        } else if (!scoop_devs[skt->nr].keep_rd) {
                 if (nccr & 0x0080)
-                        keep_rd = 1;
+                        scoop_devs[skt->nr].keep_rd = 1;
                 else
                         nccr |= 0x0080;
         }
 
         if (mcr != nmcr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_MCR, nmcr);
+                write_scoop_reg(scoop, SCOOP_MCR, nmcr);
         if (cpr != ncpr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CPR, ncpr);
+                write_scoop_reg(scoop, SCOOP_CPR, ncpr);
         if (ccr != nccr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_CCR, nccr);
+                write_scoop_reg(scoop, SCOOP_CCR, nccr);
         if (imr != nimr)
-                write_scoop_reg(&corgiscoop_device.dev, SCOOP_IMR, nimr);
+                write_scoop_reg(scoop, SCOOP_IMR, nimr);
 
         local_irq_restore(flags);
 
@@ -208,10 +207,18 @@ static int sharpsl_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
 
 static void sharpsl_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
 {
+        sharpsl_pcmcia_init_reset(&scoop_devs[skt->nr]);
+
+        /* Enable interrupt */
+        write_scoop_reg(scoop_devs[skt->nr].dev, SCOOP_IMR, 0x00C0);
+        write_scoop_reg(scoop_devs[skt->nr].dev, SCOOP_MCR, 0x0101);
+        scoop_devs[skt->nr].keep_vs = NO_KEEP_VS;
 }
 
 static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 {
+        /* CF_BUS_OFF */
+        sharpsl_pcmcia_init_reset(&scoop_devs[skt->nr]);
 }
 
 static struct pcmcia_low_level sharpsl_pcmcia_ops = {
@@ -223,7 +230,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops = {
         .socket_init            = sharpsl_pcmcia_socket_init,
         .socket_suspend         = sharpsl_pcmcia_socket_suspend,
         .first                          = 0,
-        .nr                                     = 1,
+        .nr                                     = 0,
 };
 
 static struct platform_device *sharpsl_pcmcia_device;
@@ -232,12 +239,15 @@ static int __init sharpsl_pcmcia_init(void)
 {
         int ret;
 
+        sharpsl_pcmcia_ops.nr=scoop_num;
         sharpsl_pcmcia_device = kmalloc(sizeof(*sharpsl_pcmcia_device), GFP_KERNEL);
         if (!sharpsl_pcmcia_device)
                 return -ENOMEM;
+
         memset(sharpsl_pcmcia_device, 0, sizeof(*sharpsl_pcmcia_device));
         sharpsl_pcmcia_device->name = "pxa2xx-pcmcia";
         sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops;
+        sharpsl_pcmcia_device->dev.parent=scoop_devs[0].dev;
 
         ret = platform_device_register(sharpsl_pcmcia_device);
         if (ret)
@@ -257,7 +267,7 @@ static void __exit sharpsl_pcmcia_exit(void)
         platform_device_unregister(sharpsl_pcmcia_device);
 }
 
-module_init(sharpsl_pcmcia_init);
+fs_initcall(sharpsl_pcmcia_init);
 module_exit(sharpsl_pcmcia_exit);
 
 MODULE_DESCRIPTION("Sharp SL Series PCMCIA Support");
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index e98bb3d80e7c..d4ed508b38be 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -126,5 +126,5 @@ MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");
 MODULE_DESCRIPTION("Linux PCMCIA Card Services: SA-11x0 Socket Controller");
 MODULE_LICENSE("Dual MPL/GPL");
 
-module_init(sa11x0_pcmcia_init);
+fs_initcall(sa11x0_pcmcia_init);
 module_exit(sa11x0_pcmcia_exit);
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index b441f43a6a55..bb90a1448a53 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -189,7 +189,7 @@ static void __exit sa1111_drv_pcmcia_exit(void)
         sa1111_driver_unregister(&pcmcia_driver);
 }
 
-module_init(sa1111_drv_pcmcia_init);
+fs_initcall(sa1111_drv_pcmcia_init);
 module_exit(sa1111_drv_pcmcia_exit);
 
 MODULE_DESCRIPTION("SA1111 PCMCIA card socket driver");
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index db04ffb6f68c..59c5d968e9f6 100644
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -189,7 +189,7 @@ static int __init sa11xx_pcmcia_init(void)
 {
         return 0;
 }
-module_init(sa11xx_pcmcia_init);
+fs_initcall(sa11xx_pcmcia_init);
 
 static void __exit sa11xx_pcmcia_exit(void) {}
 
diff --git a/drivers/pcmcia/topic.h b/drivers/pcmcia/topic.h
index be420bb29113..edccfa5bb400 100644
--- a/drivers/pcmcia/topic.h
+++ b/drivers/pcmcia/topic.h
@@ -101,6 +101,8 @@
 #define  TOPIC97_AVS_AUDIO_CONTROL      0x02
 #define  TOPIC97_AVS_VIDEO_CONTROL      0x01
 
+#define TOPIC_EXCA_IF_CONTROL           0x3e    /* 8 bit */
+#define TOPIC_EXCA_IFC_33V_ENA          0x01
 
 static void topic97_zoom_video(struct pcmcia_socket *sock, int onoff)
 {
@@ -137,4 +139,19 @@ static int topic97_override(struct yenta_socket *socket)
         return 0;
 }
 
+
+static int topic95_override(struct yenta_socket *socket)
+{
+        u8 fctrl;
+
+        /* enable 3.3V support for 16bit cards */
+        fctrl = exca_readb(socket, TOPIC_EXCA_IF_CONTROL);
+        exca_writeb(socket, TOPIC_EXCA_IF_CONTROL, fctrl | TOPIC_EXCA_IFC_33V_ENA);
+
+        /* tell yenta to use exca registers to power 16bit cards */
+        socket->flags |= YENTA_16BIT_POWER_EXCA | YENTA_16BIT_POWER_DF;
+
+        return 0;
+}
+
 #endif /* _LINUX_TOPIC_H */
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 62fd705203fb..0347a29f297b 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -184,22 +184,52 @@ static int yenta_get_status(struct pcmcia_socket *sock, unsigned int *value)
         return 0;
 }
 
-static int yenta_Vcc_power(u32 control)
+static void yenta_get_power(struct yenta_socket *socket, socket_state_t *state)
 {
-        switch (control & CB_SC_VCC_MASK) {
-        case CB_SC_VCC_5V: return 50;
-        case CB_SC_VCC_3V: return 33;
-        default: return 0;
-        }
-}
+        if (!(cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) &&
+            (socket->flags & YENTA_16BIT_POWER_EXCA)) {
+                u8 reg, vcc, vpp;
+
+                reg = exca_readb(socket, I365_POWER);
+                vcc = reg & I365_VCC_MASK;
+                vpp = reg & I365_VPP1_MASK;
+                state->Vcc = state->Vpp = 0;
+
+                if (socket->flags & YENTA_16BIT_POWER_DF) {
+                        if (vcc == I365_VCC_3V)
+                                state->Vcc = 33;
+                        if (vcc == I365_VCC_5V)
+                                state->Vcc = 50;
+                        if (vpp == I365_VPP1_5V)
+                                state->Vpp = state->Vcc;
+                        if (vpp == I365_VPP1_12V)
+                                state->Vpp = 120;
+                } else {
+                        if (reg & I365_VCC_5V) {
+                                state->Vcc = 50;
+                                if (vpp == I365_VPP1_5V)
+                                        state->Vpp = 50;
+                                if (vpp == I365_VPP1_12V)
+                                        state->Vpp = 120;
+                        }
+                }
+        } else {
+                u32 control;
 
-static int yenta_Vpp_power(u32 control)
-{
-        switch (control & CB_SC_VPP_MASK) {
-        case CB_SC_VPP_12V: return 120;
-        case CB_SC_VPP_5V: return 50;
-        case CB_SC_VPP_3V: return 33;
-        default: return 0;
+                control = cb_readl(socket, CB_SOCKET_CONTROL);
+
+                switch (control & CB_SC_VCC_MASK) {
+                case CB_SC_VCC_5V: state->Vcc = 50; break;
+                case CB_SC_VCC_3V: state->Vcc = 33; break;
+                default: state->Vcc = 0;
+                }
+
+                switch (control & CB_SC_VPP_MASK) {
+                case CB_SC_VPP_12V: state->Vpp = 120; break;
+                case CB_SC_VPP_5V: state->Vpp = 50; break;
+                case CB_SC_VPP_3V: state->Vpp = 33; break;
+                default: state->Vpp = 0;
+                }
         }
 }
 
@@ -211,8 +241,7 @@ static int yenta_get_socket(struct pcmcia_socket *sock, socket_state_t *state)
 
         control = cb_readl(socket, CB_SOCKET_CONTROL);
 
-        state->Vcc = yenta_Vcc_power(control);
-        state->Vpp = yenta_Vpp_power(control);
+        yenta_get_power(socket, state);
         state->io_irq = socket->io_irq;
 
         if (cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) {
@@ -246,19 +275,54 @@ static int yenta_get_socket(struct pcmcia_socket *sock, socket_state_t *state)
 
 static void yenta_set_power(struct yenta_socket *socket, socket_state_t *state)
 {
-        u32 reg = 0;    /* CB_SC_STPCLK? */
-        switch (state->Vcc) {
-        case 33: reg = CB_SC_VCC_3V; break;
-        case 50: reg = CB_SC_VCC_5V; break;
-        default: reg = 0; break;
-        }
-        switch (state->Vpp) {
-        case 33:  reg |= CB_SC_VPP_3V; break;
-        case 50:  reg |= CB_SC_VPP_5V; break;
-        case 120: reg |= CB_SC_VPP_12V; break;
+        /* some birdges require to use the ExCA registers to power 16bit cards */
+        if (!(cb_readl(socket, CB_SOCKET_STATE) & CB_CBCARD) &&
+            (socket->flags & YENTA_16BIT_POWER_EXCA)) {
+                u8 reg, old;
+                reg = old = exca_readb(socket, I365_POWER);
+                reg &= ~(I365_VCC_MASK | I365_VPP1_MASK | I365_VPP2_MASK);
+
+                /* i82365SL-DF style */
+                if (socket->flags & YENTA_16BIT_POWER_DF) {
+                        switch (state->Vcc) {
+                        case 33: reg |= I365_VCC_3V; break;
+                        case 50: reg |= I365_VCC_5V; break;
+                        default: reg = 0; break;
+                        }
+                        switch (state->Vpp) {
+                        case 33:
+                        case 50: reg |= I365_VPP1_5V; break;
+                        case 120: reg |= I365_VPP1_12V; break;
+                        }
+                } else {
+                        /* i82365SL-B style */
+                        switch (state->Vcc) {
+                        case 50: reg |= I365_VCC_5V; break;
+                        default: reg = 0; break;
+                        }
+                        switch (state->Vpp) {
+                        case 50: reg |= I365_VPP1_5V | I365_VPP2_5V; break;
+                        case 120: reg |= I365_VPP1_12V | I365_VPP2_12V; break;
+                        }
+                }
+
+                if (reg != old)
+                        exca_writeb(socket, I365_POWER, reg);
+        } else {
+                u32 reg = 0;    /* CB_SC_STPCLK? */
+                switch (state->Vcc) {
+                case 33: reg = CB_SC_VCC_3V; break;
+                case 50: reg = CB_SC_VCC_5V; break;
+                default: reg = 0; break;
+                }
+                switch (state->Vpp) {
+                case 33:  reg |= CB_SC_VPP_3V; break;
+                case 50:  reg |= CB_SC_VPP_5V; break;
+                case 120: reg |= CB_SC_VPP_12V; break;
+                }
+                if (reg != cb_readl(socket, CB_SOCKET_CONTROL))
+                        cb_writel(socket, CB_SOCKET_CONTROL, reg);
         }
-        if (reg != cb_readl(socket, CB_SOCKET_CONTROL))
-                cb_writel(socket, CB_SOCKET_CONTROL, reg);
 }
 
 static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
@@ -751,6 +815,7 @@ enum {
         CARDBUS_TYPE_TI12XX,
         CARDBUS_TYPE_TI1250,
         CARDBUS_TYPE_RICOH,
+        CARDBUS_TYPE_TOPIC95,
         CARDBUS_TYPE_TOPIC97,
         CARDBUS_TYPE_O2MICRO,
 };
@@ -789,6 +854,9 @@ static struct cardbus_type cardbus_type[] = {
                 .save_state     = ricoh_save_state,
                 .restore_state  = ricoh_restore_state,
         },
+        [CARDBUS_TYPE_TOPIC95]  = {
+                .override       = topic95_override,
+        },
         [CARDBUS_TYPE_TOPIC97]  = {
                 .override       = topic97_override,
         },
@@ -1196,6 +1264,7 @@ static struct pci_device_id yenta_table [] = {
         CB_ID(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C476, RICOH),
         CB_ID(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_RL5C478, RICOH),
 
+        CB_ID(PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_TOPIC95, TOPIC95),
         CB_ID(PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_TOPIC97, TOPIC97),
         CB_ID(PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_TOPIC100, TOPIC97),
 
diff --git a/drivers/pcmcia/yenta_socket.h b/drivers/pcmcia/yenta_socket.h
index 4e637eef2076..4e75e9e258cd 100644
--- a/drivers/pcmcia/yenta_socket.h
+++ b/drivers/pcmcia/yenta_socket.h
@@ -95,6 +95,12 @@
  */
 #define CB_MEM_PAGE(map)        (0x40 + (map))
 
+
+/* control how 16bit cards are powered */
+#define YENTA_16BIT_POWER_EXCA  0x00000001
+#define YENTA_16BIT_POWER_DF    0x00000002
+
+
 struct yenta_socket;
 
 struct cardbus_type {
@@ -113,6 +119,8 @@ struct yenta_socket {
         struct pcmcia_socket socket;
         struct cardbus_type *type;
 
+        u32 flags;
+
         /* for PCI interrupt probing */
         unsigned int probe_status;
 
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 6e5229e92fbc..e95ed67d4f05 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -8,13 +8,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 1d037c2a82ac..33da25f3213f 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -11,13 +11,6 @@
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 82c5edd5b9ee..beedd86800f4 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -142,17 +142,6 @@ static void isapnp_write_word(unsigned char idx, unsigned short val)
         isapnp_write_byte(idx+1, val);
 }
 
-static void *isapnp_alloc(long size)
-{
-        void *result;
-
-        result = kmalloc(size, GFP_KERNEL);
-        if (!result)
-                return NULL;
-        memset(result, 0, size);
-        return result;
-}
-
 static void isapnp_key(void)
 {
         unsigned char code = 0x6a, msb;
@@ -406,7 +395,7 @@ static void isapnp_parse_id(struct pnp_dev * dev, unsigned short vendor, unsigne
         struct pnp_id * id;
         if (!dev)
                 return;
-        id = isapnp_alloc(sizeof(struct pnp_id));
+        id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!id)
                 return;
         sprintf(id->id, "%c%c%c%x%x%x%x",
@@ -430,7 +419,7 @@ static struct pnp_dev * __init isapnp_parse_device(struct pnp_card *card, int si
         struct pnp_dev *dev;
 
         isapnp_peek(tmp, size);
-        dev = isapnp_alloc(sizeof(struct pnp_dev));
+        dev = kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
         if (!dev)
                 return NULL;
         dev->number = number;
@@ -461,7 +450,7 @@ static void __init isapnp_parse_irq_resource(struct pnp_option *option,
         unsigned long bits;
 
         isapnp_peek(tmp, size);
-        irq = isapnp_alloc(sizeof(struct pnp_irq));
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
         bits = (tmp[1] << 8) | tmp[0];
@@ -485,7 +474,7 @@ static void __init isapnp_parse_dma_resource(struct pnp_option *option,
         struct pnp_dma *dma;
 
         isapnp_peek(tmp, size);
-        dma = isapnp_alloc(sizeof(struct pnp_dma));
+        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
         dma->map = tmp[0];
@@ -505,7 +494,7 @@ static void __init isapnp_parse_port_resource(struct pnp_option *option,
         struct pnp_port *port;
 
         isapnp_peek(tmp, size);
-        port = isapnp_alloc(sizeof(struct pnp_port));
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = (tmp[2] << 8) | tmp[1];
@@ -528,7 +517,7 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
         struct pnp_port *port;
 
         isapnp_peek(tmp, size);
-        port = isapnp_alloc(sizeof(struct pnp_port));
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = (tmp[1] << 8) | tmp[0];
@@ -550,7 +539,7 @@ static void __init isapnp_parse_mem_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = isapnp_alloc(sizeof(struct pnp_mem));
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = ((tmp[2] << 8) | tmp[1]) << 8;
@@ -573,7 +562,7 @@ static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = isapnp_alloc(sizeof(struct pnp_mem));
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
@@ -595,7 +584,7 @@ static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
         struct pnp_mem *mem;
 
         isapnp_peek(tmp, size);
-        mem = isapnp_alloc(sizeof(struct pnp_mem));
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
@@ -838,7 +827,7 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
 
 static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device)
 {
-        struct pnp_id * id = isapnp_alloc(sizeof(struct pnp_id));
+        struct pnp_id * id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!id)
                 return;
         sprintf(id->id, "%c%c%c%x%x%x%x",
@@ -874,7 +863,7 @@ static int __init isapnp_build_device_list(void)
                         header[4], header[5], header[6], header[7], header[8]);
                 printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
 #endif
-                if ((card = isapnp_alloc(sizeof(struct pnp_card))) == NULL)
+                if ((card = kcalloc(1, sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
                         continue;
 
                 card->number = csn;
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 6c510c19ad7d..94442ffd4aed 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -11,13 +11,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 8655dd2e5b83..1a8915e74160 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
  
+#include <linux/config.h>
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 #include <acpi/acpi_bus.h>
@@ -41,14 +42,6 @@ static inline int is_exclusive_device(struct acpi_device *dev)
         return (!acpi_match_ids(dev, excluded_id_list));
 }
 
-void *pnpacpi_kmalloc(size_t size, int f)
-{
-        void *p = kmalloc(size, f);
-        if (p)
-                memset(p, 0, size);
-        return p;
-}
-
 /*
  * Compatible Device IDs
  */
@@ -143,7 +136,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 return 0;
 
         pnp_dbg("ACPI device : hid %s", acpi_device_hid(device));
-        dev =  pnpacpi_kmalloc(sizeof(struct pnp_dev), GFP_KERNEL);
+        dev =  kcalloc(1, sizeof(struct pnp_dev), GFP_KERNEL);
         if (!dev) {
                 pnp_err("Out of memory");
                 return -ENOMEM;
@@ -173,7 +166,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         dev->number = num;
         
         /* set the initial values for the PnP device */
-        dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id), GFP_KERNEL);
+        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
                 goto err;
         pnpidacpi_to_pnpid(acpi_device_hid(device), dev_id->id);
@@ -205,8 +198,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
                 for (i = 0; i < cid_list->count; i++) {
                         if (!ispnpidacpi(cid_list->id[i].value))
                                 continue;
-                        dev_id = pnpacpi_kmalloc(sizeof(struct pnp_id), 
-                                GFP_KERNEL);
+                        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
                         if (!dev_id)
                                 continue;
 
diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h
index 76f907e09ee6..f28e2ed66fa3 100644
--- a/drivers/pnp/pnpacpi/pnpacpi.h
+++ b/drivers/pnp/pnpacpi/pnpacpi.h
@@ -5,7 +5,6 @@
 #include <linux/acpi.h>
 #include <linux/pnp.h>
 
-void *pnpacpi_kmalloc(size_t size, int f);
 acpi_status pnpacpi_parse_allocated_resource(acpi_handle, struct pnp_resource_table*);
 acpi_status pnpacpi_parse_resource_option_data(acpi_handle, struct pnp_dev*);
 int pnpacpi_encode_resources(struct pnp_resource_table *, struct acpi_buffer *);
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 75575f6c349c..675b76a42403 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -244,7 +244,7 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
 
         if (p->number_of_channels == 0)
                 return;
-        dma = pnpacpi_kmalloc(sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
 
@@ -300,7 +300,7 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
         
         if (p->number_of_interrupts == 0)
                 return;
-        irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
@@ -321,7 +321,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
 
         if (p->number_of_interrupts == 0)
                 return;
-        irq = pnpacpi_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
@@ -342,7 +342,7 @@ pnpacpi_parse_port_option(struct pnp_option *option,
 
         if (io->range_length == 0)
                 return;
-        port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = io->min_base_address;
@@ -363,7 +363,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
 
         if (io->range_length == 0)
                 return;
-        port = pnpacpi_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = io->base_address;
@@ -382,7 +382,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
 
         if (p->range_length == 0)
                 return;
-        mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = p->min_base_address;
@@ -405,7 +405,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
 
         if (p->range_length == 0)
                 return;
-        mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = p->min_base_address;
@@ -428,7 +428,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
 
         if (p->range_length == 0)
                 return;
-        mem = pnpacpi_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = p->range_base_address;
@@ -612,7 +612,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
         if (!res_cnt)
                 return -EINVAL;
         buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
-        buffer->pointer = pnpacpi_kmalloc(buffer->length - 1, GFP_KERNEL);
+        buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL);
         if (!buffer->pointer)
                 return -ENOMEM;
         pnp_dbg("Res cnt %d", res_cnt);
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 778a324028f4..f49674f07949 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -86,16 +86,6 @@ int pnp_bios_present(void)
 
 struct pnp_dev_node_info node_info;
 
-void *pnpbios_kmalloc(size_t size, int f)
-{
-        void *p = kmalloc( size, f );
-        if ( p == NULL )
-                printk(KERN_ERR "PnPBIOS: kmalloc() failed\n");
-        else
-                memset(p, 0, size);
-        return p;
-}
-
 /*
  *
  * DOCKING FUNCTIONS
@@ -121,10 +111,10 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
         if (!current->fs->root) {
                 return -EAGAIN;
         }
-        if (!(envp = (char **) pnpbios_kmalloc (20 * sizeof (char *), GFP_KERNEL))) {
+        if (!(envp = (char **) kcalloc (20, sizeof (char *), GFP_KERNEL))) {
                 return -ENOMEM;
         }
-        if (!(buf = pnpbios_kmalloc (256, GFP_KERNEL))) {
+        if (!(buf = kcalloc (1, 256, GFP_KERNEL))) {
                 kfree (envp);
                 return -ENOMEM;
         }
@@ -231,7 +221,7 @@ static int pnpbios_get_resources(struct pnp_dev * dev, struct pnp_resource_table
         if(!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -254,7 +244,7 @@ static int pnpbios_set_resources(struct pnp_dev * dev, struct pnp_resource_table
         if (!pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -1;
         if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node)) {
@@ -305,7 +295,7 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
         if(dev->flags & PNPBIOS_NO_DISABLE || !pnpbios_is_dynamic(dev))
                 return -EPERM;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
 
@@ -347,7 +337,7 @@ static int insert_device(struct pnp_dev *dev, struct pnp_bios_node * node)
         }
 
         /* set the initial values for the PnP device */
-        dev_id = pnpbios_kmalloc(sizeof(struct pnp_id), GFP_KERNEL);
+        dev_id = kcalloc(1, sizeof(struct pnp_id), GFP_KERNEL);
         if (!dev_id)
                 return -1;
         pnpid32_to_pnpid(node->eisa_id,id);
@@ -385,7 +375,7 @@ static void __init build_devlist(void)
         struct pnp_bios_node *node;
         struct pnp_dev *dev;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return;
 
@@ -402,7 +392,7 @@ static void __init build_devlist(void)
                                 break;
                 }
                 nodes_got++;
-                dev =  pnpbios_kmalloc(sizeof (struct pnp_dev), GFP_KERNEL);
+                dev =  kcalloc(1, sizeof (struct pnp_dev), GFP_KERNEL);
                 if (!dev)
                         break;
                 if(insert_device(dev,node)<0)
diff --git a/drivers/pnp/pnpbios/pnpbios.h b/drivers/pnp/pnpbios/pnpbios.h
index 01896e705ed4..d8cb2fd1f127 100644
--- a/drivers/pnp/pnpbios/pnpbios.h
+++ b/drivers/pnp/pnpbios/pnpbios.h
@@ -26,7 +26,6 @@ union pnp_bios_install_struct {
 
 extern int pnp_bios_present(void);
 extern int  pnpbios_dont_use_current_config;
-extern void *pnpbios_kmalloc(size_t size, int f);
 
 extern int pnpbios_parse_data_stream(struct pnp_dev *dev, struct pnp_bios_node * node);
 extern int pnpbios_read_resources_from_node(struct pnp_resource_table *res, struct pnp_bios_node * node);
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 6bb8e1973fd4..5a3dfc97f5e9 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -87,7 +87,7 @@ static int proc_read_escd(char *buf, char **start, off_t pos,
                 return -EFBIG;
         }
 
-        tmpbuf = pnpbios_kmalloc(escd.escd_size, GFP_KERNEL);
+        tmpbuf = kcalloc(1, escd.escd_size, GFP_KERNEL);
         if (!tmpbuf) return -ENOMEM;
 
         if (pnp_bios_read_escd(tmpbuf, escd.nv_storage_base)) {
@@ -133,7 +133,7 @@ static int proc_read_devices(char *buf, char **start, off_t pos,
         if (pos >= 0xff)
                 return 0;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
 
         for (nodenum=pos; nodenum<0xff; ) {
@@ -168,7 +168,7 @@ static int proc_read_node(char *buf, char **start, off_t pos,
         u8 nodenum = (long)data;
         int len;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node) return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
                 kfree(node);
@@ -188,7 +188,7 @@ static int proc_write_node(struct file *file, const char __user *buf,
         u8 nodenum = (long)data;
         int ret = count;
 
-        node = pnpbios_kmalloc(node_info.max_node_size, GFP_KERNEL);
+        node = kcalloc(1, node_info.max_node_size, GFP_KERNEL);
         if (!node)
                 return -ENOMEM;
         if (pnp_bios_get_dev_node(&nodenum, boot, node)) {
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index e305bb132c24..b0ca65b68645 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -247,7 +247,7 @@ static void
 pnpbios_parse_mem_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = pnpbios_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = ((p[5] << 8) | p[4]) << 8;
@@ -263,7 +263,7 @@ static void
 pnpbios_parse_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = pnpbios_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -279,7 +279,7 @@ static void
 pnpbios_parse_fixed_mem32_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_mem * mem;
-        mem = pnpbios_kmalloc(sizeof(struct pnp_mem), GFP_KERNEL);
+        mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
         mem->min = mem->max = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4];
@@ -296,7 +296,7 @@ pnpbios_parse_irq_option(unsigned char *p, int size, struct pnp_option *option)
         struct pnp_irq * irq;
         unsigned long bits;
 
-        irq = pnpbios_kmalloc(sizeof(struct pnp_irq), GFP_KERNEL);
+        irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
         bits = (p[2] << 8) | p[1];
@@ -313,7 +313,7 @@ static void
 pnpbios_parse_dma_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_dma * dma;
-        dma = pnpbios_kmalloc(sizeof(struct pnp_dma), GFP_KERNEL);
+        dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
         dma->map = p[1];
@@ -326,7 +326,7 @@ static void
 pnpbios_parse_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = pnpbios_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = (p[3] << 8) | p[2];
@@ -342,7 +342,7 @@ static void
 pnpbios_parse_fixed_port_option(unsigned char *p, int size, struct pnp_option *option)
 {
         struct pnp_port * port;
-        port = pnpbios_kmalloc(sizeof(struct pnp_port), GFP_KERNEL);
+        port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
         port->min = port->max = (p[2] << 8) | p[1];
@@ -530,7 +530,7 @@ pnpbios_parse_compatible_ids(unsigned char *p, unsigned char *end, struct pnp_de
                 case SMALL_TAG_COMPATDEVID: /* compatible ID */
                         if (len != 4)
                                 goto len_err;
-                        dev_id =  pnpbios_kmalloc(sizeof (struct pnp_id), GFP_KERNEL);
+                        dev_id =  kcalloc(1, sizeof (struct pnp_id), GFP_KERNEL);
                         if (!dev_id)
                                 return NULL;
                         memset(dev_id, 0, sizeof(struct pnp_id));
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 596a02d7e03d..8936b0cb2ec3 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -16,13 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index b952aec49189..61fe998944bd 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -8,13 +8,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/ctype.h>
-
-#ifdef CONFIG_PNP_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index dc1c89dbdb8f..6e7d7b06421d 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -49,7 +49,7 @@ config DASD_FBA
 
 config DASD_DIAG
         tristate "Support for DIAG access to Disks"
-        depends on DASD && ARCH_S390X = 'n'
+        depends on DASD && ( ARCH_S390X = 'n' || EXPERIMENTAL)
         help
           Select this option if you want to use Diagnose250 command to access
           Disks under VM.  If you are not running under VM or unsure what it is,
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d5f53980749b..8fc891a9d47f 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -7,7 +7,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
- * $Revision: 1.165 $
+ * $Revision: 1.167 $
  */
 
 #include <linux/config.h>
@@ -1131,17 +1131,13 @@ __dasd_process_blk_queue(struct dasd_device * device)
         request_queue_t *queue;
         struct request *req;
         struct dasd_ccw_req *cqr;
-        int nr_queued, feature_ro;
+        int nr_queued;
 
         queue = device->request_queue;
         /* No queue ? Then there is nothing to do. */
         if (queue == NULL)
                 return;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)     /* no devmap */
-                return;
-
         /*
          * We requeue request from the block device queue to the ccw
          * queue only in two states. In state DASD_STATE_READY the
@@ -1162,7 +1158,8 @@ __dasd_process_blk_queue(struct dasd_device * device)
                 nr_queued < DASD_CHANQ_MAX_SIZE) {
                 req = elv_next_request(queue);
 
-                if (feature_ro && rq_data_dir(req) == WRITE) {
+                if (device->features & DASD_FEATURE_READONLY &&
+                    rq_data_dir(req) == WRITE) {
                         DBF_DEV_EVENT(DBF_ERR, device,
                                       "Rejecting write request %p",
                                       req);
@@ -1814,17 +1811,13 @@ dasd_generic_set_online (struct ccw_device *cdev,
 
 {
         struct dasd_device *device;
-        int feature_diag, rc;
+        int rc;
 
         device = dasd_create_device(cdev);
         if (IS_ERR(device))
                 return PTR_ERR(device);
 
-        feature_diag = dasd_get_feature(cdev, DASD_FEATURE_USEDIAG);
-        if (feature_diag < 0)
-                return feature_diag;
-
-        if (feature_diag) {
+        if (device->features & DASD_FEATURE_USEDIAG) {
                 if (!dasd_diag_discipline_pointer) {
                         printk (KERN_WARNING
                                 "dasd_generic couldn't online device %s "
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index d948566bb24a..bda896d9d788 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -11,7 +11,7 @@
  * functions may not be called from interrupt context. In particular
  * dasd_get_device is a no-no from interrupt context.
  *
- * $Revision: 1.40 $
+ * $Revision: 1.43 $
  */
 
 #include <linux/config.h>
@@ -513,6 +513,7 @@ dasd_create_device(struct ccw_device *cdev)
         if (!devmap->device) {
                 devmap->device = device;
                 device->devindex = devmap->devindex;
+                device->features = devmap->features;
                 get_device(&cdev->dev);
                 device->cdev = cdev;
                 rc = 0;
@@ -643,6 +644,8 @@ dasd_ro_store(struct device *dev, struct device_attribute *attr, const char *buf
                 devmap->features |= DASD_FEATURE_READONLY;
         else
                 devmap->features &= ~DASD_FEATURE_READONLY;
+        if (devmap->device)
+                devmap->device->features = devmap->features;
         if (devmap->device && devmap->device->gdp)
                 set_disk_ro(devmap->device->gdp, ro_flag);
         spin_unlock(&dasd_devmap_lock);
@@ -758,7 +761,8 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag)
                 devmap->features |= feature;
         else
                 devmap->features &= ~feature;
-
+        if (devmap->device)
+                devmap->device->features = devmap->features;
         spin_unlock(&dasd_devmap_lock);
         return 0;
 }
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 127699830fa1..7478423b53bb 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -6,17 +6,18 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.42 $
+ * $Revision: 1.49 $
  */
 
 #include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/hdreg.h>        /* HDIO_GETGEO                      */
+#include <linux/hdreg.h>
 #include <linux/bio.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 
 #include <asm/dasd.h>
 #include <asm/debug.h>
@@ -28,58 +29,89 @@
 #include "dasd_int.h"
 #include "dasd_diag.h"
 
-#ifdef PRINTK_HEADER
-#undef PRINTK_HEADER
-#endif                          /* PRINTK_HEADER */
 #define PRINTK_HEADER "dasd(diag):"
 
 MODULE_LICENSE("GPL");
 
+/* The maximum number of blocks per request (max_blocks) is dependent on the
+ * amount of storage that is available in the static I/O buffer for each
+ * device. Currently each device gets 2 pages. We want to fit two requests
+ * into the available memory so that we can immediately start the next if one
+ * finishes. */
+#define DIAG_MAX_BLOCKS (((2 * PAGE_SIZE - sizeof(struct dasd_ccw_req) - \
+                           sizeof(struct dasd_diag_req)) / \
+                           sizeof(struct dasd_diag_bio)) / 2)
+#define DIAG_MAX_RETRIES        32
+#define DIAG_TIMEOUT            50 * HZ
+
 struct dasd_discipline dasd_diag_discipline;
 
 struct dasd_diag_private {
         struct dasd_diag_characteristics rdc_data;
         struct dasd_diag_rw_io iob;
         struct dasd_diag_init_io iib;
-        unsigned int pt_block;
+        blocknum_t pt_block;
 };
 
 struct dasd_diag_req {
-        int block_count;
+        unsigned int block_count;
         struct dasd_diag_bio bio[0];
 };
 
+static const u8 DASD_DIAG_CMS1[] = { 0xc3, 0xd4, 0xe2, 0xf1 };/* EBCDIC CMS1 */
+
+/* Perform DIAG250 call with block I/O parameter list iob (input and output)
+ * and function code cmd.
+ * In case of an exception return 3. Otherwise return result of bitwise OR of
+ * resulting condition code and DIAG return code. */
 static __inline__ int
 dia250(void *iob, int cmd)
 {
+        typedef struct {
+                char _[max(sizeof (struct dasd_diag_init_io),
+                           sizeof (struct dasd_diag_rw_io))];
+        } addr_type;
         int rc;
 
-        __asm__ __volatile__("    lhi   %0,3\n"
-                             "    lr    0,%2\n"
-                             "    diag  0,%1,0x250\n"
-                             "0:  ipm   %0\n"
-                             "    srl   %0,28\n"
-                             "    or    %0,1\n"
-                             "1:\n"
-#ifndef CONFIG_ARCH_S390X
-                             ".section __ex_table,\"a\"\n"
-                             "    .align 4\n"
-                             "    .long 0b,1b\n"
-                             ".previous\n"
+        __asm__ __volatile__(
+#ifdef CONFIG_ARCH_S390X
+                "       lghi    %0,3\n"
+                "       lgr     0,%3\n"
+                "       diag    0,%2,0x250\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "       or      %0,1\n"
+                "1:\n"
+                ".section __ex_table,\"a\"\n"
+                "       .align 8\n"
+                "       .quad  0b,1b\n"
+                ".previous\n"
 #else
-                             ".section __ex_table,\"a\"\n"
-                             "    .align 8\n"
-                             "    .quad  0b,1b\n"
-                             ".previous\n"
+                "       lhi     %0,3\n"
+                "       lr      0,%3\n"
+                "       diag    0,%2,0x250\n"
+                "0:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "       or      %0,1\n"
+                "1:\n"
+                ".section __ex_table,\"a\"\n"
+                "       .align 4\n"
+                "       .long 0b,1b\n"
+                ".previous\n"
 #endif
-                             : "=&d" (rc)
-                             : "d" (cmd), "d" ((void *) __pa(iob))
-                             : "0", "1", "cc");
+                : "=&d" (rc), "=m" (*(addr_type *) iob)
+                : "d" (cmd), "d" (iob), "m" (*(addr_type *) iob)
+                : "0", "1", "cc");
         return rc;
 }
 
+/* Initialize block I/O to DIAG device using the specified blocksize and
+ * block offset. On success, return zero and set end_block to contain the
+ * number of blocks on the device minus the specified offset. Return non-zero
+ * otherwise. */
 static __inline__ int
-mdsk_init_io(struct dasd_device * device, int blocksize, int offset, int size)
+mdsk_init_io(struct dasd_device *device, unsigned int blocksize,
+             blocknum_t offset, blocknum_t *end_block)
 {
         struct dasd_diag_private *private;
         struct dasd_diag_init_io *iib;
@@ -92,14 +124,18 @@ mdsk_init_io(struct dasd_device * device, int blocksize, int offset, int size)
         iib->dev_nr = _ccw_device_get_device_number(device->cdev);
         iib->block_size = blocksize;
         iib->offset = offset;
-        iib->start_block = 0;
-        iib->end_block = size;
+        iib->flaga = DASD_DIAG_FLAGA_DEFAULT;
 
         rc = dia250(iib, INIT_BIO);
 
-        return rc & 3;
+        if ((rc & 3) == 0 && end_block)
+                *end_block = iib->end_block;
+
+        return rc;
 }
 
+/* Remove block I/O environment for device. Return zero on success, non-zero
+ * otherwise. */
 static __inline__ int
 mdsk_term_io(struct dasd_device * device)
 {
@@ -112,9 +148,25 @@ mdsk_term_io(struct dasd_device * device)
         memset(iib, 0, sizeof (struct dasd_diag_init_io));
         iib->dev_nr = _ccw_device_get_device_number(device->cdev);
         rc = dia250(iib, TERM_BIO);
-        return rc & 3;
+        return rc;
+}
+
+/* Error recovery for failed DIAG requests - try to reestablish the DIAG
+ * environment. */
+static void
+dasd_diag_erp(struct dasd_device *device)
+{
+        int rc;
+
+        mdsk_term_io(device);
+        rc = mdsk_init_io(device, device->bp_block, 0, NULL);
+        if (rc)
+                DEV_MESSAGE(KERN_WARNING, device, "DIAG ERP unsuccessful, "
+                            "rc=%d", rc);
 }
 
+/* Start a given request at the device. Return zero on success, non-zero
+ * otherwise. */
 static int
 dasd_start_diag(struct dasd_ccw_req * cqr)
 {
@@ -124,32 +176,66 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
         int rc;
 
         device = cqr->device;
+        if (cqr->retries < 0) {
+                DEV_MESSAGE(KERN_WARNING, device, "DIAG start_IO: request %p "
+                            "- no retry left)", cqr);
+                cqr->status = DASD_CQR_FAILED;
+                return -EIO;
+        }
         private = (struct dasd_diag_private *) device->private;
         dreq = (struct dasd_diag_req *) cqr->data;
 
         private->iob.dev_nr = _ccw_device_get_device_number(device->cdev);
         private->iob.key = 0;
-        private->iob.flags = 2; /* do asynchronous io */
+        private->iob.flags = DASD_DIAG_RWFLAG_ASYNC;
         private->iob.block_count = dreq->block_count;
-        private->iob.interrupt_params = (u32)(addr_t) cqr;
+        private->iob.interrupt_params = (addr_t) cqr;
         private->iob.bio_list = __pa(dreq->bio);
+        private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
 
         cqr->startclk = get_clock();
+        cqr->starttime = jiffies;
+        cqr->retries--;
 
         rc = dia250(&private->iob, RW_BIO);
-        if (rc > 8) {
-                DEV_MESSAGE(KERN_WARNING, device, "dia250 returned CC %d", rc);
-                cqr->status = DASD_CQR_ERROR;
-        } else if (rc == 0) {
+        switch (rc) {
+        case 0: /* Synchronous I/O finished successfully */
+                cqr->stopclk = get_clock();
                 cqr->status = DASD_CQR_DONE;
-                dasd_schedule_bh(device);
-        } else {
+                /* Indicate to calling function that only a dasd_schedule_bh()
+                   and no timer is needed */
+                rc = -EACCES;
+                break;
+        case 8: /* Asynchronous I/O was started */
                 cqr->status = DASD_CQR_IN_IO;
                 rc = 0;
+                break;
+        default: /* Error condition */
+                cqr->status = DASD_CQR_QUEUED;
+                DEV_MESSAGE(KERN_WARNING, device, "dia250 returned rc=%d", rc);
+                dasd_diag_erp(device);
+                rc = -EIO;
+                break;
         }
         return rc;
 }
 
+/* Terminate given request at the device. */
+static int
+dasd_diag_term_IO(struct dasd_ccw_req * cqr)
+{
+        struct dasd_device *device;
+
+        device = cqr->device;
+        mdsk_term_io(device);
+        mdsk_init_io(device, device->bp_block, 0, NULL);
+        cqr->status = DASD_CQR_CLEAR;
+        cqr->stopclk = get_clock();
+        dasd_schedule_bh(device);
+        return 0;
+}
+
+/* Handle external interruption. */
 static void
 dasd_ext_handler(struct pt_regs *regs, __u16 code)
 {
@@ -157,25 +243,27 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
         struct dasd_device *device;
         unsigned long long expires;
         unsigned long flags;
-        char status;
-        int ip;
-
-        /*
-         * Get the external interruption subcode. VM stores
-         * this in the 'cpu address' field associated with
-         * the external interrupt. For diag 250 the subcode
-         * needs to be 3.
-         */
-        if ((S390_lowcore.cpu_addr & 0xff00) != 0x0300)
-                return;
-        status = *((char *) &S390_lowcore.ext_params + 5);
-        ip = S390_lowcore.ext_params;
+        u8 int_code, status;
+        addr_t ip;
+        int rc;
 
+        int_code = *((u8 *) DASD_DIAG_LC_INT_CODE);
+        status = *((u8 *) DASD_DIAG_LC_INT_STATUS);
+        switch (int_code) {
+        case DASD_DIAG_CODE_31BIT:
+                ip = (addr_t) *((u32 *) DASD_DIAG_LC_INT_PARM_31BIT);
+                break;
+        case DASD_DIAG_CODE_64BIT:
+                ip = (addr_t) *((u64 *) DASD_DIAG_LC_INT_PARM_64BIT);
+                break;
+        default:
+                return;
+        }
         if (!ip) {              /* no intparm: unsolicited interrupt */
                 MESSAGE(KERN_DEBUG, "%s", "caught unsolicited interrupt");
                 return;
         }
-        cqr = (struct dasd_ccw_req *)(addr_t) ip;
+        cqr = (struct dasd_ccw_req *) ip;
         device = (struct dasd_device *) cqr->device;
         if (strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
                 DEV_MESSAGE(KERN_WARNING, device,
@@ -188,6 +276,15 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
         /* get irq lock to modify request queue */
         spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
 
+        /* Check for a pending clear operation */
+        if (cqr->status == DASD_CQR_CLEAR) {
+                cqr->status = DASD_CQR_QUEUED;
+                dasd_clear_timer(device);
+                dasd_schedule_bh(device);
+                spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
+                return;
+        }
+
         cqr->stopclk = get_clock();
 
         expires = 0;
@@ -198,16 +295,22 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
                         next = list_entry(device->ccw_queue.next,
                                           struct dasd_ccw_req, list);
                         if (next->status == DASD_CQR_QUEUED) {
-                                if (dasd_start_diag(next) == 0)
+                                rc = dasd_start_diag(next);
+                                if (rc == 0)
                                         expires = next->expires;
-                                else
+                                else if (rc != -EACCES)
                                         DEV_MESSAGE(KERN_WARNING, device, "%s",
                                                     "Interrupt fastpath "
                                                     "failed!");
                         }
                 }
-        } else 
-                cqr->status = DASD_CQR_FAILED;
+        } else {
+                cqr->status = DASD_CQR_QUEUED;
+                DEV_MESSAGE(KERN_WARNING, device, "interrupt status for "
+                            "request %p was %d (%d retries left)", cqr, status,
+                            cqr->retries);
+                dasd_diag_erp(device);
+        }
 
         if (expires != 0)
                 dasd_set_timer(device, expires);
@@ -218,14 +321,17 @@ dasd_ext_handler(struct pt_regs *regs, __u16 code)
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
 }
 
+/* Check whether device can be controlled by DIAG discipline. Return zero on
+ * success, non-zero otherwise. */
 static int
 dasd_diag_check_device(struct dasd_device *device)
 {
         struct dasd_diag_private *private;
         struct dasd_diag_characteristics *rdc_data;
         struct dasd_diag_bio bio;
-        long *label;
-        int sb, bsize;
+        struct dasd_diag_cms_label *label;
+        blocknum_t end_block;
+        unsigned int sb, bsize;
         int rc;
 
         private = (struct dasd_diag_private *) device->private;
@@ -244,8 +350,11 @@ dasd_diag_check_device(struct dasd_device *device)
         rdc_data->rdc_len = sizeof (struct dasd_diag_characteristics);
 
         rc = diag210((struct diag210 *) rdc_data);
-        if (rc)
+        if (rc) {
+                DEV_MESSAGE(KERN_WARNING, device, "failed to retrieve device "
+                            "information (rc=%d)", rc);
                 return -ENOTSUPP;
+        }
 
         /* Figure out position of label block */
         switch (private->rdc_data.vdev_class) {
@@ -256,6 +365,8 @@ dasd_diag_check_device(struct dasd_device *device)
                 private->pt_block = 2;
                 break;
         default:
+                DEV_MESSAGE(KERN_WARNING, device, "unsupported device class "
+                            "(class=%d)", private->rdc_data.vdev_class);
                 return -ENOTSUPP;
         }
 
@@ -269,15 +380,17 @@ dasd_diag_check_device(struct dasd_device *device)
         mdsk_term_io(device);
 
         /* figure out blocksize of device */
-        label = (long *) get_zeroed_page(GFP_KERNEL);
+        label = (struct dasd_diag_cms_label *) get_zeroed_page(GFP_KERNEL);
         if (label == NULL)  {
                 DEV_MESSAGE(KERN_WARNING, device, "%s",
                             "No memory to allocate initialization request");
                 return -ENOMEM;
         }
+        rc = 0;
+        end_block = 0;
         /* try all sizes - needed for ECKD devices */
         for (bsize = 512; bsize <= PAGE_SIZE; bsize <<= 1) {
-                mdsk_init_io(device, bsize, 0, 64);
+                mdsk_init_io(device, bsize, 0, &end_block);
                 memset(&bio, 0, sizeof (struct dasd_diag_bio));
                 bio.type = MDSK_READ_REQ;
                 bio.block_number = private->pt_block + 1;
@@ -289,37 +402,45 @@ dasd_diag_check_device(struct dasd_device *device)
                 private->iob.block_count = 1;
                 private->iob.interrupt_params = 0;
                 private->iob.bio_list = __pa(&bio);
-                if (dia250(&private->iob, RW_BIO) == 0)
+                private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
+                rc = dia250(&private->iob, RW_BIO);
+                if (rc == 0 || rc == 3)
                         break;
                 mdsk_term_io(device);
         }
-        if (bsize <= PAGE_SIZE && label[0] == 0xc3d4e2f1) {
-                /* get formatted blocksize from label block */
-                bsize = (int) label[3];
-                device->blocks = label[7];
+        if (rc == 3) {
+                DEV_MESSAGE(KERN_WARNING, device, "%s", "DIAG call failed");
+                rc = -EOPNOTSUPP;
+        } else if (rc != 0) {
+                DEV_MESSAGE(KERN_WARNING, device, "device access failed "
+                            "(rc=%d)", rc);
+                rc = -EIO;
+        } else {
+                if (memcmp(label->label_id, DASD_DIAG_CMS1,
+                          sizeof(DASD_DIAG_CMS1)) == 0) {
+                        /* get formatted blocksize from label block */
+                        bsize = (unsigned int) label->block_size;
+                        device->blocks = (unsigned long) label->block_count;
+                } else
+                        device->blocks = end_block;
                 device->bp_block = bsize;
                 device->s2b_shift = 0;  /* bits to shift 512 to get a block */
                 for (sb = 512; sb < bsize; sb = sb << 1)
                         device->s2b_shift++;
                 
                 DEV_MESSAGE(KERN_INFO, device,
-                            "capacity (%dkB blks): %ldkB",
-                            (device->bp_block >> 10),
-                            (device->blocks << device->s2b_shift) >> 1);
+                            "(%ld B/blk): %ldkB",
+                            (unsigned long) device->bp_block,
+                            (unsigned long) (device->blocks <<
+                                device->s2b_shift) >> 1);
                 rc = 0;
-        } else {
-                if (bsize > PAGE_SIZE)
-                        DEV_MESSAGE(KERN_WARNING, device, "%s",
-                                    "DIAG access failed");
-                else
-                        DEV_MESSAGE(KERN_WARNING, device, "%s",
-                                    "volume is not CMS formatted");
-                rc = -EMEDIUMTYPE;
         }
         free_page((long) label);
         return rc;
 }
 
+/* Fill in virtual disk geometry for device. Return zero on success, non-zero
+ * otherwise. */
 static int
 dasd_diag_fill_geometry(struct dasd_device *device, struct hd_geometry *geo)
 {
@@ -349,6 +470,8 @@ dasd_diag_erp_postaction(struct dasd_ccw_req * cqr)
         return dasd_default_erp_postaction;
 }
 
+/* Create DASD request from block device request. Return pointer to new
+ * request on success, ERR_PTR otherwise. */
 static struct dasd_ccw_req *
 dasd_diag_build_cp(struct dasd_device * device, struct request *req)
 {
@@ -358,9 +481,9 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
         struct bio *bio;
         struct bio_vec *bv;
         char *dst;
-        int count, datasize;
+        unsigned int count, datasize;
         sector_t recid, first_rec, last_rec;
-        unsigned blksize, off;
+        unsigned int blksize, off;
         unsigned char rw_cmd;
         int i;
 
@@ -413,13 +536,16 @@ dasd_diag_build_cp(struct dasd_device * device, struct request *req)
                         }
                 }
         }
+        cqr->retries = DIAG_MAX_RETRIES;
         cqr->buildclk = get_clock();
         cqr->device = device;
-        cqr->expires = 50 * HZ; /* 50 seconds */
+        cqr->expires = DIAG_TIMEOUT;
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }
 
+/* Release DASD request. Return non-zero if request was successful, zero
+ * otherwise. */
 static int
 dasd_diag_free_cp(struct dasd_ccw_req *cqr, struct request *req)
 {
@@ -430,6 +556,7 @@ dasd_diag_free_cp(struct dasd_ccw_req *cqr, struct request *req)
         return status;
 }
 
+/* Fill in IOCTL data for device. */
 static int
 dasd_diag_fill_info(struct dasd_device * device,
                     struct dasd_information2_t * info)
@@ -437,7 +564,7 @@ dasd_diag_fill_info(struct dasd_device * device,
         struct dasd_diag_private *private;
 
         private = (struct dasd_diag_private *) device->private;
-        info->label_block = private->pt_block;
+        info->label_block = (unsigned int) private->pt_block;
         info->FBA_layout = 1;
         info->format = DASD_FORMAT_LDL;
         info->characteristics_size = sizeof (struct dasd_diag_characteristics);
@@ -456,26 +583,15 @@ dasd_diag_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
                     "dump sense not available for DIAG data");
 }
 
-/*
- * max_blocks is dependent on the amount of storage that is available
- * in the static io buffer for each device. Currently each device has
- * 8192 bytes (=2 pages). dasd diag is only relevant for 31 bit.
- * The struct dasd_ccw_req has 96 bytes, the struct dasd_diag_req has
- * 8 bytes and the struct dasd_diag_bio for each block has 16 bytes. 
- * That makes:
- * (8192 - 96 - 8) / 16 = 505.5 blocks at maximum.
- * We want to fit two into the available memory so that we can immediately
- * start the next request if one finishes off. That makes 252.75 blocks
- * for one request. Give a little safety and the result is 240.
- */
 struct dasd_discipline dasd_diag_discipline = {
         .owner = THIS_MODULE,
         .name = "DIAG",
         .ebcname = "DIAG",
-        .max_blocks = 240,
+        .max_blocks = DIAG_MAX_BLOCKS,
         .check_device = dasd_diag_check_device,
         .fill_geometry = dasd_diag_fill_geometry,
         .start_IO = dasd_start_diag,
+        .term_IO = dasd_diag_term_IO,
         .examine_error = dasd_diag_examine_error,
         .erp_action = dasd_diag_erp_action,
         .erp_postaction = dasd_diag_erp_postaction,
@@ -493,7 +609,7 @@ dasd_diag_init(void)
                             "Machine is not VM: %s "
                             "discipline not initializing",
                             dasd_diag_discipline.name);
-                return -EINVAL;
+                return -ENODEV;
         }
         ASCEBC(dasd_diag_discipline.ebcname, 4);
 
@@ -506,13 +622,6 @@ dasd_diag_init(void)
 static void __exit
 dasd_diag_cleanup(void)
 {
-        if (!MACHINE_IS_VM) {
-                MESSAGE_LOG(KERN_INFO,
-                            "Machine is not VM: %s "
-                            "discipline not cleaned",
-                            dasd_diag_discipline.name);
-                return;
-        }
         unregister_external_interrupt(0x2603, dasd_ext_handler);
         ctl_clear_bit(0, 9);
         dasd_diag_discipline_pointer = NULL;
@@ -520,22 +629,3 @@ dasd_diag_cleanup(void)
 
 module_init(dasd_diag_init);
 module_exit(dasd_diag_cleanup);
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 4 
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * c-continued-statement-offset: 4
- * c-continued-brace-offset: 0
- * indent-tabs-mode: 1
- * tab-width: 8
- * End:
- */
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index a0c38e303979..b26eb28df4bf 100644
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  */
 
 #define MDSK_WRITE_REQ 0x01
@@ -19,6 +19,18 @@
 #define DEV_CLASS_FBA   0x01
 #define DEV_CLASS_ECKD  0x04
 
+#define DASD_DIAG_LC_INT_CODE           132
+#define DASD_DIAG_LC_INT_STATUS         133
+#define DASD_DIAG_LC_INT_PARM_31BIT     128
+#define DASD_DIAG_LC_INT_PARM_64BIT     4536
+#define DASD_DIAG_CODE_31BIT            0x03
+#define DASD_DIAG_CODE_64BIT            0x07
+
+#define DASD_DIAG_RWFLAG_ASYNC          0x02
+#define DASD_DIAG_RWFLAG_NOCACHE        0x01
+
+#define DASD_DIAG_FLAGA_FORMAT_64BIT    0x80
+
 struct dasd_diag_characteristics {
         u16 dev_nr;
         u16 rdc_len;
@@ -32,35 +44,106 @@ struct dasd_diag_characteristics {
         u8 rdev_features;
 } __attribute__ ((packed, aligned(4)));
 
+struct dasd_diag_cms_label {
+        u8 label_id[4];
+        u8 vol_id[6];
+        u16 version_id;
+        u32 block_size;
+        u32 origin_ptr;
+        u32 usable_count;
+        u32 formatted_count;
+        u32 block_count;
+        u32 used_count;
+        u32 fst_size;
+        u32 fst_count;
+        u8 format_date[6];
+        u8 reserved1[2];
+        u32 disk_offset;
+        u32 map_block;
+        u32 hblk_disp;
+        u32 user_disp;
+        u8 reserved2[4];
+        u8 segment_name[8];
+} __attribute__ ((packed));
+
+#ifdef CONFIG_ARCH_S390X
+#define DASD_DIAG_FLAGA_DEFAULT         DASD_DIAG_FLAGA_FORMAT_64BIT
+
+typedef u64 blocknum_t;
+typedef s64 sblocknum_t;
+
+struct dasd_diag_bio {
+        u8 type;
+        u8 status;
+        u8 spare1[2];
+        u32 alet;
+        blocknum_t block_number;
+        u64 buffer;
+} __attribute__ ((packed, aligned(8)));
+
+struct dasd_diag_init_io {
+        u16 dev_nr;
+        u8 flaga;
+        u8 spare1[21];
+        u32 block_size;
+        u8 spare2[4];
+        blocknum_t offset;
+        sblocknum_t start_block;
+        blocknum_t end_block;
+        u8  spare3[8];
+} __attribute__ ((packed, aligned(8)));
+
+struct dasd_diag_rw_io {
+        u16 dev_nr;
+        u8  flaga;
+        u8  spare1[21];
+        u8  key;
+        u8  flags;
+        u8  spare2[2];
+        u32 block_count;
+        u32 alet;
+        u8  spare3[4];
+        u64 interrupt_params;
+        u64 bio_list;
+        u8  spare4[8];
+} __attribute__ ((packed, aligned(8)));
+#else /* CONFIG_ARCH_S390X */
+#define DASD_DIAG_FLAGA_DEFAULT         0x0
+
+typedef u32 blocknum_t;
+typedef s32 sblocknum_t;
+
 struct dasd_diag_bio {
         u8 type;
         u8 status;
         u16 spare1;
-        u32 block_number;
+        blocknum_t block_number;
         u32 alet;
         u32 buffer;
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_init_io {
         u16 dev_nr;
-        u16 spare1[11];
+        u8 flaga;
+        u8 spare1[21];
         u32 block_size;
-        u32 offset;
-        u32 start_block;
-        u32 end_block;
-        u32 spare2[6];
+        blocknum_t offset;
+        sblocknum_t start_block;
+        blocknum_t end_block;
+        u8 spare2[24];
 } __attribute__ ((packed, aligned(8)));
 
 struct dasd_diag_rw_io {
         u16 dev_nr;
-        u16 spare1[11];
+        u8 flaga;
+        u8 spare1[21];
         u8 key;
         u8 flags;
-        u16 spare2;
+        u8 spare2[2];
         u32 block_count;
         u32 alet;
         u32 bio_list;
         u32 interrupt_params;
-        u32 spare3[5];
+        u8 spare3[20];
 } __attribute__ ((packed, aligned(8)));
-
+#endif /* CONFIG_ARCH_S390X */
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 96c49349701f..a601c9a33541 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -9,7 +9,7 @@
  *
  * gendisk related functions for the dasd driver.
  *
- * $Revision: 1.50 $
+ * $Revision: 1.51 $
  */
 
 #include <linux/config.h>
@@ -31,16 +31,12 @@ int
 dasd_gendisk_alloc(struct dasd_device *device)
 {
         struct gendisk *gdp;
-        int len, feature_ro;
+        int len;
 
         /* Make sure the minor for this device exists. */
         if (device->devindex >= DASD_PER_MAJOR)
                 return -EBUSY;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)
-                return feature_ro;
-
         gdp = alloc_disk(1 << DASD_PARTN_BITS);
         if (!gdp)
                 return -ENOMEM;
@@ -75,7 +71,7 @@ dasd_gendisk_alloc(struct dasd_device *device)
 
         sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id);
 
-        if (feature_ro)
+        if (device->features & DASD_FEATURE_READONLY)
                 set_disk_ro(gdp, 1);
         gdp->private_data = device;
         gdp->queue = device->request_queue;
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index a9f38b235981..9fab04f3056d 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.64 $
+ * $Revision: 1.65 $
  */
 
 #ifndef DASD_INT_H
@@ -286,6 +286,7 @@ struct dasd_device {
         unsigned int bp_block;          /* bytes per block */
         unsigned int s2b_shift;         /* log2 (bp_block/512) */
         unsigned long flags;            /* per device flags */
+        unsigned short features;        /* copy of devmap-features (read-only!) */
 
         /* Device discipline stuff. */
         struct dasd_discipline *discipline;
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 980c555aa538..789595b3fa09 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -7,7 +7,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
- * $Revision: 1.45 $
+ * $Revision: 1.47 $
  *
  * i/o controls for the dasd driver.
  */
@@ -296,7 +296,6 @@ dasd_ioctl_format(struct block_device *bdev, int no, long args)
 {
         struct dasd_device *device;
         struct format_data_t fdata;
-        int feature_ro;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
@@ -308,10 +307,7 @@ dasd_ioctl_format(struct block_device *bdev, int no, long args)
         if (device == NULL)
                 return -ENODEV;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)
-                return feature_ro;
-        if (feature_ro)
+        if (device->features & DASD_FEATURE_READONLY)
                 return -EROFS;
         if (copy_from_user(&fdata, (void __user *) args,
                            sizeof (struct format_data_t)))
@@ -384,7 +380,7 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
         struct dasd_device *device;
         struct dasd_information2_t *dasd_info;
         unsigned long flags;
-        int rc, feature_ro;
+        int rc;
         struct ccw_device *cdev;
 
         device = bdev->bd_disk->private_data;
@@ -394,10 +390,6 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
         if (!device->discipline->fill_info)
                 return -EINVAL;
 
-        feature_ro = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature_ro < 0)
-                return feature_ro;
-
         dasd_info = kmalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
         if (dasd_info == NULL)
                 return -ENOMEM;
@@ -427,7 +419,8 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
             (dasd_check_blocksize(device->bp_block)))
                 dasd_info->format = DASD_FORMAT_NONE;
 
-        dasd_info->features |= feature_ro;
+        dasd_info->features |=
+                ((device->features & DASD_FEATURE_READONLY) != 0);
 
         if (device->discipline)
                 memcpy(dasd_info->type, device->discipline->name, 4);
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index 43c34f8c5e68..fff9020d4886 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -9,7 +9,7 @@
  *
  * /proc interface for the dasd driver.
  *
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
  */
 
 #include <linux/config.h>
@@ -55,7 +55,6 @@ dasd_devices_show(struct seq_file *m, void *v)
 {
         struct dasd_device *device;
         char *substr;
-        int feature;
 
         device = dasd_device_from_devindex((unsigned long) v - 1);
         if (IS_ERR(device))
@@ -79,10 +78,7 @@ dasd_devices_show(struct seq_file *m, void *v)
         else
                 seq_printf(m, " is ????????");
         /* Print devices features. */
-        feature = dasd_get_feature(device->cdev, DASD_FEATURE_READONLY);
-        if (feature < 0)
-                return 0;
-        substr = feature ? "(ro)" : " ";
+        substr = (device->features & DASD_FEATURE_READONLY) ? "(ro)" : " ";
         seq_printf(m, "%4s: ", substr);
         /* Print device status information. */
         switch ((device != NULL) ? device->state : -1) {
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index d5eefeaba50c..328d9cbc56a3 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -632,12 +632,9 @@ __raw3270_size_device(struct raw3270 *rp)
         raw3270_init_request.ccw.cda = (__u32) __pa(raw3270_init_data);
 
         rc = raw3270_start_init(rp, &raw3270_init_view, &raw3270_init_request);
-        if (rc) {
+        if (rc)
                 /* Check error cases: -ERESTARTSYS, -EIO and -EOPNOTSUPP */
-                if (rc == -EOPNOTSUPP && MACHINE_IS_VM)
-                        return __raw3270_size_device_vm(rp);
                 return rc;
-        }
 
         /* Wait for attention interrupt. */
 #ifdef CONFIG_TN3270_CONSOLE
@@ -695,7 +692,10 @@ raw3270_size_device(struct raw3270 *rp)
         down(&raw3270_init_sem);
         rp->view = &raw3270_init_view;
         raw3270_init_view.dev = rp;
-        rc = __raw3270_size_device(rp);
+        if (MACHINE_IS_VM)
+                rc = __raw3270_size_device_vm(rp);
+        else
+                rc = __raw3270_size_device(rp);
         raw3270_init_view.dev = 0;
         rp->view = 0;
         up(&raw3270_init_sem);
@@ -710,6 +710,12 @@ raw3270_size_device(struct raw3270 *rp)
                         rp->model = 4;
                 if (rp->rows == 27 && rp->cols == 132)
                         rp->model = 5;
+        } else {
+                /* Couldn't detect size. Use default model 2. */
+                rp->model = 2;
+                rp->rows = 24;
+                rp->cols = 80;
+                return 0;
         }
         return rc;
 }
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index ea813bdce1d6..185bc73c3ecd 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.134 $
+ *   $Revision: 1.135 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
@@ -815,8 +815,9 @@ __clear_subchannel_easy(unsigned int schid)
                 struct tpi_info ti;
 
                 if (tpi(&ti)) {
-                        tsch(schid, (struct irb *)__LC_IRB);
-                        return 0;
+                        tsch(ti.irq, (struct irb *)__LC_IRB);
+                        if (ti.irq == schid)
+                                return 0;
                 }
                 udelay(100);
         }
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index ee7a05e0c3ba..fbe4202a3f6f 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 
 #include <asm/ccwdev.h>
-#include <asm/qdio.h>
+#include <asm/cio.h>
 
 #include "cio.h"
 #include "cio_debug.h"
@@ -21,7 +21,6 @@
 #include "device.h"
 #include "chsc.h"
 #include "ioasm.h"
-#include "qdio.h"
 
 int
 device_is_online(struct subchannel *sch)
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 02d01a0de16c..ad3fe5aeb663 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/device_ops.c
  *
- *   $Revision: 1.56 $
+ *   $Revision: 1.57 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
@@ -19,14 +19,12 @@
 
 #include <asm/ccwdev.h>
 #include <asm/idals.h>
-#include <asm/qdio.h>
 
 #include "cio.h"
 #include "cio_debug.h"
 #include "css.h"
 #include "chsc.h"
 #include "device.h"
-#include "qdio.h"
 
 int
 ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h
index c874607d9a80..45480a2bc4c0 100644
--- a/drivers/s390/cio/ioasm.h
+++ b/drivers/s390/cio/ioasm.h
@@ -21,7 +21,7 @@ struct tpi_info {
  * Some S390 specific IO instructions as inline
  */
 
-extern __inline__ int stsch(int irq, volatile struct schib *addr)
+static inline int stsch(int irq, volatile struct schib *addr)
 {
         int ccode;
 
@@ -36,7 +36,7 @@ extern __inline__ int stsch(int irq, volatile struct schib *addr)
         return ccode;
 }
 
-extern __inline__ int msch(int irq, volatile struct schib *addr)
+static inline int msch(int irq, volatile struct schib *addr)
 {
         int ccode;
 
@@ -51,7 +51,7 @@ extern __inline__ int msch(int irq, volatile struct schib *addr)
         return ccode;
 }
 
-extern __inline__ int msch_err(int irq, volatile struct schib *addr)
+static inline int msch_err(int irq, volatile struct schib *addr)
 {
         int ccode;
 
@@ -79,7 +79,7 @@ extern __inline__ int msch_err(int irq, volatile struct schib *addr)
         return ccode;
 }
 
-extern __inline__ int tsch(int irq, volatile struct irb *addr)
+static inline int tsch(int irq, volatile struct irb *addr)
 {
         int ccode;
 
@@ -94,7 +94,7 @@ extern __inline__ int tsch(int irq, volatile struct irb *addr)
         return ccode;
 }
 
-extern __inline__ int tpi( volatile struct tpi_info *addr)
+static inline int tpi( volatile struct tpi_info *addr)
 {
         int ccode;
 
@@ -108,7 +108,7 @@ extern __inline__ int tpi( volatile struct tpi_info *addr)
         return ccode;
 }
 
-extern __inline__ int ssch(int irq, volatile struct orb *addr)
+static inline int ssch(int irq, volatile struct orb *addr)
 {
         int ccode;
 
@@ -123,7 +123,7 @@ extern __inline__ int ssch(int irq, volatile struct orb *addr)
         return ccode;
 }
 
-extern __inline__ int rsch(int irq)
+static inline int rsch(int irq)
 {
         int ccode;
 
@@ -138,7 +138,7 @@ extern __inline__ int rsch(int irq)
         return ccode;
 }
 
-extern __inline__ int csch(int irq)
+static inline int csch(int irq)
 {
         int ccode;
 
@@ -153,7 +153,7 @@ extern __inline__ int csch(int irq)
         return ccode;
 }
 
-extern __inline__ int hsch(int irq)
+static inline int hsch(int irq)
 {
         int ccode;
 
@@ -168,7 +168,7 @@ extern __inline__ int hsch(int irq)
         return ccode;
 }
 
-extern __inline__ int xsch(int irq)
+static inline int xsch(int irq)
 {
         int ccode;
 
@@ -183,7 +183,7 @@ extern __inline__ int xsch(int irq)
         return ccode;
 }
 
-extern __inline__ int chsc(void *chsc_area)
+static inline int chsc(void *chsc_area)
 {
         int cc;
 
@@ -198,7 +198,7 @@ extern __inline__ int chsc(void *chsc_area)
         return cc;
 }
 
-extern __inline__ int iac( void)
+static inline int iac( void)
 {
         int ccode;
 
@@ -210,7 +210,7 @@ extern __inline__ int iac( void)
         return ccode;
 }
 
-extern __inline__ int rchp(int chpid)
+static inline int rchp(int chpid)
 {
         int ccode;
 
diff --git a/drivers/s390/crypto/z90common.h b/drivers/s390/crypto/z90common.h
index bcabac7a7c46..e319e78b5ea2 100644
--- a/drivers/s390/crypto/z90common.h
+++ b/drivers/s390/crypto/z90common.h
@@ -27,7 +27,7 @@
 #ifndef _Z90COMMON_H_
 #define _Z90COMMON_H_
 
-#define VERSION_Z90COMMON_H "$Revision: 1.16 $"
+#define VERSION_Z90COMMON_H "$Revision: 1.17 $"
 
 
 #define RESPBUFFSIZE 256
@@ -164,5 +164,4 @@ struct CPRBX {
 #define UMIN(a,b) ((a) < (b) ? (a) : (b))
 #define IS_EVEN(x) ((x) == (2 * ((x) / 2)))
 
-
 #endif
diff --git a/drivers/s390/crypto/z90hardware.c b/drivers/s390/crypto/z90hardware.c
index beb6a5e0da22..c215e0889736 100644
--- a/drivers/s390/crypto/z90hardware.c
+++ b/drivers/s390/crypto/z90hardware.c
@@ -32,7 +32,7 @@
 #include "z90crypt.h"
 #include "z90common.h"
 
-#define VERSION_Z90HARDWARE_C "$Revision: 1.33 $"
+#define VERSION_Z90HARDWARE_C "$Revision: 1.34 $"
 
 char z90hardware_version[] __initdata =
         "z90hardware.o (" VERSION_Z90HARDWARE_C "/"
@@ -283,48 +283,6 @@ struct type6_msg {
         struct CPRB      CPRB;
 };
 
-union request_msg {
-        union  type4_msg t4msg;
-        struct type6_msg t6msg;
-};
-
-struct request_msg_ext {
-        int               q_nr;
-        unsigned char     *psmid;
-        union request_msg reqMsg;
-};
-
-struct type82_hdr {
-        unsigned char reserved1;
-        unsigned char type;
-        unsigned char reserved2[2];
-        unsigned char reply_code;
-        unsigned char reserved3[3];
-};
-
-#define TYPE82_RSP_CODE 0x82
-
-#define REPLY_ERROR_MACHINE_FAILURE  0x10
-#define REPLY_ERROR_PREEMPT_FAILURE  0x12
-#define REPLY_ERROR_CHECKPT_FAILURE  0x14
-#define REPLY_ERROR_MESSAGE_TYPE     0x20
-#define REPLY_ERROR_INVALID_COMM_CD  0x21
-#define REPLY_ERROR_INVALID_MSG_LEN  0x23
-#define REPLY_ERROR_RESERVD_FIELD    0x24
-#define REPLY_ERROR_FORMAT_FIELD     0x29
-#define REPLY_ERROR_INVALID_COMMAND  0x30
-#define REPLY_ERROR_MALFORMED_MSG    0x40
-#define REPLY_ERROR_RESERVED_FIELDO  0x50
-#define REPLY_ERROR_WORD_ALIGNMENT   0x60
-#define REPLY_ERROR_MESSAGE_LENGTH   0x80
-#define REPLY_ERROR_OPERAND_INVALID  0x82
-#define REPLY_ERROR_OPERAND_SIZE     0x84
-#define REPLY_ERROR_EVEN_MOD_IN_OPND 0x85
-#define REPLY_ERROR_RESERVED_FIELD   0x88
-#define REPLY_ERROR_TRANSPORT_FAIL   0x90
-#define REPLY_ERROR_PACKET_TRUNCATED 0xA0
-#define REPLY_ERROR_ZERO_BUFFER_LEN  0xB0
-
 struct type86_hdr {
         unsigned char reserved1;
         unsigned char type;
@@ -338,7 +296,7 @@ struct type86_hdr {
 #define TYPE86_FMT2     0x02
 
 struct type86_fmt2_msg {
-        struct type86_hdr hdr;
+        struct type86_hdr header;
         unsigned char     reserved[4];
         unsigned char     apfs[4];
         unsigned int      count1;
@@ -538,6 +496,8 @@ static struct function_and_rules_block static_pke_function_and_rulesX = {
         {'M','R','P',' ',' ',' ',' ',' '}
 };
 
+static unsigned char static_PKE_function_code[2] = {0x50, 0x4B};
+
 struct T6_keyBlock_hdrX {
         unsigned short blen;
         unsigned short ulen;
@@ -688,9 +648,38 @@ static struct cca_public_sec static_cca_pub_sec = {
 #define RESPONSE_CPRB_SIZE  0x000006B8
 #define RESPONSE_CPRBX_SIZE 0x00000724
 
-#define CALLER_HEADER 12
+struct error_hdr {
+        unsigned char reserved1;
+        unsigned char type;
+        unsigned char reserved2[2];
+        unsigned char reply_code;
+        unsigned char reserved3[3];
+};
 
-static unsigned char static_PKE_function_code[2] = {0x50, 0x4B};
+#define TYPE82_RSP_CODE 0x82
+
+#define REP82_ERROR_MACHINE_FAILURE  0x10
+#define REP82_ERROR_PREEMPT_FAILURE  0x12
+#define REP82_ERROR_CHECKPT_FAILURE  0x14
+#define REP82_ERROR_MESSAGE_TYPE     0x20
+#define REP82_ERROR_INVALID_COMM_CD  0x21
+#define REP82_ERROR_INVALID_MSG_LEN  0x23
+#define REP82_ERROR_RESERVD_FIELD    0x24
+#define REP82_ERROR_FORMAT_FIELD     0x29
+#define REP82_ERROR_INVALID_COMMAND  0x30
+#define REP82_ERROR_MALFORMED_MSG    0x40
+#define REP82_ERROR_RESERVED_FIELDO  0x50
+#define REP82_ERROR_WORD_ALIGNMENT   0x60
+#define REP82_ERROR_MESSAGE_LENGTH   0x80
+#define REP82_ERROR_OPERAND_INVALID  0x82
+#define REP82_ERROR_OPERAND_SIZE     0x84
+#define REP82_ERROR_EVEN_MOD_IN_OPND 0x85
+#define REP82_ERROR_RESERVED_FIELD   0x88
+#define REP82_ERROR_TRANSPORT_FAIL   0x90
+#define REP82_ERROR_PACKET_TRUNCATED 0xA0
+#define REP82_ERROR_ZERO_BUFFER_LEN  0xB0
+
+#define CALLER_HEADER 12
 
 static inline int
 testq(int q_nr, int *q_depth, int *dev_type, struct ap_status_word *stat)
@@ -1212,9 +1201,9 @@ send_to_AP(int dev_nr, int cdx, int msg_len, unsigned char *msg_ext)
         struct ap_status_word stat_word;
         enum devstat stat;
         int ccode;
+        u32 *q_nr_p = (u32 *)msg_ext;
 
-        ((struct request_msg_ext *) msg_ext)->q_nr =
-                (dev_nr << SKIP_BITL) + cdx;
+        *q_nr_p = (dev_nr << SKIP_BITL) + cdx;
         PDEBUG("msg_len passed to sen: %d\n", msg_len);
         PDEBUG("q number passed to sen: %02x%02x%02x%02x\n",
                msg_ext[0], msg_ext[1], msg_ext[2], msg_ext[3]);
@@ -2104,7 +2093,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                  int *respbufflen_p, unsigned char *resp_buff)
 {
         struct ica_rsa_modexpo *icaMsg_p = (struct ica_rsa_modexpo *) buffer;
-        struct type82_hdr *t82h_p = (struct type82_hdr *) response;
+        struct error_hdr *errh_p = (struct error_hdr *) response;
         struct type84_hdr *t84h_p = (struct type84_hdr *) response;
         struct type86_fmt2_msg *t86m_p =  (struct type86_fmt2_msg *) response;
         int reply_code, service_rc, service_rs, src_l;
@@ -2117,12 +2106,13 @@ convert_response(unsigned char *response, unsigned char *buffer,
         service_rc = 0;
         service_rs = 0;
         src_l = 0;
-        switch (t82h_p->type) {
+        switch (errh_p->type) {
         case TYPE82_RSP_CODE:
-                reply_code = t82h_p->reply_code;
-                src_p = (unsigned char *)t82h_p;
-                PRINTK("Hardware error: Type 82 Message Header: "
+                reply_code = errh_p->reply_code;
+                src_p = (unsigned char *)errh_p;
+                PRINTK("Hardware error: Type %02X Message Header: "
                        "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                       errh_p->type,
                        src_p[0], src_p[1], src_p[2], src_p[3],
                        src_p[4], src_p[5], src_p[6], src_p[7]);
                 break;
@@ -2131,7 +2121,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                 src_p = response + (int)t84h_p->len - src_l;
                 break;
         case TYPE86_RSP_CODE:
-                reply_code = t86m_p->hdr.reply_code;
+                reply_code = t86m_p->header.reply_code;
                 if (reply_code != 0)
                         break;
                 cprb_p = (struct CPRB *)
@@ -2143,6 +2133,9 @@ convert_response(unsigned char *response, unsigned char *buffer,
                                 le2toI(cprb_p->ccp_rscode, &service_rs);
                                 if ((service_rc == 8) && (service_rs == 66))
                                         PDEBUG("Bad block format on PCICC\n");
+                                else if ((service_rc == 8) && (service_rs == 65))
+                                        PDEBUG("Probably an even modulus on "
+                                               "PCICC\n");
                                 else if ((service_rc == 8) && (service_rs == 770)) {
                                         PDEBUG("Invalid key length on PCICC\n");
                                         unset_ext_bitlens();
@@ -2155,7 +2148,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                                         return REC_USE_PCICA;
                                 }
                                 else
-                                        PRINTK("service rc/rs: %d/%d\n",
+                                        PRINTK("service rc/rs (PCICC): %d/%d\n",
                                                service_rc, service_rs);
                                 return REC_OPERAND_INV;
                         }
@@ -2169,7 +2162,10 @@ convert_response(unsigned char *response, unsigned char *buffer,
                         if (service_rc != 0) {
                                 service_rs = (int) cprbx_p->ccp_rscode;
                                 if ((service_rc == 8) && (service_rs == 66))
-                                        PDEBUG("Bad block format on PCXICC\n");
+                                        PDEBUG("Bad block format on PCIXCC\n");
+                                else if ((service_rc == 8) && (service_rs == 65))
+                                        PDEBUG("Probably an even modulus on "
+                                               "PCIXCC\n");
                                 else if ((service_rc == 8) && (service_rs == 770)) {
                                         PDEBUG("Invalid key length on PCIXCC\n");
                                         unset_ext_bitlens();
@@ -2182,7 +2178,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
                                         return REC_USE_PCICA;
                                 }
                                 else
-                                        PRINTK("service rc/rs: %d/%d\n",
+                                        PRINTK("service rc/rs (PCIXCC): %d/%d\n",
                                                service_rc, service_rs);
                                 return REC_OPERAND_INV;
                         }
@@ -2195,20 +2191,25 @@ convert_response(unsigned char *response, unsigned char *buffer,
                 }
                 break;
         default:
+                src_p = (unsigned char *)errh_p;
+                PRINTK("Unrecognized Message Header: "
+                       "%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                       src_p[0], src_p[1], src_p[2], src_p[3],
+                       src_p[4], src_p[5], src_p[6], src_p[7]);
                 return REC_BAD_MESSAGE;
         }
 
         if (reply_code)
                 switch (reply_code) {
-                case REPLY_ERROR_OPERAND_INVALID:
+                case REP82_ERROR_OPERAND_INVALID:
                         return REC_OPERAND_INV;
-                case REPLY_ERROR_OPERAND_SIZE:
+                case REP82_ERROR_OPERAND_SIZE:
                         return REC_OPERAND_SIZE;
-                case REPLY_ERROR_EVEN_MOD_IN_OPND:
+                case REP82_ERROR_EVEN_MOD_IN_OPND:
                         return REC_EVEN_MOD;
-                case REPLY_ERROR_MESSAGE_TYPE:
+                case REP82_ERROR_MESSAGE_TYPE:
                         return WRONG_DEVICE_TYPE;
-                case REPLY_ERROR_TRANSPORT_FAIL:
+                case REP82_ERROR_TRANSPORT_FAIL:
                         PRINTKW("Transport failed (APFS = %02X%02X%02X%02X)\n",
                                 t86m_p->apfs[0], t86m_p->apfs[1],
                                 t86m_p->apfs[2], t86m_p->apfs[3]);
@@ -2229,7 +2230,7 @@ convert_response(unsigned char *response, unsigned char *buffer,
         PDEBUG("Length returned = %d\n", src_l);
         tgt_p = resp_buff + icaMsg_p->outputdatalength - src_l;
         memcpy(tgt_p, src_p, src_l);
-        if ((t82h_p->type == TYPE86_RSP_CODE) && (resp_buff < tgt_p)) {
+        if ((errh_p->type == TYPE86_RSP_CODE) && (resp_buff < tgt_p)) {
                 memset(resp_buff, 0, icaMsg_p->outputdatalength - src_l);
                 if (pad_msg(resp_buff, icaMsg_p->outputdatalength, src_l))
                         return REC_INVALID_PAD;
diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index 9ec29bb41b28..6aeef3bacc33 100644
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>   // for tasklets
 #include <linux/ioctl32.h>
+#include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kobject_uevent.h>
@@ -39,19 +40,8 @@
 #include <linux/version.h>
 #include "z90crypt.h"
 #include "z90common.h"
-#ifndef Z90CRYPT_USE_HOTPLUG
-#include <linux/miscdevice.h>
-#endif
-
-#define VERSION_CODE(vers, rel, seq) (((vers)<<16) | ((rel)<<8) | (seq))
-#if LINUX_VERSION_CODE < VERSION_CODE(2,4,0) /* version < 2.4 */
-#  error "This kernel is too old: not supported"
-#endif
-#if LINUX_VERSION_CODE > VERSION_CODE(2,7,0) /* version > 2.6 */
-#  error "This kernel is too recent: not supported by this file"
-#endif
 
-#define VERSION_Z90MAIN_C "$Revision: 1.57 $"
+#define VERSION_Z90MAIN_C "$Revision: 1.62 $"
 
 static char z90main_version[] __initdata =
         "z90main.o (" VERSION_Z90MAIN_C "/"
@@ -63,21 +53,12 @@ extern char z90hardware_version[];
  * Defaults that may be modified.
  */
 
-#ifndef Z90CRYPT_USE_HOTPLUG
 /**
  * You can specify a different minor at compile time.
  */
 #ifndef Z90CRYPT_MINOR
 #define Z90CRYPT_MINOR  MISC_DYNAMIC_MINOR
 #endif
-#else
-/**
- * You can specify a different major at compile time.
- */
-#ifndef Z90CRYPT_MAJOR
-#define Z90CRYPT_MAJOR  0
-#endif
-#endif
 
 /**
  * You can specify a different domain at compile time or on the insmod
@@ -97,7 +78,7 @@ extern char z90hardware_version[];
  * older than CLEANUPTIME seconds in the past.
  */
 #ifndef CLEANUPTIME
-#define CLEANUPTIME 20
+#define CLEANUPTIME 15
 #endif
 
 /**
@@ -298,6 +279,10 @@ struct z90crypt {
  * it contains the request; at READ, the response. The function
  * send_to_crypto_device converts the request to device-dependent
  * form and use the caller's OPEN-allocated buffer for the response.
+ *
+ * For the contents of caller_dev_dep_req and caller_dev_dep_req_p
+ * because that points to it, see the discussion in z90hardware.c.
+ * Search for "extended request message block".
  */
 struct caller {
         int              caller_buf_l;           // length of original request
@@ -398,24 +383,9 @@ static int z90crypt_status_write(struct file *, const char __user *,
                                  unsigned long, void *);
 
 /**
- * Hotplug support
- */
-
-#ifdef Z90CRYPT_USE_HOTPLUG
-#define Z90CRYPT_HOTPLUG_ADD     1
-#define Z90CRYPT_HOTPLUG_REMOVE  2
-
-static void z90crypt_hotplug_event(int, int, int);
-#endif
-
-/**
  * Storage allocated at initialization and used throughout the life of
  * this insmod
  */
-#ifdef Z90CRYPT_USE_HOTPLUG
-static int z90crypt_major = Z90CRYPT_MAJOR;
-#endif
-
 static int domain = DOMAIN_INDEX;
 static struct z90crypt z90crypt;
 static int quiesce_z90crypt;
@@ -444,14 +414,12 @@ static struct file_operations z90crypt_fops = {
         .release        = z90crypt_release
 };
 
-#ifndef Z90CRYPT_USE_HOTPLUG
 static struct miscdevice z90crypt_misc_device = {
         .minor      = Z90CRYPT_MINOR,
         .name       = DEV_NAME,
         .fops       = &z90crypt_fops,
         .devfs_name = DEV_NAME
 };
-#endif
 
 /**
  * Documentation values.
@@ -603,7 +571,6 @@ z90crypt_init_module(void)
                 return -EINVAL;
         }
 
-#ifndef Z90CRYPT_USE_HOTPLUG
         /* Register as misc device with given minor (or get a dynamic one). */
         result = misc_register(&z90crypt_misc_device);
         if (result < 0) {
@@ -611,18 +578,6 @@ z90crypt_init_module(void)
                         z90crypt_misc_device.minor, result);
                 return result;
         }
-#else
-        /* Register the major (or get a dynamic one). */
-        result = register_chrdev(z90crypt_major, REG_NAME, &z90crypt_fops);
-        if (result < 0) {
-                PRINTKW("register_chrdev (major %d) failed with %d.\n",
-                        z90crypt_major, result);
-                return result;
-        }
-
-        if (z90crypt_major == 0)
-                z90crypt_major = result;
-#endif
 
         PDEBUG("Registered " DEV_NAME " with result %d\n", result);
 
@@ -645,11 +600,6 @@ z90crypt_init_module(void)
         } else
                 PRINTK("No devices at startup\n");
 
-#ifdef Z90CRYPT_USE_HOTPLUG
-        /* generate hotplug event for device node generation */
-        z90crypt_hotplug_event(z90crypt_major, 0, Z90CRYPT_HOTPLUG_ADD);
-#endif
-
         /* Initialize globals. */
         spin_lock_init(&queuespinlock);
 
@@ -701,17 +651,10 @@ z90crypt_init_module(void)
         return 0; // success
 
 init_module_cleanup:
-#ifndef Z90CRYPT_USE_HOTPLUG
         if ((nresult = misc_deregister(&z90crypt_misc_device)))
                 PRINTK("misc_deregister failed with %d.\n", nresult);
         else
                 PDEBUG("misc_deregister successful.\n");
-#else
-        if ((nresult = unregister_chrdev(z90crypt_major, REG_NAME)))
-                PRINTK("unregister_chrdev failed with %d.\n", nresult);
-        else
-                PDEBUG("unregister_chrdev successful.\n");
-#endif
 
         return result; // failure
 }
@@ -728,19 +671,10 @@ z90crypt_cleanup_module(void)
 
         remove_proc_entry("driver/z90crypt", 0);
 
-#ifndef Z90CRYPT_USE_HOTPLUG
         if ((nresult = misc_deregister(&z90crypt_misc_device)))
                 PRINTK("misc_deregister failed with %d.\n", nresult);
         else
                 PDEBUG("misc_deregister successful.\n");
-#else
-        z90crypt_hotplug_event(z90crypt_major, 0, Z90CRYPT_HOTPLUG_REMOVE);
-
-        if ((nresult = unregister_chrdev(z90crypt_major, REG_NAME)))
-                PRINTK("unregister_chrdev failed with %d.\n", nresult);
-        else
-                PDEBUG("unregister_chrdev successful.\n");
-#endif
 
         /* Remove the tasks */
         tasklet_kill(&reader_tasklet);
@@ -748,6 +682,9 @@ z90crypt_cleanup_module(void)
         del_timer(&config_timer);
         del_timer(&cleanup_timer);
 
+        if (z90_device_work)
+                destroy_workqueue(z90_device_work);
+
         destroy_z90crypt();
 
         PRINTKN("Unloaded.\n");
@@ -766,8 +703,6 @@ z90crypt_cleanup_module(void)
  *     z90crypt_status_write
  *       disable_card
  *       enable_card
- *       scan_char
- *       scan_string
  *
  * Helper functions:
  *     z90crypt_rsa
@@ -1057,9 +992,10 @@ remove_device(struct device *device_p)
  * The MCL must be applied and the newer bitlengths enabled for these to work.
  *
  * Card Type    Old limit    New limit
+ * PCICA          ??-2048     same (the lower limit is less than 128 bit...)
  * PCICC         512-1024     512-2048
- * PCIXCC_MCL2   512-2048     no change (applying this MCL == card is MCL3+)
- * PCIXCC_MCL3   512-2048     128-2048
+ * PCIXCC_MCL2   512-2048     ----- (applying any GA LIC will make an MCL3 card)
+ * PCIXCC_MCL3   -----        128-2048
  * CEX2C         512-2048     128-2048
  *
  * ext_bitlens (extended bitlengths) is a global, since you should not apply an
@@ -1104,7 +1040,7 @@ select_device_type(int *dev_type_p, int bytelength)
         if (PCICA_avail || PCIXCC_MCL3_avail || CEX2C_avail) {
                 /**
                  * bitlength is a factor, PCICA is the most capable, even with
-                 * the new MCL.
+                 * the new MCL for PCIXCC.
                  */
                 if ((bytelength < PCIXCC_MIN_MOD_SIZE) ||
                     (!ext_bitlens && (bytelength < OLD_PCIXCC_MIN_MOD_SIZE))) {
@@ -2144,73 +2080,15 @@ enable_card(int card_index)
         z90crypt.hdware_info->type_mask[devp->dev_type].user_disabled_count--;
 }
 
-static inline int
-scan_char(unsigned char *bf, unsigned int len,
-          unsigned int *offs, unsigned int *p_eof, unsigned char c)
-{
-        unsigned int i, found;
-
-        found = 0;
-        for (i = 0; i < len; i++) {
-                if (bf[i] == c) {
-                        found = 1;
-                        break;
-                }
-                if (bf[i] == '\0') {
-                        *p_eof = 1;
-                        break;
-                }
-                if (bf[i] == '\n') {
-                        break;
-                }
-        }
-        *offs = i+1;
-        return found;
-}
-
-static inline int
-scan_string(unsigned char *bf, unsigned int len,
-            unsigned int *offs, unsigned int *p_eof, unsigned char *s)
-{
-        unsigned int temp_len, temp_offs, found, eof;
-
-        temp_len = temp_offs = found = eof = 0;
-        while (!eof && !found) {
-                found = scan_char(bf+temp_len, len-temp_len,
-                                  &temp_offs, &eof, *s);
-
-                temp_len += temp_offs;
-                if (eof) {
-                        found = 0;
-                        break;
-                }
-
-                if (found) {
-                        if (len >= temp_offs+strlen(s)) {
-                                found = !strncmp(bf+temp_len-1, s, strlen(s));
-                                if (found) {
-                                        *offs = temp_len+strlen(s)-1;
-                                        break;
-                                }
-                        } else {
-                                found = 0;
-                                *p_eof = 1;
-                                break;
-                        }
-                }
-        }
-        return found;
-}
-
 static int
 z90crypt_status_write(struct file *file, const char __user *buffer,
                       unsigned long count, void *data)
 {
-        int i, j, len, offs, found, eof;
-        unsigned char *lbuf;
+        int j, eol;
+        unsigned char *lbuf, *ptr;
         unsigned int local_count;
 
-#define LBUFSIZE 600
+#define LBUFSIZE 1200
         lbuf = kmalloc(LBUFSIZE, GFP_KERNEL);
         if (!lbuf) {
                 PRINTK("kmalloc failed!\n");
@@ -2227,49 +2105,46 @@ z90crypt_status_write(struct file *file, const char __user *buffer,
                 return -EFAULT;
         }
 
-        lbuf[local_count-1] = '\0';
+        lbuf[local_count] = '\0';
 
-        len = 0;
-        eof = 0;
-        found = 0;
-        while (!eof) {
-                found = scan_string(lbuf+len, local_count-len, &offs, &eof,
-                                    "Online devices");
-                len += offs;
-                if (found == 1)
-                        break;
+        ptr = strstr(lbuf, "Online devices");
+        if (ptr == 0) {
+                PRINTK("Unable to parse data (missing \"Online devices\")\n");
+                kfree(lbuf);
+                return count;
         }
 
-        if (eof) {
+        ptr = strstr(ptr, "\n");
+        if (ptr == 0) {
+                PRINTK("Unable to parse data (missing newline after \"Online devices\")\n");
                 kfree(lbuf);
                 return count;
         }
+        ptr++;
 
-        if (found)
-                found = scan_char(lbuf+len, local_count-len, &offs, &eof, '\n');
-
-        if (!found || eof) {
+        if (strstr(ptr, "Waiting work element counts") == NULL) {
+                PRINTK("Unable to parse data (missing \"Waiting work element counts\")\n");
                 kfree(lbuf);
                 return count;
         }
 
-        len += offs;
         j = 0;
-        for (i = 0; i < 80; i++) {
-                switch (*(lbuf+len+i)) {
+        eol = 0;
+        while ((j < 64) && (*ptr != '\0')) {
+                switch (*ptr) {
                 case '\t':
                 case ' ':
                         break;
                 case '\n':
                 default:
-                        eof = 1;
+                        eol = 1;
                         break;
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
+                case '0':       // no device
+                case '1':       // PCICA
+                case '2':       // PCICC
+                case '3':       // PCIXCC_MCL2
+                case '4':       // PCIXCC_MCL3
+                case '5':       // CEX2C
                         j++;
                         break;
                 case 'd':
@@ -2283,8 +2158,9 @@ z90crypt_status_write(struct file *file, const char __user *buffer,
                         j++;
                         break;
                 }
-                if (eof)
+                if (eol)
                         break;
+                ptr++;
         }
 
         kfree(lbuf);
@@ -3479,45 +3355,5 @@ probe_PCIXCC_type(struct device *devPtr)
         return rv;
 }
 
-#ifdef Z90CRYPT_USE_HOTPLUG
-static void
-z90crypt_hotplug_event(int dev_major, int dev_minor, int action)
-{
-#ifdef CONFIG_HOTPLUG
-        char *argv[3];
-        char *envp[6];
-        char  major[20];
-        char  minor[20];
-
-        sprintf(major, "MAJOR=%d", dev_major);
-        sprintf(minor, "MINOR=%d", dev_minor);
-
-        argv[0] = hotplug_path;
-        argv[1] = "z90crypt";
-        argv[2] = 0;
-
-        envp[0] = "HOME=/";
-        envp[1] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
-
-        switch (action) {
-        case Z90CRYPT_HOTPLUG_ADD:
-                envp[2] = "ACTION=add";
-                break;
-        case Z90CRYPT_HOTPLUG_REMOVE:
-                envp[2] = "ACTION=remove";
-                break;
-        default:
-                BUG();
-                break;
-        }
-        envp[3] = major;
-        envp[4] = minor;
-        envp[5] = 0;
-
-        call_usermodehelper(argv[0], argv, envp, 0);
-#endif
-}
-#endif
-
 module_init(z90crypt_init_module);
 module_exit(z90crypt_cleanup_module);
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 24c0af49c25c..3092473991a7 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2,9 +2,9 @@
  *  drivers/s390/net/claw.c
  *    ESCON CLAW network driver
  *
- *    $Revision: 1.35 $ $Date: 2005/03/24 12:25:38 $
+ *    $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $
  *
- *  Linux fo zSeries version
+ *  Linux for zSeries version
  *    Copyright (C) 2002,2005 IBM Corporation
  *  Author(s) Original code written by:
  *              Kazuo Iimura (iimura@jp.ibm.com)
@@ -431,12 +431,12 @@ claw_pack_skb(struct claw_privbk *privptr)
         if (!skb_queue_empty(&p_ch->collect_queue)) {
         /* some data */
                 held_skb = skb_dequeue(&p_ch->collect_queue);
-                if (p_env->packing != DO_PACKED)
-                        return held_skb;
                 if (held_skb)
-                        atomic_dec(&held_skb->users);
+                        dev_kfree_skb_any(held_skb);
                 else
                         return NULL;
+                if (p_env->packing != DO_PACKED)
+                        return held_skb;
                 /* get a new SKB we will pack at least one */
                 new_skb = dev_alloc_skb(p_env->write_size);
                 if (new_skb == NULL) {
@@ -455,7 +455,7 @@ claw_pack_skb(struct claw_privbk *privptr)
                                 privptr->stats.tx_packets++;
                                 so_far += held_skb->len;
                                 pkt_cnt++;
-                                dev_kfree_skb_irq(held_skb);
+                                dev_kfree_skb_any(held_skb);
                                 held_skb = skb_dequeue(&p_ch->collect_queue);
                                 if (held_skb)
                                         atomic_dec(&held_skb->users);
@@ -1092,7 +1092,7 @@ claw_release(struct net_device *dev)
                 }
         }
         if (privptr->pk_skb != NULL) {
-                dev_kfree_skb(privptr->pk_skb);
+                dev_kfree_skb_any(privptr->pk_skb);
                 privptr->pk_skb = NULL;
         }
         if(privptr->buffs_alloc != 1) {
@@ -2016,7 +2016,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
         p_buf=(struct ccwbk*)privptr->p_end_ccw;
         dumpit((char *)p_buf, sizeof(struct endccw));
 #endif
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
         if (linkid==0) {
                 lock=LOCK_NO;
         }
@@ -4061,7 +4061,7 @@ claw_purge_skb_queue(struct sk_buff_head *q)
 
         while ((skb = skb_dequeue(q))) {
                 atomic_dec(&skb->users);
-                dev_kfree_skb_irq(skb);
+                dev_kfree_skb_any(skb);
         }
 }
 
@@ -4410,7 +4410,7 @@ claw_init(void)
 #else
                 "compiled into kernel "
 #endif
-                " $Revision: 1.35 $ $Date: 2005/03/24 12:25:38 $ \n");
+                " $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $ \n");
 
 
 #ifdef FUNCTRACE
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 5bb255e02acc..4191fd9d4d11 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -240,7 +240,7 @@ s390_revalidate_registers(struct mci *mci)
                          * Floating point control register can't be restored.
                          * Task will be terminated.
                          */
-                        asm volatile ("lfpc 0(%0)" : : "a" (&zero));
+                        asm volatile ("lfpc 0(%0)" : : "a" (&zero), "m" (zero));
                         kill_task = 1;
 
                 }
diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig
index a41778a490d6..3a8152906bf6 100644
--- a/drivers/sbus/char/Kconfig
+++ b/drivers/sbus/char/Kconfig
@@ -69,11 +69,40 @@ config SUN_JSFLASH
           If you say Y here, you will be able to boot from your JavaStation's
           Flash memory.
 
-# XXX Why don't we do "source drivers/char/Config.in" somewhere?
-# no shit
-config RTC
-        tristate "PC-style Real Time Clock Support"
-        depends on PCI && EXPERIMENTAL && SPARC32
+config BBC_I2C
+        tristate "UltraSPARC-III bootbus i2c controller driver"
+        depends on PCI && SPARC64
+        help
+          The BBC devices on the UltraSPARC III have two I2C controllers.  The
+          first I2C controller connects mainly to configuration PROMs (NVRAM,
+          CPU configuration, DIMM types, etc.).  The second I2C controller
+          connects to environmental control devices such as fans and
+          temperature sensors.  The second controller also connects to the
+          smartcard reader, if present.  Say Y to enable support for these.
+
+config ENVCTRL
+        tristate "SUNW, envctrl support"
+        depends on PCI && SPARC64
+        help
+          Kernel support for temperature and fan monitoring on Sun SME
+          machines.
+
+          To compile this driver as a module, choose M here: the
+          module will be called envctrl.
+
+config DISPLAY7SEG
+        tristate "7-Segment Display support"
+        depends on PCI && SPARC64
+        ---help---
+          This is the driver for the 7-segment display and LED present on
+          Sun Microsystems CompactPCI models CP1400 and CP1500.
+
+          To compile this driver as a module, choose M here: the
+          module will be called display7seg.
+
+          If you do not have a CompactPCI model CP1400 or CP1500, or
+          another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
+          you should say N to this option.
 
 endmenu
 
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 973c51fb0fe2..ae9e0203e9de 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1499,22 +1499,43 @@ static int tw_scsiop_inquiry(TW_Device_Extension *tw_dev, int request_id)
         return 0;
 } /* End tw_scsiop_inquiry() */
 
+static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,
+                                 void *data, unsigned int len)
+{
+        struct scsi_cmnd *cmd = tw_dev->srb[request_id];
+        void *buf;
+        unsigned int transfer_len;
+
+        if (cmd->use_sg) {
+                struct scatterlist *sg =
+                        (struct scatterlist *)cmd->request_buffer;
+                buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
+                transfer_len = min(sg->length, len);
+        } else {
+                buf = cmd->request_buffer;
+                transfer_len = min(cmd->request_bufflen, len);
+        }
+
+        memcpy(buf, data, transfer_len);
+        
+        if (cmd->use_sg) {
+                struct scatterlist *sg;
+
+                sg = (struct scatterlist *)cmd->request_buffer;
+                kunmap_atomic(buf - sg->offset, KM_IRQ0);
+        }
+}
+
 /* This function is called by the isr to complete an inquiry command */
 static int tw_scsiop_inquiry_complete(TW_Device_Extension *tw_dev, int request_id)
 {
         unsigned char *is_unit_present;
-        unsigned char *request_buffer;
+        unsigned char request_buffer[36];
         TW_Param *param;
 
         dprintk(KERN_NOTICE "3w-xxxx: tw_scsiop_inquiry_complete()\n");
 
-        /* Fill request buffer */
-        if (tw_dev->srb[request_id]->request_buffer == NULL) {
-                printk(KERN_WARNING "3w-xxxx: tw_scsiop_inquiry_complete(): Request buffer NULL.\n");
-                return 1;
-        }
-        request_buffer = tw_dev->srb[request_id]->request_buffer;
-        memset(request_buffer, 0, tw_dev->srb[request_id]->request_bufflen);
+        memset(request_buffer, 0, sizeof(request_buffer));
         request_buffer[0] = TYPE_DISK; /* Peripheral device type */
         request_buffer[1] = 0;         /* Device type modifier */
         request_buffer[2] = 0;         /* No ansi/iso compliance */
@@ -1522,6 +1543,8 @@ static int tw_scsiop_inquiry_complete(TW_Device_Extension *tw_dev, int request_i
         memcpy(&request_buffer[8], "3ware   ", 8);       /* Vendor ID */
         sprintf(&request_buffer[16], "Logical Disk %-2d ", tw_dev->srb[request_id]->device->id);
         memcpy(&request_buffer[32], TW_DRIVER_VERSION, 3);
+        tw_transfer_internal(tw_dev, request_id, request_buffer,
+                             sizeof(request_buffer));
 
         param = (TW_Param *)tw_dev->alignment_virtual_address[request_id];
         if (param == NULL) {
@@ -1612,7 +1635,7 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques
 {
         TW_Param *param;
         unsigned char *flags;
-        unsigned char *request_buffer;
+        unsigned char request_buffer[8];
 
         dprintk(KERN_NOTICE "3w-xxxx: tw_scsiop_mode_sense_complete()\n");
 
@@ -1622,8 +1645,7 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques
                 return 1;
         }
         flags = (char *)&(param->data[0]);
-        request_buffer = tw_dev->srb[request_id]->buffer;
-        memset(request_buffer, 0, tw_dev->srb[request_id]->request_bufflen);
+        memset(request_buffer, 0, sizeof(request_buffer));
 
         request_buffer[0] = 0xf;        /* mode data length */
         request_buffer[1] = 0;          /* default medium type */
@@ -1635,6 +1657,8 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques
                 request_buffer[6] = 0x4;        /* WCE on */
         else
                 request_buffer[6] = 0x0;        /* WCE off */
+        tw_transfer_internal(tw_dev, request_id, request_buffer,
+                             sizeof(request_buffer));
 
         return 0;
 } /* End tw_scsiop_mode_sense_complete() */
@@ -1701,17 +1725,12 @@ static int tw_scsiop_read_capacity_complete(TW_Device_Extension *tw_dev, int req
 {
         unsigned char *param_data;
         u32 capacity;
-        char *buff;
+        char buff[8];
         TW_Param *param;
 
         dprintk(KERN_NOTICE "3w-xxxx: tw_scsiop_read_capacity_complete()\n");
 
-        buff = tw_dev->srb[request_id]->request_buffer;
-        if (buff == NULL) {
-                printk(KERN_WARNING "3w-xxxx: tw_scsiop_read_capacity_complete(): Request buffer NULL.\n");
-                return 1;
-        }
-        memset(buff, 0, tw_dev->srb[request_id]->request_bufflen);
+        memset(buff, 0, sizeof(buff));
         param = (TW_Param *)tw_dev->alignment_virtual_address[request_id];
         if (param == NULL) {
                 printk(KERN_WARNING "3w-xxxx: tw_scsiop_read_capacity_complete(): Bad alignment virtual address.\n");
@@ -1739,6 +1758,8 @@ static int tw_scsiop_read_capacity_complete(TW_Device_Extension *tw_dev, int req
         buff[6] = (TW_BLOCK_SIZE >> 8) & 0xff;
         buff[7] = TW_BLOCK_SIZE & 0xff;
 
+        tw_transfer_internal(tw_dev, request_id, buff, sizeof(buff));
+
         return 0;
 } /* End tw_scsiop_read_capacity_complete() */
 
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 12c208fb18c5..2d21265e650b 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1,5 +1,11 @@
 menu "SCSI device support"
 
+config RAID_ATTRS
+        tristate "RAID Transport Class"
+        default n
+        ---help---
+          Provides RAID
+
 config SCSI
         tristate "SCSI device support"
         ---help---
@@ -250,7 +256,7 @@ config SCSI_DECNCR
 
 config SCSI_DECSII
         tristate "DEC SII Scsi Driver"
-        depends on MACH_DECSTATION && SCSI && MIPS32
+        depends on MACH_DECSTATION && SCSI && 32BIT
 
 config BLK_DEV_3W_XXXX_RAID
         tristate "3ware 5/6/7/8xxx ATA-RAID support"
@@ -459,6 +465,15 @@ config SCSI_ATA_PIIX
 
           If unsure, say N.
 
+config SCSI_SATA_MV
+        tristate "Marvell SATA support"
+        depends on SCSI_SATA && PCI && EXPERIMENTAL
+        help
+          This option enables support for the Marvell Serial ATA family.
+          Currently supports 88SX[56]0[48][01] chips.
+
+          If unsure, say N.
+
 config SCSI_SATA_NV
         tristate "NVIDIA SATA support"
         depends on SCSI_SATA && PCI && EXPERIMENTAL
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 3746fb9fa2f5..4b4fd94c2674 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -22,6 +22,8 @@ subdir-$(CONFIG_PCMCIA)		+= pcmcia
 
 obj-$(CONFIG_SCSI)              += scsi_mod.o
 
+obj-$(CONFIG_RAID_ATTRS)        += raid_class.o
+
 # --- NOTE ORDERING HERE ---
 # For kernel non-modular link, transport attributes need to
 # be initialised before drivers
@@ -132,6 +134,7 @@ obj-$(CONFIG_SCSI_SATA_SIS)	+= libata.o sata_sis.o
 obj-$(CONFIG_SCSI_SATA_SX4)     += libata.o sata_sx4.o
 obj-$(CONFIG_SCSI_SATA_NV)      += libata.o sata_nv.o
 obj-$(CONFIG_SCSI_SATA_ULI)     += libata.o sata_uli.o
+obj-$(CONFIG_SCSI_SATA_MV)      += libata.o sata_mv.o
 
 obj-$(CONFIG_ARM)               += arm/
 
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index f8ec6fe7d858..d40ba0bd68a3 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -88,6 +88,13 @@
  */
 #include <scsi/scsi_dbg.h>
 
+#ifndef NDEBUG
+#define NDEBUG 0
+#endif
+#ifndef NDEBUG
+#define NDEBUG_ABORT 0
+#endif
+
 #if (NDEBUG & NDEBUG_LISTS)
 #define LIST(x,y) {printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); }
 #define REMOVE(w,x,y,z) {printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, (void*)(w), (void*)(x), (void*)(y), (void*)(z)); if ((x)==(y)) udelay(5); }
@@ -359,7 +366,7 @@ static struct {
         {PHASE_UNKNOWN, "UNKNOWN"}
 };
 
-#ifdef NDEBUG
+#if NDEBUG
 static struct {
         unsigned char mask;
         const char *name;
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index 79ae73b23680..e1f2246ee7cd 100644
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -62,7 +62,7 @@
 
 #define SYNC_MODE 0             /* Synchronous transfer mode */
 
-#if DEBUG
+#ifdef DEBUG
 #undef NCR53C406A_DEBUG
 #define NCR53C406A_DEBUG 1
 #endif
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index ccdf440021fb..a8e3dfcd0dc7 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -133,6 +133,7 @@ struct inquiry_data {
  
 static unsigned long aac_build_sg(struct scsi_cmnd* scsicmd, struct sgmap* sgmap);
 static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* psg);
+static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* psg);
 static int aac_send_srb_fib(struct scsi_cmnd* scsicmd);
 #ifdef AAC_DETAILED_STATUS_INFO
 static char *aac_get_status_string(u32 status);
@@ -348,6 +349,27 @@ static void aac_io_done(struct scsi_cmnd * scsicmd)
         spin_unlock_irqrestore(host->host_lock, cpu_flags);
 }
 
+static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigned int offset, unsigned int len)
+{
+        void *buf;
+        unsigned int transfer_len;
+        struct scatterlist *sg = scsicmd->request_buffer;
+
+        if (scsicmd->use_sg) {
+                buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset;
+                transfer_len = min(sg->length, len + offset);
+        } else {
+                buf = scsicmd->request_buffer;
+                transfer_len = min(scsicmd->request_bufflen, len + offset);
+        }
+
+        memcpy(buf + offset, data, transfer_len - offset);
+
+        if (scsicmd->use_sg) 
+                kunmap_atomic(buf - sg->offset, KM_IRQ0);
+
+}
+
 static void get_container_name_callback(void *context, struct fib * fibptr)
 {
         struct aac_get_name_resp * get_name_reply;
@@ -363,18 +385,22 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
         /* Failure is irrelevant, using default value instead */
         if ((le32_to_cpu(get_name_reply->status) == CT_OK)
          && (get_name_reply->data[0] != '\0')) {
-                int    count;
-                char * dp;
-                char * sp = get_name_reply->data;
+                char *sp = get_name_reply->data;
                 sp[sizeof(((struct aac_get_name_resp *)NULL)->data)-1] = '\0';
                 while (*sp == ' ')
                         ++sp;
-                count = sizeof(((struct inquiry_data *)NULL)->inqd_pid);
-                dp = ((struct inquiry_data *)scsicmd->request_buffer)->inqd_pid;
-                if (*sp) do {
-                        *dp++ = (*sp) ? *sp++ : ' ';
-                } while (--count > 0);
+                if (*sp) {
+                        char d[sizeof(((struct inquiry_data *)NULL)->inqd_pid)];
+                        int count = sizeof(d);
+                        char *dp = d;
+                        do {
+                                *dp++ = (*sp) ? *sp++ : ' ';
+                        } while (--count > 0);
+                        aac_internal_transfer(scsicmd, d, 
+                          offsetof(struct inquiry_data, inqd_pid), sizeof(d));
+                }
         }
+
         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
 
         fib_complete(fibptr);
@@ -777,34 +803,36 @@ int aac_get_adapter_info(struct aac_dev* dev)
         /* 
          * 57 scatter gather elements 
          */
-        dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size -
-                sizeof(struct aac_fibhdr) -
-                sizeof(struct aac_write) + sizeof(struct sgmap)) /
-                        sizeof(struct sgmap);
-        if (dev->dac_support) {
-                /* 
-                 * 38 scatter gather elements 
-                 */
-                dev->scsi_host_ptr->sg_tablesize =
-                        (dev->max_fib_size -
+        if (!(dev->raw_io_interface)) {
+                dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size -
                         sizeof(struct aac_fibhdr) -
-                        sizeof(struct aac_write64) +
-                        sizeof(struct sgmap64)) /
-                                sizeof(struct sgmap64);
-        }
-        dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
-        if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
-                /*
-                 * Worst case size that could cause sg overflow when
-                 * we break up SG elements that are larger than 64KB.
-                 * Would be nice if we could tell the SCSI layer what
-                 * the maximum SG element size can be. Worst case is
-                 * (sg_tablesize-1) 4KB elements with one 64KB
-                 * element.
-                 *      32bit -> 468 or 238KB   64bit -> 424 or 212KB
-                 */
-                dev->scsi_host_ptr->max_sectors =
-                  (dev->scsi_host_ptr->sg_tablesize * 8) + 112;
+                        sizeof(struct aac_write) + sizeof(struct sgmap)) /
+                                sizeof(struct sgmap);
+                if (dev->dac_support) {
+                        /* 
+                         * 38 scatter gather elements 
+                         */
+                        dev->scsi_host_ptr->sg_tablesize =
+                                (dev->max_fib_size -
+                                sizeof(struct aac_fibhdr) -
+                                sizeof(struct aac_write64) +
+                                sizeof(struct sgmap64)) /
+                                        sizeof(struct sgmap64);
+                }
+                dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
+                if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
+                        /*
+                         * Worst case size that could cause sg overflow when
+                         * we break up SG elements that are larger than 64KB.
+                         * Would be nice if we could tell the SCSI layer what
+                         * the maximum SG element size can be. Worst case is
+                         * (sg_tablesize-1) 4KB elements with one 64KB
+                         * element.
+                         *      32bit -> 468 or 238KB   64bit -> 424 or 212KB
+                         */
+                        dev->scsi_host_ptr->max_sectors =
+                          (dev->scsi_host_ptr->sg_tablesize * 8) + 112;
+                }
         }
 
         fib_complete(fibptr);
@@ -814,12 +842,11 @@ int aac_get_adapter_info(struct aac_dev* dev)
 }
 
 
-static void read_callback(void *context, struct fib * fibptr)
+static void io_callback(void *context, struct fib * fibptr)
 {
         struct aac_dev *dev;
         struct aac_read_reply *readreply;
         struct scsi_cmnd *scsicmd;
-        u32 lba;
         u32 cid;
 
         scsicmd = (struct scsi_cmnd *) context;
@@ -827,8 +854,7 @@ static void read_callback(void *context, struct fib * fibptr)
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
         cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);
 
-        lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
-        dprintk((KERN_DEBUG "read_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), lba, jiffies));
+        dprintk((KERN_DEBUG "io_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3], jiffies));
 
         if (fibptr == NULL)
                 BUG();
@@ -847,7 +873,7 @@ static void read_callback(void *context, struct fib * fibptr)
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
         else {
 #ifdef AAC_DETAILED_STATUS_INFO
-                printk(KERN_WARNING "read_callback: io failed, status = %d\n",
+                printk(KERN_WARNING "io_callback: io failed, status = %d\n",
                   le32_to_cpu(readreply->status));
 #endif
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
@@ -867,53 +893,6 @@ static void read_callback(void *context, struct fib * fibptr)
         aac_io_done(scsicmd);
 }
 
-static void write_callback(void *context, struct fib * fibptr)
-{
-        struct aac_dev *dev;
-        struct aac_write_reply *writereply;
-        struct scsi_cmnd *scsicmd;
-        u32 lba;
-        u32 cid;
-
-        scsicmd = (struct scsi_cmnd *) context;
-        dev = (struct aac_dev *)scsicmd->device->host->hostdata;
-        cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);
-
-        lba = ((scsicmd->cmnd[1] & 0x1F) << 16) | (scsicmd->cmnd[2] << 8) | scsicmd->cmnd[3];
-        dprintk((KERN_DEBUG "write_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), lba, jiffies));
-        if (fibptr == NULL)
-                BUG();
-
-        if(scsicmd->use_sg)
-                pci_unmap_sg(dev->pdev, 
-                        (struct scatterlist *)scsicmd->buffer,
-                        scsicmd->use_sg,
-                        scsicmd->sc_data_direction);
-        else if(scsicmd->request_bufflen)
-                pci_unmap_single(dev->pdev, scsicmd->SCp.dma_handle,
-                                 scsicmd->request_bufflen,
-                                 scsicmd->sc_data_direction);
-
-        writereply = (struct aac_write_reply *) fib_data(fibptr);
-        if (le32_to_cpu(writereply->status) == ST_OK)
-                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
-        else {
-                printk(KERN_WARNING "write_callback: write failed, status = %d\n", writereply->status);
-                scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_CHECK_CONDITION;
-                set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
-                                    HARDWARE_ERROR,
-                                    SENCODE_INTERNAL_TARGET_FAILURE,
-                                    ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
-                                    0, 0);
-                memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data, 
-                                sizeof(struct sense_data));
-        }
-
-        fib_complete(fibptr);
-        fib_free(fibptr);
-        aac_io_done(scsicmd);
-}
-
 static int aac_read(struct scsi_cmnd * scsicmd, int cid)
 {
         u32 lba;
@@ -954,7 +933,32 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
 
         fib_init(cmd_fibcontext);
 
-        if (dev->dac_support == 1) {
+        if (dev->raw_io_interface) {
+                struct aac_raw_io *readcmd;
+                readcmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
+                readcmd->block[0] = cpu_to_le32(lba);
+                readcmd->block[1] = 0;
+                readcmd->count = cpu_to_le32(count<<9);
+                readcmd->cid = cpu_to_le16(cid);
+                readcmd->flags = cpu_to_le16(1);
+                readcmd->bpTotal = 0;
+                readcmd->bpComplete = 0;
+                
+                aac_build_sgraw(scsicmd, &readcmd->sg);
+                fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(readcmd->sg.count) - 1) * sizeof (struct sgentryraw));
+                if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))
+                        BUG();
+                /*
+                 *      Now send the Fib to the adapter
+                 */
+                status = fib_send(ContainerRawIo,
+                          cmd_fibcontext, 
+                          fibsize, 
+                          FsaNormal, 
+                          0, 1, 
+                          (fib_callback) io_callback, 
+                          (void *) scsicmd);
+        } else if (dev->dac_support == 1) {
                 struct aac_read64 *readcmd;
                 readcmd = (struct aac_read64 *) fib_data(cmd_fibcontext);
                 readcmd->command = cpu_to_le32(VM_CtHostRead64);
@@ -968,7 +972,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 fibsize = sizeof(struct aac_read64) + 
                         ((le32_to_cpu(readcmd->sg.count) - 1) * 
                          sizeof (struct sgentry64));
-                BUG_ON (fibsize > (sizeof(struct hw_fib) - 
+                BUG_ON (fibsize > (dev->max_fib_size - 
                                         sizeof(struct aac_fibhdr)));
                 /*
                  *      Now send the Fib to the adapter
@@ -978,7 +982,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) read_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         } else {
                 struct aac_read *readcmd;
@@ -1002,7 +1006,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) read_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         }
 
@@ -1061,7 +1065,32 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
         }
         fib_init(cmd_fibcontext);
 
-        if(dev->dac_support == 1) {
+        if (dev->raw_io_interface) {
+                struct aac_raw_io *writecmd;
+                writecmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
+                writecmd->block[0] = cpu_to_le32(lba);
+                writecmd->block[1] = 0;
+                writecmd->count = cpu_to_le32(count<<9);
+                writecmd->cid = cpu_to_le16(cid);
+                writecmd->flags = 0; 
+                writecmd->bpTotal = 0;
+                writecmd->bpComplete = 0;
+                
+                aac_build_sgraw(scsicmd, &writecmd->sg);
+                fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(writecmd->sg.count) - 1) * sizeof (struct sgentryraw));
+                if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))
+                        BUG();
+                /*
+                 *      Now send the Fib to the adapter
+                 */
+                status = fib_send(ContainerRawIo,
+                          cmd_fibcontext, 
+                          fibsize, 
+                          FsaNormal, 
+                          0, 1, 
+                          (fib_callback) io_callback, 
+                          (void *) scsicmd);
+        } else if (dev->dac_support == 1) {
                 struct aac_write64 *writecmd;
                 writecmd = (struct aac_write64 *) fib_data(cmd_fibcontext);
                 writecmd->command = cpu_to_le32(VM_CtHostWrite64);
@@ -1085,7 +1114,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) write_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         } else {
                 struct aac_write *writecmd;
@@ -1111,7 +1140,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                           fibsize, 
                           FsaNormal, 
                           0, 1, 
-                          (fib_callback) write_callback, 
+                          (fib_callback) io_callback, 
                           (void *) scsicmd);
         }
 
@@ -1340,44 +1369,45 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         switch (scsicmd->cmnd[0]) {
         case INQUIRY:
         {
-                struct inquiry_data *inq_data_ptr;
+                struct inquiry_data inq_data;
 
                 dprintk((KERN_DEBUG "INQUIRY command, ID: %d.\n", scsicmd->device->id));
-                inq_data_ptr = (struct inquiry_data *)scsicmd->request_buffer;
-                memset(inq_data_ptr, 0, sizeof (struct inquiry_data));
+                memset(&inq_data, 0, sizeof (struct inquiry_data));
 
-                inq_data_ptr->inqd_ver = 2;     /* claim compliance to SCSI-2 */
-                inq_data_ptr->inqd_dtq = 0x80;  /* set RMB bit to one indicating that the medium is removable */
-                inq_data_ptr->inqd_rdf = 2;     /* A response data format value of two indicates that the data shall be in the format specified in SCSI-2 */
-                inq_data_ptr->inqd_len = 31;
+                inq_data.inqd_ver = 2;  /* claim compliance to SCSI-2 */
+                inq_data.inqd_dtq = 0x80;       /* set RMB bit to one indicating that the medium is removable */
+                inq_data.inqd_rdf = 2;  /* A response data format value of two indicates that the data shall be in the format specified in SCSI-2 */
+                inq_data.inqd_len = 31;
                 /*Format for "pad2" is  RelAdr | WBus32 | WBus16 |  Sync  | Linked |Reserved| CmdQue | SftRe */
-                inq_data_ptr->inqd_pad2= 0x32 ;  /*WBus16|Sync|CmdQue */
+                inq_data.inqd_pad2= 0x32 ;       /*WBus16|Sync|CmdQue */
                 /*
                  *      Set the Vendor, Product, and Revision Level
                  *      see: <vendor>.c i.e. aac.c
                  */
                 if (scsicmd->device->id == host->this_id) {
-                        setinqstr(cardtype, (void *) (inq_data_ptr->inqd_vid), (sizeof(container_types)/sizeof(char *)));
-                        inq_data_ptr->inqd_pdt = INQD_PDT_PROC; /* Processor device */
+                        setinqstr(cardtype, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));
+                        inq_data.inqd_pdt = INQD_PDT_PROC;      /* Processor device */
+                        aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                         scsicmd->scsi_done(scsicmd);
                         return 0;
                 }
-                setinqstr(cardtype, (void *) (inq_data_ptr->inqd_vid), fsa_dev_ptr[cid].type);
-                inq_data_ptr->inqd_pdt = INQD_PDT_DA;   /* Direct/random access device */
+                setinqstr(cardtype, (void *) (inq_data.inqd_vid), fsa_dev_ptr[cid].type);
+                inq_data.inqd_pdt = INQD_PDT_DA;        /* Direct/random access device */
+                aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                 return aac_get_container_name(scsicmd, cid);
         }
         case READ_CAPACITY:
         {
                 u32 capacity;
-                char *cp;
+                char cp[8];
 
                 dprintk((KERN_DEBUG "READ CAPACITY command.\n"));
                 if (fsa_dev_ptr[cid].size <= 0x100000000LL)
                         capacity = fsa_dev_ptr[cid].size - 1;
                 else
                         capacity = (u32)-1;
-                cp = scsicmd->request_buffer;
+
                 cp[0] = (capacity >> 24) & 0xff;
                 cp[1] = (capacity >> 16) & 0xff;
                 cp[2] = (capacity >> 8) & 0xff;
@@ -1386,6 +1416,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 cp[5] = 0;
                 cp[6] = 2;
                 cp[7] = 0;
+                aac_internal_transfer(scsicmd, cp, 0, sizeof(cp));
 
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
@@ -1395,15 +1426,15 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
 
         case MODE_SENSE:
         {
-                char *mode_buf;
+                char mode_buf[4];
 
                 dprintk((KERN_DEBUG "MODE SENSE command.\n"));
-                mode_buf = scsicmd->request_buffer;
                 mode_buf[0] = 3;        /* Mode data length */
                 mode_buf[1] = 0;        /* Medium type - default */
                 mode_buf[2] = 0;        /* Device-specific param, bit 8: 0/1 = write enabled/protected */
                 mode_buf[3] = 0;        /* Block descriptor length */
 
+                aac_internal_transfer(scsicmd, mode_buf, 0, sizeof(mode_buf));
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
 
@@ -1411,10 +1442,9 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
         }
         case MODE_SENSE_10:
         {
-                char *mode_buf;
+                char mode_buf[8];
 
                 dprintk((KERN_DEBUG "MODE SENSE 10 byte command.\n"));
-                mode_buf = scsicmd->request_buffer;
                 mode_buf[0] = 0;        /* Mode data length (MSB) */
                 mode_buf[1] = 6;        /* Mode data length (LSB) */
                 mode_buf[2] = 0;        /* Medium type - default */
@@ -1423,6 +1453,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                 mode_buf[5] = 0;        /* reserved */
                 mode_buf[6] = 0;        /* Block descriptor length (MSB) */
                 mode_buf[7] = 0;        /* Block descriptor length (LSB) */
+                aac_internal_transfer(scsicmd, mode_buf, 0, sizeof(mode_buf));
 
                 scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
                 scsicmd->scsi_done(scsicmd);
@@ -1894,7 +1925,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
         srbcmd->id   = cpu_to_le32(scsicmd->device->id);
         srbcmd->lun      = cpu_to_le32(scsicmd->device->lun);
         srbcmd->flags    = cpu_to_le32(flag);
-        timeout = (scsicmd->timeout-jiffies)/HZ;
+        timeout = scsicmd->timeout_per_command/HZ;
         if(timeout == 0){
                 timeout = 1;
         }
@@ -2077,6 +2108,76 @@ static unsigned long aac_build_sg64(struct scsi_cmnd* scsicmd, struct sgmap64* p
         return byte_count;
 }
 
+static unsigned long aac_build_sgraw(struct scsi_cmnd* scsicmd, struct sgmapraw* psg)
+{
+        struct Scsi_Host *host = scsicmd->device->host;
+        struct aac_dev *dev = (struct aac_dev *)host->hostdata;
+        unsigned long byte_count = 0;
+
+        // Get rid of old data
+        psg->count = 0;
+        psg->sg[0].next = 0;
+        psg->sg[0].prev = 0;
+        psg->sg[0].addr[0] = 0;
+        psg->sg[0].addr[1] = 0;
+        psg->sg[0].count = 0;
+        psg->sg[0].flags = 0;
+        if (scsicmd->use_sg) {
+                struct scatterlist *sg;
+                int i;
+                int sg_count;
+                sg = (struct scatterlist *) scsicmd->request_buffer;
+
+                sg_count = pci_map_sg(dev->pdev, sg, scsicmd->use_sg,
+                        scsicmd->sc_data_direction);
+
+                for (i = 0; i < sg_count; i++) {
+                        int count = sg_dma_len(sg);
+                        u64 addr = sg_dma_address(sg);
+                        psg->sg[i].next = 0;
+                        psg->sg[i].prev = 0;
+                        psg->sg[i].addr[1] = cpu_to_le32((u32)(addr>>32));
+                        psg->sg[i].addr[0] = cpu_to_le32((u32)(addr & 0xffffffff));
+                        psg->sg[i].count = cpu_to_le32(count);
+                        psg->sg[i].flags = 0;
+                        byte_count += count;
+                        sg++;
+                }
+                psg->count = cpu_to_le32(sg_count);
+                /* hba wants the size to be exact */
+                if(byte_count > scsicmd->request_bufflen){
+                        u32 temp = le32_to_cpu(psg->sg[i-1].count) - 
+                                (byte_count - scsicmd->request_bufflen);
+                        psg->sg[i-1].count = cpu_to_le32(temp);
+                        byte_count = scsicmd->request_bufflen;
+                }
+                /* Check for command underflow */
+                if(scsicmd->underflow && (byte_count < scsicmd->underflow)){
+                        printk(KERN_WARNING"aacraid: cmd len %08lX cmd underflow %08X\n",
+                                        byte_count, scsicmd->underflow);
+                }
+        }
+        else if(scsicmd->request_bufflen) {
+                int count;
+                u64 addr;
+                scsicmd->SCp.dma_handle = pci_map_single(dev->pdev,
+                                scsicmd->request_buffer,
+                                scsicmd->request_bufflen,
+                                scsicmd->sc_data_direction);
+                addr = scsicmd->SCp.dma_handle;
+                count = scsicmd->request_bufflen;
+                psg->count = cpu_to_le32(1);
+                psg->sg[0].next = 0;
+                psg->sg[0].prev = 0;
+                psg->sg[0].addr[1] = cpu_to_le32((u32)(addr>>32));
+                psg->sg[0].addr[0] = cpu_to_le32((u32)(addr & 0xffffffff));
+                psg->sg[0].count = cpu_to_le32(count);
+                psg->sg[0].flags = 0;
+                byte_count = scsicmd->request_bufflen;
+        }
+        return byte_count;
+}
+
 #ifdef AAC_DETAILED_STATUS_INFO
 
 struct aac_srb_status_info {
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 4ab07861b457..e40528185d48 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -110,6 +110,22 @@ struct user_sgentry64 {
         u32     count;  /* Length. */
 };
 
+struct sgentryraw {
+        __le32          next;   /* reserved for F/W use */
+        __le32          prev;   /* reserved for F/W use */
+        __le32          addr[2];
+        __le32          count;
+        __le32          flags;  /* reserved for F/W use */
+};
+
+struct user_sgentryraw {
+        u32             next;   /* reserved for F/W use */
+        u32             prev;   /* reserved for F/W use */
+        u32             addr[2];
+        u32             count;
+        u32             flags;  /* reserved for F/W use */
+};
+
 /*
  *      SGMAP
  *
@@ -137,6 +153,16 @@ struct user_sgmap64 {
         struct user_sgentry64 sg[1];
 };
 
+struct sgmapraw {
+        __le32            count;
+        struct sgentryraw sg[1];
+};
+
+struct user_sgmapraw {
+        u32               count;
+        struct user_sgentryraw sg[1];
+};
+
 struct creation_info
 {
         u8              buildnum;               /* e.g., 588 */
@@ -351,6 +377,7 @@ struct hw_fib {
  */
 #define         ContainerCommand                500
 #define         ContainerCommand64              501
+#define         ContainerRawIo                  502
 /*
  *      Cluster Commands
  */
@@ -456,6 +483,7 @@ struct adapter_ops
 {
         void (*adapter_interrupt)(struct aac_dev *dev);
         void (*adapter_notify)(struct aac_dev *dev, u32 event);
+        void (*adapter_disable_int)(struct aac_dev *dev);
         int  (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4);
         int  (*adapter_check_health)(struct aac_dev *dev);
 };
@@ -981,6 +1009,9 @@ struct aac_dev
         u8                      nondasd_support; 
         u8                      dac_support;
         u8                      raid_scsi_mode;
+        /* macro side-effects BEWARE */
+#       define                  raw_io_interface \
+          init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)
         u8                      printf_enabled;
 };
 
@@ -990,6 +1021,9 @@ struct aac_dev
 #define aac_adapter_notify(dev, event) \
         (dev)->a_ops.adapter_notify(dev, event)
 
+#define aac_adapter_disable_int(dev) \
+        (dev)->a_ops.adapter_disable_int(dev)
+
 #define aac_adapter_sync_cmd(dev, command, p1, p2, p3, p4, p5, p6, status, r1, r2, r3, r4) \
         (dev)->a_ops.adapter_sync_cmd(dev, command, p1, p2, p3, p4, p5, p6, status, r1, r2, r3, r4)
 
@@ -1156,6 +1190,17 @@ struct aac_write_reply
         __le32          committed;
 };
 
+struct aac_raw_io
+{
+        __le32          block[2];
+        __le32          count;
+        __le16          cid;
+        __le16          flags;          /* 00 W, 01 R */
+        __le16          bpTotal;        /* reserved for F/W use */
+        __le16          bpComplete;     /* reserved for F/W use */
+        struct sgmapraw sg;
+};
+
 #define CT_FLUSH_CACHE 129
 struct aac_synchronize {
         __le32          command;        /* VM_ContainerConfig */
@@ -1196,7 +1241,7 @@ struct aac_srb
 };
 
 /*
- * This and assocated data structs are used by the 
+ * This and associated data structs are used by the
  * ioctl caller and are in cpu order.
  */
 struct user_aac_srb
@@ -1508,11 +1553,12 @@ struct fib_ioctl
 
 struct revision
 {
-        u32 compat;
-        u32 version;
-        u32 build;
+        __le32 compat;
+        __le32 version;
+        __le32 build;
 };
         
+
 /*
  *      Ugly - non Linux like ioctl coding for back compat.
  */
@@ -1733,3 +1779,4 @@ int aac_get_adapter_info(struct aac_dev* dev);
 int aac_send_shutdown(struct aac_dev *dev);
 extern int numacb;
 extern int acbsize;
+extern char aac_driver_version[];
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 85387099aab2..71f1cad9b5f0 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -287,7 +287,6 @@ return_fib:
                 kfree(fib->hw_fib);
                 kfree(fib);
                 status = 0;
-                fibctx->jiffies = jiffies/HZ;
         } else {
                 spin_unlock_irqrestore(&dev->fib_lock, flags);
                 if (f.wait) {
@@ -302,6 +301,7 @@ return_fib:
                         status = -EAGAIN;
                 }       
         }
+        fibctx->jiffies = jiffies/HZ;
         return status;
 }
 
@@ -405,10 +405,20 @@ static int close_getadapter_fib(struct aac_dev * dev, void __user *arg)
 static int check_revision(struct aac_dev *dev, void __user *arg)
 {
         struct revision response;
-
-        response.compat = 1;
-        response.version = le32_to_cpu(dev->adapter_info.kernelrev);
-        response.build = le32_to_cpu(dev->adapter_info.kernelbuild);
+        char *driver_version = aac_driver_version;
+        u32 version;
+
+        response.compat = cpu_to_le32(1);
+        version = (simple_strtol(driver_version, 
+                                &driver_version, 10) << 24) | 0x00000400;
+        version += simple_strtol(driver_version + 1, &driver_version, 10) << 16;
+        version += simple_strtol(driver_version + 1, NULL, 10);
+        response.version = cpu_to_le32(version);
+#       if (defined(AAC_DRIVER_BUILD))
+                response.build = cpu_to_le32(AAC_DRIVER_BUILD);
+#       else
+                response.build = cpu_to_le32(9999);
+#       endif
 
         if (copy_to_user(arg, &response, sizeof(response)))
                 return -EFAULT;
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 43557bf661f6..75abd0453289 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -44,7 +44,9 @@
 
 #include "aacraid.h"
 
-struct aac_common aac_config;
+struct aac_common aac_config = {
+        .irq_mod = 1
+};
 
 static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long commsize, unsigned long commalign)
 {
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 5322865942e2..a1d303f03480 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -254,6 +254,7 @@ static void fib_dealloc(struct fib * fibptr)
 static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entry, u32 * index, unsigned long *nonotify)
 {
         struct aac_queue * q;
+        unsigned long idx;
 
         /*
          *      All of the queues wrap when they reach the end, so we check
@@ -263,10 +264,23 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
          */
 
         q = &dev->queues->queue[qid];
-        
-        *index = le32_to_cpu(*(q->headers.producer));
-        if ((*index - 2) == le32_to_cpu(*(q->headers.consumer)))
+
+        idx = *index = le32_to_cpu(*(q->headers.producer));
+        /* Interrupt Moderation, only interrupt for first two entries */
+        if (idx != le32_to_cpu(*(q->headers.consumer))) {
+                if (--idx == 0) {
+                        if (qid == AdapHighCmdQueue)
+                                idx = ADAP_HIGH_CMD_ENTRIES;
+                        else if (qid == AdapNormCmdQueue)
+                                idx = ADAP_NORM_CMD_ENTRIES;
+                        else if (qid == AdapHighRespQueue) 
+                                idx = ADAP_HIGH_RESP_ENTRIES;
+                        else if (qid == AdapNormRespQueue) 
+                                idx = ADAP_NORM_RESP_ENTRIES;
+                }
+                if (idx != le32_to_cpu(*(q->headers.consumer)))
                         *nonotify = 1; 
+        }
 
         if (qid == AdapHighCmdQueue) {
                 if (*index >= ADAP_HIGH_CMD_ENTRIES)
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 562da90480a1..4ff29d7f5825 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -27,8 +27,11 @@
  * Abstract: Linux Driver entry module for Adaptec RAID Array Controller
  */
 
-#define AAC_DRIVER_VERSION              "1.1.2-lk2"
-#define AAC_DRIVER_BUILD_DATE           __DATE__
+#define AAC_DRIVER_VERSION              "1.1-4"
+#ifndef AAC_DRIVER_BRANCH
+#define AAC_DRIVER_BRANCH               ""
+#endif
+#define AAC_DRIVER_BUILD_DATE           __DATE__ " " __TIME__
 #define AAC_DRIVERNAME                  "aacraid"
 
 #include <linux/compat.h>
@@ -58,16 +61,24 @@
 
 #include "aacraid.h"
 
+#ifdef AAC_DRIVER_BUILD
+#define _str(x) #x
+#define str(x) _str(x)
+#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION "[" str(AAC_DRIVER_BUILD) "]" AAC_DRIVER_BRANCH
+#else
+#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION AAC_DRIVER_BRANCH " " AAC_DRIVER_BUILD_DATE
+#endif
 
 MODULE_AUTHOR("Red Hat Inc and Adaptec");
 MODULE_DESCRIPTION("Dell PERC2, 2/Si, 3/Si, 3/Di, "
                    "Adaptec Advanced Raid Products, "
                    "and HP NetRAID-4M SCSI driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(AAC_DRIVER_VERSION);
+MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
 
 static LIST_HEAD(aac_devices);
 static int aac_cfg_major = -1;
+char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
 
 /*
  * Because of the way Linux names scsi devices, the order in this table has
@@ -109,36 +120,39 @@ static struct pci_device_id aac_pci_tbl[] = {
         { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5085AU (Hurricane) */
         { 0x9005, 0x0285, 0x9005, 0x02a4, 0, 0, 30 }, /* ICP9085LI (Marauder-X) */
         { 0x9005, 0x0285, 0x9005, 0x02a5, 0, 0, 31 }, /* ICP5085BR (Marauder-E) */
-        { 0x9005, 0x0287, 0x9005, 0x0800, 0, 0, 32 }, /* Themisto Jupiter Platform */
-        { 0x9005, 0x0200, 0x9005, 0x0200, 0, 0, 32 }, /* Themisto Jupiter Platform */
-        { 0x9005, 0x0286, 0x9005, 0x0800, 0, 0, 33 }, /* Callisto Jupiter Platform */
-        { 0x9005, 0x0285, 0x9005, 0x028e, 0, 0, 34 }, /* ASR-2020SA SATA PCI-X ZCR (Skyhawk) */
-        { 0x9005, 0x0285, 0x9005, 0x028f, 0, 0, 35 }, /* ASR-2025SA SATA SO-DIMM PCI-X ZCR (Terminator) */
-        { 0x9005, 0x0285, 0x9005, 0x0290, 0, 0, 36 }, /* AAR-2410SA PCI SATA 4ch (Jaguar II) */
-        { 0x9005, 0x0285, 0x1028, 0x0291, 0, 0, 37 }, /* CERC SATA RAID 2 PCI SATA 6ch (DellCorsair) */
-        { 0x9005, 0x0285, 0x9005, 0x0292, 0, 0, 38 }, /* AAR-2810SA PCI SATA 8ch (Corsair-8) */
-        { 0x9005, 0x0285, 0x9005, 0x0293, 0, 0, 39 }, /* AAR-21610SA PCI SATA 16ch (Corsair-16) */
-        { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 40 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */
-        { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 41 }, /* AAR-2610SA PCI SATA 6ch */
-        { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 42 }, /* ASR-2240S (SabreExpress) */
-        { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 43 }, /* ASR-4005SAS */
-        { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 44 }, /* IBM 8i (AvonPark) */
-        { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 44 }, /* IBM 8i (AvonPark Lite) */
-        { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 45 }, /* ASR-4000SAS (BlackBird) */
-        { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 46 }, /* ASR-4800SAS (Marauder-X) */
-        { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 47 }, /* ASR-4805SAS (Marauder-E) */
-        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 48 }, /* ASR-4810SAS (Hurricane */
-
-        { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 49 }, /* Perc 320/DC*/
-        { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 50 }, /* Adaptec 5400S (Mustang)*/
-        { 0x1011, 0x0046, 0x9005, 0x0364, 0, 0, 51 }, /* Adaptec 5400S (Mustang)*/
-        { 0x1011, 0x0046, 0x9005, 0x1364, 0, 0, 52 }, /* Dell PERC2/QC */
-        { 0x1011, 0x0046, 0x103c, 0x10c2, 0, 0, 53 }, /* HP NetRAID-4M */
-
-        { 0x9005, 0x0285, 0x1028, PCI_ANY_ID, 0, 0, 54 }, /* Dell Catchall */
-        { 0x9005, 0x0285, 0x17aa, PCI_ANY_ID, 0, 0, 55 }, /* Legend Catchall */
-        { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 56 }, /* Adaptec Catch All */
-        { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 57 }, /* Adaptec Rocket Catch All */
+        { 0x9005, 0x0286, 0x9005, 0x02a6, 0, 0, 32 }, /* ICP9067MA (Intruder-6) */
+        { 0x9005, 0x0287, 0x9005, 0x0800, 0, 0, 33 }, /* Themisto Jupiter Platform */
+        { 0x9005, 0x0200, 0x9005, 0x0200, 0, 0, 33 }, /* Themisto Jupiter Platform */
+        { 0x9005, 0x0286, 0x9005, 0x0800, 0, 0, 34 }, /* Callisto Jupiter Platform */
+        { 0x9005, 0x0285, 0x9005, 0x028e, 0, 0, 35 }, /* ASR-2020SA SATA PCI-X ZCR (Skyhawk) */
+        { 0x9005, 0x0285, 0x9005, 0x028f, 0, 0, 36 }, /* ASR-2025SA SATA SO-DIMM PCI-X ZCR (Terminator) */
+        { 0x9005, 0x0285, 0x9005, 0x0290, 0, 0, 37 }, /* AAR-2410SA PCI SATA 4ch (Jaguar II) */
+        { 0x9005, 0x0285, 0x1028, 0x0291, 0, 0, 38 }, /* CERC SATA RAID 2 PCI SATA 6ch (DellCorsair) */
+        { 0x9005, 0x0285, 0x9005, 0x0292, 0, 0, 39 }, /* AAR-2810SA PCI SATA 8ch (Corsair-8) */
+        { 0x9005, 0x0285, 0x9005, 0x0293, 0, 0, 40 }, /* AAR-21610SA PCI SATA 16ch (Corsair-16) */
+        { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 41 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */
+        { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 42 }, /* AAR-2610SA PCI SATA 6ch */
+        { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 43 }, /* ASR-2240S (SabreExpress) */
+        { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005SAS */
+        { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 45 }, /* IBM 8i (AvonPark) */
+        { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 45 }, /* IBM 8i (AvonPark Lite) */
+        { 0x9005, 0x0286, 0x1014, 0x9580, 0, 0, 46 }, /* IBM 8k/8k-l8 (Aurora) */
+        { 0x9005, 0x0286, 0x1014, 0x9540, 0, 0, 47 }, /* IBM 8k/8k-l4 (Aurora Lite) */
+        { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000SAS (BlackBird) */
+        { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS (Marauder-X) */
+        { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS (Marauder-E) */
+        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-4810SAS (Hurricane */
+
+        { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/
+        { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S (Mustang)*/
+        { 0x1011, 0x0046, 0x9005, 0x0364, 0, 0, 54 }, /* Adaptec 5400S (Mustang)*/
+        { 0x1011, 0x0046, 0x9005, 0x1364, 0, 0, 55 }, /* Dell PERC2/QC */
+        { 0x1011, 0x0046, 0x103c, 0x10c2, 0, 0, 56 }, /* HP NetRAID-4M */
+
+        { 0x9005, 0x0285, 0x1028, PCI_ANY_ID, 0, 0, 57 }, /* Dell Catchall */
+        { 0x9005, 0x0285, 0x17aa, PCI_ANY_ID, 0, 0, 58 }, /* Legend Catchall */
+        { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */
+        { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */
         { 0,}
 };
 MODULE_DEVICE_TABLE(pci, aac_pci_tbl);
@@ -180,8 +194,9 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9047MA       ", 1 }, /* ICP9047MA (Lancer) */
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP9087MA       ", 1 }, /* ICP9087MA (Lancer) */
         { aac_rkt_init, "aacraid",  "ICP     ", "ICP5085AU       ", 1 }, /* ICP5085AU (Hurricane) */
-        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9085LI       ", 1 }, /* ICP9085LI (Marauder-X) */
-        { aac_rkt_init, "aacraid",  "ICP     ", "ICP5085BR       ", 1 }, /* ICP5085BR (Marauder-E) */
+        { aac_rx_init, "aacraid",  "ICP     ", "ICP9085LI       ", 1 }, /* ICP9085LI (Marauder-X) */
+        { aac_rx_init, "aacraid",  "ICP     ", "ICP5085BR       ", 1 }, /* ICP5085BR (Marauder-E) */
+        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9067MA       ", 1 }, /* ICP9067MA (Intruder-6) */
         { NULL        , "aacraid",  "ADAPTEC ", "Themisto        ", 0, AAC_QUIRK_SLAVE }, /* Jupiter Platform */
         { aac_rkt_init, "aacraid",  "ADAPTEC ", "Callisto        ", 2, AAC_QUIRK_MASTER }, /* Jupiter Platform */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2020SA       ", 1 }, /* ASR-2020SA SATA PCI-X ZCR (Skyhawk) */
@@ -195,10 +210,12 @@ static struct aac_driver_ident aac_drivers[] = {
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2240S       ", 1 }, /* ASR-2240S (SabreExpress) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4005SAS     ", 1 }, /* ASR-4005SAS */
         { aac_rx_init, "ServeRAID","IBM     ", "ServeRAID 8i    ", 1 }, /* IBM 8i (AvonPark) */
+        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l8 ", 1 }, /* IBM 8k/8k-l8 (Aurora) */
+        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l4 ", 1 }, /* IBM 8k/8k-l4 (Aurora Lite) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000SAS     ", 1 }, /* ASR-4000SAS (BlackBird & AvonPark) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4800SAS     ", 1 }, /* ASR-4800SAS (Marauder-X) */
         { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4805SAS     ", 1 }, /* ASR-4805SAS (Marauder-E) */
-        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4810SAS     ", 1 }, /* ASR-4810SAS (Hurricane) */
+        { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-4810SAS     ", 1 }, /* ASR-4810SAS (Hurricane) */
 
         { aac_rx_init, "percraid", "DELL    ", "PERC 320/DC     ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/
         { aac_sa_init, "aacraid",  "ADAPTEC ", "Adaptec 5400S   ", 4, AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/
@@ -839,11 +856,12 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
 
         return 0;
 
-out_deinit:
+ out_deinit:
         kill_proc(aac->thread_pid, SIGKILL, 0);
         wait_for_completion(&aac->aif_completion);
 
         aac_send_shutdown(aac);
+        aac_adapter_disable_int(aac);
         fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);
         kfree(aac->queues);
@@ -860,6 +878,13 @@ out_deinit:
         return error;
 }
 
+static void aac_shutdown(struct pci_dev *dev)
+{
+        struct Scsi_Host *shost = pci_get_drvdata(dev);
+        struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
+        aac_send_shutdown(aac);
+}
+
 static void __devexit aac_remove_one(struct pci_dev *pdev)
 {
         struct Scsi_Host *shost = pci_get_drvdata(pdev);
@@ -871,6 +896,7 @@ static void __devexit aac_remove_one(struct pci_dev *pdev)
         wait_for_completion(&aac->aif_completion);
 
         aac_send_shutdown(aac);
+        aac_adapter_disable_int(aac);
         fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,
                         aac->comm_phys);
@@ -891,14 +917,15 @@ static struct pci_driver aac_pci_driver = {
         .id_table       = aac_pci_tbl,
         .probe          = aac_probe_one,
         .remove         = __devexit_p(aac_remove_one),
+        .shutdown       = aac_shutdown,
 };
 
 static int __init aac_init(void)
 {
         int error;
         
-        printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
-                        AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
+        printk(KERN_INFO "Adaptec %s driver (%s)\n",
+          AAC_DRIVERNAME, aac_driver_version);
 
         error = pci_module_init(&aac_pci_driver);
         if (error)
@@ -909,6 +936,7 @@ static int __init aac_init(void)
                 printk(KERN_WARNING
                        "aacraid: unable to register \"aac\" device.\n");
         }
+
         return 0;
 }
 
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
index 7d68b7825137..557287a0b80b 100644
--- a/drivers/scsi/aacraid/rkt.c
+++ b/drivers/scsi/aacraid/rkt.c
@@ -88,6 +88,16 @@ static irqreturn_t aac_rkt_intr(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /**
+ *      aac_rkt_disable_interrupt       -       Disable interrupts
+ *      @dev: Adapter
+ */
+
+static void aac_rkt_disable_interrupt(struct aac_dev *dev)
+{
+        rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
+}
+
+/**
  *      rkt_sync_cmd    -       send a command and wait
  *      @dev: Adapter
  *      @command: Command to execute
@@ -412,10 +422,19 @@ int aac_rkt_init(struct aac_dev *dev)
          *      Fill in the function dispatch table.
          */
         dev->a_ops.adapter_interrupt = aac_rkt_interrupt_adapter;
+        dev->a_ops.adapter_disable_int = aac_rkt_disable_interrupt;
         dev->a_ops.adapter_notify = aac_rkt_notify_adapter;
         dev->a_ops.adapter_sync_cmd = rkt_sync_cmd;
         dev->a_ops.adapter_check_health = aac_rkt_check_health;
 
+        /*
+         *      First clear out all interrupts.  Then enable the one's that we
+         *      can handle.
+         */
+        rkt_writeb(dev, MUnit.OIMR, 0xff);
+        rkt_writel(dev, MUnit.ODR, 0xffffffff);
+        rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xfb);
+
         if (aac_init_adapter(dev) == NULL)
                 goto error_irq;
         /*
@@ -438,6 +457,7 @@ error_kfree:
         kfree(dev->queues);
 
 error_irq:
+        rkt_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
         free_irq(dev->scsi_host_ptr->irq, (void *)dev);
 
 error_iounmap:
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 1ff25f49fada..a8459faf87ca 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -88,6 +88,16 @@ static irqreturn_t aac_rx_intr(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /**
+ *      aac_rx_disable_interrupt        -       Disable interrupts
+ *      @dev: Adapter
+ */
+
+static void aac_rx_disable_interrupt(struct aac_dev *dev)
+{
+        rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
+}
+
+/**
  *      rx_sync_cmd     -       send a command and wait
  *      @dev: Adapter
  *      @command: Command to execute
@@ -412,10 +422,19 @@ int aac_rx_init(struct aac_dev *dev)
          *      Fill in the function dispatch table.
          */
         dev->a_ops.adapter_interrupt = aac_rx_interrupt_adapter;
+        dev->a_ops.adapter_disable_int = aac_rx_disable_interrupt;
         dev->a_ops.adapter_notify = aac_rx_notify_adapter;
         dev->a_ops.adapter_sync_cmd = rx_sync_cmd;
         dev->a_ops.adapter_check_health = aac_rx_check_health;
 
+        /*
+         *      First clear out all interrupts.  Then enable the one's that we
+         *      can handle.
+         */
+        rx_writeb(dev, MUnit.OIMR, 0xff);
+        rx_writel(dev, MUnit.ODR, 0xffffffff);
+        rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xfb);
+
         if (aac_init_adapter(dev) == NULL)
                 goto error_irq;
         /*
@@ -438,6 +457,7 @@ error_kfree:
         kfree(dev->queues);
 
 error_irq:
+        rx_writeb(dev, MUnit.OIMR, dev->OIMR = 0xff);
         free_irq(dev->scsi_host_ptr->irq, (void *)dev);
 
 error_iounmap:
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 0680249ab861..3900abc5850d 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -82,6 +82,16 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 /**
+ *      aac_sa_disable_interrupt        -       disable interrupt
+ *      @dev: Which adapter to enable.
+ */
+
+static void aac_sa_disable_interrupt (struct aac_dev *dev)
+{
+        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
+}
+
+/**
  *      aac_sa_notify_adapter           -       handle adapter notification
  *      @dev:   Adapter that notification is for
  *      @event: Event to notidy
@@ -214,9 +224,8 @@ static int sa_sync_cmd(struct aac_dev *dev, u32 command,
  
 static void aac_sa_interrupt_adapter (struct aac_dev *dev)
 {
-        u32 ret;
         sa_sync_cmd(dev, BREAKPOINT_REQUEST, 0, 0, 0, 0, 0, 0,
-                        &ret, NULL, NULL, NULL, NULL);
+                        NULL, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -352,10 +361,18 @@ int aac_sa_init(struct aac_dev *dev)
          */
 
         dev->a_ops.adapter_interrupt = aac_sa_interrupt_adapter;
+        dev->a_ops.adapter_disable_int = aac_sa_disable_interrupt;
         dev->a_ops.adapter_notify = aac_sa_notify_adapter;
         dev->a_ops.adapter_sync_cmd = sa_sync_cmd;
         dev->a_ops.adapter_check_health = aac_sa_check_health;
 
+        /*
+         *      First clear out all interrupts.  Then enable the one's that 
+         *      we can handle.
+         */
+        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
+        sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, (PrintfReady | DOORBELL_1 | 
+                                DOORBELL_2 | DOORBELL_3 | DOORBELL_4));
 
         if(aac_init_adapter(dev) == NULL)
                 goto error_irq;
@@ -381,6 +398,7 @@ error_kfree:
         kfree(dev->queues);
 
 error_irq:
+        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
         free_irq(dev->scsi_host_ptr->irq, (void *)dev);
 
 error_iounmap:
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 0fb93363eb22..37ec5411e325 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -9200,8 +9200,8 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s)
         (unsigned) s->serial_number, s->retries, s->allowed);
 
     printk(
-" timeout_per_command %d, timeout_total %d, timeout %d\n",
-        s->timeout_per_command, s->timeout_total, s->timeout);
+" timeout_per_command %d\n",
+        s->timeout_per_command);
 
     printk(
 " scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n",
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 179c95c878ac..320df6cd3def 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -189,7 +189,6 @@ static void ahci_irq_clear(struct ata_port *ap);
 static void ahci_eng_timeout(struct ata_port *ap);
 static int ahci_port_start(struct ata_port *ap);
 static void ahci_port_stop(struct ata_port *ap);
-static void ahci_host_stop(struct ata_host_set *host_set);
 static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
 static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
@@ -242,7 +241,6 @@ static struct ata_port_operations ahci_ops = {
 
         .port_start             = ahci_port_start,
         .port_stop              = ahci_port_stop,
-        .host_stop              = ahci_host_stop,
 };
 
 static struct ata_port_info ahci_port_info[] = {
@@ -252,7 +250,7 @@ static struct ata_port_info ahci_port_info[] = {
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
                                   ATA_FLAG_PIO_DMA,
-                .pio_mask       = 0x03, /* pio3-4 */
+                .pio_mask       = 0x1f, /* pio0-4 */
                 .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
                 .port_ops       = &ahci_ops,
         },
@@ -296,17 +294,9 @@ static inline unsigned long ahci_port_base_ul (unsigned long base, unsigned int
         return base + 0x100 + (port * 0x80);
 }
 
-static inline void *ahci_port_base (void *base, unsigned int port)
+static inline void __iomem *ahci_port_base (void __iomem *base, unsigned int port)
 {
-        return (void *) ahci_port_base_ul((unsigned long)base, port);
-}
-
-static void ahci_host_stop(struct ata_host_set *host_set)
-{
-        struct ahci_host_priv *hpriv = host_set->private_data;
-        kfree(hpriv);
-
-        ata_host_stop(host_set);
+        return (void __iomem *) ahci_port_base_ul((unsigned long)base, port);
 }
 
 static int ahci_port_start(struct ata_port *ap)
@@ -314,8 +304,9 @@ static int ahci_port_start(struct ata_port *ap)
         struct device *dev = ap->host_set->dev;
         struct ahci_host_priv *hpriv = ap->host_set->private_data;
         struct ahci_port_priv *pp;
-        void *mem, *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void *mem;
         dma_addr_t mem_dma;
 
         pp = kmalloc(sizeof(*pp), GFP_KERNEL);
@@ -383,8 +374,8 @@ static void ahci_port_stop(struct ata_port *ap)
 {
         struct device *dev = ap->host_set->dev;
         struct ahci_port_priv *pp = ap->private_data;
-        void *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         u32 tmp;
 
         tmp = readl(port_mmio + PORT_CMD);
@@ -546,8 +537,8 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc)
 
 static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
 {
-        void *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         u32 tmp;
         int work;
 
@@ -595,8 +586,8 @@ static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)
 static void ahci_eng_timeout(struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         struct ata_queued_cmd *qc;
         unsigned long flags;
 
@@ -626,8 +617,8 @@ static void ahci_eng_timeout(struct ata_port *ap)
 
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
 {
-        void *mmio = ap->host_set->mmio_base;
-        void *port_mmio = ahci_port_base(mmio, ap->port_no);
+        void __iomem *mmio = ap->host_set->mmio_base;
+        void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
         u32 status, serr, ci;
 
         serr = readl(port_mmio + PORT_SCR_ERR);
@@ -663,7 +654,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
         struct ata_host_set *host_set = dev_instance;
         struct ahci_host_priv *hpriv;
         unsigned int i, handled = 0;
-        void *mmio;
+        void __iomem *mmio;
         u32 irq_stat, irq_ack = 0;
 
         VPRINTK("ENTER\n");
@@ -709,7 +700,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
 static int ahci_qc_issue(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
-        void *port_mmio = (void *) ap->ioaddr.cmd_addr;
+        void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
 
         writel(1, port_mmio + PORT_CMD_ISSUE);
         readl(port_mmio + PORT_CMD_ISSUE);      /* flush */
@@ -894,7 +885,7 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
 {
         struct ahci_host_priv *hpriv = probe_ent->private_data;
         struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
-        void *mmio = probe_ent->mmio_base;
+        void __iomem *mmio = probe_ent->mmio_base;
         u32 vers, cap, impl, speed;
         const char *speed_s;
         u16 cc;
@@ -967,7 +958,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         struct ata_probe_ent *probe_ent = NULL;
         struct ahci_host_priv *hpriv;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         unsigned int board_idx = (unsigned int) ent->driver_data;
         int have_msi, pci_dev_busy = 0;
         int rc;
@@ -1004,8 +995,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, AHCI_PCI_BAR),
-                            pci_resource_len(pdev, AHCI_PCI_BAR));
+        mmio_base = pci_iomap(pdev, AHCI_PCI_BAR, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
@@ -1049,7 +1039,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 err_out_hpriv:
         kfree(hpriv);
 err_out_iounmap:
-        iounmap(mmio_base);
+        pci_iounmap(pdev, mmio_base);
 err_out_free_ent:
         kfree(probe_ent);
 err_out_msi:
@@ -1089,7 +1079,8 @@ static void ahci_remove_one (struct pci_dev *pdev)
                 scsi_host_put(ap->host);
         }
 
-        host_set->ops->host_stop(host_set);
+        kfree(hpriv);
+        pci_iounmap(pdev, host_set->mmio_base);
         kfree(host_set);
 
         if (have_msi)
@@ -1106,7 +1097,6 @@ static int __init ahci_init(void)
         return pci_module_init(&ahci_pci_driver);
 }
 
-
 static void __exit ahci_exit(void)
 {
         pci_unregister_driver(&ahci_pci_driver);
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index c2523a30a7f5..69ed77fcb71f 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -5,6 +5,7 @@
 config SCSI_AIC79XX
         tristate "Adaptec AIC79xx U320 support"
         depends on PCI && SCSI
+        select SCSI_SPI_ATTRS
         help
         This driver supports all of Adaptec's Ultra 320 PCI-X
         based SCSI controllers.
diff --git a/drivers/scsi/aic7xxx/aic7770.c b/drivers/scsi/aic7xxx/aic7770.c
index 00f3bd1e181e..527efd36f5c1 100644
--- a/drivers/scsi/aic7xxx/aic7770.c
+++ b/drivers/scsi/aic7xxx/aic7770.c
@@ -126,7 +126,6 @@ aic7770_find_device(uint32_t id)
 int
 aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
 {
-        u_long  l;
         int     error;
         int     have_seeprom;
         u_int   hostconf;
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index fd4b2f3eb0c2..653fb0b42aea 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -1247,9 +1247,6 @@ struct ahd_softc {
         uint16_t                  user_tagenable;/* Tagged Queuing allowed */
 };
 
-TAILQ_HEAD(ahd_softc_tailq, ahd_softc);
-extern struct ahd_softc_tailq ahd_tailq;
-
 /*************************** IO Cell Configuration ****************************/
 #define AHD_PRECOMP_SLEW_INDEX                                          \
     (AHD_ANNEXCOL_PRECOMP_SLEW - AHD_ANNEXCOL_PER_DEV0)
@@ -1374,8 +1371,6 @@ void			 ahd_enable_coalescing(struct ahd_softc *ahd,
 void                     ahd_pause_and_flushwork(struct ahd_softc *ahd);
 int                      ahd_suspend(struct ahd_softc *ahd); 
 int                      ahd_resume(struct ahd_softc *ahd);
-void                     ahd_softc_insert(struct ahd_softc *);
-struct ahd_softc        *ahd_find_softc(struct ahd_softc *ahd);
 void                     ahd_set_unit(struct ahd_softc *, int);
 void                     ahd_set_name(struct ahd_softc *, char *);
 struct scb              *ahd_get_scb(struct ahd_softc *ahd, u_int col_idx);
@@ -1524,7 +1519,6 @@ void			ahd_print_scb(struct scb *scb);
 void                    ahd_print_devinfo(struct ahd_softc *ahd,
                                           struct ahd_devinfo *devinfo);
 void                    ahd_dump_sglist(struct scb *scb);
-void                    ahd_dump_all_cards_state(void);
 void                    ahd_dump_card_state(struct ahd_softc *ahd);
 int                     ahd_print_register(ahd_reg_parse_entry_t *table,
                                            u_int num_entries,
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 137fb1a37dd1..4e8f00df978d 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -52,8 +52,6 @@
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
 #endif
 
-/******************************** Globals *************************************/
-struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq);
 
 /***************************** Lookup Tables **********************************/
 char *ahd_chip_names[] =
@@ -5180,74 +5178,6 @@ ahd_softc_init(struct ahd_softc *ahd)
 }
 
 void
-ahd_softc_insert(struct ahd_softc *ahd)
-{
-        struct ahd_softc *list_ahd;
-
-#if AHD_PCI_CONFIG > 0
-        /*
-         * Second Function PCI devices need to inherit some
-         * settings from function 0.
-         */
-        if ((ahd->features & AHD_MULTI_FUNC) != 0) {
-                TAILQ_FOREACH(list_ahd, &ahd_tailq, links) {
-                        ahd_dev_softc_t list_pci;
-                        ahd_dev_softc_t pci;
-
-                        list_pci = list_ahd->dev_softc;
-                        pci = ahd->dev_softc;
-                        if (ahd_get_pci_slot(list_pci) == ahd_get_pci_slot(pci)
-                         && ahd_get_pci_bus(list_pci) == ahd_get_pci_bus(pci)) {
-                                struct ahd_softc *master;
-                                struct ahd_softc *slave;
-
-                                if (ahd_get_pci_function(list_pci) == 0) {
-                                        master = list_ahd;
-                                        slave = ahd;
-                                } else {
-                                        master = ahd;
-                                        slave = list_ahd;
-                                }
-                                slave->flags &= ~AHD_BIOS_ENABLED; 
-                                slave->flags |=
-                                    master->flags & AHD_BIOS_ENABLED;
-                                break;
-                        }
-                }
-        }
-#endif
-
-        /*
-         * Insertion sort into our list of softcs.
-         */
-        list_ahd = TAILQ_FIRST(&ahd_tailq);
-        while (list_ahd != NULL
-            && ahd_softc_comp(ahd, list_ahd) <= 0)
-                list_ahd = TAILQ_NEXT(list_ahd, links);
-        if (list_ahd != NULL)
-                TAILQ_INSERT_BEFORE(list_ahd, ahd, links);
-        else
-                TAILQ_INSERT_TAIL(&ahd_tailq, ahd, links);
-        ahd->init_level++;
-}
-
-/*
- * Verify that the passed in softc pointer is for a
- * controller that is still configured.
- */
-struct ahd_softc *
-ahd_find_softc(struct ahd_softc *ahd)
-{
-        struct ahd_softc *list_ahd;
-
-        TAILQ_FOREACH(list_ahd, &ahd_tailq, links) {
-                if (list_ahd == ahd)
-                        return (ahd);
-        }
-        return (NULL);
-}
-
-void
 ahd_set_unit(struct ahd_softc *ahd, int unit)
 {
         ahd->unit = unit;
@@ -7902,18 +7832,10 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset)
 static void
 ahd_reset_poll(void *arg)
 {
-        struct  ahd_softc *ahd;
+        struct  ahd_softc *ahd = arg;
         u_int   scsiseq1;
-        u_long  l;
         u_long  s;
         
-        ahd_list_lock(&l);
-        ahd = ahd_find_softc((struct ahd_softc *)arg);
-        if (ahd == NULL) {
-                printf("ahd_reset_poll: Instance %p no longer exists\n", arg);
-                ahd_list_unlock(&l);
-                return;
-        }
         ahd_lock(ahd, &s);
         ahd_pause(ahd);
         ahd_update_modes(ahd);
@@ -7924,7 +7846,6 @@ ahd_reset_poll(void *arg)
                                 ahd_reset_poll, ahd);
                 ahd_unpause(ahd);
                 ahd_unlock(ahd, &s);
-                ahd_list_unlock(&l);
                 return;
         }
 
@@ -7936,25 +7857,16 @@ ahd_reset_poll(void *arg)
         ahd->flags &= ~AHD_RESET_POLL_ACTIVE;
         ahd_unlock(ahd, &s);
         ahd_release_simq(ahd);
-        ahd_list_unlock(&l);
 }
 
 /**************************** Statistics Processing ***************************/
 static void
 ahd_stat_timer(void *arg)
 {
-        struct  ahd_softc *ahd;
-        u_long  l;
+        struct  ahd_softc *ahd = arg;
         u_long  s;
         int     enint_coal;
         
-        ahd_list_lock(&l);
-        ahd = ahd_find_softc((struct ahd_softc *)arg);
-        if (ahd == NULL) {
-                printf("ahd_stat_timer: Instance %p no longer exists\n", arg);
-                ahd_list_unlock(&l);
-                return;
-        }
         ahd_lock(ahd, &s);
 
         enint_coal = ahd->hs_mailbox & ENINT_COALESCE;
@@ -7981,7 +7893,6 @@ ahd_stat_timer(void *arg)
         ahd_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
                         ahd_stat_timer, ahd);
         ahd_unlock(ahd, &s);
-        ahd_list_unlock(&l);
 }
 
 /****************************** Status Processing *****************************/
@@ -8745,16 +8656,6 @@ sized:
         return (last_probe);
 }
 
-void
-ahd_dump_all_cards_state(void)
-{
-        struct ahd_softc *list_ahd;
-
-        TAILQ_FOREACH(list_ahd, &ahd_tailq, links) {
-                ahd_dump_card_state(list_ahd);
-        }
-}
-
 int
 ahd_print_register(ahd_reg_parse_entry_t *table, u_int num_entries,
                    const char *name, u_int address, u_int value,
@@ -9039,7 +8940,6 @@ ahd_dump_card_state(struct ahd_softc *ahd)
                 ahd_outb(ahd, STACK, (ahd->saved_stack[i] >> 8) & 0xFF);
         }
         printf("\n<<<<<<<<<<<<<<<<< Dump Card State Ends >>>>>>>>>>>>>>>>>>\n");
-        ahd_platform_dump_card_state(ahd);
         ahd_restore_modes(ahd, saved_modes);
         if (paused == 0)
                 ahd_unpause(ahd);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 329cb2331339..6b6d4e287793 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -46,32 +46,14 @@
 #include "aic79xx_inline.h"
 #include <scsi/scsicam.h>
 
-/*
- * Include aiclib.c as part of our
- * "module dependencies are hard" work around.
- */
-#include "aiclib.c"
+static struct scsi_transport_template *ahd_linux_transport_template = NULL;
 
 #include <linux/init.h>         /* __setup */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "sd.h"                 /* For geometry detection */
-#endif
-
 #include <linux/mm.h>           /* For fetching system memory size */
+#include <linux/blkdev.h>               /* For block_size() */
 #include <linux/delay.h>        /* For ssleep/msleep */
 
 /*
- * Lock protecting manipulation of the ahd softc list.
- */
-spinlock_t ahd_list_spinlock;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/* For dynamic sglist size calculation. */
-u_int ahd_linux_nseg;
-#endif
-
-/*
  * Bucket size for counting good commands in between bad ones.
  */
 #define AHD_LINUX_ERR_THRESH    1000
@@ -188,71 +170,6 @@ static adapter_tag_info_t aic79xx_tag_info[] =
 };
 
 /*
- * By default, read streaming is disabled.  In theory,
- * read streaming should enhance performance, but early
- * U320 drive firmware actually performs slower with
- * read streaming enabled.
- */
-#ifdef CONFIG_AIC79XX_ENABLE_RD_STRM
-#define AIC79XX_CONFIGED_RD_STRM 0xFFFF
-#else
-#define AIC79XX_CONFIGED_RD_STRM 0
-#endif
-
-static uint16_t aic79xx_rd_strm_info[] =
-{
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM,
-        AIC79XX_CONFIGED_RD_STRM
-};
-
-/*
- * DV option:
- *
- * positive value = DV Enabled
- * zero           = DV Disabled
- * negative value = DV Default for adapter type/seeprom
- */
-#ifdef CONFIG_AIC79XX_DV_SETTING
-#define AIC79XX_CONFIGED_DV CONFIG_AIC79XX_DV_SETTING
-#else
-#define AIC79XX_CONFIGED_DV -1
-#endif
-
-static int8_t aic79xx_dv_settings[] =
-{
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV,
-        AIC79XX_CONFIGED_DV
-};
-
-/*
  * The I/O cell on the chip is very configurable in respect to its analog
  * characteristics.  Set the defaults here; they can be overriden with
  * the proper insmod parameters.
@@ -375,13 +292,6 @@ static uint32_t aic79xx_pci_parity = ~0;
 uint32_t aic79xx_allow_memio = ~0;
 
 /*
- * aic79xx_detect() has been run, so register all device arrivals
- * immediately with the system rather than deferring to the sorted
- * attachment performed by aic79xx_detect().
- */
-int aic79xx_detect_complete;
-
-/*
  * So that we can set how long each device is given as a selection timeout.
  * The table of values goes like this:
  *   0 - 256ms
@@ -412,7 +322,7 @@ MODULE_AUTHOR("Maintainer: Justin T. Gibbs <gibbs@scsiguy.com>");
 MODULE_DESCRIPTION("Adaptec Aic790X U320 SCSI Host Bus Adapter driver");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_VERSION(AIC79XX_DRIVER_VERSION);
-module_param(aic79xx, charp, 0);
+module_param(aic79xx, charp, 0444);
 MODULE_PARM_DESC(aic79xx,
 "period delimited, options string.\n"
 "       verbose                 Enable verbose/diagnostic logging\n"
@@ -427,8 +337,6 @@ MODULE_PARM_DESC(aic79xx,
 "       reverse_scan            Sort PCI devices highest Bus/Slot to lowest\n"
 "       tag_info:<tag_str>      Set per-target tag depth\n"
 "       global_tag_depth:<int>  Global tag depth for all targets on all buses\n"
-"       rd_strm:<rd_strm_masks> Set per-target read streaming setting.\n"
-"       dv:<dv_settings>        Set per-controller Domain Validation Setting.\n"
 "       slewrate:<slewrate_list>Set the signal slew rate (0-15).\n"
 "       precomp:<pcomp_list>    Set the signal precompensation (0-7).\n"
 "       amplitude:<int>         Set the signal amplitude (0-7).\n"
@@ -441,249 +349,35 @@ MODULE_PARM_DESC(aic79xx,
 "               Shorten the selection timeout to 128ms\n"
 "\n"
 "       options aic79xx 'aic79xx=verbose.tag_info:{{}.{}.{..10}}.seltime:1'\n"
-"\n"
-"       Sample /etc/modprobe.conf line:\n"
-"               Change Read Streaming for Controller's 2 and 3\n"
-"\n"
-"       options aic79xx 'aic79xx=rd_strm:{..0xFFF0.0xC0F0}'");
+"\n");
 
 static void ahd_linux_handle_scsi_status(struct ahd_softc *,
-                                         struct ahd_linux_device *,
+                                         struct scsi_device *,
                                          struct scb *);
 static void ahd_linux_queue_cmd_complete(struct ahd_softc *ahd,
-                                         Scsi_Cmnd *cmd);
-static void ahd_linux_filter_inquiry(struct ahd_softc *ahd,
-                                     struct ahd_devinfo *devinfo);
-static void ahd_linux_dev_timed_unfreeze(u_long arg);
+                                         struct scsi_cmnd *cmd);
 static void ahd_linux_sem_timeout(u_long arg);
+static int  ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag);
 static void ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd);
-static void ahd_linux_size_nseg(void);
-static void ahd_linux_thread_run_complete_queue(struct ahd_softc *ahd);
-static void ahd_linux_start_dv(struct ahd_softc *ahd);
-static void ahd_linux_dv_timeout(struct scsi_cmnd *cmd);
-static int  ahd_linux_dv_thread(void *data);
-static void ahd_linux_kill_dv_thread(struct ahd_softc *ahd);
-static void ahd_linux_dv_target(struct ahd_softc *ahd, u_int target);
-static void ahd_linux_dv_transition(struct ahd_softc *ahd,
-                                    struct scsi_cmnd *cmd,
-                                    struct ahd_devinfo *devinfo,
-                                    struct ahd_linux_target *targ);
-static void ahd_linux_dv_fill_cmd(struct ahd_softc *ahd,
-                                  struct scsi_cmnd *cmd,
-                                  struct ahd_devinfo *devinfo);
-static void ahd_linux_dv_inq(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo,
-                             struct ahd_linux_target *targ,
-                             u_int request_length);
-static void ahd_linux_dv_tur(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo);
-static void ahd_linux_dv_rebd(struct ahd_softc *ahd,
-                              struct scsi_cmnd *cmd,
-                              struct ahd_devinfo *devinfo,
-                              struct ahd_linux_target *targ);
-static void ahd_linux_dv_web(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo,
-                             struct ahd_linux_target *targ);
-static void ahd_linux_dv_reb(struct ahd_softc *ahd,
-                             struct scsi_cmnd *cmd,
-                             struct ahd_devinfo *devinfo,
-                             struct ahd_linux_target *targ);
-static void ahd_linux_dv_su(struct ahd_softc *ahd,
-                            struct scsi_cmnd *cmd,
-                            struct ahd_devinfo *devinfo,
-                            struct ahd_linux_target *targ);
-static int ahd_linux_fallback(struct ahd_softc *ahd,
-                              struct ahd_devinfo *devinfo);
-static __inline int ahd_linux_dv_fallback(struct ahd_softc *ahd,
-                                          struct ahd_devinfo *devinfo);
-static void ahd_linux_dv_complete(Scsi_Cmnd *cmd);
-static void ahd_linux_generate_dv_pattern(struct ahd_linux_target *targ);
 static u_int ahd_linux_user_tagdepth(struct ahd_softc *ahd,
                                      struct ahd_devinfo *devinfo);
-static u_int ahd_linux_user_dv_setting(struct ahd_softc *ahd);
-static void ahd_linux_setup_user_rd_strm_settings(struct ahd_softc *ahd);
-static void ahd_linux_device_queue_depth(struct ahd_softc *ahd,
-                                         struct ahd_linux_device *dev);
-static struct ahd_linux_target* ahd_linux_alloc_target(struct ahd_softc*,
-                                                       u_int, u_int);
-static void                     ahd_linux_free_target(struct ahd_softc*,
-                                                      struct ahd_linux_target*);
-static struct ahd_linux_device* ahd_linux_alloc_device(struct ahd_softc*,
-                                                       struct ahd_linux_target*,
-                                                       u_int);
-static void                     ahd_linux_free_device(struct ahd_softc*,
-                                                      struct ahd_linux_device*);
-static void ahd_linux_run_device_queue(struct ahd_softc*,
-                                       struct ahd_linux_device*);
+static void ahd_linux_device_queue_depth(struct scsi_device *);
+static int ahd_linux_run_command(struct ahd_softc*,
+                                 struct ahd_linux_device *,
+                                 struct scsi_cmnd *);
 static void ahd_linux_setup_tag_info_global(char *p);
-static aic_option_callback_t ahd_linux_setup_tag_info;
-static aic_option_callback_t ahd_linux_setup_rd_strm_info;
-static aic_option_callback_t ahd_linux_setup_dv;
-static aic_option_callback_t ahd_linux_setup_iocell_info;
-static int ahd_linux_next_unit(void);
-static void ahd_runq_tasklet(unsigned long data);
-static int aic79xx_setup(char *c);
-
-/****************************** Inlines ***************************************/
-static __inline void ahd_schedule_completeq(struct ahd_softc *ahd);
-static __inline void ahd_schedule_runq(struct ahd_softc *ahd);
-static __inline void ahd_setup_runq_tasklet(struct ahd_softc *ahd);
-static __inline void ahd_teardown_runq_tasklet(struct ahd_softc *ahd);
-static __inline struct ahd_linux_device*
-                     ahd_linux_get_device(struct ahd_softc *ahd, u_int channel,
-                                          u_int target, u_int lun, int alloc);
-static struct ahd_cmd *ahd_linux_run_complete_queue(struct ahd_softc *ahd);
-static __inline void ahd_linux_check_device_queue(struct ahd_softc *ahd,
-                                                  struct ahd_linux_device *dev);
-static __inline struct ahd_linux_device *
-                     ahd_linux_next_device_to_run(struct ahd_softc *ahd);
-static __inline void ahd_linux_run_device_queues(struct ahd_softc *ahd);
-static __inline void ahd_linux_unmap_scb(struct ahd_softc*, struct scb*);
-
-static __inline void
-ahd_schedule_completeq(struct ahd_softc *ahd)
-{
-        if ((ahd->platform_data->flags & AHD_RUN_CMPLT_Q_TIMER) == 0) {
-                ahd->platform_data->flags |= AHD_RUN_CMPLT_Q_TIMER;
-                ahd->platform_data->completeq_timer.expires = jiffies;
-                add_timer(&ahd->platform_data->completeq_timer);
-        }
-}
-
-/*
- * Must be called with our lock held.
- */
-static __inline void
-ahd_schedule_runq(struct ahd_softc *ahd)
-{
-        tasklet_schedule(&ahd->platform_data->runq_tasklet);
-}
-
-static __inline
-void ahd_setup_runq_tasklet(struct ahd_softc *ahd)
-{
-        tasklet_init(&ahd->platform_data->runq_tasklet, ahd_runq_tasklet,
-                     (unsigned long)ahd);
-}
+static int  aic79xx_setup(char *c);
 
-static __inline void
-ahd_teardown_runq_tasklet(struct ahd_softc *ahd)
-{
-        tasklet_kill(&ahd->platform_data->runq_tasklet);
-}
+static int ahd_linux_unit;
 
-static __inline struct ahd_linux_device*
-ahd_linux_get_device(struct ahd_softc *ahd, u_int channel, u_int target,
-                     u_int lun, int alloc)
-{
-        struct ahd_linux_target *targ;
-        struct ahd_linux_device *dev;
-        u_int target_offset;
 
-        target_offset = target;
-        if (channel != 0)
-                target_offset += 8;
-        targ = ahd->platform_data->targets[target_offset];
-        if (targ == NULL) {
-                if (alloc != 0) {
-                        targ = ahd_linux_alloc_target(ahd, channel, target);
-                        if (targ == NULL)
-                                return (NULL);
-                } else
-                        return (NULL);
-        }
-        dev = targ->devices[lun];
-        if (dev == NULL && alloc != 0)
-                dev = ahd_linux_alloc_device(ahd, targ, lun);
-        return (dev);
-}
-
-#define AHD_LINUX_MAX_RETURNED_ERRORS 4
-static struct ahd_cmd *
-ahd_linux_run_complete_queue(struct ahd_softc *ahd)
-{       
-        struct  ahd_cmd *acmd;
-        u_long  done_flags;
-        int     with_errors;
-
-        with_errors = 0;
-        ahd_done_lock(ahd, &done_flags);
-        while ((acmd = TAILQ_FIRST(&ahd->platform_data->completeq)) != NULL) {
-                Scsi_Cmnd *cmd;
-
-                if (with_errors > AHD_LINUX_MAX_RETURNED_ERRORS) {
-                        /*
-                         * Linux uses stack recursion to requeue
-                         * commands that need to be retried.  Avoid
-                         * blowing out the stack by "spoon feeding"
-                         * commands that completed with error back
-                         * the operating system in case they are going
-                         * to be retried. "ick"
-                         */
-                        ahd_schedule_completeq(ahd);
-                        break;
-                }
-                TAILQ_REMOVE(&ahd->platform_data->completeq,
-                             acmd, acmd_links.tqe);
-                cmd = &acmd_scsi_cmd(acmd);
-                cmd->host_scribble = NULL;
-                if (ahd_cmd_get_transaction_status(cmd) != DID_OK
-                 || (cmd->result & 0xFF) != SCSI_STATUS_OK)
-                        with_errors++;
-
-                cmd->scsi_done(cmd);
-        }
-        ahd_done_unlock(ahd, &done_flags);
-        return (acmd);
-}
-
-static __inline void
-ahd_linux_check_device_queue(struct ahd_softc *ahd,
-                             struct ahd_linux_device *dev)
-{
-        if ((dev->flags & AHD_DEV_FREEZE_TIL_EMPTY) != 0
-         && dev->active == 0) {
-                dev->flags &= ~AHD_DEV_FREEZE_TIL_EMPTY;
-                dev->qfrozen--;
-        }
-
-        if (TAILQ_FIRST(&dev->busyq) == NULL
-         || dev->openings == 0 || dev->qfrozen != 0)
-                return;
-
-        ahd_linux_run_device_queue(ahd, dev);
-}
-
-static __inline struct ahd_linux_device *
-ahd_linux_next_device_to_run(struct ahd_softc *ahd)
-{
-        
-        if ((ahd->flags & AHD_RESOURCE_SHORTAGE) != 0
-         || (ahd->platform_data->qfrozen != 0
-          && AHD_DV_SIMQ_FROZEN(ahd) == 0))
-                return (NULL);
-        return (TAILQ_FIRST(&ahd->platform_data->device_runq));
-}
-
-static __inline void
-ahd_linux_run_device_queues(struct ahd_softc *ahd)
-{
-        struct ahd_linux_device *dev;
-
-        while ((dev = ahd_linux_next_device_to_run(ahd)) != NULL) {
-                TAILQ_REMOVE(&ahd->platform_data->device_runq, dev, links);
-                dev->flags &= ~AHD_DEV_ON_RUN_LIST;
-                ahd_linux_check_device_queue(ahd, dev);
-        }
-}
+/****************************** Inlines ***************************************/
+static __inline void ahd_linux_unmap_scb(struct ahd_softc*, struct scb*);
 
 static __inline void
 ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)
 {
-        Scsi_Cmnd *cmd;
+        struct scsi_cmnd *cmd;
         int direction;
 
         cmd = scb->io_ctx;
@@ -705,197 +399,6 @@ ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)
 #define BUILD_SCSIID(ahd, cmd)                                          \
         ((((cmd)->device->id << TID_SHIFT) & TID) | (ahd)->our_id)
 
-/************************  Host template entry points *************************/
-static int         ahd_linux_detect(Scsi_Host_Template *);
-static const char *ahd_linux_info(struct Scsi_Host *);
-static int         ahd_linux_queue(Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-static int         ahd_linux_slave_alloc(Scsi_Device *);
-static int         ahd_linux_slave_configure(Scsi_Device *);
-static void        ahd_linux_slave_destroy(Scsi_Device *);
-#if defined(__i386__)
-static int         ahd_linux_biosparam(struct scsi_device*,
-                                       struct block_device*, sector_t, int[]);
-#endif
-#else
-static int         ahd_linux_release(struct Scsi_Host *);
-static void        ahd_linux_select_queue_depth(struct Scsi_Host *host,
-                                                Scsi_Device *scsi_devs);
-#if defined(__i386__)
-static int         ahd_linux_biosparam(Disk *, kdev_t, int[]);
-#endif
-#endif
-static int         ahd_linux_bus_reset(Scsi_Cmnd *);
-static int         ahd_linux_dev_reset(Scsi_Cmnd *);
-static int         ahd_linux_abort(Scsi_Cmnd *);
-
-/*
- * Calculate a safe value for AHD_NSEG (as expressed through ahd_linux_nseg).
- *
- * In pre-2.5.X...
- * The midlayer allocates an S/G array dynamically when a command is issued
- * using SCSI malloc.  This array, which is in an OS dependent format that
- * must later be copied to our private S/G list, is sized to house just the
- * number of segments needed for the current transfer.  Since the code that
- * sizes the SCSI malloc pool does not take into consideration fragmentation
- * of the pool, executing transactions numbering just a fraction of our
- * concurrent transaction limit with SG list lengths aproaching AHC_NSEG will
- * quickly depleat the SCSI malloc pool of usable space.  Unfortunately, the
- * mid-layer does not properly handle this scsi malloc failures for the S/G
- * array and the result can be a lockup of the I/O subsystem.  We try to size
- * our S/G list so that it satisfies our drivers allocation requirements in
- * addition to avoiding fragmentation of the SCSI malloc pool.
- */
-static void
-ahd_linux_size_nseg(void)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        u_int cur_size;
-        u_int best_size;
-
-        /*
-         * The SCSI allocator rounds to the nearest 512 bytes
-         * an cannot allocate across a page boundary.  Our algorithm
-         * is to start at 1K of scsi malloc space per-command and
-         * loop through all factors of the PAGE_SIZE and pick the best.
-         */
-        best_size = 0;
-        for (cur_size = 1024; cur_size <= PAGE_SIZE; cur_size *= 2) {
-                u_int nseg;
-
-                nseg = cur_size / sizeof(struct scatterlist);
-                if (nseg < AHD_LINUX_MIN_NSEG)
-                        continue;
-
-                if (best_size == 0) {
-                        best_size = cur_size;
-                        ahd_linux_nseg = nseg;
-                } else {
-                        u_int best_rem;
-                        u_int cur_rem;
-
-                        /*
-                         * Compare the traits of the current "best_size"
-                         * with the current size to determine if the
-                         * current size is a better size.
-                         */
-                        best_rem = best_size % sizeof(struct scatterlist);
-                        cur_rem = cur_size % sizeof(struct scatterlist);
-                        if (cur_rem < best_rem) {
-                                best_size = cur_size;
-                                ahd_linux_nseg = nseg;
-                        }
-                }
-        }
-#endif
-}
-
-/*
- * Try to detect an Adaptec 79XX controller.
- */
-static int
-ahd_linux_detect(Scsi_Host_Template *template)
-{
-        struct  ahd_softc *ahd;
-        int     found;
-        int     error = 0;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        /*
-         * It is a bug that the upper layer takes
-         * this lock just prior to calling us.
-         */
-        spin_unlock_irq(&io_request_lock);
-#endif
-
-        /*
-         * Sanity checking of Linux SCSI data structures so
-         * that some of our hacks^H^H^H^H^Hassumptions aren't
-         * violated.
-         */
-        if (offsetof(struct ahd_cmd_internal, end)
-          > offsetof(struct scsi_cmnd, host_scribble)) {
-                printf("ahd_linux_detect: SCSI data structures changed.\n");
-                printf("ahd_linux_detect: Unable to attach\n");
-                return (0);
-        }
-        /*
-         * Determine an appropriate size for our Scatter Gatther lists.
-         */
-        ahd_linux_size_nseg();
-#ifdef MODULE
-        /*
-         * If we've been passed any parameters, process them now.
-         */
-        if (aic79xx)
-                aic79xx_setup(aic79xx);
-#endif
-
-        template->proc_name = "aic79xx";
-
-        /*
-         * Initialize our softc list lock prior to
-         * probing for any adapters.
-         */
-        ahd_list_lockinit();
-
-#ifdef CONFIG_PCI
-        error = ahd_linux_pci_init();
-        if (error)
-                return error;
-#endif
-
-        /*
-         * Register with the SCSI layer all
-         * controllers we've found.
-         */
-        found = 0;
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-
-                if (ahd_linux_register_host(ahd, template) == 0)
-                        found++;
-        }
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        spin_lock_irq(&io_request_lock);
-#endif
-        aic79xx_detect_complete++;
-        return 0;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/*
- * Free the passed in Scsi_Host memory structures prior to unloading the
- * module.
- */
-static int
-ahd_linux_release(struct Scsi_Host * host)
-{
-        struct ahd_softc *ahd;
-        u_long l;
-
-        ahd_list_lock(&l);
-        if (host != NULL) {
-
-                /*
-                 * We should be able to just perform
-                 * the free directly, but check our
-                 * list for extra sanity.
-                 */
-                ahd = ahd_find_softc(*(struct ahd_softc **)host->hostdata);
-                if (ahd != NULL) {
-                        u_long s;
-
-                        ahd_lock(ahd, &s);
-                        ahd_intr_enable(ahd, FALSE);
-                        ahd_unlock(ahd, &s);
-                        ahd_free(ahd);
-                }
-        }
-        ahd_list_unlock(&l);
-        return (0);
-}
-#endif
-
 /*
  * Return a string describing the driver.
  */
@@ -928,220 +431,177 @@ ahd_linux_info(struct Scsi_Host *host)
  * Queue an SCB to the controller.
  */
 static int
-ahd_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *))
+ahd_linux_queue(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd *))
 {
         struct   ahd_softc *ahd;
-        struct   ahd_linux_device *dev;
-        u_long   flags;
+        struct   ahd_linux_device *dev = scsi_transport_device_data(cmd->device);
 
         ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
 
         /*
-         * Save the callback on completion function.
-         */
-        cmd->scsi_done = scsi_done;
-
-        ahd_midlayer_entrypoint_lock(ahd, &flags);
-
-        /*
          * Close the race of a command that was in the process of
          * being queued to us just as our simq was frozen.  Let
          * DV commands through so long as we are only frozen to
          * perform DV.
          */
-        if (ahd->platform_data->qfrozen != 0
-         && AHD_DV_CMD(cmd) == 0) {
-
-                ahd_cmd_set_transaction_status(cmd, CAM_REQUEUE_REQ);
-                ahd_linux_queue_cmd_complete(ahd, cmd);
-                ahd_schedule_completeq(ahd);
-                ahd_midlayer_entrypoint_unlock(ahd, &flags);
-                return (0);
-        }
-        dev = ahd_linux_get_device(ahd, cmd->device->channel,
-                                   cmd->device->id, cmd->device->lun,
-                                   /*alloc*/TRUE);
-        if (dev == NULL) {
-                ahd_cmd_set_transaction_status(cmd, CAM_RESRC_UNAVAIL);
-                ahd_linux_queue_cmd_complete(ahd, cmd);
-                ahd_schedule_completeq(ahd);
-                ahd_midlayer_entrypoint_unlock(ahd, &flags);
-                printf("%s: aic79xx_linux_queue - Unable to allocate device!\n",
-                       ahd_name(ahd));
-                return (0);
+        if (ahd->platform_data->qfrozen != 0) {
+                printf("%s: queue frozen\n", ahd_name(ahd));
+
+                return SCSI_MLQUEUE_HOST_BUSY;
         }
-        if (cmd->cmd_len > MAX_CDB_LEN)
-                return (-EINVAL);
+
+        /*
+         * Save the callback on completion function.
+         */
+        cmd->scsi_done = scsi_done;
+
         cmd->result = CAM_REQ_INPROG << 16;
-        TAILQ_INSERT_TAIL(&dev->busyq, (struct ahd_cmd *)cmd, acmd_links.tqe);
-        if ((dev->flags & AHD_DEV_ON_RUN_LIST) == 0) {
-                TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq, dev, links);
-                dev->flags |= AHD_DEV_ON_RUN_LIST;
-                ahd_linux_run_device_queues(ahd);
-        }
-        ahd_midlayer_entrypoint_unlock(ahd, &flags);
-        return (0);
+
+        return ahd_linux_run_command(ahd, dev, cmd);
+}
+
+static inline struct scsi_target **
+ahd_linux_target_in_softc(struct scsi_target *starget)
+{
+        struct  ahd_softc *ahd =
+                *((struct ahd_softc **)dev_to_shost(&starget->dev)->hostdata);
+        unsigned int target_offset;
+
+        target_offset = starget->id;
+        if (starget->channel != 0)
+                target_offset += 8;
+
+        return &ahd->platform_data->starget[target_offset];
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int
-ahd_linux_slave_alloc(Scsi_Device *device)
+ahd_linux_target_alloc(struct scsi_target *starget)
 {
-        struct  ahd_softc *ahd;
+        struct  ahd_softc *ahd =
+                *((struct ahd_softc **)dev_to_shost(&starget->dev)->hostdata);
+        unsigned long flags;
+        struct scsi_target **ahd_targp = ahd_linux_target_in_softc(starget);
+        struct ahd_linux_target *targ = scsi_transport_target_data(starget);
+        struct ahd_devinfo devinfo;
+        struct ahd_initiator_tinfo *tinfo;
+        struct ahd_tmode_tstate *tstate;
+        char channel = starget->channel + 'A';
 
-        ahd = *((struct ahd_softc **)device->host->hostdata);
-        if (bootverbose)
-                printf("%s: Slave Alloc %d\n", ahd_name(ahd), device->id);
-        return (0);
+        ahd_lock(ahd, &flags);
+
+        BUG_ON(*ahd_targp != NULL);
+
+        *ahd_targp = starget;
+        memset(targ, 0, sizeof(*targ));
+
+        tinfo = ahd_fetch_transinfo(ahd, channel, ahd->our_id,
+                                    starget->id, &tstate);
+        ahd_compile_devinfo(&devinfo, ahd->our_id, starget->id,
+                            CAM_LUN_WILDCARD, channel,
+                            ROLE_INITIATOR);
+        spi_min_period(starget) = AHD_SYNCRATE_MAX; /* We can do U320 */
+        if ((ahd->bugs & AHD_PACED_NEGTABLE_BUG) != 0)
+                spi_max_offset(starget) = MAX_OFFSET_PACED_BUG;
+        else
+                spi_max_offset(starget) = MAX_OFFSET_PACED;
+        spi_max_width(starget) = ahd->features & AHD_WIDE;
+
+        ahd_set_syncrate(ahd, &devinfo, 0, 0, 0,
+                         AHD_TRANS_GOAL, /*paused*/FALSE);
+        ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
+                      AHD_TRANS_GOAL, /*paused*/FALSE);
+        ahd_unlock(ahd, &flags);
+
+        return 0;
+}
+
+static void
+ahd_linux_target_destroy(struct scsi_target *starget)
+{
+        struct scsi_target **ahd_targp = ahd_linux_target_in_softc(starget);
+
+        *ahd_targp = NULL;
 }
 
 static int
-ahd_linux_slave_configure(Scsi_Device *device)
+ahd_linux_slave_alloc(struct scsi_device *sdev)
 {
-        struct  ahd_softc *ahd;
-        struct  ahd_linux_device *dev;
-        u_long  flags;
+        struct  ahd_softc *ahd =
+                *((struct ahd_softc **)sdev->host->hostdata);
+        struct scsi_target *starget = sdev->sdev_target;
+        struct ahd_linux_target *targ = scsi_transport_target_data(starget);
+        struct ahd_linux_device *dev;
 
-        ahd = *((struct ahd_softc **)device->host->hostdata);
         if (bootverbose)
-                printf("%s: Slave Configure %d\n", ahd_name(ahd), device->id);
-        ahd_midlayer_entrypoint_lock(ahd, &flags);
+                printf("%s: Slave Alloc %d\n", ahd_name(ahd), sdev->id);
+
+        BUG_ON(targ->sdev[sdev->lun] != NULL);
+
+        dev = scsi_transport_device_data(sdev);
+        memset(dev, 0, sizeof(*dev));
+
         /*
-         * Since Linux has attached to the device, configure
-         * it so we don't free and allocate the device
-         * structure on every command.
+         * We start out life using untagged
+         * transactions of which we allow one.
          */
-        dev = ahd_linux_get_device(ahd, device->channel,
-                                   device->id, device->lun,
-                                   /*alloc*/TRUE);
-        if (dev != NULL) {
-                dev->flags &= ~AHD_DEV_UNCONFIGURED;
-                dev->flags |= AHD_DEV_SLAVE_CONFIGURED;
-                dev->scsi_device = device;
-                ahd_linux_device_queue_depth(ahd, dev);
-        }
-        ahd_midlayer_entrypoint_unlock(ahd, &flags);
+        dev->openings = 1;
+
+        /*
+         * Set maxtags to 0.  This will be changed if we
+         * later determine that we are dealing with
+         * a tagged queuing capable device.
+         */
+        dev->maxtags = 0;
+        
+        targ->sdev[sdev->lun] = sdev;
+
         return (0);
 }
 
-static void
-ahd_linux_slave_destroy(Scsi_Device *device)
+static int
+ahd_linux_slave_configure(struct scsi_device *sdev)
 {
         struct  ahd_softc *ahd;
-        struct  ahd_linux_device *dev;
-        u_long  flags;
 
-        ahd = *((struct ahd_softc **)device->host->hostdata);
+        ahd = *((struct ahd_softc **)sdev->host->hostdata);
         if (bootverbose)
-                printf("%s: Slave Destroy %d\n", ahd_name(ahd), device->id);
-        ahd_midlayer_entrypoint_lock(ahd, &flags);
-        dev = ahd_linux_get_device(ahd, device->channel,
-                                   device->id, device->lun,
-                                           /*alloc*/FALSE);
+                printf("%s: Slave Configure %d\n", ahd_name(ahd), sdev->id);
 
-        /*
-         * Filter out "silly" deletions of real devices by only
-         * deleting devices that have had slave_configure()
-         * called on them.  All other devices that have not
-         * been configured will automatically be deleted by
-         * the refcounting process.
-         */
-        if (dev != NULL
-         && (dev->flags & AHD_DEV_SLAVE_CONFIGURED) != 0) {
-                dev->flags |= AHD_DEV_UNCONFIGURED;
-                if (TAILQ_EMPTY(&dev->busyq)
-                 && dev->active == 0
-                 && (dev->flags & AHD_DEV_TIMER_ACTIVE) == 0)
-                        ahd_linux_free_device(ahd, dev);
-        }
-        ahd_midlayer_entrypoint_unlock(ahd, &flags);
+        ahd_linux_device_queue_depth(sdev);
+
+        /* Initial Domain Validation */
+        if (!spi_initial_dv(sdev->sdev_target))
+                spi_dv_device(sdev);
+
+        return 0;
 }
-#else
-/*
- * Sets the queue depth for each SCSI device hanging
- * off the input host adapter.
- */
+
 static void
-ahd_linux_select_queue_depth(struct Scsi_Host * host,
-                             Scsi_Device * scsi_devs)
+ahd_linux_slave_destroy(struct scsi_device *sdev)
 {
-        Scsi_Device *device;
-        Scsi_Device *ldev;
         struct  ahd_softc *ahd;
-        u_long  flags;
+        struct  ahd_linux_device *dev = scsi_transport_device_data(sdev);
+        struct  ahd_linux_target *targ = scsi_transport_target_data(sdev->sdev_target);
 
-        ahd = *((struct ahd_softc **)host->hostdata);
-        ahd_lock(ahd, &flags);
-        for (device = scsi_devs; device != NULL; device = device->next) {
+        ahd = *((struct ahd_softc **)sdev->host->hostdata);
+        if (bootverbose)
+                printf("%s: Slave Destroy %d\n", ahd_name(ahd), sdev->id);
 
-                /*
-                 * Watch out for duplicate devices.  This works around
-                 * some quirks in how the SCSI scanning code does its
-                 * device management.
-                 */
-                for (ldev = scsi_devs; ldev != device; ldev = ldev->next) {
-                        if (ldev->host == device->host
-                         && ldev->channel == device->channel
-                         && ldev->id == device->id
-                         && ldev->lun == device->lun)
-                                break;
-                }
-                /* Skip duplicate. */
-                if (ldev != device)
-                        continue;
+        BUG_ON(dev->active);
 
-                if (device->host == host) {
-                        struct   ahd_linux_device *dev;
+        targ->sdev[sdev->lun] = NULL;
 
-                        /*
-                         * Since Linux has attached to the device, configure
-                         * it so we don't free and allocate the device
-                         * structure on every command.
-                         */
-                        dev = ahd_linux_get_device(ahd, device->channel,
-                                                   device->id, device->lun,
-                                                   /*alloc*/TRUE);
-                        if (dev != NULL) {
-                                dev->flags &= ~AHD_DEV_UNCONFIGURED;
-                                dev->scsi_device = device;
-                                ahd_linux_device_queue_depth(ahd, dev);
-                                device->queue_depth = dev->openings
-                                                    + dev->active;
-                                if ((dev->flags & (AHD_DEV_Q_BASIC
-                                                | AHD_DEV_Q_TAGGED)) == 0) {
-                                        /*
-                                         * We allow the OS to queue 2 untagged
-                                         * transactions to us at any time even
-                                         * though we can only execute them
-                                         * serially on the controller/device.
-                                         * This should remove some latency.
-                                         */
-                                        device->queue_depth = 2;
-                                }
-                        }
-                }
-        }
-        ahd_unlock(ahd, &flags);
 }
-#endif
 
 #if defined(__i386__)
 /*
  * Return the disk geometry for the given SCSI device.
  */
 static int
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 ahd_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
                     sector_t capacity, int geom[])
 {
         uint8_t *bh;
-#else
-ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
-{
-        struct  scsi_device *sdev = disk->device;
-        u_long  capacity = disk->capacity;
-        struct  buffer_head *bh;
-#endif
         int      heads;
         int      sectors;
         int      cylinders;
@@ -1151,22 +611,11 @@ ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
 
         ahd = *((struct ahd_softc **)sdev->host->hostdata);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         bh = scsi_bios_ptable(bdev);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,17)
-        bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, block_size(dev));
-#else
-        bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, 1024);
-#endif
-
         if (bh) {
                 ret = scsi_partsize(bh, capacity,
                                     &geom[2], &geom[0], &geom[1]);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                 kfree(bh);
-#else
-                brelse(bh);
-#endif
                 if (ret != -1)
                         return (ret);
         }
@@ -1194,392 +643,35 @@ ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
  * Abort the current SCSI command(s).
  */
 static int
-ahd_linux_abort(Scsi_Cmnd *cmd)
+ahd_linux_abort(struct scsi_cmnd *cmd)
 {
-        struct ahd_softc *ahd;
-        struct ahd_cmd *acmd;
-        struct ahd_cmd *list_acmd;
-        struct ahd_linux_device *dev;
-        struct scb *pending_scb;
-        u_long s;
-        u_int  saved_scbptr;
-        u_int  active_scbptr;
-        u_int  last_phase;
-        u_int  cdb_byte;
-        int    retval;
-        int    was_paused;
-        int    paused;
-        int    wait;
-        int    disconnected;
-        ahd_mode_state saved_modes;
-
-        pending_scb = NULL;
-        paused = FALSE;
-        wait = FALSE;
-        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
-        acmd = (struct ahd_cmd *)cmd;
-
-        printf("%s:%d:%d:%d: Attempting to abort cmd %p:",
-               ahd_name(ahd), cmd->device->channel, cmd->device->id,
-               cmd->device->lun, cmd);
-        for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
-                printf(" 0x%x", cmd->cmnd[cdb_byte]);
-        printf("\n");
-
-        /*
-         * In all versions of Linux, we have to work around
-         * a major flaw in how the mid-layer is locked down
-         * if we are to sleep successfully in our error handler
-         * while allowing our interrupt handler to run.  Since
-         * the midlayer acquires either the io_request_lock or
-         * our lock prior to calling us, we must use the
-         * spin_unlock_irq() method for unlocking our lock.
-         * This will force interrupts to be enabled on the
-         * current CPU.  Since the EH thread should not have
-         * been running with CPU interrupts disabled other than
-         * by acquiring either the io_request_lock or our own
-         * lock, this *should* be safe.
-         */
-        ahd_midlayer_entrypoint_lock(ahd, &s);
-
-        /*
-         * First determine if we currently own this command.
-         * Start by searching the device queue.  If not found
-         * there, check the pending_scb list.  If not found
-         * at all, and the system wanted us to just abort the
-         * command, return success.
-         */
-        dev = ahd_linux_get_device(ahd, cmd->device->channel,
-                                   cmd->device->id, cmd->device->lun,
-                                   /*alloc*/FALSE);
-
-        if (dev == NULL) {
-                /*
-                 * No target device for this command exists,
-                 * so we must not still own the command.
-                 */
-                printf("%s:%d:%d:%d: Is not an active device\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                retval = SUCCESS;
-                goto no_cmd;
-        }
-
-        TAILQ_FOREACH(list_acmd, &dev->busyq, acmd_links.tqe) {
-                if (list_acmd == acmd)
-                        break;
-        }
-
-        if (list_acmd != NULL) {
-                printf("%s:%d:%d:%d: Command found on device queue\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                TAILQ_REMOVE(&dev->busyq, list_acmd, acmd_links.tqe);
-                cmd->result = DID_ABORT << 16;
-                ahd_linux_queue_cmd_complete(ahd, cmd);
-                retval = SUCCESS;
-                goto done;
-        }
+        int error;
 
-        /*
-         * See if we can find a matching cmd in the pending list.
-         */
-        LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
-                if (pending_scb->io_ctx == cmd)
-                        break;
-        }
-
-        if (pending_scb == NULL) {
-                printf("%s:%d:%d:%d: Command not found\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                goto no_cmd;
-        }
-
-        if ((pending_scb->flags & SCB_RECOVERY_SCB) != 0) {
-                /*
-                 * We can't queue two recovery actions using the same SCB
-                 */
-                retval = FAILED;
-                goto  done;
-        }
-
-        /*
-         * Ensure that the card doesn't do anything
-         * behind our back.  Also make sure that we
-         * didn't "just" miss an interrupt that would
-         * affect this cmd.
-         */
-        was_paused = ahd_is_paused(ahd);
-        ahd_pause_and_flushwork(ahd);
-        paused = TRUE;
-
-        if ((pending_scb->flags & SCB_ACTIVE) == 0) {
-                printf("%s:%d:%d:%d: Command already completed\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun);
-                goto no_cmd;
-        }
-
-        printf("%s: At time of recovery, card was %spaused\n",
-               ahd_name(ahd), was_paused ? "" : "not ");
-        ahd_dump_card_state(ahd);
-
-        disconnected = TRUE;
-        if (ahd_search_qinfifo(ahd, cmd->device->id, cmd->device->channel + 'A',
-                               cmd->device->lun, SCB_GET_TAG(pending_scb),
-                               ROLE_INITIATOR, CAM_REQ_ABORTED,
-                               SEARCH_COMPLETE) > 0) {
-                printf("%s:%d:%d:%d: Cmd aborted from QINFIFO\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                                cmd->device->lun);
-                retval = SUCCESS;
-                goto done;
-        }
-
-        saved_modes = ahd_save_modes(ahd);
-        ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
-        last_phase = ahd_inb(ahd, LASTPHASE);
-        saved_scbptr = ahd_get_scbptr(ahd);
-        active_scbptr = saved_scbptr;
-        if (disconnected && (ahd_inb(ahd, SEQ_FLAGS) & NOT_IDENTIFIED) == 0) {
-                struct scb *bus_scb;
-
-                bus_scb = ahd_lookup_scb(ahd, active_scbptr);
-                if (bus_scb == pending_scb)
-                        disconnected = FALSE;
-        }
-
-        /*
-         * At this point, pending_scb is the scb associated with the
-         * passed in command.  That command is currently active on the
-         * bus or is in the disconnected state.
-         */
-        if (last_phase != P_BUSFREE
-         && SCB_GET_TAG(pending_scb) == active_scbptr) {
-
-                /*
-                 * We're active on the bus, so assert ATN
-                 * and hope that the target responds.
-                 */
-                pending_scb = ahd_lookup_scb(ahd, active_scbptr);
-                pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
-                ahd_outb(ahd, MSG_OUT, HOST_MSG);
-                ahd_outb(ahd, SCSISIGO, last_phase|ATNO);
-                printf("%s:%d:%d:%d: Device is active, asserting ATN\n",
-                       ahd_name(ahd), cmd->device->channel,
-                       cmd->device->id, cmd->device->lun);
-                wait = TRUE;
-        } else if (disconnected) {
-
-                /*
-                 * Actually re-queue this SCB in an attempt
-                 * to select the device before it reconnects.
-                 */
-                pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
-                ahd_set_scbptr(ahd, SCB_GET_TAG(pending_scb));
-                pending_scb->hscb->cdb_len = 0;
-                pending_scb->hscb->task_attribute = 0;
-                pending_scb->hscb->task_management = SIU_TASKMGMT_ABORT_TASK;
-
-                if ((pending_scb->flags & SCB_PACKETIZED) != 0) {
-                        /*
-                         * Mark the SCB has having an outstanding
-                         * task management function.  Should the command
-                         * complete normally before the task management
-                         * function can be sent, the host will be notified
-                         * to abort our requeued SCB.
-                         */
-                        ahd_outb(ahd, SCB_TASK_MANAGEMENT,
-                                 pending_scb->hscb->task_management);
-                } else {
-                        /*
-                         * If non-packetized, set the MK_MESSAGE control
-                         * bit indicating that we desire to send a message.
-                         * We also set the disconnected flag since there is
-                         * no guarantee that our SCB control byte matches
-                         * the version on the card.  We don't want the
-                         * sequencer to abort the command thinking an
-                         * unsolicited reselection occurred.
-                         */
-                        pending_scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
-
-                        /*
-                         * The sequencer will never re-reference the
-                         * in-core SCB.  To make sure we are notified
-                         * during reslection, set the MK_MESSAGE flag in
-                         * the card's copy of the SCB.
-                         */
-                        ahd_outb(ahd, SCB_CONTROL,
-                                 ahd_inb(ahd, SCB_CONTROL)|MK_MESSAGE);
-                }
-
-                /*
-                 * Clear out any entries in the QINFIFO first
-                 * so we are the next SCB for this target
-                 * to run.
-                 */
-                ahd_search_qinfifo(ahd, cmd->device->id,
-                                   cmd->device->channel + 'A', cmd->device->lun,
-                                   SCB_LIST_NULL, ROLE_INITIATOR,
-                                   CAM_REQUEUE_REQ, SEARCH_COMPLETE);
-                ahd_qinfifo_requeue_tail(ahd, pending_scb);
-                ahd_set_scbptr(ahd, saved_scbptr);
-                ahd_print_path(ahd, pending_scb);
-                printf("Device is disconnected, re-queuing SCB\n");
-                wait = TRUE;
-        } else {
-                printf("%s:%d:%d:%d: Unable to deliver message\n",
-                       ahd_name(ahd), cmd->device->channel,
-                       cmd->device->id, cmd->device->lun);
-                retval = FAILED;
-                goto done;
-        }
-
-no_cmd:
-        /*
-         * Our assumption is that if we don't have the command, no
-         * recovery action was required, so we return success.  Again,
-         * the semantics of the mid-layer recovery engine are not
-         * well defined, so this may change in time.
-         */
-        retval = SUCCESS;
-done:
-        if (paused)
-                ahd_unpause(ahd);
-        if (wait) {
-                struct timer_list timer;
-                int ret;
-
-                pending_scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
-                spin_unlock_irq(&ahd->platform_data->spin_lock);
-                init_timer(&timer);
-                timer.data = (u_long)pending_scb;
-                timer.expires = jiffies + (5 * HZ);
-                timer.function = ahd_linux_sem_timeout;
-                add_timer(&timer);
-                printf("Recovery code sleeping\n");
-                down(&ahd->platform_data->eh_sem);
-                printf("Recovery code awake\n");
-                ret = del_timer_sync(&timer);
-                if (ret == 0) {
-                        printf("Timer Expired\n");
-                        retval = FAILED;
-                }
-                spin_lock_irq(&ahd->platform_data->spin_lock);
-        }
-        ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
-        ahd_midlayer_entrypoint_unlock(ahd, &s);
-        return (retval);
-}
-
-
-static void
-ahd_linux_dev_reset_complete(Scsi_Cmnd *cmd)
-{
-        free(cmd, M_DEVBUF);
+        error = ahd_linux_queue_recovery_cmd(cmd, SCB_ABORT);
+        if (error != 0)
+                printf("aic79xx_abort returns 0x%x\n", error);
+        return error;
 }
 
 /*
  * Attempt to send a target reset message to the device that timed out.
  */
 static int
-ahd_linux_dev_reset(Scsi_Cmnd *cmd)
+ahd_linux_dev_reset(struct scsi_cmnd *cmd)
 {
-        struct  ahd_softc *ahd;
-        struct  scsi_cmnd *recovery_cmd;
-        struct  ahd_linux_device *dev;
-        struct  ahd_initiator_tinfo *tinfo;
-        struct  ahd_tmode_tstate *tstate;
-        struct  scb *scb;
-        struct  hardware_scb *hscb;
-        u_long  s;
-        struct  timer_list timer;
-        int     retval;
-
-        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
-        recovery_cmd = malloc(sizeof(struct scsi_cmnd), M_DEVBUF, M_WAITOK);
-        if (!recovery_cmd)
-                return (FAILED);
-        memset(recovery_cmd, 0, sizeof(struct scsi_cmnd));
-        recovery_cmd->device = cmd->device;
-        recovery_cmd->scsi_done = ahd_linux_dev_reset_complete;
-#ifdef AHD_DEBUG
-        if ((ahd_debug & AHD_SHOW_RECOVERY) != 0)
-                printf("%s:%d:%d:%d: Device reset called for cmd %p\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->device->lun, cmd);
-#endif
-        ahd_lock(ahd, &s);
-
-        dev = ahd_linux_get_device(ahd, cmd->device->channel, cmd->device->id,
-                                   cmd->device->lun, /*alloc*/FALSE);
-        if (dev == NULL) {
-                ahd_unlock(ahd, &s);
-                kfree(recovery_cmd);
-                return (FAILED);
-        }
-        if ((scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX)) == NULL) {
-                ahd_unlock(ahd, &s);
-                kfree(recovery_cmd);
-                return (FAILED);
-        }
-        tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
-                                    cmd->device->id, &tstate);
-        recovery_cmd->result = CAM_REQ_INPROG << 16;
-        recovery_cmd->host_scribble = (char *)scb;
-        scb->io_ctx = recovery_cmd;
-        scb->platform_data->dev = dev;
-        scb->sg_count = 0;
-        ahd_set_residual(scb, 0);
-        ahd_set_sense_residual(scb, 0);
-        hscb = scb->hscb;
-        hscb->control = 0;
-        hscb->scsiid = BUILD_SCSIID(ahd, cmd);
-        hscb->lun = cmd->device->lun;
-        hscb->cdb_len = 0;
-        hscb->task_management = SIU_TASKMGMT_LUN_RESET;
-        scb->flags |= SCB_DEVICE_RESET|SCB_RECOVERY_SCB|SCB_ACTIVE;
-        if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-                scb->flags |= SCB_PACKETIZED;
-        } else {
-                hscb->control |= MK_MESSAGE;
-        }
-        dev->openings--;
-        dev->active++;
-        dev->commands_issued++;
-        LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
-        ahd_queue_scb(ahd, scb);
+        int error;
 
-        scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
-        ahd_unlock(ahd, &s);
-        init_timer(&timer);
-        timer.data = (u_long)scb;
-        timer.expires = jiffies + (5 * HZ);
-        timer.function = ahd_linux_sem_timeout;
-        add_timer(&timer);
-        printf("Recovery code sleeping\n");
-        down(&ahd->platform_data->eh_sem);
-        printf("Recovery code awake\n");
-        retval = SUCCESS;
-        if (del_timer_sync(&timer) == 0) {
-                printf("Timer Expired\n");
-                retval = FAILED;
-        }
-        ahd_lock(ahd, &s);
-        ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
-        ahd_unlock(ahd, &s);
-        printf("%s: Device reset returning 0x%x\n", ahd_name(ahd), retval);
-        return (retval);
+        error = ahd_linux_queue_recovery_cmd(cmd, SCB_DEVICE_RESET);
+        if (error != 0)
+                printf("aic79xx_dev_reset returns 0x%x\n", error);
+        return error;
 }
 
 /*
  * Reset the SCSI bus.
  */
 static int
-ahd_linux_bus_reset(Scsi_Cmnd *cmd)
+ahd_linux_bus_reset(struct scsi_cmnd *cmd)
 {
         struct ahd_softc *ahd;
         u_long s;
@@ -1594,7 +686,6 @@ ahd_linux_bus_reset(Scsi_Cmnd *cmd)
         ahd_lock(ahd, &s);
         found = ahd_reset_channel(ahd, cmd->device->channel + 'A',
                                   /*initiate reset*/TRUE);
-        ahd_linux_run_complete_queue(ahd);
         ahd_unlock(ahd, &s);
 
         if (bootverbose)
@@ -1604,9 +695,10 @@ ahd_linux_bus_reset(Scsi_Cmnd *cmd)
         return (SUCCESS);
 }
 
-Scsi_Host_Template aic79xx_driver_template = {
+struct scsi_host_template aic79xx_driver_template = {
         .module                 = THIS_MODULE,
         .name                   = "aic79xx",
+        .proc_name              = "aic79xx",
         .proc_info              = ahd_linux_proc_info,
         .info                   = ahd_linux_info,
         .queuecommand           = ahd_linux_queue,
@@ -1623,37 +715,10 @@ Scsi_Host_Template aic79xx_driver_template = {
         .slave_alloc            = ahd_linux_slave_alloc,
         .slave_configure        = ahd_linux_slave_configure,
         .slave_destroy          = ahd_linux_slave_destroy,
+        .target_alloc           = ahd_linux_target_alloc,
+        .target_destroy         = ahd_linux_target_destroy,
 };
 
-/**************************** Tasklet Handler *********************************/
-
-/*
- * In 2.4.X and above, this routine is called from a tasklet,
- * so we must re-acquire our lock prior to executing this code.
- * In all prior kernels, ahd_schedule_runq() calls this routine
- * directly and ahd_schedule_runq() is called with our lock held.
- */
-static void
-ahd_runq_tasklet(unsigned long data)
-{
-        struct ahd_softc* ahd;
-        struct ahd_linux_device *dev;
-        u_long flags;
-
-        ahd = (struct ahd_softc *)data;
-        ahd_lock(ahd, &flags);
-        while ((dev = ahd_linux_next_device_to_run(ahd)) != NULL) {
-        
-                TAILQ_REMOVE(&ahd->platform_data->device_runq, dev, links);
-                dev->flags &= ~AHD_DEV_ON_RUN_LIST;
-                ahd_linux_check_device_queue(ahd, dev);
-                /* Yeild to our interrupt handler */
-                ahd_unlock(ahd, &flags);
-                ahd_lock(ahd, &flags);
-        }
-        ahd_unlock(ahd, &flags);
-}
-
 /******************************** Bus DMA *************************************/
 int
 ahd_dma_tag_create(struct ahd_softc *ahd, bus_dma_tag_t parent,
@@ -1693,36 +758,10 @@ int
 ahd_dmamem_alloc(struct ahd_softc *ahd, bus_dma_tag_t dmat, void** vaddr,
                  int flags, bus_dmamap_t *mapp)
 {
-        bus_dmamap_t map;
-
-        map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT);
-        if (map == NULL)
-                return (ENOMEM);
-        /*
-         * Although we can dma data above 4GB, our
-         * "consistent" memory is below 4GB for
-         * space efficiency reasons (only need a 4byte
-         * address).  For this reason, we have to reset
-         * our dma mask when doing allocations.
-         */
-        if (ahd->dev_softc != NULL)
-                if (pci_set_dma_mask(ahd->dev_softc, 0xFFFFFFFF)) {
-                        printk(KERN_WARNING "aic79xx: No suitable DMA available.\n");
-                        kfree(map);
-                        return (ENODEV);
-                }
         *vaddr = pci_alloc_consistent(ahd->dev_softc,
-                                      dmat->maxsize, &map->bus_addr);
-        if (ahd->dev_softc != NULL)
-                if (pci_set_dma_mask(ahd->dev_softc,
-                                     ahd->platform_data->hw_dma_mask)) {
-                        printk(KERN_WARNING "aic79xx: No suitable DMA available.\n");
-                        kfree(map);
-                        return (ENODEV);
-                }
+                                      dmat->maxsize, mapp);
         if (*vaddr == NULL)
                 return (ENOMEM);
-        *mapp = map;
         return(0);
 }
 
@@ -1731,7 +770,7 @@ ahd_dmamem_free(struct ahd_softc *ahd, bus_dma_tag_t dmat,
                 void* vaddr, bus_dmamap_t map)
 {
         pci_free_consistent(ahd->dev_softc, dmat->maxsize,
-                            vaddr, map->bus_addr);
+                            vaddr, map);
 }
 
 int
@@ -1745,7 +784,7 @@ ahd_dmamap_load(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map,
          */
         bus_dma_segment_t stack_sg;
 
-        stack_sg.ds_addr = map->bus_addr;
+        stack_sg.ds_addr = map;
         stack_sg.ds_len = dmat->maxsize;
         cb(cb_arg, &stack_sg, /*nseg*/1, /*error*/0);
         return (0);
@@ -1754,11 +793,6 @@ ahd_dmamap_load(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map,
 void
 ahd_dmamap_destroy(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map)
 {
-        /*
-         * The map may is NULL in our < 2.3.X implementation.
-         */
-        if (map != NULL)
-                free(map, M_DEVBUF);
 }
 
 int
@@ -1823,41 +857,6 @@ ahd_softc_comp(struct ahd_softc *lahd, struct ahd_softc *rahd)
 }
 
 static void
-ahd_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
-{
-
-        if ((instance >= 0) && (targ >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_tag_info))
-         && (targ < AHD_NUM_TARGETS)) {
-                aic79xx_tag_info[instance].tag_commands[targ] = value & 0x1FF;
-                if (bootverbose)
-                        printf("tag_info[%d:%d] = %d\n", instance, targ, value);
-        }
-}
-
-static void
-ahd_linux_setup_rd_strm_info(u_long arg, int instance, int targ, int32_t value)
-{
-        if ((instance >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_rd_strm_info))) {
-                aic79xx_rd_strm_info[instance] = value & 0xFFFF;
-                if (bootverbose)
-                        printf("rd_strm[%d] = 0x%x\n", instance, value);
-        }
-}
-
-static void
-ahd_linux_setup_dv(u_long arg, int instance, int targ, int32_t value)
-{
-        if ((instance >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_dv_settings))) {
-                aic79xx_dv_settings[instance] = value;
-                if (bootverbose)
-                        printf("dv[%d] = %d\n", instance, value);
-        }
-}
-
-static void
 ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value)
 {
 
@@ -1887,6 +886,99 @@ ahd_linux_setup_tag_info_global(char *p)
         }
 }
 
+static void
+ahd_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
+{
+
+        if ((instance >= 0) && (targ >= 0)
+         && (instance < NUM_ELEMENTS(aic79xx_tag_info))
+         && (targ < AHD_NUM_TARGETS)) {
+                aic79xx_tag_info[instance].tag_commands[targ] = value & 0x1FF;
+                if (bootverbose)
+                        printf("tag_info[%d:%d] = %d\n", instance, targ, value);
+        }
+}
+
+static char *
+ahd_parse_brace_option(char *opt_name, char *opt_arg, char *end, int depth,
+                       void (*callback)(u_long, int, int, int32_t),
+                       u_long callback_arg)
+{
+        char    *tok_end;
+        char    *tok_end2;
+        int      i;
+        int      instance;
+        int      targ;
+        int      done;
+        char     tok_list[] = {'.', ',', '{', '}', '\0'};
+
+        /* All options use a ':' name/arg separator */
+        if (*opt_arg != ':')
+                return (opt_arg);
+        opt_arg++;
+        instance = -1;
+        targ = -1;
+        done = FALSE;
+        /*
+         * Restore separator that may be in
+         * the middle of our option argument.
+         */
+        tok_end = strchr(opt_arg, '\0');
+        if (tok_end < end)
+                *tok_end = ',';
+        while (!done) {
+                switch (*opt_arg) {
+                case '{':
+                        if (instance == -1) {
+                                instance = 0;
+                        } else {
+                                if (depth > 1) {
+                                        if (targ == -1)
+                                                targ = 0;
+                                } else {
+                                        printf("Malformed Option %s\n",
+                                               opt_name);
+                                        done = TRUE;
+                                }
+                        }
+                        opt_arg++;
+                        break;
+                case '}':
+                        if (targ != -1)
+                                targ = -1;
+                        else if (instance != -1)
+                                instance = -1;
+                        opt_arg++;
+                        break;
+                case ',':
+                case '.':
+                        if (instance == -1)
+                                done = TRUE;
+                        else if (targ >= 0)
+                                targ++;
+                        else if (instance >= 0)
+                                instance++;
+                        opt_arg++;
+                        break;
+                case '\0':
+                        done = TRUE;
+                        break;
+                default:
+                        tok_end = end;
+                        for (i = 0; tok_list[i]; i++) {
+                                tok_end2 = strchr(opt_arg, tok_list[i]);
+                                if ((tok_end2) && (tok_end2 < tok_end))
+                                        tok_end = tok_end2;
+                        }
+                        callback(callback_arg, instance, targ,
+                                 simple_strtol(opt_arg, NULL, 0));
+                        opt_arg = tok_end;
+                        break;
+                }
+        }
+        return (opt_arg);
+}
+
 /*
  * Handle Linux boot parameters. This routine allows for assigning a value
  * to a parameter with a ':' between the parameter and the value.
@@ -1916,8 +1008,6 @@ aic79xx_setup(char *s)
                 { "seltime", &aic79xx_seltime },
                 { "tag_info", NULL },
                 { "global_tag_depth", NULL},
-                { "rd_strm", NULL },
-                { "dv", NULL },
                 { "slewrate", NULL },
                 { "precomp", NULL },
                 { "amplitude", NULL },
@@ -1946,24 +1036,18 @@ aic79xx_setup(char *s)
                 if (strncmp(p, "global_tag_depth", n) == 0) {
                         ahd_linux_setup_tag_info_global(p + n);
                 } else if (strncmp(p, "tag_info", n) == 0) {
-                        s = aic_parse_brace_option("tag_info", p + n, end,
+                        s = ahd_parse_brace_option("tag_info", p + n, end,
                             2, ahd_linux_setup_tag_info, 0);
-                } else if (strncmp(p, "rd_strm", n) == 0) {
-                        s = aic_parse_brace_option("rd_strm", p + n, end,
-                            1, ahd_linux_setup_rd_strm_info, 0);
-                } else if (strncmp(p, "dv", n) == 0) {
-                        s = aic_parse_brace_option("dv", p + n, end, 1,
-                            ahd_linux_setup_dv, 0);
                 } else if (strncmp(p, "slewrate", n) == 0) {
-                        s = aic_parse_brace_option("slewrate",
+                        s = ahd_parse_brace_option("slewrate",
                             p + n, end, 1, ahd_linux_setup_iocell_info,
                             AIC79XX_SLEWRATE_INDEX);
                 } else if (strncmp(p, "precomp", n) == 0) {
-                        s = aic_parse_brace_option("precomp",
+                        s = ahd_parse_brace_option("precomp",
                             p + n, end, 1, ahd_linux_setup_iocell_info,
                             AIC79XX_PRECOMP_INDEX);
                 } else if (strncmp(p, "amplitude", n) == 0) {
-                        s = aic_parse_brace_option("amplitude",
+                        s = ahd_parse_brace_option("amplitude",
                             p + n, end, 1, ahd_linux_setup_iocell_info,
                             AIC79XX_AMPLITUDE_INDEX);
                 } else if (p[n] == ':') {
@@ -1982,13 +1066,12 @@ __setup("aic79xx=", aic79xx_setup);
 uint32_t aic79xx_verbose;
 
 int
-ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
+ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *template)
 {
         char    buf[80];
         struct  Scsi_Host *host;
         char    *new_name;
         u_long  s;
-        u_long  target;
 
         template->name = ahd->description;
         host = scsi_host_alloc(template, sizeof(struct ahd_softc *));
@@ -1997,11 +1080,7 @@ ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
 
         *((struct ahd_softc **)host->hostdata) = ahd;
         ahd_lock(ahd, &s);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         scsi_assign_lock(host, &ahd->platform_data->spin_lock);
-#elif AHD_SCSI_HAS_HOST_LOCK != 0
-        host->lock = &ahd->platform_data->spin_lock;
-#endif
         ahd->platform_data->host = host;
         host->can_queue = AHD_MAX_QUEUE;
         host->cmd_per_lun = 2;
@@ -2012,7 +1091,7 @@ ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
         host->max_lun = AHD_NUM_LUNS;
         host->max_channel = 0;
         host->sg_tablesize = AHD_NSEG;
-        ahd_set_unit(ahd, ahd_linux_next_unit());
+        ahd_set_unit(ahd, ahd_linux_unit++);
         sprintf(buf, "scsi%d", host->host_no);
         new_name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
         if (new_name != NULL) {
@@ -2020,54 +1099,14 @@ ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
                 ahd_set_name(ahd, new_name);
         }
         host->unique_id = ahd->unit;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        scsi_set_pci_device(host, ahd->dev_softc);
-#endif
-        ahd_linux_setup_user_rd_strm_settings(ahd);
         ahd_linux_initialize_scsi_bus(ahd);
-        ahd_unlock(ahd, &s);
-        ahd->platform_data->dv_pid = kernel_thread(ahd_linux_dv_thread, ahd, 0);
-        ahd_lock(ahd, &s);
-        if (ahd->platform_data->dv_pid < 0) {
-                printf("%s: Failed to create DV thread, error= %d\n",
-                       ahd_name(ahd), ahd->platform_data->dv_pid);
-                return (-ahd->platform_data->dv_pid);
-        }
-        /*
-         * Initially allocate *all* of our linux target objects
-         * so that the DV thread will scan them all in parallel
-         * just after driver initialization.  Any device that
-         * does not exist will have its target object destroyed
-         * by the selection timeout handler.  In the case of a
-         * device that appears after the initial DV scan, async
-         * negotiation will occur for the first command, and DV
-         * will comence should that first command be successful.
-         */
-        for (target = 0; target < host->max_id; target++) {
-
-                /*
-                 * Skip our own ID.  Some Compaq/HP storage devices
-                 * have enclosure management devices that respond to
-                 * single bit selection (i.e. selecting ourselves).
-                 * It is expected that either an external application
-                 * or a modified kernel will be used to probe this
-                 * ID if it is appropriate.  To accommodate these
-                 * installations, ahc_linux_alloc_target() will allocate
-                 * for our ID if asked to do so.
-                 */
-                if (target == ahd->our_id) 
-                        continue;
-
-                ahd_linux_alloc_target(ahd, 0, target);
-        }
         ahd_intr_enable(ahd, TRUE);
-        ahd_linux_start_dv(ahd);
         ahd_unlock(ahd, &s);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+        host->transportt = ahd_linux_transport_template;
+
         scsi_add_host(host, &ahd->dev_softc->dev); /* XXX handle failure */
         scsi_scan_host(host);
-#endif
         return (0);
 }
 
@@ -2081,29 +1120,6 @@ ahd_linux_get_memsize(void)
 }
 
 /*
- * Find the smallest available unit number to use
- * for a new device.  We don't just use a static
- * count to handle the "repeated hot-(un)plug"
- * scenario.
- */
-static int
-ahd_linux_next_unit(void)
-{
-        struct ahd_softc *ahd;
-        int unit;
-
-        unit = 0;
-retry:
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-                if (ahd->unit == unit) {
-                        unit++;
-                        goto retry;
-                }
-        }
-        return (unit);
-}
-
-/*
  * Place the SCSI bus into a known state by either resetting it,
  * or forcing transfer negotiations on the next command to any
  * target.
@@ -2162,20 +1178,9 @@ ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg)
         if (ahd->platform_data == NULL)
                 return (ENOMEM);
         memset(ahd->platform_data, 0, sizeof(struct ahd_platform_data));
-        TAILQ_INIT(&ahd->platform_data->completeq);
-        TAILQ_INIT(&ahd->platform_data->device_runq);
         ahd->platform_data->irq = AHD_LINUX_NOIRQ;
-        ahd->platform_data->hw_dma_mask = 0xFFFFFFFF;
         ahd_lockinit(ahd);
-        ahd_done_lockinit(ahd);
-        init_timer(&ahd->platform_data->completeq_timer);
-        ahd->platform_data->completeq_timer.data = (u_long)ahd;
-        ahd->platform_data->completeq_timer.function =
-            (ahd_linux_callback_t *)ahd_linux_thread_run_complete_queue;
         init_MUTEX_LOCKED(&ahd->platform_data->eh_sem);
-        init_MUTEX_LOCKED(&ahd->platform_data->dv_sem);
-        init_MUTEX_LOCKED(&ahd->platform_data->dv_cmd_sem);
-        ahd_setup_runq_tasklet(ahd);
         ahd->seltime = (aic79xx_seltime & 0x3) << 4;
         return (0);
 }
@@ -2183,39 +1188,27 @@ ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg)
 void
 ahd_platform_free(struct ahd_softc *ahd)
 {
-        struct ahd_linux_target *targ;
-        struct ahd_linux_device *dev;
+        struct scsi_target *starget;
         int i, j;
 
         if (ahd->platform_data != NULL) {
-                del_timer_sync(&ahd->platform_data->completeq_timer);
-                ahd_linux_kill_dv_thread(ahd);
-                ahd_teardown_runq_tasklet(ahd);
                 if (ahd->platform_data->host != NULL) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                         scsi_remove_host(ahd->platform_data->host);
-#endif
                         scsi_host_put(ahd->platform_data->host);
                 }
 
                 /* destroy all of the device and target objects */
                 for (i = 0; i < AHD_NUM_TARGETS; i++) {
-                        targ = ahd->platform_data->targets[i];
-                        if (targ != NULL) {
-                                /* Keep target around through the loop. */
-                                targ->refcount++;
+                        starget = ahd->platform_data->starget[i];
+                        if (starget != NULL) {
                                 for (j = 0; j < AHD_NUM_LUNS; j++) {
-
-                                        if (targ->devices[j] == NULL)
+                                        struct ahd_linux_target *targ =
+                                                scsi_transport_target_data(starget);
+                                        if (targ->sdev[j] == NULL)
                                                 continue;
-                                        dev = targ->devices[j];
-                                        ahd_linux_free_device(ahd, dev);
+                                        targ->sdev[j] = NULL;
                                 }
-                                /*
-                                 * Forcibly free the target now that
-                                 * all devices are gone.
-                                 */
-                                ahd_linux_free_target(ahd, targ);
+                                ahd->platform_data->starget[i] = NULL;
                         }
                 }
 
@@ -2233,16 +1226,6 @@ ahd_platform_free(struct ahd_softc *ahd)
                         release_mem_region(ahd->platform_data->mem_busaddr,
                                            0x1000);
                 }
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-                /*
-                 * In 2.4 we detach from the scsi midlayer before the PCI
-                 * layer invokes our remove callback.  No per-instance
-                 * detach is provided, so we must reach inside the PCI
-                 * subsystem's internals and detach our driver manually.
-                 */
-                if (ahd->dev_softc != NULL)
-                        ahd->dev_softc->driver = NULL;
-#endif
                 free(ahd->platform_data, M_DEVBUF);
         }
 }
@@ -2280,13 +1263,22 @@ void
 ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                       ahd_queue_alg alg)
 {
+        struct scsi_target *starget;
+        struct ahd_linux_target *targ;
         struct ahd_linux_device *dev;
+        struct scsi_device *sdev;
         int was_queuing;
         int now_queuing;
 
-        dev = ahd_linux_get_device(ahd, devinfo->channel - 'A',
-                                   devinfo->target,
-                                   devinfo->lun, /*alloc*/FALSE);
+        starget = ahd->platform_data->starget[devinfo->target];
+        targ = scsi_transport_target_data(starget);
+        BUG_ON(targ == NULL);
+        sdev = targ->sdev[devinfo->lun];
+        if (sdev == NULL)
+                return;
+
+        dev = scsi_transport_device_data(sdev);
+
         if (dev == NULL)
                 return;
         was_queuing = dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED);
@@ -2339,1434 +1331,37 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                 dev->maxtags = 0;
                 dev->openings =  1 - dev->active;
         }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-        if (dev->scsi_device != NULL) {
-                switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
-                case AHD_DEV_Q_BASIC:
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                MSG_SIMPLE_TASK,
-                                                dev->openings + dev->active);
-                        break;
-                case AHD_DEV_Q_TAGGED:
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                MSG_ORDERED_TASK,
-                                                dev->openings + dev->active);
-                        break;
-                default:
-                        /*
-                         * We allow the OS to queue 2 untagged transactions to
-                         * us at any time even though we can only execute them
-                         * serially on the controller/device.  This should
-                         * remove some latency.
-                         */
-                        scsi_adjust_queue_depth(dev->scsi_device,
-                                                /*NON-TAGGED*/0,
-                                                /*queue depth*/2);
-                        break;
-                }
-        }
-#endif
-}
-
-int
-ahd_platform_abort_scbs(struct ahd_softc *ahd, int target, char channel,
-                        int lun, u_int tag, role_t role, uint32_t status)
-{
-        int targ;
-        int maxtarg;
-        int maxlun;
-        int clun;
-        int count;
-
-        if (tag != SCB_LIST_NULL)
-                return (0);
-
-        targ = 0;
-        if (target != CAM_TARGET_WILDCARD) {
-                targ = target;
-                maxtarg = targ + 1;
-        } else {
-                maxtarg = (ahd->features & AHD_WIDE) ? 16 : 8;
-        }
-        clun = 0;
-        if (lun != CAM_LUN_WILDCARD) {
-                clun = lun;
-                maxlun = clun + 1;
-        } else {
-                maxlun = AHD_NUM_LUNS;
-        }
-
-        count = 0;
-        for (; targ < maxtarg; targ++) {
-
-                for (; clun < maxlun; clun++) {
-                        struct ahd_linux_device *dev;
-                        struct ahd_busyq *busyq;
-                        struct ahd_cmd *acmd;
-
-                        dev = ahd_linux_get_device(ahd, /*chan*/0, targ,
-                                                   clun, /*alloc*/FALSE);
-                        if (dev == NULL)
-                                continue;
-
-                        busyq = &dev->busyq;
-                        while ((acmd = TAILQ_FIRST(busyq)) != NULL) {
-                                Scsi_Cmnd *cmd;
-
-                                cmd = &acmd_scsi_cmd(acmd);
-                                TAILQ_REMOVE(busyq, acmd,
-                                             acmd_links.tqe);
-                                count++;
-                                cmd->result = status << 16;
-                                ahd_linux_queue_cmd_complete(ahd, cmd);
-                        }
-                }
-        }
-
-        return (count);
-}
-
-static void
-ahd_linux_thread_run_complete_queue(struct ahd_softc *ahd)
-{
-        u_long flags;
-
-        ahd_lock(ahd, &flags);
-        del_timer(&ahd->platform_data->completeq_timer);
-        ahd->platform_data->flags &= ~AHD_RUN_CMPLT_Q_TIMER;
-        ahd_linux_run_complete_queue(ahd);
-        ahd_unlock(ahd, &flags);
-}
-
-static void
-ahd_linux_start_dv(struct ahd_softc *ahd)
-{
-
-        /*
-         * Freeze the simq and signal ahd_linux_queue to not let any
-         * more commands through
-         */
-        if ((ahd->platform_data->flags & AHD_DV_ACTIVE) == 0) {
-#ifdef AHD_DEBUG
-                if (ahd_debug & AHD_SHOW_DV)
-                        printf("%s: Starting DV\n", ahd_name(ahd));
-#endif
-
-                ahd->platform_data->flags |= AHD_DV_ACTIVE;
-                ahd_freeze_simq(ahd);
-
-                /* Wake up the DV kthread */
-                up(&ahd->platform_data->dv_sem);
-        }
-}
-
-static int
-ahd_linux_dv_thread(void *data)
-{
-        struct  ahd_softc *ahd;
-        int     target;
-        u_long  s;
-
-        ahd = (struct ahd_softc *)data;
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV)
-                printf("In DV Thread\n");
-#endif
-
-        /*
-         * Complete thread creation.
-         */
-        lock_kernel();
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,60)
-        /*
-         * Don't care about any signals.
-         */
-        siginitsetinv(&current->blocked, 0);
-
-        daemonize();
-        sprintf(current->comm, "ahd_dv_%d", ahd->unit);
-#else
-        daemonize("ahd_dv_%d", ahd->unit);
-        current->flags |= PF_NOFREEZE;
-#endif
-        unlock_kernel();
-
-        while (1) {
-                /*
-                 * Use down_interruptible() rather than down() to
-                 * avoid inclusion in the load average.
-                 */
-                down_interruptible(&ahd->platform_data->dv_sem);
-
-                /* Check to see if we've been signaled to exit */
-                ahd_lock(ahd, &s);
-                if ((ahd->platform_data->flags & AHD_DV_SHUTDOWN) != 0) {
-                        ahd_unlock(ahd, &s);
-                        break;
-                }
-                ahd_unlock(ahd, &s);
-
-#ifdef AHD_DEBUG
-                if (ahd_debug & AHD_SHOW_DV)
-                        printf("%s: Beginning Domain Validation\n",
-                               ahd_name(ahd));
-#endif
-
-                /*
-                 * Wait for any pending commands to drain before proceeding.
-                 */
-                ahd_lock(ahd, &s);
-                while (LIST_FIRST(&ahd->pending_scbs) != NULL) {
-                        ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_EMPTY;
-                        ahd_unlock(ahd, &s);
-                        down_interruptible(&ahd->platform_data->dv_sem);
-                        ahd_lock(ahd, &s);
-                }
-
-                /*
-                 * Wait for the SIMQ to be released so that DV is the
-                 * only reason the queue is frozen.
-                 */
-                while (AHD_DV_SIMQ_FROZEN(ahd) == 0) {
-                        ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_RELEASE;
-                        ahd_unlock(ahd, &s);
-                        down_interruptible(&ahd->platform_data->dv_sem);
-                        ahd_lock(ahd, &s);
-                }
-                ahd_unlock(ahd, &s);
-
-                for (target = 0; target < AHD_NUM_TARGETS; target++)
-                        ahd_linux_dv_target(ahd, target);
-
-                ahd_lock(ahd, &s);
-                ahd->platform_data->flags &= ~AHD_DV_ACTIVE;
-                ahd_unlock(ahd, &s);
-
-                /*
-                 * Release the SIMQ so that normal commands are
-                 * allowed to continue on the bus.
-                 */
-                ahd_release_simq(ahd);
-        }
-        up(&ahd->platform_data->eh_sem);
-        return (0);
-}
-
-static void
-ahd_linux_kill_dv_thread(struct ahd_softc *ahd)
-{
-        u_long s;
-
-        ahd_lock(ahd, &s);
-        if (ahd->platform_data->dv_pid != 0) {
-                ahd->platform_data->flags |= AHD_DV_SHUTDOWN;
-                ahd_unlock(ahd, &s);
-                up(&ahd->platform_data->dv_sem);
-
-                /*
-                 * Use the eh_sem as an indicator that the
-                 * dv thread is exiting.  Note that the dv
-                 * thread must still return after performing
-                 * the up on our semaphore before it has
-                 * completely exited this module.  Unfortunately,
-                 * there seems to be no easy way to wait for the
-                 * exit of a thread for which you are not the
-                 * parent (dv threads are parented by init).
-                 * Cross your fingers...
-                 */
-                down(&ahd->platform_data->eh_sem);
-
-                /*
-                 * Mark the dv thread as already dead.  This
-                 * avoids attempting to kill it a second time.
-                 * This is necessary because we must kill the
-                 * DV thread before calling ahd_free() in the
-                 * module shutdown case to avoid bogus locking
-                 * in the SCSI mid-layer, but we ahd_free() is
-                 * called without killing the DV thread in the
-                 * instance detach case, so ahd_platform_free()
-                 * calls us again to verify that the DV thread
-                 * is dead.
-                 */
-                ahd->platform_data->dv_pid = 0;
-        } else {
-                ahd_unlock(ahd, &s);
-        }
-}
-
-#define AHD_LINUX_DV_INQ_SHORT_LEN      36
-#define AHD_LINUX_DV_INQ_LEN            256
-#define AHD_LINUX_DV_TIMEOUT            (HZ / 4)
-
-#define AHD_SET_DV_STATE(ahd, targ, newstate) \
-        ahd_set_dv_state(ahd, targ, newstate, __LINE__)
-
-static __inline void
-ahd_set_dv_state(struct ahd_softc *ahd, struct ahd_linux_target *targ,
-                 ahd_dv_state newstate, u_int line)
-{
-        ahd_dv_state oldstate;
-
-        oldstate = targ->dv_state;
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV)
-                printf("%s:%d: Going from state %d to state %d\n",
-                       ahd_name(ahd), line, oldstate, newstate);
-#endif
-
-        if (oldstate == newstate)
-                targ->dv_state_retry++;
-        else
-                targ->dv_state_retry = 0;
-        targ->dv_state = newstate;
-}
-
-static void
-ahd_linux_dv_target(struct ahd_softc *ahd, u_int target_offset)
-{
-        struct   ahd_devinfo devinfo;
-        struct   ahd_linux_target *targ;
-        struct   scsi_cmnd *cmd;
-        struct   scsi_device *scsi_dev;
-        struct   scsi_sense_data *sense;
-        uint8_t *buffer;
-        u_long   s;
-        u_int    timeout;
-        int      echo_size;
-
-        sense = NULL;
-        buffer = NULL;
-        echo_size = 0;
-        ahd_lock(ahd, &s);
-        targ = ahd->platform_data->targets[target_offset];
-        if (targ == NULL || (targ->flags & AHD_DV_REQUIRED) == 0) {
-                ahd_unlock(ahd, &s);
-                return;
-        }
-        ahd_compile_devinfo(&devinfo, ahd->our_id, targ->target, /*lun*/0,
-                            targ->channel + 'A', ROLE_INITIATOR);
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, &devinfo);
-                printf("Performing DV\n");
-        }
-#endif
-
-        ahd_unlock(ahd, &s);
-
-        cmd = malloc(sizeof(struct scsi_cmnd), M_DEVBUF, M_WAITOK);
-        scsi_dev = malloc(sizeof(struct scsi_device), M_DEVBUF, M_WAITOK);
-        scsi_dev->host = ahd->platform_data->host;
-        scsi_dev->id = devinfo.target;
-        scsi_dev->lun = devinfo.lun;
-        scsi_dev->channel = devinfo.channel - 'A';
-        ahd->platform_data->dv_scsi_dev = scsi_dev;
-
-        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_INQ_SHORT_ASYNC);
-
-        while (targ->dv_state != AHD_DV_STATE_EXIT) {
-                timeout = AHD_LINUX_DV_TIMEOUT;
-                switch (targ->dv_state) {
-                case AHD_DV_STATE_INQ_SHORT_ASYNC:
-                case AHD_DV_STATE_INQ_ASYNC:
-                case AHD_DV_STATE_INQ_ASYNC_VERIFY:
-                        /*
-                         * Set things to async narrow to reduce the
-                         * chance that the INQ will fail.
-                         */
-                        ahd_lock(ahd, &s);
-                        ahd_set_syncrate(ahd, &devinfo, 0, 0, 0,
-                                         AHD_TRANS_GOAL, /*paused*/FALSE);
-                        ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-                                      AHD_TRANS_GOAL, /*paused*/FALSE);
-                        ahd_unlock(ahd, &s);
-                        timeout = 10 * HZ;
-                        targ->flags &= ~AHD_INQ_VALID;
-                        /* FALLTHROUGH */
-                case AHD_DV_STATE_INQ_VERIFY:
-                {
-                        u_int inq_len;
-
-                        if (targ->dv_state == AHD_DV_STATE_INQ_SHORT_ASYNC)
-                                inq_len = AHD_LINUX_DV_INQ_SHORT_LEN;
-                        else
-                                inq_len = targ->inq_data->additional_length + 5;
-                        ahd_linux_dv_inq(ahd, cmd, &devinfo, targ, inq_len);
-                        break;
-                }
-                case AHD_DV_STATE_TUR:
-                case AHD_DV_STATE_BUSY:
-                        timeout = 5 * HZ;
-                        ahd_linux_dv_tur(ahd, cmd, &devinfo);
-                        break;
-                case AHD_DV_STATE_REBD:
-                        ahd_linux_dv_rebd(ahd, cmd, &devinfo, targ);
-                        break;
-                case AHD_DV_STATE_WEB:
-                        ahd_linux_dv_web(ahd, cmd, &devinfo, targ);
-                        break;
-
-                case AHD_DV_STATE_REB:
-                        ahd_linux_dv_reb(ahd, cmd, &devinfo, targ);
-                        break;
-
-                case AHD_DV_STATE_SU:
-                        ahd_linux_dv_su(ahd, cmd, &devinfo, targ);
-                        timeout = 50 * HZ;
-                        break;
-
-                default:
-                        ahd_print_devinfo(ahd, &devinfo);
-                        printf("Unknown DV state %d\n", targ->dv_state);
-                        goto out;
-                }
-
-                /* Queue the command and wait for it to complete */
-                /* Abuse eh_timeout in the scsi_cmnd struct for our purposes */
-                init_timer(&cmd->eh_timeout);
-#ifdef AHD_DEBUG
-                if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
-                        /*
-                         * All of the printfs during negotiation
-                         * really slow down the negotiation.
-                         * Add a bit of time just to be safe.
-                         */
-                        timeout += HZ;
-#endif
-                scsi_add_timer(cmd, timeout, ahd_linux_dv_timeout);
-                /*
-                 * In 2.5.X, it is assumed that all calls from the
-                 * "midlayer" (which we are emulating) will have the
-                 * ahd host lock held.  For other kernels, the
-                 * io_request_lock must be held.
-                 */
-#if AHD_SCSI_HAS_HOST_LOCK != 0
-                ahd_lock(ahd, &s);
-#else
-                spin_lock_irqsave(&io_request_lock, s);
-#endif
-                ahd_linux_queue(cmd, ahd_linux_dv_complete);
-#if AHD_SCSI_HAS_HOST_LOCK != 0
-                ahd_unlock(ahd, &s);
-#else
-                spin_unlock_irqrestore(&io_request_lock, s);
-#endif
-                down_interruptible(&ahd->platform_data->dv_cmd_sem);
-                /*
-                 * Wait for the SIMQ to be released so that DV is the
-                 * only reason the queue is frozen.
-                 */
-                ahd_lock(ahd, &s);
-                while (AHD_DV_SIMQ_FROZEN(ahd) == 0) {
-                        ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_RELEASE;
-                        ahd_unlock(ahd, &s);
-                        down_interruptible(&ahd->platform_data->dv_sem);
-                        ahd_lock(ahd, &s);
-                }
-                ahd_unlock(ahd, &s);
-
-                ahd_linux_dv_transition(ahd, cmd, &devinfo, targ);
-        }
-
-out:
-        if ((targ->flags & AHD_INQ_VALID) != 0
-         && ahd_linux_get_device(ahd, devinfo.channel - 'A',
-                                 devinfo.target, devinfo.lun,
-                                 /*alloc*/FALSE) == NULL) {
-                /*
-                 * The DV state machine failed to configure this device.  
-                 * This is normal if DV is disabled.  Since we have inquiry
-                 * data, filter it and use the "optimistic" negotiation
-                 * parameters found in the inquiry string.
-                 */
-                ahd_linux_filter_inquiry(ahd, &devinfo);
-                if ((targ->flags & (AHD_BASIC_DV|AHD_ENHANCED_DV)) != 0) {
-                        ahd_print_devinfo(ahd, &devinfo);
-                        printf("DV failed to configure device.  "
-                               "Please file a bug report against "
-                               "this driver.\n");
-                }
-        }
-
-        if (cmd != NULL)
-                free(cmd, M_DEVBUF);
-
-        if (ahd->platform_data->dv_scsi_dev != NULL) {
-                free(ahd->platform_data->dv_scsi_dev, M_DEVBUF);
-                ahd->platform_data->dv_scsi_dev = NULL;
-        }
-
-        ahd_lock(ahd, &s);
-        if (targ->dv_buffer != NULL) {
-                free(targ->dv_buffer, M_DEVBUF);
-                targ->dv_buffer = NULL;
-        }
-        if (targ->dv_buffer1 != NULL) {
-                free(targ->dv_buffer1, M_DEVBUF);
-                targ->dv_buffer1 = NULL;
-        }
-        targ->flags &= ~AHD_DV_REQUIRED;
-        if (targ->refcount == 0)
-                ahd_linux_free_target(ahd, targ);
-        ahd_unlock(ahd, &s);
-}
-
-static __inline int
-ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
-{
-        u_long s;
-        int retval;
-
-        ahd_lock(ahd, &s);
-        retval = ahd_linux_fallback(ahd, devinfo);
-        ahd_unlock(ahd, &s);
-
-        return (retval);
-}
-
-static void
-ahd_linux_dv_transition(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                        struct ahd_devinfo *devinfo,
-                        struct ahd_linux_target *targ)
-{
-        u_int32_t status;
-
-        status = aic_error_action(cmd, targ->inq_data,
-                                  ahd_cmd_get_transaction_status(cmd),
-                                  ahd_cmd_get_scsi_status(cmd));
-
-        
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Entering ahd_linux_dv_transition, state= %d, "
-                       "status= 0x%x, cmd->result= 0x%x\n", targ->dv_state,
-                       status, cmd->result);
-        }
-#endif
 
-        switch (targ->dv_state) {
-        case AHD_DV_STATE_INQ_SHORT_ASYNC:
-        case AHD_DV_STATE_INQ_ASYNC:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state+1);
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ)
-                                targ->dv_state_retry--;
-                        if ((status & SS_ERRMASK) == EBUSY)
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                        if (targ->dv_state_retry < 10)
-                                break;
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Failed DV inquiry, skipping\n");
-                        }
-#endif
-                        break;
-                }
+        switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
+        case AHD_DEV_Q_BASIC:
+                scsi_adjust_queue_depth(sdev,
+                                        MSG_SIMPLE_TASK,
+                                        dev->openings + dev->active);
                 break;
-        case AHD_DV_STATE_INQ_ASYNC_VERIFY:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-                        u_int xportflags;
-                        u_int spi3data;
-
-                        if (memcmp(targ->inq_data, targ->dv_buffer,
-                                   AHD_LINUX_DV_INQ_LEN) != 0) {
-                                /*
-                                 * Inquiry data must have changed.
-                                 * Try from the top again.
-                                 */
-                                AHD_SET_DV_STATE(ahd, targ,
-                                                 AHD_DV_STATE_INQ_SHORT_ASYNC);
-                                break;
-                        }
-
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state+1);
-                        targ->flags |= AHD_INQ_VALID;
-                        if (ahd_linux_user_dv_setting(ahd) == 0)
-                                break;
-
-                        xportflags = targ->inq_data->flags;
-                        if ((xportflags & (SID_Sync|SID_WBus16)) == 0)
-                                break;
-
-                        spi3data = targ->inq_data->spi3data;
-                        switch (spi3data & SID_SPI_CLOCK_DT_ST) {
-                        default:
-                        case SID_SPI_CLOCK_ST:
-                                /* Assume only basic DV is supported. */
-                                targ->flags |= AHD_BASIC_DV;
-                                break;
-                        case SID_SPI_CLOCK_DT:
-                        case SID_SPI_CLOCK_DT_ST:
-                                targ->flags |= AHD_ENHANCED_DV;
-                                break;
-                        }
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ)
-                                targ->dv_state_retry--;
-
-                        if ((status & SS_ERRMASK) == EBUSY)
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                        if (targ->dv_state_retry < 10)
-                                break;
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Failed DV inquiry, skipping\n");
-                        }
-#endif
-                        break;
-                }
+        case AHD_DEV_Q_TAGGED:
+                scsi_adjust_queue_depth(sdev,
+                                        MSG_ORDERED_TASK,
+                                        dev->openings + dev->active);
                 break;
-        case AHD_DV_STATE_INQ_VERIFY:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-
-                        if (memcmp(targ->inq_data, targ->dv_buffer,
-                                   AHD_LINUX_DV_INQ_LEN) == 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                int i;
-
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Inquiry buffer mismatch:");
-                                for (i = 0; i < AHD_LINUX_DV_INQ_LEN; i++) {
-                                        if ((i & 0xF) == 0)
-                                                printf("\n        ");
-                                        printf("0x%x:0x0%x ",
-                                               ((uint8_t *)targ->inq_data)[i], 
-                                               targ->dv_buffer[i]);
-                                }
-                                printf("\n");
-                        }
-#endif
-
-                        if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-                        /*
-                         * Do not count "falling back"
-                         * against our retries.
-                         */
-                        targ->dv_state_retry = 0;
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                /*
-                                 * Do not count "falling back"
-                                 * against our retries.
-                                 */
-                                targ->dv_state_retry = 0;
-                        } else if ((status & SS_ERRMASK) == EBUSY)
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                        if (targ->dv_state_retry < 10)
-                                break;
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Failed DV inquiry, skipping\n");
-                        }
-#endif
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_TUR:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                        if ((targ->flags & AHD_BASIC_DV) != 0) {
-                                ahd_linux_filter_inquiry(ahd, devinfo);
-                                AHD_SET_DV_STATE(ahd, targ,
-                                                 AHD_DV_STATE_INQ_VERIFY);
-                        } else if ((targ->flags & AHD_ENHANCED_DV) != 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_REBD);
-                        } else {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        }
-                        break;
-                case SS_RETRY:
-                case SS_TUR:
-                        if ((status & SS_ERRMASK) == EBUSY) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
-                                break;
-                        }
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                /*
-                                 * Do not count "falling back"
-                                 * against our retries.
-                                 */
-                                targ->dv_state_retry = 0;
-                        }
-                        if (targ->dv_state_retry >= 10) {
-#ifdef AHD_DEBUG
-                                if (ahd_debug & AHD_SHOW_DV) {
-                                        ahd_print_devinfo(ahd, devinfo);
-                                        printf("DV TUR reties exhausted\n");
-                                }
-#endif
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-                        if (status & SSQ_DELAY)
-                                ssleep(1);
-
-                        break;
-                case SS_START:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_SU);
-                        break;
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_REBD:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                {
-                        uint32_t echo_size;
-
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_WEB);
-                        echo_size = scsi_3btoul(&targ->dv_buffer[1]);
-                        echo_size &= 0x1FFF;
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("Echo buffer size= %d\n", echo_size);
-                        }
-#endif
-                        if (echo_size == 0) {
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                                break;
-                        }
-
-                        /* Generate the buffer pattern */
-                        targ->dv_echo_size = echo_size;
-                        ahd_linux_generate_dv_pattern(targ);
-                        /*
-                         * Setup initial negotiation values.
-                         */
-                        ahd_linux_filter_inquiry(ahd, devinfo);
-                        break;
-                }
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ)
-                                targ->dv_state_retry--;
-                        if (targ->dv_state_retry <= 10)
-                                break;
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("DV REBD reties exhausted\n");
-                        }
-#endif
-                        /* FALLTHROUGH */
-                case SS_FATAL:
-                default:
-                        /*
-                         * Setup initial negotiation values
-                         * and try level 1 DV.
-                         */
-                        ahd_linux_filter_inquiry(ahd, devinfo);
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_INQ_VERIFY);
-                        targ->dv_echo_size = 0;
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_WEB:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_REB);
-                        break;
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                /*
-                                 * Do not count "falling back"
-                                 * against our retries.
-                                 */
-                                targ->dv_state_retry = 0;
-                        }
-                        if (targ->dv_state_retry <= 10)
-                                break;
-                        /* FALLTHROUGH */
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("DV WEB reties exhausted\n");
-                        }
-#endif
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_REB:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                        if (memcmp(targ->dv_buffer, targ->dv_buffer1,
-                                   targ->dv_echo_size) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0)
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                else
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_WEB);
-                                break;
-                        }
-                        
-                        if (targ->dv_buffer != NULL) {
-                                free(targ->dv_buffer, M_DEVBUF);
-                                targ->dv_buffer = NULL;
-                        }
-                        if (targ->dv_buffer1 != NULL) {
-                                free(targ->dv_buffer1, M_DEVBUF);
-                                targ->dv_buffer1 = NULL;
-                        }
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if ((status & SSQ_FALLBACK) != 0) {
-                                if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
-                                        AHD_SET_DV_STATE(ahd, targ,
-                                                         AHD_DV_STATE_EXIT);
-                                        break;
-                                }
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_WEB);
-                        }
-                        if (targ->dv_state_retry <= 10) {
-                                if ((status & (SSQ_DELAY_RANDOM|SSQ_DELAY))!= 0)
-                                        msleep(ahd->our_id*1000/10);
-                                break;
-                        }
-#ifdef AHD_DEBUG
-                        if (ahd_debug & AHD_SHOW_DV) {
-                                ahd_print_devinfo(ahd, devinfo);
-                                printf("DV REB reties exhausted\n");
-                        }
-#endif
-                        /* FALLTHROUGH */
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_SU:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
-        case AHD_DV_STATE_BUSY:
-                switch (status & SS_MASK) {
-                case SS_NOP:
-                case SS_INQ_REFRESH:
-                        AHD_SET_DV_STATE(ahd, targ,
-                                         AHD_DV_STATE_INQ_SHORT_ASYNC);
-                        break;
-                case SS_TUR:
-                case SS_RETRY:
-                        AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
-                        if (ahd_cmd_get_transaction_status(cmd)
-                         == CAM_REQUEUE_REQ) {
-                                targ->dv_state_retry--;
-                        } else if (targ->dv_state_retry < 60) {
-                                if ((status & SSQ_DELAY) != 0)
-                                        ssleep(1);
-                        } else {
-#ifdef AHD_DEBUG
-                                if (ahd_debug & AHD_SHOW_DV) {
-                                        ahd_print_devinfo(ahd, devinfo);
-                                        printf("DV BUSY reties exhausted\n");
-                                }
-#endif
-                                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        }
-                        break;
-                default:
-                        AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                        break;
-                }
-                break;
-
         default:
-                printf("%s: Invalid DV completion state %d\n", ahd_name(ahd),
-                       targ->dv_state);
-                AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
-                break;
-        }
-}
-
-static void
-ahd_linux_dv_fill_cmd(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                      struct ahd_devinfo *devinfo)
-{
-        memset(cmd, 0, sizeof(struct scsi_cmnd));
-        cmd->device = ahd->platform_data->dv_scsi_dev;
-        cmd->scsi_done = ahd_linux_dv_complete;
-}
-
-/*
- * Synthesize an inquiry command.  On the return trip, it'll be
- * sniffed and the device transfer settings set for us.
- */
-static void
-ahd_linux_dv_inq(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ,
-                 u_int request_length)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending INQ\n");
-        }
-#endif
-        if (targ->inq_data == NULL)
-                targ->inq_data = malloc(AHD_LINUX_DV_INQ_LEN,
-                                        M_DEVBUF, M_WAITOK);
-        if (targ->dv_state > AHD_DV_STATE_INQ_ASYNC) {
-                if (targ->dv_buffer != NULL)
-                        free(targ->dv_buffer, M_DEVBUF);
-                targ->dv_buffer = malloc(AHD_LINUX_DV_INQ_LEN,
-                                         M_DEVBUF, M_WAITOK);
-        }
-
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_FROM_DEVICE;
-        cmd->cmd_len = 6;
-        cmd->cmnd[0] = INQUIRY;
-        cmd->cmnd[4] = request_length;
-        cmd->request_bufflen = request_length;
-        if (targ->dv_state > AHD_DV_STATE_INQ_ASYNC)
-                cmd->request_buffer = targ->dv_buffer;
-        else
-                cmd->request_buffer = targ->inq_data;
-        memset(cmd->request_buffer, 0, AHD_LINUX_DV_INQ_LEN);
-}
-
-static void
-ahd_linux_dv_tur(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending TUR\n");
-        }
-#endif
-        /* Do a TUR to clear out any non-fatal transitional state */
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_NONE;
-        cmd->cmd_len = 6;
-        cmd->cmnd[0] = TEST_UNIT_READY;
-}
-
-#define AHD_REBD_LEN 4
-
-static void
-ahd_linux_dv_rebd(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending REBD\n");
-        }
-#endif
-        if (targ->dv_buffer != NULL)
-                free(targ->dv_buffer, M_DEVBUF);
-        targ->dv_buffer = malloc(AHD_REBD_LEN, M_DEVBUF, M_WAITOK);
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_FROM_DEVICE;
-        cmd->cmd_len = 10;
-        cmd->cmnd[0] = READ_BUFFER;
-        cmd->cmnd[1] = 0x0b;
-        scsi_ulto3b(AHD_REBD_LEN, &cmd->cmnd[6]);
-        cmd->request_bufflen = AHD_REBD_LEN;
-        cmd->underflow = cmd->request_bufflen;
-        cmd->request_buffer = targ->dv_buffer;
-}
-
-static void
-ahd_linux_dv_web(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending WEB\n");
-        }
-#endif
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_TO_DEVICE;
-        cmd->cmd_len = 10;
-        cmd->cmnd[0] = WRITE_BUFFER;
-        cmd->cmnd[1] = 0x0a;
-        scsi_ulto3b(targ->dv_echo_size, &cmd->cmnd[6]);
-        cmd->request_bufflen = targ->dv_echo_size;
-        cmd->underflow = cmd->request_bufflen;
-        cmd->request_buffer = targ->dv_buffer;
-}
-
-static void
-ahd_linux_dv_reb(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
-{
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending REB\n");
-        }
-#endif
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_FROM_DEVICE;
-        cmd->cmd_len = 10;
-        cmd->cmnd[0] = READ_BUFFER;
-        cmd->cmnd[1] = 0x0a;
-        scsi_ulto3b(targ->dv_echo_size, &cmd->cmnd[6]);
-        cmd->request_bufflen = targ->dv_echo_size;
-        cmd->underflow = cmd->request_bufflen;
-        cmd->request_buffer = targ->dv_buffer1;
-}
-
-static void
-ahd_linux_dv_su(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
-                struct ahd_devinfo *devinfo,
-                struct ahd_linux_target *targ)
-{
-        u_int le;
-
-        le = SID_IS_REMOVABLE(targ->inq_data) ? SSS_LOEJ : 0;
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Sending SU\n");
-        }
-#endif
-        ahd_linux_dv_fill_cmd(ahd, cmd, devinfo);
-        cmd->sc_data_direction = DMA_NONE;
-        cmd->cmd_len = 6;
-        cmd->cmnd[0] = START_STOP_UNIT;
-        cmd->cmnd[4] = le | SSS_START;
-}
-
-static int
-ahd_linux_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
-{
-        struct  ahd_linux_target *targ;
-        struct  ahd_initiator_tinfo *tinfo;
-        struct  ahd_transinfo *goal;
-        struct  ahd_tmode_tstate *tstate;
-        u_int   width;
-        u_int   period;
-        u_int   offset;
-        u_int   ppr_options;
-        u_int   cur_speed;
-        u_int   wide_speed;
-        u_int   narrow_speed;
-        u_int   fallback_speed;
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                ahd_print_devinfo(ahd, devinfo);
-                printf("Trying to fallback\n");
-        }
-#endif
-        targ = ahd->platform_data->targets[devinfo->target_offset];
-        tinfo = ahd_fetch_transinfo(ahd, devinfo->channel,
-                                    devinfo->our_scsiid,
-                                    devinfo->target, &tstate);
-        goal = &tinfo->goal;
-        width = goal->width;
-        period = goal->period;
-        offset = goal->offset;
-        ppr_options = goal->ppr_options;
-        if (offset == 0)
-                period = AHD_ASYNC_XFER_PERIOD;
-        if (targ->dv_next_narrow_period == 0)
-                targ->dv_next_narrow_period = MAX(period, AHD_SYNCRATE_ULTRA2);
-        if (targ->dv_next_wide_period == 0)
-                targ->dv_next_wide_period = period;
-        if (targ->dv_max_width == 0)
-                targ->dv_max_width = width;
-        if (targ->dv_max_ppr_options == 0)
-                targ->dv_max_ppr_options = ppr_options;
-        if (targ->dv_last_ppr_options == 0)
-                targ->dv_last_ppr_options = ppr_options;
-
-        cur_speed = aic_calc_speed(width, period, offset, AHD_SYNCRATE_MIN);
-        wide_speed = aic_calc_speed(MSG_EXT_WDTR_BUS_16_BIT,
-                                          targ->dv_next_wide_period,
-                                          MAX_OFFSET, AHD_SYNCRATE_MIN);
-        narrow_speed = aic_calc_speed(MSG_EXT_WDTR_BUS_8_BIT,
-                                            targ->dv_next_narrow_period,
-                                            MAX_OFFSET, AHD_SYNCRATE_MIN);
-        fallback_speed = aic_calc_speed(width, period+1, offset,
-                                              AHD_SYNCRATE_MIN);
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                printf("cur_speed= %d, wide_speed= %d, narrow_speed= %d, "
-                       "fallback_speed= %d\n", cur_speed, wide_speed,
-                       narrow_speed, fallback_speed);
-        }
-#endif
-
-        if (cur_speed > 160000) {
-                /*
-                 * Paced/DT/IU_REQ only transfer speeds.  All we
-                 * can do is fallback in terms of syncrate.
-                 */
-                period++;
-        } else if (cur_speed > 80000) {
-                if ((ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-                        /*
-                         * Try without IU_REQ as it may be confusing
-                         * an expander.
-                         */
-                        ppr_options &= ~MSG_EXT_PPR_IU_REQ;
-                } else {
-                        /*
-                         * Paced/DT only transfer speeds.  All we
-                         * can do is fallback in terms of syncrate.
-                         */
-                        period++;
-                        ppr_options = targ->dv_max_ppr_options;
-                }
-        } else if (cur_speed > 3300) {
-
                 /*
-                 * In this range we the following
-                 * options ordered from highest to
-                 * lowest desireability:
-                 *
-                 * o Wide/DT
-                 * o Wide/non-DT
-                 * o Narrow at a potentally higher sync rate.
-                 *
-                 * All modes are tested with and without IU_REQ
-                 * set since using IUs may confuse an expander.
+                 * We allow the OS to queue 2 untagged transactions to
+                 * us at any time even though we can only execute them
+                 * serially on the controller/device.  This should
+                 * remove some latency.
                  */
-                if ((ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-
-                        ppr_options &= ~MSG_EXT_PPR_IU_REQ;
-                } else if ((ppr_options & MSG_EXT_PPR_DT_REQ) != 0) {
-                        /*
-                         * Try going non-DT.
-                         */
-                        ppr_options = targ->dv_max_ppr_options;
-                        ppr_options &= ~MSG_EXT_PPR_DT_REQ;
-                } else if (targ->dv_last_ppr_options != 0) {
-                        /*
-                         * Try without QAS or any other PPR options.
-                         * We may need a non-PPR message to work with
-                         * an expander.  We look at the "last PPR options"
-                         * so we will perform this fallback even if the
-                         * target responded to our PPR negotiation with
-                         * no option bits set.
-                         */
-                        ppr_options = 0;
-                } else if (width == MSG_EXT_WDTR_BUS_16_BIT) {
-                        /*
-                         * If the next narrow speed is greater than
-                         * the next wide speed, fallback to narrow.
-                         * Otherwise fallback to the next DT/Wide setting.
-                         * The narrow async speed will always be smaller
-                         * than the wide async speed, so handle this case
-                         * specifically.
-                         */
-                        ppr_options = targ->dv_max_ppr_options;
-                        if (narrow_speed > fallback_speed
-                         || period >= AHD_ASYNC_XFER_PERIOD) {
-                                targ->dv_next_wide_period = period+1;
-                                width = MSG_EXT_WDTR_BUS_8_BIT;
-                                period = targ->dv_next_narrow_period;
-                        } else {
-                                period++;
-                        }
-                } else if ((ahd->features & AHD_WIDE) != 0
-                        && targ->dv_max_width != 0
-                        && wide_speed >= fallback_speed
-                        && (targ->dv_next_wide_period <= AHD_ASYNC_XFER_PERIOD
-                         || period >= AHD_ASYNC_XFER_PERIOD)) {
-
-                        /*
-                         * We are narrow.  Try falling back
-                         * to the next wide speed with 
-                         * all supported ppr options set.
-                         */
-                        targ->dv_next_narrow_period = period+1;
-                        width = MSG_EXT_WDTR_BUS_16_BIT;
-                        period = targ->dv_next_wide_period;
-                        ppr_options = targ->dv_max_ppr_options;
-                } else {
-                        /* Only narrow fallback is allowed. */
-                        period++;
-                        ppr_options = targ->dv_max_ppr_options;
-                }
-        } else {
-                return (-1);
-        }
-        offset = MAX_OFFSET;
-        ahd_find_syncrate(ahd, &period, &ppr_options, AHD_SYNCRATE_PACED);
-        ahd_set_width(ahd, devinfo, width, AHD_TRANS_GOAL, FALSE);
-        if (period == 0) {
-                period = 0;
-                offset = 0;
-                ppr_options = 0;
-                if (width == MSG_EXT_WDTR_BUS_8_BIT)
-                        targ->dv_next_narrow_period = AHD_ASYNC_XFER_PERIOD;
-                else
-                        targ->dv_next_wide_period = AHD_ASYNC_XFER_PERIOD;
-        }
-        ahd_set_syncrate(ahd, devinfo, period, offset,
-                         ppr_options, AHD_TRANS_GOAL, FALSE);
-        targ->dv_last_ppr_options = ppr_options;
-        return (0);
-}
-
-static void
-ahd_linux_dv_timeout(struct scsi_cmnd *cmd)
-{
-        struct  ahd_softc *ahd;
-        struct  scb *scb;
-        u_long  flags;
-
-        ahd = *((struct ahd_softc **)cmd->device->host->hostdata);
-        ahd_lock(ahd, &flags);
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV) {
-                printf("%s: Timeout while doing DV command %x.\n",
-                       ahd_name(ahd), cmd->cmnd[0]);
-                ahd_dump_card_state(ahd);
-        }
-#endif
-        
-        /*
-         * Guard against "done race".  No action is
-         * required if we just completed.
-         */
-        if ((scb = (struct scb *)cmd->host_scribble) == NULL) {
-                ahd_unlock(ahd, &flags);
-                return;
+                scsi_adjust_queue_depth(sdev,
+                                        /*NON-TAGGED*/0,
+                                        /*queue depth*/2);
+                break;
         }
-
-        /*
-         * Command has not completed.  Mark this
-         * SCB as having failing status prior to
-         * resetting the bus, so we get the correct
-         * error code.
-         */
-        if ((scb->flags & SCB_SENSE) != 0)
-                ahd_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
-        else
-                ahd_set_transaction_status(scb, CAM_CMD_TIMEOUT);
-        ahd_reset_channel(ahd, cmd->device->channel + 'A', /*initiate*/TRUE);
-
-        /*
-         * Add a minimal bus settle delay for devices that are slow to
-         * respond after bus resets.
-         */
-        ahd_freeze_simq(ahd);
-        init_timer(&ahd->platform_data->reset_timer);
-        ahd->platform_data->reset_timer.data = (u_long)ahd;
-        ahd->platform_data->reset_timer.expires = jiffies + HZ / 2;
-        ahd->platform_data->reset_timer.function =
-            (ahd_linux_callback_t *)ahd_release_simq;
-        add_timer(&ahd->platform_data->reset_timer);
-        if (ahd_linux_next_device_to_run(ahd) != NULL)
-                ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
-        ahd_unlock(ahd, &flags);
-}
-
-static void
-ahd_linux_dv_complete(struct scsi_cmnd *cmd)
-{
-        struct ahd_softc *ahd;
-
-        ahd = *((struct ahd_softc **)cmd->device->host->hostdata);
-
-        /* Delete the DV timer before it goes off! */
-        scsi_delete_timer(cmd);
-
-#ifdef AHD_DEBUG
-        if (ahd_debug & AHD_SHOW_DV)
-                printf("%s:%c:%d: Command completed, status= 0x%x\n",
-                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
-                       cmd->result);
-#endif
-
-        /* Wake up the state machine */
-        up(&ahd->platform_data->dv_cmd_sem);
 }
 
-static void
-ahd_linux_generate_dv_pattern(struct ahd_linux_target *targ)
+int
+ahd_platform_abort_scbs(struct ahd_softc *ahd, int target, char channel,
+                        int lun, u_int tag, role_t role, uint32_t status)
 {
-        uint16_t b;
-        u_int    i;
-        u_int    j;
-
-        if (targ->dv_buffer != NULL)
-                free(targ->dv_buffer, M_DEVBUF);
-        targ->dv_buffer = malloc(targ->dv_echo_size, M_DEVBUF, M_WAITOK);
-        if (targ->dv_buffer1 != NULL)
-                free(targ->dv_buffer1, M_DEVBUF);
-        targ->dv_buffer1 = malloc(targ->dv_echo_size, M_DEVBUF, M_WAITOK);
-
-        i = 0;
-
-        b = 0x0001;
-        for (j = 0 ; i < targ->dv_echo_size; j++) {
-                if (j < 32) {
-                        /*
-                         * 32bytes of sequential numbers.
-                         */
-                        targ->dv_buffer[i++] = j & 0xff;
-                } else if (j < 48) {
-                        /*
-                         * 32bytes of repeating 0x0000, 0xffff.
-                         */
-                        targ->dv_buffer[i++] = (j & 0x02) ? 0xff : 0x00;
-                } else if (j < 64) {
-                        /*
-                         * 32bytes of repeating 0x5555, 0xaaaa.
-                         */
-                        targ->dv_buffer[i++] = (j & 0x02) ? 0xaa : 0x55;
-                } else {
-                        /*
-                         * Remaining buffer is filled with a repeating
-                         * patter of:
-                         *
-                         *       0xffff
-                         *      ~0x0001 << shifted once in each loop.
-                         */
-                        if (j & 0x02) {
-                                if (j & 0x01) {
-                                        targ->dv_buffer[i++] = ~(b >> 8) & 0xff;
-                                        b <<= 1;
-                                        if (b == 0x0000)
-                                                b = 0x0001;
-                                } else {
-                                        targ->dv_buffer[i++] = (~b & 0xff);
-                                }
-                        } else {
-                                targ->dv_buffer[i++] = 0xff;
-                        }
-                }
-        }
+        return 0;
 }
 
 static u_int
@@ -3800,100 +1395,23 @@ ahd_linux_user_tagdepth(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
         return (tags);
 }
 
-static u_int
-ahd_linux_user_dv_setting(struct ahd_softc *ahd)
-{
-        static int warned_user;
-        int dv;
-
-        if (ahd->unit >= NUM_ELEMENTS(aic79xx_dv_settings)) {
-
-                if (warned_user == 0) {
-                        printf(KERN_WARNING
-"aic79xx: WARNING: Insufficient dv settings instances\n"
-"aic79xx: for installed controllers. Using defaults\n"
-"aic79xx: Please update the aic79xx_dv_settings array in"
-"aic79xx: the aic79xx_osm.c source file.\n");
-                        warned_user++;
-                }
-                dv = -1;
-        } else {
-
-                dv = aic79xx_dv_settings[ahd->unit];
-        }
-
-        if (dv < 0) {
-                /*
-                 * Apply the default.
-                 */
-                dv = 1;
-                if (ahd->seep_config != 0)
-                        dv = (ahd->seep_config->bios_control & CFENABLEDV);
-        }
-        return (dv);
-}
-
-static void
-ahd_linux_setup_user_rd_strm_settings(struct ahd_softc *ahd)
-{
-        static  int warned_user;
-        u_int   rd_strm_mask;
-        u_int   target_id;
-
-        /*
-         * If we have specific read streaming info for this controller,
-         * apply it.  Otherwise use the defaults.
-         */
-         if (ahd->unit >= NUM_ELEMENTS(aic79xx_rd_strm_info)) {
-
-                if (warned_user == 0) {
-
-                        printf(KERN_WARNING
-"aic79xx: WARNING: Insufficient rd_strm instances\n"
-"aic79xx: for installed controllers. Using defaults\n"
-"aic79xx: Please update the aic79xx_rd_strm_info array\n"
-"aic79xx: in the aic79xx_osm.c source file.\n");
-                        warned_user++;
-                }
-                rd_strm_mask = AIC79XX_CONFIGED_RD_STRM;
-        } else {
-
-                rd_strm_mask = aic79xx_rd_strm_info[ahd->unit];
-        }
-        for (target_id = 0; target_id < 16; target_id++) {
-                struct ahd_devinfo devinfo;
-                struct ahd_initiator_tinfo *tinfo;
-                struct ahd_tmode_tstate *tstate;
-
-                tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
-                                            target_id, &tstate);
-                ahd_compile_devinfo(&devinfo, ahd->our_id, target_id,
-                                    CAM_LUN_WILDCARD, 'A', ROLE_INITIATOR);
-                tinfo->user.ppr_options &= ~MSG_EXT_PPR_RD_STRM;
-                if ((rd_strm_mask & devinfo.target_mask) != 0)
-                        tinfo->user.ppr_options |= MSG_EXT_PPR_RD_STRM;
-        }
-}
-
 /*
  * Determines the queue depth for a given device.
  */
 static void
-ahd_linux_device_queue_depth(struct ahd_softc *ahd,
-                             struct ahd_linux_device *dev)
+ahd_linux_device_queue_depth(struct scsi_device *sdev)
 {
         struct  ahd_devinfo devinfo;
         u_int   tags;
+        struct ahd_softc *ahd = *((struct ahd_softc **)sdev->host->hostdata);
 
         ahd_compile_devinfo(&devinfo,
                             ahd->our_id,
-                            dev->target->target, dev->lun,
-                            dev->target->channel == 0 ? 'A' : 'B',
+                            sdev->sdev_target->id, sdev->lun,
+                            sdev->sdev_target->channel == 0 ? 'A' : 'B',
                             ROLE_INITIATOR);
         tags = ahd_linux_user_tagdepth(ahd, &devinfo);
-        if (tags != 0
-         && dev->scsi_device != NULL
-         && dev->scsi_device->tagged_supported != 0) {
+        if (tags != 0 && sdev->tagged_supported != 0) {
 
                 ahd_set_tags(ahd, &devinfo, AHD_QUEUE_TAGGED);
                 ahd_print_devinfo(ahd, &devinfo);
@@ -3903,11 +1421,10 @@ ahd_linux_device_queue_depth(struct ahd_softc *ahd,
         }
 }
 
-static void
-ahd_linux_run_device_queue(struct ahd_softc *ahd, struct ahd_linux_device *dev)
+static int
+ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,
+                      struct scsi_cmnd *cmd)
 {
-        struct   ahd_cmd *acmd;
-        struct   scsi_cmnd *cmd;
         struct   scb *scb;
         struct   hardware_scb *hscb;
         struct   ahd_initiator_tinfo *tinfo;
@@ -3915,157 +1432,122 @@ ahd_linux_run_device_queue(struct ahd_softc *ahd, struct ahd_linux_device *dev)
         u_int    col_idx;
         uint16_t mask;
 
-        if ((dev->flags & AHD_DEV_ON_RUN_LIST) != 0)
-                panic("running device on run list");
-
-        while ((acmd = TAILQ_FIRST(&dev->busyq)) != NULL
-            && dev->openings > 0 && dev->qfrozen == 0) {
-
-                /*
-                 * Schedule us to run later.  The only reason we are not
-                 * running is because the whole controller Q is frozen.
-                 */
-                if (ahd->platform_data->qfrozen != 0
-                 && AHD_DV_SIMQ_FROZEN(ahd) == 0) {
-
-                        TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq,
-                                          dev, links);
-                        dev->flags |= AHD_DEV_ON_RUN_LIST;
-                        return;
-                }
-
-                cmd = &acmd_scsi_cmd(acmd);
+        /*
+         * Get an scb to use.
+         */
+        tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
+                                    cmd->device->id, &tstate);
+        if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) == 0
+         || (tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
+                col_idx = AHD_NEVER_COL_IDX;
+        } else {
+                col_idx = AHD_BUILD_COL_IDX(cmd->device->id,
+                                            cmd->device->lun);
+        }
+        if ((scb = ahd_get_scb(ahd, col_idx)) == NULL) {
+                ahd->flags |= AHD_RESOURCE_SHORTAGE;
+                return SCSI_MLQUEUE_HOST_BUSY;
+        }
 
-                /*
-                 * Get an scb to use.
-                 */
-                tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
-                                            cmd->device->id, &tstate);
-                if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) == 0
-                 || (tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
-                        col_idx = AHD_NEVER_COL_IDX;
-                } else {
-                        col_idx = AHD_BUILD_COL_IDX(cmd->device->id,
-                                                    cmd->device->lun);
-                }
-                if ((scb = ahd_get_scb(ahd, col_idx)) == NULL) {
-                        TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq,
-                                         dev, links);
-                        dev->flags |= AHD_DEV_ON_RUN_LIST;
-                        ahd->flags |= AHD_RESOURCE_SHORTAGE;
-                        return;
-                }
-                TAILQ_REMOVE(&dev->busyq, acmd, acmd_links.tqe);
-                scb->io_ctx = cmd;
-                scb->platform_data->dev = dev;
-                hscb = scb->hscb;
-                cmd->host_scribble = (char *)scb;
+        scb->io_ctx = cmd;
+        scb->platform_data->dev = dev;
+        hscb = scb->hscb;
+        cmd->host_scribble = (char *)scb;
 
-                /*
-                 * Fill out basics of the HSCB.
-                 */
-                hscb->control = 0;
-                hscb->scsiid = BUILD_SCSIID(ahd, cmd);
-                hscb->lun = cmd->device->lun;
-                scb->hscb->task_management = 0;
-                mask = SCB_GET_TARGET_MASK(ahd, scb);
+        /*
+         * Fill out basics of the HSCB.
+         */
+        hscb->control = 0;
+        hscb->scsiid = BUILD_SCSIID(ahd, cmd);
+        hscb->lun = cmd->device->lun;
+        scb->hscb->task_management = 0;
+        mask = SCB_GET_TARGET_MASK(ahd, scb);
 
-                if ((ahd->user_discenable & mask) != 0)
-                        hscb->control |= DISCENB;
+        if ((ahd->user_discenable & mask) != 0)
+                hscb->control |= DISCENB;
 
-                if (AHD_DV_CMD(cmd) != 0)
-                        scb->flags |= SCB_SILENT;
+        if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0)
+                scb->flags |= SCB_PACKETIZED;
 
-                if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0)
-                        scb->flags |= SCB_PACKETIZED;
+        if ((tstate->auto_negotiate & mask) != 0) {
+                scb->flags |= SCB_AUTO_NEGOTIATE;
+                scb->hscb->control |= MK_MESSAGE;
+        }
 
-                if ((tstate->auto_negotiate & mask) != 0) {
-                        scb->flags |= SCB_AUTO_NEGOTIATE;
-                        scb->hscb->control |= MK_MESSAGE;
-                }
+        if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {
+                int     msg_bytes;
+                uint8_t tag_msgs[2];
 
-                if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-                        int     msg_bytes;
-                        uint8_t tag_msgs[2];
-
-                        msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
-                        if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
-                                hscb->control |= tag_msgs[0];
-                                if (tag_msgs[0] == MSG_ORDERED_TASK)
-                                        dev->commands_since_idle_or_otag = 0;
-                        } else
-#endif
-                        if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH
-                         && (dev->flags & AHD_DEV_Q_TAGGED) != 0) {
-                                hscb->control |= MSG_ORDERED_TASK;
+                msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);
+                if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {
+                        hscb->control |= tag_msgs[0];
+                        if (tag_msgs[0] == MSG_ORDERED_TASK)
                                 dev->commands_since_idle_or_otag = 0;
-                        } else {
-                                hscb->control |= MSG_SIMPLE_TASK;
-                        }
+                } else
+                if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH
+                 && (dev->flags & AHD_DEV_Q_TAGGED) != 0) {
+                        hscb->control |= MSG_ORDERED_TASK;
+                        dev->commands_since_idle_or_otag = 0;
+                } else {
+                        hscb->control |= MSG_SIMPLE_TASK;
                 }
+        }
 
-                hscb->cdb_len = cmd->cmd_len;
-                memcpy(hscb->shared_data.idata.cdb, cmd->cmnd, hscb->cdb_len);
-
-                scb->sg_count = 0;
-                ahd_set_residual(scb, 0);
-                ahd_set_sense_residual(scb, 0);
-                if (cmd->use_sg != 0) {
-                        void    *sg;
-                        struct   scatterlist *cur_seg;
-                        u_int    nseg;
-                        int      dir;
-
-                        cur_seg = (struct scatterlist *)cmd->request_buffer;
-                        dir = cmd->sc_data_direction;
-                        nseg = pci_map_sg(ahd->dev_softc, cur_seg,
-                                          cmd->use_sg, dir);
-                        scb->platform_data->xfer_len = 0;
-                        for (sg = scb->sg_list; nseg > 0; nseg--, cur_seg++) {
-                                dma_addr_t addr;
-                                bus_size_t len;
-
-                                addr = sg_dma_address(cur_seg);
-                                len = sg_dma_len(cur_seg);
-                                scb->platform_data->xfer_len += len;
-                                sg = ahd_sg_setup(ahd, scb, sg, addr, len,
-                                                  /*last*/nseg == 1);
-                        }
-                } else if (cmd->request_bufflen != 0) {
-                        void *sg;
+        hscb->cdb_len = cmd->cmd_len;
+        memcpy(hscb->shared_data.idata.cdb, cmd->cmnd, hscb->cdb_len);
+
+        scb->platform_data->xfer_len = 0;
+        ahd_set_residual(scb, 0);
+        ahd_set_sense_residual(scb, 0);
+        scb->sg_count = 0;
+        if (cmd->use_sg != 0) {
+                void    *sg;
+                struct   scatterlist *cur_seg;
+                u_int    nseg;
+                int      dir;
+
+                cur_seg = (struct scatterlist *)cmd->request_buffer;
+                dir = cmd->sc_data_direction;
+                nseg = pci_map_sg(ahd->dev_softc, cur_seg,
+                                  cmd->use_sg, dir);
+                scb->platform_data->xfer_len = 0;
+                for (sg = scb->sg_list; nseg > 0; nseg--, cur_seg++) {
                         dma_addr_t addr;
-                        int dir;
-
-                        sg = scb->sg_list;
-                        dir = cmd->sc_data_direction;
-                        addr = pci_map_single(ahd->dev_softc,
-                                              cmd->request_buffer,
-                                              cmd->request_bufflen, dir);
-                        scb->platform_data->xfer_len = cmd->request_bufflen;
-                        scb->platform_data->buf_busaddr = addr;
-                        sg = ahd_sg_setup(ahd, scb, sg, addr,
-                                          cmd->request_bufflen, /*last*/TRUE);
-                }
+                        bus_size_t len;
 
-                LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
-                dev->openings--;
-                dev->active++;
-                dev->commands_issued++;
-
-                /* Update the error counting bucket and dump if needed */
-                if (dev->target->cmds_since_error) {
-                        dev->target->cmds_since_error++;
-                        if (dev->target->cmds_since_error >
-                            AHD_LINUX_ERR_THRESH)
-                                dev->target->cmds_since_error = 0;
+                        addr = sg_dma_address(cur_seg);
+                        len = sg_dma_len(cur_seg);
+                        scb->platform_data->xfer_len += len;
+                        sg = ahd_sg_setup(ahd, scb, sg, addr, len,
+                                          /*last*/nseg == 1);
                 }
+        } else if (cmd->request_bufflen != 0) {
+                void *sg;
+                dma_addr_t addr;
+                int dir;
 
-                if ((dev->flags & AHD_DEV_PERIODIC_OTAG) != 0)
-                        dev->commands_since_idle_or_otag++;
-                scb->flags |= SCB_ACTIVE;
-                ahd_queue_scb(ahd, scb);
+                sg = scb->sg_list;
+                dir = cmd->sc_data_direction;
+                addr = pci_map_single(ahd->dev_softc,
+                                      cmd->request_buffer,
+                                      cmd->request_bufflen, dir);
+                scb->platform_data->xfer_len = cmd->request_bufflen;
+                scb->platform_data->buf_busaddr = addr;
+                sg = ahd_sg_setup(ahd, scb, sg, addr,
+                                  cmd->request_bufflen, /*last*/TRUE);
         }
+
+        LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
+        dev->openings--;
+        dev->active++;
+        dev->commands_issued++;
+
+        if ((dev->flags & AHD_DEV_PERIODIC_OTAG) != 0)
+                dev->commands_since_idle_or_otag++;
+        scb->flags |= SCB_ACTIVE;
+        ahd_queue_scb(ahd, scb);
+
+        return 0;
 }
 
 /*
@@ -4081,9 +1563,6 @@ ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs)
         ahd = (struct ahd_softc *) dev_id;
         ahd_lock(ahd, &flags); 
         ours = ahd_intr(ahd);
-        if (ahd_linux_next_device_to_run(ahd) != NULL)
-                ahd_schedule_runq(ahd);
-        ahd_linux_run_complete_queue(ahd);
         ahd_unlock(ahd, &flags);
         return IRQ_RETVAL(ours);
 }
@@ -4092,111 +1571,6 @@ void
 ahd_platform_flushwork(struct ahd_softc *ahd)
 {
 
-        while (ahd_linux_run_complete_queue(ahd) != NULL)
-                ;
-}
-
-static struct ahd_linux_target*
-ahd_linux_alloc_target(struct ahd_softc *ahd, u_int channel, u_int target)
-{
-        struct ahd_linux_target *targ;
-
-        targ = malloc(sizeof(*targ), M_DEVBUF, M_NOWAIT);
-        if (targ == NULL)
-                return (NULL);
-        memset(targ, 0, sizeof(*targ));
-        targ->channel = channel;
-        targ->target = target;
-        targ->ahd = ahd;
-        targ->flags = AHD_DV_REQUIRED;
-        ahd->platform_data->targets[target] = targ;
-        return (targ);
-}
-
-static void
-ahd_linux_free_target(struct ahd_softc *ahd, struct ahd_linux_target *targ)
-{
-        struct ahd_devinfo devinfo;
-        struct ahd_initiator_tinfo *tinfo;
-        struct ahd_tmode_tstate *tstate;
-        u_int our_id;
-        u_int target_offset;
-        char channel;
-
-        /*
-         * Force a negotiation to async/narrow on any
-         * future command to this device unless a bus
-         * reset occurs between now and that command.
-         */
-        channel = 'A' + targ->channel;
-        our_id = ahd->our_id;
-        target_offset = targ->target;
-        tinfo = ahd_fetch_transinfo(ahd, channel, our_id,
-                                    targ->target, &tstate);
-        ahd_compile_devinfo(&devinfo, our_id, targ->target, CAM_LUN_WILDCARD,
-                            channel, ROLE_INITIATOR);
-        ahd_set_syncrate(ahd, &devinfo, 0, 0, 0,
-                         AHD_TRANS_GOAL, /*paused*/FALSE);
-        ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
-                      AHD_TRANS_GOAL, /*paused*/FALSE);
-        ahd_update_neg_request(ahd, &devinfo, tstate, tinfo, AHD_NEG_ALWAYS);
-        ahd->platform_data->targets[target_offset] = NULL;
-        if (targ->inq_data != NULL)
-                free(targ->inq_data, M_DEVBUF);
-        if (targ->dv_buffer != NULL)
-                free(targ->dv_buffer, M_DEVBUF);
-        if (targ->dv_buffer1 != NULL)
-                free(targ->dv_buffer1, M_DEVBUF);
-        free(targ, M_DEVBUF);
-}
-
-static struct ahd_linux_device*
-ahd_linux_alloc_device(struct ahd_softc *ahd,
-                 struct ahd_linux_target *targ, u_int lun)
-{
-        struct ahd_linux_device *dev;
-
-        dev = malloc(sizeof(*dev), M_DEVBUG, M_NOWAIT);
-        if (dev == NULL)
-                return (NULL);
-        memset(dev, 0, sizeof(*dev));
-        init_timer(&dev->timer);
-        TAILQ_INIT(&dev->busyq);
-        dev->flags = AHD_DEV_UNCONFIGURED;
-        dev->lun = lun;
-        dev->target = targ;
-
-        /*
-         * We start out life using untagged
-         * transactions of which we allow one.
-         */
-        dev->openings = 1;
-
-        /*
-         * Set maxtags to 0.  This will be changed if we
-         * later determine that we are dealing with
-         * a tagged queuing capable device.
-         */
-        dev->maxtags = 0;
-        
-        targ->refcount++;
-        targ->devices[lun] = dev;
-        return (dev);
-}
-
-static void
-ahd_linux_free_device(struct ahd_softc *ahd, struct ahd_linux_device *dev)
-{
-        struct ahd_linux_target *targ;
-
-        del_timer(&dev->timer);
-        targ = dev->target;
-        targ->devices[dev->lun] = NULL;
-        free(dev, M_DEVBUF);
-        targ->refcount--;
-        if (targ->refcount == 0
-         && (targ->flags & AHD_DV_REQUIRED) == 0)
-                ahd_linux_free_target(ahd, targ);
 }
 
 void
@@ -4207,10 +1581,14 @@ ahd_send_async(struct ahd_softc *ahd, char channel,
         case AC_TRANSFER_NEG:
         {
                 char    buf[80];
+                struct  scsi_target *starget;
                 struct  ahd_linux_target *targ;
                 struct  info_str info;
                 struct  ahd_initiator_tinfo *tinfo;
                 struct  ahd_tmode_tstate *tstate;
+                unsigned int target_ppr_options;
+
+                BUG_ON(target == CAM_TARGET_WILDCARD);
 
                 info.buffer = buf;
                 info.length = sizeof(buf);
@@ -4234,58 +1612,47 @@ ahd_send_async(struct ahd_softc *ahd, char channel,
                  * Don't bother reporting results that
                  * are identical to those last reported.
                  */
-                targ = ahd->platform_data->targets[target];
-                if (targ == NULL)
+                starget = ahd->platform_data->starget[target];
+                if (starget == NULL)
                         break;
-                if (tinfo->curr.period == targ->last_tinfo.period
-                 && tinfo->curr.width == targ->last_tinfo.width
-                 && tinfo->curr.offset == targ->last_tinfo.offset
-                 && tinfo->curr.ppr_options == targ->last_tinfo.ppr_options)
+                targ = scsi_transport_target_data(starget);
+
+                target_ppr_options =
+                        (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0)
+                        + (spi_qas(starget) ? MSG_EXT_PPR_QAS_REQ : 0)
+                        + (spi_iu(starget) ?  MSG_EXT_PPR_IU_REQ : 0)
+                        + (spi_rd_strm(starget) ? MSG_EXT_PPR_RD_STRM : 0)
+                        + (spi_pcomp_en(starget) ? MSG_EXT_PPR_PCOMP_EN : 0)
+                        + (spi_rti(starget) ? MSG_EXT_PPR_RTI : 0)
+                        + (spi_wr_flow(starget) ? MSG_EXT_PPR_WR_FLOW : 0)
+                        + (spi_hold_mcs(starget) ? MSG_EXT_PPR_HOLD_MCS : 0);
+
+                if (tinfo->curr.period == spi_period(starget)
+                    && tinfo->curr.width == spi_width(starget)
+                    && tinfo->curr.offset == spi_offset(starget)
+                 && tinfo->curr.ppr_options == target_ppr_options)
                         if (bootverbose == 0)
                                 break;
 
-                targ->last_tinfo.period = tinfo->curr.period;
-                targ->last_tinfo.width = tinfo->curr.width;
-                targ->last_tinfo.offset = tinfo->curr.offset;
-                targ->last_tinfo.ppr_options = tinfo->curr.ppr_options;
-
-                printf("(%s:%c:", ahd_name(ahd), channel);
-                if (target == CAM_TARGET_WILDCARD)
-                        printf("*): ");
-                else
-                        printf("%d): ", target);
-                ahd_format_transinfo(&info, &tinfo->curr);
-                if (info.pos < info.length)
-                        *info.buffer = '\0';
-                else
-                        buf[info.length - 1] = '\0';
-                printf("%s", buf);
+                spi_period(starget) = tinfo->curr.period;
+                spi_width(starget) = tinfo->curr.width;
+                spi_offset(starget) = tinfo->curr.offset;
+                spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ ? 1 : 0;
+                spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ ? 1 : 0;
+                spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ ? 1 : 0;
+                spi_rd_strm(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_RD_STRM ? 1 : 0;
+                spi_pcomp_en(starget) =  tinfo->curr.ppr_options & MSG_EXT_PPR_PCOMP_EN ? 1 : 0;
+                spi_rti(starget) =  tinfo->curr.ppr_options &  MSG_EXT_PPR_RTI ? 1 : 0;
+                spi_wr_flow(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_WR_FLOW ? 1 : 0;
+                spi_hold_mcs(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_HOLD_MCS ? 1 : 0;
+                spi_display_xfer_agreement(starget);
                 break;
         }
         case AC_SENT_BDR:
         {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                 WARN_ON(lun != CAM_LUN_WILDCARD);
                 scsi_report_device_reset(ahd->platform_data->host,
                                          channel - 'A', target);
-#else
-                Scsi_Device *scsi_dev;
-
-                /*
-                 * Find the SCSI device associated with this
-                 * request and indicate that a UA is expected.
-                 */
-                for (scsi_dev = ahd->platform_data->host->host_queue;
-                     scsi_dev != NULL; scsi_dev = scsi_dev->next) {
-                        if (channel - 'A' == scsi_dev->channel
-                         && target == scsi_dev->id
-                         && (lun == CAM_LUN_WILDCARD
-                          || lun == scsi_dev->lun)) {
-                                scsi_dev->was_reset = 1;
-                                scsi_dev->expecting_cc_ua = 1;
-                        }
-                }
-#endif
                 break;
         }
         case AC_BUS_RESET:
@@ -4305,7 +1672,7 @@ ahd_send_async(struct ahd_softc *ahd, char channel,
 void
 ahd_done(struct ahd_softc *ahd, struct scb *scb)
 {
-        Scsi_Cmnd *cmd;
+        struct scsi_cmnd *cmd;
         struct    ahd_linux_device *dev;
 
         if ((scb->flags & SCB_ACTIVE) == 0) {
@@ -4373,19 +1740,8 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb)
                         ahd_set_transaction_status(scb, CAM_REQ_CMP);
                 }
         } else if (ahd_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
-                ahd_linux_handle_scsi_status(ahd, dev, scb);
-        } else if (ahd_get_transaction_status(scb) == CAM_SEL_TIMEOUT) {
-                dev->flags |= AHD_DEV_UNCONFIGURED;
-                if (AHD_DV_CMD(cmd) == FALSE)
-                        dev->target->flags &= ~AHD_DV_REQUIRED;
+                ahd_linux_handle_scsi_status(ahd, cmd->device, scb);
         }
-        /*
-         * Start DV for devices that require it assuming the first command
-         * sent does not result in a selection timeout.
-         */
-        if (ahd_get_transaction_status(scb) != CAM_SEL_TIMEOUT
-         && (dev->target->flags & AHD_DV_REQUIRED) != 0)
-                ahd_linux_start_dv(ahd);
 
         if (dev->openings == 1
          && ahd_get_transaction_status(scb) == CAM_REQ_CMP
@@ -4406,47 +1762,32 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb)
         if (dev->active == 0)
                 dev->commands_since_idle_or_otag = 0;
 
-        if (TAILQ_EMPTY(&dev->busyq)) {
-                if ((dev->flags & AHD_DEV_UNCONFIGURED) != 0
-                 && dev->active == 0
-                 && (dev->flags & AHD_DEV_TIMER_ACTIVE) == 0)
-                        ahd_linux_free_device(ahd, dev);
-        } else if ((dev->flags & AHD_DEV_ON_RUN_LIST) == 0) {
-                TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq, dev, links);
-                dev->flags |= AHD_DEV_ON_RUN_LIST;
-        }
-
         if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
                 printf("Recovery SCB completes\n");
                 if (ahd_get_transaction_status(scb) == CAM_BDR_SENT
                  || ahd_get_transaction_status(scb) == CAM_REQ_ABORTED)
                         ahd_set_transaction_status(scb, CAM_CMD_TIMEOUT);
-                if ((scb->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
-                        scb->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
+                if ((ahd->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
+                        ahd->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
                         up(&ahd->platform_data->eh_sem);
                 }
         }
 
         ahd_free_scb(ahd, scb);
         ahd_linux_queue_cmd_complete(ahd, cmd);
-
-        if ((ahd->platform_data->flags & AHD_DV_WAIT_SIMQ_EMPTY) != 0
-         && LIST_FIRST(&ahd->pending_scbs) == NULL) {
-                ahd->platform_data->flags &= ~AHD_DV_WAIT_SIMQ_EMPTY;
-                up(&ahd->platform_data->dv_sem);
-        }
 }
 
 static void
 ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
-                             struct ahd_linux_device *dev, struct scb *scb)
+                             struct scsi_device *sdev, struct scb *scb)
 {
         struct  ahd_devinfo devinfo;
+        struct ahd_linux_device *dev = scsi_transport_device_data(sdev);
 
         ahd_compile_devinfo(&devinfo,
                             ahd->our_id,
-                            dev->target->target, dev->lun,
-                            dev->target->channel == 0 ? 'A' : 'B',
+                            sdev->sdev_target->id, sdev->lun,
+                            sdev->sdev_target->channel == 0 ? 'A' : 'B',
                             ROLE_INITIATOR);
         
         /*
@@ -4465,7 +1806,7 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
         case SCSI_STATUS_CHECK_COND:
         case SCSI_STATUS_CMD_TERMINATED:
         {
-                Scsi_Cmnd *cmd;
+                struct scsi_cmnd *cmd;
 
                 /*
                  * Copy sense information to the OS's cmd
@@ -4518,7 +1859,6 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
                 break;
         }
         case SCSI_STATUS_QUEUE_FULL:
-        {
                 /*
                  * By the time the core driver has returned this
                  * command, all other commands that were queued
@@ -4579,98 +1919,23 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
                              (dev->flags & AHD_DEV_Q_BASIC)
                            ? AHD_QUEUE_BASIC : AHD_QUEUE_TAGGED);
                 ahd_set_scsi_status(scb, SCSI_STATUS_BUSY);
-                /* FALLTHROUGH */
-        }
-        case SCSI_STATUS_BUSY:
-                /*
-                 * Set a short timer to defer sending commands for
-                 * a bit since Linux will not delay in this case.
-                 */
-                if ((dev->flags & AHD_DEV_TIMER_ACTIVE) != 0) {
-                        printf("%s:%c:%d: Device Timer still active during "
-                               "busy processing\n", ahd_name(ahd),
-                                dev->target->channel, dev->target->target);
-                        break;
-                }
-                dev->flags |= AHD_DEV_TIMER_ACTIVE;
-                dev->qfrozen++;
-                init_timer(&dev->timer);
-                dev->timer.data = (u_long)dev;
-                dev->timer.expires = jiffies + (HZ/2);
-                dev->timer.function = ahd_linux_dev_timed_unfreeze;
-                add_timer(&dev->timer);
-                break;
         }
 }
 
 static void
-ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, Scsi_Cmnd *cmd)
+ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, struct scsi_cmnd *cmd)
 {
         /*
-         * Typically, the complete queue has very few entries
-         * queued to it before the queue is emptied by
-         * ahd_linux_run_complete_queue, so sorting the entries
-         * by generation number should be inexpensive.
-         * We perform the sort so that commands that complete
-         * with an error are retuned in the order origionally
-         * queued to the controller so that any subsequent retries
-         * are performed in order.  The underlying ahd routines do
-         * not guarantee the order that aborted commands will be
-         * returned to us.
-         */
-        struct ahd_completeq *completeq;
-        struct ahd_cmd *list_cmd;
-        struct ahd_cmd *acmd;
-
-        /*
          * Map CAM error codes into Linux Error codes.  We
          * avoid the conversion so that the DV code has the
          * full error information available when making
          * state change decisions.
          */
-        if (AHD_DV_CMD(cmd) == FALSE) {
+        {
                 uint32_t status;
                 u_int new_status;
 
                 status = ahd_cmd_get_transaction_status(cmd);
-                if (status != CAM_REQ_CMP) {
-                        struct ahd_linux_device *dev;
-                        struct ahd_devinfo devinfo;
-                        cam_status cam_status;
-                        uint32_t action;
-                        u_int scsi_status;
-
-                        dev = ahd_linux_get_device(ahd, cmd->device->channel,
-                                                   cmd->device->id,
-                                                   cmd->device->lun,
-                                                   /*alloc*/FALSE);
-
-                        if (dev == NULL)
-                                goto no_fallback;
-
-                        ahd_compile_devinfo(&devinfo,
-                                            ahd->our_id,
-                                            dev->target->target, dev->lun,
-                                            dev->target->channel == 0 ? 'A':'B',
-                                            ROLE_INITIATOR);
-
-                        scsi_status = ahd_cmd_get_scsi_status(cmd);
-                        cam_status = ahd_cmd_get_transaction_status(cmd);
-                        action = aic_error_action(cmd, dev->target->inq_data,
-                                                  cam_status, scsi_status);
-                        if ((action & SSQ_FALLBACK) != 0) {
-
-                                /* Update stats */
-                                dev->target->errors_detected++;
-                                if (dev->target->cmds_since_error == 0)
-                                        dev->target->cmds_since_error++;
-                                else {
-                                        dev->target->cmds_since_error = 0;
-                                        ahd_linux_fallback(ahd, &devinfo);
-                                }
-                        }
-                }
-no_fallback:
                 switch (status) {
                 case CAM_REQ_INPROG:
                 case CAM_REQ_CMP:
@@ -4715,26 +1980,7 @@ no_fallback:
                         new_status = DID_ERROR;
                         break;
                 case CAM_REQUEUE_REQ:
-                        /*
-                         * If we want the request requeued, make sure there
-                         * are sufficent retries.  In the old scsi error code,
-                         * we used to be able to specify a result code that
-                         * bypassed the retry count.  Now we must use this
-                         * hack.  We also "fake" a check condition with
-                         * a sense code of ABORTED COMMAND.  This seems to
-                         * evoke a retry even if this command is being sent
-                         * via the eh thread.  Ick!  Ick!  Ick!
-                         */
-                        if (cmd->retries > 0)
-                                cmd->retries--;
-                        new_status = DID_OK;
-                        ahd_cmd_set_scsi_status(cmd, SCSI_STATUS_CHECK_COND);
-                        cmd->result |= (DRIVER_SENSE << 24);
-                        memset(cmd->sense_buffer, 0,
-                               sizeof(cmd->sense_buffer));
-                        cmd->sense_buffer[0] = SSD_ERRCODE_VALID
-                                             | SSD_CURRENT_ERROR;
-                        cmd->sense_buffer[2] = SSD_KEY_ABORTED_COMMAND;
+                        new_status = DID_REQUEUE;
                         break;
                 default:
                         /* We should never get here */
@@ -4745,116 +1991,23 @@ no_fallback:
                 ahd_cmd_set_transaction_status(cmd, new_status);
         }
 
-        completeq = &ahd->platform_data->completeq;
-        list_cmd = TAILQ_FIRST(completeq);
-        acmd = (struct ahd_cmd *)cmd;
-        while (list_cmd != NULL
-            && acmd_scsi_cmd(list_cmd).serial_number
-             < acmd_scsi_cmd(acmd).serial_number)
-                list_cmd = TAILQ_NEXT(list_cmd, acmd_links.tqe);
-        if (list_cmd != NULL)
-                TAILQ_INSERT_BEFORE(list_cmd, acmd, acmd_links.tqe);
-        else
-                TAILQ_INSERT_TAIL(completeq, acmd, acmd_links.tqe);
+        cmd->scsi_done(cmd);
 }
 
 static void
-ahd_linux_filter_inquiry(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
+ahd_linux_sem_timeout(u_long arg)
 {
-        struct  scsi_inquiry_data *sid;
-        struct  ahd_initiator_tinfo *tinfo;
-        struct  ahd_transinfo *user;
-        struct  ahd_transinfo *goal;
-        struct  ahd_transinfo *curr;
-        struct  ahd_tmode_tstate *tstate;
-        struct  ahd_linux_device *dev;
-        u_int   width;
-        u_int   period;
-        u_int   offset;
-        u_int   ppr_options;
-        u_int   trans_version;
-        u_int   prot_version;
-
-        /*
-         * Determine if this lun actually exists.  If so,
-         * hold on to its corresponding device structure.
-         * If not, make sure we release the device and
-         * don't bother processing the rest of this inquiry
-         * command.
-         */
-        dev = ahd_linux_get_device(ahd, devinfo->channel - 'A',
-                                   devinfo->target, devinfo->lun,
-                                   /*alloc*/TRUE);
-
-        sid = (struct scsi_inquiry_data *)dev->target->inq_data;
-        if (SID_QUAL(sid) == SID_QUAL_LU_CONNECTED) {
-
-                dev->flags &= ~AHD_DEV_UNCONFIGURED;
-        } else {
-                dev->flags |= AHD_DEV_UNCONFIGURED;
-                return;
-        }
+        struct  ahd_softc *ahd;
+        u_long  s;
 
-        /*
-         * Update our notion of this device's transfer
-         * negotiation capabilities.
-         */
-        tinfo = ahd_fetch_transinfo(ahd, devinfo->channel,
-                                    devinfo->our_scsiid,
-                                    devinfo->target, &tstate);
-        user = &tinfo->user;
-        goal = &tinfo->goal;
-        curr = &tinfo->curr;
-        width = user->width;
-        period = user->period;
-        offset = user->offset;
-        ppr_options = user->ppr_options;
-        trans_version = user->transport_version;
-        prot_version = MIN(user->protocol_version, SID_ANSI_REV(sid));
+        ahd = (struct ahd_softc *)arg;
 
-        /*
-         * Only attempt SPI3/4 once we've verified that
-         * the device claims to support SPI3/4 features.
-         */
-        if (prot_version < SCSI_REV_2)
-                trans_version = SID_ANSI_REV(sid);
-        else
-                trans_version = SCSI_REV_2;
-
-        if ((sid->flags & SID_WBus16) == 0)
-                width = MSG_EXT_WDTR_BUS_8_BIT;
-        if ((sid->flags & SID_Sync) == 0) {
-                period = 0;
-                offset = 0;
-                ppr_options = 0;
-        }
-        if ((sid->spi3data & SID_SPI_QAS) == 0)
-                ppr_options &= ~MSG_EXT_PPR_QAS_REQ;
-        if ((sid->spi3data & SID_SPI_CLOCK_DT) == 0)
-                ppr_options &= MSG_EXT_PPR_QAS_REQ;
-        if ((sid->spi3data & SID_SPI_IUS) == 0)
-                ppr_options &= (MSG_EXT_PPR_DT_REQ
-                              | MSG_EXT_PPR_QAS_REQ);
-
-        if (prot_version > SCSI_REV_2
-         && ppr_options != 0)
-                trans_version = user->transport_version;
-
-        ahd_validate_width(ahd, /*tinfo limit*/NULL, &width, ROLE_UNKNOWN);
-        ahd_find_syncrate(ahd, &period, &ppr_options, AHD_SYNCRATE_MAX);
-        ahd_validate_offset(ahd, /*tinfo limit*/NULL, period,
-                            &offset, width, ROLE_UNKNOWN);
-        if (offset == 0 || period == 0) {
-                period = 0;
-                offset = 0;
-                ppr_options = 0;
+        ahd_lock(ahd, &s);
+        if ((ahd->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
+                ahd->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
+                up(&ahd->platform_data->eh_sem);
         }
-        /* Apply our filtered user settings. */
-        curr->transport_version = trans_version;
-        curr->protocol_version = prot_version;
-        ahd_set_width(ahd, devinfo, width, AHD_TRANS_GOAL, /*paused*/FALSE);
-        ahd_set_syncrate(ahd, devinfo, period, offset, ppr_options,
-                         AHD_TRANS_GOAL, /*paused*/FALSE);
+        ahd_unlock(ahd, &s);
 }
 
 void
@@ -4882,12 +2035,6 @@ ahd_release_simq(struct ahd_softc *ahd)
         if (ahd->platform_data->qfrozen == 0) {
                 unblock_reqs = 1;
         }
-        if (AHD_DV_SIMQ_FROZEN(ahd)
-         && ((ahd->platform_data->flags & AHD_DV_WAIT_SIMQ_RELEASE) != 0)) {
-                ahd->platform_data->flags &= ~AHD_DV_WAIT_SIMQ_RELEASE;
-                up(&ahd->platform_data->dv_sem);
-        }
-        ahd_schedule_runq(ahd);
         ahd_unlock(ahd, &s);
         /*
          * There is still a race here.  The mid-layer
@@ -4899,118 +2046,743 @@ ahd_release_simq(struct ahd_softc *ahd)
                 scsi_unblock_requests(ahd->platform_data->host);
 }
 
-static void
-ahd_linux_sem_timeout(u_long arg)
+static int
+ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
 {
-        struct  scb *scb;
-        struct  ahd_softc *ahd;
-        u_long  s;
+        struct ahd_softc *ahd;
+        struct ahd_linux_device *dev;
+        struct scb *pending_scb;
+        u_int  saved_scbptr;
+        u_int  active_scbptr;
+        u_int  last_phase;
+        u_int  saved_scsiid;
+        u_int  cdb_byte;
+        int    retval;
+        int    was_paused;
+        int    paused;
+        int    wait;
+        int    disconnected;
+        ahd_mode_state saved_modes;
 
-        scb = (struct scb *)arg;
-        ahd = scb->ahd_softc;
-        ahd_lock(ahd, &s);
-        if ((scb->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
-                scb->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
-                up(&ahd->platform_data->eh_sem);
+        pending_scb = NULL;
+        paused = FALSE;
+        wait = FALSE;
+        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
+
+        printf("%s:%d:%d:%d: Attempting to queue a%s message:",
+               ahd_name(ahd), cmd->device->channel,
+               cmd->device->id, cmd->device->lun,
+               flag == SCB_ABORT ? "n ABORT" : " TARGET RESET");
+
+        printf("CDB:");
+        for (cdb_byte = 0; cdb_byte < cmd->cmd_len; cdb_byte++)
+                printf(" 0x%x", cmd->cmnd[cdb_byte]);
+        printf("\n");
+
+        spin_lock_irq(&ahd->platform_data->spin_lock);
+
+        /*
+         * First determine if we currently own this command.
+         * Start by searching the device queue.  If not found
+         * there, check the pending_scb list.  If not found
+         * at all, and the system wanted us to just abort the
+         * command, return success.
+         */
+        dev = scsi_transport_device_data(cmd->device);
+
+        if (dev == NULL) {
+                /*
+                 * No target device for this command exists,
+                 * so we must not still own the command.
+                 */
+                printf("%s:%d:%d:%d: Is not an active device\n",
+                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
+                       cmd->device->lun);
+                retval = SUCCESS;
+                goto no_cmd;
         }
-        ahd_unlock(ahd, &s);
+
+        /*
+         * See if we can find a matching cmd in the pending list.
+         */
+        LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
+                if (pending_scb->io_ctx == cmd)
+                        break;
+        }
+
+        if (pending_scb == NULL && flag == SCB_DEVICE_RESET) {
+
+                /* Any SCB for this device will do for a target reset */
+                LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
+                        if (ahd_match_scb(ahd, pending_scb, cmd->device->id,
+                                          cmd->device->channel + 'A',
+                                          CAM_LUN_WILDCARD,
+                                          SCB_LIST_NULL, ROLE_INITIATOR) == 0)
+                                break;
+                }
+        }
+
+        if (pending_scb == NULL) {
+                printf("%s:%d:%d:%d: Command not found\n",
+                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
+                       cmd->device->lun);
+                goto no_cmd;
+        }
+
+        if ((pending_scb->flags & SCB_RECOVERY_SCB) != 0) {
+                /*
+                 * We can't queue two recovery actions using the same SCB
+                 */
+                retval = FAILED;
+                goto  done;
+        }
+
+        /*
+         * Ensure that the card doesn't do anything
+         * behind our back.  Also make sure that we
+         * didn't "just" miss an interrupt that would
+         * affect this cmd.
+         */
+        was_paused = ahd_is_paused(ahd);
+        ahd_pause_and_flushwork(ahd);
+        paused = TRUE;
+
+        if ((pending_scb->flags & SCB_ACTIVE) == 0) {
+                printf("%s:%d:%d:%d: Command already completed\n",
+                       ahd_name(ahd), cmd->device->channel, cmd->device->id,
+                       cmd->device->lun);
+                goto no_cmd;
+        }
+
+        printf("%s: At time of recovery, card was %spaused\n",
+               ahd_name(ahd), was_paused ? "" : "not ");
+        ahd_dump_card_state(ahd);
+
+        disconnected = TRUE;
+        if (flag == SCB_ABORT) {
+                if (ahd_search_qinfifo(ahd, cmd->device->id, 
+                                       cmd->device->channel + 'A',
+                                       cmd->device->lun, 
+                                       pending_scb->hscb->tag,
+                                       ROLE_INITIATOR, CAM_REQ_ABORTED,
+                                       SEARCH_COMPLETE) > 0) {
+                        printf("%s:%d:%d:%d: Cmd aborted from QINFIFO\n",
+                               ahd_name(ahd), cmd->device->channel, 
+                               cmd->device->id, cmd->device->lun);
+                        retval = SUCCESS;
+                        goto done;
+                }
+        } else if (ahd_search_qinfifo(ahd, cmd->device->id,
+                                      cmd->device->channel + 'A',
+                                      cmd->device->lun, pending_scb->hscb->tag,
+                                      ROLE_INITIATOR, /*status*/0,
+                                      SEARCH_COUNT) > 0) {
+                disconnected = FALSE;
+        }
+
+        saved_modes = ahd_save_modes(ahd);
+        ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+        last_phase = ahd_inb(ahd, LASTPHASE);
+        saved_scbptr = ahd_get_scbptr(ahd);
+        active_scbptr = saved_scbptr;
+        if (disconnected && (ahd_inb(ahd, SEQ_FLAGS) & NOT_IDENTIFIED) == 0) {
+                struct scb *bus_scb;
+
+                bus_scb = ahd_lookup_scb(ahd, active_scbptr);
+                if (bus_scb == pending_scb)
+                        disconnected = FALSE;
+                else if (flag != SCB_ABORT
+                         && ahd_inb(ahd, SAVED_SCSIID) == pending_scb->hscb->scsiid
+                         && ahd_inb(ahd, SAVED_LUN) == SCB_GET_LUN(pending_scb))
+                        disconnected = FALSE;
+        }
+
+        /*
+         * At this point, pending_scb is the scb associated with the
+         * passed in command.  That command is currently active on the
+         * bus or is in the disconnected state.
+         */
+        saved_scsiid = ahd_inb(ahd, SAVED_SCSIID);
+        if (last_phase != P_BUSFREE
+         && (SCB_GET_TAG(pending_scb) == active_scbptr
+             || (flag == SCB_DEVICE_RESET
+                 && SCSIID_TARGET(ahd, saved_scsiid) == cmd->device->id))) {
+
+                /*
+                 * We're active on the bus, so assert ATN
+                 * and hope that the target responds.
+                 */
+                pending_scb = ahd_lookup_scb(ahd, active_scbptr);
+                pending_scb->flags |= SCB_RECOVERY_SCB|flag;
+                ahd_outb(ahd, MSG_OUT, HOST_MSG);
+                ahd_outb(ahd, SCSISIGO, last_phase|ATNO);
+                printf("%s:%d:%d:%d: Device is active, asserting ATN\n",
+                       ahd_name(ahd), cmd->device->channel,
+                       cmd->device->id, cmd->device->lun);
+                wait = TRUE;
+        } else if (disconnected) {
+
+                /*
+                 * Actually re-queue this SCB in an attempt
+                 * to select the device before it reconnects.
+                 */
+                pending_scb->flags |= SCB_RECOVERY_SCB|SCB_ABORT;
+                ahd_set_scbptr(ahd, SCB_GET_TAG(pending_scb));
+                pending_scb->hscb->cdb_len = 0;
+                pending_scb->hscb->task_attribute = 0;
+                pending_scb->hscb->task_management = SIU_TASKMGMT_ABORT_TASK;
+
+                if ((pending_scb->flags & SCB_PACKETIZED) != 0) {
+                        /*
+                         * Mark the SCB has having an outstanding
+                         * task management function.  Should the command
+                         * complete normally before the task management
+                         * function can be sent, the host will be notified
+                         * to abort our requeued SCB.
+                         */
+                        ahd_outb(ahd, SCB_TASK_MANAGEMENT,
+                                 pending_scb->hscb->task_management);
+                } else {
+                        /*
+                         * If non-packetized, set the MK_MESSAGE control
+                         * bit indicating that we desire to send a message.
+                         * We also set the disconnected flag since there is
+                         * no guarantee that our SCB control byte matches
+                         * the version on the card.  We don't want the
+                         * sequencer to abort the command thinking an
+                         * unsolicited reselection occurred.
+                         */
+                        pending_scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
+
+                        /*
+                         * The sequencer will never re-reference the
+                         * in-core SCB.  To make sure we are notified
+                         * during reslection, set the MK_MESSAGE flag in
+                         * the card's copy of the SCB.
+                         */
+                        ahd_outb(ahd, SCB_CONTROL,
+                                 ahd_inb(ahd, SCB_CONTROL)|MK_MESSAGE);
+                }
+
+                /*
+                 * Clear out any entries in the QINFIFO first
+                 * so we are the next SCB for this target
+                 * to run.
+                 */
+                ahd_search_qinfifo(ahd, cmd->device->id,
+                                   cmd->device->channel + 'A', cmd->device->lun,
+                                   SCB_LIST_NULL, ROLE_INITIATOR,
+                                   CAM_REQUEUE_REQ, SEARCH_COMPLETE);
+                ahd_qinfifo_requeue_tail(ahd, pending_scb);
+                ahd_set_scbptr(ahd, saved_scbptr);
+                ahd_print_path(ahd, pending_scb);
+                printf("Device is disconnected, re-queuing SCB\n");
+                wait = TRUE;
+        } else {
+                printf("%s:%d:%d:%d: Unable to deliver message\n",
+                       ahd_name(ahd), cmd->device->channel,
+                       cmd->device->id, cmd->device->lun);
+                retval = FAILED;
+                goto done;
+        }
+
+no_cmd:
+        /*
+         * Our assumption is that if we don't have the command, no
+         * recovery action was required, so we return success.  Again,
+         * the semantics of the mid-layer recovery engine are not
+         * well defined, so this may change in time.
+         */
+        retval = SUCCESS;
+done:
+        if (paused)
+                ahd_unpause(ahd);
+        if (wait) {
+                struct timer_list timer;
+                int ret;
+
+                ahd->platform_data->flags |= AHD_SCB_UP_EH_SEM;
+                spin_unlock_irq(&ahd->platform_data->spin_lock);
+                init_timer(&timer);
+                timer.data = (u_long)ahd;
+                timer.expires = jiffies + (5 * HZ);
+                timer.function = ahd_linux_sem_timeout;
+                add_timer(&timer);
+                printf("Recovery code sleeping\n");
+                down(&ahd->platform_data->eh_sem);
+                printf("Recovery code awake\n");
+                ret = del_timer_sync(&timer);
+                if (ret == 0) {
+                        printf("Timer Expired\n");
+                        retval = FAILED;
+                }
+                spin_lock_irq(&ahd->platform_data->spin_lock);
+        }
+        spin_unlock_irq(&ahd->platform_data->spin_lock);
+        return (retval);
 }
 
-static void
-ahd_linux_dev_timed_unfreeze(u_long arg)
+static void ahd_linux_set_width(struct scsi_target *starget, int width)
 {
-        struct ahd_linux_device *dev;
-        struct ahd_softc *ahd;
-        u_long s;
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_devinfo devinfo;
+        unsigned long flags;
 
-        dev = (struct ahd_linux_device *)arg;
-        ahd = dev->target->ahd;
-        ahd_lock(ahd, &s);
-        dev->flags &= ~AHD_DEV_TIMER_ACTIVE;
-        if (dev->qfrozen > 0)
-                dev->qfrozen--;
-        if (dev->qfrozen == 0
-         && (dev->flags & AHD_DEV_ON_RUN_LIST) == 0)
-                ahd_linux_run_device_queue(ahd, dev);
-        if ((dev->flags & AHD_DEV_UNCONFIGURED) != 0
-         && dev->active == 0)
-                ahd_linux_free_device(ahd, dev);
-        ahd_unlock(ahd, &s);
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_lock(ahd, &flags);
+        ahd_set_width(ahd, &devinfo, width, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
 }
 
-void
-ahd_platform_dump_card_state(struct ahd_softc *ahd)
+static void ahd_linux_set_period(struct scsi_target *starget, int period)
 {
-        struct ahd_linux_device *dev;
-        int target;
-        int maxtarget;
-        int lun;
-        int i;
-
-        maxtarget = (ahd->features & AHD_WIDE) ? 15 : 7;
-        for (target = 0; target <=maxtarget; target++) {
-
-                for (lun = 0; lun < AHD_NUM_LUNS; lun++) {
-                        struct ahd_cmd *acmd;
-
-                        dev = ahd_linux_get_device(ahd, 0, target,
-                                                   lun, /*alloc*/FALSE);
-                        if (dev == NULL)
-                                continue;
-
-                        printf("DevQ(%d:%d:%d): ", 0, target, lun);
-                        i = 0;
-                        TAILQ_FOREACH(acmd, &dev->busyq, acmd_links.tqe) {
-                                if (i++ > AHD_SCB_MAX)
-                                        break;
-                        }
-                        printf("%d waiting\n", i);
-                }
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options;
+        unsigned int dt;
+        unsigned long flags;
+        unsigned long offset = tinfo->goal.offset;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: set period to %d\n", ahd_name(ahd), period);
+#endif
+        if (offset == 0)
+                offset = MAX_OFFSET;
+
+        if (period < 8)
+                period = 8;
+        if (period < 10) {
+                ppr_options |= MSG_EXT_PPR_DT_REQ;
+                if (period == 8)
+                        ppr_options |= MSG_EXT_PPR_IU_REQ;
         }
+
+        dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+
+        /* all PPR requests apart from QAS require wide transfers */
+        if (ppr_options & ~MSG_EXT_PPR_QAS_REQ) {
+                if (spi_width(starget) == 0)
+                        ppr_options &= MSG_EXT_PPR_QAS_REQ;
+        }
+
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
 }
 
-static int __init
-ahd_linux_init(void)
+static void ahd_linux_set_offset(struct scsi_target *starget, int offset)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-        return ahd_linux_detect(&aic79xx_driver_template);
-#else
-        scsi_register_module(MODULE_SCSI_HA, &aic79xx_driver_template);
-        if (aic79xx_driver_template.present == 0) {
-                scsi_unregister_module(MODULE_SCSI_HA,
-                                       &aic79xx_driver_template);
-                return (-ENODEV);
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = 0;
+        unsigned int period = 0;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: set offset to %d\n", ahd_name(ahd), offset);
+#endif
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        if (offset != 0) {
+                period = tinfo->goal.period;
+                ppr_options = tinfo->goal.ppr_options;
+                ahd_find_syncrate(ahd, &period, &ppr_options, 
+                                  dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
         }
 
-        return (0);
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, offset, ppr_options,
+                         AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_dt(struct scsi_target *starget, int dt)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_DT_REQ;
+        unsigned int period = tinfo->goal.period;
+        unsigned int width = tinfo->goal.width;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s DT\n", ahd_name(ahd), 
+                       dt ? "enabling" : "disabling");
+#endif
+        if (dt) {
+                ppr_options |= MSG_EXT_PPR_DT_REQ;
+                if (!width)
+                        ahd_linux_set_width(starget, 1);
+        } else {
+                if (period <= 9)
+                        period = 10; /* If resetting DT, period must be >= 25ns */
+                /* IU is invalid without DT set */
+                ppr_options &= ~MSG_EXT_PPR_IU_REQ;
+        }
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_qas(struct scsi_target *starget, int qas)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_QAS_REQ;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s QAS\n", ahd_name(ahd), 
+                       qas ? "enabling" : "disabling");
+#endif
+
+        if (qas) {
+                ppr_options |= MSG_EXT_PPR_QAS_REQ; 
+        }
+
+        dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_iu(struct scsi_target *starget, int iu)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_IU_REQ;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s IU\n", ahd_name(ahd),
+                       iu ? "enabling" : "disabling");
 #endif
+
+        if (iu) {
+                ppr_options |= MSG_EXT_PPR_IU_REQ;
+                ppr_options |= MSG_EXT_PPR_DT_REQ; /* IU requires DT */
+        }
+
+        dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
 }
 
-static void __exit
-ahd_linux_exit(void)
+static void ahd_linux_set_rd_strm(struct scsi_target *starget, int rdstrm)
 {
-        struct ahd_softc *ahd;
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_RD_STRM;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
 
-        /*
-         * Shutdown DV threads before going into the SCSI mid-layer.
-         * This avoids situations where the mid-layer locks the entire
-         * kernel so that waiting for our DV threads to exit leads
-         * to deadlock.
-         */
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s Read Streaming\n", ahd_name(ahd), 
+                       rdstrm  ? "enabling" : "disabling");
+#endif
+
+        if (rdstrm)
+                ppr_options |= MSG_EXT_PPR_RD_STRM;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
 
-                ahd_linux_kill_dv_thread(ahd);
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_wr_flow(struct scsi_target *starget, int wrflow)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_WR_FLOW;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s Write Flow Control\n", ahd_name(ahd),
+                       wrflow ? "enabling" : "disabling");
+#endif
+
+        if (wrflow)
+                ppr_options |= MSG_EXT_PPR_WR_FLOW;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_rti(struct scsi_target *starget, int rti)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_RTI;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+        if ((ahd->features & AHD_RTI) == 0) {
+#ifdef AHD_DEBUG
+                if ((ahd_debug & AHD_SHOW_DV) != 0)
+                        printf("%s: RTI not available\n", ahd_name(ahd));
+#endif
+                return;
         }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s RTI\n", ahd_name(ahd),
+                       rti ? "enabling" : "disabling");
+#endif
+
+        if (rti)
+                ppr_options |= MSG_EXT_PPR_RTI;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_pcomp_en(struct scsi_target *starget, int pcomp)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_PCOMP_EN;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+#ifdef AHD_DEBUG
+        if ((ahd_debug & AHD_SHOW_DV) != 0)
+                printf("%s: %s Precompensation\n", ahd_name(ahd), 
+                       pcomp ? "Enable" : "Disable");
+#endif
+
+        if (pcomp)
+                ppr_options |= MSG_EXT_PPR_PCOMP_EN;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+static void ahd_linux_set_hold_mcs(struct scsi_target *starget, int hold)
+{
+        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
+        struct ahd_softc *ahd = *((struct ahd_softc **)shost->hostdata);
+        struct ahd_tmode_tstate *tstate;
+        struct ahd_initiator_tinfo *tinfo 
+                = ahd_fetch_transinfo(ahd,
+                                      starget->channel + 'A',
+                                      shost->this_id, starget->id, &tstate);
+        struct ahd_devinfo devinfo;
+        unsigned int ppr_options = tinfo->goal.ppr_options
+                & ~MSG_EXT_PPR_HOLD_MCS;
+        unsigned int period = tinfo->goal.period;
+        unsigned int dt = ppr_options & MSG_EXT_PPR_DT_REQ;
+        unsigned long flags;
+
+        if (hold)
+                ppr_options |= MSG_EXT_PPR_HOLD_MCS;
+
+        ahd_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
+                            starget->channel + 'A', ROLE_INITIATOR);
+        ahd_find_syncrate(ahd, &period, &ppr_options,
+                          dt ? AHD_SYNCRATE_MAX : AHD_SYNCRATE_ULTRA2);
+
+        ahd_lock(ahd, &flags);
+        ahd_set_syncrate(ahd, &devinfo, period, tinfo->goal.offset,
+                         ppr_options, AHD_TRANS_GOAL, FALSE);
+        ahd_unlock(ahd, &flags);
+}
+
+
+
+static struct spi_function_template ahd_linux_transport_functions = {
+        .set_offset     = ahd_linux_set_offset,
+        .show_offset    = 1,
+        .set_period     = ahd_linux_set_period,
+        .show_period    = 1,
+        .set_width      = ahd_linux_set_width,
+        .show_width     = 1,
+        .set_dt         = ahd_linux_set_dt,
+        .show_dt        = 1,
+        .set_iu         = ahd_linux_set_iu,
+        .show_iu        = 1,
+        .set_qas        = ahd_linux_set_qas,
+        .show_qas       = 1,
+        .set_rd_strm    = ahd_linux_set_rd_strm,
+        .show_rd_strm   = 1,
+        .set_wr_flow    = ahd_linux_set_wr_flow,
+        .show_wr_flow   = 1,
+        .set_rti        = ahd_linux_set_rti,
+        .show_rti       = 1,
+        .set_pcomp_en   = ahd_linux_set_pcomp_en,
+        .show_pcomp_en  = 1,
+        .set_hold_mcs   = ahd_linux_set_hold_mcs,
+        .show_hold_mcs  = 1,
+};
+
+static int __init
+ahd_linux_init(void)
+{
+        int     error = 0;
+
         /*
-         * In 2.4 we have to unregister from the PCI core _after_
-         * unregistering from the scsi midlayer to avoid dangling
-         * references.
+         * If we've been passed any parameters, process them now.
          */
-        scsi_unregister_module(MODULE_SCSI_HA, &aic79xx_driver_template);
-#endif
+        if (aic79xx)
+                aic79xx_setup(aic79xx);
+
+        ahd_linux_transport_template =
+                spi_attach_transport(&ahd_linux_transport_functions);
+        if (!ahd_linux_transport_template)
+                return -ENODEV;
+
+        scsi_transport_reserve_target(ahd_linux_transport_template,
+                                      sizeof(struct ahd_linux_target));
+        scsi_transport_reserve_device(ahd_linux_transport_template,
+                                      sizeof(struct ahd_linux_device));
+
+        error = ahd_linux_pci_init();
+        if (error)
+                spi_release_transport(ahd_linux_transport_template);
+        return error;
+}
+
+static void __exit
+ahd_linux_exit(void)
+{
         ahd_linux_pci_exit();
+        spi_release_transport(ahd_linux_transport_template);
 }
 
 module_init(ahd_linux_init);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 7823e52e99ab..052c6619accc 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -42,6 +42,7 @@
 #ifndef _AIC79XX_LINUX_H_
 #define _AIC79XX_LINUX_H_
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
@@ -49,18 +50,23 @@
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include <linux/version.h>
+#include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
 
-#include <linux/interrupt.h> /* For tasklet support. */
-#include <linux/config.h>
-#include <linux/slab.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_eh.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_spi.h>
 
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahd
-#include "scsi.h"
-#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
@@ -95,7 +101,7 @@
 /************************* Forward Declarations *******************************/
 struct ahd_softc;
 typedef struct pci_dev *ahd_dev_softc_t;
-typedef Scsi_Cmnd      *ahd_io_ctx_t;
+typedef struct scsi_cmnd      *ahd_io_ctx_t;
 
 /******************************* Byte Order ***********************************/
 #define ahd_htobe16(x)  cpu_to_be16(x)
@@ -114,8 +120,7 @@ typedef Scsi_Cmnd      *ahd_io_ctx_t;
 
 /************************* Configuration Data *********************************/
 extern uint32_t aic79xx_allow_memio;
-extern int aic79xx_detect_complete;
-extern Scsi_Host_Template aic79xx_driver_template;
+extern struct scsi_host_template aic79xx_driver_template;
 
 /***************************** Bus Space/DMA **********************************/
 
@@ -145,11 +150,7 @@ struct ahd_linux_dma_tag
 };
 typedef struct ahd_linux_dma_tag* bus_dma_tag_t;
 
-struct ahd_linux_dmamap
-{
-        dma_addr_t      bus_addr;
-};
-typedef struct ahd_linux_dmamap* bus_dmamap_t;
+typedef dma_addr_t bus_dmamap_t;
 
 typedef int bus_dma_filter_t(void*, dma_addr_t);
 typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int);
@@ -226,12 +227,12 @@ typedef struct timer_list ahd_timer_t;
 #define ahd_timer_init init_timer
 #define ahd_timer_stop del_timer_sync
 typedef void ahd_linux_callback_t (u_long);  
-static __inline void ahd_timer_reset(ahd_timer_t *timer, u_int usec,
+static __inline void ahd_timer_reset(ahd_timer_t *timer, int usec,
                                      ahd_callback_t *func, void *arg);
 static __inline void ahd_scb_timer_reset(struct scb *scb, u_int usec);
 
 static __inline void
-ahd_timer_reset(ahd_timer_t *timer, u_int usec, ahd_callback_t *func, void *arg)
+ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
 {
         struct ahd_softc *ahd;
 
@@ -252,43 +253,8 @@ ahd_scb_timer_reset(struct scb *scb, u_int usec)
 /***************************** SMP support ************************************/
 #include <linux/spinlock.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) || defined(SCSI_HAS_HOST_LOCK))
-#define AHD_SCSI_HAS_HOST_LOCK 1
-#else
-#define AHD_SCSI_HAS_HOST_LOCK 0
-#endif
-
 #define AIC79XX_DRIVER_VERSION "1.3.11"
 
-/**************************** Front End Queues ********************************/
-/*
- * Data structure used to cast the Linux struct scsi_cmnd to something
- * that allows us to use the queue macros.  The linux structure has
- * plenty of space to hold the links fields as required by the queue
- * macros, but the queue macors require them to have the correct type.
- */
-struct ahd_cmd_internal {
-        /* Area owned by the Linux scsi layer. */
-        uint8_t private[offsetof(struct scsi_cmnd, SCp.Status)];
-        union {
-                STAILQ_ENTRY(ahd_cmd)   ste;
-                LIST_ENTRY(ahd_cmd)     le;
-                TAILQ_ENTRY(ahd_cmd)    tqe;
-        } links;
-        uint32_t                        end;
-};
-
-struct ahd_cmd {
-        union {
-                struct ahd_cmd_internal icmd;
-                struct scsi_cmnd        scsi_cmd;
-        } un;
-};
-
-#define acmd_icmd(cmd) ((cmd)->un.icmd)
-#define acmd_scsi_cmd(cmd) ((cmd)->un.scsi_cmd)
-#define acmd_links un.icmd.links
-
 /*************************** Device Data Structures ***************************/
 /*
  * A per probed device structure used to deal with some error recovery
@@ -297,22 +263,17 @@ struct ahd_cmd {
  * after a successfully completed inquiry command to the target when
  * that inquiry data indicates a lun is present.
  */
-TAILQ_HEAD(ahd_busyq, ahd_cmd);
+
 typedef enum {
-        AHD_DEV_UNCONFIGURED     = 0x01,
         AHD_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */
-        AHD_DEV_TIMER_ACTIVE     = 0x04, /* Our timer is active */
-        AHD_DEV_ON_RUN_LIST      = 0x08, /* Queued to be run later */
         AHD_DEV_Q_BASIC          = 0x10, /* Allow basic device queuing */
         AHD_DEV_Q_TAGGED         = 0x20, /* Allow full SCSI2 command queueing */
         AHD_DEV_PERIODIC_OTAG    = 0x40, /* Send OTAG to prevent starvation */
-        AHD_DEV_SLAVE_CONFIGURED = 0x80  /* slave_configure() has been called */
 } ahd_linux_dev_flags;
 
 struct ahd_linux_target;
 struct ahd_linux_device {
         TAILQ_ENTRY(ahd_linux_device) links;
-        struct                  ahd_busyq busyq;
 
         /*
          * The number of transactions currently
@@ -388,62 +349,12 @@ struct ahd_linux_device {
          */
         u_int                   commands_since_idle_or_otag;
 #define AHD_OTAG_THRESH 500
-
-        int                     lun;
-        Scsi_Device            *scsi_device;
-        struct                  ahd_linux_target *target;
 };
 
-typedef enum {
-        AHD_DV_REQUIRED          = 0x01,
-        AHD_INQ_VALID            = 0x02,
-        AHD_BASIC_DV             = 0x04,
-        AHD_ENHANCED_DV          = 0x08
-} ahd_linux_targ_flags;
-
-/* DV States */
-typedef enum {
-        AHD_DV_STATE_EXIT = 0,
-        AHD_DV_STATE_INQ_SHORT_ASYNC,
-        AHD_DV_STATE_INQ_ASYNC,
-        AHD_DV_STATE_INQ_ASYNC_VERIFY,
-        AHD_DV_STATE_TUR,
-        AHD_DV_STATE_REBD,
-        AHD_DV_STATE_INQ_VERIFY,
-        AHD_DV_STATE_WEB,
-        AHD_DV_STATE_REB,
-        AHD_DV_STATE_SU,
-        AHD_DV_STATE_BUSY
-} ahd_dv_state;
-
 struct ahd_linux_target {
-        struct ahd_linux_device  *devices[AHD_NUM_LUNS];
-        int                       channel;
-        int                       target;
-        int                       refcount;
+        struct scsi_device       *sdev[AHD_NUM_LUNS];
         struct ahd_transinfo      last_tinfo;
         struct ahd_softc         *ahd;
-        ahd_linux_targ_flags      flags;
-        struct scsi_inquiry_data *inq_data;
-        /*
-         * The next "fallback" period to use for narrow/wide transfers.
-         */
-        uint8_t                   dv_next_narrow_period;
-        uint8_t                   dv_next_wide_period;
-        uint8_t                   dv_max_width;
-        uint8_t                   dv_max_ppr_options;
-        uint8_t                   dv_last_ppr_options;
-        u_int                     dv_echo_size;
-        ahd_dv_state              dv_state;
-        u_int                     dv_state_retry;
-        uint8_t                  *dv_buffer;
-        uint8_t                  *dv_buffer1;
-
-        /*
-         * Cumulative counter of errors.
-         */
-        u_long                  errors_detected;
-        u_long                  cmds_since_error;
 };
 
 /********************* Definitions Required by the Core ***********************/
@@ -453,32 +364,16 @@ struct ahd_linux_target {
  * manner and are allocated below 4GB, the number of S/G segments is
  * unrestricted.
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/*
- * We dynamically adjust the number of segments in pre-2.5 kernels to
- * avoid fragmentation issues in the SCSI mid-layer's private memory
- * allocator.  See aic79xx_osm.c ahd_linux_size_nseg() for details.
- */
-extern u_int ahd_linux_nseg;
-#define AHD_NSEG ahd_linux_nseg
-#define AHD_LINUX_MIN_NSEG 64
-#else
 #define AHD_NSEG 128
-#endif
 
 /*
  * Per-SCB OSM storage.
  */
-typedef enum {
-        AHD_SCB_UP_EH_SEM = 0x1
-} ahd_linux_scb_flags;
-
 struct scb_platform_data {
         struct ahd_linux_device *dev;
         dma_addr_t               buf_busaddr;
         uint32_t                 xfer_len;
         uint32_t                 sense_resid;   /* Auto-Sense residual */
-        ahd_linux_scb_flags      flags;
 };
 
 /*
@@ -487,44 +382,23 @@ struct scb_platform_data {
  * alignment restrictions of the various platforms supported by
  * this driver.
  */
-typedef enum {
-        AHD_DV_WAIT_SIMQ_EMPTY   = 0x01,
-        AHD_DV_WAIT_SIMQ_RELEASE = 0x02,
-        AHD_DV_ACTIVE            = 0x04,
-        AHD_DV_SHUTDOWN          = 0x08,
-        AHD_RUN_CMPLT_Q_TIMER    = 0x10
-} ahd_linux_softc_flags;
-
-TAILQ_HEAD(ahd_completeq, ahd_cmd);
-
 struct ahd_platform_data {
         /*
          * Fields accessed from interrupt context.
          */
-        struct ahd_linux_target *targets[AHD_NUM_TARGETS]; 
-        TAILQ_HEAD(, ahd_linux_device) device_runq;
-        struct ahd_completeq     completeq;
+        struct scsi_target *starget[AHD_NUM_TARGETS]; 
 
         spinlock_t               spin_lock;
-        struct tasklet_struct    runq_tasklet;
         u_int                    qfrozen;
-        pid_t                    dv_pid;
-        struct timer_list        completeq_timer;
         struct timer_list        reset_timer;
-        struct timer_list        stats_timer;
         struct semaphore         eh_sem;
-        struct semaphore         dv_sem;
-        struct semaphore         dv_cmd_sem;    /* XXX This needs to be in
-                                                 * the target struct
-                                                 */
-        struct scsi_device      *dv_scsi_dev;
         struct Scsi_Host        *host;          /* pointer to scsi host */
 #define AHD_LINUX_NOIRQ ((uint32_t)~0)
         uint32_t                 irq;           /* IRQ for this adapter */
         uint32_t                 bios_address;
         uint32_t                 mem_busaddr;   /* Mem Base Addr */
-        uint64_t                 hw_dma_mask;
-        ahd_linux_softc_flags    flags;
+#define AHD_SCB_UP_EH_SEM 0x1
+        uint32_t                 flags;
 };
 
 /************************** OS Utility Wrappers *******************************/
@@ -641,7 +515,7 @@ ahd_insb(struct ahd_softc * ahd, long port, uint8_t *array, int count)
 
 /**************************** Initialization **********************************/
 int             ahd_linux_register_host(struct ahd_softc *,
-                                        Scsi_Host_Template *);
+                                        struct scsi_host_template *);
 
 uint64_t        ahd_linux_get_memsize(void);
 
@@ -657,28 +531,6 @@ void	ahd_format_transinfo(struct info_str *info,
                              struct ahd_transinfo *tinfo);
 
 /******************************** Locking *************************************/
-/* Lock protecting internal data structures */
-static __inline void ahd_lockinit(struct ahd_softc *);
-static __inline void ahd_lock(struct ahd_softc *, unsigned long *flags);
-static __inline void ahd_unlock(struct ahd_softc *, unsigned long *flags);
-
-/* Lock acquisition and release of the above lock in midlayer entry points. */
-static __inline void ahd_midlayer_entrypoint_lock(struct ahd_softc *,
-                                                  unsigned long *flags);
-static __inline void ahd_midlayer_entrypoint_unlock(struct ahd_softc *,
-                                                    unsigned long *flags);
-
-/* Lock held during command compeletion to the upper layer */
-static __inline void ahd_done_lockinit(struct ahd_softc *);
-static __inline void ahd_done_lock(struct ahd_softc *, unsigned long *flags);
-static __inline void ahd_done_unlock(struct ahd_softc *, unsigned long *flags);
-
-/* Lock held during ahd_list manipulation and ahd softc frees */
-extern spinlock_t ahd_list_spinlock;
-static __inline void ahd_list_lockinit(void);
-static __inline void ahd_list_lock(unsigned long *flags);
-static __inline void ahd_list_unlock(unsigned long *flags);
-
 static __inline void
 ahd_lockinit(struct ahd_softc *ahd)
 {
@@ -697,75 +549,6 @@ ahd_unlock(struct ahd_softc *ahd, unsigned long *flags)
         spin_unlock_irqrestore(&ahd->platform_data->spin_lock, *flags);
 }
 
-static __inline void
-ahd_midlayer_entrypoint_lock(struct ahd_softc *ahd, unsigned long *flags)
-{
-        /*
-         * In 2.5.X and some 2.4.X versions, the midlayer takes our
-         * lock just before calling us, so we avoid locking again.
-         * For other kernel versions, the io_request_lock is taken
-         * just before our entry point is called.  In this case, we
-         * trade the io_request_lock for our per-softc lock.
-         */
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_unlock(&io_request_lock);
-        spin_lock(&ahd->platform_data->spin_lock);
-#endif
-}
-
-static __inline void
-ahd_midlayer_entrypoint_unlock(struct ahd_softc *ahd, unsigned long *flags)
-{
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_unlock(&ahd->platform_data->spin_lock);
-        spin_lock(&io_request_lock);
-#endif
-}
-
-static __inline void
-ahd_done_lockinit(struct ahd_softc *ahd)
-{
-        /*
-         * In 2.5.X, our own lock is held during completions.
-         * In previous versions, the io_request_lock is used.
-         * In either case, we can't initialize this lock again.
-         */
-}
-
-static __inline void
-ahd_done_lock(struct ahd_softc *ahd, unsigned long *flags)
-{
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_lock(&io_request_lock);
-#endif
-}
-
-static __inline void
-ahd_done_unlock(struct ahd_softc *ahd, unsigned long *flags)
-{
-#if AHD_SCSI_HAS_HOST_LOCK == 0
-        spin_unlock(&io_request_lock);
-#endif
-}
-
-static __inline void
-ahd_list_lockinit(void)
-{
-        spin_lock_init(&ahd_list_spinlock);
-}
-
-static __inline void
-ahd_list_lock(unsigned long *flags)
-{
-        spin_lock_irqsave(&ahd_list_spinlock, *flags);
-}
-
-static __inline void
-ahd_list_unlock(unsigned long *flags)
-{
-        spin_unlock_irqrestore(&ahd_list_spinlock, *flags);
-}
-
 /******************************* PCI Definitions ******************************/
 /*
  * PCIM_xxx: mask to locate subfield in register
@@ -925,27 +708,17 @@ ahd_flush_device_writes(struct ahd_softc *ahd)
 }
 
 /**************************** Proc FS Support *********************************/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-int     ahd_linux_proc_info(char *, char **, off_t, int, int, int);
-#else
 int     ahd_linux_proc_info(struct Scsi_Host *, char *, char **,
                             off_t, int, int);
-#endif
-
-/*************************** Domain Validation ********************************/
-#define AHD_DV_CMD(cmd) ((cmd)->scsi_done == ahd_linux_dv_complete)
-#define AHD_DV_SIMQ_FROZEN(ahd)                                 \
-        ((((ahd)->platform_data->flags & AHD_DV_ACTIVE) != 0)   \
-         && (ahd)->platform_data->qfrozen == 1)
 
 /*********************** Transaction Access Wrappers **************************/
-static __inline void ahd_cmd_set_transaction_status(Scsi_Cmnd *, uint32_t);
+static __inline void ahd_cmd_set_transaction_status(struct scsi_cmnd *, uint32_t);
 static __inline void ahd_set_transaction_status(struct scb *, uint32_t);
-static __inline void ahd_cmd_set_scsi_status(Scsi_Cmnd *, uint32_t);
+static __inline void ahd_cmd_set_scsi_status(struct scsi_cmnd *, uint32_t);
 static __inline void ahd_set_scsi_status(struct scb *, uint32_t);
-static __inline uint32_t ahd_cmd_get_transaction_status(Scsi_Cmnd *cmd);
+static __inline uint32_t ahd_cmd_get_transaction_status(struct scsi_cmnd *cmd);
 static __inline uint32_t ahd_get_transaction_status(struct scb *);
-static __inline uint32_t ahd_cmd_get_scsi_status(Scsi_Cmnd *cmd);
+static __inline uint32_t ahd_cmd_get_scsi_status(struct scsi_cmnd *cmd);
 static __inline uint32_t ahd_get_scsi_status(struct scb *);
 static __inline void ahd_set_transaction_tag(struct scb *, int, u_int);
 static __inline u_long ahd_get_transfer_length(struct scb *);
@@ -964,7 +737,7 @@ static __inline void ahd_platform_scb_free(struct ahd_softc *ahd,
 static __inline void ahd_freeze_scb(struct scb *scb);
 
 static __inline
-void ahd_cmd_set_transaction_status(Scsi_Cmnd *cmd, uint32_t status)
+void ahd_cmd_set_transaction_status(struct scsi_cmnd *cmd, uint32_t status)
 {
         cmd->result &= ~(CAM_STATUS_MASK << 16);
         cmd->result |= status << 16;
@@ -977,7 +750,7 @@ void ahd_set_transaction_status(struct scb *scb, uint32_t status)
 }
 
 static __inline
-void ahd_cmd_set_scsi_status(Scsi_Cmnd *cmd, uint32_t status)
+void ahd_cmd_set_scsi_status(struct scsi_cmnd *cmd, uint32_t status)
 {
         cmd->result &= ~0xFFFF;
         cmd->result |= status;
@@ -990,7 +763,7 @@ void ahd_set_scsi_status(struct scb *scb, uint32_t status)
 }
 
 static __inline
-uint32_t ahd_cmd_get_transaction_status(Scsi_Cmnd *cmd)
+uint32_t ahd_cmd_get_transaction_status(struct scsi_cmnd *cmd)
 {
         return ((cmd->result >> 16) & CAM_STATUS_MASK);
 }
@@ -1002,7 +775,7 @@ uint32_t ahd_get_transaction_status(struct scb *scb)
 }
 
 static __inline
-uint32_t ahd_cmd_get_scsi_status(Scsi_Cmnd *cmd)
+uint32_t ahd_cmd_get_scsi_status(struct scsi_cmnd *cmd)
 {
         return (cmd->result & 0xFFFF);
 }
@@ -1117,7 +890,6 @@ void	ahd_done(struct ahd_softc*, struct scb*);
 void    ahd_send_async(struct ahd_softc *, char channel,
                        u_int target, u_int lun, ac_code, void *);
 void    ahd_print_path(struct ahd_softc *, struct scb *);
-void    ahd_platform_dump_card_state(struct ahd_softc *ahd);
 
 #ifdef CONFIG_PCI
 #define AHD_PCI_CONFIG 1
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 91daf0c7fb10..390b53852d4b 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -92,27 +92,31 @@ struct pci_driver aic79xx_pci_driver = {
 static void
 ahd_linux_pci_dev_remove(struct pci_dev *pdev)
 {
-        struct ahd_softc *ahd;
-        u_long l;
+        struct ahd_softc *ahd = pci_get_drvdata(pdev);
+        u_long s;
 
-        /*
-         * We should be able to just perform
-         * the free directly, but check our
-         * list for extra sanity.
-         */
-        ahd_list_lock(&l);
-        ahd = ahd_find_softc((struct ahd_softc *)pci_get_drvdata(pdev));
-        if (ahd != NULL) {
-                u_long s;
-
-                TAILQ_REMOVE(&ahd_tailq, ahd, links);
-                ahd_list_unlock(&l);
-                ahd_lock(ahd, &s);
-                ahd_intr_enable(ahd, FALSE);
-                ahd_unlock(ahd, &s);
-                ahd_free(ahd);
-        } else
-                ahd_list_unlock(&l);
+        ahd_lock(ahd, &s);
+        ahd_intr_enable(ahd, FALSE);
+        ahd_unlock(ahd, &s);
+        ahd_free(ahd);
+}
+
+static void
+ahd_linux_pci_inherit_flags(struct ahd_softc *ahd)
+{
+        struct pci_dev *pdev = ahd->dev_softc, *master_pdev;
+        unsigned int master_devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+
+        master_pdev = pci_get_slot(pdev->bus, master_devfn);
+        if (master_pdev) {
+                struct ahd_softc *master = pci_get_drvdata(master_pdev);
+                if (master) {
+                        ahd->flags &= ~AHD_BIOS_ENABLED;
+                        ahd->flags |= master->flags & AHD_BIOS_ENABLED;
+                } else
+                        printk(KERN_ERR "aic79xx: no multichannel peer found!\n");
+                pci_dev_put(master_pdev);
+        }
 }
 
 static int
@@ -125,22 +129,6 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         char            *name;
         int              error;
 
-        /*
-         * Some BIOSen report the same device multiple times.
-         */
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-                struct pci_dev *probed_pdev;
-
-                probed_pdev = ahd->dev_softc;
-                if (probed_pdev->bus->number == pdev->bus->number
-                 && probed_pdev->devfn == pdev->devfn)
-                        break;
-        }
-        if (ahd != NULL) {
-                /* Skip duplicate. */
-                return (-ENODEV);
-        }
-
         pci = pdev;
         entry = ahd_find_pci_device(pci);
         if (entry == NULL)
@@ -177,15 +165,12 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 if (memsize >= 0x8000000000ULL
                  && pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {
                         ahd->flags |= AHD_64BIT_ADDRESSING;
-                        ahd->platform_data->hw_dma_mask = DMA_64BIT_MASK;
                 } else if (memsize > 0x80000000
                         && pci_set_dma_mask(pdev, mask_39bit) == 0) {
                         ahd->flags |= AHD_39BIT_ADDRESSING;
-                        ahd->platform_data->hw_dma_mask = mask_39bit;
                 }
         } else {
                 pci_set_dma_mask(pdev, DMA_32BIT_MASK);
-                ahd->platform_data->hw_dma_mask = DMA_32BIT_MASK;
         }
         ahd->dev_softc = pci;
         error = ahd_pci_config(ahd, entry);
@@ -193,16 +178,17 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ahd_free(ahd);
                 return (-error);
         }
+
+        /*
+         * Second Function PCI devices need to inherit some
+         * * settings from function 0.
+         */
+        if ((ahd->features & AHD_MULTI_FUNC) && PCI_FUNC(pdev->devfn) != 0)
+                ahd_linux_pci_inherit_flags(ahd);
+
         pci_set_drvdata(pdev, ahd);
-        if (aic79xx_detect_complete) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-                ahd_linux_register_host(ahd, &aic79xx_driver_template);
-#else
-                printf("aic79xx: ignoring PCI device found after "
-                       "initialization\n");
-                return (-ENODEV);
-#endif
-        }
+
+        ahd_linux_register_host(ahd, &aic79xx_driver_template);
         return (0);
 }
 
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 703f6e44889d..2131db60018a 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -283,7 +283,6 @@ int
 ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_identity *entry)
 {
         struct scb_data *shared_scb_data;
-        u_long           l;
         u_int            command;
         uint32_t         devconfig;
         uint16_t         subvendor; 
@@ -373,16 +372,9 @@ ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_identity *entry)
          * Allow interrupts now that we are completely setup.
          */
         error = ahd_pci_map_int(ahd);
-        if (error != 0)
-                return (error);
-
-        ahd_list_lock(&l);
-        /*
-         * Link this softc in with all other ahd instances.
-         */
-        ahd_softc_insert(ahd);
-        ahd_list_unlock(&l);
-        return (0);
+        if (!error)
+                ahd->init_level++;
+        return error;
 }
 
 /*
diff --git a/drivers/scsi/aic7xxx/aic79xx_proc.c b/drivers/scsi/aic7xxx/aic79xx_proc.c
index e01cd6175e34..39a27840fce6 100644
--- a/drivers/scsi/aic7xxx/aic79xx_proc.c
+++ b/drivers/scsi/aic7xxx/aic79xx_proc.c
@@ -49,10 +49,53 @@ static void	ahd_dump_target_state(struct ahd_softc *ahd,
                                       u_int our_id, char channel,
                                       u_int target_id, u_int target_offset);
 static void     ahd_dump_device_state(struct info_str *info,
-                                      struct ahd_linux_device *dev);
+                                      struct scsi_device *sdev);
 static int      ahd_proc_write_seeprom(struct ahd_softc *ahd,
                                        char *buffer, int length);
 
+/*
+ * Table of syncrates that don't follow the "divisible by 4"
+ * rule. This table will be expanded in future SCSI specs.
+ */
+static struct {
+        u_int period_factor;
+        u_int period;   /* in 100ths of ns */
+} scsi_syncrates[] = {
+        { 0x08, 625 },  /* FAST-160 */
+        { 0x09, 1250 }, /* FAST-80 */
+        { 0x0a, 2500 }, /* FAST-40 40MHz */
+        { 0x0b, 3030 }, /* FAST-40 33MHz */
+        { 0x0c, 5000 }  /* FAST-20 */
+};
+
+/*
+ * Return the frequency in kHz corresponding to the given
+ * sync period factor.
+ */
+static u_int
+ahd_calc_syncsrate(u_int period_factor)
+{
+        int i;
+        int num_syncrates;
+
+        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
+        /* See if the period is in the "exception" table */
+        for (i = 0; i < num_syncrates; i++) {
+
+                if (period_factor == scsi_syncrates[i].period_factor) {
+                        /* Period in kHz */
+                        return (100000000 / scsi_syncrates[i].period);
+                }
+        }
+
+        /*
+         * Wasn't in the table, so use the standard
+         * 4 times conversion.
+         */
+        return (10000000 / (period_factor * 4 * 10));
+}
+
+
 static void
 copy_mem_info(struct info_str *info, char *data, int len)
 {
@@ -109,7 +152,7 @@ ahd_format_transinfo(struct info_str *info, struct ahd_transinfo *tinfo)
         speed = 3300;
         freq = 0;
         if (tinfo->offset != 0) {
-                freq = aic_calc_syncsrate(tinfo->period);
+                freq = ahd_calc_syncsrate(tinfo->period);
                 speed = freq;
         }
         speed *= (0x01 << tinfo->width);
@@ -167,6 +210,7 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,
                       u_int target_offset)
 {
         struct  ahd_linux_target *targ;
+        struct  scsi_target *starget;
         struct  ahd_initiator_tinfo *tinfo;
         struct  ahd_tmode_tstate *tstate;
         int     lun;
@@ -176,20 +220,20 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,
         copy_info(info, "Target %d Negotiation Settings\n", target_id);
         copy_info(info, "\tUser: ");
         ahd_format_transinfo(info, &tinfo->user);
-        targ = ahd->platform_data->targets[target_offset];
-        if (targ == NULL)
+        starget = ahd->platform_data->starget[target_offset];
+        if (starget == NULL)
                 return;
+        targ = scsi_transport_target_data(starget);
 
         copy_info(info, "\tGoal: ");
         ahd_format_transinfo(info, &tinfo->goal);
         copy_info(info, "\tCurr: ");
         ahd_format_transinfo(info, &tinfo->curr);
-        copy_info(info, "\tTransmission Errors %ld\n", targ->errors_detected);
 
         for (lun = 0; lun < AHD_NUM_LUNS; lun++) {
-                struct ahd_linux_device *dev;
+                struct scsi_device *dev;
 
-                dev = targ->devices[lun];
+                dev = targ->sdev[lun];
 
                 if (dev == NULL)
                         continue;
@@ -199,10 +243,13 @@ ahd_dump_target_state(struct ahd_softc *ahd, struct info_str *info,
 }
 
 static void
-ahd_dump_device_state(struct info_str *info, struct ahd_linux_device *dev)
+ahd_dump_device_state(struct info_str *info, struct scsi_device *sdev)
 {
+        struct ahd_linux_device *dev = scsi_transport_device_data(sdev);
+
         copy_info(info, "\tChannel %c Target %d Lun %d Settings\n",
-                  dev->target->channel + 'A', dev->target->target, dev->lun);
+                  sdev->sdev_target->channel + 'A',
+                  sdev->sdev_target->id, sdev->lun);
 
         copy_info(info, "\t\tCommands Queued %ld\n", dev->commands_issued);
         copy_info(info, "\t\tCommands Active %d\n", dev->active);
@@ -278,36 +325,16 @@ done:
  * Return information to handle /proc support for the driver.
  */
 int
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-ahd_linux_proc_info(char *buffer, char **start, off_t offset,
-                    int length, int hostno, int inout)
-#else
 ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
                     off_t offset, int length, int inout)
-#endif
 {
-        struct  ahd_softc *ahd;
+        struct  ahd_softc *ahd = *(struct ahd_softc **)shost->hostdata;
         struct  info_str info;
         char    ahd_info[256];
-        u_long  l;
         u_int   max_targ;
         u_int   i;
         int     retval;
 
-        retval = -EINVAL;
-        ahd_list_lock(&l);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        TAILQ_FOREACH(ahd, &ahd_tailq, links) {
-                if (ahd->platform_data->host->host_no == hostno)
-                        break;
-        }
-#else
-        ahd = ahd_find_softc(*(struct ahd_softc **)shost->hostdata);
-#endif
-
-        if (ahd == NULL)
-                goto done;
-
          /* Has data been written to the file? */ 
         if (inout == TRUE) {
                 retval = ahd_proc_write_seeprom(ahd, buffer, length);
@@ -357,6 +384,5 @@ ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
         }
         retval = info.pos > info.offset ? info.pos - info.offset : 0;
 done:
-        ahd_list_unlock(&l);
         return (retval);
 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 088cbc23743d..91d294c6334e 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#79 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $
  *
  * $FreeBSD$
  */
@@ -243,7 +243,7 @@ typedef enum {
          */
         AHC_AIC7850_FE  = AHC_SPIOCAP|AHC_AUTOPAUSE|AHC_TARGETMODE|AHC_ULTRA,
         AHC_AIC7860_FE  = AHC_AIC7850_FE,
-        AHC_AIC7870_FE  = AHC_TARGETMODE,
+        AHC_AIC7870_FE  = AHC_TARGETMODE|AHC_AUTOPAUSE,
         AHC_AIC7880_FE  = AHC_AIC7870_FE|AHC_ULTRA,
         /*
          * Although we have space for both the initiator and
diff --git a/drivers/scsi/aic7xxx/aic7xxx.reg b/drivers/scsi/aic7xxx/aic7xxx.reg
index 810ec700d9fc..e196d83b93c7 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.reg
+++ b/drivers/scsi/aic7xxx/aic7xxx.reg
@@ -39,7 +39,7 @@
  *
  * $FreeBSD$
  */
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $"
 
 /*
  * This file is processed by the aic7xxx_asm utility for use in assembling
@@ -1306,7 +1306,6 @@ scratch_ram {
          */
         MWI_RESIDUAL {
                 size            1
-                alias   TARG_IMMEDIATE_SCB
         }
         /*
          * SCBID of the next SCB to be started by the controller.
@@ -1461,6 +1460,7 @@ scratch_ram {
          */
         LAST_MSG {
                 size            1
+                alias   TARG_IMMEDIATE_SCB
         }
 
         /*
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq
index d84b741fbab5..15196390e28d 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx/aic7xxx.seq
@@ -40,7 +40,7 @@
  * $FreeBSD$
  */
 
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $"
 PATCH_ARG_LIST = "struct ahc_softc *ahc"
 PREFIX = "ahc_"
 
@@ -679,6 +679,7 @@ await_busfree:
                 clr     SCSIBUSL;       /* Prevent bit leakage durint SELTO */
         }
         and     SXFRCTL0, ~SPIOEN;
+        mvi     SEQ_FLAGS, NOT_IDENTIFIED|NO_CDB_SENT;
         test    SSTAT1,REQINIT|BUSFREE  jz .;
         test    SSTAT1, BUSFREE jnz poll_for_work;
         mvi     MISSED_BUSFREE call set_seqint;
@@ -1097,7 +1098,7 @@ ultra2_dmahalt:
                 test    SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz dma_mid_sg;
                 if ((ahc->flags & AHC_TARGETROLE) != 0) {
                         test    SSTAT0, TARGET jz dma_last_sg;
-                        if ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0) {
+                        if ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0) {
                                 test    DMAPARAMS, DIRECTION jz dma_mid_sg;
                         }
                 }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_93cx6.c b/drivers/scsi/aic7xxx/aic7xxx_93cx6.c
index 468d612a44f6..3cb07e114e89 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_93cx6.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_93cx6.c
@@ -28,9 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#17 $
- *
- * $FreeBSD$
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#19 $
  */
 
 /*
@@ -64,7 +62,6 @@
  *   is preceded by an initial zero (leading 0, followed by 16-bits, MSB
  *   first).  The clock cycling from low to high initiates the next data
  *   bit to be sent from the chip.
- *
  */
 
 #ifdef __linux__
@@ -81,14 +78,22 @@
  * Right now, we only have to read the SEEPROM.  But we make it easier to
  * add other 93Cx6 functions.
  */
-static struct seeprom_cmd {
+struct seeprom_cmd {
         uint8_t len;
-        uint8_t bits[9];
-} seeprom_read = {3, {1, 1, 0}};
+        uint8_t bits[11];
+};
 
+/* Short opcodes for the c46 */
 static struct seeprom_cmd seeprom_ewen = {9, {1, 0, 0, 1, 1, 0, 0, 0, 0}};
 static struct seeprom_cmd seeprom_ewds = {9, {1, 0, 0, 0, 0, 0, 0, 0, 0}};
+
+/* Long opcodes for the C56/C66 */
+static struct seeprom_cmd seeprom_long_ewen = {11, {1, 0, 0, 1, 1, 0, 0, 0, 0}};
+static struct seeprom_cmd seeprom_long_ewds = {11, {1, 0, 0, 0, 0, 0, 0, 0, 0}};
+
+/* Common opcodes */
 static struct seeprom_cmd seeprom_write = {3, {1, 0, 1}};
+static struct seeprom_cmd seeprom_read  = {3, {1, 1, 0}};
 
 /*
  * Wait for the SEERDY to go high; about 800 ns.
@@ -222,12 +227,25 @@ int
 ahc_write_seeprom(struct seeprom_descriptor *sd, uint16_t *buf,
                   u_int start_addr, u_int count)
 {
+        struct seeprom_cmd *ewen, *ewds;
         uint16_t v;
         uint8_t temp;
         int i, k;
 
         /* Place the chip into write-enable mode */
-        send_seeprom_cmd(sd, &seeprom_ewen);
+        if (sd->sd_chip == C46) {
+                ewen = &seeprom_ewen;
+                ewds = &seeprom_ewds;
+        } else if (sd->sd_chip == C56_66) {
+                ewen = &seeprom_long_ewen;
+                ewds = &seeprom_long_ewds;
+        } else {
+                printf("ahc_write_seeprom: unsupported seeprom type %d\n",
+                       sd->sd_chip);
+                return (0);
+        }
+
+        send_seeprom_cmd(sd, ewen);
         reset_seeprom(sd);
 
         /* Write all requested data out to the seeprom. */
@@ -277,7 +295,7 @@ ahc_write_seeprom(struct seeprom_descriptor *sd, uint16_t *buf,
         }
 
         /* Put the chip back into write-protect mode */
-        send_seeprom_cmd(sd, &seeprom_ewds);
+        send_seeprom_cmd(sd, ewds);
         reset_seeprom(sd);
 
         return (1);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 7bc01e41bcce..58ac46103eb6 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -37,9 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#134 $
- *
- * $FreeBSD$
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#155 $
  */
 
 #ifdef __linux__
@@ -287,10 +285,19 @@ ahc_restart(struct ahc_softc *ahc)
                 ahc_outb(ahc, SEQ_FLAGS2,
                          ahc_inb(ahc, SEQ_FLAGS2) & ~SCB_DMA);
         }
+
+        /*
+         * Clear any pending sequencer interrupt.  It is no
+         * longer relevant since we're resetting the Program
+         * Counter.
+         */
+        ahc_outb(ahc, CLRINT, CLRSEQINT);
+
         ahc_outb(ahc, MWI_RESIDUAL, 0);
         ahc_outb(ahc, SEQCTL, ahc->seqctl);
         ahc_outb(ahc, SEQADDR0, 0);
         ahc_outb(ahc, SEQADDR1, 0);
+
         ahc_unpause(ahc);
 }
 
@@ -1174,19 +1181,20 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
                                        scb_index);
                         }
 #endif
-                        /*
-                         * Force a renegotiation with this target just in
-                         * case the cable was pulled and will later be
-                         * re-attached.  The target may forget its negotiation
-                         * settings with us should it attempt to reselect
-                         * during the interruption.  The target will not issue
-                         * a unit attention in this case, so we must always
-                         * renegotiate.
-                         */
                         ahc_scb_devinfo(ahc, &devinfo, scb);
-                        ahc_force_renegotiation(ahc, &devinfo);
                         ahc_set_transaction_status(scb, CAM_SEL_TIMEOUT);
                         ahc_freeze_devq(ahc, scb);
+
+                        /*
+                         * Cancel any pending transactions on the device
+                         * now that it seems to be missing.  This will
+                         * also revert us to async/narrow transfers until
+                         * we can renegotiate with the device.
+                         */
+                        ahc_handle_devreset(ahc, &devinfo,
+                                            CAM_SEL_TIMEOUT,
+                                            "Selection Timeout",
+                                            /*verbose_level*/1);
                 }
                 ahc_outb(ahc, CLRINT, CLRSCSIINT);
                 ahc_restart(ahc);
@@ -3763,8 +3771,9 @@ ahc_handle_devreset(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
                          /*period*/0, /*offset*/0, /*ppr_options*/0,
                          AHC_TRANS_CUR, /*paused*/TRUE);
         
-        ahc_send_async(ahc, devinfo->channel, devinfo->target,
-                       CAM_LUN_WILDCARD, AC_SENT_BDR, NULL);
+        if (status != CAM_SEL_TIMEOUT)
+                ahc_send_async(ahc, devinfo->channel, devinfo->target,
+                               CAM_LUN_WILDCARD, AC_SENT_BDR, NULL);
 
         if (message != NULL
          && (verbose_level <= bootverbose))
@@ -4003,14 +4012,6 @@ ahc_reset(struct ahc_softc *ahc, int reinit)
          * to disturb the integrity of the bus.
          */
         ahc_pause(ahc);
-        if ((ahc_inb(ahc, HCNTRL) & CHIPRST) != 0) {
-                /*
-                 * The chip has not been initialized since
-                 * PCI/EISA/VLB bus reset.  Don't trust
-                 * "left over BIOS data".
-                 */
-                ahc->flags |= AHC_NO_BIOS_INIT;
-        }
         sxfrctl1_b = 0;
         if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7770) {
                 u_int sblkctl;
@@ -5036,14 +5037,23 @@ ahc_pause_and_flushwork(struct ahc_softc *ahc)
         ahc->flags |= AHC_ALL_INTERRUPTS;
         paused = FALSE;
         do {
-                if (paused)
+                if (paused) {
                         ahc_unpause(ahc);
+                        /*
+                         * Give the sequencer some time to service
+                         * any active selections.
+                         */
+                        ahc_delay(500);
+                }
                 ahc_intr(ahc);
                 ahc_pause(ahc);
                 paused = TRUE;
                 ahc_outb(ahc, SCSISEQ, ahc_inb(ahc, SCSISEQ) & ~ENSELO);
-                ahc_clear_critical_section(ahc);
                 intstat = ahc_inb(ahc, INTSTAT);
+                if ((intstat & INT_PEND) == 0) {
+                        ahc_clear_critical_section(ahc);
+                        intstat = ahc_inb(ahc, INTSTAT);
+                }
         } while (--maxloops
               && (intstat != 0xFF || (ahc->features & AHC_REMOVABLE) == 0)
               && ((intstat & INT_PEND) != 0
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 687f19e9cf03..c932b3b94490 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -125,12 +125,6 @@
 
 static struct scsi_transport_template *ahc_linux_transport_template = NULL;
 
-/*
- * Include aiclib.c as part of our
- * "module dependencies are hard" work around.
- */
-#include "aiclib.c"
-
 #include <linux/init.h>         /* __setup */
 #include <linux/mm.h>           /* For fetching system memory size */
 #include <linux/blkdev.h>               /* For block_size() */
@@ -391,7 +385,6 @@ static int ahc_linux_run_command(struct ahc_softc*,
                                  struct ahc_linux_device *,
                                  struct scsi_cmnd *);
 static void ahc_linux_setup_tag_info_global(char *p);
-static aic_option_callback_t ahc_linux_setup_tag_info;
 static int  aic7xxx_setup(char *s);
 
 static int ahc_linux_unit;
@@ -635,6 +628,8 @@ ahc_linux_slave_alloc(struct scsi_device *sdev)
         
         targ->sdev[sdev->lun] = sdev;
 
+        spi_period(starget) = 0;
+
         return 0;
 }
 
@@ -918,6 +913,86 @@ ahc_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
         }
 }
 
+static char *
+ahc_parse_brace_option(char *opt_name, char *opt_arg, char *end, int depth,
+                       void (*callback)(u_long, int, int, int32_t),
+                       u_long callback_arg)
+{
+        char    *tok_end;
+        char    *tok_end2;
+        int      i;
+        int      instance;
+        int      targ;
+        int      done;
+        char     tok_list[] = {'.', ',', '{', '}', '\0'};
+
+        /* All options use a ':' name/arg separator */
+        if (*opt_arg != ':')
+                return (opt_arg);
+        opt_arg++;
+        instance = -1;
+        targ = -1;
+        done = FALSE;
+        /*
+         * Restore separator that may be in
+         * the middle of our option argument.
+         */
+        tok_end = strchr(opt_arg, '\0');
+        if (tok_end < end)
+                *tok_end = ',';
+        while (!done) {
+                switch (*opt_arg) {
+                case '{':
+                        if (instance == -1) {
+                                instance = 0;
+                        } else {
+                                if (depth > 1) {
+                                        if (targ == -1)
+                                                targ = 0;
+                                } else {
+                                        printf("Malformed Option %s\n",
+                                               opt_name);
+                                        done = TRUE;
+                                }
+                        }
+                        opt_arg++;
+                        break;
+                case '}':
+                        if (targ != -1)
+                                targ = -1;
+                        else if (instance != -1)
+                                instance = -1;
+                        opt_arg++;
+                        break;
+                case ',':
+                case '.':
+                        if (instance == -1)
+                                done = TRUE;
+                        else if (targ >= 0)
+                                targ++;
+                        else if (instance >= 0)
+                                instance++;
+                        opt_arg++;
+                        break;
+                case '\0':
+                        done = TRUE;
+                        break;
+                default:
+                        tok_end = end;
+                        for (i = 0; tok_list[i]; i++) {
+                                tok_end2 = strchr(opt_arg, tok_list[i]);
+                                if ((tok_end2) && (tok_end2 < tok_end))
+                                        tok_end = tok_end2;
+                        }
+                        callback(callback_arg, instance, targ,
+                                 simple_strtol(opt_arg, NULL, 0));
+                        opt_arg = tok_end;
+                        break;
+                }
+        }
+        return (opt_arg);
+}
+
 /*
  * Handle Linux boot parameters. This routine allows for assigning a value
  * to a parameter with a ':' between the parameter and the value.
@@ -972,7 +1047,7 @@ aic7xxx_setup(char *s)
                 if (strncmp(p, "global_tag_depth", n) == 0) {
                         ahc_linux_setup_tag_info_global(p + n);
                 } else if (strncmp(p, "tag_info", n) == 0) {
-                        s = aic_parse_brace_option("tag_info", p + n, end,
+                        s = ahc_parse_brace_option("tag_info", p + n, end,
                             2, ahc_linux_setup_tag_info, 0);
                 } else if (p[n] == ':') {
                         *(options[i].flag) = simple_strtoul(p + n + 1, NULL, 0);
@@ -1612,9 +1687,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
                 if (channel == 'B')
                         target_offset += 8;
                 starget = ahc->platform_data->starget[target_offset];
-                targ = scsi_transport_target_data(starget);
-                if (targ == NULL)
+                if (starget == NULL)
                         break;
+                targ = scsi_transport_target_data(starget);
 
                 target_ppr_options =
                         (spi_dt(starget) ? MSG_EXT_PPR_DT_REQ : 0)
@@ -2329,8 +2404,6 @@ ahc_platform_dump_card_state(struct ahc_softc *ahc)
 {
 }
 
-static void ahc_linux_exit(void);
-
 static void ahc_linux_set_width(struct scsi_target *starget, int width)
 {
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 0e47ac217549..c52996269240 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -265,7 +265,7 @@ ahc_scb_timer_reset(struct scb *scb, u_int usec)
 /***************************** SMP support ************************************/
 #include <linux/spinlock.h>
 
-#define AIC7XXX_DRIVER_VERSION "6.2.36"
+#define AIC7XXX_DRIVER_VERSION "7.0"
 
 /*************************** Device Data Structures ***************************/
 /*
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 9d318ce2c993..0d44a6907dd2 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -149,6 +149,27 @@ ahc_linux_pci_dev_remove(struct pci_dev *pdev)
         ahc_free(ahc);
 }
 
+static void
+ahc_linux_pci_inherit_flags(struct ahc_softc *ahc)
+{
+        struct pci_dev *pdev = ahc->dev_softc, *master_pdev;
+        unsigned int master_devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+
+        master_pdev = pci_get_slot(pdev->bus, master_devfn);
+        if (master_pdev) {
+                struct ahc_softc *master = pci_get_drvdata(master_pdev);
+                if (master) {
+                        ahc->flags &= ~AHC_BIOS_ENABLED; 
+                        ahc->flags |= master->flags & AHC_BIOS_ENABLED;
+
+                        ahc->flags &= ~AHC_PRIMARY_CHANNEL; 
+                        ahc->flags |= master->flags & AHC_PRIMARY_CHANNEL;
+                } else
+                        printk(KERN_ERR "aic7xxx: no multichannel peer found!\n");
+                pci_dev_put(master_pdev);
+        } 
+}
+
 static int
 ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -203,6 +224,14 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 ahc_free(ahc);
                 return (-error);
         }
+
+        /*
+         * Second Function PCI devices need to inherit some
+         * settings from function 0.
+         */
+        if ((ahc->features & AHC_MULTI_FUNC) && PCI_FUNC(pdev->devfn) != 0)
+                ahc_linux_pci_inherit_flags(ahc);
+
         pci_set_drvdata(pdev, ahc);
         ahc_linux_register_host(ahc, &aic7xxx_driver_template);
         return (0);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c
index 3802c91f0b07..04a3506cf340 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_proc.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_proc.c
@@ -54,6 +54,49 @@ static void	ahc_dump_device_state(struct info_str *info,
 static int      ahc_proc_write_seeprom(struct ahc_softc *ahc,
                                        char *buffer, int length);
 
+/*
+ * Table of syncrates that don't follow the "divisible by 4"
+ * rule. This table will be expanded in future SCSI specs.
+ */
+static struct {
+        u_int period_factor;
+        u_int period;   /* in 100ths of ns */
+} scsi_syncrates[] = {
+        { 0x08, 625 },  /* FAST-160 */
+        { 0x09, 1250 }, /* FAST-80 */
+        { 0x0a, 2500 }, /* FAST-40 40MHz */
+        { 0x0b, 3030 }, /* FAST-40 33MHz */
+        { 0x0c, 5000 }  /* FAST-20 */
+};
+
+/*
+ * Return the frequency in kHz corresponding to the given
+ * sync period factor.
+ */
+static u_int
+ahc_calc_syncsrate(u_int period_factor)
+{
+        int i;
+        int num_syncrates;
+
+        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
+        /* See if the period is in the "exception" table */
+        for (i = 0; i < num_syncrates; i++) {
+
+                if (period_factor == scsi_syncrates[i].period_factor) {
+                        /* Period in kHz */
+                        return (100000000 / scsi_syncrates[i].period);
+                }
+        }
+
+        /*
+         * Wasn't in the table, so use the standard
+         * 4 times conversion.
+         */
+        return (10000000 / (period_factor * 4 * 10));
+}
+
+
 static void
 copy_mem_info(struct info_str *info, char *data, int len)
 {
@@ -106,7 +149,7 @@ ahc_format_transinfo(struct info_str *info, struct ahc_transinfo *tinfo)
         speed = 3300;
         freq = 0;
         if (tinfo->offset != 0) {
-                freq = aic_calc_syncsrate(tinfo->period);
+                freq = ahc_calc_syncsrate(tinfo->period);
                 speed = freq;
         }
         speed *= (0x01 << tinfo->width);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped b/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
index 7c1390ed1179..2ce1febca207 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $
  */
 typedef int (ahc_reg_print_t)(u_int, u_int *, u_int);
 typedef struct ahc_reg_parse_entry {
@@ -1298,7 +1298,6 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
 #define CMDSIZE_TABLE_TAIL              0x34
 
 #define MWI_RESIDUAL                    0x38
-#define TARG_IMMEDIATE_SCB              0x38
 
 #define NEXT_QUEUED_SCB                 0x39
 
@@ -1380,6 +1379,7 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
 #define RETURN_2                        0x52
 
 #define LAST_MSG                        0x53
+#define TARG_IMMEDIATE_SCB              0x53
 
 #define SCSISEQ_TEMPLATE                0x54
 #define         ENSELO                  0x40
diff --git a/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped b/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
index 9c713775d44a..88bfd767c51c 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $
  */
 
 #include "aic7xxx_osm.h"
diff --git a/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped b/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped
index cf411368a871..4cee08521e75 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped
+++ b/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped
@@ -2,13 +2,13 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $
- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $
  */
 static uint8_t seqprog[] = {
         0xb2, 0x00, 0x00, 0x08,
         0xf7, 0x11, 0x22, 0x08,
-        0x00, 0x65, 0xec, 0x59,
+        0x00, 0x65, 0xee, 0x59,
         0xf7, 0x01, 0x02, 0x08,
         0xff, 0x6a, 0x24, 0x08,
         0x40, 0x00, 0x40, 0x68,
@@ -21,15 +21,15 @@ static uint8_t seqprog[] = {
         0x01, 0x4d, 0xc8, 0x30,
         0x00, 0x4c, 0x12, 0x70,
         0x01, 0x39, 0xa2, 0x30,
-        0x00, 0x6a, 0xc0, 0x5e,
+        0x00, 0x6a, 0xc2, 0x5e,
         0x01, 0x51, 0x20, 0x31,
         0x01, 0x57, 0xae, 0x00,
         0x0d, 0x6a, 0x76, 0x00,
-        0x00, 0x51, 0x12, 0x5e,
+        0x00, 0x51, 0x14, 0x5e,
         0x01, 0x51, 0xc8, 0x30,
         0x00, 0x39, 0xc8, 0x60,
         0x00, 0xbb, 0x30, 0x70,
-        0xc1, 0x6a, 0xd8, 0x5e,
+        0xc1, 0x6a, 0xda, 0x5e,
         0x01, 0xbf, 0x72, 0x30,
         0x01, 0x40, 0x7e, 0x31,
         0x01, 0x90, 0x80, 0x30,
@@ -49,10 +49,10 @@ static uint8_t seqprog[] = {
         0x08, 0x6a, 0x78, 0x00,
         0x01, 0x50, 0xc8, 0x30,
         0xe0, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0xfc, 0x5d,
+        0x48, 0x6a, 0xfe, 0x5d,
         0x01, 0x6a, 0xdc, 0x01,
         0x88, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0xfc, 0x5d,
+        0x48, 0x6a, 0xfe, 0x5d,
         0x01, 0x6a, 0x26, 0x01,
         0xf0, 0x19, 0x7a, 0x08,
         0x0f, 0x18, 0xc8, 0x08,
@@ -93,7 +93,7 @@ static uint8_t seqprog[] = {
         0x00, 0x65, 0x20, 0x41,
         0x02, 0x57, 0xae, 0x00,
         0x00, 0x65, 0x9e, 0x40,
-        0x61, 0x6a, 0xd8, 0x5e,
+        0x61, 0x6a, 0xda, 0x5e,
         0x08, 0x51, 0x20, 0x71,
         0x02, 0x0b, 0xb2, 0x78,
         0x00, 0x65, 0xae, 0x40,
@@ -106,7 +106,7 @@ static uint8_t seqprog[] = {
         0x80, 0x3d, 0x7a, 0x00,
         0x20, 0x6a, 0x16, 0x00,
         0x00, 0x65, 0xcc, 0x41,
-        0x00, 0x65, 0xb2, 0x5e,
+        0x00, 0x65, 0xb4, 0x5e,
         0x00, 0x65, 0x12, 0x40,
         0x20, 0x11, 0xd2, 0x68,
         0x20, 0x6a, 0x18, 0x00,
@@ -140,27 +140,27 @@ static uint8_t seqprog[] = {
         0x80, 0x0b, 0xc4, 0x79,
         0x12, 0x01, 0x02, 0x00,
         0x01, 0xab, 0xac, 0x30,
-        0xe4, 0x6a, 0x6e, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
         0x40, 0x6a, 0x16, 0x00,
-        0x80, 0x3e, 0x84, 0x5d,
+        0x80, 0x3e, 0x86, 0x5d,
         0x20, 0xb8, 0x18, 0x79,
-        0x20, 0x6a, 0x84, 0x5d,
-        0x00, 0xab, 0x84, 0x5d,
+        0x20, 0x6a, 0x86, 0x5d,
+        0x00, 0xab, 0x86, 0x5d,
         0x01, 0xa9, 0x78, 0x30,
         0x10, 0xb8, 0x20, 0x79,
-        0xe4, 0x6a, 0x6e, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
         0x00, 0x65, 0xae, 0x40,
         0x10, 0x03, 0x3c, 0x69,
         0x08, 0x3c, 0x5a, 0x69,
         0x04, 0x3c, 0x92, 0x69,
         0x02, 0x3c, 0x98, 0x69,
         0x01, 0x3c, 0x44, 0x79,
-        0xff, 0x6a, 0x70, 0x00,
+        0xff, 0x6a, 0xa6, 0x00,
         0x00, 0x65, 0xa4, 0x59,
-        0x00, 0x6a, 0xc0, 0x5e,
-        0xff, 0x38, 0x30, 0x71,
+        0x00, 0x6a, 0xc2, 0x5e,
+        0xff, 0x53, 0x30, 0x71,
         0x0d, 0x6a, 0x76, 0x00,
-        0x00, 0x38, 0x12, 0x5e,
+        0x00, 0x53, 0x14, 0x5e,
         0x00, 0x65, 0xea, 0x58,
         0x12, 0x01, 0x02, 0x00,
         0x00, 0x65, 0x18, 0x41,
@@ -168,10 +168,10 @@ static uint8_t seqprog[] = {
         0x00, 0x65, 0xf2, 0x58,
         0xfd, 0x57, 0xae, 0x08,
         0x00, 0x65, 0xae, 0x40,
-        0xe4, 0x6a, 0x6e, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
         0x20, 0x3c, 0x4a, 0x79,
-        0x02, 0x6a, 0x84, 0x5d,
-        0x04, 0x6a, 0x84, 0x5d,
+        0x02, 0x6a, 0x86, 0x5d,
+        0x04, 0x6a, 0x86, 0x5d,
         0x01, 0x03, 0x4c, 0x69,
         0xf7, 0x11, 0x22, 0x08,
         0xff, 0x6a, 0x24, 0x08,
@@ -182,13 +182,13 @@ static uint8_t seqprog[] = {
         0x80, 0x86, 0xc8, 0x08,
         0x01, 0x4f, 0xc8, 0x30,
         0x00, 0x50, 0x6c, 0x61,
-        0xc4, 0x6a, 0x6e, 0x5d,
+        0xc4, 0x6a, 0x70, 0x5d,
         0x40, 0x3c, 0x68, 0x79,
-        0x28, 0x6a, 0x84, 0x5d,
+        0x28, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x4c, 0x41,
-        0x08, 0x6a, 0x84, 0x5d,
+        0x08, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x4c, 0x41,
-        0x84, 0x6a, 0x6e, 0x5d,
+        0x84, 0x6a, 0x70, 0x5d,
         0x00, 0x65, 0xf2, 0x58,
         0x01, 0x66, 0xc8, 0x30,
         0x01, 0x64, 0xd8, 0x31,
@@ -208,16 +208,16 @@ static uint8_t seqprog[] = {
         0xf7, 0x3c, 0x78, 0x08,
         0x00, 0x65, 0x20, 0x41,
         0x40, 0xaa, 0x7e, 0x10,
-        0x04, 0xaa, 0x6e, 0x5d,
-        0x00, 0x65, 0x56, 0x42,
-        0xc4, 0x6a, 0x6e, 0x5d,
+        0x04, 0xaa, 0x70, 0x5d,
+        0x00, 0x65, 0x58, 0x42,
+        0xc4, 0x6a, 0x70, 0x5d,
         0xc0, 0x6a, 0x7e, 0x00,
-        0x00, 0xa8, 0x84, 0x5d,
+        0x00, 0xa8, 0x86, 0x5d,
         0xe4, 0x6a, 0x06, 0x00,
-        0x00, 0x6a, 0x84, 0x5d,
+        0x00, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x4c, 0x41,
         0x10, 0x3c, 0xa8, 0x69,
-        0x00, 0xbb, 0x8a, 0x44,
+        0x00, 0xbb, 0x8c, 0x44,
         0x18, 0x6a, 0xda, 0x01,
         0x01, 0x69, 0xd8, 0x31,
         0x1c, 0x6a, 0xd0, 0x01,
@@ -227,31 +227,32 @@ static uint8_t seqprog[] = {
         0x01, 0x93, 0x26, 0x01,
         0x03, 0x6a, 0x2a, 0x01,
         0x01, 0x69, 0x32, 0x31,
-        0x1c, 0x6a, 0xe0, 0x5d,
+        0x1c, 0x6a, 0xe2, 0x5d,
         0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x5e,
+        0x00, 0x65, 0xaa, 0x5e,
         0x01, 0x50, 0xa0, 0x18,
         0x02, 0x6a, 0x22, 0x05,
         0x1a, 0x01, 0x02, 0x00,
         0x80, 0x6a, 0x74, 0x00,
         0x40, 0x6a, 0x78, 0x00,
         0x40, 0x6a, 0x16, 0x00,
-        0x00, 0x65, 0xd8, 0x5d,
+        0x00, 0x65, 0xda, 0x5d,
         0x01, 0x3f, 0xc8, 0x30,
-        0xbf, 0x64, 0x56, 0x7a,
-        0x80, 0x64, 0x9e, 0x73,
-        0xa0, 0x64, 0x00, 0x74,
-        0xc0, 0x64, 0xf4, 0x73,
-        0xe0, 0x64, 0x30, 0x74,
-        0x01, 0x6a, 0xd8, 0x5e,
+        0xbf, 0x64, 0x58, 0x7a,
+        0x80, 0x64, 0xa0, 0x73,
+        0xa0, 0x64, 0x02, 0x74,
+        0xc0, 0x64, 0xf6, 0x73,
+        0xe0, 0x64, 0x32, 0x74,
+        0x01, 0x6a, 0xda, 0x5e,
         0x00, 0x65, 0xcc, 0x41,
         0xf7, 0x11, 0x22, 0x08,
         0x01, 0x06, 0xd4, 0x30,
         0xff, 0x6a, 0x24, 0x08,
         0xf7, 0x01, 0x02, 0x08,
-        0x09, 0x0c, 0xe6, 0x79,
+        0xc0, 0x6a, 0x78, 0x00,
+        0x09, 0x0c, 0xe8, 0x79,
         0x08, 0x0c, 0x04, 0x68,
-        0xb1, 0x6a, 0xd8, 0x5e,
+        0xb1, 0x6a, 0xda, 0x5e,
         0xff, 0x6a, 0x26, 0x09,
         0x12, 0x01, 0x02, 0x00,
         0x02, 0x6a, 0x08, 0x30,
@@ -264,29 +265,29 @@ static uint8_t seqprog[] = {
         0x00, 0xa5, 0x4a, 0x21,
         0x00, 0xa6, 0x4c, 0x21,
         0x00, 0xa7, 0x4e, 0x25,
-        0x08, 0xeb, 0xdc, 0x7e,
-        0x80, 0xeb, 0x06, 0x7a,
+        0x08, 0xeb, 0xde, 0x7e,
+        0x80, 0xeb, 0x08, 0x7a,
         0xff, 0x6a, 0xd6, 0x09,
-        0x08, 0xeb, 0x0a, 0x6a,
+        0x08, 0xeb, 0x0c, 0x6a,
         0xff, 0x6a, 0xd4, 0x0c,
-        0x80, 0xa3, 0xdc, 0x6e,
-        0x88, 0xeb, 0x20, 0x72,
-        0x08, 0xeb, 0xdc, 0x6e,
-        0x04, 0xea, 0x24, 0xe2,
-        0x08, 0xee, 0xdc, 0x6e,
+        0x80, 0xa3, 0xde, 0x6e,
+        0x88, 0xeb, 0x22, 0x72,
+        0x08, 0xeb, 0xde, 0x6e,
+        0x04, 0xea, 0x26, 0xe2,
+        0x08, 0xee, 0xde, 0x6e,
         0x04, 0x6a, 0xd0, 0x81,
         0x05, 0xa4, 0xc0, 0x89,
         0x03, 0xa5, 0xc2, 0x31,
         0x09, 0x6a, 0xd6, 0x05,
-        0x00, 0x65, 0x08, 0x5a,
+        0x00, 0x65, 0x0a, 0x5a,
         0x06, 0xa4, 0xd4, 0x89,
-        0x80, 0x94, 0xdc, 0x7e,
+        0x80, 0x94, 0xde, 0x7e,
         0x07, 0xe9, 0x10, 0x31,
         0x01, 0xe9, 0x46, 0x31,
-        0x00, 0xa3, 0xba, 0x5e,
-        0x00, 0x65, 0xfa, 0x59,
+        0x00, 0xa3, 0xbc, 0x5e,
+        0x00, 0x65, 0xfc, 0x59,
         0x01, 0xa4, 0xca, 0x30,
-        0x80, 0xa3, 0x34, 0x7a,
+        0x80, 0xa3, 0x36, 0x7a,
         0x02, 0x65, 0xca, 0x00,
         0x01, 0x65, 0xf8, 0x31,
         0x80, 0x93, 0x26, 0x01,
@@ -294,162 +295,162 @@ static uint8_t seqprog[] = {
         0x01, 0x8c, 0xc8, 0x30,
         0x00, 0x88, 0xc8, 0x18,
         0x02, 0x64, 0xc8, 0x88,
-        0xff, 0x64, 0xdc, 0x7e,
-        0xff, 0x8d, 0x4a, 0x6a,
-        0xff, 0x8e, 0x4a, 0x6a,
+        0xff, 0x64, 0xde, 0x7e,
+        0xff, 0x8d, 0x4c, 0x6a,
+        0xff, 0x8e, 0x4c, 0x6a,
         0x03, 0x8c, 0xd4, 0x98,
-        0x00, 0x65, 0xdc, 0x56,
+        0x00, 0x65, 0xde, 0x56,
         0x01, 0x64, 0x70, 0x30,
         0xff, 0x64, 0xc8, 0x10,
         0x01, 0x64, 0xc8, 0x18,
         0x00, 0x8c, 0x18, 0x19,
         0xff, 0x8d, 0x1a, 0x21,
         0xff, 0x8e, 0x1c, 0x25,
-        0xc0, 0x3c, 0x5a, 0x7a,
-        0x21, 0x6a, 0xd8, 0x5e,
+        0xc0, 0x3c, 0x5c, 0x7a,
+        0x21, 0x6a, 0xda, 0x5e,
         0xa8, 0x6a, 0x76, 0x00,
         0x79, 0x6a, 0x76, 0x00,
-        0x40, 0x3f, 0x62, 0x6a,
+        0x40, 0x3f, 0x64, 0x6a,
         0x04, 0x3b, 0x76, 0x00,
         0x04, 0x6a, 0xd4, 0x81,
-        0x20, 0x3c, 0x6a, 0x7a,
-        0x51, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x82, 0x42,
+        0x20, 0x3c, 0x6c, 0x7a,
+        0x51, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x84, 0x42,
         0x20, 0x3c, 0x78, 0x00,
-        0x00, 0xb3, 0xba, 0x5e,
+        0x00, 0xb3, 0xbc, 0x5e,
         0x07, 0xac, 0x10, 0x31,
         0x05, 0xb3, 0x46, 0x31,
         0x88, 0x6a, 0xcc, 0x00,
-        0xac, 0x6a, 0xee, 0x5d,
+        0xac, 0x6a, 0xf0, 0x5d,
         0xa3, 0x6a, 0xcc, 0x00,
-        0xb3, 0x6a, 0xf2, 0x5d,
-        0x00, 0x65, 0x3a, 0x5a,
+        0xb3, 0x6a, 0xf4, 0x5d,
+        0x00, 0x65, 0x3c, 0x5a,
         0xfd, 0xa4, 0x48, 0x09,
         0x03, 0x8c, 0x10, 0x30,
-        0x00, 0x65, 0xe6, 0x5d,
-        0x01, 0xa4, 0x94, 0x7a,
+        0x00, 0x65, 0xe8, 0x5d,
+        0x01, 0xa4, 0x96, 0x7a,
         0x04, 0x3b, 0x76, 0x08,
         0x01, 0x3b, 0x26, 0x31,
         0x80, 0x02, 0x04, 0x00,
-        0x10, 0x0c, 0x8a, 0x7a,
-        0x03, 0x9e, 0x8c, 0x6a,
+        0x10, 0x0c, 0x8c, 0x7a,
+        0x03, 0x9e, 0x8e, 0x6a,
         0x7f, 0x02, 0x04, 0x08,
-        0x91, 0x6a, 0xd8, 0x5e,
+        0x91, 0x6a, 0xda, 0x5e,
         0x00, 0x65, 0xcc, 0x41,
         0x01, 0xa4, 0xca, 0x30,
-        0x80, 0xa3, 0x9a, 0x7a,
+        0x80, 0xa3, 0x9c, 0x7a,
         0x02, 0x65, 0xca, 0x00,
         0x01, 0x65, 0xf8, 0x31,
         0x01, 0x3b, 0x26, 0x31,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x01, 0xfc, 0xa8, 0x6a,
-        0x80, 0x0b, 0x9e, 0x6a,
-        0x10, 0x0c, 0x9e, 0x7a,
-        0x20, 0x93, 0x9e, 0x6a,
+        0x00, 0x65, 0x10, 0x5a,
+        0x01, 0xfc, 0xaa, 0x6a,
+        0x80, 0x0b, 0xa0, 0x6a,
+        0x10, 0x0c, 0xa0, 0x7a,
+        0x20, 0x93, 0xa0, 0x6a,
         0x02, 0x93, 0x26, 0x01,
-        0x02, 0xfc, 0xb2, 0x7a,
-        0x40, 0x0d, 0xc6, 0x6a,
+        0x02, 0xfc, 0xb4, 0x7a,
+        0x40, 0x0d, 0xc8, 0x6a,
         0x01, 0xa4, 0x48, 0x01,
-        0x00, 0x65, 0xc6, 0x42,
-        0x40, 0x0d, 0xb8, 0x6a,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x00, 0x65, 0xaa, 0x42,
-        0x80, 0xfc, 0xc2, 0x7a,
-        0x80, 0xa4, 0xc2, 0x6a,
+        0x00, 0x65, 0xc8, 0x42,
+        0x40, 0x0d, 0xba, 0x6a,
+        0x00, 0x65, 0x10, 0x5a,
+        0x00, 0x65, 0xac, 0x42,
+        0x80, 0xfc, 0xc4, 0x7a,
+        0x80, 0xa4, 0xc4, 0x6a,
         0xff, 0xa5, 0x4a, 0x19,
         0xff, 0xa6, 0x4c, 0x21,
         0xff, 0xa7, 0x4e, 0x21,
         0xf8, 0xfc, 0x48, 0x09,
         0x7f, 0xa3, 0x46, 0x09,
-        0x04, 0x3b, 0xe2, 0x6a,
+        0x04, 0x3b, 0xe4, 0x6a,
         0x02, 0x93, 0x26, 0x01,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0x94, 0xc8, 0x7a,
-        0x01, 0xa4, 0xe0, 0x7a,
-        0x01, 0xfc, 0xd6, 0x7a,
-        0x01, 0x94, 0xe2, 0x6a,
-        0x01, 0x94, 0xe2, 0x6a,
-        0x01, 0x94, 0xe2, 0x6a,
-        0x00, 0x65, 0x82, 0x42,
-        0x01, 0x94, 0xe0, 0x7a,
-        0x10, 0x94, 0xe2, 0x6a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0x94, 0xca, 0x7a,
+        0x01, 0xa4, 0xe2, 0x7a,
+        0x01, 0xfc, 0xd8, 0x7a,
+        0x01, 0x94, 0xe4, 0x6a,
+        0x01, 0x94, 0xe4, 0x6a,
+        0x01, 0x94, 0xe4, 0x6a,
+        0x00, 0x65, 0x84, 0x42,
+        0x01, 0x94, 0xe2, 0x7a,
+        0x10, 0x94, 0xe4, 0x6a,
         0xd7, 0x93, 0x26, 0x09,
-        0x28, 0x93, 0xe6, 0x6a,
+        0x28, 0x93, 0xe8, 0x6a,
         0x01, 0x85, 0x0a, 0x01,
-        0x02, 0xfc, 0xee, 0x6a,
+        0x02, 0xfc, 0xf0, 0x6a,
         0x01, 0x14, 0x46, 0x31,
         0xff, 0x6a, 0x10, 0x09,
         0xfe, 0x85, 0x0a, 0x09,
-        0xff, 0x38, 0xfc, 0x6a,
-        0x80, 0xa3, 0xfc, 0x7a,
-        0x80, 0x0b, 0xfa, 0x7a,
-        0x04, 0x3b, 0xfc, 0x7a,
+        0xff, 0x38, 0xfe, 0x6a,
+        0x80, 0xa3, 0xfe, 0x7a,
+        0x80, 0x0b, 0xfc, 0x7a,
+        0x04, 0x3b, 0xfe, 0x7a,
         0xbf, 0x3b, 0x76, 0x08,
         0x01, 0x3b, 0x26, 0x31,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x01, 0x0b, 0x0a, 0x6b,
-        0x10, 0x0c, 0xfe, 0x7a,
-        0x04, 0x93, 0x08, 0x6b,
-        0x01, 0x94, 0x06, 0x7b,
-        0x10, 0x94, 0x08, 0x6b,
+        0x00, 0x65, 0x10, 0x5a,
+        0x01, 0x0b, 0x0c, 0x6b,
+        0x10, 0x0c, 0x00, 0x7b,
+        0x04, 0x93, 0x0a, 0x6b,
+        0x01, 0x94, 0x08, 0x7b,
+        0x10, 0x94, 0x0a, 0x6b,
         0xc7, 0x93, 0x26, 0x09,
         0x01, 0x99, 0xd4, 0x30,
-        0x38, 0x93, 0x0c, 0x6b,
-        0xff, 0x08, 0x5a, 0x6b,
-        0xff, 0x09, 0x5a, 0x6b,
-        0xff, 0x0a, 0x5a, 0x6b,
-        0xff, 0x38, 0x28, 0x7b,
+        0x38, 0x93, 0x0e, 0x6b,
+        0xff, 0x08, 0x5c, 0x6b,
+        0xff, 0x09, 0x5c, 0x6b,
+        0xff, 0x0a, 0x5c, 0x6b,
+        0xff, 0x38, 0x2a, 0x7b,
         0x04, 0x14, 0x10, 0x31,
         0x01, 0x38, 0x18, 0x31,
         0x02, 0x6a, 0x1a, 0x31,
         0x88, 0x6a, 0xcc, 0x00,
-        0x14, 0x6a, 0xf4, 0x5d,
-        0x00, 0x38, 0xe0, 0x5d,
+        0x14, 0x6a, 0xf6, 0x5d,
+        0x00, 0x38, 0xe2, 0x5d,
         0xff, 0x6a, 0x70, 0x08,
-        0x00, 0x65, 0x54, 0x43,
-        0x80, 0xa3, 0x2e, 0x7b,
+        0x00, 0x65, 0x56, 0x43,
+        0x80, 0xa3, 0x30, 0x7b,
         0x01, 0xa4, 0x48, 0x01,
-        0x00, 0x65, 0x5a, 0x43,
-        0x08, 0xeb, 0x34, 0x7b,
-        0x00, 0x65, 0x0e, 0x5a,
-        0x08, 0xeb, 0x30, 0x6b,
+        0x00, 0x65, 0x5c, 0x43,
+        0x08, 0xeb, 0x36, 0x7b,
+        0x00, 0x65, 0x10, 0x5a,
+        0x08, 0xeb, 0x32, 0x6b,
         0x07, 0xe9, 0x10, 0x31,
         0x01, 0xe9, 0xca, 0x30,
         0x01, 0x65, 0x46, 0x31,
-        0x00, 0x6a, 0xba, 0x5e,
+        0x00, 0x6a, 0xbc, 0x5e,
         0x88, 0x6a, 0xcc, 0x00,
-        0xa4, 0x6a, 0xf4, 0x5d,
-        0x08, 0x6a, 0xe0, 0x5d,
+        0xa4, 0x6a, 0xf6, 0x5d,
+        0x08, 0x6a, 0xe2, 0x5d,
         0x0d, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x5e,
+        0x00, 0x65, 0xaa, 0x5e,
         0x88, 0x6a, 0xcc, 0x00,
-        0x00, 0x65, 0x8a, 0x5e,
+        0x00, 0x65, 0x8c, 0x5e,
         0x01, 0x99, 0x46, 0x31,
-        0x00, 0xa3, 0xba, 0x5e,
+        0x00, 0xa3, 0xbc, 0x5e,
         0x01, 0x88, 0x10, 0x31,
-        0x00, 0x65, 0x3a, 0x5a,
-        0x00, 0x65, 0xfa, 0x59,
+        0x00, 0x65, 0x3c, 0x5a,
+        0x00, 0x65, 0xfc, 0x59,
         0x03, 0x8c, 0x10, 0x30,
-        0x00, 0x65, 0xe6, 0x5d,
-        0x80, 0x0b, 0x82, 0x6a,
-        0x80, 0x0b, 0x62, 0x6b,
-        0x01, 0x0c, 0x5c, 0x7b,
-        0x10, 0x0c, 0x82, 0x7a,
-        0x03, 0x9e, 0x82, 0x6a,
-        0x00, 0x65, 0x04, 0x5a,
-        0x00, 0x6a, 0xba, 0x5e,
-        0x01, 0xa4, 0x82, 0x6b,
-        0xff, 0x38, 0x78, 0x7b,
+        0x00, 0x65, 0xe8, 0x5d,
+        0x80, 0x0b, 0x84, 0x6a,
+        0x80, 0x0b, 0x64, 0x6b,
+        0x01, 0x0c, 0x5e, 0x7b,
+        0x10, 0x0c, 0x84, 0x7a,
+        0x03, 0x9e, 0x84, 0x6a,
+        0x00, 0x65, 0x06, 0x5a,
+        0x00, 0x6a, 0xbc, 0x5e,
+        0x01, 0xa4, 0x84, 0x6b,
+        0xff, 0x38, 0x7a, 0x7b,
         0x01, 0x38, 0xc8, 0x30,
         0x00, 0x08, 0x40, 0x19,
         0xff, 0x6a, 0xc8, 0x08,
         0x00, 0x09, 0x42, 0x21,
         0x00, 0x0a, 0x44, 0x21,
         0xff, 0x6a, 0x70, 0x08,
-        0x00, 0x65, 0x7a, 0x43,
+        0x00, 0x65, 0x7c, 0x43,
         0x03, 0x08, 0x40, 0x31,
         0x03, 0x08, 0x40, 0x31,
         0x01, 0x08, 0x40, 0x31,
@@ -461,16 +462,16 @@ static uint8_t seqprog[] = {
         0x04, 0x3c, 0xcc, 0x79,
         0xfb, 0x3c, 0x78, 0x08,
         0x04, 0x93, 0x20, 0x79,
-        0x01, 0x0c, 0x8e, 0x6b,
+        0x01, 0x0c, 0x90, 0x6b,
         0x80, 0xba, 0x20, 0x79,
         0x80, 0x04, 0x20, 0x79,
-        0xe4, 0x6a, 0x6e, 0x5d,
-        0x23, 0x6a, 0x84, 0x5d,
-        0x01, 0x6a, 0x84, 0x5d,
+        0xe4, 0x6a, 0x70, 0x5d,
+        0x23, 0x6a, 0x86, 0x5d,
+        0x01, 0x6a, 0x86, 0x5d,
         0x00, 0x65, 0x20, 0x41,
         0x00, 0x65, 0xcc, 0x41,
-        0x80, 0x3c, 0xa2, 0x7b,
-        0x21, 0x6a, 0xd8, 0x5e,
+        0x80, 0x3c, 0xa4, 0x7b,
+        0x21, 0x6a, 0xda, 0x5e,
         0x01, 0xbc, 0x18, 0x31,
         0x02, 0x6a, 0x1a, 0x31,
         0x02, 0x6a, 0xf8, 0x01,
@@ -480,16 +481,16 @@ static uint8_t seqprog[] = {
         0xff, 0x6a, 0x12, 0x08,
         0xff, 0x6a, 0x14, 0x08,
         0xf3, 0xbc, 0xd4, 0x18,
-        0xa0, 0x6a, 0xc8, 0x53,
+        0xa0, 0x6a, 0xca, 0x53,
         0x04, 0xa0, 0x10, 0x31,
         0xac, 0x6a, 0x26, 0x01,
         0x04, 0xa0, 0x10, 0x31,
         0x03, 0x08, 0x18, 0x31,
         0x88, 0x6a, 0xcc, 0x00,
-        0xa0, 0x6a, 0xf4, 0x5d,
-        0x00, 0xbc, 0xe0, 0x5d,
+        0xa0, 0x6a, 0xf6, 0x5d,
+        0x00, 0xbc, 0xe2, 0x5d,
         0x3d, 0x6a, 0x26, 0x01,
-        0x00, 0x65, 0xe0, 0x43,
+        0x00, 0x65, 0xe2, 0x43,
         0xff, 0x6a, 0x10, 0x09,
         0xa4, 0x6a, 0x26, 0x01,
         0x0c, 0xa0, 0x32, 0x31,
@@ -499,128 +500,128 @@ static uint8_t seqprog[] = {
         0x36, 0x6a, 0x26, 0x01,
         0x02, 0x93, 0x26, 0x01,
         0x35, 0x6a, 0x26, 0x01,
-        0x00, 0x65, 0x9c, 0x5e,
-        0x00, 0x65, 0x9c, 0x5e,
+        0x00, 0x65, 0x9e, 0x5e,
+        0x00, 0x65, 0x9e, 0x5e,
         0x02, 0x93, 0x26, 0x01,
         0xbf, 0x3c, 0x78, 0x08,
-        0x04, 0x0b, 0xe6, 0x6b,
-        0x10, 0x0c, 0xe2, 0x7b,
-        0x01, 0x03, 0xe6, 0x6b,
-        0x20, 0x93, 0xe8, 0x6b,
-        0x04, 0x0b, 0xee, 0x6b,
+        0x04, 0x0b, 0xe8, 0x6b,
+        0x10, 0x0c, 0xe4, 0x7b,
+        0x01, 0x03, 0xe8, 0x6b,
+        0x20, 0x93, 0xea, 0x6b,
+        0x04, 0x0b, 0xf0, 0x6b,
         0x40, 0x3c, 0x78, 0x00,
         0xc7, 0x93, 0x26, 0x09,
-        0x38, 0x93, 0xf0, 0x6b,
+        0x38, 0x93, 0xf2, 0x6b,
         0x00, 0x65, 0xcc, 0x41,
-        0x80, 0x3c, 0x56, 0x6c,
+        0x80, 0x3c, 0x58, 0x6c,
         0x01, 0x06, 0x50, 0x31,
         0x80, 0xb8, 0x70, 0x01,
         0x00, 0x65, 0xcc, 0x41,
         0x10, 0x3f, 0x06, 0x00,
         0x10, 0x6a, 0x06, 0x00,
         0x01, 0x3a, 0xca, 0x30,
-        0x80, 0x65, 0x1c, 0x64,
-        0x10, 0xb8, 0x40, 0x6c,
+        0x80, 0x65, 0x1e, 0x64,
+        0x10, 0xb8, 0x42, 0x6c,
         0xc0, 0x3e, 0xca, 0x00,
-        0x40, 0xb8, 0x0c, 0x6c,
+        0x40, 0xb8, 0x0e, 0x6c,
         0xbf, 0x65, 0xca, 0x08,
-        0x20, 0xb8, 0x20, 0x7c,
+        0x20, 0xb8, 0x22, 0x7c,
         0x01, 0x65, 0x0c, 0x30,
-        0x00, 0x65, 0xd8, 0x5d,
-        0xa0, 0x3f, 0x28, 0x64,
+        0x00, 0x65, 0xda, 0x5d,
+        0xa0, 0x3f, 0x2a, 0x64,
         0x23, 0xb8, 0x0c, 0x08,
-        0x00, 0x65, 0xd8, 0x5d,
-        0xa0, 0x3f, 0x28, 0x64,
-        0x00, 0xbb, 0x20, 0x44,
-        0xff, 0x65, 0x20, 0x64,
-        0x00, 0x65, 0x40, 0x44,
+        0x00, 0x65, 0xda, 0x5d,
+        0xa0, 0x3f, 0x2a, 0x64,
+        0x00, 0xbb, 0x22, 0x44,
+        0xff, 0x65, 0x22, 0x64,
+        0x00, 0x65, 0x42, 0x44,
         0x40, 0x6a, 0x18, 0x00,
         0x01, 0x65, 0x0c, 0x30,
-        0x00, 0x65, 0xd8, 0x5d,
-        0xa0, 0x3f, 0xfc, 0x73,
+        0x00, 0x65, 0xda, 0x5d,
+        0xa0, 0x3f, 0xfe, 0x73,
         0x40, 0x6a, 0x18, 0x00,
         0x01, 0x3a, 0xa6, 0x30,
         0x08, 0x6a, 0x74, 0x00,
         0x00, 0x65, 0xcc, 0x41,
-        0x64, 0x6a, 0x68, 0x5d,
-        0x80, 0x64, 0xd8, 0x6c,
-        0x04, 0x64, 0x9a, 0x74,
-        0x02, 0x64, 0xaa, 0x74,
-        0x00, 0x6a, 0x60, 0x74,
-        0x03, 0x64, 0xc8, 0x74,
-        0x23, 0x64, 0x48, 0x74,
-        0x08, 0x64, 0x5c, 0x74,
-        0x61, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0xd8, 0x5d,
+        0x64, 0x6a, 0x6a, 0x5d,
+        0x80, 0x64, 0xda, 0x6c,
+        0x04, 0x64, 0x9c, 0x74,
+        0x02, 0x64, 0xac, 0x74,
+        0x00, 0x6a, 0x62, 0x74,
+        0x03, 0x64, 0xca, 0x74,
+        0x23, 0x64, 0x4a, 0x74,
+        0x08, 0x64, 0x5e, 0x74,
+        0x61, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0xda, 0x5d,
         0x08, 0x51, 0xce, 0x71,
-        0x00, 0x65, 0x40, 0x44,
-        0x80, 0x04, 0x5a, 0x7c,
-        0x51, 0x6a, 0x5e, 0x5d,
-        0x01, 0x51, 0x5a, 0x64,
-        0x01, 0xa4, 0x52, 0x7c,
-        0x80, 0xba, 0x5c, 0x6c,
-        0x41, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x5c, 0x44,
-        0x21, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x5c, 0x44,
-        0x07, 0x6a, 0x54, 0x5d,
+        0x00, 0x65, 0x42, 0x44,
+        0x80, 0x04, 0x5c, 0x7c,
+        0x51, 0x6a, 0x60, 0x5d,
+        0x01, 0x51, 0x5c, 0x64,
+        0x01, 0xa4, 0x54, 0x7c,
+        0x80, 0xba, 0x5e, 0x6c,
+        0x41, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x5e, 0x44,
+        0x21, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x5e, 0x44,
+        0x07, 0x6a, 0x56, 0x5d,
         0x01, 0x06, 0xd4, 0x30,
         0x00, 0x65, 0xcc, 0x41,
-        0x80, 0xb8, 0x56, 0x7c,
-        0xc0, 0x3c, 0x6a, 0x7c,
-        0x80, 0x3c, 0x56, 0x6c,
-        0xff, 0xa8, 0x6a, 0x6c,
-        0x40, 0x3c, 0x56, 0x6c,
-        0x10, 0xb8, 0x6e, 0x7c,
-        0xa1, 0x6a, 0xd8, 0x5e,
-        0x01, 0xb4, 0x74, 0x6c,
-        0x02, 0xb4, 0x76, 0x6c,
-        0x01, 0xa4, 0x76, 0x7c,
-        0xff, 0xa8, 0x86, 0x7c,
+        0x80, 0xb8, 0x58, 0x7c,
+        0xc0, 0x3c, 0x6c, 0x7c,
+        0x80, 0x3c, 0x58, 0x6c,
+        0xff, 0xa8, 0x6c, 0x6c,
+        0x40, 0x3c, 0x58, 0x6c,
+        0x10, 0xb8, 0x70, 0x7c,
+        0xa1, 0x6a, 0xda, 0x5e,
+        0x01, 0xb4, 0x76, 0x6c,
+        0x02, 0xb4, 0x78, 0x6c,
+        0x01, 0xa4, 0x78, 0x7c,
+        0xff, 0xa8, 0x88, 0x7c,
         0x04, 0xb4, 0x68, 0x01,
         0x01, 0x6a, 0x76, 0x00,
-        0x00, 0xbb, 0x12, 0x5e,
-        0xff, 0xa8, 0x86, 0x7c,
-        0x71, 0x6a, 0xd8, 0x5e,
-        0x40, 0x51, 0x86, 0x64,
-        0x00, 0x65, 0xb2, 0x5e,
+        0x00, 0xbb, 0x14, 0x5e,
+        0xff, 0xa8, 0x88, 0x7c,
+        0x71, 0x6a, 0xda, 0x5e,
+        0x40, 0x51, 0x88, 0x64,
+        0x00, 0x65, 0xb4, 0x5e,
         0x00, 0x65, 0xde, 0x41,
-        0x00, 0xbb, 0x8a, 0x5c,
+        0x00, 0xbb, 0x8c, 0x5c,
         0x00, 0x65, 0xde, 0x41,
-        0x00, 0x65, 0xb2, 0x5e,
+        0x00, 0x65, 0xb4, 0x5e,
         0x01, 0x65, 0xa2, 0x30,
         0x01, 0xf8, 0xc8, 0x30,
         0x01, 0x4e, 0xc8, 0x30,
-        0x00, 0x6a, 0xb6, 0xdd,
-        0x00, 0x51, 0xc8, 0x5d,
+        0x00, 0x6a, 0xb8, 0xdd,
+        0x00, 0x51, 0xca, 0x5d,
         0x01, 0x4e, 0x9c, 0x18,
         0x02, 0x6a, 0x22, 0x05,
-        0xc0, 0x3c, 0x56, 0x6c,
+        0xc0, 0x3c, 0x58, 0x6c,
         0x04, 0xb8, 0x70, 0x01,
-        0x00, 0x65, 0xd4, 0x5e,
+        0x00, 0x65, 0xd6, 0x5e,
         0x20, 0xb8, 0xde, 0x69,
         0x01, 0xbb, 0xa2, 0x30,
         0x3f, 0xba, 0x7c, 0x08,
-        0x00, 0xb9, 0xce, 0x5c,
+        0x00, 0xb9, 0xd0, 0x5c,
         0x00, 0x65, 0xde, 0x41,
         0x01, 0x06, 0xd4, 0x30,
         0x20, 0x3c, 0xcc, 0x79,
-        0x20, 0x3c, 0x5c, 0x7c,
-        0x01, 0xa4, 0xb8, 0x7c,
+        0x20, 0x3c, 0x5e, 0x7c,
+        0x01, 0xa4, 0xba, 0x7c,
         0x01, 0xb4, 0x68, 0x01,
         0x00, 0x65, 0xcc, 0x41,
-        0x00, 0x65, 0x5c, 0x44,
+        0x00, 0x65, 0x5e, 0x44,
         0x04, 0x14, 0x58, 0x31,
         0x01, 0x06, 0xd4, 0x30,
         0x08, 0xa0, 0x60, 0x31,
         0xac, 0x6a, 0xcc, 0x00,
-        0x14, 0x6a, 0xf4, 0x5d,
+        0x14, 0x6a, 0xf6, 0x5d,
         0x01, 0x06, 0xd4, 0x30,
-        0xa0, 0x6a, 0xec, 0x5d,
+        0xa0, 0x6a, 0xee, 0x5d,
         0x00, 0x65, 0xcc, 0x41,
         0xdf, 0x3c, 0x78, 0x08,
         0x12, 0x01, 0x02, 0x00,
-        0x00, 0x65, 0x5c, 0x44,
+        0x00, 0x65, 0x5e, 0x44,
         0x4c, 0x65, 0xcc, 0x28,
         0x01, 0x3e, 0x20, 0x31,
         0xd0, 0x66, 0xcc, 0x18,
@@ -631,102 +632,102 @@ static uint8_t seqprog[] = {
         0xd0, 0x65, 0xca, 0x18,
         0x01, 0x3e, 0x20, 0x31,
         0x30, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0xe6, 0x4c,
+        0x00, 0x65, 0xe8, 0x4c,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0x20, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0xee, 0x54,
+        0x00, 0x65, 0xf0, 0x54,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0x20, 0x65, 0xca, 0x18,
         0xe0, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0xf8, 0x4c,
+        0x00, 0x65, 0xfa, 0x4c,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0xd0, 0x65, 0xd4, 0x18,
-        0x00, 0x65, 0x00, 0x55,
+        0x00, 0x65, 0x02, 0x55,
         0xe1, 0x6a, 0x22, 0x01,
         0xff, 0x6a, 0xd4, 0x08,
         0x01, 0x6c, 0xa2, 0x30,
-        0xff, 0x51, 0x12, 0x75,
-        0x00, 0x51, 0x8e, 0x5d,
+        0xff, 0x51, 0x14, 0x75,
+        0x00, 0x51, 0x90, 0x5d,
         0x01, 0x51, 0x20, 0x31,
-        0x00, 0x65, 0x34, 0x45,
+        0x00, 0x65, 0x36, 0x45,
         0x3f, 0xba, 0xc8, 0x08,
-        0x00, 0x3e, 0x34, 0x75,
-        0x00, 0x65, 0xb0, 0x5e,
+        0x00, 0x3e, 0x36, 0x75,
+        0x00, 0x65, 0xb2, 0x5e,
         0x80, 0x3c, 0x78, 0x00,
         0x01, 0x06, 0xd4, 0x30,
-        0x00, 0x65, 0xd8, 0x5d,
+        0x00, 0x65, 0xda, 0x5d,
         0x01, 0x3c, 0x78, 0x00,
-        0xe0, 0x3f, 0x50, 0x65,
+        0xe0, 0x3f, 0x52, 0x65,
         0x02, 0x3c, 0x78, 0x00,
-        0x20, 0x12, 0x50, 0x65,
-        0x51, 0x6a, 0x5e, 0x5d,
-        0x00, 0x51, 0x8e, 0x5d,
-        0x51, 0x6a, 0x5e, 0x5d,
+        0x20, 0x12, 0x52, 0x65,
+        0x51, 0x6a, 0x60, 0x5d,
+        0x00, 0x51, 0x90, 0x5d,
+        0x51, 0x6a, 0x60, 0x5d,
         0x01, 0x51, 0x20, 0x31,
         0x04, 0x3c, 0x78, 0x00,
         0x01, 0xb9, 0xc8, 0x30,
-        0x00, 0x3d, 0x4e, 0x65,
+        0x00, 0x3d, 0x50, 0x65,
         0x08, 0x3c, 0x78, 0x00,
         0x3f, 0xba, 0xc8, 0x08,
-        0x00, 0x3e, 0x4e, 0x65,
+        0x00, 0x3e, 0x50, 0x65,
         0x10, 0x3c, 0x78, 0x00,
-        0x04, 0xb8, 0x4e, 0x7d,
+        0x04, 0xb8, 0x50, 0x7d,
         0xfb, 0xb8, 0x70, 0x09,
-        0x20, 0xb8, 0x44, 0x6d,
+        0x20, 0xb8, 0x46, 0x6d,
         0x01, 0x90, 0xc8, 0x30,
         0xff, 0x6a, 0xa2, 0x00,
-        0x00, 0x3d, 0xce, 0x5c,
+        0x00, 0x3d, 0xd0, 0x5c,
         0x01, 0x64, 0x20, 0x31,
         0xff, 0x6a, 0x78, 0x08,
         0x00, 0x65, 0xea, 0x58,
-        0x10, 0xb8, 0x5c, 0x7c,
-        0xff, 0x6a, 0x54, 0x5d,
-        0x00, 0x65, 0x5c, 0x44,
-        0x00, 0x65, 0xb0, 0x5e,
-        0x31, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x5c, 0x44,
+        0x10, 0xb8, 0x5e, 0x7c,
+        0xff, 0x6a, 0x56, 0x5d,
+        0x00, 0x65, 0x5e, 0x44,
+        0x00, 0x65, 0xb2, 0x5e,
+        0x31, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x5e, 0x44,
         0x10, 0x3f, 0x06, 0x00,
         0x10, 0x6a, 0x06, 0x00,
         0x01, 0x65, 0x74, 0x34,
-        0x81, 0x6a, 0xd8, 0x5e,
-        0x00, 0x65, 0x60, 0x45,
+        0x81, 0x6a, 0xda, 0x5e,
+        0x00, 0x65, 0x62, 0x45,
         0x01, 0x06, 0xd4, 0x30,
-        0x01, 0x0c, 0x60, 0x7d,
-        0x04, 0x0c, 0x5a, 0x6d,
+        0x01, 0x0c, 0x62, 0x7d,
+        0x04, 0x0c, 0x5c, 0x6d,
         0xe0, 0x03, 0x7e, 0x08,
         0xe0, 0x3f, 0xcc, 0x61,
         0x01, 0x65, 0xcc, 0x30,
         0x01, 0x12, 0xda, 0x34,
         0x01, 0x06, 0xd4, 0x34,
-        0x01, 0x03, 0x6e, 0x6d,
+        0x01, 0x03, 0x70, 0x6d,
         0x40, 0x03, 0xcc, 0x08,
         0x01, 0x65, 0x06, 0x30,
         0x40, 0x65, 0xc8, 0x08,
-        0x00, 0x66, 0x7c, 0x75,
-        0x40, 0x65, 0x7c, 0x7d,
-        0x00, 0x65, 0x7c, 0x5d,
+        0x00, 0x66, 0x7e, 0x75,
+        0x40, 0x65, 0x7e, 0x7d,
+        0x00, 0x65, 0x7e, 0x5d,
         0xff, 0x6a, 0xd4, 0x08,
         0xff, 0x6a, 0xd4, 0x08,
         0xff, 0x6a, 0xd4, 0x08,
         0xff, 0x6a, 0xd4, 0x0c,
         0x08, 0x01, 0x02, 0x00,
-        0x02, 0x0b, 0x86, 0x7d,
+        0x02, 0x0b, 0x88, 0x7d,
         0x01, 0x65, 0x0c, 0x30,
-        0x02, 0x0b, 0x8a, 0x7d,
+        0x02, 0x0b, 0x8c, 0x7d,
         0xf7, 0x01, 0x02, 0x0c,
         0x01, 0x65, 0xc8, 0x30,
-        0xff, 0x41, 0xae, 0x75,
+        0xff, 0x41, 0xb0, 0x75,
         0x01, 0x41, 0x20, 0x31,
         0xff, 0x6a, 0xa4, 0x00,
-        0x00, 0x65, 0x9e, 0x45,
-        0xff, 0xbf, 0xae, 0x75,
+        0x00, 0x65, 0xa0, 0x45,
+        0xff, 0xbf, 0xb0, 0x75,
         0x01, 0x90, 0xa4, 0x30,
         0x01, 0xbf, 0x20, 0x31,
-        0x00, 0xbb, 0x98, 0x65,
-        0xff, 0x52, 0xac, 0x75,
+        0x00, 0xbb, 0x9a, 0x65,
+        0xff, 0x52, 0xae, 0x75,
         0x01, 0xbf, 0xcc, 0x30,
         0x01, 0x90, 0xca, 0x30,
         0x01, 0x52, 0x20, 0x31,
@@ -734,28 +735,28 @@ static uint8_t seqprog[] = {
         0x01, 0x65, 0x20, 0x35,
         0x01, 0xbf, 0x82, 0x34,
         0x01, 0x64, 0xa2, 0x30,
-        0x00, 0x6a, 0xc0, 0x5e,
+        0x00, 0x6a, 0xc2, 0x5e,
         0x0d, 0x6a, 0x76, 0x00,
-        0x00, 0x51, 0x12, 0x46,
+        0x00, 0x51, 0x14, 0x46,
         0x01, 0x65, 0xa4, 0x30,
         0xe0, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0x06, 0x5e,
+        0x48, 0x6a, 0x08, 0x5e,
         0x01, 0x6a, 0xd0, 0x01,
         0x01, 0x6a, 0xdc, 0x05,
         0x88, 0x6a, 0xcc, 0x00,
-        0x48, 0x6a, 0x06, 0x5e,
-        0x01, 0x6a, 0xe0, 0x5d,
+        0x48, 0x6a, 0x08, 0x5e,
+        0x01, 0x6a, 0xe2, 0x5d,
         0x01, 0x6a, 0x26, 0x05,
         0x01, 0x65, 0xd8, 0x31,
         0x09, 0xee, 0xdc, 0x01,
-        0x80, 0xee, 0xcc, 0x7d,
+        0x80, 0xee, 0xce, 0x7d,
         0xff, 0x6a, 0xdc, 0x0d,
         0x01, 0x65, 0x32, 0x31,
         0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x46,
-        0x81, 0x6a, 0xd8, 0x5e,
-        0x01, 0x0c, 0xd8, 0x7d,
-        0x04, 0x0c, 0xd6, 0x6d,
+        0x00, 0x65, 0xaa, 0x46,
+        0x81, 0x6a, 0xda, 0x5e,
+        0x01, 0x0c, 0xda, 0x7d,
+        0x04, 0x0c, 0xd8, 0x6d,
         0xe0, 0x03, 0x06, 0x08,
         0xe0, 0x03, 0x7e, 0x0c,
         0x01, 0x65, 0x18, 0x31,
@@ -774,7 +775,7 @@ static uint8_t seqprog[] = {
         0x01, 0x6c, 0xda, 0x34,
         0x3d, 0x64, 0xa4, 0x28,
         0x55, 0x64, 0xc8, 0x28,
-        0x00, 0x65, 0x06, 0x46,
+        0x00, 0x65, 0x08, 0x46,
         0x2e, 0x64, 0xa4, 0x28,
         0x66, 0x64, 0xc8, 0x28,
         0x00, 0x6c, 0xda, 0x18,
@@ -785,63 +786,63 @@ static uint8_t seqprog[] = {
         0x00, 0x6c, 0xda, 0x24,
         0x01, 0x65, 0xc8, 0x30,
         0xe0, 0x6a, 0xcc, 0x00,
-        0x44, 0x6a, 0x02, 0x5e,
+        0x44, 0x6a, 0x04, 0x5e,
         0x01, 0x90, 0xe2, 0x31,
-        0x04, 0x3b, 0x26, 0x7e,
+        0x04, 0x3b, 0x28, 0x7e,
         0x30, 0x6a, 0xd0, 0x01,
         0x20, 0x6a, 0xd0, 0x01,
         0x1d, 0x6a, 0xdc, 0x01,
-        0xdc, 0xee, 0x22, 0x66,
-        0x00, 0x65, 0x3e, 0x46,
+        0xdc, 0xee, 0x24, 0x66,
+        0x00, 0x65, 0x40, 0x46,
         0x20, 0x6a, 0xd0, 0x01,
         0x01, 0x6a, 0xdc, 0x01,
         0x20, 0xa0, 0xd8, 0x31,
         0x09, 0xee, 0xdc, 0x01,
-        0x80, 0xee, 0x2e, 0x7e,
+        0x80, 0xee, 0x30, 0x7e,
         0x11, 0x6a, 0xdc, 0x01,
-        0x50, 0xee, 0x32, 0x66,
+        0x50, 0xee, 0x34, 0x66,
         0x20, 0x6a, 0xd0, 0x01,
         0x09, 0x6a, 0xdc, 0x01,
-        0x88, 0xee, 0x38, 0x66,
+        0x88, 0xee, 0x3a, 0x66,
         0x19, 0x6a, 0xdc, 0x01,
-        0xd8, 0xee, 0x3c, 0x66,
+        0xd8, 0xee, 0x3e, 0x66,
         0xff, 0x6a, 0xdc, 0x09,
-        0x18, 0xee, 0x40, 0x6e,
+        0x18, 0xee, 0x42, 0x6e,
         0xff, 0x6a, 0xd4, 0x0c,
         0x88, 0x6a, 0xcc, 0x00,
-        0x44, 0x6a, 0x02, 0x5e,
-        0x20, 0x6a, 0xe0, 0x5d,
+        0x44, 0x6a, 0x04, 0x5e,
+        0x20, 0x6a, 0xe2, 0x5d,
         0x01, 0x3b, 0x26, 0x31,
-        0x04, 0x3b, 0x5a, 0x6e,
+        0x04, 0x3b, 0x5c, 0x6e,
         0xa0, 0x6a, 0xca, 0x00,
         0x20, 0x65, 0xc8, 0x18,
-        0x00, 0x65, 0x98, 0x5e,
-        0x00, 0x65, 0x52, 0x66,
+        0x00, 0x65, 0x9a, 0x5e,
+        0x00, 0x65, 0x54, 0x66,
         0x0a, 0x93, 0x26, 0x01,
-        0x00, 0x65, 0xa8, 0x46,
+        0x00, 0x65, 0xaa, 0x46,
         0xa0, 0x6a, 0xcc, 0x00,
         0xff, 0x6a, 0xc8, 0x08,
-        0x20, 0x94, 0x5e, 0x6e,
-        0x10, 0x94, 0x60, 0x6e,
-        0x08, 0x94, 0x7a, 0x6e,
-        0x08, 0x94, 0x7a, 0x6e,
-        0x08, 0x94, 0x7a, 0x6e,
+        0x20, 0x94, 0x60, 0x6e,
+        0x10, 0x94, 0x62, 0x6e,
+        0x08, 0x94, 0x7c, 0x6e,
+        0x08, 0x94, 0x7c, 0x6e,
+        0x08, 0x94, 0x7c, 0x6e,
         0xff, 0x8c, 0xc8, 0x10,
         0xc1, 0x64, 0xc8, 0x18,
         0xf8, 0x64, 0xc8, 0x08,
         0x01, 0x99, 0xda, 0x30,
-        0x00, 0x66, 0x6e, 0x66,
-        0xc0, 0x66, 0xaa, 0x76,
+        0x00, 0x66, 0x70, 0x66,
+        0xc0, 0x66, 0xac, 0x76,
         0x60, 0x66, 0xc8, 0x18,
         0x3d, 0x64, 0xc8, 0x28,
-        0x00, 0x65, 0x5e, 0x46,
+        0x00, 0x65, 0x60, 0x46,
         0xf7, 0x93, 0x26, 0x09,
-        0x08, 0x93, 0x7c, 0x6e,
+        0x08, 0x93, 0x7e, 0x6e,
         0x00, 0x62, 0xc4, 0x18,
-        0x00, 0x65, 0xa8, 0x5e,
-        0x00, 0x65, 0x88, 0x5e,
-        0x00, 0x65, 0x88, 0x5e,
-        0x00, 0x65, 0x88, 0x5e,
+        0x00, 0x65, 0xaa, 0x5e,
+        0x00, 0x65, 0x8a, 0x5e,
+        0x00, 0x65, 0x8a, 0x5e,
+        0x00, 0x65, 0x8a, 0x5e,
         0x01, 0x99, 0xda, 0x30,
         0x01, 0x99, 0xda, 0x30,
         0x01, 0x99, 0xda, 0x30,
@@ -858,11 +859,11 @@ static uint8_t seqprog[] = {
         0x01, 0x6c, 0x32, 0x31,
         0x01, 0x6c, 0x32, 0x31,
         0x01, 0x6c, 0x32, 0x35,
-        0x08, 0x94, 0xa8, 0x7e,
+        0x08, 0x94, 0xaa, 0x7e,
         0xf7, 0x93, 0x26, 0x09,
-        0x08, 0x93, 0xac, 0x6e,
+        0x08, 0x93, 0xae, 0x6e,
         0xff, 0x6a, 0xd4, 0x0c,
-        0x04, 0xb8, 0xd4, 0x6e,
+        0x04, 0xb8, 0xd6, 0x6e,
         0x01, 0x42, 0x7e, 0x31,
         0xff, 0x6a, 0x76, 0x01,
         0x01, 0x90, 0x84, 0x34,
@@ -870,14 +871,14 @@ static uint8_t seqprog[] = {
         0x01, 0x85, 0x0a, 0x01,
         0x7f, 0x65, 0x10, 0x09,
         0xfe, 0x85, 0x0a, 0x0d,
-        0xff, 0x42, 0xd0, 0x66,
-        0xff, 0x41, 0xc8, 0x66,
-        0xd1, 0x6a, 0xd8, 0x5e,
+        0xff, 0x42, 0xd2, 0x66,
+        0xff, 0x41, 0xca, 0x66,
+        0xd1, 0x6a, 0xda, 0x5e,
         0xff, 0x6a, 0xca, 0x04,
         0x01, 0x41, 0x20, 0x31,
         0x01, 0xbf, 0x82, 0x30,
         0x01, 0x6a, 0x76, 0x00,
-        0x00, 0xbb, 0x12, 0x46,
+        0x00, 0xbb, 0x14, 0x46,
         0x01, 0x42, 0x20, 0x31,
         0x01, 0xbf, 0x84, 0x34,
         0x01, 0x41, 0x7e, 0x31,
@@ -941,7 +942,7 @@ static ahc_patch_func_t ahc_patch17_func;
 static int
 ahc_patch17_func(struct ahc_softc *ahc)
 {
-        return ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0);
+        return ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0);
 }
 
 static ahc_patch_func_t ahc_patch16_func;
@@ -1142,152 +1143,152 @@ static struct patch {
         { ahc_patch0_func, 196, 1, 1 },
         { ahc_patch9_func, 212, 6, 2 },
         { ahc_patch0_func, 218, 6, 1 },
-        { ahc_patch8_func, 226, 20, 2 },
+        { ahc_patch8_func, 226, 21, 2 },
         { ahc_patch1_func, 241, 1, 1 },
-        { ahc_patch1_func, 248, 1, 2 },
-        { ahc_patch0_func, 249, 2, 2 },
-        { ahc_patch11_func, 250, 1, 1 },
-        { ahc_patch9_func, 258, 27, 3 },
-        { ahc_patch1_func, 274, 10, 2 },
-        { ahc_patch13_func, 277, 1, 1 },
-        { ahc_patch14_func, 285, 14, 1 },
-        { ahc_patch1_func, 301, 1, 2 },
-        { ahc_patch0_func, 302, 1, 1 },
-        { ahc_patch9_func, 305, 1, 1 },
-        { ahc_patch13_func, 310, 1, 1 },
-        { ahc_patch9_func, 311, 2, 2 },
-        { ahc_patch0_func, 313, 4, 1 },
-        { ahc_patch14_func, 317, 1, 1 },
-        { ahc_patch15_func, 319, 2, 3 },
-        { ahc_patch9_func, 319, 1, 2 },
-        { ahc_patch0_func, 320, 1, 1 },
-        { ahc_patch6_func, 325, 1, 2 },
-        { ahc_patch0_func, 326, 1, 1 },
-        { ahc_patch1_func, 330, 47, 11 },
-        { ahc_patch6_func, 337, 2, 4 },
-        { ahc_patch7_func, 337, 1, 1 },
-        { ahc_patch8_func, 338, 1, 1 },
-        { ahc_patch0_func, 339, 1, 1 },
-        { ahc_patch16_func, 340, 1, 1 },
-        { ahc_patch6_func, 356, 6, 3 },
-        { ahc_patch16_func, 356, 5, 1 },
-        { ahc_patch0_func, 362, 7, 1 },
-        { ahc_patch13_func, 372, 5, 1 },
-        { ahc_patch0_func, 377, 52, 17 },
-        { ahc_patch14_func, 377, 1, 1 },
-        { ahc_patch7_func, 379, 2, 2 },
-        { ahc_patch17_func, 380, 1, 1 },
-        { ahc_patch9_func, 383, 1, 1 },
-        { ahc_patch18_func, 390, 1, 1 },
-        { ahc_patch14_func, 395, 9, 3 },
-        { ahc_patch9_func, 396, 3, 2 },
-        { ahc_patch0_func, 399, 3, 1 },
-        { ahc_patch9_func, 407, 6, 2 },
-        { ahc_patch0_func, 413, 9, 2 },
-        { ahc_patch13_func, 413, 1, 1 },
-        { ahc_patch13_func, 422, 2, 1 },
-        { ahc_patch14_func, 424, 1, 1 },
-        { ahc_patch9_func, 426, 1, 2 },
-        { ahc_patch0_func, 427, 1, 1 },
-        { ahc_patch7_func, 428, 1, 1 },
+        { ahc_patch1_func, 249, 1, 2 },
+        { ahc_patch0_func, 250, 2, 2 },
+        { ahc_patch11_func, 251, 1, 1 },
+        { ahc_patch9_func, 259, 27, 3 },
+        { ahc_patch1_func, 275, 10, 2 },
+        { ahc_patch13_func, 278, 1, 1 },
+        { ahc_patch14_func, 286, 14, 1 },
+        { ahc_patch1_func, 302, 1, 2 },
+        { ahc_patch0_func, 303, 1, 1 },
+        { ahc_patch9_func, 306, 1, 1 },
+        { ahc_patch13_func, 311, 1, 1 },
+        { ahc_patch9_func, 312, 2, 2 },
+        { ahc_patch0_func, 314, 4, 1 },
+        { ahc_patch14_func, 318, 1, 1 },
+        { ahc_patch15_func, 320, 2, 3 },
+        { ahc_patch9_func, 320, 1, 2 },
+        { ahc_patch0_func, 321, 1, 1 },
+        { ahc_patch6_func, 326, 1, 2 },
+        { ahc_patch0_func, 327, 1, 1 },
+        { ahc_patch1_func, 331, 47, 11 },
+        { ahc_patch6_func, 338, 2, 4 },
+        { ahc_patch7_func, 338, 1, 1 },
+        { ahc_patch8_func, 339, 1, 1 },
+        { ahc_patch0_func, 340, 1, 1 },
+        { ahc_patch16_func, 341, 1, 1 },
+        { ahc_patch6_func, 357, 6, 3 },
+        { ahc_patch16_func, 357, 5, 1 },
+        { ahc_patch0_func, 363, 7, 1 },
+        { ahc_patch13_func, 373, 5, 1 },
+        { ahc_patch0_func, 378, 52, 17 },
+        { ahc_patch14_func, 378, 1, 1 },
+        { ahc_patch7_func, 380, 2, 2 },
+        { ahc_patch17_func, 381, 1, 1 },
+        { ahc_patch9_func, 384, 1, 1 },
+        { ahc_patch18_func, 391, 1, 1 },
+        { ahc_patch14_func, 396, 9, 3 },
+        { ahc_patch9_func, 397, 3, 2 },
+        { ahc_patch0_func, 400, 3, 1 },
+        { ahc_patch9_func, 408, 6, 2 },
+        { ahc_patch0_func, 414, 9, 2 },
+        { ahc_patch13_func, 414, 1, 1 },
+        { ahc_patch13_func, 423, 2, 1 },
+        { ahc_patch14_func, 425, 1, 1 },
+        { ahc_patch9_func, 427, 1, 2 },
+        { ahc_patch0_func, 428, 1, 1 },
         { ahc_patch7_func, 429, 1, 1 },
-        { ahc_patch8_func, 430, 3, 3 },
-        { ahc_patch6_func, 431, 1, 2 },
-        { ahc_patch0_func, 432, 1, 1 },
-        { ahc_patch9_func, 433, 1, 1 },
-        { ahc_patch15_func, 434, 1, 2 },
-        { ahc_patch13_func, 434, 1, 1 },
-        { ahc_patch14_func, 436, 9, 4 },
-        { ahc_patch9_func, 436, 1, 1 },
-        { ahc_patch9_func, 443, 2, 1 },
-        { ahc_patch0_func, 445, 4, 3 },
-        { ahc_patch9_func, 445, 1, 2 },
-        { ahc_patch0_func, 446, 3, 1 },
-        { ahc_patch1_func, 450, 2, 1 },
-        { ahc_patch7_func, 452, 10, 2 },
-        { ahc_patch0_func, 462, 1, 1 },
-        { ahc_patch8_func, 463, 118, 22 },
-        { ahc_patch1_func, 465, 3, 2 },
-        { ahc_patch0_func, 468, 5, 3 },
-        { ahc_patch9_func, 468, 2, 2 },
-        { ahc_patch0_func, 470, 3, 1 },
-        { ahc_patch1_func, 475, 2, 2 },
-        { ahc_patch0_func, 477, 6, 3 },
-        { ahc_patch9_func, 477, 2, 2 },
-        { ahc_patch0_func, 479, 3, 1 },
-        { ahc_patch1_func, 485, 2, 2 },
-        { ahc_patch0_func, 487, 9, 7 },
-        { ahc_patch9_func, 487, 5, 6 },
-        { ahc_patch19_func, 487, 1, 2 },
-        { ahc_patch0_func, 488, 1, 1 },
-        { ahc_patch19_func, 490, 1, 2 },
-        { ahc_patch0_func, 491, 1, 1 },
-        { ahc_patch0_func, 492, 4, 1 },
-        { ahc_patch6_func, 497, 3, 2 },
-        { ahc_patch0_func, 500, 1, 1 },
-        { ahc_patch6_func, 510, 1, 2 },
-        { ahc_patch0_func, 511, 1, 1 },
-        { ahc_patch20_func, 548, 7, 1 },
-        { ahc_patch3_func, 583, 1, 2 },
-        { ahc_patch0_func, 584, 1, 1 },
-        { ahc_patch21_func, 587, 1, 1 },
-        { ahc_patch8_func, 589, 106, 33 },
-        { ahc_patch4_func, 591, 1, 1 },
-        { ahc_patch1_func, 597, 2, 2 },
-        { ahc_patch0_func, 599, 1, 1 },
-        { ahc_patch1_func, 602, 1, 2 },
-        { ahc_patch0_func, 603, 1, 1 },
-        { ahc_patch9_func, 604, 3, 3 },
-        { ahc_patch15_func, 605, 1, 1 },
-        { ahc_patch0_func, 607, 4, 1 },
-        { ahc_patch19_func, 616, 2, 2 },
-        { ahc_patch0_func, 618, 1, 1 },
-        { ahc_patch19_func, 622, 10, 3 },
-        { ahc_patch5_func, 624, 8, 1 },
-        { ahc_patch0_func, 632, 9, 2 },
-        { ahc_patch5_func, 633, 8, 1 },
-        { ahc_patch4_func, 643, 1, 2 },
-        { ahc_patch0_func, 644, 1, 1 },
-        { ahc_patch19_func, 645, 1, 2 },
-        { ahc_patch0_func, 646, 3, 2 },
-        { ahc_patch4_func, 648, 1, 1 },
-        { ahc_patch5_func, 649, 1, 1 },
-        { ahc_patch5_func, 652, 1, 1 },
-        { ahc_patch5_func, 654, 1, 1 },
-        { ahc_patch4_func, 656, 2, 2 },
-        { ahc_patch0_func, 658, 2, 1 },
-        { ahc_patch5_func, 660, 1, 1 },
-        { ahc_patch5_func, 663, 1, 1 },
-        { ahc_patch5_func, 666, 1, 1 },
-        { ahc_patch19_func, 670, 1, 1 },
-        { ahc_patch19_func, 673, 1, 1 },
-        { ahc_patch4_func, 679, 1, 1 },
-        { ahc_patch6_func, 682, 1, 2 },
-        { ahc_patch0_func, 683, 1, 1 },
-        { ahc_patch7_func, 695, 16, 1 },
-        { ahc_patch4_func, 711, 20, 1 },
-        { ahc_patch9_func, 732, 4, 2 },
-        { ahc_patch0_func, 736, 4, 1 },
-        { ahc_patch9_func, 740, 4, 2 },
-        { ahc_patch0_func, 744, 3, 1 },
-        { ahc_patch6_func, 750, 1, 1 },
-        { ahc_patch22_func, 752, 14, 1 },
-        { ahc_patch7_func, 766, 3, 1 },
-        { ahc_patch9_func, 778, 24, 8 },
-        { ahc_patch19_func, 782, 1, 2 },
-        { ahc_patch0_func, 783, 1, 1 },
-        { ahc_patch15_func, 788, 4, 2 },
-        { ahc_patch0_func, 792, 7, 3 },
-        { ahc_patch23_func, 792, 5, 2 },
-        { ahc_patch0_func, 797, 2, 1 },
-        { ahc_patch0_func, 802, 42, 3 },
-        { ahc_patch18_func, 814, 18, 2 },
-        { ahc_patch0_func, 832, 1, 1 },
-        { ahc_patch4_func, 856, 1, 1 },
-        { ahc_patch4_func, 857, 3, 2 },
-        { ahc_patch0_func, 860, 1, 1 },
-        { ahc_patch13_func, 861, 3, 1 },
-        { ahc_patch4_func, 864, 12, 1 }
+        { ahc_patch7_func, 430, 1, 1 },
+        { ahc_patch8_func, 431, 3, 3 },
+        { ahc_patch6_func, 432, 1, 2 },
+        { ahc_patch0_func, 433, 1, 1 },
+        { ahc_patch9_func, 434, 1, 1 },
+        { ahc_patch15_func, 435, 1, 2 },
+        { ahc_patch13_func, 435, 1, 1 },
+        { ahc_patch14_func, 437, 9, 4 },
+        { ahc_patch9_func, 437, 1, 1 },
+        { ahc_patch9_func, 444, 2, 1 },
+        { ahc_patch0_func, 446, 4, 3 },
+        { ahc_patch9_func, 446, 1, 2 },
+        { ahc_patch0_func, 447, 3, 1 },
+        { ahc_patch1_func, 451, 2, 1 },
+        { ahc_patch7_func, 453, 10, 2 },
+        { ahc_patch0_func, 463, 1, 1 },
+        { ahc_patch8_func, 464, 118, 22 },
+        { ahc_patch1_func, 466, 3, 2 },
+        { ahc_patch0_func, 469, 5, 3 },
+        { ahc_patch9_func, 469, 2, 2 },
+        { ahc_patch0_func, 471, 3, 1 },
+        { ahc_patch1_func, 476, 2, 2 },
+        { ahc_patch0_func, 478, 6, 3 },
+        { ahc_patch9_func, 478, 2, 2 },
+        { ahc_patch0_func, 480, 3, 1 },
+        { ahc_patch1_func, 486, 2, 2 },
+        { ahc_patch0_func, 488, 9, 7 },
+        { ahc_patch9_func, 488, 5, 6 },
+        { ahc_patch19_func, 488, 1, 2 },
+        { ahc_patch0_func, 489, 1, 1 },
+        { ahc_patch19_func, 491, 1, 2 },
+        { ahc_patch0_func, 492, 1, 1 },
+        { ahc_patch0_func, 493, 4, 1 },
+        { ahc_patch6_func, 498, 3, 2 },
+        { ahc_patch0_func, 501, 1, 1 },
+        { ahc_patch6_func, 511, 1, 2 },
+        { ahc_patch0_func, 512, 1, 1 },
+        { ahc_patch20_func, 549, 7, 1 },
+        { ahc_patch3_func, 584, 1, 2 },
+        { ahc_patch0_func, 585, 1, 1 },
+        { ahc_patch21_func, 588, 1, 1 },
+        { ahc_patch8_func, 590, 106, 33 },
+        { ahc_patch4_func, 592, 1, 1 },
+        { ahc_patch1_func, 598, 2, 2 },
+        { ahc_patch0_func, 600, 1, 1 },
+        { ahc_patch1_func, 603, 1, 2 },
+        { ahc_patch0_func, 604, 1, 1 },
+        { ahc_patch9_func, 605, 3, 3 },
+        { ahc_patch15_func, 606, 1, 1 },
+        { ahc_patch0_func, 608, 4, 1 },
+        { ahc_patch19_func, 617, 2, 2 },
+        { ahc_patch0_func, 619, 1, 1 },
+        { ahc_patch19_func, 623, 10, 3 },
+        { ahc_patch5_func, 625, 8, 1 },
+        { ahc_patch0_func, 633, 9, 2 },
+        { ahc_patch5_func, 634, 8, 1 },
+        { ahc_patch4_func, 644, 1, 2 },
+        { ahc_patch0_func, 645, 1, 1 },
+        { ahc_patch19_func, 646, 1, 2 },
+        { ahc_patch0_func, 647, 3, 2 },
+        { ahc_patch4_func, 649, 1, 1 },
+        { ahc_patch5_func, 650, 1, 1 },
+        { ahc_patch5_func, 653, 1, 1 },
+        { ahc_patch5_func, 655, 1, 1 },
+        { ahc_patch4_func, 657, 2, 2 },
+        { ahc_patch0_func, 659, 2, 1 },
+        { ahc_patch5_func, 661, 1, 1 },
+        { ahc_patch5_func, 664, 1, 1 },
+        { ahc_patch5_func, 667, 1, 1 },
+        { ahc_patch19_func, 671, 1, 1 },
+        { ahc_patch19_func, 674, 1, 1 },
+        { ahc_patch4_func, 680, 1, 1 },
+        { ahc_patch6_func, 683, 1, 2 },
+        { ahc_patch0_func, 684, 1, 1 },
+        { ahc_patch7_func, 696, 16, 1 },
+        { ahc_patch4_func, 712, 20, 1 },
+        { ahc_patch9_func, 733, 4, 2 },
+        { ahc_patch0_func, 737, 4, 1 },
+        { ahc_patch9_func, 741, 4, 2 },
+        { ahc_patch0_func, 745, 3, 1 },
+        { ahc_patch6_func, 751, 1, 1 },
+        { ahc_patch22_func, 753, 14, 1 },
+        { ahc_patch7_func, 767, 3, 1 },
+        { ahc_patch9_func, 779, 24, 8 },
+        { ahc_patch19_func, 783, 1, 2 },
+        { ahc_patch0_func, 784, 1, 1 },
+        { ahc_patch15_func, 789, 4, 2 },
+        { ahc_patch0_func, 793, 7, 3 },
+        { ahc_patch23_func, 793, 5, 2 },
+        { ahc_patch0_func, 798, 2, 1 },
+        { ahc_patch0_func, 803, 42, 3 },
+        { ahc_patch18_func, 815, 18, 2 },
+        { ahc_patch0_func, 833, 1, 1 },
+        { ahc_patch4_func, 857, 1, 1 },
+        { ahc_patch4_func, 858, 3, 2 },
+        { ahc_patch0_func, 861, 1, 1 },
+        { ahc_patch13_func, 862, 3, 1 },
+        { ahc_patch4_func, 865, 12, 1 }
 };
 
 static struct cs {
@@ -1296,11 +1297,11 @@ static struct cs {
 } critical_sections[] = {
         { 11, 18 },
         { 21, 30 },
-        { 711, 727 },
-        { 857, 860 },
-        { 864, 870 },
-        { 872, 874 },
-        { 874, 876 }
+        { 712, 728 },
+        { 858, 861 },
+        { 865, 871 },
+        { 873, 875 },
+        { 875, 877 }
 };
 
 static const int num_critical_sections = sizeof(critical_sections)
diff --git a/drivers/scsi/aic7xxx/aiclib.c b/drivers/scsi/aic7xxx/aiclib.c
index 7c5a6db0e672..828ae3d9a510 100644
--- a/drivers/scsi/aic7xxx/aiclib.c
+++ b/drivers/scsi/aic7xxx/aiclib.c
@@ -30,1382 +30,5 @@
  * $Id$
  */
 
-#include <linux/blkdev.h>
-#include <linux/delay.h>
-#include <linux/version.h>
-
-/* Core SCSI definitions */
-#include <scsi/scsi_host.h>
 #include "aiclib.h"
-#include "cam.h"
-
-#ifndef FALSE
-#define FALSE   0
-#endif /* FALSE */
-#ifndef TRUE
-#define TRUE    1
-#endif /* TRUE */
-#ifndef ERESTART
-#define ERESTART        -1              /* restart syscall */
-#endif
-#ifndef EJUSTRETURN
-#define EJUSTRETURN     -2              /* don't modify regs, just return */
-#endif
-
-static int      ascentrycomp(const void *key, const void *member);
-static int      senseentrycomp(const void *key, const void *member);
-static void     fetchtableentries(int sense_key, int asc, int ascq,
-                                  struct scsi_inquiry_data *,
-                                  const struct sense_key_table_entry **,
-                                  const struct asc_table_entry **);
-static void *   scsibsearch(const void *key, const void *base, size_t nmemb,
-                            size_t size,
-                            int (*compar)(const void *, const void *));
-typedef int (cam_quirkmatch_t)(caddr_t, caddr_t);
-static int      cam_strmatch(const u_int8_t *str, const u_int8_t *pattern,
-                             int str_len);
-static caddr_t  cam_quirkmatch(caddr_t target, caddr_t quirk_table,
-                               int num_entries, int entry_size,
-                               cam_quirkmatch_t *comp_func);
-
-#define SCSI_NO_SENSE_STRINGS 1
-#if !defined(SCSI_NO_SENSE_STRINGS)
-#define SST(asc, ascq, action, desc) \
-        asc, ascq, action, desc
-#else 
-static const char empty_string[] = "";
-
-#define SST(asc, ascq, action, desc) \
-        asc, ascq, action, empty_string
-#endif 
-
-static const struct sense_key_table_entry sense_key_table[] = 
-{
-        { SSD_KEY_NO_SENSE, SS_NOP, "NO SENSE" },
-        { SSD_KEY_RECOVERED_ERROR, SS_NOP|SSQ_PRINT_SENSE, "RECOVERED ERROR" },
-        {
-          SSD_KEY_NOT_READY, SS_TUR|SSQ_MANY|SSQ_DECREMENT_COUNT|EBUSY,
-          "NOT READY"
-        },
-        { SSD_KEY_MEDIUM_ERROR, SS_RDEF, "MEDIUM ERROR" },
-        { SSD_KEY_HARDWARE_ERROR, SS_RDEF, "HARDWARE FAILURE" },
-        { SSD_KEY_ILLEGAL_REQUEST, SS_FATAL|EINVAL, "ILLEGAL REQUEST" },
-        { SSD_KEY_UNIT_ATTENTION, SS_FATAL|ENXIO, "UNIT ATTENTION" },
-        { SSD_KEY_DATA_PROTECT, SS_FATAL|EACCES, "DATA PROTECT" },
-        { SSD_KEY_BLANK_CHECK, SS_FATAL|ENOSPC, "BLANK CHECK" },
-        { SSD_KEY_Vendor_Specific, SS_FATAL|EIO, "Vendor Specific" },
-        { SSD_KEY_COPY_ABORTED, SS_FATAL|EIO, "COPY ABORTED" },
-        { SSD_KEY_ABORTED_COMMAND, SS_RDEF, "ABORTED COMMAND" },
-        { SSD_KEY_EQUAL, SS_NOP, "EQUAL" },
-        { SSD_KEY_VOLUME_OVERFLOW, SS_FATAL|EIO, "VOLUME OVERFLOW" },
-        { SSD_KEY_MISCOMPARE, SS_NOP, "MISCOMPARE" },
-        { SSD_KEY_RESERVED, SS_FATAL|EIO, "RESERVED" }
-};
-
-static const int sense_key_table_size =
-    sizeof(sense_key_table)/sizeof(sense_key_table[0]);
-
-static struct asc_table_entry quantum_fireball_entries[] = {
-        {SST(0x04, 0x0b, SS_START|SSQ_DECREMENT_COUNT|ENXIO, 
-             "Logical unit not ready, initializing cmd. required")}
-};
-
-static struct asc_table_entry sony_mo_entries[] = {
-        {SST(0x04, 0x00, SS_START|SSQ_DECREMENT_COUNT|ENXIO,
-             "Logical unit not ready, cause not reportable")}
-};
-
-static struct scsi_sense_quirk_entry sense_quirk_table[] = {
-        {
-                /*
-                 * The Quantum Fireball ST and SE like to return 0x04 0x0b when
-                 * they really should return 0x04 0x02.  0x04,0x0b isn't
-                 * defined in any SCSI spec, and it isn't mentioned in the
-                 * hardware manual for these drives.
-                 */
-                {T_DIRECT, SIP_MEDIA_FIXED, "QUANTUM", "FIREBALL S*", "*"},
-                /*num_sense_keys*/0,
-                sizeof(quantum_fireball_entries)/sizeof(struct asc_table_entry),
-                /*sense key entries*/NULL,
-                quantum_fireball_entries
-        },
-        {
-                /*
-                 * This Sony MO drive likes to return 0x04, 0x00 when it
-                 * isn't spun up.
-                 */
-                {T_DIRECT, SIP_MEDIA_REMOVABLE, "SONY", "SMO-*", "*"},
-                /*num_sense_keys*/0,
-                sizeof(sony_mo_entries)/sizeof(struct asc_table_entry),
-                /*sense key entries*/NULL,
-                sony_mo_entries
-        }
-};
-
-static const int sense_quirk_table_size =
-    sizeof(sense_quirk_table)/sizeof(sense_quirk_table[0]);
-
-static struct asc_table_entry asc_table[] = {
-/*
- * From File: ASC-NUM.TXT
- * SCSI ASC/ASCQ Assignments
- * Numeric Sorted Listing
- * as of  5/12/97
- *
- * D - DIRECT ACCESS DEVICE (SBC)                     device column key
- * .T - SEQUENTIAL ACCESS DEVICE (SSC)               -------------------
- * . L - PRINTER DEVICE (SSC)                           blank = reserved
- * .  P - PROCESSOR DEVICE (SPC)                     not blank = allowed
- * .  .W - WRITE ONCE READ MULTIPLE DEVICE (SBC)
- * .  . R - CD DEVICE (MMC)
- * .  .  S - SCANNER DEVICE (SGC)
- * .  .  .O - OPTICAL MEMORY DEVICE (SBC)
- * .  .  . M - MEDIA CHANGER DEVICE (SMC)
- * .  .  .  C - COMMUNICATION DEVICE (SSC)
- * .  .  .  .A - STORAGE ARRAY DEVICE (SCC)
- * .  .  .  . E - ENCLOSURE SERVICES DEVICE (SES)
- * DTLPWRSOMCAE        ASC   ASCQ  Action  Description
- * ------------        ----  ----  ------  -----------------------------------*/
-/* DTLPWRSOMCAE */{SST(0x00, 0x00, SS_NOP,
-                        "No additional sense information") },
-/*  T    S      */{SST(0x00, 0x01, SS_RDEF,
-                        "Filemark detected") },
-/*  T    S      */{SST(0x00, 0x02, SS_RDEF,
-                        "End-of-partition/medium detected") },
-/*  T           */{SST(0x00, 0x03, SS_RDEF,
-                        "Setmark detected") },
-/*  T    S      */{SST(0x00, 0x04, SS_RDEF,
-                        "Beginning-of-partition/medium detected") },
-/*  T    S      */{SST(0x00, 0x05, SS_RDEF,
-                        "End-of-data detected") },
-/* DTLPWRSOMCAE */{SST(0x00, 0x06, SS_RDEF,
-                        "I/O process terminated") },
-/*      R       */{SST(0x00, 0x11, SS_FATAL|EBUSY,
-                        "Audio play operation in progress") },
-/*      R       */{SST(0x00, 0x12, SS_NOP,
-                        "Audio play operation paused") },
-/*      R       */{SST(0x00, 0x13, SS_NOP,
-                        "Audio play operation successfully completed") },
-/*      R       */{SST(0x00, 0x14, SS_RDEF,
-                        "Audio play operation stopped due to error") },
-/*      R       */{SST(0x00, 0x15, SS_NOP,
-                        "No current audio status to return") },
-/* DTLPWRSOMCAE */{SST(0x00, 0x16, SS_FATAL|EBUSY,
-                        "Operation in progress") },
-/* DTL WRSOM AE */{SST(0x00, 0x17, SS_RDEF,
-                        "Cleaning requested") },
-/* D   W  O     */{SST(0x01, 0x00, SS_RDEF,
-                        "No index/sector signal") },
-/* D   WR OM    */{SST(0x02, 0x00, SS_RDEF,
-                        "No seek complete") },
-/* DTL W SO     */{SST(0x03, 0x00, SS_RDEF,
-                        "Peripheral device write fault") },
-/*  T           */{SST(0x03, 0x01, SS_RDEF,
-                        "No write current") },
-/*  T           */{SST(0x03, 0x02, SS_RDEF,
-                        "Excessive write errors") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x00,
-                        SS_TUR|SSQ_DELAY|SSQ_MANY|SSQ_DECREMENT_COUNT|EIO,
-                        "Logical unit not ready, cause not reportable") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x01,
-                        SS_TUR|SSQ_DELAY|SSQ_MANY|SSQ_DECREMENT_COUNT|EBUSY,
-                        "Logical unit is in process of becoming ready") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x02, SS_START|SSQ_DECREMENT_COUNT|ENXIO,
-                        "Logical unit not ready, initializing cmd. required") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x03, SS_FATAL|ENXIO,
-                        "Logical unit not ready, manual intervention required")},
-/* DTL    O     */{SST(0x04, 0x04, SS_FATAL|EBUSY,
-                        "Logical unit not ready, format in progress") },
-/* DT  W  OMCA  */{SST(0x04, 0x05, SS_FATAL|EBUSY,
-                        "Logical unit not ready, rebuild in progress") },
-/* DT  W  OMCA  */{SST(0x04, 0x06, SS_FATAL|EBUSY,
-                        "Logical unit not ready, recalculation in progress") },
-/* DTLPWRSOMCAE */{SST(0x04, 0x07, SS_FATAL|EBUSY,
-                        "Logical unit not ready, operation in progress") },
-/*      R       */{SST(0x04, 0x08, SS_FATAL|EBUSY,
-                        "Logical unit not ready, long write in progress") },
-/* DTL WRSOMCAE */{SST(0x05, 0x00, SS_RDEF,
-                        "Logical unit does not respond to selection") },
-/* D   WR OM    */{SST(0x06, 0x00, SS_RDEF,
-                        "No reference position found") },
-/* DTL WRSOM    */{SST(0x07, 0x00, SS_RDEF,
-                        "Multiple peripheral devices selected") },
-/* DTL WRSOMCAE */{SST(0x08, 0x00, SS_RDEF,
-                        "Logical unit communication failure") },
-/* DTL WRSOMCAE */{SST(0x08, 0x01, SS_RDEF,
-                        "Logical unit communication time-out") },
-/* DTL WRSOMCAE */{SST(0x08, 0x02, SS_RDEF,
-                        "Logical unit communication parity error") },
-/* DT   R OM    */{SST(0x08, 0x03, SS_RDEF,
-                        "Logical unit communication crc error (ultra-dma/32)")},
-/* DT  WR O     */{SST(0x09, 0x00, SS_RDEF,
-                        "Track following error") },
-/*     WR O     */{SST(0x09, 0x01, SS_RDEF,
-                        "Tracking servo failure") },
-/*     WR O     */{SST(0x09, 0x02, SS_RDEF,
-                        "Focus servo failure") },
-/*     WR O     */{SST(0x09, 0x03, SS_RDEF,
-                        "Spindle servo failure") },
-/* DT  WR O     */{SST(0x09, 0x04, SS_RDEF,
-                        "Head select fault") },
-/* DTLPWRSOMCAE */{SST(0x0A, 0x00, SS_FATAL|ENOSPC,
-                        "Error log overflow") },
-/* DTLPWRSOMCAE */{SST(0x0B, 0x00, SS_RDEF,
-                        "Warning") },
-/* DTLPWRSOMCAE */{SST(0x0B, 0x01, SS_RDEF,
-                        "Specified temperature exceeded") },
-/* DTLPWRSOMCAE */{SST(0x0B, 0x02, SS_RDEF,
-                        "Enclosure degraded") },
-/*  T   RS      */{SST(0x0C, 0x00, SS_RDEF,
-                        "Write error") },
-/* D   W  O     */{SST(0x0C, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Write error - recovered with auto reallocation") },
-/* D   W  O     */{SST(0x0C, 0x02, SS_RDEF,
-                        "Write error - auto reallocation failed") },
-/* D   W  O     */{SST(0x0C, 0x03, SS_RDEF,
-                        "Write error - recommend reassignment") },
-/* DT  W  O     */{SST(0x0C, 0x04, SS_RDEF,
-                        "Compression check miscompare error") },
-/* DT  W  O     */{SST(0x0C, 0x05, SS_RDEF,
-                        "Data expansion occurred during compression") },
-/* DT  W  O     */{SST(0x0C, 0x06, SS_RDEF,
-                        "Block not compressible") },
-/*      R       */{SST(0x0C, 0x07, SS_RDEF,
-                        "Write error - recovery needed") },
-/*      R       */{SST(0x0C, 0x08, SS_RDEF,
-                        "Write error - recovery failed") },
-/*      R       */{SST(0x0C, 0x09, SS_RDEF,
-                        "Write error - loss of streaming") },
-/*      R       */{SST(0x0C, 0x0A, SS_RDEF,
-                        "Write error - padding blocks added") },
-/* D   W  O     */{SST(0x10, 0x00, SS_RDEF,
-                        "ID CRC or ECC error") },
-/* DT  WRSO     */{SST(0x11, 0x00, SS_RDEF,
-                        "Unrecovered read error") },
-/* DT  W SO     */{SST(0x11, 0x01, SS_RDEF,
-                        "Read retries exhausted") },
-/* DT  W SO     */{SST(0x11, 0x02, SS_RDEF,
-                        "Error too long to correct") },
-/* DT  W SO     */{SST(0x11, 0x03, SS_RDEF,
-                        "Multiple read errors") },
-/* D   W  O     */{SST(0x11, 0x04, SS_RDEF,
-                        "Unrecovered read error - auto reallocate failed") },
-/*     WR O     */{SST(0x11, 0x05, SS_RDEF,
-                        "L-EC uncorrectable error") },
-/*     WR O     */{SST(0x11, 0x06, SS_RDEF,
-                        "CIRC unrecovered error") },
-/*     W  O     */{SST(0x11, 0x07, SS_RDEF,
-                        "Data re-synchronization error") },
-/*  T           */{SST(0x11, 0x08, SS_RDEF,
-                        "Incomplete block read") },
-/*  T           */{SST(0x11, 0x09, SS_RDEF,
-                        "No gap found") },
-/* DT     O     */{SST(0x11, 0x0A, SS_RDEF,
-                        "Miscorrected error") },
-/* D   W  O     */{SST(0x11, 0x0B, SS_RDEF,
-                        "Unrecovered read error - recommend reassignment") },
-/* D   W  O     */{SST(0x11, 0x0C, SS_RDEF,
-                        "Unrecovered read error - recommend rewrite the data")},
-/* DT  WR O     */{SST(0x11, 0x0D, SS_RDEF,
-                        "De-compression CRC error") },
-/* DT  WR O     */{SST(0x11, 0x0E, SS_RDEF,
-                        "Cannot decompress using declared algorithm") },
-/*      R       */{SST(0x11, 0x0F, SS_RDEF,
-                        "Error reading UPC/EAN number") },
-/*      R       */{SST(0x11, 0x10, SS_RDEF,
-                        "Error reading ISRC number") },
-/*      R       */{SST(0x11, 0x11, SS_RDEF,
-                        "Read error - loss of streaming") },
-/* D   W  O     */{SST(0x12, 0x00, SS_RDEF,
-                        "Address mark not found for id field") },
-/* D   W  O     */{SST(0x13, 0x00, SS_RDEF,
-                        "Address mark not found for data field") },
-/* DTL WRSO     */{SST(0x14, 0x00, SS_RDEF,
-                        "Recorded entity not found") },
-/* DT  WR O     */{SST(0x14, 0x01, SS_RDEF,
-                        "Record not found") },
-/*  T           */{SST(0x14, 0x02, SS_RDEF,
-                        "Filemark or setmark not found") },
-/*  T           */{SST(0x14, 0x03, SS_RDEF,
-                        "End-of-data not found") },
-/*  T           */{SST(0x14, 0x04, SS_RDEF,
-                        "Block sequence error") },
-/* DT  W  O     */{SST(0x14, 0x05, SS_RDEF,
-                        "Record not found - recommend reassignment") },
-/* DT  W  O     */{SST(0x14, 0x06, SS_RDEF,
-                        "Record not found - data auto-reallocated") },
-/* DTL WRSOM    */{SST(0x15, 0x00, SS_RDEF,
-                        "Random positioning error") },
-/* DTL WRSOM    */{SST(0x15, 0x01, SS_RDEF,
-                        "Mechanical positioning error") },
-/* DT  WR O     */{SST(0x15, 0x02, SS_RDEF,
-                        "Positioning error detected by read of medium") },
-/* D   W  O     */{SST(0x16, 0x00, SS_RDEF,
-                        "Data synchronization mark error") },
-/* D   W  O     */{SST(0x16, 0x01, SS_RDEF,
-                        "Data sync error - data rewritten") },
-/* D   W  O     */{SST(0x16, 0x02, SS_RDEF,
-                        "Data sync error - recommend rewrite") },
-/* D   W  O     */{SST(0x16, 0x03, SS_NOP|SSQ_PRINT_SENSE,
-                        "Data sync error - data auto-reallocated") },
-/* D   W  O     */{SST(0x16, 0x04, SS_RDEF,
-                        "Data sync error - recommend reassignment") },
-/* DT  WRSO     */{SST(0x17, 0x00, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with no error correction applied") },
-/* DT  WRSO     */{SST(0x17, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with retries") },
-/* DT  WR O     */{SST(0x17, 0x02, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with positive head offset") },
-/* DT  WR O     */{SST(0x17, 0x03, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with negative head offset") },
-/*     WR O     */{SST(0x17, 0x04, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with retries and/or CIRC applied") },
-/* D   WR O     */{SST(0x17, 0x05, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data using previous sector id") },
-/* D   W  O     */{SST(0x17, 0x06, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - data auto-reallocated") },
-/* D   W  O     */{SST(0x17, 0x07, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - recommend reassignment")},
-/* D   W  O     */{SST(0x17, 0x08, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - recommend rewrite") },
-/* D   W  O     */{SST(0x17, 0x09, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data without ECC - data rewritten") },
-/* D   W  O     */{SST(0x18, 0x00, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with error correction applied") },
-/* D   WR O     */{SST(0x18, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with error corr. & retries applied") },
-/* D   WR O     */{SST(0x18, 0x02, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data - data auto-reallocated") },
-/*      R       */{SST(0x18, 0x03, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with CIRC") },
-/*      R       */{SST(0x18, 0x04, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with L-EC") },
-/* D   WR O     */{SST(0x18, 0x05, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data - recommend reassignment") },
-/* D   WR O     */{SST(0x18, 0x06, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data - recommend rewrite") },
-/* D   W  O     */{SST(0x18, 0x07, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered data with ECC - data rewritten") },
-/* D      O     */{SST(0x19, 0x00, SS_RDEF,
-                        "Defect list error") },
-/* D      O     */{SST(0x19, 0x01, SS_RDEF,
-                        "Defect list not available") },
-/* D      O     */{SST(0x19, 0x02, SS_RDEF,
-                        "Defect list error in primary list") },
-/* D      O     */{SST(0x19, 0x03, SS_RDEF,
-                        "Defect list error in grown list") },
-/* DTLPWRSOMCAE */{SST(0x1A, 0x00, SS_RDEF,
-                        "Parameter list length error") },
-/* DTLPWRSOMCAE */{SST(0x1B, 0x00, SS_RDEF,
-                        "Synchronous data transfer error") },
-/* D      O     */{SST(0x1C, 0x00, SS_RDEF,
-                        "Defect list not found") },
-/* D      O     */{SST(0x1C, 0x01, SS_RDEF,
-                        "Primary defect list not found") },
-/* D      O     */{SST(0x1C, 0x02, SS_RDEF,
-                        "Grown defect list not found") },
-/* D   W  O     */{SST(0x1D, 0x00, SS_FATAL,
-                        "Miscompare during verify operation" )},
-/* D   W  O     */{SST(0x1E, 0x00, SS_NOP|SSQ_PRINT_SENSE,
-                        "Recovered id with ecc correction") },
-/* D      O     */{SST(0x1F, 0x00, SS_RDEF,
-                        "Partial defect list transfer") },
-/* DTLPWRSOMCAE */{SST(0x20, 0x00, SS_FATAL|EINVAL,
-                        "Invalid command operation code") },
-/* DT  WR OM    */{SST(0x21, 0x00, SS_FATAL|EINVAL,
-                        "Logical block address out of range" )},
-/* DT  WR OM    */{SST(0x21, 0x01, SS_FATAL|EINVAL,
-                        "Invalid element address") },
-/* D            */{SST(0x22, 0x00, SS_FATAL|EINVAL,
-                        "Illegal function") }, /* Deprecated. Use 20 00, 24 00, or 26 00 instead */
-/* DTLPWRSOMCAE */{SST(0x24, 0x00, SS_FATAL|EINVAL,
-                        "Invalid field in CDB") },
-/* DTLPWRSOMCAE */{SST(0x25, 0x00, SS_FATAL|ENXIO,
-                        "Logical unit not supported") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x00, SS_FATAL|EINVAL,
-                        "Invalid field in parameter list") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x01, SS_FATAL|EINVAL,
-                        "Parameter not supported") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x02, SS_FATAL|EINVAL,
-                        "Parameter value invalid") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x03, SS_FATAL|EINVAL,
-                        "Threshold parameters not supported") },
-/* DTLPWRSOMCAE */{SST(0x26, 0x04, SS_FATAL|EINVAL,
-                        "Invalid release of active persistent reservation") },
-/* DT  W  O     */{SST(0x27, 0x00, SS_FATAL|EACCES,
-                        "Write protected") },
-/* DT  W  O     */{SST(0x27, 0x01, SS_FATAL|EACCES,
-                        "Hardware write protected") },
-/* DT  W  O     */{SST(0x27, 0x02, SS_FATAL|EACCES,
-                        "Logical unit software write protected") },
-/*  T           */{SST(0x27, 0x03, SS_FATAL|EACCES,
-                        "Associated write protect") },
-/*  T           */{SST(0x27, 0x04, SS_FATAL|EACCES,
-                        "Persistent write protect") },
-/*  T           */{SST(0x27, 0x05, SS_FATAL|EACCES,
-                        "Permanent write protect") },
-/* DTLPWRSOMCAE */{SST(0x28, 0x00, SS_RDEF,
-                        "Not ready to ready change, medium may have changed") },
-/* DTLPWRSOMCAE */{SST(0x28, 0x01, SS_FATAL|ENXIO,
-                        "Import or export element accessed") },
-/*
- * XXX JGibbs - All of these should use the same errno, but I don't think
- * ENXIO is the correct choice.  Should we borrow from the networking
- * errnos?  ECONNRESET anyone?
- */
-/* DTLPWRSOMCAE */{SST(0x29, 0x00, SS_RDEF,
-                        "Power on, reset, or bus device reset occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x01, SS_RDEF,
-                        "Power on occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x02, SS_RDEF,
-                        "Scsi bus reset occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x03, SS_RDEF,
-                        "Bus device reset function occurred") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x04, SS_RDEF,
-                        "Device internal reset") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x05, SS_RDEF,
-                        "Transceiver mode changed to single-ended") },
-/* DTLPWRSOMCAE */{SST(0x29, 0x06, SS_RDEF,
-                        "Transceiver mode changed to LVD") },
-/* DTL WRSOMCAE */{SST(0x2A, 0x00, SS_RDEF,
-                        "Parameters changed") },
-/* DTL WRSOMCAE */{SST(0x2A, 0x01, SS_RDEF,
-                        "Mode parameters changed") },
-/* DTL WRSOMCAE */{SST(0x2A, 0x02, SS_RDEF,
-                        "Log parameters changed") },
-/* DTLPWRSOMCAE */{SST(0x2A, 0x03, SS_RDEF,
-                        "Reservations preempted") },
-/* DTLPWRSO C   */{SST(0x2B, 0x00, SS_RDEF,
-                        "Copy cannot execute since host cannot disconnect") },
-/* DTLPWRSOMCAE */{SST(0x2C, 0x00, SS_RDEF,
-                        "Command sequence error") },
-/*       S      */{SST(0x2C, 0x01, SS_RDEF,
-                        "Too many windows specified") },
-/*       S      */{SST(0x2C, 0x02, SS_RDEF,
-                        "Invalid combination of windows specified") },
-/*      R       */{SST(0x2C, 0x03, SS_RDEF,
-                        "Current program area is not empty") },
-/*      R       */{SST(0x2C, 0x04, SS_RDEF,
-                        "Current program area is empty") },
-/*  T           */{SST(0x2D, 0x00, SS_RDEF,
-                        "Overwrite error on update in place") },
-/* DTLPWRSOMCAE */{SST(0x2F, 0x00, SS_RDEF,
-                        "Commands cleared by another initiator") },
-/* DT  WR OM    */{SST(0x30, 0x00, SS_RDEF,
-                        "Incompatible medium installed") },
-/* DT  WR O     */{SST(0x30, 0x01, SS_RDEF,
-                        "Cannot read medium - unknown format") },
-/* DT  WR O     */{SST(0x30, 0x02, SS_RDEF,
-                        "Cannot read medium - incompatible format") },
-/* DT           */{SST(0x30, 0x03, SS_RDEF,
-                        "Cleaning cartridge installed") },
-/* DT  WR O     */{SST(0x30, 0x04, SS_RDEF,
-                        "Cannot write medium - unknown format") },
-/* DT  WR O     */{SST(0x30, 0x05, SS_RDEF,
-                        "Cannot write medium - incompatible format") },
-/* DT  W  O     */{SST(0x30, 0x06, SS_RDEF,
-                        "Cannot format medium - incompatible medium") },
-/* DTL WRSOM AE */{SST(0x30, 0x07, SS_RDEF,
-                        "Cleaning failure") },
-/*      R       */{SST(0x30, 0x08, SS_RDEF,
-                        "Cannot write - application code mismatch") },
-/*      R       */{SST(0x30, 0x09, SS_RDEF,
-                        "Current session not fixated for append") },
-/* DT  WR O     */{SST(0x31, 0x00, SS_RDEF,
-                        "Medium format corrupted") },
-/* D L  R O     */{SST(0x31, 0x01, SS_RDEF,
-                        "Format command failed") },
-/* D   W  O     */{SST(0x32, 0x00, SS_RDEF,
-                        "No defect spare location available") },
-/* D   W  O     */{SST(0x32, 0x01, SS_RDEF,
-                        "Defect list update failure") },
-/*  T           */{SST(0x33, 0x00, SS_RDEF,
-                        "Tape length error") },
-/* DTLPWRSOMCAE */{SST(0x34, 0x00, SS_RDEF,
-                        "Enclosure failure") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x00, SS_RDEF,
-                        "Enclosure services failure") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x01, SS_RDEF,
-                        "Unsupported enclosure function") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x02, SS_RDEF,
-                        "Enclosure services unavailable") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x03, SS_RDEF,
-                        "Enclosure services transfer failure") },
-/* DTLPWRSOMCAE */{SST(0x35, 0x04, SS_RDEF,
-                        "Enclosure services transfer refused") },
-/*   L          */{SST(0x36, 0x00, SS_RDEF,
-                        "Ribbon, ink, or toner failure") },
-/* DTL WRSOMCAE */{SST(0x37, 0x00, SS_RDEF,
-                        "Rounded parameter") },
-/* DTL WRSOMCAE */{SST(0x39, 0x00, SS_RDEF,
-                        "Saving parameters not supported") },
-/* DTL WRSOM    */{SST(0x3A, 0x00, SS_NOP,
-                        "Medium not present") },
-/* DT  WR OM    */{SST(0x3A, 0x01, SS_NOP,
-                        "Medium not present - tray closed") },
-/* DT  WR OM    */{SST(0x3A, 0x01, SS_NOP,
-                        "Medium not present - tray open") },
-/* DT  WR OM    */{SST(0x3A, 0x03, SS_NOP,
-                        "Medium not present - Loadable") },
-/* DT  WR OM    */{SST(0x3A, 0x04, SS_NOP,
-                        "Medium not present - medium auxiliary "
-                        "memory accessible") },
-/* DT  WR OM    */{SST(0x3A, 0xFF, SS_NOP, NULL) },/* Range 0x05->0xFF */
-/*  TL          */{SST(0x3B, 0x00, SS_RDEF,
-                        "Sequential positioning error") },
-/*  T           */{SST(0x3B, 0x01, SS_RDEF,
-                        "Tape position error at beginning-of-medium") },
-/*  T           */{SST(0x3B, 0x02, SS_RDEF,
-                        "Tape position error at end-of-medium") },
-/*   L          */{SST(0x3B, 0x03, SS_RDEF,
-                        "Tape or electronic vertical forms unit not ready") },
-/*   L          */{SST(0x3B, 0x04, SS_RDEF,
-                        "Slew failure") },
-/*   L          */{SST(0x3B, 0x05, SS_RDEF,
-                        "Paper jam") },
-/*   L          */{SST(0x3B, 0x06, SS_RDEF,
-                        "Failed to sense top-of-form") },
-/*   L          */{SST(0x3B, 0x07, SS_RDEF,
-                        "Failed to sense bottom-of-form") },
-/*  T           */{SST(0x3B, 0x08, SS_RDEF,
-                        "Reposition error") },
-/*       S      */{SST(0x3B, 0x09, SS_RDEF,
-                        "Read past end of medium") },
-/*       S      */{SST(0x3B, 0x0A, SS_RDEF,
-                        "Read past beginning of medium") },
-/*       S      */{SST(0x3B, 0x0B, SS_RDEF,
-                        "Position past end of medium") },
-/*  T    S      */{SST(0x3B, 0x0C, SS_RDEF,
-                        "Position past beginning of medium") },
-/* DT  WR OM    */{SST(0x3B, 0x0D, SS_FATAL|ENOSPC,
-                        "Medium destination element full") },
-/* DT  WR OM    */{SST(0x3B, 0x0E, SS_RDEF,
-                        "Medium source element empty") },
-/*      R       */{SST(0x3B, 0x0F, SS_RDEF,
-                        "End of medium reached") },
-/* DT  WR OM    */{SST(0x3B, 0x11, SS_RDEF,
-                        "Medium magazine not accessible") },
-/* DT  WR OM    */{SST(0x3B, 0x12, SS_RDEF,
-                        "Medium magazine removed") },
-/* DT  WR OM    */{SST(0x3B, 0x13, SS_RDEF,
-                        "Medium magazine inserted") },
-/* DT  WR OM    */{SST(0x3B, 0x14, SS_RDEF,
-                        "Medium magazine locked") },
-/* DT  WR OM    */{SST(0x3B, 0x15, SS_RDEF,
-                        "Medium magazine unlocked") },
-/* DTLPWRSOMCAE */{SST(0x3D, 0x00, SS_RDEF,
-                        "Invalid bits in identify message") },
-/* DTLPWRSOMCAE */{SST(0x3E, 0x00, SS_RDEF,
-                        "Logical unit has not self-configured yet") },
-/* DTLPWRSOMCAE */{SST(0x3E, 0x01, SS_RDEF,
-                        "Logical unit failure") },
-/* DTLPWRSOMCAE */{SST(0x3E, 0x02, SS_RDEF,
-                        "Timeout on logical unit") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x00, SS_RDEF,
-                        "Target operating conditions have changed") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x01, SS_RDEF,
-                        "Microcode has been changed") },
-/* DTLPWRSOMC   */{SST(0x3F, 0x02, SS_RDEF,
-                        "Changed operating definition") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x03, SS_INQ_REFRESH|SSQ_DECREMENT_COUNT,
-                        "Inquiry data has changed") },
-/* DT  WR OMCAE */{SST(0x3F, 0x04, SS_RDEF,
-                        "Component device attached") },
-/* DT  WR OMCAE */{SST(0x3F, 0x05, SS_RDEF,
-                        "Device identifier changed") },
-/* DT  WR OMCAE */{SST(0x3F, 0x06, SS_RDEF,
-                        "Redundancy group created or modified") },
-/* DT  WR OMCAE */{SST(0x3F, 0x07, SS_RDEF,
-                        "Redundancy group deleted") },
-/* DT  WR OMCAE */{SST(0x3F, 0x08, SS_RDEF,
-                        "Spare created or modified") },
-/* DT  WR OMCAE */{SST(0x3F, 0x09, SS_RDEF,
-                        "Spare deleted") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0A, SS_RDEF,
-                        "Volume set created or modified") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0B, SS_RDEF,
-                        "Volume set deleted") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0C, SS_RDEF,
-                        "Volume set deassigned") },
-/* DT  WR OMCAE */{SST(0x3F, 0x0D, SS_RDEF,
-                        "Volume set reassigned") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x0E, SS_RDEF,
-                        "Reported luns data has changed") },
-/* DTLPWRSOMCAE */{SST(0x3F, 0x0F, SS_RETRY|SSQ_DECREMENT_COUNT
-                                 | SSQ_DELAY_RANDOM|EBUSY,
-                        "Echo buffer overwritten") },
-/* DT  WR OM   B*/{SST(0x3F, 0x0F, SS_RDEF, "Medium Loadable") },
-/* DT  WR OM   B*/{SST(0x3F, 0x0F, SS_RDEF,
-                        "Medium auxiliary memory accessible") },
-/* D            */{SST(0x40, 0x00, SS_RDEF,
-                        "Ram failure") }, /* deprecated - use 40 NN instead */
-/* DTLPWRSOMCAE */{SST(0x40, 0x80, SS_RDEF,
-                        "Diagnostic failure: ASCQ = Component ID") },
-/* DTLPWRSOMCAE */{SST(0x40, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL) },/* Range 0x80->0xFF */
-/* D            */{SST(0x41, 0x00, SS_RDEF,
-                        "Data path failure") }, /* deprecated - use 40 NN instead */
-/* D            */{SST(0x42, 0x00, SS_RDEF,
-                        "Power-on or self-test failure") }, /* deprecated - use 40 NN instead */
-/* DTLPWRSOMCAE */{SST(0x43, 0x00, SS_RDEF,
-                        "Message error") },
-/* DTLPWRSOMCAE */{SST(0x44, 0x00, SS_RDEF,
-                        "Internal target failure") },
-/* DTLPWRSOMCAE */{SST(0x45, 0x00, SS_RDEF,
-                        "Select or reselect failure") },
-/* DTLPWRSOMC   */{SST(0x46, 0x00, SS_RDEF,
-                        "Unsuccessful soft reset") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x00, SS_RDEF|SSQ_FALLBACK,
-                        "SCSI parity error") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x01, SS_RDEF|SSQ_FALLBACK,
-                        "Data Phase CRC error detected") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x02, SS_RDEF|SSQ_FALLBACK,
-                        "SCSI parity error detected during ST data phase") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x03, SS_RDEF|SSQ_FALLBACK,
-                        "Information Unit iuCRC error") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x04, SS_RDEF|SSQ_FALLBACK,
-                        "Asynchronous information protection error detected") },
-/* DTLPWRSOMCAE */{SST(0x47, 0x05, SS_RDEF|SSQ_FALLBACK,
-                        "Protocol server CRC error") },
-/* DTLPWRSOMCAE */{SST(0x48, 0x00, SS_RDEF|SSQ_FALLBACK,
-                        "Initiator detected error message received") },
-/* DTLPWRSOMCAE */{SST(0x49, 0x00, SS_RDEF,
-                        "Invalid message error") },
-/* DTLPWRSOMCAE */{SST(0x4A, 0x00, SS_RDEF,
-                        "Command phase error") },
-/* DTLPWRSOMCAE */{SST(0x4B, 0x00, SS_RDEF,
-                        "Data phase error") },
-/* DTLPWRSOMCAE */{SST(0x4C, 0x00, SS_RDEF,
-                        "Logical unit failed self-configuration") },
-/* DTLPWRSOMCAE */{SST(0x4D, 0x00, SS_RDEF,
-                        "Tagged overlapped commands: ASCQ = Queue tag ID") },
-/* DTLPWRSOMCAE */{SST(0x4D, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL)}, /* Range 0x00->0xFF */
-/* DTLPWRSOMCAE */{SST(0x4E, 0x00, SS_RDEF,
-                        "Overlapped commands attempted") },
-/*  T           */{SST(0x50, 0x00, SS_RDEF,
-                        "Write append error") },
-/*  T           */{SST(0x50, 0x01, SS_RDEF,
-                        "Write append position error") },
-/*  T           */{SST(0x50, 0x02, SS_RDEF,
-                        "Position error related to timing") },
-/*  T     O     */{SST(0x51, 0x00, SS_RDEF,
-                        "Erase failure") },
-/*  T           */{SST(0x52, 0x00, SS_RDEF,
-                        "Cartridge fault") },
-/* DTL WRSOM    */{SST(0x53, 0x00, SS_RDEF,
-                        "Media load or eject failed") },
-/*  T           */{SST(0x53, 0x01, SS_RDEF,
-                        "Unload tape failure") },
-/* DT  WR OM    */{SST(0x53, 0x02, SS_RDEF,
-                        "Medium removal prevented") },
-/*    P         */{SST(0x54, 0x00, SS_RDEF,
-                        "Scsi to host system interface failure") },
-/*    P         */{SST(0x55, 0x00, SS_RDEF,
-                        "System resource failure") },
-/* D      O     */{SST(0x55, 0x01, SS_FATAL|ENOSPC,
-                        "System buffer full") },
-/*      R       */{SST(0x57, 0x00, SS_RDEF,
-                        "Unable to recover table-of-contents") },
-/*        O     */{SST(0x58, 0x00, SS_RDEF,
-                        "Generation does not exist") },
-/*        O     */{SST(0x59, 0x00, SS_RDEF,
-                        "Updated block read") },
-/* DTLPWRSOM    */{SST(0x5A, 0x00, SS_RDEF,
-                        "Operator request or state change input") },
-/* DT  WR OM    */{SST(0x5A, 0x01, SS_RDEF,
-                        "Operator medium removal request") },
-/* DT  W  O     */{SST(0x5A, 0x02, SS_RDEF,
-                        "Operator selected write protect") },
-/* DT  W  O     */{SST(0x5A, 0x03, SS_RDEF,
-                        "Operator selected write permit") },
-/* DTLPWRSOM    */{SST(0x5B, 0x00, SS_RDEF,
-                        "Log exception") },
-/* DTLPWRSOM    */{SST(0x5B, 0x01, SS_RDEF,
-                        "Threshold condition met") },
-/* DTLPWRSOM    */{SST(0x5B, 0x02, SS_RDEF,
-                        "Log counter at maximum") },
-/* DTLPWRSOM    */{SST(0x5B, 0x03, SS_RDEF,
-                        "Log list codes exhausted") },
-/* D      O     */{SST(0x5C, 0x00, SS_RDEF,
-                        "RPL status change") },
-/* D      O     */{SST(0x5C, 0x01, SS_NOP|SSQ_PRINT_SENSE,
-                        "Spindles synchronized") },
-/* D      O     */{SST(0x5C, 0x02, SS_RDEF,
-                        "Spindles not synchronized") },
-/* DTLPWRSOMCAE */{SST(0x5D, 0x00, SS_RDEF,
-                        "Failure prediction threshold exceeded") },
-/* DTLPWRSOMCAE */{SST(0x5D, 0xFF, SS_RDEF,
-                        "Failure prediction threshold exceeded (false)") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x00, SS_RDEF,
-                        "Low power condition on") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x01, SS_RDEF,
-                        "Idle condition activated by timer") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x02, SS_RDEF,
-                        "Standby condition activated by timer") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x03, SS_RDEF,
-                        "Idle condition activated by command") },
-/* DTLPWRSO CA  */{SST(0x5E, 0x04, SS_RDEF,
-                        "Standby condition activated by command") },
-/*       S      */{SST(0x60, 0x00, SS_RDEF,
-                        "Lamp failure") },
-/*       S      */{SST(0x61, 0x00, SS_RDEF,
-                        "Video acquisition error") },
-/*       S      */{SST(0x61, 0x01, SS_RDEF,
-                        "Unable to acquire video") },
-/*       S      */{SST(0x61, 0x02, SS_RDEF,
-                        "Out of focus") },
-/*       S      */{SST(0x62, 0x00, SS_RDEF,
-                        "Scan head positioning error") },
-/*      R       */{SST(0x63, 0x00, SS_RDEF,
-                        "End of user area encountered on this track") },
-/*      R       */{SST(0x63, 0x01, SS_FATAL|ENOSPC,
-                        "Packet does not fit in available space") },
-/*      R       */{SST(0x64, 0x00, SS_RDEF,
-                        "Illegal mode for this track") },
-/*      R       */{SST(0x64, 0x01, SS_RDEF,
-                        "Invalid packet size") },
-/* DTLPWRSOMCAE */{SST(0x65, 0x00, SS_RDEF,
-                        "Voltage fault") },
-/*       S      */{SST(0x66, 0x00, SS_RDEF,
-                        "Automatic document feeder cover up") },
-/*       S      */{SST(0x66, 0x01, SS_RDEF,
-                        "Automatic document feeder lift up") },
-/*       S      */{SST(0x66, 0x02, SS_RDEF,
-                        "Document jam in automatic document feeder") },
-/*       S      */{SST(0x66, 0x03, SS_RDEF,
-                        "Document miss feed automatic in document feeder") },
-/*           A  */{SST(0x67, 0x00, SS_RDEF,
-                        "Configuration failure") },
-/*           A  */{SST(0x67, 0x01, SS_RDEF,
-                        "Configuration of incapable logical units failed") },
-/*           A  */{SST(0x67, 0x02, SS_RDEF,
-                        "Add logical unit failed") },
-/*           A  */{SST(0x67, 0x03, SS_RDEF,
-                        "Modification of logical unit failed") },
-/*           A  */{SST(0x67, 0x04, SS_RDEF,
-                        "Exchange of logical unit failed") },
-/*           A  */{SST(0x67, 0x05, SS_RDEF,
-                        "Remove of logical unit failed") },
-/*           A  */{SST(0x67, 0x06, SS_RDEF,
-                        "Attachment of logical unit failed") },
-/*           A  */{SST(0x67, 0x07, SS_RDEF,
-                        "Creation of logical unit failed") },
-/*           A  */{SST(0x68, 0x00, SS_RDEF,
-                        "Logical unit not configured") },
-/*           A  */{SST(0x69, 0x00, SS_RDEF,
-                        "Data loss on logical unit") },
-/*           A  */{SST(0x69, 0x01, SS_RDEF,
-                        "Multiple logical unit failures") },
-/*           A  */{SST(0x69, 0x02, SS_RDEF,
-                        "Parity/data mismatch") },
-/*           A  */{SST(0x6A, 0x00, SS_RDEF,
-                        "Informational, refer to log") },
-/*           A  */{SST(0x6B, 0x00, SS_RDEF,
-                        "State change has occurred") },
-/*           A  */{SST(0x6B, 0x01, SS_RDEF,
-                        "Redundancy level got better") },
-/*           A  */{SST(0x6B, 0x02, SS_RDEF,
-                        "Redundancy level got worse") },
-/*           A  */{SST(0x6C, 0x00, SS_RDEF,
-                        "Rebuild failure occurred") },
-/*           A  */{SST(0x6D, 0x00, SS_RDEF,
-                        "Recalculate failure occurred") },
-/*           A  */{SST(0x6E, 0x00, SS_RDEF,
-                        "Command to logical unit failed") },
-/*  T           */{SST(0x70, 0x00, SS_RDEF,
-                        "Decompression exception short: ASCQ = Algorithm ID") },
-/*  T           */{SST(0x70, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL) }, /* Range 0x00 -> 0xFF */
-/*  T           */{SST(0x71, 0x00, SS_RDEF,
-                        "Decompression exception long: ASCQ = Algorithm ID") },
-/*  T           */{SST(0x71, 0xFF, SS_RDEF|SSQ_RANGE,
-                        NULL) }, /* Range 0x00 -> 0xFF */       
-/*      R       */{SST(0x72, 0x00, SS_RDEF,
-                        "Session fixation error") },
-/*      R       */{SST(0x72, 0x01, SS_RDEF,
-                        "Session fixation error writing lead-in") },
-/*      R       */{SST(0x72, 0x02, SS_RDEF,
-                        "Session fixation error writing lead-out") },
-/*      R       */{SST(0x72, 0x03, SS_RDEF,
-                        "Session fixation error - incomplete track in session") },
-/*      R       */{SST(0x72, 0x04, SS_RDEF,
-                        "Empty or partially written reserved track") },
-/*      R       */{SST(0x73, 0x00, SS_RDEF,
-                        "CD control error") },
-/*      R       */{SST(0x73, 0x01, SS_RDEF,
-                        "Power calibration area almost full") },
-/*      R       */{SST(0x73, 0x02, SS_FATAL|ENOSPC,
-                        "Power calibration area is full") },
-/*      R       */{SST(0x73, 0x03, SS_RDEF,
-                        "Power calibration area error") },
-/*      R       */{SST(0x73, 0x04, SS_RDEF,
-                        "Program memory area update failure") },
-/*      R       */{SST(0x73, 0x05, SS_RDEF,
-                        "program memory area is full") }
-};
-
-static const int asc_table_size = sizeof(asc_table)/sizeof(asc_table[0]);
-
-struct asc_key
-{
-        int asc;
-        int ascq;
-};
-
-static int
-ascentrycomp(const void *key, const void *member)
-{
-        int asc;
-        int ascq;
-        const struct asc_table_entry *table_entry;
-
-        asc = ((const struct asc_key *)key)->asc;
-        ascq = ((const struct asc_key *)key)->ascq;
-        table_entry = (const struct asc_table_entry *)member;
-
-        if (asc >= table_entry->asc) {
-
-                if (asc > table_entry->asc)
-                        return (1);
-
-                if (ascq <= table_entry->ascq) {
-                        /* Check for ranges */
-                        if (ascq == table_entry->ascq
-                         || ((table_entry->action & SSQ_RANGE) != 0
-                           && ascq >= (table_entry - 1)->ascq))
-                                return (0);
-                        return (-1);
-                }
-                return (1);
-        }
-        return (-1);
-}
-
-static int
-senseentrycomp(const void *key, const void *member)
-{
-        int sense_key;
-        const struct sense_key_table_entry *table_entry;
-
-        sense_key = *((const int *)key);
-        table_entry = (const struct sense_key_table_entry *)member;
-
-        if (sense_key >= table_entry->sense_key) {
-                if (sense_key == table_entry->sense_key)
-                        return (0);
-                return (1);
-        }
-        return (-1);
-}
-
-static void
-fetchtableentries(int sense_key, int asc, int ascq,
-                  struct scsi_inquiry_data *inq_data,
-                  const struct sense_key_table_entry **sense_entry,
-                  const struct asc_table_entry **asc_entry)
-{
-        void *match;
-        const struct asc_table_entry *asc_tables[2];
-        const struct sense_key_table_entry *sense_tables[2];
-        struct asc_key asc_ascq;
-        size_t asc_tables_size[2];
-        size_t sense_tables_size[2];
-        int num_asc_tables;
-        int num_sense_tables;
-        int i;
-
-        /* Default to failure */
-        *sense_entry = NULL;
-        *asc_entry = NULL;
-        match = NULL;
-        if (inq_data != NULL)
-                match = cam_quirkmatch((void *)inq_data,
-                                       (void *)sense_quirk_table,
-                                       sense_quirk_table_size,
-                                       sizeof(*sense_quirk_table),
-                                       aic_inquiry_match);
-
-        if (match != NULL) {
-                struct scsi_sense_quirk_entry *quirk;
-
-                quirk = (struct scsi_sense_quirk_entry *)match;
-                asc_tables[0] = quirk->asc_info;
-                asc_tables_size[0] = quirk->num_ascs;
-                asc_tables[1] = asc_table;
-                asc_tables_size[1] = asc_table_size;
-                num_asc_tables = 2;
-                sense_tables[0] = quirk->sense_key_info;
-                sense_tables_size[0] = quirk->num_sense_keys;
-                sense_tables[1] = sense_key_table;
-                sense_tables_size[1] = sense_key_table_size;
-                num_sense_tables = 2;
-        } else {
-                asc_tables[0] = asc_table;
-                asc_tables_size[0] = asc_table_size;
-                num_asc_tables = 1;
-                sense_tables[0] = sense_key_table;
-                sense_tables_size[0] = sense_key_table_size;
-                num_sense_tables = 1;
-        }
-
-        asc_ascq.asc = asc;
-        asc_ascq.ascq = ascq;
-        for (i = 0; i < num_asc_tables; i++) {
-                void *found_entry;
-
-                found_entry = scsibsearch(&asc_ascq, asc_tables[i],
-                                          asc_tables_size[i],
-                                          sizeof(**asc_tables),
-                                          ascentrycomp);
-
-                if (found_entry) {
-                        *asc_entry = (struct asc_table_entry *)found_entry;
-                        break;
-                }
-        }
-
-        for (i = 0; i < num_sense_tables; i++) {
-                void *found_entry;
-
-                found_entry = scsibsearch(&sense_key, sense_tables[i],
-                                          sense_tables_size[i],
-                                          sizeof(**sense_tables),
-                                          senseentrycomp);
-
-                if (found_entry) {
-                        *sense_entry =
-                            (struct sense_key_table_entry *)found_entry;
-                        break;
-                }
-        }
-}
-
-static void *
-scsibsearch(const void *key, const void *base, size_t nmemb, size_t size,
-                 int (*compar)(const void *, const void *))
-{
-        const void *entry;
-        u_int l;
-        u_int u;
-        u_int m;
-
-        l = -1;
-        u = nmemb;
-        while (l + 1 != u) {
-                m = (l + u) / 2;
-                entry = base + m * size;
-                if (compar(key, entry) > 0)
-                        l = m;
-                else
-                        u = m;
-        }
-
-        entry = base + u * size;
-        if (u == nmemb
-         || compar(key, entry) != 0)
-                return (NULL);
-
-        return ((void *)entry);
-}
-
-/*
- * Compare string with pattern, returning 0 on match.
- * Short pattern matches trailing blanks in name,
- * wildcard '*' in pattern matches rest of name,
- * wildcard '?' matches a single non-space character.
- */
-static int
-cam_strmatch(const uint8_t *str, const uint8_t *pattern, int str_len)
-{
-
-        while (*pattern != '\0'&& str_len > 0) {  
-
-                if (*pattern == '*') {
-                        return (0);
-                }
-                if ((*pattern != *str)
-                 && (*pattern != '?' || *str == ' ')) {
-                        return (1);
-                }
-                pattern++;
-                str++;
-                str_len--;
-        }
-        while (str_len > 0 && *str++ == ' ')
-                str_len--;
-
-        return (str_len);
-}
-
-static caddr_t
-cam_quirkmatch(caddr_t target, caddr_t quirk_table, int num_entries,
-               int entry_size, cam_quirkmatch_t *comp_func)
-{
-        for (; num_entries > 0; num_entries--, quirk_table += entry_size) {
-                if ((*comp_func)(target, quirk_table) == 0)
-                        return (quirk_table);
-        }
-        return (NULL);
-}
-
-void
-aic_sense_desc(int sense_key, int asc, int ascq,
-               struct scsi_inquiry_data *inq_data,
-               const char **sense_key_desc, const char **asc_desc)
-{
-        const struct asc_table_entry *asc_entry;
-        const struct sense_key_table_entry *sense_entry;
-
-        fetchtableentries(sense_key, asc, ascq,
-                          inq_data,
-                          &sense_entry,
-                          &asc_entry);
-
-        *sense_key_desc = sense_entry->desc;
-
-        if (asc_entry != NULL)
-                *asc_desc = asc_entry->desc;
-        else if (asc >= 0x80 && asc <= 0xff)
-                *asc_desc = "Vendor Specific ASC";
-        else if (ascq >= 0x80 && ascq <= 0xff)
-                *asc_desc = "Vendor Specific ASCQ";
-        else
-                *asc_desc = "Reserved ASC/ASCQ pair";
-}
-
-/*
- * Given sense and device type information, return the appropriate action.
- * If we do not understand the specific error as identified by the ASC/ASCQ
- * pair, fall back on the more generic actions derived from the sense key.
- */
-aic_sense_action
-aic_sense_error_action(struct scsi_sense_data *sense_data,
-                       struct scsi_inquiry_data *inq_data, uint32_t sense_flags)
-{
-        const struct asc_table_entry *asc_entry;
-        const struct sense_key_table_entry *sense_entry;
-        int error_code, sense_key, asc, ascq;
-        aic_sense_action action;
-
-        scsi_extract_sense(sense_data, &error_code, &sense_key, &asc, &ascq);
-
-        if (error_code == SSD_DEFERRED_ERROR) {
-                /*
-                 * XXX dufault@FreeBSD.org
-                 * This error doesn't relate to the command associated
-                 * with this request sense.  A deferred error is an error
-                 * for a command that has already returned GOOD status
-                 * (see SCSI2 8.2.14.2).
-                 *
-                 * By my reading of that section, it looks like the current
-                 * command has been cancelled, we should now clean things up
-                 * (hopefully recovering any lost data) and then retry the
-                 * current command.  There are two easy choices, both wrong:
-                 *
-                 * 1. Drop through (like we had been doing), thus treating
-                 *    this as if the error were for the current command and
-                 *    return and stop the current command.
-                 * 
-                 * 2. Issue a retry (like I made it do) thus hopefully
-                 *    recovering the current transfer, and ignoring the
-                 *    fact that we've dropped a command.
-                 *
-                 * These should probably be handled in a device specific
-                 * sense handler or punted back up to a user mode daemon
-                 */
-                action = SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE;
-        } else {
-                fetchtableentries(sense_key, asc, ascq,
-                                  inq_data,
-                                  &sense_entry,
-                                  &asc_entry);
-
-                /*
-                 * Override the 'No additional Sense' entry (0,0)
-                 * with the error action of the sense key.
-                 */
-                if (asc_entry != NULL
-                 && (asc != 0 || ascq != 0))
-                        action = asc_entry->action;
-                else
-                        action = sense_entry->action;
-
-                if (sense_key == SSD_KEY_RECOVERED_ERROR) {
-                        /*
-                         * The action succeeded but the device wants
-                         * the user to know that some recovery action
-                         * was required.
-                         */
-                        action &= ~(SS_MASK|SSQ_MASK|SS_ERRMASK);
-                        action |= SS_NOP|SSQ_PRINT_SENSE;
-                } else if (sense_key == SSD_KEY_ILLEGAL_REQUEST) {
-                        if ((sense_flags & SF_QUIET_IR) != 0)
-                                action &= ~SSQ_PRINT_SENSE;
-                } else if (sense_key == SSD_KEY_UNIT_ATTENTION) {
-                        if ((sense_flags & SF_RETRY_UA) != 0
-                         && (action & SS_MASK) == SS_FAIL) {
-                                action &= ~(SS_MASK|SSQ_MASK);
-                                action |= SS_RETRY|SSQ_DECREMENT_COUNT|
-                                          SSQ_PRINT_SENSE;
-                        }
-                }
-        }
-
-        if ((sense_flags & SF_PRINT_ALWAYS) != 0)
-                action |= SSQ_PRINT_SENSE;
-        else if ((sense_flags & SF_NO_PRINT) != 0)
-                action &= ~SSQ_PRINT_SENSE;
-
-        return (action);
-}
-
-/*      
- * Try make as good a match as possible with
- * available sub drivers
- */
-int
-aic_inquiry_match(caddr_t inqbuffer, caddr_t table_entry)
-{
-        struct scsi_inquiry_pattern *entry;
-        struct scsi_inquiry_data *inq;
- 
-        entry = (struct scsi_inquiry_pattern *)table_entry;
-        inq = (struct scsi_inquiry_data *)inqbuffer;
-
-        if (((SID_TYPE(inq) == entry->type)
-          || (entry->type == T_ANY))
-         && (SID_IS_REMOVABLE(inq) ? entry->media_type & SIP_MEDIA_REMOVABLE
-                                   : entry->media_type & SIP_MEDIA_FIXED)
-         && (cam_strmatch(inq->vendor, entry->vendor, sizeof(inq->vendor)) == 0)
-         && (cam_strmatch(inq->product, entry->product,
-                          sizeof(inq->product)) == 0)
-         && (cam_strmatch(inq->revision, entry->revision,
-                          sizeof(inq->revision)) == 0)) {
-                return (0);
-        }
-        return (-1);
-}
-
-/*
- * Table of syncrates that don't follow the "divisible by 4"
- * rule. This table will be expanded in future SCSI specs.
- */
-static struct {
-        u_int period_factor;
-        u_int period;   /* in 100ths of ns */
-} scsi_syncrates[] = {
-        { 0x08, 625 },  /* FAST-160 */
-        { 0x09, 1250 }, /* FAST-80 */
-        { 0x0a, 2500 }, /* FAST-40 40MHz */
-        { 0x0b, 3030 }, /* FAST-40 33MHz */
-        { 0x0c, 5000 }  /* FAST-20 */
-};
-
-/*
- * Return the frequency in kHz corresponding to the given
- * sync period factor.
- */
-u_int
-aic_calc_syncsrate(u_int period_factor)
-{
-        int i;
-        int num_syncrates;
-
-        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
-        /* See if the period is in the "exception" table */
-        for (i = 0; i < num_syncrates; i++) {
-
-                if (period_factor == scsi_syncrates[i].period_factor) {
-                        /* Period in kHz */
-                        return (100000000 / scsi_syncrates[i].period);
-                }
-        }
-
-        /*
-         * Wasn't in the table, so use the standard
-         * 4 times conversion.
-         */
-        return (10000000 / (period_factor * 4 * 10));
-}
-
-/*
- * Return speed in KB/s.
- */
-u_int
-aic_calc_speed(u_int width, u_int period, u_int offset, u_int min_rate)
-{
-        u_int freq;
-
-        if (offset != 0 && period < min_rate)
-                freq  = aic_calc_syncsrate(period);
-        else
-                /* Roughly 3.3MB/s for async */
-                freq  = 3300;
-        freq <<= width;
-        return (freq);
-}
-
-uint32_t
-aic_error_action(struct scsi_cmnd *cmd, struct scsi_inquiry_data *inq_data,
-                 cam_status status, u_int scsi_status)
-{
-        aic_sense_action  err_action;
-        int               sense;
-
-        sense  = (cmd->result >> 24) == DRIVER_SENSE;
-
-        switch (status) {
-        case CAM_REQ_CMP:
-                err_action = SS_NOP;
-                break;
-        case CAM_AUTOSENSE_FAIL:
-        case CAM_SCSI_STATUS_ERROR:
-
-                switch (scsi_status) {
-                case SCSI_STATUS_OK:
-                case SCSI_STATUS_COND_MET:
-                case SCSI_STATUS_INTERMED:
-                case SCSI_STATUS_INTERMED_COND_MET:
-                        err_action = SS_NOP;
-                        break;
-                case SCSI_STATUS_CMD_TERMINATED:
-                case SCSI_STATUS_CHECK_COND:
-                        if (sense != 0) {
-                                struct scsi_sense_data *sense;
-
-                                sense = (struct scsi_sense_data *)
-                                    &cmd->sense_buffer;
-                                err_action =
-                                    aic_sense_error_action(sense, inq_data, 0);
-
-                        } else {
-                                err_action = SS_RETRY|SSQ_FALLBACK
-                                           | SSQ_DECREMENT_COUNT|EIO;
-                        }
-                        break;
-                case SCSI_STATUS_QUEUE_FULL:
-                case SCSI_STATUS_BUSY:
-                        err_action = SS_RETRY|SSQ_DELAY|SSQ_MANY
-                                   | SSQ_DECREMENT_COUNT|EBUSY;
-                        break;
-                case SCSI_STATUS_RESERV_CONFLICT:
-                default:
-                        err_action = SS_FAIL|EBUSY;
-                        break;
-                }
-                break;
-        case CAM_CMD_TIMEOUT:
-        case CAM_REQ_CMP_ERR:
-        case CAM_UNEXP_BUSFREE:
-        case CAM_UNCOR_PARITY:
-        case CAM_DATA_RUN_ERR:
-                err_action = SS_RETRY|SSQ_FALLBACK|EIO;
-                break;
-        case CAM_UA_ABORT:
-        case CAM_UA_TERMIO:
-        case CAM_MSG_REJECT_REC:
-        case CAM_SEL_TIMEOUT:
-                err_action = SS_FAIL|EIO;
-                break;
-        case CAM_REQ_INVALID:
-        case CAM_PATH_INVALID:
-        case CAM_DEV_NOT_THERE:
-        case CAM_NO_HBA:
-        case CAM_PROVIDE_FAIL:
-        case CAM_REQ_TOO_BIG:           
-        case CAM_RESRC_UNAVAIL:
-        case CAM_BUSY:
-        default:
-                /* panic??  These should never occur in our application. */
-                err_action = SS_FAIL|EIO;
-                break;
-        case CAM_SCSI_BUS_RESET:
-        case CAM_BDR_SENT:              
-        case CAM_REQUEUE_REQ:
-                /* Unconditional requeue */
-                err_action = SS_RETRY;
-                break;
-        }
-
-        return (err_action);
-}
-
-char *
-aic_parse_brace_option(char *opt_name, char *opt_arg, char *end, int depth,
-                       aic_option_callback_t *callback, u_long callback_arg)
-{
-        char    *tok_end;
-        char    *tok_end2;
-        int      i;
-        int      instance;
-        int      targ;
-        int      done;
-        char     tok_list[] = {'.', ',', '{', '}', '\0'};
 
-        /* All options use a ':' name/arg separator */
-        if (*opt_arg != ':')
-                return (opt_arg);
-        opt_arg++;
-        instance = -1;
-        targ = -1;
-        done = FALSE;
-        /*
-         * Restore separator that may be in
-         * the middle of our option argument.
-         */
-        tok_end = strchr(opt_arg, '\0');
-        if (tok_end < end)
-                *tok_end = ',';
-        while (!done) {
-                switch (*opt_arg) {
-                case '{':
-                        if (instance == -1) {
-                                instance = 0;
-                        } else {
-                                if (depth > 1) {
-                                        if (targ == -1)
-                                                targ = 0;
-                                } else {
-                                        printf("Malformed Option %s\n",
-                                               opt_name);
-                                        done = TRUE;
-                                }
-                        }
-                        opt_arg++;
-                        break;
-                case '}':
-                        if (targ != -1)
-                                targ = -1;
-                        else if (instance != -1)
-                                instance = -1;
-                        opt_arg++;
-                        break;
-                case ',':
-                case '.':
-                        if (instance == -1)
-                                done = TRUE;
-                        else if (targ >= 0)
-                                targ++;
-                        else if (instance >= 0)
-                                instance++;
-                        opt_arg++;
-                        break;
-                case '\0':
-                        done = TRUE;
-                        break;
-                default:
-                        tok_end = end;
-                        for (i = 0; tok_list[i]; i++) {
-                                tok_end2 = strchr(opt_arg, tok_list[i]);
-                                if ((tok_end2) && (tok_end2 < tok_end))
-                                        tok_end = tok_end2;
-                        }
-                        callback(callback_arg, instance, targ,
-                                 simple_strtol(opt_arg, NULL, 0));
-                        opt_arg = tok_end;
-                        break;
-                }
-        }
-        return (opt_arg);
-}
diff --git a/drivers/scsi/aic7xxx/aiclib.h b/drivers/scsi/aic7xxx/aiclib.h
index bfe6f954d3c4..3bfbf0fe1ec2 100644
--- a/drivers/scsi/aic7xxx/aiclib.h
+++ b/drivers/scsi/aic7xxx/aiclib.h
@@ -57,121 +57,6 @@
 #ifndef _AICLIB_H
 #define _AICLIB_H
 
-/*
- * Linux Interrupt Support.
- */
-#ifndef IRQ_RETVAL
-typedef void irqreturn_t;
-#define IRQ_RETVAL(x)
-#endif
-
-/*
- * SCSI command format
- */
-
-/*
- * Define dome bits that are in ALL (or a lot of) scsi commands
- */
-#define SCSI_CTL_LINK           0x01
-#define SCSI_CTL_FLAG           0x02
-#define SCSI_CTL_VENDOR         0xC0
-#define SCSI_CMD_LUN            0xA0    /* these two should not be needed */
-#define SCSI_CMD_LUN_SHIFT      5       /* LUN in the cmd is no longer SCSI */
-
-#define SCSI_MAX_CDBLEN         16      /* 
-                                         * 16 byte commands are in the 
-                                         * SCSI-3 spec 
-                                         */
-/* 6byte CDBs special case 0 length to be 256 */
-#define SCSI_CDB6_LEN(len)      ((len) == 0 ? 256 : len)
-
-/*
- * This type defines actions to be taken when a particular sense code is
- * received.  Right now, these flags are only defined to take up 16 bits,
- * but can be expanded in the future if necessary.
- */
-typedef enum {
-        SS_NOP          = 0x000000, /* Do nothing */
-        SS_RETRY        = 0x010000, /* Retry the command */
-        SS_FAIL         = 0x020000, /* Bail out */
-        SS_START        = 0x030000, /* Send a Start Unit command to the device,
-                                     * then retry the original command.
-                                     */
-        SS_TUR          = 0x040000, /* Send a Test Unit Ready command to the
-                                     * device, then retry the original command.
-                                     */
-        SS_REQSENSE     = 0x050000, /* Send a RequestSense command to the
-                                     * device, then retry the original command.
-                                     */
-        SS_INQ_REFRESH  = 0x060000,
-        SS_MASK         = 0xff0000
-} aic_sense_action;
-
-typedef enum {
-        SSQ_NONE                = 0x0000,
-        SSQ_DECREMENT_COUNT     = 0x0100,  /* Decrement the retry count */
-        SSQ_MANY                = 0x0200,  /* send lots of recovery commands */
-        SSQ_RANGE               = 0x0400,  /*
-                                            * This table entry represents the
-                                            * end of a range of ASCQs that
-                                            * have identical error actions
-                                            * and text.
-                                            */
-        SSQ_PRINT_SENSE         = 0x0800,
-        SSQ_DELAY               = 0x1000,  /* Delay before retry. */
-        SSQ_DELAY_RANDOM        = 0x2000,  /* Randomized delay before retry. */
-        SSQ_FALLBACK            = 0x4000,  /* Do a speed fallback to recover */
-        SSQ_MASK                = 0xff00
-} aic_sense_action_qualifier;
-
-/* Mask for error status values */
-#define SS_ERRMASK      0xff
-
-/* The default, retyable, error action */
-#define SS_RDEF         SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE|EIO
-
-/* The retyable, error action, with table specified error code */
-#define SS_RET          SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE
-
-/* Fatal error action, with table specified error code */
-#define SS_FATAL        SS_FAIL|SSQ_PRINT_SENSE
-
-struct scsi_generic
-{
-        uint8_t opcode;
-        uint8_t bytes[11];
-};
-
-struct scsi_request_sense
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_test_unit_ready
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[3];
-        uint8_t control;
-};
-
-struct scsi_send_diag
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SSD_UOL         0x01
-#define SSD_DOL         0x02
-#define SSD_SELFTEST    0x04
-#define SSD_PF          0x10
-        uint8_t unused[1];
-        uint8_t paramlen[2];
-        uint8_t control;
-};
-
 struct scsi_sense
 {
         uint8_t opcode;
@@ -181,537 +66,12 @@ struct scsi_sense
         uint8_t control;
 };
 
-struct scsi_inquiry
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SI_EVPD 0x01
-        uint8_t page_code;
-        uint8_t reserved;
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_mode_sense_6
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SMS_DBD                         0x08
-        uint8_t page;
-#define SMS_PAGE_CODE                   0x3F
-#define SMS_VENDOR_SPECIFIC_PAGE        0x00
-#define SMS_DISCONNECT_RECONNECT_PAGE   0x02
-#define SMS_PERIPHERAL_DEVICE_PAGE      0x09
-#define SMS_CONTROL_MODE_PAGE           0x0A
-#define SMS_ALL_PAGES_PAGE              0x3F
-#define SMS_PAGE_CTRL_MASK              0xC0
-#define SMS_PAGE_CTRL_CURRENT           0x00
-#define SMS_PAGE_CTRL_CHANGEABLE        0x40
-#define SMS_PAGE_CTRL_DEFAULT           0x80
-#define SMS_PAGE_CTRL_SAVED             0xC0
-        uint8_t unused;
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_mode_sense_10
-{
-        uint8_t opcode;
-        uint8_t byte2;          /* same bits as small version */
-        uint8_t page;           /* same bits as small version */
-        uint8_t unused[4];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_mode_select_6
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SMS_SP  0x01
-#define SMS_PF  0x10
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_mode_select_10
-{
-        uint8_t opcode;
-        uint8_t byte2;          /* same bits as small version */
-        uint8_t unused[5];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-/*
- * When sending a mode select to a tape drive, the medium type must be 0.
- */
-struct scsi_mode_hdr_6
-{
-        uint8_t datalen;
-        uint8_t medium_type;
-        uint8_t dev_specific;
-        uint8_t block_descr_len;
-};
-
-struct scsi_mode_hdr_10
-{
-        uint8_t datalen[2];
-        uint8_t medium_type;
-        uint8_t dev_specific;
-        uint8_t reserved[2];
-        uint8_t block_descr_len[2];
-};
-
-struct scsi_mode_block_descr
-{
-        uint8_t density_code;
-        uint8_t num_blocks[3];
-        uint8_t reserved;
-        uint8_t block_len[3];
-};
-
-struct scsi_log_sense
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SLS_SP                          0x01
-#define SLS_PPC                         0x02
-        uint8_t page;
-#define SLS_PAGE_CODE                   0x3F
-#define SLS_ALL_PAGES_PAGE              0x00
-#define SLS_OVERRUN_PAGE                0x01
-#define SLS_ERROR_WRITE_PAGE            0x02
-#define SLS_ERROR_READ_PAGE             0x03
-#define SLS_ERROR_READREVERSE_PAGE      0x04
-#define SLS_ERROR_VERIFY_PAGE           0x05
-#define SLS_ERROR_NONMEDIUM_PAGE        0x06
-#define SLS_ERROR_LASTN_PAGE            0x07
-#define SLS_PAGE_CTRL_MASK              0xC0
-#define SLS_PAGE_CTRL_THRESHOLD         0x00
-#define SLS_PAGE_CTRL_CUMULATIVE        0x40
-#define SLS_PAGE_CTRL_THRESH_DEFAULT    0x80
-#define SLS_PAGE_CTRL_CUMUL_DEFAULT     0xC0
-        uint8_t reserved[2];
-        uint8_t paramptr[2];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_log_select
-{
-        uint8_t opcode;
-        uint8_t byte2;
-/*      SLS_SP                          0x01 */
-#define SLS_PCR                         0x02
-        uint8_t page;
-/*      SLS_PAGE_CTRL_MASK              0xC0 */
-/*      SLS_PAGE_CTRL_THRESHOLD         0x00 */
-/*      SLS_PAGE_CTRL_CUMULATIVE        0x40 */
-/*      SLS_PAGE_CTRL_THRESH_DEFAULT    0x80 */
-/*      SLS_PAGE_CTRL_CUMUL_DEFAULT     0xC0 */
-        uint8_t reserved[4];
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_log_header
-{
-        uint8_t page;
-        uint8_t reserved;
-        uint8_t datalen[2];
-};
-
-struct scsi_log_param_header {
-        uint8_t param_code[2];
-        uint8_t param_control;
-#define SLP_LP                          0x01
-#define SLP_LBIN                        0x02
-#define SLP_TMC_MASK                    0x0C
-#define SLP_TMC_ALWAYS                  0x00
-#define SLP_TMC_EQUAL                   0x04
-#define SLP_TMC_NOTEQUAL                0x08
-#define SLP_TMC_GREATER                 0x0C
-#define SLP_ETC                         0x10
-#define SLP_TSD                         0x20
-#define SLP_DS                          0x40
-#define SLP_DU                          0x80
-        uint8_t param_len;
-};
-
-struct scsi_control_page {
-        uint8_t page_code;
-        uint8_t page_length;
-        uint8_t rlec;
-#define SCB_RLEC                        0x01    /*Report Log Exception Cond*/
-        uint8_t queue_flags;
-#define SCP_QUEUE_ALG_MASK              0xF0
-#define SCP_QUEUE_ALG_RESTRICTED        0x00
-#define SCP_QUEUE_ALG_UNRESTRICTED      0x10
-#define SCP_QUEUE_ERR                   0x02    /*Queued I/O aborted for CACs*/
-#define SCP_QUEUE_DQUE                  0x01    /*Queued I/O disabled*/
-        uint8_t eca_and_aen;
-#define SCP_EECA                        0x80    /*Enable Extended CA*/
-#define SCP_RAENP                       0x04    /*Ready AEN Permission*/
-#define SCP_UAAENP                      0x02    /*UA AEN Permission*/
-#define SCP_EAENP                       0x01    /*Error AEN Permission*/
-        uint8_t reserved;
-        uint8_t aen_holdoff_period[2];
-};
-
-struct scsi_reserve
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_release
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_prevent
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[2];
-        uint8_t how;
-        uint8_t control;
-};
-#define PR_PREVENT 0x01
-#define PR_ALLOW   0x00
-
-struct scsi_sync_cache
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t begin_lba[4];
-        uint8_t reserved;
-        uint8_t lb_count[2];
-        uint8_t control;        
-};
-
-
-struct scsi_changedef
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused1;
-        uint8_t how;
-        uint8_t unused[4];
-        uint8_t datalen;
-        uint8_t control;
-};
-
-struct scsi_read_buffer
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define RWB_MODE                0x07
-#define RWB_MODE_HDR_DATA       0x00
-#define RWB_MODE_DATA           0x02
-#define RWB_MODE_DOWNLOAD       0x04
-#define RWB_MODE_DOWNLOAD_SAVE  0x05
-        uint8_t buffer_id;
-        uint8_t offset[3];
-        uint8_t length[3];
-        uint8_t control;
-};
-
-struct scsi_write_buffer
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t buffer_id;
-        uint8_t offset[3];
-        uint8_t length[3];
-        uint8_t control;
-};
-
-struct scsi_rw_6
-{
-        uint8_t opcode;
-        uint8_t addr[3];
-/* only 5 bits are valid in the MSB address byte */
-#define SRW_TOPADDR     0x1F
-        uint8_t length;
-        uint8_t control;
-};
-
-struct scsi_rw_10
-{
-        uint8_t opcode;
-#define SRW10_RELADDR   0x01
-#define SRW10_FUA       0x08
-#define SRW10_DPO       0x10
-        uint8_t byte2;
-        uint8_t addr[4];
-        uint8_t reserved;
-        uint8_t length[2];
-        uint8_t control;
-};
-
-struct scsi_rw_12
-{
-        uint8_t opcode;
-#define SRW12_RELADDR   0x01
-#define SRW12_FUA       0x08
-#define SRW12_DPO       0x10
-        uint8_t byte2;
-        uint8_t addr[4];
-        uint8_t length[4];
-        uint8_t reserved;
-        uint8_t control;
-};
-
-struct scsi_start_stop_unit
-{
-        uint8_t opcode;
-        uint8_t byte2;
-#define SSS_IMMED               0x01
-        uint8_t reserved[2];
-        uint8_t how;
-#define SSS_START               0x01
-#define SSS_LOEJ                0x02
-        uint8_t control;
-};
-
-#define SC_SCSI_1 0x01
-#define SC_SCSI_2 0x03
-
-/*
- * Opcodes
- */
-
-#define TEST_UNIT_READY         0x00
-#define REQUEST_SENSE           0x03
-#define READ_6                  0x08
-#define WRITE_6                 0x0a
-#define INQUIRY                 0x12
-#define MODE_SELECT_6           0x15
-#define MODE_SENSE_6            0x1a
-#define START_STOP_UNIT         0x1b
-#define START_STOP              0x1b
-#define RESERVE                 0x16
-#define RELEASE                 0x17
-#define RECEIVE_DIAGNOSTIC      0x1c
-#define SEND_DIAGNOSTIC         0x1d
-#define PREVENT_ALLOW           0x1e
-#define READ_CAPACITY           0x25
-#define READ_10                 0x28
-#define WRITE_10                0x2a
-#define POSITION_TO_ELEMENT     0x2b
-#define SYNCHRONIZE_CACHE       0x35
-#define WRITE_BUFFER            0x3b
-#define READ_BUFFER             0x3c
-#define CHANGE_DEFINITION       0x40
-#define LOG_SELECT              0x4c
-#define LOG_SENSE               0x4d
-#ifdef XXXCAM
-#define MODE_SENSE_10           0x5A
-#endif
-#define MODE_SELECT_10          0x55
-#define MOVE_MEDIUM             0xa5
-#define READ_12                 0xa8
-#define WRITE_12                0xaa
-#define READ_ELEMENT_STATUS     0xb8
-
-
-/*
- * Device Types
- */
-#define T_DIRECT        0x00
-#define T_SEQUENTIAL    0x01
-#define T_PRINTER       0x02
-#define T_PROCESSOR     0x03
-#define T_WORM          0x04
-#define T_CDROM         0x05
-#define T_SCANNER       0x06
-#define T_OPTICAL       0x07
-#define T_CHANGER       0x08
-#define T_COMM          0x09
-#define T_ASC0          0x0a
-#define T_ASC1          0x0b
-#define T_STORARRAY     0x0c
-#define T_ENCLOSURE     0x0d
-#define T_RBC           0x0e
-#define T_OCRW          0x0f
-#define T_NODEVICE      0x1F
-#define T_ANY           0xFF    /* Used in Quirk table matches */
-
-#define T_REMOV         1
-#define T_FIXED         0
-
-/*
- * This length is the initial inquiry length used by the probe code, as    
- * well as the legnth necessary for aic_print_inquiry() to function 
- * correctly.  If either use requires a different length in the future, 
- * the two values should be de-coupled.
- */
-#define SHORT_INQUIRY_LENGTH    36
-
-struct scsi_inquiry_data
-{
-        uint8_t device;
-#define SID_TYPE(inq_data) ((inq_data)->device & 0x1f)
-#define SID_QUAL(inq_data) (((inq_data)->device & 0xE0) >> 5)
-#define SID_QUAL_LU_CONNECTED   0x00    /*
-                                         * The specified peripheral device
-                                         * type is currently connected to
-                                         * logical unit.  If the target cannot
-                                         * determine whether or not a physical
-                                         * device is currently connected, it
-                                         * shall also use this peripheral
-                                         * qualifier when returning the INQUIRY
-                                         * data.  This peripheral qualifier
-                                         * does not mean that the device is
-                                         * ready for access by the initiator.
-                                         */
-#define SID_QUAL_LU_OFFLINE     0x01    /*
-                                         * The target is capable of supporting
-                                         * the specified peripheral device type
-                                         * on this logical unit; however, the
-                                         * physical device is not currently
-                                         * connected to this logical unit.
-                                         */
-#define SID_QUAL_RSVD           0x02
-#define SID_QUAL_BAD_LU         0x03    /*
-                                         * The target is not capable of
-                                         * supporting a physical device on
-                                         * this logical unit. For this
-                                         * peripheral qualifier the peripheral
-                                         * device type shall be set to 1Fh to
-                                         * provide compatibility with previous
-                                         * versions of SCSI. All other
-                                         * peripheral device type values are
-                                         * reserved for this peripheral
-                                         * qualifier.
-                                         */
-#define SID_QUAL_IS_VENDOR_UNIQUE(inq_data) ((SID_QUAL(inq_data) & 0x08) != 0)
-        uint8_t dev_qual2;
-#define SID_QUAL2       0x7F
-#define SID_IS_REMOVABLE(inq_data) (((inq_data)->dev_qual2 & 0x80) != 0)
-        uint8_t version;
-#define SID_ANSI_REV(inq_data) ((inq_data)->version & 0x07)
 #define         SCSI_REV_0              0
 #define         SCSI_REV_CCS            1
 #define         SCSI_REV_2              2
 #define         SCSI_REV_SPC            3
 #define         SCSI_REV_SPC2           4
 
-#define SID_ECMA        0x38
-#define SID_ISO         0xC0
-        uint8_t response_format;
-#define SID_AENC        0x80
-#define SID_TrmIOP      0x40
-        uint8_t additional_length;
-        uint8_t reserved[2];
-        uint8_t flags;
-#define SID_SftRe       0x01
-#define SID_CmdQue      0x02
-#define SID_Linked      0x08
-#define SID_Sync        0x10
-#define SID_WBus16      0x20
-#define SID_WBus32      0x40
-#define SID_RelAdr      0x80
-#define SID_VENDOR_SIZE   8
-        char     vendor[SID_VENDOR_SIZE];
-#define SID_PRODUCT_SIZE  16
-        char     product[SID_PRODUCT_SIZE];
-#define SID_REVISION_SIZE 4
-        char     revision[SID_REVISION_SIZE];
-        /*
-         * The following fields were taken from SCSI Primary Commands - 2
-         * (SPC-2) Revision 14, Dated 11 November 1999
-         */
-#define SID_VENDOR_SPECIFIC_0_SIZE      20
-        uint8_t vendor_specific0[SID_VENDOR_SPECIFIC_0_SIZE];
-        /*
-         * An extension of SCSI Parallel Specific Values
-         */
-#define SID_SPI_IUS             0x01
-#define SID_SPI_QAS             0x02
-#define SID_SPI_CLOCK_ST        0x00
-#define SID_SPI_CLOCK_DT        0x04
-#define SID_SPI_CLOCK_DT_ST     0x0C
-#define SID_SPI_MASK            0x0F
-        uint8_t spi3data;
-        uint8_t reserved2;
-        /*
-         * Version Descriptors, stored 2 byte values.
-         */
-        uint8_t version1[2];
-        uint8_t version2[2];
-        uint8_t version3[2];
-        uint8_t version4[2];
-        uint8_t version5[2];
-        uint8_t version6[2];
-        uint8_t version7[2];
-        uint8_t version8[2];
-
-        uint8_t reserved3[22];
-
-#define SID_VENDOR_SPECIFIC_1_SIZE      160
-        uint8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE];
-};
-
-struct scsi_vpd_unit_serial_number
-{
-        uint8_t device;
-        uint8_t page_code;
-#define SVPD_UNIT_SERIAL_NUMBER 0x80
-        uint8_t reserved;
-        uint8_t length; /* serial number length */
-#define SVPD_SERIAL_NUM_SIZE 251
-        uint8_t serial_num[SVPD_SERIAL_NUM_SIZE];
-};
-
-struct scsi_read_capacity
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t addr[4];
-        uint8_t unused[3];
-        uint8_t control;
-};
-
-struct scsi_read_capacity_data
-{
-        uint8_t addr[4];
-        uint8_t length[4];
-};
-
-struct scsi_report_luns
-{
-        uint8_t opcode;
-        uint8_t byte2;
-        uint8_t unused[3];
-        uint8_t addr[4];
-        uint8_t control;
-};
-
-struct scsi_report_luns_data {
-        uint8_t length[4];      /* length of LUN inventory, in bytes */
-        uint8_t reserved[4];    /* unused */
-        /*
-         * LUN inventory- we only support the type zero form for now.
-         */
-        struct {
-                uint8_t lundata[8];
-        } luns[1];
-};
-#define RPL_LUNDATA_ATYP_MASK   0xc0    /* MBZ for type 0 lun */
-#define RPL_LUNDATA_T0LUN       1       /* @ lundata[1] */
-
-
 struct scsi_sense_data
 {
         uint8_t error_code;
@@ -757,41 +117,6 @@ struct scsi_sense_data
 #define SSD_FULL_SIZE sizeof(struct scsi_sense_data)
 };
 
-struct scsi_mode_header_6
-{
-        uint8_t data_length;    /* Sense data length */
-        uint8_t medium_type;
-        uint8_t dev_spec;
-        uint8_t blk_desc_len;
-};
-
-struct scsi_mode_header_10
-{
-        uint8_t data_length[2];/* Sense data length */
-        uint8_t medium_type;
-        uint8_t dev_spec;
-        uint8_t unused[2];
-        uint8_t blk_desc_len[2];
-};
-
-struct scsi_mode_page_header
-{
-        uint8_t page_code;
-        uint8_t page_length;
-};
-
-struct scsi_mode_blk_desc
-{
-        uint8_t density;
-        uint8_t nblocks[3];
-        uint8_t reserved;
-        uint8_t blklen[3];
-};
-
-#define SCSI_DEFAULT_DENSITY    0x00    /* use 'default' density */
-#define SCSI_SAME_DENSITY       0x7f    /* use 'same' density- >= SCSI-2 only */
-
-
 /*
  * Status Byte
  */
@@ -807,76 +132,7 @@ struct scsi_mode_blk_desc
 #define SCSI_STATUS_ACA_ACTIVE          0x30
 #define SCSI_STATUS_TASK_ABORTED        0x40
 
-struct scsi_inquiry_pattern {
-        uint8_t   type;
-        uint8_t   media_type;
-#define SIP_MEDIA_REMOVABLE     0x01
-#define SIP_MEDIA_FIXED         0x02
-        const char *vendor;
-        const char *product;
-        const char *revision;
-}; 
-
-struct scsi_static_inquiry_pattern {
-        uint8_t   type;
-        uint8_t   media_type;
-        char       vendor[SID_VENDOR_SIZE+1];
-        char       product[SID_PRODUCT_SIZE+1];
-        char       revision[SID_REVISION_SIZE+1];
-};
-
-struct scsi_sense_quirk_entry {
-        struct scsi_inquiry_pattern     inq_pat;
-        int                             num_sense_keys;
-        int                             num_ascs;
-        struct sense_key_table_entry    *sense_key_info;
-        struct asc_table_entry          *asc_info;
-};
-
-struct sense_key_table_entry {
-        uint8_t    sense_key;
-        uint32_t   action;
-        const char *desc;
-};
-
-struct asc_table_entry {
-        uint8_t    asc;
-        uint8_t    ascq;
-        uint32_t   action;
-        const char *desc;
-};
-
-struct op_table_entry {
-        uint8_t    opcode;
-        uint16_t   opmask;
-        const char  *desc;
-};
-
-struct scsi_op_quirk_entry {
-        struct scsi_inquiry_pattern     inq_pat;
-        int                             num_ops;
-        struct op_table_entry           *op_table;
-};
-
-typedef enum {
-        SSS_FLAG_NONE           = 0x00,
-        SSS_FLAG_PRINT_COMMAND  = 0x01
-} scsi_sense_string_flags;
-
-extern const char *scsi_sense_key_text[];
-
 /************************* Large Disk Handling ********************************/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static __inline int aic_sector_div(u_long capacity, int heads, int sectors);
-
-static __inline int
-aic_sector_div(u_long capacity, int heads, int sectors)
-{
-        return (capacity / (heads * sectors));
-}
-#else
-static __inline int aic_sector_div(sector_t capacity, int heads, int sectors);
-
 static __inline int
 aic_sector_div(sector_t capacity, int heads, int sectors)
 {
@@ -884,152 +140,6 @@ aic_sector_div(sector_t capacity, int heads, int sectors)
         sector_div(capacity, (heads * sectors));
         return (int)capacity;
 }
-#endif
-
-/**************************** Module Library Hack *****************************/
-/*
- * What we'd like to do is have a single "scsi library" module that both the
- * aic7xxx and aic79xx drivers could load and depend on.  A cursory examination
- * of implementing module dependencies in Linux (handling the install and
- * initrd cases) does not look promissing.  For now, we just duplicate this
- * code in both drivers using a simple symbol renaming scheme that hides this
- * hack from the drivers.
- */
-#define AIC_LIB_ENTRY_CONCAT(x, prefix) prefix ## x
-#define AIC_LIB_ENTRY_EXPAND(x, prefix) AIC_LIB_ENTRY_CONCAT(x, prefix)
-#define AIC_LIB_ENTRY(x)                AIC_LIB_ENTRY_EXPAND(x, AIC_LIB_PREFIX)
-
-#define aic_sense_desc                  AIC_LIB_ENTRY(_sense_desc)
-#define aic_sense_error_action          AIC_LIB_ENTRY(_sense_error_action)
-#define aic_error_action                AIC_LIB_ENTRY(_error_action)
-#define aic_op_desc                     AIC_LIB_ENTRY(_op_desc)
-#define aic_cdb_string                  AIC_LIB_ENTRY(_cdb_string)
-#define aic_print_inquiry               AIC_LIB_ENTRY(_print_inquiry)
-#define aic_calc_syncsrate              AIC_LIB_ENTRY(_calc_syncrate)
-#define aic_calc_syncparam              AIC_LIB_ENTRY(_calc_syncparam)
-#define aic_calc_speed                  AIC_LIB_ENTRY(_calc_speed)
-#define aic_inquiry_match               AIC_LIB_ENTRY(_inquiry_match)
-#define aic_static_inquiry_match        AIC_LIB_ENTRY(_static_inquiry_match)
-#define aic_parse_brace_option          AIC_LIB_ENTRY(_parse_brace_option)
-
-/******************************************************************************/
-
-void                    aic_sense_desc(int /*sense_key*/, int /*asc*/,
-                                       int /*ascq*/, struct scsi_inquiry_data*,
-                                       const char** /*sense_key_desc*/,
-                                       const char** /*asc_desc*/);
-aic_sense_action        aic_sense_error_action(struct scsi_sense_data*,
-                                               struct scsi_inquiry_data*,
-                                               uint32_t /*sense_flags*/);
-uint32_t                aic_error_action(struct scsi_cmnd *,
-                                         struct scsi_inquiry_data *,
-                                         cam_status, u_int);
-
-#define SF_RETRY_UA     0x01
-#define SF_NO_PRINT     0x02
-#define SF_QUIET_IR     0x04    /* Be quiet about Illegal Request reponses */
-#define SF_PRINT_ALWAYS 0x08
-
-
-const char *    aic_op_desc(uint16_t /*opcode*/, struct scsi_inquiry_data*);
-char *          aic_cdb_string(uint8_t* /*cdb_ptr*/, char* /*cdb_string*/,
-                               size_t /*len*/);
-void            aic_print_inquiry(struct scsi_inquiry_data*);
-
-u_int           aic_calc_syncsrate(u_int /*period_factor*/);
-u_int           aic_calc_syncparam(u_int /*period*/);
-u_int           aic_calc_speed(u_int width, u_int period, u_int offset,
-                               u_int min_rate);
-        
-int             aic_inquiry_match(caddr_t /*inqbuffer*/,
-                                  caddr_t /*table_entry*/);
-int             aic_static_inquiry_match(caddr_t /*inqbuffer*/,
-                                         caddr_t /*table_entry*/);
-
-typedef void aic_option_callback_t(u_long, int, int, int32_t);
-char *          aic_parse_brace_option(char *opt_name, char *opt_arg,
-                                       char *end, int depth,
-                                       aic_option_callback_t *, u_long);
-
-static __inline void     scsi_extract_sense(struct scsi_sense_data *sense,
-                                            int *error_code, int *sense_key,
-                                            int *asc, int *ascq);
-static __inline void     scsi_ulto2b(uint32_t val, uint8_t *bytes);
-static __inline void     scsi_ulto3b(uint32_t val, uint8_t *bytes);
-static __inline void     scsi_ulto4b(uint32_t val, uint8_t *bytes);
-static __inline uint32_t scsi_2btoul(uint8_t *bytes);
-static __inline uint32_t scsi_3btoul(uint8_t *bytes);
-static __inline int32_t  scsi_3btol(uint8_t *bytes);
-static __inline uint32_t scsi_4btoul(uint8_t *bytes);
-
-static __inline void scsi_extract_sense(struct scsi_sense_data *sense,
-                                       int *error_code, int *sense_key,
-                                       int *asc, int *ascq)
-{
-        *error_code = sense->error_code & SSD_ERRCODE;
-        *sense_key = sense->flags & SSD_KEY;
-        *asc = (sense->extra_len >= 5) ? sense->add_sense_code : 0;
-        *ascq = (sense->extra_len >= 6) ? sense->add_sense_code_qual : 0;
-}
-
-static __inline void
-scsi_ulto2b(uint32_t val, uint8_t *bytes)
-{
-
-        bytes[0] = (val >> 8) & 0xff;
-        bytes[1] = val & 0xff;
-}
-
-static __inline void
-scsi_ulto3b(uint32_t val, uint8_t *bytes)
-{
-
-        bytes[0] = (val >> 16) & 0xff;
-        bytes[1] = (val >> 8) & 0xff;
-        bytes[2] = val & 0xff;
-}
-
-static __inline void
-scsi_ulto4b(uint32_t val, uint8_t *bytes)
-{
-
-        bytes[0] = (val >> 24) & 0xff;
-        bytes[1] = (val >> 16) & 0xff;
-        bytes[2] = (val >> 8) & 0xff;
-        bytes[3] = val & 0xff;
-}
-
-static __inline uint32_t
-scsi_2btoul(uint8_t *bytes)
-{
-        uint32_t rv;
-
-        rv = (bytes[0] << 8) |
-             bytes[1];
-        return (rv);
-}
-
-static __inline uint32_t
-scsi_3btoul(uint8_t *bytes)
-{
-        uint32_t rv;
-
-        rv = (bytes[0] << 16) |
-             (bytes[1] << 8) |
-             bytes[2];
-        return (rv);
-}
-
-static __inline int32_t 
-scsi_3btol(uint8_t *bytes)
-{
-        uint32_t rc = scsi_3btoul(bytes);
- 
-        if (rc & 0x00800000)
-                rc |= 0xff000000;
-
-        return (int32_t) rc;
-}
 
 static __inline uint32_t
 scsi_4btoul(uint8_t *bytes)
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index fb28c1261848..deec0cef88d9 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -583,8 +583,7 @@ static void pci_enable_intx(struct pci_dev *pdev)
 #define AHCI_ENABLE (1 << 31)
 static int piix_disable_ahci(struct pci_dev *pdev)
 {
-        void *mmio;
-        unsigned long addr;
+        void __iomem *mmio;
         u32 tmp;
         int rc = 0;
 
@@ -592,11 +591,11 @@ static int piix_disable_ahci(struct pci_dev *pdev)
          * works because this device is usually set up by BIOS.
          */
 
-        addr = pci_resource_start(pdev, AHCI_PCI_BAR);
-        if (!addr || !pci_resource_len(pdev, AHCI_PCI_BAR))
+        if (!pci_resource_start(pdev, AHCI_PCI_BAR) ||
+            !pci_resource_len(pdev, AHCI_PCI_BAR))
                 return 0;
 
-        mmio = ioremap(addr, 64);
+        mmio = pci_iomap(pdev, AHCI_PCI_BAR, 64);
         if (!mmio)
                 return -ENOMEM;
 
@@ -610,7 +609,7 @@ static int piix_disable_ahci(struct pci_dev *pdev)
                         rc = -EIO;
         }
 
-        iounmap(mmio);
+        pci_iounmap(pdev, mmio);
         return rc;
 }
 
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 3900e28ac7d6..bd0e1b6be1ea 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -20,7 +20,6 @@
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/completion.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/ioctl32.h>
 #include <linux/compat.h>
 #include <linux/chio.h>                 /* here are all the ioctls */
@@ -31,7 +30,7 @@
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
-#include <scsi/scsi_request.h>
+#include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
 
 #define CH_DT_MAX       16
@@ -181,17 +180,17 @@ static struct {
 
 /* ------------------------------------------------------------------- */
 
-static int ch_find_errno(unsigned char *sense_buffer)
+static int ch_find_errno(struct scsi_sense_hdr *sshdr)
 {
         int i,errno = 0;
 
         /* Check to see if additional sense information is available */
-        if (sense_buffer[7]  > 5 &&
-            sense_buffer[12] != 0) {
+        if (scsi_sense_valid(sshdr) &&
+            sshdr->asc != 0) {
                 for (i = 0; err[i].errno != 0; i++) {
-                        if (err[i].sense == sense_buffer[ 2] &&
-                            err[i].asc   == sense_buffer[12] &&
-                            err[i].ascq  == sense_buffer[13]) {
+                        if (err[i].sense == sshdr->sense_key &&
+                            err[i].asc   == sshdr->asc &&
+                            err[i].ascq  == sshdr->ascq) {
                                 errno = -err[i].errno;
                                 break;
                         }
@@ -207,13 +206,9 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
            void *buffer, unsigned buflength,
            enum dma_data_direction direction)
 {
-        int errno, retries = 0, timeout;
-        struct scsi_request *sr;
+        int errno, retries = 0, timeout, result;
+        struct scsi_sense_hdr sshdr;
         
-        sr = scsi_allocate_request(ch->device, GFP_KERNEL);
-        if (NULL == sr)
-                return -ENOMEM;
-
         timeout = (cmd[0] == INITIALIZE_ELEMENT_STATUS)
                 ? timeout_init : timeout_move;
 
@@ -224,16 +219,17 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
                 __scsi_print_command(cmd);
         }
 
-        scsi_wait_req(sr, cmd, buffer, buflength,
-                      timeout * HZ, MAX_RETRIES);
+        result = scsi_execute_req(ch->device, cmd, direction, buffer,
+                                  buflength, &sshdr, timeout * HZ,
+                                  MAX_RETRIES);
 
-        dprintk("result: 0x%x\n",sr->sr_result);
-        if (driver_byte(sr->sr_result) & DRIVER_SENSE) {
+        dprintk("result: 0x%x\n",result);
+        if (driver_byte(result) & DRIVER_SENSE) {
                 if (debug)
-                        scsi_print_req_sense(ch->name, sr);
-                errno = ch_find_errno(sr->sr_sense_buffer);
+                        scsi_print_sense_hdr(ch->name, &sshdr);
+                errno = ch_find_errno(&sshdr);
 
-                switch(sr->sr_sense_buffer[2] & 0xf) {
+                switch(sshdr.sense_key) {
                 case UNIT_ATTENTION:
                         ch->unit_attention = 1;
                         if (retries++ < 3)
@@ -241,7 +237,6 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
                         break;
                 }
         }
-        scsi_release_request(sr);
         return errno;
 }
 
@@ -940,8 +935,6 @@ static int ch_probe(struct device *dev)
         if (init)
                 ch_init_elem(ch);
 
-        devfs_mk_cdev(MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
-                      S_IFCHR | S_IRUGO | S_IWUGO, ch->name);
         class_device_create(ch_sysfs_class,
                             MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
                             dev, "s%s", ch->name);
@@ -974,7 +967,6 @@ static int ch_remove(struct device *dev)
 
         class_device_destroy(ch_sysfs_class,
                              MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
-        devfs_remove(ch->name);
         kfree(ch->dt);
         kfree(ch);
         ch_devcount--;
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index ec161733a82b..f6be2c1c3942 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -17,6 +17,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_request.h>
 #include <scsi/scsi_eh.h>
+#include <scsi/scsi_dbg.h>
 
 
 
@@ -1155,6 +1156,31 @@ scsi_show_extd_sense(unsigned char asc, unsigned char ascq)
         }
 }
 
+void
+scsi_print_sense_hdr(const char *name, struct scsi_sense_hdr *sshdr)
+{
+        const char *sense_txt;
+        /* An example of deferred is when an earlier write to disk cache
+         * succeeded, but now the disk discovers that it cannot write the
+         * data to the magnetic media.
+         */
+        const char *error = scsi_sense_is_deferred(sshdr) ? 
+                "<<DEFERRED>>" : "Current";
+        printk(KERN_INFO "%s: %s", name, error);
+        if (sshdr->response_code >= 0x72)
+                printk(" [descriptor]");
+
+        sense_txt = scsi_sense_key_string(sshdr->sense_key);
+        if (sense_txt)
+                printk(": sense key: %s\n", sense_txt);
+        else
+                printk(": sense key=0x%x\n", sshdr->sense_key);
+        printk(KERN_INFO "    ");
+        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
+        printk("\n");
+}
+EXPORT_SYMBOL(scsi_print_sense_hdr);
+
 /* Print sense information */
 void
 __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
@@ -1162,8 +1188,6 @@ __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
 {
         int k, num, res;
         unsigned int info;
-        const char *error;
-        const char *sense_txt;
         struct scsi_sense_hdr ssh;
     
         res = scsi_normalize_sense(sense_buffer, sense_len, &ssh);
@@ -1181,26 +1205,7 @@ __scsi_print_sense(const char *name, const unsigned char *sense_buffer,
                 printk("\n");
                 return;
         }
-
-        /* An example of deferred is when an earlier write to disk cache
-         * succeeded, but now the disk discovers that it cannot write the
-         * data to the magnetic media.
-         */
-        error = scsi_sense_is_deferred(&ssh) ? 
-                        "<<DEFERRED>>" : "Current";
-        printk(KERN_INFO "%s: %s", name, error);
-        if (ssh.response_code >= 0x72)
-                printk(" [descriptor]");
-
-        sense_txt = scsi_sense_key_string(ssh.sense_key);
-        if (sense_txt)
-                printk(": sense key: %s\n", sense_txt);
-        else
-                printk(": sense key=0x%x\n", ssh.sense_key);
-        printk(KERN_INFO "    ");
-        scsi_show_extd_sense(ssh.asc, ssh.ascq);
-        printk("\n");
-
+        scsi_print_sense_hdr(name, &ssh);
         if (ssh.response_code < 0x72) {
                 /* only decode extras for "fixed" format now */
                 char buff[80];
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 5feb886c3392..85503fad789a 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/blkdev.h>
 #include <linux/kernel.h>
+#include <linux/kthread.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/init.h>
@@ -52,21 +53,80 @@ static struct class shost_class = {
 };
 
 /**
- * scsi_host_cancel - cancel outstanding IO to this host
- * @shost:      pointer to struct Scsi_Host
- * recovery:    recovery requested to run.
+ *      scsi_host_set_state - Take the given host through the host
+ *              state model.
+ *      @shost: scsi host to change the state of.
+ *      @state: state to change to.
+ *
+ *      Returns zero if unsuccessful or an error if the requested
+ *      transition is illegal.
  **/
-static void scsi_host_cancel(struct Scsi_Host *shost, int recovery)
+int scsi_host_set_state(struct Scsi_Host *shost, enum scsi_host_state state)
 {
-        struct scsi_device *sdev;
+        enum scsi_host_state oldstate = shost->shost_state;
+
+        if (state == oldstate)
+                return 0;
+
+        switch (state) {
+        case SHOST_CREATED:
+                /* There are no legal states that come back to
+                 * created.  This is the manually initialised start
+                 * state */
+                goto illegal;
+
+        case SHOST_RUNNING:
+                switch (oldstate) {
+                case SHOST_CREATED:
+                case SHOST_RECOVERY:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
+
+        case SHOST_RECOVERY:
+                switch (oldstate) {
+                case SHOST_RUNNING:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
+
+        case SHOST_CANCEL:
+                switch (oldstate) {
+                case SHOST_CREATED:
+                case SHOST_RUNNING:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
+
+        case SHOST_DEL:
+                switch (oldstate) {
+                case SHOST_CANCEL:
+                        break;
+                default:
+                        goto illegal;
+                }
+                break;
 
-        set_bit(SHOST_CANCEL, &shost->shost_state);
-        shost_for_each_device(sdev, shost) {
-                scsi_device_cancel(sdev, recovery);
         }
-        wait_event(shost->host_wait, (!test_bit(SHOST_RECOVERY,
-                                                &shost->shost_state)));
+        shost->shost_state = state;
+        return 0;
+
+ illegal:
+        SCSI_LOG_ERROR_RECOVERY(1,
+                                dev_printk(KERN_ERR, &shost->shost_gendev,
+                                           "Illegal host state transition"
+                                           "%s->%s\n",
+                                           scsi_host_state_name(oldstate),
+                                           scsi_host_state_name(state)));
+        return -EINVAL;
 }
+EXPORT_SYMBOL(scsi_host_set_state);
 
 /**
  * scsi_remove_host - remove a scsi host
@@ -74,11 +134,13 @@ static void scsi_host_cancel(struct Scsi_Host *shost, int recovery)
  **/
 void scsi_remove_host(struct Scsi_Host *shost)
 {
+        down(&shost->scan_mutex);
+        scsi_host_set_state(shost, SHOST_CANCEL);
+        up(&shost->scan_mutex);
         scsi_forget_host(shost);
-        scsi_host_cancel(shost, 0);
         scsi_proc_host_rm(shost);
 
-        set_bit(SHOST_DEL, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_DEL);
 
         transport_unregister_device(&shost->shost_gendev);
         class_device_unregister(&shost->shost_classdev);
@@ -115,7 +177,7 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev)
         if (error)
                 goto out;
 
-        set_bit(SHOST_ADD, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_RUNNING);
         get_device(shost->shost_gendev.parent);
 
         error = class_device_add(&shost->shost_classdev);
@@ -164,15 +226,8 @@ static void scsi_host_dev_release(struct device *dev)
         struct Scsi_Host *shost = dev_to_shost(dev);
         struct device *parent = dev->parent;
 
-        if (shost->ehandler) {
-                DECLARE_COMPLETION(sem);
-                shost->eh_notify = &sem;
-                shost->eh_kill = 1;
-                up(shost->eh_wait);
-                wait_for_completion(&sem);
-                shost->eh_notify = NULL;
-        }
-
+        if (shost->ehandler)
+                kthread_stop(shost->ehandler);
         if (shost->work_q)
                 destroy_workqueue(shost->work_q);
 
@@ -202,7 +257,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 {
         struct Scsi_Host *shost;
         int gfp_mask = GFP_KERNEL, rval;
-        DECLARE_COMPLETION(complete);
 
         if (sht->unchecked_isa_dma && privsize)
                 gfp_mask |= __GFP_DMA;
@@ -226,6 +280,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 
         spin_lock_init(&shost->default_lock);
         scsi_assign_lock(shost, &shost->default_lock);
+        shost->shost_state = SHOST_CREATED;
         INIT_LIST_HEAD(&shost->__devices);
         INIT_LIST_HEAD(&shost->__targets);
         INIT_LIST_HEAD(&shost->eh_cmd_q);
@@ -307,12 +362,12 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         snprintf(shost->shost_classdev.class_id, BUS_ID_SIZE, "host%d",
                   shost->host_no);
 
-        shost->eh_notify = &complete;
-        rval = kernel_thread(scsi_error_handler, shost, 0);
-        if (rval < 0)
+        shost->ehandler = kthread_run(scsi_error_handler, shost,
+                        "scsi_eh_%d", shost->host_no);
+        if (IS_ERR(shost->ehandler)) {
+                rval = PTR_ERR(shost->ehandler);
                 goto fail_destroy_freelist;
-        wait_for_completion(&complete);
-        shost->eh_notify = NULL;
+        }
 
         scsi_proc_hostdir_add(shost->hostt);
         return shost;
@@ -382,7 +437,7 @@ EXPORT_SYMBOL(scsi_host_lookup);
  **/
 struct Scsi_Host *scsi_host_get(struct Scsi_Host *shost)
 {
-        if (test_bit(SHOST_DEL, &shost->shost_state) ||
+        if ((shost->shost_state == SHOST_DEL) ||
                 !get_device(&shost->shost_gendev))
                 return NULL;
         return shost;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 2cb3c8340ca8..5b14934ba861 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -87,7 +87,7 @@ static int max_channel = 3;
 static int init_timeout = 5;
 static int max_requests = 50;
 
-#define IBMVSCSI_VERSION "1.5.6"
+#define IBMVSCSI_VERSION "1.5.7"
 
 MODULE_DESCRIPTION("IBM Virtual SCSI");
 MODULE_AUTHOR("Dave Boutcher");
@@ -145,6 +145,8 @@ static int initialize_event_pool(struct event_pool *pool,
                         sizeof(*evt->xfer_iu) * i;
                 evt->xfer_iu = pool->iu_storage + i;
                 evt->hostdata = hostdata;
+                evt->ext_list = NULL;
+                evt->ext_list_token = 0;
         }
 
         return 0;
@@ -161,9 +163,16 @@ static void release_event_pool(struct event_pool *pool,
                                struct ibmvscsi_host_data *hostdata)
 {
         int i, in_use = 0;
-        for (i = 0; i < pool->size; ++i)
+        for (i = 0; i < pool->size; ++i) {
                 if (atomic_read(&pool->events[i].free) != 1)
                         ++in_use;
+                if (pool->events[i].ext_list) {
+                        dma_free_coherent(hostdata->dev,
+                                  SG_ALL * sizeof(struct memory_descriptor),
+                                  pool->events[i].ext_list,
+                                  pool->events[i].ext_list_token);
+                }
+        }
         if (in_use)
                 printk(KERN_WARNING
                        "ibmvscsi: releasing event pool with %d "
@@ -286,24 +295,41 @@ static void set_srp_direction(struct scsi_cmnd *cmd,
         } else {
                 if (cmd->sc_data_direction == DMA_TO_DEVICE) {
                         srp_cmd->data_out_format = SRP_INDIRECT_BUFFER;
-                        srp_cmd->data_out_count = numbuf;
+                        srp_cmd->data_out_count =
+                                numbuf < MAX_INDIRECT_BUFS ?
+                                        numbuf: MAX_INDIRECT_BUFS;
                 } else {
                         srp_cmd->data_in_format = SRP_INDIRECT_BUFFER;
-                        srp_cmd->data_in_count = numbuf;
+                        srp_cmd->data_in_count =
+                                numbuf < MAX_INDIRECT_BUFS ?
+                                        numbuf: MAX_INDIRECT_BUFS;
                 }
         }
 }
 
+static void unmap_sg_list(int num_entries, 
+                struct device *dev,
+                struct memory_descriptor *md)
+{ 
+        int i;
+
+        for (i = 0; i < num_entries; ++i) {
+                dma_unmap_single(dev,
+                        md[i].virtual_address,
+                        md[i].length, DMA_BIDIRECTIONAL);
+        }
+}
+
 /**
  * unmap_cmd_data: - Unmap data pointed in srp_cmd based on the format
  * @cmd:        srp_cmd whose additional_data member will be unmapped
  * @dev:        device for which the memory is mapped
  *
 */
-static void unmap_cmd_data(struct srp_cmd *cmd, struct device *dev)
+static void unmap_cmd_data(struct srp_cmd *cmd,
+                           struct srp_event_struct *evt_struct,
+                           struct device *dev)
 {
-        int i;
-
         if ((cmd->data_out_format == SRP_NO_BUFFER) &&
             (cmd->data_in_format == SRP_NO_BUFFER))
                 return;
@@ -318,15 +344,34 @@ static void unmap_cmd_data(struct srp_cmd *cmd, struct device *dev)
                         (struct indirect_descriptor *)cmd->additional_data;
                 int num_mapped = indirect->head.length / 
                         sizeof(indirect->list[0]);
-                for (i = 0; i < num_mapped; ++i) {
-                        struct memory_descriptor *data = &indirect->list[i];
-                        dma_unmap_single(dev,
-                                         data->virtual_address,
-                                         data->length, DMA_BIDIRECTIONAL);
+
+                if (num_mapped <= MAX_INDIRECT_BUFS) {
+                        unmap_sg_list(num_mapped, dev, &indirect->list[0]);
+                        return;
                 }
+
+                unmap_sg_list(num_mapped, dev, evt_struct->ext_list);
         }
 }
 
+static int map_sg_list(int num_entries, 
+                       struct scatterlist *sg,
+                       struct memory_descriptor *md)
+{
+        int i;
+        u64 total_length = 0;
+
+        for (i = 0; i < num_entries; ++i) {
+                struct memory_descriptor *descr = md + i;
+                struct scatterlist *sg_entry = &sg[i];
+                descr->virtual_address = sg_dma_address(sg_entry);
+                descr->length = sg_dma_len(sg_entry);
+                descr->memory_handle = 0;
+                total_length += sg_dma_len(sg_entry);
+        }
+        return total_length;
+}
+
 /**
  * map_sg_data: - Maps dma for a scatterlist and initializes decriptor fields
  * @cmd:        Scsi_Cmnd with the scatterlist
@@ -337,10 +382,11 @@ static void unmap_cmd_data(struct srp_cmd *cmd, struct device *dev)
  * Returns 1 on success.
 */
 static int map_sg_data(struct scsi_cmnd *cmd,
+                       struct srp_event_struct *evt_struct,
                        struct srp_cmd *srp_cmd, struct device *dev)
 {
 
-        int i, sg_mapped;
+        int sg_mapped;
         u64 total_length = 0;
         struct scatterlist *sg = cmd->request_buffer;
         struct memory_descriptor *data =
@@ -363,27 +409,46 @@ static int map_sg_data(struct scsi_cmnd *cmd,
                 return 1;
         }
 
-        if (sg_mapped > MAX_INDIRECT_BUFS) {
+        if (sg_mapped > SG_ALL) {
                 printk(KERN_ERR
                        "ibmvscsi: More than %d mapped sg entries, got %d\n",
-                       MAX_INDIRECT_BUFS, sg_mapped);
+                       SG_ALL, sg_mapped);
                 return 0;
         }
 
         indirect->head.virtual_address = 0;
         indirect->head.length = sg_mapped * sizeof(indirect->list[0]);
         indirect->head.memory_handle = 0;
-        for (i = 0; i < sg_mapped; ++i) {
-                struct memory_descriptor *descr = &indirect->list[i];
-                struct scatterlist *sg_entry = &sg[i];
-                descr->virtual_address = sg_dma_address(sg_entry);
-                descr->length = sg_dma_len(sg_entry);
-                descr->memory_handle = 0;
-                total_length += sg_dma_len(sg_entry);
+
+        if (sg_mapped <= MAX_INDIRECT_BUFS) {
+                total_length = map_sg_list(sg_mapped, sg, &indirect->list[0]);
+                indirect->total_length = total_length;
+                return 1;
         }
-        indirect->total_length = total_length;
 
-        return 1;
+        /* get indirect table */
+        if (!evt_struct->ext_list) {
+                evt_struct->ext_list =(struct memory_descriptor*)
+                        dma_alloc_coherent(dev, 
+                                SG_ALL * sizeof(struct memory_descriptor),
+                                &evt_struct->ext_list_token, 0);
+                if (!evt_struct->ext_list) {
+                    printk(KERN_ERR
+                        "ibmvscsi: Can't allocate memory for indirect table\n");
+                        return 0;
+                        
+                }
+        }
+
+        total_length = map_sg_list(sg_mapped, sg, evt_struct->ext_list);        
+
+        indirect->total_length = total_length;
+        indirect->head.virtual_address = evt_struct->ext_list_token;
+        indirect->head.length = sg_mapped * sizeof(indirect->list[0]);
+        memcpy(indirect->list, evt_struct->ext_list,
+                MAX_INDIRECT_BUFS * sizeof(struct memory_descriptor));
+        
+        return 1;
 }
 
 /**
@@ -428,6 +493,7 @@ static int map_single_data(struct scsi_cmnd *cmd,
  * Returns 1 on success.
 */
 static int map_data_for_srp_cmd(struct scsi_cmnd *cmd,
+                                struct srp_event_struct *evt_struct,
                                 struct srp_cmd *srp_cmd, struct device *dev)
 {
         switch (cmd->sc_data_direction) {
@@ -450,7 +516,7 @@ static int map_data_for_srp_cmd(struct scsi_cmnd *cmd,
         if (!cmd->request_buffer)
                 return 1;
         if (cmd->use_sg)
-                return map_sg_data(cmd, srp_cmd, dev);
+                return map_sg_data(cmd, evt_struct, srp_cmd, dev);
         return map_single_data(cmd, srp_cmd, dev);
 }
 
@@ -486,6 +552,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
                 printk(KERN_WARNING 
                        "ibmvscsi: Warning, request_limit exceeded\n");
                 unmap_cmd_data(&evt_struct->iu.srp.cmd,
+                               evt_struct,
                                hostdata->dev);
                 free_event_struct(&hostdata->pool, evt_struct);
                 return SCSI_MLQUEUE_HOST_BUSY;
@@ -513,7 +580,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
         return 0;
 
  send_error:
-        unmap_cmd_data(&evt_struct->iu.srp.cmd, hostdata->dev);
+        unmap_cmd_data(&evt_struct->iu.srp.cmd, evt_struct, hostdata->dev);
 
         if ((cmnd = evt_struct->cmnd) != NULL) {
                 cmnd->result = DID_ERROR << 16;
@@ -551,6 +618,7 @@ static void handle_cmd_rsp(struct srp_event_struct *evt_struct)
                                rsp->sense_and_response_data,
                                rsp->sense_data_list_length);
                 unmap_cmd_data(&evt_struct->iu.srp.cmd, 
+                               evt_struct, 
                                evt_struct->hostdata->dev);
 
                 if (rsp->doover)
@@ -583,6 +651,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
 {
         struct srp_cmd *srp_cmd;
         struct srp_event_struct *evt_struct;
+        struct indirect_descriptor *indirect;
         struct ibmvscsi_host_data *hostdata =
                 (struct ibmvscsi_host_data *)&cmnd->device->host->hostdata;
         u16 lun = lun_from_dev(cmnd->device);
@@ -591,14 +660,6 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
         if (!evt_struct)
                 return SCSI_MLQUEUE_HOST_BUSY;
 
-        init_event_struct(evt_struct,
-                          handle_cmd_rsp,
-                          VIOSRP_SRP_FORMAT,
-                          cmnd->timeout);
-
-        evt_struct->cmnd = cmnd;
-        evt_struct->cmnd_done = done;
-
         /* Set up the actual SRP IU */
         srp_cmd = &evt_struct->iu.srp.cmd;
         memset(srp_cmd, 0x00, sizeof(*srp_cmd));
@@ -606,17 +667,25 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd,
         memcpy(srp_cmd->cdb, cmnd->cmnd, sizeof(cmnd->cmnd));
         srp_cmd->lun = ((u64) lun) << 48;
 
-        if (!map_data_for_srp_cmd(cmnd, srp_cmd, hostdata->dev)) {
+        if (!map_data_for_srp_cmd(cmnd, evt_struct, srp_cmd, hostdata->dev)) {
                 printk(KERN_ERR "ibmvscsi: couldn't convert cmd to srp_cmd\n");
                 free_event_struct(&hostdata->pool, evt_struct);
                 return SCSI_MLQUEUE_HOST_BUSY;
         }
 
+        init_event_struct(evt_struct,
+                          handle_cmd_rsp,
+                          VIOSRP_SRP_FORMAT,
+                          cmnd->timeout_per_command/HZ);
+
+        evt_struct->cmnd = cmnd;
+        evt_struct->cmnd_done = done;
+
         /* Fix up dma address of the buffer itself */
-        if ((srp_cmd->data_out_format == SRP_INDIRECT_BUFFER) ||
-            (srp_cmd->data_in_format == SRP_INDIRECT_BUFFER)) {
-                struct indirect_descriptor *indirect =
-                    (struct indirect_descriptor *)srp_cmd->additional_data;
+        indirect = (struct indirect_descriptor *)srp_cmd->additional_data;
+        if (((srp_cmd->data_out_format == SRP_INDIRECT_BUFFER) ||
+            (srp_cmd->data_in_format == SRP_INDIRECT_BUFFER)) &&
+            (indirect->head.virtual_address == 0)) {
                 indirect->head.virtual_address = evt_struct->crq.IU_data_ptr +
                     offsetof(struct srp_cmd, additional_data) +
                     offsetof(struct indirect_descriptor, list);
@@ -826,11 +895,13 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
         struct srp_event_struct *tmp_evt, *found_evt;
         union viosrp_iu srp_rsp;
         int rsp_rc;
+        unsigned long flags;
         u16 lun = lun_from_dev(cmd->device);
 
         /* First, find this command in our sent list so we can figure
          * out the correct tag
          */
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         found_evt = NULL;
         list_for_each_entry(tmp_evt, &hostdata->sent, list) {
                 if (tmp_evt->cmnd == cmd) {
@@ -839,11 +910,14 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
                 }
         }
 
-        if (!found_evt) 
+        if (!found_evt) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 return FAILED;
+        }
 
         evt = get_event_struct(&hostdata->pool);
         if (evt == NULL) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 printk(KERN_ERR "ibmvscsi: failed to allocate abort event\n");
                 return FAILED;
         }
@@ -867,7 +941,9 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
 
         evt->sync_srp = &srp_rsp;
         init_completion(&evt->comp);
-        if (ibmvscsi_send_srp_event(evt, hostdata) != 0) {
+        rsp_rc = ibmvscsi_send_srp_event(evt, hostdata);
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
+        if (rsp_rc != 0) {
                 printk(KERN_ERR "ibmvscsi: failed to send abort() event\n");
                 return FAILED;
         }
@@ -901,6 +977,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
          * The event is no longer in our list.  Make sure it didn't
          * complete while we were aborting
          */
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         found_evt = NULL;
         list_for_each_entry(tmp_evt, &hostdata->sent, list) {
                 if (tmp_evt->cmnd == cmd) {
@@ -910,6 +987,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
         }
 
         if (found_evt == NULL) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 printk(KERN_INFO
                        "ibmvscsi: aborted task tag 0x%lx completed\n",
                        tsk_mgmt->managed_task_tag);
@@ -922,8 +1000,10 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
 
         cmd->result = (DID_ABORT << 16);
         list_del(&found_evt->list);
-        unmap_cmd_data(&found_evt->iu.srp.cmd, found_evt->hostdata->dev);
+        unmap_cmd_data(&found_evt->iu.srp.cmd, found_evt,
+                       found_evt->hostdata->dev);
         free_event_struct(&found_evt->hostdata->pool, found_evt);
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
         atomic_inc(&hostdata->request_limit);
         return SUCCESS;
 }
@@ -943,10 +1023,13 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
         struct srp_event_struct *tmp_evt, *pos;
         union viosrp_iu srp_rsp;
         int rsp_rc;
+        unsigned long flags;
         u16 lun = lun_from_dev(cmd->device);
 
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         evt = get_event_struct(&hostdata->pool);
         if (evt == NULL) {
+                spin_unlock_irqrestore(hostdata->host->host_lock, flags);
                 printk(KERN_ERR "ibmvscsi: failed to allocate reset event\n");
                 return FAILED;
         }
@@ -969,7 +1052,9 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
 
         evt->sync_srp = &srp_rsp;
         init_completion(&evt->comp);
-        if (ibmvscsi_send_srp_event(evt, hostdata) != 0) {
+        rsp_rc = ibmvscsi_send_srp_event(evt, hostdata);
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
+        if (rsp_rc != 0) {
                 printk(KERN_ERR "ibmvscsi: failed to send reset event\n");
                 return FAILED;
         }
@@ -1002,12 +1087,14 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
         /* We need to find all commands for this LUN that have not yet been
          * responded to, and fail them with DID_RESET
          */
+        spin_lock_irqsave(hostdata->host->host_lock, flags);
         list_for_each_entry_safe(tmp_evt, pos, &hostdata->sent, list) {
                 if ((tmp_evt->cmnd) && (tmp_evt->cmnd->device == cmd->device)) {
                         if (tmp_evt->cmnd)
                                 tmp_evt->cmnd->result = (DID_RESET << 16);
                         list_del(&tmp_evt->list);
-                        unmap_cmd_data(&tmp_evt->iu.srp.cmd, tmp_evt->hostdata->dev);
+                        unmap_cmd_data(&tmp_evt->iu.srp.cmd, tmp_evt,
+                                       tmp_evt->hostdata->dev);
                         free_event_struct(&tmp_evt->hostdata->pool,
                                                    tmp_evt);
                         atomic_inc(&hostdata->request_limit);
@@ -1017,6 +1104,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
                                 tmp_evt->done(tmp_evt);
                 }
         }
+        spin_unlock_irqrestore(hostdata->host->host_lock, flags);
         return SUCCESS;
 }
 
@@ -1035,6 +1123,7 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata)
                 if (tmp_evt->cmnd) {
                         tmp_evt->cmnd->result = (DID_ERROR << 16);
                         unmap_cmd_data(&tmp_evt->iu.srp.cmd, 
+                                       tmp_evt, 
                                        tmp_evt->hostdata->dev);
                         if (tmp_evt->cmnd_done)
                                 tmp_evt->cmnd_done(tmp_evt->cmnd);
@@ -1339,7 +1428,7 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun = 16,
         .can_queue = 1,         /* Updated after SRP_LOGIN */
         .this_id = -1,
-        .sg_tablesize = MAX_INDIRECT_BUFS,
+        .sg_tablesize = SG_ALL,
         .use_clustering = ENABLE_CLUSTERING,
         .shost_attrs = ibmvscsi_attrs,
 };
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 1030b703c30e..8bec0438dc8a 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -68,6 +68,8 @@ struct srp_event_struct {
         void (*cmnd_done) (struct scsi_cmnd *);
         struct completion comp;
         union viosrp_iu *sync_srp;
+        struct memory_descriptor *ext_list;
+        dma_addr_t ext_list_token;
 };
 
 /* a pool of event structs for use */
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index dee4b12b0342..5cc53cd9323e 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -75,6 +75,10 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc);
 static unsigned int ata_unique_id = 1;
 static struct workqueue_struct *ata_wq;
 
+int atapi_enabled = 0;
+module_param(atapi_enabled, int, 0444);
+MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
+
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("Library module for ATA devices");
 MODULE_LICENSE("GPL");
@@ -2527,7 +2531,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
  *      @ap: port to read/write
  *      @buf: data buffer
  *      @buflen: buffer length
- *      @do_write: read/write
+ *      @write_data: read/write
  *
  *      Transfer data from/to the device data register by MMIO.
  *
@@ -2573,7 +2577,7 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,
  *      @ap: port to read/write
  *      @buf: data buffer
  *      @buflen: buffer length
- *      @do_write: read/write
+ *      @write_data: read/write
  *
  *      Transfer data from/to the device data register by PIO.
  *
@@ -4200,6 +4204,15 @@ ata_probe_ent_alloc(struct device *dev, struct ata_port_info *port)
 
 
 
+#ifdef CONFIG_PCI
+
+void ata_pci_host_stop (struct ata_host_set *host_set)
+{
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
+
+        pci_iounmap(pdev, host_set->mmio_base);
+}
+
 /**
  *      ata_pci_init_native_mode - Initialize native-mode driver
  *      @pdev:  pci device to be initialized
@@ -4212,7 +4225,6 @@ ata_probe_ent_alloc(struct device *dev, struct ata_port_info *port)
  *      ata_probe_ent structure should then be freed with kfree().
  */
 
-#ifdef CONFIG_PCI
 struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port)
 {
@@ -4595,6 +4607,7 @@ EXPORT_SYMBOL_GPL(ata_scsi_simulate);
 
 #ifdef CONFIG_PCI
 EXPORT_SYMBOL_GPL(pci_test_config_bits);
+EXPORT_SYMBOL_GPL(ata_pci_host_stop);
 EXPORT_SYMBOL_GPL(ata_pci_init_native_mode);
 EXPORT_SYMBOL_GPL(ata_pci_init_one);
 EXPORT_SYMBOL_GPL(ata_pci_remove_one);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index a980701d06c7..98057563a3cc 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1776,10 +1776,10 @@ ata_scsi_find_dev(struct ata_port *ap, struct scsi_device *scsidev)
         if (unlikely(!ata_dev_present(dev)))
                 return NULL;
 
-#ifndef ATA_ENABLE_ATAPI
-        if (unlikely(dev->class == ATA_DEV_ATAPI))
-                return NULL;
-#endif
+        if (!atapi_enabled) {
+                if (unlikely(dev->class == ATA_DEV_ATAPI))
+                        return NULL;
+        }
 
         return dev;
 }
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index a97ccb034e14..0f1db892f6aa 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -38,6 +38,7 @@ struct ata_scsi_args {
 };
 
 /* libata-core.c */
+extern int atapi_enabled;
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                                       struct ata_device *dev);
 extern void ata_qc_free(struct ata_queued_cmd *qc);
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 3bb82aae432e..adb95674823f 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -342,9 +342,6 @@ struct lpfc_hba {
 #define VPD_MASK            0xf         /* mask for any vpd data */
 
         struct timer_list els_tmofunc;
-
-        void *link_stats;
-
         /*
          * stat  counters
          */
@@ -370,6 +367,8 @@ struct lpfc_hba {
         struct list_head freebufList;
         struct list_head ctrspbuflist;
         struct list_head rnidrspbuflist;
+
+        struct fc_host_statistics link_stats;
 };
 
 
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 3cea92883019..0e089a42c03a 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
@@ -988,8 +989,7 @@ lpfc_get_stats(struct Scsi_Host *shost)
 {
         struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata[0];
         struct lpfc_sli *psli = &phba->sli;
-        struct fc_host_statistics *hs =
-                        (struct fc_host_statistics *)phba->link_stats;
+        struct fc_host_statistics *hs = &phba->link_stats;
         LPFC_MBOXQ_t *pmboxq;
         MAILBOX_t *pmb;
         int rc=0;
@@ -1020,6 +1020,8 @@ lpfc_get_stats(struct Scsi_Host *shost)
                 return NULL;
         }
 
+        memset(hs, 0, sizeof (struct fc_host_statistics));
+
         hs->tx_frames = pmb->un.varRdStatus.xmitFrameCnt;
         hs->tx_words = (pmb->un.varRdStatus.xmitByteCnt * 256);
         hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 78adee4699af..1280f0e54636 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -27,8 +27,10 @@
 #include <linux/interrupt.h>
 #include <linux/utsname.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_transport_fc.h>
 
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 2b1c9572dae7..63caf7fe9725 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 233901e9dfde..0a8269d6b130 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -24,6 +24,7 @@
 #include <linux/kthread.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
@@ -1135,6 +1136,8 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list)
         switch(list) {
         case NLP_NO_LIST: /* No list, just remove it */
                 lpfc_nlp_remove(phba, nlp);
+                /* as node removed - stop further transport calls */
+                rport_del = none;
                 break;
         case NLP_UNUSED_LIST:
                 spin_lock_irq(phba->host->host_lock);
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 34d416d2b007..6f3cb59bf9e0 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -28,6 +28,7 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
@@ -1339,14 +1340,12 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         if (pci_request_regions(pdev, LPFC_DRIVER_NAME))
                 goto out_disable_device;
 
-        host = scsi_host_alloc(&lpfc_template,
-                        sizeof (struct lpfc_hba) + sizeof (unsigned long));
+        host = scsi_host_alloc(&lpfc_template, sizeof (struct lpfc_hba));
         if (!host)
                 goto out_release_regions;
 
         phba = (struct lpfc_hba*)host->hostdata;
         memset(phba, 0, sizeof (struct lpfc_hba));
-        phba->link_stats = (void *)&phba[1];
         phba->host = host;
 
         phba->fc_flag |= FC_LOADING;
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index c27cf94795db..73eb89f91593 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -23,6 +23,11 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_transport_fc.h>
+
+#include <scsi/scsi.h>
+
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
 #include "lpfc_disc.h"
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index a5cfb6421fa9..0aba13ceaacf 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -23,6 +23,11 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_transport_fc.h>
+
+#include <scsi/scsi.h>
+
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
 #include "lpfc_disc.h"
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 45dc0210fc49..9b35eaac781d 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 17e4974d4445..b5ad1871d34b 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -40,11 +40,6 @@
 #define LPFC_RESET_WAIT  2
 #define LPFC_ABORT_WAIT  2
 
-static inline void lpfc_put_lun(struct fcp_cmnd *fcmd, unsigned int lun)
-{
-        fcmd->fcpLunLsl = 0;
-        fcmd->fcpLunMsl = swab16((uint16_t)lun);
-}
 
 /*
  * This routine allocates a scsi buffer, which contains all the necessary
@@ -238,6 +233,8 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd)
                 bpl->tus.f.bdeSize = scsi_cmnd->request_bufflen;
                 if (datadir == DMA_TO_DEVICE)
                         bpl->tus.f.bdeFlags = 0;
+                else
+                        bpl->tus.f.bdeFlags = BUFF_USE_RCV;
                 bpl->tus.w = le32_to_cpu(bpl->tus.w);
                 num_bde = 1;
                 bpl++;
@@ -245,8 +242,11 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd)
 
         /*
          * Finish initializing those IOCB fields that are dependent on the
-         * scsi_cmnd request_buffer
+         * scsi_cmnd request_buffer.  Note that the bdeSize is explicitly
+         * reinitialized since all iocb memory resources are used many times
+         * for transmit, receive, and continuation bpl's.
          */
+        iocb_cmd->un.fcpi64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));
         iocb_cmd->un.fcpi64.bdl.bdeSize +=
                 (num_bde * sizeof (struct ulp_bde64));
         iocb_cmd->ulpBdeCount = 1;
@@ -445,8 +445,11 @@ lpfc_scsi_prep_cmnd(struct lpfc_hba * phba, struct lpfc_scsi_buf * lpfc_cmd,
         int datadir = scsi_cmnd->sc_data_direction;
 
         lpfc_cmd->fcp_rsp->rspSnsLen = 0;
+        /* clear task management bits */
+        lpfc_cmd->fcp_cmnd->fcpCntl2 = 0;
 
-        lpfc_put_lun(lpfc_cmd->fcp_cmnd, lpfc_cmd->pCmd->device->lun);
+        int_to_scsilun(lpfc_cmd->pCmd->device->lun,
+                        &lpfc_cmd->fcp_cmnd->fcp_lun);
 
         memcpy(&fcp_cmnd->fcpCdb[0], scsi_cmnd->cmnd, 16);
 
@@ -545,7 +548,8 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_hba *phba,
         piocb = &piocbq->iocb;
 
         fcp_cmnd = lpfc_cmd->fcp_cmnd;
-        lpfc_put_lun(lpfc_cmd->fcp_cmnd, lpfc_cmd->pCmd->device->lun);
+        int_to_scsilun(lpfc_cmd->pCmd->device->lun,
+                        &lpfc_cmd->fcp_cmnd->fcp_lun);
         fcp_cmnd->fcpCntl2 = task_mgmt_cmd;
 
         piocb->ulpCommand = CMD_FCP_ICMND64_CR;
@@ -746,6 +750,10 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
                         cmnd->result = ScsiResult(DID_NO_CONNECT, 0);
                         goto out_fail_command;
                 }
+                else if (ndlp->nlp_state == NLP_STE_NPR_NODE) {
+                        cmnd->result = ScsiResult(DID_BUS_BUSY, 0);
+                        goto out_fail_command;
+                }
                 /*
                  * The device is most likely recovered and the driver
                  * needs a bit more time to finish.  Ask the midlayer
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index 0fd9ba14e1b5..acd64c49e849 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -78,18 +78,7 @@ struct fcp_rsp {
 };
 
 struct fcp_cmnd {
-        uint32_t fcpLunMsl;     /* most  significant lun word (32 bits) */
-        uint32_t fcpLunLsl;     /* least significant lun word (32 bits) */
-        /* # of bits to shift lun id to end up in right
-         * payload word, little endian = 8, big = 16.
-         */
-#ifdef __BIG_ENDIAN
-#define FC_LUN_SHIFT         16
-#define FC_ADDR_MODE_SHIFT   24
-#else   /*  __LITTLE_ENDIAN */
-#define FC_LUN_SHIFT         8
-#define FC_ADDR_MODE_SHIFT   0
-#endif
+        struct scsi_lun  fcp_lun;
 
         uint8_t fcpCntl0;       /* FCP_CNTL byte 0 (reserved) */
         uint8_t fcpCntl1;       /* FCP_CNTL byte 1 task codes */
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 1775508ed276..e74e224fd77c 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -24,9 +24,11 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_transport_fc.h>
 
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index 47dea48ee0ec..7e6747b06f90 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -18,7 +18,7 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "8.0.29"
+#define LPFC_DRIVER_VERSION "8.0.30"
 
 #define LPFC_DRIVER_NAME "lpfc"
 
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index ff1933298da6..a4857db4f9b8 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1766,7 +1766,7 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t state)
         struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
         unsigned long flags;
 
-        if (state == mdev->ofdev.dev.power.power_state || state < 2)
+        if (state.event == mdev->ofdev.dev.power.power_state.event || state.event < 2)
                 return 0;
 
         scsi_block_requests(ms->host);
@@ -1791,7 +1791,7 @@ static int mesh_resume(struct macio_dev *mdev)
         struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev);
         unsigned long flags;
 
-        if (mdev->ofdev.dev.power.power_state == 0)
+        if (mdev->ofdev.dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         set_mesh_power(ms, 1);
@@ -1802,7 +1802,7 @@ static int mesh_resume(struct macio_dev *mdev)
         enable_irq(ms->meshintr);
         scsi_unblock_requests(ms->host);
 
-        mdev->ofdev.dev.power.power_state = 0;
+        mdev->ofdev.dev.power.power_state.event = PM_EVENT_ON;
 
         return 0;
 }
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index b993652bfa25..637fb6565d28 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -996,7 +996,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                 break;
 
         case ABORT_DEVICE:
-                ha->flags.in_reset = 1;
                 if (qla1280_verbose)
                         printk(KERN_INFO
                                "scsi(%ld:%d:%d:%d): Queueing abort device "
@@ -1010,7 +1009,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                         printk(KERN_INFO
                                "scsi(%ld:%d:%d:%d): Queueing device reset "
                                "command.\n", ha->host_no, bus, target, lun);
-                ha->flags.in_reset = 1;
                 if (qla1280_device_reset(ha, bus, target) == 0)
                         result = SUCCESS;
                 break;
@@ -1019,7 +1017,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
                 if (qla1280_verbose)
                         printk(KERN_INFO "qla1280(%ld:%d): Issuing BUS "
                                "DEVICE RESET\n", ha->host_no, bus);
-                ha->flags.in_reset = 1;
                 if (qla1280_bus_reset(ha, bus == 0))
                         result = SUCCESS;
 
@@ -1047,7 +1044,6 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
 
         if (!list_empty(&ha->done_q))
                 qla1280_done(ha);
-        ha->flags.in_reset = 0;
 
         /* If we didn't manage to issue the action, or we have no
          * command to wait for, exit here */
@@ -1269,6 +1265,22 @@ qla1280_biosparam_old(Disk * disk, kdev_t dev, int geom[])
         return qla1280_biosparam(disk->device, NULL, disk->capacity, geom);
 }
 #endif
+ 
+/* disable risc and host interrupts */
+static inline void
+qla1280_disable_intrs(struct scsi_qla_host *ha)
+{
+        WRT_REG_WORD(&ha->iobase->ictrl, 0);
+        RD_REG_WORD(&ha->iobase->ictrl);        /* PCI Posted Write flush */
+}
+
+/* enable risc and host interrupts */
+static inline void
+qla1280_enable_intrs(struct scsi_qla_host *ha)
+{
+        WRT_REG_WORD(&ha->iobase->ictrl, (ISP_EN_INT | ISP_EN_RISC));
+        RD_REG_WORD(&ha->iobase->ictrl);        /* PCI Posted Write flush */
+}
 
 /**************************************************************************
  * qla1280_intr_handler
@@ -1290,7 +1302,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         ha->isr_count++;
         reg = ha->iobase;
 
-        WRT_REG_WORD(&reg->ictrl, 0);   /* disable our interrupt. */
+        qla1280_disable_intrs(ha);
 
         data = qla1280_debounce_register(&reg->istatus);
         /* Check for pending interrupts. */
@@ -1303,8 +1315,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
 
         spin_unlock(HOST_LOCK);
 
-        /* enable our interrupt. */
-        WRT_REG_WORD(&reg->ictrl, (ISP_EN_INT | ISP_EN_RISC));
+        qla1280_enable_intrs(ha);
 
         LEAVE_INTR("qla1280_intr_handler");
         return IRQ_RETVAL(handled);
@@ -1317,7 +1328,7 @@ qla1280_set_target_parameters(struct scsi_qla_host *ha, int bus, int target)
         uint8_t mr;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         struct nvram *nv;
-        int status;
+        int status, lun;
 
         nv = &ha->nvram;
 
@@ -1325,24 +1336,38 @@ qla1280_set_target_parameters(struct scsi_qla_host *ha, int bus, int target)
 
         /* Set Target Parameters. */
         mb[0] = MBC_SET_TARGET_PARAMETERS;
-        mb[1] = (uint16_t) (bus ? target | BIT_7 : target);
-        mb[1] <<= 8;
-
-        mb[2] = (nv->bus[bus].target[target].parameter.c << 8);
+        mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
+        mb[2] = nv->bus[bus].target[target].parameter.renegotiate_on_error << 8;
+        mb[2] |= nv->bus[bus].target[target].parameter.stop_queue_on_check << 9;
+        mb[2] |= nv->bus[bus].target[target].parameter.auto_request_sense << 10;
+        mb[2] |= nv->bus[bus].target[target].parameter.tag_queuing << 11;
+        mb[2] |= nv->bus[bus].target[target].parameter.enable_sync << 12;
+        mb[2] |= nv->bus[bus].target[target].parameter.enable_wide << 13;
+        mb[2] |= nv->bus[bus].target[target].parameter.parity_checking << 14;
+        mb[2] |= nv->bus[bus].target[target].parameter.disconnect_allowed << 15;
 
         if (IS_ISP1x160(ha)) {
                 mb[2] |= nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr << 5;
-                mb[3] = (nv->bus[bus].target[target].flags.flags1x160.sync_offset << 8) |
-                         nv->bus[bus].target[target].sync_period;
+                mb[3] = (nv->bus[bus].target[target].flags.flags1x160.sync_offset << 8);
                 mb[6] = (nv->bus[bus].target[target].ppr_1x160.flags.ppr_options << 8) |
                          nv->bus[bus].target[target].ppr_1x160.flags.ppr_bus_width;
                 mr |= BIT_6;
         } else {
-                mb[3] = (nv->bus[bus].target[target].flags.flags1x80.sync_offset << 8) |
-                         nv->bus[bus].target[target].sync_period;
+                mb[3] = (nv->bus[bus].target[target].flags.flags1x80.sync_offset << 8);
         }
+        mb[3] |= nv->bus[bus].target[target].sync_period;
 
-        status = qla1280_mailbox_command(ha, mr, &mb[0]);
+        status = qla1280_mailbox_command(ha, mr, mb);
+
+        /* Set Device Queue Parameters. */
+        for (lun = 0; lun < MAX_LUNS; lun++) {
+                mb[0] = MBC_SET_DEVICE_QUEUE;
+                mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
+                mb[1] |= lun;
+                mb[2] = nv->bus[bus].max_queue_depth;
+                mb[3] = nv->bus[bus].target[target].execution_throttle;
+                status |= qla1280_mailbox_command(ha, 0x0f, mb);
+        }
 
         if (status)
                 printk(KERN_WARNING "scsi(%ld:%i:%i): "
@@ -1389,19 +1414,19 @@ qla1280_slave_configure(struct scsi_device *device)
         }
 
 #if LINUX_VERSION_CODE > 0x020500
-        nv->bus[bus].target[target].parameter.f.enable_sync = device->sdtr;
-        nv->bus[bus].target[target].parameter.f.enable_wide = device->wdtr;
+        nv->bus[bus].target[target].parameter.enable_sync = device->sdtr;
+        nv->bus[bus].target[target].parameter.enable_wide = device->wdtr;
         nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = device->ppr;
 #endif
 
         if (driver_setup.no_sync ||
             (driver_setup.sync_mask &&
              (~driver_setup.sync_mask & (1 << target))))
-                nv->bus[bus].target[target].parameter.f.enable_sync = 0;
+                nv->bus[bus].target[target].parameter.enable_sync = 0;
         if (driver_setup.no_wide ||
             (driver_setup.wide_mask &&
              (~driver_setup.wide_mask & (1 << target))))
-                nv->bus[bus].target[target].parameter.f.enable_wide = 0;
+                nv->bus[bus].target[target].parameter.enable_wide = 0;
         if (IS_ISP1x160(ha)) {
                 if (driver_setup.no_ppr ||
                     (driver_setup.ppr_mask &&
@@ -1410,7 +1435,7 @@ qla1280_slave_configure(struct scsi_device *device)
         }
 
         spin_lock_irqsave(HOST_LOCK, flags);
-        if (nv->bus[bus].target[target].parameter.f.enable_sync)
+        if (nv->bus[bus].target[target].parameter.enable_sync)
                 status = qla1280_set_target_parameters(ha, bus, target);
         qla1280_get_target_parameters(ha, device);
         spin_unlock_irqrestore(HOST_LOCK, flags);
@@ -1448,7 +1473,6 @@ qla1280_select_queue_depth(struct Scsi_Host *host, struct scsi_device *sdev_q)
  *
  * Input:
  *      ha           = adapter block pointer.
- *      done_q       = done queue.
  */
 static void
 qla1280_done(struct scsi_qla_host *ha)
@@ -1522,7 +1546,7 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
         int host_status = DID_ERROR;
         uint16_t comp_status = le16_to_cpu(sts->comp_status);
         uint16_t state_flags = le16_to_cpu(sts->state_flags);
-        uint16_t residual_length = le16_to_cpu(sts->residual_length);
+        uint16_t residual_length = le32_to_cpu(sts->residual_length);
         uint16_t scsi_status = le16_to_cpu(sts->scsi_status);
 #if DEBUG_QLA1280_INTR
         static char *reason[] = {
@@ -1582,7 +1606,7 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
 
         case CS_DATA_OVERRUN:
                 dprintk(2, "Data overrun 0x%x\n", residual_length);
-                dprintk(2, "qla1280_isr: response packet data\n");
+                dprintk(2, "qla1280_return_status: response packet data\n");
                 qla1280_dump_buffer(2, (char *)sts, RESPONSE_ENTRY_SIZE);
                 host_status = DID_ERROR;
                 break;
@@ -1617,40 +1641,6 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
 /*                QLogic ISP1280 Hardware Support Functions.                */
 /****************************************************************************/
 
- /*
-  * qla2100_enable_intrs
-  * qla2100_disable_intrs
-  *
-  * Input:
-  *      ha = adapter block pointer.
-  *
-  * Returns:
-  *      None
-  */
-static inline void
-qla1280_enable_intrs(struct scsi_qla_host *ha)
-{
-        struct device_reg __iomem *reg;
-
-        reg = ha->iobase;
-        /* enable risc and host interrupts */
-        WRT_REG_WORD(&reg->ictrl, (ISP_EN_INT | ISP_EN_RISC));
-        RD_REG_WORD(&reg->ictrl);       /* PCI Posted Write flush */
-        ha->flags.ints_enabled = 1;
-}
-
-static inline void
-qla1280_disable_intrs(struct scsi_qla_host *ha)
-{
-        struct device_reg __iomem *reg;
-
-        reg = ha->iobase;
-        /* disable risc and host interrupts */
-        WRT_REG_WORD(&reg->ictrl, 0);
-        RD_REG_WORD(&reg->ictrl);       /* PCI Posted Write flush */
-        ha->flags.ints_enabled = 0;
-}
-
 /*
  * qla1280_initialize_adapter
  *      Initialize board.
@@ -1679,7 +1669,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
         ha->flags.reset_active = 0;
         ha->flags.abort_isp_active = 0;
 
-        ha->flags.ints_enabled = 0;
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
         if (ia64_platform_is("sn2")) {
                 printk(KERN_INFO "scsi(%li): Enabling SN2 PCI DMA "
@@ -1758,69 +1747,6 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
         return status;
 }
 
-
-/*
- * ISP Firmware Test
- *      Checks if present version of RISC firmware is older than
- *      driver firmware.
- *
- * Input:
- *      ha = adapter block pointer.
- *
- * Returns:
- *      0 = firmware does not need to be loaded.
- */
-static int
-qla1280_isp_firmware(struct scsi_qla_host *ha)
-{
-        struct nvram *nv = (struct nvram *) ha->response_ring;
-        int status = 0;         /* dg 2/27 always loads RISC */
-        uint16_t mb[MAILBOX_REGISTER_COUNT];
-
-        ENTER("qla1280_isp_firmware");
-
-        dprintk(1, "scsi(%li): Determining if RISC is loaded\n", ha->host_no);
-
-        /* Bad NVRAM data, load RISC code. */
-        if (!ha->nvram_valid) {
-                ha->flags.disable_risc_code_load = 0;
-        } else
-                ha->flags.disable_risc_code_load =
-                        nv->cntr_flags_1.disable_loading_risc_code;
-
-        if (ha->flags.disable_risc_code_load) {
-                dprintk(3, "qla1280_isp_firmware: Telling RISC to verify "
-                        "checksum of loaded BIOS code.\n");
-
-                /* Verify checksum of loaded RISC code. */
-                mb[0] = MBC_VERIFY_CHECKSUM;
-                /* mb[1] = ql12_risc_code_addr01; */
-                mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
-
-                if (!(status =
-                      qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]))) {
-                        /* Start firmware execution. */
-                        dprintk(3, "qla1280_isp_firmware: Startng F/W "
-                                "execution.\n");
-
-                        mb[0] = MBC_EXECUTE_FIRMWARE;
-                        /* mb[1] = ql12_risc_code_addr01; */
-                        mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
-                        qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
-                } else
-                        printk(KERN_INFO "qla1280: RISC checksum failed.\n");
-        } else {
-                dprintk(1, "qla1280: NVRAM configured to load RISC load.\n");
-                status = 1;
-        }
-
-        if (status)
-                dprintk(2, "qla1280_isp_firmware: **** Load RISC code ****\n");
-
-        LEAVE("qla1280_isp_firmware");
-        return status;
-}
-
 /*
  * Chip diagnostics
  *      Test chip for proper operation.
@@ -2006,7 +1932,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
                         "%d,%d(0x%x)\n",
                         risc_code_address, cnt, num, risc_address);
                 for(i = 0; i < cnt; i++)
-                        ((uint16_t *)ha->request_ring)[i] =
+                        ((__le16 *)ha->request_ring)[i] =
                                 cpu_to_le16(risc_code_address[i]);
 
                 mb[0] = MBC_LOAD_RAM;
@@ -2085,7 +2011,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
         mb[1] = *ql1280_board_tbl[ha->devnum].fwstart;
         err = qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
         if (err) {
-                printk(KERN_ERR "scsi(%li): Failed checksum\n", ha->host_no);
+                printk(KERN_ERR "scsi(%li): RISC checksum failed.\n", ha->host_no);
                 return err;
         }
 
@@ -2105,14 +2031,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha)
 static int
 qla1280_load_firmware(struct scsi_qla_host *ha)
 {
-        int err = -ENODEV;
-
-        /* If firmware needs to be loaded */
-        if (!qla1280_isp_firmware(ha)) {
-                printk(KERN_ERR "scsi(%li): isp_firmware() failed!\n",
-                                ha->host_no);
-                goto out;
-        }
+        int err;
 
         err = qla1280_chip_diag(ha);
         if (err)
@@ -2246,17 +2165,17 @@ qla1280_set_target_defaults(struct scsi_qla_host *ha, int bus, int target)
 {
         struct nvram *nv = &ha->nvram;
 
-        nv->bus[bus].target[target].parameter.f.renegotiate_on_error = 1;
-        nv->bus[bus].target[target].parameter.f.auto_request_sense = 1;
-        nv->bus[bus].target[target].parameter.f.tag_queuing = 1;
-        nv->bus[bus].target[target].parameter.f.enable_sync = 1;
+        nv->bus[bus].target[target].parameter.renegotiate_on_error = 1;
+        nv->bus[bus].target[target].parameter.auto_request_sense = 1;
+        nv->bus[bus].target[target].parameter.tag_queuing = 1;
+        nv->bus[bus].target[target].parameter.enable_sync = 1;
 #if 1   /* Some SCSI Processors do not seem to like this */
-        nv->bus[bus].target[target].parameter.f.enable_wide = 1;
+        nv->bus[bus].target[target].parameter.enable_wide = 1;
 #endif
-        nv->bus[bus].target[target].parameter.f.parity_checking = 1;
-        nv->bus[bus].target[target].parameter.f.disconnect_allowed = 1;
         nv->bus[bus].target[target].execution_throttle =
                 nv->bus[bus].max_queue_depth - 1;
+        nv->bus[bus].target[target].parameter.parity_checking = 1;
+        nv->bus[bus].target[target].parameter.disconnect_allowed = 1;
 
         if (IS_ISP1x160(ha)) {
                 nv->bus[bus].target[target].flags.flags1x160.device_enable = 1;
@@ -2284,9 +2203,9 @@ qla1280_set_defaults(struct scsi_qla_host *ha)
         /* nv->cntr_flags_1.disable_loading_risc_code = 1; */
         nv->firmware_feature.f.enable_fast_posting = 1;
         nv->firmware_feature.f.disable_synchronous_backoff = 1;
-        nv->termination.f.scsi_bus_0_control = 3;
-        nv->termination.f.scsi_bus_1_control = 3;
-        nv->termination.f.auto_term_support = 1;
+        nv->termination.scsi_bus_0_control = 3;
+        nv->termination.scsi_bus_1_control = 3;
+        nv->termination.auto_term_support = 1;
 
         /*
          * Set default FIFO magic - What appropriate values would be here
@@ -2296,7 +2215,12 @@ qla1280_set_defaults(struct scsi_qla_host *ha)
          * header file provided by QLogic seems to be bogus or incomplete
          * at best.
          */
-        nv->isp_config.c = ISP_CFG1_BENAB|ISP_CFG1_F128;
+        nv->isp_config.burst_enable = 1;
+        if (IS_ISP1040(ha))
+                nv->isp_config.fifo_threshold |= 3;
+        else
+                nv->isp_config.fifo_threshold |= 4;
+
         if (IS_ISP1x160(ha))
                 nv->isp_parameter = 0x01; /* fast memory enable */
 
@@ -2327,66 +2251,53 @@ qla1280_config_target(struct scsi_qla_host *ha, int bus, int target)
         struct nvram *nv = &ha->nvram;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         int status, lun;
+        uint16_t flag;
 
         /* Set Target Parameters. */
         mb[0] = MBC_SET_TARGET_PARAMETERS;
-        mb[1] = (uint16_t) (bus ? target | BIT_7 : target);
-        mb[1] <<= 8;
-
-        /*
-         * Do not enable wide, sync, and ppr for the initial
-         * INQUIRY run. We enable this later if we determine
-         * the target actually supports it.
-         */
-        nv->bus[bus].target[target].parameter.f.
-                auto_request_sense = 1;
-        nv->bus[bus].target[target].parameter.f.
-                stop_queue_on_check = 0;
-
-        if (IS_ISP1x160(ha))
-                nv->bus[bus].target[target].ppr_1x160.
-                        flags.enable_ppr = 0;
+        mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
 
         /*
-         * No sync, wide, etc. while probing
+         * Do not enable sync and ppr for the initial INQUIRY run. We
+         * enable this later if we determine the target actually
+         * supports it.
          */
-        mb[2] = (nv->bus[bus].target[target].parameter.c << 8) &
-                ~(TP_SYNC /*| TP_WIDE | TP_PPR*/);
+        mb[2] = (TP_RENEGOTIATE | TP_AUTO_REQUEST_SENSE | TP_TAGGED_QUEUE
+                 | TP_WIDE | TP_PARITY | TP_DISCONNECT);
 
         if (IS_ISP1x160(ha))
                 mb[3] = nv->bus[bus].target[target].flags.flags1x160.sync_offset << 8;
         else
                 mb[3] = nv->bus[bus].target[target].flags.flags1x80.sync_offset << 8;
         mb[3] |= nv->bus[bus].target[target].sync_period;
-
-        status = qla1280_mailbox_command(ha, BIT_3 | BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        status = qla1280_mailbox_command(ha, 0x0f, mb);
 
         /* Save Tag queuing enable flag. */
-        mb[0] = BIT_0 << target;
-        if (nv->bus[bus].target[target].parameter.f.tag_queuing)
-                ha->bus_settings[bus].qtag_enables |= mb[0];
+        flag = (BIT_0 << target) & mb[0];
+        if (nv->bus[bus].target[target].parameter.tag_queuing)
+                ha->bus_settings[bus].qtag_enables |= flag;
 
         /* Save Device enable flag. */
         if (IS_ISP1x160(ha)) {
                 if (nv->bus[bus].target[target].flags.flags1x160.device_enable)
-                        ha->bus_settings[bus].device_enables |= mb[0];
+                        ha->bus_settings[bus].device_enables |= flag;
                 ha->bus_settings[bus].lun_disables |= 0;
         } else {
                 if (nv->bus[bus].target[target].flags.flags1x80.device_enable)
-                        ha->bus_settings[bus].device_enables |= mb[0];
+                        ha->bus_settings[bus].device_enables |= flag;
                 /* Save LUN disable flag. */
                 if (nv->bus[bus].target[target].flags.flags1x80.lun_disable)
-                        ha->bus_settings[bus].lun_disables |= mb[0];
+                        ha->bus_settings[bus].lun_disables |= flag;
         }
 
         /* Set Device Queue Parameters. */
         for (lun = 0; lun < MAX_LUNS; lun++) {
                 mb[0] = MBC_SET_DEVICE_QUEUE;
-                mb[1] = (uint16_t)(bus ? target | BIT_7 : target);
-                mb[1] = mb[1] << 8 | lun;
+                mb[1] = (uint16_t)((bus ? target | BIT_7 : target) << 8);
+                mb[1] |= lun;
                 mb[2] = nv->bus[bus].max_queue_depth;
                 mb[3] = nv->bus[bus].target[target].execution_throttle;
-                status |= qla1280_mailbox_command(ha, 0x0f, &mb[0]);
+                status |= qla1280_mailbox_command(ha, 0x0f, mb);
         }
 
         return status;
@@ -2431,7 +2342,6 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
         struct nvram *nv = &ha->nvram;
         int bus, target, status = 0;
         uint16_t mb[MAILBOX_REGISTER_COUNT];
-        uint16_t mask;
 
         ENTER("qla1280_nvram_config");
 
@@ -2439,7 +2349,7 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
                 /* Always force AUTO sense for LINUX SCSI */
                 for (bus = 0; bus < MAX_BUSES; bus++)
                         for (target = 0; target < MAX_TARGETS; target++) {
-                                nv->bus[bus].target[target].parameter.f.
+                                nv->bus[bus].target[target].parameter.
                                         auto_request_sense = 1;
                         }
         } else {
@@ -2457,31 +2367,40 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
 
                 hwrev = RD_REG_WORD(&reg->cfg_0) & ISP_CFG0_HWMSK;
 
-                cfg1 = RD_REG_WORD(&reg->cfg_1);
+                cfg1 = RD_REG_WORD(&reg->cfg_1) & ~(BIT_4 | BIT_5 | BIT_6);
                 cdma_conf = RD_REG_WORD(&reg->cdma_cfg);
                 ddma_conf = RD_REG_WORD(&reg->ddma_cfg);
 
                 /* Busted fifo, says mjacob. */
-                if (hwrev == ISP_CFG0_1040A)
-                        WRT_REG_WORD(&reg->cfg_1, cfg1 | ISP_CFG1_F64);
-                else
-                        WRT_REG_WORD(&reg->cfg_1, cfg1 | ISP_CFG1_F64 | ISP_CFG1_BENAB);
+                if (hwrev != ISP_CFG0_1040A)
+                        cfg1 |= nv->isp_config.fifo_threshold << 4;
+
+                cfg1 |= nv->isp_config.burst_enable << 2;
+                WRT_REG_WORD(&reg->cfg_1, cfg1);
 
                 WRT_REG_WORD(&reg->cdma_cfg, cdma_conf | CDMA_CONF_BENAB);
                 WRT_REG_WORD(&reg->ddma_cfg, cdma_conf | DDMA_CONF_BENAB);
         } else {
+                uint16_t cfg1, term;
+
                 /* Set ISP hardware DMA burst */
-                mb[0] = nv->isp_config.c;
+                cfg1 = nv->isp_config.fifo_threshold << 4;
+                cfg1 |= nv->isp_config.burst_enable << 2;
                 /* Enable DMA arbitration on dual channel controllers */
                 if (ha->ports > 1)
-                        mb[0] |= BIT_13;
-                WRT_REG_WORD(&reg->cfg_1, mb[0]);
+                        cfg1 |= BIT_13;
+                WRT_REG_WORD(&reg->cfg_1, cfg1);
 
                 /* Set SCSI termination. */
-                WRT_REG_WORD(&reg->gpio_enable, (BIT_3 + BIT_2 + BIT_1 + BIT_0));
-                mb[0] = nv->termination.c & (BIT_3 + BIT_2 + BIT_1 + BIT_0);
-                WRT_REG_WORD(&reg->gpio_data, mb[0]);
+                WRT_REG_WORD(&reg->gpio_enable,
+                             BIT_7 | BIT_3 | BIT_2 | BIT_1 | BIT_0);
+                term = nv->termination.scsi_bus_1_control;
+                term |= nv->termination.scsi_bus_0_control << 2;
+                term |= nv->termination.auto_term_support << 7;
+                RD_REG_WORD(&reg->id_l);        /* Flush PCI write */
+                WRT_REG_WORD(&reg->gpio_data, term);
         }
+        RD_REG_WORD(&reg->id_l);        /* Flush PCI write */
 
         /* ISP parameter word. */
         mb[0] = MBC_SET_SYSTEM_PARAMETER;
@@ -2497,16 +2416,17 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
 
         /* Firmware feature word. */
         mb[0] = MBC_SET_FIRMWARE_FEATURES;
-        mask = BIT_5 | BIT_1 | BIT_0;
-        mb[1] = le16_to_cpu(nv->firmware_feature.w) & (mask);
+        mb[1] = nv->firmware_feature.f.enable_fast_posting;
+        mb[1] |= nv->firmware_feature.f.report_lvd_bus_transition << 1;
+        mb[1] |= nv->firmware_feature.f.disable_synchronous_backoff << 5;
 #if defined(CONFIG_IA64_GENERIC) || defined (CONFIG_IA64_SGI_SN2)
         if (ia64_platform_is("sn2")) {
                 printk(KERN_INFO "scsi(%li): Enabling SN2 PCI DMA "
                        "workaround\n", ha->host_no);
-                mb[1] |= BIT_9;
+                mb[1] |= nv->firmware_feature.f.unused_9 << 9; /* XXX */
         }
 #endif
-        status |= qla1280_mailbox_command(ha, mask, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
 
         /* Retry count and delay. */
         mb[0] = MBC_SET_RETRY_COUNT;
@@ -2535,27 +2455,27 @@ qla1280_nvram_config(struct scsi_qla_host *ha)
                 mb[2] |= BIT_5;
         if (nv->bus[1].config_2.data_line_active_negation)
                 mb[2] |= BIT_4;
-        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, mb);
 
         mb[0] = MBC_SET_DATA_OVERRUN_RECOVERY;
         mb[1] = 2;      /* Reset SCSI bus and return all outstanding IO */
-        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
 
         /* thingy */
         mb[0] = MBC_SET_PCI_CONTROL;
-        mb[1] = 2;      /* Data DMA Channel Burst Enable */
-        mb[2] = 2;      /* Command DMA Channel Burst Enable */
-        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        mb[1] = BIT_1;  /* Data DMA Channel Burst Enable */
+        mb[2] = BIT_1;  /* Command DMA Channel Burst Enable */
+        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, mb);
 
         mb[0] = MBC_SET_TAG_AGE_LIMIT;
         mb[1] = 8;
-        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_1 | BIT_0, mb);
 
         /* Selection timeout. */
         mb[0] = MBC_SET_SELECTION_TIMEOUT;
         mb[1] = nv->bus[0].selection_timeout;
         mb[2] = nv->bus[1].selection_timeout;
-        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, &mb[0]);
+        status |= qla1280_mailbox_command(ha, BIT_2 | BIT_1 | BIT_0, mb);
 
         for (bus = 0; bus < ha->ports; bus++)
                 status |= qla1280_config_bus(ha, bus);
@@ -3066,7 +2986,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         struct scsi_cmnd *cmd = sp->cmd;
         cmd_a64_entry_t *pkt;
         struct scatterlist *sg = NULL;
-        u32 *dword_ptr;
+        __le32 *dword_ptr;
         dma_addr_t dma_handle;
         int status = 0;
         int cnt;
@@ -3104,10 +3024,13 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                                 REQUEST_ENTRY_CNT - (ha->req_ring_index - cnt);
         }
 
+        dprintk(3, "Number of free entries=(%d) seg_cnt=0x%x\n",
+                ha->req_q_cnt, seg_cnt);
+
         /* If room for request in request ring. */
         if ((req_cnt + 2) >= ha->req_q_cnt) {
                 status = 1;
-                dprintk(2, "qla1280_64bit_start_scsi: in-ptr=0x%x  req_q_cnt="
+                dprintk(2, "qla1280_start_scsi: in-ptr=0x%x  req_q_cnt="
                         "0x%xreq_cnt=0x%x", ha->req_ring_index, ha->req_q_cnt,
                         req_cnt);
                 goto out;
@@ -3119,7 +3042,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
 
         if (cnt >= MAX_OUTSTANDING_COMMANDS) {
                 status = 1;
-                dprintk(2, "qla1280_64bit_start_scsi: NO ROOM IN "
+                dprintk(2, "qla1280_start_scsi: NO ROOM IN "
                         "OUTSTANDING ARRAY, req_q_cnt=0x%x", ha->req_q_cnt);
                 goto out;
         }
@@ -3128,7 +3051,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         ha->req_q_cnt -= req_cnt;
         CMD_HANDLE(sp->cmd) = (unsigned char *)(unsigned long)(cnt + 1);
 
-        dprintk(2, "64bit_start: cmd=%p sp=%p CDB=%xm, handle %lx\n", cmd, sp,
+        dprintk(2, "start: cmd=%p sp=%p CDB=%xm, handle %lx\n", cmd, sp,
                 cmd->cmnd[0], (long)CMD_HANDLE(sp->cmd));
         dprintk(2, "             bus %i, target %i, lun %i\n",
                 SCSI_BUS_32(cmd), SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
@@ -3350,7 +3273,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
         struct scsi_cmnd *cmd = sp->cmd;
         struct cmd_entry *pkt;
         struct scatterlist *sg = NULL;
-        uint32_t *dword_ptr;
+        __le32 *dword_ptr;
         int status = 0;
         int cnt;
         int req_cnt;
@@ -3993,21 +3916,21 @@ qla1280_get_target_options(struct scsi_cmnd *cmd, struct scsi_qla_host *ha)
         result = cmd->request_buffer;
         n = &ha->nvram;
 
-        n->bus[bus].target[target].parameter.f.enable_wide = 0;
-        n->bus[bus].target[target].parameter.f.enable_sync = 0;
+        n->bus[bus].target[target].parameter.enable_wide = 0;
+        n->bus[bus].target[target].parameter.enable_sync = 0;
         n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
 
         if (result[7] & 0x60)
-                n->bus[bus].target[target].parameter.f.enable_wide = 1;
+                n->bus[bus].target[target].parameter.enable_wide = 1;
         if (result[7] & 0x10)
-                n->bus[bus].target[target].parameter.f.enable_sync = 1;
+                n->bus[bus].target[target].parameter.enable_sync = 1;
         if ((result[2] >= 3) && (result[4] + 5 > 56) &&
             (result[56] & 0x4))
                 n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 1;
 
         dprintk(2, "get_target_options(): wide %i, sync %i, ppr %i\n",
-                n->bus[bus].target[target].parameter.f.enable_wide,
-                n->bus[bus].target[target].parameter.f.enable_sync,
+                n->bus[bus].target[target].parameter.enable_wide,
+                n->bus[bus].target[target].parameter.enable_sync,
                 n->bus[bus].target[target].ppr_1x160.flags.enable_ppr);
 }
 #endif
@@ -4071,7 +3994,7 @@ qla1280_status_entry(struct scsi_qla_host *ha, struct response *pkt,
                 /* Save ISP completion status */
                 CMD_RESULT(cmd) = qla1280_return_status(pkt, cmd);
 
-                if (scsi_status & SS_CHECK_CONDITION) {
+                if (scsi_status & SAM_STAT_CHECK_CONDITION) {
                         if (comp_status != CS_ARS_FAILED) {
                                 uint16_t req_sense_length =
                                         le16_to_cpu(pkt->req_sense_length);
@@ -4650,7 +4573,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         if (pci_set_dma_mask(ha->pdev, (dma_addr_t) ~ 0ULL)) {
                 if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
                         printk(KERN_WARNING "scsi(%li): Unable to set a "
-                               " suitable DMA mask - aboring\n", ha->host_no);
+                               "suitable DMA mask - aborting\n", ha->host_no);
                         error = -ENODEV;
                         goto error_free_irq;
                 }
@@ -4660,14 +4583,14 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 #else
         if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
                 printk(KERN_WARNING "scsi(%li): Unable to set a "
-                       " suitable DMA mask - aboring\n", ha->host_no);
+                       "suitable DMA mask - aborting\n", ha->host_no);
                 error = -ENODEV;
                 goto error_free_irq;
         }
 #endif
 
         ha->request_ring = pci_alloc_consistent(ha->pdev,
-                        ((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
+                        ((REQUEST_ENTRY_CNT + 1) * sizeof(request_t)),
                         &ha->request_dma);
         if (!ha->request_ring) {
                 printk(KERN_INFO "qla1280: Failed to get request memory\n");
@@ -4675,7 +4598,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         ha->response_ring = pci_alloc_consistent(ha->pdev,
-                        ((RESPONSE_ENTRY_CNT + 1) * (sizeof(struct response))),
+                        ((RESPONSE_ENTRY_CNT + 1) * sizeof(struct response)),
                         &ha->response_dma);
         if (!ha->response_ring) {
                 printk(KERN_INFO "qla1280: Failed to get response memory\n");
@@ -4758,7 +4681,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
 #if LINUX_VERSION_CODE >= 0x020600
  error_disable_adapter:
-        WRT_REG_WORD(&ha->iobase->ictrl, 0);
+        qla1280_disable_intrs(ha);
 #endif
  error_free_irq:
         free_irq(pdev->irq, ha);
@@ -4770,11 +4693,11 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 #endif
  error_free_response_ring:
         pci_free_consistent(ha->pdev,
-                        ((RESPONSE_ENTRY_CNT + 1) * (sizeof(struct response))),
+                        ((RESPONSE_ENTRY_CNT + 1) * sizeof(struct response)),
                         ha->response_ring, ha->response_dma);
  error_free_request_ring:
         pci_free_consistent(ha->pdev,
-                        ((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
+                        ((REQUEST_ENTRY_CNT + 1) * sizeof(request_t)),
                         ha->request_ring, ha->request_dma);
  error_put_host:
         scsi_host_put(host);
@@ -4795,7 +4718,7 @@ qla1280_remove_one(struct pci_dev *pdev)
         scsi_remove_host(host);
 #endif
 
-        WRT_REG_WORD(&ha->iobase->ictrl, 0);
+        qla1280_disable_intrs(ha);
 
         free_irq(pdev->irq, ha);
 
diff --git a/drivers/scsi/qla1280.h b/drivers/scsi/qla1280.h
index d245ae07518e..59915fb70301 100644
--- a/drivers/scsi/qla1280.h
+++ b/drivers/scsi/qla1280.h
@@ -94,9 +94,6 @@
 #define REQUEST_ENTRY_CNT               256 /* Number of request entries. */
 #define RESPONSE_ENTRY_CNT              16  /* Number of response entries. */
 
-/* Number of segments 1 - 65535 */
-#define SG_SEGMENTS                     32  /* Cmd entry + 6 continuations */
-
 /*
  * SCSI Request Block structure  (sp)  that is placed
  * on cmd->SCp location of every I/O
@@ -378,29 +375,23 @@ struct nvram {
         uint16_t unused_12;     /* 12, 13 */
         uint16_t unused_14;     /* 14, 15 */
 
-        union {
-                uint8_t c;
-                struct {
-                        uint8_t reserved:2;
-                        uint8_t burst_enable:1;
-                        uint8_t reserved_1:1;
-                        uint8_t fifo_threshold:4;
-                } f;
+        struct {
+                uint8_t reserved:2;
+                uint8_t burst_enable:1;
+                uint8_t reserved_1:1;
+                uint8_t fifo_threshold:4;
         } isp_config;           /* 16 */
 
         /* Termination
          * 0 = Disable, 1 = high only, 3 = Auto term
          */
-        union {
-                uint8_t c;
-                struct {
-                        uint8_t scsi_bus_1_control:2;
-                        uint8_t scsi_bus_0_control:2;
-                        uint8_t unused_0:1;
-                        uint8_t unused_1:1;
-                        uint8_t unused_2:1;
-                        uint8_t auto_term_support:1;
-                } f;
+        struct {
+                uint8_t scsi_bus_1_control:2;
+                uint8_t scsi_bus_0_control:2;
+                uint8_t unused_0:1;
+                uint8_t unused_1:1;
+                uint8_t unused_2:1;
+                uint8_t auto_term_support:1;
         } termination;          /* 17 */
 
         uint16_t isp_parameter; /* 18, 19 */
@@ -460,18 +451,15 @@ struct nvram {
                 uint16_t unused_38;     /* 38, 39 */
 
                 struct {
-                        union {
-                                uint8_t c;
-                                struct {
-                                        uint8_t renegotiate_on_error:1;
-                                        uint8_t stop_queue_on_check:1;
-                                        uint8_t auto_request_sense:1;
-                                        uint8_t tag_queuing:1;
-                                        uint8_t enable_sync:1;
-                                        uint8_t enable_wide:1;
-                                        uint8_t parity_checking:1;
-                                        uint8_t disconnect_allowed:1;
-                                } f;
+                        struct {
+                                uint8_t renegotiate_on_error:1;
+                                uint8_t stop_queue_on_check:1;
+                                uint8_t auto_request_sense:1;
+                                uint8_t tag_queuing:1;
+                                uint8_t enable_sync:1;
+                                uint8_t enable_wide:1;
+                                uint8_t parity_checking:1;
+                                uint8_t disconnect_allowed:1;
                         } parameter;    /* 40 */
 
                         uint8_t execution_throttle;     /* 41 */
@@ -528,23 +516,23 @@ struct cmd_entry {
         uint8_t entry_count;            /* Entry count. */
         uint8_t sys_define;             /* System defined. */
         uint8_t entry_status;           /* Entry Status. */
-        uint32_t handle;                /* System handle. */
+        __le32 handle;                  /* System handle. */
         uint8_t lun;                    /* SCSI LUN */
         uint8_t target;                 /* SCSI ID */
-        uint16_t cdb_len;               /* SCSI command length. */
-        uint16_t control_flags;         /* Control flags. */
-        uint16_t reserved;
-        uint16_t timeout;               /* Command timeout. */
-        uint16_t dseg_count;            /* Data segment count. */
+        __le16 cdb_len;                 /* SCSI command length. */
+        __le16 control_flags;           /* Control flags. */
+        __le16 reserved;
+        __le16 timeout;                 /* Command timeout. */
+        __le16 dseg_count;              /* Data segment count. */
         uint8_t scsi_cdb[MAX_CMDSZ];    /* SCSI command words. */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length;         /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint32_t dseg_1_length;         /* Data segment 1 length. */
-        uint32_t dseg_2_address;        /* Data segment 2 address. */
-        uint32_t dseg_2_length;         /* Data segment 2 length. */
-        uint32_t dseg_3_address;        /* Data segment 3 address. */
-        uint32_t dseg_3_length;         /* Data segment 3 length. */
+        __le32 dseg_0_address;          /* Data segment 0 address. */
+        __le32 dseg_0_length;           /* Data segment 0 length. */
+        __le32 dseg_1_address;          /* Data segment 1 address. */
+        __le32 dseg_1_length;           /* Data segment 1 length. */
+        __le32 dseg_2_address;          /* Data segment 2 address. */
+        __le32 dseg_2_length;           /* Data segment 2 length. */
+        __le32 dseg_3_address;          /* Data segment 3 address. */
+        __le32 dseg_3_length;           /* Data segment 3 length. */
 };
 
 /*
@@ -556,21 +544,21 @@ struct cont_entry {
         uint8_t entry_count;            /* Entry count. */
         uint8_t sys_define;             /* System defined. */
         uint8_t entry_status;           /* Entry Status. */
-        uint32_t reserved;              /* Reserved */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length;         /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint32_t dseg_1_length;         /* Data segment 1 length. */
-        uint32_t dseg_2_address;        /* Data segment 2 address. */
-        uint32_t dseg_2_length;         /* Data segment 2 length. */
-        uint32_t dseg_3_address;        /* Data segment 3 address. */
-        uint32_t dseg_3_length;         /* Data segment 3 length. */
-        uint32_t dseg_4_address;        /* Data segment 4 address. */
-        uint32_t dseg_4_length;         /* Data segment 4 length. */
-        uint32_t dseg_5_address;        /* Data segment 5 address. */
-        uint32_t dseg_5_length;         /* Data segment 5 length. */
-        uint32_t dseg_6_address;        /* Data segment 6 address. */
-        uint32_t dseg_6_length;         /* Data segment 6 length. */
+        __le32 reserved;                /* Reserved */
+        __le32 dseg_0_address;          /* Data segment 0 address. */
+        __le32 dseg_0_length;           /* Data segment 0 length. */
+        __le32 dseg_1_address;          /* Data segment 1 address. */
+        __le32 dseg_1_length;           /* Data segment 1 length. */
+        __le32 dseg_2_address;          /* Data segment 2 address. */
+        __le32 dseg_2_length;           /* Data segment 2 length. */
+        __le32 dseg_3_address;          /* Data segment 3 address. */
+        __le32 dseg_3_length;           /* Data segment 3 length. */
+        __le32 dseg_4_address;          /* Data segment 4 address. */
+        __le32 dseg_4_length;           /* Data segment 4 length. */
+        __le32 dseg_5_address;          /* Data segment 5 address. */
+        __le32 dseg_5_length;           /* Data segment 5 length. */
+        __le32 dseg_6_address;          /* Data segment 6 address. */
+        __le32 dseg_6_length;           /* Data segment 6 length. */
 };
 
 /*
@@ -586,22 +574,22 @@ struct response {
 #define RF_FULL         BIT_1   /* Full */
 #define RF_BAD_HEADER   BIT_2   /* Bad header. */
 #define RF_BAD_PAYLOAD  BIT_3   /* Bad payload. */
-        uint32_t handle;        /* System handle. */
-        uint16_t scsi_status;   /* SCSI status. */
-        uint16_t comp_status;   /* Completion status. */
-        uint16_t state_flags;   /* State flags. */
-#define SF_TRANSFER_CMPL BIT_14 /* Transfer Complete. */
-#define SF_GOT_SENSE    BIT_13  /* Got Sense */
-#define SF_GOT_STATUS    BIT_12 /* Got Status */
-#define SF_TRANSFERRED_DATA BIT_11      /* Transferred data */
-#define SF_SENT_CDB   BIT_10    /* Send CDB */
-#define SF_GOT_TARGET  BIT_9    /*  */
-#define SF_GOT_BUS     BIT_8    /*  */
-        uint16_t status_flags;  /* Status flags. */
-        uint16_t time;          /* Time. */
-        uint16_t req_sense_length;      /* Request sense data length. */
-        uint32_t residual_length;       /* Residual transfer length. */
-        uint16_t reserved[4];
+        __le32 handle;          /* System handle. */
+        __le16 scsi_status;     /* SCSI status. */
+        __le16 comp_status;     /* Completion status. */
+        __le16 state_flags;     /* State flags. */
+#define SF_TRANSFER_CMPL        BIT_14  /* Transfer Complete. */
+#define SF_GOT_SENSE            BIT_13  /* Got Sense */
+#define SF_GOT_STATUS           BIT_12  /* Got Status */
+#define SF_TRANSFERRED_DATA     BIT_11  /* Transferred data */
+#define SF_SENT_CDB             BIT_10  /* Send CDB */
+#define SF_GOT_TARGET           BIT_9   /*  */
+#define SF_GOT_BUS              BIT_8   /*  */
+        __le16 status_flags;    /* Status flags. */
+        __le16 time;            /* Time. */
+        __le16 req_sense_length;/* Request sense data length. */
+        __le32 residual_length; /* Residual transfer length. */
+        __le16 reserved[4];
         uint8_t req_sense_data[32];     /* Request sense data. */
 };
 
@@ -614,7 +602,7 @@ struct mrk_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t sys_define;     /* System defined. */
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved;
+        __le32 reserved;
         uint8_t lun;            /* SCSI LUN */
         uint8_t target;         /* SCSI ID */
         uint8_t modifier;       /* Modifier (7-0). */
@@ -638,11 +626,11 @@ struct ecmd_entry {
         uint32_t handle;        /* System handle. */
         uint8_t lun;            /* SCSI LUN */
         uint8_t target;         /* SCSI ID */
-        uint16_t cdb_len;       /* SCSI command length. */
-        uint16_t control_flags; /* Control flags. */
-        uint16_t reserved;
-        uint16_t timeout;       /* Command timeout. */
-        uint16_t dseg_count;    /* Data segment count. */
+        __le16 cdb_len;         /* SCSI command length. */
+        __le16 control_flags;   /* Control flags. */
+        __le16 reserved;
+        __le16 timeout;         /* Command timeout. */
+        __le16 dseg_count;      /* Data segment count. */
         uint8_t scsi_cdb[88];   /* SCSI command words. */
 };
 
@@ -655,20 +643,20 @@ typedef struct {
         uint8_t entry_count;    /* Entry count. */
         uint8_t sys_define;     /* System defined. */
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t handle;        /* System handle. */
+        __le32 handle;  /* System handle. */
         uint8_t lun;            /* SCSI LUN */
         uint8_t target;         /* SCSI ID */
-        uint16_t cdb_len;       /* SCSI command length. */
-        uint16_t control_flags; /* Control flags. */
-        uint16_t reserved;
-        uint16_t timeout;       /* Command timeout. */
-        uint16_t dseg_count;    /* Data segment count. */
+        __le16 cdb_len; /* SCSI command length. */
+        __le16 control_flags;   /* Control flags. */
+        __le16 reserved;
+        __le16 timeout; /* Command timeout. */
+        __le16 dseg_count;      /* Data segment count. */
         uint8_t scsi_cdb[MAX_CMDSZ];    /* SCSI command words. */
-        uint32_t reserved_1[2]; /* unused */
-        uint32_t dseg_0_address[2];     /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address[2];     /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
+        __le32 reserved_1[2];   /* unused */
+        __le32 dseg_0_address[2];       /* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address[2];       /* Data segment 1 address. */
+        __le32 dseg_1_length;   /* Data segment 1 length. */
 } cmd_a64_entry_t, request_t;
 
 /*
@@ -680,16 +668,16 @@ struct cont_a64_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t sys_define;     /* System defined. */
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t dseg_0_address[2];     /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address[2];     /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
-        uint32_t dseg_2_address[2];     /* Data segment 2 address. */
-        uint32_t dseg_2_length; /* Data segment 2 length. */
-        uint32_t dseg_3_address[2];     /* Data segment 3 address. */
-        uint32_t dseg_3_length; /* Data segment 3 length. */
-        uint32_t dseg_4_address[2];     /* Data segment 4 address. */
-        uint32_t dseg_4_length; /* Data segment 4 length. */
+        __le32 dseg_0_address[2];       /* Data segment 0 address. */
+        __le32 dseg_0_length;           /* Data segment 0 length. */
+        __le32 dseg_1_address[2];       /* Data segment 1 address. */
+        __le32 dseg_1_length;           /* Data segment 1 length. */
+        __le32 dseg_2_address[2];       /* Data segment 2 address. */
+        __le32 dseg_2_length;           /* Data segment 2 length. */
+        __le32 dseg_3_address[2];       /* Data segment 3 address. */
+        __le32 dseg_3_length;           /* Data segment 3 length. */
+        __le32 dseg_4_address[2];       /* Data segment 4 address. */
+        __le32 dseg_4_length;           /* Data segment 4 length. */
 };
 
 /*
@@ -701,10 +689,10 @@ struct elun_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status not used. */
-        uint32_t reserved_2;
-        uint16_t lun;           /* Bit 15 is bus number. */
-        uint16_t reserved_4;
-        uint32_t option_flags;
+        __le32 reserved_2;
+        __le16 lun;             /* Bit 15 is bus number. */
+        __le16 reserved_4;
+        __le32 option_flags;
         uint8_t status;
         uint8_t reserved_5;
         uint8_t command_count;  /* Number of ATIOs allocated. */
@@ -714,8 +702,8 @@ struct elun_entry {
         /* commands (2-26). */
         uint8_t group_7_length; /* SCSI CDB length for group 7 */
         /* commands (2-26). */
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t reserved_6[20];
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 reserved_6[20];
 };
 
 /*
@@ -729,20 +717,20 @@ struct modify_lun_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t reserved_3;
         uint8_t operators;
         uint8_t reserved_4;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t reserved_5;
         uint8_t command_count;  /* Number of ATIOs allocated. */
         uint8_t immed_notify_count;     /* Number of Immediate Notify */
         /* entries allocated. */
-        uint16_t reserved_6;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t reserved_7[20];
+        __le16 reserved_6;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 reserved_7[20];
 };
 
 /*
@@ -754,20 +742,20 @@ struct notify_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t reserved_4;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
         /* entries allocated. */
-        uint16_t seq_id;
+        __le16 seq_id;
         uint8_t scsi_msg[8];    /* SCSI message not handled by ISP */
-        uint16_t reserved_5[8];
+        __le16 reserved_5[8];
         uint8_t sense_data[18];
 };
 
@@ -780,16 +768,16 @@ struct nack_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t event;
-        uint16_t seq_id;
-        uint16_t reserved_4[22];
+        __le16 seq_id;
+        __le16 reserved_4[22];
 };
 
 /*
@@ -801,12 +789,12 @@ struct atio_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;
         uint8_t initiator_id;
         uint8_t cdb_len;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
@@ -824,28 +812,28 @@ struct ctio_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
-        uint32_t dseg_2_address;        /* Data segment 2 address. */
-        uint32_t dseg_2_length; /* Data segment 2 length. */
-        uint32_t dseg_3_address;        /* Data segment 3 address. */
-        uint32_t dseg_3_length; /* Data segment 3 length. */
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le32 dseg_0_address;  /* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address;  /* Data segment 1 address. */
+        __le32 dseg_1_length;   /* Data segment 1 length. */
+        __le32 dseg_2_address;  /* Data segment 2 address. */
+        __le32 dseg_2_length;   /* Data segment 2 length. */
+        __le32 dseg_3_address;  /* Data segment 3 address. */
+        __le32 dseg_3_length;   /* Data segment 3 length. */
 };
 
 /*
@@ -857,24 +845,24 @@ struct ctio_ret_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint32_t dseg_0_address;        /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address;        /* Data segment 1 address. */
-        uint16_t dseg_1_length; /* Data segment 1 length. */
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le32 dseg_0_address;  /* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address;  /* Data segment 1 address. */
+        __le16 dseg_1_length;   /* Data segment 1 length. */
         uint8_t sense_data[18];
 };
 
@@ -887,25 +875,25 @@ struct ctio_a64_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint32_t reserved_4[2];
-        uint32_t dseg_0_address[2];     /* Data segment 0 address. */
-        uint32_t dseg_0_length; /* Data segment 0 length. */
-        uint32_t dseg_1_address[2];     /* Data segment 1 address. */
-        uint32_t dseg_1_length; /* Data segment 1 length. */
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le32 reserved_4[2];
+        __le32 dseg_0_address[2];/* Data segment 0 address. */
+        __le32 dseg_0_length;   /* Data segment 0 length. */
+        __le32 dseg_1_address[2];/* Data segment 1 address. */
+        __le32 dseg_1_length;   /* Data segment 1 length. */
 };
 
 /*
@@ -917,21 +905,21 @@ struct ctio_a64_ret_entry {
         uint8_t entry_count;    /* Entry count. */
         uint8_t reserved_1;
         uint8_t entry_status;   /* Entry Status. */
-        uint32_t reserved_2;
+        __le32 reserved_2;
         uint8_t lun;            /* SCSI LUN */
         uint8_t initiator_id;
         uint8_t reserved_3;
         uint8_t target_id;
-        uint32_t option_flags;
+        __le32 option_flags;
         uint8_t status;
         uint8_t scsi_status;
         uint8_t tag_value;      /* Received queue tag message value */
         uint8_t tag_type;       /* Received queue tag message type */
-        uint32_t transfer_length;
-        uint32_t residual;
-        uint16_t timeout;       /* 0 = 30 seconds, 0xFFFF = disable */
-        uint16_t dseg_count;    /* Data segment count. */
-        uint16_t reserved_4[7];
+        __le32 transfer_length;
+        __le32 residual;
+        __le16 timeout;         /* 0 = 30 seconds, 0xFFFF = disable */
+        __le16 dseg_count;      /* Data segment count. */
+        __le16 reserved_4[7];
         uint8_t sense_data[18];
 };
 
@@ -979,14 +967,6 @@ struct ctio_a64_ret_entry {
 #define CS_RETRY            0x82        /* Driver defined */
 
 /*
- * ISP status entry - SCSI status byte bit definitions.
- */
-#define SS_CHECK_CONDITION  BIT_1
-#define SS_CONDITION_MET    BIT_2
-#define SS_BUSY_CONDITION   BIT_3
-#define SS_RESERVE_CONFLICT (BIT_4 | BIT_3)
-
-/*
  * ISP target entries - Option flags bit definitions.
  */
 #define OF_ENABLE_TAG       BIT_1       /* Tagged queue action enable */
@@ -1082,10 +1062,6 @@ struct scsi_qla_host {
                 uint32_t reset_active:1;                /* 3 */
                 uint32_t abort_isp_active:1;            /* 4 */
                 uint32_t disable_risc_code_load:1;      /* 5 */
-                uint32_t enable_64bit_addressing:1;     /* 6 */
-                uint32_t in_reset:1;                    /* 7 */
-                uint32_t ints_enabled:1;
-                uint32_t ignore_nvram:1;
 #ifdef __ia64__
                 uint32_t use_pci_vchannel:1;
 #endif
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 659a5d63467d..fe0fce71adc7 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -211,6 +211,138 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *ha)
         sysfs_remove_bin_file(&host->shost_gendev.kobj, &sysfs_nvram_attr);
 }
 
+/* Scsi_Host attributes. */
+
+static ssize_t
+qla2x00_drvr_version_show(struct class_device *cdev, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", qla2x00_version_str);
+}
+
+static ssize_t
+qla2x00_fw_version_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        char fw_str[30];
+
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+            ha->isp_ops.fw_version_str(ha, fw_str));
+}
+
+static ssize_t
+qla2x00_serial_num_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        uint32_t sn;
+
+        sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;
+        return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000,
+            sn % 100000);
+}
+
+static ssize_t
+qla2x00_isp_name_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%s\n", ha->brd_info->isp_name);
+}
+
+static ssize_t
+qla2x00_isp_id_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%04x %04x %04x %04x\n",
+            ha->product_id[0], ha->product_id[1], ha->product_id[2],
+            ha->product_id[3]);
+}
+
+static ssize_t
+qla2x00_model_name_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%s\n", ha->model_number);
+}
+
+static ssize_t
+qla2x00_model_desc_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+            ha->model_desc ? ha->model_desc: "");
+}
+
+static ssize_t
+qla2x00_pci_info_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        char pci_info[30];
+
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+            ha->isp_ops.pci_info_str(ha, pci_info));
+}
+
+static ssize_t
+qla2x00_state_show(struct class_device *cdev, char *buf)
+{
+        scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev));
+        int len = 0;
+
+        if (atomic_read(&ha->loop_state) == LOOP_DOWN ||
+            atomic_read(&ha->loop_state) == LOOP_DEAD)
+                len = snprintf(buf, PAGE_SIZE, "Link Down\n");
+        else if (atomic_read(&ha->loop_state) != LOOP_READY ||
+            test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) ||
+            test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags))
+                len = snprintf(buf, PAGE_SIZE, "Unknown Link State\n");
+        else {
+                len = snprintf(buf, PAGE_SIZE, "Link Up - ");
+
+                switch (ha->current_topology) {
+                case ISP_CFG_NL:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "Loop\n");
+                        break;
+                case ISP_CFG_FL:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "FL_Port\n");
+                        break;
+                case ISP_CFG_N:
+                        len += snprintf(buf + len, PAGE_SIZE-len,
+                            "N_Port to N_Port\n");
+                        break;
+                case ISP_CFG_F:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "F_Port\n");
+                        break;
+                default:
+                        len += snprintf(buf + len, PAGE_SIZE-len, "Loop\n");
+                        break;
+                }
+        }
+        return len;
+}
+
+static CLASS_DEVICE_ATTR(driver_version, S_IRUGO, qla2x00_drvr_version_show,
+        NULL);
+static CLASS_DEVICE_ATTR(fw_version, S_IRUGO, qla2x00_fw_version_show, NULL);
+static CLASS_DEVICE_ATTR(serial_num, S_IRUGO, qla2x00_serial_num_show, NULL);
+static CLASS_DEVICE_ATTR(isp_name, S_IRUGO, qla2x00_isp_name_show, NULL);
+static CLASS_DEVICE_ATTR(isp_id, S_IRUGO, qla2x00_isp_id_show, NULL);
+static CLASS_DEVICE_ATTR(model_name, S_IRUGO, qla2x00_model_name_show, NULL);
+static CLASS_DEVICE_ATTR(model_desc, S_IRUGO, qla2x00_model_desc_show, NULL);
+static CLASS_DEVICE_ATTR(pci_info, S_IRUGO, qla2x00_pci_info_show, NULL);
+static CLASS_DEVICE_ATTR(state, S_IRUGO, qla2x00_state_show, NULL);
+
+struct class_device_attribute *qla2x00_host_attrs[] = {
+        &class_device_attr_driver_version,
+        &class_device_attr_fw_version,
+        &class_device_attr_serial_num,
+        &class_device_attr_isp_name,
+        &class_device_attr_isp_id,
+        &class_device_attr_model_name,
+        &class_device_attr_model_desc,
+        &class_device_attr_pci_info,
+        &class_device_attr_state,
+        NULL,
+};
+
 /* Host attributes. */
 
 static void
@@ -304,10 +436,13 @@ struct fc_function_template qla2xxx_transport_functions = {
 
         .show_host_node_name = 1,
         .show_host_port_name = 1,
+        .show_host_supported_classes = 1,
+
         .get_host_port_id = qla2x00_get_host_port_id,
         .show_host_port_id = 1,
 
         .dd_fcrport_size = sizeof(struct fc_port *),
+        .show_rport_supported_classes = 1,
 
         .get_starget_node_name = qla2x00_get_starget_node_name,
         .show_starget_node_name = 1,
@@ -329,4 +464,5 @@ qla2x00_init_host_attr(scsi_qla_host_t *ha)
             be64_to_cpu(*(uint64_t *)ha->init_cb->node_name);
         fc_host_port_name(ha->host) =
             be64_to_cpu(*(uint64_t *)ha->init_cb->port_name);
+        fc_host_supported_classes(ha->host) = FC_COS_CLASS3;
 }
diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index b8d90e97e017..9684e7a91fa9 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -81,6 +81,7 @@
 #define DEBUG2_3_11(x)  do {x;} while (0);
 #define DEBUG2_9_10(x)    do {x;} while (0);
 #define DEBUG2_11(x)    do {x;} while (0);
+#define DEBUG2_13(x)    do {x;} while (0);
 #else
 #define DEBUG2(x)       do {} while (0);
 #endif
@@ -169,8 +170,14 @@
 
 #if defined(QL_DEBUG_LEVEL_13)
 #define DEBUG13(x)      do {x;} while (0)
+#if !defined(DEBUG2_13)
+#define DEBUG2_13(x)    do {x;} while(0)
+#endif
 #else
 #define DEBUG13(x)      do {} while (0)
+#if !defined(QL_DEBUG_LEVEL_2)
+#define DEBUG2_13(x)    do {} while(0)
+#endif
 #endif
 
 #if defined(QL_DEBUG_LEVEL_14)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 1c6d366f4fad..b455c31405e4 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -214,6 +214,7 @@
  * valid range of an N-PORT id is 0 through 0x7ef.
  */
 #define NPH_LAST_HANDLE         0x7ef
+#define NPH_MGMT_SERVER         0x7fa           /*  FFFFFA */
 #define NPH_SNS                 0x7fc           /*  FFFFFC */
 #define NPH_FABRIC_CONTROLLER   0x7fd           /*  FFFFFD */
 #define NPH_F_PORT              0x7fe           /*  FFFFFE */
@@ -630,6 +631,7 @@ typedef struct {
 #define MBC_WRITE_RAM_WORD_EXTENDED     0xd     /* Write RAM word extended */
 #define MBC_READ_RAM_EXTENDED           0xf     /* Read RAM extended. */
 #define MBC_IOCB_COMMAND                0x12    /* Execute IOCB command. */
+#define MBC_STOP_FIRMWARE               0x14    /* Stop firmware. */
 #define MBC_ABORT_COMMAND               0x15    /* Abort IOCB command. */
 #define MBC_ABORT_DEVICE                0x16    /* Abort device (ID/LUN). */
 #define MBC_ABORT_TARGET                0x17    /* Abort target (ID). */
@@ -913,7 +915,7 @@ typedef struct {
          * MSB BIT 1 =
          * MSB BIT 2 =
          * MSB BIT 3 =
-         * MSB BIT 4 =
+         * MSB BIT 4 = LED mode
          * MSB BIT 5 = enable 50 ohm termination
          * MSB BIT 6 = Data Rate (2300 only)
          * MSB BIT 7 = Data Rate (2300 only)
@@ -1035,7 +1037,7 @@ typedef struct {
          * MSB BIT 1 =
          * MSB BIT 2 =
          * MSB BIT 3 =
-         * MSB BIT 4 =
+         * MSB BIT 4 = LED mode
          * MSB BIT 5 = enable 50 ohm termination
          * MSB BIT 6 = Data Rate (2300 only)
          * MSB BIT 7 = Data Rate (2300 only)
@@ -1131,10 +1133,7 @@ typedef struct {
 
         uint8_t link_down_timeout;
 
-        uint8_t adapter_id_0[4];
-        uint8_t adapter_id_1[4];
-        uint8_t adapter_id_2[4];
-        uint8_t adapter_id_3[4];
+        uint8_t adapter_id[16];
 
         uint8_t alt1_boot_node_name[WWN_SIZE];
         uint16_t alt1_boot_lun_number;
@@ -1673,6 +1672,7 @@ typedef struct fc_port {
         uint8_t cur_path;               /* current path id */
 
         struct fc_rport *rport;
+        u32 supported_classes;
 } fc_port_t;
 
 /*
@@ -1727,6 +1727,8 @@ typedef struct fc_port {
 
 #define CT_REJECT_RESPONSE      0x8001
 #define CT_ACCEPT_RESPONSE      0x8002
+#define CT_REASON_CANNOT_PERFORM        0x09
+#define CT_EXPL_ALREADY_REGISTERED      0x10
 
 #define NS_N_PORT_TYPE  0x01
 #define NS_NL_PORT_TYPE 0x02
@@ -1768,6 +1770,100 @@ typedef struct fc_port {
 #define RSNN_NN_REQ_SIZE (16 + 8 + 1 + 255)
 #define RSNN_NN_RSP_SIZE 16
 
+/*
+ * HBA attribute types.
+ */
+#define FDMI_HBA_ATTR_COUNT                     9
+#define FDMI_HBA_NODE_NAME                      1
+#define FDMI_HBA_MANUFACTURER                   2
+#define FDMI_HBA_SERIAL_NUMBER                  3
+#define FDMI_HBA_MODEL                          4
+#define FDMI_HBA_MODEL_DESCRIPTION              5
+#define FDMI_HBA_HARDWARE_VERSION               6
+#define FDMI_HBA_DRIVER_VERSION                 7
+#define FDMI_HBA_OPTION_ROM_VERSION             8
+#define FDMI_HBA_FIRMWARE_VERSION               9
+#define FDMI_HBA_OS_NAME_AND_VERSION            0xa
+#define FDMI_HBA_MAXIMUM_CT_PAYLOAD_LENGTH      0xb
+
+struct ct_fdmi_hba_attr {
+        uint16_t type;
+        uint16_t len;
+        union {
+                uint8_t node_name[WWN_SIZE];
+                uint8_t manufacturer[32];
+                uint8_t serial_num[8];
+                uint8_t model[16];
+                uint8_t model_desc[80];
+                uint8_t hw_version[16];
+                uint8_t driver_version[32];
+                uint8_t orom_version[16];
+                uint8_t fw_version[16];
+                uint8_t os_version[128];
+                uint8_t max_ct_len[4];
+        } a;
+};
+
+struct ct_fdmi_hba_attributes {
+        uint32_t count;
+        struct ct_fdmi_hba_attr entry[FDMI_HBA_ATTR_COUNT];
+};
+
+/*
+ * Port attribute types.
+ */
+#define FDMI_PORT_ATTR_COUNT            5
+#define FDMI_PORT_FC4_TYPES             1
+#define FDMI_PORT_SUPPORT_SPEED         2
+#define FDMI_PORT_CURRENT_SPEED         3
+#define FDMI_PORT_MAX_FRAME_SIZE        4
+#define FDMI_PORT_OS_DEVICE_NAME        5
+#define FDMI_PORT_HOST_NAME             6
+
+struct ct_fdmi_port_attr {
+        uint16_t type;
+        uint16_t len;
+        union {
+                uint8_t fc4_types[32];
+                uint32_t sup_speed;
+                uint32_t cur_speed;
+                uint32_t max_frame_size;
+                uint8_t os_dev_name[32];
+                uint8_t host_name[32];
+        } a;
+};
+
+/*
+ * Port Attribute Block.
+ */
+struct ct_fdmi_port_attributes {
+        uint32_t count;
+        struct ct_fdmi_port_attr entry[FDMI_PORT_ATTR_COUNT];
+};
+
+/* FDMI definitions. */
+#define GRHL_CMD        0x100
+#define GHAT_CMD        0x101
+#define GRPL_CMD        0x102
+#define GPAT_CMD        0x110
+
+#define RHBA_CMD        0x200
+#define RHBA_RSP_SIZE   16
+
+#define RHAT_CMD        0x201
+#define RPRT_CMD        0x210
+
+#define RPA_CMD         0x211
+#define RPA_RSP_SIZE    16
+
+#define DHBA_CMD        0x300
+#define DHBA_REQ_SIZE   (16 + 8)
+#define DHBA_RSP_SIZE   16
+
+#define DHAT_CMD        0x301
+#define DPRT_CMD        0x310
+#define DPA_CMD         0x311
+
 /* CT command header -- request/response common fields */
 struct ct_cmd_hdr {
         uint8_t revision;
@@ -1825,6 +1921,43 @@ struct ct_sns_req {
                         uint8_t name_len;
                         uint8_t sym_node_name[255];
                 } rsnn_nn;
+
+                struct {
+                        uint8_t hba_indentifier[8];
+                } ghat;
+
+                struct {
+                        uint8_t hba_identifier[8];
+                        uint32_t entry_count;
+                        uint8_t port_name[8];
+                        struct ct_fdmi_hba_attributes attrs;
+                } rhba;
+
+                struct {
+                        uint8_t hba_identifier[8];
+                        struct ct_fdmi_hba_attributes attrs;
+                } rhat;
+
+                struct {
+                        uint8_t port_name[8];
+                        struct ct_fdmi_port_attributes attrs;
+                } rpa;
+
+                struct {
+                        uint8_t port_name[8];
+                } dhba;
+
+                struct {
+                        uint8_t port_name[8];
+                } dhat;
+
+                struct {
+                        uint8_t port_name[8];
+                } dprt;
+
+                struct {
+                        uint8_t port_name[8];
+                } dpa;
         } req;
 };
 
@@ -1882,6 +2015,12 @@ struct ct_sns_rsp {
                 struct {
                         uint8_t fc4_types[32];
                 } gft_id;
+
+                struct {
+                        uint32_t entry_count;
+                        uint8_t port_name[8];
+                        struct ct_fdmi_hba_attributes attrs;
+                } ghat;
         } rsp;
 };
 
@@ -2032,6 +2171,8 @@ struct isp_operations {
         uint16_t (*calc_req_entries) (uint16_t);
         void (*build_iocbs) (srb_t *, cmd_entry_t *, uint16_t);
         void * (*prep_ms_iocb) (struct scsi_qla_host *, uint32_t, uint32_t);
+        void * (*prep_ms_fdmi_iocb) (struct scsi_qla_host *, uint32_t,
+            uint32_t);
 
         uint8_t * (*read_nvram) (struct scsi_qla_host *, uint8_t *,
                 uint32_t, uint32_t);
@@ -2111,6 +2252,7 @@ typedef struct scsi_qla_host {
 #define IOCTL_ERROR_RECOVERY    23
 #define LOOP_RESET_NEEDED       24
 #define BEACON_BLINK_NEEDED     25
+#define REGISTER_FDMI_NEEDED    26
 
         uint32_t        device_flags;
 #define DFLG_LOCAL_DEVICES              BIT_0
@@ -2204,6 +2346,7 @@ typedef struct scsi_qla_host {
         int             port_down_retry_count;
         uint8_t         mbx_count;
         uint16_t        last_loop_id;
+        uint16_t        mgmt_svr_loop_id;
 
         uint32_t        login_retry_count;
 
@@ -2318,6 +2461,7 @@ typedef struct scsi_qla_host {
         uint8_t         model_number[16+1];
 #define BINZERO         "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
         char            *model_desc;
+        uint8_t         adapter_id[16+1];
 
         uint8_t         *node_name;
         uint8_t         *port_name;
@@ -2377,6 +2521,7 @@ typedef struct scsi_qla_host {
 #define QLA_SUSPENDED                   0x106
 #define QLA_BUSY                        0x107
 #define QLA_RSCNS_HANDLED               0x108
+#define QLA_ALREADY_REGISTERED          0x109
 
 /*
 * Stat info for all adpaters
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 665c203e0675..1ed32e7b5472 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -79,6 +79,7 @@ extern int ql2xplogiabsentdevice;
 extern int ql2xenablezio;
 extern int ql2xintrdelaytimer;
 extern int ql2xloginretrycount;
+extern int ql2xfdmienable;
 
 extern void qla2x00_sp_compl(scsi_qla_host_t *, srb_t *);
 
@@ -147,9 +148,6 @@ qla2x00_abort_target(fc_port_t *);
 #endif
 
 extern int
-qla2x00_target_reset(scsi_qla_host_t *, struct fc_port *);
-
-extern int
 qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *,
     uint8_t *, uint16_t *);
 
@@ -215,6 +213,9 @@ qla2x00_get_serdes_params(scsi_qla_host_t *, uint16_t *, uint16_t *,
 extern int
 qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);
 
+extern int
+qla2x00_stop_firmware(scsi_qla_host_t *);
+
 /*
  * Global Function Prototypes in qla_isr.c source file.
  */
@@ -269,6 +270,9 @@ extern int qla2x00_rft_id(scsi_qla_host_t *);
 extern int qla2x00_rff_id(scsi_qla_host_t *);
 extern int qla2x00_rnn_id(scsi_qla_host_t *);
 extern int qla2x00_rsnn_nn(scsi_qla_host_t *);
+extern void *qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t);
+extern void *qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t);
+extern int qla2x00_fdmi_register(scsi_qla_host_t *);
 
 /*
  * Global Function Prototypes in qla_rscn.c source file.
@@ -289,6 +293,8 @@ extern void qla2x00_cancel_io_descriptors(scsi_qla_host_t *);
 /*
  * Global Function Prototypes in qla_attr.c source file.
  */
+struct class_device_attribute;
+extern struct class_device_attribute *qla2x00_host_attrs[];
 struct fc_function_template;
 extern struct fc_function_template qla2xxx_transport_functions;
 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 31ce4f62da13..e7b138c2e339 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1099,3 +1099,567 @@ qla2x00_sns_rnn_id(scsi_qla_host_t *ha)
 
         return (rval);
 }
+
+/**
+ * qla2x00_mgmt_svr_login() - Login to fabric Managment Service.
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_mgmt_svr_login(scsi_qla_host_t *ha)
+{
+        int ret;
+        uint16_t mb[MAILBOX_REGISTER_COUNT];
+
+        ret = QLA_SUCCESS;
+        if (ha->flags.management_server_logged_in)
+                return ret;
+
+        ha->isp_ops.fabric_login(ha, ha->mgmt_svr_loop_id, 0xff, 0xff, 0xfa,
+            mb, BIT_1);
+        if (mb[0] != MBS_COMMAND_COMPLETE) {
+                DEBUG2_13(printk("%s(%ld): Failed MANAGEMENT_SERVER login: "
+                    "loop_id=%x mb[0]=%x mb[1]=%x mb[2]=%x mb[6]=%x mb[7]=%x\n",
+                    __func__, ha->host_no, ha->mgmt_svr_loop_id, mb[0], mb[1],
+                    mb[2], mb[6], mb[7]));
+                ret = QLA_FUNCTION_FAILED;
+        } else
+                ha->flags.management_server_logged_in = 1;
+
+        return ret;
+}
+
+/**
+ * qla2x00_prep_ms_fdmi_iocb() - Prepare common MS IOCB fields for FDMI query.
+ * @ha: HA context
+ * @req_size: request size in bytes
+ * @rsp_size: response size in bytes
+ *
+ * Returns a pointer to the @ha's ms_iocb.
+ */
+void *
+qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size,
+    uint32_t rsp_size)
+{
+        ms_iocb_entry_t *ms_pkt;
+
+        ms_pkt = ha->ms_iocb;
+        memset(ms_pkt, 0, sizeof(ms_iocb_entry_t));
+
+        ms_pkt->entry_type = MS_IOCB_TYPE;
+        ms_pkt->entry_count = 1;
+        SET_TARGET_ID(ha, ms_pkt->loop_id, ha->mgmt_svr_loop_id);
+        ms_pkt->control_flags = __constant_cpu_to_le16(CF_READ | CF_HEAD_TAG);
+        ms_pkt->timeout = __constant_cpu_to_le16(59);
+        ms_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);
+        ms_pkt->total_dsd_count = __constant_cpu_to_le16(2);
+        ms_pkt->rsp_bytecount = cpu_to_le32(rsp_size);
+        ms_pkt->req_bytecount = cpu_to_le32(req_size);
+
+        ms_pkt->dseg_req_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ms_pkt->dseg_req_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ms_pkt->dseg_req_length = ms_pkt->req_bytecount;
+
+        ms_pkt->dseg_rsp_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ms_pkt->dseg_rsp_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ms_pkt->dseg_rsp_length = ms_pkt->rsp_bytecount;
+
+        return ms_pkt;
+}
+
+/**
+ * qla24xx_prep_ms_fdmi_iocb() - Prepare common MS IOCB fields for FDMI query.
+ * @ha: HA context
+ * @req_size: request size in bytes
+ * @rsp_size: response size in bytes
+ *
+ * Returns a pointer to the @ha's ms_iocb.
+ */
+void *
+qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size,
+    uint32_t rsp_size)
+{
+        struct ct_entry_24xx *ct_pkt;
+
+        ct_pkt = (struct ct_entry_24xx *)ha->ms_iocb;
+        memset(ct_pkt, 0, sizeof(struct ct_entry_24xx));
+
+        ct_pkt->entry_type = CT_IOCB_TYPE;
+        ct_pkt->entry_count = 1;
+        ct_pkt->nport_handle = cpu_to_le16(ha->mgmt_svr_loop_id);
+        ct_pkt->timeout = __constant_cpu_to_le16(59);
+        ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);
+        ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);
+        ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);
+        ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
+
+        ct_pkt->dseg_0_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ct_pkt->dseg_0_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ct_pkt->dseg_0_len = ct_pkt->cmd_byte_count;
+
+        ct_pkt->dseg_1_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
+        ct_pkt->dseg_1_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
+        ct_pkt->dseg_1_len = ct_pkt->rsp_byte_count;
+
+        return ct_pkt;
+}
+
+static inline ms_iocb_entry_t *
+qla2x00_update_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size)
+{
+        ms_iocb_entry_t *ms_pkt = ha->ms_iocb;
+        struct ct_entry_24xx *ct_pkt = (struct ct_entry_24xx *)ha->ms_iocb;
+
+        if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) {
+                ct_pkt->cmd_byte_count = cpu_to_le32(req_size);
+                ct_pkt->dseg_0_len = ct_pkt->cmd_byte_count;
+        } else {
+                ms_pkt->req_bytecount = cpu_to_le32(req_size);
+                ms_pkt->dseg_req_length = ms_pkt->req_bytecount;
+        }
+
+        return ms_pkt;
+}
+
+/**
+ * qla2x00_prep_ct_req() - Prepare common CT request fields for SNS query.
+ * @ct_req: CT request buffer
+ * @cmd: GS command
+ * @rsp_size: response size in bytes
+ *
+ * Returns a pointer to the intitialized @ct_req.
+ */
+static inline struct ct_sns_req *
+qla2x00_prep_ct_fdmi_req(struct ct_sns_req *ct_req, uint16_t cmd,
+    uint16_t rsp_size)
+{
+        memset(ct_req, 0, sizeof(struct ct_sns_pkt));
+
+        ct_req->header.revision = 0x01;
+        ct_req->header.gs_type = 0xFA;
+        ct_req->header.gs_subtype = 0x10;
+        ct_req->command = cpu_to_be16(cmd);
+        ct_req->max_rsp_size = cpu_to_be16((rsp_size - 16) / 4);
+
+        return ct_req;
+}
+
+/**
+ * qla2x00_fdmi_rhba() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_fdmi_rhba(scsi_qla_host_t *ha)
+{
+        int rval, alen;
+        uint32_t size, sn;
+
+        ms_iocb_entry_t *ms_pkt;
+        struct ct_sns_req *ct_req;
+        struct ct_sns_rsp *ct_rsp;
+        uint8_t *entries;
+        struct ct_fdmi_hba_attr *eiter;
+
+        /* Issue RHBA */
+        /* Prepare common MS IOCB */
+        /*   Request size adjusted after CT preparation */
+        ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, 0, RHBA_RSP_SIZE);
+
+        /* Prepare CT request */
+        ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, RHBA_CMD,
+            RHBA_RSP_SIZE);
+        ct_rsp = &ha->ct_sns->p.rsp;
+
+        /* Prepare FDMI command arguments -- attribute block, attributes. */
+        memcpy(ct_req->req.rhba.hba_identifier, ha->port_name, WWN_SIZE);
+        ct_req->req.rhba.entry_count = __constant_cpu_to_be32(1);
+        memcpy(ct_req->req.rhba.port_name, ha->port_name, WWN_SIZE);
+        size = 2 * WWN_SIZE + 4 + 4;
+
+        /* Attributes */
+        ct_req->req.rhba.attrs.count =
+            __constant_cpu_to_be32(FDMI_HBA_ATTR_COUNT);
+        entries = ct_req->req.rhba.hba_identifier;
+
+        /* Nodename. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_NODE_NAME);
+        eiter->len = __constant_cpu_to_be16(4 + WWN_SIZE);
+        memcpy(eiter->a.node_name, ha->node_name, WWN_SIZE);
+        size += 4 + WWN_SIZE;
+
+        DEBUG13(printk("%s(%ld): NODENAME=%02x%02x%02x%02x%02x%02x%02x%02x.\n",
+            __func__, ha->host_no,
+            eiter->a.node_name[0], eiter->a.node_name[1], eiter->a.node_name[2],
+            eiter->a.node_name[3], eiter->a.node_name[4], eiter->a.node_name[5],
+            eiter->a.node_name[6], eiter->a.node_name[7]));
+
+        /* Manufacturer. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_MANUFACTURER);
+        strcpy(eiter->a.manufacturer, "QLogic Corporation");
+        alen = strlen(eiter->a.manufacturer);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): MANUFACTURER=%s.\n", __func__, ha->host_no,
+            eiter->a.manufacturer));
+
+        /* Serial number. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_SERIAL_NUMBER);
+        sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;
+        sprintf(eiter->a.serial_num, "%c%05d", 'A' + sn / 100000, sn % 100000);
+        alen = strlen(eiter->a.serial_num);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): SERIALNO=%s.\n", __func__, ha->host_no,
+            eiter->a.serial_num));
+
+        /* Model name. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL);
+        strcpy(eiter->a.model, ha->model_number);
+        alen = strlen(eiter->a.model);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): MODEL_NAME=%s.\n", __func__, ha->host_no,
+            eiter->a.model));
+
+        /* Model description. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);
+        if (ha->model_desc)
+                strncpy(eiter->a.model_desc, ha->model_desc, 80);
+        alen = strlen(eiter->a.model_desc);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): MODEL_DESC=%s.\n", __func__, ha->host_no,
+            eiter->a.model_desc));
+
+        /* Hardware version. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_HARDWARE_VERSION);
+        strcpy(eiter->a.hw_version, ha->adapter_id);
+        alen = strlen(eiter->a.hw_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): HARDWAREVER=%s.\n", __func__, ha->host_no,
+            eiter->a.hw_version));
+
+        /* Driver version. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_DRIVER_VERSION);
+        strcpy(eiter->a.driver_version, qla2x00_version_str);
+        alen = strlen(eiter->a.driver_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): DRIVERVER=%s.\n", __func__, ha->host_no,
+            eiter->a.driver_version));
+
+        /* Option ROM version. */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_OPTION_ROM_VERSION);
+        strcpy(eiter->a.orom_version, "0.00");
+        alen = strlen(eiter->a.orom_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): OPTROMVER=%s.\n", __func__, ha->host_no,
+            eiter->a.orom_version));
+
+        /* Firmware version */
+        eiter = (struct ct_fdmi_hba_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_HBA_FIRMWARE_VERSION);
+        ha->isp_ops.fw_version_str(ha, eiter->a.fw_version);
+        alen = strlen(eiter->a.fw_version);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): FIRMWAREVER=%s.\n", __func__, ha->host_no,
+            eiter->a.fw_version));
+
+        /* Update MS request size. */
+        qla2x00_update_ms_fdmi_iocb(ha, size + 16);
+
+        DEBUG13(printk("%s(%ld): RHBA identifier="
+            "%02x%02x%02x%02x%02x%02x%02x%02x size=%d.\n", __func__,
+            ha->host_no, ct_req->req.rhba.hba_identifier[0],
+            ct_req->req.rhba.hba_identifier[1],
+            ct_req->req.rhba.hba_identifier[2],
+            ct_req->req.rhba.hba_identifier[3],
+            ct_req->req.rhba.hba_identifier[4],
+            ct_req->req.rhba.hba_identifier[5],
+            ct_req->req.rhba.hba_identifier[6],
+            ct_req->req.rhba.hba_identifier[7], size));
+        DEBUG13(qla2x00_dump_buffer(entries, size));
+
+        /* Execute MS IOCB */
+        rval = qla2x00_issue_iocb(ha, ha->ms_iocb, ha->ms_iocb_dma,
+            sizeof(ms_iocb_entry_t));
+        if (rval != QLA_SUCCESS) {
+                /*EMPTY*/
+                DEBUG2_3(printk("scsi(%ld): RHBA issue IOCB failed (%d).\n",
+                    ha->host_no, rval));
+        } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, "RHBA") !=
+            QLA_SUCCESS) {
+                rval = QLA_FUNCTION_FAILED;
+                if (ct_rsp->header.reason_code == CT_REASON_CANNOT_PERFORM &&
+                    ct_rsp->header.explanation_code ==
+                    CT_EXPL_ALREADY_REGISTERED) {
+                        DEBUG2_13(printk("%s(%ld): HBA already registered.\n",
+                            __func__, ha->host_no));
+                        rval = QLA_ALREADY_REGISTERED;
+                }
+        } else {
+                DEBUG2(printk("scsi(%ld): RHBA exiting normally.\n",
+                    ha->host_no));
+        }
+
+        return rval;
+}
+
+/**
+ * qla2x00_fdmi_dhba() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_fdmi_dhba(scsi_qla_host_t *ha)
+{
+        int rval;
+
+        ms_iocb_entry_t *ms_pkt;
+        struct ct_sns_req *ct_req;
+        struct ct_sns_rsp *ct_rsp;
+
+        /* Issue RPA */
+        /* Prepare common MS IOCB */
+        ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, DHBA_REQ_SIZE,
+            DHBA_RSP_SIZE);
+
+        /* Prepare CT request */
+        ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, DHBA_CMD,
+            DHBA_RSP_SIZE);
+        ct_rsp = &ha->ct_sns->p.rsp;
+
+        /* Prepare FDMI command arguments -- portname. */
+        memcpy(ct_req->req.dhba.port_name, ha->port_name, WWN_SIZE);
+
+        DEBUG13(printk("%s(%ld): DHBA portname="
+            "%02x%02x%02x%02x%02x%02x%02x%02x.\n", __func__, ha->host_no,
+            ct_req->req.dhba.port_name[0], ct_req->req.dhba.port_name[1],
+            ct_req->req.dhba.port_name[2], ct_req->req.dhba.port_name[3],
+            ct_req->req.dhba.port_name[4], ct_req->req.dhba.port_name[5],
+            ct_req->req.dhba.port_name[6], ct_req->req.dhba.port_name[7]));
+
+        /* Execute MS IOCB */
+        rval = qla2x00_issue_iocb(ha, ha->ms_iocb, ha->ms_iocb_dma,
+            sizeof(ms_iocb_entry_t));
+        if (rval != QLA_SUCCESS) {
+                /*EMPTY*/
+                DEBUG2_3(printk("scsi(%ld): DHBA issue IOCB failed (%d).\n",
+                    ha->host_no, rval));
+        } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, "DHBA") !=
+            QLA_SUCCESS) {
+                rval = QLA_FUNCTION_FAILED;
+        } else {
+                DEBUG2(printk("scsi(%ld): DHBA exiting normally.\n",
+                    ha->host_no));
+        }
+
+        return rval;
+}
+
+/**
+ * qla2x00_fdmi_rpa() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+static int
+qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
+{
+        int rval, alen;
+        uint32_t size, max_frame_size;
+
+        ms_iocb_entry_t *ms_pkt;
+        struct ct_sns_req *ct_req;
+        struct ct_sns_rsp *ct_rsp;
+        uint8_t *entries;
+        struct ct_fdmi_port_attr *eiter;
+        struct init_cb_24xx *icb24 = (struct init_cb_24xx *)ha->init_cb;
+
+        /* Issue RPA */
+        /* Prepare common MS IOCB */
+        /*   Request size adjusted after CT preparation */
+        ms_pkt = ha->isp_ops.prep_ms_fdmi_iocb(ha, 0, RPA_RSP_SIZE);
+
+        /* Prepare CT request */
+        ct_req = qla2x00_prep_ct_fdmi_req(&ha->ct_sns->p.req, RPA_CMD,
+            RPA_RSP_SIZE);
+        ct_rsp = &ha->ct_sns->p.rsp;
+
+        /* Prepare FDMI command arguments -- attribute block, attributes. */
+        memcpy(ct_req->req.rpa.port_name, ha->port_name, WWN_SIZE);
+        size = WWN_SIZE + 4;
+
+        /* Attributes */
+        ct_req->req.rpa.attrs.count =
+            __constant_cpu_to_be32(FDMI_PORT_ATTR_COUNT);
+        entries = ct_req->req.rpa.port_name;
+
+        /* FC4 types. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_FC4_TYPES);
+        eiter->len = __constant_cpu_to_be16(4 + 32);
+        eiter->a.fc4_types[2] = 0x01;
+        size += 4 + 32;
+
+        DEBUG13(printk("%s(%ld): FC4_TYPES=%02x %02x.\n", __func__, ha->host_no,
+            eiter->a.fc4_types[2], eiter->a.fc4_types[1]));
+
+        /* Supported speed. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_SUPPORT_SPEED);
+        eiter->len = __constant_cpu_to_be16(4 + 4);
+        if (IS_QLA25XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(4);
+        else if (IS_QLA24XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(8);
+        else if (IS_QLA23XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(2);
+        else
+                eiter->a.sup_speed = __constant_cpu_to_be32(1);
+        size += 4 + 4;
+
+        DEBUG13(printk("%s(%ld): SUPPORTED_SPEED=%x.\n", __func__, ha->host_no,
+            eiter->a.sup_speed));
+
+        /* Current speed. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_CURRENT_SPEED);
+        eiter->len = __constant_cpu_to_be16(4 + 4);
+        switch (ha->link_data_rate) {
+        case 0:
+                eiter->a.cur_speed = __constant_cpu_to_be32(1);
+                break;
+        case 1:
+                eiter->a.cur_speed = __constant_cpu_to_be32(2);
+                break;
+        case 3:
+                eiter->a.cur_speed = __constant_cpu_to_be32(8);
+                break;
+        case 4:
+                eiter->a.cur_speed = __constant_cpu_to_be32(4);
+                break;
+        }
+        size += 4 + 4;
+
+        DEBUG13(printk("%s(%ld): CURRENT_SPEED=%x.\n", __func__, ha->host_no,
+            eiter->a.cur_speed));
+
+        /* Max frame size. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_MAX_FRAME_SIZE);
+        eiter->len = __constant_cpu_to_be16(4 + 4);
+        max_frame_size = IS_QLA24XX(ha) || IS_QLA25XX(ha) ?
+                (uint32_t) icb24->frame_payload_size:
+                (uint32_t) ha->init_cb->frame_payload_size;
+        eiter->a.max_frame_size = cpu_to_be32(max_frame_size);
+        size += 4 + 4;
+
+        DEBUG13(printk("%s(%ld): MAX_FRAME_SIZE=%x.\n", __func__, ha->host_no,
+            eiter->a.max_frame_size));
+
+        /* OS device name. */
+        eiter = (struct ct_fdmi_port_attr *) (entries + size);
+        eiter->type = __constant_cpu_to_be16(FDMI_PORT_OS_DEVICE_NAME);
+        sprintf(eiter->a.os_dev_name, "/proc/scsi/qla2xxx/%ld", ha->host_no);
+        alen = strlen(eiter->a.os_dev_name);
+        alen += (alen & 3) ? (4 - (alen & 3)) : 4;
+        eiter->len = cpu_to_be16(4 + alen);
+        size += 4 + alen;
+
+        DEBUG13(printk("%s(%ld): OS_DEVICE_NAME=%s.\n", __func__, ha->host_no,
+            eiter->a.os_dev_name));
+
+        /* Update MS request size. */
+        qla2x00_update_ms_fdmi_iocb(ha, size + 16);
+
+        DEBUG13(printk("%s(%ld): RPA portname="
+            "%02x%02x%02x%02x%02x%02x%02x%02x size=%d.\n", __func__,
+            ha->host_no, ct_req->req.rpa.port_name[0],
+            ct_req->req.rpa.port_name[1], ct_req->req.rpa.port_name[2],
+            ct_req->req.rpa.port_name[3], ct_req->req.rpa.port_name[4],
+            ct_req->req.rpa.port_name[5], ct_req->req.rpa.port_name[6],
+            ct_req->req.rpa.port_name[7], size));
+        DEBUG13(qla2x00_dump_buffer(entries, size));
+
+        /* Execute MS IOCB */
+        rval = qla2x00_issue_iocb(ha, ha->ms_iocb, ha->ms_iocb_dma,
+            sizeof(ms_iocb_entry_t));
+        if (rval != QLA_SUCCESS) {
+                /*EMPTY*/
+                DEBUG2_3(printk("scsi(%ld): RPA issue IOCB failed (%d).\n",
+                    ha->host_no, rval));
+        } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp, "RPA") !=
+            QLA_SUCCESS) {
+                rval = QLA_FUNCTION_FAILED;
+        } else {
+                DEBUG2(printk("scsi(%ld): RPA exiting normally.\n",
+                    ha->host_no));
+        }
+
+        return rval;
+}
+
+/**
+ * qla2x00_fdmi_register() -
+ * @ha: HA context
+ *
+ * Returns 0 on success.
+ */
+int
+qla2x00_fdmi_register(scsi_qla_host_t *ha)
+{
+        int rval;
+
+        rval = qla2x00_mgmt_svr_login(ha);
+        if (rval)
+                return rval;
+
+        rval = qla2x00_fdmi_rhba(ha);
+        if (rval) {
+                if (rval != QLA_ALREADY_REGISTERED)
+                        return rval;
+
+                rval = qla2x00_fdmi_dhba(ha);
+                if (rval)
+                        return rval;
+
+                rval = qla2x00_fdmi_rhba(ha);
+                if (rval)
+                        return rval;
+        }
+        rval = qla2x00_fdmi_rpa(ha);
+
+        return rval;
+}
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a6d2559217cd..c619583e646b 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -88,6 +88,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
         ha->mbx_flags = 0;
         ha->isp_abort_cnt = 0;
         ha->beacon_blink_led = 0;
+        set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
 
         qla_printk(KERN_INFO, ha, "Configuring PCI space...\n");
         rval = ha->isp_ops.pci_config(ha);
@@ -1563,7 +1564,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         ha->flags.enable_lip_reset = ((nv->host_p[1] & BIT_1) ? 1 : 0);
         ha->flags.enable_lip_full_login = ((nv->host_p[1] & BIT_2) ? 1 : 0);
         ha->flags.enable_target_reset = ((nv->host_p[1] & BIT_3) ? 1 : 0);
-        ha->flags.enable_led_scheme = ((nv->efi_parameters & BIT_3) ? 1 : 0);
+        ha->flags.enable_led_scheme = (nv->special_options[1] & BIT_4) ? 1 : 0;
 
         ha->operating_mode =
             (icb->add_firmware_options[0] & (BIT_6 | BIT_5 | BIT_4)) >> 4;
@@ -1697,6 +1698,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, int flags)
         fcport->iodesc_idx_sent = IODESC_INVALID_INDEX;
         atomic_set(&fcport->state, FCS_UNCONFIGURED);
         fcport->flags = FCF_RLC_SUPPORT;
+        fcport->supported_classes = FC_COS_UNSPECIFIED;
 
         return (fcport);
 }
@@ -1898,7 +1900,8 @@ qla2x00_configure_local_loop(scsi_qla_host_t *ha)
                         continue;
 
                 /* Bypass if not same domain and area of adapter. */
-                if (area != ha->d_id.b.area || domain != ha->d_id.b.domain)
+                if (area && domain &&
+                    (area != ha->d_id.b.area || domain != ha->d_id.b.domain))
                         continue;
 
                 /* Bypass invalid local loop ID. */
@@ -2075,6 +2078,7 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
                 return;
         }
         rport->dd_data = fcport;
+        rport->supported_classes = fcport->supported_classes;
 
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
         if (fcport->port_type == FCT_INITIATOR)
@@ -2130,6 +2134,11 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
                 return (QLA_SUCCESS);
         }
         do {
+                /* FDMI support. */
+                if (ql2xfdmienable &&
+                    test_and_clear_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags))
+                        qla2x00_fdmi_register(ha);
+
                 /* Ensure we are logged into the SNS. */
                 if (IS_QLA24XX(ha) || IS_QLA25XX(ha))
                         loop_id = NPH_SNS;
@@ -2392,6 +2401,12 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                 if (new_fcport->d_id.b24 == ha->d_id.b24)
                         continue;
 
+                /* Bypass if same domain and area of adapter. */
+                if (((new_fcport->d_id.b24 & 0xffff00) ==
+                    (ha->d_id.b24 & 0xffff00)) && ha->current_topology ==
+                        ISP_CFG_FL)
+                            continue;
+
                 /* Bypass reserved domain fields. */
                 if ((new_fcport->d_id.b.domain & 0xf0) == 0xf0)
                         continue;
@@ -2794,6 +2809,11 @@ qla2x00_fabric_login(scsi_qla_host_t *ha, fc_port_t *fcport,
                                 }
                         }
 
+                        if (mb[10] & BIT_0)
+                                fcport->supported_classes |= FC_COS_CLASS2;
+                        if (mb[10] & BIT_1)
+                                fcport->supported_classes |= FC_COS_CLASS3;
+
                         rval = QLA_SUCCESS;
                         break;
                 } else if (mb[0] == MBS_LOOP_ID_USED) {
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index ebdc3c54d155..37f82e2cd7fb 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -810,12 +810,8 @@ qla24xx_start_scsi(srb_t *sp)
                         ha->req_q_cnt = ha->request_q_length -
                                 (ha->req_ring_index - cnt);
         }
-        if (ha->req_q_cnt < (req_cnt + 2)) {
-                if  (cmd->use_sg)
-                        pci_unmap_sg(ha->pdev, sg, cmd->use_sg,
-                                        cmd->sc_data_direction);
+        if (ha->req_q_cnt < (req_cnt + 2))
                 goto queuing_error;
-        }
 
         /* Build command packet. */
         ha->current_outstanding_cmd = handle;
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f910de6dd437..c255bb0268a9 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -451,6 +451,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
 
                 ha->flags.management_server_logged_in = 0;
                 ha->link_data_rate = 0;
+                if (ql2xfdmienable)
+                        set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
 
                 /* Update AEN queue. */
                 qla2x00_enqueue_aen(ha, MBA_LOOP_DOWN, NULL);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 409ea0ac4032..13e1c9047079 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -19,6 +19,7 @@
 #include "qla_def.h"
 
 #include <linux/delay.h>
+#include <scsi/scsi_transport_fc.h>
 
 static void
 qla2x00_mbx_sem_timeout(unsigned long data)
@@ -251,7 +252,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
                         mb0 = RD_REG_WORD(&reg->isp24.mailbox0);
                         ictrl = RD_REG_DWORD(&reg->isp24.ictrl);
                 } else {
-                        mb0 = RD_MAILBOX_REG(ha, reg->isp, 0);
+                        mb0 = RD_MAILBOX_REG(ha, &reg->isp, 0);
                         ictrl = RD_REG_WORD(&reg->isp.ictrl);
                 }
                 printk("%s(%ld): **** MB Command Timeout for cmd %x ****\n",
@@ -983,58 +984,6 @@ qla2x00_abort_target(fc_port_t *fcport)
 #endif
 
 /*
- * qla2x00_target_reset
- *      Issue target reset mailbox command.
- *
- * Input:
- *      ha = adapter block pointer.
- *      TARGET_QUEUE_LOCK must be released.
- *      ADAPTER_STATE_LOCK must be released.
- *
- * Returns:
- *      qla2x00 local function return status code.
- *
- * Context:
- *      Kernel context.
- */
-int
-qla2x00_target_reset(scsi_qla_host_t *ha, struct fc_port *fcport)
-{
-        int rval;
-        mbx_cmd_t mc;
-        mbx_cmd_t *mcp = &mc;
-
-        DEBUG11(printk("qla2x00_target_reset(%ld): entered.\n", ha->host_no);)
-
-        if (atomic_read(&fcport->state) != FCS_ONLINE)
-                return 0;
-
-        mcp->mb[0] = MBC_TARGET_RESET;
-        if (HAS_EXTENDED_IDS(ha))
-                mcp->mb[1] = fcport->loop_id;
-        else
-                mcp->mb[1] = fcport->loop_id << 8;
-        mcp->mb[2] = ha->loop_reset_delay;
-        mcp->out_mb = MBX_2|MBX_1|MBX_0;
-        mcp->in_mb = MBX_0;
-        mcp->tov = 30;
-        mcp->flags = 0;
-        rval = qla2x00_mailbox_command(ha, mcp);
-
-        if (rval != QLA_SUCCESS) {
-                /*EMPTY*/
-                DEBUG2_3_11(printk("qla2x00_target_reset(%ld): failed=%x.\n",
-                    ha->host_no, rval);)
-        } else {
-                /*EMPTY*/
-                DEBUG11(printk("qla2x00_target_reset(%ld): done.\n",
-                    ha->host_no);)
-        }
-
-        return rval;
-}
-
-/*
  * qla2x00_get_adapter_id
  *      Get adapter ID and topology.
  *
@@ -1326,6 +1275,10 @@ qla2x00_get_port_database(scsi_qla_host_t *ha, fc_port_t *fcport, uint8_t opt)
                         fcport->port_type = FCT_INITIATOR;
                 else
                         fcport->port_type = FCT_TARGET;
+
+                /* Passback COS information. */
+                fcport->supported_classes = (pd->options & BIT_4) ?
+                    FC_COS_CLASS2: FC_COS_CLASS3;
         }
 
 gpd_error_out:
@@ -1661,6 +1614,13 @@ qla24xx_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
                                 mb[1] |= BIT_1;
                 } else
                         mb[1] = BIT_0;
+
+                /* Passback COS information. */
+                mb[10] = 0;
+                if (lg->io_parameter[7] || lg->io_parameter[8])
+                        mb[10] |= BIT_0;        /* Class 2. */
+                if (lg->io_parameter[9] || lg->io_parameter[10])
+                        mb[10] |= BIT_1;        /* Class 3. */
         }
 
         dma_pool_free(ha->s_dma_pool, lg, lg_dma);
@@ -1723,6 +1683,8 @@ qla2x00_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
                 mb[2] = mcp->mb[2];
                 mb[6] = mcp->mb[6];
                 mb[7] = mcp->mb[7];
+                /* COS retrieved from Get-Port-Database mailbox command. */
+                mb[10] = 0;
         }
 
         if (rval != QLA_SUCCESS) {
@@ -2465,3 +2427,32 @@ qla2x00_set_serdes_params(scsi_qla_host_t *ha, uint16_t sw_em_1g,
 
         return rval;
 }
+
+int
+qla2x00_stop_firmware(scsi_qla_host_t *ha)
+{
+        int rval;
+        mbx_cmd_t mc;
+        mbx_cmd_t *mcp = &mc;
+
+        if (!IS_QLA24XX(ha) && !IS_QLA25XX(ha))
+                return QLA_FUNCTION_FAILED;
+
+        DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
+
+        mcp->mb[0] = MBC_STOP_FIRMWARE;
+        mcp->out_mb = MBX_0;
+        mcp->in_mb = MBX_0;
+        mcp->tov = 5;
+        mcp->flags = 0;
+        rval = qla2x00_mailbox_command(ha, mcp);
+
+        if (rval != QLA_SUCCESS) {
+                DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__,
+                    ha->host_no, rval));
+        } else {
+                DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
+        }
+
+        return rval;
+}
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 9000659bfbcf..8982978c42fd 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -79,7 +79,7 @@ module_param(ql2xloginretrycount, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xloginretrycount,
                 "Specify an alternate value for the NVRAM login retry count.");
 
-int ql2xfwloadbin;
+int ql2xfwloadbin=1;
 module_param(ql2xfwloadbin, int, S_IRUGO|S_IRUSR);
 MODULE_PARM_DESC(ql2xfwloadbin,
                 "Load ISP2xxx firmware image via hotplug.");
@@ -88,6 +88,12 @@ static void qla2x00_free_device(scsi_qla_host_t *);
 
 static void qla2x00_config_dma_addressing(scsi_qla_host_t *ha);
 
+int ql2xfdmienable;
+module_param(ql2xfdmienable, int, S_IRUGO|S_IRUSR);
+MODULE_PARM_DESC(ql2xfdmienable,
+                "Enables FDMI registratons "
+                "Default is 0 - no FDMI. 1 - perfom FDMI.");
+
 /*
  * SCSI host template entry points
  */
@@ -105,6 +111,9 @@ static int qla2xxx_eh_host_reset(struct scsi_cmnd *);
 static int qla2x00_loop_reset(scsi_qla_host_t *ha);
 static int qla2x00_device_reset(scsi_qla_host_t *, fc_port_t *);
 
+static int qla2x00_change_queue_depth(struct scsi_device *, int);
+static int qla2x00_change_queue_type(struct scsi_device *, int);
+
 static struct scsi_host_template qla2x00_driver_template = {
         .module                 = THIS_MODULE,
         .name                   = "qla2xxx",
@@ -119,6 +128,8 @@ static struct scsi_host_template qla2x00_driver_template = {
 
         .slave_alloc            = qla2xxx_slave_alloc,
         .slave_destroy          = qla2xxx_slave_destroy,
+        .change_queue_depth     = qla2x00_change_queue_depth,
+        .change_queue_type      = qla2x00_change_queue_type,
         .this_id                = -1,
         .cmd_per_lun            = 3,
         .use_clustering         = ENABLE_CLUSTERING,
@@ -129,6 +140,7 @@ static struct scsi_host_template qla2x00_driver_template = {
          * which equates to 0x800000 sectors.
          */
         .max_sectors            = 0xFFFF,
+        .shost_attrs            = qla2x00_host_attrs,
 };
 
 static struct scsi_host_template qla24xx_driver_template = {
@@ -145,12 +157,15 @@ static struct scsi_host_template qla24xx_driver_template = {
 
         .slave_alloc            = qla2xxx_slave_alloc,
         .slave_destroy          = qla2xxx_slave_destroy,
+        .change_queue_depth     = qla2x00_change_queue_depth,
+        .change_queue_type      = qla2x00_change_queue_type,
         .this_id                = -1,
         .cmd_per_lun            = 3,
         .use_clustering         = ENABLE_CLUSTERING,
         .sg_tablesize           = SG_ALL,
 
         .max_sectors            = 0xFFFF,
+        .shost_attrs            = qla2x00_host_attrs,
 };
 
 static struct scsi_transport_template *qla2xxx_transport_template = NULL;
@@ -487,14 +502,13 @@ qc24_fail_command:
 static int
 qla2x00_eh_wait_on_command(scsi_qla_host_t *ha, struct scsi_cmnd *cmd)
 {
-#define ABORT_POLLING_PERIOD    HZ
-#define ABORT_WAIT_ITER         ((10 * HZ) / (ABORT_POLLING_PERIOD))
+#define ABORT_POLLING_PERIOD    1000
+#define ABORT_WAIT_ITER         ((10 * 1000) / (ABORT_POLLING_PERIOD))
         unsigned long wait_iter = ABORT_WAIT_ITER;
         int ret = QLA_SUCCESS;
 
         while (CMD_SP(cmd)) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
-                schedule_timeout(ABORT_POLLING_PERIOD);
+                msleep(ABORT_POLLING_PERIOD);
 
                 if (--wait_iter)
                         break;
@@ -1016,7 +1030,7 @@ qla2x00_loop_reset(scsi_qla_host_t *ha)
                         if (fcport->port_type != FCT_TARGET)
                                 continue;
 
-                        status = qla2x00_target_reset(ha, fcport);
+                        status = qla2x00_device_reset(ha, fcport);
                         if (status != QLA_SUCCESS)
                                 break;
                 }
@@ -1103,6 +1117,28 @@ qla2xxx_slave_destroy(struct scsi_device *sdev)
         sdev->hostdata = NULL;
 }
 
+static int
+qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth)
+{
+        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        return sdev->queue_depth;
+}
+
+static int
+qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)
+{
+        if (sdev->tagged_supported) {
+                scsi_set_tag_type(sdev, tag_type);
+                if (tag_type)
+                        scsi_activate_tcq(sdev, sdev->queue_depth);
+                else
+                        scsi_deactivate_tcq(sdev, sdev->queue_depth);
+        } else
+                tag_type = 0;
+
+        return tag_type;
+}
+
 /**
  * qla2x00_config_dma_addressing() - Configure OS DMA addressing method.
  * @ha: HA context
@@ -1113,36 +1149,23 @@ qla2xxx_slave_destroy(struct scsi_device *sdev)
 static void
 qla2x00_config_dma_addressing(scsi_qla_host_t *ha)
 {
-        /* Assume 32bit DMA address */
+        /* Assume a 32bit DMA mask. */
         ha->flags.enable_64bit_addressing = 0;
 
-        /*
-         * Given the two variants pci_set_dma_mask(), allow the compiler to
-         * assist in setting the proper dma mask.
-         */
-        if (sizeof(dma_addr_t) > 4) {
-                if (pci_set_dma_mask(ha->pdev, DMA_64BIT_MASK) == 0) {
+        if (!dma_set_mask(&ha->pdev->dev, DMA_64BIT_MASK)) {
+                /* Any upper-dword bits set? */
+                if (MSD(dma_get_required_mask(&ha->pdev->dev)) &&
+                    !pci_set_consistent_dma_mask(ha->pdev, DMA_64BIT_MASK)) {
+                        /* Ok, a 64bit DMA mask is applicable. */
                         ha->flags.enable_64bit_addressing = 1;
                         ha->isp_ops.calc_req_entries = qla2x00_calc_iocbs_64;
                         ha->isp_ops.build_iocbs = qla2x00_build_scsi_iocbs_64;
-
-                        if (pci_set_consistent_dma_mask(ha->pdev,
-                            DMA_64BIT_MASK)) {
-                                qla_printk(KERN_DEBUG, ha,
-                                    "Failed to set 64 bit PCI consistent mask; "
-                                    "using 32 bit.\n");
-                                pci_set_consistent_dma_mask(ha->pdev,
-                                    DMA_32BIT_MASK);
-                        }
-                } else {
-                        qla_printk(KERN_DEBUG, ha,
-                            "Failed to set 64 bit PCI DMA mask, falling back "
-                            "to 32 bit MASK.\n");
-                        pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK);
+                        return;
                 }
-        } else {
-                pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK);
         }
+
+        dma_set_mask(&ha->pdev->dev, DMA_32BIT_MASK);
+        pci_set_consistent_dma_mask(ha->pdev, DMA_32BIT_MASK);
 }
 
 static int
@@ -1316,6 +1339,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         ha->prev_topology = 0;
         ha->ports = MAX_BUSES;
         ha->init_cb_size = sizeof(init_cb_t);
+        ha->mgmt_svr_loop_id = MANAGEMENT_SERVER;
 
         /* Assign ISP specific operations. */
         ha->isp_ops.pci_config          = qla2100_pci_config;
@@ -1338,6 +1362,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         ha->isp_ops.calc_req_entries    = qla2x00_calc_iocbs_32;
         ha->isp_ops.build_iocbs         = qla2x00_build_scsi_iocbs_32;
         ha->isp_ops.prep_ms_iocb        = qla2x00_prep_ms_iocb;
+        ha->isp_ops.prep_ms_fdmi_iocb   = qla2x00_prep_ms_fdmi_iocb;
         ha->isp_ops.read_nvram          = qla2x00_read_nvram_data;
         ha->isp_ops.write_nvram         = qla2x00_write_nvram_data;
         ha->isp_ops.fw_dump             = qla2100_fw_dump;
@@ -1375,6 +1400,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 ha->response_q_length = RESPONSE_ENTRY_CNT_2300;
                 ha->last_loop_id = SNS_LAST_LOOP_ID_2300;
                 ha->init_cb_size = sizeof(struct init_cb_24xx);
+                ha->mgmt_svr_loop_id = 10;
                 ha->isp_ops.pci_config = qla24xx_pci_config;
                 ha->isp_ops.reset_chip = qla24xx_reset_chip;
                 ha->isp_ops.chip_diag = qla24xx_chip_diag;
@@ -1395,6 +1421,7 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
                 ha->isp_ops.fabric_login = qla24xx_login_fabric;
                 ha->isp_ops.fabric_logout = qla24xx_fabric_logout;
                 ha->isp_ops.prep_ms_iocb = qla24xx_prep_ms_iocb;
+                ha->isp_ops.prep_ms_fdmi_iocb = qla24xx_prep_ms_fdmi_iocb;
                 ha->isp_ops.read_nvram = qla24xx_read_nvram_data;
                 ha->isp_ops.write_nvram = qla24xx_write_nvram_data;
                 ha->isp_ops.fw_dump = qla24xx_fw_dump;
@@ -1558,8 +1585,6 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
         return 0;
 
 probe_failed:
-        fc_remove_host(ha->host);
-
         qla2x00_free_device(ha);
 
         scsi_host_put(host);
@@ -1601,10 +1626,6 @@ qla2x00_free_device(scsi_qla_host_t *ha)
         if (!IS_QLA2100(ha) && !IS_QLA2200(ha))
                 qla2x00_cancel_io_descriptors(ha);
 
-        /* turn-off interrupts on the card */
-        if (ha->interrupts_on)
-                ha->isp_ops.disable_intrs(ha);
-
         /* Disable timer */
         if (ha->timer_active)
                 qla2x00_stop_timer(ha);
@@ -1624,8 +1645,14 @@ qla2x00_free_device(scsi_qla_host_t *ha)
                 }
         }
 
-        qla2x00_mem_free(ha);
+        /* Stop currently executing firmware. */
+        qla2x00_stop_firmware(ha);
+
+        /* turn-off interrupts on the card */
+        if (ha->interrupts_on)
+                ha->isp_ops.disable_intrs(ha);
 
+        qla2x00_mem_free(ha);
 
         ha->flags.online = 0;
 
@@ -1934,7 +1961,7 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
 {
         struct list_head        *fcpl, *fcptemp;
         fc_port_t       *fcport;
-        unsigned long   wtime;/* max wait time if mbx cmd is busy. */
+        unsigned int    wtime;/* max wait time if mbx cmd is busy. */
 
         if (ha == NULL) {
                 /* error */
@@ -1943,11 +1970,9 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
         }
 
         /* Make sure all other threads are stopped. */
-        wtime = 60 * HZ;
-        while (ha->dpc_wait && wtime) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                wtime = schedule_timeout(wtime);
-        }
+        wtime = 60 * 1000;
+        while (ha->dpc_wait && wtime)
+                wtime = msleep_interruptible(wtime);
 
         /* free ioctl memory */
         qla2x00_free_ioctl_mem(ha);
@@ -2478,15 +2503,15 @@ qla2x00_timer(scsi_qla_host_t *ha)
 int
 qla2x00_down_timeout(struct semaphore *sema, unsigned long timeout)
 {
-        const unsigned int step = HZ/10;
+        const unsigned int step = 100; /* msecs */
+        unsigned int iterations = jiffies_to_msecs(timeout)/100;
 
         do {
                 if (!down_trylock(sema))
                         return 0;
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (schedule_timeout(step))
+                if (msleep_interruptible(step))
                         break;
-        } while ((timeout -= step) > 0);
+        } while (--iterations >= 0);
 
         return -ETIMEDOUT;
 }
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index d7f5c608009c..c14abf743b7c 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -468,21 +468,12 @@ qla24xx_read_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
     uint32_t dwords)
 {
         uint32_t i;
-        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
-
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
 
         /* Dword reads to flash. */
         for (i = 0; i < dwords; i++, faddr++)
                 dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,
                     flash_data_to_access_addr(faddr)));
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         return dwptr;
 }
 
@@ -532,10 +523,6 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
 
         ret = QLA_SUCCESS;
 
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         qla24xx_get_flash_manufacturer(ha, &man_id, &flash_id);
         DEBUG9(printk("%s(%ld): Flash man_id=%d flash_id=%d\n", __func__,
             ha->host_no, man_id, flash_id));
@@ -599,10 +586,6 @@ qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr,
             RD_REG_DWORD(&reg->ctrl_status) & ~CSRX_FLASH_ENABLE);
         RD_REG_DWORD(&reg->ctrl_status);        /* PCI Posting. */
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         return ret;
 }
 
@@ -630,11 +613,6 @@ qla24xx_read_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
 {
         uint32_t i;
         uint32_t *dwptr;
-        struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
-
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);       /* PCI Posting. */
 
         /* Dword reads to flash. */
         dwptr = (uint32_t *)buf;
@@ -642,10 +620,6 @@ qla24xx_read_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
                 dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,
                     nvram_data_to_access_addr(naddr)));
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);       /* PCI Posting. */
-
         return buf;
 }
 
@@ -690,10 +664,6 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
 
         ret = QLA_SUCCESS;
 
-        /* Pause RISC. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         /* Enable flash write. */
         WRT_REG_DWORD(&reg->ctrl_status,
             RD_REG_DWORD(&reg->ctrl_status) | CSRX_FLASH_ENABLE);
@@ -728,9 +698,5 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr,
             RD_REG_DWORD(&reg->ctrl_status) & ~CSRX_FLASH_ENABLE);
         RD_REG_DWORD(&reg->ctrl_status);        /* PCI Posting. */
 
-        /* Release RISC pause. */
-        WRT_REG_DWORD(&reg->hccr, HCCRX_REL_RISC_PAUSE);
-        RD_REG_DWORD(&reg->hccr);               /* PCI Posting. */
-
         return ret;
 }
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index e3cd3618bc54..eae7d6edd531 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -19,9 +19,9 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.01.00b5-k"
+#define QLA2XXX_VERSION      "8.01.00-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1
 #define QLA_DRIVER_PATCH_VER    0
-#define QLA_DRIVER_BETA_VER     5
+#define QLA_DRIVER_BETA_VER     0
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
new file mode 100644
index 000000000000..f1ea5027865f
--- /dev/null
+++ b/drivers/scsi/raid_class.c
@@ -0,0 +1,250 @@
+/*
+ * RAID Attributes
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/raid_class.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
+
+#define RAID_NUM_ATTRS  3
+
+struct raid_internal {
+        struct raid_template r;
+        struct raid_function_template *f;
+        /* The actual attributes */
+        struct class_device_attribute private_attrs[RAID_NUM_ATTRS];
+        /* The array of null terminated pointers to attributes 
+         * needed by scsi_sysfs.c */
+        struct class_device_attribute *attrs[RAID_NUM_ATTRS + 1];
+};
+
+struct raid_component {
+        struct list_head node;
+        struct device *dev;
+        int num;
+};
+
+#define to_raid_internal(tmpl)  container_of(tmpl, struct raid_internal, r)
+
+#define tc_to_raid_internal(tcont) ({                                   \
+        struct raid_template *r =                                       \
+                container_of(tcont, struct raid_template, raid_attrs);  \
+        to_raid_internal(r);                                            \
+})
+
+#define ac_to_raid_internal(acont) ({                                   \
+        struct transport_container *tc =                                \
+                container_of(acont, struct transport_container, ac);    \
+        tc_to_raid_internal(tc);                                        \
+})
+
+#define class_device_to_raid_internal(cdev) ({                          \
+        struct attribute_container *ac =                                \
+                attribute_container_classdev_to_container(cdev);        \
+        ac_to_raid_internal(ac);                                        \
+})
+        
+
+static int raid_match(struct attribute_container *cont, struct device *dev)
+{
+        /* We have to look for every subsystem that could house
+         * emulated RAID devices, so start with SCSI */
+        struct raid_internal *i = ac_to_raid_internal(cont);
+
+        if (scsi_is_sdev_device(dev)) {
+                struct scsi_device *sdev = to_scsi_device(dev);
+
+                if (i->f->cookie != sdev->host->hostt)
+                        return 0;
+
+                return i->f->is_raid(dev);
+        }
+        /* FIXME: look at other subsystems too */
+        return 0;
+}
+
+static int raid_setup(struct transport_container *tc, struct device *dev,
+                       struct class_device *cdev)
+{
+        struct raid_data *rd;
+
+        BUG_ON(class_get_devdata(cdev));
+
+        rd = kmalloc(sizeof(*rd), GFP_KERNEL);
+        if (!rd)
+                return -ENOMEM;
+
+        memset(rd, 0, sizeof(*rd));
+        INIT_LIST_HEAD(&rd->component_list);
+        class_set_devdata(cdev, rd);
+                
+        return 0;
+}
+
+static int raid_remove(struct transport_container *tc, struct device *dev,
+                       struct class_device *cdev)
+{
+        struct raid_data *rd = class_get_devdata(cdev);
+        struct raid_component *rc, *next;
+        class_set_devdata(cdev, NULL);
+        list_for_each_entry_safe(rc, next, &rd->component_list, node) {
+                char buf[40];
+                snprintf(buf, sizeof(buf), "component-%d", rc->num);
+                list_del(&rc->node);
+                sysfs_remove_link(&cdev->kobj, buf);
+                kfree(rc);
+        }
+        kfree(class_get_devdata(cdev));
+        return 0;
+}
+
+static DECLARE_TRANSPORT_CLASS(raid_class,
+                               "raid_devices",
+                               raid_setup,
+                               raid_remove,
+                               NULL);
+
+static struct {
+        enum raid_state value;
+        char            *name;
+} raid_states[] = {
+        { RAID_ACTIVE, "active" },
+        { RAID_DEGRADED, "degraded" },
+        { RAID_RESYNCING, "resyncing" },
+        { RAID_OFFLINE, "offline" },
+};
+
+static const char *raid_state_name(enum raid_state state)
+{
+        int i;
+        char *name = NULL;
+
+        for (i = 0; i < sizeof(raid_states)/sizeof(raid_states[0]); i++) {
+                if (raid_states[i].value == state) {
+                        name = raid_states[i].name;
+                        break;
+                }
+        }
+        return name;
+}
+
+
+#define raid_attr_show_internal(attr, fmt, var, code)                   \
+static ssize_t raid_show_##attr(struct class_device *cdev, char *buf)   \
+{                                                                       \
+        struct raid_data *rd = class_get_devdata(cdev);                 \
+        code                                                            \
+        return snprintf(buf, 20, #fmt "\n", var);                       \
+}
+
+#define raid_attr_ro_states(attr, states, code)                         \
+raid_attr_show_internal(attr, %s, name,                                 \
+        const char *name;                                               \
+        code                                                            \
+        name = raid_##states##_name(rd->attr);                          \
+)                                                                       \
+static CLASS_DEVICE_ATTR(attr, S_IRUGO, raid_show_##attr, NULL)
+
+
+#define raid_attr_ro_internal(attr, code)                               \
+raid_attr_show_internal(attr, %d, rd->attr, code)                       \
+static CLASS_DEVICE_ATTR(attr, S_IRUGO, raid_show_##attr, NULL)
+
+#define ATTR_CODE(attr)                                                 \
+        struct raid_internal *i = class_device_to_raid_internal(cdev);  \
+        if (i->f->get_##attr)                                           \
+                i->f->get_##attr(cdev->dev);
+
+#define raid_attr_ro(attr)      raid_attr_ro_internal(attr, )
+#define raid_attr_ro_fn(attr)   raid_attr_ro_internal(attr, ATTR_CODE(attr))
+#define raid_attr_ro_state(attr)        raid_attr_ro_states(attr, attr, ATTR_CODE(attr))
+
+raid_attr_ro(level);
+raid_attr_ro_fn(resync);
+raid_attr_ro_state(state);
+
+void raid_component_add(struct raid_template *r,struct device *raid_dev,
+                        struct device *component_dev)
+{
+        struct class_device *cdev =
+                attribute_container_find_class_device(&r->raid_attrs.ac,
+                                                      raid_dev);
+        struct raid_component *rc;
+        struct raid_data *rd = class_get_devdata(cdev);
+        char buf[40];
+
+        rc = kmalloc(sizeof(*rc), GFP_KERNEL);
+        if (!rc)
+                return;
+
+        INIT_LIST_HEAD(&rc->node);
+        rc->dev = component_dev;
+        rc->num = rd->component_count++;
+
+        snprintf(buf, sizeof(buf), "component-%d", rc->num);
+        list_add_tail(&rc->node, &rd->component_list);
+        sysfs_create_link(&cdev->kobj, &component_dev->kobj, buf);
+}
+EXPORT_SYMBOL(raid_component_add);
+
+struct raid_template *
+raid_class_attach(struct raid_function_template *ft)
+{
+        struct raid_internal *i = kmalloc(sizeof(struct raid_internal),
+                                          GFP_KERNEL);
+        int count = 0;
+
+        if (unlikely(!i))
+                return NULL;
+
+        memset(i, 0, sizeof(*i));
+
+        i->f = ft;
+
+        i->r.raid_attrs.ac.class = &raid_class.class;
+        i->r.raid_attrs.ac.match = raid_match;
+        i->r.raid_attrs.ac.attrs = &i->attrs[0];
+
+        attribute_container_register(&i->r.raid_attrs.ac);
+
+        i->attrs[count++] = &class_device_attr_level;
+        i->attrs[count++] = &class_device_attr_resync;
+        i->attrs[count++] = &class_device_attr_state;
+
+        i->attrs[count] = NULL;
+        BUG_ON(count > RAID_NUM_ATTRS);
+
+        return &i->r;
+}
+EXPORT_SYMBOL(raid_class_attach);
+
+void
+raid_class_release(struct raid_template *r)
+{
+        struct raid_internal *i = to_raid_internal(r);
+
+        attribute_container_unregister(&i->r.raid_attrs.ac);
+
+        kfree(i);
+}
+EXPORT_SYMBOL(raid_class_release);
+
+static __init int raid_init(void)
+{
+        return transport_class_register(&raid_class);
+}
+
+static __exit void raid_exit(void)
+{
+        transport_class_unregister(&raid_class);
+}
+
+MODULE_AUTHOR("James Bottomley");
+MODULE_DESCRIPTION("RAID device class");
+MODULE_LICENSE("GPL");
+
+module_init(raid_init);
+module_exit(raid_exit);
+
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
new file mode 100644
index 000000000000..f97e3afa97d9
--- /dev/null
+++ b/drivers/scsi/sata_mv.c
@@ -0,0 +1,843 @@
+/*
+ * sata_mv.c - Marvell SATA support
+ *
+ * Copyright 2005: EMC Corporation, all rights reserved. 
+ *
+ * Please ALWAYS copy linux-ide@vger.kernel.org on emails.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/sched.h>
+#include <linux/dma-mapping.h>
+#include "scsi.h"
+#include <scsi/scsi_host.h>
+#include <linux/libata.h>
+#include <asm/io.h>
+
+#define DRV_NAME        "sata_mv"
+#define DRV_VERSION     "0.12"
+
+enum {
+        /* BAR's are enumerated in terms of pci_resource_start() terms */
+        MV_PRIMARY_BAR          = 0,    /* offset 0x10: memory space */
+        MV_IO_BAR               = 2,    /* offset 0x18: IO space */
+        MV_MISC_BAR             = 3,    /* offset 0x1c: FLASH, NVRAM, SRAM */
+
+        MV_MAJOR_REG_AREA_SZ    = 0x10000,      /* 64KB */
+        MV_MINOR_REG_AREA_SZ    = 0x2000,       /* 8KB */
+
+        MV_PCI_REG_BASE         = 0,
+        MV_IRQ_COAL_REG_BASE    = 0x18000,      /* 6xxx part only */
+        MV_SATAHC0_REG_BASE     = 0x20000,
+
+        MV_PCI_REG_SZ           = MV_MAJOR_REG_AREA_SZ,
+        MV_SATAHC_REG_SZ        = MV_MAJOR_REG_AREA_SZ,
+        MV_SATAHC_ARBTR_REG_SZ  = MV_MINOR_REG_AREA_SZ,         /* arbiter */
+        MV_PORT_REG_SZ          = MV_MINOR_REG_AREA_SZ,
+
+        MV_Q_CT                 = 32,
+        MV_CRQB_SZ              = 32,
+        MV_CRPB_SZ              = 8,
+
+        MV_DMA_BOUNDARY         = 0xffffffffU,
+        SATAHC_MASK             = (~(MV_SATAHC_REG_SZ - 1)),
+
+        MV_PORTS_PER_HC         = 4,
+        /* == (port / MV_PORTS_PER_HC) to determine HC from 0-7 port */
+        MV_PORT_HC_SHIFT        = 2,
+        /* == (port % MV_PORTS_PER_HC) to determine port from 0-7 port */
+        MV_PORT_MASK            = 3,
+
+        /* Host Flags */
+        MV_FLAG_DUAL_HC         = (1 << 30),  /* two SATA Host Controllers */
+        MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
+        MV_FLAG_BDMA            = (1 << 28),  /* Basic DMA */
+
+        chip_504x               = 0,
+        chip_508x               = 1,
+        chip_604x               = 2,
+        chip_608x               = 3,
+
+        /* PCI interface registers */
+
+        PCI_MAIN_CMD_STS_OFS    = 0xd30,
+        STOP_PCI_MASTER         = (1 << 2),
+        PCI_MASTER_EMPTY        = (1 << 3),
+        GLOB_SFT_RST            = (1 << 4),
+
+        PCI_IRQ_CAUSE_OFS       = 0x1d58,
+        PCI_IRQ_MASK_OFS        = 0x1d5c,
+        PCI_UNMASK_ALL_IRQS     = 0x7fffff,     /* bits 22-0 */
+
+        HC_MAIN_IRQ_CAUSE_OFS   = 0x1d60,
+        HC_MAIN_IRQ_MASK_OFS    = 0x1d64,
+        PORT0_ERR               = (1 << 0),     /* shift by port # */
+        PORT0_DONE              = (1 << 1),     /* shift by port # */
+        HC0_IRQ_PEND            = 0x1ff,        /* bits 0-8 = HC0's ports */
+        HC_SHIFT                = 9,            /* bits 9-17 = HC1's ports */
+        PCI_ERR                 = (1 << 18),
+        TRAN_LO_DONE            = (1 << 19),    /* 6xxx: IRQ coalescing */
+        TRAN_HI_DONE            = (1 << 20),    /* 6xxx: IRQ coalescing */
+        PORTS_0_7_COAL_DONE     = (1 << 21),    /* 6xxx: IRQ coalescing */
+        GPIO_INT                = (1 << 22),
+        SELF_INT                = (1 << 23),
+        TWSI_INT                = (1 << 24),
+        HC_MAIN_RSVD            = (0x7f << 25), /* bits 31-25 */
+        HC_MAIN_MASKED_IRQS     = (TRAN_LO_DONE | TRAN_HI_DONE | 
+                                   PORTS_0_7_COAL_DONE | GPIO_INT | TWSI_INT |
+                                   HC_MAIN_RSVD),
+
+        /* SATAHC registers */
+        HC_CFG_OFS              = 0,
+
+        HC_IRQ_CAUSE_OFS        = 0x14,
+        CRBP_DMA_DONE           = (1 << 0),     /* shift by port # */
+        HC_IRQ_COAL             = (1 << 4),     /* IRQ coalescing */
+        DEV_IRQ                 = (1 << 8),     /* shift by port # */
+
+        /* Shadow block registers */
+        SHD_PIO_DATA_OFS        = 0x100,
+        SHD_FEA_ERR_OFS         = 0x104,
+        SHD_SECT_CNT_OFS        = 0x108,
+        SHD_LBA_L_OFS           = 0x10C,
+        SHD_LBA_M_OFS           = 0x110,
+        SHD_LBA_H_OFS           = 0x114,
+        SHD_DEV_HD_OFS          = 0x118,
+        SHD_CMD_STA_OFS         = 0x11C,
+        SHD_CTL_AST_OFS         = 0x120,
+
+        /* SATA registers */
+        SATA_STATUS_OFS         = 0x300,  /* ctrl, err regs follow status */
+        SATA_ACTIVE_OFS         = 0x350,
+
+        /* Port registers */
+        EDMA_CFG_OFS            = 0,
+
+        EDMA_ERR_IRQ_CAUSE_OFS  = 0x8,
+        EDMA_ERR_IRQ_MASK_OFS   = 0xc,
+        EDMA_ERR_D_PAR          = (1 << 0),
+        EDMA_ERR_PRD_PAR        = (1 << 1),
+        EDMA_ERR_DEV            = (1 << 2),
+        EDMA_ERR_DEV_DCON       = (1 << 3),
+        EDMA_ERR_DEV_CON        = (1 << 4),
+        EDMA_ERR_SERR           = (1 << 5),
+        EDMA_ERR_SELF_DIS       = (1 << 7),
+        EDMA_ERR_BIST_ASYNC     = (1 << 8),
+        EDMA_ERR_CRBQ_PAR       = (1 << 9),
+        EDMA_ERR_CRPB_PAR       = (1 << 10),
+        EDMA_ERR_INTRL_PAR      = (1 << 11),
+        EDMA_ERR_IORDY          = (1 << 12),
+        EDMA_ERR_LNK_CTRL_RX    = (0xf << 13),
+        EDMA_ERR_LNK_CTRL_RX_2  = (1 << 15),
+        EDMA_ERR_LNK_DATA_RX    = (0xf << 17),
+        EDMA_ERR_LNK_CTRL_TX    = (0x1f << 21),
+        EDMA_ERR_LNK_DATA_TX    = (0x1f << 26),
+        EDMA_ERR_TRANS_PROTO    = (1 << 31),
+        EDMA_ERR_FATAL          = (EDMA_ERR_D_PAR | EDMA_ERR_PRD_PAR | 
+                                   EDMA_ERR_DEV_DCON | EDMA_ERR_CRBQ_PAR |
+                                   EDMA_ERR_CRPB_PAR | EDMA_ERR_INTRL_PAR |
+                                   EDMA_ERR_IORDY | EDMA_ERR_LNK_CTRL_RX_2 | 
+                                   EDMA_ERR_LNK_DATA_RX |
+                                   EDMA_ERR_LNK_DATA_TX | 
+                                   EDMA_ERR_TRANS_PROTO),
+
+        EDMA_CMD_OFS            = 0x28,
+        EDMA_EN                 = (1 << 0),
+        EDMA_DS                 = (1 << 1),
+        ATA_RST                 = (1 << 2),
+
+        /* BDMA is 6xxx part only */
+        BDMA_CMD_OFS            = 0x224,
+        BDMA_START              = (1 << 0),
+
+        MV_UNDEF                = 0,
+};
+
+struct mv_port_priv {
+
+};
+
+struct mv_host_priv {
+
+};
+
+static void mv_irq_clear(struct ata_port *ap);
+static u32 mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in);
+static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val);
+static void mv_phy_reset(struct ata_port *ap);
+static int mv_master_reset(void __iomem *mmio_base);
+static irqreturn_t mv_interrupt(int irq, void *dev_instance,
+                                struct pt_regs *regs);
+static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
+
+static Scsi_Host_Template mv_sht = {
+        .module                 = THIS_MODULE,
+        .name                   = DRV_NAME,
+        .ioctl                  = ata_scsi_ioctl,
+        .queuecommand           = ata_scsi_queuecmd,
+        .eh_strategy_handler    = ata_scsi_error,
+        .can_queue              = ATA_DEF_QUEUE,
+        .this_id                = ATA_SHT_THIS_ID,
+        .sg_tablesize           = MV_UNDEF,
+        .max_sectors            = ATA_MAX_SECTORS,
+        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
+        .emulated               = ATA_SHT_EMULATED,
+        .use_clustering         = MV_UNDEF,
+        .proc_name              = DRV_NAME,
+        .dma_boundary           = MV_DMA_BOUNDARY,
+        .slave_configure        = ata_scsi_slave_config,
+        .bios_param             = ata_std_bios_param,
+        .ordered_flush          = 1,
+};
+
+static struct ata_port_operations mv_ops = {
+        .port_disable           = ata_port_disable,
+
+        .tf_load                = ata_tf_load,
+        .tf_read                = ata_tf_read,
+        .check_status           = ata_check_status,
+        .exec_command           = ata_exec_command,
+        .dev_select             = ata_std_dev_select,
+
+        .phy_reset              = mv_phy_reset,
+
+        .qc_prep                = ata_qc_prep,
+        .qc_issue               = ata_qc_issue_prot,
+
+        .eng_timeout            = ata_eng_timeout,
+
+        .irq_handler            = mv_interrupt,
+        .irq_clear              = mv_irq_clear,
+
+        .scr_read               = mv_scr_read,
+        .scr_write              = mv_scr_write,
+
+        .port_start             = ata_port_start,
+        .port_stop              = ata_port_stop,
+        .host_stop              = ata_host_stop,
+};
+
+static struct ata_port_info mv_port_info[] = {
+        {  /* chip_504x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+        {  /* chip_508x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO | 
+                                   MV_FLAG_DUAL_HC),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+        {  /* chip_604x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO | 
+                                   MV_FLAG_IRQ_COALESCE | MV_FLAG_BDMA),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+        {  /* chip_608x */
+                .sht            = &mv_sht,
+                .host_flags     = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
+                                   MV_FLAG_IRQ_COALESCE | MV_FLAG_DUAL_HC |
+                                   MV_FLAG_BDMA),
+                .pio_mask       = 0x1f, /* pio4-0 */
+                .udma_mask      = 0,    /* 0x7f (udma6-0 disabled for now) */
+                .port_ops       = &mv_ops,
+        },
+};
+
+static struct pci_device_id mv_pci_tbl[] = {
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5040), 0, 0, chip_504x},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5041), 0, 0, chip_504x},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5080), 0, 0, chip_508x},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5081), 0, 0, chip_508x},
+
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6040), 0, 0, chip_604x},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6041), 0, 0, chip_604x},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6080), 0, 0, chip_608x},
+        {PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x6081), 0, 0, chip_608x},
+        {}                      /* terminate list */
+};
+
+static struct pci_driver mv_pci_driver = {
+        .name                   = DRV_NAME,
+        .id_table               = mv_pci_tbl,
+        .probe                  = mv_init_one,
+        .remove                 = ata_pci_remove_one,
+};
+
+/*
+ * Functions
+ */
+
+static inline void writelfl(unsigned long data, void __iomem *addr)
+{
+        writel(data, addr);
+        (void) readl(addr);     /* flush to avoid PCI posted write */
+}
+
+static inline void __iomem *mv_port_addr_to_hc_base(void __iomem *port_mmio)
+{
+        return ((void __iomem *)((unsigned long)port_mmio & 
+                                 (unsigned long)SATAHC_MASK));
+}
+
+static inline void __iomem *mv_hc_base(void __iomem *base, unsigned int hc)
+{
+        return (base + MV_SATAHC0_REG_BASE + (hc * MV_SATAHC_REG_SZ));
+}
+
+static inline void __iomem *mv_port_base(void __iomem *base, unsigned int port)
+{
+        return (mv_hc_base(base, port >> MV_PORT_HC_SHIFT) +
+                MV_SATAHC_ARBTR_REG_SZ + 
+                ((port & MV_PORT_MASK) * MV_PORT_REG_SZ));
+}
+
+static inline void __iomem *mv_ap_base(struct ata_port *ap)
+{
+        return mv_port_base(ap->host_set->mmio_base, ap->port_no);
+}
+
+static inline int mv_get_hc_count(unsigned long flags)
+{
+        return ((flags & MV_FLAG_DUAL_HC) ? 2 : 1);
+}
+
+static inline int mv_is_edma_active(struct ata_port *ap)
+{
+        void __iomem *port_mmio = mv_ap_base(ap);
+        return (EDMA_EN & readl(port_mmio + EDMA_CMD_OFS));
+}
+
+static inline int mv_port_bdma_capable(struct ata_port *ap)
+{
+        return (ap->flags & MV_FLAG_BDMA);
+}
+
+static void mv_irq_clear(struct ata_port *ap)
+{
+}
+
+static unsigned int mv_scr_offset(unsigned int sc_reg_in)
+{
+        unsigned int ofs;
+
+        switch (sc_reg_in) {
+        case SCR_STATUS:
+        case SCR_CONTROL:
+        case SCR_ERROR:
+                ofs = SATA_STATUS_OFS + (sc_reg_in * sizeof(u32));
+                break;
+        case SCR_ACTIVE:
+                ofs = SATA_ACTIVE_OFS;   /* active is not with the others */
+                break;
+        default:
+                ofs = 0xffffffffU;
+                break;
+        }
+        return ofs;
+}
+
+static u32 mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in)
+{
+        unsigned int ofs = mv_scr_offset(sc_reg_in);
+
+        if (0xffffffffU != ofs) {
+                return readl(mv_ap_base(ap) + ofs);
+        } else {
+                return (u32) ofs;
+        }
+}
+
+static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val)
+{
+        unsigned int ofs = mv_scr_offset(sc_reg_in);
+
+        if (0xffffffffU != ofs) {
+                writelfl(val, mv_ap_base(ap) + ofs);
+        }
+}
+
+static int mv_master_reset(void __iomem *mmio_base)
+{
+        void __iomem *reg = mmio_base + PCI_MAIN_CMD_STS_OFS;
+        int i, rc = 0;
+        u32 t;
+
+        VPRINTK("ENTER\n");
+
+        /* Following procedure defined in PCI "main command and status
+         * register" table.
+         */
+        t = readl(reg);
+        writel(t | STOP_PCI_MASTER, reg);
+
+        for (i = 0; i < 100; i++) {
+                msleep(10);
+                t = readl(reg);
+                if (PCI_MASTER_EMPTY & t) {
+                        break;
+                }
+        }
+        if (!(PCI_MASTER_EMPTY & t)) {
+                printk(KERN_ERR DRV_NAME "PCI master won't flush\n");
+                rc = 1;         /* broken HW? */
+                goto done;
+        }
+
+        /* set reset */
+        i = 5;
+        do {
+                writel(t | GLOB_SFT_RST, reg);
+                t = readl(reg);
+                udelay(1);
+        } while (!(GLOB_SFT_RST & t) && (i-- > 0));
+
+        if (!(GLOB_SFT_RST & t)) {
+                printk(KERN_ERR DRV_NAME "can't set global reset\n");
+                rc = 1;         /* broken HW? */
+                goto done;
+        }
+
+        /* clear reset */
+        i = 5;
+        do {
+                writel(t & ~GLOB_SFT_RST, reg);
+                t = readl(reg);
+                udelay(1);
+        } while ((GLOB_SFT_RST & t) && (i-- > 0));
+
+        if (GLOB_SFT_RST & t) {
+                printk(KERN_ERR DRV_NAME "can't clear global reset\n");
+                rc = 1;         /* broken HW? */
+        }
+
+ done:
+        VPRINTK("EXIT, rc = %i\n", rc);
+        return rc;
+}
+
+static void mv_err_intr(struct ata_port *ap)
+{
+        void __iomem *port_mmio;
+        u32 edma_err_cause, serr = 0;
+
+        /* bug here b/c we got an err int on a port we don't know about,
+         * so there's no way to clear it
+         */
+        BUG_ON(NULL == ap);
+        port_mmio = mv_ap_base(ap);
+
+        edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
+
+        if (EDMA_ERR_SERR & edma_err_cause) {
+                serr = scr_read(ap, SCR_ERROR);
+                scr_write_flush(ap, SCR_ERROR, serr);
+        }
+        DPRINTK("port %u error; EDMA err cause: 0x%08x SERR: 0x%08x\n", 
+                ap->port_no, edma_err_cause, serr);
+
+        /* Clear EDMA now that SERR cleanup done */
+        writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
+
+        /* check for fatal here and recover if needed */
+        if (EDMA_ERR_FATAL & edma_err_cause) {
+                mv_phy_reset(ap);
+        }
+}
+
+/* Handle any outstanding interrupts in a single SATAHC 
+ */
+static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
+                         unsigned int hc)
+{
+        void __iomem *mmio = host_set->mmio_base;
+        void __iomem *hc_mmio = mv_hc_base(mmio, hc);
+        struct ata_port *ap;
+        struct ata_queued_cmd *qc;
+        u32 hc_irq_cause;
+        int shift, port, port0, hard_port;
+        u8 ata_status;
+
+        if (hc == 0) {
+                port0 = 0;
+        } else {
+                port0 = MV_PORTS_PER_HC;
+        }
+
+        /* we'll need the HC success int register in most cases */
+        hc_irq_cause = readl(hc_mmio + HC_IRQ_CAUSE_OFS);
+        if (hc_irq_cause) {
+                writelfl(0, hc_mmio + HC_IRQ_CAUSE_OFS);
+        }
+
+        VPRINTK("ENTER, hc%u relevant=0x%08x HC IRQ cause=0x%08x\n",
+                hc,relevant,hc_irq_cause);
+
+        for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) {
+                ap = host_set->ports[port];
+                hard_port = port & MV_PORT_MASK;        /* range 0-3 */
+                ata_status = 0xffU;
+
+                if (((CRBP_DMA_DONE | DEV_IRQ) << hard_port) & hc_irq_cause) {
+                        BUG_ON(NULL == ap);
+                        /* rcv'd new resp, basic DMA complete, or ATA IRQ */
+                        /* This is needed to clear the ATA INTRQ.
+                         * FIXME: don't read the status reg in EDMA mode!
+                         */
+                        ata_status = readb((void __iomem *)
+                                           ap->ioaddr.status_addr);
+                }
+
+                shift = port * 2;
+                if (port >= MV_PORTS_PER_HC) {
+                        shift++;        /* skip bit 8 in the HC Main IRQ reg */
+                }
+                if ((PORT0_ERR << shift) & relevant) {
+                        mv_err_intr(ap);
+                        /* FIXME: smart to OR in ATA_ERR? */
+                        ata_status = readb((void __iomem *)
+                                           ap->ioaddr.status_addr) | ATA_ERR;
+                }
+                
+                if (ap) {
+                        qc = ata_qc_from_tag(ap, ap->active_tag);
+                        if (NULL != qc) {
+                                VPRINTK("port %u IRQ found for qc, "
+                                        "ata_status 0x%x\n", port,ata_status);
+                                BUG_ON(0xffU == ata_status);
+                                /* mark qc status appropriately */
+                                ata_qc_complete(qc, ata_status);
+                        }
+                }
+        }
+        VPRINTK("EXIT\n");
+}
+
+static irqreturn_t mv_interrupt(int irq, void *dev_instance,
+                                struct pt_regs *regs)
+{
+        struct ata_host_set *host_set = dev_instance;
+        unsigned int hc, handled = 0, n_hcs;
+        void __iomem *mmio;
+        u32 irq_stat;
+
+        mmio = host_set->mmio_base;
+        irq_stat = readl(mmio + HC_MAIN_IRQ_CAUSE_OFS);
+        n_hcs = mv_get_hc_count(host_set->ports[0]->flags);
+
+        /* check the cases where we either have nothing pending or have read
+         * a bogus register value which can indicate HW removal or PCI fault
+         */
+        if (!irq_stat || (0xffffffffU == irq_stat)) {
+                return IRQ_NONE;
+        }
+
+        spin_lock(&host_set->lock);
+
+        for (hc = 0; hc < n_hcs; hc++) {
+                u32 relevant = irq_stat & (HC0_IRQ_PEND << (hc * HC_SHIFT));
+                if (relevant) {
+                        mv_host_intr(host_set, relevant, hc);
+                        handled = 1;
+                }
+        }
+        if (PCI_ERR & irq_stat) {
+                /* FIXME: these are all masked by default, but still need
+                 * to recover from them properly.
+                 */
+        }
+
+        spin_unlock(&host_set->lock);
+
+        return IRQ_RETVAL(handled);
+}
+
+static void mv_phy_reset(struct ata_port *ap)
+{
+        void __iomem *port_mmio = mv_ap_base(ap);
+        struct ata_taskfile tf;
+        struct ata_device *dev = &ap->device[0];
+        u32 edma = 0, bdma;
+
+        VPRINTK("ENTER, port %u, mmio 0x%p\n", ap->port_no, port_mmio);
+
+        edma = readl(port_mmio + EDMA_CMD_OFS);
+        if (EDMA_EN & edma) {
+                /* disable EDMA if active */
+                edma &= ~EDMA_EN;
+                writelfl(edma | EDMA_DS, port_mmio + EDMA_CMD_OFS);
+                udelay(1);
+        } else if (mv_port_bdma_capable(ap) &&
+                   (bdma = readl(port_mmio + BDMA_CMD_OFS)) & BDMA_START) {
+                /* disable BDMA if active */
+                writelfl(bdma & ~BDMA_START, port_mmio + BDMA_CMD_OFS);
+        }
+
+        writelfl(edma | ATA_RST, port_mmio + EDMA_CMD_OFS);
+        udelay(25);             /* allow reset propagation */
+
+        /* Spec never mentions clearing the bit.  Marvell's driver does
+         * clear the bit, however.
+         */
+        writelfl(edma & ~ATA_RST, port_mmio + EDMA_CMD_OFS);
+
+        VPRINTK("Done.  Now calling __sata_phy_reset()\n");
+
+        /* proceed to init communications via the scr_control reg */
+        __sata_phy_reset(ap);
+
+        if (ap->flags & ATA_FLAG_PORT_DISABLED) {
+                VPRINTK("Port disabled pre-sig.  Exiting.\n");
+                return;
+        }
+
+        tf.lbah = readb((void __iomem *) ap->ioaddr.lbah_addr);
+        tf.lbam = readb((void __iomem *) ap->ioaddr.lbam_addr);
+        tf.lbal = readb((void __iomem *) ap->ioaddr.lbal_addr);
+        tf.nsect = readb((void __iomem *) ap->ioaddr.nsect_addr);
+
+        dev->class = ata_dev_classify(&tf);
+        if (!ata_dev_present(dev)) {
+                VPRINTK("Port disabled post-sig: No device present.\n");
+                ata_port_disable(ap);
+        }
+        VPRINTK("EXIT\n");
+}
+
+static void mv_port_init(struct ata_ioports *port, unsigned long base)
+{
+        /* PIO related setup */
+        port->data_addr = base + SHD_PIO_DATA_OFS;
+        port->error_addr = port->feature_addr = base + SHD_FEA_ERR_OFS;
+        port->nsect_addr = base + SHD_SECT_CNT_OFS;
+        port->lbal_addr = base + SHD_LBA_L_OFS;
+        port->lbam_addr = base + SHD_LBA_M_OFS;
+        port->lbah_addr = base + SHD_LBA_H_OFS;
+        port->device_addr = base + SHD_DEV_HD_OFS;
+        port->status_addr = port->command_addr = base + SHD_CMD_STA_OFS;
+        port->altstatus_addr = port->ctl_addr = base + SHD_CTL_AST_OFS;
+        /* unused */
+        port->cmd_addr = port->bmdma_addr = port->scr_addr = 0;
+
+        /* unmask all EDMA error interrupts */
+        writel(~0, (void __iomem *)base + EDMA_ERR_IRQ_MASK_OFS);
+
+        VPRINTK("EDMA cfg=0x%08x EDMA IRQ err cause/mask=0x%08x/0x%08x\n", 
+                readl((void __iomem *)base + EDMA_CFG_OFS),
+                readl((void __iomem *)base + EDMA_ERR_IRQ_CAUSE_OFS),
+                readl((void __iomem *)base + EDMA_ERR_IRQ_MASK_OFS));
+}
+
+static int mv_host_init(struct ata_probe_ent *probe_ent)
+{
+        int rc = 0, n_hc, port, hc;
+        void __iomem *mmio = probe_ent->mmio_base;
+        void __iomem *port_mmio;
+
+        if (mv_master_reset(probe_ent->mmio_base)) {
+                rc = 1;
+                goto done;
+        }
+
+        n_hc = mv_get_hc_count(probe_ent->host_flags);
+        probe_ent->n_ports = MV_PORTS_PER_HC * n_hc;
+
+        for (port = 0; port < probe_ent->n_ports; port++) {
+                port_mmio = mv_port_base(mmio, port);
+                mv_port_init(&probe_ent->port[port], (unsigned long)port_mmio);
+        }
+
+        for (hc = 0; hc < n_hc; hc++) {
+                VPRINTK("HC%i: HC config=0x%08x HC IRQ cause=0x%08x\n", hc,
+                        readl(mv_hc_base(mmio, hc) + HC_CFG_OFS),
+                        readl(mv_hc_base(mmio, hc) + HC_IRQ_CAUSE_OFS));
+        }
+
+        writel(~HC_MAIN_MASKED_IRQS, mmio + HC_MAIN_IRQ_MASK_OFS);
+        writel(PCI_UNMASK_ALL_IRQS, mmio + PCI_IRQ_MASK_OFS);
+
+        VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x "
+                "PCI int cause/mask=0x%08x/0x%08x\n", 
+                readl(mmio + HC_MAIN_IRQ_CAUSE_OFS),
+                readl(mmio + HC_MAIN_IRQ_MASK_OFS),
+                readl(mmio + PCI_IRQ_CAUSE_OFS),
+                readl(mmio + PCI_IRQ_MASK_OFS));
+
+ done:
+        return rc;
+}
+
+/* move to PCI layer, integrate w/ MSI stuff */
+static void pci_intx(struct pci_dev *pdev, int enable)
+{
+        u16 pci_command, new;
+
+        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
+
+        if (enable)
+                new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
+        else
+                new = pci_command | PCI_COMMAND_INTX_DISABLE;
+
+        if (new != pci_command)
+                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
+}
+
+static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+        static int printed_version = 0;
+        struct ata_probe_ent *probe_ent = NULL;
+        struct mv_host_priv *hpriv;
+        unsigned int board_idx = (unsigned int)ent->driver_data;
+        void __iomem *mmio_base;
+        int pci_dev_busy = 0;
+        int rc;
+
+        if (!printed_version++) {
+                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+        }
+
+        VPRINTK("ENTER for PCI Bus:Slot.Func=%u:%u.%u\n", pdev->bus->number,
+                PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
+
+        rc = pci_enable_device(pdev);
+        if (rc) {
+                return rc;
+        }
+
+        rc = pci_request_regions(pdev, DRV_NAME);
+        if (rc) {
+                pci_dev_busy = 1;
+                goto err_out;
+        }
+
+        pci_intx(pdev, 1);
+
+        probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
+        if (probe_ent == NULL) {
+                rc = -ENOMEM;
+                goto err_out_regions;
+        }
+
+        memset(probe_ent, 0, sizeof(*probe_ent));
+        probe_ent->dev = pci_dev_to_dev(pdev);
+        INIT_LIST_HEAD(&probe_ent->node);
+
+        mmio_base = ioremap_nocache(pci_resource_start(pdev, MV_PRIMARY_BAR),
+                                    pci_resource_len(pdev, MV_PRIMARY_BAR));
+        if (mmio_base == NULL) {
+                rc = -ENOMEM;
+                goto err_out_free_ent;
+        }
+
+        hpriv = kmalloc(sizeof(*hpriv), GFP_KERNEL);
+        if (!hpriv) {
+                rc = -ENOMEM;
+                goto err_out_iounmap;
+        }
+        memset(hpriv, 0, sizeof(*hpriv));
+
+        probe_ent->sht = mv_port_info[board_idx].sht;
+        probe_ent->host_flags = mv_port_info[board_idx].host_flags;
+        probe_ent->pio_mask = mv_port_info[board_idx].pio_mask;
+        probe_ent->udma_mask = mv_port_info[board_idx].udma_mask;
+        probe_ent->port_ops = mv_port_info[board_idx].port_ops;
+
+        probe_ent->irq = pdev->irq;
+        probe_ent->irq_flags = SA_SHIRQ;
+        probe_ent->mmio_base = mmio_base;
+        probe_ent->private_data = hpriv;
+
+        /* initialize adapter */
+        rc = mv_host_init(probe_ent);
+        if (rc) {
+                goto err_out_hpriv;
+        }
+/*      mv_print_info(probe_ent); */
+
+        {
+                int b, w;
+                u32 dw[4];      /* hold a line of 16b */
+                VPRINTK("PCI config space:\n");
+                for (b = 0; b < 0x40; ) {
+                        for (w = 0; w < 4; w++) {
+                                (void) pci_read_config_dword(pdev,b,&dw[w]);
+                                b += sizeof(*dw);
+                        }
+                        VPRINTK("%08x %08x %08x %08x\n",
+                                dw[0],dw[1],dw[2],dw[3]);
+                }
+        }
+
+        /* FIXME: check ata_device_add return value */
+        ata_device_add(probe_ent);
+        kfree(probe_ent);
+
+        return 0;
+
+ err_out_hpriv:
+        kfree(hpriv);
+ err_out_iounmap:
+        iounmap(mmio_base);
+ err_out_free_ent:
+        kfree(probe_ent);
+ err_out_regions:
+        pci_release_regions(pdev);
+ err_out:
+        if (!pci_dev_busy) {
+                pci_disable_device(pdev);
+        }
+
+        return rc;
+}
+
+static int __init mv_init(void)
+{
+        return pci_module_init(&mv_pci_driver);
+}
+
+static void __exit mv_exit(void)
+{
+        pci_unregister_driver(&mv_pci_driver);
+}
+
+MODULE_AUTHOR("Brett Russ");
+MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
+
+module_init(mv_init);
+module_exit(mv_exit);
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 03d9bc6e69df..a1d62dee3be6 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -351,6 +351,7 @@ static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 static void nv_host_stop (struct ata_host_set *host_set)
 {
         struct nv_host *host = host_set->private_data;
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
 
         // Disable hotplug event interrupts.
         if (host->host_desc->disable_hotplug)
@@ -358,7 +359,8 @@ static void nv_host_stop (struct ata_host_set *host_set)
 
         kfree(host);
 
-        ata_host_stop(host_set);
+        if (host_set->mmio_base)
+                pci_iounmap(pdev, host_set->mmio_base);
 }
 
 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -420,8 +422,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO) {
                 unsigned long base;
 
-                probe_ent->mmio_base = ioremap(pci_resource_start(pdev, 5),
-                                pci_resource_len(pdev, 5));
+                probe_ent->mmio_base = pci_iomap(pdev, 5, 0);
                 if (probe_ent->mmio_base == NULL) {
                         rc = -EIO;
                         goto err_out_free_host;
@@ -457,7 +458,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
 err_out_iounmap:
         if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO)
-                iounmap(probe_ent->mmio_base);
+                pci_iounmap(pdev, probe_ent->mmio_base);
 err_out_free_host:
         kfree(host);
 err_out_free_ent:
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 7c4f6ecc1cc9..538ad727bd2e 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -92,6 +92,7 @@ static void pdc_exec_command_mmio(struct ata_port *ap, struct ata_taskfile *tf);
 static void pdc_irq_clear(struct ata_port *ap);
 static int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
 
+
 static Scsi_Host_Template pdc_ata_sht = {
         .module                 = THIS_MODULE,
         .name                   = DRV_NAME,
@@ -132,7 +133,7 @@ static struct ata_port_operations pdc_sata_ops = {
         .scr_write              = pdc_sata_scr_write,
         .port_start             = pdc_port_start,
         .port_stop              = pdc_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static struct ata_port_operations pdc_pata_ops = {
@@ -153,7 +154,7 @@ static struct ata_port_operations pdc_pata_ops = {
 
         .port_start             = pdc_port_start,
         .port_stop              = pdc_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static struct ata_port_info pdc_port_info[] = {
@@ -282,7 +283,7 @@ static void pdc_port_stop(struct ata_port *ap)
 
 static void pdc_reset_port(struct ata_port *ap)
 {
-        void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT;
+        void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT;
         unsigned int i;
         u32 tmp;
 
@@ -418,7 +419,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap,
         u8 status;
         unsigned int handled = 0, have_err = 0;
         u32 tmp;
-        void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;
+        void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;
 
         tmp = readl(mmio);
         if (tmp & PDC_ERR_MASK) {
@@ -447,7 +448,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap,
 static void pdc_irq_clear(struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
 
         readl(mmio + PDC_INT_SEQMASK);
 }
@@ -459,7 +460,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r
         u32 mask = 0;
         unsigned int i, tmp;
         unsigned int handled = 0;
-        void *mmio_base;
+        void __iomem *mmio_base;
 
         VPRINTK("ENTER\n");
 
@@ -581,7 +582,7 @@ static void pdc_ata_setup_port(struct ata_ioports *port, unsigned long base)
 
 static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
 {
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         u32 tmp;
 
         /*
@@ -624,7 +625,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         unsigned int board_idx = (unsigned int) ent->driver_data;
         int pci_dev_busy = 0;
         int rc;
@@ -663,8 +664,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 3),
-                            pci_resource_len(pdev, 3));
+        mmio_base = pci_iomap(pdev, 3, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 9c99ab433bd3..ffcdeb68641c 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -494,7 +494,7 @@ static int qs_port_start(struct ata_port *ap)
         if (rc)
                 return rc;
         qs_enter_reg_mode(ap);
-        pp = kcalloc(1, sizeof(*pp), GFP_KERNEL);
+        pp = kzalloc(sizeof(*pp), GFP_KERNEL);
         if (!pp) {
                 rc = -ENOMEM;
                 goto err_out;
@@ -538,11 +538,12 @@ static void qs_port_stop(struct ata_port *ap)
 static void qs_host_stop(struct ata_host_set *host_set)
 {
         void __iomem *mmio_base = host_set->mmio_base;
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
 
         writeb(0, mmio_base + QS_HCT_CTRL); /* disable host interrupts */
         writeb(QS_CNFG3_GSRST, mmio_base + QS_HCF_CNFG3); /* global reset */
 
-        ata_host_stop(host_set);
+        pci_iounmap(pdev, mmio_base);
 }
 
 static void qs_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
@@ -646,8 +647,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
                 goto err_out_regions;
         }
 
-        mmio_base = ioremap(pci_resource_start(pdev, 4),
-                            pci_resource_len(pdev, 4));
+        mmio_base = pci_iomap(pdev, 4, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_regions;
@@ -697,7 +697,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
         return 0;
 
 err_out_iounmap:
-        iounmap(mmio_base);
+        pci_iounmap(pdev, mmio_base);
 err_out_regions:
         pci_release_regions(pdev);
 err_out:
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 71d49548f0a3..ba98a175ee3a 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -86,6 +86,7 @@ static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void sil_post_set_mode (struct ata_port *ap);
 
+
 static struct pci_device_id sil_pci_tbl[] = {
         { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
         { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },
@@ -172,7 +173,7 @@ static struct ata_port_operations sil_ops = {
         .scr_write              = sil_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static struct ata_port_info sil_port_info[] = {
@@ -231,6 +232,7 @@ MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, sil_pci_tbl);
 MODULE_VERSION(DRV_VERSION);
 
+
 static unsigned char sil_get_device_cache_line(struct pci_dev *pdev)
 {
         u8 cache_line = 0;
@@ -242,7 +244,8 @@ static void sil_post_set_mode (struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
         struct ata_device *dev;
-        void *addr = host_set->mmio_base + sil_port[ap->port_no].xfer_mode;
+        void __iomem *addr =
+                host_set->mmio_base + sil_port[ap->port_no].xfer_mode;
         u32 tmp, dev_mode[2];
         unsigned int i;
 
@@ -375,7 +378,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         int rc;
         unsigned int i;
         int pci_dev_busy = 0;
@@ -425,8 +428,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         probe_ent->irq_flags = SA_SHIRQ;
         probe_ent->host_flags = sil_port_info[ent->driver_data].host_flags;
 
-        mmio_base = ioremap(pci_resource_start(pdev, 5),
-                            pci_resource_len(pdev, 5));
+        mmio_base = pci_iomap(pdev, 5, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 19d3bb3b0fb6..d89d968bedac 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -318,7 +318,7 @@ static struct ata_port_operations k2_sata_ops = {
         .scr_write              = k2_sata_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base)
@@ -346,7 +346,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base;
+        void __iomem *mmio_base;
         int pci_dev_busy = 0;
         int rc;
         int i;
@@ -392,8 +392,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 5),
-                            pci_resource_len(pdev, 5));
+        mmio_base = pci_iomap(pdev, 5, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index c72fcc46f0fa..540a85191172 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -245,13 +245,14 @@ static struct pci_driver pdc_sata_pci_driver = {
 
 static void pdc20621_host_stop(struct ata_host_set *host_set)
 {
+        struct pci_dev *pdev = to_pci_dev(host_set->dev);
         struct pdc_host_priv *hpriv = host_set->private_data;
         void *dimm_mmio = hpriv->dimm_mmio;
 
-        iounmap(dimm_mmio);
+        pci_iounmap(pdev, dimm_mmio);
         kfree(hpriv);
 
-        ata_host_stop(host_set);
+        pci_iounmap(pdev, host_set->mmio_base);
 }
 
 static int pdc_port_start(struct ata_port *ap)
@@ -451,9 +452,9 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)
         struct scatterlist *sg = qc->sg;
         struct ata_port *ap = qc->ap;
         struct pdc_port_priv *pp = ap->private_data;
-        void *mmio = ap->host_set->mmio_base;
+        void __iomem *mmio = ap->host_set->mmio_base;
         struct pdc_host_priv *hpriv = ap->host_set->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
         unsigned int portno = ap->port_no;
         unsigned int i, last, idx, total_len = 0, sgt_len;
         u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ];
@@ -513,9 +514,9 @@ static void pdc20621_nodata_prep(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct pdc_port_priv *pp = ap->private_data;
-        void *mmio = ap->host_set->mmio_base;
+        void __iomem *mmio = ap->host_set->mmio_base;
         struct pdc_host_priv *hpriv = ap->host_set->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
         unsigned int portno = ap->port_no;
         unsigned int i;
 
@@ -565,7 +566,7 @@ static void __pdc20621_push_hdma(struct ata_queued_cmd *qc,
 {
         struct ata_port *ap = qc->ap;
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -639,7 +640,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)
         struct ata_port *ap = qc->ap;
         struct ata_host_set *host_set = ap->host_set;
         unsigned int port_no = ap->port_no;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
         unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE);
         u8 seq = (u8) (port_no + 1);
         unsigned int port_ofs;
@@ -699,7 +700,7 @@ static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc)
 static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
                                           struct ata_queued_cmd *qc,
                                           unsigned int doing_hdma,
-                                          void *mmio)
+                                          void __iomem *mmio)
 {
         unsigned int port_no = ap->port_no;
         unsigned int port_ofs =
@@ -778,7 +779,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
 static void pdc20621_irq_clear(struct ata_port *ap)
 {
         struct ata_host_set *host_set = ap->host_set;
-        void *mmio = host_set->mmio_base;
+        void __iomem *mmio = host_set->mmio_base;
 
         mmio += PDC_CHIP0_OFS;
 
@@ -792,7 +793,7 @@ static irqreturn_t pdc20621_interrupt (int irq, void *dev_instance, struct pt_re
         u32 mask = 0;
         unsigned int i, tmp, port_no;
         unsigned int handled = 0;
-        void *mmio_base;
+        void __iomem *mmio_base;
 
         VPRINTK("ENTER\n");
 
@@ -940,9 +941,9 @@ static void pdc20621_get_from_dimm(struct ata_probe_ent *pe, void *psource,
         u16 idx;
         u8 page_mask;
         long dist;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         struct pdc_host_priv *hpriv = pe->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -996,9 +997,9 @@ static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, void *psource,
         u16 idx;
         u8 page_mask;
         long dist;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         struct pdc_host_priv *hpriv = pe->private_data;
-        void *dimm_mmio = hpriv->dimm_mmio;
+        void __iomem *dimm_mmio = hpriv->dimm_mmio;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1044,7 +1045,7 @@ static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, void *psource,
 static unsigned int pdc20621_i2c_read(struct ata_probe_ent *pe, u32 device,
                                       u32 subaddr, u32 *pdata)
 {
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         u32 i2creg  = 0;
         u32 status;
         u32 count =0;
@@ -1103,7 +1104,7 @@ static int pdc20621_prog_dimm0(struct ata_probe_ent *pe)
         u32 data = 0;
         int size, i;
         u8 bdimmsize;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
         static const struct {
                 unsigned int reg;
                 unsigned int ofs;
@@ -1166,7 +1167,7 @@ static unsigned int pdc20621_prog_dimm_global(struct ata_probe_ent *pe)
 {
         u32 data, spd0;
         int error, i;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1220,7 +1221,7 @@ static unsigned int pdc20621_dimm_init(struct ata_probe_ent *pe)
         u32 ticks=0;
         u32 clock=0;
         u32 fparam=0;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1344,7 +1345,7 @@ static unsigned int pdc20621_dimm_init(struct ata_probe_ent *pe)
 static void pdc_20621_init(struct ata_probe_ent *pe)
 {
         u32 tmp;
-        void *mmio = pe->mmio_base;
+        void __iomem *mmio = pe->mmio_base;
 
         /* hard-code chip #0 */
         mmio += PDC_CHIP0_OFS;
@@ -1377,7 +1378,8 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
         static int printed_version;
         struct ata_probe_ent *probe_ent = NULL;
         unsigned long base;
-        void *mmio_base, *dimm_mmio = NULL;
+        void __iomem *mmio_base;
+        void __iomem *dimm_mmio = NULL;
         struct pdc_host_priv *hpriv = NULL;
         unsigned int board_idx = (unsigned int) ent->driver_data;
         int pci_dev_busy = 0;
@@ -1417,8 +1419,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 3),
-                            pci_resource_len(pdev, 3));
+        mmio_base = pci_iomap(pdev, 3, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
@@ -1432,8 +1433,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
         }
         memset(hpriv, 0, sizeof(*hpriv));
 
-        dimm_mmio = ioremap(pci_resource_start(pdev, 4),
-                            pci_resource_len(pdev, 4));
+        dimm_mmio = pci_iomap(pdev, 4, 0);
         if (!dimm_mmio) {
                 kfree(hpriv);
                 rc = -ENOMEM;
@@ -1480,9 +1480,9 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
 
 err_out_iounmap_dimm:           /* only get to this label if 20621 */
         kfree(hpriv);
-        iounmap(dimm_mmio);
+        pci_iounmap(pdev, dimm_mmio);
 err_out_iounmap:
-        iounmap(mmio_base);
+        pci_iounmap(pdev, mmio_base);
 err_out_free_ent:
         kfree(probe_ent);
 err_out_regions:
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 1566886815fb..42e13ed8eb5b 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -125,8 +125,8 @@ static struct ata_port_info uli_port_info = {
         .sht            = &uli_sht,
         .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |
                           ATA_FLAG_NO_LEGACY,
-        .pio_mask       = 0x03,         //support pio mode 4 (FIXME)
-        .udma_mask      = 0x7f,         //support udma mode 6
+        .pio_mask       = 0x1f,         /* pio0-4 */
+        .udma_mask      = 0x7f,         /* udma0-6 */
         .port_ops       = &uli_ops,
 };
 
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 3985f344da4d..cf94e0158a8d 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -252,7 +252,7 @@ static struct ata_port_operations vsc_sata_ops = {
         .scr_write              = vsc_sata_scr_write,
         .port_start             = ata_port_start,
         .port_stop              = ata_port_stop,
-        .host_stop              = ata_host_stop,
+        .host_stop              = ata_pci_host_stop,
 };
 
 static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base)
@@ -326,8 +326,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d
         probe_ent->dev = pci_dev_to_dev(pdev);
         INIT_LIST_HEAD(&probe_ent->node);
 
-        mmio_base = ioremap(pci_resource_start(pdev, 0),
-                            pci_resource_len(pdev, 0));
+        mmio_base = pci_iomap(pdev, 0, 0);
         if (mmio_base == NULL) {
                 rc = -ENOMEM;
                 goto err_out_free_ent;
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index d14523d7e449..a780546eda9c 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -268,6 +268,7 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, int gfp_mask)
         } else
                 put_device(&dev->sdev_gendev);
 
+        cmd->jiffies_at_alloc = jiffies;
         return cmd;
 }                               
 EXPORT_SYMBOL(scsi_get_command);
@@ -627,7 +628,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
         spin_lock_irqsave(host->host_lock, flags);
         scsi_cmd_get_serial(host, cmd); 
 
-        if (unlikely(test_bit(SHOST_CANCEL, &host->shost_state))) {
+        if (unlikely(host->shost_state == SHOST_DEL)) {
                 cmd->result = (DID_NO_CONNECT << 16);
                 scsi_done(cmd);
         } else {
@@ -798,9 +799,23 @@ static void scsi_softirq(struct softirq_action *h)
         while (!list_empty(&local_q)) {
                 struct scsi_cmnd *cmd = list_entry(local_q.next,
                                                    struct scsi_cmnd, eh_entry);
+                /* The longest time any command should be outstanding is the
+                 * per command timeout multiplied by the number of retries.
+                 *
+                 * For a typical command, this is 2.5 minutes */
+                unsigned long wait_for 
+                        = cmd->allowed * cmd->timeout_per_command;
                 list_del_init(&cmd->eh_entry);
 
                 disposition = scsi_decide_disposition(cmd);
+                if (disposition != SUCCESS &&
+                    time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) {
+                        dev_printk(KERN_ERR, &cmd->device->sdev_gendev, 
+                                   "timing out command, waited %lus\n",
+                                   wait_for/HZ);
+                        disposition = SUCCESS;
+                }
+                        
                 scsi_log_completion(cmd, disposition);
                 switch (disposition) {
                 case SUCCESS:
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 6121dc1bfada..07b554affcf2 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -114,6 +114,7 @@ static struct {
         {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN},      /* locks up */
         {"YAMAHA", "CRW8424S", "1.0", BLIST_NOLUN},     /* locks up */
         {"YAMAHA", "CRW6416S", "1.0c", BLIST_NOLUN},    /* locks up */
+        {"", "Scanner", "1.80", BLIST_NOLUN},   /* responds to all lun */
 
         /*
          * Other types of devices that have special flags.
@@ -135,7 +136,7 @@ static struct {
         {"COMPAQ", "MSA1000 VOLUME", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
         {"COMPAQ", "HSV110", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
         {"DDN", "SAN DataDirector", "*", BLIST_SPARSELUN},
-        {"DEC", "HSG80", NULL, BLIST_SPARSELUN | BLIST_NOSTARTONADD},
+        {"DEC", "HSG80", NULL, BLIST_REPORTLUN2 | BLIST_NOSTARTONADD},
         {"DELL", "PV660F", NULL, BLIST_SPARSELUN},
         {"DELL", "PV660F   PSEUDO", NULL, BLIST_SPARSELUN},
         {"DELL", "PSEUDO DEVICE .", NULL, BLIST_SPARSELUN},     /* Dell PV 530F */
@@ -191,6 +192,7 @@ static struct {
         {"SGI", "RAID5", "*", BLIST_SPARSELUN},
         {"SGI", "TP9100", "*", BLIST_REPORTLUN2},
         {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
+        {"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
         {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
         {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
         {"SONY", "TSL", NULL, BLIST_FORCELUN},          /* DDS3 & DDS4 autoloaders */
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 0fc8b48f052b..895c9452be4c 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -20,6 +20,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
+#include <linux/kthread.h>
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
@@ -75,7 +76,7 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)
 
         scmd->eh_eflags |= eh_flag;
         list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q);
-        set_bit(SHOST_RECOVERY, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_RECOVERY);
         shost->host_failed++;
         scsi_eh_wakeup(shost);
         spin_unlock_irqrestore(shost->host_lock, flags);
@@ -115,7 +116,6 @@ void scsi_add_timer(struct scsi_cmnd *scmd, int timeout,
 
         add_timer(&scmd->eh_timeout);
 }
-EXPORT_SYMBOL(scsi_add_timer);
 
 /**
  * scsi_delete_timer - Delete/cancel timer for a given function.
@@ -143,7 +143,6 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)
 
         return rtn;
 }
-EXPORT_SYMBOL(scsi_delete_timer);
 
 /**
  * scsi_times_out - Timeout function for normal scsi commands.
@@ -197,7 +196,8 @@ int scsi_block_when_processing_errors(struct scsi_device *sdev)
 {
         int online;
 
-        wait_event(sdev->host->host_wait, (!test_bit(SHOST_RECOVERY, &sdev->host->shost_state)));
+        wait_event(sdev->host->host_wait, (sdev->host->shost_state !=
+                                           SHOST_RECOVERY));
 
         online = scsi_device_online(sdev);
 
@@ -775,9 +775,11 @@ retry_tur:
                 __FUNCTION__, scmd, rtn));
         if (rtn == SUCCESS)
                 return 0;
-        else if (rtn == NEEDS_RETRY)
+        else if (rtn == NEEDS_RETRY) {
                 if (retry_cnt--)
                         goto retry_tur;
+                return 0;
+        }
         return 1;
 }
 
@@ -1458,7 +1460,7 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: waking up host to restart\n",
                                           __FUNCTION__));
 
-        clear_bit(SHOST_RECOVERY, &shost->shost_state);
+        scsi_host_set_state(shost, SHOST_RUNNING);
 
         wake_up(&shost->host_wait);
 
@@ -1582,16 +1584,8 @@ int scsi_error_handler(void *data)
         int rtn;
         DECLARE_MUTEX_LOCKED(sem);
 
-        /*
-         *    Flush resources
-         */
-
-        daemonize("scsi_eh_%d", shost->host_no);
-
         current->flags |= PF_NOFREEZE;
-
         shost->eh_wait = &sem;
-        shost->ehandler = current;
 
         /*
          * Wake up the thread that created us.
@@ -1599,8 +1593,6 @@ int scsi_error_handler(void *data)
         SCSI_LOG_ERROR_RECOVERY(3, printk("Wake up parent of"
                                           " scsi_eh_%d\n",shost->host_no));
 
-        complete(shost->eh_notify);
-
         while (1) {
                 /*
                  * If we get a signal, it means we are supposed to go
@@ -1621,7 +1613,7 @@ int scsi_error_handler(void *data)
                  * semaphores isn't unreasonable.
                  */
                 down_interruptible(&sem);
-                if (shost->eh_kill)
+                if (kthread_should_stop())
                         break;
 
                 SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler"
@@ -1660,22 +1652,6 @@ int scsi_error_handler(void *data)
          * Make sure that nobody tries to wake us up again.
          */
         shost->eh_wait = NULL;
-
-        /*
-         * Knock this down too.  From this point on, the host is flying
-         * without a pilot.  If this is because the module is being unloaded,
-         * that's fine.  If the user sent a signal to this thing, we are
-         * potentially in real danger.
-         */
-        shost->eh_active = 0;
-        shost->ehandler = NULL;
-
-        /*
-         * If anyone is waiting for us to exit (i.e. someone trying to unload
-         * a driver), then wake up that process to let them know we are on
-         * the way out the door.
-         */
-        complete_and_exit(shost->eh_notify, 0);
         return 0;
 }
 
@@ -1846,12 +1822,16 @@ EXPORT_SYMBOL(scsi_reset_provider);
 int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,
                          struct scsi_sense_hdr *sshdr)
 {
-        if (!sense_buffer || !sb_len || (sense_buffer[0] & 0x70) != 0x70)
+        if (!sense_buffer || !sb_len)
                 return 0;
 
         memset(sshdr, 0, sizeof(struct scsi_sense_hdr));
 
         sshdr->response_code = (sense_buffer[0] & 0x7f);
+
+        if (!scsi_sense_valid(sshdr))
+                return 0;
+
         if (sshdr->response_code >= 0x72) {
                 /*
                  * descriptor format
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 7a6b530115ac..b7fddac81347 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -30,20 +30,20 @@
 
 #define MAX_BUF PAGE_SIZE
 
-/*
- * If we are told to probe a host, we will return 0 if  the host is not
- * present, 1 if the host is present, and will return an identifying
- * string at *arg, if arg is non null, filling to the length stored at
- * (int *) arg
+/**
+ * ioctl_probe  --  return host identification
+ * @host:       host to identify
+ * @buffer:     userspace buffer for identification
+ *
+ * Return an identifying string at @buffer, if @buffer is non-NULL, filling
+ * to the length stored at * (int *) @buffer.
  */
-
 static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)
 {
         unsigned int len, slen;
         const char *string;
-        int temp = host->hostt->present;
 
-        if (temp && buffer) {
+        if (buffer) {
                 if (get_user(len, (unsigned int __user *) buffer))
                         return -EFAULT;
 
@@ -59,7 +59,7 @@ static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)
                                 return -EFAULT;
                 }
         }
-        return temp;
+        return 1;
 }
 
 /*
@@ -88,25 +88,18 @@ static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)
 static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                                   int timeout, int retries)
 {
-        struct scsi_request *sreq;
         int result;
         struct scsi_sense_hdr sshdr;
 
         SCSI_LOG_IOCTL(1, printk("Trying ioctl with scsi command %d\n", *cmd));
 
-        sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        if (!sreq) {
-                printk(KERN_WARNING "SCSI internal ioctl failed, no memory\n");
-                return -ENOMEM;
-        }
-
-        sreq->sr_data_direction = DMA_NONE;
-        scsi_wait_req(sreq, cmd, NULL, 0, timeout, retries);
+        result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0,
+                                  &sshdr, timeout, retries);
 
-        SCSI_LOG_IOCTL(2, printk("Ioctl returned  0x%x\n", sreq->sr_result));
+        SCSI_LOG_IOCTL(2, printk("Ioctl returned  0x%x\n", result));
 
-        if ((driver_byte(sreq->sr_result) & DRIVER_SENSE) &&
-            (scsi_request_normalize_sense(sreq, &sshdr))) {
+        if ((driver_byte(result) & DRIVER_SENSE) &&
+            (scsi_sense_valid(&sshdr))) {
                 switch (sshdr.sense_key) {
                 case ILLEGAL_REQUEST:
                         if (cmd[0] == ALLOW_MEDIUM_REMOVAL)
@@ -125,7 +118,7 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                 case UNIT_ATTENTION:
                         if (sdev->removable) {
                                 sdev->changed = 1;
-                                sreq->sr_result = 0;    /* This is no longer considered an error */
+                                result = 0;     /* This is no longer considered an error */
                                 break;
                         }
                 default:        /* Fall through for non-removable media */
@@ -135,15 +128,13 @@ static int ioctl_internal_command(struct scsi_device *sdev, char *cmd,
                                sdev->channel,
                                sdev->id,
                                sdev->lun,
-                               sreq->sr_result);
-                        scsi_print_req_sense("   ", sreq);
+                               result);
+                        scsi_print_sense_hdr("   ", &sshdr);
                         break;
                 }
         }
 
-        result = sreq->sr_result;
         SCSI_LOG_IOCTL(2, printk("IOCTL Releasing command\n"));
-        scsi_release_request(sreq);
         return result;
 }
 
@@ -208,8 +199,8 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
 {
         char *buf;
         unsigned char cmd[MAX_COMMAND_SIZE];
+        unsigned char sense[SCSI_SENSE_BUFFERSIZE];
         char __user *cmd_in;
-        struct scsi_request *sreq;
         unsigned char opcode;
         unsigned int inlen, outlen, cmdlen;
         unsigned int needed, buf_needed;
@@ -321,31 +312,23 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
                 break;
         }
 
-        sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        if (!sreq) {
-                result = -EINTR;
-                goto error;
-        }
-
-        sreq->sr_data_direction = data_direction;
-        scsi_wait_req(sreq, cmd, buf, needed, timeout, retries);
+        result = scsi_execute(sdev, cmd, data_direction, buf, needed,
+                              sense, timeout, retries, 0);
 
         /* 
          * If there was an error condition, pass the info back to the user. 
          */
-        result = sreq->sr_result;
         if (result) {
-                int sb_len = sizeof(sreq->sr_sense_buffer);
+                int sb_len = sizeof(*sense);
 
                 sb_len = (sb_len > OMAX_SB_LEN) ? OMAX_SB_LEN : sb_len;
-                if (copy_to_user(cmd_in, sreq->sr_sense_buffer, sb_len))
+                if (copy_to_user(cmd_in, sense, sb_len))
                         result = -EFAULT;
         } else {
                 if (copy_to_user(cmd_in, buf, outlen))
                         result = -EFAULT;
         }       
 
-        scsi_release_request(sreq);
 error:
         kfree(buf);
         return result;
@@ -475,8 +458,7 @@ int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
          * error processing, as long as the device was opened
          * non-blocking */
         if (filp && filp->f_flags & O_NONBLOCK) {
-                if (test_bit(SHOST_RECOVERY,
-                             &sdev->host->shost_state))
+                if (sdev->host->shost_state == SHOST_RECOVERY)
                         return -ENODEV;
         } else if (!scsi_block_when_processing_errors(sdev))
                 return -ENODEV;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 7a91ca3d32a6..77f2d444f7e0 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -232,23 +232,6 @@ void scsi_do_req(struct scsi_request *sreq, const void *cmnd,
 }
 EXPORT_SYMBOL(scsi_do_req);
 
-static void scsi_wait_done(struct scsi_cmnd *cmd)
-{
-        struct request *req = cmd->request;
-        struct request_queue *q = cmd->device->request_queue;
-        unsigned long flags;
-
-        req->rq_status = RQ_SCSI_DONE;  /* Busy, but indicate request done */
-
-        spin_lock_irqsave(q->queue_lock, flags);
-        if (blk_rq_tagged(req))
-                blk_queue_end_tag(q, req);
-        spin_unlock_irqrestore(q->queue_lock, flags);
-
-        if (req->waiting)
-                complete(req->waiting);
-}
-
 /* This is the end routine we get to if a command was never attached
  * to the request.  Simply complete the request without changing
  * rq_status; this will cause a DRIVER_ERROR. */
@@ -263,21 +246,114 @@ void scsi_wait_req(struct scsi_request *sreq, const void *cmnd, void *buffer,
                    unsigned bufflen, int timeout, int retries)
 {
         DECLARE_COMPLETION(wait);
-        
-        sreq->sr_request->waiting = &wait;
-        sreq->sr_request->rq_status = RQ_SCSI_BUSY;
-        sreq->sr_request->end_io = scsi_wait_req_end_io;
-        scsi_do_req(sreq, cmnd, buffer, bufflen, scsi_wait_done,
-                        timeout, retries);
+        int write = (sreq->sr_data_direction == DMA_TO_DEVICE);
+        struct request *req;
+
+        req = blk_get_request(sreq->sr_device->request_queue, write,
+                              __GFP_WAIT);
+        if (bufflen && blk_rq_map_kern(sreq->sr_device->request_queue, req,
+                                       buffer, bufflen, __GFP_WAIT)) {
+                sreq->sr_result = DRIVER_ERROR << 24;
+                blk_put_request(req);
+                return;
+        }
+
+        req->flags |= REQ_NOMERGE;
+        req->waiting = &wait;
+        req->end_io = scsi_wait_req_end_io;
+        req->cmd_len = COMMAND_SIZE(((u8 *)cmnd)[0]);
+        req->sense = sreq->sr_sense_buffer;
+        req->sense_len = 0;
+        memcpy(req->cmd, cmnd, req->cmd_len);
+        req->timeout = timeout;
+        req->flags |= REQ_BLOCK_PC;
+        req->rq_disk = NULL;
+        blk_insert_request(sreq->sr_device->request_queue, req,
+                           sreq->sr_data_direction == DMA_TO_DEVICE, NULL);
         wait_for_completion(&wait);
         sreq->sr_request->waiting = NULL;
-        if (sreq->sr_request->rq_status != RQ_SCSI_DONE)
+        sreq->sr_result = req->errors;
+        if (req->errors)
                 sreq->sr_result |= (DRIVER_ERROR << 24);
 
-        __scsi_release_request(sreq);
+        blk_put_request(req);
 }
+
 EXPORT_SYMBOL(scsi_wait_req);
 
+/**
+ * scsi_execute - insert request and wait for the result
+ * @sdev:       scsi device
+ * @cmd:        scsi command
+ * @data_direction: data direction
+ * @buffer:     data buffer
+ * @bufflen:    len of buffer
+ * @sense:      optional sense buffer
+ * @timeout:    request timeout in seconds
+ * @retries:    number of times to retry request
+ * @flags:      or into request flags;
+ *
+ * returns the req->errors value which is the the scsi_cmnd result
+ * field.
+ **/
+int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
+                 int data_direction, void *buffer, unsigned bufflen,
+                 unsigned char *sense, int timeout, int retries, int flags)
+{
+        struct request *req;
+        int write = (data_direction == DMA_TO_DEVICE);
+        int ret = DRIVER_ERROR << 24;
+
+        req = blk_get_request(sdev->request_queue, write, __GFP_WAIT);
+
+        if (bufflen &&  blk_rq_map_kern(sdev->request_queue, req,
+                                        buffer, bufflen, __GFP_WAIT))
+                goto out;
+
+        req->cmd_len = COMMAND_SIZE(cmd[0]);
+        memcpy(req->cmd, cmd, req->cmd_len);
+        req->sense = sense;
+        req->sense_len = 0;
+        req->timeout = timeout;
+        req->flags |= flags | REQ_BLOCK_PC | REQ_SPECIAL | REQ_QUIET;
+
+        /*
+         * head injection *required* here otherwise quiesce won't work
+         */
+        blk_execute_rq(req->q, NULL, req, 1);
+
+        ret = req->errors;
+ out:
+        blk_put_request(req);
+
+        return ret;
+}
+EXPORT_SYMBOL(scsi_execute);
+
+
+int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
+                     int data_direction, void *buffer, unsigned bufflen,
+                     struct scsi_sense_hdr *sshdr, int timeout, int retries)
+{
+        char *sense = NULL;
+        int result;
+        
+        if (sshdr) {
+                sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+                if (!sense)
+                        return DRIVER_ERROR << 24;
+                memset(sense, 0, SCSI_SENSE_BUFFERSIZE);
+        }
+        result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen,
+                                  sense, timeout, retries, 0);
+        if (sshdr)
+                scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE, sshdr);
+
+        kfree(sense);
+        return result;
+}
+EXPORT_SYMBOL(scsi_execute_req);
+
 /*
  * Function:    scsi_init_cmd_errh()
  *
@@ -348,7 +424,7 @@ void scsi_device_unbusy(struct scsi_device *sdev)
 
         spin_lock_irqsave(shost->host_lock, flags);
         shost->host_busy--;
-        if (unlikely(test_bit(SHOST_RECOVERY, &shost->shost_state) &&
+        if (unlikely((shost->shost_state == SHOST_RECOVERY) &&
                      shost->host_failed))
                 scsi_eh_wakeup(shost);
         spin_unlock(shost->host_lock);
@@ -851,17 +927,20 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,
                                 scsi_requeue_command(q, cmd);
                                 return;
                         }
-                        printk(KERN_INFO "Device %s not ready.\n",
-                               req->rq_disk ? req->rq_disk->disk_name : "");
+                        if (!(req->flags & REQ_QUIET))
+                                dev_printk(KERN_INFO,
+                                           &cmd->device->sdev_gendev,
+                                           "Device not ready.\n");
                         cmd = scsi_end_request(cmd, 0, this_count, 1);
                         return;
                 case VOLUME_OVERFLOW:
-                        printk(KERN_INFO "Volume overflow <%d %d %d %d> CDB: ",
-                               cmd->device->host->host_no,
-                               (int)cmd->device->channel,
-                               (int)cmd->device->id, (int)cmd->device->lun);
-                        __scsi_print_command(cmd->data_cmnd);
-                        scsi_print_sense("", cmd);
+                        if (!(req->flags & REQ_QUIET)) {
+                                dev_printk(KERN_INFO,
+                                           &cmd->device->sdev_gendev,
+                                           "Volume overflow, CDB: ");
+                                __scsi_print_command(cmd->data_cmnd);
+                                scsi_print_sense("", cmd);
+                        }
                         cmd = scsi_end_request(cmd, 0, block_bytes, 1);
                         return;
                 default:
@@ -878,14 +957,13 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes,
                 return;
         }
         if (result) {
-                printk(KERN_INFO "SCSI error : <%d %d %d %d> return code "
-                       "= 0x%x\n", cmd->device->host->host_no,
-                       cmd->device->channel,
-                       cmd->device->id,
-                       cmd->device->lun, result);
-
-                if (driver_byte(result) & DRIVER_SENSE)
-                        scsi_print_sense("", cmd);
+                if (!(req->flags & REQ_QUIET)) {
+                        dev_printk(KERN_INFO, &cmd->device->sdev_gendev,
+                                   "SCSI error: return code = 0x%x\n", result);
+
+                        if (driver_byte(result) & DRIVER_SENSE)
+                                scsi_print_sense("", cmd);
+                }
                 /*
                  * Mark a single buffer as not uptodate.  Queue the remainder.
                  * We sometimes get this cruft in the event that a medium error
@@ -1020,6 +1098,12 @@ static int scsi_issue_flush_fn(request_queue_t *q, struct gendisk *disk,
         return -EOPNOTSUPP;
 }
 
+static void scsi_generic_done(struct scsi_cmnd *cmd)
+{
+        BUG_ON(!blk_pc_request(cmd->request));
+        scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0);
+}
+
 static int scsi_prep_fn(struct request_queue *q, struct request *req)
 {
         struct scsi_device *sdev = q->queuedata;
@@ -1061,7 +1145,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
          * these two cases differently.  We differentiate by looking
          * at request->cmd, as this tells us the real story.
          */
-        if (req->flags & REQ_SPECIAL) {
+        if (req->flags & REQ_SPECIAL && req->special) {
                 struct scsi_request *sreq = req->special;
 
                 if (sreq->sr_magic == SCSI_REQ_MAGIC) {
@@ -1073,7 +1157,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                         cmd = req->special;
         } else if (req->flags & (REQ_CMD | REQ_BLOCK_PC)) {
 
-                if(unlikely(specials_only)) {
+                if(unlikely(specials_only) && !(req->flags & REQ_SPECIAL)) {
                         if(specials_only == SDEV_QUIESCE ||
                                         specials_only == SDEV_BLOCK)
                                 return BLKPREP_DEFER;
@@ -1142,11 +1226,26 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                 /*
                  * Initialize the actual SCSI command for this request.
                  */
-                drv = *(struct scsi_driver **)req->rq_disk->private_data;
-                if (unlikely(!drv->init_command(cmd))) {
-                        scsi_release_buffers(cmd);
-                        scsi_put_command(cmd);
-                        return BLKPREP_KILL;
+                if (req->rq_disk) {
+                        drv = *(struct scsi_driver **)req->rq_disk->private_data;
+                        if (unlikely(!drv->init_command(cmd))) {
+                                scsi_release_buffers(cmd);
+                                scsi_put_command(cmd);
+                                return BLKPREP_KILL;
+                        }
+                } else {
+                        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
+                        if (rq_data_dir(req) == WRITE)
+                                cmd->sc_data_direction = DMA_TO_DEVICE;
+                        else if (req->data_len)
+                                cmd->sc_data_direction = DMA_FROM_DEVICE;
+                        else
+                                cmd->sc_data_direction = DMA_NONE;
+                        
+                        cmd->transfersize = req->data_len;
+                        cmd->allowed = 3;
+                        cmd->timeout_per_command = req->timeout;
+                        cmd->done = scsi_generic_done;
                 }
         }
 
@@ -1207,7 +1306,7 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
                                    struct Scsi_Host *shost,
                                    struct scsi_device *sdev)
 {
-        if (test_bit(SHOST_RECOVERY, &shost->shost_state))
+        if (shost->shost_state == SHOST_RECOVERY)
                 return 0;
         if (shost->host_busy == 0 && shost->host_blocked) {
                 /*
@@ -1539,9 +1638,9 @@ void scsi_exit_queue(void)
         }
 }
 /**
- *      __scsi_mode_sense - issue a mode sense, falling back from 10 to 
+ *      scsi_mode_sense - issue a mode sense, falling back from 10 to 
  *              six bytes if necessary.
- *      @sreq:  SCSI request to fill in with the MODE_SENSE
+ *      @sdev:  SCSI device to be queried
  *      @dbd:   set if mode sense will allow block descriptors to be returned
  *      @modepage: mode page being requested
  *      @buffer: request buffer (may not be smaller than eight bytes)
@@ -1549,26 +1648,34 @@ void scsi_exit_queue(void)
  *      @timeout: command timeout
  *      @retries: number of retries before failing
  *      @data: returns a structure abstracting the mode header data
+ *      @sense: place to put sense data (or NULL if no sense to be collected).
+ *              must be SCSI_SENSE_BUFFERSIZE big.
  *
  *      Returns zero if unsuccessful, or the header offset (either 4
  *      or 8 depending on whether a six or ten byte command was
  *      issued) if successful.
  **/
 int
-__scsi_mode_sense(struct scsi_request *sreq, int dbd, int modepage,
+scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
                   unsigned char *buffer, int len, int timeout, int retries,
-                  struct scsi_mode_data *data) {
+                  struct scsi_mode_data *data, struct scsi_sense_hdr *sshdr) {
         unsigned char cmd[12];
         int use_10_for_ms;
         int header_length;
+        int result;
+        struct scsi_sense_hdr my_sshdr;
 
         memset(data, 0, sizeof(*data));
         memset(&cmd[0], 0, 12);
         cmd[1] = dbd & 0x18;    /* allows DBD and LLBA bits */
         cmd[2] = modepage;
 
+        /* caller might not be interested in sense, but we need it */
+        if (!sshdr)
+                sshdr = &my_sshdr;
+
  retry:
-        use_10_for_ms = sreq->sr_device->use_10_for_ms;
+        use_10_for_ms = sdev->use_10_for_ms;
 
         if (use_10_for_ms) {
                 if (len < 8)
@@ -1586,36 +1693,31 @@ __scsi_mode_sense(struct scsi_request *sreq, int dbd, int modepage,
                 header_length = 4;
         }
 
-        sreq->sr_cmd_len = 0;
-        memset(sreq->sr_sense_buffer, 0, sizeof(sreq->sr_sense_buffer));
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
-
         memset(buffer, 0, len);
 
-        scsi_wait_req(sreq, cmd, buffer, len, timeout, retries);
+        result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buffer, len,
+                                  sshdr, timeout, retries);
 
         /* This code looks awful: what it's doing is making sure an
          * ILLEGAL REQUEST sense return identifies the actual command
          * byte as the problem.  MODE_SENSE commands can return
          * ILLEGAL REQUEST if the code page isn't supported */
 
-        if (use_10_for_ms && !scsi_status_is_good(sreq->sr_result) &&
-            (driver_byte(sreq->sr_result) & DRIVER_SENSE)) {
-                struct scsi_sense_hdr sshdr;
-
-                if (scsi_request_normalize_sense(sreq, &sshdr)) {
-                        if ((sshdr.sense_key == ILLEGAL_REQUEST) &&
-                            (sshdr.asc == 0x20) && (sshdr.ascq == 0)) {
+        if (use_10_for_ms && !scsi_status_is_good(result) &&
+            (driver_byte(result) & DRIVER_SENSE)) {
+                if (scsi_sense_valid(sshdr)) {
+                        if ((sshdr->sense_key == ILLEGAL_REQUEST) &&
+                            (sshdr->asc == 0x20) && (sshdr->ascq == 0)) {
                                 /* 
                                  * Invalid command operation code
                                  */
-                                sreq->sr_device->use_10_for_ms = 0;
+                                sdev->use_10_for_ms = 0;
                                 goto retry;
                         }
                 }
         }
 
-        if(scsi_status_is_good(sreq->sr_result)) {
+        if(scsi_status_is_good(result)) {
                 data->header_length = header_length;
                 if(use_10_for_ms) {
                         data->length = buffer[0]*256 + buffer[1] + 2;
@@ -1632,73 +1734,31 @@ __scsi_mode_sense(struct scsi_request *sreq, int dbd, int modepage,
                 }
         }
 
-        return sreq->sr_result;
-}
-EXPORT_SYMBOL(__scsi_mode_sense);
-
-/**
- *      scsi_mode_sense - issue a mode sense, falling back from 10 to 
- *              six bytes if necessary.
- *      @sdev:  scsi device to send command to.
- *      @dbd:   set if mode sense will disable block descriptors in the return
- *      @modepage: mode page being requested
- *      @buffer: request buffer (may not be smaller than eight bytes)
- *      @len:   length of request buffer.
- *      @timeout: command timeout
- *      @retries: number of retries before failing
- *
- *      Returns zero if unsuccessful, or the header offset (either 4
- *      or 8 depending on whether a six or ten byte command was
- *      issued) if successful.
- **/
-int
-scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
-                unsigned char *buffer, int len, int timeout, int retries,
-                struct scsi_mode_data *data)
-{
-        struct scsi_request *sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        int ret;
-
-        if (!sreq)
-                return -1;
-
-        ret = __scsi_mode_sense(sreq, dbd, modepage, buffer, len,
-                                timeout, retries, data);
-
-        scsi_release_request(sreq);
-
-        return ret;
+        return result;
 }
 EXPORT_SYMBOL(scsi_mode_sense);
 
 int
 scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries)
 {
-        struct scsi_request *sreq;
         char cmd[] = {
                 TEST_UNIT_READY, 0, 0, 0, 0, 0,
         };
+        struct scsi_sense_hdr sshdr;
         int result;
         
-        sreq = scsi_allocate_request(sdev, GFP_KERNEL);
-        if (!sreq)
-                return -ENOMEM;
-
-        sreq->sr_data_direction = DMA_NONE;
-        scsi_wait_req(sreq, cmd, NULL, 0, timeout, retries);
+        result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL, 0, &sshdr,
+                                  timeout, retries);
 
-        if ((driver_byte(sreq->sr_result) & DRIVER_SENSE) && sdev->removable) {
-                struct scsi_sense_hdr sshdr;
+        if ((driver_byte(result) & DRIVER_SENSE) && sdev->removable) {
 
-                if ((scsi_request_normalize_sense(sreq, &sshdr)) &&
+                if ((scsi_sense_valid(&sshdr)) &&
                     ((sshdr.sense_key == UNIT_ATTENTION) ||
                      (sshdr.sense_key == NOT_READY))) {
                         sdev->changed = 1;
-                        sreq->sr_result = 0;
+                        result = 0;
                 }
         }
-        result = sreq->sr_result;
-        scsi_release_request(sreq);
         return result;
 }
 EXPORT_SYMBOL(scsi_test_unit_ready);
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index d30d7f4e63ec..ee6de1768e53 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -63,6 +63,9 @@ extern int __init scsi_init_devinfo(void);
 extern void scsi_exit_devinfo(void);
 
 /* scsi_error.c */
+extern void scsi_add_timer(struct scsi_cmnd *, int,
+                void (*)(struct scsi_cmnd *));
+extern int scsi_delete_timer(struct scsi_cmnd *);
 extern void scsi_times_out(struct scsi_cmnd *cmd);
 extern int scsi_error_handler(void *host);
 extern int scsi_decide_disposition(struct scsi_cmnd *cmd);
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 48edd67982a5..19c9a232a754 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -111,15 +111,14 @@ MODULE_PARM_DESC(inq_timeout,
 
 /**
  * scsi_unlock_floptical - unlock device via a special MODE SENSE command
- * @sreq:       used to send the command
+ * @sdev:       scsi device to send command to
  * @result:     area to store the result of the MODE SENSE
  *
  * Description:
- *     Send a vendor specific MODE SENSE (not a MODE SELECT) command using
- *     @sreq to unlock a device, storing the (unused) results into result.
+ *     Send a vendor specific MODE SENSE (not a MODE SELECT) command.
  *     Called for BLIST_KEY devices.
  **/
-static void scsi_unlock_floptical(struct scsi_request *sreq,
+static void scsi_unlock_floptical(struct scsi_device *sdev,
                                   unsigned char *result)
 {
         unsigned char scsi_cmd[MAX_COMMAND_SIZE];
@@ -129,11 +128,10 @@ static void scsi_unlock_floptical(struct scsi_request *sreq,
         scsi_cmd[1] = 0;
         scsi_cmd[2] = 0x2e;
         scsi_cmd[3] = 0;
-        scsi_cmd[4] = 0x2a;     /* size */
+        scsi_cmd[4] = 0x2a;     /* size */
         scsi_cmd[5] = 0;
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
-        scsi_wait_req(sreq, scsi_cmd, result, 0x2a /* size */, SCSI_TIMEOUT, 3);
+        scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE, result, 0x2a, NULL,
+                         SCSI_TIMEOUT, 3);
 }
 
 /**
@@ -433,26 +431,25 @@ void scsi_target_reap(struct scsi_target *starget)
 
 /**
  * scsi_probe_lun - probe a single LUN using a SCSI INQUIRY
- * @sreq:       used to send the INQUIRY
+ * @sdev:       scsi_device to probe
  * @inq_result: area to store the INQUIRY result
+ * @result_len: len of inq_result
  * @bflags:     store any bflags found here
  *
  * Description:
- *     Probe the lun associated with @sreq using a standard SCSI INQUIRY;
+ *     Probe the lun associated with @req using a standard SCSI INQUIRY;
  *
- *     If the INQUIRY is successful, sreq->sr_result is zero and: the
+ *     If the INQUIRY is successful, zero is returned and the
  *     INQUIRY data is in @inq_result; the scsi_level and INQUIRY length
- *     are copied to the Scsi_Device at @sreq->sr_device (sdev);
- *     any flags value is stored in *@bflags.
+ *     are copied to the Scsi_Device any flags value is stored in *@bflags.
  **/
-static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
-                           int *bflags)
+static int scsi_probe_lun(struct scsi_device *sdev, char *inq_result,
+                          int result_len, int *bflags)
 {
-        struct scsi_device *sdev = sreq->sr_device;     /* a bit ugly */
         unsigned char scsi_cmd[MAX_COMMAND_SIZE];
         int first_inquiry_len, try_inquiry_len, next_inquiry_len;
         int response_len = 0;
-        int pass, count;
+        int pass, count, result;
         struct scsi_sense_hdr sshdr;
 
         *bflags = 0;
@@ -475,28 +472,26 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
                 memset(scsi_cmd, 0, 6);
                 scsi_cmd[0] = INQUIRY;
                 scsi_cmd[4] = (unsigned char) try_inquiry_len;
-                sreq->sr_cmd_len = 0;
-                sreq->sr_data_direction = DMA_FROM_DEVICE;
 
                 memset(inq_result, 0, try_inquiry_len);
-                scsi_wait_req(sreq, (void *) scsi_cmd, (void *) inq_result,
-                                try_inquiry_len,
-                                HZ/2 + HZ*scsi_inq_timeout, 3);
+
+                result = scsi_execute_req(sdev,  scsi_cmd, DMA_FROM_DEVICE,
+                                          inq_result, try_inquiry_len, &sshdr,
+                                          HZ / 2 + HZ * scsi_inq_timeout, 3);
 
                 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: INQUIRY %s "
                                 "with code 0x%x\n",
-                                sreq->sr_result ? "failed" : "successful",
-                                sreq->sr_result));
+                                result ? "failed" : "successful", result));
 
-                if (sreq->sr_result) {
+                if (result) {
                         /*
                          * not-ready to ready transition [asc/ascq=0x28/0x0]
                          * or power-on, reset [asc/ascq=0x29/0x0], continue.
                          * INQUIRY should not yield UNIT_ATTENTION
                          * but many buggy devices do so anyway. 
                          */
-                        if ((driver_byte(sreq->sr_result) & DRIVER_SENSE) &&
-                            scsi_request_normalize_sense(sreq, &sshdr)) {
+                        if ((driver_byte(result) & DRIVER_SENSE) &&
+                            scsi_sense_valid(&sshdr)) {
                                 if ((sshdr.sense_key == UNIT_ATTENTION) &&
                                     ((sshdr.asc == 0x28) ||
                                      (sshdr.asc == 0x29)) &&
@@ -507,7 +502,7 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
                 break;
         }
 
-        if (sreq->sr_result == 0) {
+        if (result == 0) {
                 response_len = (unsigned char) inq_result[4] + 5;
                 if (response_len > 255)
                         response_len = first_inquiry_len;       /* sanity */
@@ -556,8 +551,8 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
 
         /* If the last transfer attempt got an error, assume the
          * peripheral doesn't exist or is dead. */
-        if (sreq->sr_result)
-                return;
+        if (result)
+                return -EIO;
 
         /* Don't report any more data than the device says is valid */
         sdev->inquiry_len = min(try_inquiry_len, response_len);
@@ -593,7 +588,7 @@ static void scsi_probe_lun(struct scsi_request *sreq, char *inq_result,
             (sdev->scsi_level == 1 && (inq_result[3] & 0x0f) == 1))
                 sdev->scsi_level++;
 
-        return;
+        return 0;
 }
 
 /**
@@ -800,9 +795,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                                   void *hostdata)
 {
         struct scsi_device *sdev;
-        struct scsi_request *sreq;
         unsigned char *result;
-        int bflags, res = SCSI_SCAN_NO_RESPONSE;
+        int bflags, res = SCSI_SCAN_NO_RESPONSE, result_len = 256;
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
 
         /*
@@ -831,16 +825,13 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         sdev = scsi_alloc_sdev(starget, lun, hostdata);
         if (!sdev)
                 goto out;
-        sreq = scsi_allocate_request(sdev, GFP_ATOMIC);
-        if (!sreq)
-                goto out_free_sdev;
-        result = kmalloc(256, GFP_ATOMIC |
+
+        result = kmalloc(result_len, GFP_ATOMIC |
                         ((shost->unchecked_isa_dma) ? __GFP_DMA : 0));
         if (!result)
-                goto out_free_sreq;
+                goto out_free_sdev;
 
-        scsi_probe_lun(sreq, result, &bflags);
-        if (sreq->sr_result)
+        if (scsi_probe_lun(sdev, result, result_len, &bflags))
                 goto out_free_result;
 
         /*
@@ -868,7 +859,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
         if (res == SCSI_SCAN_LUN_PRESENT) {
                 if (bflags & BLIST_KEY) {
                         sdev->lockable = 0;
-                        scsi_unlock_floptical(sreq, result);
+                        scsi_unlock_floptical(sdev, result);
                 }
                 if (bflagsp)
                         *bflagsp = bflags;
@@ -876,8 +867,6 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
 
  out_free_result:
         kfree(result);
- out_free_sreq:
-        scsi_release_request(sreq);
  out_free_sdev:
         if (res == SCSI_SCAN_LUN_PRESENT) {
                 if (sdevp) {
@@ -1070,8 +1059,8 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         unsigned int lun;
         unsigned int num_luns;
         unsigned int retries;
+        int result;
         struct scsi_lun *lunp, *lun_data;
-        struct scsi_request *sreq;
         u8 *data;
         struct scsi_sense_hdr sshdr;
         struct scsi_target *starget = scsi_target(sdev);
@@ -1089,10 +1078,6 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         if (bflags & BLIST_NOLUN)
                 return 0;
 
-        sreq = scsi_allocate_request(sdev, GFP_ATOMIC);
-        if (!sreq)
-                goto out;
-
         sprintf(devname, "host %d channel %d id %d",
                 sdev->host->host_no, sdev->channel, sdev->id);
 
@@ -1110,7 +1095,7 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         lun_data = kmalloc(length, GFP_ATOMIC |
                            (sdev->host->unchecked_isa_dma ? __GFP_DMA : 0));
         if (!lun_data)
-                goto out_release_request;
+                goto out;
 
         scsi_cmd[0] = REPORT_LUNS;
 
@@ -1129,8 +1114,6 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
 
         scsi_cmd[10] = 0;       /* reserved */
         scsi_cmd[11] = 0;       /* control */
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
 
         /*
          * We can get a UNIT ATTENTION, for example a power on/reset, so
@@ -1146,29 +1129,29 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
                 SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: Sending"
                                 " REPORT LUNS to %s (try %d)\n", devname,
                                 retries));
-                scsi_wait_req(sreq, scsi_cmd, lun_data, length,
-                                SCSI_TIMEOUT + 4*HZ, 3);
+
+                result = scsi_execute_req(sdev, scsi_cmd, DMA_FROM_DEVICE,
+                                          lun_data, length, &sshdr,
+                                          SCSI_TIMEOUT + 4 * HZ, 3);
+
                 SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: REPORT LUNS"
-                                " %s (try %d) result 0x%x\n", sreq->sr_result
-                                ?  "failed" : "successful", retries,
-                                sreq->sr_result));
-                if (sreq->sr_result == 0)
+                                " %s (try %d) result 0x%x\n", result
+                                ?  "failed" : "successful", retries, result));
+                if (result == 0)
                         break;
-                else if (scsi_request_normalize_sense(sreq, &sshdr)) {
+                else if (scsi_sense_valid(&sshdr)) {
                         if (sshdr.sense_key != UNIT_ATTENTION)
                                 break;
                 }
         }
 
-        if (sreq->sr_result) {
+        if (result) {
                 /*
                  * The device probably does not support a REPORT LUN command
                  */
                 kfree(lun_data);
-                scsi_release_request(sreq);
                 return 1;
         }
-        scsi_release_request(sreq);
 
         /*
          * Get the length from the first four bytes of lun_data.
@@ -1242,8 +1225,6 @@ static int scsi_report_lun_scan(struct scsi_device *sdev, int bflags,
         kfree(lun_data);
         return 0;
 
- out_release_request:
-        scsi_release_request(sreq);
  out:
         /*
          * We are out of memory, don't try scanning any further.
@@ -1265,9 +1246,12 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
 
         get_device(&starget->dev);
         down(&shost->scan_mutex);
-        res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata);
-        if (res != SCSI_SCAN_LUN_PRESENT)
-                sdev = ERR_PTR(-ENODEV);
+        if (scsi_host_scan_allowed(shost)) {
+                res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1,
+                                             hostdata);
+                if (res != SCSI_SCAN_LUN_PRESENT)
+                        sdev = ERR_PTR(-ENODEV);
+        }
         up(&shost->scan_mutex);
         scsi_target_reap(starget);
         put_device(&starget->dev);
@@ -1417,11 +1401,15 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
                 return -EINVAL;
 
         down(&shost->scan_mutex);
-        if (channel == SCAN_WILD_CARD) 
-                for (channel = 0; channel <= shost->max_channel; channel++)
+        if (scsi_host_scan_allowed(shost)) {
+                if (channel == SCAN_WILD_CARD)
+                        for (channel = 0; channel <= shost->max_channel;
+                             channel++)
+                                scsi_scan_channel(shost, channel, id, lun,
+                                                  rescan);
+                else
                         scsi_scan_channel(shost, channel, id, lun, rescan);
-        else
-                scsi_scan_channel(shost, channel, id, lun, rescan);
+        }
         up(&shost->scan_mutex);
 
         return 0;
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index beed7fbe1cbe..dae59d1da07a 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -48,6 +48,30 @@ const char *scsi_device_state_name(enum scsi_device_state state)
         return name;
 }
 
+static struct {
+        enum scsi_host_state    value;
+        char                    *name;
+} shost_states[] = {
+        { SHOST_CREATED, "created" },
+        { SHOST_RUNNING, "running" },
+        { SHOST_CANCEL, "cancel" },
+        { SHOST_DEL, "deleted" },
+        { SHOST_RECOVERY, "recovery" },
+};
+const char *scsi_host_state_name(enum scsi_host_state state)
+{
+        int i;
+        char *name = NULL;
+
+        for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
+                if (shost_states[i].value == state) {
+                        name = shost_states[i].name;
+                        break;
+                }
+        }
+        return name;
+}
+
 static int check_set(unsigned int *val, char *src)
 {
         char *last;
@@ -124,6 +148,43 @@ static ssize_t store_scan(struct class_device *class_dev, const char *buf,
 };
 static CLASS_DEVICE_ATTR(scan, S_IWUSR, NULL, store_scan);
 
+static ssize_t
+store_shost_state(struct class_device *class_dev, const char *buf, size_t count)
+{
+        int i;
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        enum scsi_host_state state = 0;
+
+        for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
+                const int len = strlen(shost_states[i].name);
+                if (strncmp(shost_states[i].name, buf, len) == 0 &&
+                   buf[len] == '\n') {
+                        state = shost_states[i].value;
+                        break;
+                }
+        }
+        if (!state)
+                return -EINVAL;
+
+        if (scsi_host_set_state(shost, state))
+                return -EINVAL;
+        return count;
+}
+
+static ssize_t
+show_shost_state(struct class_device *class_dev, char *buf)
+{
+        struct Scsi_Host *shost = class_to_shost(class_dev);
+        const char *name = scsi_host_state_name(shost->shost_state);
+
+        if (!name)
+                return -EINVAL;
+
+        return snprintf(buf, 20, "%s\n", name);
+}
+
+static CLASS_DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_shost_state, store_shost_state);
+
 shost_rd_attr(unique_id, "%u\n");
 shost_rd_attr(host_busy, "%hu\n");
 shost_rd_attr(cmd_per_lun, "%hd\n");
@@ -139,6 +200,7 @@ static struct class_device_attribute *scsi_sysfs_shost_attrs[] = {
         &class_device_attr_unchecked_isa_dma,
         &class_device_attr_proc_name,
         &class_device_attr_scan,
+        &class_device_attr_state,
         NULL
 };
 
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index e6412fce423c..2cab556b6e82 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -252,7 +252,8 @@ struct fc_internal {
 
 #define to_fc_internal(tmpl)    container_of(tmpl, struct fc_internal, t)
 
-static int fc_target_setup(struct device *dev)
+static int fc_target_setup(struct transport_container *tc, struct device *dev,
+                           struct class_device *cdev)
 {
         struct scsi_target *starget = to_scsi_target(dev);
         struct fc_rport *rport = starget_to_rport(starget);
@@ -281,7 +282,8 @@ static DECLARE_TRANSPORT_CLASS(fc_transport_class,
                                NULL,
                                NULL);
 
-static int fc_host_setup(struct device *dev)
+static int fc_host_setup(struct transport_container *tc, struct device *dev,
+                         struct class_device *cdev)
 {
         struct Scsi_Host *shost = dev_to_shost(dev);
 
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 7670919a087a..ef577c8c2182 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -28,14 +28,14 @@
 #include "scsi_priv.h"
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
-#include <scsi/scsi_request.h>
+#include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_spi.h>
 
 #define SPI_PRINTK(x, l, f, a...)       dev_printk(l, &(x)->dev, f , ##a)
 
-#define SPI_NUM_ATTRS 13        /* increase this if you add attributes */
+#define SPI_NUM_ATTRS 14        /* increase this if you add attributes */
 #define SPI_OTHER_ATTRS 1       /* Increase this if you add "always
                                  * on" attributes */
 #define SPI_HOST_ATTRS  1
@@ -106,27 +106,31 @@ static int sprint_frac(char *dest, int value, int denom)
         return result;
 }
 
-/* Modification of scsi_wait_req that will clear UNIT ATTENTION conditions
- * resulting from (likely) bus and device resets */
-static void spi_wait_req(struct scsi_request *sreq, const void *cmd,
-                         void *buffer, unsigned bufflen)
+static int spi_execute(struct scsi_device *sdev, const void *cmd,
+                       enum dma_data_direction dir,
+                       void *buffer, unsigned bufflen,
+                       struct scsi_sense_hdr *sshdr)
 {
-        int i;
+        int i, result;
+        unsigned char sense[SCSI_SENSE_BUFFERSIZE];
 
         for(i = 0; i < DV_RETRIES; i++) {
-                sreq->sr_request->flags |= REQ_FAILFAST;
-
-                scsi_wait_req(sreq, cmd, buffer, bufflen,
-                              DV_TIMEOUT, /* retries */ 1);
-                if (sreq->sr_result & DRIVER_SENSE) {
-                        struct scsi_sense_hdr sshdr;
-
-                        if (scsi_request_normalize_sense(sreq, &sshdr)
-                            && sshdr.sense_key == UNIT_ATTENTION)
+                result = scsi_execute(sdev, cmd, dir, buffer, bufflen,
+                                      sense, DV_TIMEOUT, /* retries */ 1,
+                                      REQ_FAILFAST);
+                if (result & DRIVER_SENSE) {
+                        struct scsi_sense_hdr sshdr_tmp;
+                        if (!sshdr)
+                                sshdr = &sshdr_tmp;
+
+                        if (scsi_normalize_sense(sense, sizeof(*sense),
+                                                 sshdr)
+                            && sshdr->sense_key == UNIT_ATTENTION)
                                 continue;
                 }
                 break;
         }
+        return result;
 }
 
 static struct {
@@ -162,7 +166,8 @@ static inline enum spi_signal_type spi_signal_to_value(const char *name)
         return SPI_SIGNAL_UNKNOWN;
 }
 
-static int spi_host_setup(struct device *dev)
+static int spi_host_setup(struct transport_container *tc, struct device *dev,
+                          struct class_device *cdev)
 {
         struct Scsi_Host *shost = dev_to_shost(dev);
 
@@ -196,7 +201,9 @@ static int spi_host_match(struct attribute_container *cont,
         return &i->t.host_attrs.ac == cont;
 }
 
-static int spi_device_configure(struct device *dev)
+static int spi_device_configure(struct transport_container *tc,
+                                struct device *dev,
+                                struct class_device *cdev)
 {
         struct scsi_device *sdev = to_scsi_device(dev);
         struct scsi_target *starget = sdev->sdev_target;
@@ -214,7 +221,9 @@ static int spi_device_configure(struct device *dev)
         return 0;
 }
 
-static int spi_setup_transport_attrs(struct device *dev)
+static int spi_setup_transport_attrs(struct transport_container *tc,
+                                     struct device *dev,
+                                     struct class_device *cdev)
 {
         struct scsi_target *starget = to_scsi_target(dev);
 
@@ -231,6 +240,7 @@ static int spi_setup_transport_attrs(struct device *dev)
         spi_rd_strm(starget) = 0;
         spi_rti(starget) = 0;
         spi_pcomp_en(starget) = 0;
+        spi_hold_mcs(starget) = 0;
         spi_dv_pending(starget) = 0;
         spi_initial_dv(starget) = 0;
         init_MUTEX(&spi_dv_sem(starget));
@@ -347,6 +357,7 @@ spi_transport_rd_attr(wr_flow, "%d\n");
 spi_transport_rd_attr(rd_strm, "%d\n");
 spi_transport_rd_attr(rti, "%d\n");
 spi_transport_rd_attr(pcomp_en, "%d\n");
+spi_transport_rd_attr(hold_mcs, "%d\n");
 
 /* we only care about the first child device so we return 1 */
 static int child_iter(struct device *dev, void *data)
@@ -539,13 +550,13 @@ enum spi_compare_returns {
 /* This is for read/write Domain Validation:  If the device supports
  * an echo buffer, we do read/write tests to it */
 static enum spi_compare_returns
-spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
+spi_dv_device_echo_buffer(struct scsi_device *sdev, u8 *buffer,
                           u8 *ptr, const int retries)
 {
-        struct scsi_device *sdev = sreq->sr_device;
         int len = ptr - buffer;
-        int j, k, r;
+        int j, k, r, result;
         unsigned int pattern = 0x0000ffff;
+        struct scsi_sense_hdr sshdr;
 
         const char spi_write_buffer[] = {
                 WRITE_BUFFER, 0x0a, 0, 0, 0, 0, 0, len >> 8, len & 0xff, 0
@@ -590,14 +601,12 @@ spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
         }
 
         for (r = 0; r < retries; r++) {
-                sreq->sr_cmd_len = 0;   /* wait_req to fill in */
-                sreq->sr_data_direction = DMA_TO_DEVICE;
-                spi_wait_req(sreq, spi_write_buffer, buffer, len);
-                if(sreq->sr_result || !scsi_device_online(sdev)) {
-                        struct scsi_sense_hdr sshdr;
+                result = spi_execute(sdev, spi_write_buffer, DMA_TO_DEVICE,
+                                     buffer, len, &sshdr);
+                if(result || !scsi_device_online(sdev)) {
 
                         scsi_device_set_state(sdev, SDEV_QUIESCE);
-                        if (scsi_request_normalize_sense(sreq, &sshdr)
+                        if (scsi_sense_valid(&sshdr)
                             && sshdr.sense_key == ILLEGAL_REQUEST
                             /* INVALID FIELD IN CDB */
                             && sshdr.asc == 0x24 && sshdr.ascq == 0x00)
@@ -609,14 +618,13 @@ spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
                                 return SPI_COMPARE_SKIP_TEST;
 
 
-                        SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Write Buffer failure %x\n", sreq->sr_result);
+                        SPI_PRINTK(sdev->sdev_target, KERN_ERR, "Write Buffer failure %x\n", result);
                         return SPI_COMPARE_FAILURE;
                 }
 
                 memset(ptr, 0, len);
-                sreq->sr_cmd_len = 0;   /* wait_req to fill in */
-                sreq->sr_data_direction = DMA_FROM_DEVICE;
-                spi_wait_req(sreq, spi_read_buffer, ptr, len);
+                spi_execute(sdev, spi_read_buffer, DMA_FROM_DEVICE,
+                            ptr, len, NULL);
                 scsi_device_set_state(sdev, SDEV_QUIESCE);
 
                 if (memcmp(buffer, ptr, len) != 0)
@@ -628,25 +636,22 @@ spi_dv_device_echo_buffer(struct scsi_request *sreq, u8 *buffer,
 /* This is for the simplest form of Domain Validation: a read test
  * on the inquiry data from the device */
 static enum spi_compare_returns
-spi_dv_device_compare_inquiry(struct scsi_request *sreq, u8 *buffer,
+spi_dv_device_compare_inquiry(struct scsi_device *sdev, u8 *buffer,
                               u8 *ptr, const int retries)
 {
-        int r;
-        const int len = sreq->sr_device->inquiry_len;
-        struct scsi_device *sdev = sreq->sr_device;
+        int r, result;
+        const int len = sdev->inquiry_len;
         const char spi_inquiry[] = {
                 INQUIRY, 0, 0, 0, len, 0
         };
 
         for (r = 0; r < retries; r++) {
-                sreq->sr_cmd_len = 0;   /* wait_req to fill in */
-                sreq->sr_data_direction = DMA_FROM_DEVICE;
-
                 memset(ptr, 0, len);
 
-                spi_wait_req(sreq, spi_inquiry, ptr, len);
+                result = spi_execute(sdev, spi_inquiry, DMA_FROM_DEVICE,
+                                     ptr, len, NULL);
                 
-                if(sreq->sr_result || !scsi_device_online(sdev)) {
+                if(result || !scsi_device_online(sdev)) {
                         scsi_device_set_state(sdev, SDEV_QUIESCE);
                         return SPI_COMPARE_FAILURE;
                 }
@@ -667,12 +672,11 @@ spi_dv_device_compare_inquiry(struct scsi_request *sreq, u8 *buffer,
 }
 
 static enum spi_compare_returns
-spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
+spi_dv_retrain(struct scsi_device *sdev, u8 *buffer, u8 *ptr,
                enum spi_compare_returns 
-               (*compare_fn)(struct scsi_request *, u8 *, u8 *, int))
+               (*compare_fn)(struct scsi_device *, u8 *, u8 *, int))
 {
-        struct spi_internal *i = to_spi_internal(sreq->sr_host->transportt);
-        struct scsi_device *sdev = sreq->sr_device;
+        struct spi_internal *i = to_spi_internal(sdev->host->transportt);
         struct scsi_target *starget = sdev->sdev_target;
         int period = 0, prevperiod = 0; 
         enum spi_compare_returns retval;
@@ -680,7 +684,7 @@ spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
 
         for (;;) {
                 int newperiod;
-                retval = compare_fn(sreq, buffer, ptr, DV_LOOPS);
+                retval = compare_fn(sdev, buffer, ptr, DV_LOOPS);
 
                 if (retval == SPI_COMPARE_SUCCESS
                     || retval == SPI_COMPARE_SKIP_TEST)
@@ -726,9 +730,9 @@ spi_dv_retrain(struct scsi_request *sreq, u8 *buffer, u8 *ptr,
 }
 
 static int
-spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
+spi_dv_device_get_echo_buffer(struct scsi_device *sdev, u8 *buffer)
 {
-        int l;
+        int l, result;
 
         /* first off do a test unit ready.  This can error out 
          * because of reservations or some other reason.  If it
@@ -744,18 +748,16 @@ spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
         };
 
         
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_NONE;
-
         /* We send a set of three TURs to clear any outstanding 
          * unit attention conditions if they exist (Otherwise the
          * buffer tests won't be happy).  If the TUR still fails
          * (reservation conflict, device not ready, etc) just
          * skip the write tests */
         for (l = 0; ; l++) {
-                spi_wait_req(sreq, spi_test_unit_ready, NULL, 0);
+                result = spi_execute(sdev, spi_test_unit_ready, DMA_NONE, 
+                                     NULL, 0, NULL);
 
-                if(sreq->sr_result) {
+                if(result) {
                         if(l >= 3)
                                 return 0;
                 } else {
@@ -764,12 +766,10 @@ spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
                 }
         }
 
-        sreq->sr_cmd_len = 0;
-        sreq->sr_data_direction = DMA_FROM_DEVICE;
-
-        spi_wait_req(sreq, spi_read_buffer_descriptor, buffer, 4);
+        result = spi_execute(sdev, spi_read_buffer_descriptor, 
+                             DMA_FROM_DEVICE, buffer, 4, NULL);
 
-        if (sreq->sr_result)
+        if (result)
                 /* Device has no echo buffer */
                 return 0;
 
@@ -777,17 +777,16 @@ spi_dv_device_get_echo_buffer(struct scsi_request *sreq, u8 *buffer)
 }
 
 static void
-spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
+spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
 {
-        struct spi_internal *i = to_spi_internal(sreq->sr_host->transportt);
-        struct scsi_device *sdev = sreq->sr_device;
+        struct spi_internal *i = to_spi_internal(sdev->host->transportt);
         struct scsi_target *starget = sdev->sdev_target;
         int len = sdev->inquiry_len;
         /* first set us up for narrow async */
         DV_SET(offset, 0);
         DV_SET(width, 0);
         
-        if (spi_dv_device_compare_inquiry(sreq, buffer, buffer, DV_LOOPS)
+        if (spi_dv_device_compare_inquiry(sdev, buffer, buffer, DV_LOOPS)
             != SPI_COMPARE_SUCCESS) {
                 SPI_PRINTK(starget, KERN_ERR, "Domain Validation Initial Inquiry Failed\n");
                 /* FIXME: should probably offline the device here? */
@@ -799,7 +798,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
             scsi_device_wide(sdev)) {
                 i->f->set_width(starget, 1);
 
-                if (spi_dv_device_compare_inquiry(sreq, buffer,
+                if (spi_dv_device_compare_inquiry(sdev, buffer,
                                                    buffer + len,
                                                    DV_LOOPS)
                     != SPI_COMPARE_SUCCESS) {
@@ -820,7 +819,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
 
         len = 0;
         if (scsi_device_dt(sdev))
-                len = spi_dv_device_get_echo_buffer(sreq, buffer);
+                len = spi_dv_device_get_echo_buffer(sdev, buffer);
 
  retry:
 
@@ -846,7 +845,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
 
         if (len == 0) {
                 SPI_PRINTK(starget, KERN_INFO, "Domain Validation skipping write tests\n");
-                spi_dv_retrain(sreq, buffer, buffer + len,
+                spi_dv_retrain(sdev, buffer, buffer + len,
                                spi_dv_device_compare_inquiry);
                 return;
         }
@@ -856,7 +855,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
                 len = SPI_MAX_ECHO_BUFFER_SIZE;
         }
 
-        if (spi_dv_retrain(sreq, buffer, buffer + len,
+        if (spi_dv_retrain(sdev, buffer, buffer + len,
                            spi_dv_device_echo_buffer)
             == SPI_COMPARE_SKIP_TEST) {
                 /* OK, the stupid drive can't do a write echo buffer
@@ -879,16 +878,12 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
 void
 spi_dv_device(struct scsi_device *sdev)
 {
-        struct scsi_request *sreq = scsi_allocate_request(sdev, GFP_KERNEL);
         struct scsi_target *starget = sdev->sdev_target;
         u8 *buffer;
         const int len = SPI_MAX_ECHO_BUFFER_SIZE*2;
 
-        if (unlikely(!sreq))
-                return;
-
         if (unlikely(scsi_device_get(sdev)))
-                goto out_free_req;
+                return;
 
         buffer = kmalloc(len, GFP_KERNEL);
 
@@ -909,7 +904,7 @@ spi_dv_device(struct scsi_device *sdev)
 
         SPI_PRINTK(starget, KERN_INFO, "Beginning Domain Validation\n");
 
-        spi_dv_device_internal(sreq, buffer);
+        spi_dv_device_internal(sdev, buffer);
 
         SPI_PRINTK(starget, KERN_INFO, "Ending Domain Validation\n");
 
@@ -924,8 +919,6 @@ spi_dv_device(struct scsi_device *sdev)
         kfree(buffer);
  out_put:
         scsi_device_put(sdev);
- out_free_req:
-        scsi_release_request(sreq);
 }
 EXPORT_SYMBOL(spi_dv_device);
 
@@ -1028,10 +1021,17 @@ void spi_display_xfer_agreement(struct scsi_target *starget)
                 sprint_frac(tmp, picosec, 1000);
 
                 dev_info(&starget->dev,
-                        "%s %sSCSI %d.%d MB/s %s%s%s (%s ns, offset %d)\n",
-                        scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10,
-                        tp->dt ? "DT" : "ST", tp->iu ? " IU" : "",
-                        tp->qas  ? " QAS" : "", tmp, tp->offset);
+                         "%s %sSCSI %d.%d MB/s %s%s%s%s%s%s%s%s (%s ns, offset %d)\n",
+                         scsi, tp->width ? "WIDE " : "", kb100/10, kb100 % 10,
+                         tp->dt ? "DT" : "ST",
+                         tp->iu ? " IU" : "",
+                         tp->qas  ? " QAS" : "",
+                         tp->rd_strm ? " RDSTRM" : "",
+                         tp->rti ? " RTI" : "",
+                         tp->wr_flow ? " WRFLOW" : "",
+                         tp->pcomp_en ? " PCOMP" : "",
+                         tp->hold_mcs ? " HMCS" : "",
+                         tmp, tp->offset);
         } else {
                 dev_info(&starget->dev, "%sasynchronous.\n",
                                 tp->width ? "wide " : "");
@@ -1073,6 +1073,7 @@ static int spi_device_match(struct attribute_container *cont,
 {
         struct scsi_device *sdev;
         struct Scsi_Host *shost;
+        struct spi_internal *i;
 
         if (!scsi_is_sdev_device(dev))
                 return 0;
@@ -1085,6 +1086,9 @@ static int spi_device_match(struct attribute_container *cont,
         /* Note: this class has no device attributes, so it has
          * no per-HBA allocation and thus we don't need to distinguish
          * the attribute containers for the device */
+        i = to_spi_internal(shost->transportt);
+        if (i->f->deny_binding && i->f->deny_binding(sdev->sdev_target))
+                return 0;
         return 1;
 }
 
@@ -1092,6 +1096,7 @@ static int spi_target_match(struct attribute_container *cont,
                             struct device *dev)
 {
         struct Scsi_Host *shost;
+        struct scsi_target *starget;
         struct spi_internal *i;
 
         if (!scsi_is_target_device(dev))
@@ -1103,7 +1108,11 @@ static int spi_target_match(struct attribute_container *cont,
                 return 0;
 
         i = to_spi_internal(shost->transportt);
-        
+        starget = to_scsi_target(dev);
+
+        if (i->f->deny_binding && i->f->deny_binding(starget))
+                return 0;
+
         return &i->t.target_attrs.ac == cont;
 }
 
@@ -1154,6 +1163,7 @@ spi_attach_transport(struct spi_function_template *ft)
         SETUP_ATTRIBUTE(rd_strm);
         SETUP_ATTRIBUTE(rti);
         SETUP_ATTRIBUTE(pcomp_en);
+        SETUP_ATTRIBUTE(hold_mcs);
 
         /* if you add an attribute but forget to increase SPI_NUM_ATTRS
          * this bug will trigger */
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 0410e1bf109a..de564b386052 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -59,7 +59,6 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_request.h>
 #include <scsi/scsicam.h>
 
 #include "scsi_logging.h"
@@ -125,7 +124,7 @@ static int sd_issue_flush(struct device *, sector_t *);
 static void sd_end_flush(request_queue_t *, struct request *);
 static int sd_prepare_flush(request_queue_t *, struct request *);
 static void sd_read_capacity(struct scsi_disk *sdkp, char *diskname,
-                 struct scsi_request *SRpnt, unsigned char *buffer);
+                             unsigned char *buffer);
 
 static struct scsi_driver sd_template = {
         .owner                  = THIS_MODULE,
@@ -682,19 +681,13 @@ not_present:
 
 static int sd_sync_cache(struct scsi_device *sdp)
 {
-        struct scsi_request *sreq;
         int retries, res;
+        struct scsi_sense_hdr sshdr;
 
         if (!scsi_device_online(sdp))
                 return -ENODEV;
 
-        sreq = scsi_allocate_request(sdp, GFP_KERNEL);
-        if (!sreq) {
-                printk("FAILED\n  No memory for request\n");
-                return -ENOMEM;
-        }
 
-        sreq->sr_data_direction = DMA_NONE;
         for (retries = 3; retries > 0; --retries) {
                 unsigned char cmd[10] = { 0 };
 
@@ -703,22 +696,20 @@ static int sd_sync_cache(struct scsi_device *sdp)
                  * Leave the rest of the command zero to indicate
                  * flush everything.
                  */
-                scsi_wait_req(sreq, cmd, NULL, 0, SD_TIMEOUT, SD_MAX_RETRIES);
-                if (sreq->sr_result == 0)
+                res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
+                                       SD_TIMEOUT, SD_MAX_RETRIES);
+                if (res == 0)
                         break;
         }
 
-        res = sreq->sr_result;
-        if (res) {
-                printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
+        if (res) {              printk(KERN_WARNING "FAILED\n  status = %x, message = %02x, "
                                     "host = %d, driver = %02x\n  ",
                                     status_byte(res), msg_byte(res),
                                     host_byte(res), driver_byte(res));
                         if (driver_byte(res) & DRIVER_SENSE)
-                                scsi_print_req_sense("sd", sreq);
+                                scsi_print_sense_hdr("sd", &sshdr);
         }
 
-        scsi_release_request(sreq);
         return res;
 }
 
@@ -957,22 +948,19 @@ static void sd_rw_intr(struct scsi_cmnd * SCpnt)
         scsi_io_completion(SCpnt, good_bytes, block_sectors << 9);
 }
 
-static int media_not_present(struct scsi_disk *sdkp, struct scsi_request *srp)
+static int media_not_present(struct scsi_disk *sdkp,
+                             struct scsi_sense_hdr *sshdr)
 {
-        struct scsi_sense_hdr sshdr;
 
-        if (!srp->sr_result)
-                return 0;
-        if (!(driver_byte(srp->sr_result) & DRIVER_SENSE))
+        if (!scsi_sense_valid(sshdr))
                 return 0;
         /* not invoked for commands that could return deferred errors */
-        if (scsi_request_normalize_sense(srp, &sshdr)) {
-                if (sshdr.sense_key != NOT_READY &&
-                    sshdr.sense_key != UNIT_ATTENTION)
-                        return 0;
-                if (sshdr.asc != 0x3A) /* medium not present */
-                        return 0;
-        }
+        if (sshdr->sense_key != NOT_READY &&
+            sshdr->sense_key != UNIT_ATTENTION)
+                return 0;
+        if (sshdr->asc != 0x3A) /* medium not present */
+                return 0;
+
         set_media_not_present(sdkp);
         return 1;
 }
@@ -981,10 +969,10 @@ static int media_not_present(struct scsi_disk *sdkp, struct scsi_request *srp)
  * spinup disk - called only in sd_revalidate_disk()
  */
 static void
-sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
-               struct scsi_request *SRpnt, unsigned char *buffer) {
+sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
+{
         unsigned char cmd[10];
-        unsigned long spintime_value = 0;
+        unsigned long spintime_expire = 0;
         int retries, spintime;
         unsigned int the_result;
         struct scsi_sense_hdr sshdr;
@@ -1001,18 +989,13 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
                         cmd[0] = TEST_UNIT_READY;
                         memset((void *) &cmd[1], 0, 9);
 
-                        SRpnt->sr_cmd_len = 0;
-                        memset(SRpnt->sr_sense_buffer, 0,
-                               SCSI_SENSE_BUFFERSIZE);
-                        SRpnt->sr_data_direction = DMA_NONE;
+                        the_result = scsi_execute_req(sdkp->device, cmd,
+                                                      DMA_NONE, NULL, 0,
+                                                      &sshdr, SD_TIMEOUT,
+                                                      SD_MAX_RETRIES);
 
-                        scsi_wait_req (SRpnt, (void *) cmd, (void *) buffer,
-                                       0/*512*/, SD_TIMEOUT, SD_MAX_RETRIES);
-
-                        the_result = SRpnt->sr_result;
                         if (the_result)
-                                sense_valid = scsi_request_normalize_sense(
-                                                        SRpnt, &sshdr);
+                                sense_valid = scsi_sense_valid(&sshdr);
                         retries++;
                 } while (retries < 3 && 
                          (!scsi_status_is_good(the_result) ||
@@ -1024,7 +1007,7 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
                  * any media in it, don't bother with any of the rest of
                  * this crap.
                  */
-                if (media_not_present(sdkp, SRpnt))
+                if (media_not_present(sdkp, &sshdr))
                         return;
 
                 if ((driver_byte(the_result) & DRIVER_SENSE) == 0) {
@@ -1063,33 +1046,42 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
                                 cmd[1] = 1;     /* Return immediately */
                                 memset((void *) &cmd[2], 0, 8);
                                 cmd[4] = 1;     /* Start spin cycle */
-                                SRpnt->sr_cmd_len = 0;
-                                memset(SRpnt->sr_sense_buffer, 0,
-                                        SCSI_SENSE_BUFFERSIZE);
-
-                                SRpnt->sr_data_direction = DMA_NONE;
-                                scsi_wait_req(SRpnt, (void *)cmd, 
-                                              (void *) buffer, 0/*512*/, 
-                                              SD_TIMEOUT, SD_MAX_RETRIES);
-                                spintime_value = jiffies;
+                                scsi_execute_req(sdkp->device, cmd, DMA_NONE,
+                                                 NULL, 0, &sshdr,
+                                                 SD_TIMEOUT, SD_MAX_RETRIES);
+                                spintime_expire = jiffies + 100 * HZ;
+                                spintime = 1;
                         }
-                        spintime = 1;
                         /* Wait 1 second for next try */
                         msleep(1000);
                         printk(".");
+
+                /*
+                 * Wait for USB flash devices with slow firmware.
+                 * Yes, this sense key/ASC combination shouldn't
+                 * occur here.  It's characteristic of these devices.
+                 */
+                } else if (sense_valid &&
+                                sshdr.sense_key == UNIT_ATTENTION &&
+                                sshdr.asc == 0x28) {
+                        if (!spintime) {
+                                spintime_expire = jiffies + 5 * HZ;
+                                spintime = 1;
+                        }
+                        /* Wait 1 second for next try */
+                        msleep(1000);
                 } else {
                         /* we don't understand the sense code, so it's
                          * probably pointless to loop */
                         if(!spintime) {
                                 printk(KERN_NOTICE "%s: Unit Not Ready, "
                                         "sense:\n", diskname);
-                                scsi_print_req_sense("", SRpnt);
+                                scsi_print_sense_hdr("", &sshdr);
                         }
                         break;
                 }
                                 
-        } while (spintime &&
-                 time_after(spintime_value + 100 * HZ, jiffies));
+        } while (spintime && time_before_eq(jiffies, spintime_expire));
 
         if (spintime) {
                 if (scsi_status_is_good(the_result))
@@ -1104,14 +1096,15 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname,
  */
 static void
 sd_read_capacity(struct scsi_disk *sdkp, char *diskname,
-                 struct scsi_request *SRpnt, unsigned char *buffer) {
+                 unsigned char *buffer)
+{
         unsigned char cmd[16];
-        struct scsi_device *sdp = sdkp->device;
         int the_result, retries;
         int sector_size = 0;
         int longrc = 0;
         struct scsi_sense_hdr sshdr;
         int sense_valid = 0;
+        struct scsi_device *sdp = sdkp->device;
 
 repeat:
         retries = 3;
@@ -1128,20 +1121,15 @@ repeat:
                         memset((void *) buffer, 0, 8);
                 }
                 
-                SRpnt->sr_cmd_len = 0;
-                memset(SRpnt->sr_sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
-                SRpnt->sr_data_direction = DMA_FROM_DEVICE;
-
-                scsi_wait_req(SRpnt, (void *) cmd, (void *) buffer,
-                              longrc ? 12 : 8, SD_TIMEOUT, SD_MAX_RETRIES);
+                the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
+                                              buffer, longrc ? 12 : 8, &sshdr,
+                                              SD_TIMEOUT, SD_MAX_RETRIES);
 
-                if (media_not_present(sdkp, SRpnt))
+                if (media_not_present(sdkp, &sshdr))
                         return;
 
-                the_result = SRpnt->sr_result;
                 if (the_result)
-                        sense_valid = scsi_request_normalize_sense(SRpnt,
-                                                                   &sshdr);
+                        sense_valid = scsi_sense_valid(&sshdr);
                 retries--;
 
         } while (the_result && retries);
@@ -1156,7 +1144,7 @@ repeat:
                        driver_byte(the_result));
 
                 if (driver_byte(the_result) & DRIVER_SENSE)
-                        scsi_print_req_sense("sd", SRpnt);
+                        scsi_print_sense_hdr("sd", &sshdr);
                 else
                         printk("%s : sense not available. \n", diskname);
 
@@ -1296,11 +1284,13 @@ got_data:
 
 /* called with buffer of length 512 */
 static inline int
-sd_do_mode_sense(struct scsi_request *SRpnt, int dbd, int modepage,
-                 unsigned char *buffer, int len, struct scsi_mode_data *data)
+sd_do_mode_sense(struct scsi_device *sdp, int dbd, int modepage,
+                 unsigned char *buffer, int len, struct scsi_mode_data *data,
+                 struct scsi_sense_hdr *sshdr)
 {
-        return __scsi_mode_sense(SRpnt, dbd, modepage, buffer, len,
-                                 SD_TIMEOUT, SD_MAX_RETRIES, data);
+        return scsi_mode_sense(sdp, dbd, modepage, buffer, len,
+                               SD_TIMEOUT, SD_MAX_RETRIES, data,
+                               sshdr);
 }
 
 /*
@@ -1309,25 +1299,27 @@ sd_do_mode_sense(struct scsi_request *SRpnt, int dbd, int modepage,
  */
 static void
 sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
-                   struct scsi_request *SRpnt, unsigned char *buffer) {
+                           unsigned char *buffer)
+{
         int res;
+        struct scsi_device *sdp = sdkp->device;
         struct scsi_mode_data data;
 
         set_disk_ro(sdkp->disk, 0);
-        if (sdkp->device->skip_ms_page_3f) {
+        if (sdp->skip_ms_page_3f) {
                 printk(KERN_NOTICE "%s: assuming Write Enabled\n", diskname);
                 return;
         }
 
-        if (sdkp->device->use_192_bytes_for_3f) {
-                res = sd_do_mode_sense(SRpnt, 0, 0x3F, buffer, 192, &data);
+        if (sdp->use_192_bytes_for_3f) {
+                res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 192, &data, NULL);
         } else {
                 /*
                  * First attempt: ask for all pages (0x3F), but only 4 bytes.
                  * We have to start carefully: some devices hang if we ask
                  * for more than is available.
                  */
-                res = sd_do_mode_sense(SRpnt, 0, 0x3F, buffer, 4, &data);
+                res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 4, &data, NULL);
 
                 /*
                  * Second attempt: ask for page 0 When only page 0 is
@@ -1336,14 +1328,14 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
                  * CDB.
                  */
                 if (!scsi_status_is_good(res))
-                        res = sd_do_mode_sense(SRpnt, 0, 0, buffer, 4, &data);
+                        res = sd_do_mode_sense(sdp, 0, 0, buffer, 4, &data, NULL);
 
                 /*
                  * Third attempt: ask 255 bytes, as we did earlier.
                  */
                 if (!scsi_status_is_good(res))
-                        res = sd_do_mode_sense(SRpnt, 0, 0x3F, buffer, 255,
-                                               &data);
+                        res = sd_do_mode_sense(sdp, 0, 0x3F, buffer, 255,
+                                               &data, NULL);
         }
 
         if (!scsi_status_is_good(res)) {
@@ -1365,19 +1357,20 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, char *diskname,
  */
 static void
 sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
-                   struct scsi_request *SRpnt, unsigned char *buffer)
+                   unsigned char *buffer)
 {
         int len = 0, res;
+        struct scsi_device *sdp = sdkp->device;
 
         int dbd;
         int modepage;
         struct scsi_mode_data data;
         struct scsi_sense_hdr sshdr;
 
-        if (sdkp->device->skip_ms_page_8)
+        if (sdp->skip_ms_page_8)
                 goto defaults;
 
-        if (sdkp->device->type == TYPE_RBC) {
+        if (sdp->type == TYPE_RBC) {
                 modepage = 6;
                 dbd = 8;
         } else {
@@ -1386,7 +1379,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
         }
 
         /* cautiously ask */
-        res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, 4, &data);
+        res = sd_do_mode_sense(sdp, dbd, modepage, buffer, 4, &data, &sshdr);
 
         if (!scsi_status_is_good(res))
                 goto bad_sense;
@@ -1407,7 +1400,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
         len += data.header_length + data.block_descriptor_length;
 
         /* Get the data */
-        res = sd_do_mode_sense(SRpnt, dbd, modepage, buffer, len, &data);
+        res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr);
 
         if (scsi_status_is_good(res)) {
                 const char *types[] = {
@@ -1439,7 +1432,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, char *diskname,
         }
 
 bad_sense:
-        if (scsi_request_normalize_sense(SRpnt, &sshdr) &&
+        if (scsi_sense_valid(&sshdr) &&
             sshdr.sense_key == ILLEGAL_REQUEST &&
             sshdr.asc == 0x24 && sshdr.ascq == 0x0)
                 printk(KERN_NOTICE "%s: cache data unavailable\n",
@@ -1464,7 +1457,6 @@ static int sd_revalidate_disk(struct gendisk *disk)
 {
         struct scsi_disk *sdkp = scsi_disk(disk);
         struct scsi_device *sdp = sdkp->device;
-        struct scsi_request *sreq;
         unsigned char *buffer;
 
         SCSI_LOG_HLQUEUE(3, printk("sd_revalidate_disk: disk=%s\n", disk->disk_name));
@@ -1476,18 +1468,11 @@ static int sd_revalidate_disk(struct gendisk *disk)
         if (!scsi_device_online(sdp))
                 goto out;
 
-        sreq = scsi_allocate_request(sdp, GFP_KERNEL);
-        if (!sreq) {
-                printk(KERN_WARNING "(sd_revalidate_disk:) Request allocation "
-                       "failure.\n");
-                goto out;
-        }
-
         buffer = kmalloc(512, GFP_KERNEL | __GFP_DMA);
         if (!buffer) {
                 printk(KERN_WARNING "(sd_revalidate_disk:) Memory allocation "
                        "failure.\n");
-                goto out_release_request;
+                goto out;
         }
 
         /* defaults, until the device tells us otherwise */
@@ -1498,25 +1483,23 @@ static int sd_revalidate_disk(struct gendisk *disk)
         sdkp->WCE = 0;
         sdkp->RCD = 0;
 
-        sd_spinup_disk(sdkp, disk->disk_name, sreq, buffer);
+        sd_spinup_disk(sdkp, disk->disk_name);
 
         /*
          * Without media there is no reason to ask; moreover, some devices
          * react badly if we do.
          */
         if (sdkp->media_present) {
-                sd_read_capacity(sdkp, disk->disk_name, sreq, buffer);
+                sd_read_capacity(sdkp, disk->disk_name, buffer);
                 if (sdp->removable)
                         sd_read_write_protect_flag(sdkp, disk->disk_name,
-                                        sreq, buffer);
-                sd_read_cache_type(sdkp, disk->disk_name, sreq, buffer);
+                                                   buffer);
+                sd_read_cache_type(sdkp, disk->disk_name, buffer);
         }
                 
         set_capacity(disk, sdkp->capacity);
         kfree(buffer);
 
- out_release_request: 
-        scsi_release_request(sreq);
  out:
         return 0;
 }
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index e822ca0e97cf..b1b69d738d08 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -61,7 +61,7 @@ static int sg_version_num = 30533;	/* 2 digits for each component */
 
 #ifdef CONFIG_SCSI_PROC_FS
 #include <linux/proc_fs.h>
-static char *sg_version_date = "20050328";
+static char *sg_version_date = "20050901";
 
 static int sg_proc_init(void);
 static void sg_proc_cleanup(void);
@@ -1027,8 +1027,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
                 if (sdp->detached)
                         return -ENODEV;
                 if (filp->f_flags & O_NONBLOCK) {
-                        if (test_bit(SHOST_RECOVERY,
-                                     &sdp->device->host->shost_state))
+                        if (sdp->device->host->shost_state == SHOST_RECOVERY)
                                 return -EBUSY;
                 } else if (!scsi_block_when_processing_errors(sdp->device))
                         return -EBUSY;
@@ -1795,12 +1794,12 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,
                   unsigned long uaddr, size_t count, int rw,
                   unsigned long max_pfn)
 {
+        unsigned long end = (uaddr + count + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        unsigned long start = uaddr >> PAGE_SHIFT;
+        const int nr_pages = end - start;
         int res, i, j;
-        unsigned int nr_pages;
         struct page **pages;
 
-        nr_pages = ((uaddr & ~PAGE_MASK) + count + ~PAGE_MASK) >> PAGE_SHIFT;
-
         /* User attempted Overflow! */
         if ((uaddr + count) < uaddr)
                 return -EINVAL;
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 2f259f249522..ce63fc8312dc 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -50,10 +50,10 @@
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_driver.h>
+#include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>    /* For the door lock/unlock commands */
-#include <scsi/scsi_request.h>
 
 #include "scsi_logging.h"
 #include "sr.h"
@@ -199,15 +199,7 @@ int sr_media_change(struct cdrom_device_info *cdi, int slot)
                 /* check multisession offset etc */
                 sr_cd_check(cdi);
 
-                /* 
-                 * If the disk changed, the capacity will now be different,
-                 * so we force a re-read of this information 
-                 * Force 2048 for the sector size so that filesystems won't
-                 * be trying to use something that is too small if the disc
-                 * has changed.
-                 */
-                cd->needs_sector_size = 1;
-                cd->device->sector_size = 2048;
+                get_sectorsize(cd);
         }
         return retval;
 }
@@ -538,13 +530,6 @@ static int sr_open(struct cdrom_device_info *cdi, int purpose)
         if (!scsi_block_when_processing_errors(sdev))
                 goto error_out;
 
-        /*
-         * If this device did not have media in the drive at boot time, then
-         * we would have been unable to get the sector size.  Check to see if
-         * this is the case, and try again.
-         */
-        if (cd->needs_sector_size)
-                get_sectorsize(cd);
         return 0;
 
 error_out:
@@ -604,7 +589,6 @@ static int sr_probe(struct device *dev)
         cd->driver = &sr_template;
         cd->disk = disk;
         cd->capacity = 0x1fffff;
-        cd->needs_sector_size = 1;
         cd->device->changed = 1;        /* force recheck CD type */
         cd->use = 1;
         cd->readcd_known = 0;
@@ -658,43 +642,30 @@ static void get_sectorsize(struct scsi_cd *cd)
         unsigned char *buffer;
         int the_result, retries = 3;
         int sector_size;
-        struct scsi_request *SRpnt = NULL;
         request_queue_t *queue;
 
         buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
         if (!buffer)
                 goto Enomem;
-        SRpnt = scsi_allocate_request(cd->device, GFP_KERNEL);
-        if (!SRpnt)
-                goto Enomem;
 
         do {
                 cmd[0] = READ_CAPACITY;
                 memset((void *) &cmd[1], 0, 9);
-                /* Mark as really busy */
-                SRpnt->sr_request->rq_status = RQ_SCSI_BUSY;
-                SRpnt->sr_cmd_len = 0;
-
                 memset(buffer, 0, 8);
 
                 /* Do the command and wait.. */
-                SRpnt->sr_data_direction = DMA_FROM_DEVICE;
-                scsi_wait_req(SRpnt, (void *) cmd, (void *) buffer,
-                              8, SR_TIMEOUT, MAX_RETRIES);
+                the_result = scsi_execute_req(cd->device, cmd, DMA_FROM_DEVICE,
+                                              buffer, 8, NULL, SR_TIMEOUT,
+                                              MAX_RETRIES);
 
-                the_result = SRpnt->sr_result;
                 retries--;
 
         } while (the_result && retries);
 
 
-        scsi_release_request(SRpnt);
-        SRpnt = NULL;
-
         if (the_result) {
                 cd->capacity = 0x1fffff;
                 sector_size = 2048;     /* A guess, just in case */
-                cd->needs_sector_size = 1;
         } else {
 #if 0
                 if (cdrom_get_last_written(&cd->cdi,
@@ -727,7 +698,6 @@ static void get_sectorsize(struct scsi_cd *cd)
                         printk("%s: unsupported sector size %d.\n",
                                cd->cdi.name, sector_size);
                         cd->capacity = 0;
-                        cd->needs_sector_size = 1;
                 }
 
                 cd->device->sector_size = sector_size;
@@ -736,7 +706,6 @@ static void get_sectorsize(struct scsi_cd *cd)
                  * Add this so that we have the ability to correctly gauge
                  * what the device is capable of.
                  */
-                cd->needs_sector_size = 0;
                 set_capacity(cd->disk, cd->capacity);
         }
 
@@ -748,10 +717,7 @@ out:
 
 Enomem:
         cd->capacity = 0x1fffff;
-        sector_size = 2048;     /* A guess, just in case */
-        cd->needs_sector_size = 1;
-        if (SRpnt)
-                scsi_release_request(SRpnt);
+        cd->device->sector_size = 2048; /* A guess, just in case */
         goto out;
 }
 
@@ -759,8 +725,8 @@ static void get_capabilities(struct scsi_cd *cd)
 {
         unsigned char *buffer;
         struct scsi_mode_data data;
-        struct scsi_request *SRpnt;
         unsigned char cmd[MAX_COMMAND_SIZE];
+        struct scsi_sense_hdr sshdr;
         unsigned int the_result;
         int retries, rc, n;
 
@@ -776,19 +742,11 @@ static void get_capabilities(struct scsi_cd *cd)
                 ""
         };
 
-        /* allocate a request for the TEST_UNIT_READY */
-        SRpnt = scsi_allocate_request(cd->device, GFP_KERNEL);
-        if (!SRpnt) {
-                printk(KERN_WARNING "(get_capabilities:) Request allocation "
-                       "failure.\n");
-                return;
-        }
 
         /* allocate transfer buffer */
         buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
         if (!buffer) {
                 printk(KERN_ERR "sr: out of memory.\n");
-                scsi_release_request(SRpnt);
                 return;
         }
 
@@ -800,24 +758,19 @@ static void get_capabilities(struct scsi_cd *cd)
                 memset((void *)cmd, 0, MAX_COMMAND_SIZE);
                 cmd[0] = TEST_UNIT_READY;
 
-                SRpnt->sr_cmd_len = 0;
-                SRpnt->sr_sense_buffer[0] = 0;
-                SRpnt->sr_sense_buffer[2] = 0;
-                SRpnt->sr_data_direction = DMA_NONE;
-
-                scsi_wait_req (SRpnt, (void *) cmd, buffer,
-                               0, SR_TIMEOUT, MAX_RETRIES);
+                the_result = scsi_execute_req (cd->device, cmd, DMA_NONE, NULL,
+                                               0, &sshdr, SR_TIMEOUT,
+                                               MAX_RETRIES);
 
-                the_result = SRpnt->sr_result;
                 retries++;
         } while (retries < 5 && 
                  (!scsi_status_is_good(the_result) ||
-                  ((driver_byte(the_result) & DRIVER_SENSE) &&
-                   SRpnt->sr_sense_buffer[2] == UNIT_ATTENTION)));
+                  (scsi_sense_valid(&sshdr) &&
+                   sshdr.sense_key == UNIT_ATTENTION)));
 
         /* ask for mode page 0x2a */
         rc = scsi_mode_sense(cd->device, 0, 0x2a, buffer, 128,
-                             SR_TIMEOUT, 3, &data);
+                             SR_TIMEOUT, 3, &data, NULL);
 
         if (!scsi_status_is_good(rc)) {
                 /* failed, drive doesn't have capabilities mode page */
@@ -825,7 +778,6 @@ static void get_capabilities(struct scsi_cd *cd)
                 cd->cdi.mask |= (CDC_CD_R | CDC_CD_RW | CDC_DVD_R |
                                          CDC_DVD | CDC_DVD_RAM |
                                          CDC_SELECT_DISC | CDC_SELECT_SPEED);
-                scsi_release_request(SRpnt);
                 kfree(buffer);
                 printk("%s: scsi-1 drive\n", cd->cdi.name);
                 return;
@@ -885,7 +837,6 @@ static void get_capabilities(struct scsi_cd *cd)
                 cd->device->writeable = 1;
         }
 
-        scsi_release_request(SRpnt);
         kfree(buffer);
 }
 
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h
index 0b3178007203..d2bcd99c272f 100644
--- a/drivers/scsi/sr.h
+++ b/drivers/scsi/sr.h
@@ -33,7 +33,6 @@ typedef struct scsi_cd {
         struct scsi_device *device;
         unsigned int vendor;    /* vendor code, see sr_vendor.c         */
         unsigned long ms_offset;        /* for reading multisession-CD's        */
-        unsigned needs_sector_size:1;   /* needs to get sector size */
         unsigned use:1;         /* is this device still supportable     */
         unsigned xa_flag:1;     /* CD has XA sectors ? */
         unsigned readcd_known:1;        /* drive supports READ_CD (0xbe) */
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 82d68fdb1548..6e45ac3c43c5 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -17,7 +17,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
-#include <scsi/scsi_request.h>
+#include <scsi/scsi_cmnd.h>
 
 #include "sr.h"
 
@@ -84,41 +84,37 @@ static int sr_fake_playtrkind(struct cdrom_device_info *cdi, struct cdrom_ti *ti
 
 int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
 {
-        struct scsi_request *SRpnt;
         struct scsi_device *SDev;
-        struct request *req;
+        struct scsi_sense_hdr sshdr;
         int result, err = 0, retries = 0;
+        struct request_sense *sense = cgc->sense;
 
         SDev = cd->device;
-        SRpnt = scsi_allocate_request(SDev, GFP_KERNEL);
-        if (!SRpnt) {
-                printk(KERN_ERR "Unable to allocate SCSI request in sr_do_ioctl");
-                err = -ENOMEM;
-                goto out;
-        }
-        SRpnt->sr_data_direction = cgc->data_direction;
+
+        if (!sense) {
+                sense = kmalloc(sizeof(*sense), GFP_KERNEL);
+                if (!sense) {
+                        err = -ENOMEM;
+                        goto out;
+                }
+        }
 
       retry:
         if (!scsi_block_when_processing_errors(SDev)) {
                 err = -ENODEV;
-                goto out_free;
+                goto out;
         }
 
-        scsi_wait_req(SRpnt, cgc->cmd, cgc->buffer, cgc->buflen,
-                      cgc->timeout, IOCTL_RETRIES);
-
-        req = SRpnt->sr_request;
-        if (SRpnt->sr_buffer && req->buffer && SRpnt->sr_buffer != req->buffer) {
-                memcpy(req->buffer, SRpnt->sr_buffer, SRpnt->sr_bufflen);
-                kfree(SRpnt->sr_buffer);
-                SRpnt->sr_buffer = req->buffer;
-        }
+        memset(sense, 0, sizeof(*sense));
+        result = scsi_execute(SDev, cgc->cmd, cgc->data_direction,
+                              cgc->buffer, cgc->buflen, (char *)sense,
+                              cgc->timeout, IOCTL_RETRIES, 0);
 
-        result = SRpnt->sr_result;
+        scsi_normalize_sense((char *)sense, sizeof(*sense), &sshdr);
 
         /* Minimal error checking.  Ignore cases we know about, and report the rest. */
         if (driver_byte(result) != 0) {
-                switch (SRpnt->sr_sense_buffer[2] & 0xf) {
+                switch (sshdr.sense_key) {
                 case UNIT_ATTENTION:
                         SDev->changed = 1;
                         if (!cgc->quiet)
@@ -128,8 +124,8 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                         err = -ENOMEDIUM;
                         break;
                 case NOT_READY: /* This happens if there is no disc in drive */
-                        if (SRpnt->sr_sense_buffer[12] == 0x04 &&
-                            SRpnt->sr_sense_buffer[13] == 0x01) {
+                        if (sshdr.asc == 0x04 &&
+                            sshdr.ascq == 0x01) {
                                 /* sense: Logical unit is in process of becoming ready */
                                 if (!cgc->quiet)
                                         printk(KERN_INFO "%s: CDROM not ready yet.\n", cd->cdi.name);
@@ -146,37 +142,33 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
                         if (!cgc->quiet)
                                 printk(KERN_INFO "%s: CDROM not ready.  Make sure there is a disc in the drive.\n", cd->cdi.name);
 #ifdef DEBUG
-                        scsi_print_req_sense("sr", SRpnt);
+                        scsi_print_sense_hdr("sr", &sshdr);
 #endif
                         err = -ENOMEDIUM;
                         break;
                 case ILLEGAL_REQUEST:
                         err = -EIO;
-                        if (SRpnt->sr_sense_buffer[12] == 0x20 &&
-                            SRpnt->sr_sense_buffer[13] == 0x00)
+                        if (sshdr.asc == 0x20 &&
+                            sshdr.ascq == 0x00)
                                 /* sense: Invalid command operation code */
                                 err = -EDRIVE_CANT_DO_THIS;
 #ifdef DEBUG
                         __scsi_print_command(cgc->cmd);
-                        scsi_print_req_sense("sr", SRpnt);
+                        scsi_print_sense_hdr("sr", &sshdr);
 #endif
                         break;
                 default:
                         printk(KERN_ERR "%s: CDROM (ioctl) error, command: ", cd->cdi.name);
                         __scsi_print_command(cgc->cmd);
-                        scsi_print_req_sense("sr", SRpnt);
+                        scsi_print_sense_hdr("sr", &sshdr);
                         err = -EIO;
                 }
         }
 
-        if (cgc->sense)
-                memcpy(cgc->sense, SRpnt->sr_sense_buffer, sizeof(*cgc->sense));
-
         /* Wake up a process waiting for device */
-      out_free:
-        scsi_release_request(SRpnt);
-        SRpnt = NULL;
       out:
+        if (!cgc->sense)
+                kfree(sense);
         cgc->stat = err;
         return err;
 }
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 0a7839db5752..a93308ae9736 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -17,7 +17,7 @@
    Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
  */
 
-static char *verstr = "20050501";
+static char *verstr = "20050830";
 
 #include <linux/module.h>
 
@@ -219,6 +219,12 @@ static int switch_partition(struct scsi_tape *);
 
 static int st_int_ioctl(struct scsi_tape *, unsigned int, unsigned long);
 
+static void scsi_tape_release(struct kref *);
+
+#define to_scsi_tape(obj) container_of(obj, struct scsi_tape, kref)
+
+static DECLARE_MUTEX(st_ref_sem);
+
 
 #include "osst_detect.h"
 #ifndef SIGS_FROM_OSST
@@ -230,6 +236,46 @@ static int st_int_ioctl(struct scsi_tape *, unsigned int, unsigned long);
         {"OnStream", "FW-", "", "osst"}
 #endif
 
+static struct scsi_tape *scsi_tape_get(int dev)
+{
+        struct scsi_tape *STp = NULL;
+
+        down(&st_ref_sem);
+        write_lock(&st_dev_arr_lock);
+
+        if (dev < st_dev_max && scsi_tapes != NULL)
+                STp = scsi_tapes[dev];
+        if (!STp) goto out;
+
+        kref_get(&STp->kref);
+
+        if (!STp->device)
+                goto out_put;
+
+        if (scsi_device_get(STp->device))
+                goto out_put;
+
+        goto out;
+
+out_put:
+        kref_put(&STp->kref, scsi_tape_release);
+        STp = NULL;
+out:
+        write_unlock(&st_dev_arr_lock);
+        up(&st_ref_sem);
+        return STp;
+}
+
+static void scsi_tape_put(struct scsi_tape *STp)
+{
+        struct scsi_device *sdev = STp->device;
+
+        down(&st_ref_sem);
+        kref_put(&STp->kref, scsi_tape_release);
+        scsi_device_put(sdev);
+        up(&st_ref_sem);
+}
+
 struct st_reject_data {
         char *vendor;
         char *model;
@@ -311,7 +357,7 @@ static int st_chk_result(struct scsi_tape *STp, struct scsi_request * SRpnt)
                 return 0;
 
         cmdstatp = &STp->buffer->cmdstat;
-        st_analyze_sense(STp->buffer->last_SRpnt, cmdstatp);
+        st_analyze_sense(SRpnt, cmdstatp);
 
         if (cmdstatp->have_sense)
                 scode = STp->buffer->cmdstat.sense_hdr.sense_key;
@@ -399,10 +445,10 @@ static void st_sleep_done(struct scsi_cmnd * SCpnt)
 
         (STp->buffer)->cmdstat.midlevel_result = SCpnt->result;
         SCpnt->request->rq_status = RQ_SCSI_DONE;
-        (STp->buffer)->last_SRpnt = SCpnt->sc_request;
         DEB( STp->write_pending = 0; )
 
-        complete(SCpnt->request->waiting);
+        if (SCpnt->request->waiting)
+                complete(SCpnt->request->waiting);
 }
 
 /* Do the scsi command. Waits until command performed if do_wait is true.
@@ -412,8 +458,20 @@ static struct scsi_request *
 st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd,
            int bytes, int direction, int timeout, int retries, int do_wait)
 {
+        struct completion *waiting;
         unsigned char *bp;
 
+        /* if async, make sure there's no command outstanding */
+        if (!do_wait && ((STp->buffer)->last_SRpnt)) {
+                printk(KERN_ERR "%s: Async command already active.\n",
+                       tape_name(STp));
+                if (signal_pending(current))
+                        (STp->buffer)->syscall_result = (-EINTR);
+                else
+                        (STp->buffer)->syscall_result = (-EBUSY);
+                return NULL;
+        }
+
         if (SRpnt == NULL) {
                 SRpnt = scsi_allocate_request(STp->device, GFP_ATOMIC);
                 if (SRpnt == NULL) {
@@ -427,7 +485,13 @@ st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *c
                 }
         }
 
-        init_completion(&STp->wait);
+        /* If async IO, set last_SRpnt. This ptr tells write_behind_check
+           which IO is outstanding. It's nulled out when the IO completes. */
+        if (!do_wait)
+                (STp->buffer)->last_SRpnt = SRpnt;
+
+        waiting = &STp->wait;
+        init_completion(waiting);
         SRpnt->sr_use_sg = STp->buffer->do_dio || (bytes > (STp->buffer)->frp[0].length);
         if (SRpnt->sr_use_sg) {
                 if (!STp->buffer->do_dio)
@@ -438,17 +502,20 @@ st_do_scsi(struct scsi_request * SRpnt, struct scsi_tape * STp, unsigned char *c
                 bp = (STp->buffer)->b_data;
         SRpnt->sr_data_direction = direction;
         SRpnt->sr_cmd_len = 0;
-        SRpnt->sr_request->waiting = &(STp->wait);
+        SRpnt->sr_request->waiting = waiting;
         SRpnt->sr_request->rq_status = RQ_SCSI_BUSY;
         SRpnt->sr_request->rq_disk = STp->disk;
+        SRpnt->sr_request->end_io = blk_end_sync_rq;
         STp->buffer->cmdstat.have_sense = 0;
 
         scsi_do_req(SRpnt, (void *) cmd, bp, bytes,
                     st_sleep_done, timeout, retries);
 
         if (do_wait) {
-                wait_for_completion(SRpnt->sr_request->waiting);
+                wait_for_completion(waiting);
                 SRpnt->sr_request->waiting = NULL;
+                if (SRpnt->sr_request->rq_status != RQ_SCSI_DONE)
+                        SRpnt->sr_result |= (DRIVER_ERROR << 24);
                 (STp->buffer)->syscall_result = st_chk_result(STp, SRpnt);
         }
         return SRpnt;
@@ -465,6 +532,7 @@ static int write_behind_check(struct scsi_tape * STp)
         struct st_buffer *STbuffer;
         struct st_partstat *STps;
         struct st_cmdstatus *cmdstatp;
+        struct scsi_request *SRpnt;
 
         STbuffer = STp->buffer;
         if (!STbuffer->writing)
@@ -478,10 +546,14 @@ static int write_behind_check(struct scsi_tape * STp)
         ) /* end DEB */
 
         wait_for_completion(&(STp->wait));
-        (STp->buffer)->last_SRpnt->sr_request->waiting = NULL;
+        SRpnt = STbuffer->last_SRpnt;
+        STbuffer->last_SRpnt = NULL;
+        SRpnt->sr_request->waiting = NULL;
+        if (SRpnt->sr_request->rq_status != RQ_SCSI_DONE)
+                SRpnt->sr_result |= (DRIVER_ERROR << 24);
 
-        (STp->buffer)->syscall_result = st_chk_result(STp, (STp->buffer)->last_SRpnt);
-        scsi_release_request((STp->buffer)->last_SRpnt);
+        (STp->buffer)->syscall_result = st_chk_result(STp, SRpnt);
+        scsi_release_request(SRpnt);
 
         STbuffer->buffer_bytes -= STbuffer->writing;
         STps = &(STp->ps[STp->partition]);
@@ -1055,25 +1127,20 @@ static int st_open(struct inode *inode, struct file *filp)
          */
         filp->f_mode &= ~(FMODE_PREAD | FMODE_PWRITE);
 
+        if (!(STp = scsi_tape_get(dev)))
+                return -ENXIO;
+
         write_lock(&st_dev_arr_lock);
-        if (dev >= st_dev_max || scsi_tapes == NULL ||
-            ((STp = scsi_tapes[dev]) == NULL)) {
-                write_unlock(&st_dev_arr_lock);
-                return (-ENXIO);
-        }
         filp->private_data = STp;
         name = tape_name(STp);
 
         if (STp->in_use) {
                 write_unlock(&st_dev_arr_lock);
+                scsi_tape_put(STp);
                 DEB( printk(ST_DEB_MSG "%s: Device already in use.\n", name); )
                 return (-EBUSY);
         }
 
-        if(scsi_device_get(STp->device)) {
-                write_unlock(&st_dev_arr_lock);
-                return (-ENXIO);
-        }
         STp->in_use = 1;
         write_unlock(&st_dev_arr_lock);
         STp->rew_at_close = STp->autorew_dev = (iminor(inode) & 0x80) == 0;
@@ -1118,7 +1185,7 @@ static int st_open(struct inode *inode, struct file *filp)
  err_out:
         normalize_buffer(STp->buffer);
         STp->in_use = 0;
-        scsi_device_put(STp->device);
+        scsi_tape_put(STp);
         return retval;
 
 }
@@ -1250,7 +1317,7 @@ static int st_release(struct inode *inode, struct file *filp)
         write_lock(&st_dev_arr_lock);
         STp->in_use = 0;
         write_unlock(&st_dev_arr_lock);
-        scsi_device_put(STp->device);
+        scsi_tape_put(STp);
 
         return result;
 }
@@ -3887,6 +3954,7 @@ static int st_probe(struct device *dev)
                 goto out_put_disk;
         }
         memset(tpnt, 0, sizeof(struct scsi_tape));
+        kref_init(&tpnt->kref);
         tpnt->disk = disk;
         sprintf(disk->disk_name, "st%d", i);
         disk->private_data = &tpnt->driver;
@@ -3902,6 +3970,7 @@ static int st_probe(struct device *dev)
                 tpnt->tape_type = MT_ISSCSI2;
 
         tpnt->buffer = buffer;
+        tpnt->buffer->last_SRpnt = NULL;
 
         tpnt->inited = 0;
         tpnt->dirty = 0;
@@ -4076,15 +4145,10 @@ static int st_remove(struct device *dev)
                                         tpnt->modes[mode].cdevs[j] = NULL;
                                 }
                         }
-                        tpnt->device = NULL;
 
-                        if (tpnt->buffer) {
-                                tpnt->buffer->orig_frp_segs = 0;
-                                normalize_buffer(tpnt->buffer);
-                                kfree(tpnt->buffer);
-                        }
-                        put_disk(tpnt->disk);
-                        kfree(tpnt);
+                        down(&st_ref_sem);
+                        kref_put(&tpnt->kref, scsi_tape_release);
+                        up(&st_ref_sem);
                         return 0;
                 }
         }
@@ -4093,6 +4157,34 @@ static int st_remove(struct device *dev)
         return 0;
 }
 
+/**
+ *      scsi_tape_release - Called to free the Scsi_Tape structure
+ *      @kref: pointer to embedded kref
+ *
+ *      st_ref_sem must be held entering this routine.  Because it is
+ *      called on last put, you should always use the scsi_tape_get()
+ *      scsi_tape_put() helpers which manipulate the semaphore directly
+ *      and never do a direct kref_put().
+ **/
+static void scsi_tape_release(struct kref *kref)
+{
+        struct scsi_tape *tpnt = to_scsi_tape(kref);
+        struct gendisk *disk = tpnt->disk;
+
+        tpnt->device = NULL;
+
+        if (tpnt->buffer) {
+                tpnt->buffer->orig_frp_segs = 0;
+                normalize_buffer(tpnt->buffer);
+                kfree(tpnt->buffer);
+        }
+
+        disk->private_data = NULL;
+        put_disk(disk);
+        kfree(tpnt);
+        return;
+}
+
 static void st_intr(struct scsi_cmnd *SCpnt)
 {
         scsi_io_completion(SCpnt, (SCpnt->result ? 0: SCpnt->bufflen), 1);
@@ -4348,12 +4440,12 @@ static int st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pag
 static int sgl_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages, 
                               unsigned long uaddr, size_t count, int rw)
 {
+        unsigned long end = (uaddr + count + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        unsigned long start = uaddr >> PAGE_SHIFT;
+        const int nr_pages = end - start;
         int res, i, j;
-        unsigned int nr_pages;
         struct page **pages;
 
-        nr_pages = ((uaddr & ~PAGE_MASK) + count + ~PAGE_MASK) >> PAGE_SHIFT;
-
         /* User attempted Overflow! */
         if ((uaddr + count) < uaddr)
                 return -EINVAL;
diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h
index 061da111398e..790acac160bc 100644
--- a/drivers/scsi/st.h
+++ b/drivers/scsi/st.h
@@ -3,7 +3,7 @@
 #define _ST_H
 
 #include <linux/completion.h>
-
+#include <linux/kref.h>
 
 /* Descriptor for analyzed sense data */
 struct st_cmdstatus {
@@ -156,6 +156,7 @@ struct scsi_tape {
         unsigned char last_sense[16];
 #endif
         struct gendisk *disk;
+        struct kref     kref;
 };
 
 /* Bit masks for use_pf */
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 0b10169961eb..aec39fb261ca 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -58,8 +58,7 @@ static const char serial21285_name[] = "Footbridge UART";
  *  int((BAUD_BASE - (baud >> 1)) / baud)
  */
 
-static void
-serial21285_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void serial21285_stop_tx(struct uart_port *port)
 {
         if (tx_enabled(port)) {
                 disable_irq(IRQ_CONTX);
@@ -67,8 +66,7 @@ serial21285_stop_tx(struct uart_port *port, unsigned int tty_stop)
         }
 }
 
-static void
-serial21285_start_tx(struct uart_port *port, unsigned int tty_start)
+static void serial21285_start_tx(struct uart_port *port)
 {
         if (!tx_enabled(port)) {
                 enable_irq(IRQ_CONTX);
@@ -148,7 +146,7 @@ static irqreturn_t serial21285_tx_chars(int irq, void *dev_id, struct pt_regs *r
                 goto out;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                serial21285_stop_tx(port, 0);
+                serial21285_stop_tx(port);
                 goto out;
         }
 
@@ -164,7 +162,7 @@ static irqreturn_t serial21285_tx_chars(int irq, void *dev_id, struct pt_regs *r
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit))
-                serial21285_stop_tx(port, 0);
+                serial21285_stop_tx(port);
 
  out:
         return IRQ_HANDLED;
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 9097f2f7b12a..2efb317153ce 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -40,7 +40,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index b116122e569a..170c9d2a749c 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -2474,8 +2474,7 @@ static struct tty_operations rs_360_ops = {
         .tiocmset = rs_360_tiocmset,
 };
 
-/* int __init rs_360_init(void) */
-int rs_360_init(void)
+static int __init rs_360_init(void)
 {
         struct serial_state * state;
         ser_info_t      *info;
@@ -2827,10 +2826,7 @@ int rs_360_init(void)
 
         return 0;
 }
-
-
-
-
+module_init(rs_360_init);
 
 /* This must always be called before the rs_360_init() function, otherwise
  * it blows away the port control information.
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 7e8fc7c1d4cc..30a0a3d10145 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1001,7 +1001,7 @@ static inline void __stop_tx(struct uart_8250_port *p)
         }
 }
 
-static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void serial8250_stop_tx(struct uart_port *port)
 {
         struct uart_8250_port *up = (struct uart_8250_port *)port;
 
@@ -1018,7 +1018,7 @@ static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop)
 
 static void transmit_chars(struct uart_8250_port *up);
 
-static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
+static void serial8250_start_tx(struct uart_port *port)
 {
         struct uart_8250_port *up = (struct uart_8250_port *)port;
 
@@ -1158,7 +1158,11 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up)
                 up->port.x_char = 0;
                 return;
         }
-        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
+        if (uart_tx_stopped(&up->port)) {
+                serial8250_stop_tx(&up->port);
+                return;
+        }
+        if (uart_circ_empty(xmit)) {
                 __stop_tx(up);
                 return;
         }
@@ -2586,82 +2590,3 @@ module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444);
 MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");
 #endif
 MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
-
-/**
- *      register_serial - configure a 16x50 serial port at runtime
- *      @req: request structure
- *
- *      Configure the serial port specified by the request. If the
- *      port exists and is in use an error is returned. If the port
- *      is not currently in the table it is added.
- *
- *      The port is then probed and if necessary the IRQ is autodetected
- *      If this fails an error is returned.
- *
- *      On success the port is ready to use and the line number is returned.
- *
- *      Note: this function is deprecated - use serial8250_register_port
- *      instead.
- */
-int register_serial(struct serial_struct *req)
-{
-        struct uart_port port;
-
-        port.iobase   = req->port;
-        port.membase  = req->iomem_base;
-        port.irq      = req->irq;
-        port.uartclk  = req->baud_base * 16;
-        port.fifosize = req->xmit_fifo_size;
-        port.regshift = req->iomem_reg_shift;
-        port.iotype   = req->io_type;
-        port.flags    = req->flags | UPF_BOOT_AUTOCONF;
-        port.mapbase  = req->iomap_base;
-        port.dev      = NULL;
-
-        if (share_irqs)
-                port.flags |= UPF_SHARE_IRQ;
-
-        if (HIGH_BITS_OFFSET)
-                port.iobase |= (long) req->port_high << HIGH_BITS_OFFSET;
-
-        /*
-         * If a clock rate wasn't specified by the low level driver, then
-         * default to the standard clock rate.  This should be 115200 (*16)
-         * and should not depend on the architecture's BASE_BAUD definition.
-         * However, since this API will be deprecated, it's probably a
-         * better idea to convert the drivers to use the new API
-         * (serial8250_register_port and serial8250_unregister_port).
-         */
-        if (port.uartclk == 0) {
-                printk(KERN_WARNING
-                       "Serial: registering port at [%08x,%08lx,%p] irq %d with zero baud_base\n",
-                       port.iobase, port.mapbase, port.membase, port.irq);
-                printk(KERN_WARNING "Serial: see %s:%d for more information\n",
-                       __FILE__, __LINE__);
-                dump_stack();
-
-                /*
-                 * Fix it up for now, but this is only a temporary measure.
-                 */
-                port.uartclk = BASE_BAUD * 16;
-        }
-
-        return serial8250_register_port(&port);
-}
-EXPORT_SYMBOL(register_serial);
-
-/**
- *      unregister_serial - remove a 16x50 serial port at runtime
- *      @line: serial line number
- *
- *      Remove one serial port.  This may not be called from interrupt
- *      context.  We hand the port back to our local PM control.
- *
- *      Note: this function is deprecated - use serial8250_unregister_port
- *      instead.
- */
-void unregister_serial(int line)
-{
-        serial8250_unregister_port(line);
-}
-EXPORT_SYMBOL(unregister_serial);
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 9225c82faeb8..b1b459efda52 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -16,11 +16,7 @@
  */
 
 #include <linux/config.h>
-
-int serial8250_register_port(struct uart_port *);
-void serial8250_unregister_port(int line);
-void serial8250_suspend_port(int line);
-void serial8250_resume_port(int line);
+#include <linux/serial_8250.h>
 
 struct old_serial_port {
         unsigned int uart;
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d5797618a3b9..e39818a34a07 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -308,7 +308,7 @@ config SERIAL_S3C2410_CONSOLE
 
 config SERIAL_DZ
         bool "DECstation DZ serial driver"
-        depends on MACH_DECSTATION && MIPS32
+        depends on MACH_DECSTATION && 32BIT
         select SERIAL_CORE
         help
           DZ11-family serial controllers for VAXstations, including the
@@ -830,7 +830,7 @@ config SERIAL_M32R_PLDSIO
 
 config SERIAL_TXX9
         bool "TMPTX39XX/49XX SIO support"
-        depends HAS_TXX9_SERIAL
+        depends HAS_TXX9_SERIAL && BROKEN
         select SERIAL_CORE
         default y
 
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 2884b310e54d..978e12437e61 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -105,7 +105,7 @@ struct uart_amba_port {
         unsigned int            old_status;
 };
 
-static void pl010_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void pl010_stop_tx(struct uart_port *port)
 {
         unsigned int cr;
 
@@ -114,7 +114,7 @@ static void pl010_stop_tx(struct uart_port *port, unsigned int tty_stop)
         UART_PUT_CR(port, cr);
 }
 
-static void pl010_start_tx(struct uart_port *port, unsigned int tty_start)
+static void pl010_start_tx(struct uart_port *port)
 {
         unsigned int cr;
 
@@ -219,7 +219,7 @@ static void pl010_tx_chars(struct uart_port *port)
                 return;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                pl010_stop_tx(port, 0);
+                pl010_stop_tx(port);
                 return;
         }
 
@@ -236,7 +236,7 @@ static void pl010_tx_chars(struct uart_port *port)
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit))
-                pl010_stop_tx(port, 0);
+                pl010_stop_tx(port);
 }
 
 static void pl010_modem_status(struct uart_port *port)
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 7db88ee18f75..56071309744c 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -74,7 +74,7 @@ struct uart_amba_port {
         unsigned int            old_status;
 };
 
-static void pl011_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void pl011_stop_tx(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
 
@@ -82,7 +82,7 @@ static void pl011_stop_tx(struct uart_port *port, unsigned int tty_stop)
         writew(uap->im, uap->port.membase + UART011_IMSC);
 }
 
-static void pl011_start_tx(struct uart_port *port, unsigned int tty_start)
+static void pl011_start_tx(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
 
@@ -184,7 +184,7 @@ static void pl011_tx_chars(struct uart_amba_port *uap)
                 return;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(&uap->port)) {
-                pl011_stop_tx(&uap->port, 0);
+                pl011_stop_tx(&uap->port);
                 return;
         }
 
@@ -201,7 +201,7 @@ static void pl011_tx_chars(struct uart_amba_port *uap)
                 uart_write_wakeup(&uap->port);
 
         if (uart_circ_empty(xmit))
-                pl011_stop_tx(&uap->port, 0);
+                pl011_stop_tx(&uap->port);
 }
 
 static void pl011_modem_status(struct uart_amba_port *uap)
diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c
index 6104aeef1243..a274ebf256a1 100644
--- a/drivers/serial/au1x00_uart.c
+++ b/drivers/serial/au1x00_uart.c
@@ -200,7 +200,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
         DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name);
 }
 
-static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void serial8250_stop_tx(struct uart_port *port)
 {
         struct uart_8250_port *up = (struct uart_8250_port *)port;
 
@@ -210,7 +210,7 @@ static void serial8250_stop_tx(struct uart_port *port, unsigned int tty_stop)
         }
 }
 
-static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
+static void serial8250_start_tx(struct uart_port *port)
 {
         struct uart_8250_port *up = (struct uart_8250_port *)port;
 
@@ -337,7 +337,7 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up)
                 return;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
-                serial8250_stop_tx(&up->port, 0);
+                serial8250_stop_tx(&up->port);
                 return;
         }
 
@@ -356,7 +356,7 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up)
         DEBUG_INTR("THRE...");
 
         if (uart_circ_empty(xmit))
-                serial8250_stop_tx(&up->port, 0);
+                serial8250_stop_tx(&up->port);
 }
 
 static _INLINE_ void check_modem_status(struct uart_8250_port *up)
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index e92522b33c48..d822896b488c 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -69,8 +69,7 @@
 
 #define tx_enabled(port)        ((port)->unused[0])
 
-static void
-clps711xuart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void clps711xuart_stop_tx(struct uart_port *port)
 {
         if (tx_enabled(port)) {
                 disable_irq(TX_IRQ(port));
@@ -78,8 +77,7 @@ clps711xuart_stop_tx(struct uart_port *port, unsigned int tty_stop)
         }
 }
 
-static void
-clps711xuart_start_tx(struct uart_port *port, unsigned int tty_start)
+static void clps711xuart_start_tx(struct uart_port *port)
 {
         if (!tx_enabled(port)) {
                 enable_irq(TX_IRQ(port));
@@ -165,7 +163,7 @@ static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *re
                 return IRQ_HANDLED;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                clps711xuart_stop_tx(port, 0);
+                clps711xuart_stop_tx(port);
                 return IRQ_HANDLED;
         }
 
@@ -182,7 +180,7 @@ static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *re
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit))
-                clps711xuart_stop_tx(port, 0);
+                clps711xuart_stop_tx(port);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index d639ac92a117..25825f2aba22 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -124,7 +124,7 @@ static unsigned int cpm_uart_get_mctrl(struct uart_port *port)
 /*
  * Stop transmitter
  */
-static void cpm_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void cpm_uart_stop_tx(struct uart_port *port)
 {
         struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
         volatile smc_t *smcp = pinfo->smcp;
@@ -141,7 +141,7 @@ static void cpm_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
 /*
  * Start transmitter
  */
-static void cpm_uart_start_tx(struct uart_port *port, unsigned int tty_start)
+static void cpm_uart_start_tx(struct uart_port *port)
 {
         struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
         volatile smc_t *smcp = pinfo->smcp;
@@ -403,10 +403,8 @@ static int cpm_uart_startup(struct uart_port *port)
 
 inline void cpm_uart_wait_until_send(struct uart_cpm_port *pinfo)
 {
-        unsigned long target_jiffies = jiffies + pinfo->wait_closing;
-
-        while (!time_after(jiffies, target_jiffies))
-                schedule();
+        set_current_state(TASK_UNINTERRUPTIBLE);
+        schedule_timeout(pinfo->wait_closing);
 }
 
 /*
@@ -425,9 +423,12 @@ static void cpm_uart_shutdown(struct uart_port *port)
         /* If the port is not the console, disable Rx and Tx. */
         if (!(pinfo->flags & FLAG_CONSOLE)) {
                 /* Wait for all the BDs marked sent */
-                while(!cpm_uart_tx_empty(port))
+                while(!cpm_uart_tx_empty(port)) {
+                        set_current_state(TASK_UNINTERRUPTIBLE);
                         schedule_timeout(2);
-                if(pinfo->wait_closing)
+                }
+
+                if (pinfo->wait_closing)
                         cpm_uart_wait_until_send(pinfo);
 
                 /* Stop uarts */
@@ -623,7 +624,7 @@ static int cpm_uart_tx_pump(struct uart_port *port)
         }
 
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                cpm_uart_stop_tx(port, 0);
+                cpm_uart_stop_tx(port);
                 return 0;
         }
 
@@ -656,7 +657,7 @@ static int cpm_uart_tx_pump(struct uart_port *port)
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit)) {
-                cpm_uart_stop_tx(port, 0);
+                cpm_uart_stop_tx(port);
                 return 0;
         }
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index c4c8f4b44f53..15ad58d94889 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -142,6 +142,14 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
          * be supported in a sane fashion.
          */
 #ifndef CONFIG_STX_GP3
+#ifdef CONFIG_MPC8560_ADS
+        volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
+        io->iop_ppard |= 0x00000018;
+        io->iop_psord &= ~0x00000008;   /* Rx */
+        io->iop_psord &= ~0x00000010;   /* Tx */
+        io->iop_pdird &= ~0x00000008;   /* Rx */
+        io->iop_pdird |= 0x00000010;    /* Tx */
+#else
         volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
         io->iop_pparb |= 0x008b0000;
         io->iop_pdirb |= 0x00880000;
@@ -149,6 +157,7 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
         io->iop_pdirb &= ~0x00030000;
         io->iop_psorb &= ~0x00030000;
 #endif
+#endif
         cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
         cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
         pinfo->brg = 2;
@@ -257,6 +266,7 @@ int cpm_uart_init_portdesc(void)
         cpm_uart_ports[UART_SMC1].smcp = (smc_t *) & cpm2_immr->im_smc[0];
         cpm_uart_ports[UART_SMC1].smcup =
             (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC1];
+        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC1_BASE]) = PROFF_SMC1;
         cpm_uart_ports[UART_SMC1].port.mapbase =
             (unsigned long)&cpm2_immr->im_smc[0];
         cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
@@ -269,6 +279,7 @@ int cpm_uart_init_portdesc(void)
         cpm_uart_ports[UART_SMC2].smcp = (smc_t *) & cpm2_immr->im_smc[1];
         cpm_uart_ports[UART_SMC2].smcup =
             (smc_uart_t *) & cpm2_immr->im_dprambase[PROFF_SMC2];
+        *(u16 *)(&cpm2_immr->im_dprambase[PROFF_SMC2_BASE]) = PROFF_SMC2;
         cpm_uart_ports[UART_SMC2].port.mapbase =
             (unsigned long)&cpm2_immr->im_smc[1];
         cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 23b8871e74cc..40d3e7139cfe 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -446,7 +446,6 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/bitops.h>
 #include <linux/delay.h>
 
@@ -5041,17 +5040,3 @@ rs_init(void)
 /* this makes sure that rs_init is called during kernel boot */
 
 module_init(rs_init);
-
-/*
- * register_serial and unregister_serial allows for serial ports to be
- * configured at run-time, to support PCMCIA modems.
- */
-int
-register_serial(struct serial_struct *req)
-{
-        return -1;
-}
-
-void unregister_serial(int line)
-{
-}
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index 97824eeeafae..e63b9dffc8d7 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -112,7 +112,7 @@ static inline void dz_out(struct dz_port *dport, unsigned offset,
  * ------------------------------------------------------------
  */
 
-static void dz_stop_tx(struct uart_port *uport, unsigned int tty_stop)
+static void dz_stop_tx(struct uart_port *uport)
 {
         struct dz_port *dport = (struct dz_port *)uport;
         unsigned short tmp, mask = 1 << dport->port.line;
@@ -125,7 +125,7 @@ static void dz_stop_tx(struct uart_port *uport, unsigned int tty_stop)
         spin_unlock_irqrestore(&dport->port.lock, flags);
 }
 
-static void dz_start_tx(struct uart_port *uport, unsigned int tty_start)
+static void dz_start_tx(struct uart_port *uport)
 {
         struct dz_port *dport = (struct dz_port *)uport;
         unsigned short tmp, mask = 1 << dport->port.line;
@@ -290,7 +290,7 @@ static inline void dz_transmit_chars(struct dz_port *dport)
         }
         /* if nothing to do or stopped or hardware stopped */
         if (uart_circ_empty(xmit) || uart_tx_stopped(&dport->port)) {
-                dz_stop_tx(&dport->port, 0);
+                dz_stop_tx(&dport->port);
                 return;
         }
 
@@ -308,7 +308,7 @@ static inline void dz_transmit_chars(struct dz_port *dport)
 
         /* Are we done */
         if (uart_circ_empty(xmit))
-                dz_stop_tx(&dport->port, 0);
+                dz_stop_tx(&dport->port);
 }
 
 /*
@@ -440,7 +440,7 @@ static int dz_startup(struct uart_port *uport)
  */
 static void dz_shutdown(struct uart_port *uport)
 {
-        dz_stop_tx(uport, 0);
+        dz_stop_tx(uport);
 }
 
 /*
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index c112b32764e8..eb31125c6a30 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -56,7 +56,6 @@
 #include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -989,18 +988,16 @@ static unsigned int icom_get_mctrl(struct uart_port *port)
         return result;
 }
 
-static void icom_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void icom_stop_tx(struct uart_port *port)
 {
         unsigned char cmdReg;
 
-        if (tty_stop) {
-                trace(ICOM_PORT, "STOP", 0);
-                cmdReg = readb(&ICOM_PORT->dram->CmdReg);
-                writeb(cmdReg | CMD_HOLD_XMIT, &ICOM_PORT->dram->CmdReg);
-        }
+        trace(ICOM_PORT, "STOP", 0);
+        cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+        writeb(cmdReg | CMD_HOLD_XMIT, &ICOM_PORT->dram->CmdReg);
 }
 
-static void icom_start_tx(struct uart_port *port, unsigned int tty_start)
+static void icom_start_tx(struct uart_port *port)
 {
         unsigned char cmdReg;
 
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 01a8726a3f97..4c985e6b3784 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -124,7 +124,7 @@ static void imx_timeout(unsigned long data)
 /*
  * interrupts disabled on entry
  */
-static void imx_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void imx_stop_tx(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
         UCR1((u32)sport->port.membase) &= ~UCR1_TXMPTYEN;
@@ -165,13 +165,13 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
         } while (!(UTS((u32)sport->port.membase) & UTS_TXFULL));
 
         if (uart_circ_empty(xmit))
-                imx_stop_tx(&sport->port, 0);
+                imx_stop_tx(&sport->port);
 }
 
 /*
  * interrupts disabled on entry
  */
-static void imx_start_tx(struct uart_port *port, unsigned int tty_start)
+static void imx_start_tx(struct uart_port *port)
 {
         struct imx_port *sport = (struct imx_port *)port;
 
@@ -196,7 +196,7 @@ static irqreturn_t imx_txint(int irq, void *dev_id, struct pt_regs *regs)
         }
 
         if (uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)) {
-                imx_stop_tx(&sport->port, 0);
+                imx_stop_tx(&sport->port);
                 goto out;
         }
 
@@ -291,13 +291,31 @@ static unsigned int imx_tx_empty(struct uart_port *port)
         return USR2((u32)sport->port.membase) & USR2_TXDC ?  TIOCSER_TEMT : 0;
 }
 
+/*
+ * We have a modem side uart, so the meanings of RTS and CTS are inverted.
+ */
 static unsigned int imx_get_mctrl(struct uart_port *port)
 {
-        return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
+        struct imx_port *sport = (struct imx_port *)port;
+        unsigned int tmp = TIOCM_DSR | TIOCM_CAR;
+
+        if (USR1((u32)sport->port.membase) & USR1_RTSS)
+                tmp |= TIOCM_CTS;
+
+        if (UCR2((u32)sport->port.membase) & UCR2_CTS)
+                tmp |= TIOCM_RTS;
+
+        return tmp;
 }
 
 static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
+        struct imx_port *sport = (struct imx_port *)port;
+
+        if (mctrl & TIOCM_RTS)
+                UCR2((u32)sport->port.membase) |= UCR2_CTS;
+        else
+                UCR2((u32)sport->port.membase) &= ~UCR2_CTS;
 }
 
 /*
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 793c3a7cbe47..0c5c96a582b3 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -2373,10 +2373,9 @@ static unsigned int ic4_tx_empty(struct uart_port *the_port)
 /**
  * ic4_stop_tx - stop the transmitter
  * @port: Port to operate on
- * @tty_stop: Set to 1 if called via uart_stop
  *
  */
-static void ic4_stop_tx(struct uart_port *the_port, unsigned int tty_stop)
+static void ic4_stop_tx(struct uart_port *the_port)
 {
 }
 
@@ -2471,10 +2470,9 @@ static unsigned int ic4_get_mctrl(struct uart_port *the_port)
 /**
  * ic4_start_tx - Start transmitter, flush any output
  * @port: Port to operate on
- * @tty_stop: Set to 1 if called via uart_start
  *
  */
-static void ic4_start_tx(struct uart_port *the_port, unsigned int tty_stop)
+static void ic4_start_tx(struct uart_port *the_port)
 {
         struct ioc4_port *port = get_ioc4_port(the_port);
         unsigned long flags;
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index ea5bf4d4daa3..ef132349f310 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -592,7 +592,7 @@ static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
 }
 
 /* The port lock is held and interrupts are disabled.  */
-static void ip22zilog_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void ip22zilog_stop_tx(struct uart_port *port)
 {
         struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
 
@@ -600,7 +600,7 @@ static void ip22zilog_stop_tx(struct uart_port *port, unsigned int tty_stop)
 }
 
 /* The port lock is held and interrupts are disabled.  */
-static void ip22zilog_start_tx(struct uart_port *port, unsigned int tty_start)
+static void ip22zilog_start_tx(struct uart_port *port)
 {
         struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
         struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 98de2258fd06..6fa0d62d6f68 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -113,7 +113,7 @@ static void jsm_tty_set_mctrl(struct uart_port *port, unsigned int mctrl)
         udelay(10);
 }
 
-static void jsm_tty_start_tx(struct uart_port *port, unsigned int tty_start)
+static void jsm_tty_start_tx(struct uart_port *port)
 {
         struct jsm_channel *channel = (struct jsm_channel *)port;
 
@@ -125,7 +125,7 @@ static void jsm_tty_start_tx(struct uart_port *port, unsigned int tty_start)
         jsm_printk(IOCTL, INFO, &channel->ch_bd->pci_dev, "finish\n");
 }
 
-static void jsm_tty_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void jsm_tty_stop_tx(struct uart_port *port)
 {
         struct jsm_channel *channel = (struct jsm_channel *)port;
 
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 9b50560b9d16..b0ecc7537ce5 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -275,7 +275,7 @@ serial_out(struct uart_sio_port *up, int offset, int value)
         __sio_out(value, offset);
 }
 
-static void m32r_sio_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void m32r_sio_stop_tx(struct uart_port *port)
 {
         struct uart_sio_port *up = (struct uart_sio_port *)port;
 
@@ -285,7 +285,7 @@ static void m32r_sio_stop_tx(struct uart_port *port, unsigned int tty_stop)
         }
 }
 
-static void m32r_sio_start_tx(struct uart_port *port, unsigned int tty_start)
+static void m32r_sio_start_tx(struct uart_port *port)
 {
 #ifdef CONFIG_SERIAL_M32R_PLDSIO
         struct uart_sio_port *up = (struct uart_sio_port *)port;
@@ -425,7 +425,7 @@ static _INLINE_ void transmit_chars(struct uart_sio_port *up)
                 return;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
-                m32r_sio_stop_tx(&up->port, 0);
+                m32r_sio_stop_tx(&up->port);
                 return;
         }
 
@@ -446,7 +446,7 @@ static _INLINE_ void transmit_chars(struct uart_sio_port *up)
         DEBUG_INTR("THRE...");
 
         if (uart_circ_empty(xmit))
-                m32r_sio_stop_tx(&up->port, 0);
+                m32r_sio_stop_tx(&up->port);
 }
 
 /*
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 8c40167778de..43b03c55f453 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -40,7 +40,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/segment.h>
 #include <asm/semaphore.h>
 #include <asm/delay.h>
 #include <asm/coldfire.h>
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 2a5cf174ca30..a3cd0ee8486d 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -119,7 +119,7 @@ mpc52xx_uart_get_mctrl(struct uart_port *port)
 }
 
 static void 
-mpc52xx_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
+mpc52xx_uart_stop_tx(struct uart_port *port)
 {
         /* port->lock taken by caller */
         port->read_status_mask &= ~MPC52xx_PSC_IMR_TXRDY;
@@ -127,7 +127,7 @@ mpc52xx_uart_stop_tx(struct uart_port *port, unsigned int tty_stop)
 }
 
 static void 
-mpc52xx_uart_start_tx(struct uart_port *port, unsigned int tty_start)
+mpc52xx_uart_start_tx(struct uart_port *port)
 {
         /* port->lock taken by caller */
         port->read_status_mask |= MPC52xx_PSC_IMR_TXRDY;
@@ -485,7 +485,7 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port)
 
         /* Nothing to do ? */
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                mpc52xx_uart_stop_tx(port,0);
+                mpc52xx_uart_stop_tx(port);
                 return 0;
         }
 
@@ -504,7 +504,7 @@ mpc52xx_uart_int_tx_chars(struct uart_port *port)
 
         /* Maybe we're done after all */
         if (uart_circ_empty(xmit)) {
-                mpc52xx_uart_stop_tx(port,0);
+                mpc52xx_uart_stop_tx(port);
                 return 0;
         }
 
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index e43276c6a954..efe79b1fd431 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1072,18 +1072,18 @@ mpsc_get_mctrl(struct uart_port *port)
 }
 
 static void
-mpsc_stop_tx(struct uart_port *port, uint tty_start)
+mpsc_stop_tx(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
 
-        pr_debug("mpsc_stop_tx[%d]: tty_start: %d\n", port->line, tty_start);
+        pr_debug("mpsc_stop_tx[%d]\n", port->line);
 
         mpsc_freeze(pi);
         return;
 }
 
 static void
-mpsc_start_tx(struct uart_port *port, uint tty_start)
+mpsc_start_tx(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
 
@@ -1091,7 +1091,7 @@ mpsc_start_tx(struct uart_port *port, uint tty_start)
         mpsc_copy_tx_data(pi);
         mpsc_sdma_start_tx(pi);
 
-        pr_debug("mpsc_start_tx[%d]: tty_start: %d\n", port->line, tty_start);
+        pr_debug("mpsc_start_tx[%d]\n", port->line);
         return;
 }
 
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index dadd7e19714e..189064607709 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -111,22 +111,20 @@ static unsigned int mux_get_mctrl(struct uart_port *port)
 /**
  * mux_stop_tx - Stop transmitting characters.
  * @port: Ptr to the uart_port.
- * @tty_stop: tty layer issue this command?
  *
  * The Serial MUX does not support this function.
  */
-static void mux_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void mux_stop_tx(struct uart_port *port)
 {
 }
 
 /**
  * mux_start_tx - Start transmitting characters.
  * @port: Ptr to the uart_port.
- * @tty_start: tty layer issue this command?
  *
  * The Serial Mux does not support this function.
  */
-static void mux_start_tx(struct uart_port *port, unsigned int tty_start)
+static void mux_start_tx(struct uart_port *port)
 {
 }
 
@@ -181,7 +179,7 @@ static void mux_write(struct uart_port *port)
         }
 
         if(uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                mux_stop_tx(port, 0);
+                mux_stop_tx(port);
                 return;
         }
 
@@ -202,7 +200,7 @@ static void mux_write(struct uart_port *port)
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit))
-                mux_stop_tx(port, 0);
+                mux_stop_tx(port);
 }
 
 /**
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 7db2f37532cf..5ddd8ab1f108 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -630,11 +630,10 @@ static unsigned int pmz_get_mctrl(struct uart_port *port)
 
 /* 
  * Stop TX side. Dealt like sunzilog at next Tx interrupt,
- * though for DMA, we will have to do a bit more. What is
- * the meaning of the tty_stop bit ? XXX
+ * though for DMA, we will have to do a bit more.
  * The port lock is held and interrupts are disabled.
  */
-static void pmz_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void pmz_stop_tx(struct uart_port *port)
 {
         to_pmz(port)->flags |= PMACZILOG_FLAG_TX_STOPPED;
 }
@@ -643,7 +642,7 @@ static void pmz_stop_tx(struct uart_port *port, unsigned int tty_stop)
  * Kick the Tx side.
  * The port lock is held and interrupts are disabled.
  */
-static void pmz_start_tx(struct uart_port *port, unsigned int tty_start)
+static void pmz_start_tx(struct uart_port *port)
 {
         struct uart_pmac_port *uap = to_pmz(port);
         unsigned char status;
@@ -1601,7 +1600,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
                 return 0;
         }
 
-        if (pm_state == mdev->ofdev.dev.power.power_state || pm_state < 2)
+        if (pm_state.event == mdev->ofdev.dev.power.power_state.event)
                 return 0;
 
         pmz_debug("suspend, switching to state %d\n", pm_state);
@@ -1661,7 +1660,7 @@ static int pmz_resume(struct macio_dev *mdev)
         if (uap == NULL)
                 return 0;
 
-        if (mdev->ofdev.dev.power.power_state == 0)
+        if (mdev->ofdev.dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
         
         pmz_debug("resume, switching to state 0\n");
@@ -1714,7 +1713,7 @@ static int pmz_resume(struct macio_dev *mdev)
 
         pmz_debug("resume, switching complete\n");
 
-        mdev->ofdev.dev.power.power_state = 0;
+        mdev->ofdev.dev.power.power_state.event = PM_EVENT_ON;
 
         return 0;
 }
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 461c81c93207..eaa0af835290 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -80,7 +80,7 @@ static void serial_pxa_enable_ms(struct uart_port *port)
         serial_out(up, UART_IER, up->ier);
 }
 
-static void serial_pxa_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void serial_pxa_stop_tx(struct uart_port *port)
 {
         struct uart_pxa_port *up = (struct uart_pxa_port *)port;
 
@@ -185,7 +185,7 @@ static void transmit_chars(struct uart_pxa_port *up)
                 return;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
-                serial_pxa_stop_tx(&up->port, 0);
+                serial_pxa_stop_tx(&up->port);
                 return;
         }
 
@@ -203,10 +203,10 @@ static void transmit_chars(struct uart_pxa_port *up)
 
 
         if (uart_circ_empty(xmit))
-                serial_pxa_stop_tx(&up->port, 0);
+                serial_pxa_stop_tx(&up->port);
 }
 
-static void serial_pxa_start_tx(struct uart_port *port, unsigned int tty_start)
+static void serial_pxa_start_tx(struct uart_port *port)
 {
         struct uart_pxa_port *up = (struct uart_pxa_port *)port;
 
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 7365d4b50b95..c361c6fb0809 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -246,8 +246,7 @@ static void s3c24xx_serial_rx_disable(struct uart_port *port)
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
-static void
-s3c24xx_serial_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void s3c24xx_serial_stop_tx(struct uart_port *port)
 {
         if (tx_enabled(port)) {
                 disable_irq(TX_IRQ(port));
@@ -257,8 +256,7 @@ s3c24xx_serial_stop_tx(struct uart_port *port, unsigned int tty_stop)
         }
 }
 
-static void
-s3c24xx_serial_start_tx(struct uart_port *port, unsigned int tty_start)
+static void s3c24xx_serial_start_tx(struct uart_port *port)
 {
         if (!tx_enabled(port)) {
                 if (port->flags & UPF_CONS_FLOW)
@@ -424,7 +422,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id, struct pt_regs *re
         */
 
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                s3c24xx_serial_stop_tx(port, 0);
+                s3c24xx_serial_stop_tx(port);
                 goto out;
         }
 
@@ -443,7 +441,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id, struct pt_regs *re
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit))
-                s3c24xx_serial_stop_tx(port, 0);
+                s3c24xx_serial_stop_tx(port);
 
  out:
         return IRQ_HANDLED;
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 98641c3f5ab9..1225b14f6e9d 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -145,7 +145,7 @@ static void sa1100_timeout(unsigned long data)
 /*
  * interrupts disabled on entry
  */
-static void sa1100_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void sa1100_stop_tx(struct uart_port *port)
 {
         struct sa1100_port *sport = (struct sa1100_port *)port;
         u32 utcr3;
@@ -158,7 +158,7 @@ static void sa1100_stop_tx(struct uart_port *port, unsigned int tty_stop)
 /*
  * interrupts may not be disabled on entry
  */
-static void sa1100_start_tx(struct uart_port *port, unsigned int tty_start)
+static void sa1100_start_tx(struct uart_port *port)
 {
         struct sa1100_port *sport = (struct sa1100_port *)port;
         unsigned long flags;
@@ -264,7 +264,7 @@ static void sa1100_tx_chars(struct sa1100_port *sport)
         sa1100_mctrl_check(sport);
 
         if (uart_circ_empty(xmit) || uart_tx_stopped(&sport->port)) {
-                sa1100_stop_tx(&sport->port, 0);
+                sa1100_stop_tx(&sport->port);
                 return;
         }
 
@@ -284,7 +284,7 @@ static void sa1100_tx_chars(struct sa1100_port *sport)
                 uart_write_wakeup(&sport->port);
 
         if (uart_circ_empty(xmit))
-                sa1100_stop_tx(&sport->port, 0);
+                sa1100_stop_tx(&sport->port);
 }
 
 static irqreturn_t sa1100_int(int irq, void *dev_id, struct pt_regs *regs)
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 54699c3a00ab..2d8622eef701 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -80,7 +80,7 @@ static void uart_stop(struct tty_struct *tty)
         unsigned long flags;
 
         spin_lock_irqsave(&port->lock, flags);
-        port->ops->stop_tx(port, 1);
+        port->ops->stop_tx(port);
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
@@ -91,7 +91,7 @@ static void __uart_start(struct tty_struct *tty)
 
         if (!uart_circ_empty(&state->info->xmit) && state->info->xmit.buf &&
             !tty->stopped && !tty->hw_stopped)
-                port->ops->start_tx(port, 1);
+                port->ops->start_tx(port);
 }
 
 static void uart_start(struct tty_struct *tty)
@@ -542,7 +542,7 @@ static void uart_send_xchar(struct tty_struct *tty, char ch)
                 port->x_char = ch;
                 if (ch) {
                         spin_lock_irqsave(&port->lock, flags);
-                        port->ops->start_tx(port, 0);
+                        port->ops->start_tx(port);
                         spin_unlock_irqrestore(&port->lock, flags);
                 }
         }
@@ -1146,7 +1146,7 @@ static void uart_set_termios(struct tty_struct *tty, struct termios *old_termios
                 spin_lock_irqsave(&state->port->lock, flags);
                 if (!(state->port->ops->get_mctrl(state->port) & TIOCM_CTS)) {
                         tty->hw_stopped = 1;
-                        state->port->ops->stop_tx(state->port, 0);
+                        state->port->ops->stop_tx(state->port);
                 }
                 spin_unlock_irqrestore(&state->port->lock, flags);
         }
@@ -1869,7 +1869,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
                 struct uart_ops *ops = port->ops;
 
                 spin_lock_irq(&port->lock);
-                ops->stop_tx(port, 0);
+                ops->stop_tx(port);
                 ops->set_mctrl(port, 0);
                 ops->stop_rx(port);
                 spin_unlock_irq(&port->lock);
@@ -1935,7 +1935,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                 uart_change_speed(state, NULL);
                 spin_lock_irq(&port->lock);
                 ops->set_mctrl(port, port->mctrl);
-                ops->start_tx(port, 0);
+                ops->start_tx(port);
                 spin_unlock_irq(&port->lock);
         }
 
@@ -1947,21 +1947,29 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
 static inline void
 uart_report_port(struct uart_driver *drv, struct uart_port *port)
 {
-        printk("%s%d", drv->dev_name, port->line);
-        printk(" at ");
+        char address[64];
+
         switch (port->iotype) {
         case UPIO_PORT:
-                printk("I/O 0x%x", port->iobase);
+                snprintf(address, sizeof(address),
+                         "I/O 0x%x", port->iobase);
                 break;
         case UPIO_HUB6:
-                printk("I/O 0x%x offset 0x%x", port->iobase, port->hub6);
+                snprintf(address, sizeof(address),
+                         "I/O 0x%x offset 0x%x", port->iobase, port->hub6);
                 break;
         case UPIO_MEM:
         case UPIO_MEM32:
-                printk("MMIO 0x%lx", port->mapbase);
+                snprintf(address, sizeof(address),
+                         "MMIO 0x%lx", port->mapbase);
+                break;
+        default:
+                strlcpy(address, "*unknown*", sizeof(address));
                 break;
         }
-        printk(" (irq = %d) is a %s\n", port->irq, uart_type(port));
+
+        printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n",
+               drv->dev_name, port->line, address, port->irq, uart_type(port));
 }
 
 static void
@@ -2289,143 +2297,11 @@ int uart_match_port(struct uart_port *port1, struct uart_port *port2)
 }
 EXPORT_SYMBOL(uart_match_port);
 
-/*
- *      Try to find an unused uart_state slot for a port.
- */
-static struct uart_state *
-uart_find_match_or_unused(struct uart_driver *drv, struct uart_port *port)
-{
-        int i;
-
-        /*
-         * First, find a port entry which matches.  Note: if we do
-         * find a matching entry, and it has a non-zero use count,
-         * then we can't register the port.
-         */
-        for (i = 0; i < drv->nr; i++)
-                if (uart_match_port(drv->state[i].port, port))
-                        return &drv->state[i];
-
-        /*
-         * We didn't find a matching entry, so look for the first
-         * free entry.  We look for one which hasn't been previously
-         * used (indicated by zero iobase).
-         */
-        for (i = 0; i < drv->nr; i++)
-                if (drv->state[i].port->type == PORT_UNKNOWN &&
-                    drv->state[i].port->iobase == 0 &&
-                    drv->state[i].count == 0)
-                        return &drv->state[i];
-
-        /*
-         * That also failed.  Last resort is to find any currently
-         * entry which doesn't have a real port associated with it.
-         */
-        for (i = 0; i < drv->nr; i++)
-                if (drv->state[i].port->type == PORT_UNKNOWN &&
-                    drv->state[i].count == 0)
-                        return &drv->state[i];
-
-        return NULL;
-}
-
-/**
- *      uart_register_port: register uart settings with a port
- *      @drv: pointer to the uart low level driver structure for this port
- *      @port: uart port structure describing the port
- *
- *      Register UART settings with the specified low level driver.  Detect
- *      the type of the port if UPF_BOOT_AUTOCONF is set, and detect the
- *      IRQ if UPF_AUTO_IRQ is set.
- *
- *      We try to pick the same port for the same IO base address, so that
- *      when a modem is plugged in, unplugged and plugged back in, it gets
- *      allocated the same port.
- *
- *      Returns negative error, or positive line number.
- */
-int uart_register_port(struct uart_driver *drv, struct uart_port *port)
-{
-        struct uart_state *state;
-        int ret;
-
-        down(&port_sem);
-
-        state = uart_find_match_or_unused(drv, port);
-
-        if (state) {
-                /*
-                 * Ok, we've found a line that we can use.
-                 *
-                 * If we find a port that matches this one, and it appears
-                 * to be in-use (even if it doesn't have a type) we shouldn't
-                 * alter it underneath itself - the port may be open and
-                 * trying to do useful work.
-                 */
-                if (uart_users(state) != 0) {
-                        ret = -EBUSY;
-                        goto out;
-                }
-
-                /*
-                 * If the port is already initialised, don't touch it.
-                 */
-                if (state->port->type == PORT_UNKNOWN) {
-                        state->port->iobase   = port->iobase;
-                        state->port->membase  = port->membase;
-                        state->port->irq      = port->irq;
-                        state->port->uartclk  = port->uartclk;
-                        state->port->fifosize = port->fifosize;
-                        state->port->regshift = port->regshift;
-                        state->port->iotype   = port->iotype;
-                        state->port->flags    = port->flags;
-                        state->port->line     = state - drv->state;
-                        state->port->mapbase  = port->mapbase;
-
-                        uart_configure_port(drv, state, state->port);
-                }
-
-                ret = state->port->line;
-        } else
-                ret = -ENOSPC;
- out:
-        up(&port_sem);
-        return ret;
-}
-
-/**
- *      uart_unregister_port - de-allocate a port
- *      @drv: pointer to the uart low level driver structure for this port
- *      @line: line index previously returned from uart_register_port()
- *
- *      Hang up the specified line associated with the low level driver,
- *      and mark the port as unused.
- */
-void uart_unregister_port(struct uart_driver *drv, int line)
-{
-        struct uart_state *state;
-
-        if (line < 0 || line >= drv->nr) {
-                printk(KERN_ERR "Attempt to unregister ");
-                printk("%s%d", drv->dev_name, line);
-                printk("\n");
-                return;
-        }
-
-        state = drv->state + line;
-
-        down(&port_sem);
-        uart_unconfigure_port(drv, state);
-        up(&port_sem);
-}
-
 EXPORT_SYMBOL(uart_write_wakeup);
 EXPORT_SYMBOL(uart_register_driver);
 EXPORT_SYMBOL(uart_unregister_driver);
 EXPORT_SYMBOL(uart_suspend_port);
 EXPORT_SYMBOL(uart_resume_port);
-EXPORT_SYMBOL(uart_register_port);
-EXPORT_SYMBOL(uart_unregister_port);
 EXPORT_SYMBOL(uart_add_one_port);
 EXPORT_SYMBOL(uart_remove_one_port);
 
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
index 56f269b6bfb1..8302376800c0 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
@@ -112,13 +112,12 @@ struct uart_port_lh7a40x {
         unsigned int statusPrev; /* Most recently read modem status */
 };
 
-static void lh7a40xuart_stop_tx (struct uart_port* port, unsigned int tty_stop)
+static void lh7a40xuart_stop_tx (struct uart_port* port)
 {
         BIT_CLR (port, UART_R_INTEN, TxInt);
 }
 
-static void lh7a40xuart_start_tx (struct uart_port* port,
-                                  unsigned int tty_start)
+static void lh7a40xuart_start_tx (struct uart_port* port)
 {
         BIT_SET (port, UART_R_INTEN, TxInt);
 
@@ -208,7 +207,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port)
                 return;
         }
         if (uart_circ_empty (xmit) || uart_tx_stopped (port)) {
-                lh7a40xuart_stop_tx (port, 0);
+                lh7a40xuart_stop_tx (port);
                 return;
         }
 
@@ -230,7 +229,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port)
                 uart_write_wakeup (port);
 
         if (uart_circ_empty (xmit))
-                lh7a40xuart_stop_tx (port, 0);
+                lh7a40xuart_stop_tx (port);
 }
 
 static void lh7a40xuart_modem_status (struct uart_port* port)
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index d085030df70b..49afadbe461b 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -253,7 +253,7 @@ sio_quot_set(struct uart_txx9_port *up, int quot)
                 sio_out(up, TXX9_SIBGR, 0xff | TXX9_SIBGR_BCLK_T6);
 }
 
-static void serial_txx9_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void serial_txx9_stop_tx(struct uart_port *port)
 {
         struct uart_txx9_port *up = (struct uart_txx9_port *)port;
         unsigned long flags;
@@ -263,7 +263,7 @@ static void serial_txx9_stop_tx(struct uart_port *port, unsigned int tty_stop)
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-static void serial_txx9_start_tx(struct uart_port *port, unsigned int tty_start)
+static void serial_txx9_start_tx(struct uart_port *port)
 {
         struct uart_txx9_port *up = (struct uart_txx9_port *)port;
         unsigned long flags;
@@ -372,7 +372,7 @@ static inline void transmit_chars(struct uart_txx9_port *up)
                 return;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
-                serial_txx9_stop_tx(&up->port, 0);
+                serial_txx9_stop_tx(&up->port);
                 return;
         }
 
@@ -389,7 +389,7 @@ static inline void transmit_chars(struct uart_txx9_port *up)
                 uart_write_wakeup(&up->port);
 
         if (uart_circ_empty(xmit))
-                serial_txx9_stop_tx(&up->port, 0);
+                serial_txx9_stop_tx(&up->port);
 }
 
 static irqreturn_t serial_txx9_interrupt(int irq, void *dev_id, struct pt_regs *regs)
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index ad5b776d779b..512266307866 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -79,8 +79,8 @@ static struct sci_port *serial_console_port = 0;
 #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
 
 /* Function prototypes */
-static void sci_stop_tx(struct uart_port *port, unsigned int tty_stop);
-static void sci_start_tx(struct uart_port *port, unsigned int tty_start);
+static void sci_stop_tx(struct uart_port *port);
+static void sci_start_tx(struct uart_port *port);
 static void sci_start_rx(struct uart_port *port, unsigned int tty_start);
 static void sci_stop_rx(struct uart_port *port);
 static int sci_request_irq(struct sci_port *port);
@@ -455,7 +455,7 @@ static void sci_transmit_chars(struct uart_port *port)
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                 uart_write_wakeup(port);
         if (uart_circ_empty(xmit)) {
-                sci_stop_tx(port, 0);
+                sci_stop_tx(port);
         } else {
                 local_irq_save(flags);
                 ctrl = sci_in(port, SCSCR);
@@ -900,7 +900,7 @@ static unsigned int sci_get_mctrl(struct uart_port *port)
         return TIOCM_DTR | TIOCM_RTS | TIOCM_DSR;
 }
 
-static void sci_start_tx(struct uart_port *port, unsigned int tty_start)
+static void sci_start_tx(struct uart_port *port)
 {
         struct sci_port *s = &sci_ports[port->line];
 
@@ -909,7 +909,7 @@ static void sci_start_tx(struct uart_port *port, unsigned int tty_start)
         enable_irq(s->irqs[SCIx_TXI_IRQ]);
 }
 
-static void sci_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void sci_stop_tx(struct uart_port *port)
 {
         unsigned long flags;
         unsigned short ctrl;
@@ -978,7 +978,7 @@ static void sci_shutdown(struct uart_port *port)
         struct sci_port *s = &sci_ports[port->line];
 
         sci_stop_rx(port);
-        sci_stop_tx(port, 1);
+        sci_stop_tx(port);
         sci_free_irq(s);
 
 #if defined(__H8300S__)
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 12d1f14e78ce..313f9df24a2d 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -259,10 +259,9 @@ static unsigned int snp_tx_empty(struct uart_port *port)
 /**
  * snp_stop_tx - stop the transmitter - no-op for us
  * @port: Port to operat eon - we ignore - no-op function
- * @tty_stop: Set to 1 if called via uart_stop
  *
  */
-static void snp_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void snp_stop_tx(struct uart_port *port)
 {
 }
 
@@ -325,10 +324,9 @@ static void snp_stop_rx(struct uart_port *port)
 /**
  * snp_start_tx - Start transmitter
  * @port: Port to operate on
- * @tty_stop: Set to 1 if called via uart_start
  *
  */
-static void snp_start_tx(struct uart_port *port, unsigned int tty_stop)
+static void snp_start_tx(struct uart_port *port)
 {
         if (sal_console_port.sc_ops->sal_wakeup_transmit)
                 sal_console_port.sc_ops->sal_wakeup_transmit(&sal_console_port,
@@ -615,7 +613,7 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
                 uart_write_wakeup(&port->sc_port);
 
         if (uart_circ_empty(xmit))
-                snp_stop_tx(&port->sc_port, 0); /* no-op for us */
+                snp_stop_tx(&port->sc_port);    /* no-op for us */
 }
 
 /**
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 8d198880756a..e971156daa60 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -245,7 +245,7 @@ receive_chars(struct uart_sunsab_port *up,
         return tty;
 }
 
-static void sunsab_stop_tx(struct uart_port *, unsigned int);
+static void sunsab_stop_tx(struct uart_port *);
 static void sunsab_tx_idle(struct uart_sunsab_port *);
 
 static void transmit_chars(struct uart_sunsab_port *up,
@@ -301,7 +301,7 @@ static void transmit_chars(struct uart_sunsab_port *up,
                 uart_write_wakeup(&up->port);
 
         if (uart_circ_empty(xmit))
-                sunsab_stop_tx(&up->port, 0);
+                sunsab_stop_tx(&up->port);
 }
 
 static void check_status(struct uart_sunsab_port *up,
@@ -448,7 +448,7 @@ static unsigned int sunsab_get_mctrl(struct uart_port *port)
 }
 
 /* port->lock held by caller.  */
-static void sunsab_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void sunsab_stop_tx(struct uart_port *port)
 {
         struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
 
@@ -476,7 +476,7 @@ static void sunsab_tx_idle(struct uart_sunsab_port *up)
 }
 
 /* port->lock held by caller.  */
-static void sunsab_start_tx(struct uart_port *port, unsigned int tty_start)
+static void sunsab_start_tx(struct uart_port *port)
 {
         struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
         struct circ_buf *xmit = &up->port.info->xmit;
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index d57a3553aea3..5959e6755a81 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -255,21 +255,30 @@ static void disable_rsa(struct uart_sunsu_port *up)
 }
 #endif /* CONFIG_SERIAL_8250_RSA */
 
-static void sunsu_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static inline void __stop_tx(struct uart_sunsu_port *p)
+{
+        if (p->ier & UART_IER_THRI) {
+                p->ier &= ~UART_IER_THRI;
+                serial_out(p, UART_IER, p->ier);
+        }
+}
+
+static void sunsu_stop_tx(struct uart_port *port)
 {
         struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
 
-        if (up->ier & UART_IER_THRI) {
-                up->ier &= ~UART_IER_THRI;
-                serial_out(up, UART_IER, up->ier);
-        }
-        if (up->port.type == PORT_16C950 && tty_stop) {
+        __stop_tx(up);
+
+        /*
+         * We really want to stop the transmitter from sending.
+         */
+        if (up->port.type == PORT_16C950) {
                 up->acr |= UART_ACR_TXDIS;
                 serial_icr_write(up, UART_ACR, up->acr);
         }
 }
 
-static void sunsu_start_tx(struct uart_port *port, unsigned int tty_start)
+static void sunsu_start_tx(struct uart_port *port)
 {
         struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
 
@@ -277,10 +286,11 @@ static void sunsu_start_tx(struct uart_port *port, unsigned int tty_start)
                 up->ier |= UART_IER_THRI;
                 serial_out(up, UART_IER, up->ier);
         }
+
         /*
-         * We only do this from uart_start
+         * Re-enable the transmitter if we disabled it.
          */
-        if (tty_start && up->port.type == PORT_16C950) {
+        if (up->port.type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
                 up->acr &= ~UART_ACR_TXDIS;
                 serial_icr_write(up, UART_ACR, up->acr);
         }
@@ -413,8 +423,12 @@ static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
                 up->port.x_char = 0;
                 return;
         }
-        if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
-                sunsu_stop_tx(&up->port, 0);
+        if (uart_tx_stopped(&up->port)) {
+                sunsu_stop_tx(&up->port);
+                return;
+        }
+        if (uart_circ_empty(xmit)) {
+                __stop_tx(up);
                 return;
         }
 
@@ -431,7 +445,7 @@ static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
                 uart_write_wakeup(&up->port);
 
         if (uart_circ_empty(xmit))
-                sunsu_stop_tx(&up->port, 0);
+                __stop_tx(up);
 }
 
 static _INLINE_ void check_modem_status(struct uart_sunsu_port *up)
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index bff42a7b89d0..d75445738c88 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -684,7 +684,7 @@ static void sunzilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
 }
 
 /* The port lock is held and interrupts are disabled.  */
-static void sunzilog_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void sunzilog_stop_tx(struct uart_port *port)
 {
         struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
 
@@ -692,7 +692,7 @@ static void sunzilog_stop_tx(struct uart_port *port, unsigned int tty_stop)
 }
 
 /* The port lock is held and interrupts are disabled.  */
-static void sunzilog_start_tx(struct uart_port *port, unsigned int tty_start)
+static void sunzilog_start_tx(struct uart_port *port)
 {
         struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
         struct zilog_channel __iomem *channel = ZILOG_CHANNEL_FROM_PORT(port);
diff --git a/drivers/serial/uart00.c b/drivers/serial/uart00.c
index 186f1300cead..47b504ff38b2 100644
--- a/drivers/serial/uart00.c
+++ b/drivers/serial/uart00.c
@@ -87,7 +87,7 @@
 #define UART_TX_READY(s)        (((s) & UART_TSR_TX_LEVEL_MSK) < 15)
 //#define UART_TX_EMPTY(p)      ((UART_GET_FR(p) & UART00_UARTFR_TMSK) == 0)
 
-static void uart00_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void uart00_stop_tx(struct uart_port *port)
 {
         UART_PUT_IEC(port, UART_IEC_TIE_MSK);
 }
@@ -199,7 +199,7 @@ static void uart00_tx_chars(struct uart_port *port)
                 return;
         }
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                uart00_stop_tx(port, 0);
+                uart00_stop_tx(port);
                 return;
         }
 
@@ -218,10 +218,10 @@ static void uart00_tx_chars(struct uart_port *port)
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit))
-                uart00_stop_tx(port, 0);
+                uart00_stop_tx(port);
 }
 
-static void uart00_start_tx(struct uart_port *port, unsigned int tty_start)
+static void uart00_start_tx(struct uart_port *port)
 {
         UART_PUT_IES(port, UART_IES_TIE_MSK);
         uart00_tx_chars(port);
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c
index bb482780a41d..9378895a8d56 100644
--- a/drivers/serial/v850e_uart.c
+++ b/drivers/serial/v850e_uart.c
@@ -240,7 +240,7 @@ console_initcall(v850e_uart_console_init);
 
 /* TX/RX interrupt handlers.  */
 
-static void v850e_uart_stop_tx (struct uart_port *port, unsigned tty_stop);
+static void v850e_uart_stop_tx (struct uart_port *port);
 
 void v850e_uart_tx (struct uart_port *port)
 {
@@ -339,14 +339,14 @@ static unsigned v850e_uart_get_mctrl (struct uart_port *port)
         return mctrl;
 }
 
-static void v850e_uart_start_tx (struct uart_port *port, unsigned tty_start)
+static void v850e_uart_start_tx (struct uart_port *port)
 {
         v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
         v850e_uart_tx (port);
         v850e_intc_enable_irq (V850E_UART_TX_IRQ (port->line));
 }
 
-static void v850e_uart_stop_tx (struct uart_port *port, unsigned tty_stop)
+static void v850e_uart_stop_tx (struct uart_port *port)
 {
         v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
 }
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 1f985327b0d4..0c5d65a08f6e 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -284,7 +284,7 @@ static unsigned int siu_get_mctrl(struct uart_port *port)
         return mctrl;
 }
 
-static void siu_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void siu_stop_tx(struct uart_port *port)
 {
         unsigned long flags;
         uint8_t ier;
@@ -298,7 +298,7 @@ static void siu_stop_tx(struct uart_port *port, unsigned int tty_stop)
         spin_unlock_irqrestore(&port->lock, flags);
 }
 
-static void siu_start_tx(struct uart_port *port, unsigned int tty_start)
+static void siu_start_tx(struct uart_port *port)
 {
         unsigned long flags;
         uint8_t ier;
@@ -458,7 +458,7 @@ static inline void transmit_chars(struct uart_port *port)
         }
 
         if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-                siu_stop_tx(port, 0);
+                siu_stop_tx(port);
                 return;
         }
 
@@ -474,7 +474,7 @@ static inline void transmit_chars(struct uart_port *port)
                 uart_write_wakeup(port);
 
         if (uart_circ_empty(xmit))
-                siu_stop_tx(port, 0);
+                siu_stop_tx(port);
 }
 
 static irqreturn_t siu_interrupt(int irq, void *dev_id, struct pt_regs *regs)
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index bb1db1959854..c466739428b2 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -960,7 +960,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
                         intf->altsetting->desc.bInterfaceNumber);
 
         /* instance init */
-        instance = kcalloc(1, sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
+        instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
         if (!instance) {
                 dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
                 return -ENOMEM;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 79422a3b07bc..12ecdb03ee5f 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -782,7 +782,7 @@ static int usb_register_bus(struct usb_bus *bus)
                 return -E2BIG;
         }
 
-        bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb%d", busnum);
+        bus->class_dev = class_device_create(usb_host_class, MKDEV(0,0), bus->controller, "usb_host%d", busnum);
         if (IS_ERR(bus->class_dev)) {
                 clear_bit(busnum, busmap.busmap);
                 up(&usb_bus_list_lock);
@@ -1669,7 +1669,7 @@ struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,
 {
         struct usb_hcd *hcd;
 
-        hcd = kcalloc(1, sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
+        hcd = kzalloc(sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
         if (!hcd) {
                 dev_dbg (dev, "hcd alloc failed\n");
                 return NULL;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index c3e46d24a37e..c9412daff682 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1570,7 +1570,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
                         struct usb_driver       *driver;
 
                         intf = udev->actconfig->interface[i];
-                        if (state <= intf->dev.power.power_state)
+                        if (state.event <= intf->dev.power.power_state.event)
                                 continue;
                         if (!intf->dev.driver)
                                 continue;
@@ -1578,11 +1578,11 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
 
                         if (driver->suspend) {
                                 status = driver->suspend(intf, state);
-                                if (intf->dev.power.power_state != state
+                                if (intf->dev.power.power_state.event != state.event
                                                 || status)
                                         dev_err(&intf->dev,
                                                 "suspend %d fail, code %d\n",
-                                                state, status);
+                                                state.event, status);
                         }
 
                         /* only drivers with suspend() can ever resume();
@@ -1595,7 +1595,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
                          * since we know every driver's probe/disconnect works
                          * even for drivers that can't suspend.
                          */
-                        if (!driver->suspend || state > PM_SUSPEND_MEM) {
+                        if (!driver->suspend || state.event > PM_EVENT_FREEZE) {
 #if 1
                                 dev_warn(&intf->dev, "resume is unsafe!\n");
 #else
@@ -1616,7 +1616,7 @@ static int __usb_suspend_device (struct usb_device *udev, int port1,
          * policies (when HNP doesn't apply) once we have mechanisms to
          * turn power back on!  (Likely not before 2.7...)
          */
-        if (state > PM_SUSPEND_MEM) {
+        if (state.event > PM_EVENT_FREEZE) {
                 dev_warn(&udev->dev, "no poweroff yet, suspending instead\n");
         }
 
@@ -1733,7 +1733,7 @@ static int finish_port_resume(struct usb_device *udev)
                         struct usb_driver       *driver;
 
                         intf = udev->actconfig->interface[i];
-                        if (intf->dev.power.power_state == PMSG_ON)
+                        if (intf->dev.power.power_state.event == PM_EVENT_ON)
                                 continue;
                         if (!intf->dev.driver) {
                                 /* FIXME maybe force to alt 0 */
@@ -1747,11 +1747,11 @@ static int finish_port_resume(struct usb_device *udev)
 
                         /* can we do better than just logging errors? */
                         status = driver->resume(intf);
-                        if (intf->dev.power.power_state != PMSG_ON
+                        if (intf->dev.power.power_state.event != PM_EVENT_ON
                                         || status)
                                 dev_dbg(&intf->dev,
                                         "resume fail, state %d code %d\n",
-                                        intf->dev.power.power_state, status);
+                                        intf->dev.power.power_state.event, status);
                 }
                 status = 0;
 
@@ -1934,7 +1934,7 @@ static int hub_resume(struct usb_interface *intf)
         unsigned                port1;
         int                     status;
 
-        if (intf->dev.power.power_state == PM_SUSPEND_ON)
+        if (intf->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         for (port1 = 1; port1 <= hdev->maxchild; port1++) {
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 99c85d2f92da..2cddd8a00437 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1400,7 +1400,7 @@ static int usb_generic_suspend(struct device *dev, pm_message_t message)
         driver = to_usb_driver(dev->driver);
 
         /* there's only one USB suspend state */
-        if (intf->dev.power.power_state)
+        if (intf->dev.power.power_state.event)
                 return 0;
 
         if (driver->suspend)
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index b01efb6b36f6..65ac9fef3a7c 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -641,7 +641,7 @@ show_registers (struct class_device *class_dev, char *buf)
 
         spin_lock_irqsave (&ehci->lock, flags);
 
-        if (bus->controller->power.power_state) {
+        if (bus->controller->power.power_state.event) {
                 size = scnprintf (next, size,
                         "bus %s, device %s (driver " DRIVER_VERSION ")\n"
                         "%s\n"
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index b56f25864ed6..4c972b57c7c3 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -638,7 +638,7 @@ iso_stream_alloc (unsigned mem_flags)
 {
         struct ehci_iso_stream *stream;
 
-        stream = kcalloc(1, sizeof *stream, mem_flags);
+        stream = kzalloc(sizeof *stream, mem_flags);
         if (likely (stream != NULL)) {
                 INIT_LIST_HEAD(&stream->td_list);
                 INIT_LIST_HEAD(&stream->free_list);
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 76cb496c5836..75128c371800 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -717,7 +717,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
         }
         /* avoid all allocations within spinlocks: request or endpoint */
         if (!hep->hcpriv) {
-                ep = kcalloc(1, sizeof *ep, mem_flags);
+                ep = kzalloc(sizeof *ep, mem_flags);
                 if (!ep)
                         return -ENOMEM;
         }
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index c58408c95c3d..447f488f5d93 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -631,7 +631,7 @@ show_registers (struct class_device *class_dev, char *buf)
                 hcd->product_desc,
                 hcd_name);
 
-        if (bus->controller->power.power_state) {
+        if (bus->controller->power.power_state.event) {
                 size -= scnprintf (next, size,
                         "SUSPENDED (no register access)\n");
                 goto done;
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 7a890a65f55d..d2a1fd40dfcb 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -835,7 +835,7 @@ static int sl811h_urb_enqueue(
 
         /* avoid all allocations within spinlocks */
         if (!hep->hcpriv)
-                ep = kcalloc(1, sizeof *ep, mem_flags);
+                ep = kzalloc(sizeof *ep, mem_flags);
 
         spin_lock_irqsave(&sl811->lock, flags);
 
@@ -1781,9 +1781,9 @@ sl811h_suspend(struct device *dev, pm_message_t state, u32 phase)
         if (phase != SUSPEND_POWER_DOWN)
                 return retval;
 
-        if (state <= PM_SUSPEND_MEM)
+        if (state.event == PM_EVENT_FREEZE)
                 retval = sl811h_hub_suspend(hcd);
-        else
+        else if (state.event == PM_EVENT_SUSPEND)
                 port_power(sl811, 0);
         if (retval == 0)
                 dev->power.power_state = state;
@@ -1802,7 +1802,7 @@ sl811h_resume(struct device *dev, u32 phase)
         /* with no "check to see if VBUS is still powered" board hook,
          * let's assume it'd only be powered to enable remote wakeup.
          */
-        if (dev->power.power_state > PM_SUSPEND_MEM
+        if (dev->power.power_state.event == PM_EVENT_SUSPEND
                         || !hcd->can_wakeup) {
                 sl811->port1 = 0;
                 port_power(sl811, 1);
diff --git a/drivers/usb/input/acecad.c b/drivers/usb/input/acecad.c
index 13532f3e3efc..74f8760d7c07 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/usb/input/acecad.c
@@ -152,7 +152,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_
         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
         maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 
-        acecad = kcalloc(1, sizeof(struct usb_acecad), GFP_KERNEL);
+        acecad = kzalloc(sizeof(struct usb_acecad), GFP_KERNEL);
         if (!acecad)
                 return -ENOMEM;
 
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 0dc439f10823..becb87efb869 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -166,7 +166,7 @@ static int itmtouch_probe(struct usb_interface *intf, const struct usb_device_id
         interface = intf->cur_altsetting;
         endpoint = &interface->endpoint[0].desc;
 
-        if (!(itmtouch = kcalloc(1, sizeof(struct itmtouch_dev), GFP_KERNEL))) {
+        if (!(itmtouch = kzalloc(sizeof(struct itmtouch_dev), GFP_KERNEL))) {
                 err("%s - Out of memory.", __FUNCTION__);
                 return -ENOMEM;
         }
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c
index 256963863478..acc71ec560e9 100644
--- a/drivers/usb/input/pid.c
+++ b/drivers/usb/input/pid.c
@@ -263,7 +263,7 @@ int hid_pid_init(struct hid_device *hid)
         struct hid_ff_pid *private;
         struct hid_input *hidinput = list_entry(&hid->inputs, struct hid_input, list);
 
-        private = hid->ff_private = kcalloc(1, sizeof(struct hid_ff_pid), GFP_KERNEL);
+        private = hid->ff_private = kzalloc(sizeof(struct hid_ff_pid), GFP_KERNEL);
         if (!private)
                 return -ENOMEM;
 
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index ca9f3a30634f..f36c0b6c6e36 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1523,7 +1523,6 @@ static u32 w9968cf_i2c_func(struct i2c_adapter* adap)
 static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 {
         struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
         int id = client->driver->id, err = 0;
 
         if (id == I2C_DRIVERID_OVCAMCHIP) {
@@ -1535,12 +1534,12 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
                 }
         } else {
                 DBG(4, "Rejected client [%s] with driver [%s]", 
-                    clientname, client->driver->name)
+                    client->name, client->driver->name)
                 return -EINVAL;
         }
 
         DBG(5, "I2C attach client [%s] with driver [%s]",
-            clientname, client->driver->name)
+            client->name, client->driver->name)
 
         return 0;
 }
@@ -1549,12 +1548,11 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 static int w9968cf_i2c_detach_inform(struct i2c_client* client)
 {
         struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
 
         if (cam->sensor_client == client)
                 cam->sensor_client = NULL;
 
-        DBG(5, "I2C detach client [%s]", clientname)
+        DBG(5, "I2C detach client [%s]", client->name)
 
         return 0;
 }
@@ -1573,15 +1571,13 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
         int err = 0;
 
         static struct i2c_algorithm algo = {
-                .name =          "W996[87]CF algorithm",
-                .id =            I2C_ALGO_SMBUS,
                 .smbus_xfer =    w9968cf_i2c_smbus_xfer,
                 .algo_control =  w9968cf_i2c_control,
                 .functionality = w9968cf_i2c_func,
         };
 
         static struct i2c_adapter adap = {
-                .id =                I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF,
+                .id =                I2C_HW_SMBUS_W9968CF,
                 .class =             I2C_CLASS_CAM_DIGITAL,
                 .owner =             THIS_MODULE,
                 .client_register =   w9968cf_i2c_attach_inform,
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index cda7249a90b2..fd7fb98e4b20 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1533,7 +1533,7 @@ usbtest_ioctl (struct usb_interface *intf, unsigned int code, void *buf)
         if (down_interruptible (&dev->sem))
                 return -ERESTARTSYS;
 
-        if (intf->dev.power.power_state != PMSG_ON) {
+        if (intf->dev.power.power_state.event != PM_EVENT_ON) {
                 up (&dev->sem);
                 return -EHOSTUNREACH;
         }
diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile
index 16f352195512..fe3fd4115e1e 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
@@ -8,5 +8,3 @@ obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
 obj-$(CONFIG_USB_RTL8150)       += rtl8150.o
 obj-$(CONFIG_USB_USBNET)        += usbnet.o
 obj-$(CONFIG_USB_ZD1201)        += zd1201.o
-
-CFLAGS_zd1201.o = -Idrivers/net/wireless/
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c
index e32a80b39182..fc013978837e 100644
--- a/drivers/usb/net/zd1201.c
+++ b/drivers/usb/net/zd1201.c
@@ -21,7 +21,7 @@
 #include <linux/string.h>
 #include <linux/if_arp.h>
 #include <linux/firmware.h>
-#include <ieee802_11.h>
+#include <net/ieee80211.h>
 #include "zd1201.h"
 
 static struct usb_device_id zd1201_table[] = {
@@ -338,24 +338,24 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
                         goto resubmit;
                 }
                         
-                if ((seq & IEEE802_11_SCTL_FRAG) ||
-                    (fc & IEEE802_11_FCTL_MOREFRAGS)) {
+                if ((seq & IEEE80211_SCTL_FRAG) ||
+                    (fc & IEEE80211_FCTL_MOREFRAGS)) {
                         struct zd1201_frag *frag = NULL;
                         char *ptr;
 
                         if (datalen<14)
                                 goto resubmit;
-                        if ((seq & IEEE802_11_SCTL_FRAG) == 0) {
+                        if ((seq & IEEE80211_SCTL_FRAG) == 0) {
                                 frag = kmalloc(sizeof(*frag), GFP_ATOMIC);
                                 if (!frag)
                                         goto resubmit;
-                                skb = dev_alloc_skb(IEEE802_11_DATA_LEN +14+2);
+                                skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2);
                                 if (!skb) {
                                         kfree(frag);
                                         goto resubmit;
                                 }
                                 frag->skb = skb;
-                                frag->seq = seq & IEEE802_11_SCTL_SEQ;
+                                frag->seq = seq & IEEE80211_SCTL_SEQ;
                                 skb_reserve(skb, 2);
                                 memcpy(skb_put(skb, 12), &data[datalen-14], 12);
                                 memcpy(skb_put(skb, 2), &data[6], 2);
@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
                                 goto resubmit;
                         }
                         hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
-                                if(frag->seq == (seq&IEEE802_11_SCTL_SEQ))
+                                if(frag->seq == (seq&IEEE80211_SCTL_SEQ))
                                         break;
                         if (!frag)
                                 goto resubmit;
@@ -372,7 +372,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
                         ptr = skb_put(skb, len);
                         if (ptr)
                                 memcpy(ptr, data+8, len);
-                        if (fc & IEEE802_11_FCTL_MOREFRAGS)
+                        if (fc & IEEE80211_FCTL_MOREFRAGS)
                                 goto resubmit;
                         hlist_del_init(&frag->fnode);
                         kfree(frag);
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 7bc1d44d8814..b0eba3ac6420 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -2323,17 +2323,16 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
          * can properly take care of D3 ? Also, with swsusp, we
          * know we'll be rebooted, ...
          */
-#ifdef CONFIG_PPC_PMAC
+#ifndef CONFIG_PPC_PMAC
         /* HACK ALERT ! Once I find a proper way to say to each driver
          * individually what will happen with it's PCI slot, I'll change
          * that. On laptops, the AGP slot is just unclocked, so D2 is
          * expected, while on desktops, the card is powered off
          */
-        if (state >= 3)
-                state = 2;
+        return 0;
 #endif /* CONFIG_PPC_PMAC */
          
-        if (state != 2 || state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
         printk(KERN_DEBUG "aty128fb: suspending...\n");
@@ -2367,7 +2366,7 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
          * used dummy fb ops, 2.5 need proper support for this at the
          * fbdev level
          */
-        if (state == 2)
+        if (state.event != PM_EVENT_ON)
                 aty128_set_suspend(par, 1);
 
         release_console_sem();
@@ -2382,12 +2381,11 @@ static int aty128_do_resume(struct pci_dev *pdev)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
 
-        if (pdev->dev.power.power_state == 0)
+        if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         /* Wakeup chip */
-        if (pdev->dev.power.power_state == 2)
-                aty128_set_suspend(par, 0);
+        aty128_set_suspend(par, 0);
         par->asleep = 0;
 
         /* Restore display & engine */
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 8c42538dc8c1..3e10bd837d9e 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2022,17 +2022,16 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct atyfb_par *par = (struct atyfb_par *) info->par;
 
-#ifdef CONFIG_PPC_PMAC
+#ifndef CONFIG_PPC_PMAC
         /* HACK ALERT ! Once I find a proper way to say to each driver
          * individually what will happen with it's PCI slot, I'll change
          * that. On laptops, the AGP slot is just unclocked, so D2 is
          * expected, while on desktops, the card is powered off
          */
-        if (state >= 3)
-                state = 2;
+        return 0;
 #endif /* CONFIG_PPC_PMAC */
 
-        if (state != 2 || state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
         acquire_console_sem();
@@ -2071,12 +2070,12 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct atyfb_par *par = (struct atyfb_par *) info->par;
 
-        if (pdev->dev.power.power_state == 0)
+        if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         acquire_console_sem();
 
-        if (pdev->dev.power.power_state == 2)
+        if (pdev->dev.power.power_state.event == 2)
                 aty_power_mgmt(0, par);
         par->asleep = 0;
 
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 762244164c81..a9d0414e4655 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -75,7 +75,7 @@ static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name)
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner             = THIS_MODULE;
-        chan->adapter.id                = I2C_ALGO_ATI;
+        chan->adapter.id                = I2C_HW_B_RADEON;
         chan->adapter.algo_data         = &chan->algo;
         chan->adapter.dev.parent        = &chan->rinfo->pdev->dev;
         chan->algo.setsda               = radeon_gpio_setsda;
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 98352af39325..59a1b6f85067 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2526,18 +2526,18 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct radeonfb_info *rinfo = info->par;
         int i;
 
-        if (state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
 
         printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
-               pci_name(pdev), state);
+               pci_name(pdev), state.event);
 
         /* For suspend-to-disk, we cheat here. We don't suspend anything and
          * let fbcon continue drawing until we are all set. That shouldn't
          * really cause any problem at this point, provided that the wakeup
          * code knows that any state in memory may not match the HW
          */
-        if (state != PM_SUSPEND_MEM)
+        if (state.event == PM_EVENT_FREEZE)
                 goto done;
 
         acquire_console_sem();
@@ -2616,7 +2616,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         struct radeonfb_info *rinfo = info->par;
         int rc = 0;
 
-        if (pdev->dev.power.power_state == 0)
+        if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
         if (rinfo->no_schedule) {
@@ -2626,7 +2626,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
                 acquire_console_sem();
 
         printk(KERN_DEBUG "radeonfb (%s): resuming from state: %d...\n",
-               pci_name(pdev), pdev->dev.power.power_state);
+               pci_name(pdev), pdev->dev.power.power_state.event);
 
 
         if (pci_enable_device(pdev)) {
@@ -2637,7 +2637,7 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         }
         pci_set_master(pdev);
 
-        if (pdev->dev.power.power_state == PM_SUSPEND_MEM) {
+        if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
                 /* Wakeup chip. Check from config space if we were powered off
                  * (todo: additionally, check CLK_PIN_CNTL too)
                  */
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 9aae884475be..4af321fae390 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -3,3 +3,4 @@
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_CORGI)   += corgi_bl.o
+obj-$(CONFIG_SHARP_LOCOMO)      += locomolcd.o
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
new file mode 100644
index 000000000000..ada6e75eb048
--- /dev/null
+++ b/drivers/video/backlight/locomolcd.c
@@ -0,0 +1,157 @@
+/*
+ * Backlight control code for Sharp Zaurus SL-5500
+ *
+ * Copyright 2005 John Lenz <lenz@cs.wisc.edu>
+ * Maintainer: Pavel Machek <pavel@suse.cz> (unless John wants to :-)
+ * GPL v2
+ *
+ * This driver assumes single CPU. That's okay, because collie is
+ * slightly old hardware, and noone is going to retrofit second CPU to
+ * old PDA.
+ */
+
+/* LCD power functions */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+
+#include <asm/hardware/locomo.h>
+#include <asm/irq.h>
+
+#ifdef CONFIG_SA1100_COLLIE
+#include <asm/arch/collie.h>
+#else
+#include <asm/arch/poodle.h>
+#endif
+
+extern void (*sa1100fb_lcd_power)(int on);
+
+static struct locomo_dev *locomolcd_dev;
+
+static void locomolcd_on(int comadj)
+{
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 1);
+        mdelay(2);
+
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 1);
+        mdelay(2);
+
+        locomo_m62332_senddata(locomolcd_dev, comadj, 0);
+        mdelay(5);
+
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 1);
+        mdelay(10);
+
+        /* TFTCRST | CPSOUT=0 | CPSEN */
+        locomo_writel(0x01, locomolcd_dev->mapbase + LOCOMO_TC);
+
+        /* Set CPSD */
+        locomo_writel(6, locomolcd_dev->mapbase + LOCOMO_CPSD);
+
+        /* TFTCRST | CPSOUT=0 | CPSEN */
+        locomo_writel((0x04 | 0x01), locomolcd_dev->mapbase + LOCOMO_TC);
+        mdelay(10);
+
+        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 1);
+}
+
+static void locomolcd_off(int comadj)
+{
+        /* TFTCRST=1 | CPSOUT=1 | CPSEN = 0 */
+        locomo_writel(0x06, locomolcd_dev->mapbase + LOCOMO_TC);
+        mdelay(1);
+
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0);
+        mdelay(110);
+
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0);
+        mdelay(700);
+
+        /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */
+        locomo_writel(0, locomolcd_dev->mapbase + LOCOMO_TC);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0);
+        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0);
+}
+
+void locomolcd_power(int on)
+{
+        int comadj = 118;
+        unsigned long flags;
+
+        local_irq_save(flags);
+
+        if (!locomolcd_dev) {
+                local_irq_restore(flags);
+                return;
+        }
+
+        /* read comadj */
+#ifdef CONFIG_MACH_POODLE
+        comadj = 118;
+#else
+        comadj = 128;
+#endif
+
+        if (on)
+                locomolcd_on(comadj);
+        else
+                locomolcd_off(comadj);
+
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(locomolcd_power);
+
+static int poodle_lcd_probe(struct locomo_dev *dev)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        locomolcd_dev = dev;
+
+        /* the poodle_lcd_power function is called for the first time
+         * from fs_initcall, which is before locomo is activated.
+         * We need to recall poodle_lcd_power here*/
+#ifdef CONFIG_MACH_POODLE
+        locomolcd_power(1);
+#endif
+        local_irq_restore(flags);
+        return 0;
+}
+
+static int poodle_lcd_remove(struct locomo_dev *dev)
+{
+        unsigned long flags;
+        local_irq_save(flags);
+        locomolcd_dev = NULL;
+        local_irq_restore(flags);
+        return 0;
+}
+
+static struct locomo_driver poodle_lcd_driver = {
+        .drv = {
+                .name = "locomo-backlight",
+        },
+        .devid  = LOCOMO_DEVID_BACKLIGHT,
+        .probe  = poodle_lcd_probe,
+        .remove = poodle_lcd_remove,
+};
+
+static int __init poodle_lcd_init(void)
+{
+        int ret = locomo_driver_register(&poodle_lcd_driver);
+        if (ret) return ret;
+
+#ifdef CONFIG_SA1100_COLLIE
+        sa1100fb_lcd_power = locomolcd_power;
+#endif
+        return 0;
+}
+device_initcall(poodle_lcd_init);
+
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index e75a965ec760..4131243cfdf8 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -462,9 +462,9 @@ static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct fb_info *p = pci_get_drvdata(pdev);
 
-        if (state == pdev->dev.power.power_state)
+        if (state.event == pdev->dev.power.power_state.event)
                 return 0;
-        if (state != PM_SUSPEND_MEM)
+        if (state.event != PM_SUSPEND_MEM)
                 goto done;
 
         acquire_console_sem();
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 7513fb9b19cf..6db183462b92 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1506,12 +1506,12 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)
         struct i810fb_par *par = (struct i810fb_par *) info->par;
         int blank = 0, prev_state = par->cur_state;
 
-        if (state == prev_state)
+        if (state.event == prev_state)
                 return 0;
 
-        par->cur_state = state;
+        par->cur_state = state.event;
 
-        switch (state) {
+        switch (state.event) {
         case 1:
                 blank = VESA_VSYNC_SUSPEND;
                 break;
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 67f85344f0cc..ad60bbb16cdf 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1271,7 +1271,7 @@ ERROR0:;
 }
 
 static int maven_attach_adapter(struct i2c_adapter* adapter) {
-        if (adapter->id == (I2C_ALGO_BIT | I2C_HW_B_G400))
+        if (adapter->id == I2C_HW_B_G400)
                 return i2c_probe(adapter, &addr_data, &maven_detect_client);
         return 0;
 }
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 3757c1407c19..1a91bffdda26 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -90,14 +90,13 @@ static int nvidia_gpio_getsda(void *data)
         return val;
 }
 
-#define I2C_ALGO_NVIDIA   0x0e0000
 static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name)
 {
         int rc;
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner = THIS_MODULE;
-        chan->adapter.id = I2C_ALGO_NVIDIA;
+        chan->adapter.id = I2C_HW_B_NVIDIA;
         chan->adapter.algo_data = &chan->algo;
         chan->adapter.dev.parent = &chan->par->pci_dev->dev;
         chan->algo.setsda = nvidia_gpio_setsda;
diff --git a/drivers/video/pmag-aa-fb.c b/drivers/video/pmag-aa-fb.c
index 3e00ad7f2e31..28d1fe5fe340 100644
--- a/drivers/video/pmag-aa-fb.c
+++ b/drivers/video/pmag-aa-fb.c
@@ -413,7 +413,7 @@ static struct fb_ops aafb_ops = {
 
 static int __init init_one(int slot)
 {
-        unsigned long base_addr = get_tc_base_addr(slot);
+        unsigned long base_addr = CKSEG1ADDR(get_tc_base_addr(slot));
         struct aafb_info *ip = &my_fb_info[slot];
 
         memset(ip, 0, sizeof(struct aafb_info));
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index f8095588e99d..c98f1c8d7dc2 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -1,57 +1,55 @@
 /*
- *      linux/drivers/video/pmag-ba-fb.c
+ *      linux/drivers/video/pmag-ba-fb.c
  *
- *      PMAG-BA TurboChannel framebuffer card support ... derived from:
+ *      PMAG-BA TURBOchannel Color Frame Buffer (CFB) card support,
+ *      derived from:
  *      "HP300 Topcat framebuffer support (derived from macfb of all things)
  *      Phil Blundell <philb@gnu.org> 1998", the original code can be
- *      found in the file hpfb.c in the same directory.
+ *      found in the file hpfb.c in the same directory.
  *
  *      Based on digital document:
  *      "PMAG-BA TURBOchannel Color Frame Buffer
  *       Functional Specification", Revision 1.2, August 27, 1990
  *
- *      DECstation related code Copyright (C) 1999, 2000, 2001 by
- *      Michael Engel <engel@unix-ag.org>, 
- *      Karsten Merker <merker@linuxtag.org> and
+ *      DECstation related code Copyright (C) 1999, 2000, 2001 by
+ *      Michael Engel <engel@unix-ag.org>,
+ *      Karsten Merker <merker@linuxtag.org> and
  *      Harald Koerfgen.
- *      This file is subject to the terms and conditions of the GNU General
- *      Public License.  See the file COPYING in the main directory of this
- *      archive for more details.
+ *      Copyright (c) 2005  Maciej W. Rozycki
  *
+ *      This file is subject to the terms and conditions of the GNU General
+ *      Public License.  See the file COPYING in the main directory of this
+ *      archive for more details.
  */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
+
+#include <linux/compiler.h>
 #include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/fb.h>
-#include <asm/bootinfo.h>
-#include <asm/dec/machtype.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include <asm/bug.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
 #include <asm/dec/tc.h>
+
 #include <video/pmag-ba-fb.h>
 
-struct pmag_ba_ramdac_regs {
-        unsigned char addr_low;
-        unsigned char pad0[3];
-        unsigned char addr_hi;
-        unsigned char pad1[3];
-        unsigned char data;
-        unsigned char pad2[3];
-        unsigned char cmap;
+
+struct pmagbafb_par {
+        struct fb_info *next;
+        volatile void __iomem *mmio;
+        volatile u32 __iomem *dac;
+        int slot;
 };
 
-/*
- * Max 3 TURBOchannel slots -> max 3 PMAG-BA :)
- */
-static struct fb_info pmagba_fb_info[3];
 
-static struct fb_var_screeninfo pmagbafb_defined = {
+static struct fb_info *root_pmagbafb_dev;
+
+static struct fb_var_screeninfo pmagbafb_defined __initdata = {
         .xres           = 1024,
         .yres           = 864,
         .xres_virtual   = 1024,
@@ -61,58 +59,71 @@ static struct fb_var_screeninfo pmagbafb_defined = {
         .green.length   = 8,
         .blue.length    = 8,
         .activate       = FB_ACTIVATE_NOW,
-        .height         = 274,
-        .width          = 195,
-        .accel          = FB_ACCEL_NONE,
+        .height         = -1,
+        .width          = -1,
+        .accel_flags    = FB_ACCEL_NONE,
+        .pixclock       = 14452,
+        .left_margin    = 116,
+        .right_margin   = 12,
+        .upper_margin   = 34,
+        .lower_margin   = 12,
+        .hsync_len      = 128,
+        .vsync_len      = 3,
+        .sync           = FB_SYNC_ON_GREEN,
         .vmode          = FB_VMODE_NONINTERLACED,
 };
 
-static struct fb_fix_screeninfo pmagbafb_fix = {
+static struct fb_fix_screeninfo pmagbafb_fix __initdata = {
         .id             = "PMAG-BA",
-        .smem_len       = (1024 * 864),
+        .smem_len       = (1024 * 1024),
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_PSEUDOCOLOR,
         .line_length    = 1024,
+        .mmio_len       = PMAG_BA_SIZE - PMAG_BA_BT459,
 };
 
-/*
- * Turn hardware cursor off
- */
-void pmagbafb_erase_cursor(struct pmag_ba_ramdac_regs *bt459_regs)
+
+static inline void dac_write(struct pmagbafb_par *par, unsigned int reg, u8 v)
 {
-        bt459_regs->addr_low = 0;
-        bt459_regs->addr_hi = 3;
-        bt459_regs->data = 0;
+        writeb(v, par->dac + reg / 4);
 }
 
+static inline u8 dac_read(struct pmagbafb_par *par, unsigned int reg)
+{
+        return readb(par->dac + reg / 4);
+}
+
+
 /*
- * Set the palette. 
+ * Set the palette.
  */
-static int pmagbafb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                              unsigned blue, unsigned transp,
-                              struct fb_info *info)
+static int pmagbafb_setcolreg(unsigned int regno, unsigned int red,
+                              unsigned int green, unsigned int blue,
+                              unsigned int transp, struct fb_info *info)
 {
-        struct pmag_ba_ramdac_regs *bt459_regs = (struct pmag_ba_ramdac_regs *) info->par;
+        struct pmagbafb_par *par = info->par;
 
-        if (regno >= info->cmap.len)
-                return 1;
+        BUG_ON(regno >= info->cmap.len);
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
-        green >>= 8;    /* wide, but the harware colormap */
+        green >>= 8;    /* wide, but the hardware colormap */
         blue  >>= 8;    /* registers are only 8 bits wide */
 
-        bt459_regs->addr_low = (__u8) regno;
-        bt459_regs->addr_hi = 0;
-        bt459_regs->cmap = red;
-        bt459_regs->cmap = green;
-        bt459_regs->cmap = blue;
+        mb();
+        dac_write(par, BT459_ADDR_LO, regno);
+        dac_write(par, BT459_ADDR_HI, 0x00);
+        wmb();
+        dac_write(par, BT459_CMAP, red);
+        wmb();
+        dac_write(par, BT459_CMAP, green);
+        wmb();
+        dac_write(par, BT459_CMAP, blue);
+
         return 0;
 }
 
 static struct fb_ops pmagbafb_ops = {
         .owner          = THIS_MODULE,
-        .fb_get_fix     = gen_get_fix,
-        .fb_get_var     = gen_get_var,
         .fb_setcolreg   = pmagbafb_setcolreg,
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
@@ -120,63 +131,133 @@ static struct fb_ops pmagbafb_ops = {
         .fb_cursor      = soft_cursor,
 };
 
-int __init pmagbafb_init_one(int slot)
+
+/*
+ * Turn the hardware cursor off.
+ */
+static void __init pmagbafb_erase_cursor(struct fb_info *info)
+{
+        struct pmagbafb_par *par = info->par;
+
+        mb();
+        dac_write(par, BT459_ADDR_LO, 0x00);
+        dac_write(par, BT459_ADDR_HI, 0x03);
+        wmb();
+        dac_write(par, BT459_DATA, 0x00);
+}
+
+
+static int __init pmagbafb_init_one(int slot)
 {
-        unsigned long base_addr = get_tc_base_addr(slot);
-        struct fb_info *info = &pmagba_fb_info[slot]; 
-        struct display *disp = &pmagba_disp[slot];
-
-        printk("PMAG-BA framebuffer in slot %d\n", slot);
-        /*
-         * Framebuffer display memory base address and friends
-         */
-        pmagbafb_fix.smem_start = base_addr + PMAG_BA_ONBOARD_FBMEM_OFFSET;
-        info->par = (base_addr + PMAG_BA_BT459_OFFSET);
-
-        /*
-         * Configure the Bt459 RAM DAC
-         */
-        pmagbafb_erase_cursor((struct pmag_ba_ramdac_regs *) info->par);
-
-        /*
-         *      Let there be consoles..
-         */
+        struct fb_info *info;
+        struct pmagbafb_par *par;
+        unsigned long base_addr;
+
+        info = framebuffer_alloc(sizeof(struct pmagbafb_par), NULL);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->slot = slot;
+        claim_tc_card(par->slot);
+
+        base_addr = get_tc_base_addr(par->slot);
+
+        par->next = root_pmagbafb_dev;
+        root_pmagbafb_dev = info;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
+                goto err_alloc;
+
         info->fbops = &pmagbafb_ops;
+        info->fix = pmagbafb_fix;
         info->var = pmagbafb_defined;
-        info->fix = pmagbafb_fix; 
-        info->screen_base = pmagbafb_fix.smem_start;
         info->flags = FBINFO_DEFAULT;
 
-        fb_alloc_cmap(&fb_info.cmap, 256, 0);
+        /* MMIO mapping setup.  */
+        info->fix.mmio_start = base_addr;
+        par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+        if (!par->mmio)
+                goto err_cmap;
+        par->dac = par->mmio + PMAG_BA_BT459;
+
+        /* Frame buffer mapping setup.  */
+        info->fix.smem_start = base_addr + PMAG_BA_FBMEM;
+        info->screen_base = ioremap_nocache(info->fix.smem_start,
+                                            info->fix.smem_len);
+        if (!info->screen_base)
+                goto err_mmio_map;
+        info->screen_size = info->fix.smem_len;
+
+        pmagbafb_erase_cursor(info);
 
         if (register_framebuffer(info) < 0)
-                return 1;
+                goto err_smem_map;
+
+        pr_info("fb%d: %s frame buffer device in slot %d\n",
+                info->node, info->fix.id, par->slot);
+
         return 0;
+
+
+err_smem_map:
+        iounmap(info->screen_base);
+
+err_mmio_map:
+        iounmap(par->mmio);
+
+err_cmap:
+        fb_dealloc_cmap(&info->cmap);
+
+err_alloc:
+        root_pmagbafb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+        return -ENXIO;
 }
 
-/* 
- * Initialise the framebuffer
- */
+static void __exit pmagbafb_exit_one(void)
+{
+        struct fb_info *info = root_pmagbafb_dev;
+        struct pmagbafb_par *par = info->par;
 
-int __init pmagbafb_init(void)
+        unregister_framebuffer(info);
+        iounmap(info->screen_base);
+        iounmap(par->mmio);
+        fb_dealloc_cmap(&info->cmap);
+        root_pmagbafb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+}
+
+
+/*
+ * Initialise the framebuffer.
+ */
+static int __init pmagbafb_init(void)
 {
-        int sid;
-        int found = 0;
+        int count = 0;
+        int slot;
 
         if (fb_get_options("pmagbafb", NULL))
-                return -ENODEV;
-
-        if (TURBOCHANNEL) {
-                while ((sid = search_tc_card("PMAG-BA")) >= 0) {
-                        found = 1;
-                        claim_tc_card(sid);
-                        pmagbafb_init_one(sid);
-                }
-                return found ? 0 : -ENODEV;
-        } else {
-                return -ENODEV;
+                return -ENXIO;
+
+        while ((slot = search_tc_card("PMAG-BA")) >= 0) {
+                if (pmagbafb_init_one(slot) < 0)
+                        break;
+                count++;
         }
+        return (count > 0) ? 0 : -ENXIO;
 }
 
+static void __exit pmagbafb_exit(void)
+{
+        while (root_pmagbafb_dev)
+                pmagbafb_exit_one();
+}
+
+
 module_init(pmagbafb_init);
+module_exit(pmagbafb_exit);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index d14eaee91cff..a483b13e117b 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -1,114 +1,128 @@
 /*
- *      linux/drivers/video/pmagb-b-fb.c
+ *      linux/drivers/video/pmagb-b-fb.c
  *
- *      PMAGB-B TurboChannel framebuffer card support ... derived from:
+ *      PMAGB-B TURBOchannel Smart Frame Buffer (SFB) card support,
+ *      derived from:
  *      "HP300 Topcat framebuffer support (derived from macfb of all things)
  *      Phil Blundell <philb@gnu.org> 1998", the original code can be
- *      found in the file hpfb.c in the same directory.
+ *      found in the file hpfb.c in the same directory.
  *
- *      DECstation related code Copyright (C) 1999, 2000, 2001 by
- *      Michael Engel <engel@unix-ag.org>,
- *      Karsten Merker <merker@linuxtag.org> and 
+ *      DECstation related code Copyright (C) 1999, 2000, 2001 by
+ *      Michael Engel <engel@unix-ag.org>,
+ *      Karsten Merker <merker@linuxtag.org> and
  *      Harald Koerfgen.
- *      This file is subject to the terms and conditions of the GNU General
- *      Public License.  See the file COPYING in the main directory of this
- *      archive for more details.
+ *      Copyright (c) 2005  Maciej W. Rozycki
  *
+ *      This file is subject to the terms and conditions of the GNU General
+ *      Public License.  See the file COPYING in the main directory of this
+ *      archive for more details.
  */
 
-/*
- *      We currently only support the PMAGB-B in high resolution mode
- *      as I know of no way to detect low resolution mode set via jumper.
- *      KM, 2001/01/07
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
+#include <linux/compiler.h>
 #include <linux/delay.h>
-#include <linux/init.h>
+#include <linux/errno.h>
 #include <linux/fb.h>
-#include <asm/bootinfo.h>
-#include <asm/dec/machtype.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include <asm/bug.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
 #include <asm/dec/tc.h>
+
 #include <video/pmagb-b-fb.h>
 
-struct pmagb_b_ramdac_regs {
-        unsigned char addr_low;
-        unsigned char pad0[3];
-        unsigned char addr_hi;
-        unsigned char pad1[3];
-        unsigned char data;
-        unsigned char pad2[3];
-        unsigned char cmap;
+
+struct pmagbbfb_par {
+        struct fb_info *next;
+        volatile void __iomem *mmio;
+        volatile void __iomem *smem;
+        volatile u32 __iomem *sfb;
+        volatile u32 __iomem *dac;
+        unsigned int osc0;
+        unsigned int osc1;
+        int slot;
 };
 
-/*
- * Max 3 TURBOchannel slots -> max 3 PMAGB-B :)
- */
-static struct fb_info pmagbb_fb_info[3];
 
-static struct fb_var_screeninfo pmagbbfb_defined = {
-        .xres           = 1280,
-        .yres           = 1024,
-        .xres_virtual   = 1280,
-        .yres_virtual   = 1024,
+static struct fb_info *root_pmagbbfb_dev;
+
+static struct fb_var_screeninfo pmagbbfb_defined __initdata = {
         .bits_per_pixel = 8,
         .red.length     = 8,
         .green.length   = 8,
         .blue.length    = 8,
         .activate       = FB_ACTIVATE_NOW,
-        .height         = 274,
-        .width          = 195,
+        .height         = -1,
+        .width          = -1,
         .accel_flags    = FB_ACCEL_NONE,
+        .sync           = FB_SYNC_ON_GREEN,
         .vmode          = FB_VMODE_NONINTERLACED,
 };
 
-static struct fb_fix_screeninfo pmagbafb_fix = {
+static struct fb_fix_screeninfo pmagbbfb_fix __initdata = {
         .id             = "PMAGB-BA",
-        .smem_len       = (1280 * 1024),
+        .smem_len       = (2048 * 1024),
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_PSEUDOCOLOR,
-        .line_length    = 1280,
+        .mmio_len       = PMAGB_B_FBMEM,
+};
+
+
+static inline void sfb_write(struct pmagbbfb_par *par, unsigned int reg, u32 v)
+{
+        writel(v, par->sfb + reg / 4);
 }
 
-/*
- * Turn hardware cursor off
- */
-void pmagbbfb_erase_cursor(struct pmagb_b_ramdac_regs *bt459_regs)
+static inline u32 sfb_read(struct pmagbbfb_par *par, unsigned int reg)
+{
+        return readl(par->sfb + reg / 4);
+}
+
+static inline void dac_write(struct pmagbbfb_par *par, unsigned int reg, u8 v)
 {
-        bt459_regs->addr_low = 0;
-        bt459_regs->addr_hi = 3;
-        bt459_regs->data = 0;
+        writeb(v, par->dac + reg / 4);
 }
 
+static inline u8 dac_read(struct pmagbbfb_par *par, unsigned int reg)
+{
+        return readb(par->dac + reg / 4);
+}
+
+static inline void gp0_write(struct pmagbbfb_par *par, u32 v)
+{
+        writel(v, par->mmio + PMAGB_B_GP0);
+}
+
+
 /*
- * Set the palette. 
+ * Set the palette.
  */
-static int pmagbbfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                              unsigned blue, unsigned transp,
-                              struct fb_info *info)
+static int pmagbbfb_setcolreg(unsigned int regno, unsigned int red,
+                              unsigned int green, unsigned int blue,
+                              unsigned int transp, struct fb_info *info)
 {
-        struct pmagb_b_ramdac_regs *bt459_regs = (struct pmagb_b_ramdac_regs *) info->par;
-        
-        if (regno >= info->cmap.len)
-                return 1;
+        struct pmagbbfb_par *par = info->par;
+
+        BUG_ON(regno >= info->cmap.len);
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
-        green >>= 8;    /* wide, but the harware colormap */
+        green >>= 8;    /* wide, but the hardware colormap */
         blue  >>= 8;    /* registers are only 8 bits wide */
 
-        bt459_regs->addr_low = (__u8) regno;
-        bt459_regs->addr_hi = 0;
-        bt459_regs->cmap = red;
-        bt459_regs->cmap = green;
-        bt459_regs->cmap = blue;
+        mb();
+        dac_write(par, BT459_ADDR_LO, regno);
+        dac_write(par, BT459_ADDR_HI, 0x00);
+        wmb();
+        dac_write(par, BT459_CMAP, red);
+        wmb();
+        dac_write(par, BT459_CMAP, green);
+        wmb();
+        dac_write(par, BT459_CMAP, blue);
+
         return 0;
 }
 
@@ -121,62 +135,247 @@ static struct fb_ops pmagbbfb_ops = {
         .fb_cursor      = soft_cursor,
 };
 
-int __init pmagbbfb_init_one(int slot)
+
+/*
+ * Turn the hardware cursor off.
+ */
+static void __init pmagbbfb_erase_cursor(struct fb_info *info)
+{
+        struct pmagbbfb_par *par = info->par;
+
+        mb();
+        dac_write(par, BT459_ADDR_LO, 0x00);
+        dac_write(par, BT459_ADDR_HI, 0x03);
+        wmb();
+        dac_write(par, BT459_DATA, 0x00);
+}
+
+/*
+ * Set up screen parameters.
+ */
+static void __init pmagbbfb_screen_setup(struct fb_info *info)
+{
+        struct pmagbbfb_par *par = info->par;
+
+        info->var.xres = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                           SFB_VID_HOR_PIX_SHIFT) & SFB_VID_HOR_PIX_MASK) * 4;
+        info->var.xres_virtual = info->var.xres;
+        info->var.yres = (sfb_read(par, SFB_REG_VID_VER) >>
+                          SFB_VID_VER_SL_SHIFT) & SFB_VID_VER_SL_MASK;
+        info->var.yres_virtual = info->var.yres;
+        info->var.left_margin = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                                  SFB_VID_HOR_BP_SHIFT) &
+                                 SFB_VID_HOR_BP_MASK) * 4;
+        info->var.right_margin = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                                   SFB_VID_HOR_FP_SHIFT) &
+                                  SFB_VID_HOR_FP_MASK) * 4;
+        info->var.upper_margin = (sfb_read(par, SFB_REG_VID_VER) >>
+                                  SFB_VID_VER_BP_SHIFT) & SFB_VID_VER_BP_MASK;
+        info->var.lower_margin = (sfb_read(par, SFB_REG_VID_VER) >>
+                                  SFB_VID_VER_FP_SHIFT) & SFB_VID_VER_FP_MASK;
+        info->var.hsync_len = ((sfb_read(par, SFB_REG_VID_HOR) >>
+                                SFB_VID_HOR_SYN_SHIFT) &
+                               SFB_VID_HOR_SYN_MASK) * 4;
+        info->var.vsync_len = (sfb_read(par, SFB_REG_VID_VER) >>
+                               SFB_VID_VER_SYN_SHIFT) & SFB_VID_VER_SYN_MASK;
+
+        info->fix.line_length = info->var.xres;
+};
+
+/*
+ * Determine oscillator configuration.
+ */
+static void __init pmagbbfb_osc_setup(struct fb_info *info)
 {
-        unsigned long base_addr = get_tc_base_addr(slot);
-        struct fb_info *info = &pmagbb_fb_info[slot];
-
-        printk("PMAGB-BA framebuffer in slot %d\n", slot);
-        /*
-         * Framebuffer display memory base address and friends
-         */
-        pmagbbfb_fix.smem_start = base_addr + PMAGB_B_ONBOARD_FBMEM_OFFSET;
-        info->par = (base_addr + PMAGB_B_BT459_OFFSET); 
-        
-        /*
-         * Configure the Bt459 RAM DAC
-         */
-        pmagbbfb_erase_cursor((struct pmagb_b_ramdac_regs *) info->par);
-
-        /*
-         *      Let there be consoles..
-         */
+        static unsigned int pmagbbfb_freqs[] __initdata = {
+                130808, 119843, 104000, 92980, 74367, 72800,
+                69197, 66000, 65000, 50350, 36000, 32000, 25175
+        };
+        struct pmagbbfb_par *par = info->par;
+        u32 count0 = 8, count1 = 8, counttc = 16 * 256 + 8;
+        u32 freq0, freq1, freqtc = get_tc_speed() / 250;
+        int i, j;
+
+        gp0_write(par, 0);                              /* select Osc0 */
+        for (j = 0; j < 16; j++) {
+                mb();
+                sfb_write(par, SFB_REG_TCCLK_COUNT, 0);
+                mb();
+                for (i = 0; i < 100; i++) {     /* nominally max. 20.5us */
+                        if (sfb_read(par, SFB_REG_TCCLK_COUNT) == 0)
+                                break;
+                        udelay(1);
+                }
+                count0 += sfb_read(par, SFB_REG_VIDCLK_COUNT);
+        }
+
+        gp0_write(par, 1);                              /* select Osc1 */
+        for (j = 0; j < 16; j++) {
+                mb();
+                sfb_write(par, SFB_REG_TCCLK_COUNT, 0);
+
+                for (i = 0; i < 100; i++) {     /* nominally max. 20.5us */
+                        if (sfb_read(par, SFB_REG_TCCLK_COUNT) == 0)
+                                break;
+                        udelay(1);
+                }
+                count1 += sfb_read(par, SFB_REG_VIDCLK_COUNT);
+        }
+
+        freq0 = (freqtc * count0 + counttc / 2) / counttc;
+        par->osc0 = freq0;
+        if (freq0 >= pmagbbfb_freqs[0] - (pmagbbfb_freqs[0] + 32) / 64 &&
+            freq0 <= pmagbbfb_freqs[0] + (pmagbbfb_freqs[0] + 32) / 64)
+                par->osc0 = pmagbbfb_freqs[0];
+
+        freq1 = (par->osc0 * count1 + count0 / 2) / count0;
+        par->osc1 = freq1;
+        for (i = 0; i < sizeof(pmagbbfb_freqs) / sizeof(*pmagbbfb_freqs); i++)
+                if (freq1 >= pmagbbfb_freqs[i] -
+                             (pmagbbfb_freqs[i] + 128) / 256 &&
+                    freq1 <= pmagbbfb_freqs[i] +
+                             (pmagbbfb_freqs[i] + 128) / 256) {
+                        par->osc1 = pmagbbfb_freqs[i];
+                        break;
+                }
+
+        if (par->osc0 - par->osc1 <= (par->osc0 + par->osc1 + 256) / 512 ||
+            par->osc1 - par->osc0 <= (par->osc0 + par->osc1 + 256) / 512)
+                par->osc1 = 0;
+
+        gp0_write(par, par->osc1 != 0);                 /* reselect OscX */
+
+        info->var.pixclock = par->osc1 ?
+                             (1000000000 + par->osc1 / 2) / par->osc1 :
+                             (1000000000 + par->osc0 / 2) / par->osc0;
+};
+
+
+static int __init pmagbbfb_init_one(int slot)
+{
+        char freq0[12], freq1[12];
+        struct fb_info *info;
+        struct pmagbbfb_par *par;
+        unsigned long base_addr;
+        u32 vid_base;
+
+        info = framebuffer_alloc(sizeof(struct pmagbbfb_par), NULL);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->slot = slot;
+        claim_tc_card(par->slot);
+
+        base_addr = get_tc_base_addr(par->slot);
+
+        par->next = root_pmagbbfb_dev;
+        root_pmagbbfb_dev = info;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
+                goto err_alloc;
+
         info->fbops = &pmagbbfb_ops;
-        info->var = pmagbbfb_defined;
         info->fix = pmagbbfb_fix;
-        info->screen_base = pmagbbfb_fix.smem_start; 
+        info->var = pmagbbfb_defined;
         info->flags = FBINFO_DEFAULT;
 
-        fb_alloc_cmap(&fb_info.cmap, 256, 0);
+        /* MMIO mapping setup.  */
+        info->fix.mmio_start = base_addr;
+        par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
+        if (!par->mmio)
+                goto err_cmap;
+        par->sfb = par->mmio + PMAGB_B_SFB;
+        par->dac = par->mmio + PMAGB_B_BT459;
+
+        /* Frame buffer mapping setup.  */
+        info->fix.smem_start = base_addr + PMAGB_B_FBMEM;
+        par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);
+        if (!par->smem)
+                goto err_mmio_map;
+        vid_base = sfb_read(par, SFB_REG_VID_BASE);
+        info->screen_base = (void __iomem *)par->smem + vid_base * 0x1000;
+        info->screen_size = info->fix.smem_len - 2 * vid_base * 0x1000;
+
+        pmagbbfb_erase_cursor(info);
+        pmagbbfb_screen_setup(info);
+        pmagbbfb_osc_setup(info);
 
         if (register_framebuffer(info) < 0)
-                return 1;
+                goto err_smem_map;
+
+        snprintf(freq0, sizeof(freq0), "%u.%03uMHz",
+                 par->osc0 / 1000, par->osc0 % 1000);
+        snprintf(freq1, sizeof(freq1), "%u.%03uMHz",
+                 par->osc1 / 1000, par->osc1 % 1000);
+
+        pr_info("fb%d: %s frame buffer device in slot %d\n",
+                info->node, info->fix.id, par->slot);
+        pr_info("fb%d: Osc0: %s, Osc1: %s, Osc%u selected\n",
+                info->node, freq0, par->osc1 ? freq1 : "disabled",
+                par->osc1 != 0);
+
         return 0;
+
+
+err_smem_map:
+        iounmap(par->smem);
+
+err_mmio_map:
+        iounmap(par->mmio);
+
+err_cmap:
+        fb_dealloc_cmap(&info->cmap);
+
+err_alloc:
+        root_pmagbbfb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+        return -ENXIO;
 }
 
-/* 
- * Initialise the framebuffer
- */
+static void __exit pmagbbfb_exit_one(void)
+{
+        struct fb_info *info = root_pmagbbfb_dev;
+        struct pmagbbfb_par *par = info->par;
+
+        unregister_framebuffer(info);
+        iounmap(par->smem);
+        iounmap(par->mmio);
+        fb_dealloc_cmap(&info->cmap);
+        root_pmagbbfb_dev = par->next;
+        release_tc_card(par->slot);
+        framebuffer_release(info);
+}
 
-int __init pmagbbfb_init(void)
+
+/*
+ * Initialise the framebuffer.
+ */
+static int __init pmagbbfb_init(void)
 {
-        int sid;
-        int found = 0;
+        int count = 0;
+        int slot;
 
         if (fb_get_options("pmagbbfb", NULL))
-                return -ENODEV;
+                return -ENXIO;
 
-        if (TURBOCHANNEL) {
-                while ((sid = search_tc_card("PMAGB-BA")) >= 0) {
-                        found = 1;
-                        claim_tc_card(sid);
-                        pmagbbfb_init_one(sid);
-                }
-                return found ? 0 : -ENODEV;
-        } else {
-                return -ENODEV;
+        while ((slot = search_tc_card("PMAGB-BA")) >= 0) {
+                if (pmagbbfb_init_one(slot) < 0)
+                        break;
+                count++;
         }
+        return (count > 0) ? 0 : -ENXIO;
+}
+
+static void __exit pmagbbfb_exit(void)
+{
+        while (root_pmagbbfb_dev)
+                pmagbbfb_exit_one();
 }
 
+
 module_init(pmagbbfb_init);
+module_exit(pmagbbfb_exit);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 71b69da0c40d..162012bb9264 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -21,7 +21,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/setup.h>
-#include <asm/segment.h>
 #include <asm/system.h>
 #include <asm/q40_master.h>
 #include <linux/fb.h>
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index da1334dfd51d..77151d8e0766 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -92,14 +92,13 @@ static int riva_gpio_getsda(void* data)
         return val;
 }
 
-#define I2C_ALGO_RIVA   0x0e0000
 static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
 {
         int rc;
 
         strcpy(chan->adapter.name, name);
         chan->adapter.owner             = THIS_MODULE;
-        chan->adapter.id                = I2C_ALGO_RIVA;
+        chan->adapter.id                = I2C_HW_B_RIVA;
         chan->adapter.algo_data         = &chan->algo;
         chan->adapter.dev.parent        = &chan->par->pdev->dev;
         chan->algo.setsda               = riva_gpio_setsda;
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 3848be2b9d2d..fa98d91c42eb 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -655,7 +655,7 @@ bail:
 }
 
 #ifdef CONFIG_PM
-static int s1d13xxxfb_suspend(struct device *dev, u32 state, u32 level)
+static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state, u32 level)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct s1d13xxxfb_par *s1dfb = info->par;
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 024a0cecff15..847698b5cfe7 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -137,7 +137,6 @@ static int prosavage_gpio_getsda(void* data)
         return (0 != (GET_CR_DATA(chan->ioaddr) & PROSAVAGE_I2C_SDA_IN));
 }
 
-#define I2C_ALGO_SAVAGE   0x0f0000
 static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
                                 const char *name)
 {
@@ -147,7 +146,7 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
         if (add_bus && chan->par) {
                 strcpy(chan->adapter.name, name);
                 chan->adapter.owner             = THIS_MODULE;
-                chan->adapter.id                = I2C_ALGO_SAVAGE;
+                chan->adapter.id                = I2C_HW_B_SAVAGE;
                 chan->adapter.algo_data         = &chan->algo;
                 chan->adapter.dev.parent        = &chan->par->pcidev->dev;
                 chan->algo.udelay               = 40;
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index f4633d1891f1..117ad42f120d 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2110,7 +2110,6 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
         struct savagefb_par *par = (struct savagefb_par *)info->par;
 
         DBG("savagefb_suspend");
-        printk(KERN_DEBUG "state: %u\n", state);
 
         acquire_console_sem();
         fb_set_suspend(info, pci_choose_state(dev, state));
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index adcda697ea60..0030c071da8f 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -5,9 +5,15 @@
  *
  * Copyright (C) 2002, ATI Corp.
  * Copyright (C) 2004-2005 Richard Purdie
+ * Copyright (c) 2005 Ian Molton
  *
  * Rewritten for 2.6 by Richard Purdie <rpurdie@rpsys.net>
  *
+ * Generic platform support by Ian Molton <spyro@f2s.com>
+ * and Richard Purdie <rpurdie@rpsys.net>
+ *
+ * w32xx support by Ian Molton
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -21,7 +27,7 @@
 #include <linux/mm.h>
 #include <linux/device.h>
 #include <linux/string.h>
-#include <linux/proc_fs.h>
+#include <linux/vmalloc.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <video/w100fb.h>
@@ -30,114 +36,78 @@
 /*
  * Prototypes
  */
-static void w100fb_save_buffer(void);
-static void w100fb_clear_buffer(void);
-static void w100fb_restore_buffer(void);
-static void w100fb_clear_screen(u32 mode, long int offset);
-static void w100_resume(void);
 static void w100_suspend(u32 mode);
-static void w100_init_qvga_rotation(u16 deg);
-static void w100_init_vga_rotation(u16 deg);
 static void w100_vsync(void);
-static void w100_init_sharp_lcd(u32 mode);
-static void w100_pwm_setup(void);
-static void w100_InitExtMem(u32 mode);
-static void w100_hw_init(void);
-static u16 w100_set_fastsysclk(u16 Freq);
-
-static void lcdtg_hw_init(u32 mode);
-static void lcdtg_lcd_change(u32 mode);
-static void lcdtg_resume(void);
-static void lcdtg_suspend(void);
-
-
-/* Register offsets & lengths */
-#define REMAPPED_FB_LEN   0x15ffff
-
-#define BITS_PER_PIXEL    16
+static void w100_hw_init(struct w100fb_par*);
+static void w100_pwm_setup(struct w100fb_par*);
+static void w100_init_clocks(struct w100fb_par*);
+static void w100_setup_memory(struct w100fb_par*);
+static void w100_init_lcd(struct w100fb_par*);
+static void w100_set_dispregs(struct w100fb_par*);
+static void w100_update_enable(void);
+static void w100_update_disable(void);
+static void calc_hsync(struct w100fb_par *par);
+struct w100_pll_info *w100_get_xtal_table(unsigned int freq);
 
 /* Pseudo palette size */
 #define MAX_PALETTES      16
 
-/* for resolution change */
-#define LCD_MODE_INIT (-1)
-#define LCD_MODE_480    0
-#define LCD_MODE_320    1
-#define LCD_MODE_240    2
-#define LCD_MODE_640    3
-
-#define LCD_SHARP_QVGA 0
-#define LCD_SHARP_VGA  1
-
-#define LCD_MODE_PORTRAIT       0
-#define LCD_MODE_LANDSCAPE      1
-
 #define W100_SUSPEND_EXTMEM 0
 #define W100_SUSPEND_ALL    1
 
-/* General frame buffer data structures */
-struct w100fb_par {
-        u32 xres;
-        u32 yres;
-        int fastsysclk_mode;
-        int lcdMode;
-        int rotation_flag;
-        int blanking_flag;
-        int comadj;
-        int phadadj;
-};
-
-static struct w100fb_par *current_par;
+#define BITS_PER_PIXEL    16
 
 /* Remapped addresses for base cfg, memmapped regs and the frame buffer itself */
 static void *remapped_base;
 static void *remapped_regs;
 static void *remapped_fbuf;
 
-/* External Function */
-static void(*w100fb_ssp_send)(u8 adrs, u8 data);
+#define REMAPPED_FB_LEN   0x15ffff
+
+/* This is the offset in the w100's address space we map the current
+   framebuffer memory to. We use the position of external memory as
+   we can remap internal memory to there if external isn't present. */
+#define W100_FB_BASE MEM_EXT_BASE_VALUE
+
 
 /*
  * Sysfs functions
  */
-
-static ssize_t rotation_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t flip_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        return sprintf(buf, "%d\n",par->rotation_flag);
+        return sprintf(buf, "%d\n",par->flip);
 }
 
-static ssize_t rotation_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t flip_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned int rotate;
+        unsigned int flip;
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        rotate = simple_strtoul(buf, NULL, 10);
+        flip = simple_strtoul(buf, NULL, 10);
+
+        if (flip > 0)
+                par->flip = 1;
+        else
+                par->flip = 0;
 
-        if (rotate > 0) par->rotation_flag = 1;
-        else par->rotation_flag = 0;
+        w100_update_disable();
+        w100_set_dispregs(par);
+        w100_update_enable();
 
-        if (par->lcdMode == LCD_MODE_320)
-                w100_init_qvga_rotation(par->rotation_flag ? 270 : 90);
-        else if (par->lcdMode == LCD_MODE_240)
-                w100_init_qvga_rotation(par->rotation_flag ? 180 : 0);
-        else if (par->lcdMode == LCD_MODE_640)
-                w100_init_vga_rotation(par->rotation_flag ? 270 : 90);
-        else if (par->lcdMode == LCD_MODE_480)
-                w100_init_vga_rotation(par->rotation_flag ? 180 : 0);
+        calc_hsync(par);
 
         return count;
 }
 
-static DEVICE_ATTR(rotation, 0644, rotation_show, rotation_store);
+static DEVICE_ATTR(flip, 0644, flip_show, flip_store);
 
 static ssize_t w100fb_reg_read(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned long param;
-        unsigned long regs;
+        unsigned long regs, param;
         regs = simple_strtoul(buf, NULL, 16);
         param = readl(remapped_regs + regs);
         printk("Read Register 0x%08lX: 0x%08lX\n", regs, param);
@@ -148,8 +118,7 @@ static DEVICE_ATTR(reg_read, 0200, NULL, w100fb_reg_read);
 
 static ssize_t w100fb_reg_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned long regs;
-        unsigned long param;
+        unsigned long regs, param;
         sscanf(buf, "%lx %lx", &regs, &param);
 
         if (regs <= 0x2000) {
@@ -163,54 +132,56 @@ static ssize_t w100fb_reg_write(struct device *dev, struct device_attribute *att
 static DEVICE_ATTR(reg_write, 0200, NULL, w100fb_reg_write);
 
 
-static ssize_t fastsysclk_show(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t fastpllclk_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        return sprintf(buf, "%d\n",par->fastsysclk_mode);
+        return sprintf(buf, "%d\n",par->fastpll_mode);
 }
 
-static ssize_t fastsysclk_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t fastpllclk_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
-        int param;
         struct fb_info *info = dev_get_drvdata(dev);
         struct w100fb_par *par=info->par;
 
-        param = simple_strtoul(buf, NULL, 10);
-
-        if (param == 75) {
-                printk("Set fastsysclk %d\n", param);
-                par->fastsysclk_mode = param;
-                w100_set_fastsysclk(par->fastsysclk_mode);
-        } else if (param == 100) {
-                printk("Set fastsysclk %d\n", param);
-                par->fastsysclk_mode = param;
-                w100_set_fastsysclk(par->fastsysclk_mode);
+        if (simple_strtoul(buf, NULL, 10) > 0) {
+                par->fastpll_mode=1;
+                printk("w100fb: Using fast system clock (if possible)\n");
+        } else {
+                par->fastpll_mode=0;
+                printk("w100fb: Using normal system clock\n");
         }
+
+        w100_init_clocks(par);
+        calc_hsync(par);
+
         return count;
 }
 
-static DEVICE_ATTR(fastsysclk, 0644, fastsysclk_show, fastsysclk_store);
+static DEVICE_ATTR(fastpllclk, 0644, fastpllclk_show, fastpllclk_store);
 
 /*
- * The touchscreen on this device needs certain information
- * from the video driver to function correctly. We export it here.
+ * Some touchscreens need hsync information from the video driver to
+ * function correctly. We export it here.
  */
-int w100fb_get_xres(void) {
-        return current_par->xres;
-}
+unsigned long w100fb_get_hsynclen(struct device *dev)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
 
-int w100fb_get_blanking(void) {
-        return current_par->blanking_flag;
+        /* If display is blanked/suspended, hsync isn't active */
+        if (par->blanked)
+                return 0;
+        else
+                return par->hsync_len;
 }
+EXPORT_SYMBOL(w100fb_get_hsynclen);
 
-int w100fb_get_fastsysclk(void) {
-        return current_par->fastsysclk_mode;
+static void w100fb_clear_screen(struct w100fb_par *par)
+{
+        memset_io(remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), 0, (par->xres * par->yres * BITS_PER_PIXEL/8));
 }
-EXPORT_SYMBOL(w100fb_get_xres);
-EXPORT_SYMBOL(w100fb_get_blanking);
-EXPORT_SYMBOL(w100fb_get_fastsysclk);
 
 
 /*
@@ -234,7 +205,6 @@ static int w100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
          * according to the RGB bitfield information.
          */
         if (regno < MAX_PALETTES) {
-
                 u32 *pal = info->pseudo_palette;
 
                 val = (red & 0xf800) | ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
@@ -250,115 +220,90 @@ static int w100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
  */
 static int w100fb_blank(int blank_mode, struct fb_info *info)
 {
-        struct w100fb_par *par;
-        par=info->par;
+        struct w100fb_par *par = info->par;
+        struct w100_tg_info *tg = par->mach->tg;
 
         switch(blank_mode) {
 
-        case FB_BLANK_NORMAL: /* Normal blanking */
-        case FB_BLANK_VSYNC_SUSPEND: /* VESA blank (vsync off) */
-        case FB_BLANK_HSYNC_SUSPEND: /* VESA blank (hsync off) */
-        case FB_BLANK_POWERDOWN: /* Poweroff */
-                if (par->blanking_flag == 0) {
-                        w100fb_save_buffer();
-                        lcdtg_suspend();
-                        par->blanking_flag = 1;
+        case FB_BLANK_NORMAL:         /* Normal blanking */
+        case FB_BLANK_VSYNC_SUSPEND:  /* VESA blank (vsync off) */
+        case FB_BLANK_HSYNC_SUSPEND:  /* VESA blank (hsync off) */
+        case FB_BLANK_POWERDOWN:      /* Poweroff */
+                if (par->blanked == 0) {
+                        if(tg && tg->suspend)
+                                tg->suspend(par);
+                        par->blanked = 1;
                 }
                 break;
 
         case FB_BLANK_UNBLANK: /* Unblanking */
-                if (par->blanking_flag != 0) {
-                        w100fb_restore_buffer();
-                        lcdtg_resume();
-                        par->blanking_flag = 0;
+                if (par->blanked != 0) {
+                        if(tg && tg->resume)
+                                tg->resume(par);
+                        par->blanked = 0;
                 }
                 break;
         }
         return 0;
 }
 
+
 /*
  *  Change the resolution by calling the appropriate hardware functions
  */
-static void w100fb_changeres(int rotate_mode, u32 mode)
+static void w100fb_activate_var(struct w100fb_par *par)
 {
-        u16 rotation=0;
-
-        switch(rotate_mode) {
-        case LCD_MODE_LANDSCAPE:
-                rotation=(current_par->rotation_flag ? 270 : 90);
-                break;
-        case LCD_MODE_PORTRAIT:
-                rotation=(current_par->rotation_flag ? 180 : 0);
-                break;
-        }
+        struct w100_tg_info *tg = par->mach->tg;
 
-        w100_pwm_setup();
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                w100_vsync();
-                w100_suspend(W100_SUSPEND_EXTMEM);
-                w100_init_sharp_lcd(LCD_SHARP_QVGA);
-                w100_init_qvga_rotation(rotation);
-                w100_InitExtMem(LCD_SHARP_QVGA);
-                w100fb_clear_screen(LCD_SHARP_QVGA, 0);
-                lcdtg_lcd_change(LCD_SHARP_QVGA);
-                break;
-        case LCD_SHARP_VGA:
-                w100fb_clear_screen(LCD_SHARP_QVGA, 0);
-                writel(0xBFFFA000, remapped_regs + mmMC_EXT_MEM_LOCATION);
-                w100_InitExtMem(LCD_SHARP_VGA);
-                w100fb_clear_screen(LCD_SHARP_VGA, 0x200000);
-                w100_vsync();
-                w100_init_sharp_lcd(LCD_SHARP_VGA);
-                if (rotation != 0)
-                        w100_init_vga_rotation(rotation);
-                lcdtg_lcd_change(LCD_SHARP_VGA);
-                break;
-        }
+        w100_pwm_setup(par);
+        w100_setup_memory(par);
+        w100_init_clocks(par);
+        w100fb_clear_screen(par);
+        w100_vsync();
+
+        w100_update_disable();
+        w100_init_lcd(par);
+        w100_set_dispregs(par);
+        w100_update_enable();
+
+        calc_hsync(par);
+
+        if (!par->blanked && tg && tg->change)
+                tg->change(par);
 }
 
-/*
- * Set up the display for the fb subsystem
+
+/* Select the smallest mode that allows the desired resolution to be
+ * displayed. If desired, the x and y parameters can be rounded up to
+ * match the selected mode.
  */
-static void w100fb_activate_var(struct fb_info *info)
+static struct w100_mode *w100fb_get_mode(struct w100fb_par *par, unsigned int *x, unsigned int *y, int saveval)
 {
-        u32 temp32;
-        struct w100fb_par *par=info->par;
-        struct fb_var_screeninfo *var = &info->var;
+        struct w100_mode *mode = NULL;
+        struct w100_mode *modelist = par->mach->modelist;
+        unsigned int best_x = 0xffffffff, best_y = 0xffffffff;
+        unsigned int i;
+
+        for (i = 0 ; i < par->mach->num_modes ; i++) {
+                if (modelist[i].xres >= *x && modelist[i].yres >= *y &&
+                                modelist[i].xres < best_x && modelist[i].yres < best_y) {
+                        best_x = modelist[i].xres;
+                        best_y = modelist[i].yres;
+                        mode = &modelist[i];
+                } else if(modelist[i].xres >= *y && modelist[i].yres >= *x &&
+                        modelist[i].xres < best_y && modelist[i].yres < best_x) {
+                        best_x = modelist[i].yres;
+                        best_y = modelist[i].xres;
+                        mode = &modelist[i];
+                }
+        }
 
-        /* Set the hardware to 565 */
-        temp32 = readl(remapped_regs + mmDISP_DEBUG2);
-        temp32 &= 0xff7fffff;
-        temp32 |= 0x00800000;
-        writel(temp32, remapped_regs + mmDISP_DEBUG2);
+        if (mode && saveval) {
+                *x = best_x;
+                *y = best_y;
+        }
 
-        if (par->lcdMode == LCD_MODE_INIT) {
-                w100_init_sharp_lcd(LCD_SHARP_VGA);
-                w100_init_vga_rotation(par->rotation_flag ? 270 : 90);
-                par->lcdMode = LCD_MODE_640;
-                lcdtg_hw_init(LCD_SHARP_VGA);
-        } else if (var->xres == 320 && var->yres == 240) {
-                if (par->lcdMode != LCD_MODE_320) {
-                        w100fb_changeres(LCD_MODE_LANDSCAPE, LCD_SHARP_QVGA);
-                        par->lcdMode = LCD_MODE_320;
-                }
-        } else if (var->xres == 240 && var->yres == 320) {
-                if (par->lcdMode != LCD_MODE_240) {
-                        w100fb_changeres(LCD_MODE_PORTRAIT, LCD_SHARP_QVGA);
-                        par->lcdMode = LCD_MODE_240;
-                }
-        } else if (var->xres == 640 && var->yres == 480) {
-                if (par->lcdMode != LCD_MODE_640) {
-                        w100fb_changeres(LCD_MODE_LANDSCAPE, LCD_SHARP_VGA);
-                        par->lcdMode = LCD_MODE_640;
-                }
-        } else if (var->xres == 480 && var->yres == 640) {
-                if (par->lcdMode != LCD_MODE_480) {
-                        w100fb_changeres(LCD_MODE_PORTRAIT, LCD_SHARP_VGA);
-                        par->lcdMode = LCD_MODE_480;
-                }
-        } else printk(KERN_ERR "W100FB: Resolution error!\n");
+        return mode;
 }
 
 
@@ -366,31 +311,19 @@ static void w100fb_activate_var(struct fb_info *info)
  *  w100fb_check_var():
  *  Get the video params out of 'var'. If a value doesn't fit, round it up,
  *  if it's too big, return -EINVAL.
- *
  */
 static int w100fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
-        if (var->xres < var->yres) { /* Portrait mode */
-                if ((var->xres > 480) || (var->yres > 640)) {
-                        return -EINVAL;
-                } else if ((var->xres > 240) || (var->yres > 320)) {
-                        var->xres = 480;
-                        var->yres = 640;
-                } else {
-                        var->xres = 240;
-                        var->yres = 320;
-                }
-        } else { /* Landscape mode */
-                if ((var->xres > 640) || (var->yres > 480)) {
-                        return -EINVAL;
-                } else if ((var->xres > 320) || (var->yres > 240)) {
-                        var->xres = 640;
-                        var->yres = 480;
-                } else {
-                        var->xres = 320;
-                        var->yres = 240;
-                }
-        }
+        struct w100fb_par *par=info->par;
+
+        if(!w100fb_get_mode(par, &var->xres, &var->yres, 1))
+                return -EINVAL;
+
+        if (par->mach->mem && ((var->xres*var->yres*BITS_PER_PIXEL/8) > (par->mach->mem->size+1)))
+                return -EINVAL;
+
+        if (!par->mach->mem && ((var->xres*var->yres*BITS_PER_PIXEL/8) > (MEM_INT_SIZE+1)))
+                return -EINVAL;
 
         var->xres_virtual = max(var->xres_virtual, var->xres);
         var->yres_virtual = max(var->yres_virtual, var->yres);
@@ -409,13 +342,11 @@ static int w100fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
         var->transp.offset = var->transp.length = 0;
 
         var->nonstd = 0;
-
         var->height = -1;
         var->width = -1;
         var->vmode = FB_VMODE_NONINTERLACED;
-
         var->sync = 0;
-        var->pixclock = 0x04;   /* 171521; */
+        var->pixclock = 0x04;  /* 171521; */
 
         return 0;
 }
@@ -430,274 +361,286 @@ static int w100fb_set_par(struct fb_info *info)
 {
         struct w100fb_par *par=info->par;
 
-        par->xres = info->var.xres;
-        par->yres = info->var.yres;
-
-        info->fix.visual = FB_VISUAL_TRUECOLOR;
-
-        info->fix.ypanstep = 0;
-        info->fix.ywrapstep = 0;
+        if (par->xres != info->var.xres || par->yres != info->var.yres) {
+                par->xres = info->var.xres;
+                par->yres = info->var.yres;
+                par->mode = w100fb_get_mode(par, &par->xres, &par->yres, 0);
 
-        if (par->blanking_flag)
-                w100fb_clear_buffer();
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                info->fix.ypanstep = 0;
+                info->fix.ywrapstep = 0;
+                info->fix.line_length = par->xres * BITS_PER_PIXEL / 8;
 
-        w100fb_activate_var(info);
+                if ((par->xres*par->yres*BITS_PER_PIXEL/8) > (MEM_INT_SIZE+1)) {
+                        par->extmem_active = 1;
+                        info->fix.smem_len = par->mach->mem->size+1;
+                } else {
+                        par->extmem_active = 0;
+                        info->fix.smem_len = MEM_INT_SIZE+1;
+                }
 
-        if (par->lcdMode == LCD_MODE_480) {
-                info->fix.line_length = (480 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x200000;
-        } else if (par->lcdMode == LCD_MODE_320) {
-                info->fix.line_length = (320 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x60000;
-        } else if (par->lcdMode == LCD_MODE_240) {
-                info->fix.line_length = (240 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x60000;
-        } else if (par->lcdMode == LCD_MODE_INIT || par->lcdMode == LCD_MODE_640) {
-                info->fix.line_length = (640 * BITS_PER_PIXEL) / 8;
-                info->fix.smem_len = 0x200000;
+                w100fb_activate_var(par);
         }
-
         return 0;
 }
 
 
 /*
- *      Frame buffer operations
+ *  Frame buffer operations
  */
 static struct fb_ops w100fb_ops = {
-        .owner = THIS_MODULE,
+        .owner        = THIS_MODULE,
         .fb_check_var = w100fb_check_var,
-        .fb_set_par = w100fb_set_par,
+        .fb_set_par   = w100fb_set_par,
         .fb_setcolreg = w100fb_setcolreg,
-        .fb_blank = w100fb_blank,
-        .fb_fillrect = cfb_fillrect,
-        .fb_copyarea = cfb_copyarea,
+        .fb_blank     = w100fb_blank,
+        .fb_fillrect  = cfb_fillrect,
+        .fb_copyarea  = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_cursor = soft_cursor,
+        .fb_cursor    = soft_cursor,
 };
 
-
-static void w100fb_clear_screen(u32 mode, long int offset)
+#ifdef CONFIG_PM
+static void w100fb_save_vidmem(struct w100fb_par *par)
 {
-        int i, numPix = 0;
-
-        if (mode == LCD_SHARP_VGA)
-                numPix = 640 * 480;
-        else if (mode == LCD_SHARP_QVGA)
-                numPix = 320 * 240;
+        int memsize;
 
-        for (i = 0; i < numPix; i++)
-                writew(0xffff, remapped_fbuf + offset + (2*i));
-}
-
-
-/* Need to split up the buffers to stay within the limits of kmalloc */
-#define W100_BUF_NUM    6
-static uint32_t *gSaveImagePtr[W100_BUF_NUM] = { NULL };
-
-static void w100fb_save_buffer(void)
-{
-        int i, j, bufsize;
-
-        bufsize=(current_par->xres * current_par->yres * BITS_PER_PIXEL / 8) / W100_BUF_NUM;
-        for (i = 0; i < W100_BUF_NUM; i++) {
-                if (gSaveImagePtr[i] == NULL)
-                        gSaveImagePtr[i] = kmalloc(bufsize, GFP_KERNEL);
-                if (gSaveImagePtr[i] == NULL) {
-                        w100fb_clear_buffer();
-                        printk(KERN_WARNING "can't alloc pre-off image buffer %d\n", i);
-                        break;
-                }
-                for (j = 0; j < bufsize/4; j++)
-                        *(gSaveImagePtr[i] + j) = readl(remapped_fbuf + (bufsize*i) + j*4);
+        if (par->extmem_active) {
+                memsize=par->mach->mem->size;
+                par->saved_extmem = vmalloc(memsize);
+                if (par->saved_extmem)
+                        memcpy_fromio(par->saved_extmem, remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), memsize);
         }
+        memsize=MEM_INT_SIZE;
+        par->saved_intmem = vmalloc(memsize);
+        if (par->saved_intmem && par->extmem_active)
+                memcpy_fromio(par->saved_intmem, remapped_fbuf + (W100_FB_BASE-MEM_INT_BASE_VALUE), memsize);
+        else if (par->saved_intmem)
+                memcpy_fromio(par->saved_intmem, remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), memsize);
 }
 
-
-static void w100fb_restore_buffer(void)
+static void w100fb_restore_vidmem(struct w100fb_par *par)
 {
-        int i, j, bufsize;
+        int memsize;
 
-        bufsize=(current_par->xres * current_par->yres * BITS_PER_PIXEL / 8) / W100_BUF_NUM;
-        for (i = 0; i < W100_BUF_NUM; i++) {
-                if (gSaveImagePtr[i] == NULL) {
-                        printk(KERN_WARNING "can't find pre-off image buffer %d\n", i);
-                        w100fb_clear_buffer();
-                        break;
-                }
-                for (j = 0; j < (bufsize/4); j++)
-                        writel(*(gSaveImagePtr[i] + j),remapped_fbuf + (bufsize*i) + (j*4));
-                kfree(gSaveImagePtr[i]);
-                gSaveImagePtr[i] = NULL;
+        if (par->extmem_active && par->saved_extmem) {
+                memsize=par->mach->mem->size;
+                memcpy_toio(remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), par->saved_extmem, memsize);
+                vfree(par->saved_extmem);
         }
-}
-
-
-static void w100fb_clear_buffer(void)
-{
-        int i;
-        for (i = 0; i < W100_BUF_NUM; i++) {
-                kfree(gSaveImagePtr[i]);
-                gSaveImagePtr[i] = NULL;
+        if (par->saved_intmem) {
+                memsize=MEM_INT_SIZE;
+                if (par->extmem_active)
+                        memcpy_toio(remapped_fbuf + (W100_FB_BASE-MEM_INT_BASE_VALUE), par->saved_intmem, memsize);
+                else
+                        memcpy_toio(remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE), par->saved_intmem, memsize);
+                vfree(par->saved_intmem);
         }
 }
 
-
-#ifdef CONFIG_PM
-static int w100fb_suspend(struct device *dev, pm_message_t state, u32 level)
+static int w100fb_suspend(struct device *dev, pm_message_t state, uint32_t level)
 {
         if (level == SUSPEND_POWER_DOWN) {
                 struct fb_info *info = dev_get_drvdata(dev);
                 struct w100fb_par *par=info->par;
+                struct w100_tg_info *tg = par->mach->tg;
 
-                w100fb_save_buffer();
-                lcdtg_suspend();
+                w100fb_save_vidmem(par);
+                if(tg && tg->suspend)
+                        tg->suspend(par);
                 w100_suspend(W100_SUSPEND_ALL);
-                par->blanking_flag = 1;
+                par->blanked = 1;
         }
         return 0;
 }
 
-static int w100fb_resume(struct device *dev, u32 level)
+static int w100fb_resume(struct device *dev, uint32_t level)
 {
         if (level == RESUME_POWER_ON) {
                 struct fb_info *info = dev_get_drvdata(dev);
                 struct w100fb_par *par=info->par;
-
-                w100_resume();
-                w100fb_restore_buffer();
-                lcdtg_resume();
-                par->blanking_flag = 0;
+                struct w100_tg_info *tg = par->mach->tg;
+
+                w100_hw_init(par);
+                w100fb_activate_var(par);
+                w100fb_restore_vidmem(par);
+                if(tg && tg->resume)
+                        tg->resume(par);
+                par->blanked = 0;
         }
         return 0;
 }
 #else
-#define w100fb_suspend  NULL
-#define w100fb_resume   NULL
+#define w100fb_suspend  NULL
+#define w100fb_resume   NULL
 #endif
 
 
 int __init w100fb_probe(struct device *dev)
 {
+        int err = -EIO;
         struct w100fb_mach_info *inf;
-        struct fb_info *info;
+        struct fb_info *info = NULL;
         struct w100fb_par *par;
         struct platform_device *pdev = to_platform_device(dev);
         struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        unsigned int chip_id;
 
         if (!mem)
                 return -EINVAL;
 
-        /* remap the areas we're going to use */
+        /* Remap the chip base address */
         remapped_base = ioremap_nocache(mem->start+W100_CFG_BASE, W100_CFG_LEN);
         if (remapped_base == NULL)
-                return -EIO;
+                goto out;
 
+        /* Map the register space */
         remapped_regs = ioremap_nocache(mem->start+W100_REG_BASE, W100_REG_LEN);
-        if (remapped_regs == NULL) {
-                iounmap(remapped_base);
-                return -EIO;
+        if (remapped_regs == NULL)
+                goto out;
+
+        /* Identify the chip */
+        printk("Found ");
+        chip_id = readl(remapped_regs + mmCHIP_ID);
+        switch(chip_id) {
+                case CHIP_ID_W100:  printk("w100");  break;
+                case CHIP_ID_W3200: printk("w3200"); break;
+                case CHIP_ID_W3220: printk("w3220"); break;
+                default:
+                        printk("Unknown imageon chip ID\n");
+                        err = -ENODEV;
+                        goto out;
         }
+        printk(" at 0x%08lx.\n", mem->start+W100_CFG_BASE);
 
-        remapped_fbuf = ioremap_nocache(mem->start+MEM_EXT_BASE_VALUE, REMAPPED_FB_LEN);
-        if (remapped_fbuf == NULL) {
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                return -EIO;
-        }
+        /* Remap the framebuffer */
+        remapped_fbuf = ioremap_nocache(mem->start+MEM_WINDOW_BASE, MEM_WINDOW_SIZE);
+        if (remapped_fbuf == NULL)
+                goto out;
 
         info=framebuffer_alloc(sizeof(struct w100fb_par), dev);
         if (!info) {
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                iounmap(remapped_fbuf);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto out;
         }
 
-        info->device=dev;
         par = info->par;
-        current_par=info->par;
         dev_set_drvdata(dev, info);
 
         inf = dev->platform_data;
-        par->phadadj = inf->phadadj;
-        par->comadj = inf->comadj;
-        par->fastsysclk_mode = 75;
-        par->lcdMode = LCD_MODE_INIT;
-        par->rotation_flag=0;
-        par->blanking_flag=0;
-        w100fb_ssp_send = inf->w100fb_ssp_send;
-
-        w100_hw_init();
-        w100_pwm_setup();
+        par->chip_id = chip_id;
+        par->mach = inf;
+        par->fastpll_mode = 0;
+        par->blanked = 0;
+
+        par->pll_table=w100_get_xtal_table(inf->xtal_freq);
+        if (!par->pll_table) {
+                printk(KERN_ERR "No matching Xtal definition found\n");
+                err = -EINVAL;
+                goto out;
+        }
 
         info->pseudo_palette = kmalloc(sizeof (u32) * MAX_PALETTES, GFP_KERNEL);
         if (!info->pseudo_palette) {
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                iounmap(remapped_fbuf);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto out;
         }
 
         info->fbops = &w100fb_ops;
         info->flags = FBINFO_DEFAULT;
         info->node = -1;
-        info->screen_base = remapped_fbuf;
+        info->screen_base = remapped_fbuf + (W100_FB_BASE-MEM_WINDOW_BASE);
         info->screen_size = REMAPPED_FB_LEN;
 
-        info->var.xres = 640;
+        strcpy(info->fix.id, "w100fb");
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.type_aux = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+        info->fix.smem_start = mem->start+W100_FB_BASE;
+        info->fix.mmio_start = mem->start+W100_REG_BASE;
+        info->fix.mmio_len = W100_REG_LEN;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                err = -ENOMEM;
+                goto out;
+        }
+
+        par->mode = &inf->modelist[0];
+        if(inf->init_mode & INIT_MODE_ROTATED) {
+                info->var.xres = par->mode->yres;
+                info->var.yres = par->mode->xres;
+        }
+        else {
+                info->var.xres = par->mode->xres;
+                info->var.yres = par->mode->yres;
+        }
+
+        if(inf->init_mode &= INIT_MODE_FLIPPED)
+                par->flip = 1;
+        else
+                par->flip = 0;
+
         info->var.xres_virtual = info->var.xres;
-        info->var.yres = 480;
         info->var.yres_virtual = info->var.yres;
-        info->var.pixclock = 0x04;      /* 171521; */
+        info->var.pixclock = 0x04;  /* 171521; */
         info->var.sync = 0;
         info->var.grayscale = 0;
         info->var.xoffset = info->var.yoffset = 0;
         info->var.accel_flags = 0;
         info->var.activate = FB_ACTIVATE_NOW;
 
-        strcpy(info->fix.id, "w100fb");
-        info->fix.type = FB_TYPE_PACKED_PIXELS;
-        info->fix.type_aux = 0;
-        info->fix.accel = FB_ACCEL_NONE;
-        info->fix.smem_start = mem->start+MEM_EXT_BASE_VALUE;
-        info->fix.mmio_start = mem->start+W100_REG_BASE;
-        info->fix.mmio_len = W100_REG_LEN;
+        w100_hw_init(par);
+
+        if (w100fb_check_var(&info->var, info) < 0) {
+                err = -EINVAL;
+                goto out;
+        }
 
-        w100fb_check_var(&info->var, info);
         w100fb_set_par(info);
 
         if (register_framebuffer(info) < 0) {
-                kfree(info->pseudo_palette);
-                iounmap(remapped_base);
-                iounmap(remapped_regs);
-                iounmap(remapped_fbuf);
-                return -EINVAL;
+                err = -EINVAL;
+                goto out;
         }
 
-        device_create_file(dev, &dev_attr_fastsysclk);
+        device_create_file(dev, &dev_attr_fastpllclk);
         device_create_file(dev, &dev_attr_reg_read);
         device_create_file(dev, &dev_attr_reg_write);
-        device_create_file(dev, &dev_attr_rotation);
+        device_create_file(dev, &dev_attr_flip);
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
         return 0;
+out:
+        fb_dealloc_cmap(&info->cmap);
+        kfree(info->pseudo_palette);
+        if (remapped_fbuf != NULL)
+                iounmap(remapped_fbuf);
+        if (remapped_regs != NULL)
+                iounmap(remapped_regs);
+        if (remapped_base != NULL)
+                iounmap(remapped_base);
+        if (info)
+                framebuffer_release(info);
+        return err;
 }
 
 
 static int w100fb_remove(struct device *dev)
 {
         struct fb_info *info = dev_get_drvdata(dev);
+        struct w100fb_par *par=info->par;
 
-        device_remove_file(dev, &dev_attr_fastsysclk);
+        device_remove_file(dev, &dev_attr_fastpllclk);
         device_remove_file(dev, &dev_attr_reg_read);
         device_remove_file(dev, &dev_attr_reg_write);
-        device_remove_file(dev, &dev_attr_rotation);
+        device_remove_file(dev, &dev_attr_flip);
 
         unregister_framebuffer(info);
 
-        w100fb_clear_buffer();
+        vfree(par->saved_intmem);
+        vfree(par->saved_extmem);
         kfree(info->pseudo_palette);
+        fb_dealloc_cmap(&info->cmap);
 
         iounmap(remapped_base);
         iounmap(remapped_regs);
@@ -721,10 +664,54 @@ static void w100_soft_reset(void)
         udelay(100);
 }
 
+static void w100_update_disable(void)
+{
+        union disp_db_buf_cntl_wr_u disp_db_buf_wr_cntl;
+
+        /* Prevent display updates */
+        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
+        disp_db_buf_wr_cntl.f.update_db_buf = 0;
+        disp_db_buf_wr_cntl.f.en_db_buf = 0;
+        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
+}
+
+static void w100_update_enable(void)
+{
+        union disp_db_buf_cntl_wr_u disp_db_buf_wr_cntl;
+
+        /* Enable display updates */
+        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
+        disp_db_buf_wr_cntl.f.update_db_buf = 1;
+        disp_db_buf_wr_cntl.f.en_db_buf = 1;
+        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
+}
+
+unsigned long w100fb_gpio_read(int port)
+{
+        unsigned long value;
+
+        if (port==W100_GPIO_PORT_A)
+                value = readl(remapped_regs + mmGPIO_DATA);
+        else
+                value = readl(remapped_regs + mmGPIO_DATA2);
+
+        return value;
+}
+
+void w100fb_gpio_write(int port, unsigned long value)
+{
+        if (port==W100_GPIO_PORT_A)
+                value = writel(value, remapped_regs + mmGPIO_DATA);
+        else
+                value = writel(value, remapped_regs + mmGPIO_DATA2);
+}
+EXPORT_SYMBOL(w100fb_gpio_read);
+EXPORT_SYMBOL(w100fb_gpio_write);
+
 /*
  * Initialization of critical w100 hardware
  */
-static void w100_hw_init(void)
+static void w100_hw_init(struct w100fb_par *par)
 {
         u32 temp32;
         union cif_cntl_u cif_cntl;
@@ -735,8 +722,8 @@ static void w100_hw_init(void)
         union cpu_defaults_u cpu_default;
         union cif_write_dbg_u cif_write_dbg;
         union wrap_start_dir_u wrap_start_dir;
-        union mc_ext_mem_location_u mc_ext_mem_loc;
         union cif_io_u cif_io;
+        struct w100_gpio_regs *gpio = par->mach->gpio;
 
         w100_soft_reset();
 
@@ -791,19 +778,6 @@ static void w100_hw_init(void)
         cfgreg_base.f.cfgreg_base = W100_CFG_BASE;
         writel((u32) (cfgreg_base.val), remapped_regs + mmCFGREG_BASE);
 
-        /* This location is relative to internal w100 addresses */
-        writel(0x15FF1000, remapped_regs + mmMC_FB_LOCATION);
-
-        mc_ext_mem_loc.val = defMC_EXT_MEM_LOCATION;
-        mc_ext_mem_loc.f.mc_ext_mem_start = MEM_EXT_BASE_VALUE >> 8;
-        mc_ext_mem_loc.f.mc_ext_mem_top = MEM_EXT_TOP_VALUE >> 8;
-        writel((u32) (mc_ext_mem_loc.val), remapped_regs + mmMC_EXT_MEM_LOCATION);
-
-        if ((current_par->lcdMode == LCD_MODE_240) || (current_par->lcdMode == LCD_MODE_320))
-                w100_InitExtMem(LCD_SHARP_QVGA);
-        else
-                w100_InitExtMem(LCD_SHARP_VGA);
-
         wrap_start_dir.val = defWRAP_START_DIR;
         wrap_start_dir.f.start_addr = WRAP_BUF_BASE_VALUE >> 1;
         writel((u32) (wrap_start_dir.val), remapped_regs + mmWRAP_START_DIR);
@@ -813,21 +787,24 @@ static void w100_hw_init(void)
         writel((u32) (wrap_top_dir.val), remapped_regs + mmWRAP_TOP_DIR);
 
         writel((u32) 0x2440, remapped_regs + mmRBBM_CNTL);
-}
 
+        /* Set the hardware to 565 colour */
+        temp32 = readl(remapped_regs + mmDISP_DEBUG2);
+        temp32 &= 0xff7fffff;
+        temp32 |= 0x00800000;
+        writel(temp32, remapped_regs + mmDISP_DEBUG2);
 
-/*
- * Types
- */
+        /* Initialise the GPIO lines */
+        if (gpio) {
+                writel(gpio->init_data1, remapped_regs + mmGPIO_DATA);
+                writel(gpio->init_data2, remapped_regs + mmGPIO_DATA2);
+                writel(gpio->gpio_dir1,  remapped_regs + mmGPIO_CNTL1);
+                writel(gpio->gpio_oe1,   remapped_regs + mmGPIO_CNTL2);
+                writel(gpio->gpio_dir2,  remapped_regs + mmGPIO_CNTL3);
+                writel(gpio->gpio_oe2,   remapped_regs + mmGPIO_CNTL4);
+        }
+}
 
-struct pll_parm {
-        u16 freq;               /* desired Fout for PLL */
-        u8 M;
-        u8 N_int;
-        u8 N_fac;
-        u8 tfgoal;
-        u8 lock_time;
-};
 
 struct power_state {
         union clk_pin_cntl_u clk_pin_cntl;
@@ -835,317 +812,275 @@ struct power_state {
         union pll_cntl_u pll_cntl;
         union sclk_cntl_u sclk_cntl;
         union pclk_cntl_u pclk_cntl;
-        union clk_test_cntl_u clk_test_cntl;
         union pwrmgt_cntl_u pwrmgt_cntl;
-        u32 freq;               /* Fout for PLL calibration */
-        u8 tf100;               /* for pll calibration */
-        u8 tf80;                /* for pll calibration */
-        u8 tf20;                /* for pll calibration */
-        u8 M;                   /* for pll calibration */
-        u8 N_int;               /* for pll calibration */
-        u8 N_fac;               /* for pll calibration */
-        u8 lock_time;   /* for pll calibration */
-        u8 tfgoal;              /* for pll calibration */
-        u8 auto_mode;   /* hardware auto switch? */
-        u8 pwm_mode;            /* 0 fast, 1 normal/slow */
-        u16 fast_sclk;  /* fast clk freq */
-        u16 norm_sclk;  /* slow clk freq */
+        int auto_mode;  /* system clock auto changing? */
 };
 
 
-/*
- * Global state variables
- */
-
 static struct power_state w100_pwr_state;
 
-/* This table is specific for 12.5MHz ref crystal.  */
-static struct pll_parm gPLLTable[] = {
-    /*freq     M   N_int    N_fac  tfgoal  lock_time */
-    { 50,      0,   1,       0,     0xE0,        56}, /*  50.00 MHz */
-    { 75,      0,   5,       0,     0xDE,            37}, /*  75.00 MHz */
-    {100,      0,   7,       0,     0xE0,        28}, /* 100.00 MHz */
-    {125,      0,   9,       0,     0xE0,        22}, /* 125.00 MHz */
-    {150,      0,   11,      0,     0xE0,        17}, /* 150.00 MHz */
-    {  0,      0,   0,       0,        0,         0}  /* Terminator */
+/* The PLL Fout is determined by (XtalFreq/(M+1)) * ((N_int+1) + (N_fac/8)) */
+
+/* 12.5MHz Crystal PLL Table */
+static struct w100_pll_info xtal_12500000[] = {
+        /*freq     M   N_int    N_fac  tfgoal  lock_time */
+        { 50,      0,   1,       0,     0xe0,        56},  /*  50.00 MHz */
+        { 75,      0,   5,       0,     0xde,        37},  /*  75.00 MHz */
+        {100,      0,   7,       0,     0xe0,        28},  /* 100.00 MHz */
+        {125,      0,   9,       0,     0xe0,        22},  /* 125.00 MHz */
+        {150,      0,   11,      0,     0xe0,        17},  /* 150.00 MHz */
+        {  0,      0,   0,       0,        0,         0},  /* Terminator */
 };
 
+/* 14.318MHz Crystal PLL Table */
+static struct w100_pll_info xtal_14318000[] = {
+        /*freq     M   N_int    N_fac  tfgoal  lock_time */
+        { 40,      4,   13,      0,     0xe0,        80}, /* tfgoal guessed */
+        { 50,      1,   6,       0,     0xe0,        64}, /*  50.05 MHz */
+        { 57,      2,   11,      0,     0xe0,        53}, /* tfgoal guessed */
+        { 75,      0,   4,       3,     0xe0,        43}, /*  75.08 MHz */
+        {100,      0,   6,       0,     0xe0,        32}, /* 100.10 MHz */
+        {  0,      0,   0,       0,        0,         0},
+};
 
-static u8 w100_pll_get_testcount(u8 testclk_sel)
+/* 16MHz Crystal PLL Table */
+static struct w100_pll_info xtal_16000000[] = {
+        /*freq     M   N_int    N_fac  tfgoal  lock_time */
+        { 72,      1,   8,       0,     0xe0,        48}, /* tfgoal guessed */
+        { 95,      1,   10,      7,     0xe0,        38}, /* tfgoal guessed */
+        { 96,      1,   11,      0,     0xe0,        36}, /* tfgoal guessed */
+        {  0,      0,   0,       0,        0,         0},
+};
+
+static struct pll_entries {
+        int xtal_freq;
+        struct w100_pll_info *pll_table;
+} w100_pll_tables[] = {
+        { 12500000, &xtal_12500000[0] },
+        { 14318000, &xtal_14318000[0] },
+        { 16000000, &xtal_16000000[0] },
+        { 0 },
+};
+
+struct w100_pll_info *w100_get_xtal_table(unsigned int freq)
 {
+        struct pll_entries *pll_entry = w100_pll_tables;
+
+        do {
+                if (freq == pll_entry->xtal_freq)
+                        return pll_entry->pll_table;
+                pll_entry++;
+        } while (pll_entry->xtal_freq);
+        return 0;
+}
+
+
+static unsigned int w100_get_testcount(unsigned int testclk_sel)
+{
+        union clk_test_cntl_u clk_test_cntl;
+
         udelay(5);
 
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x0;
-        w100_pwr_state.clk_test_cntl.f.testclk_sel = testclk_sel;
-        w100_pwr_state.clk_test_cntl.f.tstcount_rst = 0x1;      /*reset test count */
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
-        w100_pwr_state.clk_test_cntl.f.tstcount_rst = 0x0;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+        /* Select the test clock source and reset */
+        clk_test_cntl.f.start_check_freq = 0x0;
+        clk_test_cntl.f.testclk_sel = testclk_sel;
+        clk_test_cntl.f.tstcount_rst = 0x1; /* set reset */
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
 
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x1;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+        clk_test_cntl.f.tstcount_rst = 0x0; /* clear reset */
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
 
+        /* Run clock test */
+        clk_test_cntl.f.start_check_freq = 0x1;
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+
+        /* Give the test time to complete */
         udelay(20);
 
-        w100_pwr_state.clk_test_cntl.val = readl(remapped_regs + mmCLK_TEST_CNTL);
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x0;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
+        /* Return the result */
+        clk_test_cntl.val = readl(remapped_regs + mmCLK_TEST_CNTL);
+        clk_test_cntl.f.start_check_freq = 0x0;
+        writel((u32) (clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
 
-        return w100_pwr_state.clk_test_cntl.f.test_count;
+        return clk_test_cntl.f.test_count;
 }
 
 
-static u8 w100_pll_adjust(void)
+static int w100_pll_adjust(struct w100_pll_info *pll)
 {
+        unsigned int tf80;
+        unsigned int tf20;
+
+        /* Initial Settings */
+        w100_pwr_state.pll_cntl.f.pll_pwdn = 0x0;     /* power down */
+        w100_pwr_state.pll_cntl.f.pll_reset = 0x0;    /* not reset */
+        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x1;   /* Hi-Z */
+        w100_pwr_state.pll_cntl.f.pll_pvg = 0x0;      /* VCO gain = 0 */
+        w100_pwr_state.pll_cntl.f.pll_vcofr = 0x0;    /* VCO frequency range control = off */
+        w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;  /* current offset inside VCO = 0 */
+        w100_pwr_state.pll_cntl.f.pll_ring_off = 0x0;
+
+        /* Wai Ming 80 percent of VDD 1.3V gives 1.04V, minimum operating voltage is 1.08V
+         * therefore, commented out the following lines
+         * tf80 meant tf100
+         */
         do {
-                /* Wai Ming 80 percent of VDD 1.3V gives 1.04V, minimum operating voltage is 1.08V
-                 * therefore, commented out the following lines
-                 * tf80 meant tf100
-                 * set VCO input = 0.8 * VDD
-                 */
+                /* set VCO input = 0.8 * VDD */
                 w100_pwr_state.pll_cntl.f.pll_dactal = 0xd;
                 writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-                w100_pwr_state.tf80 = w100_pll_get_testcount(0x1);      /* PLLCLK */
-                if (w100_pwr_state.tf80 >= (w100_pwr_state.tfgoal)) {
+                tf80 = w100_get_testcount(TESTCLK_SRC_PLL);
+                if (tf80 >= (pll->tfgoal)) {
                         /* set VCO input = 0.2 * VDD */
                         w100_pwr_state.pll_cntl.f.pll_dactal = 0x7;
                         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-                        w100_pwr_state.tf20 = w100_pll_get_testcount(0x1);      /* PLLCLK */
-                        if (w100_pwr_state.tf20 <= (w100_pwr_state.tfgoal))
-                                return 1; // Success
+                        tf20 = w100_get_testcount(TESTCLK_SRC_PLL);
+                        if (tf20 <= (pll->tfgoal))
+                                return 1;  /* Success */
 
                         if ((w100_pwr_state.pll_cntl.f.pll_vcofr == 0x0) &&
-                            ((w100_pwr_state.pll_cntl.f.pll_pvg == 0x7) ||
-                             (w100_pwr_state.pll_cntl.f.pll_ioffset == 0x0))) {
+                                ((w100_pwr_state.pll_cntl.f.pll_pvg == 0x7) ||
+                                (w100_pwr_state.pll_cntl.f.pll_ioffset == 0x0))) {
                                 /* slow VCO config */
                                 w100_pwr_state.pll_cntl.f.pll_vcofr = 0x1;
                                 w100_pwr_state.pll_cntl.f.pll_pvg = 0x0;
                                 w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;
-                                writel((u32) (w100_pwr_state.pll_cntl.val),
-                                        remapped_regs + mmPLL_CNTL);
                                 continue;
                         }
                 }
                 if ((w100_pwr_state.pll_cntl.f.pll_ioffset) < 0x3) {
                         w100_pwr_state.pll_cntl.f.pll_ioffset += 0x1;
-                        writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
-                        continue;
-                }
-                if ((w100_pwr_state.pll_cntl.f.pll_pvg) < 0x7) {
+                } else if ((w100_pwr_state.pll_cntl.f.pll_pvg) < 0x7) {
                         w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;
                         w100_pwr_state.pll_cntl.f.pll_pvg += 0x1;
-                        writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
-                        continue;
+                } else {
+                        return 0;  /* Error */
                 }
-                return 0; // error
         } while(1);
 }
 
 
 /*
  * w100_pll_calibration
- *                freq = target frequency of the PLL
- *                (note: crystal = 14.3MHz)
  */
-static u8 w100_pll_calibration(u32 freq)
+static int w100_pll_calibration(struct w100_pll_info *pll)
 {
-        u8 status;
-
-        /* initial setting */
-        w100_pwr_state.pll_cntl.f.pll_pwdn = 0x0;               /* power down */
-        w100_pwr_state.pll_cntl.f.pll_reset = 0x0;              /* not reset */
-        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x1;     /* Hi-Z */
-        w100_pwr_state.pll_cntl.f.pll_pvg = 0x0;                /* VCO gain = 0 */
-        w100_pwr_state.pll_cntl.f.pll_vcofr = 0x0;              /* VCO frequency range control = off */
-        w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;    /* current offset inside VCO = 0 */
-        w100_pwr_state.pll_cntl.f.pll_ring_off = 0x0;
-        writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
+        int status;
 
-        /* check for (tf80 >= tfgoal) && (tf20 =< tfgoal) */
-        if ((w100_pwr_state.tf80 < w100_pwr_state.tfgoal) || (w100_pwr_state.tf20 > w100_pwr_state.tfgoal)) {
-                status=w100_pll_adjust();
-        }
-        /* PLL Reset And Lock */
+        status = w100_pll_adjust(pll);
 
+        /* PLL Reset And Lock */
         /* set VCO input = 0.5 * VDD */
         w100_pwr_state.pll_cntl.f.pll_dactal = 0xa;
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        /* reset time */
-        udelay(1);
+        udelay(1);  /* reset time */
 
         /* enable charge pump */
-        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x0;     /* normal */
+        w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x0;  /* normal */
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        /* set VCO input = Hi-Z */
-        /* disable DAC */
+        /* set VCO input = Hi-Z, disable DAC */
         w100_pwr_state.pll_cntl.f.pll_dactal = 0x0;
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        /* lock time */
-        udelay(400);    /* delay 400 us */
+        udelay(400);  /* lock time */
 
         /* PLL locked */
 
-        w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x1;  /* PLL clock */
-        writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
-
-        w100_pwr_state.tf100 = w100_pll_get_testcount(0x1);     /* PLLCLK */
-
         return status;
 }
 
 
-static u8 w100_pll_set_clk(void)
+static int w100_pll_set_clk(struct w100_pll_info *pll)
 {
-        u8 status;
+        int status;
 
-        if (w100_pwr_state.auto_mode == 1)      /* auto mode */
+        if (w100_pwr_state.auto_mode == 1)  /* auto mode */
         {
-                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x0; /* disable fast to normal */
-                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x0; /* disable normal to fast */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x0;  /* disable fast to normal */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x0;  /* disable normal to fast */
                 writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
         }
 
-        w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x0;  /* crystal clock */
+        /* Set system clock source to XTAL whilst adjusting the PLL! */
+        w100_pwr_state.sclk_cntl.f.sclk_src_sel = CLK_SRC_XTAL;
         writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
 
-        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = w100_pwr_state.M;
-        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = w100_pwr_state.N_int;
-        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_frac = w100_pwr_state.N_fac;
-        w100_pwr_state.pll_ref_fb_div.f.pll_lock_time = w100_pwr_state.lock_time;
+        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = pll->M;
+        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = pll->N_int;
+        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_frac = pll->N_fac;
+        w100_pwr_state.pll_ref_fb_div.f.pll_lock_time = pll->lock_time;
         writel((u32) (w100_pwr_state.pll_ref_fb_div.val), remapped_regs + mmPLL_REF_FB_DIV);
 
         w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0;
         writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
 
-        status = w100_pll_calibration (w100_pwr_state.freq);
+        status = w100_pll_calibration(pll);
 
-        if (w100_pwr_state.auto_mode == 1)      /* auto mode */
+        if (w100_pwr_state.auto_mode == 1)  /* auto mode */
         {
-                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x1; /* reenable fast to normal */
-                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x1; /* reenable normal to fast  */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x1;  /* reenable fast to normal */
+                w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x1;  /* reenable normal to fast  */
                 writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
         }
         return status;
 }
 
-
-/* assume reference crystal clk is 12.5MHz,
- * and that doubling is not enabled.
- *
- * Freq = 12 == 12.5MHz.
- */
-static u16 w100_set_slowsysclk(u16 freq)
-{
-        if (w100_pwr_state.norm_sclk == freq)
-                return freq;
-
-        if (w100_pwr_state.auto_mode == 1)      /* auto mode */
-                return 0;
-
-        if (freq == 12) {
-                w100_pwr_state.norm_sclk = freq;
-                w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = 0x0;    /* Pslow = 1 */
-                w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x0;  /* crystal src */
-
-                writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
-
-                w100_pwr_state.clk_pin_cntl.f.xtalin_pm_en = 0x1;
-                writel((u32) (w100_pwr_state.clk_pin_cntl.val), remapped_regs + mmCLK_PIN_CNTL);
-
-                w100_pwr_state.pwrmgt_cntl.f.pwm_enable = 0x1;
-                w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0x1;
-                writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
-                w100_pwr_state.pwm_mode = 1;    /* normal mode */
-                return freq;
-        } else
-                return 0;
-}
-
-
-static u16 w100_set_fastsysclk(u16 freq)
+/* freq = target frequency of the PLL */
+static int w100_set_pll_freq(struct w100fb_par *par, unsigned int freq)
 {
-        u16 pll_freq;
-        int i;
-
-        while(1) {
-                pll_freq = (u16) (freq * (w100_pwr_state.sclk_cntl.f.sclk_post_div_fast + 1));
-                i = 0;
-                do {
-                        if (pll_freq == gPLLTable[i].freq) {
-                                w100_pwr_state.freq = gPLLTable[i].freq * 1000000;
-                                w100_pwr_state.M = gPLLTable[i].M;
-                                w100_pwr_state.N_int = gPLLTable[i].N_int;
-                                w100_pwr_state.N_fac = gPLLTable[i].N_fac;
-                                w100_pwr_state.tfgoal = gPLLTable[i].tfgoal;
-                                w100_pwr_state.lock_time = gPLLTable[i].lock_time;
-                                w100_pwr_state.tf20 = 0xff;     /* set highest */
-                                w100_pwr_state.tf80 = 0x00;     /* set lowest */
-
-                                w100_pll_set_clk();
-                                w100_pwr_state.pwm_mode = 0;    /* fast mode */
-                                w100_pwr_state.fast_sclk = freq;
-                                return freq;
-                        }
-                        i++;
-                } while(gPLLTable[i].freq);
+        struct w100_pll_info *pll = par->pll_table;
 
-                if (w100_pwr_state.auto_mode == 1)
-                        break;
-
-                if (w100_pwr_state.sclk_cntl.f.sclk_post_div_fast == 0)
-                        break;
-
-                w100_pwr_state.sclk_cntl.f.sclk_post_div_fast -= 1;
-                writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
-        }
+        do {
+                if (freq == pll->freq) {
+                        return w100_pll_set_clk(pll);
+                }
+                pll++;
+        } while(pll->freq);
         return 0;
 }
 
-
 /* Set up an initial state.  Some values/fields set
    here will be overwritten. */
-static void w100_pwm_setup(void)
+static void w100_pwm_setup(struct w100fb_par *par)
 {
         w100_pwr_state.clk_pin_cntl.f.osc_en = 0x1;
         w100_pwr_state.clk_pin_cntl.f.osc_gain = 0x1f;
         w100_pwr_state.clk_pin_cntl.f.dont_use_xtalin = 0x0;
         w100_pwr_state.clk_pin_cntl.f.xtalin_pm_en = 0x0;
-        w100_pwr_state.clk_pin_cntl.f.xtalin_dbl_en = 0x0;      /* no freq doubling */
+        w100_pwr_state.clk_pin_cntl.f.xtalin_dbl_en = par->mach->xtal_dbl ? 1 : 0;
         w100_pwr_state.clk_pin_cntl.f.cg_debug = 0x0;
         writel((u32) (w100_pwr_state.clk_pin_cntl.val), remapped_regs + mmCLK_PIN_CNTL);
 
-        w100_pwr_state.sclk_cntl.f.sclk_src_sel = 0x0;  /* Crystal Clk */
-        w100_pwr_state.sclk_cntl.f.sclk_post_div_fast = 0x0;    /* Pfast = 1 */
+        w100_pwr_state.sclk_cntl.f.sclk_src_sel = CLK_SRC_XTAL;
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_fast = 0x0;  /* Pfast = 1 */
         w100_pwr_state.sclk_cntl.f.sclk_clkon_hys = 0x3;
-        w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = 0x0;    /* Pslow = 1 */
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = 0x0;  /* Pslow = 1 */
         w100_pwr_state.sclk_cntl.f.disp_cg_ok2switch_en = 0x0;
-        w100_pwr_state.sclk_cntl.f.sclk_force_reg = 0x0;        /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_disp = 0x0;       /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_mc = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_extmc = 0x0;      /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_cp = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_e2 = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_e3 = 0x0; /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_idct = 0x0;       /* Dynamic */
-        w100_pwr_state.sclk_cntl.f.sclk_force_bist = 0x0;       /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_reg = 0x0;    /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_disp = 0x0;   /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_mc = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_extmc = 0x0;  /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_cp = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_e2 = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_e3 = 0x0;     /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_idct = 0x0;   /* Dynamic */
+        w100_pwr_state.sclk_cntl.f.sclk_force_bist = 0x0;   /* Dynamic */
         w100_pwr_state.sclk_cntl.f.busy_extend_cp = 0x0;
         w100_pwr_state.sclk_cntl.f.busy_extend_e2 = 0x0;
         w100_pwr_state.sclk_cntl.f.busy_extend_e3 = 0x0;
         w100_pwr_state.sclk_cntl.f.busy_extend_idct = 0x0;
         writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
 
-        w100_pwr_state.pclk_cntl.f.pclk_src_sel = 0x0;  /* Crystal Clk */
-        w100_pwr_state.pclk_cntl.f.pclk_post_div = 0x1; /* P = 2 */
-        w100_pwr_state.pclk_cntl.f.pclk_force_disp = 0x0;       /* Dynamic */
+        w100_pwr_state.pclk_cntl.f.pclk_src_sel = CLK_SRC_XTAL;
+        w100_pwr_state.pclk_cntl.f.pclk_post_div = 0x1;    /* P = 2 */
+        w100_pwr_state.pclk_cntl.f.pclk_force_disp = 0x0;  /* Dynamic */
         writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
 
-        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = 0x0;      /* M = 1 */
-        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = 0x0;   /* N = 1.0 */
+        w100_pwr_state.pll_ref_fb_div.f.pll_ref_div = 0x0;     /* M = 1 */
+        w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_int = 0x0;  /* N = 1.0 */
         w100_pwr_state.pll_ref_fb_div.f.pll_fb_div_frac = 0x0;
         w100_pwr_state.pll_ref_fb_div.f.pll_reset_time = 0x5;
         w100_pwr_state.pll_ref_fb_div.f.pll_lock_time = 0xff;
@@ -1154,7 +1089,7 @@ static void w100_pwm_setup(void)
         w100_pwr_state.pll_cntl.f.pll_pwdn = 0x1;
         w100_pwr_state.pll_cntl.f.pll_reset = 0x1;
         w100_pwr_state.pll_cntl.f.pll_pm_en = 0x0;
-        w100_pwr_state.pll_cntl.f.pll_mode = 0x0;       /* uses VCO clock */
+        w100_pwr_state.pll_cntl.f.pll_mode = 0x0;  /* uses VCO clock */
         w100_pwr_state.pll_cntl.f.pll_refclk_sel = 0x0;
         w100_pwr_state.pll_cntl.f.pll_fbclk_sel = 0x0;
         w100_pwr_state.pll_cntl.f.pll_tcpoff = 0x0;
@@ -1164,220 +1099,275 @@ static void w100_pwm_setup(void)
         w100_pwr_state.pll_cntl.f.pll_ioffset = 0x0;
         w100_pwr_state.pll_cntl.f.pll_pecc_mode = 0x0;
         w100_pwr_state.pll_cntl.f.pll_pecc_scon = 0x0;
-        w100_pwr_state.pll_cntl.f.pll_dactal = 0x0;     /* Hi-Z */
+        w100_pwr_state.pll_cntl.f.pll_dactal = 0x0;  /* Hi-Z */
         w100_pwr_state.pll_cntl.f.pll_cp_clip = 0x3;
         w100_pwr_state.pll_cntl.f.pll_conf = 0x2;
         w100_pwr_state.pll_cntl.f.pll_mbctrl = 0x2;
         w100_pwr_state.pll_cntl.f.pll_ring_off = 0x0;
         writel((u32) (w100_pwr_state.pll_cntl.val), remapped_regs + mmPLL_CNTL);
 
-        w100_pwr_state.clk_test_cntl.f.testclk_sel = 0x1;       /* PLLCLK (for testing) */
-        w100_pwr_state.clk_test_cntl.f.start_check_freq = 0x0;
-        w100_pwr_state.clk_test_cntl.f.tstcount_rst = 0x0;
-        writel((u32) (w100_pwr_state.clk_test_cntl.val), remapped_regs + mmCLK_TEST_CNTL);
-
         w100_pwr_state.pwrmgt_cntl.f.pwm_enable = 0x0;
-        w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0x1;        /* normal mode (0, 1, 3) */
+        w100_pwr_state.pwrmgt_cntl.f.pwm_mode_req = 0x1;  /* normal mode (0, 1, 3) */
         w100_pwr_state.pwrmgt_cntl.f.pwm_wakeup_cond = 0x0;
         w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_hw_en = 0x0;
         w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_hw_en = 0x0;
-        w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_cond = 0x1;  /* PM4,ENG */
-        w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_cond = 0x1;  /* PM4,ENG */
+        w100_pwr_state.pwrmgt_cntl.f.pwm_fast_noml_cond = 0x1;  /* PM4,ENG */
+        w100_pwr_state.pwrmgt_cntl.f.pwm_noml_fast_cond = 0x1;  /* PM4,ENG */
         w100_pwr_state.pwrmgt_cntl.f.pwm_idle_timer = 0xFF;
         w100_pwr_state.pwrmgt_cntl.f.pwm_busy_timer = 0xFF;
         writel((u32) (w100_pwr_state.pwrmgt_cntl.val), remapped_regs + mmPWRMGT_CNTL);
 
-        w100_pwr_state.auto_mode = 0;   /* manual mode */
-        w100_pwr_state.pwm_mode = 1;    /* normal mode (0, 1, 2) */
-        w100_pwr_state.freq = 50000000; /* 50 MHz */
-        w100_pwr_state.M = 3;   /* M = 4 */
-        w100_pwr_state.N_int = 6;       /* N = 7.0 */
-        w100_pwr_state.N_fac = 0;
-        w100_pwr_state.tfgoal = 0xE0;
-        w100_pwr_state.lock_time = 56;
-        w100_pwr_state.tf20 = 0xff;     /* set highest */
-        w100_pwr_state.tf80 = 0x00;     /* set lowest */
-        w100_pwr_state.tf100 = 0x00;    /* set lowest */
-        w100_pwr_state.fast_sclk = 50;  /* 50.0 MHz */
-        w100_pwr_state.norm_sclk = 12;  /* 12.5 MHz */
+        w100_pwr_state.auto_mode = 0;  /* manual mode */
 }
 
 
-static void w100_init_sharp_lcd(u32 mode)
+/*
+ * Setup the w100 clocks for the specified mode
+ */
+static void w100_init_clocks(struct w100fb_par *par)
 {
-        u32 temp32;
-        union disp_db_buf_cntl_wr_u disp_db_buf_wr_cntl;
+        struct w100_mode *mode = par->mode;
 
-        /* Prevent display updates */
-        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
-        disp_db_buf_wr_cntl.f.update_db_buf = 0;
-        disp_db_buf_wr_cntl.f.en_db_buf = 0;
-        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
+        if (mode->pixclk_src == CLK_SRC_PLL || mode->sysclk_src == CLK_SRC_PLL)
+                w100_set_pll_freq(par, (par->fastpll_mode && mode->fast_pll_freq) ? mode->fast_pll_freq : mode->pll_freq);
 
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                w100_set_slowsysclk(12);        /* use crystal -- 12.5MHz */
-                /* not use PLL */
-
-                writel(0x7FFF8000, remapped_regs + mmMC_EXT_MEM_LOCATION);
-                writel(0x85FF8000, remapped_regs + mmMC_FB_LOCATION);
-                writel(0x00000003, remapped_regs + mmLCD_FORMAT);
-                writel(0x00CF1C06, remapped_regs + mmGRAPHIC_CTRL);
-                writel(0x01410145, remapped_regs + mmCRTC_TOTAL);
-                writel(0x01170027, remapped_regs + mmACTIVE_H_DISP);
-                writel(0x01410001, remapped_regs + mmACTIVE_V_DISP);
-                writel(0x01170027, remapped_regs + mmGRAPHIC_H_DISP);
-                writel(0x01410001, remapped_regs + mmGRAPHIC_V_DISP);
-                writel(0x81170027, remapped_regs + mmCRTC_SS);
-                writel(0xA0140000, remapped_regs + mmCRTC_LS);
-                writel(0x00400008, remapped_regs + mmCRTC_REV);
-                writel(0xA0000000, remapped_regs + mmCRTC_DCLK);
-                writel(0xC0140014, remapped_regs + mmCRTC_GS);
-                writel(0x00010141, remapped_regs + mmCRTC_VPOS_GS);
-                writel(0x8015010F, remapped_regs + mmCRTC_GCLK);
-                writel(0x80100110, remapped_regs + mmCRTC_GOE);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME_VPOS);
-                writel(0x01CC0000, remapped_regs + mmLCDD_CNTL1);
-                writel(0x0003FFFF, remapped_regs + mmLCDD_CNTL2);
-                writel(0x00FFFF0D, remapped_regs + mmGENLCD_CNTL1);
-                writel(0x003F3003, remapped_regs + mmGENLCD_CNTL2);
-                writel(0x00000000, remapped_regs + mmCRTC_DEFAULT_COUNT);
-                writel(0x0000FF00, remapped_regs + mmLCD_BACKGROUND_COLOR);
-                writel(0x000102aa, remapped_regs + mmGENLCD_CNTL3);
-                writel(0x00800000, remapped_regs + mmGRAPHIC_OFFSET);
-                writel(0x000001e0, remapped_regs + mmGRAPHIC_PITCH);
-                writel(0x000000bf, remapped_regs + mmGPIO_DATA);
-                writel(0x03c0feff, remapped_regs + mmGPIO_CNTL2);
-                writel(0x00000000, remapped_regs + mmGPIO_CNTL1);
-                writel(0x41060010, remapped_regs + mmCRTC_PS1_ACTIVE);
-                break;
-        case LCD_SHARP_VGA:
-                w100_set_slowsysclk(12);        /* use crystal -- 12.5MHz */
-                w100_set_fastsysclk(current_par->fastsysclk_mode);      /* use PLL -- 75.0MHz */
-                w100_pwr_state.pclk_cntl.f.pclk_src_sel = 0x1;
-                w100_pwr_state.pclk_cntl.f.pclk_post_div = 0x2;
-                writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
-                writel(0x15FF1000, remapped_regs + mmMC_FB_LOCATION);
-                writel(0x9FFF8000, remapped_regs + mmMC_EXT_MEM_LOCATION);
-                writel(0x00000003, remapped_regs + mmLCD_FORMAT);
-                writel(0x00DE1D66, remapped_regs + mmGRAPHIC_CTRL);
-
-                writel(0x0283028B, remapped_regs + mmCRTC_TOTAL);
-                writel(0x02360056, remapped_regs + mmACTIVE_H_DISP);
-                writel(0x02830003, remapped_regs + mmACTIVE_V_DISP);
-                writel(0x02360056, remapped_regs + mmGRAPHIC_H_DISP);
-                writel(0x02830003, remapped_regs + mmGRAPHIC_V_DISP);
-                writel(0x82360056, remapped_regs + mmCRTC_SS);
-                writel(0xA0280000, remapped_regs + mmCRTC_LS);
-                writel(0x00400008, remapped_regs + mmCRTC_REV);
-                writel(0xA0000000, remapped_regs + mmCRTC_DCLK);
-                writel(0x80280028, remapped_regs + mmCRTC_GS);
-                writel(0x02830002, remapped_regs + mmCRTC_VPOS_GS);
-                writel(0x8015010F, remapped_regs + mmCRTC_GCLK);
-                writel(0x80100110, remapped_regs + mmCRTC_GOE);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME);
-                writel(0x00000000, remapped_regs + mmCRTC_FRAME_VPOS);
-                writel(0x01CC0000, remapped_regs + mmLCDD_CNTL1);
-                writel(0x0003FFFF, remapped_regs + mmLCDD_CNTL2);
-                writel(0x00FFFF0D, remapped_regs + mmGENLCD_CNTL1);
-                writel(0x003F3003, remapped_regs + mmGENLCD_CNTL2);
-                writel(0x00000000, remapped_regs + mmCRTC_DEFAULT_COUNT);
-                writel(0x0000FF00, remapped_regs + mmLCD_BACKGROUND_COLOR);
-                writel(0x000102aa, remapped_regs + mmGENLCD_CNTL3);
-                writel(0x00800000, remapped_regs + mmGRAPHIC_OFFSET);
-                writel(0x000003C0, remapped_regs + mmGRAPHIC_PITCH);
-                writel(0x000000bf, remapped_regs + mmGPIO_DATA);
-                writel(0x03c0feff, remapped_regs + mmGPIO_CNTL2);
-                writel(0x00000000, remapped_regs + mmGPIO_CNTL1);
-                writel(0x41060010, remapped_regs + mmCRTC_PS1_ACTIVE);
-                break;
-        default:
-                break;
-        }
+        w100_pwr_state.sclk_cntl.f.sclk_src_sel = mode->sysclk_src;
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_fast = mode->sysclk_divider;
+        w100_pwr_state.sclk_cntl.f.sclk_post_div_slow = mode->sysclk_divider;
+        writel((u32) (w100_pwr_state.sclk_cntl.val), remapped_regs + mmSCLK_CNTL);
+}
+
+static void w100_init_lcd(struct w100fb_par *par)
+{
+        u32 temp32;
+        struct w100_mode *mode = par->mode;
+        struct w100_gen_regs *regs = par->mach->regs;
+        union active_h_disp_u active_h_disp;
+        union active_v_disp_u active_v_disp;
+        union graphic_h_disp_u graphic_h_disp;
+        union graphic_v_disp_u graphic_v_disp;
+        union crtc_total_u crtc_total;
+
+        /* w3200 doesnt like undefined bits being set so zero register values first */
+
+        active_h_disp.val = 0;
+        active_h_disp.f.active_h_start=mode->left_margin;
+        active_h_disp.f.active_h_end=mode->left_margin + mode->xres;
+        writel(active_h_disp.val, remapped_regs + mmACTIVE_H_DISP);
+
+        active_v_disp.val = 0;
+        active_v_disp.f.active_v_start=mode->upper_margin;
+        active_v_disp.f.active_v_end=mode->upper_margin + mode->yres;
+        writel(active_v_disp.val, remapped_regs + mmACTIVE_V_DISP);
+
+        graphic_h_disp.val = 0;
+        graphic_h_disp.f.graphic_h_start=mode->left_margin;
+        graphic_h_disp.f.graphic_h_end=mode->left_margin + mode->xres;
+        writel(graphic_h_disp.val, remapped_regs + mmGRAPHIC_H_DISP);
+
+        graphic_v_disp.val = 0;
+        graphic_v_disp.f.graphic_v_start=mode->upper_margin;
+        graphic_v_disp.f.graphic_v_end=mode->upper_margin + mode->yres;
+        writel(graphic_v_disp.val, remapped_regs + mmGRAPHIC_V_DISP);
+
+        crtc_total.val = 0;
+        crtc_total.f.crtc_h_total=mode->left_margin  + mode->xres + mode->right_margin;
+        crtc_total.f.crtc_v_total=mode->upper_margin + mode->yres + mode->lower_margin;
+        writel(crtc_total.val, remapped_regs + mmCRTC_TOTAL);
+
+        writel(mode->crtc_ss, remapped_regs + mmCRTC_SS);
+        writel(mode->crtc_ls, remapped_regs + mmCRTC_LS);
+        writel(mode->crtc_gs, remapped_regs + mmCRTC_GS);
+        writel(mode->crtc_vpos_gs, remapped_regs + mmCRTC_VPOS_GS);
+        writel(mode->crtc_rev, remapped_regs + mmCRTC_REV);
+        writel(mode->crtc_dclk, remapped_regs + mmCRTC_DCLK);
+        writel(mode->crtc_gclk, remapped_regs + mmCRTC_GCLK);
+        writel(mode->crtc_goe, remapped_regs + mmCRTC_GOE);
+        writel(mode->crtc_ps1_active, remapped_regs + mmCRTC_PS1_ACTIVE);
+
+        writel(regs->lcd_format, remapped_regs + mmLCD_FORMAT);
+        writel(regs->lcdd_cntl1, remapped_regs + mmLCDD_CNTL1);
+        writel(regs->lcdd_cntl2, remapped_regs + mmLCDD_CNTL2);
+        writel(regs->genlcd_cntl1, remapped_regs + mmGENLCD_CNTL1);
+        writel(regs->genlcd_cntl2, remapped_regs + mmGENLCD_CNTL2);
+        writel(regs->genlcd_cntl3, remapped_regs + mmGENLCD_CNTL3);
+
+        writel(0x00000000, remapped_regs + mmCRTC_FRAME);
+        writel(0x00000000, remapped_regs + mmCRTC_FRAME_VPOS);
+        writel(0x00000000, remapped_regs + mmCRTC_DEFAULT_COUNT);
+        writel(0x0000FF00, remapped_regs + mmLCD_BACKGROUND_COLOR);
 
         /* Hack for overlay in ext memory */
         temp32 = readl(remapped_regs + mmDISP_DEBUG2);
         temp32 |= 0xc0000000;
         writel(temp32, remapped_regs + mmDISP_DEBUG2);
-
-        /* Re-enable display updates */
-        disp_db_buf_wr_cntl.f.db_buf_cntl = 0x1e;
-        disp_db_buf_wr_cntl.f.update_db_buf = 1;
-        disp_db_buf_wr_cntl.f.en_db_buf = 1;
-        writel((u32) (disp_db_buf_wr_cntl.val), remapped_regs + mmDISP_DB_BUF_CNTL);
 }
 
 
-static void w100_set_vga_rotation_regs(u16 divider, unsigned long ctrl, unsigned long offset, unsigned long pitch)
+static void w100_setup_memory(struct w100fb_par *par)
 {
-        w100_pwr_state.pclk_cntl.f.pclk_src_sel = 0x1;
-        w100_pwr_state.pclk_cntl.f.pclk_post_div = divider;
-        writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
+        union mc_ext_mem_location_u extmem_location;
+        union mc_fb_location_u intmem_location;
+        struct w100_mem_info *mem = par->mach->mem;
+        struct w100_bm_mem_info *bm_mem = par->mach->bm_mem;
 
-        writel(ctrl, remapped_regs + mmGRAPHIC_CTRL);
-        writel(offset, remapped_regs + mmGRAPHIC_OFFSET);
-        writel(pitch, remapped_regs + mmGRAPHIC_PITCH);
+        if (!par->extmem_active) {
+                w100_suspend(W100_SUSPEND_EXTMEM);
 
-        /* Re-enable display updates */
-        writel(0x0000007b, remapped_regs + mmDISP_DB_BUF_CNTL);
-}
+                /* Map Internal Memory at FB Base */
+                intmem_location.f.mc_fb_start = W100_FB_BASE >> 8;
+                intmem_location.f.mc_fb_top = (W100_FB_BASE+MEM_INT_SIZE) >> 8;
+                writel((u32) (intmem_location.val), remapped_regs + mmMC_FB_LOCATION);
 
+                /* Unmap External Memory - value is *probably* irrelevant but may have meaning
+                   to acceleration libraries */
+                extmem_location.f.mc_ext_mem_start = MEM_EXT_BASE_VALUE >> 8;
+                extmem_location.f.mc_ext_mem_top = (MEM_EXT_BASE_VALUE-1) >> 8;
+                writel((u32) (extmem_location.val), remapped_regs + mmMC_EXT_MEM_LOCATION);
+        } else {
+                /* Map Internal Memory to its default location */
+                intmem_location.f.mc_fb_start = MEM_INT_BASE_VALUE >> 8;
+                intmem_location.f.mc_fb_top = (MEM_INT_BASE_VALUE+MEM_INT_SIZE) >> 8;
+                writel((u32) (intmem_location.val), remapped_regs + mmMC_FB_LOCATION);
 
-static void w100_init_vga_rotation(u16 deg)
-{
-        switch(deg) {
-        case 0:
-                w100_set_vga_rotation_regs(0x02, 0x00DE1D66, 0x00800000, 0x000003c0);
-                break;
-        case 90:
-                w100_set_vga_rotation_regs(0x06, 0x00DE1D0e, 0x00895b00, 0x00000500);
-                break;
-        case 180:
-                w100_set_vga_rotation_regs(0x02, 0x00DE1D7e, 0x00895ffc, 0x000003c0);
-                break;
-        case 270:
-                w100_set_vga_rotation_regs(0x06, 0x00DE1D16, 0x008004fc, 0x00000500);
-                break;
-        default:
-                /* not-support */
-                break;
+                /* Map External Memory at FB Base */
+                extmem_location.f.mc_ext_mem_start = W100_FB_BASE >> 8;
+                extmem_location.f.mc_ext_mem_top = (W100_FB_BASE+par->mach->mem->size) >> 8;
+                writel((u32) (extmem_location.val), remapped_regs + mmMC_EXT_MEM_LOCATION);
+
+                writel(0x00007800, remapped_regs + mmMC_BIST_CTRL);
+                writel(mem->ext_cntl, remapped_regs + mmMEM_EXT_CNTL);
+                writel(0x00200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
+                udelay(100);
+                writel(0x80200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
+                udelay(100);
+                writel(mem->sdram_mode_reg, remapped_regs + mmMEM_SDRAM_MODE_REG);
+                udelay(100);
+                writel(mem->ext_timing_cntl, remapped_regs + mmMEM_EXT_TIMING_CNTL);
+                writel(mem->io_cntl, remapped_regs + mmMEM_IO_CNTL);
+                if (bm_mem) {
+                        writel(bm_mem->ext_mem_bw, remapped_regs + mmBM_EXT_MEM_BANDWIDTH);
+                        writel(bm_mem->offset, remapped_regs + mmBM_OFFSET);
+                        writel(bm_mem->ext_timing_ctl, remapped_regs + mmBM_MEM_EXT_TIMING_CNTL);
+                        writel(bm_mem->ext_cntl, remapped_regs + mmBM_MEM_EXT_CNTL);
+                        writel(bm_mem->mode_reg, remapped_regs + mmBM_MEM_MODE_REG);
+                        writel(bm_mem->io_cntl, remapped_regs + mmBM_MEM_IO_CNTL);
+                        writel(bm_mem->config, remapped_regs + mmBM_CONFIG);
+                }
         }
 }
 
-
-static void w100_set_qvga_rotation_regs(unsigned long ctrl, unsigned long offset, unsigned long pitch)
+static void w100_set_dispregs(struct w100fb_par *par)
 {
-        writel(ctrl, remapped_regs + mmGRAPHIC_CTRL);
-        writel(offset, remapped_regs + mmGRAPHIC_OFFSET);
-        writel(pitch, remapped_regs + mmGRAPHIC_PITCH);
+        unsigned long rot=0, divider, offset=0;
+        union graphic_ctrl_u graphic_ctrl;
+
+        /* See if the mode has been rotated */
+        if (par->xres == par->mode->xres) {
+                if (par->flip) {
+                        rot=3; /* 180 degree */
+                        offset=(par->xres * par->yres) - 1;
+                } /* else 0 degree */
+                divider = par->mode->pixclk_divider;
+        } else {
+                if (par->flip) {
+                        rot=2; /* 270 degree */
+                        offset=par->xres - 1;
+                } else {
+                        rot=1; /* 90 degree */
+                        offset=par->xres * (par->yres - 1);
+                }
+                divider = par->mode->pixclk_divider_rotated;
+        }
 
-        /* Re-enable display updates */
-        writel(0x0000007b, remapped_regs + mmDISP_DB_BUF_CNTL);
+        graphic_ctrl.val = 0; /* w32xx doesn't like undefined bits */
+        switch (par->chip_id) {
+                case CHIP_ID_W100:
+                        graphic_ctrl.f_w100.color_depth=6;
+                        graphic_ctrl.f_w100.en_crtc=1;
+                        graphic_ctrl.f_w100.en_graphic_req=1;
+                        graphic_ctrl.f_w100.en_graphic_crtc=1;
+                        graphic_ctrl.f_w100.lcd_pclk_on=1;
+                        graphic_ctrl.f_w100.lcd_sclk_on=1;
+                        graphic_ctrl.f_w100.low_power_on=0;
+                        graphic_ctrl.f_w100.req_freq=0;
+                        graphic_ctrl.f_w100.portrait_mode=rot;
+
+                        /* Zaurus needs this */
+                        switch(par->xres) {
+                                case 240:
+                                case 320:
+                                default:
+                                        graphic_ctrl.f_w100.total_req_graphic=0xa0;
+                                        break;
+                                case 480:
+                                case 640:
+                                        switch(rot) {
+                                                case 0:  /* 0 */
+                                                case 3:  /* 180 */
+                                                        graphic_ctrl.f_w100.low_power_on=1;
+                                                        graphic_ctrl.f_w100.req_freq=5;
+                                                break;
+                                                case 1:  /* 90 */
+                                                case 2:  /* 270 */
+                                                        graphic_ctrl.f_w100.req_freq=4;
+                                                        break;
+                                                default:
+                                                        break;
+                                        }
+                                        graphic_ctrl.f_w100.total_req_graphic=0xf0;
+                                        break;
+                        }
+                        break;
+                case CHIP_ID_W3200:
+                case CHIP_ID_W3220:
+                        graphic_ctrl.f_w32xx.color_depth=6;
+                        graphic_ctrl.f_w32xx.en_crtc=1;
+                        graphic_ctrl.f_w32xx.en_graphic_req=1;
+                        graphic_ctrl.f_w32xx.en_graphic_crtc=1;
+                        graphic_ctrl.f_w32xx.lcd_pclk_on=1;
+                        graphic_ctrl.f_w32xx.lcd_sclk_on=1;
+                        graphic_ctrl.f_w32xx.low_power_on=0;
+                        graphic_ctrl.f_w32xx.req_freq=0;
+                        graphic_ctrl.f_w32xx.total_req_graphic=par->mode->xres >> 1; /* panel xres, not mode */
+                        graphic_ctrl.f_w32xx.portrait_mode=rot;
+                        break;
+        }
+
+        /* Set the pixel clock source and divider */
+        w100_pwr_state.pclk_cntl.f.pclk_src_sel = par->mode->pixclk_src;
+        w100_pwr_state.pclk_cntl.f.pclk_post_div = divider;
+        writel((u32) (w100_pwr_state.pclk_cntl.val), remapped_regs + mmPCLK_CNTL);
+
+        writel(graphic_ctrl.val, remapped_regs + mmGRAPHIC_CTRL);
+        writel(W100_FB_BASE + ((offset * BITS_PER_PIXEL/8)&~0x03UL), remapped_regs + mmGRAPHIC_OFFSET);
+        writel((par->xres*BITS_PER_PIXEL/8), remapped_regs + mmGRAPHIC_PITCH);
 }
 
 
-static void w100_init_qvga_rotation(u16 deg)
+/*
+ * Work out how long the sync pulse lasts
+ * Value is 1/(time in seconds)
+ */
+static void calc_hsync(struct w100fb_par *par)
 {
-        switch(deg) {
-        case 0:
-                w100_set_qvga_rotation_regs(0x00d41c06, 0x00800000, 0x000001e0);
-                break;
-        case 90:
-                w100_set_qvga_rotation_regs(0x00d41c0E, 0x00825580, 0x00000280);
-                break;
-        case 180:
-                w100_set_qvga_rotation_regs(0x00d41c1e, 0x008257fc, 0x000001e0);
-                break;
-        case 270:
-                w100_set_qvga_rotation_regs(0x00d41c16, 0x0080027c, 0x00000280);
-                break;
-        default:
-                /* not-support */
-                break;
-        }
-}
+        unsigned long hsync;
+        struct w100_mode *mode = par->mode;
+        union crtc_ss_u crtc_ss;
+
+        if (mode->pixclk_src == CLK_SRC_XTAL)
+                hsync=par->mach->xtal_freq;
+        else
+                hsync=((par->fastpll_mode && mode->fast_pll_freq) ? mode->fast_pll_freq : mode->pll_freq)*100000;
 
+        hsync /= (w100_pwr_state.pclk_cntl.f.pclk_post_div + 1);
+
+        crtc_ss.val = readl(remapped_regs + mmCRTC_SS);
+        if (crtc_ss.val)
+                par->hsync_len = hsync / (crtc_ss.f.ss_end-crtc_ss.f.ss_start);
+        else
+                par->hsync_len = 0;
+}
 
 static void w100_suspend(u32 mode)
 {
@@ -1387,30 +1377,28 @@ static void w100_suspend(u32 mode)
         writel(0x00FF0000, remapped_regs + mmMC_PERF_MON_CNTL);
 
         val = readl(remapped_regs + mmMEM_EXT_TIMING_CNTL);
-        val &= ~(0x00100000);   /* bit20=0 */
-        val |= 0xFF000000;      /* bit31:24=0xff */
+        val &= ~(0x00100000);  /* bit20=0 */
+        val |= 0xFF000000;     /* bit31:24=0xff */
         writel(val, remapped_regs + mmMEM_EXT_TIMING_CNTL);
 
         val = readl(remapped_regs + mmMEM_EXT_CNTL);
-        val &= ~(0x00040000);   /* bit18=0 */
-        val |= 0x00080000;      /* bit19=1 */
+        val &= ~(0x00040000);  /* bit18=0 */
+        val |= 0x00080000;     /* bit19=1 */
         writel(val, remapped_regs + mmMEM_EXT_CNTL);
 
-        udelay(1);              /* wait 1us */
+        udelay(1);  /* wait 1us */
 
         if (mode == W100_SUSPEND_EXTMEM) {
-
                 /* CKE: Tri-State */
                 val = readl(remapped_regs + mmMEM_EXT_CNTL);
-                val |= 0x40000000;      /* bit30=1 */
+                val |= 0x40000000;  /* bit30=1 */
                 writel(val, remapped_regs + mmMEM_EXT_CNTL);
 
                 /* CLK: Stop */
                 val = readl(remapped_regs + mmMEM_EXT_CNTL);
-                val &= ~(0x00000001);   /* bit0=0 */
+                val &= ~(0x00000001);  /* bit0=0 */
                 writel(val, remapped_regs + mmMEM_EXT_CNTL);
         } else {
-
                 writel(0x00000000, remapped_regs + mmSCLK_CNTL);
                 writel(0x000000BF, remapped_regs + mmCLK_PIN_CNTL);
                 writel(0x00000015, remapped_regs + mmPWRMGT_CNTL);
@@ -1418,43 +1406,16 @@ static void w100_suspend(u32 mode)
                 udelay(5);
 
                 val = readl(remapped_regs + mmPLL_CNTL);
-                val |= 0x00000004;      /* bit2=1 */
+                val |= 0x00000004;  /* bit2=1 */
                 writel(val, remapped_regs + mmPLL_CNTL);
                 writel(0x0000001d, remapped_regs + mmPWRMGT_CNTL);
         }
 }
 
-
-static void w100_resume(void)
-{
-        u32 temp32;
-
-        w100_hw_init();
-        w100_pwm_setup();
-
-        temp32 = readl(remapped_regs + mmDISP_DEBUG2);
-        temp32 &= 0xff7fffff;
-        temp32 |= 0x00800000;
-        writel(temp32, remapped_regs + mmDISP_DEBUG2);
-
-        if (current_par->lcdMode == LCD_MODE_480 || current_par->lcdMode == LCD_MODE_640) {
-                w100_init_sharp_lcd(LCD_SHARP_VGA);
-                if (current_par->lcdMode == LCD_MODE_640) {
-                        w100_init_vga_rotation(current_par->rotation_flag ? 270 : 90);
-                }
-        } else {
-                w100_init_sharp_lcd(LCD_SHARP_QVGA);
-                if (current_par->lcdMode == LCD_MODE_320) {
-                        w100_init_qvga_rotation(current_par->rotation_flag ? 270 : 90);
-                }
-        }
-}
-
-
 static void w100_vsync(void)
 {
         u32 tmp;
-        int timeout = 30000; /* VSync timeout = 30[ms] > 16.8[ms] */
+        int timeout = 30000;  /* VSync timeout = 30[ms] > 16.8[ms] */
 
         tmp = readl(remapped_regs + mmACTIVE_V_DISP);
 
@@ -1490,363 +1451,6 @@ static void w100_vsync(void)
         writel(0x00000002, remapped_regs + mmGEN_INT_STATUS);
 }
 
-
-static void w100_InitExtMem(u32 mode)
-{
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                /* QVGA doesn't use external memory
-                   nothing to do, really. */
-                break;
-        case LCD_SHARP_VGA:
-                writel(0x00007800, remapped_regs + mmMC_BIST_CTRL);
-                writel(0x00040003, remapped_regs + mmMEM_EXT_CNTL);
-                writel(0x00200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
-                udelay(100);
-                writel(0x80200021, remapped_regs + mmMEM_SDRAM_MODE_REG);
-                udelay(100);
-                writel(0x00650021, remapped_regs + mmMEM_SDRAM_MODE_REG);
-                udelay(100);
-                writel(0x10002a4a, remapped_regs + mmMEM_EXT_TIMING_CNTL);
-                writel(0x7ff87012, remapped_regs + mmMEM_IO_CNTL);
-                break;
-        default:
-                break;
-        }
-}
-
-
-#define RESCTL_ADRS     0x00
-#define PHACTRL_ADRS    0x01
-#define DUTYCTRL_ADRS   0x02
-#define POWERREG0_ADRS  0x03
-#define POWERREG1_ADRS  0x04
-#define GPOR3_ADRS              0x05
-#define PICTRL_ADRS     0x06
-#define POLCTRL_ADRS    0x07
-
-#define RESCTL_QVGA     0x01
-#define RESCTL_VGA      0x00
-
-#define POWER1_VW_ON    0x01    /* VW Supply FET ON */
-#define POWER1_GVSS_ON  0x02    /* GVSS(-8V) Power Supply ON */
-#define POWER1_VDD_ON   0x04    /* VDD(8V),SVSS(-4V) Power Supply ON */
-
-#define POWER1_VW_OFF   0x00    /* VW Supply FET OFF */
-#define POWER1_GVSS_OFF 0x00    /* GVSS(-8V) Power Supply OFF */
-#define POWER1_VDD_OFF  0x00    /* VDD(8V),SVSS(-4V) Power Supply OFF */
-
-#define POWER0_COM_DCLK 0x01    /* COM Voltage DC Bias DAC Serial Data Clock */
-#define POWER0_COM_DOUT 0x02    /* COM Voltage DC Bias DAC Serial Data Out */
-#define POWER0_DAC_ON   0x04    /* DAC Power Supply ON */
-#define POWER0_COM_ON   0x08    /* COM Powewr Supply ON */
-#define POWER0_VCC5_ON  0x10    /* VCC5 Power Supply ON */
-
-#define POWER0_DAC_OFF  0x00    /* DAC Power Supply OFF */
-#define POWER0_COM_OFF  0x00    /* COM Powewr Supply OFF */
-#define POWER0_VCC5_OFF 0x00    /* VCC5 Power Supply OFF */
-
-#define PICTRL_INIT_STATE       0x01
-#define PICTRL_INIOFF           0x02
-#define PICTRL_POWER_DOWN       0x04
-#define PICTRL_COM_SIGNAL_OFF   0x08
-#define PICTRL_DAC_SIGNAL_OFF   0x10
-
-#define PICTRL_POWER_ACTIVE     (0)
-
-#define POLCTRL_SYNC_POL_FALL   0x01
-#define POLCTRL_EN_POL_FALL     0x02
-#define POLCTRL_DATA_POL_FALL   0x04
-#define POLCTRL_SYNC_ACT_H      0x08
-#define POLCTRL_EN_ACT_L        0x10
-
-#define POLCTRL_SYNC_POL_RISE   0x00
-#define POLCTRL_EN_POL_RISE     0x00
-#define POLCTRL_DATA_POL_RISE   0x00
-#define POLCTRL_SYNC_ACT_L      0x00
-#define POLCTRL_EN_ACT_H        0x00
-
-#define PHACTRL_PHASE_MANUAL    0x01
-
-#define PHAD_QVGA_DEFAULT_VAL (9)
-#define COMADJ_DEFAULT        (125)
-
-static void lcdtg_ssp_send(u8 adrs, u8 data)
-{
-        w100fb_ssp_send(adrs,data);
-}
-
-/*
- * This is only a psuedo I2C interface. We can't use the standard kernel
- * routines as the interface is write only. We just assume the data is acked...
- */
-static void lcdtg_ssp_i2c_send(u8 data)
-{
-        lcdtg_ssp_send(POWERREG0_ADRS, data);
-        udelay(10);
-}
-
-static void lcdtg_i2c_send_bit(u8 data)
-{
-        lcdtg_ssp_i2c_send(data);
-        lcdtg_ssp_i2c_send(data | POWER0_COM_DCLK);
-        lcdtg_ssp_i2c_send(data);
-}
-
-static void lcdtg_i2c_send_start(u8 base)
-{
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
-        lcdtg_ssp_i2c_send(base);
-}
-
-static void lcdtg_i2c_send_stop(u8 base)
-{
-        lcdtg_ssp_i2c_send(base);
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
-        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
-}
-
-static void lcdtg_i2c_send_byte(u8 base, u8 data)
-{
-        int i;
-        for (i = 0; i < 8; i++) {
-                if (data & 0x80)
-                        lcdtg_i2c_send_bit(base | POWER0_COM_DOUT);
-                else
-                        lcdtg_i2c_send_bit(base);
-                data <<= 1;
-        }
-}
-
-static void lcdtg_i2c_wait_ack(u8 base)
-{
-        lcdtg_i2c_send_bit(base);
-}
-
-static void lcdtg_set_common_voltage(u8 base_data, u8 data)
-{
-        /* Set Common Voltage to M62332FP via I2C */
-        lcdtg_i2c_send_start(base_data);
-        lcdtg_i2c_send_byte(base_data, 0x9c);
-        lcdtg_i2c_wait_ack(base_data);
-        lcdtg_i2c_send_byte(base_data, 0x00);
-        lcdtg_i2c_wait_ack(base_data);
-        lcdtg_i2c_send_byte(base_data, data);
-        lcdtg_i2c_wait_ack(base_data);
-        lcdtg_i2c_send_stop(base_data);
-}
-
-static struct lcdtg_register_setting {
-        u8 adrs;
-        u8 data;
-        u32 wait;
-} lcdtg_power_on_table[] = {
-
-    /* Initialize Internal Logic & Port */
-    { PICTRL_ADRS,
-      PICTRL_POWER_DOWN | PICTRL_INIOFF | PICTRL_INIT_STATE |
-      PICTRL_COM_SIGNAL_OFF | PICTRL_DAC_SIGNAL_OFF,
-      0 },
-
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_OFF | POWER0_COM_OFF |
-      POWER0_VCC5_OFF,
-      0 },
-
-    { POWERREG1_ADRS,
-      POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF,
-      0 },
-
-    /* VDD(+8V),SVSS(-4V) ON */
-    { POWERREG1_ADRS,
-      POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON /* VDD ON */,
-      3000 },
-
-    /* DAC ON */
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON /* DAC ON */ |
-      POWER0_COM_OFF | POWER0_VCC5_OFF,
-      0 },
-
-    /* INIB = H, INI = L  */
-    { PICTRL_ADRS,
-      /* PICTL[0] = H , PICTL[1] = PICTL[2] = PICTL[4] = L */
-      PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF,
-      0 },
-
-    /* Set Common Voltage */
-    { 0xfe, 0, 0 },
-
-    /* VCC5 ON */
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON /* DAC ON */ |
-      POWER0_COM_OFF | POWER0_VCC5_ON /* VCC5 ON */,
-      0 },
-
-    /* GVSS(-8V) ON */
-    { POWERREG1_ADRS,
-      POWER1_VW_OFF | POWER1_GVSS_ON /* GVSS ON */ |
-      POWER1_VDD_ON /* VDD ON */,
-      2000 },
-
-    /* COM SIGNAL ON (PICTL[3] = L) */
-    { PICTRL_ADRS,
-      PICTRL_INIT_STATE,
-      0 },
-
-    /* COM ON */
-    { POWERREG0_ADRS,
-      POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON /* DAC ON */ |
-      POWER0_COM_ON /* COM ON */ | POWER0_VCC5_ON /* VCC5_ON */,
-      0 },
-
-    /* VW ON */
-    { POWERREG1_ADRS,
-      POWER1_VW_ON /* VW ON */ | POWER1_GVSS_ON /* GVSS ON */ |
-      POWER1_VDD_ON /* VDD ON */,
-      0 /* Wait 100ms */ },
-
-    /* Signals output enable */
-    { PICTRL_ADRS,
-      0 /* Signals output enable */,
-      0 },
-
-    { PHACTRL_ADRS,
-      PHACTRL_PHASE_MANUAL,
-      0 },
-
-    /* Initialize for Input Signals from ATI */
-    { POLCTRL_ADRS,
-      POLCTRL_SYNC_POL_RISE | POLCTRL_EN_POL_RISE | POLCTRL_DATA_POL_RISE |
-      POLCTRL_SYNC_ACT_L | POLCTRL_EN_ACT_H,
-      1000 /*100000*/ /* Wait 100ms */ },
-
-    /* end mark */
-    { 0xff, 0, 0 }
-};
-
-static void lcdtg_resume(void)
-{
-        if (current_par->lcdMode == LCD_MODE_480 || current_par->lcdMode == LCD_MODE_640) {
-                lcdtg_hw_init(LCD_SHARP_VGA);
-        } else {
-                lcdtg_hw_init(LCD_SHARP_QVGA);
-        }
-}
-
-static void lcdtg_suspend(void)
-{
-        int i;
-
-        for (i = 0; i < (current_par->xres * current_par->yres); i++) {
-                writew(0xffff, remapped_fbuf + (2*i));
-        }
-
-        /* 60Hz x 2 frame = 16.7msec x 2 = 33.4 msec */
-        mdelay(34);
-
-        /* (1)VW OFF */
-        lcdtg_ssp_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
-
-        /* (2)COM OFF */
-        lcdtg_ssp_send(PICTRL_ADRS, PICTRL_COM_SIGNAL_OFF);
-        lcdtg_ssp_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON);
-
-        /* (3)Set Common Voltage Bias 0V */
-        lcdtg_set_common_voltage(POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON, 0);
-
-        /* (4)GVSS OFF */
-        lcdtg_ssp_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
-
-        /* (5)VCC5 OFF */
-        lcdtg_ssp_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF);
-
-        /* (6)Set PDWN, INIOFF, DACOFF */
-        lcdtg_ssp_send(PICTRL_ADRS, PICTRL_INIOFF | PICTRL_DAC_SIGNAL_OFF |
-                        PICTRL_POWER_DOWN | PICTRL_COM_SIGNAL_OFF);
-
-        /* (7)DAC OFF */
-        lcdtg_ssp_send(POWERREG0_ADRS, POWER0_DAC_OFF | POWER0_COM_OFF | POWER0_VCC5_OFF);
-
-        /* (8)VDD OFF */
-        lcdtg_ssp_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
-
-}
-
-static void lcdtg_set_phadadj(u32 mode)
-{
-        int adj;
-
-        if (mode == LCD_SHARP_VGA) {
-                /* Setting for VGA */
-                adj = current_par->phadadj;
-                if (adj < 0) {
-                        adj = PHACTRL_PHASE_MANUAL;
-                } else {
-                        adj = ((adj & 0x0f) << 1) | PHACTRL_PHASE_MANUAL;
-                }
-        } else {
-                /* Setting for QVGA */
-                adj = (PHAD_QVGA_DEFAULT_VAL << 1) | PHACTRL_PHASE_MANUAL;
-        }
-        lcdtg_ssp_send(PHACTRL_ADRS, adj);
-}
-
-static void lcdtg_hw_init(u32 mode)
-{
-        int i;
-        int comadj;
-
-        i = 0;
-        while(lcdtg_power_on_table[i].adrs != 0xff) {
-                if (lcdtg_power_on_table[i].adrs == 0xfe) {
-                        /* Set Common Voltage */
-                        comadj = current_par->comadj;
-                        if (comadj < 0) {
-                                comadj = COMADJ_DEFAULT;
-                        }
-                        lcdtg_set_common_voltage((POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF), comadj);
-                } else if (lcdtg_power_on_table[i].adrs == PHACTRL_ADRS) {
-                        /* Set Phase Adjuct */
-                        lcdtg_set_phadadj(mode);
-                } else {
-                        /* Other */
-                        lcdtg_ssp_send(lcdtg_power_on_table[i].adrs, lcdtg_power_on_table[i].data);
-                }
-                if (lcdtg_power_on_table[i].wait != 0)
-                        udelay(lcdtg_power_on_table[i].wait);
-                i++;
-        }
-
-        switch(mode) {
-        case LCD_SHARP_QVGA:
-                /* Set Lcd Resolution (QVGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_QVGA);
-                break;
-        case LCD_SHARP_VGA:
-                /* Set Lcd Resolution (VGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_VGA);
-                break;
-        default:
-                break;
-        }
-}
-
-static void lcdtg_lcd_change(u32 mode)
-{
-        /* Set Phase Adjuct */
-        lcdtg_set_phadadj(mode);
-
-        if (mode == LCD_SHARP_VGA)
-                /* Set Lcd Resolution (VGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_VGA);
-        else if (mode == LCD_SHARP_QVGA)
-                /* Set Lcd Resolution (QVGA) */
-                lcdtg_ssp_send(RESCTL_ADRS, RESCTL_QVGA);
-}
-
-
 static struct device_driver w100fb_driver = {
         .name           = "w100fb",
         .bus            = &platform_bus_type,
@@ -1870,4 +1474,4 @@ module_init(w100fb_init);
 module_exit(w100fb_cleanup);
 
 MODULE_DESCRIPTION("ATI Imageon w100 framebuffer driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/w100fb.h b/drivers/video/w100fb.h
index 41624f961237..7a58a1e3e427 100644
--- a/drivers/video/w100fb.h
+++ b/drivers/video/w100fb.h
@@ -5,9 +5,12 @@
  *
  * Copyright (C) 2002, ATI Corp.
  * Copyright (C) 2004-2005 Richard Purdie
+ * Copyright (c) 2005 Ian Molton <spyro@f2s.com>
  *
  * Modified to work with 2.6 by Richard Purdie <rpurdie@rpsys.net>
  *
+ * w32xx support by Ian Molton
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -19,7 +22,7 @@
 
 /* Block CIF Start: */
 #define mmCHIP_ID           0x0000
-#define mmREVISION_ID           0x0004
+#define mmREVISION_ID       0x0004
 #define mmWRAP_BUF_A        0x0008
 #define mmWRAP_BUF_B        0x000C
 #define mmWRAP_TOP_DIR      0x0010
@@ -88,7 +91,7 @@
 #define mmDISP_DEBUG        0x04D4
 #define mmDISP_DB_BUF_CNTL  0x04D8
 #define mmDISP_CRC_SIG      0x04DC
-#define mmCRTC_DEFAULT_COUNT    0x04E0
+#define mmCRTC_DEFAULT_COUNT    0x04E0
 #define mmLCD_BACKGROUND_COLOR  0x04E4
 #define mmCRTC_PS2          0x04E8
 #define mmCRTC_PS2_VPOS     0x04EC
@@ -119,17 +122,17 @@
 /* Block DISPLAY End: */
 
 /* Block GFX Start: */
-#define mmBRUSH_OFFSET      0x108C
-#define mmBRUSH_Y_X         0x1074
-#define mmDEFAULT_PITCH_OFFSET          0x10A0
-#define mmDEFAULT_SC_BOTTOM_RIGHT       0x10A8
-#define mmDEFAULT2_SC_BOTTOM_RIGHT      0x10AC
-#define mmGLOBAL_ALPHA      0x1210
-#define mmFILTER_COEF       0x1214
-#define mmMVC_CNTL_START    0x11E0
-#define mmE2_ARITHMETIC_CNTL    0x1220
-#define mmENG_CNTL          0x13E8
-#define mmENG_PERF_CNT      0x13F0
+#define mmBRUSH_OFFSET        0x108C
+#define mmBRUSH_Y_X           0x1074
+#define mmDEFAULT_PITCH_OFFSET      0x10A0
+#define mmDEFAULT_SC_BOTTOM_RIGHT   0x10A8
+#define mmDEFAULT2_SC_BOTTOM_RIGHT  0x10AC
+#define mmGLOBAL_ALPHA        0x1210
+#define mmFILTER_COEF         0x1214
+#define mmMVC_CNTL_START      0x11E0
+#define mmE2_ARITHMETIC_CNTL  0x1220
+#define mmENG_CNTL            0x13E8
+#define mmENG_PERF_CNT        0x13F0
 /* Block GFX End: */
 
 /* Block IDCT Start: */
@@ -141,22 +144,38 @@
 /* Block IDCT End: */
 
 /* Block MC Start: */
-#define mmMEM_CNTL          0x0180
-#define mmMEM_ARB           0x0184
-#define mmMC_FB_LOCATION    0x0188
-#define mmMEM_EXT_CNTL      0x018C
-#define mmMC_EXT_MEM_LOCATION   0x0190
-#define mmMEM_EXT_TIMING_CNTL   0x0194
-#define mmMEM_SDRAM_MODE_REG    0x0198
-#define mmMEM_IO_CNTL       0x019C
-#define mmMC_DEBUG          0x01A0
-#define mmMC_BIST_CTRL      0x01A4
-#define mmMC_BIST_COLLAR_READ   0x01A8
-#define mmTC_MISMATCH       0x01AC
-#define mmMC_PERF_MON_CNTL  0x01B0
-#define mmMC_PERF_COUNTERS  0x01B4
+#define mmMEM_CNTL             0x0180
+#define mmMEM_ARB              0x0184
+#define mmMC_FB_LOCATION       0x0188
+#define mmMEM_EXT_CNTL         0x018C
+#define mmMC_EXT_MEM_LOCATION  0x0190
+#define mmMEM_EXT_TIMING_CNTL  0x0194
+#define mmMEM_SDRAM_MODE_REG   0x0198
+#define mmMEM_IO_CNTL          0x019C
+#define mmMC_DEBUG             0x01A0
+#define mmMC_BIST_CTRL         0x01A4
+#define mmMC_BIST_COLLAR_READ  0x01A8
+#define mmTC_MISMATCH          0x01AC
+#define mmMC_PERF_MON_CNTL     0x01B0
+#define mmMC_PERF_COUNTERS     0x01B4
 /* Block MC End: */
 
+/* Block BM Start: */
+#define mmBM_EXT_MEM_BANDWIDTH    0x0A00
+#define mmBM_OFFSET               0x0A04
+#define mmBM_MEM_EXT_TIMING_CNTL  0x0A08
+#define mmBM_MEM_EXT_CNTL         0x0A0C
+#define mmBM_MEM_MODE_REG         0x0A10
+#define mmBM_MEM_IO_CNTL          0x0A18
+#define mmBM_CONFIG               0x0A1C
+#define mmBM_STATUS               0x0A20
+#define mmBM_DEBUG                0x0A24
+#define mmBM_PERF_MON_CNTL        0x0A28
+#define mmBM_PERF_COUNTERS        0x0A2C
+#define mmBM_PERF2_MON_CNTL       0x0A30
+#define mmBM_PERF2_COUNTERS       0x0A34
+/* Block BM End: */
+
 /* Block RBBM Start: */
 #define mmWAIT_UNTIL        0x1400
 #define mmISYNC_CNTL        0x1404
@@ -176,439 +195,575 @@
 /* Block CG End: */
 
 /* default value definitions */
-#define defWRAP_TOP_DIR     0x00000000
-#define defWRAP_START_DIR       0x00000000
-#define defCFGREG_BASE      0x00000000
-#define defCIF_IO           0x000C0902
-#define defINTF_CNTL        0x00000011
-#define defCPU_DEFAULTS     0x00000006
-#define defHW_INT           0x00000000
-#define defMC_EXT_MEM_LOCATION            0x07ff0000
-#define defTC_MISMATCH      0x00000000
+#define defWRAP_TOP_DIR        0x00000000
+#define defWRAP_START_DIR      0x00000000
+#define defCFGREG_BASE         0x00000000
+#define defCIF_IO              0x000C0902
+#define defINTF_CNTL           0x00000011
+#define defCPU_DEFAULTS        0x00000006
+#define defHW_INT              0x00000000
+#define defMC_EXT_MEM_LOCATION 0x07ff0000
+#define defTC_MISMATCH         0x00000000
 
 #define W100_CFG_BASE          0x0
 #define W100_CFG_LEN           0x10
 #define W100_REG_BASE          0x10000
 #define W100_REG_LEN           0x2000
 #define MEM_INT_BASE_VALUE     0x100000
-#define MEM_INT_TOP_VALUE_W100 0x15ffff
 #define MEM_EXT_BASE_VALUE     0x800000
-#define MEM_EXT_TOP_VALUE      0x9fffff
+#define MEM_INT_SIZE           0x05ffff
+#define MEM_WINDOW_BASE        0x100000
+#define MEM_WINDOW_SIZE        0xf00000
+
 #define WRAP_BUF_BASE_VALUE    0x80000
 #define WRAP_BUF_TOP_VALUE     0xbffff
 
+#define CHIP_ID_W100           0x57411002
+#define CHIP_ID_W3200          0x56441002
+#define CHIP_ID_W3220          0x57441002
 
-/* data structure definitions */
+/* Register structure definitions */
 
 struct wrap_top_dir_t {
-     unsigned long top_addr         : 23;
-     unsigned long                              : 9;
+        unsigned long top_addr  : 23;
+        unsigned long           : 9;
 } __attribute__((packed));
 
 union wrap_top_dir_u {
-     unsigned long val : 32;
-     struct wrap_top_dir_t f;
+        unsigned long val : 32;
+        struct wrap_top_dir_t f;
 } __attribute__((packed));
 
 struct wrap_start_dir_t {
-     unsigned long start_addr       : 23;
-     unsigned long                              : 9;
+        unsigned long start_addr : 23;
+        unsigned long            : 9;
 } __attribute__((packed));
 
 union wrap_start_dir_u {
-     unsigned long val : 32;
-     struct wrap_start_dir_t f;
+        unsigned long val : 32;
+        struct wrap_start_dir_t f;
 } __attribute__((packed));
 
 struct cif_cntl_t {
-     unsigned long swap_reg                     : 2;
-     unsigned long swap_fbuf_1                  : 2;
-     unsigned long swap_fbuf_2                  : 2;
-     unsigned long swap_fbuf_3                  : 2;
-     unsigned long pmi_int_disable              : 1;
-     unsigned long pmi_schmen_disable       : 1;
-     unsigned long intb_oe                      : 1;
-     unsigned long en_wait_to_compensate_dq_prop_dly : 1;
-     unsigned long compensate_wait_rd_size  : 2;
-     unsigned long wait_asserted_timeout_val      : 2;
-     unsigned long wait_masked_val              : 2;
-     unsigned long en_wait_timeout              : 1;
-     unsigned long en_one_clk_setup_before_wait   : 1;
-     unsigned long interrupt_active_high    : 1;
-     unsigned long en_overwrite_straps      : 1;
-     unsigned long strap_wait_active_hi     : 1;
-     unsigned long lat_busy_count               : 2;
-     unsigned long lat_rd_pm4_sclk_busy     : 1;
-     unsigned long dis_system_bits              : 1;
-     unsigned long dis_mr                       : 1;
-     unsigned long cif_spare_1                  : 4;
+        unsigned long swap_reg                 : 2;
+        unsigned long swap_fbuf_1              : 2;
+        unsigned long swap_fbuf_2              : 2;
+        unsigned long swap_fbuf_3              : 2;
+        unsigned long pmi_int_disable          : 1;
+        unsigned long pmi_schmen_disable       : 1;
+        unsigned long intb_oe                  : 1;
+        unsigned long en_wait_to_compensate_dq_prop_dly  : 1;
+        unsigned long compensate_wait_rd_size  : 2;
+        unsigned long wait_asserted_timeout_val  : 2;
+        unsigned long wait_masked_val          : 2;
+        unsigned long en_wait_timeout          : 1;
+        unsigned long en_one_clk_setup_before_wait  : 1;
+        unsigned long interrupt_active_high    : 1;
+        unsigned long en_overwrite_straps      : 1;
+        unsigned long strap_wait_active_hi     : 1;
+        unsigned long lat_busy_count           : 2;
+        unsigned long lat_rd_pm4_sclk_busy     : 1;
+        unsigned long dis_system_bits          : 1;
+        unsigned long dis_mr                   : 1;
+        unsigned long cif_spare_1              : 4;
 } __attribute__((packed));
 
 union cif_cntl_u {
-     unsigned long val : 32;
-     struct cif_cntl_t f;
+        unsigned long val : 32;
+        struct cif_cntl_t f;
 } __attribute__((packed));
 
 struct cfgreg_base_t {
-     unsigned long cfgreg_base      : 24;
-     unsigned long                              : 8;
+        unsigned long cfgreg_base  : 24;
+        unsigned long              : 8;
 } __attribute__((packed));
 
 union cfgreg_base_u {
-     unsigned long val : 32;
-     struct cfgreg_base_t f;
+        unsigned long val : 32;
+        struct cfgreg_base_t f;
 } __attribute__((packed));
 
 struct cif_io_t {
-     unsigned long dq_srp           : 1;
-     unsigned long dq_srn           : 1;
-     unsigned long dq_sp            : 4;
-     unsigned long dq_sn            : 4;
-     unsigned long waitb_srp        : 1;
-     unsigned long waitb_srn        : 1;
-     unsigned long waitb_sp         : 4;
-     unsigned long waitb_sn         : 4;
-     unsigned long intb_srp         : 1;
-     unsigned long intb_srn         : 1;
-     unsigned long intb_sp          : 4;
-     unsigned long intb_sn          : 4;
-     unsigned long                              : 2;
+        unsigned long dq_srp     : 1;
+        unsigned long dq_srn     : 1;
+        unsigned long dq_sp      : 4;
+        unsigned long dq_sn      : 4;
+        unsigned long waitb_srp  : 1;
+        unsigned long waitb_srn  : 1;
+        unsigned long waitb_sp   : 4;
+        unsigned long waitb_sn   : 4;
+        unsigned long intb_srp   : 1;
+        unsigned long intb_srn   : 1;
+        unsigned long intb_sp    : 4;
+        unsigned long intb_sn    : 4;
+        unsigned long            : 2;
 } __attribute__((packed));
 
 union cif_io_u {
-     unsigned long val : 32;
-     struct cif_io_t f;
+        unsigned long val : 32;
+        struct cif_io_t f;
 } __attribute__((packed));
 
 struct cif_read_dbg_t {
-     unsigned long unpacker_pre_fetch_trig_gen  : 2;
-     unsigned long dly_second_rd_fetch_trig     : 1;
-     unsigned long rst_rd_burst_id                      : 1;
-     unsigned long dis_rd_burst_id                      : 1;
-     unsigned long en_block_rd_when_packer_is_not_emp : 1;
-     unsigned long dis_pre_fetch_cntl_sm        : 1;
-     unsigned long rbbm_chrncy_dis                      : 1;
-     unsigned long rbbm_rd_after_wr_lat         : 2;
-     unsigned long dis_be_during_rd                     : 1;
-     unsigned long one_clk_invalidate_pulse     : 1;
-     unsigned long dis_chnl_priority                    : 1;
-     unsigned long rst_read_path_a_pls          : 1;
-     unsigned long rst_read_path_b_pls          : 1;
-     unsigned long dis_reg_rd_fetch_trig        : 1;
-     unsigned long dis_rd_fetch_trig_from_ind_addr : 1;
-     unsigned long dis_rd_same_byte_to_trig_fetch : 1;
-     unsigned long dis_dir_wrap                         : 1;
-     unsigned long dis_ring_buf_to_force_dec    : 1;
-     unsigned long dis_addr_comp_in_16bit       : 1;
-     unsigned long clr_w                                : 1;
-     unsigned long err_rd_tag_is_3                      : 1;
-     unsigned long err_load_when_ful_a          : 1;
-     unsigned long err_load_when_ful_b          : 1;
-     unsigned long                                                      : 7;
+        unsigned long unpacker_pre_fetch_trig_gen  : 2;
+        unsigned long dly_second_rd_fetch_trig     : 1;
+        unsigned long rst_rd_burst_id              : 1;
+        unsigned long dis_rd_burst_id              : 1;
+        unsigned long en_block_rd_when_packer_is_not_emp : 1;
+        unsigned long dis_pre_fetch_cntl_sm        : 1;
+        unsigned long rbbm_chrncy_dis              : 1;
+        unsigned long rbbm_rd_after_wr_lat         : 2;
+        unsigned long dis_be_during_rd             : 1;
+        unsigned long one_clk_invalidate_pulse     : 1;
+        unsigned long dis_chnl_priority            : 1;
+        unsigned long rst_read_path_a_pls          : 1;
+        unsigned long rst_read_path_b_pls          : 1;
+        unsigned long dis_reg_rd_fetch_trig        : 1;
+        unsigned long dis_rd_fetch_trig_from_ind_addr : 1;
+        unsigned long dis_rd_same_byte_to_trig_fetch : 1;
+        unsigned long dis_dir_wrap                 : 1;
+        unsigned long dis_ring_buf_to_force_dec    : 1;
+        unsigned long dis_addr_comp_in_16bit       : 1;
+        unsigned long clr_w                        : 1;
+        unsigned long err_rd_tag_is_3              : 1;
+        unsigned long err_load_when_ful_a          : 1;
+        unsigned long err_load_when_ful_b          : 1;
+        unsigned long                              : 7;
 } __attribute__((packed));
 
 union cif_read_dbg_u {
-     unsigned long val : 32;
-     struct cif_read_dbg_t f;
+        unsigned long val : 32;
+        struct cif_read_dbg_t f;
 } __attribute__((packed));
 
 struct cif_write_dbg_t {
-     unsigned long packer_timeout_count           : 2;
-     unsigned long en_upper_load_cond             : 1;
-     unsigned long en_chnl_change_cond            : 1;
-     unsigned long dis_addr_comp_cond             : 1;
-     unsigned long dis_load_same_byte_addr_cond   : 1;
-     unsigned long dis_timeout_cond                       : 1;
-     unsigned long dis_timeout_during_rbbm        : 1;
-     unsigned long dis_packer_ful_during_rbbm_timeout : 1;
-     unsigned long en_dword_split_to_rbbm         : 1;
-     unsigned long en_dummy_val                           : 1;
-     unsigned long dummy_val_sel                          : 1;
-     unsigned long mask_pm4_wrptr_dec             : 1;
-     unsigned long dis_mc_clean_cond                      : 1;
-     unsigned long err_two_reqi_during_ful        : 1;
-     unsigned long err_reqi_during_idle_clk       : 1;
-     unsigned long err_global                             : 1;
-     unsigned long en_wr_buf_dbg_load             : 1;
-     unsigned long en_wr_buf_dbg_path             : 1;
-     unsigned long sel_wr_buf_byte                        : 3;
-     unsigned long dis_rd_flush_wr                        : 1;
-     unsigned long dis_packer_ful_cond            : 1;
-     unsigned long dis_invalidate_by_ops_chnl     : 1;
-     unsigned long en_halt_when_reqi_err          : 1;
-     unsigned long cif_spare_2                            : 5;
-     unsigned long                                                        : 1;
+        unsigned long packer_timeout_count          : 2;
+        unsigned long en_upper_load_cond            : 1;
+        unsigned long en_chnl_change_cond           : 1;
+        unsigned long dis_addr_comp_cond            : 1;
+        unsigned long dis_load_same_byte_addr_cond  : 1;
+        unsigned long dis_timeout_cond              : 1;
+        unsigned long dis_timeout_during_rbbm       : 1;
+        unsigned long dis_packer_ful_during_rbbm_timeout : 1;
+        unsigned long en_dword_split_to_rbbm        : 1;
+        unsigned long en_dummy_val                  : 1;
+        unsigned long dummy_val_sel                 : 1;
+        unsigned long mask_pm4_wrptr_dec            : 1;
+        unsigned long dis_mc_clean_cond             : 1;
+        unsigned long err_two_reqi_during_ful       : 1;
+        unsigned long err_reqi_during_idle_clk      : 1;
+        unsigned long err_global                    : 1;
+        unsigned long en_wr_buf_dbg_load            : 1;
+        unsigned long en_wr_buf_dbg_path            : 1;
+        unsigned long sel_wr_buf_byte               : 3;
+        unsigned long dis_rd_flush_wr               : 1;
+        unsigned long dis_packer_ful_cond           : 1;
+        unsigned long dis_invalidate_by_ops_chnl    : 1;
+        unsigned long en_halt_when_reqi_err         : 1;
+        unsigned long cif_spare_2                   : 5;
+        unsigned long                               : 1;
 } __attribute__((packed));
 
 union cif_write_dbg_u {
-     unsigned long val : 32;
-     struct cif_write_dbg_t f;
+        unsigned long val : 32;
+        struct cif_write_dbg_t f;
 } __attribute__((packed));
 
 
 struct intf_cntl_t {
-     unsigned char ad_inc_a            : 1;
-     unsigned char ring_buf_a          : 1;
-     unsigned char rd_fetch_trigger_a  : 1;
-     unsigned char rd_data_rdy_a       : 1;
-     unsigned char ad_inc_b            : 1;
-     unsigned char ring_buf_b          : 1;
-     unsigned char rd_fetch_trigger_b  : 1;
-     unsigned char rd_data_rdy_b       : 1;
+        unsigned char ad_inc_a            : 1;
+        unsigned char ring_buf_a          : 1;
+        unsigned char rd_fetch_trigger_a  : 1;
+        unsigned char rd_data_rdy_a       : 1;
+        unsigned char ad_inc_b            : 1;
+        unsigned char ring_buf_b          : 1;
+        unsigned char rd_fetch_trigger_b  : 1;
+        unsigned char rd_data_rdy_b       : 1;
 } __attribute__((packed));
 
 union intf_cntl_u {
-     unsigned char val : 8;
-     struct intf_cntl_t f;
+        unsigned char val : 8;
+        struct intf_cntl_t f;
 } __attribute__((packed));
 
 struct cpu_defaults_t {
-     unsigned char unpack_rd_data   : 1;
-     unsigned char access_ind_addr_a: 1;
-     unsigned char access_ind_addr_b: 1;
-     unsigned char access_scratch_reg             : 1;
-     unsigned char pack_wr_data     : 1;
-     unsigned char transition_size  : 1;
-     unsigned char en_read_buf_mode : 1;
-     unsigned char rd_fetch_scratch : 1;
+        unsigned char unpack_rd_data     : 1;
+        unsigned char access_ind_addr_a  : 1;
+        unsigned char access_ind_addr_b  : 1;
+        unsigned char access_scratch_reg : 1;
+        unsigned char pack_wr_data       : 1;
+        unsigned char transition_size    : 1;
+        unsigned char en_read_buf_mode   : 1;
+        unsigned char rd_fetch_scratch   : 1;
 } __attribute__((packed));
 
 union cpu_defaults_u {
-     unsigned char val : 8;
-     struct cpu_defaults_t f;
+        unsigned char val : 8;
+        struct cpu_defaults_t f;
+} __attribute__((packed));
+
+struct crtc_total_t {
+        unsigned long crtc_h_total : 10;
+        unsigned long              : 6;
+        unsigned long crtc_v_total : 10;
+        unsigned long              : 6;
+} __attribute__((packed));
+
+union crtc_total_u {
+        unsigned long val : 32;
+        struct crtc_total_t f;
+} __attribute__((packed));
+
+struct crtc_ss_t {
+        unsigned long ss_start    : 10;
+        unsigned long             : 6;
+        unsigned long ss_end      : 10;
+        unsigned long             : 2;
+        unsigned long ss_align    : 1;
+        unsigned long ss_pol      : 1;
+        unsigned long ss_run_mode : 1;
+        unsigned long ss_en       : 1;
+} __attribute__((packed));
+
+union crtc_ss_u {
+        unsigned long val : 32;
+        struct crtc_ss_t f;
+} __attribute__((packed));
+
+struct active_h_disp_t {
+        unsigned long active_h_start  : 10;
+        unsigned long                 : 6;
+        unsigned long active_h_end    : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union active_h_disp_u {
+        unsigned long val : 32;
+        struct active_h_disp_t f;
+} __attribute__((packed));
+
+struct active_v_disp_t {
+        unsigned long active_v_start  : 10;
+        unsigned long                 : 6;
+        unsigned long active_v_end    : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union active_v_disp_u {
+        unsigned long val : 32;
+        struct active_v_disp_t f;
+} __attribute__((packed));
+
+struct graphic_h_disp_t {
+        unsigned long graphic_h_start : 10;
+        unsigned long                 : 6;
+        unsigned long graphic_h_end   : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union graphic_h_disp_u {
+        unsigned long val : 32;
+        struct graphic_h_disp_t f;
+} __attribute__((packed));
+
+struct graphic_v_disp_t {
+        unsigned long graphic_v_start : 10;
+        unsigned long                 : 6;
+        unsigned long graphic_v_end   : 10;
+        unsigned long                 : 6;
+} __attribute__((packed));
+
+union graphic_v_disp_u{
+        unsigned long val : 32;
+        struct graphic_v_disp_t f;
+} __attribute__((packed));
+
+struct graphic_ctrl_t_w100 {
+        unsigned long color_depth       : 3;
+        unsigned long portrait_mode     : 2;
+        unsigned long low_power_on      : 1;
+        unsigned long req_freq          : 4;
+        unsigned long en_crtc           : 1;
+        unsigned long en_graphic_req    : 1;
+        unsigned long en_graphic_crtc   : 1;
+        unsigned long total_req_graphic : 9;
+        unsigned long lcd_pclk_on       : 1;
+        unsigned long lcd_sclk_on       : 1;
+        unsigned long pclk_running      : 1;
+        unsigned long sclk_running      : 1;
+        unsigned long                   : 6;
+} __attribute__((packed));
+
+struct graphic_ctrl_t_w32xx {
+        unsigned long color_depth       : 3;
+        unsigned long portrait_mode     : 2;
+        unsigned long low_power_on      : 1;
+        unsigned long req_freq          : 4;
+        unsigned long en_crtc           : 1;
+        unsigned long en_graphic_req    : 1;
+        unsigned long en_graphic_crtc   : 1;
+        unsigned long total_req_graphic : 10;
+        unsigned long lcd_pclk_on       : 1;
+        unsigned long lcd_sclk_on       : 1;
+        unsigned long pclk_running      : 1;
+        unsigned long sclk_running      : 1;
+        unsigned long                   : 5;
+} __attribute__((packed));
+
+union graphic_ctrl_u {
+        unsigned long val : 32;
+        struct graphic_ctrl_t_w100 f_w100;
+        struct graphic_ctrl_t_w32xx f_w32xx;
 } __attribute__((packed));
 
 struct video_ctrl_t {
-     unsigned long video_mode       : 1;
-     unsigned long keyer_en         : 1;
-     unsigned long en_video_req     : 1;
-     unsigned long en_graphic_req_video           : 1;
-     unsigned long en_video_crtc    : 1;
-     unsigned long video_hor_exp    : 2;
-     unsigned long video_ver_exp    : 2;
-     unsigned long uv_combine       : 1;
-     unsigned long total_req_video  : 9;
-     unsigned long video_ch_sel     : 1;
-     unsigned long video_portrait   : 2;
-     unsigned long yuv2rgb_en       : 1;
-     unsigned long yuv2rgb_option   : 1;
-     unsigned long video_inv_hor    : 1;
-     unsigned long video_inv_ver    : 1;
-     unsigned long gamma_sel        : 2;
-     unsigned long dis_limit        : 1;
-     unsigned long en_uv_hblend     : 1;
-     unsigned long rgb_gamma_sel    : 2;
+        unsigned long video_mode       : 1;
+        unsigned long keyer_en         : 1;
+        unsigned long en_video_req     : 1;
+        unsigned long en_graphic_req_video  : 1;
+        unsigned long en_video_crtc    : 1;
+        unsigned long video_hor_exp    : 2;
+        unsigned long video_ver_exp    : 2;
+        unsigned long uv_combine       : 1;
+        unsigned long total_req_video  : 9;
+        unsigned long video_ch_sel     : 1;
+        unsigned long video_portrait   : 2;
+        unsigned long yuv2rgb_en       : 1;
+        unsigned long yuv2rgb_option   : 1;
+        unsigned long video_inv_hor    : 1;
+        unsigned long video_inv_ver    : 1;
+        unsigned long gamma_sel        : 2;
+        unsigned long dis_limit        : 1;
+        unsigned long en_uv_hblend     : 1;
+        unsigned long rgb_gamma_sel    : 2;
 } __attribute__((packed));
 
 union video_ctrl_u {
-     unsigned long val : 32;
-     struct video_ctrl_t f;
+        unsigned long val : 32;
+        struct video_ctrl_t f;
 } __attribute__((packed));
 
 struct disp_db_buf_cntl_rd_t {
-     unsigned long en_db_buf            : 1;
-     unsigned long update_db_buf_done   : 1;
-     unsigned long db_buf_cntl          : 6;
-     unsigned long                                      : 24;
+        unsigned long en_db_buf           : 1;
+        unsigned long update_db_buf_done  : 1;
+        unsigned long db_buf_cntl         : 6;
+        unsigned long                     : 24;
 } __attribute__((packed));
 
 union disp_db_buf_cntl_rd_u {
-     unsigned long val : 32;
-     struct disp_db_buf_cntl_rd_t f;
+        unsigned long val : 32;
+        struct disp_db_buf_cntl_rd_t f;
 } __attribute__((packed));
 
 struct disp_db_buf_cntl_wr_t {
-     unsigned long en_db_buf        : 1;
-     unsigned long update_db_buf    : 1;
-     unsigned long db_buf_cntl      : 6;
-     unsigned long    : 24;
+        unsigned long en_db_buf      : 1;
+        unsigned long update_db_buf  : 1;
+        unsigned long db_buf_cntl    : 6;
+        unsigned long                : 24;
 } __attribute__((packed));
 
 union disp_db_buf_cntl_wr_u {
-     unsigned long val : 32;
-     struct disp_db_buf_cntl_wr_t f;
+        unsigned long val : 32;
+        struct disp_db_buf_cntl_wr_t f;
 } __attribute__((packed));
 
 struct gamma_value1_t {
-     unsigned long gamma1           : 8;
-     unsigned long gamma2           : 8;
-     unsigned long gamma3           : 8;
-     unsigned long gamma4           : 8;
+        unsigned long gamma1   : 8;
+        unsigned long gamma2   : 8;
+        unsigned long gamma3   : 8;
+        unsigned long gamma4   : 8;
 } __attribute__((packed));
 
 union gamma_value1_u {
-     unsigned long val : 32;
-     struct gamma_value1_t f;
+        unsigned long val : 32;
+        struct gamma_value1_t f;
 } __attribute__((packed));
 
 struct gamma_value2_t {
-     unsigned long gamma5           : 8;
-     unsigned long gamma6           : 8;
-     unsigned long gamma7           : 8;
-     unsigned long gamma8           : 8;
+        unsigned long gamma5   : 8;
+        unsigned long gamma6   : 8;
+        unsigned long gamma7   : 8;
+        unsigned long gamma8   : 8;
 } __attribute__((packed));
 
 union gamma_value2_u {
-     unsigned long val : 32;
-     struct gamma_value2_t f;
+        unsigned long val : 32;
+        struct gamma_value2_t f;
 } __attribute__((packed));
 
 struct gamma_slope_t {
-     unsigned long slope1           : 3;
-     unsigned long slope2           : 3;
-     unsigned long slope3           : 3;
-     unsigned long slope4           : 3;
-     unsigned long slope5           : 3;
-     unsigned long slope6           : 3;
-     unsigned long slope7           : 3;
-     unsigned long slope8           : 3;
-     unsigned long                              : 8;
+        unsigned long slope1   : 3;
+        unsigned long slope2   : 3;
+        unsigned long slope3   : 3;
+        unsigned long slope4   : 3;
+        unsigned long slope5   : 3;
+        unsigned long slope6   : 3;
+        unsigned long slope7   : 3;
+        unsigned long slope8   : 3;
+        unsigned long          : 8;
 } __attribute__((packed));
 
 union gamma_slope_u {
-     unsigned long val : 32;
-     struct gamma_slope_t f;
+        unsigned long val : 32;
+        struct gamma_slope_t f;
 } __attribute__((packed));
 
 struct mc_ext_mem_location_t {
-     unsigned long mc_ext_mem_start : 16;
-     unsigned long mc_ext_mem_top   : 16;
+        unsigned long mc_ext_mem_start : 16;
+        unsigned long mc_ext_mem_top   : 16;
 } __attribute__((packed));
 
 union mc_ext_mem_location_u {
-     unsigned long val : 32;
-     struct mc_ext_mem_location_t f;
+        unsigned long val : 32;
+        struct mc_ext_mem_location_t f;
+} __attribute__((packed));
+
+struct mc_fb_location_t {
+        unsigned long mc_fb_start      : 16;
+        unsigned long mc_fb_top        : 16;
+} __attribute__((packed));
+
+union mc_fb_location_u {
+        unsigned long val : 32;
+        struct mc_fb_location_t f;
 } __attribute__((packed));
 
 struct clk_pin_cntl_t {
-     unsigned long osc_en           : 1;
-     unsigned long osc_gain         : 5;
-     unsigned long dont_use_xtalin  : 1;
-     unsigned long xtalin_pm_en     : 1;
-     unsigned long xtalin_dbl_en    : 1;
-     unsigned long                              : 7;
-     unsigned long cg_debug         : 16;
+        unsigned long osc_en           : 1;
+        unsigned long osc_gain         : 5;
+        unsigned long dont_use_xtalin  : 1;
+        unsigned long xtalin_pm_en     : 1;
+        unsigned long xtalin_dbl_en    : 1;
+        unsigned long                  : 7;
+        unsigned long cg_debug         : 16;
 } __attribute__((packed));
 
 union clk_pin_cntl_u {
-     unsigned long val : 32;
-     struct clk_pin_cntl_t f;
+        unsigned long val : 32;
+        struct clk_pin_cntl_t f;
 } __attribute__((packed));
 
 struct pll_ref_fb_div_t {
-     unsigned long pll_ref_div      : 4;
-     unsigned long                              : 4;
-     unsigned long pll_fb_div_int   : 6;
-     unsigned long                              : 2;
-     unsigned long pll_fb_div_frac  : 3;
-     unsigned long                              : 1;
-     unsigned long pll_reset_time   : 4;
-     unsigned long pll_lock_time    : 8;
+        unsigned long pll_ref_div      : 4;
+        unsigned long                  : 4;
+        unsigned long pll_fb_div_int   : 6;
+        unsigned long                  : 2;
+        unsigned long pll_fb_div_frac  : 3;
+        unsigned long                  : 1;
+        unsigned long pll_reset_time   : 4;
+        unsigned long pll_lock_time    : 8;
 } __attribute__((packed));
 
 union pll_ref_fb_div_u {
-     unsigned long val : 32;
-     struct pll_ref_fb_div_t f;
+        unsigned long val : 32;
+        struct pll_ref_fb_div_t f;
 } __attribute__((packed));
 
 struct pll_cntl_t {
-     unsigned long pll_pwdn         : 1;
-     unsigned long pll_reset        : 1;
-     unsigned long pll_pm_en        : 1;
-     unsigned long pll_mode         : 1;
-     unsigned long pll_refclk_sel   : 1;
-     unsigned long pll_fbclk_sel    : 1;
-     unsigned long pll_tcpoff       : 1;
-     unsigned long pll_pcp          : 3;
-     unsigned long pll_pvg          : 3;
-     unsigned long pll_vcofr        : 1;
-     unsigned long pll_ioffset      : 2;
-     unsigned long pll_pecc_mode    : 2;
-     unsigned long pll_pecc_scon    : 2;
-     unsigned long pll_dactal       : 4;
-     unsigned long pll_cp_clip      : 2;
-     unsigned long pll_conf         : 3;
-     unsigned long pll_mbctrl       : 2;
-     unsigned long pll_ring_off     : 1;
+        unsigned long pll_pwdn        : 1;
+        unsigned long pll_reset       : 1;
+        unsigned long pll_pm_en       : 1;
+        unsigned long pll_mode        : 1;
+        unsigned long pll_refclk_sel  : 1;
+        unsigned long pll_fbclk_sel   : 1;
+        unsigned long pll_tcpoff      : 1;
+        unsigned long pll_pcp         : 3;
+        unsigned long pll_pvg         : 3;
+        unsigned long pll_vcofr       : 1;
+        unsigned long pll_ioffset     : 2;
+        unsigned long pll_pecc_mode   : 2;
+        unsigned long pll_pecc_scon   : 2;
+        unsigned long pll_dactal      : 4;
+        unsigned long pll_cp_clip     : 2;
+        unsigned long pll_conf        : 3;
+        unsigned long pll_mbctrl      : 2;
+        unsigned long pll_ring_off    : 1;
 } __attribute__((packed));
 
 union pll_cntl_u {
-     unsigned long val : 32;
-     struct pll_cntl_t f;
+        unsigned long val : 32;
+        struct pll_cntl_t f;
 } __attribute__((packed));
 
 struct sclk_cntl_t {
-     unsigned long sclk_src_sel         : 2;
-     unsigned long                                      : 2;
-     unsigned long sclk_post_div_fast   : 4;
-     unsigned long sclk_clkon_hys       : 3;
-     unsigned long sclk_post_div_slow   : 4;
-     unsigned long disp_cg_ok2switch_en : 1;
-     unsigned long sclk_force_reg       : 1;
-     unsigned long sclk_force_disp      : 1;
-     unsigned long sclk_force_mc        : 1;
-     unsigned long sclk_force_extmc     : 1;
-     unsigned long sclk_force_cp        : 1;
-     unsigned long sclk_force_e2        : 1;
-     unsigned long sclk_force_e3        : 1;
-     unsigned long sclk_force_idct      : 1;
-     unsigned long sclk_force_bist      : 1;
-     unsigned long busy_extend_cp       : 1;
-     unsigned long busy_extend_e2       : 1;
-     unsigned long busy_extend_e3       : 1;
-     unsigned long busy_extend_idct     : 1;
-     unsigned long                                      : 3;
+        unsigned long sclk_src_sel         : 2;
+        unsigned long                      : 2;
+        unsigned long sclk_post_div_fast   : 4;
+        unsigned long sclk_clkon_hys       : 3;
+        unsigned long sclk_post_div_slow   : 4;
+        unsigned long disp_cg_ok2switch_en : 1;
+        unsigned long sclk_force_reg       : 1;
+        unsigned long sclk_force_disp      : 1;
+        unsigned long sclk_force_mc        : 1;
+        unsigned long sclk_force_extmc     : 1;
+        unsigned long sclk_force_cp        : 1;
+        unsigned long sclk_force_e2        : 1;
+        unsigned long sclk_force_e3        : 1;
+        unsigned long sclk_force_idct      : 1;
+        unsigned long sclk_force_bist      : 1;
+        unsigned long busy_extend_cp       : 1;
+        unsigned long busy_extend_e2       : 1;
+        unsigned long busy_extend_e3       : 1;
+        unsigned long busy_extend_idct     : 1;
+        unsigned long                      : 3;
 } __attribute__((packed));
 
 union sclk_cntl_u {
-     unsigned long val : 32;
-     struct sclk_cntl_t f;
+        unsigned long val : 32;
+        struct sclk_cntl_t f;
 } __attribute__((packed));
 
 struct pclk_cntl_t {
-     unsigned long pclk_src_sel     : 2;
-     unsigned long                              : 2;
-     unsigned long pclk_post_div    : 4;
-     unsigned long                              : 8;
-     unsigned long pclk_force_disp  : 1;
-     unsigned long                              : 15;
+        unsigned long pclk_src_sel     : 2;
+        unsigned long                  : 2;
+        unsigned long pclk_post_div    : 4;
+        unsigned long                  : 8;
+        unsigned long pclk_force_disp  : 1;
+        unsigned long                  : 15;
 } __attribute__((packed));
 
 union pclk_cntl_u {
-     unsigned long val : 32;
-     struct pclk_cntl_t f;
+        unsigned long val : 32;
+        struct pclk_cntl_t f;
 } __attribute__((packed));
 
+
+#define TESTCLK_SRC_PLL   0x01
+#define TESTCLK_SRC_SCLK  0x02
+#define TESTCLK_SRC_PCLK  0x03
+/* 4 and 5 seem to by XTAL/M */
+#define TESTCLK_SRC_XTAL  0x06
+
 struct clk_test_cntl_t {
-     unsigned long testclk_sel      : 4;
-     unsigned long                              : 3;
-     unsigned long start_check_freq : 1;
-     unsigned long tstcount_rst     : 1;
-     unsigned long                              : 15;
-     unsigned long test_count       : 8;
+        unsigned long testclk_sel      : 4;
+        unsigned long                  : 3;
+        unsigned long start_check_freq : 1;
+        unsigned long tstcount_rst     : 1;
+        unsigned long                  : 15;
+        unsigned long test_count       : 8;
 } __attribute__((packed));
 
 union clk_test_cntl_u {
-     unsigned long val : 32;
-     struct clk_test_cntl_t f;
+        unsigned long val : 32;
+        struct clk_test_cntl_t f;
 } __attribute__((packed));
 
 struct pwrmgt_cntl_t {
-     unsigned long pwm_enable           : 1;
-     unsigned long                                      : 1;
-     unsigned long pwm_mode_req         : 2;
-     unsigned long pwm_wakeup_cond      : 2;
-     unsigned long pwm_fast_noml_hw_en  : 1;
-     unsigned long pwm_noml_fast_hw_en  : 1;
-     unsigned long pwm_fast_noml_cond   : 4;
-     unsigned long pwm_noml_fast_cond   : 4;
-     unsigned long pwm_idle_timer       : 8;
-     unsigned long pwm_busy_timer       : 8;
+        unsigned long pwm_enable           : 1;
+        unsigned long                      : 1;
+        unsigned long pwm_mode_req         : 2;
+        unsigned long pwm_wakeup_cond      : 2;
+        unsigned long pwm_fast_noml_hw_en  : 1;
+        unsigned long pwm_noml_fast_hw_en  : 1;
+        unsigned long pwm_fast_noml_cond   : 4;
+        unsigned long pwm_noml_fast_cond   : 4;
+        unsigned long pwm_idle_timer       : 8;
+        unsigned long pwm_busy_timer       : 8;
 } __attribute__((packed));
 
 union pwrmgt_cntl_u {
-     unsigned long val : 32;
-     struct pwrmgt_cntl_t f;
+        unsigned long val : 32;
+        struct pwrmgt_cntl_t f;
 } __attribute__((packed));
 
 #endif