Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

220 files changed, 8271 insertions, 3179 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index d7f9839ba264..8a851d0f4384 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -9,6 +9,7 @@ menuconfig ACPI
         depends on PCI
         depends on PM
         select PNP
+        select CPU_IDLE
         default y
         ---help---
           Advanced Configuration and Power Interface (ACPI) support for 
@@ -253,13 +254,6 @@ config ACPI_PCI_SLOT
           help you correlate PCI bus addresses with the physical geography
           of your slots. If you are unsure, say N.
 
-config ACPI_SYSTEM
-        bool
-        default y
-        help
-          This driver will enable your system to shut down using ACPI, and
-          dump your ACPI DSDT table using /proc/acpi/dsdt.
-
 config X86_PM_TIMER
         bool "Power Management Timer Support" if EMBEDDED
         depends on X86
@@ -287,7 +281,7 @@ config ACPI_CONTAINER
           support physical cpu/memory hot-plug.
 
           If one selects "m", this driver can be loaded with
-          "modprobe acpi_container".
+          "modprobe container".
 
 config ACPI_HOTPLUG_MEMORY
         tristate "Memory Hotplug"
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 65d90c720b5a..b130ea0d0759 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -52,7 +52,7 @@ obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
 obj-$(CONFIG_ACPI_CONTAINER)    += container.o
 obj-$(CONFIG_ACPI_THERMAL)      += thermal.o
 obj-y                           += power.o
-obj-$(CONFIG_ACPI_SYSTEM)       += system.o event.o
+obj-y                           += system.o event.o
 obj-$(CONFIG_ACPI_DEBUG)        += debug.o
 obj-$(CONFIG_ACPI_NUMA)         += numa.o
 obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)       += acpi_memhotplug.o
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index 9684cc827930..22ce48985720 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -538,10 +538,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
                         if (ACPI_FAILURE(status)) {
                                 ACPI_WARNING((AE_INFO,
                                               "Truncating %u table entries!",
-                                              (unsigned)
-                                              (acpi_gbl_root_table_list.size -
-                                               acpi_gbl_root_table_list.
-                                               count)));
+                                              (unsigned) (table_count -
+                                               (acpi_gbl_root_table_list.
+                                               count - 2))));
                                 break;
                         }
                 }
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index da9450bc60f7..9c9897dbe907 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -116,9 +116,9 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        /* Default return value is SUPPORTED */
+        /* Default return value is 0, NOT-SUPPORTED */
 
-        return_desc->integer.value = ACPI_UINT32_MAX;
+        return_desc->integer.value = 0;
         walk_state->return_desc = return_desc;
 
         /* Compare input string to static table of supported interfaces */
@@ -127,10 +127,8 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
                 if (!ACPI_STRCMP
                     (string_desc->string.pointer,
                      acpi_interfaces_supported[i])) {
-
-                        /* The interface is supported */
-
-                        return_ACPI_STATUS(AE_OK);
+                        return_desc->integer.value = ACPI_UINT32_MAX;
+                        goto done;
                 }
         }
 
@@ -141,15 +139,14 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
          */
         status = acpi_os_validate_interface(string_desc->string.pointer);
         if (ACPI_SUCCESS(status)) {
-
-                /* The interface is supported */
-
-                return_ACPI_STATUS(AE_OK);
+                return_desc->integer.value = ACPI_UINT32_MAX;
         }
 
-        /* The interface is not supported */
+done:
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO, "ACPI: BIOS _OSI(%s) %ssupported\n",
+                string_desc->string.pointer,
+                return_desc->integer.value == 0 ? "not-" : ""));
 
-        return_desc->integer.value = 0;
         return_ACPI_STATUS(AE_OK);
 }
 
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 65132f920459..69cbc57c2d1c 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -138,6 +138,29 @@ static int acpi_battery_technology(struct acpi_battery *battery)
 
 static int acpi_battery_get_state(struct acpi_battery *battery);
 
+static int acpi_battery_is_charged(struct acpi_battery *battery)
+{
+        /* either charging or discharging */
+        if (battery->state != 0)
+                return 0;
+
+        /* battery not reporting charge */
+        if (battery->capacity_now == ACPI_BATTERY_VALUE_UNKNOWN ||
+            battery->capacity_now == 0)
+                return 0;
+
+        /* good batteries update full_charge as the batteries degrade */
+        if (battery->full_charge_capacity == battery->capacity_now)
+                return 1;
+
+        /* fallback to using design values for broken batteries */
+        if (battery->design_capacity == battery->capacity_now)
+                return 1;
+
+        /* we don't do any sort of metric based on percentages */
+        return 0;
+}
+
 static int acpi_battery_get_property(struct power_supply *psy,
                                      enum power_supply_property psp,
                                      union power_supply_propval *val)
@@ -155,7 +178,7 @@ static int acpi_battery_get_property(struct power_supply *psy,
                         val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
                 else if (battery->state & 0x02)
                         val->intval = POWER_SUPPLY_STATUS_CHARGING;
-                else if (battery->state == 0)
+                else if (acpi_battery_is_charged(battery))
                         val->intval = POWER_SUPPLY_STATUS_FULL;
                 else
                         val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 17020c12623c..fe0cdf83641a 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -163,7 +163,7 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
         case ACPI_NOTIFY_BUS_CHECK:
                 /* Fall through */
         case ACPI_NOTIFY_DEVICE_CHECK:
-                printk("Container driver received %s event\n",
+                printk(KERN_WARNING "Container driver received %s event\n",
                        (type == ACPI_NOTIFY_BUS_CHECK) ?
                        "ACPI_NOTIFY_BUS_CHECK" : "ACPI_NOTIFY_DEVICE_CHECK");
                 status = acpi_bus_get_device(handle, &device);
@@ -174,7 +174,8 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
                                         kobject_uevent(&device->dev.kobj,
                                                        KOBJ_ONLINE);
                                 else
-                                        printk("Failed to add container\n");
+                                        printk(KERN_WARNING
+                                               "Failed to add container\n");
                         }
                 } else {
                         if (ACPI_SUCCESS(status)) {
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 5b30b8d91d71..35094f230b1e 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -855,10 +855,14 @@ fdd_out:
 static ssize_t show_docked(struct device *dev,
                            struct device_attribute *attr, char *buf)
 {
+        struct acpi_device *tmp;
+
         struct dock_station *dock_station = *((struct dock_station **)
                 dev->platform_data);
-        return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
 
+        if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp)))
+                return snprintf(buf, PAGE_SIZE, "1\n");
+        return snprintf(buf, PAGE_SIZE, "0\n");
 }
 static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
 
@@ -984,7 +988,7 @@ static int dock_add(acpi_handle handle)
 
         ret = device_create_file(&dock_device->dev, &dev_attr_docked);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 platform_device_unregister(dock_device);
                 kfree(dock_station);
                 dock_station = NULL;
@@ -992,7 +996,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_undock);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 platform_device_unregister(dock_device);
                 kfree(dock_station);
@@ -1001,7 +1005,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_uid);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 device_remove_file(&dock_device->dev, &dev_attr_undock);
                 platform_device_unregister(dock_device);
@@ -1011,7 +1015,7 @@ static int dock_add(acpi_handle handle)
         }
         ret = device_create_file(&dock_device->dev, &dev_attr_flags);
         if (ret) {
-                printk("Error %d adding sysfs file\n", ret);
+                printk(KERN_ERR "Error %d adding sysfs file\n", ret);
                 device_remove_file(&dock_device->dev, &dev_attr_docked);
                 device_remove_file(&dock_device->dev, &dev_attr_undock);
                 device_remove_file(&dock_device->dev, &dev_attr_uid);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index a2b82c90a683..2fe15060dcdc 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -120,6 +120,8 @@ static struct acpi_ec {
         spinlock_t curr_lock;
 } *boot_ec, *first_ec;
 
+static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */
+
 /* --------------------------------------------------------------------------
                              Transaction Management
    -------------------------------------------------------------------------- */
@@ -259,6 +261,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,
                 clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
                 acpi_disable_gpe(NULL, ec->gpe);
         }
+        if (EC_FLAGS_MSI)
+                udelay(ACPI_EC_DELAY);
         /* start transaction */
         spin_lock_irqsave(&ec->curr_lock, tmp);
         /* following two actions should be kept atomic */
@@ -967,6 +971,11 @@ int __init acpi_ec_ecdt_probe(void)
         /*
          * Generate a boot ec context
          */
+        if (dmi_name_in_vendors("Micro-Star") ||
+            dmi_name_in_vendors("Notebook")) {
+                pr_info(PREFIX "Enabling special treatment for EC from MSI.\n");
+                EC_FLAGS_MSI = 1;
+        }
         status = acpi_get_table(ACPI_SIG_ECDT, 1,
                                 (struct acpi_table_header **)&ecdt_ptr);
         if (ACPI_SUCCESS(status)) {
@@ -982,7 +991,7 @@ int __init acpi_ec_ecdt_probe(void)
                 saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
                 if (!saved_ec)
                         return -ENOMEM;
-                memcpy(&saved_ec, boot_ec, sizeof(saved_ec));
+                memcpy(saved_ec, boot_ec, sizeof(*saved_ec));
         /* fall through */
         }
         /* This workaround is needed only on some broken machines,
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index adec3d15810a..5479b9f42513 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -255,12 +255,12 @@ static int acpi_platform_notify(struct device *dev)
         }
         type = acpi_get_bus_type(dev->bus);
         if (!type) {
-                DBG("No ACPI bus support for %s\n", dev->bus_id);
+                DBG("No ACPI bus support for %s\n", dev_name(dev));
                 ret = -EINVAL;
                 goto end;
         }
         if ((ret = type->find_device(dev, &handle)) != 0)
-                DBG("Can't get handler for %s\n", dev->bus_id);
+                DBG("Can't get handler for %s\n", dev_name(dev));
       end:
         if (!ret)
                 acpi_bind_one(dev, handle);
@@ -271,10 +271,10 @@ static int acpi_platform_notify(struct device *dev)
 
                 acpi_get_name(dev->archdata.acpi_handle,
                               ACPI_FULL_PATHNAME, &buffer);
-                DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
+                DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
                 kfree(buffer.pointer);
         } else
-                DBG("Device %s -> No ACPI support\n", dev->bus_id);
+                DBG("Device %s -> No ACPI support\n", dev_name(dev));
 #endif
 
         return ret;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6729a4992f2b..b3193ec0a2ef 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -228,10 +228,10 @@ void acpi_os_vprintf(const char *fmt, va_list args)
         if (acpi_in_debugger) {
                 kdb_printf("%s", buffer);
         } else {
-                printk("%s", buffer);
+                printk(KERN_CONT "%s", buffer);
         }
 #else
-        printk("%s", buffer);
+        printk(KERN_CONT "%s", buffer);
 #endif
 }
 
@@ -1317,6 +1317,54 @@ acpi_os_validate_interface (char *interface)
         return AE_SUPPORT;
 }
 
+#ifdef  CONFIG_X86
+
+struct aml_port_desc {
+        uint    start;
+        uint    end;
+        char*   name;
+        char    warned;
+};
+
+static struct aml_port_desc aml_invalid_port_list[] = {
+        {0x20, 0x21, "PIC0", 0},
+        {0xA0, 0xA1, "PIC1", 0},
+        {0x4D0, 0x4D1, "ELCR", 0}
+};
+
+/*
+ * valid_aml_io_address()
+ *
+ * if valid, return true
+ * else invalid, warn once, return false
+ */
+static bool valid_aml_io_address(uint address, uint length)
+{
+        int i;
+        int entries = sizeof(aml_invalid_port_list) / sizeof(struct aml_port_desc);
+
+        for (i = 0; i < entries; ++i) {
+                if ((address >= aml_invalid_port_list[i].start &&
+                        address <= aml_invalid_port_list[i].end) ||
+                        (address + length >= aml_invalid_port_list[i].start &&
+                        address  + length <= aml_invalid_port_list[i].end))
+                {
+                        if (!aml_invalid_port_list[i].warned)
+                        {
+                                printk(KERN_ERR "ACPI: Denied BIOS AML access"
+                                        " to invalid port 0x%x+0x%x (%s)\n",
+                                        address, length,
+                                        aml_invalid_port_list[i].name);
+                                aml_invalid_port_list[i].warned = 1;
+                        }
+                        return false;   /* invalid */
+                }
+        }
+        return true;    /* valid */
+}
+#else
+static inline bool valid_aml_io_address(uint address, uint length) { return true; }
+#endif
 /******************************************************************************
  *
  * FUNCTION:    acpi_os_validate_address
@@ -1346,6 +1394,8 @@ acpi_os_validate_address (
 
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
+                if (!valid_aml_io_address(address, length))
+                        return AE_AML_ILLEGAL_ADDRESS;
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
                 /* Only interference checks against SystemIO and SytemMemory
                    are needed */
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 1c6e73c7865e..6c772ca76bd1 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -593,7 +593,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
                 return -ENODEV;
         } else {
                 acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;
-                printk(PREFIX "%s [%s] enabled at IRQ %d\n",
+                printk(KERN_WARNING PREFIX "%s [%s] enabled at IRQ %d\n",
                        acpi_device_name(link->device),
                        acpi_device_bid(link->device), link->irq.active);
         }
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 66a9d8145562..7bc22a471fe3 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -66,43 +66,17 @@ ACPI_MODULE_NAME("processor_idle");
 #define ACPI_PROCESSOR_FILE_POWER       "power"
 #define US_TO_PM_TIMER_TICKS(t)         ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
 #define PM_TIMER_TICK_NS                (1000000000ULL/PM_TIMER_FREQUENCY)
-#ifndef CONFIG_CPU_IDLE
-#define C2_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
-#define C3_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
-static void (*pm_idle_save) (void) __read_mostly;
-#else
 #define C2_OVERHEAD                     1       /* 1us */
 #define C3_OVERHEAD                     1       /* 1us */
-#endif
 #define PM_TIMER_TICKS_TO_US(p)         (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
 
 static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
-#ifdef CONFIG_CPU_IDLE
 module_param(max_cstate, uint, 0000);
-#else
-module_param(max_cstate, uint, 0644);
-#endif
 static unsigned int nocst __read_mostly;
 module_param(nocst, uint, 0000);
 
-#ifndef CONFIG_CPU_IDLE
-/*
- * bm_history -- bit-mask with a bit per jiffy of bus-master activity
- * 1000 HZ: 0xFFFFFFFF: 32 jiffies = 32ms
- * 800 HZ: 0xFFFFFFFF: 32 jiffies = 40ms
- * 100 HZ: 0x0000000F: 4 jiffies = 40ms
- * reduce history for more aggressive entry into C3
- */
-static unsigned int bm_history __read_mostly =
-    (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
-module_param(bm_history, uint, 0644);
-
-static int acpi_processor_set_power_policy(struct acpi_processor *pr);
-
-#else   /* CONFIG_CPU_IDLE */
 static unsigned int latency_factor __read_mostly = 2;
 module_param(latency_factor, uint, 0644);
-#endif
 
 /*
  * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
@@ -224,71 +198,6 @@ static void acpi_safe_halt(void)
         current_thread_info()->status |= TS_POLLING;
 }
 
-#ifndef CONFIG_CPU_IDLE
-
-static void
-acpi_processor_power_activate(struct acpi_processor *pr,
-                              struct acpi_processor_cx *new)
-{
-        struct acpi_processor_cx *old;
-
-        if (!pr || !new)
-                return;
-
-        old = pr->power.state;
-
-        if (old)
-                old->promotion.count = 0;
-        new->demotion.count = 0;
-
-        /* Cleanup from old state. */
-        if (old) {
-                switch (old->type) {
-                case ACPI_STATE_C3:
-                        /* Disable bus master reload */
-                        if (new->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                        break;
-                }
-        }
-
-        /* Prepare to use new state. */
-        switch (new->type) {
-        case ACPI_STATE_C3:
-                /* Enable bus master reload */
-                if (old->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
-                break;
-        }
-
-        pr->power.state = new;
-
-        return;
-}
-
-static atomic_t c3_cpu_count;
-
-/* Common C-state entry for C2, C3, .. */
-static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
-{
-        /* Don't trace irqs off for idle */
-        stop_critical_timings();
-        if (cstate->entry_method == ACPI_CSTATE_FFH) {
-                /* Call into architectural FFH based C-state */
-                acpi_processor_ffh_cstate_enter(cstate);
-        } else {
-                int unused;
-                /* IO port based C-state */
-                inb(cstate->address);
-                /* Dummy wait op - must do something useless after P_LVL2 read
-                   because chipsets cannot guarantee that STPCLK# signal
-                   gets asserted in time to freeze execution properly. */
-                unused = inl(acpi_gbl_FADT.xpm_timer_block.address);
-        }
-        start_critical_timings();
-}
-#endif /* !CONFIG_CPU_IDLE */
-
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
 
 /*
@@ -390,421 +299,6 @@ static int tsc_halts_in_c(int state)
 }
 #endif
 
-#ifndef CONFIG_CPU_IDLE
-static void acpi_processor_idle(void)
-{
-        struct acpi_processor *pr = NULL;
-        struct acpi_processor_cx *cx = NULL;
-        struct acpi_processor_cx *next_state = NULL;
-        int sleep_ticks = 0;
-        u32 t1, t2 = 0;
-
-        /*
-         * Interrupts must be disabled during bus mastering calculations and
-         * for C2/C3 transitions.
-         */
-        local_irq_disable();
-
-        pr = __get_cpu_var(processors);
-        if (!pr) {
-                local_irq_enable();
-                return;
-        }
-
-        /*
-         * Check whether we truly need to go idle, or should
-         * reschedule:
-         */
-        if (unlikely(need_resched())) {
-                local_irq_enable();
-                return;
-        }
-
-        cx = pr->power.state;
-        if (!cx || acpi_idle_suspend) {
-                if (pm_idle_save) {
-                        pm_idle_save(); /* enables IRQs */
-                } else {
-                        acpi_safe_halt();
-                        local_irq_enable();
-                }
-
-                return;
-        }
-
-        /*
-         * Check BM Activity
-         * -----------------
-         * Check for bus mastering activity (if required), record, and check
-         * for demotion.
-         */
-        if (pr->flags.bm_check) {
-                u32 bm_status = 0;
-                unsigned long diff = jiffies - pr->power.bm_check_timestamp;
-
-                if (diff > 31)
-                        diff = 31;
-
-                pr->power.bm_activity <<= diff;
-
-                acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
-                if (bm_status) {
-                        pr->power.bm_activity |= 0x1;
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
-                }
-                /*
-                 * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
-                 * the true state of bus mastering activity; forcing us to
-                 * manually check the BMIDEA bit of each IDE channel.
-                 */
-                else if (errata.piix4.bmisx) {
-                        if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
-                            || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
-                                pr->power.bm_activity |= 0x1;
-                }
-
-                pr->power.bm_check_timestamp = jiffies;
-
-                /*
-                 * If bus mastering is or was active this jiffy, demote
-                 * to avoid a faulty transition.  Note that the processor
-                 * won't enter a low-power state during this call (to this
-                 * function) but should upon the next.
-                 *
-                 * TBD: A better policy might be to fallback to the demotion
-                 *      state (use it for this quantum only) istead of
-                 *      demoting -- and rely on duration as our sole demotion
-                 *      qualification.  This may, however, introduce DMA
-                 *      issues (e.g. floppy DMA transfer overrun/underrun).
-                 */
-                if ((pr->power.bm_activity & 0x1) &&
-                    cx->demotion.threshold.bm) {
-                        local_irq_enable();
-                        next_state = cx->demotion.state;
-                        goto end;
-                }
-        }
-
-#ifdef CONFIG_HOTPLUG_CPU
-        /*
-         * Check for P_LVL2_UP flag before entering C2 and above on
-         * an SMP system. We do it here instead of doing it at _CST/P_LVL
-         * detection phase, to work cleanly with logical CPU hotplug.
-         */
-        if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED))
-                cx = &pr->power.states[ACPI_STATE_C1];
-#endif
-
-        /*
-         * Sleep:
-         * ------
-         * Invoke the current Cx state to put the processor to sleep.
-         */
-        if (cx->type == ACPI_STATE_C2 || cx->type == ACPI_STATE_C3) {
-                current_thread_info()->status &= ~TS_POLLING;
-                /*
-                 * TS_POLLING-cleared state must be visible before we
-                 * test NEED_RESCHED:
-                 */
-                smp_mb();
-                if (need_resched()) {
-                        current_thread_info()->status |= TS_POLLING;
-                        local_irq_enable();
-                        return;
-                }
-        }
-
-        switch (cx->type) {
-
-        case ACPI_STATE_C1:
-                /*
-                 * Invoke C1.
-                 * Use the appropriate idle routine, the one that would
-                 * be used without acpi C-states.
-                 */
-                if (pm_idle_save) {
-                        pm_idle_save(); /* enables IRQs */
-                } else {
-                        acpi_safe_halt();
-                        local_irq_enable();
-                }
-
-                /*
-                 * TBD: Can't get time duration while in C1, as resumes
-                 *      go to an ISR rather than here.  Need to instrument
-                 *      base interrupt handler.
-                 *
-                 * Note: the TSC better not stop in C1, sched_clock() will
-                 *       skew otherwise.
-                 */
-                sleep_ticks = 0xFFFFFFFF;
-
-                break;
-
-        case ACPI_STATE_C2:
-                /* Get start time (ticks) */
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                /* Tell the scheduler that we are going deep-idle: */
-                sched_clock_idle_sleep_event();
-                /* Invoke C2 */
-                acpi_state_timer_broadcast(pr, cx, 1);
-                acpi_cstate_enter(cx);
-                /* Get end time (ticks) */
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-                /* TSC halts in C2, so notify users */
-                if (tsc_halts_in_c(ACPI_STATE_C2))
-                        mark_tsc_unstable("possible TSC halt in C2");
-#endif
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2);
-
-                /* Tell the scheduler how much we idled: */
-                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
-
-                /* Re-enable interrupts */
-                local_irq_enable();
-                /* Do not account our idle-switching overhead: */
-                sleep_ticks -= cx->latency_ticks + C2_OVERHEAD;
-
-                current_thread_info()->status |= TS_POLLING;
-                acpi_state_timer_broadcast(pr, cx, 0);
-                break;
-
-        case ACPI_STATE_C3:
-                acpi_unlazy_tlb(smp_processor_id());
-                /*
-                 * Must be done before busmaster disable as we might
-                 * need to access HPET !
-                 */
-                acpi_state_timer_broadcast(pr, cx, 1);
-                /*
-                 * disable bus master
-                 * bm_check implies we need ARB_DIS
-                 * !bm_check implies we need cache flush
-                 * bm_control implies whether we can do ARB_DIS
-                 *
-                 * That leaves a case where bm_check is set and bm_control is
-                 * not set. In that case we cannot do much, we enter C3
-                 * without doing anything.
-                 */
-                if (pr->flags.bm_check && pr->flags.bm_control) {
-                        if (atomic_inc_return(&c3_cpu_count) ==
-                            num_online_cpus()) {
-                                /*
-                                 * All CPUs are trying to go to C3
-                                 * Disable bus master arbitration
-                                 */
-                                acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
-                        }
-                } else if (!pr->flags.bm_check) {
-                        /* SMP with no shared cache... Invalidate cache  */
-                        ACPI_FLUSH_CPU_CACHE();
-                }
-
-                /* Get start time (ticks) */
-                t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                /* Invoke C3 */
-                /* Tell the scheduler that we are going deep-idle: */
-                sched_clock_idle_sleep_event();
-                acpi_cstate_enter(cx);
-                /* Get end time (ticks) */
-                t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                if (pr->flags.bm_check && pr->flags.bm_control) {
-                        /* Enable bus master arbitration */
-                        atomic_dec(&c3_cpu_count);
-                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
-                }
-
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
-                /* TSC halts in C3, so notify users */
-                if (tsc_halts_in_c(ACPI_STATE_C3))
-                        mark_tsc_unstable("TSC halts in C3");
-#endif
-                /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2);
-                /* Tell the scheduler how much we idled: */
-                sched_clock_idle_wakeup_event(sleep_ticks*PM_TIMER_TICK_NS);
-
-                /* Re-enable interrupts */
-                local_irq_enable();
-                /* Do not account our idle-switching overhead: */
-                sleep_ticks -= cx->latency_ticks + C3_OVERHEAD;
-
-                current_thread_info()->status |= TS_POLLING;
-                acpi_state_timer_broadcast(pr, cx, 0);
-                break;
-
-        default:
-                local_irq_enable();
-                return;
-        }
-        cx->usage++;
-        if ((cx->type != ACPI_STATE_C1) && (sleep_ticks > 0))
-                cx->time += sleep_ticks;
-
-        next_state = pr->power.state;
-
-#ifdef CONFIG_HOTPLUG_CPU
-        /* Don't do promotion/demotion */
-        if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-            !pr->flags.has_cst && !(acpi_gbl_FADT.flags & ACPI_FADT_C2_MP_SUPPORTED)) {
-                next_state = cx;
-                goto end;
-        }
-#endif
-
-        /*
-         * Promotion?
-         * ----------
-         * Track the number of longs (time asleep is greater than threshold)
-         * and promote when the count threshold is reached.  Note that bus
-         * mastering activity may prevent promotions.
-         * Do not promote above max_cstate.
-         */
-        if (cx->promotion.state &&
-            ((cx->promotion.state - pr->power.states) <= max_cstate)) {
-                if (sleep_ticks > cx->promotion.threshold.ticks &&
-                  cx->promotion.state->latency <=
-                                pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
-                        cx->promotion.count++;
-                        cx->demotion.count = 0;
-                        if (cx->promotion.count >=
-                            cx->promotion.threshold.count) {
-                                if (pr->flags.bm_check) {
-                                        if (!
-                                            (pr->power.bm_activity & cx->
-                                             promotion.threshold.bm)) {
-                                                next_state =
-                                                    cx->promotion.state;
-                                                goto end;
-                                        }
-                                } else {
-                                        next_state = cx->promotion.state;
-                                        goto end;
-                                }
-                        }
-                }
-        }
-
-        /*
-         * Demotion?
-         * ---------
-         * Track the number of shorts (time asleep is less than time threshold)
-         * and demote when the usage threshold is reached.
-         */
-        if (cx->demotion.state) {
-                if (sleep_ticks < cx->demotion.threshold.ticks) {
-                        cx->demotion.count++;
-                        cx->promotion.count = 0;
-                        if (cx->demotion.count >= cx->demotion.threshold.count) {
-                                next_state = cx->demotion.state;
-                                goto end;
-                        }
-                }
-        }
-
-      end:
-        /*
-         * Demote if current state exceeds max_cstate
-         * or if the latency of the current state is unacceptable
-         */
-        if ((pr->power.state - pr->power.states) > max_cstate ||
-                pr->power.state->latency >
-                                pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)) {
-                if (cx->demotion.state)
-                        next_state = cx->demotion.state;
-        }
-
-        /*
-         * New Cx State?
-         * -------------
-         * If we're going to start using a new Cx state we must clean up
-         * from the previous and prepare to use the new.
-         */
-        if (next_state != pr->power.state)
-                acpi_processor_power_activate(pr, next_state);
-}
-
-static int acpi_processor_set_power_policy(struct acpi_processor *pr)
-{
-        unsigned int i;
-        unsigned int state_is_set = 0;
-        struct acpi_processor_cx *lower = NULL;
-        struct acpi_processor_cx *higher = NULL;
-        struct acpi_processor_cx *cx;
-
-
-        if (!pr)
-                return -EINVAL;
-
-        /*
-         * This function sets the default Cx state policy (OS idle handler).
-         * Our scheme is to promote quickly to C2 but more conservatively
-         * to C3.  We're favoring C2  for its characteristics of low latency
-         * (quick response), good power savings, and ability to allow bus
-         * mastering activity.  Note that the Cx state policy is completely
-         * customizable and can be altered dynamically.
-         */
-
-        /* startup state */
-        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (!state_is_set)
-                        pr->power.state = cx;
-                state_is_set++;
-                break;
-        }
-
-        if (!state_is_set)
-                return -ENODEV;
-
-        /* demotion */
-        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (lower) {
-                        cx->demotion.state = lower;
-                        cx->demotion.threshold.ticks = cx->latency_ticks;
-                        cx->demotion.threshold.count = 1;
-                        if (cx->type == ACPI_STATE_C3)
-                                cx->demotion.threshold.bm = bm_history;
-                }
-
-                lower = cx;
-        }
-
-        /* promotion */
-        for (i = (ACPI_PROCESSOR_MAX_POWER - 1); i > 0; i--) {
-                cx = &pr->power.states[i];
-                if (!cx->valid)
-                        continue;
-
-                if (higher) {
-                        cx->promotion.state = higher;
-                        cx->promotion.threshold.ticks = cx->latency_ticks;
-                        if (cx->type >= ACPI_STATE_C2)
-                                cx->promotion.threshold.count = 4;
-                        else
-                                cx->promotion.threshold.count = 10;
-                        if (higher->type == ACPI_STATE_C3)
-                                cx->promotion.threshold.bm = bm_history;
-                }
-
-                higher = cx;
-        }
-
-        return 0;
-}
-#endif /* !CONFIG_CPU_IDLE */
-
 static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 {
 
@@ -1047,11 +541,7 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
          */
         cx->valid = 1;
 
-#ifndef CONFIG_CPU_IDLE
-        cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
-#else
         cx->latency_ticks = cx->latency;
-#endif
 
         return;
 }
@@ -1121,7 +611,6 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
                                           " for C3 to be enabled on SMP systems\n"));
                         return;
                 }
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
         }
 
         /*
@@ -1132,11 +621,16 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
          */
         cx->valid = 1;
 
-#ifndef CONFIG_CPU_IDLE
-        cx->latency_ticks = US_TO_PM_TIMER_TICKS(cx->latency);
-#else
         cx->latency_ticks = cx->latency;
-#endif
+        /*
+         * On older chipsets, BM_RLD needs to be set
+         * in order for Bus Master activity to wake the
+         * system from C3.  Newer chipsets handle DMA
+         * during C3 automatically and BM_RLD is a NOP.
+         * In either case, the proper way to
+         * handle BM_RLD is to set it and leave it set.
+         */
+        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
 
         return;
 }
@@ -1201,20 +695,6 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
 
         pr->power.count = acpi_processor_power_verify(pr);
 
-#ifndef CONFIG_CPU_IDLE
-        /*
-         * Set Default Policy
-         * ------------------
-         * Now that we know which states are supported, set the default
-         * policy.  Note that this policy can be changed dynamically
-         * (e.g. encourage deeper sleeps to conserve battery life when
-         * not on AC).
-         */
-        result = acpi_processor_set_power_policy(pr);
-        if (result)
-                return result;
-#endif
-
         /*
          * if one state of type C2 or C3 is available, mark this
          * CPU as being "idle manageable"
@@ -1312,69 +792,6 @@ static const struct file_operations acpi_processor_power_fops = {
         .release = single_release,
 };
 
-#ifndef CONFIG_CPU_IDLE
-
-int acpi_processor_cst_has_changed(struct acpi_processor *pr)
-{
-        int result = 0;
-
-        if (boot_option_idle_override)
-                return 0;
-
-        if (!pr)
-                return -EINVAL;
-
-        if (nocst) {
-                return -ENODEV;
-        }
-
-        if (!pr->flags.power_setup_done)
-                return -ENODEV;
-
-        /*
-         * Fall back to the default idle loop, when pm_idle_save had
-         * been initialized.
-         */
-        if (pm_idle_save) {
-                pm_idle = pm_idle_save;
-                /* Relies on interrupts forcing exit from idle. */
-                synchronize_sched();
-        }
-
-        pr->flags.power = 0;
-        result = acpi_processor_get_power_info(pr);
-        if ((pr->flags.power == 1) && (pr->flags.power_setup_done))
-                pm_idle = acpi_processor_idle;
-
-        return result;
-}
-
-#ifdef CONFIG_SMP
-static void smp_callback(void *v)
-{
-        /* we already woke the CPU up, nothing more to do */
-}
-
-/*
- * This function gets called when a part of the kernel has a new latency
- * requirement.  This means we need to get all processors out of their C-state,
- * and then recalculate a new suitable C-state. Just do a cross-cpu IPI; that
- * wakes them all right up.
- */
-static int acpi_processor_latency_notify(struct notifier_block *b,
-                unsigned long l, void *v)
-{
-        smp_call_function(smp_callback, NULL, 1);
-        return NOTIFY_OK;
-}
-
-static struct notifier_block acpi_processor_latency_notifier = {
-        .notifier_call = acpi_processor_latency_notify,
-};
-
-#endif
-
-#else /* CONFIG_CPU_IDLE */
 
 /**
  * acpi_idle_bm_check - checks if bus master activity was detected
@@ -1383,7 +800,7 @@ static int acpi_idle_bm_check(void)
 {
         u32 bm_status = 0;
 
-        acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
+        acpi_get_register_unlocked(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
         if (bm_status)
                 acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
         /*
@@ -1400,25 +817,6 @@ static int acpi_idle_bm_check(void)
 }
 
 /**
- * acpi_idle_update_bm_rld - updates the BM_RLD bit depending on target state
- * @pr: the processor
- * @target: the new target state
- */
-static inline void acpi_idle_update_bm_rld(struct acpi_processor *pr,
-                                           struct acpi_processor_cx *target)
-{
-        if (pr->flags.bm_rld_set && target->type != ACPI_STATE_C3) {
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                pr->flags.bm_rld_set = 0;
-        }
-
-        if (!pr->flags.bm_rld_set && target->type == ACPI_STATE_C3) {
-                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
-                pr->flags.bm_rld_set = 1;
-        }
-}
-
-/**
  * acpi_idle_do_entry - a helper function that does C2 and C3 type entry
  * @cx: cstate data
  *
@@ -1473,9 +871,6 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
                 return 0;
         }
 
-        if (pr->flags.bm_check)
-                acpi_idle_update_bm_rld(pr, cx);
-
         t1 = inl(acpi_gbl_FADT.xpm_timer_block.address);
         acpi_idle_do_entry(cx);
         t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
@@ -1527,9 +922,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
-        if (pr->flags.bm_check)
-                acpi_idle_update_bm_rld(pr, cx);
-
         if (cx->type == ACPI_STATE_C3)
                 ACPI_FLUSH_CPU_CACHE();
 
@@ -1621,8 +1013,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
          */
         acpi_state_timer_broadcast(pr, cx, 1);
 
-        acpi_idle_update_bm_rld(pr, cx);
-
         /*
          * disable bus master
          * bm_check implies we need ARB_DIS
@@ -1795,8 +1185,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
         return ret;
 }
 
-#endif /* CONFIG_CPU_IDLE */
-
 int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                               struct acpi_device *device)
 {
@@ -1825,10 +1213,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                "ACPI: processor limited to max C-state %d\n",
                                max_cstate);
                 first_run++;
-#if !defined(CONFIG_CPU_IDLE) && defined(CONFIG_SMP)
-                pm_qos_add_notifier(PM_QOS_CPU_DMA_LATENCY,
-                                &acpi_processor_latency_notifier);
-#endif
         }
 
         if (!pr)
@@ -1852,11 +1236,9 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
          * platforms that only support C1.
          */
         if (pr->flags.power) {
-#ifdef CONFIG_CPU_IDLE
                 acpi_processor_setup_cpuidle(pr);
                 if (cpuidle_register_device(&pr->power.dev))
                         return -EIO;
-#endif
 
                 printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
                 for (i = 1; i <= pr->power.count; i++)
@@ -1864,13 +1246,6 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr,
                                 printk(" C%d[C%d]", i,
                                        pr->power.states[i].type);
                 printk(")\n");
-
-#ifndef CONFIG_CPU_IDLE
-                if (pr->id == 0) {
-                        pm_idle_save = pm_idle;
-                        pm_idle = acpi_processor_idle;
-                }
-#endif
         }
 
         /* 'power' [R] */
@@ -1889,34 +1264,12 @@ int acpi_processor_power_exit(struct acpi_processor *pr,
         if (boot_option_idle_override)
                 return 0;
 
-#ifdef CONFIG_CPU_IDLE
         cpuidle_unregister_device(&pr->power.dev);
-#endif
         pr->flags.power_setup_done = 0;
 
         if (acpi_device_dir(device))
                 remove_proc_entry(ACPI_PROCESSOR_FILE_POWER,
                                   acpi_device_dir(device));
 
-#ifndef CONFIG_CPU_IDLE
-
-        /* Unregister the idle handler when processor #0 is removed. */
-        if (pr->id == 0) {
-                if (pm_idle_save)
-                        pm_idle = pm_idle_save;
-
-                /*
-                 * We are about to unload the current idle thread pm callback
-                 * (pm_idle), Wait for all processors to update cached/local
-                 * copies of pm_idle before proceeding.
-                 */
-                cpu_idle_wait();
-#ifdef CONFIG_SMP
-                pm_qos_remove_notifier(PM_QOS_CPU_DMA_LATENCY,
-                                &acpi_processor_latency_notifier);
-#endif
-        }
-#endif
-
         return 0;
 }
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 846e227592d4..9cc769b587ff 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -31,14 +31,6 @@
 #include <linux/init.h>
 #include <linux/cpufreq.h>
 
-#ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/mutex.h>
-
-#include <asm/uaccess.h>
-#endif
-
 #ifdef CONFIG_X86
 #include <asm/cpufeature.h>
 #endif
@@ -434,96 +426,6 @@ int acpi_processor_notify_smm(struct module *calling_module)
 
 EXPORT_SYMBOL(acpi_processor_notify_smm);
 
-#ifdef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
-/* /proc/acpi/processor/../performance interface (DEPRECATED) */
-
-static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file);
-static struct file_operations acpi_processor_perf_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_processor_perf_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
-{
-        struct acpi_processor *pr = seq->private;
-        int i;
-
-
-        if (!pr)
-                goto end;
-
-        if (!pr->performance) {
-                seq_puts(seq, "<not supported>\n");
-                goto end;
-        }
-
-        seq_printf(seq, "state count:             %d\n"
-                   "active state:            P%d\n",
-                   pr->performance->state_count, pr->performance->state);
-
-        seq_puts(seq, "states:\n");
-        for (i = 0; i < pr->performance->state_count; i++)
-                seq_printf(seq,
-                           "   %cP%d:                  %d MHz, %d mW, %d uS\n",
-                           (i == pr->performance->state ? '*' : ' '), i,
-                           (u32) pr->performance->states[i].core_frequency,
-                           (u32) pr->performance->states[i].power,
-                           (u32) pr->performance->states[i].transition_latency);
-
-      end:
-        return 0;
-}
-
-static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_processor_perf_seq_show,
-                           PDE(inode)->data);
-}
-
-static void acpi_cpufreq_add_file(struct acpi_processor *pr)
-{
-        struct acpi_device *device = NULL;
-
-
-        if (acpi_bus_get_device(pr->handle, &device))
-                return;
-
-        /* add file 'performance' [R/W] */
-        proc_create_data(ACPI_PROCESSOR_FILE_PERFORMANCE, S_IFREG | S_IRUGO,
-                         acpi_device_dir(device),
-                         &acpi_processor_perf_fops, acpi_driver_data(device));
-        return;
-}
-
-static void acpi_cpufreq_remove_file(struct acpi_processor *pr)
-{
-        struct acpi_device *device = NULL;
-
-
-        if (acpi_bus_get_device(pr->handle, &device))
-                return;
-
-        /* remove file 'performance' */
-        remove_proc_entry(ACPI_PROCESSOR_FILE_PERFORMANCE,
-                          acpi_device_dir(device));
-
-        return;
-}
-
-#else
-static void acpi_cpufreq_add_file(struct acpi_processor *pr)
-{
-        return;
-}
-static void acpi_cpufreq_remove_file(struct acpi_processor *pr)
-{
-        return;
-}
-#endif                          /* CONFIG_X86_ACPI_CPUFREQ_PROC_INTF */
-
 static int acpi_processor_get_psd(struct acpi_processor *pr)
 {
         int result = 0;
@@ -747,14 +649,12 @@ err_ret:
 }
 EXPORT_SYMBOL(acpi_processor_preregister_performance);
 
-
 int
 acpi_processor_register_performance(struct acpi_processor_performance
                                     *performance, unsigned int cpu)
 {
         struct acpi_processor *pr;
 
-
         if (!(acpi_processor_ppc_status & PPC_REGISTERED))
                 return -EINVAL;
 
@@ -781,8 +681,6 @@ acpi_processor_register_performance(struct acpi_processor_performance
                 return -EIO;
         }
 
-        acpi_cpufreq_add_file(pr);
-
         mutex_unlock(&performance_mutex);
         return 0;
 }
@@ -795,7 +693,6 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
 {
         struct acpi_processor *pr;
 
-
         mutex_lock(&performance_mutex);
 
         pr = per_cpu(processors, cpu);
@@ -808,8 +705,6 @@ acpi_processor_unregister_performance(struct acpi_processor_performance
                 kfree(pr->performance->states);
         pr->performance = NULL;
 
-        acpi_cpufreq_remove_file(pr);
-
         mutex_unlock(&performance_mutex);
 
         return;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 7e3c609cbef2..519266654f06 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -90,31 +90,6 @@ void __init acpi_old_suspend_ordering(void)
         old_suspend_ordering = true;
 }
 
-/*
- * According to the ACPI specification the BIOS should make sure that ACPI is
- * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states.  Still,
- * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI
- * on such systems during resume.  Unfortunately that doesn't help in
- * particularly pathological cases in which SCI_EN has to be set directly on
- * resume, although the specification states very clearly that this flag is
- * owned by the hardware.  The set_sci_en_on_resume variable will be set in such
- * cases.
- */
-static bool set_sci_en_on_resume;
-/*
- * The ACPI specification wants us to save NVS memory regions during hibernation
- * and to restore them during the subsequent resume.  However, it is not certain
- * if this mechanism is going to work on all machines, so we allow the user to
- * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
- * option.
- */
-static bool s4_no_nvs;
-
-void __init acpi_s4_no_nvs(void)
-{
-        s4_no_nvs = true;
-}
-
 /**
  *      acpi_pm_disable_gpes - Disable the GPEs.
  */
@@ -193,6 +168,18 @@ static void acpi_pm_end(void)
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND
+/*
+ * According to the ACPI specification the BIOS should make sure that ACPI is
+ * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states.  Still,
+ * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI
+ * on such systems during resume.  Unfortunately that doesn't help in
+ * particularly pathological cases in which SCI_EN has to be set directly on
+ * resume, although the specification states very clearly that this flag is
+ * owned by the hardware.  The set_sci_en_on_resume variable will be set in such
+ * cases.
+ */
+static bool set_sci_en_on_resume;
+
 extern void do_suspend_lowlevel(void);
 
 static u32 acpi_suspend_states[] = {
@@ -396,6 +383,20 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #endif /* CONFIG_SUSPEND */
 
 #ifdef CONFIG_HIBERNATION
+/*
+ * The ACPI specification wants us to save NVS memory regions during hibernation
+ * and to restore them during the subsequent resume.  However, it is not certain
+ * if this mechanism is going to work on all machines, so we allow the user to
+ * disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
+ * option.
+ */
+static bool s4_no_nvs;
+
+void __init acpi_s4_no_nvs(void)
+{
+        s4_no_nvs = true;
+}
+
 static unsigned long s4_hardware_signature;
 static struct acpi_table_facs *facs;
 static bool nosigcheck;
@@ -679,7 +680,7 @@ static void acpi_power_off_prepare(void)
 static void acpi_power_off(void)
 {
         /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
-        printk("%s called\n", __func__);
+        printk(KERN_DEBUG "%s called\n", __func__);
         local_irq_disable();
         acpi_enable_wakeup_device(ACPI_STATE_S5);
         acpi_enter_sleep_state(ACPI_STATE_S5);
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 775c97a282bd..a8852952fac4 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -293,7 +293,12 @@ static void __init check_multiple_madt(void)
 
 int __init acpi_table_init(void)
 {
-        acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+        acpi_status status;
+
+        status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
+        if (ACPI_FAILURE(status))
+                return 1;
+
         check_multiple_madt();
         return 0;
 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index f261737636da..bb5ed059114a 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1020,7 +1020,7 @@ acpi_video_device_brightness_seq_show(struct seq_file *seq, void *offset)
         }
 
         seq_printf(seq, "levels: ");
-        for (i = 0; i < dev->brightness->count; i++)
+        for (i = 2; i < dev->brightness->count; i++)
                 seq_printf(seq, " %d", dev->brightness->levels[i]);
         seq_printf(seq, "\ncurrent: %d\n", dev->brightness->curr);
 
@@ -1059,7 +1059,7 @@ acpi_video_device_write_brightness(struct file *file,
                 return -EFAULT;
 
         /* validate through the list of available levels */
-        for (i = 0; i < dev->brightness->count; i++)
+        for (i = 2; i < dev->brightness->count; i++)
                 if (level == dev->brightness->levels[i]) {
                         if (ACPI_SUCCESS
                             (acpi_video_device_lcd_set_level(dev, level)))
@@ -1260,7 +1260,7 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
                         printk(KERN_WARNING PREFIX
                                "This indicates a BIOS bug. Please contact the manufacturer.\n");
                 }
-                printk("%llx\n", options);
+                printk(KERN_WARNING "%llx\n", options);
                 seq_printf(seq, "can POST: <integrated video>");
                 if (options & 2)
                         seq_printf(seq, " <PCI video>");
@@ -1712,7 +1712,7 @@ acpi_video_get_next_level(struct acpi_video_device *device,
         max = max_below = 0;
         min = min_above = 255;
         /* Find closest level to level_current */
-        for (i = 0; i < device->brightness->count; i++) {
+        for (i = 2; i < device->brightness->count; i++) {
                 l = device->brightness->levels[i];
                 if (abs(l - level_current) < abs(delta)) {
                         delta = l - level_current;
@@ -1722,7 +1722,7 @@ acpi_video_get_next_level(struct acpi_video_device *device,
         }
         /* Ajust level_current to closest available level */
         level_current += delta;
-        for (i = 0; i < device->brightness->count; i++) {
+        for (i = 2; i < device->brightness->count; i++) {
                 l = device->brightness->levels[i];
                 if (l < min)
                         min = l;
@@ -2006,6 +2006,12 @@ static int acpi_video_bus_add(struct acpi_device *device)
                         device->pnp.bus_id[3] = '0' + instance;
                 instance ++;
         }
+        /* a hack to fix the duplicate name "VGA" problem on Pa 3553 */
+        if (!strcmp(device->pnp.bus_id, "VGA")) {
+                if (instance)
+                        device->pnp.bus_id[3] = '0' + instance;
+                instance++;
+        }
 
         video->device = device;
         strcpy(acpi_device_name(device), ACPI_VIDEO_BUS_NAME);
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 77bba4c083cb..a603bbf9b1b7 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -61,9 +61,14 @@
 #define EM_MSG_LED_VALUE_ON           0x00010000
 
 static int ahci_skip_host_reset;
+static int ahci_ignore_sss;
+
 module_param_named(skip_host_reset, ahci_skip_host_reset, int, 0444);
 MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip)");
 
+module_param_named(ignore_sss, ahci_ignore_sss, int, 0444);
+MODULE_PARM_DESC(ignore_sss, "Ignore staggered spinup flag (0=don't ignore, 1=ignore)");
+
 static int ahci_enable_alpm(struct ata_port *ap,
                 enum link_pm policy);
 static void ahci_disable_alpm(struct ata_port *ap);
@@ -2692,8 +2697,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         host->iomap = pcim_iomap_table(pdev);
         host->private_data = hpriv;
 
-        if (!(hpriv->cap & HOST_CAP_SSS))
+        if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)
                 host->flags |= ATA_HOST_PARALLEL_SCAN;
+        else
+                printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");
 
         if (pi.flags & ATA_FLAG_EM)
                 ahci_reset_em(host);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 88c242856dae..9fbf0595f3d4 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -164,6 +164,11 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
 
+static bool ata_sstatus_online(u32 sstatus)
+{
+        return (sstatus & 0xf) == 0x3;
+}
+
 /**
  *      ata_link_next - link iteration helper
  *      @link: the previous link, NULL to start
@@ -1015,18 +1020,6 @@ static const char *sata_spd_string(unsigned int spd)
         return spd_str[spd - 1];
 }
 
-void ata_dev_disable(struct ata_device *dev)
-{
-        if (ata_dev_enabled(dev)) {
-                if (ata_msg_drv(dev->link->ap))
-                        ata_dev_printk(dev, KERN_WARNING, "disabled\n");
-                ata_acpi_on_disable(dev);
-                ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 |
-                                             ATA_DNXFER_QUIET);
-                dev->class++;
-        }
-}
-
 static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy)
 {
         struct ata_link *link = dev->link;
@@ -2239,6 +2232,40 @@ retry:
         return rc;
 }
 
+static int ata_do_link_spd_horkage(struct ata_device *dev)
+{
+        struct ata_link *plink = ata_dev_phys_link(dev);
+        u32 target, target_limit;
+
+        if (!sata_scr_valid(plink))
+                return 0;
+
+        if (dev->horkage & ATA_HORKAGE_1_5_GBPS)
+                target = 1;
+        else
+                return 0;
+
+        target_limit = (1 << target) - 1;
+
+        /* if already on stricter limit, no need to push further */
+        if (plink->sata_spd_limit <= target_limit)
+                return 0;
+
+        plink->sata_spd_limit = target_limit;
+
+        /* Request another EH round by returning -EAGAIN if link is
+         * going faster than the target speed.  Forward progress is
+         * guaranteed by setting sata_spd_limit to target_limit above.
+         */
+        if (plink->sata_spd > target) {
+                ata_dev_printk(dev, KERN_INFO,
+                               "applying link speed limit horkage to %s\n",
+                               sata_spd_string(target));
+                return -EAGAIN;
+        }
+        return 0;
+}
+
 static inline u8 ata_dev_knobble(struct ata_device *dev)
 {
         struct ata_port *ap = dev->link->ap;
@@ -2329,6 +2356,10 @@ int ata_dev_configure(struct ata_device *dev)
                 return 0;
         }
 
+        rc = ata_do_link_spd_horkage(dev);
+        if (rc)
+                return rc;
+
         /* let ACPI work its magic */
         rc = ata_acpi_on_devcfg(dev);
         if (rc)
@@ -2784,7 +2815,7 @@ int ata_bus_probe(struct ata_port *ap)
                         /* This is the last chance, better to slow
                          * down than lose it.
                          */
-                        sata_down_spd_limit(&ap->link);
+                        sata_down_spd_limit(&ap->link, 0);
                         ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
                 }
         }
@@ -2880,21 +2911,27 @@ void ata_port_disable(struct ata_port *ap)
 /**
  *      sata_down_spd_limit - adjust SATA spd limit downward
  *      @link: Link to adjust SATA spd limit for
+ *      @spd_limit: Additional limit
  *
  *      Adjust SATA spd limit of @link downward.  Note that this
  *      function only adjusts the limit.  The change must be applied
  *      using sata_set_spd().
  *
+ *      If @spd_limit is non-zero, the speed is limited to equal to or
+ *      lower than @spd_limit if such speed is supported.  If
+ *      @spd_limit is slower than any supported speed, only the lowest
+ *      supported speed is allowed.
+ *
  *      LOCKING:
  *      Inherited from caller.
  *
  *      RETURNS:
  *      0 on success, negative errno on failure
  */
-int sata_down_spd_limit(struct ata_link *link)
+int sata_down_spd_limit(struct ata_link *link, u32 spd_limit)
 {
         u32 sstatus, spd, mask;
-        int rc, highbit;
+        int rc, bit;
 
         if (!sata_scr_valid(link))
                 return -EOPNOTSUPP;
@@ -2903,7 +2940,7 @@ int sata_down_spd_limit(struct ata_link *link)
          * If not, use cached value in link->sata_spd.
          */
         rc = sata_scr_read(link, SCR_STATUS, &sstatus);
-        if (rc == 0)
+        if (rc == 0 && ata_sstatus_online(sstatus))
                 spd = (sstatus >> 4) & 0xf;
         else
                 spd = link->sata_spd;
@@ -2913,8 +2950,8 @@ int sata_down_spd_limit(struct ata_link *link)
                 return -EINVAL;
 
         /* unconditionally mask off the highest bit */
-        highbit = fls(mask) - 1;
-        mask &= ~(1 << highbit);
+        bit = fls(mask) - 1;
+        mask &= ~(1 << bit);
 
         /* Mask off all speeds higher than or equal to the current
          * one.  Force 1.5Gbps if current SPD is not available.
@@ -2928,6 +2965,15 @@ int sata_down_spd_limit(struct ata_link *link)
         if (!mask)
                 return -EINVAL;
 
+        if (spd_limit) {
+                if (mask & ((1 << spd_limit) - 1))
+                        mask &= (1 << spd_limit) - 1;
+                else {
+                        bit = ffs(mask) - 1;
+                        mask = 1 << bit;
+                }
+        }
+
         link->sata_spd_limit = mask;
 
         ata_link_printk(link, KERN_WARNING, "limiting SATA link speed to %s\n",
@@ -4215,6 +4261,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         /* Devices that do not need bridging limits applied */
         { "MTRON MSP-SATA*",            NULL,   ATA_HORKAGE_BRIDGE_OK, },
 
+        /* Devices which aren't very happy with higher link speeds */
+        { "WD My Book",                 NULL,   ATA_HORKAGE_1_5_GBPS, },
+
         /* End Marker */
         { }
 };
@@ -4709,8 +4758,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
 
 /**
  *      ata_qc_new - Request an available ATA command, for queueing
- *      @ap: Port associated with device @dev
- *      @dev: Device from whom we request an available command structure
+ *      @ap: target port
  *
  *      LOCKING:
  *      None.
@@ -5175,7 +5223,7 @@ bool ata_phys_link_online(struct ata_link *link)
         u32 sstatus;
 
         if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0 &&
-            (sstatus & 0xf) == 0x3)
+            ata_sstatus_online(sstatus))
                 return true;
         return false;
 }
@@ -5199,7 +5247,7 @@ bool ata_phys_link_offline(struct ata_link *link)
         u32 sstatus;
 
         if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0 &&
-            (sstatus & 0xf) != 0x3)
+            !ata_sstatus_online(sstatus))
                 return true;
         return false;
 }
@@ -5412,8 +5460,8 @@ void ata_dev_init(struct ata_device *dev)
         dev->horkage = 0;
         spin_unlock_irqrestore(ap->lock, flags);
 
-        memset((void *)dev + ATA_DEVICE_CLEAR_OFFSET, 0,
-               sizeof(*dev) - ATA_DEVICE_CLEAR_OFFSET);
+        memset((void *)dev + ATA_DEVICE_CLEAR_BEGIN, 0,
+               ATA_DEVICE_CLEAR_END - ATA_DEVICE_CLEAR_BEGIN);
         dev->pio_mask = UINT_MAX;
         dev->mwdma_mask = UINT_MAX;
         dev->udma_mask = UINT_MAX;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 8147a8386370..ce2ef0475339 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -82,6 +82,10 @@ enum {
         ATA_EH_FASTDRAIN_INTERVAL       =  3000,
 
         ATA_EH_UA_TRIES                 = 5,
+
+        /* probe speed down parameters, see ata_eh_schedule_probe() */
+        ATA_EH_PROBE_TRIAL_INTERVAL     = 60000,        /* 1 min */
+        ATA_EH_PROBE_TRIALS             = 2,
 };
 
 /* The following table determines how we sequence resets.  Each entry
@@ -1176,6 +1180,32 @@ void ata_eh_qc_retry(struct ata_queued_cmd *qc)
 }
 
 /**
+ *      ata_dev_disable - disable ATA device
+ *      @dev: ATA device to disable
+ *
+ *      Disable @dev.
+ *
+ *      Locking:
+ *      EH context.
+ */
+void ata_dev_disable(struct ata_device *dev)
+{
+        if (!ata_dev_enabled(dev))
+                return;
+
+        if (ata_msg_drv(dev->link->ap))
+                ata_dev_printk(dev, KERN_WARNING, "disabled\n");
+        ata_acpi_on_disable(dev);
+        ata_down_xfermask_limit(dev, ATA_DNXFER_FORCE_PIO0 | ATA_DNXFER_QUIET);
+        dev->class++;
+
+        /* From now till the next successful probe, ering is used to
+         * track probe failures.  Clear accumulated device error info.
+         */
+        ata_ering_clear(&dev->ering);
+}
+
+/**
  *      ata_eh_detach_dev - detach ATA device
  *      @dev: ATA device to detach
  *
@@ -1849,7 +1879,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev,
         /* speed down? */
         if (verdict & ATA_EH_SPDN_SPEED_DOWN) {
                 /* speed down SATA link speed if possible */
-                if (sata_down_spd_limit(link) == 0) {
+                if (sata_down_spd_limit(link, 0) == 0) {
                         action |= ATA_EH_RESET;
                         goto done;
                 }
@@ -2601,11 +2631,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
         }
 
         if (try == max_tries - 1) {
-                sata_down_spd_limit(link);
+                sata_down_spd_limit(link, 0);
                 if (slave)
-                        sata_down_spd_limit(slave);
+                        sata_down_spd_limit(slave, 0);
         } else if (rc == -EPIPE)
-                sata_down_spd_limit(failed_link);
+                sata_down_spd_limit(failed_link, 0);
 
         if (hardreset)
                 reset = hardreset;
@@ -2744,6 +2774,8 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
                                                      readid_flags, dev->id);
                         switch (rc) {
                         case 0:
+                                /* clear error info accumulated during probe */
+                                ata_ering_clear(&dev->ering);
                                 new_mask |= 1 << dev->devno;
                                 break;
                         case -ENOENT:
@@ -2947,9 +2979,24 @@ static int ata_eh_skip_recovery(struct ata_link *link)
         return 1;
 }
 
+static int ata_count_probe_trials_cb(struct ata_ering_entry *ent, void *void_arg)
+{
+        u64 interval = msecs_to_jiffies(ATA_EH_PROBE_TRIAL_INTERVAL);
+        u64 now = get_jiffies_64();
+        int *trials = void_arg;
+
+        if (ent->timestamp < now - min(now, interval))
+                return -1;
+
+        (*trials)++;
+        return 0;
+}
+
 static int ata_eh_schedule_probe(struct ata_device *dev)
 {
         struct ata_eh_context *ehc = &dev->link->eh_context;
+        struct ata_link *link = ata_dev_phys_link(dev);
+        int trials = 0;
 
         if (!(ehc->i.probe_mask & (1 << dev->devno)) ||
             (ehc->did_probe_mask & (1 << dev->devno)))
@@ -2962,6 +3009,25 @@ static int ata_eh_schedule_probe(struct ata_device *dev)
         ehc->saved_xfer_mode[dev->devno] = 0;
         ehc->saved_ncq_enabled &= ~(1 << dev->devno);
 
+        /* Record and count probe trials on the ering.  The specific
+         * error mask used is irrelevant.  Because a successful device
+         * detection clears the ering, this count accumulates only if
+         * there are consecutive failed probes.
+         *
+         * If the count is equal to or higher than ATA_EH_PROBE_TRIALS
+         * in the last ATA_EH_PROBE_TRIAL_INTERVAL, link speed is
+         * forced to 1.5Gbps.
+         *
+         * This is to work around cases where failed link speed
+         * negotiation results in device misdetection leading to
+         * infinite DEVXCHG or PHRDY CHG events.
+         */
+        ata_ering_record(&dev->ering, 0, AC_ERR_OTHER);
+        ata_ering_map(&dev->ering, ata_count_probe_trials_cb, &trials);
+
+        if (trials > ATA_EH_PROBE_TRIALS)
+                sata_down_spd_limit(link, 1);
+
         return 1;
 }
 
@@ -2969,7 +3035,11 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)
 {
         struct ata_eh_context *ehc = &dev->link->eh_context;
 
-        ehc->tries[dev->devno]--;
+        /* -EAGAIN from EH routine indicates retry without prejudice.
+         * The requester is responsible for ensuring forward progress.
+         */
+        if (err != -EAGAIN)
+                ehc->tries[dev->devno]--;
 
         switch (err) {
         case -ENODEV:
@@ -2979,12 +3049,13 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)
                 /* give it just one more chance */
                 ehc->tries[dev->devno] = min(ehc->tries[dev->devno], 1);
         case -EIO:
-                if (ehc->tries[dev->devno] == 1 && dev->pio_mode > XFER_PIO_0) {
+                if (ehc->tries[dev->devno] == 1) {
                         /* This is the last chance, better to slow
                          * down than lose it.
                          */
-                        sata_down_spd_limit(ata_dev_phys_link(dev));
-                        ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
+                        sata_down_spd_limit(ata_dev_phys_link(dev), 0);
+                        if (dev->pio_mode > XFER_PIO_0)
+                                ata_down_xfermask_limit(dev, ATA_DNXFER_PIO);
                 }
         }
 
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 98ca07a2db87..619f2c33950e 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -729,7 +729,7 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
                 if (tries) {
                         /* consecutive revalidation failures? speed down */
                         if (reval_failed)
-                                sata_down_spd_limit(link);
+                                sata_down_spd_limit(link, 0);
                         else
                                 reval_failed = 1;
 
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 3c4c5ae277ba..b9747fa59e54 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -415,6 +415,7 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev,
 
 /**
  *      ata_get_identity - Handler for HDIO_GET_IDENTITY ioctl
+ *      @ap: target port
  *      @sdev: SCSI device to get identify data for
  *      @arg: User buffer area for identify data
  *
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 0b299b0f8172..714cb046b594 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -773,18 +773,32 @@ unsigned int ata_sff_data_xfer32(struct ata_device *dev, unsigned char *buf,
         else
                 iowrite32_rep(data_addr, buf, words);
 
+        /* Transfer trailing bytes, if any */
         if (unlikely(slop)) {
-                __le32 pad;
+                unsigned char pad[4];
+
+                /* Point buf to the tail of buffer */
+                buf += buflen - slop;
+
+                /*
+                 * Use io*_rep() accessors here as well to avoid pointlessly
+                 * swapping bytes to and fro on the big endian machines...
+                 */
                 if (rw == READ) {
-                        pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
-                        memcpy(buf + buflen - slop, &pad, slop);
+                        if (slop < 3)
+                                ioread16_rep(data_addr, pad, 1);
+                        else
+                                ioread32_rep(data_addr, pad, 1);
+                        memcpy(buf, pad, slop);
                 } else {
-                        memcpy(&pad, buf + buflen - slop, slop);
-                        iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
+                        memcpy(pad, buf, slop);
+                        if (slop < 3)
+                                iowrite16_rep(data_addr, pad, 1);
+                        else
+                                iowrite32_rep(data_addr, pad, 1);
                 }
-                words++;
         }
-        return words << 2;
+        return (buflen + 1) & ~1;
 }
 EXPORT_SYMBOL_GPL(ata_sff_data_xfer32);
 
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index fe2839e58774..cea8014cd87e 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -79,7 +79,6 @@ extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
                            u64 block, u32 n_block, unsigned int tf_flags,
                            unsigned int tag);
 extern u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev);
-extern void ata_dev_disable(struct ata_device *dev);
 extern void ata_pio_queue_task(struct ata_port *ap, void *data,
                                unsigned long delay);
 extern void ata_port_flush_task(struct ata_port *ap);
@@ -100,7 +99,7 @@ extern int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags);
 extern int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,
                               unsigned int readid_flags);
 extern int ata_dev_configure(struct ata_device *dev);
-extern int sata_down_spd_limit(struct ata_link *link);
+extern int sata_down_spd_limit(struct ata_link *link, u32 spd_limit);
 extern int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel);
 extern void ata_sg_clean(struct ata_queued_cmd *qc);
 extern void ata_qc_free(struct ata_queued_cmd *qc);
@@ -160,6 +159,7 @@ extern void ata_scsi_error(struct Scsi_Host *host);
 extern void ata_port_wait_eh(struct ata_port *ap);
 extern void ata_eh_fastdrain_timerfn(unsigned long arg);
 extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);
+extern void ata_dev_disable(struct ata_device *dev);
 extern void ata_eh_detach_dev(struct ata_device *dev);
 extern void ata_eh_about_to_do(struct ata_link *link, struct ata_device *dev,
                                unsigned int action);
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 3080f371222c..f1b26f7c8e4d 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -12,7 +12,7 @@
  *
  * Probe code based on drivers/ide/legacy/qd65xx.c
  * Rewritten from the work of Colten Edwards <pje120@cs.usask.ca> by
- * Samuel Thibault <samuel.thibault@fnac.net>
+ * Samuel Thibault <samuel.thibault@ens-lyon.org>
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 79a6c9a0b721..ba556d3e6963 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -110,7 +110,8 @@ static const struct via_isa_bridge {
         { "vt8237s",    PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "vt8251",     PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "cx700",      PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_SATA_PATA },
-        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_NO_ENABLES},
+        { "vt6410",     PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_NO_ENABLES },
+        { "vt6415",     PCI_DEVICE_ID_VIA_6415,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_NO_ENABLES },
         { "vt8237a",    PCI_DEVICE_ID_VIA_8237A,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "vt8237",     PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
         { "vt8235",     PCI_DEVICE_ID_VIA_8235,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
@@ -593,6 +594,7 @@ static int via_reinit_one(struct pci_dev *pdev)
 #endif
 
 static const struct pci_device_id via[] = {
+        { PCI_VDEVICE(VIA, 0x0415), },
         { PCI_VDEVICE(VIA, 0x0571), },
         { PCI_VDEVICE(VIA, 0x0581), },
         { PCI_VDEVICE(VIA, 0x1571), },
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index f2d8a020ea53..4ae1a4138b47 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -663,8 +663,8 @@ static const struct pci_device_id mv_pci_tbl[] = {
         { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },
         /* RocketRAID 1720/174x have different identifiers */
         { PCI_VDEVICE(TTI, 0x1720), chip_6042 },
-        { PCI_VDEVICE(TTI, 0x1740), chip_508x },
-        { PCI_VDEVICE(TTI, 0x1742), chip_508x },
+        { PCI_VDEVICE(TTI, 0x1740), chip_6042 },
+        { PCI_VDEVICE(TTI, 0x1742), chip_6042 },
 
         { PCI_VDEVICE(MARVELL, 0x6040), chip_604x },
         { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index c49ad0e61b6f..55a8eed3f3a3 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -421,26 +421,33 @@ static struct ata_port_operations nv_generic_ops = {
         .hardreset              = ATA_OP_NULL,
 };
 
-/* OSDL bz3352 reports that nf2/3 controllers can't determine device
- * signature reliably.  Also, the following thread reports detection
- * failure on cold boot with the standard debouncing timing.
+/* nf2 is ripe with hardreset related problems.
+ *
+ * kernel bz#3352 reports nf2/3 controllers can't determine device
+ * signature reliably.  The following thread reports detection failure
+ * on cold boot with the standard debouncing timing.
  *
  * http://thread.gmane.org/gmane.linux.ide/34098
  *
- * Debounce with hotplug timing and request follow-up SRST.
+ * And bz#12176 reports that hardreset simply doesn't work on nf2.
+ * Give up on it and just don't do hardreset.
  */
 static struct ata_port_operations nv_nf2_ops = {
-        .inherits               = &nv_common_ops,
+        .inherits               = &nv_generic_ops,
         .freeze                 = nv_nf2_freeze,
         .thaw                   = nv_nf2_thaw,
-        .hardreset              = nv_noclassify_hardreset,
 };
 
-/* CK804 finally gets hardreset right */
+/* For initial probing after boot and hot plugging, hardreset mostly
+ * works fine on CK804 but curiously, reprobing on the initial port by
+ * rescanning or rmmod/insmod fails to acquire the initial D2H Reg FIS
+ * in somewhat undeterministic way.  Use noclassify hardreset.
+ */
 static struct ata_port_operations nv_ck804_ops = {
         .inherits               = &nv_common_ops,
         .freeze                 = nv_ck804_freeze,
         .thaw                   = nv_ck804_thaw,
+        .hardreset              = nv_noclassify_hardreset,
         .host_stop              = nv_ck804_host_stop,
 };
 
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 9f029595f454..d0091609e210 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -324,7 +324,7 @@ static void sil_fill_sg(struct ata_queued_cmd *qc)
 
                 prd->addr = cpu_to_le32(addr);
                 prd->flags_len = cpu_to_le32(sg_len);
-                VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", pi, addr, sg_len);
+                VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", si, addr, sg_len);
 
                 last_prd = prd;
                 prd++;
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 0a5f055dffba..9f50f1b545dc 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -88,8 +88,6 @@ extern void driver_detach(struct device_driver *drv);
 extern int driver_probe_device(struct device_driver *drv, struct device *dev);
 
 extern void sysdev_shutdown(void);
-extern int sysdev_suspend(pm_message_t state);
-extern int sysdev_resume(void);
 
 extern char *make_class_name(const char *name, struct kobject *kobj);
 
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 315bed8d5e7f..135231239103 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -18,9 +18,11 @@
  */
 
 #include <linux/device.h>
+#include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/kthread.h>
 #include <linux/wait.h>
+#include <linux/async.h>
 
 #include "base.h"
 #include "power/power.h"
@@ -168,6 +170,21 @@ int driver_probe_done(void)
 }
 
 /**
+ * wait_for_device_probe
+ * Wait for device probing to be completed.
+ *
+ * Note: this function polls at 100 msec intervals.
+ */
+int wait_for_device_probe(void)
+{
+        /* wait for the known devices to complete their probing */
+        while (driver_probe_done() != 0)
+                msleep(100);
+        async_synchronize_full();
+        return 0;
+}
+
+/**
  * driver_probe_device - attempt to bind device & driver together
  * @drv: driver to bind a device to
  * @dev: device to try to bind to the driver
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 670c9d6c1407..2d14f4ae6c01 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -333,7 +333,6 @@ static void dpm_power_up(pm_message_t state)
  */
 void device_power_up(pm_message_t state)
 {
-        sysdev_resume();
         dpm_power_up(state);
 }
 EXPORT_SYMBOL_GPL(device_power_up);
@@ -577,8 +576,6 @@ int device_power_down(pm_message_t state)
                 }
                 dev->power.status = DPM_OFF_IRQ;
         }
-        if (!error)
-                error = sysdev_suspend(state);
         if (error)
                 dpm_power_up(resume_event(state));
         return error;
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index c98c31ec2f75..b428c8c4bc64 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -303,7 +303,6 @@ void sysdev_unregister(struct sys_device * sysdev)
  *      is guaranteed by virtue of the fact that child devices are registered
  *      after their parents.
  */
-
 void sysdev_shutdown(void)
 {
         struct sysdev_class * cls;
@@ -363,7 +362,6 @@ static void __sysdev_resume(struct sys_device *dev)
  *      This is only called by the device PM core, so we let them handle
  *      all synchronization.
  */
-
 int sysdev_suspend(pm_message_t state)
 {
         struct sysdev_class * cls;
@@ -432,7 +430,7 @@ aux_driver:
         }
         return ret;
 }
-
+EXPORT_SYMBOL_GPL(sysdev_suspend);
 
 /**
  *      sysdev_resume - Bring system devices back to life.
@@ -442,7 +440,6 @@ aux_driver:
  *
  *      Note: Interrupts are disabled when called.
  */
-
 int sysdev_resume(void)
 {
         struct sysdev_class * cls;
@@ -463,7 +460,7 @@ int sysdev_resume(void)
         }
         return 0;
 }
-
+EXPORT_SYMBOL_GPL(sysdev_resume);
 
 int __init system_bus_init(void)
 {
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index c237527b1aa5..5e41e6dd657b 100644
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -18,6 +18,7 @@
 enum {
         AOECMD_ATA,
         AOECMD_CFG,
+        AOECMD_VEND_MIN = 0xf0,
 
         AOEFL_RSP = (1<<3),
         AOEFL_ERR = (1<<2),
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 30de5b1c647e..c6099ba9a4b8 100644
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -142,6 +142,8 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt,
                 aoecmd_cfg_rsp(skb);
                 break;
         default:
+                if (h->cmd >= AOECMD_VEND_MIN)
+                        break;  /* don't complain about vendor commands */
                 printk(KERN_INFO "aoe: unknown cmd %d\n", h->cmd);
         }
 exit:
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 69e1df7dfa14..4234c11c1e4c 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1730,7 +1730,7 @@ static int __init fd_test_drive_present( int drive )
 
         timeout = jiffies + 2*HZ+HZ/2;
         while (time_before(jiffies, timeout))
-                if (!(mfp.par_dt_reg & 0x20))
+                if (!(st_mfp.par_dt_reg & 0x20))
                         break;
 
         status = FDC_READ( FDCREG_STATUS );
@@ -1747,7 +1747,7 @@ static int __init fd_test_drive_present( int drive )
                 /* dummy seek command to make WP bit accessible */
                 FDC_WRITE( FDCREG_DATA, 0 );
                 FDC_WRITE( FDCREG_CMD, FDCCMD_SEEK );
-                while( mfp.par_dt_reg & 0x20 )
+                while( st_mfp.par_dt_reg & 0x20 )
                         ;
                 status = FDC_READ( FDCREG_STATUS );
         }
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 01e69383d9c0..d2cb67b61176 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3390,6 +3390,203 @@ static void free_hba(int i)
         kfree(p);
 }
 
+/* Send a message CDB to the firmware. */
+static __devinit int cciss_message(struct pci_dev *pdev, unsigned char opcode, unsigned char type)
+{
+        typedef struct {
+                CommandListHeader_struct CommandHeader;
+                RequestBlock_struct Request;
+                ErrDescriptor_struct ErrorDescriptor;
+        } Command;
+        static const size_t cmd_sz = sizeof(Command) + sizeof(ErrorInfo_struct);
+        Command *cmd;
+        dma_addr_t paddr64;
+        uint32_t paddr32, tag;
+        void __iomem *vaddr;
+        int i, err;
+
+        vaddr = ioremap_nocache(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
+        if (vaddr == NULL)
+                return -ENOMEM;
+
+        /* The Inbound Post Queue only accepts 32-bit physical addresses for the
+           CCISS commands, so they must be allocated from the lower 4GiB of
+           memory. */
+        err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+        if (err) {
+                iounmap(vaddr);
+                return -ENOMEM;
+        }
+
+        cmd = pci_alloc_consistent(pdev, cmd_sz, &paddr64);
+        if (cmd == NULL) {
+                iounmap(vaddr);
+                return -ENOMEM;
+        }
+
+        /* This must fit, because of the 32-bit consistent DMA mask.  Also,
+           although there's no guarantee, we assume that the address is at
+           least 4-byte aligned (most likely, it's page-aligned). */
+        paddr32 = paddr64;
+
+        cmd->CommandHeader.ReplyQueue = 0;
+        cmd->CommandHeader.SGList = 0;
+        cmd->CommandHeader.SGTotal = 0;
+        cmd->CommandHeader.Tag.lower = paddr32;
+        cmd->CommandHeader.Tag.upper = 0;
+        memset(&cmd->CommandHeader.LUN.LunAddrBytes, 0, 8);
+
+        cmd->Request.CDBLen = 16;
+        cmd->Request.Type.Type = TYPE_MSG;
+        cmd->Request.Type.Attribute = ATTR_HEADOFQUEUE;
+        cmd->Request.Type.Direction = XFER_NONE;
+        cmd->Request.Timeout = 0; /* Don't time out */
+        cmd->Request.CDB[0] = opcode;
+        cmd->Request.CDB[1] = type;
+        memset(&cmd->Request.CDB[2], 0, 14); /* the rest of the CDB is reserved */
+
+        cmd->ErrorDescriptor.Addr.lower = paddr32 + sizeof(Command);
+        cmd->ErrorDescriptor.Addr.upper = 0;
+        cmd->ErrorDescriptor.Len = sizeof(ErrorInfo_struct);
+
+        writel(paddr32, vaddr + SA5_REQUEST_PORT_OFFSET);
+
+        for (i = 0; i < 10; i++) {
+                tag = readl(vaddr + SA5_REPLY_PORT_OFFSET);
+                if ((tag & ~3) == paddr32)
+                        break;
+                schedule_timeout_uninterruptible(HZ);
+        }
+
+        iounmap(vaddr);
+
+        /* we leak the DMA buffer here ... no choice since the controller could
+           still complete the command. */
+        if (i == 10) {
+                printk(KERN_ERR "cciss: controller message %02x:%02x timed out\n",
+                        opcode, type);
+                return -ETIMEDOUT;
+        }
+
+        pci_free_consistent(pdev, cmd_sz, cmd, paddr64);
+
+        if (tag & 2) {
+                printk(KERN_ERR "cciss: controller message %02x:%02x failed\n",
+                        opcode, type);
+                return -EIO;
+        }
+
+        printk(KERN_INFO "cciss: controller message %02x:%02x succeeded\n",
+                opcode, type);
+        return 0;
+}
+
+#define cciss_soft_reset_controller(p) cciss_message(p, 1, 0)
+#define cciss_noop(p) cciss_message(p, 3, 0)
+
+static __devinit int cciss_reset_msi(struct pci_dev *pdev)
+{
+/* the #defines are stolen from drivers/pci/msi.h. */
+#define msi_control_reg(base)           (base + PCI_MSI_FLAGS)
+#define PCI_MSIX_FLAGS_ENABLE           (1 << 15)
+
+        int pos;
+        u16 control = 0;
+
+        pos = pci_find_capability(pdev, PCI_CAP_ID_MSI);
+        if (pos) {
+                pci_read_config_word(pdev, msi_control_reg(pos), &control);
+                if (control & PCI_MSI_FLAGS_ENABLE) {
+                        printk(KERN_INFO "cciss: resetting MSI\n");
+                        pci_write_config_word(pdev, msi_control_reg(pos), control & ~PCI_MSI_FLAGS_ENABLE);
+                }
+        }
+
+        pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);
+        if (pos) {
+                pci_read_config_word(pdev, msi_control_reg(pos), &control);
+                if (control & PCI_MSIX_FLAGS_ENABLE) {
+                        printk(KERN_INFO "cciss: resetting MSI-X\n");
+                        pci_write_config_word(pdev, msi_control_reg(pos), control & ~PCI_MSIX_FLAGS_ENABLE);
+                }
+        }
+
+        return 0;
+}
+
+/* This does a hard reset of the controller using PCI power management
+ * states. */
+static __devinit int cciss_hard_reset_controller(struct pci_dev *pdev)
+{
+        u16 pmcsr, saved_config_space[32];
+        int i, pos;
+
+        printk(KERN_INFO "cciss: using PCI PM to reset controller\n");
+
+        /* This is very nearly the same thing as
+
+           pci_save_state(pci_dev);
+           pci_set_power_state(pci_dev, PCI_D3hot);
+           pci_set_power_state(pci_dev, PCI_D0);
+           pci_restore_state(pci_dev);
+
+           but we can't use these nice canned kernel routines on
+           kexec, because they also check the MSI/MSI-X state in PCI
+           configuration space and do the wrong thing when it is
+           set/cleared.  Also, the pci_save/restore_state functions
+           violate the ordering requirements for restoring the
+           configuration space from the CCISS document (see the
+           comment below).  So we roll our own .... */
+
+        for (i = 0; i < 32; i++)
+                pci_read_config_word(pdev, 2*i, &saved_config_space[i]);
+
+        pos = pci_find_capability(pdev, PCI_CAP_ID_PM);
+        if (pos == 0) {
+                printk(KERN_ERR "cciss_reset_controller: PCI PM not supported\n");
+                return -ENODEV;
+        }
+
+        /* Quoting from the Open CISS Specification: "The Power
+         * Management Control/Status Register (CSR) controls the power
+         * state of the device.  The normal operating state is D0,
+         * CSR=00h.  The software off state is D3, CSR=03h.  To reset
+         * the controller, place the interface device in D3 then to
+         * D0, this causes a secondary PCI reset which will reset the
+         * controller." */
+
+        /* enter the D3hot power management state */
+        pci_read_config_word(pdev, pos + PCI_PM_CTRL, &pmcsr);
+        pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
+        pmcsr |= PCI_D3hot;
+        pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
+
+        schedule_timeout_uninterruptible(HZ >> 1);
+
+        /* enter the D0 power management state */
+        pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
+        pmcsr |= PCI_D0;
+        pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
+
+        schedule_timeout_uninterruptible(HZ >> 1);
+
+        /* Restore the PCI configuration space.  The Open CISS
+         * Specification says, "Restore the PCI Configuration
+         * Registers, offsets 00h through 60h. It is important to
+         * restore the command register, 16-bits at offset 04h,
+         * last. Do not restore the configuration status register,
+         * 16-bits at offset 06h."  Note that the offset is 2*i. */
+        for (i = 0; i < 32; i++) {
+                if (i == 2 || i == 3)
+                        continue;
+                pci_write_config_word(pdev, 2*i, saved_config_space[i]);
+        }
+        wmb();
+        pci_write_config_word(pdev, 4, saved_config_space[2]);
+
+        return 0;
+}
+
 /*
  *  This is it.  Find all the controllers and register them.  I really hate
  *  stealing all these major device numbers.
@@ -3404,6 +3601,24 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         int dac, return_code;
         InquiryData_struct *inq_buff = NULL;
 
+        if (reset_devices) {
+                /* Reset the controller with a PCI power-cycle */
+                if (cciss_hard_reset_controller(pdev) || cciss_reset_msi(pdev))
+                        return -ENODEV;
+
+                /* Some devices (notably the HP Smart Array 5i Controller)
+                   need a little pause here */
+                schedule_timeout_uninterruptible(30*HZ);
+
+                /* Now try to get the controller to respond to a no-op */
+                for (i=0; i<12; i++) {
+                        if (cciss_noop(pdev) == 0)
+                                break;
+                        else
+                                printk("cciss: no-op failed%s\n", (i < 11 ? "; re-trying" : ""));
+                }
+        }
+
         i = alloc_cciss_hba();
         if (i < 0)
                 return -1;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index cf29cc4e6ab7..83d8ed39433d 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -558,6 +558,8 @@ static void process_fd_request(void);
 static void recalibrate_floppy(void);
 static void floppy_shutdown(unsigned long);
 
+static int floppy_request_regions(int);
+static void floppy_release_regions(int);
 static int floppy_grab_irq_and_dma(void);
 static void floppy_release_irq_and_dma(void);
 
@@ -4274,8 +4276,7 @@ static int __init floppy_init(void)
                 FDCS->rawcmd = 2;
                 if (user_reset_fdc(-1, FD_RESET_ALWAYS, 0)) {
                         /* free ioports reserved by floppy_grab_irq_and_dma() */
-                        release_region(FDCS->address + 2, 4);
-                        release_region(FDCS->address + 7, 1);
+                        floppy_release_regions(fdc);
                         FDCS->address = -1;
                         FDCS->version = FDC_NONE;
                         continue;
@@ -4284,8 +4285,7 @@ static int __init floppy_init(void)
                 FDCS->version = get_fdc_version();
                 if (FDCS->version == FDC_NONE) {
                         /* free ioports reserved by floppy_grab_irq_and_dma() */
-                        release_region(FDCS->address + 2, 4);
-                        release_region(FDCS->address + 7, 1);
+                        floppy_release_regions(fdc);
                         FDCS->address = -1;
                         continue;
                 }
@@ -4358,6 +4358,47 @@ out_put_disk:
 
 static DEFINE_SPINLOCK(floppy_usage_lock);
 
+static const struct io_region {
+        int offset;
+        int size;
+} io_regions[] = {
+        { 2, 1 },
+        /* address + 3 is sometimes reserved by pnp bios for motherboard */
+        { 4, 2 },
+        /* address + 6 is reserved, and may be taken by IDE.
+         * Unfortunately, Adaptec doesn't know this :-(, */
+        { 7, 1 },
+};
+
+static void floppy_release_allocated_regions(int fdc, const struct io_region *p)
+{
+        while (p != io_regions) {
+                p--;
+                release_region(FDCS->address + p->offset, p->size);
+        }
+}
+
+#define ARRAY_END(X) (&((X)[ARRAY_SIZE(X)]))
+
+static int floppy_request_regions(int fdc)
+{
+        const struct io_region *p;
+
+        for (p = io_regions; p < ARRAY_END(io_regions); p++) {
+                if (!request_region(FDCS->address + p->offset, p->size, "floppy")) {
+                        DPRINT("Floppy io-port 0x%04lx in use\n", FDCS->address + p->offset);
+                        floppy_release_allocated_regions(fdc, p);
+                        return -EBUSY;
+                }
+        }
+        return 0;
+}
+
+static void floppy_release_regions(int fdc)
+{
+        floppy_release_allocated_regions(fdc, ARRAY_END(io_regions));
+}
+
 static int floppy_grab_irq_and_dma(void)
 {
         unsigned long flags;
@@ -4399,18 +4440,8 @@ static int floppy_grab_irq_and_dma(void)
 
         for (fdc = 0; fdc < N_FDC; fdc++) {
                 if (FDCS->address != -1) {
-                        if (!request_region(FDCS->address + 2, 4, "floppy")) {
-                                DPRINT("Floppy io-port 0x%04lx in use\n",
-                                       FDCS->address + 2);
-                                goto cleanup1;
-                        }
-                        if (!request_region(FDCS->address + 7, 1, "floppy DIR")) {
-                                DPRINT("Floppy io-port 0x%04lx in use\n",
-                                       FDCS->address + 7);
-                                goto cleanup2;
-                        }
-                        /* address + 6 is reserved, and may be taken by IDE.
-                         * Unfortunately, Adaptec doesn't know this :-(, */
+                        if (floppy_request_regions(fdc))
+                                goto cleanup;
                 }
         }
         for (fdc = 0; fdc < N_FDC; fdc++) {
@@ -4432,15 +4463,11 @@ static int floppy_grab_irq_and_dma(void)
         fdc = 0;
         irqdma_allocated = 1;
         return 0;
-cleanup2:
-        release_region(FDCS->address + 2, 4);
-cleanup1:
+cleanup:
         fd_free_irq();
         fd_free_dma();
-        while (--fdc >= 0) {
-                release_region(FDCS->address + 2, 4);
-                release_region(FDCS->address + 7, 1);
-        }
+        while (--fdc >= 0)
+                floppy_release_regions(fdc);
         spin_lock_irqsave(&floppy_usage_lock, flags);
         usage_count--;
         spin_unlock_irqrestore(&floppy_usage_lock, flags);
@@ -4501,10 +4528,8 @@ static void floppy_release_irq_and_dma(void)
 #endif
         old_fdc = fdc;
         for (fdc = 0; fdc < N_FDC; fdc++)
-                if (FDCS->address != -1) {
-                        release_region(FDCS->address + 2, 4);
-                        release_region(FDCS->address + 7, 1);
-                }
+                if (FDCS->address != -1)
+                        floppy_release_regions(fdc);
         fdc = old_fdc;
 }
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 34f80fa6fed1..8299e2d3b611 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -549,6 +549,15 @@ static void do_nbd_request(struct request_queue * q)
 
                 BUG_ON(lo->magic != LO_MAGIC);
 
+                if (unlikely(!lo->sock)) {
+                        printk(KERN_ERR "%s: Attempted send on closed socket\n",
+                                lo->disk->disk_name);
+                        req->errors++;
+                        nbd_end_request(req);
+                        spin_lock_irq(q->queue_lock);
+                        continue;
+                }
+
                 spin_lock_irq(&lo->queue_lock);
                 list_add_tail(&req->queuelist, &lo->waiting_queue);
                 spin_unlock_irq(&lo->queue_lock);
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 9dfa27163001..c397b3ddba9b 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -422,7 +422,7 @@ static void xs(char *buf, char *targ, int len)
 
         for (k = 0; k < len; k++) {
                 char c = *buf++;
-                if (c != ' ' || c != l)
+                if (c != ' ' && c != l)
                         l = *targ++ = c;
         }
         if (l == ' ')
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index f5be8081cd81..735bbe2be51a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -761,7 +761,7 @@ source "drivers/char/hw_random/Kconfig"
 
 config NVRAM
         tristate "/dev/nvram support"
-        depends on ATARI || X86 || ARM || GENERIC_NVRAM
+        depends on ATARI || X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM
         ---help---
           If you say Y here and create a character special file /dev/nvram
           with major number 10 and minor number 144 using mknod ("man mknod"),
diff --git a/drivers/char/scc.h b/drivers/char/scc.h
index 93998f5baff5..341b1142bea8 100644
--- a/drivers/char/scc.h
+++ b/drivers/char/scc.h
@@ -387,7 +387,7 @@ struct scc_port {
 /* The SCC needs 3.5 PCLK cycles recovery time between to register
  * accesses. PCLK runs with 8 MHz on an Atari, so this delay is 3.5 *
  * 125 ns = 437.5 ns. This is too short for udelay().
- * 10/16/95: A tstb mfp.par_dt_reg takes 600ns (sure?) and thus should be
+ * 10/16/95: A tstb st_mfp.par_dt_reg takes 600ns (sure?) and thus should be
  * quite right
  */
 
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index b60be7b0decf..518f2a25d91e 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1713,8 +1713,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 for (i = 0; i < SX_NBOARDS; i++)
                         sx_dprintk(SX_DEBUG_FIRMWARE, "<%x> ", boards[i].flags);
                 sx_dprintk(SX_DEBUG_FIRMWARE, "\n");
-                unlock_kernel();
-                return -EIO;
+                rc = -EIO;
+                goto out;
         }
 
         switch (cmd) {
@@ -1746,8 +1746,10 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 sx_dprintk(SX_DEBUG_FIRMWARE, "returning type= %ld\n", rc);
                 break;
         case SXIO_DO_RAMTEST:
-                if (sx_initialized)     /* Already initialized: better not ramtest the board.  */
-                        return -EPERM;
+                if (sx_initialized) {   /* Already initialized: better not ramtest the board.  */
+                        rc = -EPERM;
+                        break;
+                }
                 if (IS_SX_BOARD(board)) {
                         rc = do_memtest(board, 0, 0x7000);
                         if (!rc)
@@ -1787,7 +1789,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                                                 nbytes - i : SX_CHUNK_SIZE)) {
                                         kfree(tmp);
                                         rc = -EFAULT;
-                                        break;
+                                        goto out;
                                 }
                                 memcpy_toio(board->base2 + offset + i, tmp,
                                                 (i + SX_CHUNK_SIZE > nbytes) ?
@@ -1844,6 +1846,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
                 rc = -ENOTTY;
                 break;
         }
+out:
         unlock_kernel();
         func_exit();
         return rc;
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 726ee8a0277f..ecba4942fc8e 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -4,7 +4,7 @@
  * SLD 9630 TT 1.1 and SLB 9635 TT 1.2 Trusted Platform Module
  * Specifications at www.trustedcomputinggroup.org
  *
- * Copyright (C) 2005, Marcel Selhorst <selhorst@crypto.rub.de>
+ * Copyright (C) 2005, Marcel Selhorst <m.selhorst@sirrix.com>
  * Sirrix AG - security technologies, http://www.sirrix.com and
  * Applied Data Security Group, Ruhr-University Bochum, Germany
  * Project-Homepage: http://www.prosec.rub.de/tpm
@@ -636,7 +636,7 @@ static void __exit cleanup_inf(void)
 module_init(init_inf);
 module_exit(cleanup_inf);
 
-MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>");
+MODULE_AUTHOR("Marcel Selhorst <m.selhorst@sirrix.com>");
 MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");
 MODULE_VERSION("1.9");
 MODULE_LICENSE("GPL");
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 6a2b036c9389..6f45b1658a67 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -117,11 +117,7 @@ static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,
         busy_time = cputime64_add(busy_time, kstat_cpu(cpu).cpustat.irq);
         busy_time = cputime64_add(busy_time, kstat_cpu(cpu).cpustat.softirq);
         busy_time = cputime64_add(busy_time, kstat_cpu(cpu).cpustat.steal);
-
-        if (!dbs_tuners_ins.ignore_nice) {
-                busy_time = cputime64_add(busy_time,
-                                kstat_cpu(cpu).cpustat.nice);
-        }
+        busy_time = cputime64_add(busy_time, kstat_cpu(cpu).cpustat.nice);
 
         idle_time = cputime64_sub(cur_wall_time, busy_time);
         if (wall)
@@ -137,23 +133,6 @@ static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)
         if (idle_time == -1ULL)
                 return get_cpu_idle_time_jiffy(cpu, wall);
 
-        if (dbs_tuners_ins.ignore_nice) {
-                cputime64_t cur_nice;
-                unsigned long cur_nice_jiffies;
-                struct cpu_dbs_info_s *dbs_info;
-
-                dbs_info = &per_cpu(cpu_dbs_info, cpu);
-                cur_nice = cputime64_sub(kstat_cpu(cpu).cpustat.nice,
-                                         dbs_info->prev_cpu_nice);
-                /*
-                 * Assumption: nice time between sampling periods will be
-                 * less than 2^32 jiffies for 32 bit sys
-                 */
-                cur_nice_jiffies = (unsigned long)
-                                        cputime64_to_jiffies64(cur_nice);
-                dbs_info->prev_cpu_nice = kstat_cpu(cpu).cpustat.nice;
-                return idle_time + jiffies_to_usecs(cur_nice_jiffies);
-        }
         return idle_time;
 }
 
@@ -319,6 +298,9 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
                 dbs_info = &per_cpu(cpu_dbs_info, j);
                 dbs_info->prev_cpu_idle = get_cpu_idle_time(j,
                                                 &dbs_info->prev_cpu_wall);
+                if (dbs_tuners_ins.ignore_nice)
+                        dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice;
+
         }
         mutex_unlock(&dbs_mutex);
 
@@ -419,6 +401,23 @@ static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info)
                                 j_dbs_info->prev_cpu_idle);
                 j_dbs_info->prev_cpu_idle = cur_idle_time;
 
+                if (dbs_tuners_ins.ignore_nice) {
+                        cputime64_t cur_nice;
+                        unsigned long cur_nice_jiffies;
+
+                        cur_nice = cputime64_sub(kstat_cpu(j).cpustat.nice,
+                                         j_dbs_info->prev_cpu_nice);
+                        /*
+                         * Assumption: nice time between sampling periods will
+                         * be less than 2^32 jiffies for 32 bit sys
+                         */
+                        cur_nice_jiffies = (unsigned long)
+                                        cputime64_to_jiffies64(cur_nice);
+
+                        j_dbs_info->prev_cpu_nice = kstat_cpu(j).cpustat.nice;
+                        idle_time += jiffies_to_usecs(cur_nice_jiffies);
+                }
+
                 if (unlikely(!wall_time || wall_time < idle_time))
                         continue;
 
@@ -575,6 +574,10 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
 
                         j_dbs_info->prev_cpu_idle = get_cpu_idle_time(j,
                                                 &j_dbs_info->prev_cpu_wall);
+                        if (dbs_tuners_ins.ignore_nice) {
+                                j_dbs_info->prev_cpu_nice =
+                                                kstat_cpu(j).cpustat.nice;
+                        }
                 }
                 this_dbs_info->cpu = cpu;
                 /*
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index a58993011edb..280a9d263eb3 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -518,6 +518,7 @@ struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, v
                                        dma_chan_name(chan), err);
                         else
                                 break;
+                        chan->private = NULL;
                         chan = NULL;
                 }
         }
@@ -536,6 +537,7 @@ void dma_release_channel(struct dma_chan *chan)
         WARN_ONCE(chan->client_count != 1,
                   "chan reference count %d != 1\n", chan->client_count);
         dma_chan_put(chan);
+        chan->private = NULL;
         mutex_unlock(&dma_list_mutex);
 }
 EXPORT_SYMBOL_GPL(dma_release_channel);
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 6b702cc46b3d..a97c07eef7ec 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -560,7 +560,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                 unsigned long flags)
 {
         struct dw_dma_chan      *dwc = to_dw_dma_chan(chan);
-        struct dw_dma_slave     *dws = dwc->dws;
+        struct dw_dma_slave     *dws = chan->private;
         struct dw_desc          *prev;
         struct dw_desc          *first;
         u32                     ctllo;
@@ -790,7 +790,7 @@ static int dwc_alloc_chan_resources(struct dma_chan *chan)
         cfghi = DWC_CFGH_FIFO_MODE;
         cfglo = 0;
 
-        dws = dwc->dws;
+        dws = chan->private;
         if (dws) {
                 /*
                  * We need controller-specific data to set up slave
@@ -866,7 +866,6 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
         spin_lock_bh(&dwc->lock);
         list_splice_init(&dwc->free_list, &list);
         dwc->descs_allocated = 0;
-        dwc->dws = NULL;
 
         /* Disable interrupts */
         channel_clear_bit(dw, MASK.XFER, dwc->mask);
diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h
index 00fdd187bb0c..b252b202c5cf 100644
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw_dmac_regs.h
@@ -139,8 +139,6 @@ struct dw_dma_chan {
         struct list_head        queue;
         struct list_head        free_list;
 
-        struct dw_dma_slave     *dws;
-
         unsigned int            descs_allocated;
 };
 
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c
index 7be2cf3514e7..a5dd7a665aa8 100644
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
@@ -412,6 +412,7 @@ fw_card_add(struct fw_card *card,
 {
         u32 *config_rom;
         size_t length;
+        int err;
 
         card->max_receive = max_receive;
         card->link_speed = link_speed;
@@ -422,7 +423,13 @@ fw_card_add(struct fw_card *card,
         list_add_tail(&card->link, &card_list);
         mutex_unlock(&card_mutex);
 
-        return card->driver->enable(card, config_rom, length);
+        err = card->driver->enable(card, config_rom, length);
+        if (err < 0) {
+                mutex_lock(&card_mutex);
+                list_del(&card->link);
+                mutex_unlock(&card_mutex);
+        }
+        return err;
 }
 EXPORT_SYMBOL(fw_card_add);
 
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index 261b9aa3f248..05aa2d406ac6 100644
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -1,7 +1,7 @@
 /*
  * linux/drivers/firmware/memmap.c
  *  Copyright (C) 2008 SUSE LINUX Products GmbH
- *  by Bernhard Walle <bwalle@suse.de>
+ *  by Bernhard Walle <bernhard.walle@gmx.de>
  *
  * 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
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 5130b72d593c..3a22eb9be378 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -70,7 +70,7 @@ config DRM_I915
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
-        depends on FB
+        select FB
         tristate "i915 driver"
         help
           Choose this option if you have a system that has Intel 830M, 845G,
@@ -80,18 +80,17 @@ config DRM_I915
           XFree86 4.4 and above. If unsure, build this and i830 as modules and
           the X server will load the correct one.
 
-endchoice
-
 config DRM_I915_KMS
         bool "Enable modesetting on intel by default"
         depends on DRM_I915
         help
-        Choose this option if you want kernel modesetting enabled by default,
-        and you have a new enough userspace to support this. Running old
-        userspaces with this enabled will cause pain.  Note that this causes
-        the driver to bind to PCI devices, which precludes loading things
-        like intelfb.
+          Choose this option if you want kernel modesetting enabled by default,
+          and you have a new enough userspace to support this. Running old
+          userspaces with this enabled will cause pain.  Note that this causes
+          the driver to bind to PCI devices, which precludes loading things
+          like intelfb.
 
+endchoice
 
 config DRM_MGA
         tristate "Matrox g200/g400"
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index bfce0992fefb..94a768871734 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1741,9 +1741,8 @@ out:
  * RETURNS:
  * Zero on success, errno on failure.
  */
-void drm_fb_release(struct file *filp)
+void drm_fb_release(struct drm_file *priv)
 {
-        struct drm_file *priv = filp->private_data;
         struct drm_device *dev = priv->minor->dev;
         struct drm_framebuffer *fb, *tfb;
 
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 964c5eb1fada..733028b4d45e 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -512,8 +512,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
         if (drm_mode_equal(&saved_mode, &crtc->mode)) {
                 if (saved_x != crtc->x || saved_y != crtc->y ||
                     depth_changed || bpp_changed) {
-                        crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y,
-                                                  old_fb);
+                        ret = !crtc_funcs->mode_set_base(crtc, crtc->x, crtc->y,
+                                                         old_fb);
                         goto done;
                 }
         }
@@ -552,7 +552,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
         /* Set up the DPLL and any encoders state that needs to adjust or depend
          * on the DPLL.
          */
-        crtc_funcs->mode_set(crtc, mode, adjusted_mode, x, y, old_fb);
+        ret = !crtc_funcs->mode_set(crtc, mode, adjusted_mode, x, y, old_fb);
+        if (!ret)
+            goto done;
 
         list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
 
@@ -752,6 +754,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                         if (!drm_crtc_helper_set_mode(set->crtc, set->mode,
                                                       set->x, set->y,
                                                       old_fb)) {
+                                DRM_ERROR("failed to set mode on crtc %p\n",
+                                          set->crtc);
                                 ret = -EINVAL;
                                 goto fail_set_mode;
                         }
@@ -765,7 +769,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                 old_fb = set->crtc->fb;
                 if (set->crtc->fb != set->fb)
                         set->crtc->fb = set->fb;
-                crtc_funcs->mode_set_base(set->crtc, set->x, set->y, old_fb);
+                ret = crtc_funcs->mode_set_base(set->crtc,
+                                                set->x, set->y, old_fb);
+                if (ret != 0)
+                    goto fail_set_mode;
         }
 
         kfree(save_encoders);
@@ -775,8 +782,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
 fail_set_mode:
         set->crtc->enabled = save_enabled;
         count = 0;
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head)
+        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+                if (!connector->encoder)
+                        continue;
+
                 connector->encoder->crtc = save_crtcs[count++];
+        }
 fail_no_encoder:
         kfree(save_crtcs);
         count = 0;
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index b06a53715853..6c020fe5431c 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -457,6 +457,9 @@ int drm_release(struct inode *inode, struct file *filp)
         if (dev->driver->driver_features & DRIVER_GEM)
                 drm_gem_release(dev, file_priv);
 
+        if (dev->driver->driver_features & DRIVER_MODESET)
+                drm_fb_release(file_priv);
+
         mutex_lock(&dev->ctxlist_mutex);
         if (!list_empty(&dev->ctxlist)) {
                 struct drm_ctx_list *pos, *n;
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 6915fb82d0b0..88d3368ffddd 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -104,8 +104,8 @@ drm_gem_init(struct drm_device *dev)
 
         if (drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START,
                         DRM_FILE_PAGE_OFFSET_SIZE)) {
-                drm_free(mm, sizeof(struct drm_gem_mm), DRM_MEM_MM);
                 drm_ht_remove(&mm->offset_hash);
+                drm_free(mm, sizeof(struct drm_gem_mm), DRM_MEM_MM);
                 return -ENOMEM;
         }
 
@@ -295,35 +295,37 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
                 return -EBADF;
 
 again:
-        if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0)
-                return -ENOMEM;
+        if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) {
+                ret = -ENOMEM;
+                goto err;
+        }
 
         spin_lock(&dev->object_name_lock);
-        if (obj->name) {
-                args->name = obj->name;
+        if (!obj->name) {
+                ret = idr_get_new_above(&dev->object_name_idr, obj, 1,
+                                        &obj->name);
+                args->name = (uint64_t) obj->name;
                 spin_unlock(&dev->object_name_lock);
-                return 0;
-        }
-        ret = idr_get_new_above(&dev->object_name_idr, obj, 1,
-                                 &obj->name);
-        spin_unlock(&dev->object_name_lock);
-        if (ret == -EAGAIN)
-                goto again;
 
-        if (ret != 0) {
-                mutex_lock(&dev->struct_mutex);
-                drm_gem_object_unreference(obj);
-                mutex_unlock(&dev->struct_mutex);
-                return ret;
-        }
+                if (ret == -EAGAIN)
+                        goto again;
 
-        /*
-         * Leave the reference from the lookup around as the
-         * name table now holds one
-         */
-        args->name = (uint64_t) obj->name;
+                if (ret != 0)
+                        goto err;
 
-        return 0;
+                /* Allocate a reference for the name table.  */
+                drm_gem_object_reference(obj);
+        } else {
+                args->name = (uint64_t) obj->name;
+                spin_unlock(&dev->object_name_lock);
+                ret = 0;
+        }
+
+err:
+        mutex_lock(&dev->struct_mutex);
+        drm_gem_object_unreference(obj);
+        mutex_unlock(&dev->struct_mutex);
+        return ret;
 }
 
 /**
@@ -448,6 +450,7 @@ drm_gem_object_handle_free(struct kref *kref)
         spin_lock(&dev->object_name_lock);
         if (obj->name) {
                 idr_remove(&dev->object_name_idr, obj->name);
+                obj->name = 0;
                 spin_unlock(&dev->object_name_lock);
                 /*
                  * The object name held a reference to this object, drop
@@ -460,6 +463,26 @@ drm_gem_object_handle_free(struct kref *kref)
 }
 EXPORT_SYMBOL(drm_gem_object_handle_free);
 
+void drm_gem_vm_open(struct vm_area_struct *vma)
+{
+        struct drm_gem_object *obj = vma->vm_private_data;
+
+        drm_gem_object_reference(obj);
+}
+EXPORT_SYMBOL(drm_gem_vm_open);
+
+void drm_gem_vm_close(struct vm_area_struct *vma)
+{
+        struct drm_gem_object *obj = vma->vm_private_data;
+        struct drm_device *dev = obj->dev;
+
+        mutex_lock(&dev->struct_mutex);
+        drm_gem_object_unreference(obj);
+        mutex_unlock(&dev->struct_mutex);
+}
+EXPORT_SYMBOL(drm_gem_vm_close);
+
+
 /**
  * drm_gem_mmap - memory map routine for GEM objects
  * @filp: DRM file pointer
@@ -521,6 +544,14 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 #endif
         vma->vm_page_prot = __pgprot(prot);
 
+        /* Take a ref for this mapping of the object, so that the fault
+         * handler can dereference the mmap offset's pointer to the object.
+         * This reference is cleaned up by the corresponding vm_close
+         * (which should happen whether the vma was created by this call, or
+         * by a vm_open due to mremap or partial unmap or whatever).
+         */
+        drm_gem_object_reference(obj);
+
         vma->vm_file = filp;    /* Needed for drm_vm_open() */
         drm_vm_open_locked(vma);
 
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 69aa0ab28403..3795dbc0f50c 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -276,6 +276,7 @@ int drm_irq_uninstall(struct drm_device * dev)
         for (i = 0; i < dev->num_crtcs; i++) {
                 DRM_WAKEUP(&dev->vbl_queue[i]);
                 dev->vblank_enabled[i] = 0;
+                dev->last_vblank[i] = dev->driver->get_vblank_counter(dev, i);
         }
         spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
 
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index 803bc9e7ce3c..bcc869bc4092 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -171,9 +171,14 @@ EXPORT_SYMBOL(drm_core_ioremap);
 
 void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev)
 {
-        map->handle = ioremap_wc(map->offset, map->size);
+        if (drm_core_has_AGP(dev) &&
+            dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
+                map->handle = agp_remap(map->offset, map->size, dev);
+        else
+                map->handle = ioremap_wc(map->offset, map->size);
 }
 EXPORT_SYMBOL(drm_core_ioremap_wc);
+
 void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev)
 {
         if (!map->handle || !map->size)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index ee64b7301f67..2d797ffe8137 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -202,7 +202,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
                 dev_priv->ring.map.flags = 0;
                 dev_priv->ring.map.mtrr = 0;
 
-                drm_core_ioremap(&dev_priv->ring.map, dev);
+                drm_core_ioremap_wc(&dev_priv->ring.map, dev);
 
                 if (dev_priv->ring.map.handle == NULL) {
                         i915_dma_cleanup(dev);
@@ -731,8 +731,11 @@ static int i915_getparam(struct drm_device *dev, void *data,
         case I915_PARAM_HAS_GEM:
                 value = dev_priv->has_gem;
                 break;
+        case I915_PARAM_NUM_FENCES_AVAIL:
+                value = dev_priv->num_fence_regs - dev_priv->fence_reg_start;
+                break;
         default:
-                DRM_ERROR("Unknown parameter %d\n", param->param);
+                DRM_DEBUG("Unknown parameter %d\n", param->param);
                 return -EINVAL;
         }
 
@@ -764,8 +767,15 @@ static int i915_setparam(struct drm_device *dev, void *data,
         case I915_SETPARAM_ALLOW_BATCHBUFFER:
                 dev_priv->allow_batchbuffer = param->value;
                 break;
+        case I915_SETPARAM_NUM_USED_FENCES:
+                if (param->value > dev_priv->num_fence_regs ||
+                    param->value < 0)
+                        return -EINVAL;
+                /* Userspace can use first N regs */
+                dev_priv->fence_reg_start = param->value;
+                break;
         default:
-                DRM_ERROR("unknown parameter %d\n", param->param);
+                DRM_DEBUG("unknown parameter %d\n", param->param);
                 return -EINVAL;
         }
 
@@ -966,10 +976,6 @@ static int i915_load_modeset_init(struct drm_device *dev)
         if (ret)
                 goto kfree_devname;
 
-        dev_priv->mm.gtt_mapping =
-                io_mapping_create_wc(dev->agp->base,
-                                     dev->agp->agp_info.aper_size * 1024*1024);
-
         /* Allow hardware batchbuffers unless told otherwise.
          */
         dev_priv->allow_batchbuffer = 1;
@@ -1081,6 +1087,23 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
                 goto free_priv;
         }
 
+        dev_priv->mm.gtt_mapping =
+                io_mapping_create_wc(dev->agp->base,
+                                     dev->agp->agp_info.aper_size * 1024*1024);
+        /* Set up a WC MTRR for non-PAT systems.  This is more common than
+         * one would think, because the kernel disables PAT on first
+         * generation Core chips because WC PAT gets overridden by a UC
+         * MTRR if present.  Even if a UC MTRR isn't present.
+         */
+        dev_priv->mm.gtt_mtrr = mtrr_add(dev->agp->base,
+                                         dev->agp->agp_info.aper_size *
+                                         1024 * 1024,
+                                         MTRR_TYPE_WRCOMB, 1);
+        if (dev_priv->mm.gtt_mtrr < 0) {
+                DRM_INFO("MTRR allocation failed\n.  Graphics "
+                         "performance may suffer.\n");
+        }
+
 #ifdef CONFIG_HIGHMEM64G
         /* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
         dev_priv->has_gem = 0;
@@ -1089,6 +1112,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         dev_priv->has_gem = 1;
 #endif
 
+        dev->driver->get_vblank_counter = i915_get_vblank_counter;
+        if (IS_GM45(dev))
+                dev->driver->get_vblank_counter = gm45_get_vblank_counter;
+
         i915_gem_load(dev);
 
         /* Init HWS */
@@ -1145,8 +1172,14 @@ int i915_driver_unload(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
+        io_mapping_free(dev_priv->mm.gtt_mapping);
+        if (dev_priv->mm.gtt_mtrr >= 0) {
+                mtrr_del(dev_priv->mm.gtt_mtrr, dev->agp->base,
+                         dev->agp->agp_info.aper_size * 1024 * 1024);
+                dev_priv->mm.gtt_mtrr = -1;
+        }
+
         if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                io_mapping_free(dev_priv->mm.gtt_mapping);
                 drm_irq_uninstall(dev);
         }
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f8b3df0926c0..b293ef0bae71 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -27,6 +27,7 @@
  *
  */
 
+#include <linux/device.h>
 #include "drmP.h"
 #include "drm.h"
 #include "i915_drm.h"
@@ -66,6 +67,14 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 
         i915_save_state(dev);
 
+        /* If KMS is active, we do the leavevt stuff here */
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                if (i915_gem_idle(dev))
+                        dev_err(&dev->pdev->dev,
+                                "GEM idle failed, resume may fail\n");
+                drm_irq_uninstall(dev);
+        }
+
         intel_opregion_free(dev);
 
         if (state.event == PM_EVENT_SUSPEND) {
@@ -79,6 +88,9 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
 
 static int i915_resume(struct drm_device *dev)
 {
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        int ret = 0;
+
         pci_set_power_state(dev->pdev, PCI_D0);
         pci_restore_state(dev->pdev);
         if (pci_enable_device(dev->pdev))
@@ -89,11 +101,26 @@ static int i915_resume(struct drm_device *dev)
 
         intel_opregion_init(dev);
 
-        return 0;
+        /* KMS EnterVT equivalent */
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                mutex_lock(&dev->struct_mutex);
+                dev_priv->mm.suspended = 0;
+
+                ret = i915_gem_init_ringbuffer(dev);
+                if (ret != 0)
+                        ret = -1;
+                mutex_unlock(&dev->struct_mutex);
+
+                drm_irq_install(dev);
+        }
+
+        return ret;
 }
 
 static struct vm_operations_struct i915_gem_vm_ops = {
         .fault = i915_gem_fault,
+        .open = drm_gem_vm_open,
+        .close = drm_gem_vm_close,
 };
 
 static struct drm_driver driver = {
@@ -112,7 +139,6 @@ static struct drm_driver driver = {
         .suspend = i915_suspend,
         .resume = i915_resume,
         .device_is_agp = i915_driver_device_is_agp,
-        .get_vblank_counter = i915_get_vblank_counter,
         .enable_vblank = i915_enable_vblank,
         .disable_vblank = i915_disable_vblank,
         .irq_preinstall = i915_driver_irq_preinstall,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e13518252007..17fa40858d26 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -184,6 +184,8 @@ typedef struct drm_i915_private {
         unsigned int lvds_dither:1;
         unsigned int lvds_vbt:1;
         unsigned int int_crt_support:1;
+        unsigned int lvds_use_ssc:1;
+        int lvds_ssc_freq;
 
         struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */
         int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */
@@ -284,6 +286,7 @@ typedef struct drm_i915_private {
                 struct drm_mm gtt_space;
 
                 struct io_mapping *gtt_mapping;
+                int gtt_mtrr;
 
                 /**
                  * List of objects currently involved in rendering from the
@@ -534,6 +537,7 @@ extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,
 extern int i915_enable_vblank(struct drm_device *dev, int crtc);
 extern void i915_disable_vblank(struct drm_device *dev, int crtc);
 extern u32 i915_get_vblank_counter(struct drm_device *dev, int crtc);
+extern u32 gm45_get_vblank_counter(struct drm_device *dev, int crtc);
 extern int i915_vblank_swap(struct drm_device *dev, void *data,
                             struct drm_file *file_priv);
 extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask);
@@ -601,6 +605,7 @@ int i915_gem_init_object(struct drm_gem_object *obj);
 void i915_gem_free_object(struct drm_gem_object *obj);
 int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);
 void i915_gem_object_unpin(struct drm_gem_object *obj);
+int i915_gem_object_unbind(struct drm_gem_object *obj);
 void i915_gem_lastclose(struct drm_device *dev);
 uint32_t i915_get_gem_seqno(struct drm_device *dev);
 void i915_gem_retire_requests(struct drm_device *dev);
@@ -613,6 +618,7 @@ int i915_gem_init_ringbuffer(struct drm_device *dev);
 void i915_gem_cleanup_ringbuffer(struct drm_device *dev);
 int i915_gem_do_init(struct drm_device *dev, unsigned long start,
                      unsigned long end);
+int i915_gem_idle(struct drm_device *dev);
 int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,
                                       int write);
@@ -784,6 +790,11 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
                         IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))
 
 #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))
+/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte
+ * rows, which changed the alignment requirements and fence programming.
+ */
+#define HAS_128_BYTE_Y_TILING(dev) (IS_I9XX(dev) && !(IS_I915G(dev) || \
+                                                      IS_I915GM(dev)))
 #define SUPPORTS_INTEGRATED_HDMI(dev)   (IS_G4X(dev))
 
 #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index debad5c04cc0..28b726d07a0c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -34,10 +34,6 @@
 
 #define I915_GEM_GPU_DOMAINS    (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT))
 
-static void
-i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
-                                  uint32_t read_domains,
-                                  uint32_t write_domain);
 static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj);
 static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj);
 static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj);
@@ -52,7 +48,7 @@ static void i915_gem_object_free_page_list(struct drm_gem_object *obj);
 static int i915_gem_object_wait_rendering(struct drm_gem_object *obj);
 static int i915_gem_object_bind_to_gtt(struct drm_gem_object *obj,
                                            unsigned alignment);
-static void i915_gem_object_get_fence_reg(struct drm_gem_object *obj);
+static int i915_gem_object_get_fence_reg(struct drm_gem_object *obj, bool write);
 static void i915_gem_clear_fence_reg(struct drm_gem_object *obj);
 static int i915_gem_evict_something(struct drm_device *dev);
 static int i915_gem_phys_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
@@ -567,6 +563,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         pgoff_t page_offset;
         unsigned long pfn;
         int ret = 0;
+        bool write = !!(vmf->flags & FAULT_FLAG_WRITE);
 
         /* We don't use vmf->pgoff since that has the fake offset */
         page_offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >>
@@ -585,8 +582,13 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
         /* Need a new fence register? */
         if (obj_priv->fence_reg == I915_FENCE_REG_NONE &&
-            obj_priv->tiling_mode != I915_TILING_NONE)
-                i915_gem_object_get_fence_reg(obj);
+            obj_priv->tiling_mode != I915_TILING_NONE) {
+                ret = i915_gem_object_get_fence_reg(obj, write);
+                if (ret) {
+                        mutex_unlock(&dev->struct_mutex);
+                        return VM_FAULT_SIGBUS;
+                }
+        }
 
         pfn = ((dev->agp->base + obj_priv->gtt_offset) >> PAGE_SHIFT) +
                 page_offset;
@@ -601,8 +603,6 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         case -EAGAIN:
                 return VM_FAULT_OOM;
         case -EFAULT:
-        case -EBUSY:
-                DRM_ERROR("can't insert pfn??  fault or busy...\n");
                 return VM_FAULT_SIGBUS;
         default:
                 return VM_FAULT_NOPAGE;
@@ -678,6 +678,30 @@ out_free_list:
         return ret;
 }
 
+static void
+i915_gem_free_mmap_offset(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+        struct drm_i915_gem_object *obj_priv = obj->driver_private;
+        struct drm_gem_mm *mm = dev->mm_private;
+        struct drm_map_list *list;
+
+        list = &obj->map_list;
+        drm_ht_remove_item(&mm->offset_hash, &list->hash);
+
+        if (list->file_offset_node) {
+                drm_mm_put_block(list->file_offset_node);
+                list->file_offset_node = NULL;
+        }
+
+        if (list->map) {
+                drm_free(list->map, sizeof(struct drm_map), DRM_MEM_DRIVER);
+                list->map = NULL;
+        }
+
+        obj_priv->mmap_offset = 0;
+}
+
 /**
  * i915_gem_get_gtt_alignment - return required GTT alignment for an object
  * @obj: object to check
@@ -752,8 +776,11 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
 
         if (!obj_priv->mmap_offset) {
                 ret = i915_gem_create_mmap_offset(obj);
-                if (ret)
+                if (ret) {
+                        drm_gem_object_unreference(obj);
+                        mutex_unlock(&dev->struct_mutex);
                         return ret;
+                }
         }
 
         args->offset = obj_priv->mmap_offset;
@@ -1024,6 +1051,9 @@ i915_gem_retire_requests(struct drm_device *dev)
         drm_i915_private_t *dev_priv = dev->dev_private;
         uint32_t seqno;
 
+        if (!dev_priv->hw_status_page)
+                return;
+
         seqno = i915_get_gem_seqno(dev);
 
         while (!list_empty(&dev_priv->mm.request_list)) {
@@ -1211,7 +1241,7 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj)
 /**
  * Unbinds an object from the GTT aperture.
  */
-static int
+int
 i915_gem_object_unbind(struct drm_gem_object *obj)
 {
         struct drm_device *dev = obj->dev;
@@ -1445,21 +1475,26 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg)
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
         int regnum = obj_priv->fence_reg;
+        int tile_width;
         uint32_t val;
         uint32_t pitch_val;
 
         if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) ||
             (obj_priv->gtt_offset & (obj->size - 1))) {
-                WARN(1, "%s: object not 1M or size aligned\n", __func__);
+                WARN(1, "%s: object 0x%08x not 1M or size (0x%zx) aligned\n",
+                     __func__, obj_priv->gtt_offset, obj->size);
                 return;
         }
 
-        if (obj_priv->tiling_mode == I915_TILING_Y && (IS_I945G(dev) ||
-                                                       IS_I945GM(dev) ||
-                                                       IS_G33(dev)))
-                pitch_val = (obj_priv->stride / 128) - 1;
+        if (obj_priv->tiling_mode == I915_TILING_Y &&
+            HAS_128_BYTE_Y_TILING(dev))
+                tile_width = 128;
         else
-                pitch_val = (obj_priv->stride / 512) - 1;
+                tile_width = 512;
+
+        /* Note: pitch better be a power of two tile widths */
+        pitch_val = obj_priv->stride / tile_width;
+        pitch_val = ffs(pitch_val) - 1;
 
         val = obj_priv->gtt_offset;
         if (obj_priv->tiling_mode == I915_TILING_Y)
@@ -1483,7 +1518,8 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg)
 
         if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) ||
             (obj_priv->gtt_offset & (obj->size - 1))) {
-                WARN(1, "%s: object not 1M or size aligned\n", __func__);
+                WARN(1, "%s: object 0x%08x not 1M or size aligned\n",
+                     __func__, obj_priv->gtt_offset);
                 return;
         }
 
@@ -1503,6 +1539,7 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg)
 /**
  * i915_gem_object_get_fence_reg - set up a fence reg for an object
  * @obj: object to map through a fence reg
+ * @write: object is about to be written
  *
  * When mapping objects through the GTT, userspace wants to be able to write
  * to them without having to worry about swizzling if the object is tiled.
@@ -1513,8 +1550,8 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg)
  * It then sets up the reg based on the object's properties: address, pitch
  * and tiling format.
  */
-static void
-i915_gem_object_get_fence_reg(struct drm_gem_object *obj)
+static int
+i915_gem_object_get_fence_reg(struct drm_gem_object *obj, bool write)
 {
         struct drm_device *dev = obj->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1527,12 +1564,18 @@ i915_gem_object_get_fence_reg(struct drm_gem_object *obj)
                 WARN(1, "allocating a fence for non-tiled object?\n");
                 break;
         case I915_TILING_X:
-                WARN(obj_priv->stride & (512 - 1),
-                     "object is X tiled but has non-512B pitch\n");
+                if (!obj_priv->stride)
+                        return -EINVAL;
+                WARN((obj_priv->stride & (512 - 1)),
+                     "object 0x%08x is X tiled but has non-512B pitch\n",
+                     obj_priv->gtt_offset);
                 break;
         case I915_TILING_Y:
-                WARN(obj_priv->stride & (128 - 1),
-                     "object is Y tiled but has non-128B pitch\n");
+                if (!obj_priv->stride)
+                        return -EINVAL;
+                WARN((obj_priv->stride & (128 - 1)),
+                     "object 0x%08x is Y tiled but has non-128B pitch\n",
+                     obj_priv->gtt_offset);
                 break;
         }
 
@@ -1563,10 +1606,11 @@ try_again:
                  * objects to finish before trying again.
                  */
                 if (i == dev_priv->num_fence_regs) {
-                        ret = i915_gem_object_wait_rendering(reg->obj);
+                        ret = i915_gem_object_set_to_gtt_domain(reg->obj, 0);
                         if (ret) {
-                                WARN(ret, "wait_rendering failed: %d\n", ret);
-                                return;
+                                WARN(ret != -ERESTARTSYS,
+                                     "switch to GTT domain failed: %d\n", ret);
+                                return ret;
                         }
                         goto try_again;
                 }
@@ -1591,6 +1635,8 @@ try_again:
                 i915_write_fence_reg(reg);
         else
                 i830_write_fence_reg(reg);
+
+        return 0;
 }
 
 /**
@@ -1631,7 +1677,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
         if (dev_priv->mm.suspended)
                 return -EBUSY;
         if (alignment == 0)
-                alignment = PAGE_SIZE;
+                alignment = i915_gem_get_gtt_alignment(obj);
         if (alignment & (PAGE_SIZE - 1)) {
                 DRM_ERROR("Invalid object alignment requested %u\n", alignment);
                 return -EINVAL;
@@ -1974,30 +2020,28 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
  *              drm_agp_chipset_flush
  */
 static void
-i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
-                                  uint32_t read_domains,
-                                  uint32_t write_domain)
+i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
 {
         struct drm_device               *dev = obj->dev;
         struct drm_i915_gem_object      *obj_priv = obj->driver_private;
         uint32_t                        invalidate_domains = 0;
         uint32_t                        flush_domains = 0;
 
-        BUG_ON(read_domains & I915_GEM_DOMAIN_CPU);
-        BUG_ON(write_domain == I915_GEM_DOMAIN_CPU);
+        BUG_ON(obj->pending_read_domains & I915_GEM_DOMAIN_CPU);
+        BUG_ON(obj->pending_write_domain == I915_GEM_DOMAIN_CPU);
 
 #if WATCH_BUF
         DRM_INFO("%s: object %p read %08x -> %08x write %08x -> %08x\n",
                  __func__, obj,
-                 obj->read_domains, read_domains,
-                 obj->write_domain, write_domain);
+                 obj->read_domains, obj->pending_read_domains,
+                 obj->write_domain, obj->pending_write_domain);
 #endif
         /*
          * If the object isn't moving to a new write domain,
          * let the object stay in multiple read domains
          */
-        if (write_domain == 0)
-                read_domains |= obj->read_domains;
+        if (obj->pending_write_domain == 0)
+                obj->pending_read_domains |= obj->read_domains;
         else
                 obj_priv->dirty = 1;
 
@@ -2007,15 +2051,17 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
          * any read domains which differ from the old
          * write domain
          */
-        if (obj->write_domain && obj->write_domain != read_domains) {
+        if (obj->write_domain &&
+            obj->write_domain != obj->pending_read_domains) {
                 flush_domains |= obj->write_domain;
-                invalidate_domains |= read_domains & ~obj->write_domain;
+                invalidate_domains |=
+                        obj->pending_read_domains & ~obj->write_domain;
         }
         /*
          * Invalidate any read caches which may have
          * stale data. That is, any new read domains.
          */
-        invalidate_domains |= read_domains & ~obj->read_domains;
+        invalidate_domains |= obj->pending_read_domains & ~obj->read_domains;
         if ((flush_domains | invalidate_domains) & I915_GEM_DOMAIN_CPU) {
 #if WATCH_BUF
                 DRM_INFO("%s: CPU domain flush %08x invalidate %08x\n",
@@ -2024,9 +2070,15 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj,
                 i915_gem_clflush_object(obj);
         }
 
-        if ((write_domain | flush_domains) != 0)
-                obj->write_domain = write_domain;
-        obj->read_domains = read_domains;
+        /* The actual obj->write_domain will be updated with
+         * pending_write_domain after we emit the accumulated flush for all
+         * of our domain changes in execbuffers (which clears objects'
+         * write_domains).  So if we have a current write domain that we
+         * aren't changing, set pending_write_domain to that.
+         */
+        if (flush_domains == 0 && obj->pending_write_domain == 0)
+                obj->pending_write_domain = obj->write_domain;
+        obj->read_domains = obj->pending_read_domains;
 
         dev->invalidate_domains |= invalidate_domains;
         dev->flush_domains |= flush_domains;
@@ -2229,6 +2281,8 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                                   (int) reloc.offset,
                                   reloc.read_domains,
                                   reloc.write_domain);
+                        drm_gem_object_unreference(target_obj);
+                        i915_gem_object_unpin(obj);
                         return -EINVAL;
                 }
 
@@ -2458,13 +2512,15 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
         if (dev_priv->mm.wedged) {
                 DRM_ERROR("Execbuf while wedged\n");
                 mutex_unlock(&dev->struct_mutex);
-                return -EIO;
+                ret = -EIO;
+                goto pre_mutex_err;
         }
 
         if (dev_priv->mm.suspended) {
                 DRM_ERROR("Execbuf while VT-switched.\n");
                 mutex_unlock(&dev->struct_mutex);
-                return -EBUSY;
+                ret = -EBUSY;
+                goto pre_mutex_err;
         }
 
         /* Look up object handles */
@@ -2532,9 +2588,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                 struct drm_gem_object *obj = object_list[i];
 
                 /* Compute new gpu domains and update invalidate/flush */
-                i915_gem_object_set_to_gpu_domain(obj,
-                                                  obj->pending_read_domains,
-                                                  obj->pending_write_domain);
+                i915_gem_object_set_to_gpu_domain(obj);
         }
 
         i915_verify_inactive(dev, __FILE__, __LINE__);
@@ -2553,6 +2607,12 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
                         (void)i915_add_request(dev, dev->flush_domains);
         }
 
+        for (i = 0; i < args->buffer_count; i++) {
+                struct drm_gem_object *obj = object_list[i];
+
+                obj->write_domain = obj->pending_write_domain;
+        }
+
         i915_verify_inactive(dev, __FILE__, __LINE__);
 
 #if WATCH_COHERENCY
@@ -2610,15 +2670,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 
         i915_verify_inactive(dev, __FILE__, __LINE__);
 
-        /* Copy the new buffer offsets back to the user's exec list. */
-        ret = copy_to_user((struct drm_i915_relocation_entry __user *)
-                           (uintptr_t) args->buffers_ptr,
-                           exec_list,
-                           sizeof(*exec_list) * args->buffer_count);
-        if (ret)
-                DRM_ERROR("failed to copy %d exec entries "
-                          "back to user (%d)\n",
-                           args->buffer_count, ret);
 err:
         for (i = 0; i < pinned; i++)
                 i915_gem_object_unpin(object_list[i]);
@@ -2628,6 +2679,18 @@ err:
 
         mutex_unlock(&dev->struct_mutex);
 
+        if (!ret) {
+                /* Copy the new buffer offsets back to the user's exec list. */
+                ret = copy_to_user((struct drm_i915_relocation_entry __user *)
+                                   (uintptr_t) args->buffers_ptr,
+                                   exec_list,
+                                   sizeof(*exec_list) * args->buffer_count);
+                if (ret)
+                        DRM_ERROR("failed to copy %d exec entries "
+                                  "back to user (%d)\n",
+                                  args->buffer_count, ret);
+        }
+
 pre_mutex_err:
         drm_free(object_list, sizeof(*object_list) * args->buffer_count,
                  DRM_MEM_DRIVER);
@@ -2652,6 +2715,14 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
                                 DRM_ERROR("Failure to bind: %d", ret);
                         return ret;
                 }
+                /*
+                 * Pre-965 chips need a fence register set up in order to
+                 * properly handle tiled surfaces.
+                 */
+                if (!IS_I965G(dev) &&
+                    obj_priv->fence_reg == I915_FENCE_REG_NONE &&
+                    obj_priv->tiling_mode != I915_TILING_NONE)
+                        i915_gem_object_get_fence_reg(obj, true);
         }
         obj_priv->pin_count++;
 
@@ -2723,6 +2794,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
         if (obj_priv->pin_filp != NULL && obj_priv->pin_filp != file_priv) {
                 DRM_ERROR("Already pinned in i915_gem_pin_ioctl(): %d\n",
                           args->handle);
+                drm_gem_object_unreference(obj);
                 mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
@@ -2803,6 +2875,13 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
                 return -EBADF;
         }
 
+        /* Update the active list for the hardware's current position.
+         * Otherwise this only updates on a delayed timer or when irqs are
+         * actually unmasked, and our working set ends up being larger than
+         * required.
+         */
+        i915_gem_retire_requests(dev);
+
         obj_priv = obj->driver_private;
         /* Don't count being on the flushing list against the object being
          * done.  Otherwise, a buffer left on the flushing list but not getting
@@ -2855,9 +2934,6 @@ int i915_gem_init_object(struct drm_gem_object *obj)
 void i915_gem_free_object(struct drm_gem_object *obj)
 {
         struct drm_device *dev = obj->dev;
-        struct drm_gem_mm *mm = dev->mm_private;
-        struct drm_map_list *list;
-        struct drm_map *map;
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
 
         while (obj_priv->pin_count > 0)
@@ -2868,19 +2944,7 @@ void i915_gem_free_object(struct drm_gem_object *obj)
 
         i915_gem_object_unbind(obj);
 
-        list = &obj->map_list;
-        drm_ht_remove_item(&mm->offset_hash, &list->hash);
-
-        if (list->file_offset_node) {
-                drm_mm_put_block(list->file_offset_node);
-                list->file_offset_node = NULL;
-        }
-
-        map = list->map;
-        if (map) {
-                drm_free(map, sizeof(*map), DRM_MEM_DRIVER);
-                list->map = NULL;
-        }
+        i915_gem_free_mmap_offset(obj);
 
         drm_free(obj_priv->page_cpu_valid, 1, DRM_MEM_DRIVER);
         drm_free(obj->driver_private, 1, DRM_MEM_DRIVER);
@@ -2919,7 +2983,7 @@ i915_gem_evict_from_list(struct drm_device *dev, struct list_head *head)
         return 0;
 }
 
-static int
+int
 i915_gem_idle(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
@@ -3065,6 +3129,7 @@ i915_gem_init_hws(struct drm_device *dev)
         if (dev_priv->hw_status_page == NULL) {
                 DRM_ERROR("Failed to map status page.\n");
                 memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
+                i915_gem_object_unpin(obj);
                 drm_gem_object_unreference(obj);
                 return -EINVAL;
         }
@@ -3077,6 +3142,31 @@ i915_gem_init_hws(struct drm_device *dev)
         return 0;
 }
 
+static void
+i915_gem_cleanup_hws(struct drm_device *dev)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        struct drm_gem_object *obj;
+        struct drm_i915_gem_object *obj_priv;
+
+        if (dev_priv->hws_obj == NULL)
+                return;
+
+        obj = dev_priv->hws_obj;
+        obj_priv = obj->driver_private;
+
+        kunmap(obj_priv->page_list[0]);
+        i915_gem_object_unpin(obj);
+        drm_gem_object_unreference(obj);
+        dev_priv->hws_obj = NULL;
+
+        memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
+        dev_priv->hw_status_page = NULL;
+
+        /* Write high address into HWS_PGA when disabling. */
+        I915_WRITE(HWS_PGA, 0x1ffff000);
+}
+
 int
 i915_gem_init_ringbuffer(struct drm_device *dev)
 {
@@ -3094,6 +3184,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
         obj = drm_gem_object_alloc(dev, 128 * 1024);
         if (obj == NULL) {
                 DRM_ERROR("Failed to allocate ringbuffer\n");
+                i915_gem_cleanup_hws(dev);
                 return -ENOMEM;
         }
         obj_priv = obj->driver_private;
@@ -3101,6 +3192,7 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
         ret = i915_gem_object_pin(obj, 4096);
         if (ret != 0) {
                 drm_gem_object_unreference(obj);
+                i915_gem_cleanup_hws(dev);
                 return ret;
         }
 
@@ -3118,7 +3210,9 @@ i915_gem_init_ringbuffer(struct drm_device *dev)
         if (ring->map.handle == NULL) {
                 DRM_ERROR("Failed to map ringbuffer.\n");
                 memset(&dev_priv->ring, 0, sizeof(dev_priv->ring));
+                i915_gem_object_unpin(obj);
                 drm_gem_object_unreference(obj);
+                i915_gem_cleanup_hws(dev);
                 return -EINVAL;
         }
         ring->ring_obj = obj;
@@ -3198,20 +3292,7 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev)
         dev_priv->ring.ring_obj = NULL;
         memset(&dev_priv->ring, 0, sizeof(dev_priv->ring));
 
-        if (dev_priv->hws_obj != NULL) {
-                struct drm_gem_object *obj = dev_priv->hws_obj;
-                struct drm_i915_gem_object *obj_priv = obj->driver_private;
-
-                kunmap(obj_priv->page_list[0]);
-                i915_gem_object_unpin(obj);
-                drm_gem_object_unreference(obj);
-                dev_priv->hws_obj = NULL;
-                memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
-                dev_priv->hw_status_page = NULL;
-
-                /* Write high address into HWS_PGA when disabling. */
-                I915_WRITE(HWS_PGA, 0x1ffff000);
-        }
+        i915_gem_cleanup_hws(dev);
 }
 
 int
@@ -3229,10 +3310,6 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
                 dev_priv->mm.wedged = 0;
         }
 
-        dev_priv->mm.gtt_mapping = io_mapping_create_wc(dev->agp->base,
-                                                        dev->agp->agp_info.aper_size
-                                                        * 1024 * 1024);
-
         mutex_lock(&dev->struct_mutex);
         dev_priv->mm.suspended = 0;
 
@@ -3255,7 +3332,6 @@ int
 i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
                        struct drm_file *file_priv)
 {
-        drm_i915_private_t *dev_priv = dev->dev_private;
         int ret;
 
         if (drm_core_check_feature(dev, DRIVER_MODESET))
@@ -3264,7 +3340,6 @@ i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
         ret = i915_gem_idle(dev);
         drm_irq_uninstall(dev);
 
-        io_mapping_free(dev_priv->mm.gtt_mapping);
         return ret;
 }
 
@@ -3273,6 +3348,9 @@ i915_gem_lastclose(struct drm_device *dev)
 {
         int ret;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return;
+
         ret = i915_gem_idle(dev);
         if (ret)
                 DRM_ERROR("failed to idle hardware: %d\n", ret);
@@ -3294,7 +3372,7 @@ i915_gem_load(struct drm_device *dev)
         /* Old X drivers will take 0-2 for front, back, depth buffers */
         dev_priv->fence_reg_start = 3;
 
-        if (IS_I965G(dev))
+        if (IS_I965G(dev) || IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev))
                 dev_priv->num_fence_regs = 16;
         else
                 dev_priv->num_fence_regs = 8;
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 241f39b7f460..7fb4191ef934 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -173,6 +173,73 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
         dev_priv->mm.bit_6_swizzle_y = swizzle_y;
 }
 
+
+/**
+ * Returns the size of the fence for a tiled object of the given size.
+ */
+static int
+i915_get_fence_size(struct drm_device *dev, int size)
+{
+        int i;
+        int start;
+
+        if (IS_I965G(dev)) {
+                /* The 965 can have fences at any page boundary. */
+                return ALIGN(size, 4096);
+        } else {
+                /* Align the size to a power of two greater than the smallest
+                 * fence size.
+                 */
+                if (IS_I9XX(dev))
+                        start = 1024 * 1024;
+                else
+                        start = 512 * 1024;
+
+                for (i = start; i < size; i <<= 1)
+                        ;
+
+                return i;
+        }
+}
+
+/* Check pitch constriants for all chips & tiling formats */
+static bool
+i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)
+{
+        int tile_width;
+
+        /* Linear is always fine */
+        if (tiling_mode == I915_TILING_NONE)
+                return true;
+
+        if (tiling_mode == I915_TILING_Y && HAS_128_BYTE_Y_TILING(dev))
+                tile_width = 128;
+        else
+                tile_width = 512;
+
+        /* 965+ just needs multiples of tile width */
+        if (IS_I965G(dev)) {
+                if (stride & (tile_width - 1))
+                        return false;
+                return true;
+        }
+
+        /* Pre-965 needs power of two tile widths */
+        if (stride < tile_width)
+                return false;
+
+        if (stride & (stride - 1))
+                return false;
+
+        /* We don't handle the aperture area covered by the fence being bigger
+         * than the object size.
+         */
+        if (i915_get_fence_size(dev, size) != size)
+                return false;
+
+        return true;
+}
+
 /**
  * Sets the tiling mode of an object, returning the required swizzling of
  * bit 6 of addresses in the object.
@@ -191,6 +258,11 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
                 return -EINVAL;
         obj_priv = obj->driver_private;
 
+        if (!i915_tiling_ok(dev, args->stride, obj->size, args->tiling_mode)) {
+                drm_gem_object_unreference(obj);
+                return -EINVAL;
+        }
+
         mutex_lock(&dev->struct_mutex);
 
         if (args->tiling_mode == I915_TILING_NONE) {
@@ -207,12 +279,28 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
                         args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
                 }
         }
-        obj_priv->tiling_mode = args->tiling_mode;
-        obj_priv->stride = args->stride;
+        if (args->tiling_mode != obj_priv->tiling_mode) {
+                int ret;
 
-        mutex_unlock(&dev->struct_mutex);
+                /* Unbind the object, as switching tiling means we're
+                 * switching the cache organization due to fencing, probably.
+                 */
+                ret = i915_gem_object_unbind(obj);
+                if (ret != 0) {
+                        WARN(ret != -ERESTARTSYS,
+                             "failed to unbind object for tiling switch");
+                        args->tiling_mode = obj_priv->tiling_mode;
+                        mutex_unlock(&dev->struct_mutex);
+                        drm_gem_object_unreference(obj);
+
+                        return ret;
+                }
+                obj_priv->tiling_mode = args->tiling_mode;
+        }
+        obj_priv->stride = args->stride;
 
         drm_gem_object_unreference(obj);
+        mutex_unlock(&dev->struct_mutex);
 
         return 0;
 }
@@ -251,9 +339,8 @@ i915_gem_get_tiling(struct drm_device *dev, void *data,
                 DRM_ERROR("unknown tiling mode\n");
         }
 
-        mutex_unlock(&dev->struct_mutex);
-
         drm_gem_object_unreference(obj);
+        mutex_unlock(&dev->struct_mutex);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 6290219de6c8..548ff2c66431 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -174,6 +174,19 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
         return count;
 }
 
+u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe)
+{
+        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        int reg = pipe ? PIPEB_FRMCOUNT_GM45 : PIPEA_FRMCOUNT_GM45;
+
+        if (!i915_pipe_enabled(dev, pipe)) {
+                DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe);
+                return 0;
+        }
+
+        return I915_READ(reg);
+}
+
 irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *) arg;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 273162579e1b..9d6539a868b3 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -186,12 +186,12 @@
 #define FENCE_REG_830_0                 0x2000
 #define   I830_FENCE_START_MASK         0x07f80000
 #define   I830_FENCE_TILING_Y_SHIFT     12
-#define   I830_FENCE_SIZE_BITS(size)    ((get_order(size >> 19) - 1) << 8)
+#define   I830_FENCE_SIZE_BITS(size)    ((ffs((size) >> 19) - 1) << 8)
 #define   I830_FENCE_PITCH_SHIFT        4
 #define   I830_FENCE_REG_VALID          (1<<0)
 
 #define   I915_FENCE_START_MASK         0x0ff00000
-#define   I915_FENCE_SIZE_BITS(size)    ((get_order(size >> 20) - 1) << 8)
+#define   I915_FENCE_SIZE_BITS(size)    ((ffs((size) >> 20) - 1) << 8)
 
 #define FENCE_REG_965_0                 0x03000
 #define   I965_FENCE_PITCH_SHIFT        2
@@ -1371,6 +1371,9 @@
 #define   PIPE_FRAME_LOW_SHIFT    24
 #define   PIPE_PIXEL_MASK         0x00ffffff
 #define   PIPE_PIXEL_SHIFT        0
+/* GM45+ just has to be different */
+#define PIPEA_FRMCOUNT_GM45     0x70040
+#define PIPEA_FLIPCOUNT_GM45    0x70044
 
 /* Cursor A & B regs */
 #define CURACNTR                0x70080
@@ -1439,6 +1442,9 @@
 #define PIPEBSTAT               0x71024
 #define PIPEBFRAMEHIGH          0x71040
 #define PIPEBFRAMEPIXEL         0x71044
+#define PIPEB_FRMCOUNT_GM45     0x71040
+#define PIPEB_FLIPCOUNT_GM45    0x71044
+
 
 /* Display B control */
 #define DSPBCNTR                0x71180
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 4ca82a025525..65be30dccc77 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -135,6 +135,14 @@ parse_general_features(struct drm_i915_private *dev_priv,
         if (general) {
                 dev_priv->int_tv_support = general->int_tv_support;
                 dev_priv->int_crt_support = general->int_crt_support;
+                dev_priv->lvds_use_ssc = general->enable_ssc;
+
+                if (dev_priv->lvds_use_ssc) {
+                  if (IS_I855(dev_priv->dev))
+                    dev_priv->lvds_ssc_freq = general->ssc_freq ? 66 : 48;
+                  else
+                    dev_priv->lvds_ssc_freq = general->ssc_freq ? 100 : 96;
+                }
         }
 }
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 31c3732b7a69..65b635ce28c8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -90,12 +90,12 @@ typedef struct {
 #define I9XX_DOT_MAX             400000
 #define I9XX_VCO_MIN            1400000
 #define I9XX_VCO_MAX            2800000
-#define I9XX_N_MIN                    3
-#define I9XX_N_MAX                    8
+#define I9XX_N_MIN                    1
+#define I9XX_N_MAX                    6
 #define I9XX_M_MIN                   70
 #define I9XX_M_MAX                  120
 #define I9XX_M1_MIN                  10
-#define I9XX_M1_MAX                  20
+#define I9XX_M1_MAX                  22
 #define I9XX_M2_MIN                   5
 #define I9XX_M2_MAX                   9
 #define I9XX_P_SDVO_DAC_MIN           5
@@ -189,9 +189,7 @@ static const intel_limit_t *intel_limit(struct drm_crtc *crtc)
         return limit;
 }
 
-/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */
-
-static void i8xx_clock(int refclk, intel_clock_t *clock)
+static void intel_clock(int refclk, intel_clock_t *clock)
 {
         clock->m = 5 * (clock->m1 + 2) + (clock->m2 + 2);
         clock->p = clock->p1 * clock->p2;
@@ -199,25 +197,6 @@ static void i8xx_clock(int refclk, intel_clock_t *clock)
         clock->dot = clock->vco / clock->p;
 }
 
-/** Derive the pixel clock for the given refclk and divisors for 9xx chips. */
-
-static void i9xx_clock(int refclk, intel_clock_t *clock)
-{
-        clock->m = 5 * (clock->m1 + 2) + (clock->m2 + 2);
-        clock->p = clock->p1 * clock->p2;
-        clock->vco = refclk * clock->m / (clock->n + 2);
-        clock->dot = clock->vco / clock->p;
-}
-
-static void intel_clock(struct drm_device *dev, int refclk,
-                        intel_clock_t *clock)
-{
-        if (IS_I9XX(dev))
-                i9xx_clock (refclk, clock);
-        else
-                i8xx_clock (refclk, clock);
-}
-
 /**
  * Returns whether any output on the specified pipe is of the specified type
  */
@@ -238,7 +217,7 @@ bool intel_pipe_has_type (struct drm_crtc *crtc, int type)
     return false;
 }
 
-#define INTELPllInvalid(s)   { /* ErrorF (s) */; return false; }
+#define INTELPllInvalid(s)   do { DRM_DEBUG(s); return false; } while (0)
 /**
  * Returns whether the given set of divisors are valid for a given refclk with
  * the given connectors.
@@ -318,7 +297,7 @@ static bool intel_find_best_PLL(struct drm_crtc *crtc, int target,
                                      clock.p1 <= limit->p1.max; clock.p1++) {
                                         int this_err;
 
-                                        intel_clock(dev, refclk, &clock);
+                                        intel_clock(refclk, &clock);
 
                                         if (!intel_PLL_is_valid(crtc, &clock))
                                                 continue;
@@ -343,7 +322,7 @@ intel_wait_for_vblank(struct drm_device *dev)
         udelay(20000);
 }
 
-static void
+static int
 intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                     struct drm_framebuffer *old_fb)
 {
@@ -361,11 +340,21 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
         int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;
         int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
         u32 dspcntr, alignment;
+        int ret;
 
         /* no fb bound */
         if (!crtc->fb) {
                 DRM_DEBUG("No FB bound\n");
-                return;
+                return 0;
+        }
+
+        switch (pipe) {
+        case 0:
+        case 1:
+                break;
+        default:
+                DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
+                return -EINVAL;
         }
 
         intel_fb = to_intel_framebuffer(crtc->fb);
@@ -377,28 +366,30 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 alignment = 64 * 1024;
                 break;
         case I915_TILING_X:
-                if (IS_I9XX(dev))
-                        alignment = 1024 * 1024;
-                else
-                        alignment = 512 * 1024;
+                /* pin() will align the object as required by fence */
+                alignment = 0;
                 break;
         case I915_TILING_Y:
                 /* FIXME: Is this true? */
                 DRM_ERROR("Y tiled not allowed for scan out buffers\n");
-                return;
+                return -EINVAL;
         default:
                 BUG();
         }
 
-        if (i915_gem_object_pin(intel_fb->obj, alignment))
-                return;
-
-        i915_gem_object_set_to_gtt_domain(intel_fb->obj, 1);
-
-        Start = obj_priv->gtt_offset;
-        Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+        mutex_lock(&dev->struct_mutex);
+        ret = i915_gem_object_pin(intel_fb->obj, alignment);
+        if (ret != 0) {
+                mutex_unlock(&dev->struct_mutex);
+                return ret;
+        }
 
-        I915_WRITE(dspstride, crtc->fb->pitch);
+        ret = i915_gem_object_set_to_gtt_domain(intel_fb->obj, 1);
+        if (ret != 0) {
+                i915_gem_object_unpin(intel_fb->obj);
+                mutex_unlock(&dev->struct_mutex);
+                return ret;
+        }
 
         dspcntr = I915_READ(dspcntr_reg);
         /* Mask out pixel format bits in case we change it */
@@ -419,11 +410,17 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 break;
         default:
                 DRM_ERROR("Unknown color depth\n");
-                return;
+                i915_gem_object_unpin(intel_fb->obj);
+                mutex_unlock(&dev->struct_mutex);
+                return -EINVAL;
         }
         I915_WRITE(dspcntr_reg, dspcntr);
 
+        Start = obj_priv->gtt_offset;
+        Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+
         DRM_DEBUG("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y);
+        I915_WRITE(dspstride, crtc->fb->pitch);
         if (IS_I965G(dev)) {
                 I915_WRITE(dspbase, Offset);
                 I915_READ(dspbase);
@@ -440,27 +437,24 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 intel_fb = to_intel_framebuffer(old_fb);
                 i915_gem_object_unpin(intel_fb->obj);
         }
+        mutex_unlock(&dev->struct_mutex);
 
         if (!dev->primary->master)
-                return;
+                return 0;
 
         master_priv = dev->primary->master->driver_priv;
         if (!master_priv->sarea_priv)
-                return;
+                return 0;
 
-        switch (pipe) {
-        case 0:
-                master_priv->sarea_priv->pipeA_x = x;
-                master_priv->sarea_priv->pipeA_y = y;
-                break;
-        case 1:
+        if (pipe) {
                 master_priv->sarea_priv->pipeB_x = x;
                 master_priv->sarea_priv->pipeB_y = y;
-                break;
-        default:
-                DRM_ERROR("Can't update pipe %d in SAREA\n", pipe);
-                break;
+        } else {
+                master_priv->sarea_priv->pipeA_x = x;
+                master_priv->sarea_priv->pipeA_y = y;
         }
+
+        return 0;
 }
 
 
@@ -708,11 +702,11 @@ static int intel_panel_fitter_pipe (struct drm_device *dev)
         return 1;
 }
 
-static void intel_crtc_mode_set(struct drm_crtc *crtc,
-                                struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode,
-                                int x, int y,
-                                struct drm_framebuffer *old_fb)
+static int intel_crtc_mode_set(struct drm_crtc *crtc,
+                               struct drm_display_mode *mode,
+                               struct drm_display_mode *adjusted_mode,
+                               int x, int y,
+                               struct drm_framebuffer *old_fb)
 {
         struct drm_device *dev = crtc->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -732,13 +726,14 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
         int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;
         int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
         int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
-        int refclk;
+        int refclk, num_outputs = 0;
         intel_clock_t clock;
         u32 dpll = 0, fp = 0, dspcntr, pipeconf;
         bool ok, is_sdvo = false, is_dvo = false;
         bool is_crt = false, is_lvds = false, is_tv = false;
         struct drm_mode_config *mode_config = &dev->mode_config;
         struct drm_connector *connector;
+        int ret;
 
         drm_vblank_pre_modeset(dev, pipe);
 
@@ -755,6 +750,8 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
                 case INTEL_OUTPUT_SDVO:
                 case INTEL_OUTPUT_HDMI:
                         is_sdvo = true;
+                        if (intel_output->needs_tv_clock)
+                                is_tv = true;
                         break;
                 case INTEL_OUTPUT_DVO:
                         is_dvo = true;
@@ -766,9 +763,14 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
                         is_crt = true;
                         break;
                 }
+
+                num_outputs++;
         }
 
-        if (IS_I9XX(dev)) {
+        if (is_lvds && dev_priv->lvds_use_ssc && num_outputs < 2) {
+                refclk = dev_priv->lvds_ssc_freq * 1000;
+                DRM_DEBUG("using SSC reference clock of %d MHz\n", refclk / 1000);
+        } else if (IS_I9XX(dev)) {
                 refclk = 96000;
         } else {
                 refclk = 48000;
@@ -777,7 +779,7 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
         ok = intel_find_best_PLL(crtc, adjusted_mode->clock, refclk, &clock);
         if (!ok) {
                 DRM_ERROR("Couldn't find PLL settings for mode!\n");
-                return;
+                return -EINVAL;
         }
 
         fp = clock.n << 16 | clock.m1 << 8 | clock.m2;
@@ -827,11 +829,14 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
                 }
         }
 
-        if (is_tv) {
+        if (is_sdvo && is_tv)
+                dpll |= PLL_REF_INPUT_TVCLKINBC;
+        else if (is_tv)
                 /* XXX: just matching BIOS for now */
-/*      dpll |= PLL_REF_INPUT_TVCLKINBC; */
+                /*      dpll |= PLL_REF_INPUT_TVCLKINBC; */
                 dpll |= 3;
-        }
+        else if (is_lvds && dev_priv->lvds_use_ssc && num_outputs < 2)
+                dpll |= PLLB_REF_INPUT_SPREADSPECTRUMIN;
         else
                 dpll |= PLL_REF_INPUT_DREFCLK;
 
@@ -948,9 +953,13 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
         I915_WRITE(dspcntr_reg, dspcntr);
 
         /* Flush the plane changes */
-        intel_pipe_set_base(crtc, x, y, old_fb);
+        ret = intel_pipe_set_base(crtc, x, y, old_fb);
+        if (ret != 0)
+            return ret;
 
         drm_vblank_post_modeset(dev, pipe);
+
+        return 0;
 }
 
 /** Loads the palette/gamma unit for the CRTC with the prepared values */
@@ -999,6 +1008,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
                 temp = CURSOR_MODE_DISABLE;
                 addr = 0;
                 bo = NULL;
+                mutex_lock(&dev->struct_mutex);
                 goto finish;
         }
 
@@ -1021,18 +1031,19 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
         }
 
         /* we only need to pin inside GTT if cursor is non-phy */
+        mutex_lock(&dev->struct_mutex);
         if (!dev_priv->cursor_needs_physical) {
                 ret = i915_gem_object_pin(bo, PAGE_SIZE);
                 if (ret) {
                         DRM_ERROR("failed to pin cursor bo\n");
-                        goto fail;
+                        goto fail_locked;
                 }
                 addr = obj_priv->gtt_offset;
         } else {
                 ret = i915_gem_attach_phys_object(dev, bo, (pipe == 0) ? I915_GEM_PHYS_CURSOR_0 : I915_GEM_PHYS_CURSOR_1);
                 if (ret) {
                         DRM_ERROR("failed to attach phys object\n");
-                        goto fail;
+                        goto fail_locked;
                 }
                 addr = obj_priv->phys_obj->handle->busaddr;
         }
@@ -1052,10 +1063,9 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
                                 i915_gem_detach_phys_object(dev, intel_crtc->cursor_bo);
                 } else
                         i915_gem_object_unpin(intel_crtc->cursor_bo);
-                mutex_lock(&dev->struct_mutex);
                 drm_gem_object_unreference(intel_crtc->cursor_bo);
-                mutex_unlock(&dev->struct_mutex);
         }
+        mutex_unlock(&dev->struct_mutex);
 
         intel_crtc->cursor_addr = addr;
         intel_crtc->cursor_bo = bo;
@@ -1063,6 +1073,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
         return 0;
 fail:
         mutex_lock(&dev->struct_mutex);
+fail_locked:
         drm_gem_object_unreference(bo);
         mutex_unlock(&dev->struct_mutex);
         return ret;
@@ -1290,7 +1301,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
                 }
 
                 /* XXX: Handle the 100Mhz refclk */
-                i9xx_clock(96000, &clock);
+                intel_clock(96000, &clock);
         } else {
                 bool is_lvds = (pipe == 1) && (I915_READ(LVDS) & LVDS_PORT_EN);
 
@@ -1302,9 +1313,9 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
                         if ((dpll & PLL_REF_INPUT_MASK) ==
                             PLLB_REF_INPUT_SPREADSPECTRUMIN) {
                                 /* XXX: might not be 66MHz */
-                                i8xx_clock(66000, &clock);
+                                intel_clock(66000, &clock);
                         } else
-                                i8xx_clock(48000, &clock);
+                                intel_clock(48000, &clock);
                 } else {
                         if (dpll & PLL_P1_DIVIDE_BY_TWO)
                                 clock.p1 = 2;
@@ -1317,7 +1328,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
                         else
                                 clock.p2 = 2;
 
-                        i8xx_clock(48000, &clock);
+                        intel_clock(48000, &clock);
                 }
         }
 
@@ -1452,6 +1463,7 @@ static int intel_connector_clones(struct drm_device *dev, int type_mask)
 
 static void intel_setup_outputs(struct drm_device *dev)
 {
+        struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_connector *connector;
 
         intel_crt_init(dev);
@@ -1463,13 +1475,16 @@ static void intel_setup_outputs(struct drm_device *dev)
         if (IS_I9XX(dev)) {
                 int found;
 
-                found = intel_sdvo_init(dev, SDVOB);
-                if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
-                        intel_hdmi_init(dev, SDVOB);
-
-                found = intel_sdvo_init(dev, SDVOC);
-                if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
-                        intel_hdmi_init(dev, SDVOC);
+                if (I915_READ(SDVOB) & SDVO_DETECTED) {
+                        found = intel_sdvo_init(dev, SDVOB);
+                        if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
+                                intel_hdmi_init(dev, SDVOB);
+                }
+                if (!IS_G4X(dev) || (I915_READ(SDVOB) & SDVO_DETECTED)) {
+                        found = intel_sdvo_init(dev, SDVOC);
+                        if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
+                                intel_hdmi_init(dev, SDVOC);
+                }
         } else
                 intel_dvo_init(dev);
 
@@ -1592,7 +1607,9 @@ intel_user_framebuffer_create(struct drm_device *dev,
 
         ret = intel_framebuffer_create(dev, mode_cmd, &fb, obj);
         if (ret) {
+                mutex_lock(&dev->struct_mutex);
                 drm_gem_object_unreference(obj);
+                mutex_unlock(&dev->struct_mutex);
                 return NULL;
         }
 
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 8a4cc50c5b4e..957daef8edff 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -82,6 +82,7 @@ struct intel_output {
         struct intel_i2c_chan *i2c_bus; /* for control functions */
         struct intel_i2c_chan *ddc_bus; /* for DDC only stuff */
         bool load_detect_temp;
+        bool needs_tv_clock;
         void *dev_priv;
 };
 
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index afd1217b8a02..b7f0ebe9f810 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -473,7 +473,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
         ret = intel_framebuffer_create(dev, &mode_cmd, &fb, fbo);
         if (ret) {
                 DRM_ERROR("failed to allocate fb.\n");
-                goto out_unref;
+                goto out_unpin;
         }
 
         list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list);
@@ -484,7 +484,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
         info = framebuffer_alloc(sizeof(struct intelfb_par), device);
         if (!info) {
                 ret = -ENOMEM;
-                goto out_unref;
+                goto out_unpin;
         }
 
         par = info->par;
@@ -513,7 +513,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
                                        size);
         if (!info->screen_base) {
                 ret = -ENOSPC;
-                goto out_unref;
+                goto out_unpin;
         }
         info->screen_size = size;
 
@@ -608,6 +608,8 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
         mutex_unlock(&dev->struct_mutex);
         return 0;
 
+out_unpin:
+        i915_gem_object_unpin(fbo);
 out_unref:
         drm_gem_object_unreference(fbo);
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index b36a5214d8df..0d211af98854 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -27,6 +27,7 @@
  *      Jesse Barnes <jesse.barnes@intel.com>
  */
 
+#include <linux/dmi.h>
 #include <linux/i2c.h>
 #include "drmP.h"
 #include "drm.h"
@@ -311,10 +312,8 @@ static int intel_lvds_get_modes(struct drm_connector *connector)
         if (dev_priv->panel_fixed_mode != NULL) {
                 struct drm_display_mode *mode;
 
-                mutex_lock(&dev->mode_config.mutex);
                 mode = drm_mode_duplicate(dev, dev_priv->panel_fixed_mode);
                 drm_mode_probed_add(connector, mode);
-                mutex_unlock(&dev->mode_config.mutex);
 
                 return 1;
         }
@@ -405,6 +404,16 @@ void intel_lvds_init(struct drm_device *dev)
         u32 lvds;
         int pipe;
 
+        /* Blacklist machines that we know falsely report LVDS. */
+        /* FIXME: add a check for the Aopen Mini PC */
+
+        /* Apple Mac Mini Core Duo and Mac Mini Core 2 Duo */
+        if(dmi_match(DMI_PRODUCT_NAME, "Macmini1,1") ||
+           dmi_match(DMI_PRODUCT_NAME, "Macmini2,1")) {
+                DRM_DEBUG("Skipping LVDS initialization for Apple Mac Mini\n");
+                return;
+        }
+
         intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);
         if (!intel_output) {
                 return;
@@ -458,7 +467,7 @@ void intel_lvds_init(struct drm_device *dev)
                         dev_priv->panel_fixed_mode =
                                 drm_mode_duplicate(dev, scan);
                         mutex_unlock(&dev->mode_config.mutex);
-                        goto out; /* FIXME: check for quirks */
+                        goto out;
                 }
                 mutex_unlock(&dev->mode_config.mutex);
         }
@@ -472,8 +481,6 @@ void intel_lvds_init(struct drm_device *dev)
                 if (dev_priv->panel_fixed_mode) {
                         dev_priv->panel_fixed_mode->type |=
                                 DRM_MODE_TYPE_PREFERRED;
-                        drm_mode_probed_add(connector,
-                                            dev_priv->panel_fixed_mode);
                         goto out;
                 }
         }
@@ -492,7 +499,7 @@ void intel_lvds_init(struct drm_device *dev)
                 if (dev_priv->panel_fixed_mode) {
                         dev_priv->panel_fixed_mode->type |=
                                 DRM_MODE_TYPE_PREFERRED;
-                        goto out; /* FIXME: check for quirks */
+                        goto out;
                 }
         }
 
@@ -500,38 +507,6 @@ void intel_lvds_init(struct drm_device *dev)
         if (!dev_priv->panel_fixed_mode)
                 goto failed;
 
-        /* FIXME: detect aopen & mac mini type stuff automatically? */
-        /*
-         * Blacklist machines with BIOSes that list an LVDS panel without
-         * actually having one.
-         */
-        if (IS_I945GM(dev)) {
-                /* aopen mini pc */
-                if (dev->pdev->subsystem_vendor == 0xa0a0)
-                        goto failed;
-
-                if ((dev->pdev->subsystem_vendor == 0x8086) &&
-                    (dev->pdev->subsystem_device == 0x7270)) {
-                        /* It's a Mac Mini or Macbook Pro.
-                         *
-                         * Apple hardware is out to get us.  The macbook pro
-                         * has a real LVDS panel, but the mac mini does not,
-                         * and they have the same device IDs.  We'll
-                         * distinguish by panel size, on the assumption
-                         * that Apple isn't about to make any machines with an
-                         * 800x600 display.
-                         */
-
-                        if (dev_priv->panel_fixed_mode != NULL &&
-                            dev_priv->panel_fixed_mode->hdisplay == 800 &&
-                            dev_priv->panel_fixed_mode->vdisplay == 600) {
-                                DRM_DEBUG("Suspected Mac Mini, ignoring the LVDS\n");
-                                goto failed;
-                        }
-                }
-        }
-
-
 out:
         drm_sysfs_connector_add(connector);
         return;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 407215469102..fbe6f3931b1b 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -40,13 +40,59 @@
 struct intel_sdvo_priv {
         struct intel_i2c_chan *i2c_bus;
         int slaveaddr;
+
+        /* Register for the SDVO device: SDVOB or SDVOC */
         int output_device;
 
-        u16 active_outputs;
+        /* Active outputs controlled by this SDVO output */
+        uint16_t controlled_output;
 
+        /*
+         * Capabilities of the SDVO device returned by
+         * i830_sdvo_get_capabilities()
+         */
         struct intel_sdvo_caps caps;
+
+        /* Pixel clock limitations reported by the SDVO device, in kHz */
         int pixel_clock_min, pixel_clock_max;
 
+        /**
+         * This is set if we're going to treat the device as TV-out.
+         *
+         * While we have these nice friendly flags for output types that ought
+         * to decide this for us, the S-Video output on our HDMI+S-Video card
+         * shows up as RGB1 (VGA).
+         */
+        bool is_tv;
+
+        /**
+         * This is set if we treat the device as HDMI, instead of DVI.
+         */
+        bool is_hdmi;
+
+        /**
+         * Returned SDTV resolutions allowed for the current format, if the
+         * device reported it.
+         */
+        struct intel_sdvo_sdtv_resolution_reply sdtv_resolutions;
+
+        /**
+         * Current selected TV format.
+         *
+         * This is stored in the same structure that's passed to the device, for
+         * convenience.
+         */
+        struct intel_sdvo_tv_format tv_format;
+
+        /*
+         * supported encoding mode, used to determine whether HDMI is
+         * supported
+         */
+        struct intel_sdvo_encode encode;
+
+        /* DDC bus used by this SDVO output */
+        uint8_t ddc_bus;
+
         int save_sdvo_mult;
         u16 save_active_outputs;
         struct intel_sdvo_dtd save_input_dtd_1, save_input_dtd_2;
@@ -147,9 +193,9 @@ static bool intel_sdvo_write_byte(struct intel_output *intel_output, int addr,
 
 #define SDVO_CMD_NAME_ENTRY(cmd) {cmd, #cmd}
 /** Mapping of command numbers to names, for debug output */
-const static struct _sdvo_cmd_name {
-    u8 cmd;
-    char *name;
+static const struct _sdvo_cmd_name {
+        u8 cmd;
+        char *name;
 } sdvo_cmd_names[] = {
     SDVO_CMD_NAME_ENTRY(SDVO_CMD_RESET),
     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DEVICE_CAPS),
@@ -186,8 +232,35 @@ const static struct _sdvo_cmd_name {
     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_TV_FORMATS),
     SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_FORMAT),
     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_FORMAT),
-    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_RESOLUTION_SUPPORT),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_POWER_STATES),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_POWER_STATE),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODER_POWER_STATE),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_DISPLAY_POWER_STATE),
     SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTROL_BUS_SWITCH),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS),
+    /* HDMI op code */
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPP_ENCODE),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ENCODE),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ENCODE),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_PIXEL_REPLI),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_PIXEL_REPLI),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY_CAP),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_COLORIMETRY),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_COLORIMETRY),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_ENCRYPT_PREFER),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_AUDIO_STAT),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_AUDIO_STAT),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INDEX),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_INDEX),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_INFO),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_AV_SPLIT),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_AV_SPLIT),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_TXRATE),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_TXRATE),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_HBUF_DATA),
+    SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_DATA),
 };
 
 #define SDVO_NAME(dev_priv) ((dev_priv)->output_device == SDVOB ? "SDVOB" : "SDVOC")
@@ -506,6 +579,50 @@ static bool intel_sdvo_set_output_timing(struct intel_output *intel_output,
                                      SDVO_CMD_SET_OUTPUT_TIMINGS_PART1, dtd);
 }
 
+static bool
+intel_sdvo_create_preferred_input_timing(struct intel_output *output,
+                                         uint16_t clock,
+                                         uint16_t width,
+                                         uint16_t height)
+{
+        struct intel_sdvo_preferred_input_timing_args args;
+        uint8_t status;
+
+        args.clock = clock;
+        args.width = width;
+        args.height = height;
+        intel_sdvo_write_cmd(output, SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING,
+                             &args, sizeof(args));
+        status = intel_sdvo_read_response(output, NULL, 0);
+        if (status != SDVO_CMD_STATUS_SUCCESS)
+                return false;
+
+        return true;
+}
+
+static bool intel_sdvo_get_preferred_input_timing(struct intel_output *output,
+                                                  struct intel_sdvo_dtd *dtd)
+{
+        bool status;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1,
+                             NULL, 0);
+
+        status = intel_sdvo_read_response(output, &dtd->part1,
+                                          sizeof(dtd->part1));
+        if (status != SDVO_CMD_STATUS_SUCCESS)
+                return false;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2,
+                             NULL, 0);
+
+        status = intel_sdvo_read_response(output, &dtd->part2,
+                                          sizeof(dtd->part2));
+        if (status != SDVO_CMD_STATUS_SUCCESS)
+                return false;
+
+        return false;
+}
 
 static int intel_sdvo_get_clock_rate_mult(struct intel_output *intel_output)
 {
@@ -536,36 +653,12 @@ static bool intel_sdvo_set_clock_rate_mult(struct intel_output *intel_output, u8
         return true;
 }
 
-static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        /* Make the CRTC code factor in the SDVO pixel multiplier.  The SDVO
-         * device will be told of the multiplier during mode_set.
-         */
-        adjusted_mode->clock *= intel_sdvo_get_pixel_multiplier(mode);
-        return true;
-}
-
-static void intel_sdvo_mode_set(struct drm_encoder *encoder,
-                                struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode)
+static void intel_sdvo_get_dtd_from_mode(struct intel_sdvo_dtd *dtd,
+                                         struct drm_display_mode *mode)
 {
-        struct drm_device *dev = encoder->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_crtc *crtc = encoder->crtc;
-        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        struct intel_output *intel_output = enc_to_intel_output(encoder);
-        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
-        u16 width, height;
-        u16 h_blank_len, h_sync_len, v_blank_len, v_sync_len;
-        u16 h_sync_offset, v_sync_offset;
-        u32 sdvox;
-        struct intel_sdvo_dtd output_dtd;
-        int sdvo_pixel_multiply;
-
-        if (!mode)
-                return;
+        uint16_t width, height;
+        uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len;
+        uint16_t h_sync_offset, v_sync_offset;
 
         width = mode->crtc_hdisplay;
         height = mode->crtc_vdisplay;
@@ -580,93 +673,423 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
         h_sync_offset = mode->crtc_hsync_start - mode->crtc_hblank_start;
         v_sync_offset = mode->crtc_vsync_start - mode->crtc_vblank_start;
 
-        output_dtd.part1.clock = mode->clock / 10;
-        output_dtd.part1.h_active = width & 0xff;
-        output_dtd.part1.h_blank = h_blank_len & 0xff;
-        output_dtd.part1.h_high = (((width >> 8) & 0xf) << 4) |
+        dtd->part1.clock = mode->clock / 10;
+        dtd->part1.h_active = width & 0xff;
+        dtd->part1.h_blank = h_blank_len & 0xff;
+        dtd->part1.h_high = (((width >> 8) & 0xf) << 4) |
                 ((h_blank_len >> 8) & 0xf);
-        output_dtd.part1.v_active = height & 0xff;
-        output_dtd.part1.v_blank = v_blank_len & 0xff;
-        output_dtd.part1.v_high = (((height >> 8) & 0xf) << 4) |
+        dtd->part1.v_active = height & 0xff;
+        dtd->part1.v_blank = v_blank_len & 0xff;
+        dtd->part1.v_high = (((height >> 8) & 0xf) << 4) |
                 ((v_blank_len >> 8) & 0xf);
 
-        output_dtd.part2.h_sync_off = h_sync_offset;
-        output_dtd.part2.h_sync_width = h_sync_len & 0xff;
-        output_dtd.part2.v_sync_off_width = (v_sync_offset & 0xf) << 4 |
+        dtd->part2.h_sync_off = h_sync_offset;
+        dtd->part2.h_sync_width = h_sync_len & 0xff;
+        dtd->part2.v_sync_off_width = (v_sync_offset & 0xf) << 4 |
                 (v_sync_len & 0xf);
-        output_dtd.part2.sync_off_width_high = ((h_sync_offset & 0x300) >> 2) |
+        dtd->part2.sync_off_width_high = ((h_sync_offset & 0x300) >> 2) |
                 ((h_sync_len & 0x300) >> 4) | ((v_sync_offset & 0x30) >> 2) |
                 ((v_sync_len & 0x30) >> 4);
 
-        output_dtd.part2.dtd_flags = 0x18;
+        dtd->part2.dtd_flags = 0x18;
         if (mode->flags & DRM_MODE_FLAG_PHSYNC)
-                output_dtd.part2.dtd_flags |= 0x2;
+                dtd->part2.dtd_flags |= 0x2;
         if (mode->flags & DRM_MODE_FLAG_PVSYNC)
-                output_dtd.part2.dtd_flags |= 0x4;
+                dtd->part2.dtd_flags |= 0x4;
+
+        dtd->part2.sdvo_flags = 0;
+        dtd->part2.v_sync_off_high = v_sync_offset & 0xc0;
+        dtd->part2.reserved = 0;
+}
+
+static void intel_sdvo_get_mode_from_dtd(struct drm_display_mode * mode,
+                                         struct intel_sdvo_dtd *dtd)
+{
+        uint16_t width, height;
+        uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len;
+        uint16_t h_sync_offset, v_sync_offset;
+
+        width = mode->crtc_hdisplay;
+        height = mode->crtc_vdisplay;
+
+        /* do some mode translations */
+        h_blank_len = mode->crtc_hblank_end - mode->crtc_hblank_start;
+        h_sync_len = mode->crtc_hsync_end - mode->crtc_hsync_start;
+
+        v_blank_len = mode->crtc_vblank_end - mode->crtc_vblank_start;
+        v_sync_len = mode->crtc_vsync_end - mode->crtc_vsync_start;
+
+        h_sync_offset = mode->crtc_hsync_start - mode->crtc_hblank_start;
+        v_sync_offset = mode->crtc_vsync_start - mode->crtc_vblank_start;
+
+        mode->hdisplay = dtd->part1.h_active;
+        mode->hdisplay += ((dtd->part1.h_high >> 4) & 0x0f) << 8;
+        mode->hsync_start = mode->hdisplay + dtd->part2.h_sync_off;
+        mode->hsync_start += (dtd->part2.sync_off_width_high & 0xa0) << 2;
+        mode->hsync_end = mode->hsync_start + dtd->part2.h_sync_width;
+        mode->hsync_end += (dtd->part2.sync_off_width_high & 0x30) << 4;
+        mode->htotal = mode->hdisplay + dtd->part1.h_blank;
+        mode->htotal += (dtd->part1.h_high & 0xf) << 8;
+
+        mode->vdisplay = dtd->part1.v_active;
+        mode->vdisplay += ((dtd->part1.v_high >> 4) & 0x0f) << 8;
+        mode->vsync_start = mode->vdisplay;
+        mode->vsync_start += (dtd->part2.v_sync_off_width >> 4) & 0xf;
+        mode->vsync_start += (dtd->part2.sync_off_width_high & 0x0a) << 2;
+        mode->vsync_start += dtd->part2.v_sync_off_high & 0xc0;
+        mode->vsync_end = mode->vsync_start +
+                (dtd->part2.v_sync_off_width & 0xf);
+        mode->vsync_end += (dtd->part2.sync_off_width_high & 0x3) << 4;
+        mode->vtotal = mode->vdisplay + dtd->part1.v_blank;
+        mode->vtotal += (dtd->part1.v_high & 0xf) << 8;
+
+        mode->clock = dtd->part1.clock * 10;
+
+        mode->flags &= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
+        if (dtd->part2.dtd_flags & 0x2)
+                mode->flags |= DRM_MODE_FLAG_PHSYNC;
+        if (dtd->part2.dtd_flags & 0x4)
+                mode->flags |= DRM_MODE_FLAG_PVSYNC;
+}
+
+static bool intel_sdvo_get_supp_encode(struct intel_output *output,
+                                       struct intel_sdvo_encode *encode)
+{
+        uint8_t status;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_GET_SUPP_ENCODE, NULL, 0);
+        status = intel_sdvo_read_response(output, encode, sizeof(*encode));
+        if (status != SDVO_CMD_STATUS_SUCCESS) { /* non-support means DVI */
+                memset(encode, 0, sizeof(*encode));
+                return false;
+        }
+
+        return true;
+}
+
+static bool intel_sdvo_set_encode(struct intel_output *output, uint8_t mode)
+{
+        uint8_t status;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_SET_ENCODE, &mode, 1);
+        status = intel_sdvo_read_response(output, NULL, 0);
+
+        return (status == SDVO_CMD_STATUS_SUCCESS);
+}
+
+static bool intel_sdvo_set_colorimetry(struct intel_output *output,
+                                       uint8_t mode)
+{
+        uint8_t status;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_SET_COLORIMETRY, &mode, 1);
+        status = intel_sdvo_read_response(output, NULL, 0);
+
+        return (status == SDVO_CMD_STATUS_SUCCESS);
+}
+
+#if 0
+static void intel_sdvo_dump_hdmi_buf(struct intel_output *output)
+{
+        int i, j;
+        uint8_t set_buf_index[2];
+        uint8_t av_split;
+        uint8_t buf_size;
+        uint8_t buf[48];
+        uint8_t *pos;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_GET_HBUF_AV_SPLIT, NULL, 0);
+        intel_sdvo_read_response(output, &av_split, 1);
+
+        for (i = 0; i <= av_split; i++) {
+                set_buf_index[0] = i; set_buf_index[1] = 0;
+                intel_sdvo_write_cmd(output, SDVO_CMD_SET_HBUF_INDEX,
+                                     set_buf_index, 2);
+                intel_sdvo_write_cmd(output, SDVO_CMD_GET_HBUF_INFO, NULL, 0);
+                intel_sdvo_read_response(output, &buf_size, 1);
+
+                pos = buf;
+                for (j = 0; j <= buf_size; j += 8) {
+                        intel_sdvo_write_cmd(output, SDVO_CMD_GET_HBUF_DATA,
+                                             NULL, 0);
+                        intel_sdvo_read_response(output, pos, 8);
+                        pos += 8;
+                }
+        }
+}
+#endif
+
+static void intel_sdvo_set_hdmi_buf(struct intel_output *output, int index,
+                                uint8_t *data, int8_t size, uint8_t tx_rate)
+{
+    uint8_t set_buf_index[2];
+
+    set_buf_index[0] = index;
+    set_buf_index[1] = 0;
+
+    intel_sdvo_write_cmd(output, SDVO_CMD_SET_HBUF_INDEX, set_buf_index, 2);
+
+    for (; size > 0; size -= 8) {
+        intel_sdvo_write_cmd(output, SDVO_CMD_SET_HBUF_DATA, data, 8);
+        data += 8;
+    }
+
+    intel_sdvo_write_cmd(output, SDVO_CMD_SET_HBUF_TXRATE, &tx_rate, 1);
+}
+
+static uint8_t intel_sdvo_calc_hbuf_csum(uint8_t *data, uint8_t size)
+{
+        uint8_t csum = 0;
+        int i;
+
+        for (i = 0; i < size; i++)
+                csum += data[i];
+
+        return 0x100 - csum;
+}
+
+#define DIP_TYPE_AVI    0x82
+#define DIP_VERSION_AVI 0x2
+#define DIP_LEN_AVI     13
+
+struct dip_infoframe {
+        uint8_t type;
+        uint8_t version;
+        uint8_t len;
+        uint8_t checksum;
+        union {
+                struct {
+                        /* Packet Byte #1 */
+                        uint8_t S:2;
+                        uint8_t B:2;
+                        uint8_t A:1;
+                        uint8_t Y:2;
+                        uint8_t rsvd1:1;
+                        /* Packet Byte #2 */
+                        uint8_t R:4;
+                        uint8_t M:2;
+                        uint8_t C:2;
+                        /* Packet Byte #3 */
+                        uint8_t SC:2;
+                        uint8_t Q:2;
+                        uint8_t EC:3;
+                        uint8_t ITC:1;
+                        /* Packet Byte #4 */
+                        uint8_t VIC:7;
+                        uint8_t rsvd2:1;
+                        /* Packet Byte #5 */
+                        uint8_t PR:4;
+                        uint8_t rsvd3:4;
+                        /* Packet Byte #6~13 */
+                        uint16_t top_bar_end;
+                        uint16_t bottom_bar_start;
+                        uint16_t left_bar_end;
+                        uint16_t right_bar_start;
+                } avi;
+                struct {
+                        /* Packet Byte #1 */
+                        uint8_t channel_count:3;
+                        uint8_t rsvd1:1;
+                        uint8_t coding_type:4;
+                        /* Packet Byte #2 */
+                        uint8_t sample_size:2; /* SS0, SS1 */
+                        uint8_t sample_frequency:3;
+                        uint8_t rsvd2:3;
+                        /* Packet Byte #3 */
+                        uint8_t coding_type_private:5;
+                        uint8_t rsvd3:3;
+                        /* Packet Byte #4 */
+                        uint8_t channel_allocation;
+                        /* Packet Byte #5 */
+                        uint8_t rsvd4:3;
+                        uint8_t level_shift:4;
+                        uint8_t downmix_inhibit:1;
+                } audio;
+                uint8_t payload[28];
+        } __attribute__ ((packed)) u;
+} __attribute__((packed));
+
+static void intel_sdvo_set_avi_infoframe(struct intel_output *output,
+                                         struct drm_display_mode * mode)
+{
+        struct dip_infoframe avi_if = {
+                .type = DIP_TYPE_AVI,
+                .version = DIP_VERSION_AVI,
+                .len = DIP_LEN_AVI,
+        };
+
+        avi_if.checksum = intel_sdvo_calc_hbuf_csum((uint8_t *)&avi_if,
+                                                    4 + avi_if.len);
+        intel_sdvo_set_hdmi_buf(output, 1, (uint8_t *)&avi_if, 4 + avi_if.len,
+                                SDVO_HBUF_TX_VSYNC);
+}
+
+static bool intel_sdvo_mode_fixup(struct drm_encoder *encoder,
+                                  struct drm_display_mode *mode,
+                                  struct drm_display_mode *adjusted_mode)
+{
+        struct intel_output *output = enc_to_intel_output(encoder);
+        struct intel_sdvo_priv *dev_priv = output->dev_priv;
 
-        output_dtd.part2.sdvo_flags = 0;
-        output_dtd.part2.v_sync_off_high = v_sync_offset & 0xc0;
-        output_dtd.part2.reserved = 0;
+        if (!dev_priv->is_tv) {
+                /* Make the CRTC code factor in the SDVO pixel multiplier.  The
+                 * SDVO device will be told of the multiplier during mode_set.
+                 */
+                adjusted_mode->clock *= intel_sdvo_get_pixel_multiplier(mode);
+        } else {
+                struct intel_sdvo_dtd output_dtd;
+                bool success;
+
+                /* We need to construct preferred input timings based on our
+                 * output timings.  To do that, we have to set the output
+                 * timings, even though this isn't really the right place in
+                 * the sequence to do it. Oh well.
+                 */
+
+
+                /* Set output timings */
+                intel_sdvo_get_dtd_from_mode(&output_dtd, mode);
+                intel_sdvo_set_target_output(output,
+                                             dev_priv->controlled_output);
+                intel_sdvo_set_output_timing(output, &output_dtd);
+
+                /* Set the input timing to the screen. Assume always input 0. */
+                intel_sdvo_set_target_input(output, true, false);
+
+
+                success = intel_sdvo_create_preferred_input_timing(output,
+                                                                   mode->clock / 10,
+                                                                   mode->hdisplay,
+                                                                   mode->vdisplay);
+                if (success) {
+                        struct intel_sdvo_dtd input_dtd;
 
-        /* Set the output timing to the screen */
-        intel_sdvo_set_target_output(intel_output, sdvo_priv->active_outputs);
-        intel_sdvo_set_output_timing(intel_output, &output_dtd);
+                        intel_sdvo_get_preferred_input_timing(output,
+                                                             &input_dtd);
+                        intel_sdvo_get_mode_from_dtd(adjusted_mode, &input_dtd);
+
+                } else {
+                        return false;
+                }
+        }
+        return true;
+}
+
+static void intel_sdvo_mode_set(struct drm_encoder *encoder,
+                                struct drm_display_mode *mode,
+                                struct drm_display_mode *adjusted_mode)
+{
+        struct drm_device *dev = encoder->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_crtc *crtc = encoder->crtc;
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        struct intel_output *output = enc_to_intel_output(encoder);
+        struct intel_sdvo_priv *sdvo_priv = output->dev_priv;
+        u32 sdvox = 0;
+        int sdvo_pixel_multiply;
+        struct intel_sdvo_in_out_map in_out;
+        struct intel_sdvo_dtd input_dtd;
+        u8 status;
+
+        if (!mode)
+                return;
+
+        /* First, set the input mapping for the first input to our controlled
+         * output. This is only correct if we're a single-input device, in
+         * which case the first input is the output from the appropriate SDVO
+         * channel on the motherboard.  In a two-input device, the first input
+         * will be SDVOB and the second SDVOC.
+         */
+        in_out.in0 = sdvo_priv->controlled_output;
+        in_out.in1 = 0;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_SET_IN_OUT_MAP,
+                             &in_out, sizeof(in_out));
+        status = intel_sdvo_read_response(output, NULL, 0);
+
+        if (sdvo_priv->is_hdmi) {
+                intel_sdvo_set_avi_infoframe(output, mode);
+                sdvox |= SDVO_AUDIO_ENABLE;
+        }
+
+        intel_sdvo_get_dtd_from_mode(&input_dtd, mode);
+
+        /* If it's a TV, we already set the output timing in mode_fixup.
+         * Otherwise, the output timing is equal to the input timing.
+         */
+        if (!sdvo_priv->is_tv) {
+                /* Set the output timing to the screen */
+                intel_sdvo_set_target_output(output,
+                                             sdvo_priv->controlled_output);
+                intel_sdvo_set_output_timing(output, &input_dtd);
+        }
 
         /* Set the input timing to the screen. Assume always input 0. */
-        intel_sdvo_set_target_input(intel_output, true, false);
+        intel_sdvo_set_target_input(output, true, false);
 
-        /* We would like to use i830_sdvo_create_preferred_input_timing() to
+        /* We would like to use intel_sdvo_create_preferred_input_timing() to
          * provide the device with a timing it can support, if it supports that
          * feature.  However, presumably we would need to adjust the CRTC to
          * output the preferred timing, and we don't support that currently.
          */
-        intel_sdvo_set_input_timing(intel_output, &output_dtd);
+#if 0
+        success = intel_sdvo_create_preferred_input_timing(output, clock,
+                                                           width, height);
+        if (success) {
+                struct intel_sdvo_dtd *input_dtd;
+
+                intel_sdvo_get_preferred_input_timing(output, &input_dtd);
+                intel_sdvo_set_input_timing(output, &input_dtd);
+        }
+#else
+        intel_sdvo_set_input_timing(output, &input_dtd);
+#endif
 
         switch (intel_sdvo_get_pixel_multiplier(mode)) {
         case 1:
-                intel_sdvo_set_clock_rate_mult(intel_output,
+                intel_sdvo_set_clock_rate_mult(output,
                                                SDVO_CLOCK_RATE_MULT_1X);
                 break;
         case 2:
-                intel_sdvo_set_clock_rate_mult(intel_output,
+                intel_sdvo_set_clock_rate_mult(output,
                                                SDVO_CLOCK_RATE_MULT_2X);
                 break;
         case 4:
-                intel_sdvo_set_clock_rate_mult(intel_output,
+                intel_sdvo_set_clock_rate_mult(output,
                                                SDVO_CLOCK_RATE_MULT_4X);
                 break;
         }
 
         /* Set the SDVO control regs. */
-        if (0/*IS_I965GM(dev)*/) {
-                sdvox = SDVO_BORDER_ENABLE;
-        } else {
-                sdvox = I915_READ(sdvo_priv->output_device);
-                switch (sdvo_priv->output_device) {
-                case SDVOB:
-                        sdvox &= SDVOB_PRESERVE_MASK;
-                        break;
-                case SDVOC:
-                        sdvox &= SDVOC_PRESERVE_MASK;
-                        break;
-                }
-                sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
-        }
+        if (IS_I965G(dev)) {
+                sdvox |= SDVO_BORDER_ENABLE |
+                        SDVO_VSYNC_ACTIVE_HIGH |
+                        SDVO_HSYNC_ACTIVE_HIGH;
+        } else {
+                sdvox |= I915_READ(sdvo_priv->output_device);
+                switch (sdvo_priv->output_device) {
+                case SDVOB:
+                        sdvox &= SDVOB_PRESERVE_MASK;
+                        break;
+                case SDVOC:
+                        sdvox &= SDVOC_PRESERVE_MASK;
+                        break;
+                }
+                sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
+        }
         if (intel_crtc->pipe == 1)
                 sdvox |= SDVO_PIPE_B_SELECT;
 
         sdvo_pixel_multiply = intel_sdvo_get_pixel_multiplier(mode);
         if (IS_I965G(dev)) {
-                /* done in crtc_mode_set as the dpll_md reg must be written
-                   early */
-        } else if (IS_I945G(dev) || IS_I945GM(dev)) {
-                /* done in crtc_mode_set as it lives inside the
-                   dpll register */
+                /* done in crtc_mode_set as the dpll_md reg must be written early */
+        } else if (IS_I945G(dev) || IS_I945GM(dev) || IS_G33(dev)) {
+                /* done in crtc_mode_set as it lives inside the dpll register */
         } else {
                 sdvox |= (sdvo_pixel_multiply - 1) << SDVO_PORT_MULTIPLY_SHIFT;
         }
 
-        intel_sdvo_write_sdvox(intel_output, sdvox);
+        intel_sdvo_write_sdvox(output, sdvox);
 }
 
 static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
@@ -714,7 +1137,7 @@ static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
 
                 if (0)
                         intel_sdvo_set_encoder_power_state(intel_output, mode);
-                intel_sdvo_set_active_outputs(intel_output, sdvo_priv->active_outputs);
+                intel_sdvo_set_active_outputs(intel_output, sdvo_priv->controlled_output);
         }
         return;
 }
@@ -752,6 +1175,9 @@ static void intel_sdvo_save(struct drm_connector *connector)
                                                      &sdvo_priv->save_output_dtd[o]);
                 }
         }
+        if (sdvo_priv->is_tv) {
+                /* XXX: Save TV format/enhancements. */
+        }
 
         sdvo_priv->save_SDVOX = I915_READ(sdvo_priv->output_device);
 }
@@ -759,7 +1185,6 @@ static void intel_sdvo_save(struct drm_connector *connector)
 static void intel_sdvo_restore(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_output *intel_output = to_intel_output(connector);
         struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
         int o;
@@ -790,7 +1215,11 @@ static void intel_sdvo_restore(struct drm_connector *connector)
 
         intel_sdvo_set_clock_rate_mult(intel_output, sdvo_priv->save_sdvo_mult);
 
-        I915_WRITE(sdvo_priv->output_device, sdvo_priv->save_SDVOX);
+        if (sdvo_priv->is_tv) {
+                /* XXX: Restore TV format/enhancements. */
+        }
+
+        intel_sdvo_write_sdvox(intel_output, sdvo_priv->save_SDVOX);
 
         if (sdvo_priv->save_SDVOX & SDVO_ENABLE)
         {
@@ -916,20 +1345,173 @@ static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connect
         status = intel_sdvo_read_response(intel_output, &response, 2);
 
         DRM_DEBUG("SDVO response %d %d\n", response[0], response[1]);
+
+        if (status != SDVO_CMD_STATUS_SUCCESS)
+                return connector_status_unknown;
+
         if ((response[0] != 0) || (response[1] != 0))
                 return connector_status_connected;
         else
                 return connector_status_disconnected;
 }
 
-static int intel_sdvo_get_modes(struct drm_connector *connector)
+static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
 {
         struct intel_output *intel_output = to_intel_output(connector);
+        struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
 
         /* set the bus switch and get the modes */
-        intel_sdvo_set_control_bus_switch(intel_output, SDVO_CONTROL_BUS_DDC2);
+        intel_sdvo_set_control_bus_switch(intel_output, sdvo_priv->ddc_bus);
         intel_ddc_get_modes(intel_output);
 
+#if 0
+        struct drm_device *dev = encoder->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        /* Mac mini hack.  On this device, I get DDC through the analog, which
+         * load-detects as disconnected.  I fail to DDC through the SDVO DDC,
+         * but it does load-detect as connected.  So, just steal the DDC bits
+         * from analog when we fail at finding it the right way.
+         */
+        crt = xf86_config->output[0];
+        intel_output = crt->driver_private;
+        if (intel_output->type == I830_OUTPUT_ANALOG &&
+            crt->funcs->detect(crt) == XF86OutputStatusDisconnected) {
+                I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOA, "CRTDDC_A");
+                edid_mon = xf86OutputGetEDID(crt, intel_output->pDDCBus);
+                xf86DestroyI2CBusRec(intel_output->pDDCBus, true, true);
+        }
+        if (edid_mon) {
+                xf86OutputSetEDID(output, edid_mon);
+                modes = xf86OutputGetEDIDModes(output);
+        }
+#endif
+}
+
+/**
+ * This function checks the current TV format, and chooses a default if
+ * it hasn't been set.
+ */
+static void
+intel_sdvo_check_tv_format(struct intel_output *output)
+{
+        struct intel_sdvo_priv *dev_priv = output->dev_priv;
+        struct intel_sdvo_tv_format format, unset;
+        uint8_t status;
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_GET_TV_FORMAT, NULL, 0);
+        status = intel_sdvo_read_response(output, &format, sizeof(format));
+        if (status != SDVO_CMD_STATUS_SUCCESS)
+                return;
+
+        memset(&unset, 0, sizeof(unset));
+        if (memcmp(&format, &unset, sizeof(format))) {
+                DRM_DEBUG("%s: Choosing default TV format of NTSC-M\n",
+                          SDVO_NAME(dev_priv));
+
+                format.ntsc_m = true;
+                intel_sdvo_write_cmd(output, SDVO_CMD_SET_TV_FORMAT, NULL, 0);
+                status = intel_sdvo_read_response(output, NULL, 0);
+        }
+}
+
+/*
+ * Set of SDVO TV modes.
+ * Note!  This is in reply order (see loop in get_tv_modes).
+ * XXX: all 60Hz refresh?
+ */
+struct drm_display_mode sdvo_tv_modes[] = {
+        { DRM_MODE("320x200", DRM_MODE_TYPE_DRIVER, 5815680, 321, 384, 416,
+                   200, 0, 232, 201, 233, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("320x240", DRM_MODE_TYPE_DRIVER, 6814080, 321, 384, 416,
+                   240, 0, 272, 241, 273, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("400x300", DRM_MODE_TYPE_DRIVER, 9910080, 401, 464, 496,
+                   300, 0, 332, 301, 333, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 16913280, 641, 704, 736,
+                   350, 0, 382, 351, 383, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("640x400", DRM_MODE_TYPE_DRIVER, 19121280, 641, 704, 736,
+                   400, 0, 432, 401, 433, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("640x400", DRM_MODE_TYPE_DRIVER, 19121280, 641, 704, 736,
+                   400, 0, 432, 401, 433, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("704x480", DRM_MODE_TYPE_DRIVER, 24624000, 705, 768, 800,
+                   480, 0, 512, 481, 513, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("704x576", DRM_MODE_TYPE_DRIVER, 29232000, 705, 768, 800,
+                   576, 0, 608, 577, 609, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("720x350", DRM_MODE_TYPE_DRIVER, 18751680, 721, 784, 816,
+                   350, 0, 382, 351, 383, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("720x400", DRM_MODE_TYPE_DRIVER, 21199680, 721, 784, 816,
+                   400, 0, 432, 401, 433, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 25116480, 721, 784, 816,
+                   480, 0, 512, 481, 513, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("720x540", DRM_MODE_TYPE_DRIVER, 28054080, 721, 784, 816,
+                   540, 0, 572, 541, 573, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 29816640, 721, 784, 816,
+                   576, 0, 608, 577, 609, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("768x576", DRM_MODE_TYPE_DRIVER, 31570560, 769, 832, 864,
+                   576, 0, 608, 577, 609, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 34030080, 801, 864, 896,
+                   600, 0, 632, 601, 633, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("832x624", DRM_MODE_TYPE_DRIVER, 36581760, 833, 896, 928,
+                   624, 0, 656, 625, 657, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("920x766", DRM_MODE_TYPE_DRIVER, 48707040, 921, 984, 1016,
+                   766, 0, 798, 767, 799, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 53827200, 1025, 1088, 1120,
+                   768, 0, 800, 769, 801, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+        { DRM_MODE("1280x1024", DRM_MODE_TYPE_DRIVER, 87265920, 1281, 1344, 1376,
+                   1024, 0, 1056, 1025, 1057, 4196112, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
+};
+
+static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
+{
+        struct intel_output *output = to_intel_output(connector);
+        uint32_t reply = 0;
+        uint8_t status;
+        int i = 0;
+
+        intel_sdvo_check_tv_format(output);
+
+        /* Read the list of supported input resolutions for the selected TV
+         * format.
+         */
+        intel_sdvo_write_cmd(output, SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT,
+                             NULL, 0);
+        status = intel_sdvo_read_response(output, &reply, 3);
+        if (status != SDVO_CMD_STATUS_SUCCESS)
+                return;
+
+        for (i = 0; i < ARRAY_SIZE(sdvo_tv_modes); i++)
+                if (reply & (1 << i))
+                        drm_mode_probed_add(connector, &sdvo_tv_modes[i]);
+}
+
+static int intel_sdvo_get_modes(struct drm_connector *connector)
+{
+        struct intel_output *output = to_intel_output(connector);
+        struct intel_sdvo_priv *sdvo_priv = output->dev_priv;
+
+        if (sdvo_priv->is_tv)
+                intel_sdvo_get_tv_modes(connector);
+        else
+                intel_sdvo_get_ddc_modes(connector);
+
         if (list_empty(&connector->probed_modes))
                 return 0;
         return 1;
@@ -978,6 +1560,65 @@ static const struct drm_encoder_funcs intel_sdvo_enc_funcs = {
 };
 
 
+/**
+ * Choose the appropriate DDC bus for control bus switch command for this
+ * SDVO output based on the controlled output.
+ *
+ * DDC bus number assignment is in a priority order of RGB outputs, then TMDS
+ * outputs, then LVDS outputs.
+ */
+static void
+intel_sdvo_select_ddc_bus(struct intel_sdvo_priv *dev_priv)
+{
+        uint16_t mask = 0;
+        unsigned int num_bits;
+
+        /* Make a mask of outputs less than or equal to our own priority in the
+         * list.
+         */
+        switch (dev_priv->controlled_output) {
+        case SDVO_OUTPUT_LVDS1:
+                mask |= SDVO_OUTPUT_LVDS1;
+        case SDVO_OUTPUT_LVDS0:
+                mask |= SDVO_OUTPUT_LVDS0;
+        case SDVO_OUTPUT_TMDS1:
+                mask |= SDVO_OUTPUT_TMDS1;
+        case SDVO_OUTPUT_TMDS0:
+                mask |= SDVO_OUTPUT_TMDS0;
+        case SDVO_OUTPUT_RGB1:
+                mask |= SDVO_OUTPUT_RGB1;
+        case SDVO_OUTPUT_RGB0:
+                mask |= SDVO_OUTPUT_RGB0;
+                break;
+        }
+
+        /* Count bits to find what number we are in the priority list. */
+        mask &= dev_priv->caps.output_flags;
+        num_bits = hweight16(mask);
+        if (num_bits > 3) {
+                /* if more than 3 outputs, default to DDC bus 3 for now */
+                num_bits = 3;
+        }
+
+        /* Corresponds to SDVO_CONTROL_BUS_DDCx */
+        dev_priv->ddc_bus = 1 << num_bits;
+}
+
+static bool
+intel_sdvo_get_digital_encoding_mode(struct intel_output *output)
+{
+        struct intel_sdvo_priv *sdvo_priv = output->dev_priv;
+        uint8_t status;
+
+        intel_sdvo_set_target_output(output, sdvo_priv->controlled_output);
+
+        intel_sdvo_write_cmd(output, SDVO_CMD_GET_ENCODE, NULL, 0);
+        status = intel_sdvo_read_response(output, &sdvo_priv->is_hdmi, 1);
+        if (status != SDVO_CMD_STATUS_SUCCESS)
+                return false;
+        return true;
+}
+
 bool intel_sdvo_init(struct drm_device *dev, int output_device)
 {
         struct drm_connector *connector;
@@ -1040,45 +1681,76 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
 
         intel_sdvo_get_capabilities(intel_output, &sdvo_priv->caps);
 
-        memset(&sdvo_priv->active_outputs, 0, sizeof(sdvo_priv->active_outputs));
+        if (sdvo_priv->caps.output_flags &
+            (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)) {
+                if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS0)
+                        sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS0;
+                else
+                        sdvo_priv->controlled_output = SDVO_OUTPUT_TMDS1;
+
+                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
+                encoder_type = DRM_MODE_ENCODER_TMDS;
+                connector_type = DRM_MODE_CONNECTOR_DVID;
 
-        /* TODO, CVBS, SVID, YPRPB & SCART outputs. */
-        if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0)
+                if (intel_sdvo_get_supp_encode(intel_output,
+                                               &sdvo_priv->encode) &&
+                    intel_sdvo_get_digital_encoding_mode(intel_output) &&
+                    sdvo_priv->is_hdmi) {
+                        /* enable hdmi encoding mode if supported */
+                        intel_sdvo_set_encode(intel_output, SDVO_ENCODE_HDMI);
+                        intel_sdvo_set_colorimetry(intel_output,
+                                                   SDVO_COLORIMETRY_RGB256);
+                        connector_type = DRM_MODE_CONNECTOR_HDMIA;
+                }
+        }
+        else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_SVID0)
         {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_RGB0;
+                sdvo_priv->controlled_output = SDVO_OUTPUT_SVID0;
+                connector->display_info.subpixel_order = SubPixelHorizontalRGB;
+                encoder_type = DRM_MODE_ENCODER_TVDAC;
+                connector_type = DRM_MODE_CONNECTOR_SVIDEO;
+                sdvo_priv->is_tv = true;
+                intel_output->needs_tv_clock = true;
+        }
+        else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0)
+        {
+                sdvo_priv->controlled_output = SDVO_OUTPUT_RGB0;
                 connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_DAC;
                 connector_type = DRM_MODE_CONNECTOR_VGA;
         }
         else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB1)
         {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_RGB1;
+                sdvo_priv->controlled_output = SDVO_OUTPUT_RGB1;
                 connector->display_info.subpixel_order = SubPixelHorizontalRGB;
                 encoder_type = DRM_MODE_ENCODER_DAC;
                 connector_type = DRM_MODE_CONNECTOR_VGA;
         }
-        else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS0)
+        else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS0)
         {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_TMDS0;
+                sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS0;
                 connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-                encoder_type = DRM_MODE_ENCODER_TMDS;
-                connector_type = DRM_MODE_CONNECTOR_DVID;
+                encoder_type = DRM_MODE_ENCODER_LVDS;
+                connector_type = DRM_MODE_CONNECTOR_LVDS;
         }
-        else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS1)
+        else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_LVDS1)
         {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_TMDS1;
+                sdvo_priv->controlled_output = SDVO_OUTPUT_LVDS1;
                 connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-                encoder_type = DRM_MODE_ENCODER_TMDS;
-                connector_type = DRM_MODE_CONNECTOR_DVID;
+                encoder_type = DRM_MODE_ENCODER_LVDS;
+                connector_type = DRM_MODE_CONNECTOR_LVDS;
         }
         else
         {
                 unsigned char bytes[2];
 
+                sdvo_priv->controlled_output = 0;
                 memcpy (bytes, &sdvo_priv->caps.output_flags, 2);
-                DRM_DEBUG("%s: No active RGB or TMDS outputs (0x%02x%02x)\n",
+                DRM_DEBUG("%s: Unknown SDVO output type (0x%02x%02x)\n",
                           SDVO_NAME(sdvo_priv),
                           bytes[0], bytes[1]);
+                encoder_type = DRM_MODE_ENCODER_NONE;
+                connector_type = DRM_MODE_CONNECTOR_Unknown;
                 goto err_i2c;
         }
 
@@ -1089,6 +1761,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
         drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
         drm_sysfs_connector_add(connector);
 
+        intel_sdvo_select_ddc_bus(sdvo_priv);
+
         /* Set the input timing to the screen. Assume always input 0. */
         intel_sdvo_set_target_input(intel_output, true, false);
 
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
index 861a43f8693c..1117b9c151a6 100644
--- a/drivers/gpu/drm/i915/intel_sdvo_regs.h
+++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h
@@ -173,6 +173,9 @@ struct intel_sdvo_get_trained_inputs_response {
  * Returns two struct intel_sdvo_output_flags structures.
  */
 #define SDVO_CMD_GET_IN_OUT_MAP                         0x06
+struct intel_sdvo_in_out_map {
+    u16 in0, in1;
+};
 
 /**
  * Sets the current mapping of SDVO inputs to outputs on the device.
@@ -206,7 +209,8 @@ struct intel_sdvo_get_trained_inputs_response {
 struct intel_sdvo_get_interrupt_event_source_response {
     u16 interrupt_status;
     unsigned int ambient_light_interrupt:1;
-    unsigned int pad:7;
+    unsigned int hdmi_audio_encrypt_change:1;
+    unsigned int pad:6;
 } __attribute__((packed));
 
 /**
@@ -305,23 +309,411 @@ struct intel_sdvo_set_target_input_args {
 # define SDVO_CLOCK_RATE_MULT_4X                                (1 << 3)
 
 #define SDVO_CMD_GET_SUPPORTED_TV_FORMATS               0x27
+/** 5 bytes of bit flags for TV formats shared by all TV format functions */
+struct intel_sdvo_tv_format {
+    unsigned int ntsc_m:1;
+    unsigned int ntsc_j:1;
+    unsigned int ntsc_443:1;
+    unsigned int pal_b:1;
+    unsigned int pal_d:1;
+    unsigned int pal_g:1;
+    unsigned int pal_h:1;
+    unsigned int pal_i:1;
+
+    unsigned int pal_m:1;
+    unsigned int pal_n:1;
+    unsigned int pal_nc:1;
+    unsigned int pal_60:1;
+    unsigned int secam_b:1;
+    unsigned int secam_d:1;
+    unsigned int secam_g:1;
+    unsigned int secam_k:1;
+
+    unsigned int secam_k1:1;
+    unsigned int secam_l:1;
+    unsigned int secam_60:1;
+    unsigned int hdtv_std_smpte_240m_1080i_59:1;
+    unsigned int hdtv_std_smpte_240m_1080i_60:1;
+    unsigned int hdtv_std_smpte_260m_1080i_59:1;
+    unsigned int hdtv_std_smpte_260m_1080i_60:1;
+    unsigned int hdtv_std_smpte_274m_1080i_50:1;
+
+    unsigned int hdtv_std_smpte_274m_1080i_59:1;
+    unsigned int hdtv_std_smpte_274m_1080i_60:1;
+    unsigned int hdtv_std_smpte_274m_1080p_23:1;
+    unsigned int hdtv_std_smpte_274m_1080p_24:1;
+    unsigned int hdtv_std_smpte_274m_1080p_25:1;
+    unsigned int hdtv_std_smpte_274m_1080p_29:1;
+    unsigned int hdtv_std_smpte_274m_1080p_30:1;
+    unsigned int hdtv_std_smpte_274m_1080p_50:1;
+
+    unsigned int hdtv_std_smpte_274m_1080p_59:1;
+    unsigned int hdtv_std_smpte_274m_1080p_60:1;
+    unsigned int hdtv_std_smpte_295m_1080i_50:1;
+    unsigned int hdtv_std_smpte_295m_1080p_50:1;
+    unsigned int hdtv_std_smpte_296m_720p_59:1;
+    unsigned int hdtv_std_smpte_296m_720p_60:1;
+    unsigned int hdtv_std_smpte_296m_720p_50:1;
+    unsigned int hdtv_std_smpte_293m_480p_59:1;
+
+    unsigned int hdtv_std_smpte_170m_480i_59:1;
+    unsigned int hdtv_std_iturbt601_576i_50:1;
+    unsigned int hdtv_std_iturbt601_576p_50:1;
+    unsigned int hdtv_std_eia_7702a_480i_60:1;
+    unsigned int hdtv_std_eia_7702a_480p_60:1;
+    unsigned int pad:3;
+} __attribute__((packed));
 
 #define SDVO_CMD_GET_TV_FORMAT                          0x28
 
 #define SDVO_CMD_SET_TV_FORMAT                          0x29
 
+/** Returns the resolutiosn that can be used with the given TV format */
+#define SDVO_CMD_GET_SDTV_RESOLUTION_SUPPORT            0x83
+struct intel_sdvo_sdtv_resolution_request {
+    unsigned int ntsc_m:1;
+    unsigned int ntsc_j:1;
+    unsigned int ntsc_443:1;
+    unsigned int pal_b:1;
+    unsigned int pal_d:1;
+    unsigned int pal_g:1;
+    unsigned int pal_h:1;
+    unsigned int pal_i:1;
+
+    unsigned int pal_m:1;
+    unsigned int pal_n:1;
+    unsigned int pal_nc:1;
+    unsigned int pal_60:1;
+    unsigned int secam_b:1;
+    unsigned int secam_d:1;
+    unsigned int secam_g:1;
+    unsigned int secam_k:1;
+
+    unsigned int secam_k1:1;
+    unsigned int secam_l:1;
+    unsigned int secam_60:1;
+    unsigned int pad:5;
+} __attribute__((packed));
+
+struct intel_sdvo_sdtv_resolution_reply {
+    unsigned int res_320x200:1;
+    unsigned int res_320x240:1;
+    unsigned int res_400x300:1;
+    unsigned int res_640x350:1;
+    unsigned int res_640x400:1;
+    unsigned int res_640x480:1;
+    unsigned int res_704x480:1;
+    unsigned int res_704x576:1;
+
+    unsigned int res_720x350:1;
+    unsigned int res_720x400:1;
+    unsigned int res_720x480:1;
+    unsigned int res_720x540:1;
+    unsigned int res_720x576:1;
+    unsigned int res_768x576:1;
+    unsigned int res_800x600:1;
+    unsigned int res_832x624:1;
+
+    unsigned int res_920x766:1;
+    unsigned int res_1024x768:1;
+    unsigned int res_1280x1024:1;
+    unsigned int pad:5;
+} __attribute__((packed));
+
+/* Get supported resolution with squire pixel aspect ratio that can be
+   scaled for the requested HDTV format */
+#define SDVO_CMD_GET_SCALED_HDTV_RESOLUTION_SUPPORT             0x85
+
+struct intel_sdvo_hdtv_resolution_request {
+    unsigned int hdtv_std_smpte_240m_1080i_59:1;
+    unsigned int hdtv_std_smpte_240m_1080i_60:1;
+    unsigned int hdtv_std_smpte_260m_1080i_59:1;
+    unsigned int hdtv_std_smpte_260m_1080i_60:1;
+    unsigned int hdtv_std_smpte_274m_1080i_50:1;
+    unsigned int hdtv_std_smpte_274m_1080i_59:1;
+    unsigned int hdtv_std_smpte_274m_1080i_60:1;
+    unsigned int hdtv_std_smpte_274m_1080p_23:1;
+
+    unsigned int hdtv_std_smpte_274m_1080p_24:1;
+    unsigned int hdtv_std_smpte_274m_1080p_25:1;
+    unsigned int hdtv_std_smpte_274m_1080p_29:1;
+    unsigned int hdtv_std_smpte_274m_1080p_30:1;
+    unsigned int hdtv_std_smpte_274m_1080p_50:1;
+    unsigned int hdtv_std_smpte_274m_1080p_59:1;
+    unsigned int hdtv_std_smpte_274m_1080p_60:1;
+    unsigned int hdtv_std_smpte_295m_1080i_50:1;
+
+    unsigned int hdtv_std_smpte_295m_1080p_50:1;
+    unsigned int hdtv_std_smpte_296m_720p_59:1;
+    unsigned int hdtv_std_smpte_296m_720p_60:1;
+    unsigned int hdtv_std_smpte_296m_720p_50:1;
+    unsigned int hdtv_std_smpte_293m_480p_59:1;
+    unsigned int hdtv_std_smpte_170m_480i_59:1;
+    unsigned int hdtv_std_iturbt601_576i_50:1;
+    unsigned int hdtv_std_iturbt601_576p_50:1;
+
+    unsigned int hdtv_std_eia_7702a_480i_60:1;
+    unsigned int hdtv_std_eia_7702a_480p_60:1;
+    unsigned int pad:6;
+} __attribute__((packed));
+
+struct intel_sdvo_hdtv_resolution_reply {
+    unsigned int res_640x480:1;
+    unsigned int res_800x600:1;
+    unsigned int res_1024x768:1;
+    unsigned int res_1280x960:1;
+    unsigned int res_1400x1050:1;
+    unsigned int res_1600x1200:1;
+    unsigned int res_1920x1440:1;
+    unsigned int res_2048x1536:1;
+
+    unsigned int res_2560x1920:1;
+    unsigned int res_3200x2400:1;
+    unsigned int res_3840x2880:1;
+    unsigned int pad1:5;
+
+    unsigned int res_848x480:1;
+    unsigned int res_1064x600:1;
+    unsigned int res_1280x720:1;
+    unsigned int res_1360x768:1;
+    unsigned int res_1704x960:1;
+    unsigned int res_1864x1050:1;
+    unsigned int res_1920x1080:1;
+    unsigned int res_2128x1200:1;
+
+    unsigned int res_2560x1400:1;
+    unsigned int res_2728x1536:1;
+    unsigned int res_3408x1920:1;
+    unsigned int res_4264x2400:1;
+    unsigned int res_5120x2880:1;
+    unsigned int pad2:3;
+
+    unsigned int res_768x480:1;
+    unsigned int res_960x600:1;
+    unsigned int res_1152x720:1;
+    unsigned int res_1124x768:1;
+    unsigned int res_1536x960:1;
+    unsigned int res_1680x1050:1;
+    unsigned int res_1728x1080:1;
+    unsigned int res_1920x1200:1;
+
+    unsigned int res_2304x1440:1;
+    unsigned int res_2456x1536:1;
+    unsigned int res_3072x1920:1;
+    unsigned int res_3840x2400:1;
+    unsigned int res_4608x2880:1;
+    unsigned int pad3:3;
+
+    unsigned int res_1280x1024:1;
+    unsigned int pad4:7;
+
+    unsigned int res_1280x768:1;
+    unsigned int pad5:7;
+} __attribute__((packed));
+
+/* Get supported power state returns info for encoder and monitor, rely on
+   last SetTargetInput and SetTargetOutput calls */
 #define SDVO_CMD_GET_SUPPORTED_POWER_STATES             0x2a
+/* Get power state returns info for encoder and monitor, rely on last
+   SetTargetInput and SetTargetOutput calls */
+#define SDVO_CMD_GET_POWER_STATE                        0x2b
 #define SDVO_CMD_GET_ENCODER_POWER_STATE                0x2b
 #define SDVO_CMD_SET_ENCODER_POWER_STATE                0x2c
 # define SDVO_ENCODER_STATE_ON                                  (1 << 0)
 # define SDVO_ENCODER_STATE_STANDBY                             (1 << 1)
 # define SDVO_ENCODER_STATE_SUSPEND                             (1 << 2)
 # define SDVO_ENCODER_STATE_OFF                                 (1 << 3)
+# define SDVO_MONITOR_STATE_ON                                  (1 << 4)
+# define SDVO_MONITOR_STATE_STANDBY                             (1 << 5)
+# define SDVO_MONITOR_STATE_SUSPEND                             (1 << 6)
+# define SDVO_MONITOR_STATE_OFF                                 (1 << 7)
+
+#define SDVO_CMD_GET_MAX_PANEL_POWER_SEQUENCING         0x2d
+#define SDVO_CMD_GET_PANEL_POWER_SEQUENCING             0x2e
+#define SDVO_CMD_SET_PANEL_POWER_SEQUENCING             0x2f
+/**
+ * The panel power sequencing parameters are in units of milliseconds.
+ * The high fields are bits 8:9 of the 10-bit values.
+ */
+struct sdvo_panel_power_sequencing {
+    u8 t0;
+    u8 t1;
+    u8 t2;
+    u8 t3;
+    u8 t4;
+
+    unsigned int t0_high:2;
+    unsigned int t1_high:2;
+    unsigned int t2_high:2;
+    unsigned int t3_high:2;
+
+    unsigned int t4_high:2;
+    unsigned int pad:6;
+} __attribute__((packed));
+
+#define SDVO_CMD_GET_MAX_BACKLIGHT_LEVEL                0x30
+struct sdvo_max_backlight_reply {
+    u8 max_value;
+    u8 default_value;
+} __attribute__((packed));
+
+#define SDVO_CMD_GET_BACKLIGHT_LEVEL                    0x31
+#define SDVO_CMD_SET_BACKLIGHT_LEVEL                    0x32
+
+#define SDVO_CMD_GET_AMBIENT_LIGHT                      0x33
+struct sdvo_get_ambient_light_reply {
+    u16 trip_low;
+    u16 trip_high;
+    u16 value;
+} __attribute__((packed));
+#define SDVO_CMD_SET_AMBIENT_LIGHT                      0x34
+struct sdvo_set_ambient_light_reply {
+    u16 trip_low;
+    u16 trip_high;
+    unsigned int enable:1;
+    unsigned int pad:7;
+} __attribute__((packed));
+
+/* Set display power state */
+#define SDVO_CMD_SET_DISPLAY_POWER_STATE                0x7d
+# define SDVO_DISPLAY_STATE_ON                          (1 << 0)
+# define SDVO_DISPLAY_STATE_STANDBY                     (1 << 1)
+# define SDVO_DISPLAY_STATE_SUSPEND                     (1 << 2)
+# define SDVO_DISPLAY_STATE_OFF                         (1 << 3)
+
+#define SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS             0x84
+struct intel_sdvo_enhancements_reply {
+    unsigned int flicker_filter:1;
+    unsigned int flicker_filter_adaptive:1;
+    unsigned int flicker_filter_2d:1;
+    unsigned int saturation:1;
+    unsigned int hue:1;
+    unsigned int brightness:1;
+    unsigned int contrast:1;
+    unsigned int overscan_h:1;
+
+    unsigned int overscan_v:1;
+    unsigned int position_h:1;
+    unsigned int position_v:1;
+    unsigned int sharpness:1;
+    unsigned int dot_crawl:1;
+    unsigned int dither:1;
+    unsigned int max_tv_chroma_filter:1;
+    unsigned int max_tv_luma_filter:1;
+} __attribute__((packed));
+
+/* Picture enhancement limits below are dependent on the current TV format,
+ * and thus need to be queried and set after it.
+ */
+#define SDVO_CMD_GET_MAX_FLICKER_FITER                  0x4d
+#define SDVO_CMD_GET_MAX_ADAPTIVE_FLICKER_FITER         0x7b
+#define SDVO_CMD_GET_MAX_2D_FLICKER_FITER               0x52
+#define SDVO_CMD_GET_MAX_SATURATION                     0x55
+#define SDVO_CMD_GET_MAX_HUE                            0x58
+#define SDVO_CMD_GET_MAX_BRIGHTNESS                     0x5b
+#define SDVO_CMD_GET_MAX_CONTRAST                       0x5e
+#define SDVO_CMD_GET_MAX_OVERSCAN_H                     0x61
+#define SDVO_CMD_GET_MAX_OVERSCAN_V                     0x64
+#define SDVO_CMD_GET_MAX_POSITION_H                     0x67
+#define SDVO_CMD_GET_MAX_POSITION_V                     0x6a
+#define SDVO_CMD_GET_MAX_SHARPNESS_V                    0x6d
+#define SDVO_CMD_GET_MAX_TV_CHROMA                      0x74
+#define SDVO_CMD_GET_MAX_TV_LUMA                        0x77
+struct intel_sdvo_enhancement_limits_reply {
+    u16 max_value;
+    u16 default_value;
+} __attribute__((packed));
 
-#define SDVO_CMD_SET_TV_RESOLUTION_SUPPORT              0x93
+#define SDVO_CMD_GET_LVDS_PANEL_INFORMATION             0x7f
+#define SDVO_CMD_SET_LVDS_PANEL_INFORMATION             0x80
+# define SDVO_LVDS_COLOR_DEPTH_18                       (0 << 0)
+# define SDVO_LVDS_COLOR_DEPTH_24                       (1 << 0)
+# define SDVO_LVDS_CONNECTOR_SPWG                       (0 << 2)
+# define SDVO_LVDS_CONNECTOR_OPENLDI                    (1 << 2)
+# define SDVO_LVDS_SINGLE_CHANNEL                       (0 << 4)
+# define SDVO_LVDS_DUAL_CHANNEL                         (1 << 4)
+
+#define SDVO_CMD_GET_FLICKER_FILTER                     0x4e
+#define SDVO_CMD_SET_FLICKER_FILTER                     0x4f
+#define SDVO_CMD_GET_ADAPTIVE_FLICKER_FITER             0x50
+#define SDVO_CMD_SET_ADAPTIVE_FLICKER_FITER             0x51
+#define SDVO_CMD_GET_2D_FLICKER_FITER                   0x53
+#define SDVO_CMD_SET_2D_FLICKER_FITER                   0x54
+#define SDVO_CMD_GET_SATURATION                         0x56
+#define SDVO_CMD_SET_SATURATION                         0x57
+#define SDVO_CMD_GET_HUE                                0x59
+#define SDVO_CMD_SET_HUE                                0x5a
+#define SDVO_CMD_GET_BRIGHTNESS                         0x5c
+#define SDVO_CMD_SET_BRIGHTNESS                         0x5d
+#define SDVO_CMD_GET_CONTRAST                           0x5f
+#define SDVO_CMD_SET_CONTRAST                           0x60
+#define SDVO_CMD_GET_OVERSCAN_H                         0x62
+#define SDVO_CMD_SET_OVERSCAN_H                         0x63
+#define SDVO_CMD_GET_OVERSCAN_V                         0x65
+#define SDVO_CMD_SET_OVERSCAN_V                         0x66
+#define SDVO_CMD_GET_POSITION_H                         0x68
+#define SDVO_CMD_SET_POSITION_H                         0x69
+#define SDVO_CMD_GET_POSITION_V                         0x6b
+#define SDVO_CMD_SET_POSITION_V                         0x6c
+#define SDVO_CMD_GET_SHARPNESS                          0x6e
+#define SDVO_CMD_SET_SHARPNESS                          0x6f
+#define SDVO_CMD_GET_TV_CHROMA                          0x75
+#define SDVO_CMD_SET_TV_CHROMA                          0x76
+#define SDVO_CMD_GET_TV_LUMA                            0x78
+#define SDVO_CMD_SET_TV_LUMA                            0x79
+struct intel_sdvo_enhancements_arg {
+    u16 value;
+}__attribute__((packed));
+
+#define SDVO_CMD_GET_DOT_CRAWL                          0x70
+#define SDVO_CMD_SET_DOT_CRAWL                          0x71
+# define SDVO_DOT_CRAWL_ON                                      (1 << 0)
+# define SDVO_DOT_CRAWL_DEFAULT_ON                              (1 << 1)
+
+#define SDVO_CMD_GET_DITHER                             0x72
+#define SDVO_CMD_SET_DITHER                             0x73
+# define SDVO_DITHER_ON                                         (1 << 0)
+# define SDVO_DITHER_DEFAULT_ON                                 (1 << 1)
 
 #define SDVO_CMD_SET_CONTROL_BUS_SWITCH                 0x7a
-# define SDVO_CONTROL_BUS_PROM                          0x0
-# define SDVO_CONTROL_BUS_DDC1                          0x1
-# define SDVO_CONTROL_BUS_DDC2                          0x2
-# define SDVO_CONTROL_BUS_DDC3                          0x3
+# define SDVO_CONTROL_BUS_PROM                          (1 << 0)
+# define SDVO_CONTROL_BUS_DDC1                          (1 << 1)
+# define SDVO_CONTROL_BUS_DDC2                          (1 << 2)
+# define SDVO_CONTROL_BUS_DDC3                          (1 << 3)
+
+/* HDMI op codes */
+#define SDVO_CMD_GET_SUPP_ENCODE        0x9d
+#define SDVO_CMD_GET_ENCODE             0x9e
+#define SDVO_CMD_SET_ENCODE             0x9f
+  #define SDVO_ENCODE_DVI       0x0
+  #define SDVO_ENCODE_HDMI      0x1
+#define SDVO_CMD_SET_PIXEL_REPLI        0x8b
+#define SDVO_CMD_GET_PIXEL_REPLI        0x8c
+#define SDVO_CMD_GET_COLORIMETRY_CAP    0x8d
+#define SDVO_CMD_SET_COLORIMETRY        0x8e
+  #define SDVO_COLORIMETRY_RGB256   0x0
+  #define SDVO_COLORIMETRY_RGB220   0x1
+  #define SDVO_COLORIMETRY_YCrCb422 0x3
+  #define SDVO_COLORIMETRY_YCrCb444 0x4
+#define SDVO_CMD_GET_COLORIMETRY        0x8f
+#define SDVO_CMD_GET_AUDIO_ENCRYPT_PREFER 0x90
+#define SDVO_CMD_SET_AUDIO_STAT         0x91
+#define SDVO_CMD_GET_AUDIO_STAT         0x92
+#define SDVO_CMD_SET_HBUF_INDEX         0x93
+#define SDVO_CMD_GET_HBUF_INDEX         0x94
+#define SDVO_CMD_GET_HBUF_INFO          0x95
+#define SDVO_CMD_SET_HBUF_AV_SPLIT      0x96
+#define SDVO_CMD_GET_HBUF_AV_SPLIT      0x97
+#define SDVO_CMD_SET_HBUF_DATA          0x98
+#define SDVO_CMD_GET_HBUF_DATA          0x99
+#define SDVO_CMD_SET_HBUF_TXRATE        0x9a
+#define SDVO_CMD_GET_HBUF_TXRATE        0x9b
+  #define SDVO_HBUF_TX_DISABLED (0 << 6)
+  #define SDVO_HBUF_TX_ONCE     (2 << 6)
+  #define SDVO_HBUF_TX_VSYNC    (3 << 6)
+#define SDVO_CMD_GET_AUDIO_TX_INFO      0x9c
+
+struct intel_sdvo_encode{
+    u8 dvi_rev;
+    u8 hdmi_rev;
+} __attribute__ ((packed));
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index fbb35dc56f5c..56485d67369b 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -411,7 +411,7 @@ struct tv_mode {
  * These values account for -1s required.
  */
 
-const static struct tv_mode tv_modes[] = {
+static const struct tv_mode tv_modes[] = {
         {
                 .name           = "NTSC-M",
                 .clock          = 107520,
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 63212d7bbc28..92965dbb3c14 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -557,8 +557,10 @@ static int radeon_do_engine_reset(struct drm_device * dev)
 }
 
 static void radeon_cp_init_ring_buffer(struct drm_device * dev,
-                                       drm_radeon_private_t * dev_priv)
+                                       drm_radeon_private_t *dev_priv,
+                                       struct drm_file *file_priv)
 {
+        struct drm_radeon_master_private *master_priv;
         u32 ring_start, cur_read_ptr;
         u32 tmp;
 
@@ -677,6 +679,14 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
         dev_priv->scratch[2] = 0;
         RADEON_WRITE(RADEON_LAST_CLEAR_REG, 0);
 
+        /* reset sarea copies of these */
+        master_priv = file_priv->master->driver_priv;
+        if (master_priv->sarea_priv) {
+                master_priv->sarea_priv->last_frame = 0;
+                master_priv->sarea_priv->last_dispatch = 0;
+                master_priv->sarea_priv->last_clear = 0;
+        }
+
         radeon_do_wait_for_idle(dev_priv);
 
         /* Sync everything up */
@@ -1039,9 +1049,9 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
 
 #if __OS_HAS_AGP
         if (dev_priv->flags & RADEON_IS_AGP) {
-                drm_core_ioremap(dev_priv->cp_ring, dev);
-                drm_core_ioremap(dev_priv->ring_rptr, dev);
-                drm_core_ioremap(dev->agp_buffer_map, dev);
+                drm_core_ioremap_wc(dev_priv->cp_ring, dev);
+                drm_core_ioremap_wc(dev_priv->ring_rptr, dev);
+                drm_core_ioremap_wc(dev->agp_buffer_map, dev);
                 if (!dev_priv->cp_ring->handle ||
                     !dev_priv->ring_rptr->handle ||
                     !dev->agp_buffer_map->handle) {
@@ -1215,7 +1225,7 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
         }
 
         radeon_cp_load_microcode(dev_priv);
-        radeon_cp_init_ring_buffer(dev, dev_priv);
+        radeon_cp_init_ring_buffer(dev, dev_priv, file_priv);
 
         dev_priv->last_buf = 0;
 
@@ -1281,7 +1291,7 @@ static int radeon_do_cleanup_cp(struct drm_device * dev)
  *
  * Charl P. Botha <http://cpbotha.net>
  */
-static int radeon_do_resume_cp(struct drm_device * dev)
+static int radeon_do_resume_cp(struct drm_device *dev, struct drm_file *file_priv)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
 
@@ -1304,7 +1314,7 @@ static int radeon_do_resume_cp(struct drm_device * dev)
         }
 
         radeon_cp_load_microcode(dev_priv);
-        radeon_cp_init_ring_buffer(dev, dev_priv);
+        radeon_cp_init_ring_buffer(dev, dev_priv, file_priv);
 
         radeon_do_engine_reset(dev);
         radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
@@ -1479,8 +1489,7 @@ int radeon_cp_idle(struct drm_device *dev, void *data, struct drm_file *file_pri
  */
 int radeon_cp_resume(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-
-        return radeon_do_resume_cp(dev);
+        return radeon_do_resume_cp(dev, file_priv);
 }
 
 int radeon_engine_reset(struct drm_device *dev, void *data, struct drm_file *file_priv)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 6cad69ed21c5..1cc967448f4d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1300,7 +1300,13 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
         { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
 
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
@@ -1605,6 +1611,7 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0002) },
         { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },
         { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
@@ -1612,10 +1619,6 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },
         { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
         { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
         { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
         { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
@@ -1626,8 +1629,6 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
         { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },
         { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
         { }
 };
 
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e899f510ebeb..88511970508d 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -348,6 +348,9 @@
 #define USB_VENDOR_ID_PLAYDOTCOM        0x0b43
 #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII      0x0003
 
+#define USB_VENDOR_ID_POWERCOM          0x0d9f
+#define USB_DEVICE_ID_POWERCOM_UPS      0x0002
+
 #define USB_VENDOR_ID_SAITEK            0x06a3
 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD  0xff17
 
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 732449628971..02b19db5442e 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -267,8 +267,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
                 default:
                         {
                                 struct hid_device *hid = dev->hid;
-                                if (_IOC_TYPE(cmd) != 'H' || _IOC_DIR(cmd) != _IOC_READ)
-                                        return -EINVAL;
+                                if (_IOC_TYPE(cmd) != 'H' || _IOC_DIR(cmd) != _IOC_READ) {
+                                        ret = -EINVAL;
+                                        break;
+                                }
 
                                 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) {
                                         int len;
@@ -277,8 +279,9 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
                                         len = strlen(hid->name) + 1;
                                         if (len > _IOC_SIZE(cmd))
                                                 len = _IOC_SIZE(cmd);
-                                        return copy_to_user(user_arg, hid->name, len) ?
+                                        ret = copy_to_user(user_arg, hid->name, len) ?
                                                 -EFAULT : len;
+                                        break;
                                 }
 
                                 if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) {
@@ -288,12 +291,13 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
                                         len = strlen(hid->phys) + 1;
                                         if (len > _IOC_SIZE(cmd))
                                                 len = _IOC_SIZE(cmd);
-                                        return copy_to_user(user_arg, hid->phys, len) ?
+                                        ret = copy_to_user(user_arg, hid->phys, len) ?
                                                 -EFAULT : len;
+                                        break;
                                 }
                 }
 
-                        ret = -ENOTTY;
+                ret = -ENOTTY;
         }
         unlock_kernel();
         return ret;
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
index 609cafff86bc..5f81ddf71508 100644
--- a/drivers/hwmon/f71882fg.c
+++ b/drivers/hwmon/f71882fg.c
@@ -1872,7 +1872,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address,
 
         devid = superio_inw(sioaddr, SIO_REG_MANID);
         if (devid != SIO_FINTEK_ID) {
-                printk(KERN_INFO DRVNAME ": Not a Fintek device\n");
+                pr_debug(DRVNAME ": Not a Fintek device\n");
                 goto exit;
         }
 
@@ -1932,7 +1932,7 @@ static int __init f71882fg_device_add(unsigned short address,
         res.name = f71882fg_pdev->name;
         err = acpi_check_resource_conflict(&res);
         if (err)
-                return err;
+                goto exit_device_put;
 
         err = platform_device_add_resources(f71882fg_pdev, &res, 1);
         if (err) {
diff --git a/drivers/hwmon/hp_accel.c b/drivers/hwmon/hp_accel.c
index 03705240000f..29c83b5b9697 100644
--- a/drivers/hwmon/hp_accel.c
+++ b/drivers/hwmon/hp_accel.c
@@ -153,7 +153,10 @@ static struct axis_conversion lis3lv02d_axis_y_inverted = {1, -2, 3};
 static struct axis_conversion lis3lv02d_axis_x_inverted = {-1, 2, 3};
 static struct axis_conversion lis3lv02d_axis_z_inverted = {1, 2, -3};
 static struct axis_conversion lis3lv02d_axis_xy_rotated_left = {-2, 1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_rotated_left_usd = {-2, 1, -3};
 static struct axis_conversion lis3lv02d_axis_xy_swap_inverted = {-2, -1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_rotated_right = {2, -1, 3};
+static struct axis_conversion lis3lv02d_axis_xy_swap_yz_inverted = {2, -1, -3};
 
 #define AXIS_DMI_MATCH(_ident, _name, _axis) {          \
         .ident = _ident,                                \
@@ -163,6 +166,18 @@ static struct axis_conversion lis3lv02d_axis_xy_swap_inverted = {-2, -1, 3};
         },                                              \
         .driver_data = &lis3lv02d_axis_##_axis          \
 }
+
+#define AXIS_DMI_MATCH2(_ident, _class1, _name1,        \
+                                _class2, _name2,        \
+                                _axis) {                \
+        .ident = _ident,                                \
+        .callback = lis3lv02d_dmi_matched,              \
+        .matches = {                                    \
+                DMI_MATCH(DMI_##_class1, _name1),       \
+                DMI_MATCH(DMI_##_class2, _name2),       \
+        },                                              \
+        .driver_data = &lis3lv02d_axis_##_axis          \
+}
 static struct dmi_system_id lis3lv02d_dmi_ids[] = {
         /* product names are truncated to match all kinds of a same model */
         AXIS_DMI_MATCH("NC64x0", "HP Compaq nc64", x_inverted),
@@ -172,10 +187,22 @@ static struct dmi_system_id lis3lv02d_dmi_ids[] = {
         AXIS_DMI_MATCH("NC2510", "HP Compaq 2510", y_inverted),
         AXIS_DMI_MATCH("NC8510", "HP Compaq 8510", xy_swap_inverted),
         AXIS_DMI_MATCH("HP2133", "HP 2133", xy_rotated_left),
+        AXIS_DMI_MATCH("NC653x", "HP Compaq 653", xy_rotated_left_usd),
+        AXIS_DMI_MATCH("NC673x", "HP Compaq 673", xy_rotated_left_usd),
+        AXIS_DMI_MATCH("NC651xx", "HP Compaq 651", xy_rotated_right),
+        AXIS_DMI_MATCH("NC671xx", "HP Compaq 671", xy_swap_yz_inverted),
+        /* Intel-based HP Pavilion dv5 */
+        AXIS_DMI_MATCH2("HPDV5_I",
+                        PRODUCT_NAME, "HP Pavilion dv5",
+                        BOARD_NAME, "3603",
+                        x_inverted),
+        /* AMD-based HP Pavilion dv5 */
+        AXIS_DMI_MATCH2("HPDV5_A",
+                        PRODUCT_NAME, "HP Pavilion dv5",
+                        BOARD_NAME, "3600",
+                        y_inverted),
         { NULL, }
 /* Laptop models without axis info (yet):
- * "NC651xx" "HP Compaq 651"
- * "NC671xx" "HP Compaq 671"
  * "NC6910" "HP Compaq 6910"
  * HP Compaq 8710x Notebook PC / Mobile Workstation
  * "NC2400" "HP Compaq nc2400"
@@ -208,9 +235,49 @@ static struct delayed_led_classdev hpled_led = {
         .set_brightness = hpled_set,
 };
 
+static acpi_status
+lis3lv02d_get_resource(struct acpi_resource *resource, void *context)
+{
+        if (resource->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
+                struct acpi_resource_extended_irq *irq;
+                u32 *device_irq = context;
+
+                irq = &resource->data.extended_irq;
+                *device_irq = irq->interrupts[0];
+        }
+
+        return AE_OK;
+}
+
+static void lis3lv02d_enum_resources(struct acpi_device *device)
+{
+        acpi_status status;
+
+        status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
+                                        lis3lv02d_get_resource, &adev.irq);
+        if (ACPI_FAILURE(status))
+                printk(KERN_DEBUG DRIVER_NAME ": Error getting resources\n");
+}
+
+static s16 lis3lv02d_read_16(acpi_handle handle, int reg)
+{
+        u8 lo, hi;
+
+        adev.read(handle, reg - 1, &lo);
+        adev.read(handle, reg, &hi);
+        /* In "12 bit right justified" mode, bit 6, bit 7, bit 8 = bit 5 */
+        return (s16)((hi << 8) | lo);
+}
+
+static s16 lis3lv02d_read_8(acpi_handle handle, int reg)
+{
+        s8 lo;
+        adev.read(handle, reg, &lo);
+        return lo;
+}
+
 static int lis3lv02d_add(struct acpi_device *device)
 {
-        u8 val;
         int ret;
 
         if (!device)
@@ -224,10 +291,22 @@ static int lis3lv02d_add(struct acpi_device *device)
         strcpy(acpi_device_class(device), ACPI_MDPS_CLASS);
         device->driver_data = &adev;
 
-        lis3lv02d_acpi_read(device->handle, WHO_AM_I, &val);
-        if ((val != LIS3LV02DL_ID) && (val != LIS302DL_ID)) {
+        lis3lv02d_acpi_read(device->handle, WHO_AM_I, &adev.whoami);
+        switch (adev.whoami) {
+        case LIS_DOUBLE_ID:
+                printk(KERN_INFO DRIVER_NAME ": 2-byte sensor found\n");
+                adev.read_data = lis3lv02d_read_16;
+                adev.mdps_max_val = 2048;
+                break;
+        case LIS_SINGLE_ID:
+                printk(KERN_INFO DRIVER_NAME ": 1-byte sensor found\n");
+                adev.read_data = lis3lv02d_read_8;
+                adev.mdps_max_val = 128;
+                break;
+        default:
                 printk(KERN_ERR DRIVER_NAME
-                                ": Accelerometer chip not LIS3LV02D{L,Q}\n");
+                        ": unknown sensor type 0x%X\n", adev.whoami);
+                return -EINVAL;
         }
 
         /* If possible use a "standard" axes order */
@@ -242,6 +321,9 @@ static int lis3lv02d_add(struct acpi_device *device)
         if (ret)
                 return ret;
 
+        /* obtain IRQ number of our device from ACPI */
+        lis3lv02d_enum_resources(adev.device);
+
         ret = lis3lv02d_init_device(&adev);
         if (ret) {
                 flush_work(&hpled_led.work);
diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
index 219d2d0d5a62..8bb2158f0453 100644
--- a/drivers/hwmon/lis3lv02d.c
+++ b/drivers/hwmon/lis3lv02d.c
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2007-2008 Yan Burman
  *  Copyright (C) 2008 Eric Piel
- *  Copyright (C) 2008 Pavel Machek
+ *  Copyright (C) 2008-2009 Pavel Machek
  *
  *  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
@@ -35,6 +35,7 @@
 #include <linux/poll.h>
 #include <linux/freezer.h>
 #include <linux/uaccess.h>
+#include <linux/miscdevice.h>
 #include <acpi/acpi_drivers.h>
 #include <asm/atomic.h>
 #include "lis3lv02d.h"
@@ -52,24 +53,14 @@
  * joystick.
  */
 
-/* Maximum value our axis may get for the input device (signed 12 bits) */
-#define MDPS_MAX_VAL 2048
+struct acpi_lis3lv02d adev = {
+        .misc_wait   = __WAIT_QUEUE_HEAD_INITIALIZER(adev.misc_wait),
+};
 
-struct acpi_lis3lv02d adev;
 EXPORT_SYMBOL_GPL(adev);
 
 static int lis3lv02d_add_fs(struct acpi_device *device);
 
-static s16 lis3lv02d_read_16(acpi_handle handle, int reg)
-{
-        u8 lo, hi;
-
-        adev.read(handle, reg, &lo);
-        adev.read(handle, reg + 1, &hi);
-        /* In "12 bit right justified" mode, bit 6, bit 7, bit 8 = bit 5 */
-        return (s16)((hi << 8) | lo);
-}
-
 /**
  * lis3lv02d_get_axis - For the given axis, give the value converted
  * @axis:      1,2,3 - can also be negative
@@ -98,9 +89,9 @@ static void lis3lv02d_get_xyz(acpi_handle handle, int *x, int *y, int *z)
 {
         int position[3];
 
-        position[0] = lis3lv02d_read_16(handle, OUTX_L);
-        position[1] = lis3lv02d_read_16(handle, OUTY_L);
-        position[2] = lis3lv02d_read_16(handle, OUTZ_L);
+        position[0] = adev.read_data(handle, OUTX);
+        position[1] = adev.read_data(handle, OUTY);
+        position[2] = adev.read_data(handle, OUTZ);
 
         *x = lis3lv02d_get_axis(adev.ac.x, position);
         *y = lis3lv02d_get_axis(adev.ac.y, position);
@@ -110,26 +101,13 @@ static void lis3lv02d_get_xyz(acpi_handle handle, int *x, int *y, int *z)
 void lis3lv02d_poweroff(acpi_handle handle)
 {
         adev.is_on = 0;
-        /* disable X,Y,Z axis and power down */
-        adev.write(handle, CTRL_REG1, 0x00);
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_poweroff);
 
 void lis3lv02d_poweron(acpi_handle handle)
 {
-        u8 val;
-
         adev.is_on = 1;
         adev.init(handle);
-        adev.write(handle, FF_WU_CFG, 0);
-        /*
-         * BDU: LSB and MSB values are not updated until both have been read.
-         *      So the value read will always be correct.
-         * IEN: Interrupt for free-fall and DD, not for data-ready.
-         */
-        adev.read(handle, CTRL_REG2, &val);
-        val |= CTRL2_BDU | CTRL2_IEN;
-        adev.write(handle, CTRL_REG2, val);
 }
 EXPORT_SYMBOL_GPL(lis3lv02d_poweron);
 
@@ -162,6 +140,140 @@ static void lis3lv02d_decrease_use(struct acpi_lis3lv02d *dev)
         mutex_unlock(&dev->lock);
 }
 
+static irqreturn_t lis302dl_interrupt(int irq, void *dummy)
+{
+        /*
+         * Be careful: on some HP laptops the bios force DD when on battery and
+         * the lid is closed. This leads to interrupts as soon as a little move
+         * is done.
+         */
+        atomic_inc(&adev.count);
+
+        wake_up_interruptible(&adev.misc_wait);
+        kill_fasync(&adev.async_queue, SIGIO, POLL_IN);
+        return IRQ_HANDLED;
+}
+
+static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
+{
+        int ret;
+
+        if (test_and_set_bit(0, &adev.misc_opened))
+                return -EBUSY; /* already open */
+
+        atomic_set(&adev.count, 0);
+
+        /*
+         * The sensor can generate interrupts for free-fall and direction
+         * detection (distinguishable with FF_WU_SRC and DD_SRC) but to keep
+         * the things simple and _fast_ we activate it only for free-fall, so
+         * no need to read register (very slow with ACPI). For the same reason,
+         * we forbid shared interrupts.
+         *
+         * IRQF_TRIGGER_RISING seems pointless on HP laptops because the
+         * io-apic is not configurable (and generates a warning) but I keep it
+         * in case of support for other hardware.
+         */
+        ret = request_irq(adev.irq, lis302dl_interrupt, IRQF_TRIGGER_RISING,
+                          DRIVER_NAME, &adev);
+
+        if (ret) {
+                clear_bit(0, &adev.misc_opened);
+                printk(KERN_ERR DRIVER_NAME ": IRQ%d allocation failed\n", adev.irq);
+                return -EBUSY;
+        }
+        lis3lv02d_increase_use(&adev);
+        printk("lis3: registered interrupt %d\n", adev.irq);
+        return 0;
+}
+
+static int lis3lv02d_misc_release(struct inode *inode, struct file *file)
+{
+        fasync_helper(-1, file, 0, &adev.async_queue);
+        lis3lv02d_decrease_use(&adev);
+        free_irq(adev.irq, &adev);
+        clear_bit(0, &adev.misc_opened); /* release the device */
+        return 0;
+}
+
+static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
+                                size_t count, loff_t *pos)
+{
+        DECLARE_WAITQUEUE(wait, current);
+        u32 data;
+        unsigned char byte_data;
+        ssize_t retval = 1;
+
+        if (count < 1)
+                return -EINVAL;
+
+        add_wait_queue(&adev.misc_wait, &wait);
+        while (true) {
+                set_current_state(TASK_INTERRUPTIBLE);
+                data = atomic_xchg(&adev.count, 0);
+                if (data)
+                        break;
+
+                if (file->f_flags & O_NONBLOCK) {
+                        retval = -EAGAIN;
+                        goto out;
+                }
+
+                if (signal_pending(current)) {
+                        retval = -ERESTARTSYS;
+                        goto out;
+                }
+
+                schedule();
+        }
+
+        if (data < 255)
+                byte_data = data;
+        else
+                byte_data = 255;
+
+        /* make sure we are not going into copy_to_user() with
+         * TASK_INTERRUPTIBLE state */
+        set_current_state(TASK_RUNNING);
+        if (copy_to_user(buf, &byte_data, sizeof(byte_data)))
+                retval = -EFAULT;
+
+out:
+        __set_current_state(TASK_RUNNING);
+        remove_wait_queue(&adev.misc_wait, &wait);
+
+        return retval;
+}
+
+static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
+{
+        poll_wait(file, &adev.misc_wait, wait);
+        if (atomic_read(&adev.count))
+                return POLLIN | POLLRDNORM;
+        return 0;
+}
+
+static int lis3lv02d_misc_fasync(int fd, struct file *file, int on)
+{
+        return fasync_helper(fd, file, on, &adev.async_queue);
+}
+
+static const struct file_operations lis3lv02d_misc_fops = {
+        .owner   = THIS_MODULE,
+        .llseek  = no_llseek,
+        .read    = lis3lv02d_misc_read,
+        .open    = lis3lv02d_misc_open,
+        .release = lis3lv02d_misc_release,
+        .poll    = lis3lv02d_misc_poll,
+        .fasync  = lis3lv02d_misc_fasync,
+};
+
+static struct miscdevice lis3lv02d_misc_device = {
+        .minor   = MISC_DYNAMIC_MINOR,
+        .name    = "freefall",
+        .fops    = &lis3lv02d_misc_fops,
+};
+
 /**
  * lis3lv02d_joystick_kthread - Kthread polling function
  * @data: unused - here to conform to threadfn prototype
@@ -203,7 +315,6 @@ static void lis3lv02d_joystick_close(struct input_dev *input)
         lis3lv02d_decrease_use(&adev);
 }
 
-
 static inline void lis3lv02d_calibrate_joystick(void)
 {
         lis3lv02d_get_xyz(adev.device->handle, &adev.xcalib, &adev.ycalib, &adev.zcalib);
@@ -231,9 +342,9 @@ int lis3lv02d_joystick_enable(void)
         adev.idev->close      = lis3lv02d_joystick_close;
 
         set_bit(EV_ABS, adev.idev->evbit);
-        input_set_abs_params(adev.idev, ABS_X, -MDPS_MAX_VAL, MDPS_MAX_VAL, 3, 3);
-        input_set_abs_params(adev.idev, ABS_Y, -MDPS_MAX_VAL, MDPS_MAX_VAL, 3, 3);
-        input_set_abs_params(adev.idev, ABS_Z, -MDPS_MAX_VAL, MDPS_MAX_VAL, 3, 3);
+        input_set_abs_params(adev.idev, ABS_X, -adev.mdps_max_val, adev.mdps_max_val, 3, 3);
+        input_set_abs_params(adev.idev, ABS_Y, -adev.mdps_max_val, adev.mdps_max_val, 3, 3);
+        input_set_abs_params(adev.idev, ABS_Z, -adev.mdps_max_val, adev.mdps_max_val, 3, 3);
 
         err = input_register_device(adev.idev);
         if (err) {
@@ -250,6 +361,7 @@ void lis3lv02d_joystick_disable(void)
         if (!adev.idev)
                 return;
 
+        misc_deregister(&lis3lv02d_misc_device);
         input_unregister_device(adev.idev);
         adev.idev = NULL;
 }
@@ -268,6 +380,19 @@ int lis3lv02d_init_device(struct acpi_lis3lv02d *dev)
         if (lis3lv02d_joystick_enable())
                 printk(KERN_ERR DRIVER_NAME ": joystick initialization failed\n");
 
+        printk("lis3_init_device: irq %d\n", dev->irq);
+
+        /* if we did not get an IRQ from ACPI - we have nothing more to do */
+        if (!dev->irq) {
+                printk(KERN_ERR DRIVER_NAME
+                        ": No IRQ in ACPI. Disabling /dev/freefall\n");
+                goto out;
+        }
+
+        printk("lis3: registering device\n");
+        if (misc_register(&lis3lv02d_misc_device))
+                printk(KERN_ERR DRIVER_NAME ": misc_register failed\n");
+out:
         lis3lv02d_decrease_use(dev);
         return 0;
 }
@@ -351,6 +476,6 @@ int lis3lv02d_remove_fs(void)
 EXPORT_SYMBOL_GPL(lis3lv02d_remove_fs);
 
 MODULE_DESCRIPTION("ST LIS3LV02Dx three-axis digital accelerometer driver");
-MODULE_AUTHOR("Yan Burman and Eric Piel");
+MODULE_AUTHOR("Yan Burman, Eric Piel, Pavel Machek");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
index 223f1c0763bb..75972bf372ff 100644
--- a/drivers/hwmon/lis3lv02d.h
+++ b/drivers/hwmon/lis3lv02d.h
@@ -22,12 +22,15 @@
 /*
  * The actual chip is STMicroelectronics LIS3LV02DL or LIS3LV02DQ that seems to
  * be connected via SPI. There exists also several similar chips (such as LIS302DL or
- * LIS3L02DQ) but not in the HP laptops and they have slightly different registers.
+ * LIS3L02DQ) and they have slightly different registers, but we can provide a
+ * common interface for all of them.
  * They can also be connected via I²C.
  */
 
-#define LIS3LV02DL_ID   0x3A /* Also the LIS3LV02DQ */
-#define LIS302DL_ID     0x3B /* Also the LIS202DL! */
+/* 2-byte registers */
+#define LIS_DOUBLE_ID   0x3A /* LIS3LV02D[LQ] */
+/* 1-byte registers */
+#define LIS_SINGLE_ID   0x3B /* LIS[32]02DL and others */
 
 enum lis3lv02d_reg {
         WHO_AM_I        = 0x0F,
@@ -44,10 +47,13 @@ enum lis3lv02d_reg {
         STATUS_REG      = 0x27,
         OUTX_L          = 0x28,
         OUTX_H          = 0x29,
+        OUTX            = 0x29,
         OUTY_L          = 0x2A,
         OUTY_H          = 0x2B,
+        OUTY            = 0x2B,
         OUTZ_L          = 0x2C,
         OUTZ_H          = 0x2D,
+        OUTZ            = 0x2D,
         FF_WU_CFG       = 0x30,
         FF_WU_SRC       = 0x31,
         FF_WU_ACK       = 0x32,
@@ -159,6 +165,10 @@ struct acpi_lis3lv02d {
         acpi_status (*write) (acpi_handle handle, int reg, u8 val);
         acpi_status (*read) (acpi_handle handle, int reg, u8 *ret);
 
+        u8                      whoami;    /* 3Ah: 2-byte registries, 3Bh: 1-byte registries */
+        s16 (*read_data) (acpi_handle handle, int reg);
+        int                     mdps_max_val;
+
         struct input_dev        *idev;     /* input device */
         struct task_struct      *kthread;  /* kthread for input */
         struct mutex            lock;
@@ -170,6 +180,11 @@ struct acpi_lis3lv02d {
         unsigned char           is_on;     /* whether the device is on or off */
         unsigned char           usage;     /* usage counter */
         struct axis_conversion  ac;        /* hw -> logical axis */
+
+        u32                     irq;       /* IRQ number */
+        struct fasync_struct    *async_queue; /* queue for the misc device */
+        wait_queue_head_t       misc_wait; /* Wait queue for the misc device */
+        unsigned long           misc_opened; /* bit0: whether the device is open */
 };
 
 int lis3lv02d_init_device(struct acpi_lis3lv02d *dev);
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c
index b0ce37852281..73f77a9b8b18 100644
--- a/drivers/hwmon/vt1211.c
+++ b/drivers/hwmon/vt1211.c
@@ -1262,7 +1262,7 @@ static int __init vt1211_device_add(unsigned short address)
         res.name = pdev->name;
         err = acpi_check_resource_conflict(&res);
         if (err)
-                goto EXIT;
+                goto EXIT_DEV_PUT;
 
         err = platform_device_add_resources(pdev, &res, 1);
         if (err) {
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index cb808d015361..feae743ba991 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1548,7 +1548,7 @@ static int __init sensors_w83627ehf_init(void)
 
         err = acpi_check_resource_conflict(&res);
         if (err)
-                goto exit;
+                goto exit_device_put;
 
         err = platform_device_add_resources(pdev, &res, 1);
         if (err) {
diff --git a/drivers/ide/qd65xx.c b/drivers/ide/qd65xx.c
index 5b2e3af43c4b..08c4fa35e9b1 100644
--- a/drivers/ide/qd65xx.c
+++ b/drivers/ide/qd65xx.c
@@ -16,7 +16,7 @@
 
 /*
  * Rewritten from the work of Colten Edwards <pje120@cs.usask.ca> by
- * Samuel Thibault <samuel.thibault@fnac.net>
+ * Samuel Thibault <samuel.thibault@ens-lyon.org>
  */
 
 #include <linux/module.h>
diff --git a/drivers/ide/qd65xx.h b/drivers/ide/qd65xx.h
index 6636f9665d16..d7e67a1a1dcc 100644
--- a/drivers/ide/qd65xx.h
+++ b/drivers/ide/qd65xx.h
@@ -4,7 +4,7 @@
 
 /*
  * Authors:     Petr Soucek <petr@ryston.cz>
- *              Samuel Thibault <samuel.thibault@fnac.net>
+ *              Samuel Thibault <samuel.thibault@ens-lyon.org>
  */
 
 /* truncates a in [b,c] */
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index a329e6bd5d2d..3838bc4acaba 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1823,6 +1823,10 @@ static int dv1394_open(struct inode *inode, struct file *file)
 
 #endif
 
+        printk(KERN_INFO "%s: NOTE, the dv1394 interface is unsupported "
+               "and will not be available in the new firewire driver stack. "
+               "Try libraw1394 based programs instead.\n", current->comm);
+
         return 0;
 }
 
@@ -2567,10 +2571,6 @@ static int __init dv1394_init_module(void)
 {
         int ret;
 
-        printk(KERN_WARNING
-               "NOTE: The dv1394 driver is unsupported and may be removed in a "
-               "future Linux release. Use raw1394 instead.\n");
-
         cdev_init(&dv1394_cdev, &dv1394_fops);
         dv1394_cdev.owner = THIS_MODULE;
         ret = cdev_add(&dv1394_cdev, IEEE1394_DV1394_DEV, 16);
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index a34338567a2a..f14813be4eff 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -328,7 +328,7 @@ static void dispatch_io(int rw, unsigned int num_regions,
         struct dpages old_pages = *dp;
 
         if (sync)
-                rw |= (1 << BIO_RW_SYNC);
+                rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
 
         /*
          * For multiple regions we need to be careful to rewind
diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 3073618269ea..0a225da21272 100644
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -344,7 +344,7 @@ static int run_io_job(struct kcopyd_job *job)
 {
         int r;
         struct dm_io_request io_req = {
-                .bi_rw = job->rw | (1 << BIO_RW_SYNC),
+                .bi_rw = job->rw | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG),
                 .mem.type = DM_IO_PAGE_LIST,
                 .mem.ptr.pl = job->pages,
                 .mem.offset = job->offset,
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 1e3aea9eecf1..09658b218474 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -25,13 +25,13 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)
 {
         dev_info_t *hash;
         linear_conf_t *conf = mddev_to_conf(mddev);
+        sector_t idx = sector >> conf->sector_shift;
 
         /*
          * sector_div(a,b) returns the remainer and sets a to a/b
          */
-        sector >>= conf->sector_shift;
-        (void)sector_div(sector, conf->spacing);
-        hash = conf->hash_table[sector];
+        (void)sector_div(idx, conf->spacing);
+        hash = conf->hash_table[idx];
 
         while (sector >= hash->num_sectors + hash->start_sector)
                 hash++;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 41e2509bf896..03b4cd0a6344 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -474,7 +474,7 @@ void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
          * causes ENOTSUPP, we allocate a spare bio...
          */
         struct bio *bio = bio_alloc(GFP_NOIO, 1);
-        int rw = (1<<BIO_RW) | (1<<BIO_RW_SYNC);
+        int rw = (1<<BIO_RW) | (1<<BIO_RW_SYNCIO) | (1<<BIO_RW_UNPLUG);
 
         bio->bi_bdev = rdev->bdev;
         bio->bi_sector = sector;
@@ -531,7 +531,7 @@ int sync_page_io(struct block_device *bdev, sector_t sector, int size,
         struct completion event;
         int ret;
 
-        rw |= (1 << BIO_RW_SYNC);
+        rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
 
         bio->bi_bdev = bdev;
         bio->bi_sector = sector;
@@ -1481,6 +1481,11 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
                 if (find_rdev_nr(mddev, rdev->desc_nr))
                         return -EBUSY;
         }
+        if (mddev->max_disks && rdev->desc_nr >= mddev->max_disks) {
+                printk(KERN_WARNING "md: %s: array is limited to %d devices\n",
+                       mdname(mddev), mddev->max_disks);
+                return -EBUSY;
+        }
         bdevname(rdev->bdev,b);
         while ( (s=strchr(b, '/')) != NULL)
                 *s = '!';
@@ -2441,6 +2446,15 @@ static void analyze_sbs(mddev_t * mddev)
 
         i = 0;
         rdev_for_each(rdev, tmp, mddev) {
+                if (rdev->desc_nr >= mddev->max_disks ||
+                    i > mddev->max_disks) {
+                        printk(KERN_WARNING
+                               "md: %s: %s: only %d devices permitted\n",
+                               mdname(mddev), bdevname(rdev->bdev, b),
+                               mddev->max_disks);
+                        kick_rdev_from_array(rdev);
+                        continue;
+                }
                 if (rdev != freshest)
                         if (super_types[mddev->major_version].
                             validate_super(mddev, rdev)) {
@@ -4614,13 +4628,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
          * noticed in interrupt contexts ...
          */
 
-        if (rdev->desc_nr == mddev->max_disks) {
-                printk(KERN_WARNING "%s: can not hot-add to full array!\n",
-                        mdname(mddev));
-                err = -EBUSY;
-                goto abort_unbind_export;
-        }
-
         rdev->raid_disk = -1;
 
         md_update_sb(mddev, 1);
@@ -4634,9 +4641,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
         md_new_event(mddev);
         return 0;
 
-abort_unbind_export:
-        unbind_rdev_from_array(rdev);
-
 abort_export:
         export_rdev(rdev);
         return err;
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 7b4f5f7155d8..01e3cffd03b8 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1640,7 +1640,8 @@ static void raid1d(mddev_t *mddev)
                         }
 
                         bio = r1_bio->bios[r1_bio->read_disk];
-                        if ((disk=read_balance(conf, r1_bio)) == -1) {
+                        if ((disk=read_balance(conf, r1_bio)) == -1 ||
+                            disk == r1_bio->read_disk) {
                                 printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
                                        " read error for block %llu\n",
                                        bdevname(bio->bi_bdev,b),
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index de7adaf5fa5b..78412c9c424a 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -318,7 +318,6 @@ static int simple_std_setup(struct dvb_frontend *fe,
                             u8 *config, u8 *cb)
 {
         struct tuner_simple_priv *priv = fe->tuner_priv;
-        u8 tuneraddr;
         int rc;
 
         /* tv norm specific stuff for multi-norm tuners */
@@ -387,6 +386,7 @@ static int simple_std_setup(struct dvb_frontend *fe,
 
         case TUNER_PHILIPS_TUV1236D:
         {
+                struct tuner_i2c_props i2c = priv->i2c_props;
                 /* 0x40 -> ATSC antenna input 1 */
                 /* 0x48 -> ATSC antenna input 2 */
                 /* 0x00 -> NTSC antenna input 1 */
@@ -398,17 +398,15 @@ static int simple_std_setup(struct dvb_frontend *fe,
                         buffer[1] = 0x04;
                 }
                 /* set to the correct mode (analog or digital) */
-                tuneraddr = priv->i2c_props.addr;
-                priv->i2c_props.addr = 0x0a;
-                rc = tuner_i2c_xfer_send(&priv->i2c_props, &buffer[0], 2);
+                i2c.addr = 0x0a;
+                rc = tuner_i2c_xfer_send(&i2c, &buffer[0], 2);
                 if (2 != rc)
                         tuner_warn("i2c i/o error: rc == %d "
                                    "(should be 2)\n", rc);
-                rc = tuner_i2c_xfer_send(&priv->i2c_props, &buffer[2], 2);
+                rc = tuner_i2c_xfer_send(&i2c, &buffer[2], 2);
                 if (2 != rc)
                         tuner_warn("i2c i/o error: rc == %d "
                                    "(should be 2)\n", rc);
-                priv->i2c_props.addr = tuneraddr;
                 break;
         }
         }
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 0c733c66a441..069d847ba887 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -364,16 +364,15 @@ static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
                                        enum dmx_success success)
 {
         struct dmxdev_filter *dmxdevfilter = filter->priv;
-        unsigned long flags;
         int ret;
 
         if (dmxdevfilter->buffer.error) {
                 wake_up(&dmxdevfilter->buffer.queue);
                 return 0;
         }
-        spin_lock_irqsave(&dmxdevfilter->dev->lock, flags);
+        spin_lock(&dmxdevfilter->dev->lock);
         if (dmxdevfilter->state != DMXDEV_STATE_GO) {
-                spin_unlock_irqrestore(&dmxdevfilter->dev->lock, flags);
+                spin_unlock(&dmxdevfilter->dev->lock);
                 return 0;
         }
         del_timer(&dmxdevfilter->timer);
@@ -392,7 +391,7 @@ static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
         }
         if (dmxdevfilter->params.sec.flags & DMX_ONESHOT)
                 dmxdevfilter->state = DMXDEV_STATE_DONE;
-        spin_unlock_irqrestore(&dmxdevfilter->dev->lock, flags);
+        spin_unlock(&dmxdevfilter->dev->lock);
         wake_up(&dmxdevfilter->buffer.queue);
         return 0;
 }
@@ -404,12 +403,11 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
 {
         struct dmxdev_filter *dmxdevfilter = feed->priv;
         struct dvb_ringbuffer *buffer;
-        unsigned long flags;
         int ret;
 
-        spin_lock_irqsave(&dmxdevfilter->dev->lock, flags);
+        spin_lock(&dmxdevfilter->dev->lock);
         if (dmxdevfilter->params.pes.output == DMX_OUT_DECODER) {
-                spin_unlock_irqrestore(&dmxdevfilter->dev->lock, flags);
+                spin_unlock(&dmxdevfilter->dev->lock);
                 return 0;
         }
 
@@ -419,7 +417,7 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
         else
                 buffer = &dmxdevfilter->dev->dvr_buffer;
         if (buffer->error) {
-                spin_unlock_irqrestore(&dmxdevfilter->dev->lock, flags);
+                spin_unlock(&dmxdevfilter->dev->lock);
                 wake_up(&buffer->queue);
                 return 0;
         }
@@ -430,7 +428,7 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
                 dvb_ringbuffer_flush(buffer);
                 buffer->error = ret;
         }
-        spin_unlock_irqrestore(&dmxdevfilter->dev->lock, flags);
+        spin_unlock(&dmxdevfilter->dev->lock);
         wake_up(&buffer->queue);
         return 0;
 }
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index a2c1fd5d2f67..e2eca0b1fe7c 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -399,9 +399,7 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
 void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf,
                               size_t count)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&demux->lock, flags);
+        spin_lock(&demux->lock);
 
         while (count--) {
                 if (buf[0] == 0x47)
@@ -409,17 +407,16 @@ void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf,
                 buf += 188;
         }
 
-        spin_unlock_irqrestore(&demux->lock, flags);
+        spin_unlock(&demux->lock);
 }
 
 EXPORT_SYMBOL(dvb_dmx_swfilter_packets);
 
 void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count)
 {
-        unsigned long flags;
         int p = 0, i, j;
 
-        spin_lock_irqsave(&demux->lock, flags);
+        spin_lock(&demux->lock);
 
         if (demux->tsbufp) {
                 i = demux->tsbufp;
@@ -452,18 +449,17 @@ void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count)
         }
 
 bailout:
-        spin_unlock_irqrestore(&demux->lock, flags);
+        spin_unlock(&demux->lock);
 }
 
 EXPORT_SYMBOL(dvb_dmx_swfilter);
 
 void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
 {
-        unsigned long flags;
         int p = 0, i, j;
         u8 tmppack[188];
 
-        spin_lock_irqsave(&demux->lock, flags);
+        spin_lock(&demux->lock);
 
         if (demux->tsbufp) {
                 i = demux->tsbufp;
@@ -504,7 +500,7 @@ void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
         }
 
 bailout:
-        spin_unlock_irqrestore(&demux->lock, flags);
+        spin_unlock(&demux->lock);
 }
 
 EXPORT_SYMBOL(dvb_dmx_swfilter_204);
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 67cbce82cb91..4dfed6aa2dbc 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -98,11 +98,16 @@
  *              - blacklisted KWorld radio in hid-core.c and hid-ids.h
  * 2008-12-03   Mark Lord <mlord@pobox.com>
  *              - add support for DealExtreme USB Radio
+ * 2009-01-31   Bob Ross <pigiron@gmx.com>
+ *              - correction of stereo detection/setting
+ *              - correction of signal strength indicator scaling
+ * 2009-01-31   Rick Bronson <rick@efn.org>
+ *              Tobias Lorenz <tobias.lorenz@gmx.net>
+ *              - add LED status output
  *
  * ToDo:
  * - add firmware download/update support
  * - RDS support: interrupt mode, instead of polling
- * - add LED status output (check if that's not already done in firmware)
  */
 
 
@@ -882,6 +887,30 @@ static int si470x_rds_on(struct si470x_device *radio)
 
 
 /**************************************************************************
+ * General Driver Functions - LED_REPORT
+ **************************************************************************/
+
+/*
+ * si470x_set_led_state - sets the led state
+ */
+static int si470x_set_led_state(struct si470x_device *radio,
+                unsigned char led_state)
+{
+        unsigned char buf[LED_REPORT_SIZE];
+        int retval;
+
+        buf[0] = LED_REPORT;
+        buf[1] = LED_COMMAND;
+        buf[2] = led_state;
+
+        retval = si470x_set_report(radio, (void *) &buf, sizeof(buf));
+
+        return (retval < 0) ? -EINVAL : 0;
+}
+
+
+
+/**************************************************************************
  * RDS Driver Functions
  **************************************************************************/
 
@@ -1385,20 +1414,22 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
         };
 
         /* stereo indicator == stereo (instead of mono) */
-        if ((radio->registers[STATUSRSSI] & STATUSRSSI_ST) == 1)
-                tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-        else
+        if ((radio->registers[STATUSRSSI] & STATUSRSSI_ST) == 0)
                 tuner->rxsubchans = V4L2_TUNER_SUB_MONO;
+        else
+                tuner->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
 
         /* mono/stereo selector */
-        if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 1)
-                tuner->audmode = V4L2_TUNER_MODE_MONO;
-        else
+        if ((radio->registers[POWERCFG] & POWERCFG_MONO) == 0)
                 tuner->audmode = V4L2_TUNER_MODE_STEREO;
+        else
+                tuner->audmode = V4L2_TUNER_MODE_MONO;
 
         /* min is worst, max is best; signal:0..0xffff; rssi: 0..0xff */
-        tuner->signal = (radio->registers[STATUSRSSI] & STATUSRSSI_RSSI)
-                                * 0x0101;
+        /* measured in units of dbµV in 1 db increments (max at ~75 dbµV) */
+        tuner->signal = (radio->registers[STATUSRSSI] & STATUSRSSI_RSSI);
+        /* the ideal factor is 0xffff/75 = 873,8 */
+        tuner->signal = (tuner->signal * 873) + (8 * tuner->signal / 10);
 
         /* automatic frequency control: -1: freq to low, 1 freq to high */
         /* AFCRL does only indicate that freq. differs, not if too low/high */
@@ -1632,6 +1663,9 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         /* set initial frequency */
         si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */
 
+        /* set led to connect state */
+        si470x_set_led_state(radio, BLINK_GREEN_LED);
+
         /* rds buffer allocation */
         radio->buf_size = rds_buf * 3;
         radio->buffer = kmalloc(radio->buf_size, GFP_KERNEL);
@@ -1715,6 +1749,9 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
         cancel_delayed_work_sync(&radio->work);
         usb_set_intfdata(intf, NULL);
         if (radio->users == 0) {
+                /* set led to disconnect state */
+                si470x_set_led_state(radio, BLINK_ORANGE_LED);
+
                 video_unregister_device(radio->videodev);
                 kfree(radio->buffer);
                 kfree(radio);
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 2ed24527ecd6..65e4901f4db7 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -422,6 +422,7 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
                 if (urb == NULL)
                         break;
 
+                BUG_ON(!gspca_dev->dev);
                 gspca_dev->urb[i] = NULL;
                 if (!gspca_dev->present)
                         usb_kill_urb(urb);
@@ -1950,8 +1951,12 @@ void gspca_disconnect(struct usb_interface *intf)
 {
         struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
 
+        mutex_lock(&gspca_dev->usb_lock);
         gspca_dev->present = 0;
+        mutex_unlock(&gspca_dev->usb_lock);
 
+        destroy_urbs(gspca_dev);
+        gspca_dev->dev = NULL;
         usb_set_intfdata(intf, NULL);
 
         /* release the device */
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index f6b3ef6e691b..c13bd2aa0bea 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -393,7 +393,7 @@ static int ivtv_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo
                 return 0;
         }
 
-        v4l2_subdev_call(itv->sd_video, video, s_fmt, fmt);
+        v4l2_subdev_call(itv->sd_video, video, g_fmt, fmt);
         vbifmt->service_set = ivtv_get_service_set(vbifmt);
         return 0;
 }
@@ -1748,6 +1748,18 @@ static long ivtv_default(struct file *file, void *fh, int cmd, void *arg)
                 break;
         }
 
+        case IVTV_IOC_DMA_FRAME:
+        case VIDEO_GET_PTS:
+        case VIDEO_GET_FRAME_COUNT:
+        case VIDEO_GET_EVENT:
+        case VIDEO_PLAY:
+        case VIDEO_STOP:
+        case VIDEO_FREEZE:
+        case VIDEO_CONTINUE:
+        case VIDEO_COMMAND:
+        case VIDEO_TRY_COMMAND:
+                return ivtv_decoder_ioctls(file, cmd, (void *)arg);
+
         default:
                 return -EINVAL;
         }
@@ -1790,18 +1802,6 @@ static long ivtv_serialized_ioctl(struct ivtv *itv, struct file *filp,
                 ivtv_vapi(itv, CX2341X_DEC_SET_AUDIO_MODE, 2, itv->audio_bilingual_mode, itv->audio_stereo_mode);
                 return 0;
 
-        case IVTV_IOC_DMA_FRAME:
-        case VIDEO_GET_PTS:
-        case VIDEO_GET_FRAME_COUNT:
-        case VIDEO_GET_EVENT:
-        case VIDEO_PLAY:
-        case VIDEO_STOP:
-        case VIDEO_FREEZE:
-        case VIDEO_CONTINUE:
-        case VIDEO_COMMAND:
-        case VIDEO_TRY_COMMAND:
-                return ivtv_decoder_ioctls(filp, cmd, (void *)arg);
-
         default:
                 break;
         }
diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index 1a4d04664d6d..aa266e1f69b2 100644
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -286,7 +286,7 @@ static int __init egpio_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
                 goto fail;
-        ei->base_addr = ioremap_nocache(res->start, res->end - res->start);
+        ei->base_addr = ioremap_nocache(res->start, resource_size(res));
         if (!ei->base_addr)
                 goto fail;
         pr_debug("EGPIO phys=%08x virt=%p\n", (u32)res->start, ei->base_addr);
@@ -307,7 +307,7 @@ static int __init egpio_probe(struct platform_device *pdev)
 
         ei->nchips = pdata->num_chips;
         ei->chip = kzalloc(sizeof(struct egpio_chip) * ei->nchips, GFP_KERNEL);
-        if (!ei) {
+        if (!ei->chip) {
                 ret = -ENOMEM;
                 goto fail;
         }
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 24508e28e3fb..2e36057659e1 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -626,7 +626,6 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
         }
 
         if (client->irq) {
-                set_irq_handler(client->irq, handle_level_irq);
                 ret = request_irq(client->irq, pcf50633_irq,
                                 IRQF_TRIGGER_LOW, "pcf50633", pcf);
 
@@ -679,6 +678,7 @@ static int __devexit pcf50633_remove(struct i2c_client *client)
 
 static struct i2c_device_id pcf50633_id_table[] = {
         {"pcf50633", 0x73},
+        {/* end of list */}
 };
 
 static struct i2c_driver pcf50633_driver = {
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 0e5761f12634..4c7b7962f6b8 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1050,7 +1050,7 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,
         return gpiochip_add(gchip);
 }
 
-static int sm501_register_gpio(struct sm501_devdata *sm)
+static int __devinit sm501_register_gpio(struct sm501_devdata *sm)
 {
         struct sm501_gpio *gpio = &sm->gpio;
         resource_size_t iobase = sm->io_res->start + SM501_GPIO;
@@ -1321,7 +1321,7 @@ static unsigned int sm501_mem_local[] = {
  * Common init code for an SM501
 */
 
-static int sm501_init_dev(struct sm501_devdata *sm)
+static int __devinit sm501_init_dev(struct sm501_devdata *sm)
 {
         struct sm501_initdata *idata;
         struct sm501_platdata *pdata;
@@ -1397,7 +1397,7 @@ static int sm501_init_dev(struct sm501_devdata *sm)
         return 0;
 }
 
-static int sm501_plat_probe(struct platform_device *dev)
+static int __devinit sm501_plat_probe(struct platform_device *dev)
 {
         struct sm501_devdata *sm;
         int ret;
@@ -1586,8 +1586,8 @@ static struct sm501_platdata sm501_pci_platdata = {
         .gpio_base      = -1,
 };
 
-static int sm501_pci_probe(struct pci_dev *dev,
-                           const struct pci_device_id *id)
+static int __devinit sm501_pci_probe(struct pci_dev *dev,
+                                     const struct pci_device_id *id)
 {
         struct sm501_devdata *sm;
         int err;
@@ -1693,7 +1693,7 @@ static void sm501_dev_remove(struct sm501_devdata *sm)
         sm501_gpio_remove(sm);
 }
 
-static void sm501_pci_remove(struct pci_dev *dev)
+static void __devexit sm501_pci_remove(struct pci_dev *dev)
 {
         struct sm501_devdata *sm = pci_get_drvdata(dev);
 
@@ -1727,16 +1727,16 @@ static struct pci_device_id sm501_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, sm501_pci_tbl);
 
-static struct pci_driver sm501_pci_drv = {
+static struct pci_driver sm501_pci_driver = {
         .name           = "sm501",
         .id_table       = sm501_pci_tbl,
         .probe          = sm501_pci_probe,
-        .remove         = sm501_pci_remove,
+        .remove         = __devexit_p(sm501_pci_remove),
 };
 
 MODULE_ALIAS("platform:sm501");
 
-static struct platform_driver sm501_plat_drv = {
+static struct platform_driver sm501_plat_driver = {
         .driver         = {
                 .name   = "sm501",
                 .owner  = THIS_MODULE,
@@ -1749,14 +1749,14 @@ static struct platform_driver sm501_plat_drv = {
 
 static int __init sm501_base_init(void)
 {
-        platform_driver_register(&sm501_plat_drv);
-        return pci_register_driver(&sm501_pci_drv);
+        platform_driver_register(&sm501_plat_driver);
+        return pci_register_driver(&sm501_pci_driver);
 }
 
 static void __exit sm501_base_exit(void)
 {
-        platform_driver_unregister(&sm501_plat_drv);
-        pci_unregister_driver(&sm501_pci_drv);
+        platform_driver_unregister(&sm501_plat_driver);
+        pci_unregister_driver(&sm501_pci_driver);
 }
 
 module_init(sm501_base_init);
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index e7ab0035d305..68826f1e36bc 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -38,7 +38,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c/twl4030.h>
 
-#ifdef CONFIG_ARM
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 #include <mach/cpu.h>
 #endif
 
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
index f92595c8f165..84d5ea1ec171 100644
--- a/drivers/mfd/wm8350-core.c
+++ b/drivers/mfd/wm8350-core.c
@@ -1111,7 +1111,7 @@ int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, int vref)
         do {
                 schedule_timeout_interruptible(1);
                 reg = wm8350_reg_read(wm8350, WM8350_DIGITISER_CONTROL_1);
-        } while (tries-- && (reg & WM8350_AUXADC_POLL));
+        } while (--tries && (reg & WM8350_AUXADC_POLL));
 
         if (!tries)
                 dev_err(wm8350->dev, "adc chn %d read timeout\n", channel);
@@ -1297,14 +1297,29 @@ static void wm8350_client_dev_register(struct wm8350 *wm8350,
 int wm8350_device_init(struct wm8350 *wm8350, int irq,
                        struct wm8350_platform_data *pdata)
 {
-        int ret = -EINVAL;
+        int ret;
         u16 id1, id2, mask_rev;
         u16 cust_id, mode, chip_rev;
 
         /* get WM8350 revision and config mode */
-        wm8350->read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &id1);
-        wm8350->read_dev(wm8350, WM8350_ID, sizeof(id2), &id2);
-        wm8350->read_dev(wm8350, WM8350_REVISION, sizeof(mask_rev), &mask_rev);
+        ret = wm8350->read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &id1);
+        if (ret != 0) {
+                dev_err(wm8350->dev, "Failed to read ID: %d\n", ret);
+                goto err;
+        }
+
+        ret = wm8350->read_dev(wm8350, WM8350_ID, sizeof(id2), &id2);
+        if (ret != 0) {
+                dev_err(wm8350->dev, "Failed to read ID: %d\n", ret);
+                goto err;
+        }
+
+        ret = wm8350->read_dev(wm8350, WM8350_REVISION, sizeof(mask_rev),
+                               &mask_rev);
+        if (ret != 0) {
+                dev_err(wm8350->dev, "Failed to read revision: %d\n", ret);
+                goto err;
+        }
 
         id1 = be16_to_cpu(id1);
         id2 = be16_to_cpu(id2);
@@ -1404,14 +1419,12 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
                 return ret;
         }
 
-        if (pdata && pdata->init) {
-                ret = pdata->init(wm8350);
-                if (ret != 0) {
-                        dev_err(wm8350->dev, "Platform init() failed: %d\n",
-                                ret);
-                        goto err;
-                }
-        }
+        wm8350_reg_write(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK, 0xFFFF);
+        wm8350_reg_write(wm8350, WM8350_INT_STATUS_1_MASK, 0xFFFF);
+        wm8350_reg_write(wm8350, WM8350_INT_STATUS_2_MASK, 0xFFFF);
+        wm8350_reg_write(wm8350, WM8350_UNDER_VOLTAGE_INT_STATUS_MASK, 0xFFFF);
+        wm8350_reg_write(wm8350, WM8350_GPIO_INT_STATUS_MASK, 0xFFFF);
+        wm8350_reg_write(wm8350, WM8350_COMPARATOR_INT_STATUS_MASK, 0xFFFF);
 
         mutex_init(&wm8350->auxadc_mutex);
         mutex_init(&wm8350->irq_mutex);
@@ -1430,6 +1443,15 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
         }
         wm8350->chip_irq = irq;
 
+        if (pdata && pdata->init) {
+                ret = pdata->init(wm8350);
+                if (ret != 0) {
+                        dev_err(wm8350->dev, "Platform init() failed: %d\n",
+                                ret);
+                        goto err;
+                }
+        }
+
         wm8350_reg_write(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK, 0x0);
 
         wm8350_client_dev_register(wm8350, "wm8350-codec",
diff --git a/drivers/mfd/wm8350-regmap.c b/drivers/mfd/wm8350-regmap.c
index 68887b817d17..9a4cc954cb7c 100644
--- a/drivers/mfd/wm8350-regmap.c
+++ b/drivers/mfd/wm8350-regmap.c
@@ -3188,7 +3188,7 @@ const struct wm8350_reg_access wm8350_reg_io_map[] = {
         { 0x7CFF, 0x0C00, 0x7FFF }, /* R1   - ID */
         { 0x0000, 0x0000, 0x0000 }, /* R2 */
         { 0xBE3B, 0xBE3B, 0x8000 }, /* R3   - System Control 1 */
-        { 0xFCF7, 0xFCF7, 0xF800 }, /* R4   - System Control 2 */
+        { 0xFEF7, 0xFEF7, 0xF800 }, /* R4   - System Control 2 */
         { 0x80FF, 0x80FF, 0x8000 }, /* R5   - System Hibernate */
         { 0xFB0E, 0xFB0E, 0x0000 }, /* R6   - Interface Control */
         { 0x0000, 0x0000, 0x0000 }, /* R7 */
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 56073199ceba..c64e6798878a 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -217,6 +217,7 @@ config DELL_LAPTOP
         depends on EXPERIMENTAL
         depends on BACKLIGHT_CLASS_DEVICE
         depends on RFKILL
+        depends on POWER_SUPPLY
         default n
         ---help---
         This driver adds support for rfkill and backlight control to Dell
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index bf5e4d065436..558bf3f2c276 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -35,7 +35,7 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
 
         if (!ssc_valid) {
                 spin_unlock(&user_lock);
-                dev_dbg(&ssc->pdev->dev, "could not find requested device\n");
+                pr_err("ssc: ssc%d platform device is missing\n", ssc_num);
                 return ERR_PTR(-ENODEV);
         }
 
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 10c421b73eaf..f26667a7abf7 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -207,7 +207,7 @@ static void ilo_ccb_close(struct pci_dev *pdev, struct ccb_data *data)
                   &device_ccb->recv_ctrl);
 
         /* give iLO some time to process stop request */
-        for (retries = 1000; retries > 0; retries--) {
+        for (retries = MAX_WAIT; retries > 0; retries--) {
                 doorbell_set(driver_ccb);
                 udelay(1);
                 if (!(ioread32(&device_ccb->send_ctrl) & (1 << CTRL_BITPOS_A))
@@ -309,7 +309,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
         doorbell_clr(driver_ccb);
 
         /* make sure iLO is really handling requests */
-        for (i = 1000; i > 0; i--) {
+        for (i = MAX_WAIT; i > 0; i--) {
                 if (ilo_pkt_dequeue(hw, driver_ccb, SENDQ, &pkt_id, NULL, NULL))
                         break;
                 udelay(1);
@@ -326,7 +326,7 @@ static int ilo_ccb_open(struct ilo_hwinfo *hw, struct ccb_data *data, int slot)
 
         return 0;
 free:
-        pci_free_consistent(pdev, data->dma_size, data->dma_va, data->dma_pa);
+        ilo_ccb_close(pdev, data);
 out:
         return error;
 }
diff --git a/drivers/misc/hpilo.h b/drivers/misc/hpilo.h
index a281207696c1..b64a20ef07e3 100644
--- a/drivers/misc/hpilo.h
+++ b/drivers/misc/hpilo.h
@@ -19,6 +19,8 @@
 #define MAX_ILO_DEV     1
 /* max number of files */
 #define MAX_OPEN        (MAX_CCB * MAX_ILO_DEV)
+/* spin counter for open/close delay */
+#define MAX_WAIT        10000
 
 /*
  * Per device, used to track global memory allocations.
diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index a5bd658c2e83..275b78896a73 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -514,7 +514,8 @@ struct xpc_channel_uv {
                                                 /* partition's notify mq */
 
         struct xpc_send_msg_slot_uv *send_msg_slots;
-        struct xpc_notify_mq_msg_uv *recv_msg_slots;
+        void *recv_msg_slots;   /* each slot will hold a xpc_notify_mq_msg_uv */
+                                /* structure plus the user's payload */
 
         struct xpc_fifo_head_uv msg_slot_free_list;
         struct xpc_fifo_head_uv recv_msg_list;  /* deliverable payloads */
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index f17f7d40ea2c..29c0502a96b2 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -1010,8 +1010,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpc_channel *ch)
                         continue;
 
                 for (entry = 0; entry < nentries; entry++) {
-                        msg_slot = ch_uv->recv_msg_slots + entry *
-                            ch->entry_size;
+                        msg_slot = ch_uv->recv_msg_slots +
+                            entry * ch->entry_size;
 
                         msg_slot->hdr.msg_slot_number = entry;
                 }
@@ -1308,9 +1308,8 @@ xpc_handle_notify_mq_msg_uv(struct xpc_partition *part,
         /* we're dealing with a normal message sent via the notify_mq */
         ch_uv = &ch->sn.uv;
 
-        msg_slot = (struct xpc_notify_mq_msg_uv *)((u64)ch_uv->recv_msg_slots +
-                    (msg->hdr.msg_slot_number % ch->remote_nentries) *
-                    ch->entry_size);
+        msg_slot = ch_uv->recv_msg_slots +
+            (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size;
 
         BUG_ON(msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);
         BUG_ON(msg_slot->hdr.size != 0);
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 45b1f430685f..513eb09a638f 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -584,7 +584,7 @@ static int mmc_blk_probe(struct mmc_card *card)
         if (err)
                 goto out;
 
-        string_get_size(get_capacity(md->disk) << 9, STRING_UNITS_2,
+        string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2,
                         cap_str, sizeof(cap_str));
         printk(KERN_INFO "%s: %s %s %s %s\n",
                 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index b92b172074ee..b9f1e84897cc 100644
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -494,7 +494,7 @@ static int mmc_test_basic_read(struct mmc_test_card *test)
 
         sg_init_one(&sg, test->buffer, 512);
 
-        ret = mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 1);
+        ret = mmc_test_simple_transfer(test, &sg, 1, 0, 1, 512, 0);
         if (ret)
                 return ret;
 
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 76bfe16c09b1..2b1196e6142c 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1548,9 +1548,10 @@ static bool filter(struct dma_chan *chan, void *slave)
 {
         struct dw_dma_slave *dws = slave;
 
-        if (dws->dma_dev == chan->device->dev)
+        if (dws->dma_dev == chan->device->dev) {
+                chan->private = dws;
                 return true;
-        else
+        } else
                 return false;
 }
 #endif
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index db37490f67ec..a631c81dce12 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -55,6 +55,7 @@
 #define VS30                    (1 << 25)
 #define SDVS18                  (0x5 << 9)
 #define SDVS30                  (0x6 << 9)
+#define SDVS33                  (0x7 << 9)
 #define SDVSCLR                 0xFFFFF1FF
 #define SDVSDET                 0x00000400
 #define AUTOIDLE                0x1
@@ -375,6 +376,32 @@ static void mmc_omap_report_irq(struct mmc_omap_host *host, u32 status)
 }
 #endif  /* CONFIG_MMC_DEBUG */
 
+/*
+ * MMC controller internal state machines reset
+ *
+ * Used to reset command or data internal state machines, using respectively
+ *  SRC or SRD bit of SYSCTL register
+ * Can be called from interrupt context
+ */
+static inline void mmc_omap_reset_controller_fsm(struct mmc_omap_host *host,
+                unsigned long bit)
+{
+        unsigned long i = 0;
+        unsigned long limit = (loops_per_jiffy *
+                                msecs_to_jiffies(MMC_TIMEOUT_MS));
+
+        OMAP_HSMMC_WRITE(host->base, SYSCTL,
+                         OMAP_HSMMC_READ(host->base, SYSCTL) | bit);
+
+        while ((OMAP_HSMMC_READ(host->base, SYSCTL) & bit) &&
+                (i++ < limit))
+                cpu_relax();
+
+        if (OMAP_HSMMC_READ(host->base, SYSCTL) & bit)
+                dev_err(mmc_dev(host->mmc),
+                        "Timeout waiting on controller reset in %s\n",
+                        __func__);
+}
 
 /*
  * MMC controller IRQ handler
@@ -403,21 +430,17 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
                         (status & CMD_CRC)) {
                         if (host->cmd) {
                                 if (status & CMD_TIMEOUT) {
-                                        OMAP_HSMMC_WRITE(host->base, SYSCTL,
-                                                OMAP_HSMMC_READ(host->base,
-                                                                SYSCTL) | SRC);
-                                        while (OMAP_HSMMC_READ(host->base,
-                                                        SYSCTL) & SRC)
-                                                ;
-
+                                        mmc_omap_reset_controller_fsm(host, SRC);
                                         host->cmd->error = -ETIMEDOUT;
                                 } else {
                                         host->cmd->error = -EILSEQ;
                                 }
                                 end_cmd = 1;
                         }
-                        if (host->data)
+                        if (host->data) {
                                 mmc_dma_cleanup(host);
+                                mmc_omap_reset_controller_fsm(host, SRD);
+                        }
                 }
                 if ((status & DATA_TIMEOUT) ||
                         (status & DATA_CRC)) {
@@ -426,12 +449,7 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
                                         mmc_dma_cleanup(host);
                                 else
                                         host->data->error = -EILSEQ;
-                                OMAP_HSMMC_WRITE(host->base, SYSCTL,
-                                        OMAP_HSMMC_READ(host->base,
-                                                        SYSCTL) | SRD);
-                                while (OMAP_HSMMC_READ(host->base,
-                                                SYSCTL) & SRD)
-                                        ;
+                                mmc_omap_reset_controller_fsm(host, SRD);
                                 end_trans = 1;
                         }
                 }
@@ -456,13 +474,20 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 }
 
 /*
- * Switch MMC operating voltage
+ * Switch MMC interface voltage ... only relevant for MMC1.
+ *
+ * MMC2 and MMC3 use fixed 1.8V levels, and maybe a transceiver.
+ * The MMC2 transceiver controls are used instead of DAT4..DAT7.
+ * Some chips, like eMMC ones, use internal transceivers.
  */
 static int omap_mmc_switch_opcond(struct mmc_omap_host *host, int vdd)
 {
         u32 reg_val = 0;
         int ret;
 
+        if (host->id != OMAP_MMC1_DEVID)
+                return 0;
+
         /* Disable the clocks */
         clk_disable(host->fclk);
         clk_disable(host->iclk);
@@ -485,19 +510,26 @@ static int omap_mmc_switch_opcond(struct mmc_omap_host *host, int vdd)
         OMAP_HSMMC_WRITE(host->base, HCTL,
                 OMAP_HSMMC_READ(host->base, HCTL) & SDVSCLR);
         reg_val = OMAP_HSMMC_READ(host->base, HCTL);
+
         /*
          * If a MMC dual voltage card is detected, the set_ios fn calls
          * this fn with VDD bit set for 1.8V. Upon card removal from the
          * slot, omap_mmc_set_ios sets the VDD back to 3V on MMC_POWER_OFF.
          *
-         * Only MMC1 supports 3.0V.  MMC2 will not function if SDVS30 is
-         * set in HCTL.
+         * Cope with a bit of slop in the range ... per data sheets:
+         *  - "1.8V" for vdds_mmc1/vdds_mmc1a can be up to 2.45V max,
+         *    but recommended values are 1.71V to 1.89V
+         *  - "3.0V" for vdds_mmc1/vdds_mmc1a can be up to 3.5V max,
+         *    but recommended values are 2.7V to 3.3V
+         *
+         * Board setup code shouldn't permit anything very out-of-range.
+         * TWL4030-family VMMC1 and VSIM regulators are fine (avoiding the
+         * middle range) but VSIM can't power DAT4..DAT7 at more than 3V.
          */
-        if (host->id == OMAP_MMC1_DEVID && (((1 << vdd) == MMC_VDD_32_33) ||
-                                ((1 << vdd) == MMC_VDD_33_34)))
-                reg_val |= SDVS30;
-        if ((1 << vdd) == MMC_VDD_165_195)
+        if ((1 << vdd) <= MMC_VDD_23_24)
                 reg_val |= SDVS18;
+        else
+                reg_val |= SDVS30;
 
         OMAP_HSMMC_WRITE(host->base, HCTL, reg_val);
 
@@ -517,16 +549,15 @@ static void mmc_omap_detect(struct work_struct *work)
 {
         struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
                                                 mmc_carddetect_work);
+        struct omap_mmc_slot_data *slot = &mmc_slot(host);
+
+        host->carddetect = slot->card_detect(slot->card_detect_irq);
 
         sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch");
         if (host->carddetect) {
                 mmc_detect_change(host->mmc, (HZ * 200) / 1000);
         } else {
-                OMAP_HSMMC_WRITE(host->base, SYSCTL,
-                        OMAP_HSMMC_READ(host->base, SYSCTL) | SRD);
-                while (OMAP_HSMMC_READ(host->base, SYSCTL) & SRD)
-                        ;
-
+                mmc_omap_reset_controller_fsm(host, SRD);
                 mmc_detect_change(host->mmc, (HZ * 50) / 1000);
         }
 }
@@ -538,7 +569,6 @@ static irqreturn_t omap_mmc_cd_handler(int irq, void *dev_id)
 {
         struct mmc_omap_host *host = (struct mmc_omap_host *)dev_id;
 
-        host->carddetect = mmc_slot(host).card_detect(irq);
         schedule_work(&host->mmc_carddetect_work);
 
         return IRQ_HANDLED;
@@ -757,10 +787,14 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         case MMC_POWER_OFF:
                 mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0);
                 /*
-                 * Reset bus voltage to 3V if it got set to 1.8V earlier.
+                 * Reset interface voltage to 3V if it's 1.8V now;
+                 * only relevant on MMC-1, the others always use 1.8V.
+                 *
                  * REVISIT: If we are able to detect cards after unplugging
                  * a 1.8V card, this code should not be needed.
                  */
+                if (host->id != OMAP_MMC1_DEVID)
+                        break;
                 if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) {
                         int vdd = fls(host->mmc->ocr_avail) - 1;
                         if (omap_mmc_switch_opcond(host, vdd) != 0)
@@ -784,7 +818,9 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         }
 
         if (host->id == OMAP_MMC1_DEVID) {
-                /* Only MMC1 can operate at 3V/1.8V */
+                /* Only MMC1 can interface at 3V without some flavor
+                 * of external transceiver; but they all handle 1.8V.
+                 */
                 if ((OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET) &&
                         (ios->vdd == DUAL_VOLT_OCR_BIT)) {
                                 /*
@@ -1137,7 +1173,9 @@ static int omap_mmc_suspend(struct platform_device *pdev, pm_message_t state)
                                                 " level suspend\n");
                         }
 
-                        if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) {
+                        if (host->id == OMAP_MMC1_DEVID
+                                        && !(OMAP_HSMMC_READ(host->base, HCTL)
+                                                        & SDVSDET)) {
                                 OMAP_HSMMC_WRITE(host->base, HCTL,
                                         OMAP_HSMMC_READ(host->base, HCTL)
                                         & SDVSCLR);
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 35a98eec7414..f4a67c65d301 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -329,7 +329,7 @@ static void do_pio_write(struct s3cmci_host *host)
 
         to_ptr = host->base + host->sdidata;
 
-        while ((fifo = fifo_free(host))) {
+        while ((fifo = fifo_free(host)) > 3) {
                 if (!host->pio_bytes) {
                         res = get_data_buffer(host, &host->pio_bytes,
                                                         &host->pio_ptr);
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index f07255cb17ee..8cff5f5e7f86 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -144,8 +144,7 @@ static int jmicron_probe(struct sdhci_pci_chip *chip)
                           SDHCI_QUIRK_32BIT_DMA_SIZE |
                           SDHCI_QUIRK_32BIT_ADMA_SIZE |
                           SDHCI_QUIRK_RESET_AFTER_REQUEST |
-                          SDHCI_QUIRK_BROKEN_SMALL_PIO |
-                          SDHCI_QUIRK_FORCE_HIGHSPEED;
+                          SDHCI_QUIRK_BROKEN_SMALL_PIO;
         }
 
         /*
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6b2d1f99af67..f52f3053ed92 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1636,8 +1636,7 @@ int sdhci_add_host(struct sdhci_host *host)
         mmc->f_max = host->max_clk;
         mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
 
-        if ((caps & SDHCI_CAN_DO_HISPD) ||
-                (host->quirks & SDHCI_QUIRK_FORCE_HIGHSPEED))
+        if (caps & SDHCI_CAN_DO_HISPD)
                 mmc->caps |= MMC_CAP_SD_HIGHSPEED;
 
         mmc->ocr_avail = 0;
@@ -1723,7 +1722,9 @@ int sdhci_add_host(struct sdhci_host *host)
 #endif
 
 #ifdef SDHCI_USE_LEDS_CLASS
-        host->led.name = mmc_hostname(mmc);
+        snprintf(host->led_name, sizeof(host->led_name),
+                "%s::", mmc_hostname(mmc));
+        host->led.name = host->led_name;
         host->led.brightness = LED_OFF;
         host->led.default_trigger = mmc_hostname(mmc);
         host->led.brightness_set = sdhci_led_control;
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 3efba2363941..ebb83657e27a 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -208,8 +208,6 @@ struct sdhci_host {
 #define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL                  (1<<12)
 /* Controller has an issue with buffer bits for small transfers */
 #define SDHCI_QUIRK_BROKEN_SMALL_PIO                    (1<<13)
-/* Controller supports high speed but doesn't have the caps bit set */
-#define SDHCI_QUIRK_FORCE_HIGHSPEED                     (1<<14)
 
         int                     irq;            /* Device IRQ */
         void __iomem *          ioaddr;         /* Mapped address */
@@ -222,6 +220,7 @@ struct sdhci_host {
 
 #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
         struct led_classdev     led;            /* LED control */
+        char   led_name[32];
 #endif
 
         spinlock_t              lock;           /* Mutex */
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 7df6bbf0e4d9..6f6a0f6dafd6 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -453,7 +453,7 @@ static struct platform_driver sa1100_mtd_driver = {
         .resume         = sa1100_mtd_resume,
         .shutdown       = sa1100_mtd_shutdown,
         .driver         = {
-                .name   = "flash",
+                .name   = "sa1100-mtd",
                 .owner  = THIS_MODULE,
         },
 };
@@ -474,4 +474,4 @@ module_exit(sa1100_mtd_exit);
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("SA1100 CFI map driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:flash");
+MODULE_ALIAS("platform:sa1100-mtd");
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index c98c1570a40b..47a33cec3793 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -139,7 +139,8 @@ static int atmel_nand_device_ready(struct mtd_info *mtd)
         struct nand_chip *nand_chip = mtd->priv;
         struct atmel_nand_host *host = nand_chip->priv;
 
-        return gpio_get_value(host->board->rdy_pin);
+        return gpio_get_value(host->board->rdy_pin) ^
+                !!host->board->rdy_pin_active_low;
 }
 
 /*
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index d15d8b79d8e5..54b52e5b1821 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -646,7 +646,7 @@ static const struct net_device_ops etherh_netdev_ops = {
         .ndo_get_stats          = ei_get_stats,
         .ndo_set_multicast_list = ei_set_multicast_list,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_set_mac_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = ei_poll,
diff --git a/drivers/parport/parport_atari.c b/drivers/parport/parport_atari.c
index ad4cdd256137..0b28fccec03f 100644
--- a/drivers/parport/parport_atari.c
+++ b/drivers/parport/parport_atari.c
@@ -84,7 +84,7 @@ parport_atari_frob_control(struct parport *p, unsigned char mask,
 static unsigned char
 parport_atari_read_status(struct parport *p)
 {
-        return ((mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) |
+        return ((st_mfp.par_dt_reg & 1 ? 0 : PARPORT_STATUS_BUSY) |
                 PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR);
 }
 
@@ -193,9 +193,9 @@ static int __init parport_atari_init(void)
                 sound_ym.wd_data = sound_ym.rd_data_reg_sel | (1 << 5);
                 local_irq_restore(flags);
                 /* MFP port I0 as input. */
-                mfp.data_dir &= ~1;
+                st_mfp.data_dir &= ~1;
                 /* MFP port I0 interrupt on high->low edge. */
-                mfp.active_edge &= ~1;
+                st_mfp.active_edge &= ~1;
                 p = parport_register_port((unsigned long)&sound_ym.wd_data,
                                           IRQ_MFP_BUSY, PARPORT_DMA_NONE,
                                           &parport_atari_ops);
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 101ed49a2d15..032db815b0f9 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -64,6 +64,11 @@ struct parport_pc_pci {
 
 static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *card, int autoirq, int autodma)
 {
+        /* the rule described below doesn't hold for this device */
+        if (dev->device == PCI_DEVICE_ID_NETMOS_9835 &&
+                        dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
+                        dev->subsystem_device == 0x0299)
+                return -ENODEV;
         /*
          * Netmos uses the subdevice ID to indicate the number of parallel
          * and serial ports.  The form is 0x00PS, where <P> is the number of
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 3dfecb20d5e7..f3f686581a90 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -61,6 +61,8 @@
 /* global iommu list, set NULL for ignored DMAR units */
 static struct intel_iommu **g_iommus;
 
+static int rwbf_quirk;
+
 /*
  * 0: Present
  * 1-11: Reserved
@@ -268,7 +270,12 @@ static long list_size;
 
 static void domain_remove_dev_info(struct dmar_domain *domain);
 
-int dmar_disabled;
+#ifdef CONFIG_DMAR_DEFAULT_ON
+int dmar_disabled = 0;
+#else
+int dmar_disabled = 1;
+#endif /*CONFIG_DMAR_DEFAULT_ON*/
+
 static int __initdata dmar_map_gfx = 1;
 static int dmar_forcedac;
 static int intel_iommu_strict;
@@ -284,9 +291,12 @@ static int __init intel_iommu_setup(char *str)
         if (!str)
                 return -EINVAL;
         while (*str) {
-                if (!strncmp(str, "off", 3)) {
+                if (!strncmp(str, "on", 2)) {
+                        dmar_disabled = 0;
+                        printk(KERN_INFO "Intel-IOMMU: enabled\n");
+                } else if (!strncmp(str, "off", 3)) {
                         dmar_disabled = 1;
-                        printk(KERN_INFO"Intel-IOMMU: disabled\n");
+                        printk(KERN_INFO "Intel-IOMMU: disabled\n");
                 } else if (!strncmp(str, "igfx_off", 8)) {
                         dmar_map_gfx = 0;
                         printk(KERN_INFO
@@ -777,7 +787,7 @@ static void iommu_flush_write_buffer(struct intel_iommu *iommu)
         u32 val;
         unsigned long flag;
 
-        if (!cap_rwbf(iommu->cap))
+        if (!rwbf_quirk && !cap_rwbf(iommu->cap))
                 return;
         val = iommu->gcmd | DMA_GCMD_WBF;
 
@@ -3129,3 +3139,15 @@ static struct iommu_ops intel_iommu_ops = {
         .unmap          = intel_iommu_unmap_range,
         .iova_to_phys   = intel_iommu_iova_to_phys,
 };
+
+static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
+{
+        /*
+         * Mobile 4 Series Chipset neglects to set RWBF capability,
+         * but needs it:
+         */
+        printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
+        rwbf_quirk = 1;
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 44f15ff70c1d..baba2eb5367d 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -103,14 +103,12 @@ static void msix_set_enable(struct pci_dev *dev, int enable)
         }
 }
 
-/*
- * Essentially, this is ((1 << (1 << x)) - 1), but without the
- * undefinedness of a << 32.
- */
 static inline __attribute_const__ u32 msi_mask(unsigned x)
 {
-        static const u32 mask[] = { 1, 2, 4, 0xf, 0xff, 0xffff, 0xffffffff };
-        return mask[x];
+        /* Don't shift by >= width of type */
+        if (x >= 5)
+                return 0xffffffff;
+        return (1 << (1 << x)) - 1;
 }
 
 static void msix_flush_writes(struct irq_desc *desc)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index ab1d615425a8..93eac1423585 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -355,6 +355,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
         int i = 0;
 
         if (drv && drv->suspend) {
+                pci_power_t prev = pci_dev->current_state;
+
                 pci_dev->state_saved = false;
 
                 i = drv->suspend(pci_dev, state);
@@ -365,12 +367,16 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
                 if (pci_dev->state_saved)
                         goto Fixup;
 
-                if (WARN_ON_ONCE(pci_dev->current_state != PCI_D0))
+                if (pci_dev->current_state != PCI_D0
+                    && pci_dev->current_state != PCI_UNKNOWN) {
+                        WARN_ONCE(pci_dev->current_state != prev,
+                                "PCI PM: Device state not saved by %pF\n",
+                                drv->suspend);
                         goto Fixup;
+                }
         }
 
         pci_save_state(pci_dev);
-        pci_dev->state_saved = true;
         /*
          * This is for compatibility with existing code with legacy PM support.
          */
@@ -424,35 +430,20 @@ static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)
         pci_fixup_device(pci_fixup_resume_early, pci_dev);
 }
 
-static int pci_pm_default_resume(struct pci_dev *pci_dev)
+static void pci_pm_default_resume(struct pci_dev *pci_dev)
 {
         pci_fixup_device(pci_fixup_resume, pci_dev);
 
         if (!pci_is_bridge(pci_dev))
                 pci_enable_wake(pci_dev, PCI_D0, false);
-
-        return pci_pm_reenable_device(pci_dev);
-}
-
-static void pci_pm_default_suspend_generic(struct pci_dev *pci_dev)
-{
-        /* If device is enabled at this point, disable it */
-        pci_disable_enabled_device(pci_dev);
-        /*
-         * Save state with interrupts enabled, because in principle the bus the
-         * device is on may be put into a low power state after this code runs.
-         */
-        pci_save_state(pci_dev);
 }
 
 static void pci_pm_default_suspend(struct pci_dev *pci_dev)
 {
-        pci_pm_default_suspend_generic(pci_dev);
-
+        /* Disable non-bridge devices without PM support */
         if (!pci_is_bridge(pci_dev))
-                pci_prepare_to_sleep(pci_dev);
-
-        pci_fixup_device(pci_fixup_suspend, pci_dev);
+                pci_disable_enabled_device(pci_dev);
+        pci_save_state(pci_dev);
 }
 
 static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev)
@@ -497,21 +488,49 @@ static void pci_pm_complete(struct device *dev)
 static int pci_pm_suspend(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
-        int error = 0;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_SUSPEND);
 
-        if (drv && drv->pm && drv->pm->suspend) {
-                error = drv->pm->suspend(dev);
-                suspend_report_result(drv->pm->suspend, error);
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                goto Fixup;
         }
 
-        if (!error)
-                pci_pm_default_suspend(pci_dev);
+        pci_dev->state_saved = false;
 
-        return error;
+        if (pm->suspend) {
+                pci_power_t prev = pci_dev->current_state;
+                int error;
+
+                error = pm->suspend(dev);
+                suspend_report_result(pm->suspend, error);
+                if (error)
+                        return error;
+
+                if (pci_dev->state_saved)
+                        goto Fixup;
+
+                if (pci_dev->current_state != PCI_D0
+                    && pci_dev->current_state != PCI_UNKNOWN) {
+                        WARN_ONCE(pci_dev->current_state != prev,
+                                "PCI PM: State of device not saved by %pF\n",
+                                pm->suspend);
+                        goto Fixup;
+                }
+        }
+
+        if (!pci_dev->state_saved) {
+                pci_save_state(pci_dev);
+                if (!pci_is_bridge(pci_dev))
+                        pci_prepare_to_sleep(pci_dev);
+        }
+
+ Fixup:
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
+
+        return 0;
 }
 
 static int pci_pm_suspend_noirq(struct device *dev)
@@ -554,7 +573,7 @@ static int pci_pm_resume_noirq(struct device *dev)
 static int pci_pm_resume(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         /*
@@ -567,12 +586,16 @@ static int pci_pm_resume(struct device *dev)
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        error = pci_pm_default_resume(pci_dev);
+        pci_pm_default_resume(pci_dev);
 
-        if (!error && drv && drv->pm && drv->pm->resume)
-                error = drv->pm->resume(dev);
+        if (pm) {
+                if (pm->resume)
+                        error = pm->resume(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
-        return error;
+        return 0;
 }
 
 #else /* !CONFIG_SUSPEND */
@@ -589,21 +612,31 @@ static int pci_pm_resume(struct device *dev)
 static int pci_pm_freeze(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
-        int error = 0;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_FREEZE);
 
-        if (drv && drv->pm && drv->pm->freeze) {
-                error = drv->pm->freeze(dev);
-                suspend_report_result(drv->pm->freeze, error);
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                return 0;
         }
 
-        if (!error)
-                pci_pm_default_suspend_generic(pci_dev);
+        pci_dev->state_saved = false;
 
-        return error;
+        if (pm->freeze) {
+                int error;
+
+                error = pm->freeze(dev);
+                suspend_report_result(pm->freeze, error);
+                if (error)
+                        return error;
+        }
+
+        if (!pci_dev->state_saved)
+                pci_save_state(pci_dev);
+
+        return 0;
 }
 
 static int pci_pm_freeze_noirq(struct device *dev)
@@ -646,16 +679,18 @@ static int pci_pm_thaw_noirq(struct device *dev)
 static int pci_pm_thaw(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        pci_pm_reenable_device(pci_dev);
-
-        if (drv && drv->pm && drv->pm->thaw)
-                error =  drv->pm->thaw(dev);
+        if (pm) {
+                if (pm->thaw)
+                        error = pm->thaw(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
         return error;
 }
@@ -663,22 +698,29 @@ static int pci_pm_thaw(struct device *dev)
 static int pci_pm_poweroff(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_suspend(dev, PMSG_HIBERNATE);
 
-        if (!drv || !drv->pm)
-                return 0;
+        if (!pm) {
+                pci_pm_default_suspend(pci_dev);
+                goto Fixup;
+        }
+
+        pci_dev->state_saved = false;
 
-        if (drv->pm->poweroff) {
-                error = drv->pm->poweroff(dev);
-                suspend_report_result(drv->pm->poweroff, error);
+        if (pm->poweroff) {
+                error = pm->poweroff(dev);
+                suspend_report_result(pm->poweroff, error);
         }
 
-        if (!error)
-                pci_pm_default_suspend(pci_dev);
+        if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))
+                pci_prepare_to_sleep(pci_dev);
+
+ Fixup:
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
 
         return error;
 }
@@ -719,7 +761,7 @@ static int pci_pm_restore_noirq(struct device *dev)
 static int pci_pm_restore(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        struct device_driver *drv = dev->driver;
+        struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
         int error = 0;
 
         /*
@@ -732,10 +774,14 @@ static int pci_pm_restore(struct device *dev)
         if (pci_has_legacy_pm_support(pci_dev))
                 return pci_legacy_resume(dev);
 
-        error = pci_pm_default_resume(pci_dev);
+        pci_pm_default_resume(pci_dev);
 
-        if (!error && drv && drv->pm && drv->pm->restore)
-                error = drv->pm->restore(dev);
+        if (pm) {
+                if (pm->restore)
+                        error = pm->restore(dev);
+        } else {
+                pci_pm_reenable_device(pci_dev);
+        }
 
         return error;
 }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index db7ec14fa719..dfc4e0ddf241 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -768,8 +768,8 @@ pci_read_rom(struct kobject *kobj, struct bin_attribute *bin_attr,
                 return -EINVAL;
         
         rom = pci_map_rom(pdev, &size); /* size starts out as PCI window size */
-        if (!rom)
-                return 0;
+        if (!rom || !size)
+                return -EIO;
                 
         if (off >= size)
                 count = 0;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 48807556b47a..6d6120007af4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1418,10 +1418,10 @@ int pci_restore_standard_config(struct pci_dev *dev)
                 break;
         }
 
-        dev->current_state = PCI_D0;
+        pci_update_current_state(dev, PCI_D0);
 
  Restore:
-        return pci_restore_state(dev);
+        return dev->state_saved ? pci_restore_state(dev) : 0;
 }
 
 /**
@@ -1540,16 +1540,21 @@ void pci_release_region(struct pci_dev *pdev, int bar)
 }
 
 /**
- *      pci_request_region - Reserved PCI I/O and memory resource
+ *      __pci_request_region - Reserved PCI I/O and memory resource
  *      @pdev: PCI device whose resources are to be reserved
  *      @bar: BAR to be reserved
  *      @res_name: Name to be associated with resource.
+ *      @exclusive: whether the region access is exclusive or not
  *
  *      Mark the PCI region associated with PCI device @pdev BR @bar as
  *      being reserved by owner @res_name.  Do not access any
  *      address inside the PCI regions unless this call returns
  *      successfully.
  *
+ *      If @exclusive is set, then the region is marked so that userspace
+ *      is explicitly not allowed to map the resource via /dev/mem or
+ *      sysfs MMIO access.
+ *
  *      Returns 0 on success, or %EBUSY on error.  A warning
  *      message is also printed on failure.
  */
@@ -1588,12 +1593,12 @@ err_out:
 }
 
 /**
- *      pci_request_region - Reserved PCI I/O and memory resource
+ *      pci_request_region - Reserve PCI I/O and memory resource
  *      @pdev: PCI device whose resources are to be reserved
  *      @bar: BAR to be reserved
- *      @res_name: Name to be associated with resource.
+ *      @res_name: Name to be associated with resource
  *
- *      Mark the PCI region associated with PCI device @pdev BR @bar as
+ *      Mark the PCI region associated with PCI device @pdev BAR @bar as
  *      being reserved by owner @res_name.  Do not access any
  *      address inside the PCI regions unless this call returns
  *      successfully.
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 26ddf78ac300..07c0aa5275e6 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -16,21 +16,21 @@ extern int pci_mmap_fits(struct pci_dev *pdev, int resno,
 #endif
 
 /**
- * Firmware PM callbacks
+ * struct pci_platform_pm_ops - Firmware PM callbacks
  *
- * @is_manageable - returns 'true' if given device is power manageable by the
- *                  platform firmware
+ * @is_manageable: returns 'true' if given device is power manageable by the
+ *                 platform firmware
  *
- * @set_state - invokes the platform firmware to set the device's power state
+ * @set_state: invokes the platform firmware to set the device's power state
  *
- * @choose_state - returns PCI power state of given device preferred by the
- *                 platform; to be used during system-wide transitions from a
- *                 sleeping state to the working state and vice versa
+ * @choose_state: returns PCI power state of given device preferred by the
+ *                platform; to be used during system-wide transitions from a
+ *                sleeping state to the working state and vice versa
  *
- * @can_wakeup - returns 'true' if given device is capable of waking up the
- *               system from a sleeping state
+ * @can_wakeup: returns 'true' if given device is capable of waking up the
+ *              system from a sleeping state
  *
- * @sleep_wake - enables/disables the system wake up capability of given device
+ * @sleep_wake: enables/disables the system wake up capability of given device
  *
  * If given platform is generally capable of power managing PCI devices, all of
  * these callbacks are mandatory.
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 586b6f75910d..b0367f168af4 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -718,9 +718,9 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
 
         /*
          * All PCIe functions are in one slot, remove one function will remove
-         * the the whole slot, so just wait
+         * the whole slot, so just wait until we are the last function left.
          */
-        if (!list_empty(&parent->subordinate->devices))
+        if (!list_is_last(&pdev->bus_list, &parent->subordinate->devices))
                 goto out;
 
         /* All functions are removed, so just disable ASPM for the link */
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 99a914a027f8..f9b874eaeb9f 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -55,25 +55,13 @@ static int pcie_portdrv_suspend(struct pci_dev *dev, pm_message_t state)
 
 }
 
-static int pcie_portdrv_suspend_late(struct pci_dev *dev, pm_message_t state)
-{
-        return pci_save_state(dev);
-}
-
-static int pcie_portdrv_resume_early(struct pci_dev *dev)
-{
-        return pci_restore_state(dev);
-}
-
 static int pcie_portdrv_resume(struct pci_dev *dev)
 {
-        pcie_portdrv_restore_config(dev);
+        pci_set_master(dev);
         return pcie_port_device_resume(dev);
 }
 #else
 #define pcie_portdrv_suspend NULL
-#define pcie_portdrv_suspend_late NULL
-#define pcie_portdrv_resume_early NULL
 #define pcie_portdrv_resume NULL
 #endif
 
@@ -292,8 +280,6 @@ static struct pci_driver pcie_portdriver = {
         .remove         = pcie_portdrv_remove,
 
         .suspend        = pcie_portdrv_suspend,
-        .suspend_late   = pcie_portdrv_suspend_late,
-        .resume_early   = pcie_portdrv_resume_early,
         .resume         = pcie_portdrv_resume,
 
         .err_handler    = &pcie_portdrv_err_handler,
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 132a78159b60..36864a935d68 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -55,6 +55,7 @@ void pci_disable_rom(struct pci_dev *pdev)
 
 /**
  * pci_get_rom_size - obtain the actual size of the ROM image
+ * @pdev: target PCI device
  * @rom: kernel virtual pointer to image of ROM
  * @size: size of PCI window
  *  return: size of actual ROM image
@@ -63,7 +64,7 @@ void pci_disable_rom(struct pci_dev *pdev)
  * The PCI window size could be much larger than the
  * actual image size.
  */
-size_t pci_get_rom_size(void __iomem *rom, size_t size)
+size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
 {
         void __iomem *image;
         int last_image;
@@ -72,8 +73,10 @@ size_t pci_get_rom_size(void __iomem *rom, size_t size)
         do {
                 void __iomem *pds;
                 /* Standard PCI ROMs start out with these bytes 55 AA */
-                if (readb(image) != 0x55)
+                if (readb(image) != 0x55) {
+                        dev_err(&pdev->dev, "Invalid ROM contents\n");
                         break;
+                }
                 if (readb(image + 1) != 0xAA)
                         break;
                 /* get the PCI data structure and check its signature */
@@ -159,7 +162,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
          * size is much larger than the actual size of the ROM.
          * True size is important if the ROM is going to be copied.
          */
-        *size = pci_get_rom_size(rom, *size);
+        *size = pci_get_rom_size(pdev, rom, *size);
         return rom;
 }
 
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 1a266d4ab5f1..b3866ad50227 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -42,6 +42,7 @@ config ASUS_LAPTOP
         depends on LEDS_CLASS
         depends on NEW_LEDS
         depends on BACKLIGHT_CLASS_DEVICE
+        depends on INPUT
         ---help---
           This is the new Linux driver for Asus laptops. It may also support some
           MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
@@ -61,6 +62,7 @@ config DELL_LAPTOP
         depends on EXPERIMENTAL
         depends on BACKLIGHT_CLASS_DEVICE
         depends on RFKILL
+        depends on POWER_SUPPLY
         default n
         ---help---
         This driver adds support for rfkill and backlight control to Dell
@@ -300,6 +302,7 @@ config INTEL_MENLOW
 config EEEPC_LAPTOP
         tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
         depends on ACPI
+        depends on INPUT
         depends on EXPERIMENTAL
         select BACKLIGHT_CLASS_DEVICE
         select HWMON
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 8fb8b3591048..56af6cf385b0 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -46,6 +46,7 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
+#include <linux/input.h>
 
 #define ASUS_LAPTOP_VERSION "0.42"
 
@@ -181,6 +182,8 @@ struct asus_hotk {
         u8 light_level;         //light sensor level
         u8 light_switch;        //light sensor switch value
         u16 event_count[128];   //count for each event TODO make this better
+        struct input_dev *inputdev;
+        u16 *keycode_map;
 };
 
 /*
@@ -250,6 +253,37 @@ ASUS_LED(rled, "record");
 ASUS_LED(pled, "phone");
 ASUS_LED(gled, "gaming");
 
+struct key_entry {
+        char type;
+        u8 code;
+        u16 keycode;
+};
+
+enum { KE_KEY, KE_END };
+
+static struct key_entry asus_keymap[] = {
+        {KE_KEY, 0x30, KEY_VOLUMEUP},
+        {KE_KEY, 0x31, KEY_VOLUMEDOWN},
+        {KE_KEY, 0x32, KEY_MUTE},
+        {KE_KEY, 0x33, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x34, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x40, KEY_PREVIOUSSONG},
+        {KE_KEY, 0x41, KEY_NEXTSONG},
+        {KE_KEY, 0x43, KEY_STOP},
+        {KE_KEY, 0x45, KEY_PLAYPAUSE},
+        {KE_KEY, 0x50, KEY_EMAIL},
+        {KE_KEY, 0x51, KEY_WWW},
+        {KE_KEY, 0x5C, BTN_EXTRA},  /* Performance */
+        {KE_KEY, 0x5D, KEY_WLAN},
+        {KE_KEY, 0x61, KEY_SWITCHVIDEOMODE},
+        {KE_KEY, 0x6B, BTN_TOUCH}, /* Lock Mouse */
+        {KE_KEY, 0x82, KEY_CAMERA},
+        {KE_KEY, 0x8A, KEY_TV},
+        {KE_KEY, 0x95, KEY_MEDIA},
+        {KE_KEY, 0x99, KEY_PHONE},
+        {KE_END, 0},
+};
+
 /*
  * This function evaluates an ACPI method, given an int as parameter, the
  * method is searched within the scope of the handle, can be NULL. The output
@@ -720,8 +754,68 @@ static ssize_t store_gps(struct device *dev, struct device_attribute *attr,
         return store_status(buf, count, NULL, GPS_ON);
 }
 
+/*
+ * Hotkey functions
+ */
+static struct key_entry *asus_get_entry_by_scancode(int code)
+{
+        struct key_entry *key;
+
+        for (key = asus_keymap; key->type != KE_END; key++)
+                if (code == key->code)
+                        return key;
+
+        return NULL;
+}
+
+static struct key_entry *asus_get_entry_by_keycode(int code)
+{
+        struct key_entry *key;
+
+        for (key = asus_keymap; key->type != KE_END; key++)
+                if (code == key->keycode && key->type == KE_KEY)
+                        return key;
+
+        return NULL;
+}
+
+static int asus_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+{
+        struct key_entry *key = asus_get_entry_by_scancode(scancode);
+
+        if (key && key->type == KE_KEY) {
+                *keycode = key->keycode;
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
+static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)
+{
+        struct key_entry *key;
+        int old_keycode;
+
+        if (keycode < 0 || keycode > KEY_MAX)
+                return -EINVAL;
+
+        key = asus_get_entry_by_scancode(scancode);
+        if (key && key->type == KE_KEY) {
+                old_keycode = key->keycode;
+                key->keycode = keycode;
+                set_bit(keycode, dev->keybit);
+                if (!asus_get_entry_by_keycode(old_keycode))
+                        clear_bit(old_keycode, dev->keybit);
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
 static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
 {
+        static struct key_entry *key;
+
         /* TODO Find a better way to handle events count. */
         if (!hotk)
                 return;
@@ -738,10 +832,24 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
                 lcd_blank(FB_BLANK_POWERDOWN);
         }
 
-        acpi_bus_generate_proc_event(hotk->device, event,
-                                hotk->event_count[event % 128]++);
-
-        return;
+        acpi_bus_generate_netlink_event(hotk->device->pnp.device_class,
+                                        dev_name(&hotk->device->dev), event,
+                                        hotk->event_count[event % 128]++);
+
+        if (hotk->inputdev) {
+                key = asus_get_entry_by_scancode(event);
+                if (!key)
+                        return ;
+
+                switch (key->type) {
+                case KE_KEY:
+                        input_report_key(hotk->inputdev, key->keycode, 1);
+                        input_sync(hotk->inputdev);
+                        input_report_key(hotk->inputdev, key->keycode, 0);
+                        input_sync(hotk->inputdev);
+                        break;
+                }
+        }
 }
 
 #define ASUS_CREATE_DEVICE_ATTR(_name)                                  \
@@ -959,6 +1067,38 @@ static int asus_hotk_get_info(void)
         return AE_OK;
 }
 
+static int asus_input_init(void)
+{
+        const struct key_entry *key;
+        int result;
+
+        hotk->inputdev = input_allocate_device();
+        if (!hotk->inputdev) {
+                printk(ASUS_INFO "Unable to allocate input device\n");
+                return 0;
+        }
+        hotk->inputdev->name = "Asus Laptop extra buttons";
+        hotk->inputdev->phys = ASUS_HOTK_FILE "/input0";
+        hotk->inputdev->id.bustype = BUS_HOST;
+        hotk->inputdev->getkeycode = asus_getkeycode;
+        hotk->inputdev->setkeycode = asus_setkeycode;
+
+        for (key = asus_keymap; key->type != KE_END; key++) {
+                switch (key->type) {
+                case KE_KEY:
+                        set_bit(EV_KEY, hotk->inputdev->evbit);
+                        set_bit(key->keycode, hotk->inputdev->keybit);
+                        break;
+                }
+        }
+        result = input_register_device(hotk->inputdev);
+        if (result) {
+                printk(ASUS_INFO "Unable to register input device\n");
+                input_free_device(hotk->inputdev);
+        }
+        return result;
+}
+
 static int asus_hotk_check(void)
 {
         int result = 0;
@@ -1044,7 +1184,7 @@ static int asus_hotk_add(struct acpi_device *device)
         /* GPS is on by default */
         write_status(NULL, 1, GPS_ON);
 
-      end:
+end:
         if (result) {
                 kfree(hotk->name);
                 kfree(hotk);
@@ -1091,10 +1231,17 @@ static void asus_led_exit(void)
         ASUS_LED_UNREGISTER(gled);
 }
 
+static void asus_input_exit(void)
+{
+        if (hotk->inputdev)
+                input_unregister_device(hotk->inputdev);
+}
+
 static void __exit asus_laptop_exit(void)
 {
         asus_backlight_exit();
         asus_led_exit();
+        asus_input_exit();
 
         acpi_bus_unregister_driver(&asus_hotk_driver);
         sysfs_remove_group(&asuspf_device->dev.kobj, &asuspf_attribute_group);
@@ -1216,6 +1363,10 @@ static int __init asus_laptop_init(void)
                 printk(ASUS_INFO "Brightness ignored, must be controlled by "
                        "ACPI video driver\n");
 
+        result = asus_input_init();
+        if (result)
+                goto fail_input;
+
         result = asus_led_init(dev);
         if (result)
                 goto fail_led;
@@ -1242,22 +1393,25 @@ static int __init asus_laptop_init(void)
 
         return 0;
 
-      fail_sysfs:
+fail_sysfs:
         platform_device_del(asuspf_device);
 
-      fail_platform_device2:
+fail_platform_device2:
         platform_device_put(asuspf_device);
 
-      fail_platform_device1:
+fail_platform_device1:
         platform_driver_unregister(&asuspf_driver);
 
-      fail_platform_driver:
+fail_platform_driver:
         asus_led_exit();
 
-      fail_led:
+fail_led:
+        asus_input_exit();
+
+fail_input:
         asus_backlight_exit();
 
-      fail_backlight:
+fail_backlight:
 
         return result;
 }
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index 1e74988c7b2d..d63f26e666a4 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -143,6 +143,7 @@ struct asus_hotk {
                                                          S1300N, S5200N*/
                 A4S,            /* Z81sp */
                 F3Sa,           /* (Centrino) */
+                R1F,
                 END_MODEL
         } model;                /* Models currently supported */
         u16 event_count[128];   /* Count for each event TODO make this better */
@@ -420,7 +421,18 @@ static struct model_data model_conf[END_MODEL] = {
                 .display_get    = "\\ADVG",
                 .display_set    = "SDSP",
         },
-
+        {
+                .name = "R1F",
+                .mt_bt_switch = "BLED",
+                .mt_mled = "MLED",
+                .mt_wled = "WLED",
+                .mt_lcd_switch = "\\Q10",
+                .lcd_status = "\\GP06",
+                .brightness_set = "SPLV",
+                .brightness_get = "GPLV",
+                .display_set = "SDSP",
+                .display_get = "\\INFB"
+        }
 };
 
 /* procdir we use */
@@ -1165,6 +1177,8 @@ static int asus_model_match(char *model)
                 return W3V;
         else if (strncmp(model, "W5A", 3) == 0)
                 return W5A;
+        else if (strncmp(model, "R1F", 3) == 0)
+                return R1F;
         else if (strncmp(model, "A4S", 3) == 0)
                 return A4S;
         else if (strncmp(model, "F3Sa", 4) == 0)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 9d93cb971e59..786ed8661cb0 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -30,6 +30,7 @@
 #include <linux/uaccess.h>
 #include <linux/input.h>
 #include <linux/rfkill.h>
+#include <linux/pci.h>
 
 #define EEEPC_LAPTOP_VERSION    "0.1"
 
@@ -161,6 +162,10 @@ static struct key_entry eeepc_keymap[] = {
         {KE_KEY, 0x13, KEY_MUTE },
         {KE_KEY, 0x14, KEY_VOLUMEDOWN },
         {KE_KEY, 0x15, KEY_VOLUMEUP },
+        {KE_KEY, 0x1a, KEY_COFFEE },
+        {KE_KEY, 0x1b, KEY_ZOOM },
+        {KE_KEY, 0x1c, KEY_PROG2 },
+        {KE_KEY, 0x1d, KEY_PROG3 },
         {KE_KEY, 0x30, KEY_SWITCHVIDEOMODE },
         {KE_KEY, 0x31, KEY_SWITCHVIDEOMODE },
         {KE_KEY, 0x32, KEY_SWITCHVIDEOMODE },
@@ -510,7 +515,43 @@ static int eeepc_hotk_check(void)
 static void notify_brn(void)
 {
         struct backlight_device *bd = eeepc_backlight_device;
-        bd->props.brightness = read_brightness(bd);
+        if (bd)
+                bd->props.brightness = read_brightness(bd);
+}
+
+static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
+{
+        struct pci_dev *dev;
+        struct pci_bus *bus = pci_find_bus(0, 1);
+
+        if (event != ACPI_NOTIFY_BUS_CHECK)
+                return;
+
+        if (!bus) {
+                printk(EEEPC_WARNING "Unable to find PCI bus 1?\n");
+                return;
+        }
+
+        if (get_acpi(CM_ASL_WLAN) == 1) {
+                dev = pci_get_slot(bus, 0);
+                if (dev) {
+                        /* Device already present */
+                        pci_dev_put(dev);
+                        return;
+                }
+                dev = pci_scan_single_device(bus, 0);
+                if (dev) {
+                        pci_bus_assign_resources(bus);
+                        if (pci_bus_add_device(dev))
+                                printk(EEEPC_ERR "Unable to hotplug wifi\n");
+                }
+        } else {
+                dev = pci_get_slot(bus, 0);
+                if (dev) {
+                        pci_remove_bus_device(dev);
+                        pci_dev_put(dev);
+                }
+        }
 }
 
 static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
@@ -520,8 +561,9 @@ static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
                 return;
         if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
                 notify_brn();
-        acpi_bus_generate_proc_event(ehotk->device, event,
-                                     ehotk->event_count[event % 128]++);
+        acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class,
+                                        dev_name(&ehotk->device->dev), event,
+                                        ehotk->event_count[event % 128]++);
         if (ehotk->inputdev) {
                 key = eepc_get_entry_by_scancode(event);
                 if (key) {
@@ -539,6 +581,45 @@ static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
         }
 }
 
+static int eeepc_register_rfkill_notifier(char *node)
+{
+        acpi_status status = AE_OK;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, node, &handle);
+
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_install_notify_handler(handle,
+                                                     ACPI_SYSTEM_NOTIFY,
+                                                     eeepc_rfkill_notify,
+                                                     NULL);
+                if (ACPI_FAILURE(status))
+                        printk(EEEPC_WARNING
+                               "Failed to register notify on %s\n", node);
+        } else
+                return -ENODEV;
+
+        return 0;
+}
+
+static void eeepc_unregister_rfkill_notifier(char *node)
+{
+        acpi_status status = AE_OK;
+        acpi_handle handle;
+
+        status = acpi_get_handle(NULL, node, &handle);
+
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_remove_notify_handler(handle,
+                                                     ACPI_SYSTEM_NOTIFY,
+                                                     eeepc_rfkill_notify);
+                if (ACPI_FAILURE(status))
+                        printk(EEEPC_ERR
+                               "Error removing rfkill notify handler %s\n",
+                                node);
+        }
+}
+
 static int eeepc_hotk_add(struct acpi_device *device)
 {
         acpi_status status = AE_OK;
@@ -558,7 +639,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
         ehotk->device = device;
         result = eeepc_hotk_check();
         if (result)
-                goto end;
+                goto ehotk_fail;
         status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
                                              eeepc_hotk_notify, ehotk);
         if (ACPI_FAILURE(status))
@@ -569,18 +650,25 @@ static int eeepc_hotk_add(struct acpi_device *device)
                                                            RFKILL_TYPE_WLAN);
 
                 if (!ehotk->eeepc_wlan_rfkill)
-                        goto end;
+                        goto wlan_fail;
 
                 ehotk->eeepc_wlan_rfkill->name = "eeepc-wlan";
                 ehotk->eeepc_wlan_rfkill->toggle_radio = eeepc_wlan_rfkill_set;
                 ehotk->eeepc_wlan_rfkill->get_state = eeepc_wlan_rfkill_state;
-                if (get_acpi(CM_ASL_WLAN) == 1)
+                if (get_acpi(CM_ASL_WLAN) == 1) {
                         ehotk->eeepc_wlan_rfkill->state =
                                 RFKILL_STATE_UNBLOCKED;
-                else
+                        rfkill_set_default(RFKILL_TYPE_WLAN,
+                                           RFKILL_STATE_UNBLOCKED);
+                } else {
                         ehotk->eeepc_wlan_rfkill->state =
                                 RFKILL_STATE_SOFT_BLOCKED;
-                rfkill_register(ehotk->eeepc_wlan_rfkill);
+                        rfkill_set_default(RFKILL_TYPE_WLAN,
+                                           RFKILL_STATE_SOFT_BLOCKED);
+                }
+                result = rfkill_register(ehotk->eeepc_wlan_rfkill);
+                if (result)
+                        goto wlan_fail;
         }
 
         if (get_acpi(CM_ASL_BLUETOOTH) != -1) {
@@ -588,27 +676,47 @@ static int eeepc_hotk_add(struct acpi_device *device)
                         rfkill_allocate(&device->dev, RFKILL_TYPE_BLUETOOTH);
 
                 if (!ehotk->eeepc_bluetooth_rfkill)
-                        goto end;
+                        goto bluetooth_fail;
 
                 ehotk->eeepc_bluetooth_rfkill->name = "eeepc-bluetooth";
                 ehotk->eeepc_bluetooth_rfkill->toggle_radio =
                         eeepc_bluetooth_rfkill_set;
                 ehotk->eeepc_bluetooth_rfkill->get_state =
                         eeepc_bluetooth_rfkill_state;
-                if (get_acpi(CM_ASL_BLUETOOTH) == 1)
+                if (get_acpi(CM_ASL_BLUETOOTH) == 1) {
                         ehotk->eeepc_bluetooth_rfkill->state =
                                 RFKILL_STATE_UNBLOCKED;
-                else
+                        rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
+                                           RFKILL_STATE_UNBLOCKED);
+                } else {
                         ehotk->eeepc_bluetooth_rfkill->state =
                                 RFKILL_STATE_SOFT_BLOCKED;
-                rfkill_register(ehotk->eeepc_bluetooth_rfkill);
-        }
+                        rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
+                                           RFKILL_STATE_SOFT_BLOCKED);
+                }
 
- end:
-        if (result) {
-                kfree(ehotk);
-                ehotk = NULL;
+                result = rfkill_register(ehotk->eeepc_bluetooth_rfkill);
+                if (result)
+                        goto bluetooth_fail;
         }
+
+        eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
+        eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+
+        return 0;
+
+ bluetooth_fail:
+        if (ehotk->eeepc_bluetooth_rfkill)
+                rfkill_free(ehotk->eeepc_bluetooth_rfkill);
+        rfkill_unregister(ehotk->eeepc_wlan_rfkill);
+        ehotk->eeepc_wlan_rfkill = NULL;
+ wlan_fail:
+        if (ehotk->eeepc_wlan_rfkill)
+                rfkill_free(ehotk->eeepc_wlan_rfkill);
+ ehotk_fail:
+        kfree(ehotk);
+        ehotk = NULL;
+
         return result;
 }
 
@@ -622,6 +730,10 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
                                             eeepc_hotk_notify);
         if (ACPI_FAILURE(status))
                 printk(EEEPC_ERR "Error removing notify handler\n");
+
+        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
+        eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+
         kfree(ehotk);
         return 0;
 }
@@ -737,13 +849,21 @@ static void eeepc_backlight_exit(void)
 {
         if (eeepc_backlight_device)
                 backlight_device_unregister(eeepc_backlight_device);
-        if (ehotk->inputdev)
-                input_unregister_device(ehotk->inputdev);
+        eeepc_backlight_device = NULL;
+}
+
+static void eeepc_rfkill_exit(void)
+{
         if (ehotk->eeepc_wlan_rfkill)
                 rfkill_unregister(ehotk->eeepc_wlan_rfkill);
         if (ehotk->eeepc_bluetooth_rfkill)
                 rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
-        eeepc_backlight_device = NULL;
+}
+
+static void eeepc_input_exit(void)
+{
+        if (ehotk->inputdev)
+                input_unregister_device(ehotk->inputdev);
 }
 
 static void eeepc_hwmon_exit(void)
@@ -762,6 +882,8 @@ static void eeepc_hwmon_exit(void)
 static void __exit eeepc_laptop_exit(void)
 {
         eeepc_backlight_exit();
+        eeepc_rfkill_exit();
+        eeepc_input_exit();
         eeepc_hwmon_exit();
         acpi_bus_unregister_driver(&eeepc_hotk_driver);
         sysfs_remove_group(&platform_device->dev.kobj,
@@ -865,6 +987,8 @@ fail_platform_driver:
 fail_hwmon:
         eeepc_backlight_exit();
 fail_backlight:
+        eeepc_input_exit();
+        eeepc_rfkill_exit();
         return result;
 }
 
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 65dc41540c62..45940f31fe9e 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -166,6 +166,7 @@ struct fujitsu_hotkey_t {
         struct platform_device *pf_device;
         struct kfifo *fifo;
         spinlock_t fifo_lock;
+        int rfkill_supported;
         int rfkill_state;
         int logolamp_registered;
         int kblamps_registered;
@@ -526,7 +527,7 @@ static ssize_t
 show_lid_state(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        if (fujitsu_hotkey->rfkill_state == UNSUPPORTED_CMD)
+        if (!(fujitsu_hotkey->rfkill_supported & 0x100))
                 return sprintf(buf, "unknown\n");
         if (fujitsu_hotkey->rfkill_state & 0x100)
                 return sprintf(buf, "open\n");
@@ -538,7 +539,7 @@ static ssize_t
 show_dock_state(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        if (fujitsu_hotkey->rfkill_state == UNSUPPORTED_CMD)
+        if (!(fujitsu_hotkey->rfkill_supported & 0x200))
                 return sprintf(buf, "unknown\n");
         if (fujitsu_hotkey->rfkill_state & 0x200)
                 return sprintf(buf, "docked\n");
@@ -550,7 +551,7 @@ static ssize_t
 show_radios_state(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        if (fujitsu_hotkey->rfkill_state == UNSUPPORTED_CMD)
+        if (!(fujitsu_hotkey->rfkill_supported & 0x20))
                 return sprintf(buf, "unknown\n");
         if (fujitsu_hotkey->rfkill_state & 0x20)
                 return sprintf(buf, "on\n");
@@ -928,8 +929,17 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
                 ; /* No action, result is discarded */
         vdbg_printk(FUJLAPTOP_DBG_INFO, "Discarded %i ringbuffer entries\n", i);
 
-        fujitsu_hotkey->rfkill_state =
-                call_fext_func(FUNC_RFKILL, 0x4, 0x0, 0x0);
+        fujitsu_hotkey->rfkill_supported =
+                call_fext_func(FUNC_RFKILL, 0x0, 0x0, 0x0);
+
+        /* Make sure our bitmask of supported functions is cleared if the
+           RFKILL function block is not implemented, like on the S7020. */
+        if (fujitsu_hotkey->rfkill_supported == UNSUPPORTED_CMD)
+                fujitsu_hotkey->rfkill_supported = 0;
+
+        if (fujitsu_hotkey->rfkill_supported)
+                fujitsu_hotkey->rfkill_state =
+                        call_fext_func(FUNC_RFKILL, 0x4, 0x0, 0x0);
 
         /* Suspect this is a keymap of the application panel, print it */
         printk(KERN_INFO "fujitsu-laptop: BTNI: [0x%x]\n",
@@ -1005,8 +1015,9 @@ static void acpi_fujitsu_hotkey_notify(acpi_handle handle, u32 event,
 
         input = fujitsu_hotkey->input;
 
-        fujitsu_hotkey->rfkill_state =
-                call_fext_func(FUNC_RFKILL, 0x4, 0x0, 0x0);
+        if (fujitsu_hotkey->rfkill_supported)
+                fujitsu_hotkey->rfkill_state =
+                        call_fext_func(FUNC_RFKILL, 0x4, 0x0, 0x0);
 
         switch (event) {
         case ACPI_FUJITSU_NOTIFY_CODE1:
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index de91ddab0a86..f41135f2fb29 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -463,9 +463,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
 
         return 0;
 register_wwan_err:
-        rfkill_unregister(bluetooth_rfkill);
+        if (bluetooth_rfkill)
+                rfkill_unregister(bluetooth_rfkill);
 register_bluetooth_error:
-        rfkill_unregister(wifi_rfkill);
+        if (wifi_rfkill)
+                rfkill_unregister(wifi_rfkill);
 add_sysfs_error:
         cleanup_sysfs(device);
         return err;
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index f30db367c82e..c47a44dcb702 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -507,7 +507,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc)
 
         hkey_num = result & 0xf;
 
-        if (hkey_num < 0 || hkey_num > ARRAY_SIZE(pcc->keymap)) {
+        if (hkey_num < 0 || hkey_num >= ARRAY_SIZE(pcc->keymap)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "hotkey number out of range: %d\n",
                                   hkey_num));
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index e988ec130fcd..41aec2acbb91 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -199,7 +199,8 @@ static int adapter_get_property(struct power_supply *psy,
                         enum power_supply_property psp,
                         union power_supply_propval *val)
 {
-        struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb);
+        struct pcf50633_mbc *mbc = container_of(psy,
+                                struct pcf50633_mbc, adapter);
         int ret = 0;
 
         switch (psp) {
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index cced4d108319..81450fbd8b12 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -241,6 +241,12 @@ config RTC_DRV_M41T80_WDT
           If you say Y here you will get support for the
           watchdog timer in the ST M41T60 and M41T80 RTC chips series.
 
+config RTC_DRV_DM355EVM
+        tristate "TI DaVinci DM355 EVM RTC"
+        depends on MFD_DM355EVM_MSP
+        help
+          Supports the RTC firmware in the MSP430 on the DM355 EVM.
+
 config RTC_DRV_TWL92330
         boolean "TI TWL92330/Menelaus"
         depends on MENELAUS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 6e28021abb9d..0e697aa51caa 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_RTC_DRV_AT91SAM9)	+= rtc-at91sam9.o
 obj-$(CONFIG_RTC_DRV_AU1XXX)    += rtc-au1xxx.o
 obj-$(CONFIG_RTC_DRV_BFIN)      += rtc-bfin.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc-cmos.o
+obj-$(CONFIG_RTC_DRV_DM355EVM)  += rtc-dm355evm.o
 obj-$(CONFIG_RTC_DRV_DS1216)    += rtc-ds1216.o
 obj-$(CONFIG_RTC_DRV_DS1286)    += rtc-ds1286.o
 obj-$(CONFIG_RTC_DRV_DS1302)    += rtc-ds1302.o
diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
index 8906a688e6a6..979ed0406ce9 100644
--- a/drivers/rtc/rtc-au1xxx.c
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -81,7 +81,7 @@ static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev)
         if (au_readl(SYS_TOYTRIM) != 32767) {
                 /* wait until hardware gives access to TRIM register */
                 t = 0x00100000;
-                while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && t--)
+                while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S) && --t)
                         msleep(1);
 
                 if (!t) {
diff --git a/drivers/rtc/rtc-dm355evm.c b/drivers/rtc/rtc-dm355evm.c
new file mode 100644
index 000000000000..58d4e18530da
--- /dev/null
+++ b/drivers/rtc/rtc-dm355evm.c
@@ -0,0 +1,175 @@
+/*
+ * rtc-dm355evm.c - access battery-backed counter in MSP430 firmware
+ *
+ * Copyright (c) 2008 by David Brownell
+ *
+ * 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/kernel.h>
+#include <linux/init.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+
+#include <linux/i2c/dm355evm_msp.h>
+
+
+/*
+ * The MSP430 firmware on the DM355 EVM uses a watch crystal to feed
+ * a 1 Hz counter.  When a backup battery is supplied, that makes a
+ * reasonable RTC for applications where alarms and non-NTP drift
+ * compensation aren't important.
+ *
+ * The only real glitch is the inability to read or write all four
+ * counter bytes atomically:  the count may increment in the middle
+ * of an operation, causing trouble when the LSB rolls over.
+ *
+ * This driver was tested with firmware revision A4.
+ */
+union evm_time {
+        u8      bytes[4];
+        u32     value;
+};
+
+static int dm355evm_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        union evm_time  time;
+        int             status;
+        int             tries = 0;
+
+        do {
+                /*
+                 * Read LSB(0) to MSB(3) bytes.  Defend against the counter
+                 * rolling over by re-reading until the value is stable,
+                 * and assuming the four reads take at most a few seconds.
+                 */
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_0);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[0] == status)
+                        break;
+                time.bytes[0] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_1);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[1] == status)
+                        break;
+                time.bytes[1] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_2);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[2] == status)
+                        break;
+                time.bytes[2] = status;
+
+                status = dm355evm_msp_read(DM355EVM_MSP_RTC_3);
+                if (status < 0)
+                        return status;
+                if (tries && time.bytes[3] == status)
+                        break;
+                time.bytes[3] = status;
+
+        } while (++tries < 5);
+
+        dev_dbg(dev, "read timestamp %08x\n", time.value);
+
+        rtc_time_to_tm(le32_to_cpu(time.value), tm);
+        return 0;
+}
+
+static int dm355evm_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        union evm_time  time;
+        unsigned long   value;
+        int             status;
+
+        rtc_tm_to_time(tm, &value);
+        time.value = cpu_to_le32(value);
+
+        dev_dbg(dev, "write timestamp %08x\n", time.value);
+
+        /*
+         * REVISIT handle non-atomic writes ... maybe just retry until
+         * byte[1] sticks (no rollover)?
+         */
+        status = dm355evm_msp_write(time.bytes[0], DM355EVM_MSP_RTC_0);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[1], DM355EVM_MSP_RTC_1);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[2], DM355EVM_MSP_RTC_2);
+        if (status < 0)
+                return status;
+
+        status = dm355evm_msp_write(time.bytes[3], DM355EVM_MSP_RTC_3);
+        if (status < 0)
+                return status;
+
+        return 0;
+}
+
+static struct rtc_class_ops dm355evm_rtc_ops = {
+        .read_time      = dm355evm_rtc_read_time,
+        .set_time       = dm355evm_rtc_set_time,
+};
+
+/*----------------------------------------------------------------------*/
+
+static int __devinit dm355evm_rtc_probe(struct platform_device *pdev)
+{
+        struct rtc_device *rtc;
+
+        rtc = rtc_device_register(pdev->name,
+                                  &pdev->dev, &dm355evm_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc)) {
+                dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
+                        PTR_ERR(rtc));
+                return PTR_ERR(rtc);
+        }
+        platform_set_drvdata(pdev, rtc);
+
+        return 0;
+}
+
+static int __devexit dm355evm_rtc_remove(struct platform_device *pdev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        rtc_device_unregister(rtc);
+        platform_set_drvdata(pdev, NULL);
+        return 0;
+}
+
+/*
+ * I2C is used to talk to the MSP430, but this platform device is
+ * exposed by an MFD driver that manages I2C communications.
+ */
+static struct platform_driver rtc_dm355evm_driver = {
+        .probe          = dm355evm_rtc_probe,
+        .remove         = __devexit_p(dm355evm_rtc_remove),
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "rtc-dm355evm",
+        },
+};
+
+static int __init dm355evm_rtc_init(void)
+{
+        return platform_driver_register(&rtc_dm355evm_driver);
+}
+module_init(dm355evm_rtc_init);
+
+static void __exit dm355evm_rtc_exit(void)
+{
+        platform_driver_unregister(&rtc_dm355evm_driver);
+}
+module_exit(dm355evm_rtc_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index e54b5c619bdf..e01b955db077 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -122,7 +122,6 @@ static const struct rtc_class_ops ds1390_rtc_ops = {
 
 static int __devinit ds1390_probe(struct spi_device *spi)
 {
-        struct rtc_device *rtc;
         unsigned char tmp;
         struct ds1390 *chip;
         int res;
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index bd56a033bfd0..bb8cc05605ac 100644
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -485,7 +485,7 @@ static void __exit pxa_rtc_exit(void)
 module_init(pxa_rtc_init);
 module_exit(pxa_rtc_exit);
 
-MODULE_AUTHOR("Robert Jarzmik");
+MODULE_AUTHOR("Robert Jarzmik <robert.jarzmik@free.fr>");
 MODULE_DESCRIPTION("PXA27x/PXA3xx Realtime Clock Driver (RTC)");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:pxa-rtc");
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index bd5914994142..08c23a921012 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -57,6 +57,8 @@ static void dasd_device_tasklet(struct dasd_device *);
 static void dasd_block_tasklet(struct dasd_block *);
 static void do_kick_device(struct work_struct *);
 static void dasd_return_cqr_cb(struct dasd_ccw_req *, void *);
+static void dasd_device_timeout(unsigned long);
+static void dasd_block_timeout(unsigned long);
 
 /*
  * SECTION: Operations on the device structure.
@@ -99,6 +101,8 @@ struct dasd_device *dasd_alloc_device(void)
                      (unsigned long) device);
         INIT_LIST_HEAD(&device->ccw_queue);
         init_timer(&device->timer);
+        device->timer.function = dasd_device_timeout;
+        device->timer.data = (unsigned long) device;
         INIT_WORK(&device->kick_work, do_kick_device);
         device->state = DASD_STATE_NEW;
         device->target = DASD_STATE_NEW;
@@ -138,6 +142,8 @@ struct dasd_block *dasd_alloc_block(void)
         INIT_LIST_HEAD(&block->ccw_queue);
         spin_lock_init(&block->queue_lock);
         init_timer(&block->timer);
+        block->timer.function = dasd_block_timeout;
+        block->timer.data = (unsigned long) block;
 
         return block;
 }
@@ -915,19 +921,10 @@ static void dasd_device_timeout(unsigned long ptr)
  */
 void dasd_device_set_timer(struct dasd_device *device, int expires)
 {
-        if (expires == 0) {
-                if (timer_pending(&device->timer))
-                        del_timer(&device->timer);
-                return;
-        }
-        if (timer_pending(&device->timer)) {
-                if (mod_timer(&device->timer, jiffies + expires))
-                        return;
-        }
-        device->timer.function = dasd_device_timeout;
-        device->timer.data = (unsigned long) device;
-        device->timer.expires = jiffies + expires;
-        add_timer(&device->timer);
+        if (expires == 0)
+                del_timer(&device->timer);
+        else
+                mod_timer(&device->timer, jiffies + expires);
 }
 
 /*
@@ -935,8 +932,7 @@ void dasd_device_set_timer(struct dasd_device *device, int expires)
  */
 void dasd_device_clear_timer(struct dasd_device *device)
 {
-        if (timer_pending(&device->timer))
-                del_timer(&device->timer);
+        del_timer(&device->timer);
 }
 
 static void dasd_handle_killed_request(struct ccw_device *cdev,
@@ -1586,19 +1582,10 @@ static void dasd_block_timeout(unsigned long ptr)
  */
 void dasd_block_set_timer(struct dasd_block *block, int expires)
 {
-        if (expires == 0) {
-                if (timer_pending(&block->timer))
-                        del_timer(&block->timer);
-                return;
-        }
-        if (timer_pending(&block->timer)) {
-                if (mod_timer(&block->timer, jiffies + expires))
-                        return;
-        }
-        block->timer.function = dasd_block_timeout;
-        block->timer.data = (unsigned long) block;
-        block->timer.expires = jiffies + expires;
-        add_timer(&block->timer);
+        if (expires == 0)
+                del_timer(&block->timer);
+        else
+                mod_timer(&block->timer, jiffies + expires);
 }
 
 /*
@@ -1606,8 +1593,7 @@ void dasd_block_set_timer(struct dasd_block *block, int expires)
  */
 void dasd_block_clear_timer(struct dasd_block *block)
 {
-        if (timer_pending(&block->timer))
-                del_timer(&block->timer);
+        del_timer(&block->timer);
 }
 
 /*
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 300e28a531f8..34339902efb9 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -677,7 +677,7 @@ static ssize_t dasd_ff_show(struct device *dev, struct device_attribute *attr,
         struct dasd_devmap *devmap;
         int ff_flag;
 
-        devmap = dasd_find_busid(dev->bus_id);
+        devmap = dasd_find_busid(dev_name(dev));
         if (!IS_ERR(devmap))
                 ff_flag = (devmap->features & DASD_FEATURE_FAILFAST) != 0;
         else
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 1fd8f2193ed8..4377e93a43d7 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -280,8 +280,11 @@ sclp_dispatch_evbufs(struct sccb_header *sccb)
         rc = 0;
         for (offset = sizeof(struct sccb_header); offset < sccb->length;
              offset += evbuf->length) {
-                /* Search for event handler */
                 evbuf = (struct evbuf_header *) ((addr_t) sccb + offset);
+                /* Check for malformed hardware response */
+                if (evbuf->length == 0)
+                        break;
+                /* Search for event handler */
                 reg = NULL;
                 list_for_each(l, &sclp_reg_list) {
                         reg = list_entry(l, struct sclp_register, list);
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 506390496416..77ab6e34a100 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -19,6 +19,7 @@
 #include <linux/memory.h>
 #include <asm/chpid.h>
 #include <asm/sclp.h>
+#include <asm/setup.h>
 
 #include "sclp.h"
 
@@ -474,6 +475,10 @@ static void __init add_memory_merged(u16 rn)
                 goto skip_add;
         if (start + size > VMEM_MAX_PHYS)
                 size = VMEM_MAX_PHYS - start;
+        if (memory_end_set && (start >= memory_end))
+                goto skip_add;
+        if (memory_end_set && (start + size > memory_end))
+                size = memory_end - start;
         add_memory(0, start, size);
 skip_add:
         first_rn = rn;
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index a1a511bdec8c..ed1e728763a2 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1573,9 +1573,6 @@ static int ibmvfc_queuecommand(struct scsi_cmnd *cmnd,
         vfc_cmd->resp_len = sizeof(vfc_cmd->rsp);
         vfc_cmd->cancel_key = (unsigned long)cmnd->device->hostdata;
         vfc_cmd->tgt_scsi_id = rport->port_id;
-        if ((rport->supported_classes & FC_COS_CLASS3) &&
-            (fc_host_supported_classes(vhost->host) & FC_COS_CLASS3))
-                vfc_cmd->flags = IBMVFC_CLASS_3_ERR;
         vfc_cmd->iu.xfer_len = scsi_bufflen(cmnd);
         int_to_scsilun(cmnd->device->lun, &vfc_cmd->iu.lun);
         memcpy(vfc_cmd->iu.cdb, cmnd->cmnd, cmnd->cmd_len);
@@ -3266,6 +3263,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
                 return -ENOMEM;
         }
 
+        memset(tgt, 0, sizeof(*tgt));
         tgt->scsi_id = scsi_id;
         tgt->new_scsi_id = scsi_id;
         tgt->vhost = vhost;
@@ -3576,9 +3574,18 @@ static void ibmvfc_log_ae(struct ibmvfc_host *vhost, int events)
 static void ibmvfc_tgt_add_rport(struct ibmvfc_target *tgt)
 {
         struct ibmvfc_host *vhost = tgt->vhost;
-        struct fc_rport *rport;
+        struct fc_rport *rport = tgt->rport;
         unsigned long flags;
 
+        if (rport) {
+                tgt_dbg(tgt, "Setting rport roles\n");
+                fc_remote_port_rolechg(rport, tgt->ids.roles);
+                spin_lock_irqsave(vhost->host->host_lock, flags);
+                ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_NONE);
+                spin_unlock_irqrestore(vhost->host->host_lock, flags);
+                return;
+        }
+
         tgt_dbg(tgt, "Adding rport\n");
         rport = fc_remote_port_add(vhost->host, 0, &tgt->ids);
         spin_lock_irqsave(vhost->host->host_lock, flags);
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 87dafd0f8d44..b21e071b9862 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -32,7 +32,7 @@
 #define IBMVFC_DRIVER_VERSION           "1.0.4"
 #define IBMVFC_DRIVER_DATE              "(November 14, 2008)"
 
-#define IBMVFC_DEFAULT_TIMEOUT  15
+#define IBMVFC_DEFAULT_TIMEOUT  60
 #define IBMVFC_INIT_TIMEOUT             120
 #define IBMVFC_MAX_REQUESTS_DEFAULT     100
 
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 74d07d137dae..c9aa7611e408 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -432,6 +432,7 @@ static int map_sg_data(struct scsi_cmnd *cmd,
                                 sdev_printk(KERN_ERR, cmd->device,
                                             "Can't allocate memory "
                                             "for indirect table\n");
+                        scsi_dma_unmap(cmd);
                         return 0;
                 }
         }
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 257c24115de9..809d32d95c76 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1998,6 +1998,8 @@ int iscsi_host_add(struct Scsi_Host *shost, struct device *pdev)
         if (!shost->can_queue)
                 shost->can_queue = ISCSI_DEF_XMIT_CMDS_MAX;
 
+        if (!shost->transportt->eh_timed_out)
+                shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out;
         return scsi_add_host(shost, pdev);
 }
 EXPORT_SYMBOL_GPL(iscsi_host_add);
@@ -2020,7 +2022,6 @@ struct Scsi_Host *iscsi_host_alloc(struct scsi_host_template *sht,
         shost = scsi_host_alloc(sht, sizeof(struct iscsi_host) + dd_data_size);
         if (!shost)
                 return NULL;
-        shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out;
 
         if (qdepth > ISCSI_MAX_CMD_PER_LUN || qdepth < 1) {
                 if (qdepth != 0)
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index a8f30bdaff69..a7302480bc4a 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -5258,6 +5258,7 @@ lpfc_send_els_event(struct lpfc_vport *vport,
                         sizeof(struct lpfc_name));
                 break;
         default:
+                kfree(els_data);
                 return;
         }
         memcpy(els_data->wwpn, &ndlp->nlp_portname, sizeof(struct lpfc_name));
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 33a3c13fd893..f4c57227ec18 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1265,13 +1265,6 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
             test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))
                 msleep(1000);
 
-        if (ha->mqenable) {
-                if (qla25xx_delete_queues(vha, 0) != QLA_SUCCESS)
-                        qla_printk(KERN_WARNING, ha,
-                                "Queue delete failed.\n");
-                vha->req_ques[0] = ha->req_q_map[0]->id;
-        }
-
         qla24xx_disable_vp(vha);
 
         fc_remove_host(vha->host);
@@ -1293,6 +1286,12 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
                     vha->host_no, vha->vp_idx, vha));
         }
 
+        if (ha->mqenable) {
+                if (qla25xx_delete_queues(vha, 0) != QLA_SUCCESS)
+                        qla_printk(KERN_WARNING, ha,
+                                "Queue delete failed.\n");
+        }
+
         scsi_host_put(vha->host);
         qla_printk(KERN_INFO, ha, "vport %d deleted\n", id);
         return 0;
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 023ee77fb027..e0c5bb54b258 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2135,6 +2135,7 @@ struct qla_msix_entry {
 /* Work events.  */
 enum qla_work_type {
         QLA_EVT_AEN,
+        QLA_EVT_IDC_ACK,
 };
 
 
@@ -2149,6 +2150,10 @@ struct qla_work_evt {
                         enum fc_host_event_code code;
                         u32 data;
                 } aen;
+                struct {
+#define QLA_IDC_ACK_REGS        7
+                        uint16_t mb[QLA_IDC_ACK_REGS];
+                } idc_ack;
         } u;
 };
 
diff --git a/drivers/scsi/qla2xxx/qla_devtbl.h b/drivers/scsi/qla2xxx/qla_devtbl.h
index d78d35e681ab..d6ea69df7c5c 100644
--- a/drivers/scsi/qla2xxx/qla_devtbl.h
+++ b/drivers/scsi/qla2xxx/qla_devtbl.h
@@ -72,7 +72,7 @@ static char *qla2x00_model_name[QLA_MODEL_NAMES*2] = {
         "QLA2462",      "Sun PCI-X 2.0 to 4Gb FC, Dual Channel",        /* 0x141 */
         "QLE2460",      "Sun PCI-Express to 2Gb FC, Single Channel",    /* 0x142 */
         "QLE2462",      "Sun PCI-Express to 4Gb FC, Single Channel",    /* 0x143 */
-        "QEM2462"       "Server I/O Module 4Gb FC, Dual Channel",       /* 0x144 */
+        "QEM2462",      "Server I/O Module 4Gb FC, Dual Channel",       /* 0x144 */
         "QLE2440",      "PCI-Express to 4Gb FC, Single Channel",        /* 0x145 */
         "QLE2464",      "PCI-Express to 4Gb FC, Quad Channel",          /* 0x146 */
         "QLA2440",      "PCI-X 2.0 to 4Gb FC, Single Channel",          /* 0x147 */
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index 7abb045a0410..ffff42554087 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -1402,6 +1402,8 @@ struct access_chip_rsp_84xx {
 #define MBA_IDC_NOTIFY          0x8101
 #define MBA_IDC_TIME_EXT        0x8102
 
+#define MBC_IDC_ACK             0x101
+
 struct nvram_81xx {
         /* NVRAM header. */
         uint8_t id[4];
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index a336b4bc81a7..6de283f8f111 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -72,6 +72,7 @@ extern int qla2x00_loop_reset(scsi_qla_host_t *);
 extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);
 extern int qla2x00_post_aen_work(struct scsi_qla_host *, enum
     fc_host_event_code, u32);
+extern int qla2x00_post_idc_ack_work(struct scsi_qla_host *, uint16_t *);
 
 extern void qla2x00_abort_fcport_cmds(fc_port_t *);
 extern struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *,
@@ -266,6 +267,8 @@ qla2x00_set_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t *);
 
 extern int qla84xx_verify_chip(struct scsi_qla_host *, uint16_t *);
 
+extern int qla81xx_idc_ack(scsi_qla_host_t *, uint16_t *);
+
 /*
  * Global Function Prototypes in qla_isr.c source file.
  */
@@ -376,10 +379,8 @@ extern int qla2x00_dfs_remove(scsi_qla_host_t *);
 
 /* Globa function prototypes for multi-q */
 extern int qla25xx_request_irq(struct rsp_que *);
-extern int qla25xx_init_req_que(struct scsi_qla_host *, struct req_que *,
-        uint8_t);
-extern int qla25xx_init_rsp_que(struct scsi_qla_host *, struct rsp_que *,
-        uint8_t);
+extern int qla25xx_init_req_que(struct scsi_qla_host *, struct req_que *);
+extern int qla25xx_init_rsp_que(struct scsi_qla_host *, struct rsp_que *);
 extern int qla25xx_create_req_que(struct qla_hw_data *, uint16_t, uint8_t,
         uint16_t, uint8_t, uint8_t);
 extern int qla25xx_create_rsp_que(struct qla_hw_data *, uint16_t, uint8_t,
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index f6368a1d3021..986501759ad4 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1226,9 +1226,8 @@ qla24xx_config_rings(struct scsi_qla_host *vha)
                         icb->firmware_options_2 |=
                                 __constant_cpu_to_le32(BIT_18);
 
-                icb->firmware_options_2 |= __constant_cpu_to_le32(BIT_22);
+                icb->firmware_options_2 &= __constant_cpu_to_le32(~BIT_22);
                 icb->firmware_options_2 |= __constant_cpu_to_le32(BIT_23);
-                ha->rsp_q_map[0]->options = icb->firmware_options_2;
 
                 WRT_REG_DWORD(&reg->isp25mq.req_q_in, 0);
                 WRT_REG_DWORD(&reg->isp25mq.req_q_out, 0);
@@ -3493,7 +3492,7 @@ qla25xx_init_queues(struct qla_hw_data *ha)
                 rsp = ha->rsp_q_map[i];
                 if (rsp) {
                         rsp->options &= ~BIT_0;
-                        ret = qla25xx_init_rsp_que(base_vha, rsp, rsp->options);
+                        ret = qla25xx_init_rsp_que(base_vha, rsp);
                         if (ret != QLA_SUCCESS)
                                 DEBUG2_17(printk(KERN_WARNING
                                         "%s Rsp que:%d init failed\n", __func__,
@@ -3507,7 +3506,7 @@ qla25xx_init_queues(struct qla_hw_data *ha)
                 if (req) {
                 /* Clear outstanding commands array. */
                         req->options &= ~BIT_0;
-                        ret = qla25xx_init_req_que(base_vha, req, req->options);
+                        ret = qla25xx_init_req_que(base_vha, req);
                         if (ret != QLA_SUCCESS)
                                 DEBUG2_17(printk(KERN_WARNING
                                         "%s Req que:%d init failed\n", __func__,
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index e28ad81baf1e..f250e5b7897c 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -266,6 +266,40 @@ qla2x00_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
         }
 }
 
+static void
+qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)
+{
+        static char *event[] =
+                { "Complete", "Request Notification", "Time Extension" };
+        int rval;
+        struct device_reg_24xx __iomem *reg24 = &vha->hw->iobase->isp24;
+        uint16_t __iomem *wptr;
+        uint16_t cnt, timeout, mb[QLA_IDC_ACK_REGS];
+
+        /* Seed data -- mailbox1 -> mailbox7. */
+        wptr = (uint16_t __iomem *)&reg24->mailbox1;
+        for (cnt = 0; cnt < QLA_IDC_ACK_REGS; cnt++, wptr++)
+                mb[cnt] = RD_REG_WORD(wptr);
+
+        DEBUG2(printk("scsi(%ld): Inter-Driver Commucation %s -- "
+            "%04x %04x %04x %04x %04x %04x %04x.\n", vha->host_no,
+            event[aen & 0xff],
+            mb[0], mb[1], mb[2], mb[3], mb[4], mb[5], mb[6]));
+
+        /* Acknowledgement needed? [Notify && non-zero timeout]. */
+        timeout = (descr >> 8) & 0xf;
+        if (aen != MBA_IDC_NOTIFY || !timeout)
+                return;
+
+        DEBUG2(printk("scsi(%ld): Inter-Driver Commucation %s -- "
+            "ACK timeout=%d.\n", vha->host_no, event[aen & 0xff], timeout));
+
+        rval = qla2x00_post_idc_ack_work(vha, mb);
+        if (rval != QLA_SUCCESS)
+                qla_printk(KERN_WARNING, vha->hw,
+                    "IDC failed to post ACK.\n");
+}
+
 /**
  * qla2x00_async_event() - Process aynchronous events.
  * @ha: SCSI driver HA context
@@ -714,21 +748,9 @@ skip_rio:
                     "%04x %04x %04x\n", vha->host_no, mb[1], mb[2], mb[3]));
                 break;
         case MBA_IDC_COMPLETE:
-                DEBUG2(printk("scsi(%ld): Inter-Driver Commucation "
-                    "Complete -- %04x %04x %04x\n", vha->host_no, mb[1], mb[2],
-                    mb[3]));
-                break;
         case MBA_IDC_NOTIFY:
-                DEBUG2(printk("scsi(%ld): Inter-Driver Commucation "
-                    "Request Notification -- %04x %04x %04x\n", vha->host_no,
-                    mb[1], mb[2], mb[3]));
-                /**** Mailbox registers 4 - 7 valid!!! */
-                break;
         case MBA_IDC_TIME_EXT:
-                DEBUG2(printk("scsi(%ld): Inter-Driver Commucation "
-                    "Time Extension -- %04x %04x %04x\n", vha->host_no, mb[1],
-                    mb[2], mb[3]));
-                /**** Mailbox registers 4 - 7 valid!!! */
+                qla81xx_idc_event(vha, mb[0], mb[1]);
                 break;
         }
 
@@ -1707,7 +1729,6 @@ qla25xx_msix_rsp_q(int irq, void *dev_id)
         struct qla_hw_data *ha;
         struct rsp_que *rsp;
         struct device_reg_24xx __iomem *reg;
-        uint16_t msix_disabled_hccr = 0;
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
@@ -1720,17 +1741,8 @@ qla25xx_msix_rsp_q(int irq, void *dev_id)
 
         spin_lock_irq(&ha->hardware_lock);
 
-        msix_disabled_hccr = rsp->options;
-        if (!rsp->id)
-                msix_disabled_hccr &= __constant_cpu_to_le32(BIT_22);
-        else
-                msix_disabled_hccr &= __constant_cpu_to_le32(BIT_6);
-
         qla24xx_process_response_queue(rsp);
 
-        if (!msix_disabled_hccr)
-                WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
-
         spin_unlock_irq(&ha->hardware_lock);
 
         return IRQ_HANDLED;
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index f94ffbb98e95..4c7504cb3990 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3090,8 +3090,7 @@ verify_done:
 }
 
 int
-qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req,
-        uint8_t options)
+qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req)
 {
         int rval;
         unsigned long flags;
@@ -3101,7 +3100,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req,
         struct qla_hw_data *ha = vha->hw;
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
-        mcp->mb[1] = options;
+        mcp->mb[1] = req->options;
         mcp->mb[2] = MSW(LSD(req->dma));
         mcp->mb[3] = LSW(LSD(req->dma));
         mcp->mb[6] = MSW(MSD(req->dma));
@@ -3128,7 +3127,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req,
         mcp->tov = 60;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        if (!(options & BIT_0)) {
+        if (!(req->options & BIT_0)) {
                 WRT_REG_DWORD(&reg->req_q_in, 0);
                 WRT_REG_DWORD(&reg->req_q_out, 0);
         }
@@ -3142,8 +3141,7 @@ qla25xx_init_req_que(struct scsi_qla_host *vha, struct req_que *req,
 }
 
 int
-qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp,
-        uint8_t options)
+qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
 {
         int rval;
         unsigned long flags;
@@ -3153,7 +3151,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp,
         struct qla_hw_data *ha = vha->hw;
 
         mcp->mb[0] = MBC_INITIALIZE_MULTIQ;
-        mcp->mb[1] = options;
+        mcp->mb[1] = rsp->options;
         mcp->mb[2] = MSW(LSD(rsp->dma));
         mcp->mb[3] = LSW(LSD(rsp->dma));
         mcp->mb[6] = MSW(MSD(rsp->dma));
@@ -3178,7 +3176,7 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp,
         mcp->tov = 60;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        if (!(options & BIT_0)) {
+        if (!(rsp->options & BIT_0)) {
                 WRT_REG_DWORD(&reg->rsp_q_out, 0);
                 WRT_REG_DWORD(&reg->rsp_q_in, 0);
         }
@@ -3193,3 +3191,29 @@ qla25xx_init_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp,
         return rval;
 }
 
+int
+qla81xx_idc_ack(scsi_qla_host_t *vha, uint16_t *mb)
+{
+        int rval;
+        mbx_cmd_t mc;
+        mbx_cmd_t *mcp = &mc;
+
+        DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));
+
+        mcp->mb[0] = MBC_IDC_ACK;
+        memcpy(&mcp->mb[1], mb, QLA_IDC_ACK_REGS * sizeof(uint16_t));
+        mcp->out_mb = MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
+        mcp->in_mb = MBX_0;
+        mcp->tov = MBX_TOV_SECONDS;
+        mcp->flags = 0;
+        rval = qla2x00_mailbox_command(vha, mcp);
+
+        if (rval != QLA_SUCCESS) {
+                DEBUG2_3_11(printk("%s(%ld): failed=%x (%x).\n", __func__,
+                    vha->host_no, rval, mcp->mb[0]));
+        } else {
+                DEBUG11(printk("%s(%ld): done.\n", __func__, vha->host_no));
+        }
+
+        return rval;
+}
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index f53179c46423..3f23932210c4 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -396,7 +396,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
 
         qla2x00_start_timer(vha, qla2x00_timer, WATCH_INTERVAL);
 
-        memset(vha->req_ques, 0, sizeof(vha->req_ques) * QLA_MAX_HOST_QUES);
+        memset(vha->req_ques, 0, sizeof(vha->req_ques));
         vha->req_ques[0] = ha->req_q_map[0]->id;
         host->can_queue = ha->req_q_map[0]->length + 128;
         host->this_id = 255;
@@ -471,7 +471,7 @@ qla25xx_delete_req_que(struct scsi_qla_host *vha, struct req_que *req)
 
         if (req) {
                 req->options |= BIT_0;
-                ret = qla25xx_init_req_que(vha, req, req->options);
+                ret = qla25xx_init_req_que(vha, req);
         }
         if (ret == QLA_SUCCESS)
                 qla25xx_free_req_que(vha, req);
@@ -486,7 +486,7 @@ qla25xx_delete_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
 
         if (rsp) {
                 rsp->options |= BIT_0;
-                ret = qla25xx_init_rsp_que(vha, rsp, rsp->options);
+                ret = qla25xx_init_rsp_que(vha, rsp);
         }
         if (ret == QLA_SUCCESS)
                 qla25xx_free_rsp_que(vha, rsp);
@@ -502,7 +502,7 @@ int qla25xx_update_req_que(struct scsi_qla_host *vha, uint8_t que, uint8_t qos)
 
         req->options |= BIT_3;
         req->qos = qos;
-        ret = qla25xx_init_req_que(vha, req, req->options);
+        ret = qla25xx_init_req_que(vha, req);
         if (ret != QLA_SUCCESS)
                 DEBUG2_17(printk(KERN_WARNING "%s failed\n", __func__));
         /* restore options bit */
@@ -632,7 +632,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options,
         req->max_q_depth = ha->req_q_map[0]->max_q_depth;
         mutex_unlock(&ha->vport_lock);
 
-        ret = qla25xx_init_req_que(base_vha, req, options);
+        ret = qla25xx_init_req_que(base_vha, req);
         if (ret != QLA_SUCCESS) {
                 qla_printk(KERN_WARNING, ha, "%s failed\n", __func__);
                 mutex_lock(&ha->vport_lock);
@@ -710,7 +710,7 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options,
         if (ret)
                 goto que_failed;
 
-        ret = qla25xx_init_rsp_que(base_vha, rsp, options);
+        ret = qla25xx_init_rsp_que(base_vha, rsp);
         if (ret != QLA_SUCCESS) {
                 qla_printk(KERN_WARNING, ha, "%s failed\n", __func__);
                 mutex_lock(&ha->vport_lock);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index c11f872d3e10..2f5f72531e23 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2522,6 +2522,19 @@ qla2x00_post_aen_work(struct scsi_qla_host *vha, enum fc_host_event_code code,
         return qla2x00_post_work(vha, e, 1);
 }
 
+int
+qla2x00_post_idc_ack_work(struct scsi_qla_host *vha, uint16_t *mb)
+{
+        struct qla_work_evt *e;
+
+        e = qla2x00_alloc_work(vha, QLA_EVT_IDC_ACK, 1);
+        if (!e)
+                return QLA_FUNCTION_FAILED;
+
+        memcpy(e->u.idc_ack.mb, mb, QLA_IDC_ACK_REGS * sizeof(uint16_t));
+        return qla2x00_post_work(vha, e, 1);
+}
+
 static void
 qla2x00_do_work(struct scsi_qla_host *vha)
 {
@@ -2539,6 +2552,9 @@ qla2x00_do_work(struct scsi_qla_host *vha)
                         fc_host_post_event(vha->host, fc_get_event_number(),
                             e->u.aen.code, e->u.aen.data);
                         break;
+                case QLA_EVT_IDC_ACK:
+                        qla81xx_idc_ack(vha, e->u.idc_ack.mb);
+                        break;
                 }
                 if (e->flags & QLA_EVT_FLAG_FREE)
                         kfree(e);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 9c3b694c049d..284827926eff 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -684,7 +684,7 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)
                     "end=0x%x size=0x%x.\n", le32_to_cpu(region->code), start,
                     le32_to_cpu(region->end) >> 2, le32_to_cpu(region->size)));
 
-                switch (le32_to_cpu(region->code)) {
+                switch (le32_to_cpu(region->code) & 0xff) {
                 case FLT_REG_FW:
                         ha->flt_region_fw = start;
                         break;
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index cfa4c11a4797..79f7053da99b 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.03.00-k2"
+#define QLA2XXX_VERSION      "8.03.00-k3"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    3
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 66505bb79410..8f4de20c9deb 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -317,6 +317,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
         return sdev;
 
 out_device_destroy:
+        scsi_device_set_state(sdev, SDEV_DEL);
         transport_destroy_device(&sdev->sdev_gendev);
         put_device(&sdev->sdev_gendev);
 out:
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 8f0bd3f7a59f..516925d8b570 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1078,7 +1078,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
         case BLKTRACESETUP:
                 return blk_trace_setup(sdp->device->request_queue,
                                        sdp->disk->disk_name,
-                                       sdp->device->sdev_gendev.devt,
+                                       MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
                                        (char *)arg);
         case BLKTRACESTART:
                 return blk_trace_startstop(sdp->device->request_queue, 1);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 0d934bfbdd9b..b4b39811b445 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2083,6 +2083,20 @@ static int serial8250_startup(struct uart_port *port)
 
         serial8250_set_mctrl(&up->port, up->port.mctrl);
 
+        /* Serial over Lan (SoL) hack:
+           Intel 8257x Gigabit ethernet chips have a
+           16550 emulation, to be used for Serial Over Lan.
+           Those chips take a longer time than a normal
+           serial device to signalize that a transmission
+           data was queued. Due to that, the above test generally
+           fails. One solution would be to delay the reading of
+           iir. However, this is not reliable, since the timeout
+           is variable. So, let's just don't test if we receive
+           TX irq. This way, we'll never enable UART_BUG_TXEN.
+         */
+        if (up->port.flags & UPF_NO_TXEN_TEST)
+                goto dont_test_tx_en;
+
         /*
          * Do a quick test to see if we receive an
          * interrupt when we enable the TX irq.
@@ -2102,6 +2116,7 @@ static int serial8250_startup(struct uart_port *port)
                 up->bugs &= ~UART_BUG_TXEN;
         }
 
+dont_test_tx_en:
         spin_unlock_irqrestore(&up->port.lock, flags);
 
         /*
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 536d8e510f66..533f82025adf 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -798,6 +798,21 @@ pci_default_setup(struct serial_private *priv,
         return setup_port(priv, port, bar, offset, board->reg_shift);
 }
 
+static int skip_tx_en_setup(struct serial_private *priv,
+                        const struct pciserial_board *board,
+                        struct uart_port *port, int idx)
+{
+        port->flags |= UPF_NO_TXEN_TEST;
+        printk(KERN_DEBUG "serial8250: skipping TxEn test for device "
+                          "[%04x:%04x] subsystem [%04x:%04x]\n",
+                          priv->dev->vendor,
+                          priv->dev->device,
+                          priv->dev->subsystem_vendor,
+                          priv->dev->subsystem_device);
+
+        return pci_default_setup(priv, board, port, idx);
+}
+
 /* This should be in linux/pci_ids.h */
 #define PCI_VENDOR_ID_SBSMODULARIO      0x124B
 #define PCI_SUBVENDOR_ID_SBSMODULARIO   0x124B
@@ -864,6 +879,27 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                 .init           = pci_inteli960ni_init,
                 .setup          = pci_default_setup,
         },
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_8257X_SOL,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = skip_tx_en_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_82573L_SOL,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = skip_tx_en_setup,
+        },
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_82573E_SOL,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .setup          = skip_tx_en_setup,
+        },
         /*
          * ITE
          */
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 89362d733d62..8f58f7ff0dd7 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -877,6 +877,10 @@ static int atmel_startup(struct uart_port *port)
                 }
         }
 
+        /* Save current CSR for comparison in atmel_tasklet_func() */
+        atmel_port->irq_status_prev = UART_GET_CSR(port);
+        atmel_port->irq_status = atmel_port->irq_status_prev;
+
         /*
          * Finally, enable the serial port
          */
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
index 92187e28608a..ac79cbe4c2cf 100644
--- a/drivers/serial/jsm/jsm_driver.c
+++ b/drivers/serial/jsm/jsm_driver.c
@@ -84,6 +84,8 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         brd->pci_dev = pdev;
         if (pdev->device == PCIE_DEVICE_ID_NEO_4_IBM)
                 brd->maxports = 4;
+        else if (pdev->device == PCI_DEVICE_ID_DIGI_NEO_8)
+                brd->maxports = 8;
         else
                 brd->maxports = 2;
 
@@ -212,6 +214,7 @@ static struct pci_device_id jsm_pci_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45), 0, 0, 2 },
         { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45PRI), 0, 0, 3 },
         { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_4_IBM), 0, 0, 4 },
+        { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_NEO_8), 0, 0, 5 },
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, jsm_pci_tbl);
diff --git a/drivers/spi/spi_gpio.c b/drivers/spi/spi_gpio.c
index 49698cabc30d..f5ed9721aabb 100644
--- a/drivers/spi/spi_gpio.c
+++ b/drivers/spi/spi_gpio.c
@@ -114,7 +114,7 @@ static inline void setmosi(const struct spi_device *spi, int is_on)
 
 static inline int getmiso(const struct spi_device *spi)
 {
-        return gpio_get_value(SPI_MISO_GPIO);
+        return !!gpio_get_value(SPI_MISO_GPIO);
 }
 
 #undef pdata
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 6b996db0dd6a..604bd1e0d546 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -27,6 +27,7 @@ menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION
         bool "Android RAM Console Enable error correction"
         default n
         depends on ANDROID_RAM_CONSOLE
+        depends on !ANDROID_RAM_CONSOLE_EARLY_INIT
         select REED_SOLOMON
         select REED_SOLOMON_ENC8
         select REED_SOLOMON_DEC8
diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c
index bf006857a87a..643ac5ce381d 100644
--- a/drivers/staging/android/ram_console.c
+++ b/drivers/staging/android/ram_console.c
@@ -224,9 +224,23 @@ static int __init ram_console_init(struct ram_console_buffer *buffer,
         ram_console_buffer_size =
                 buffer_size - sizeof(struct ram_console_buffer);
 
+        if (ram_console_buffer_size > buffer_size) {
+                pr_err("ram_console: buffer %p, invalid size %d, datasize %d\n",
+                       buffer, buffer_size, ram_console_buffer_size);
+                return 0;
+        }
+
 #ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
         ram_console_buffer_size -= (DIV_ROUND_UP(ram_console_buffer_size,
                                                 ECC_BLOCK_SIZE) + 1) * ECC_SIZE;
+
+        if (ram_console_buffer_size > buffer_size) {
+                pr_err("ram_console: buffer %p, invalid size %d, "
+                       "non-ecc datasize %d\n",
+                       buffer, buffer_size, ram_console_buffer_size);
+                return 0;
+        }
+
         ram_console_par_buffer = buffer->data + ram_console_buffer_size;
 
 
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c
index 903270cbbe02..33daff0481d2 100644
--- a/drivers/staging/android/timed_gpio.c
+++ b/drivers/staging/android/timed_gpio.c
@@ -50,7 +50,7 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *att
         if (hrtimer_active(&gpio_data->timer)) {
                 ktime_t r = hrtimer_get_remaining(&gpio_data->timer);
                 struct timeval t = ktime_to_timeval(r);
-                remaining = t.tv_sec * 1000 + t.tv_usec;
+                remaining = t.tv_sec * 1000 + t.tv_usec / 1000;
         } else
                 remaining = 0;
 
diff --git a/drivers/staging/at76_usb/Kconfig b/drivers/staging/at76_usb/Kconfig
index 4c0e55e15448..8606f9621624 100644
--- a/drivers/staging/at76_usb/Kconfig
+++ b/drivers/staging/at76_usb/Kconfig
@@ -1,6 +1,6 @@
 config USB_ATMEL
         tristate "Atmel at76c503/at76c505/at76c505a USB cards"
-        depends on MAC80211 && WLAN_80211 && USB
+        depends on WLAN_80211 && USB
         default N
         select FW_LOADER
         ---help---
diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index 185533e54769..c8e4d31c7df2 100644
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2004 Nick Jones
  * Copyright (c) 2004 Balint Seeber <n0_5p4m_p13453@hotmail.com>
  * Copyright (c) 2007 Guido Guenther <agx@sigxcpu.org>
- * Copyright (c) 2007 Kalle Valo <kalle.valo@iki.fi>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -17,13 +16,6 @@
  * Atmel AT76C503A/505/505A.
  *
  * Some iw_handler code was taken from airo.c, (C) 1999 Benjamin Reed
- *
- * TODO for the mac80211 port:
- * o adhoc support
- * o RTS/CTS support
- * o Power Save Mode support
- * o support for short/long preambles
- * o export variables through debugfs/sysfs
  */
 
 #include <linux/init.h>
@@ -44,7 +36,7 @@
 #include <net/ieee80211_radiotap.h>
 #include <linux/firmware.h>
 #include <linux/leds.h>
-#include <net/mac80211.h>
+#include <net/ieee80211.h>
 
 #include "at76_usb.h"
 
@@ -84,43 +76,31 @@
 #define DBG_WE_EVENTS           0x08000000      /* dump wireless events */
 #define DBG_FW                  0x10000000      /* firmware download */
 #define DBG_DFU                 0x20000000      /* device firmware upgrade */
-#define DBG_CMD                 0x40000000
-#define DBG_MAC80211            0x80000000
 
 #define DBG_DEFAULTS            0
 
 /* Use our own dbg macro */
 #define at76_dbg(bits, format, arg...) \
-do {    \
-        if (at76_debug & (bits))        \
-                printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \
-} while (0)
-
-#define at76_dbg_dump(bits, buf, len, format, arg...)   \
-do {    \
-        if (at76_debug & (bits)) {      \
+        do { \
+                if (at76_debug & (bits)) \
                 printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \
-                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, len); \
-                }                                                       \
-} while (0)
+        } while (0)
 
 static int at76_debug = DBG_DEFAULTS;
 
-#define FIRMWARE_IS_WPA(ver) ((ver.major == 1) && (ver.minor == 103))
-
 /* Protect against concurrent firmware loading and parsing */
 static struct mutex fw_mutex;
 
 static struct fwentry firmwares[] = {
-        [0] = { "" },
-        [BOARD_503_ISL3861] = { "atmel_at76c503-i3861.bin" },
-        [BOARD_503_ISL3863] = { "atmel_at76c503-i3863.bin" },
-        [BOARD_503] = { "atmel_at76c503-rfmd.bin" },
-        [BOARD_503_ACC] = { "atmel_at76c503-rfmd-acc.bin" },
-        [BOARD_505] = { "atmel_at76c505-rfmd.bin" },
-        [BOARD_505_2958] = { "atmel_at76c505-rfmd2958.bin" },
-        [BOARD_505A] = { "atmel_at76c505a-rfmd2958.bin" },
-        [BOARD_505AMX] = { "atmel_at76c505amx-rfmd.bin" },
+        [0] = {""},
+        [BOARD_503_ISL3861] = {"atmel_at76c503-i3861.bin"},
+        [BOARD_503_ISL3863] = {"atmel_at76c503-i3863.bin"},
+        [BOARD_503] = {"atmel_at76c503-rfmd.bin"},
+        [BOARD_503_ACC] = {"atmel_at76c503-rfmd-acc.bin"},
+        [BOARD_505] = {"atmel_at76c505-rfmd.bin"},
+        [BOARD_505_2958] = {"atmel_at76c505-rfmd2958.bin"},
+        [BOARD_505A] = {"atmel_at76c505a-rfmd2958.bin"},
+        [BOARD_505AMX] = {"atmel_at76c505amx-rfmd.bin"},
 };
 
 #define USB_DEVICE_DATA(__ops)  .driver_info = (kernel_ulong_t)(__ops)
@@ -130,133 +110,135 @@ static struct usb_device_id dev_table[] = {
          * at76c503-i3861
          */
         /* Generic AT76C503/3861 device */
-        { USB_DEVICE(0x03eb, 0x7603), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x03eb, 0x7603), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Linksys WUSB11 v2.1/v2.6 */
-        { USB_DEVICE(0x066b, 0x2211), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x066b, 0x2211), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Netgear MA101 rev. A */
-        { USB_DEVICE(0x0864, 0x4100), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x0864, 0x4100), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Tekram U300C / Allnet ALL0193 */
-        { USB_DEVICE(0x0b3b, 0x1612), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x0b3b, 0x1612), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* HP HN210W J7801A */
-        { USB_DEVICE(0x03f0, 0x011c), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x03f0, 0x011c), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Sitecom/Z-Com/Zyxel M4Y-750 */
-        { USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Dynalink/Askey WLL013 (intersil) */
-        { USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* EZ connect 11Mpbs Wireless USB Adapter SMC2662W v1 */
-        { USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* BenQ AWL300 */
-        { USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Addtron AWU-120, Compex WLU11 */
-        { USB_DEVICE(0x05dd, 0xff31), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x05dd, 0xff31), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Intel AP310 AnyPoint II USB */
-        { USB_DEVICE(0x8086, 0x0200), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x8086, 0x0200), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Dynalink L11U */
-        { USB_DEVICE(0x0d8e, 0x7100), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x0d8e, 0x7100), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* Arescom WL-210, FCC id 07J-GL2411USB */
-        { USB_DEVICE(0x0d8e, 0x7110), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x0d8e, 0x7110), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* I-O DATA WN-B11/USB */
-        { USB_DEVICE(0x04bb, 0x0919), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x04bb, 0x0919), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /* BT Voyager 1010 */
-        { USB_DEVICE(0x069a, 0x0821), USB_DEVICE_DATA(BOARD_503_ISL3861) },
+        {USB_DEVICE(0x069a, 0x0821), USB_DEVICE_DATA(BOARD_503_ISL3861)},
         /*
          * at76c503-i3863
          */
         /* Generic AT76C503/3863 device */
-        { USB_DEVICE(0x03eb, 0x7604), USB_DEVICE_DATA(BOARD_503_ISL3863) },
+        {USB_DEVICE(0x03eb, 0x7604), USB_DEVICE_DATA(BOARD_503_ISL3863)},
         /* Samsung SWL-2100U */
-        { USB_DEVICE(0x055d, 0xa000), USB_DEVICE_DATA(BOARD_503_ISL3863) },
+        {USB_DEVICE(0x055d, 0xa000), USB_DEVICE_DATA(BOARD_503_ISL3863)},
         /*
          * at76c503-rfmd
          */
         /* Generic AT76C503/RFMD device */
-        { USB_DEVICE(0x03eb, 0x7605), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x03eb, 0x7605), USB_DEVICE_DATA(BOARD_503)},
         /* Dynalink/Askey WLL013 (rfmd) */
-        { USB_DEVICE(0x069a, 0x0321), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x069a, 0x0321), USB_DEVICE_DATA(BOARD_503)},
         /* Linksys WUSB11 v2.6 */
-        { USB_DEVICE(0x077b, 0x2219), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x077b, 0x2219), USB_DEVICE_DATA(BOARD_503)},
         /* Network Everywhere NWU11B */
-        { USB_DEVICE(0x077b, 0x2227), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x077b, 0x2227), USB_DEVICE_DATA(BOARD_503)},
         /* Netgear MA101 rev. B */
-        { USB_DEVICE(0x0864, 0x4102), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x0864, 0x4102), USB_DEVICE_DATA(BOARD_503)},
         /* D-Link DWL-120 rev. E */
-        { USB_DEVICE(0x2001, 0x3200), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x2001, 0x3200), USB_DEVICE_DATA(BOARD_503)},
         /* Actiontec 802UAT1, HWU01150-01UK */
-        { USB_DEVICE(0x1668, 0x7605), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x1668, 0x7605), USB_DEVICE_DATA(BOARD_503)},
         /* AirVast W-Buddie WN210 */
-        { USB_DEVICE(0x03eb, 0x4102), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x03eb, 0x4102), USB_DEVICE_DATA(BOARD_503)},
         /* Dick Smith Electronics XH1153 802.11b USB adapter */
-        { USB_DEVICE(0x1371, 0x5743), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x1371, 0x5743), USB_DEVICE_DATA(BOARD_503)},
         /* CNet CNUSB611 */
-        { USB_DEVICE(0x1371, 0x0001), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x1371, 0x0001), USB_DEVICE_DATA(BOARD_503)},
         /* FiberLine FL-WL200U */
-        { USB_DEVICE(0x1371, 0x0002), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x1371, 0x0002), USB_DEVICE_DATA(BOARD_503)},
         /* BenQ AWL400 USB stick */
-        { USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503)},
         /* 3Com 3CRSHEW696 */
-        { USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503)},
         /* Siemens Santis ADSL WLAN USB adapter WLL 013 */
-        { USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503)},
         /* Belkin F5D6050, version 2 */
-        { USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503)},
         /* iBlitzz, BWU613 (not *B or *SB) */
-        { USB_DEVICE(0x07b8, 0xb000), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x07b8, 0xb000), USB_DEVICE_DATA(BOARD_503)},
         /* Gigabyte GN-WLBM101 */
-        { USB_DEVICE(0x1044, 0x8003), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x1044, 0x8003), USB_DEVICE_DATA(BOARD_503)},
         /* Planex GW-US11S */
-        { USB_DEVICE(0x2019, 0x3220), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x2019, 0x3220), USB_DEVICE_DATA(BOARD_503)},
         /* Internal WLAN adapter in h5[4,5]xx series iPAQs */
-        { USB_DEVICE(0x049f, 0x0032), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x049f, 0x0032), USB_DEVICE_DATA(BOARD_503)},
         /* Corega Wireless LAN USB-11 mini */
-        { USB_DEVICE(0x07aa, 0x0011), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x07aa, 0x0011), USB_DEVICE_DATA(BOARD_503)},
         /* Corega Wireless LAN USB-11 mini2 */
-        { USB_DEVICE(0x07aa, 0x0018), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x07aa, 0x0018), USB_DEVICE_DATA(BOARD_503)},
         /* Uniden PCW100 */
-        { USB_DEVICE(0x05dd, 0xff35), USB_DEVICE_DATA(BOARD_503) },
+        {USB_DEVICE(0x05dd, 0xff35), USB_DEVICE_DATA(BOARD_503)},
         /*
          * at76c503-rfmd-acc
          */
         /* SMC2664W */
-        { USB_DEVICE(0x083a, 0x3501), USB_DEVICE_DATA(BOARD_503_ACC) },
+        {USB_DEVICE(0x083a, 0x3501), USB_DEVICE_DATA(BOARD_503_ACC)},
         /* Belkin F5D6050, SMC2662W v2, SMC2662W-AR */
-        { USB_DEVICE(0x0d5c, 0xa002), USB_DEVICE_DATA(BOARD_503_ACC) },
+        {USB_DEVICE(0x0d5c, 0xa002), USB_DEVICE_DATA(BOARD_503_ACC)},
         /*
          * at76c505-rfmd
          */
         /* Generic AT76C505/RFMD */
-        { USB_DEVICE(0x03eb, 0x7606), USB_DEVICE_DATA(BOARD_505) },
+        {USB_DEVICE(0x03eb, 0x7606), USB_DEVICE_DATA(BOARD_505)},
         /*
          * at76c505-rfmd2958
          */
         /* Generic AT76C505/RFMD, OvisLink WL-1130USB */
-        { USB_DEVICE(0x03eb, 0x7613), USB_DEVICE_DATA(BOARD_505_2958) },
+        {USB_DEVICE(0x03eb, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)},
         /* Fiberline FL-WL240U */
-        { USB_DEVICE(0x1371, 0x0014), USB_DEVICE_DATA(BOARD_505_2958) },
+        {USB_DEVICE(0x1371, 0x0014), USB_DEVICE_DATA(BOARD_505_2958)},
         /* CNet CNUSB-611G */
-        { USB_DEVICE(0x1371, 0x0013), USB_DEVICE_DATA(BOARD_505_2958) },
+        {USB_DEVICE(0x1371, 0x0013), USB_DEVICE_DATA(BOARD_505_2958)},
         /* Linksys WUSB11 v2.8 */
-        { USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958) },
+        {USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958)},
         /* Xterasys XN-2122B, IBlitzz BWU613B/BWU613SB */
-        { USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958) },
+        {USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958)},
         /* Corega WLAN USB Stick 11 */
-        { USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958) },
+        {USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)},
         /* Microstar MSI Box MS6978 */
-        { USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958) },
+        {USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958)},
         /*
          * at76c505a-rfmd2958
          */
         /* Generic AT76C505A device */
-        { USB_DEVICE(0x03eb, 0x7614), USB_DEVICE_DATA(BOARD_505A) },
+        {USB_DEVICE(0x03eb, 0x7614), USB_DEVICE_DATA(BOARD_505A)},
         /* Generic AT76C505AS device */
-        { USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A) },
+        {USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A)},
         /* Siemens Gigaset USB WLAN Adapter 11 */
-        { USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A) },
+        {USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A)},
+        /* OQO Model 01+ Internal Wi-Fi */
+        {USB_DEVICE(0x1557, 0x0002), USB_DEVICE_DATA(BOARD_505A)},
         /*
          * at76c505amx-rfmd
          */
         /* Generic AT76C505AMX device */
-        { USB_DEVICE(0x03eb, 0x7615), USB_DEVICE_DATA(BOARD_505AMX) },
-        { }
+        {USB_DEVICE(0x03eb, 0x7615), USB_DEVICE_DATA(BOARD_505AMX)},
+        {}
 };
 
 MODULE_DEVICE_TABLE(usb, dev_table);
@@ -264,8 +246,26 @@ MODULE_DEVICE_TABLE(usb, dev_table);
 /* Supported rates of this hardware, bit 7 marks basic rates */
 static const u8 hw_rates[] = { 0x82, 0x84, 0x0b, 0x16 };
 
+/* Frequency of each channel in MHz */
+static const long channel_frequency[] = {
+        2412, 2417, 2422, 2427, 2432, 2437, 2442,
+        2447, 2452, 2457, 2462, 2467, 2472, 2484
+};
+
+#define NUM_CHANNELS ARRAY_SIZE(channel_frequency)
+
 static const char *const preambles[] = { "long", "short", "auto" };
 
+static const char *const mac_states[] = {
+        [MAC_INIT] = "INIT",
+        [MAC_SCANNING] = "SCANNING",
+        [MAC_AUTH] = "AUTH",
+        [MAC_ASSOC] = "ASSOC",
+        [MAC_JOINING] = "JOINING",
+        [MAC_CONNECTED] = "CONNECTED",
+        [MAC_OWN_IBSS] = "OWN_IBSS"
+};
+
 /* Firmware download */
 /* DFU states */
 #define STATE_IDLE                      0x00
@@ -300,30 +300,17 @@ struct dfu_status {
 
 static inline int at76_is_intersil(enum board_type board)
 {
-        if (board == BOARD_503_ISL3861 || board == BOARD_503_ISL3863)
-                return 1;
-        return 0;
+        return (board == BOARD_503_ISL3861 || board == BOARD_503_ISL3863);
 }
 
 static inline int at76_is_503rfmd(enum board_type board)
 {
-        if (board == BOARD_503 || board == BOARD_503_ACC)
-                return 1;
-        return 0;
-}
-
-static inline int at76_is_505(enum board_type board)
-{
-        if (board == BOARD_505 || board == BOARD_505_2958)
-                return 1;
-        return 0;
+        return (board == BOARD_503 || board == BOARD_503_ACC);
 }
 
 static inline int at76_is_505a(enum board_type board)
 {
-        if (board == BOARD_505A || board == BOARD_505AMX)
-                return 1;
-        return 0;
+        return (board == BOARD_505A || board == BOARD_505AMX);
 }
 
 /* Load a block of the first (internal) part of the firmware */
@@ -504,6 +491,41 @@ exit:
         return ret;
 }
 
+/* Report that the scan results are ready */
+static inline void at76_iwevent_scan_complete(struct net_device *netdev)
+{
+        union iwreq_data wrqu;
+        wrqu.data.length = 0;
+        wrqu.data.flags = 0;
+        wireless_send_event(netdev, SIOCGIWSCAN, &wrqu, NULL);
+        at76_dbg(DBG_WE_EVENTS, "%s: SIOCGIWSCAN sent", netdev->name);
+}
+
+static inline void at76_iwevent_bss_connect(struct net_device *netdev,
+                                            u8 *bssid)
+{
+        union iwreq_data wrqu;
+        wrqu.data.length = 0;
+        wrqu.data.flags = 0;
+        memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL);
+        at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev->name,
+                 __func__);
+}
+
+static inline void at76_iwevent_bss_disconnect(struct net_device *netdev)
+{
+        union iwreq_data wrqu;
+        wrqu.data.length = 0;
+        wrqu.data.flags = 0;
+        memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
+        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+        wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL);
+        at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev->name,
+                 __func__);
+}
+
 #define HEX2STR_BUFFERS 4
 #define HEX2STR_MAX_LEN 64
 #define BIN2HEX(x) ((x) < 10 ? '0' + (x) : (x) + 'A' - 10)
@@ -575,6 +597,37 @@ static void at76_ledtrig_tx_activity(void)
                 mod_timer(&ledtrig_tx_timer, jiffies + HZ / 4);
 }
 
+/* Check if the given ssid is hidden */
+static inline int at76_is_hidden_ssid(u8 *ssid, int length)
+{
+        static const u8 zeros[32];
+
+        if (length == 0)
+                return 1;
+
+        if (length == 1 && ssid[0] == ' ')
+                return 1;
+
+        return (memcmp(ssid, zeros, length) == 0);
+}
+
+static inline void at76_free_bss_list(struct at76_priv *priv)
+{
+        struct list_head *next, *ptr;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+
+        priv->curr_bss = NULL;
+
+        list_for_each_safe(ptr, next, &priv->bss_list) {
+                list_del(ptr);
+                kfree(list_entry(ptr, struct bss_info, list));
+        }
+
+        spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
+}
+
 static int at76_remap(struct usb_device *udev)
 {
         int ret;
@@ -598,7 +651,7 @@ static int at76_get_op_mode(struct usb_device *udev)
                 return -ENOMEM;
         ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,
                               USB_TYPE_VENDOR | USB_DIR_IN |
-                              USB_RECIP_INTERFACE, 0x01, 0, &op_mode, 1,
+                              USB_RECIP_INTERFACE, 0x01, 0, op_mode, 1,
                               USB_CTRL_GET_TIMEOUT);
         saved = *op_mode;
         kfree(op_mode);
@@ -676,7 +729,7 @@ exit:
         kfree(hwcfg);
         if (ret < 0)
                 printk(KERN_ERR "%s: cannot get HW Config (error %d)\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
 
         return ret;
 }
@@ -685,15 +738,15 @@ static struct reg_domain const *at76_get_reg_domain(u16 code)
 {
         int i;
         static struct reg_domain const fd_tab[] = {
-                { 0x10, "FCC (USA)", 0x7ff },   /* ch 1-11 */
-                { 0x20, "IC (Canada)", 0x7ff }, /* ch 1-11 */
-                { 0x30, "ETSI (most of Europe)", 0x1fff },      /* ch 1-13 */
-                { 0x31, "Spain", 0x600 },       /* ch 10-11 */
-                { 0x32, "France", 0x1e00 },     /* ch 10-13 */
-                { 0x40, "MKK (Japan)", 0x2000 },        /* ch 14 */
-                { 0x41, "MKK1 (Japan)", 0x3fff },       /* ch 1-14 */
-                { 0x50, "Israel", 0x3fc },      /* ch 3-9 */
-                { 0x00, "<unknown>", 0xffffffff }       /* ch 1-32 */
+                {0x10, "FCC (USA)", 0x7ff},     /* ch 1-11 */
+                {0x20, "IC (Canada)", 0x7ff},   /* ch 1-11 */
+                {0x30, "ETSI (most of Europe)", 0x1fff},        /* ch 1-13 */
+                {0x31, "Spain", 0x600}, /* ch 10-11 */
+                {0x32, "France", 0x1e00},       /* ch 10-13 */
+                {0x40, "MKK (Japan)", 0x2000},  /* ch 14 */
+                {0x41, "MKK1 (Japan)", 0x3fff}, /* ch 1-14 */
+                {0x50, "Israel", 0x3fc},        /* ch 3-9 */
+                {0x00, "<unknown>", 0xffffffff} /* ch 1-32 */
         };
 
         /* Last entry is fallback for unknown domain code */
@@ -731,7 +784,7 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)
         ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22,
                               USB_TYPE_VENDOR | USB_DIR_IN |
                               USB_RECIP_INTERFACE, cmd, 0, stat_buf,
-                              sizeof(stat_buf), USB_CTRL_GET_TIMEOUT);
+                              40, USB_CTRL_GET_TIMEOUT);
         if (ret >= 0)
                 ret = stat_buf[5];
         kfree(stat_buf);
@@ -739,24 +792,6 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)
         return ret;
 }
 
-#define MAKE_CMD_CASE(c) case (c): return #c
-
-static const char *at76_get_cmd_string(u8 cmd_status)
-{
-        switch (cmd_status) {
-                MAKE_CMD_CASE(CMD_SET_MIB);
-                MAKE_CMD_CASE(CMD_GET_MIB);
-                MAKE_CMD_CASE(CMD_SCAN);
-                MAKE_CMD_CASE(CMD_JOIN);
-                MAKE_CMD_CASE(CMD_START_IBSS);
-                MAKE_CMD_CASE(CMD_RADIO_ON);
-                MAKE_CMD_CASE(CMD_RADIO_OFF);
-                MAKE_CMD_CASE(CMD_STARTUP);
-        }
-
-        return "UNKNOWN";
-}
-
 static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf,
                                  int buf_size)
 {
@@ -772,10 +807,6 @@ static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf,
         cmd_buf->size = cpu_to_le16(buf_size);
         memcpy(cmd_buf->data, buf, buf_size);
 
-        at76_dbg_dump(DBG_CMD, cmd_buf, sizeof(struct at76_command) + buf_size,
-                      "issuing command %s (0x%02x)",
-                      at76_get_cmd_string(cmd), cmd);
-
         ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e,
                               USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE,
                               0, 0, cmd_buf,
@@ -813,13 +844,13 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd)
                 status = at76_get_cmd_status(priv->udev, cmd);
                 if (status < 0) {
                         printk(KERN_ERR "%s: at76_get_cmd_status failed: %d\n",
-                               wiphy_name(priv->hw->wiphy), status);
+                               priv->netdev->name, status);
                         break;
                 }
 
                 at76_dbg(DBG_WAIT_COMPLETE,
                          "%s: Waiting on cmd %d, status = %d (%s)",
-                         wiphy_name(priv->hw->wiphy), cmd, status,
+                         priv->netdev->name, cmd, status,
                          at76_get_cmd_status_string(status));
 
                 if (status != CMD_STATUS_IN_PROGRESS
@@ -830,7 +861,7 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd)
                 if (time_after(jiffies, timeout)) {
                         printk(KERN_ERR
                                "%s: completion timeout for command %d\n",
-                               wiphy_name(priv->hw->wiphy), cmd);
+                               priv->netdev->name, cmd);
                         status = -ETIMEDOUT;
                         break;
                 }
@@ -853,7 +884,7 @@ static int at76_set_mib(struct at76_priv *priv, struct set_mib_buffer *buf)
         if (ret != CMD_STATUS_COMPLETE) {
                 printk(KERN_INFO
                        "%s: set_mib: at76_wait_completion failed "
-                       "with %d\n", wiphy_name(priv->hw->wiphy), ret);
+                       "with %d\n", priv->netdev->name, ret);
                 ret = -EIO;
         }
 
@@ -874,7 +905,7 @@ static int at76_set_radio(struct at76_priv *priv, int enable)
         ret = at76_set_card_command(priv->udev, cmd, NULL, 0);
         if (ret < 0)
                 printk(KERN_ERR "%s: at76_set_card_command(%d) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), cmd, ret);
+                       priv->netdev->name, cmd, ret);
         else
                 ret = 1;
 
@@ -895,7 +926,44 @@ static int at76_set_pm_mode(struct at76_priv *priv)
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
                 printk(KERN_ERR "%s: set_mib (pm_mode) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
+
+        return ret;
+}
+
+/* Set the association id for power save mode */
+static int at76_set_associd(struct at76_priv *priv, u16 id)
+{
+        int ret = 0;
+
+        priv->mib_buf.type = MIB_MAC_MGMT;
+        priv->mib_buf.size = 2;
+        priv->mib_buf.index = offsetof(struct mib_mac_mgmt, station_id);
+        priv->mib_buf.data.word = cpu_to_le16(id);
+
+        ret = at76_set_mib(priv, &priv->mib_buf);
+        if (ret < 0)
+                printk(KERN_ERR "%s: set_mib (associd) failed: %d\n",
+                       priv->netdev->name, ret);
+
+        return ret;
+}
+
+/* Set the listen interval for power save mode */
+static int at76_set_listen_interval(struct at76_priv *priv, u16 interval)
+{
+        int ret = 0;
+
+        priv->mib_buf.type = MIB_MAC;
+        priv->mib_buf.size = 2;
+        priv->mib_buf.index = offsetof(struct mib_mac, listen_interval);
+        priv->mib_buf.data.word = cpu_to_le16(interval);
+
+        ret = at76_set_mib(priv, &priv->mib_buf);
+        if (ret < 0)
+                printk(KERN_ERR
+                       "%s: set_mib (listen_interval) failed: %d\n",
+                       priv->netdev->name, ret);
 
         return ret;
 }
@@ -912,7 +980,7 @@ static int at76_set_preamble(struct at76_priv *priv, u8 type)
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
                 printk(KERN_ERR "%s: set_mib (preamble) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
 
         return ret;
 }
@@ -929,7 +997,7 @@ static int at76_set_frag(struct at76_priv *priv, u16 size)
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
                 printk(KERN_ERR "%s: set_mib (frag threshold) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
 
         return ret;
 }
@@ -946,7 +1014,7 @@ static int at76_set_rts(struct at76_priv *priv, u16 size)
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
                 printk(KERN_ERR "%s: set_mib (rts) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
 
         return ret;
 }
@@ -963,41 +1031,24 @@ static int at76_set_autorate_fallback(struct at76_priv *priv, int onoff)
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
                 printk(KERN_ERR "%s: set_mib (autorate fallback) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
 
         return ret;
 }
 
-static int at76_set_tkip_bssid(struct at76_priv *priv, const void *addr)
+static int at76_add_mac_address(struct at76_priv *priv, void *addr)
 {
         int ret = 0;
 
-        priv->mib_buf.type = MIB_MAC_ENCRYPTION;
+        priv->mib_buf.type = MIB_MAC_ADDR;
         priv->mib_buf.size = ETH_ALEN;
-        priv->mib_buf.index = offsetof(struct mib_mac_encryption, tkip_bssid);
+        priv->mib_buf.index = offsetof(struct mib_mac_addr, mac_addr);
         memcpy(priv->mib_buf.data.addr, addr, ETH_ALEN);
 
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (MAC_ENCRYPTION, tkip_bssid) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
-
-        return ret;
-}
-
-static int at76_reset_rsc(struct at76_priv *priv)
-{
-        int ret = 0;
-
-        priv->mib_buf.type = MIB_MAC_ENCRYPTION;
-        priv->mib_buf.size = 4 * 8;
-        priv->mib_buf.index = offsetof(struct mib_mac_encryption, key_rsc);
-        memset(priv->mib_buf.data.data, 0 , priv->mib_buf.size);
-
-        ret = at76_set_mib(priv, &priv->mib_buf);
-        if (ret < 0)
-                printk(KERN_ERR "%s: set_mib (MAC_ENCRYPTION, key_rsc) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                printk(KERN_ERR "%s: set_mib (MAC_ADDR, mac_addr) failed: %d\n",
+                       priv->netdev->name, ret);
 
         return ret;
 }
@@ -1016,16 +1067,16 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv)
                            sizeof(struct mib_mac_addr));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_get_mib (MAC_ADDR) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 goto exit;
         }
 
         at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: mac_addr %s res 0x%x 0x%x",
-                 wiphy_name(priv->hw->wiphy),
+                 priv->netdev->name,
                  mac2str(m->mac_addr), m->res[0], m->res[1]);
         for (i = 0; i < ARRAY_SIZE(m->group_addr); i++)
                 at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: group addr %d: %s, "
-                         "status %d", wiphy_name(priv->hw->wiphy), i,
+                         "status %d", priv->netdev->name, i,
                          mac2str(m->group_addr[i]), m->group_addr_status[i]);
 exit:
         kfree(m);
@@ -1045,13 +1096,13 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
                            sizeof(struct mib_mac_wep));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_get_mib (MAC_WEP) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 goto exit;
         }
 
         at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: priv_invoked %u def_key_id %u "
                  "key_len %u excl_unencr %u wep_icv_err %u wep_excluded %u "
-                 "encr_level %u key %d", wiphy_name(priv->hw->wiphy),
+                 "encr_level %u key %d", priv->netdev->name,
                  m->privacy_invoked, m->wep_default_key_id,
                  m->wep_key_mapping_len, m->exclude_unencrypted,
                  le32_to_cpu(m->wep_icv_error_count),
@@ -1063,55 +1114,12 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
 
         for (i = 0; i < WEP_KEYS; i++)
                 at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: key %d: %s",
-                         wiphy_name(priv->hw->wiphy), i,
+                         priv->netdev->name, i,
                          hex2str(m->wep_default_keyvalue[i], key_len));
 exit:
         kfree(m);
 }
 
-static void at76_dump_mib_mac_encryption(struct at76_priv *priv)
-{
-        int i;
-        int ret;
-        /*int key_len;*/
-        struct mib_mac_encryption *m;
-
-        m = kmalloc(sizeof(struct mib_mac_encryption), GFP_KERNEL);
-        if (!m)
-                return;
-
-        ret = at76_get_mib(priv->udev, MIB_MAC_ENCRYPTION, m,
-                           sizeof(struct mib_mac_encryption));
-        if (ret < 0) {
-                dev_err(&priv->udev->dev,
-                        "%s: at76_get_mib (MAC_ENCRYPTION) failed: %d\n",
-                        wiphy_name(priv->hw->wiphy), ret);
-                goto exit;
-        }
-
-        at76_dbg(DBG_MIB,
-                 "%s: MIB MAC_ENCRYPTION: tkip_bssid %s priv_invoked %u "
-                 "ciph_key_id %u grp_key_id %u excl_unencr %u "
-                 "ckip_key_perm %u wep_icv_err %u wep_excluded %u",
-                 wiphy_name(priv->hw->wiphy), mac2str(m->tkip_bssid),
-                 m->privacy_invoked, m->cipher_default_key_id,
-                 m->cipher_default_group_key_id, m->exclude_unencrypted,
-                 m->ckip_key_permutation,
-                 le32_to_cpu(m->wep_icv_error_count),
-                 le32_to_cpu(m->wep_excluded_count));
-
-        /*key_len = (m->encryption_level == 1) ?
-            WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;*/
-
-        for (i = 0; i < CIPHER_KEYS; i++)
-                at76_dbg(DBG_MIB, "%s: MIB MAC_ENCRYPTION: key %d: %s",
-                         wiphy_name(priv->hw->wiphy), i,
-                         hex2str(m->cipher_default_keyvalue[i],
-                                 CIPHER_KEY_LEN));
-exit:
-        kfree(m);
-}
-
 static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
 {
         int ret;
@@ -1125,7 +1133,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
                            sizeof(struct mib_mac_mgmt));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_get_mib (MAC_MGMT) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 goto exit;
         }
 
@@ -1136,7 +1144,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
                  "pm_mode %d ibss_change %d res %d "
                  "multi_domain_capability_implemented %d "
                  "international_roaming %d country_string %.3s",
-                 wiphy_name(priv->hw->wiphy), le16_to_cpu(m->beacon_period),
+                 priv->netdev->name, le16_to_cpu(m->beacon_period),
                  le16_to_cpu(m->CFP_max_duration),
                  le16_to_cpu(m->medium_occupancy_limit),
                  le16_to_cpu(m->station_id), le16_to_cpu(m->ATIM_window),
@@ -1161,7 +1169,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
         ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_get_mib (MAC) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 goto exit;
         }
 
@@ -1171,8 +1179,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
                  "scan_type %d scan_channel %d probe_delay %u "
                  "min_channel_time %d max_channel_time %d listen_int %d "
                  "desired_ssid %s desired_bssid %s desired_bsstype %d",
-                 wiphy_name(priv->hw->wiphy),
-                 le32_to_cpu(m->max_tx_msdu_lifetime),
+                 priv->netdev->name, le32_to_cpu(m->max_tx_msdu_lifetime),
                  le32_to_cpu(m->max_rx_lifetime),
                  le16_to_cpu(m->frag_threshold), le16_to_cpu(m->rts_threshold),
                  le16_to_cpu(m->cwmin), le16_to_cpu(m->cwmax),
@@ -1198,7 +1205,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
         ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_get_mib (PHY) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 goto exit;
         }
 
@@ -1207,7 +1214,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
                  "mpdu_max_length %d cca_mode_supported %d operation_rate_set "
                  "0x%x 0x%x 0x%x 0x%x channel_id %d current_cca_mode %d "
                  "phy_type %d current_reg_domain %d",
-                 wiphy_name(priv->hw->wiphy), le32_to_cpu(m->ed_threshold),
+                 priv->netdev->name, le32_to_cpu(m->ed_threshold),
                  le16_to_cpu(m->slot_time), le16_to_cpu(m->sifs_time),
                  le16_to_cpu(m->preamble_length),
                  le16_to_cpu(m->plcp_header_length),
@@ -1231,14 +1238,13 @@ static void at76_dump_mib_local(struct at76_priv *priv)
         ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_get_mib (LOCAL) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 goto exit;
         }
 
         at76_dbg(DBG_MIB, "%s: MIB LOCAL: beacon_enable %d "
                  "txautorate_fallback %d ssid_size %d promiscuous_mode %d "
-                 "preamble_type %d", wiphy_name(priv->hw->wiphy),
-                 m->beacon_enable,
+                 "preamble_type %d", priv->netdev->name, m->beacon_enable,
                  m->txautorate_fallback, m->ssid_size, m->promiscuous_mode,
                  m->preamble_type);
 exit:
@@ -1257,21 +1263,118 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv)
                            sizeof(struct mib_mdomain));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_get_mib (MDOMAIN) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 goto exit;
         }
 
         at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s",
-                 wiphy_name(priv->hw->wiphy),
+                 priv->netdev->name,
                  hex2str(m->channel_list, sizeof(m->channel_list)));
 
         at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: tx_powerlevel %s",
-                 wiphy_name(priv->hw->wiphy),
+                 priv->netdev->name,
                  hex2str(m->tx_powerlevel, sizeof(m->tx_powerlevel)));
 exit:
         kfree(m);
 }
 
+static int at76_get_current_bssid(struct at76_priv *priv)
+{
+        int ret = 0;
+        struct mib_mac_mgmt *mac_mgmt =
+            kmalloc(sizeof(struct mib_mac_mgmt), GFP_KERNEL);
+
+        if (!mac_mgmt) {
+                ret = -ENOMEM;
+                goto exit;
+        }
+
+        ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, mac_mgmt,
+                           sizeof(struct mib_mac_mgmt));
+        if (ret < 0) {
+                printk(KERN_ERR "%s: at76_get_mib failed: %d\n",
+                       priv->netdev->name, ret);
+                goto error;
+        }
+        memcpy(priv->bssid, mac_mgmt->current_bssid, ETH_ALEN);
+        printk(KERN_INFO "%s: using BSSID %s\n", priv->netdev->name,
+               mac2str(priv->bssid));
+error:
+        kfree(mac_mgmt);
+exit:
+        return ret;
+}
+
+static int at76_get_current_channel(struct at76_priv *priv)
+{
+        int ret = 0;
+        struct mib_phy *phy = kmalloc(sizeof(struct mib_phy), GFP_KERNEL);
+
+        if (!phy) {
+                ret = -ENOMEM;
+                goto exit;
+        }
+        ret = at76_get_mib(priv->udev, MIB_PHY, phy, sizeof(struct mib_phy));
+        if (ret < 0) {
+                printk(KERN_ERR "%s: at76_get_mib(MIB_PHY) failed: %d\n",
+                       priv->netdev->name, ret);
+                goto error;
+        }
+        priv->channel = phy->channel_id;
+error:
+        kfree(phy);
+exit:
+        return ret;
+}
+
+/**
+ * at76_start_scan - start a scan
+ *
+ * @use_essid - use the configured ESSID in non passive mode
+ */
+static int at76_start_scan(struct at76_priv *priv, int use_essid)
+{
+        struct at76_req_scan scan;
+
+        memset(&scan, 0, sizeof(struct at76_req_scan));
+        memset(scan.bssid, 0xff, ETH_ALEN);
+
+        if (use_essid) {
+                memcpy(scan.essid, priv->essid, IW_ESSID_MAX_SIZE);
+                scan.essid_size = priv->essid_size;
+        } else
+                scan.essid_size = 0;
+
+        /* jal: why should we start at a certain channel? we do scan the whole
+           range allowed by reg domain. */
+        scan.channel = priv->channel;
+
+        /* atmelwlandriver differs between scan type 0 and 1 (active/passive)
+           For ad-hoc mode, it uses type 0 only. */
+        scan.scan_type = priv->scan_mode;
+
+        /* INFO: For probe_delay, not multiplying by 1024 as this will be
+           slightly less than min_channel_time
+           (per spec: probe delay < min. channel time) */
+        scan.min_channel_time = cpu_to_le16(priv->scan_min_time);
+        scan.max_channel_time = cpu_to_le16(priv->scan_max_time);
+        scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000);
+        scan.international_scan = 0;
+
+        /* other values are set to 0 for type 0 */
+
+        at76_dbg(DBG_PROGRESS, "%s: start_scan (use_essid = %d, intl = %d, "
+                 "channel = %d, probe_delay = %d, scan_min_time = %d, "
+                 "scan_max_time = %d)",
+                 priv->netdev->name, use_essid,
+                 scan.international_scan, scan.channel,
+                 le16_to_cpu(scan.probe_delay),
+                 le16_to_cpu(scan.min_channel_time),
+                 le16_to_cpu(scan.max_channel_time));
+
+        return at76_set_card_command(priv->udev, CMD_SCAN, &scan, sizeof(scan));
+}
+
 /* Enable monitor mode */
 static int at76_start_monitor(struct at76_priv *priv)
 {
@@ -1292,6 +1395,86 @@ static int at76_start_monitor(struct at76_priv *priv)
         return ret;
 }
 
+static int at76_start_ibss(struct at76_priv *priv)
+{
+        struct at76_req_ibss bss;
+        int ret;
+
+        WARN_ON(priv->mac_state != MAC_OWN_IBSS);
+        if (priv->mac_state != MAC_OWN_IBSS)
+                return -EBUSY;
+
+        memset(&bss, 0, sizeof(struct at76_req_ibss));
+        memset(bss.bssid, 0xff, ETH_ALEN);
+        memcpy(bss.essid, priv->essid, IW_ESSID_MAX_SIZE);
+        bss.essid_size = priv->essid_size;
+        bss.bss_type = ADHOC_MODE;
+        bss.channel = priv->channel;
+
+        ret = at76_set_card_command(priv->udev, CMD_START_IBSS, &bss,
+                                    sizeof(struct at76_req_ibss));
+        if (ret < 0) {
+                printk(KERN_ERR "%s: start_ibss failed: %d\n",
+                       priv->netdev->name, ret);
+                return ret;
+        }
+
+        ret = at76_wait_completion(priv, CMD_START_IBSS);
+        if (ret != CMD_STATUS_COMPLETE) {
+                printk(KERN_ERR "%s: start_ibss failed to complete, %d\n",
+                       priv->netdev->name, ret);
+                return ret;
+        }
+
+        ret = at76_get_current_bssid(priv);
+        if (ret < 0)
+                return ret;
+
+        ret = at76_get_current_channel(priv);
+        if (ret < 0)
+                return ret;
+
+        /* not sure what this is good for ??? */
+        priv->mib_buf.type = MIB_MAC_MGMT;
+        priv->mib_buf.size = 1;
+        priv->mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change);
+        priv->mib_buf.data.byte = 0;
+
+        ret = at76_set_mib(priv, &priv->mib_buf);
+        if (ret < 0) {
+                printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n",
+                       priv->netdev->name, ret);
+                return ret;
+        }
+
+        netif_carrier_on(priv->netdev);
+        netif_start_queue(priv->netdev);
+        return 0;
+}
+
+/* Request card to join BSS in managed or ad-hoc mode */
+static int at76_join_bss(struct at76_priv *priv, struct bss_info *ptr)
+{
+        struct at76_req_join join;
+
+        BUG_ON(!ptr);
+
+        memset(&join, 0, sizeof(struct at76_req_join));
+        memcpy(join.bssid, ptr->bssid, ETH_ALEN);
+        memcpy(join.essid, ptr->ssid, ptr->ssid_len);
+        join.essid_size = ptr->ssid_len;
+        join.bss_type = (priv->iw_mode == IW_MODE_ADHOC ? 1 : 2);
+        join.channel = ptr->channel;
+        join.timeout = cpu_to_le16(2000);
+
+        at76_dbg(DBG_PROGRESS,
+                 "%s join addr %s ssid %s type %d ch %d timeout %d",
+                 priv->netdev->name, mac2str(join.bssid), join.essid,
+                 join.bss_type, join.channel, le16_to_cpu(join.timeout));
+        return at76_set_card_command(priv->udev, CMD_JOIN, &join,
+                                     sizeof(struct at76_req_join));
+}
+
 /* Calculate padding from txbuf->wlength (which excludes the USB TX header),
    likely to compensate a flaw in the AT76C503A USB part ... */
 static inline int at76_calc_padding(int wlen)
@@ -1310,6 +1493,14 @@ static inline int at76_calc_padding(int wlen)
         return 0;
 }
 
+/* We are doing a lot of things here in an interrupt. Need
+   a bh handler (Watching TV with a TV card is probably
+   a good test: if you see flickers, we are doing too much.
+   Currently I do see flickers... even with our tasklet :-( )
+   Maybe because the bttv driver and usb-uhci use the same interrupt
+*/
+/* Or maybe because our BH handler is preempting bttv's BH handler.. BHs don't
+ * solve everything.. (alex) */
 static void at76_rx_callback(struct urb *urb)
 {
         struct at76_priv *priv = urb->context;
@@ -1319,6 +1510,1758 @@ static void at76_rx_callback(struct urb *urb)
         return;
 }
 
+static void at76_tx_callback(struct urb *urb)
+{
+        struct at76_priv *priv = urb->context;
+        struct net_device_stats *stats = &priv->stats;
+        unsigned long flags;
+        struct at76_tx_buffer *mgmt_buf;
+        int ret;
+
+        switch (urb->status) {
+        case 0:
+                stats->tx_packets++;
+                break;
+        case -ENOENT:
+        case -ECONNRESET:
+                /* urb has been unlinked */
+                return;
+        default:
+                at76_dbg(DBG_URB, "%s - nonzero tx status received: %d",
+                         __func__, urb->status);
+                stats->tx_errors++;
+                break;
+        }
+
+        spin_lock_irqsave(&priv->mgmt_spinlock, flags);
+        mgmt_buf = priv->next_mgmt_bulk;
+        priv->next_mgmt_bulk = NULL;
+        spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
+
+        if (!mgmt_buf) {
+                netif_wake_queue(priv->netdev);
+                return;
+        }
+
+        /* we don't copy the padding bytes, but add them
+           to the length */
+        memcpy(priv->bulk_out_buffer, mgmt_buf,
+               le16_to_cpu(mgmt_buf->wlength) + AT76_TX_HDRLEN);
+        usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe,
+                          priv->bulk_out_buffer,
+                          le16_to_cpu(mgmt_buf->wlength) + mgmt_buf->padding +
+                          AT76_TX_HDRLEN, at76_tx_callback, priv);
+        ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
+        if (ret)
+                printk(KERN_ERR "%s: error in tx submit urb: %d\n",
+                       priv->netdev->name, ret);
+
+        kfree(mgmt_buf);
+}
+
+/* Send a management frame on bulk-out.  txbuf->wlength must be set */
+static int at76_tx_mgmt(struct at76_priv *priv, struct at76_tx_buffer *txbuf)
+{
+        unsigned long flags;
+        int ret;
+        int urb_status;
+        void *oldbuf = NULL;
+
+        netif_carrier_off(priv->netdev);        /* stop netdev watchdog */
+        netif_stop_queue(priv->netdev); /* stop tx data packets */
+
+        spin_lock_irqsave(&priv->mgmt_spinlock, flags);
+
+        urb_status = priv->tx_urb->status;
+        if (urb_status == -EINPROGRESS) {
+                /* cannot transmit now, put in the queue */
+                oldbuf = priv->next_mgmt_bulk;
+                priv->next_mgmt_bulk = txbuf;
+        }
+        spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
+
+        if (oldbuf) {
+                /* a data/mgmt tx is already pending in the URB -
+                   if this is no error in some situations we must
+                   implement a queue or silently modify the old msg */
+                printk(KERN_ERR "%s: removed pending mgmt buffer %s\n",
+                       priv->netdev->name, hex2str(oldbuf, 64));
+                kfree(oldbuf);
+                return 0;
+        }
+
+        txbuf->tx_rate = TX_RATE_1MBIT;
+        txbuf->padding = at76_calc_padding(le16_to_cpu(txbuf->wlength));
+        memset(txbuf->reserved, 0, sizeof(txbuf->reserved));
+
+        if (priv->next_mgmt_bulk)
+                printk(KERN_ERR "%s: URB status %d, but mgmt is pending\n",
+                       priv->netdev->name, urb_status);
+
+        at76_dbg(DBG_TX_MGMT,
+                 "%s: tx mgmt: wlen %d tx_rate %d pad %d %s",
+                 priv->netdev->name, le16_to_cpu(txbuf->wlength),
+                 txbuf->tx_rate, txbuf->padding,
+                 hex2str(txbuf->packet, le16_to_cpu(txbuf->wlength)));
+
+        /* txbuf was not consumed above -> send mgmt msg immediately */
+        memcpy(priv->bulk_out_buffer, txbuf,
+               le16_to_cpu(txbuf->wlength) + AT76_TX_HDRLEN);
+        usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe,
+                          priv->bulk_out_buffer,
+                          le16_to_cpu(txbuf->wlength) + txbuf->padding +
+                          AT76_TX_HDRLEN, at76_tx_callback, priv);
+        ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
+        if (ret)
+                printk(KERN_ERR "%s: error in tx submit urb: %d\n",
+                       priv->netdev->name, ret);
+
+        kfree(txbuf);
+
+        return ret;
+}
+
+/* Go to the next information element */
+static inline void next_ie(struct ieee80211_info_element **ie)
+{
+        *ie = (struct ieee80211_info_element *)(&(*ie)->data[(*ie)->len]);
+}
+
+/* Challenge is the challenge string (in TLV format)
+   we got with seq_nr 2 for shared secret authentication only and
+   send in seq_nr 3 WEP encrypted to prove we have the correct WEP key;
+   otherwise it is NULL */
+static int at76_auth_req(struct at76_priv *priv, struct bss_info *bss,
+                         int seq_nr, struct ieee80211_info_element *challenge)
+{
+        struct at76_tx_buffer *tx_buffer;
+        struct ieee80211_hdr_3addr *mgmt;
+        struct ieee80211_auth *req;
+        int buf_len = (seq_nr != 3 ? AUTH_FRAME_SIZE :
+                       AUTH_FRAME_SIZE + 1 + 1 + challenge->len);
+
+        BUG_ON(!bss);
+        BUG_ON(seq_nr == 3 && !challenge);
+        tx_buffer = kmalloc(buf_len + MAX_PADDING_SIZE, GFP_ATOMIC);
+        if (!tx_buffer)
+                return -ENOMEM;
+
+        req = (struct ieee80211_auth *)tx_buffer->packet;
+        mgmt = &req->header;
+
+        /* make wireless header */
+        /* first auth msg is not encrypted, only the second (seq_nr == 3) */
+        mgmt->frame_ctl =
+            cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH |
+                        (seq_nr == 3 ? IEEE80211_FCTL_PROTECTED : 0));
+
+        mgmt->duration_id = cpu_to_le16(0x8000);
+        memcpy(mgmt->addr1, bss->bssid, ETH_ALEN);
+        memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
+        memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
+        mgmt->seq_ctl = cpu_to_le16(0);
+
+        req->algorithm = cpu_to_le16(priv->auth_mode);
+        req->transaction = cpu_to_le16(seq_nr);
+        req->status = cpu_to_le16(0);
+
+        if (seq_nr == 3)
+                memcpy(req->info_element, challenge, 1 + 1 + challenge->len);
+
+        /* init. at76_priv tx header */
+        tx_buffer->wlength = cpu_to_le16(buf_len - AT76_TX_HDRLEN);
+        at76_dbg(DBG_TX_MGMT, "%s: AuthReq bssid %s alg %d seq_nr %d",
+                 priv->netdev->name, mac2str(mgmt->addr3),
+                 le16_to_cpu(req->algorithm), le16_to_cpu(req->transaction));
+        if (seq_nr == 3)
+                at76_dbg(DBG_TX_MGMT, "%s: AuthReq challenge: %s ...",
+                         priv->netdev->name, hex2str(req->info_element, 18));
+
+        /* either send immediately (if no data tx is pending
+           or put it in pending list */
+        return at76_tx_mgmt(priv, tx_buffer);
+}
+
+static int at76_assoc_req(struct at76_priv *priv, struct bss_info *bss)
+{
+        struct at76_tx_buffer *tx_buffer;
+        struct ieee80211_hdr_3addr *mgmt;
+        struct ieee80211_assoc_request *req;
+        struct ieee80211_info_element *ie;
+        char *essid;
+        int essid_len;
+        u16 capa;
+
+        BUG_ON(!bss);
+
+        tx_buffer = kmalloc(ASSOCREQ_MAX_SIZE + MAX_PADDING_SIZE, GFP_ATOMIC);
+        if (!tx_buffer)
+                return -ENOMEM;
+
+        req = (struct ieee80211_assoc_request *)tx_buffer->packet;
+        mgmt = &req->header;
+        ie = req->info_element;
+
+        /* make wireless header */
+        mgmt->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                      IEEE80211_STYPE_ASSOC_REQ);
+
+        mgmt->duration_id = cpu_to_le16(0x8000);
+        memcpy(mgmt->addr1, bss->bssid, ETH_ALEN);
+        memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN);
+        memcpy(mgmt->addr3, bss->bssid, ETH_ALEN);
+        mgmt->seq_ctl = cpu_to_le16(0);
+
+        /* we must set the Privacy bit in the capabilities to assure an
+           Agere-based AP with optional WEP transmits encrypted frames
+           to us.  AP only set the Privacy bit in their capabilities
+           if WEP is mandatory in the BSS! */
+        capa = bss->capa;
+        if (priv->wep_enabled)
+                capa |= WLAN_CAPABILITY_PRIVACY;
+        if (priv->preamble_type != PREAMBLE_TYPE_LONG)
+                capa |= WLAN_CAPABILITY_SHORT_PREAMBLE;
+        req->capability = cpu_to_le16(capa);
+
+        req->listen_interval = cpu_to_le16(2 * bss->beacon_interval);
+
+        /* write TLV data elements */
+
+        ie->id = MFIE_TYPE_SSID;
+        ie->len = bss->ssid_len;
+        memcpy(ie->data, bss->ssid, bss->ssid_len);
+        next_ie(&ie);
+
+        ie->id = MFIE_TYPE_RATES;
+        ie->len = sizeof(hw_rates);
+        memcpy(ie->data, hw_rates, sizeof(hw_rates));
+        next_ie(&ie);           /* ie points behind the supp_rates field */
+
+        /* init. at76_priv tx header */
+        tx_buffer->wlength = cpu_to_le16((u8 *)ie - (u8 *)mgmt);
+
+        ie = req->info_element;
+        essid = ie->data;
+        essid_len = min_t(int, IW_ESSID_MAX_SIZE, ie->len);
+
+        next_ie(&ie);           /* points to IE of rates now */
+        at76_dbg(DBG_TX_MGMT,
+                 "%s: AssocReq bssid %s capa 0x%04x ssid %.*s rates %s",
+                 priv->netdev->name, mac2str(mgmt->addr3),
+                 le16_to_cpu(req->capability), essid_len, essid,
+                 hex2str(ie->data, ie->len));
+
+        /* either send immediately (if no data tx is pending
+           or put it in pending list */
+        return at76_tx_mgmt(priv, tx_buffer);
+}
+
+/* We got to check the bss_list for old entries */
+static void at76_bss_list_timeout(unsigned long par)
+{
+        struct at76_priv *priv = (struct at76_priv *)par;
+        unsigned long flags;
+        struct list_head *lptr, *nptr;
+        struct bss_info *ptr;
+
+        spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+
+        list_for_each_safe(lptr, nptr, &priv->bss_list) {
+
+                ptr = list_entry(lptr, struct bss_info, list);
+
+                if (ptr != priv->curr_bss
+                    && time_after(jiffies, ptr->last_rx + BSS_LIST_TIMEOUT)) {
+                        at76_dbg(DBG_BSS_TABLE_RM,
+                                 "%s: bss_list: removing old BSS %s ch %d",
+                                 priv->netdev->name, mac2str(ptr->bssid),
+                                 ptr->channel);
+                        list_del(&ptr->list);
+                        kfree(ptr);
+                }
+        }
+        spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
+        /* restart the timer */
+        mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
+}
+
+static inline void at76_set_mac_state(struct at76_priv *priv,
+                                      enum mac_state mac_state)
+{
+        at76_dbg(DBG_MAC_STATE, "%s state: %s", priv->netdev->name,
+                 mac_states[mac_state]);
+        priv->mac_state = mac_state;
+}
+
+static void at76_dump_bss_table(struct at76_priv *priv)
+{
+        struct bss_info *ptr;
+        unsigned long flags;
+        struct list_head *lptr;
+
+        spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+
+        at76_dbg(DBG_BSS_TABLE, "%s BSS table (curr=%p):", priv->netdev->name,
+                 priv->curr_bss);
+
+        list_for_each(lptr, &priv->bss_list) {
+                ptr = list_entry(lptr, struct bss_info, list);
+                at76_dbg(DBG_BSS_TABLE, "0x%p: bssid %s channel %d ssid %.*s "
+                         "(%s) capa 0x%04x rates %s rssi %d link %d noise %d",
+                         ptr, mac2str(ptr->bssid), ptr->channel, ptr->ssid_len,
+                         ptr->ssid, hex2str(ptr->ssid, ptr->ssid_len),
+                         ptr->capa, hex2str(ptr->rates, ptr->rates_len),
+                         ptr->rssi, ptr->link_qual, ptr->noise_level);
+        }
+        spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
+}
+
+/* Called upon successful association to mark interface as connected */
+static void at76_work_assoc_done(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              work_assoc_done);
+
+        mutex_lock(&priv->mtx);
+
+        WARN_ON(priv->mac_state != MAC_ASSOC);
+        WARN_ON(!priv->curr_bss);
+        if (priv->mac_state != MAC_ASSOC || !priv->curr_bss)
+                goto exit;
+
+        if (priv->iw_mode == IW_MODE_INFRA) {
+                if (priv->pm_mode != AT76_PM_OFF) {
+                        /* calculate the listen interval in units of
+                           beacon intervals of the curr_bss */
+                        u32 pm_period_beacon = (priv->pm_period >> 10) /
+                            priv->curr_bss->beacon_interval;
+
+                        pm_period_beacon = max(pm_period_beacon, 2u);
+                        pm_period_beacon = min(pm_period_beacon, 0xffffu);
+
+                        at76_dbg(DBG_PM,
+                                 "%s: pm_mode %d assoc id 0x%x listen int %d",
+                                 priv->netdev->name, priv->pm_mode,
+                                 priv->assoc_id, pm_period_beacon);
+
+                        at76_set_associd(priv, priv->assoc_id);
+                        at76_set_listen_interval(priv, (u16)pm_period_beacon);
+                }
+                schedule_delayed_work(&priv->dwork_beacon, BEACON_TIMEOUT);
+        }
+        at76_set_pm_mode(priv);
+
+        netif_carrier_on(priv->netdev);
+        netif_wake_queue(priv->netdev);
+        at76_set_mac_state(priv, MAC_CONNECTED);
+        at76_iwevent_bss_connect(priv->netdev, priv->curr_bss->bssid);
+        at76_dbg(DBG_PROGRESS, "%s: connected to BSSID %s",
+                 priv->netdev->name, mac2str(priv->curr_bss->bssid));
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
+/* We only store the new mac address in netdev struct,
+   it gets set when the netdev is opened. */
+static int at76_set_mac_address(struct net_device *netdev, void *addr)
+{
+        struct sockaddr *mac = addr;
+        memcpy(netdev->dev_addr, mac->sa_data, ETH_ALEN);
+        return 1;
+}
+
+static struct net_device_stats *at76_get_stats(struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        return &priv->stats;
+}
+
+static struct iw_statistics *at76_get_wireless_stats(struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_IOCTL, "RETURN qual %d level %d noise %d updated %d",
+                 priv->wstats.qual.qual, priv->wstats.qual.level,
+                 priv->wstats.qual.noise, priv->wstats.qual.updated);
+
+        return &priv->wstats;
+}
+
+static void at76_set_multicast(struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int promisc;
+
+        promisc = ((netdev->flags & IFF_PROMISC) != 0);
+        if (promisc != priv->promisc) {
+                /* This gets called in interrupt, must reschedule */
+                priv->promisc = promisc;
+                schedule_work(&priv->work_set_promisc);
+        }
+}
+
+/* Stop all network activity, flush all pending tasks */
+static void at76_quiesce(struct at76_priv *priv)
+{
+        unsigned long flags;
+
+        netif_stop_queue(priv->netdev);
+        netif_carrier_off(priv->netdev);
+
+        at76_set_mac_state(priv, MAC_INIT);
+
+        cancel_delayed_work(&priv->dwork_get_scan);
+        cancel_delayed_work(&priv->dwork_beacon);
+        cancel_delayed_work(&priv->dwork_auth);
+        cancel_delayed_work(&priv->dwork_assoc);
+        cancel_delayed_work(&priv->dwork_restart);
+
+        spin_lock_irqsave(&priv->mgmt_spinlock, flags);
+        kfree(priv->next_mgmt_bulk);
+        priv->next_mgmt_bulk = NULL;
+        spin_unlock_irqrestore(&priv->mgmt_spinlock, flags);
+}
+
+/*******************************************************************************
+ * at76_priv implementations of iw_handler functions:
+ */
+static int at76_iw_handler_commit(struct net_device *netdev,
+                                  struct iw_request_info *info,
+                                  void *null, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_IOCTL, "%s %s: restarting the device", netdev->name,
+                 __func__);
+
+        if (priv->mac_state != MAC_INIT)
+                at76_quiesce(priv);
+
+        /* Wait half second before the restart to process subsequent
+         * requests from the same iwconfig in a single restart */
+        schedule_delayed_work(&priv->dwork_restart, HZ / 2);
+
+        return 0;
+}
+
+static int at76_iw_handler_get_name(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    char *name, char *extra)
+{
+        strcpy(name, "IEEE 802.11b");
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWNAME - name %s", netdev->name, name);
+        return 0;
+}
+
+static int at76_iw_handler_set_freq(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    struct iw_freq *freq, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int chan = -1;
+        int ret = -EIWCOMMIT;
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - freq.m %d freq.e %d",
+                 netdev->name, freq->m, freq->e);
+
+        if ((freq->e == 0) && (freq->m <= 1000))
+                /* Setting by channel number */
+                chan = freq->m;
+        else {
+                /* Setting by frequency - search the table */
+                int mult = 1;
+                int i;
+
+                for (i = 0; i < (6 - freq->e); i++)
+                        mult *= 10;
+
+                for (i = 0; i < NUM_CHANNELS; i++) {
+                        if (freq->m == (channel_frequency[i] * mult))
+                                chan = i + 1;
+                }
+        }
+
+        if (chan < 1 || !priv->domain)
+                /* non-positive channels are invalid
+                 * we need a domain info to set the channel
+                 * either that or an invalid frequency was
+                 * provided by the user */
+                ret = -EINVAL;
+        else if (!(priv->domain->channel_map & (1 << (chan - 1)))) {
+                printk(KERN_INFO "%s: channel %d not allowed for domain %s\n",
+                       priv->netdev->name, chan, priv->domain->name);
+                ret = -EINVAL;
+        }
+
+        if (ret == -EIWCOMMIT) {
+                priv->channel = chan;
+                at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - ch %d", netdev->name,
+                         chan);
+        }
+
+        return ret;
+}
+
+static int at76_iw_handler_get_freq(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    struct iw_freq *freq, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        freq->m = priv->channel;
+        freq->e = 0;
+
+        if (priv->channel)
+                at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - freq %ld x 10e%d",
+                         netdev->name, channel_frequency[priv->channel - 1], 6);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - ch %d", netdev->name,
+                 priv->channel);
+
+        return 0;
+}
+
+static int at76_iw_handler_set_mode(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    __u32 *mode, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWMODE - %d", netdev->name, *mode);
+
+        if ((*mode != IW_MODE_ADHOC) && (*mode != IW_MODE_INFRA) &&
+            (*mode != IW_MODE_MONITOR))
+                return -EINVAL;
+
+        priv->iw_mode = *mode;
+        if (priv->iw_mode != IW_MODE_INFRA)
+                priv->pm_mode = AT76_PM_OFF;
+
+        return -EIWCOMMIT;
+}
+
+static int at76_iw_handler_get_mode(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    __u32 *mode, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        *mode = priv->iw_mode;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWMODE - %d", netdev->name, *mode);
+
+        return 0;
+}
+
+static int at76_iw_handler_get_range(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_point *data, char *extra)
+{
+        /* inspired by atmel.c */
+        struct at76_priv *priv = netdev_priv(netdev);
+        struct iw_range *range = (struct iw_range *)extra;
+        int i;
+
+        data->length = sizeof(struct iw_range);
+        memset(range, 0, sizeof(struct iw_range));
+
+        /* TODO: range->throughput = xxxxxx; */
+
+        range->min_nwid = 0x0000;
+        range->max_nwid = 0x0000;
+
+        /* this driver doesn't maintain sensitivity information */
+        range->sensitivity = 0;
+
+        range->max_qual.qual = 100;
+        range->max_qual.level = 100;
+        range->max_qual.noise = 0;
+        range->max_qual.updated = IW_QUAL_NOISE_INVALID;
+
+        range->avg_qual.qual = 50;
+        range->avg_qual.level = 50;
+        range->avg_qual.noise = 0;
+        range->avg_qual.updated = IW_QUAL_NOISE_INVALID;
+
+        range->bitrate[0] = 1000000;
+        range->bitrate[1] = 2000000;
+        range->bitrate[2] = 5500000;
+        range->bitrate[3] = 11000000;
+        range->num_bitrates = 4;
+
+        range->min_rts = 0;
+        range->max_rts = MAX_RTS_THRESHOLD;
+
+        range->min_frag = MIN_FRAG_THRESHOLD;
+        range->max_frag = MAX_FRAG_THRESHOLD;
+
+        range->pmp_flags = IW_POWER_PERIOD;
+        range->pmt_flags = IW_POWER_ON;
+        range->pm_capa = IW_POWER_PERIOD | IW_POWER_ALL_R;
+
+        range->encoding_size[0] = WEP_SMALL_KEY_LEN;
+        range->encoding_size[1] = WEP_LARGE_KEY_LEN;
+        range->num_encoding_sizes = 2;
+        range->max_encoding_tokens = WEP_KEYS;
+
+        /* both WL-240U and Linksys WUSB11 v2.6 specify 15 dBm as output power
+           - take this for all (ignore antenna gains) */
+        range->txpower[0] = 15;
+        range->num_txpower = 1;
+        range->txpower_capa = IW_TXPOW_DBM;
+
+        range->we_version_source = WIRELESS_EXT;
+        range->we_version_compiled = WIRELESS_EXT;
+
+        /* same as the values used in atmel.c */
+        range->retry_capa = IW_RETRY_LIMIT;
+        range->retry_flags = IW_RETRY_LIMIT;
+        range->r_time_flags = 0;
+        range->min_retry = 1;
+        range->max_retry = 255;
+
+        range->num_channels = NUM_CHANNELS;
+        range->num_frequency = 0;
+
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                /* test if channel map bit is raised */
+                if (priv->domain->channel_map & (0x1 << i)) {
+                        range->num_frequency += 1;
+
+                        range->freq[i].i = i + 1;
+                        range->freq[i].m = channel_frequency[i] * 100000;
+                        range->freq[i].e = 1;   /* freq * 10^1 */
+                }
+        }
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWRANGE", netdev->name);
+
+        return 0;
+}
+
+static int at76_iw_handler_set_spy(struct net_device *netdev,
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = 0;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWSPY - number of addresses %d",
+                 netdev->name, data->length);
+
+        spin_lock_bh(&priv->spy_spinlock);
+        ret = iw_handler_set_spy(priv->netdev, info, (union iwreq_data *)data,
+                                 extra);
+        spin_unlock_bh(&priv->spy_spinlock);
+
+        return ret;
+}
+
+static int at76_iw_handler_get_spy(struct net_device *netdev,
+                                   struct iw_request_info *info,
+                                   struct iw_point *data, char *extra)
+{
+
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = 0;
+
+        spin_lock_bh(&priv->spy_spinlock);
+        ret = iw_handler_get_spy(priv->netdev, info,
+                                 (union iwreq_data *)data, extra);
+        spin_unlock_bh(&priv->spy_spinlock);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWSPY - number of addresses %d",
+                 netdev->name, data->length);
+
+        return ret;
+}
+
+static int at76_iw_handler_set_thrspy(struct net_device *netdev,
+                                      struct iw_request_info *info,
+                                      struct iw_point *data, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWTHRSPY - number of addresses %d)",
+                 netdev->name, data->length);
+
+        spin_lock_bh(&priv->spy_spinlock);
+        ret = iw_handler_set_thrspy(netdev, info, (union iwreq_data *)data,
+                                    extra);
+        spin_unlock_bh(&priv->spy_spinlock);
+
+        return ret;
+}
+
+static int at76_iw_handler_get_thrspy(struct net_device *netdev,
+                                      struct iw_request_info *info,
+                                      struct iw_point *data, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret;
+
+        spin_lock_bh(&priv->spy_spinlock);
+        ret = iw_handler_get_thrspy(netdev, info, (union iwreq_data *)data,
+                                    extra);
+        spin_unlock_bh(&priv->spy_spinlock);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWTHRSPY - number of addresses %d)",
+                 netdev->name, data->length);
+
+        return ret;
+}
+
+static int at76_iw_handler_set_wap(struct net_device *netdev,
+                                   struct iw_request_info *info,
+                                   struct sockaddr *ap_addr, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWAP - wap/bssid %s", netdev->name,
+                 mac2str(ap_addr->sa_data));
+
+        /* if the incoming address == ff:ff:ff:ff:ff:ff, the user has
+           chosen any or auto AP preference */
+        if (is_broadcast_ether_addr(ap_addr->sa_data)
+            || is_zero_ether_addr(ap_addr->sa_data))
+                priv->wanted_bssid_valid = 0;
+        else {
+                /* user wants to set a preferred AP address */
+                priv->wanted_bssid_valid = 1;
+                memcpy(priv->wanted_bssid, ap_addr->sa_data, ETH_ALEN);
+        }
+
+        return -EIWCOMMIT;
+}
+
+static int at76_iw_handler_get_wap(struct net_device *netdev,
+                                   struct iw_request_info *info,
+                                   struct sockaddr *ap_addr, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        ap_addr->sa_family = ARPHRD_ETHER;
+        memcpy(ap_addr->sa_data, priv->bssid, ETH_ALEN);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWAP - wap/bssid %s", netdev->name,
+                 mac2str(ap_addr->sa_data));
+
+        return 0;
+}
+
+static int at76_iw_handler_set_scan(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    union iwreq_data *wrqu, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = 0;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWSCAN", netdev->name);
+
+        if (mutex_lock_interruptible(&priv->mtx))
+                return -EINTR;
+
+        if (!netif_running(netdev)) {
+                ret = -ENETDOWN;
+                goto exit;
+        }
+
+        /* jal: we don't allow "iwlist ethX scan" while we are
+           in monitor mode */
+        if (priv->iw_mode == IW_MODE_MONITOR) {
+                ret = -EBUSY;
+                goto exit;
+        }
+
+        /* Discard old scan results */
+        if ((jiffies - priv->last_scan) > (20 * HZ))
+                priv->scan_state = SCAN_IDLE;
+        priv->last_scan = jiffies;
+
+        /* Initiate a scan command */
+        if (priv->scan_state == SCAN_IN_PROGRESS) {
+                ret = -EBUSY;
+                goto exit;
+        }
+
+        priv->scan_state = SCAN_IN_PROGRESS;
+
+        at76_quiesce(priv);
+
+        /* Try to do passive or active scan if WE asks as. */
+        if (wrqu->data.length
+            && wrqu->data.length == sizeof(struct iw_scan_req)) {
+                struct iw_scan_req *req = (struct iw_scan_req *)extra;
+
+                if (req->scan_type == IW_SCAN_TYPE_PASSIVE)
+                        priv->scan_mode = SCAN_TYPE_PASSIVE;
+                else if (req->scan_type == IW_SCAN_TYPE_ACTIVE)
+                        priv->scan_mode = SCAN_TYPE_ACTIVE;
+
+                /* Sanity check values? */
+                if (req->min_channel_time > 0)
+                        priv->scan_min_time = req->min_channel_time;
+
+                if (req->max_channel_time > 0)
+                        priv->scan_max_time = req->max_channel_time;
+        }
+
+        /* change to scanning state */
+        at76_set_mac_state(priv, MAC_SCANNING);
+        schedule_work(&priv->work_start_scan);
+
+exit:
+        mutex_unlock(&priv->mtx);
+        return ret;
+}
+
+static int at76_iw_handler_get_scan(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    struct iw_point *data, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        unsigned long flags;
+        struct list_head *lptr, *nptr;
+        struct bss_info *curr_bss;
+        struct iw_event *iwe = kmalloc(sizeof(struct iw_event), GFP_KERNEL);
+        char *curr_val, *curr_pos = extra;
+        int i;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWSCAN", netdev->name);
+
+        if (!iwe)
+                return -ENOMEM;
+
+        if (priv->scan_state != SCAN_COMPLETED) {
+                /* scan not yet finished */
+                kfree(iwe);
+                return -EAGAIN;
+        }
+
+        spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+
+        list_for_each_safe(lptr, nptr, &priv->bss_list) {
+                curr_bss = list_entry(lptr, struct bss_info, list);
+
+                iwe->cmd = SIOCGIWAP;
+                iwe->u.ap_addr.sa_family = ARPHRD_ETHER;
+                memcpy(iwe->u.ap_addr.sa_data, curr_bss->bssid, 6);
+                curr_pos = iwe_stream_add_event(info, curr_pos,
+                                                extra + IW_SCAN_MAX_DATA, iwe,
+                                                IW_EV_ADDR_LEN);
+
+                iwe->u.data.length = curr_bss->ssid_len;
+                iwe->cmd = SIOCGIWESSID;
+                iwe->u.data.flags = 1;
+
+                curr_pos = iwe_stream_add_point(info, curr_pos,
+                                                extra + IW_SCAN_MAX_DATA, iwe,
+                                                curr_bss->ssid);
+
+                iwe->cmd = SIOCGIWMODE;
+                iwe->u.mode = (curr_bss->capa & WLAN_CAPABILITY_IBSS) ?
+                    IW_MODE_ADHOC :
+                    (curr_bss->capa & WLAN_CAPABILITY_ESS) ?
+                    IW_MODE_MASTER : IW_MODE_AUTO;
+                /* IW_MODE_AUTO = 0 which I thought is
+                 * the most logical value to return in this case */
+                curr_pos = iwe_stream_add_event(info, curr_pos,
+                                                extra + IW_SCAN_MAX_DATA, iwe,
+                                                IW_EV_UINT_LEN);
+
+                iwe->cmd = SIOCGIWFREQ;
+                iwe->u.freq.m = curr_bss->channel;
+                iwe->u.freq.e = 0;
+                curr_pos = iwe_stream_add_event(info, curr_pos,
+                                                extra + IW_SCAN_MAX_DATA, iwe,
+                                                IW_EV_FREQ_LEN);
+
+                iwe->cmd = SIOCGIWENCODE;
+                if (curr_bss->capa & 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;
+                curr_pos = iwe_stream_add_point(info, curr_pos,
+                                                extra + IW_SCAN_MAX_DATA, iwe,
+                                                NULL);
+
+                /* Add quality statistics */
+                iwe->cmd = IWEVQUAL;
+                iwe->u.qual.noise = 0;
+                iwe->u.qual.updated =
+                    IW_QUAL_NOISE_INVALID | IW_QUAL_LEVEL_UPDATED;
+                iwe->u.qual.level = (curr_bss->rssi * 100 / 42);
+                if (iwe->u.qual.level > 100)
+                        iwe->u.qual.level = 100;
+                if (at76_is_intersil(priv->board_type))
+                        iwe->u.qual.qual = curr_bss->link_qual;
+                else {
+                        iwe->u.qual.qual = 0;
+                        iwe->u.qual.updated |= IW_QUAL_QUAL_INVALID;
+                }
+                /* Add new value to event */
+                curr_pos = iwe_stream_add_event(info, curr_pos,
+                                                extra + IW_SCAN_MAX_DATA, iwe,
+                                                IW_EV_QUAL_LEN);
+
+                /* Rate: stuffing multiple values in a single event requires
+                 * a bit more of magic - Jean II */
+                curr_val = curr_pos + IW_EV_LCP_LEN;
+
+                iwe->cmd = SIOCGIWRATE;
+                /* Those two flags are ignored... */
+                iwe->u.bitrate.fixed = 0;
+                iwe->u.bitrate.disabled = 0;
+                /* Max 8 values */
+                for (i = 0; i < curr_bss->rates_len; i++) {
+                        /* Bit rate given in 500 kb/s units (+ 0x80) */
+                        iwe->u.bitrate.value =
+                            ((curr_bss->rates[i] & 0x7f) * 500000);
+                        /* Add new value to event */
+                        curr_val = iwe_stream_add_value(info, curr_pos,
+                                                        curr_val,
+                                                        extra +
+                                                        IW_SCAN_MAX_DATA, iwe,
+                                                        IW_EV_PARAM_LEN);
+                }
+
+                /* Check if we added any event */
+                if ((curr_val - curr_pos) > IW_EV_LCP_LEN)
+                        curr_pos = curr_val;
+
+                /* more information may be sent back using IWECUSTOM */
+
+        }
+
+        spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
+
+        data->length = (curr_pos - extra);
+        data->flags = 0;
+
+        kfree(iwe);
+        return 0;
+}
+
+static int at76_iw_handler_set_essid(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_point *data, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWESSID - %s", netdev->name, extra);
+
+        if (data->flags) {
+                memcpy(priv->essid, extra, data->length);
+                priv->essid_size = data->length;
+        } else
+                priv->essid_size = 0;   /* Use any SSID */
+
+        return -EIWCOMMIT;
+}
+
+static int at76_iw_handler_get_essid(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_point *data, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        if (priv->essid_size) {
+                /* not the ANY ssid in priv->essid */
+                data->flags = 1;
+                data->length = priv->essid_size;
+                memcpy(extra, priv->essid, data->length);
+        } else {
+                /* the ANY ssid was specified */
+                if (priv->mac_state == MAC_CONNECTED && priv->curr_bss) {
+                        /* report the SSID we have found */
+                        data->flags = 1;
+                        data->length = priv->curr_bss->ssid_len;
+                        memcpy(extra, priv->curr_bss->ssid, data->length);
+                } else {
+                        /* report ANY back */
+                        data->flags = 0;
+                        data->length = 0;
+                }
+        }
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWESSID - %.*s", netdev->name,
+                 data->length, extra);
+
+        return 0;
+}
+
+static int at76_iw_handler_set_rate(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    struct iw_param *bitrate, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = -EIWCOMMIT;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWRATE - %d", netdev->name,
+                 bitrate->value);
+
+        switch (bitrate->value) {
+        case -1:
+                priv->txrate = TX_RATE_AUTO;
+                break;          /* auto rate */
+        case 1000000:
+                priv->txrate = TX_RATE_1MBIT;
+                break;
+        case 2000000:
+                priv->txrate = TX_RATE_2MBIT;
+                break;
+        case 5500000:
+                priv->txrate = TX_RATE_5_5MBIT;
+                break;
+        case 11000000:
+                priv->txrate = TX_RATE_11MBIT;
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static int at76_iw_handler_get_rate(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    struct iw_param *bitrate, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = 0;
+
+        switch (priv->txrate) {
+                /* return max rate if RATE_AUTO */
+        case TX_RATE_AUTO:
+                bitrate->value = 11000000;
+                break;
+        case TX_RATE_1MBIT:
+                bitrate->value = 1000000;
+                break;
+        case TX_RATE_2MBIT:
+                bitrate->value = 2000000;
+                break;
+        case TX_RATE_5_5MBIT:
+                bitrate->value = 5500000;
+                break;
+        case TX_RATE_11MBIT:
+                bitrate->value = 11000000;
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        bitrate->fixed = (priv->txrate != TX_RATE_AUTO);
+        bitrate->disabled = 0;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWRATE - %d", netdev->name,
+                 bitrate->value);
+
+        return ret;
+}
+
+static int at76_iw_handler_set_rts(struct net_device *netdev,
+                                   struct iw_request_info *info,
+                                   struct iw_param *rts, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = -EIWCOMMIT;
+        int rthr = rts->value;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWRTS - value %d disabled %s",
+                 netdev->name, rts->value, (rts->disabled) ? "true" : "false");
+
+        if (rts->disabled)
+                rthr = MAX_RTS_THRESHOLD;
+
+        if ((rthr < 0) || (rthr > MAX_RTS_THRESHOLD))
+                ret = -EINVAL;
+        else
+                priv->rts_threshold = rthr;
+
+        return ret;
+}
+
+static int at76_iw_handler_get_rts(struct net_device *netdev,
+                                   struct iw_request_info *info,
+                                   struct iw_param *rts, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        rts->value = priv->rts_threshold;
+        rts->disabled = (rts->value >= MAX_RTS_THRESHOLD);
+        rts->fixed = 1;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWRTS - value %d disabled %s",
+                 netdev->name, rts->value, (rts->disabled) ? "true" : "false");
+
+        return 0;
+}
+
+static int at76_iw_handler_set_frag(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    struct iw_param *frag, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = -EIWCOMMIT;
+        int fthr = frag->value;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWFRAG - value %d, disabled %s",
+                 netdev->name, frag->value,
+                 (frag->disabled) ? "true" : "false");
+
+        if (frag->disabled)
+                fthr = MAX_FRAG_THRESHOLD;
+
+        if ((fthr < MIN_FRAG_THRESHOLD) || (fthr > MAX_FRAG_THRESHOLD))
+                ret = -EINVAL;
+        else
+                priv->frag_threshold = fthr & ~0x1;     /* get an even value */
+
+        return ret;
+}
+
+static int at76_iw_handler_get_frag(struct net_device *netdev,
+                                    struct iw_request_info *info,
+                                    struct iw_param *frag, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        frag->value = priv->frag_threshold;
+        frag->disabled = (frag->value >= MAX_FRAG_THRESHOLD);
+        frag->fixed = 1;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWFRAG - value %d, disabled %s",
+                 netdev->name, frag->value,
+                 (frag->disabled) ? "true" : "false");
+
+        return 0;
+}
+
+static int at76_iw_handler_get_txpow(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_param *power, char *extra)
+{
+        power->value = 15;
+        power->fixed = 1;       /* No power control */
+        power->disabled = 0;
+        power->flags = IW_TXPOW_DBM;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWTXPOW - txpow %d dBm", netdev->name,
+                 power->value);
+
+        return 0;
+}
+
+/* jal: short retry is handled by the firmware (at least 0.90.x),
+   while long retry is not (?) */
+static int at76_iw_handler_set_retry(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_param *retry, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = -EIWCOMMIT;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWRETRY disabled %d flags 0x%x val %d",
+                 netdev->name, retry->disabled, retry->flags, retry->value);
+
+        if (!retry->disabled && (retry->flags & IW_RETRY_LIMIT)) {
+                if ((retry->flags & IW_RETRY_MIN) ||
+                    !(retry->flags & IW_RETRY_MAX))
+                        priv->short_retry_limit = retry->value;
+                else
+                        ret = -EINVAL;
+        } else
+                ret = -EINVAL;
+
+        return ret;
+}
+
+/* Adapted (ripped) from atmel.c */
+static int at76_iw_handler_get_retry(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_param *retry, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWRETRY", netdev->name);
+
+        retry->disabled = 0;    /* Can't be disabled */
+        retry->flags = IW_RETRY_LIMIT;
+        retry->value = priv->short_retry_limit;
+
+        return 0;
+}
+
+static int at76_iw_handler_set_encode(struct net_device *netdev,
+                                      struct iw_request_info *info,
+                                      struct iw_point *encoding, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int index = (encoding->flags & IW_ENCODE_INDEX) - 1;
+        int len = encoding->length;
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - enc.flags %08x "
+                 "pointer %p len %d", netdev->name, encoding->flags,
+                 encoding->pointer, encoding->length);
+        at76_dbg(DBG_IOCTL,
+                 "%s: SIOCSIWENCODE - old wepstate: enabled %s key_id %d "
+                 "auth_mode %s", netdev->name,
+                 (priv->wep_enabled) ? "true" : "false", priv->wep_key_id,
+                 (priv->auth_mode ==
+                  WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
+
+        /* take the old default key if index is invalid */
+        if ((index < 0) || (index >= WEP_KEYS))
+                index = priv->wep_key_id;
+
+        if (len > 0) {
+                if (len > WEP_LARGE_KEY_LEN)
+                        len = WEP_LARGE_KEY_LEN;
+
+                memset(priv->wep_keys[index], 0, WEP_KEY_LEN);
+                memcpy(priv->wep_keys[index], extra, len);
+                priv->wep_keys_len[index] = (len <= WEP_SMALL_KEY_LEN) ?
+                    WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;
+                priv->wep_enabled = 1;
+        }
+
+        priv->wep_key_id = index;
+        priv->wep_enabled = ((encoding->flags & IW_ENCODE_DISABLED) == 0);
+
+        if (encoding->flags & IW_ENCODE_RESTRICTED)
+                priv->auth_mode = WLAN_AUTH_SHARED_KEY;
+        if (encoding->flags & IW_ENCODE_OPEN)
+                priv->auth_mode = WLAN_AUTH_OPEN;
+
+        at76_dbg(DBG_IOCTL,
+                 "%s: SIOCSIWENCODE - new wepstate: enabled %s key_id %d "
+                 "key_len %d auth_mode %s", netdev->name,
+                 (priv->wep_enabled) ? "true" : "false", priv->wep_key_id + 1,
+                 priv->wep_keys_len[priv->wep_key_id],
+                 (priv->auth_mode ==
+                  WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
+
+        return -EIWCOMMIT;
+}
+
+static int at76_iw_handler_get_encode(struct net_device *netdev,
+                                      struct iw_request_info *info,
+                                      struct iw_point *encoding, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int index = (encoding->flags & IW_ENCODE_INDEX) - 1;
+
+        if ((index < 0) || (index >= WEP_KEYS))
+                index = priv->wep_key_id;
+
+        encoding->flags =
+            (priv->auth_mode == WLAN_AUTH_SHARED_KEY) ?
+            IW_ENCODE_RESTRICTED : IW_ENCODE_OPEN;
+
+        if (!priv->wep_enabled)
+                encoding->flags |= IW_ENCODE_DISABLED;
+
+        if (encoding->pointer) {
+                encoding->length = priv->wep_keys_len[index];
+
+                memcpy(extra, priv->wep_keys[index], priv->wep_keys_len[index]);
+
+                encoding->flags |= (index + 1);
+        }
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWENCODE - enc.flags %08x "
+                 "pointer %p len %d", netdev->name, encoding->flags,
+                 encoding->pointer, encoding->length);
+        at76_dbg(DBG_IOCTL,
+                 "%s: SIOCGIWENCODE - wepstate: enabled %s key_id %d "
+                 "key_len %d auth_mode %s", netdev->name,
+                 (priv->wep_enabled) ? "true" : "false", priv->wep_key_id + 1,
+                 priv->wep_keys_len[priv->wep_key_id],
+                 (priv->auth_mode ==
+                  WLAN_AUTH_SHARED_KEY) ? "restricted" : "open");
+
+        return 0;
+}
+
+static int at76_iw_handler_set_power(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_param *prq, char *extra)
+{
+        int err = -EIWCOMMIT;
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_IOCTL,
+                 "%s: SIOCSIWPOWER - disabled %s flags 0x%x value 0x%x",
+                 netdev->name, (prq->disabled) ? "true" : "false", prq->flags,
+                 prq->value);
+
+        if (prq->disabled)
+                priv->pm_mode = AT76_PM_OFF;
+        else {
+                switch (prq->flags & IW_POWER_MODE) {
+                case IW_POWER_ALL_R:
+                case IW_POWER_ON:
+                        break;
+                default:
+                        err = -EINVAL;
+                        goto exit;
+                }
+                if (prq->flags & IW_POWER_PERIOD)
+                        priv->pm_period = prq->value;
+
+                if (prq->flags & IW_POWER_TIMEOUT) {
+                        err = -EINVAL;
+                        goto exit;
+                }
+                priv->pm_mode = AT76_PM_ON;
+        }
+exit:
+        return err;
+}
+
+static int at76_iw_handler_get_power(struct net_device *netdev,
+                                     struct iw_request_info *info,
+                                     struct iw_param *power, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        power->disabled = (priv->pm_mode == AT76_PM_OFF);
+        if (!power->disabled) {
+                power->flags = IW_POWER_PERIOD | IW_POWER_ALL_R;
+                power->value = priv->pm_period;
+        }
+
+        at76_dbg(DBG_IOCTL, "%s: SIOCGIWPOWER - %s flags 0x%x value 0x%x",
+                 netdev->name, power->disabled ? "disabled" : "enabled",
+                 power->flags, power->value);
+
+        return 0;
+}
+
+/*******************************************************************************
+ * Private IOCTLS
+ */
+static int at76_iw_set_short_preamble(struct net_device *netdev,
+                                      struct iw_request_info *info, char *name,
+                                      char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int val = *((int *)name);
+        int ret = -EIWCOMMIT;
+
+        at76_dbg(DBG_IOCTL, "%s: AT76_SET_SHORT_PREAMBLE, %d",
+                 netdev->name, val);
+
+        if (val < PREAMBLE_TYPE_LONG || val > PREAMBLE_TYPE_AUTO)
+                ret = -EINVAL;
+        else
+                priv->preamble_type = val;
+
+        return ret;
+}
+
+static int at76_iw_get_short_preamble(struct net_device *netdev,
+                                      struct iw_request_info *info,
+                                      union iwreq_data *wrqu, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        snprintf(wrqu->name, sizeof(wrqu->name), "%s (%d)",
+                 preambles[priv->preamble_type], priv->preamble_type);
+        return 0;
+}
+
+static int at76_iw_set_debug(struct net_device *netdev,
+                             struct iw_request_info *info,
+                             struct iw_point *data, char *extra)
+{
+        char *ptr;
+        u32 val;
+
+        if (data->length > 0) {
+                val = simple_strtol(extra, &ptr, 0);
+
+                if (ptr == extra)
+                        val = DBG_DEFAULTS;
+
+                at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG input %d: %s -> 0x%x",
+                         netdev->name, data->length, extra, val);
+        } else
+                val = DBG_DEFAULTS;
+
+        at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG, old 0x%x, new 0x%x",
+                 netdev->name, at76_debug, val);
+
+        /* jal: some more output to pin down lockups */
+        at76_dbg(DBG_IOCTL, "%s: netif running %d queue_stopped %d "
+                 "carrier_ok %d", netdev->name, netif_running(netdev),
+                 netif_queue_stopped(netdev), netif_carrier_ok(netdev));
+
+        at76_debug = val;
+
+        return 0;
+}
+
+static int at76_iw_get_debug(struct net_device *netdev,
+                             struct iw_request_info *info,
+                             union iwreq_data *wrqu, char *extra)
+{
+        snprintf(wrqu->name, sizeof(wrqu->name), "0x%08x", at76_debug);
+        return 0;
+}
+
+static int at76_iw_set_powersave_mode(struct net_device *netdev,
+                                      struct iw_request_info *info, char *name,
+                                      char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int val = *((int *)name);
+        int ret = -EIWCOMMIT;
+
+        at76_dbg(DBG_IOCTL, "%s: AT76_SET_POWERSAVE_MODE, %d (%s)",
+                 netdev->name, val,
+                 val == AT76_PM_OFF ? "active" : val == AT76_PM_ON ? "save" :
+                 val == AT76_PM_SMART ? "smart save" : "<invalid>");
+        if (val < AT76_PM_OFF || val > AT76_PM_SMART)
+                ret = -EINVAL;
+        else
+                priv->pm_mode = val;
+
+        return ret;
+}
+
+static int at76_iw_get_powersave_mode(struct net_device *netdev,
+                                      struct iw_request_info *info,
+                                      union iwreq_data *wrqu, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int *param = (int *)extra;
+
+        param[0] = priv->pm_mode;
+        return 0;
+}
+
+static int at76_iw_set_scan_times(struct net_device *netdev,
+                                  struct iw_request_info *info, char *name,
+                                  char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int mint = *((int *)name);
+        int maxt = *((int *)name + 1);
+        int ret = -EIWCOMMIT;
+
+        at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_TIMES - min %d max %d",
+                 netdev->name, mint, maxt);
+        if (mint <= 0 || maxt <= 0 || mint > maxt)
+                ret = -EINVAL;
+        else {
+                priv->scan_min_time = mint;
+                priv->scan_max_time = maxt;
+        }
+
+        return ret;
+}
+
+static int at76_iw_get_scan_times(struct net_device *netdev,
+                                  struct iw_request_info *info,
+                                  union iwreq_data *wrqu, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int *param = (int *)extra;
+
+        param[0] = priv->scan_min_time;
+        param[1] = priv->scan_max_time;
+        return 0;
+}
+
+static int at76_iw_set_scan_mode(struct net_device *netdev,
+                                 struct iw_request_info *info, char *name,
+                                 char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int val = *((int *)name);
+        int ret = -EIWCOMMIT;
+
+        at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_MODE - mode %s",
+                 netdev->name, (val = SCAN_TYPE_ACTIVE) ? "active" :
+                 (val = SCAN_TYPE_PASSIVE) ? "passive" : "<invalid>");
+
+        if (val != SCAN_TYPE_ACTIVE && val != SCAN_TYPE_PASSIVE)
+                ret = -EINVAL;
+        else
+                priv->scan_mode = val;
+
+        return ret;
+}
+
+static int at76_iw_get_scan_mode(struct net_device *netdev,
+                                 struct iw_request_info *info,
+                                 union iwreq_data *wrqu, char *extra)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int *param = (int *)extra;
+
+        param[0] = priv->scan_mode;
+        return 0;
+}
+
+#define AT76_SET_HANDLER(h, f) [h - SIOCIWFIRST] = (iw_handler) f
+
+/* Standard wireless handlers */
+static const iw_handler at76_handlers[] = {
+        AT76_SET_HANDLER(SIOCSIWCOMMIT, at76_iw_handler_commit),
+        AT76_SET_HANDLER(SIOCGIWNAME, at76_iw_handler_get_name),
+        AT76_SET_HANDLER(SIOCSIWFREQ, at76_iw_handler_set_freq),
+        AT76_SET_HANDLER(SIOCGIWFREQ, at76_iw_handler_get_freq),
+        AT76_SET_HANDLER(SIOCSIWMODE, at76_iw_handler_set_mode),
+        AT76_SET_HANDLER(SIOCGIWMODE, at76_iw_handler_get_mode),
+        AT76_SET_HANDLER(SIOCGIWRANGE, at76_iw_handler_get_range),
+        AT76_SET_HANDLER(SIOCSIWSPY, at76_iw_handler_set_spy),
+        AT76_SET_HANDLER(SIOCGIWSPY, at76_iw_handler_get_spy),
+        AT76_SET_HANDLER(SIOCSIWTHRSPY, at76_iw_handler_set_thrspy),
+        AT76_SET_HANDLER(SIOCGIWTHRSPY, at76_iw_handler_get_thrspy),
+        AT76_SET_HANDLER(SIOCSIWAP, at76_iw_handler_set_wap),
+        AT76_SET_HANDLER(SIOCGIWAP, at76_iw_handler_get_wap),
+        AT76_SET_HANDLER(SIOCSIWSCAN, at76_iw_handler_set_scan),
+        AT76_SET_HANDLER(SIOCGIWSCAN, at76_iw_handler_get_scan),
+        AT76_SET_HANDLER(SIOCSIWESSID, at76_iw_handler_set_essid),
+        AT76_SET_HANDLER(SIOCGIWESSID, at76_iw_handler_get_essid),
+        AT76_SET_HANDLER(SIOCSIWRATE, at76_iw_handler_set_rate),
+        AT76_SET_HANDLER(SIOCGIWRATE, at76_iw_handler_get_rate),
+        AT76_SET_HANDLER(SIOCSIWRTS, at76_iw_handler_set_rts),
+        AT76_SET_HANDLER(SIOCGIWRTS, at76_iw_handler_get_rts),
+        AT76_SET_HANDLER(SIOCSIWFRAG, at76_iw_handler_set_frag),
+        AT76_SET_HANDLER(SIOCGIWFRAG, at76_iw_handler_get_frag),
+        AT76_SET_HANDLER(SIOCGIWTXPOW, at76_iw_handler_get_txpow),
+        AT76_SET_HANDLER(SIOCSIWRETRY, at76_iw_handler_set_retry),
+        AT76_SET_HANDLER(SIOCGIWRETRY, at76_iw_handler_get_retry),
+        AT76_SET_HANDLER(SIOCSIWENCODE, at76_iw_handler_set_encode),
+        AT76_SET_HANDLER(SIOCGIWENCODE, at76_iw_handler_get_encode),
+        AT76_SET_HANDLER(SIOCSIWPOWER, at76_iw_handler_set_power),
+        AT76_SET_HANDLER(SIOCGIWPOWER, at76_iw_handler_get_power)
+};
+
+#define AT76_SET_PRIV(h, f) [h - SIOCIWFIRSTPRIV] = (iw_handler) f
+
+/* Private wireless handlers */
+static const iw_handler at76_priv_handlers[] = {
+        AT76_SET_PRIV(AT76_SET_SHORT_PREAMBLE, at76_iw_set_short_preamble),
+        AT76_SET_PRIV(AT76_GET_SHORT_PREAMBLE, at76_iw_get_short_preamble),
+        AT76_SET_PRIV(AT76_SET_DEBUG, at76_iw_set_debug),
+        AT76_SET_PRIV(AT76_GET_DEBUG, at76_iw_get_debug),
+        AT76_SET_PRIV(AT76_SET_POWERSAVE_MODE, at76_iw_set_powersave_mode),
+        AT76_SET_PRIV(AT76_GET_POWERSAVE_MODE, at76_iw_get_powersave_mode),
+        AT76_SET_PRIV(AT76_SET_SCAN_TIMES, at76_iw_set_scan_times),
+        AT76_SET_PRIV(AT76_GET_SCAN_TIMES, at76_iw_get_scan_times),
+        AT76_SET_PRIV(AT76_SET_SCAN_MODE, at76_iw_set_scan_mode),
+        AT76_SET_PRIV(AT76_GET_SCAN_MODE, at76_iw_get_scan_mode),
+};
+
+/* Names and arguments of private wireless handlers */
+static const struct iw_priv_args at76_priv_args[] = {
+        /* 0 - long, 1 - short */
+        {AT76_SET_SHORT_PREAMBLE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"},
+
+        {AT76_GET_SHORT_PREAMBLE,
+         0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_preamble"},
+
+        /* we must pass the new debug mask as a string, because iwpriv cannot
+         * parse hex numbers starting with 0x :-(  */
+        {AT76_SET_DEBUG,
+         IW_PRIV_TYPE_CHAR | 10, 0, "set_debug"},
+
+        {AT76_GET_DEBUG,
+         0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_debug"},
+
+        /* 1 - active, 2 - power save, 3 - smart power save */
+        {AT76_SET_POWERSAVE_MODE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_powersave"},
+
+        {AT76_GET_POWERSAVE_MODE,
+         0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_powersave"},
+
+        /* min_channel_time, max_channel_time */
+        {AT76_SET_SCAN_TIMES,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "set_scan_times"},
+
+        {AT76_GET_SCAN_TIMES,
+         0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, "get_scan_times"},
+
+        /* 0 - active, 1 - passive scan */
+        {AT76_SET_SCAN_MODE,
+         IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_scan_mode"},
+
+        {AT76_GET_SCAN_MODE,
+         0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_scan_mode"},
+};
+
+static const struct iw_handler_def at76_handler_def = {
+        .num_standard = ARRAY_SIZE(at76_handlers),
+        .num_private = ARRAY_SIZE(at76_priv_handlers),
+        .num_private_args = ARRAY_SIZE(at76_priv_args),
+        .standard = at76_handlers,
+        .private = at76_priv_handlers,
+        .private_args = at76_priv_args,
+        .get_wireless_stats = at76_get_wireless_stats,
+};
+
+static const u8 snapsig[] = { 0xaa, 0xaa, 0x03 };
+
+/* RFC 1042 encapsulates Ethernet frames in 802.2 SNAP (0xaa, 0xaa, 0x03) with
+ * a SNAP OID of 0 (0x00, 0x00, 0x00) */
+static const u8 rfc1042sig[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+
+static int at76_tx(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        struct net_device_stats *stats = &priv->stats;
+        int ret = 0;
+        int wlen;
+        int submit_len;
+        struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;
+        struct ieee80211_hdr_3addr *i802_11_hdr =
+            (struct ieee80211_hdr_3addr *)tx_buffer->packet;
+        u8 *payload = i802_11_hdr->payload;
+        struct ethhdr *eh = (struct ethhdr *)skb->data;
+
+        if (netif_queue_stopped(netdev)) {
+                printk(KERN_ERR "%s: %s called while netdev is stopped\n",
+                       netdev->name, __func__);
+                /* skip this packet */
+                dev_kfree_skb(skb);
+                return 0;
+        }
+
+        if (priv->tx_urb->status == -EINPROGRESS) {
+                printk(KERN_ERR "%s: %s called while tx urb is pending\n",
+                       netdev->name, __func__);
+                /* skip this packet */
+                dev_kfree_skb(skb);
+                return 0;
+        }
+
+        if (skb->len < ETH_HLEN) {
+                printk(KERN_ERR "%s: %s: skb too short (%d)\n",
+                       netdev->name, __func__, skb->len);
+                dev_kfree_skb(skb);
+                return 0;
+        }
+
+        at76_ledtrig_tx_activity();     /* tell ledtrigger we send a packet */
+
+        /* we can get rid of memcpy if we set netdev->hard_header_len to
+           reserve enough space, but we would need to keep the skb around */
+
+        if (ntohs(eh->h_proto) <= ETH_DATA_LEN) {
+                /* this is a 802.3 packet */
+                if (skb->len >= ETH_HLEN + sizeof(rfc1042sig)
+                    && skb->data[ETH_HLEN] == rfc1042sig[0]
+                    && skb->data[ETH_HLEN + 1] == rfc1042sig[1]) {
+                        /* higher layer delivered SNAP header - keep it */
+                        memcpy(payload, skb->data + ETH_HLEN,
+                               skb->len - ETH_HLEN);
+                        wlen = IEEE80211_3ADDR_LEN + skb->len - ETH_HLEN;
+                } else {
+                        printk(KERN_ERR "%s: dropping non-SNAP 802.2 packet "
+                               "(DSAP 0x%02x SSAP 0x%02x cntrl 0x%02x)\n",
+                               priv->netdev->name, skb->data[ETH_HLEN],
+                               skb->data[ETH_HLEN + 1],
+                               skb->data[ETH_HLEN + 2]);
+                        dev_kfree_skb(skb);
+                        return 0;
+                }
+        } else {
+                /* add RFC 1042 header in front */
+                memcpy(payload, rfc1042sig, sizeof(rfc1042sig));
+                memcpy(payload + sizeof(rfc1042sig), &eh->h_proto,
+                       skb->len - offsetof(struct ethhdr, h_proto));
+                wlen = IEEE80211_3ADDR_LEN + sizeof(rfc1042sig) + skb->len -
+                    offsetof(struct ethhdr, h_proto);
+        }
+
+        /* make wireless header */
+        i802_11_hdr->frame_ctl =
+            cpu_to_le16(IEEE80211_FTYPE_DATA |
+                        (priv->wep_enabled ? IEEE80211_FCTL_PROTECTED : 0) |
+                        (priv->iw_mode ==
+                         IW_MODE_INFRA ? IEEE80211_FCTL_TODS : 0));
+
+        if (priv->iw_mode == IW_MODE_ADHOC) {
+                memcpy(i802_11_hdr->addr1, eh->h_dest, ETH_ALEN);
+                memcpy(i802_11_hdr->addr2, eh->h_source, ETH_ALEN);
+                memcpy(i802_11_hdr->addr3, priv->bssid, ETH_ALEN);
+        } else if (priv->iw_mode == IW_MODE_INFRA) {
+                memcpy(i802_11_hdr->addr1, priv->bssid, ETH_ALEN);
+                memcpy(i802_11_hdr->addr2, eh->h_source, ETH_ALEN);
+                memcpy(i802_11_hdr->addr3, eh->h_dest, ETH_ALEN);
+        }
+
+        i802_11_hdr->duration_id = cpu_to_le16(0);
+        i802_11_hdr->seq_ctl = cpu_to_le16(0);
+
+        /* setup 'Atmel' header */
+        tx_buffer->wlength = cpu_to_le16(wlen);
+        tx_buffer->tx_rate = priv->txrate;
+        /* for broadcast destination addresses, the firmware 0.100.x
+           seems to choose the highest rate set with CMD_STARTUP in
+           basic_rate_set replacing this value */
+
+        memset(tx_buffer->reserved, 0, sizeof(tx_buffer->reserved));
+
+        tx_buffer->padding = at76_calc_padding(wlen);
+        submit_len = wlen + AT76_TX_HDRLEN + tx_buffer->padding;
+
+        at76_dbg(DBG_TX_DATA_CONTENT, "%s skb->data %s", priv->netdev->name,
+                 hex2str(skb->data, 32));
+        at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr %s",
+                 priv->netdev->name,
+                 le16_to_cpu(tx_buffer->wlength),
+                 tx_buffer->padding, tx_buffer->tx_rate,
+                 hex2str(i802_11_hdr, sizeof(*i802_11_hdr)));
+        at76_dbg(DBG_TX_DATA_CONTENT, "%s payload %s", priv->netdev->name,
+                 hex2str(payload, 48));
+
+        /* send stuff */
+        netif_stop_queue(netdev);
+        netdev->trans_start = jiffies;
+
+        usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, tx_buffer,
+                          submit_len, at76_tx_callback, priv);
+        ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
+        if (ret) {
+                stats->tx_errors++;
+                printk(KERN_ERR "%s: error in tx submit urb: %d\n",
+                       netdev->name, ret);
+                if (ret == -EINVAL)
+                        printk(KERN_ERR
+                               "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
+                               priv->netdev->name, priv->tx_urb,
+                               priv->tx_urb->hcpriv, priv->tx_urb->complete);
+        } else {
+                stats->tx_bytes += skb->len;
+                dev_kfree_skb(skb);
+        }
+
+        return ret;
+}
+
+static void at76_tx_timeout(struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        if (!priv)
+                return;
+        dev_warn(&netdev->dev, "tx timeout.");
+
+        usb_unlink_urb(priv->tx_urb);
+        priv->stats.tx_errors++;
+}
+
 static int at76_submit_rx_urb(struct at76_priv *priv)
 {
         int ret;
@@ -1327,7 +3270,7 @@ static int at76_submit_rx_urb(struct at76_priv *priv)
 
         if (!priv->rx_urb) {
                 printk(KERN_ERR "%s: %s: priv->rx_urb is NULL\n",
-                       wiphy_name(priv->hw->wiphy), __func__);
+                       priv->netdev->name, __func__);
                 return -EFAULT;
         }
 
@@ -1335,7 +3278,7 @@ static int at76_submit_rx_urb(struct at76_priv *priv)
                 skb = dev_alloc_skb(sizeof(struct at76_rx_buffer));
                 if (!skb) {
                         printk(KERN_ERR "%s: cannot allocate rx skbuff\n",
-                               wiphy_name(priv->hw->wiphy));
+                               priv->netdev->name);
                         ret = -ENOMEM;
                         goto exit;
                 }
@@ -1355,18 +3298,110 @@ static int at76_submit_rx_urb(struct at76_priv *priv)
                                  "usb_submit_urb returned -ENODEV");
                 else
                         printk(KERN_ERR "%s: rx, usb_submit_urb failed: %d\n",
-                               wiphy_name(priv->hw->wiphy), ret);
+                               priv->netdev->name, ret);
         }
 
 exit:
         if (ret < 0 && ret != -ENODEV)
                 printk(KERN_ERR "%s: cannot submit rx urb - please unload the "
                        "driver and/or power cycle the device\n",
-                       wiphy_name(priv->hw->wiphy));
+                       priv->netdev->name);
 
         return ret;
 }
 
+static int at76_open(struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        int ret = 0;
+
+        at76_dbg(DBG_PROC_ENTRY, "%s(): entry", __func__);
+
+        if (mutex_lock_interruptible(&priv->mtx))
+                return -EINTR;
+
+        /* if netdev->dev_addr != priv->mac_addr we must
+           set the mac address in the device ! */
+        if (compare_ether_addr(netdev->dev_addr, priv->mac_addr)) {
+                if (at76_add_mac_address(priv, netdev->dev_addr) >= 0)
+                        at76_dbg(DBG_PROGRESS, "%s: set new MAC addr %s",
+                                 netdev->name, mac2str(netdev->dev_addr));
+        }
+
+        priv->scan_state = SCAN_IDLE;
+        priv->last_scan = jiffies;
+
+        ret = at76_submit_rx_urb(priv);
+        if (ret < 0) {
+                printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n",
+                       netdev->name, ret);
+                goto error;
+        }
+
+        schedule_delayed_work(&priv->dwork_restart, 0);
+
+        at76_dbg(DBG_PROC_ENTRY, "%s(): end", __func__);
+error:
+        mutex_unlock(&priv->mtx);
+        return ret < 0 ? ret : 0;
+}
+
+static int at76_stop(struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        at76_dbg(DBG_DEVSTART, "%s: ENTER", __func__);
+
+        if (mutex_lock_interruptible(&priv->mtx))
+                return -EINTR;
+
+        at76_quiesce(priv);
+
+        if (!priv->device_unplugged) {
+                /* We are called by "ifconfig ethX down", not because the
+                 * device is not available anymore. */
+                at76_set_radio(priv, 0);
+
+                /* We unlink rx_urb because at76_open() re-submits it.
+                 * If unplugged, at76_delete_device() takes care of it. */
+                usb_kill_urb(priv->rx_urb);
+        }
+
+        /* free the bss_list */
+        at76_free_bss_list(priv);
+
+        mutex_unlock(&priv->mtx);
+        at76_dbg(DBG_DEVSTART, "%s: EXIT", __func__);
+
+        return 0;
+}
+
+static void at76_ethtool_get_drvinfo(struct net_device *netdev,
+                                     struct ethtool_drvinfo *info)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+
+        strncpy(info->driver, DRIVER_NAME, sizeof(info->driver));
+        strncpy(info->version, DRIVER_VERSION, sizeof(info->version));
+
+        usb_make_path(priv->udev, info->bus_info, sizeof(info->bus_info));
+
+        snprintf(info->fw_version, sizeof(info->fw_version), "%d.%d.%d-%d",
+                 priv->fw_version.major, priv->fw_version.minor,
+                 priv->fw_version.patch, priv->fw_version.build);
+}
+
+static u32 at76_ethtool_get_link(struct net_device *netdev)
+{
+        struct at76_priv *priv = netdev_priv(netdev);
+        return priv->mac_state == MAC_CONNECTED;
+}
+
+static struct ethtool_ops at76_ethtool_ops = {
+        .get_drvinfo = at76_ethtool_get_drvinfo,
+        .get_link = at76_ethtool_get_link,
+};
+
 /* Download external firmware */
 static int at76_load_external_fw(struct usb_device *udev, struct fwentry *fwe)
 {
@@ -1463,6 +3498,406 @@ exit:
         return ret;
 }
 
+static int at76_match_essid(struct at76_priv *priv, struct bss_info *ptr)
+{
+        /* common criteria for both modi */
+
+        int ret = (priv->essid_size == 0 /* ANY ssid */  ||
+                   (priv->essid_size == ptr->ssid_len &&
+                    !memcmp(priv->essid, ptr->ssid, ptr->ssid_len)));
+        if (!ret)
+                at76_dbg(DBG_BSS_MATCH,
+                         "%s bss table entry %p: essid didn't match",
+                         priv->netdev->name, ptr);
+        return ret;
+}
+
+static inline int at76_match_mode(struct at76_priv *priv, struct bss_info *ptr)
+{
+        int ret;
+
+        if (priv->iw_mode == IW_MODE_ADHOC)
+                ret = ptr->capa & WLAN_CAPABILITY_IBSS;
+        else
+                ret = ptr->capa & WLAN_CAPABILITY_ESS;
+        if (!ret)
+                at76_dbg(DBG_BSS_MATCH,
+                         "%s bss table entry %p: mode didn't match",
+                         priv->netdev->name, ptr);
+        return ret;
+}
+
+static int at76_match_rates(struct at76_priv *priv, struct bss_info *ptr)
+{
+        int i;
+
+        for (i = 0; i < ptr->rates_len; i++) {
+                u8 rate = ptr->rates[i];
+
+                if (!(rate & 0x80))
+                        continue;
+
+                /* this is a basic rate we have to support
+                   (see IEEE802.11, ch. 7.3.2.2) */
+                if (rate != (0x80 | hw_rates[0])
+                    && rate != (0x80 | hw_rates[1])
+                    && rate != (0x80 | hw_rates[2])
+                    && rate != (0x80 | hw_rates[3])) {
+                        at76_dbg(DBG_BSS_MATCH,
+                                 "%s: bss table entry %p: basic rate %02x not "
+                                 "supported", priv->netdev->name, ptr, rate);
+                        return 0;
+                }
+        }
+
+        /* if we use short preamble, the bss must support it */
+        if (priv->preamble_type == PREAMBLE_TYPE_SHORT &&
+            !(ptr->capa & WLAN_CAPABILITY_SHORT_PREAMBLE)) {
+                at76_dbg(DBG_BSS_MATCH,
+                         "%s: %p does not support short preamble",
+                         priv->netdev->name, ptr);
+                return 0;
+        } else
+                return 1;
+}
+
+static inline int at76_match_wep(struct at76_priv *priv, struct bss_info *ptr)
+{
+        if (!priv->wep_enabled && ptr->capa & WLAN_CAPABILITY_PRIVACY) {
+                /* we have disabled WEP, but the BSS signals privacy */
+                at76_dbg(DBG_BSS_MATCH,
+                         "%s: bss table entry %p: requires encryption",
+                         priv->netdev->name, ptr);
+                return 0;
+        }
+        /* otherwise if the BSS does not signal privacy it may well
+           accept encrypted packets from us ... */
+        return 1;
+}
+
+static inline int at76_match_bssid(struct at76_priv *priv, struct bss_info *ptr)
+{
+        if (!priv->wanted_bssid_valid ||
+            !compare_ether_addr(ptr->bssid, priv->wanted_bssid))
+                return 1;
+
+        at76_dbg(DBG_BSS_MATCH,
+                 "%s: requested bssid - %s does not match",
+                 priv->netdev->name, mac2str(priv->wanted_bssid));
+        at76_dbg(DBG_BSS_MATCH,
+                 "      AP bssid - %s of bss table entry %p",
+                 mac2str(ptr->bssid), ptr);
+        return 0;
+}
+
+/**
+ * at76_match_bss - try to find a matching bss in priv->bss
+ *
+ * last - last bss tried
+ *
+ * last == NULL signals a new round starting with priv->bss_list.next
+ * this function must be called inside an acquired priv->bss_list_spinlock
+ * otherwise the timeout on bss may remove the newly chosen entry
+ */
+static struct bss_info *at76_match_bss(struct at76_priv *priv,
+                                       struct bss_info *last)
+{
+        struct bss_info *ptr = NULL;
+        struct list_head *curr;
+
+        curr = last ? last->list.next : priv->bss_list.next;
+        while (curr != &priv->bss_list) {
+                ptr = list_entry(curr, struct bss_info, list);
+                if (at76_match_essid(priv, ptr) && at76_match_mode(priv, ptr)
+                    && at76_match_wep(priv, ptr) && at76_match_rates(priv, ptr)
+                    && at76_match_bssid(priv, ptr))
+                        break;
+                curr = curr->next;
+        }
+
+        if (curr == &priv->bss_list)
+                ptr = NULL;
+        /* otherwise ptr points to the struct bss_info we have chosen */
+
+        at76_dbg(DBG_BSS_TABLE, "%s %s: returned %p", priv->netdev->name,
+                 __func__, ptr);
+        return ptr;
+}
+
+/* Start joining a matching BSS, or create own IBSS */
+static void at76_work_join(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              work_join);
+        int ret;
+        unsigned long flags;
+
+        mutex_lock(&priv->mtx);
+
+        WARN_ON(priv->mac_state != MAC_JOINING);
+        if (priv->mac_state != MAC_JOINING)
+                goto exit;
+
+        /* secure the access to priv->curr_bss ! */
+        spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+        priv->curr_bss = at76_match_bss(priv, priv->curr_bss);
+        spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
+
+        if (!priv->curr_bss) {
+                /* here we haven't found a matching (i)bss ... */
+                if (priv->iw_mode == IW_MODE_ADHOC) {
+                        at76_set_mac_state(priv, MAC_OWN_IBSS);
+                        at76_start_ibss(priv);
+                        goto exit;
+                }
+                /* haven't found a matching BSS in infra mode - try again */
+                at76_set_mac_state(priv, MAC_SCANNING);
+                schedule_work(&priv->work_start_scan);
+                goto exit;
+        }
+
+        ret = at76_join_bss(priv, priv->curr_bss);
+        if (ret < 0) {
+                printk(KERN_ERR "%s: join_bss failed with %d\n",
+                       priv->netdev->name, ret);
+                goto exit;
+        }
+
+        ret = at76_wait_completion(priv, CMD_JOIN);
+        if (ret != CMD_STATUS_COMPLETE) {
+                if (ret != CMD_STATUS_TIME_OUT)
+                        printk(KERN_ERR "%s: join_bss completed with %d\n",
+                               priv->netdev->name, ret);
+                else
+                        printk(KERN_INFO "%s: join_bss ssid %s timed out\n",
+                               priv->netdev->name,
+                               mac2str(priv->curr_bss->bssid));
+
+                /* retry next BSS immediately */
+                schedule_work(&priv->work_join);
+                goto exit;
+        }
+
+        /* here we have joined the (I)BSS */
+        if (priv->iw_mode == IW_MODE_ADHOC) {
+                struct bss_info *bptr = priv->curr_bss;
+                at76_set_mac_state(priv, MAC_CONNECTED);
+                /* get ESSID, BSSID and channel for priv->curr_bss */
+                priv->essid_size = bptr->ssid_len;
+                memcpy(priv->essid, bptr->ssid, bptr->ssid_len);
+                memcpy(priv->bssid, bptr->bssid, ETH_ALEN);
+                priv->channel = bptr->channel;
+                at76_iwevent_bss_connect(priv->netdev, bptr->bssid);
+                netif_carrier_on(priv->netdev);
+                netif_start_queue(priv->netdev);
+                /* just to be sure */
+                cancel_delayed_work(&priv->dwork_get_scan);
+                cancel_delayed_work(&priv->dwork_auth);
+                cancel_delayed_work(&priv->dwork_assoc);
+        } else {
+                /* send auth req */
+                priv->retries = AUTH_RETRIES;
+                at76_set_mac_state(priv, MAC_AUTH);
+                at76_auth_req(priv, priv->curr_bss, 1, NULL);
+                at76_dbg(DBG_MGMT_TIMER,
+                         "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__);
+                schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT);
+        }
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
+/* Reap scan results */
+static void at76_dwork_get_scan(struct work_struct *work)
+{
+        int status;
+        int ret;
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              dwork_get_scan.work);
+
+        mutex_lock(&priv->mtx);
+        WARN_ON(priv->mac_state != MAC_SCANNING);
+        if (priv->mac_state != MAC_SCANNING)
+                goto exit;
+
+        status = at76_get_cmd_status(priv->udev, CMD_SCAN);
+        if (status < 0) {
+                printk(KERN_ERR "%s: %s: at76_get_cmd_status failed with %d\n",
+                       priv->netdev->name, __func__, status);
+                status = CMD_STATUS_IN_PROGRESS;
+                /* INFO: Hope it was a one off error - if not, scanning
+                   further down the line and stop this cycle */
+        }
+        at76_dbg(DBG_PROGRESS,
+                 "%s %s: got cmd_status %d (state %s, need_any %d)",
+                 priv->netdev->name, __func__, status,
+                 mac_states[priv->mac_state], priv->scan_need_any);
+
+        if (status != CMD_STATUS_COMPLETE) {
+                if ((status != CMD_STATUS_IN_PROGRESS) &&
+                    (status != CMD_STATUS_IDLE))
+                        printk(KERN_ERR "%s: %s: Bad scan status: %s\n",
+                               priv->netdev->name, __func__,
+                               at76_get_cmd_status_string(status));
+
+                /* the first cmd status after scan start is always a IDLE ->
+                   start the timer to poll again until COMPLETED */
+                at76_dbg(DBG_MGMT_TIMER,
+                         "%s:%d: starting mgmt_timer for %d ticks",
+                         __func__, __LINE__, SCAN_POLL_INTERVAL);
+                schedule_delayed_work(&priv->dwork_get_scan,
+                                      SCAN_POLL_INTERVAL);
+                goto exit;
+        }
+
+        if (at76_debug & DBG_BSS_TABLE)
+                at76_dump_bss_table(priv);
+
+        if (priv->scan_need_any) {
+                ret = at76_start_scan(priv, 0);
+                if (ret < 0)
+                        printk(KERN_ERR
+                               "%s: %s: start_scan (ANY) failed with %d\n",
+                               priv->netdev->name, __func__, ret);
+                at76_dbg(DBG_MGMT_TIMER,
+                         "%s:%d: starting mgmt_timer for %d ticks", __func__,
+                         __LINE__, SCAN_POLL_INTERVAL);
+                schedule_delayed_work(&priv->dwork_get_scan,
+                                      SCAN_POLL_INTERVAL);
+                priv->scan_need_any = 0;
+        } else {
+                priv->scan_state = SCAN_COMPLETED;
+                /* report the end of scan to user space */
+                at76_iwevent_scan_complete(priv->netdev);
+                at76_set_mac_state(priv, MAC_JOINING);
+                schedule_work(&priv->work_join);
+        }
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
+/* Handle loss of beacons from the AP */
+static void at76_dwork_beacon(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              dwork_beacon.work);
+
+        mutex_lock(&priv->mtx);
+        if (priv->mac_state != MAC_CONNECTED || priv->iw_mode != IW_MODE_INFRA)
+                goto exit;
+
+        /* We haven't received any beacons from out AP for BEACON_TIMEOUT */
+        printk(KERN_INFO "%s: lost beacon bssid %s\n",
+               priv->netdev->name, mac2str(priv->curr_bss->bssid));
+
+        netif_carrier_off(priv->netdev);
+        netif_stop_queue(priv->netdev);
+        at76_iwevent_bss_disconnect(priv->netdev);
+        at76_set_mac_state(priv, MAC_SCANNING);
+        schedule_work(&priv->work_start_scan);
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
+/* Handle authentication response timeout */
+static void at76_dwork_auth(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              dwork_auth.work);
+
+        mutex_lock(&priv->mtx);
+        WARN_ON(priv->mac_state != MAC_AUTH);
+        if (priv->mac_state != MAC_AUTH)
+                goto exit;
+
+        at76_dbg(DBG_PROGRESS, "%s: authentication response timeout",
+                 priv->netdev->name);
+
+        if (priv->retries-- >= 0) {
+                at76_auth_req(priv, priv->curr_bss, 1, NULL);
+                at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
+                         __func__, __LINE__);
+                schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT);
+        } else {
+                /* try to get next matching BSS */
+                at76_set_mac_state(priv, MAC_JOINING);
+                schedule_work(&priv->work_join);
+        }
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
+/* Handle association response timeout */
+static void at76_dwork_assoc(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              dwork_assoc.work);
+
+        mutex_lock(&priv->mtx);
+        WARN_ON(priv->mac_state != MAC_ASSOC);
+        if (priv->mac_state != MAC_ASSOC)
+                goto exit;
+
+        at76_dbg(DBG_PROGRESS, "%s: association response timeout",
+                 priv->netdev->name);
+
+        if (priv->retries-- >= 0) {
+                at76_assoc_req(priv, priv->curr_bss);
+                at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ",
+                         __func__, __LINE__);
+                schedule_delayed_work(&priv->dwork_assoc, ASSOC_TIMEOUT);
+        } else {
+                /* try to get next matching BSS */
+                at76_set_mac_state(priv, MAC_JOINING);
+                schedule_work(&priv->work_join);
+        }
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
+/* Read new bssid in ad-hoc mode */
+static void at76_work_new_bss(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              work_new_bss);
+        int ret;
+        struct mib_mac_mgmt mac_mgmt;
+
+        mutex_lock(&priv->mtx);
+
+        ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, &mac_mgmt,
+                           sizeof(struct mib_mac_mgmt));
+        if (ret < 0) {
+                printk(KERN_ERR "%s: at76_get_mib failed: %d\n",
+                       priv->netdev->name, ret);
+                goto exit;
+        }
+
+        at76_dbg(DBG_PROGRESS, "ibss_change = 0x%2x", mac_mgmt.ibss_change);
+        memcpy(priv->bssid, mac_mgmt.current_bssid, ETH_ALEN);
+        at76_dbg(DBG_PROGRESS, "using BSSID %s", mac2str(priv->bssid));
+
+        at76_iwevent_bss_connect(priv->netdev, priv->bssid);
+
+        priv->mib_buf.type = MIB_MAC_MGMT;
+        priv->mib_buf.size = 1;
+        priv->mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change);
+        priv->mib_buf.data.byte = 0;
+
+        ret = at76_set_mib(priv, &priv->mib_buf);
+        if (ret < 0)
+                printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n",
+                       priv->netdev->name, ret);
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
 static int at76_startup_device(struct at76_priv *priv)
 {
         struct at76_card_config *ccfg = &priv->card_config;
@@ -1470,14 +3905,14 @@ static int at76_startup_device(struct at76_priv *priv)
 
         at76_dbg(DBG_PARAMS,
                  "%s param: ssid %.*s (%s) mode %s ch %d wep %s key %d "
-                 "keylen %d", wiphy_name(priv->hw->wiphy), priv->essid_size,
-                 priv->essid, hex2str(priv->essid, IW_ESSID_MAX_SIZE),
+                 "keylen %d", priv->netdev->name, priv->essid_size, priv->essid,
+                 hex2str(priv->essid, IW_ESSID_MAX_SIZE),
                  priv->iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra",
                  priv->channel, priv->wep_enabled ? "enabled" : "disabled",
                  priv->wep_key_id, priv->wep_keys_len[priv->wep_key_id]);
         at76_dbg(DBG_PARAMS,
                  "%s param: preamble %s rts %d retry %d frag %d "
-                 "txrate %s auth_mode %d", wiphy_name(priv->hw->wiphy),
+                 "txrate %s auth_mode %d", priv->netdev->name,
                  preambles[priv->preamble_type], priv->rts_threshold,
                  priv->short_retry_limit, priv->frag_threshold,
                  priv->txrate == TX_RATE_1MBIT ? "1MBit" : priv->txrate ==
@@ -1488,7 +3923,7 @@ static int at76_startup_device(struct at76_priv *priv)
         at76_dbg(DBG_PARAMS,
                  "%s param: pm_mode %d pm_period %d auth_mode %s "
                  "scan_times %d %d scan_mode %s",
-                 wiphy_name(priv->hw->wiphy), priv->pm_mode, priv->pm_period,
+                 priv->netdev->name, priv->pm_mode, priv->pm_period,
                  priv->auth_mode == WLAN_AUTH_OPEN ? "open" : "shared_secret",
                  priv->scan_min_time, priv->scan_max_time,
                  priv->scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive");
@@ -1522,8 +3957,7 @@ static int at76_startup_device(struct at76_priv *priv)
         ccfg->ssid_len = priv->essid_size;
 
         ccfg->wep_default_key_id = priv->wep_key_id;
-        memcpy(ccfg->wep_default_key_value, priv->wep_keys,
-               sizeof(priv->wep_keys));
+        memcpy(ccfg->wep_default_key_value, priv->wep_keys, 4 * WEP_KEY_LEN);
 
         ccfg->short_preamble = priv->preamble_type;
         ccfg->beacon_period = cpu_to_le16(priv->beacon_period);
@@ -1532,7 +3966,7 @@ static int at76_startup_device(struct at76_priv *priv)
                                     sizeof(struct at76_card_config));
         if (ret < 0) {
                 printk(KERN_ERR "%s: at76_set_card_command failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
                 return ret;
         }
 
@@ -1578,6 +4012,69 @@ static int at76_startup_device(struct at76_priv *priv)
         return 0;
 }
 
+/* Restart the interface */
+static void at76_dwork_restart(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              dwork_restart.work);
+
+        mutex_lock(&priv->mtx);
+
+        netif_carrier_off(priv->netdev);        /* stop netdev watchdog */
+        netif_stop_queue(priv->netdev); /* stop tx data packets */
+
+        at76_startup_device(priv);
+
+        if (priv->iw_mode != IW_MODE_MONITOR) {
+                priv->netdev->type = ARPHRD_ETHER;
+                at76_set_mac_state(priv, MAC_SCANNING);
+                schedule_work(&priv->work_start_scan);
+        } else {
+                priv->netdev->type = ARPHRD_IEEE80211_RADIOTAP;
+                at76_start_monitor(priv);
+        }
+
+        mutex_unlock(&priv->mtx);
+}
+
+/* Initiate scanning */
+static void at76_work_start_scan(struct work_struct *work)
+{
+        struct at76_priv *priv = container_of(work, struct at76_priv,
+                                              work_start_scan);
+        int ret;
+
+        mutex_lock(&priv->mtx);
+
+        WARN_ON(priv->mac_state != MAC_SCANNING);
+        if (priv->mac_state != MAC_SCANNING)
+                goto exit;
+
+        /* only clear the bss list when a scan is actively initiated,
+         * otherwise simply rely on at76_bss_list_timeout */
+        if (priv->scan_state == SCAN_IN_PROGRESS) {
+                at76_free_bss_list(priv);
+                priv->scan_need_any = 1;
+        } else
+                priv->scan_need_any = 0;
+
+        ret = at76_start_scan(priv, 1);
+
+        if (ret < 0)
+                printk(KERN_ERR "%s: %s: start_scan failed with %d\n",
+                       priv->netdev->name, __func__, ret);
+        else {
+                at76_dbg(DBG_MGMT_TIMER,
+                         "%s:%d: starting mgmt_timer for %d ticks",
+                         __func__, __LINE__, SCAN_POLL_INTERVAL);
+                schedule_delayed_work(&priv->dwork_get_scan,
+                                      SCAN_POLL_INTERVAL);
+        }
+
+exit:
+        mutex_unlock(&priv->mtx);
+}
+
 /* Enable or disable promiscuous mode */
 static void at76_work_set_promisc(struct work_struct *work)
 {
@@ -1595,7 +4092,7 @@ static void at76_work_set_promisc(struct work_struct *work)
         ret = at76_set_mib(priv, &priv->mib_buf);
         if (ret < 0)
                 printk(KERN_ERR "%s: set_mib (promiscuous_mode) failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
+                       priv->netdev->name, ret);
 
         mutex_unlock(&priv->mtx);
 }
@@ -1611,759 +4108,1088 @@ static void at76_work_submit_rx(struct work_struct *work)
         mutex_unlock(&priv->mtx);
 }
 
-static void at76_rx_tasklet(unsigned long param)
+/* We got an association response */
+static void at76_rx_mgmt_assoc(struct at76_priv *priv,
+                               struct at76_rx_buffer *buf)
 {
-        struct urb *urb = (struct urb *)param;
-        struct at76_priv *priv = urb->context;
-        struct at76_rx_buffer *buf;
-        struct ieee80211_rx_status rx_status = { 0 };
-
-        if (priv->device_unplugged) {
-                at76_dbg(DBG_DEVSTART, "device unplugged");
-                if (urb)
-                        at76_dbg(DBG_DEVSTART, "urb status %d", urb->status);
+        struct ieee80211_assoc_response *resp =
+            (struct ieee80211_assoc_response *)buf->packet;
+        u16 assoc_id = le16_to_cpu(resp->aid);
+        u16 status = le16_to_cpu(resp->status);
+
+        at76_dbg(DBG_RX_MGMT, "%s: rx AssocResp bssid %s capa 0x%04x status "
+                 "0x%04x assoc_id 0x%04x rates %s", priv->netdev->name,
+                 mac2str(resp->header.addr3), le16_to_cpu(resp->capability),
+                 status, assoc_id, hex2str(resp->info_element->data,
+                                           resp->info_element->len));
+
+        if (priv->mac_state != MAC_ASSOC) {
+                printk(KERN_INFO "%s: AssocResp in state %s ignored\n",
+                       priv->netdev->name, mac_states[priv->mac_state]);
                 return;
         }
 
-        if (!priv->rx_skb || !priv->rx_skb->data)
-                return;
-
-        buf = (struct at76_rx_buffer *)priv->rx_skb->data;
-
-        if (urb->status != 0) {
-                if (urb->status != -ENOENT && urb->status != -ECONNRESET)
-                        at76_dbg(DBG_URB,
-                                 "%s %s: - nonzero Rx bulk status received: %d",
-                                 __func__, wiphy_name(priv->hw->wiphy),
-                                 urb->status);
-                return;
+        BUG_ON(!priv->curr_bss);
+
+        cancel_delayed_work(&priv->dwork_assoc);
+        if (status == WLAN_STATUS_SUCCESS) {
+                struct bss_info *ptr = priv->curr_bss;
+                priv->assoc_id = assoc_id & 0x3fff;
+                /* update iwconfig params */
+                memcpy(priv->bssid, ptr->bssid, ETH_ALEN);
+                memcpy(priv->essid, ptr->ssid, ptr->ssid_len);
+                priv->essid_size = ptr->ssid_len;
+                priv->channel = ptr->channel;
+                schedule_work(&priv->work_assoc_done);
+        } else {
+                at76_set_mac_state(priv, MAC_JOINING);
+                schedule_work(&priv->work_join);
         }
+}
 
-        at76_dbg(DBG_RX_ATMEL_HDR,
-                 "%s: rx frame: rate %d rssi %d noise %d link %d",
-                 wiphy_name(priv->hw->wiphy), buf->rx_rate, buf->rssi,
-                 buf->noise_level, buf->link_quality);
-
-        skb_trim(priv->rx_skb, le16_to_cpu(buf->wlength) + AT76_RX_HDRLEN);
-        at76_dbg_dump(DBG_RX_DATA, &priv->rx_skb->data[AT76_RX_HDRLEN],
-                      priv->rx_skb->len, "RX: len=%d",
-                      (int)(priv->rx_skb->len - AT76_RX_HDRLEN));
+/* Process disassociation request from the AP */
+static void at76_rx_mgmt_disassoc(struct at76_priv *priv,
+                                  struct at76_rx_buffer *buf)
+{
+        struct ieee80211_disassoc *resp =
+            (struct ieee80211_disassoc *)buf->packet;
+        struct ieee80211_hdr_3addr *mgmt = &resp->header;
+
+        at76_dbg(DBG_RX_MGMT,
+                 "%s: rx DisAssoc bssid %s reason 0x%04x destination %s",
+                 priv->netdev->name, mac2str(mgmt->addr3),
+                 le16_to_cpu(resp->reason), mac2str(mgmt->addr1));
+
+        /* We are not connected, ignore */
+        if (priv->mac_state == MAC_SCANNING || priv->mac_state == MAC_INIT
+            || !priv->curr_bss)
+                return;
 
-        rx_status.signal = buf->rssi;
-        /* FIXME: is rate_idx still present in structure? */
-        rx_status.rate_idx = buf->rx_rate;
-        rx_status.flag |= RX_FLAG_DECRYPTED;
-        rx_status.flag |= RX_FLAG_IV_STRIPPED;
+        /* Not our BSSID, ignore */
+        if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid))
+                return;
 
-        skb_pull(priv->rx_skb, AT76_RX_HDRLEN);
-        at76_dbg(DBG_MAC80211, "calling ieee80211_rx_irqsafe(): %d/%d",
-                 priv->rx_skb->len, priv->rx_skb->data_len);
-        ieee80211_rx_irqsafe(priv->hw, priv->rx_skb, &rx_status);
+        /* Not for our STA and not broadcast, ignore */
+        if (compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1)
+            && !is_broadcast_ether_addr(mgmt->addr1))
+                return;
 
-        /* Use a new skb for the next receive */
-        priv->rx_skb = NULL;
+        if (priv->mac_state != MAC_ASSOC && priv->mac_state != MAC_CONNECTED
+            && priv->mac_state != MAC_JOINING) {
+                printk(KERN_INFO "%s: DisAssoc in state %s ignored\n",
+                       priv->netdev->name, mac_states[priv->mac_state]);
+                return;
+        }
 
-        at76_submit_rx_urb(priv);
+        if (priv->mac_state == MAC_CONNECTED) {
+                netif_carrier_off(priv->netdev);
+                netif_stop_queue(priv->netdev);
+                at76_iwevent_bss_disconnect(priv->netdev);
+        }
+        cancel_delayed_work(&priv->dwork_get_scan);
+        cancel_delayed_work(&priv->dwork_beacon);
+        cancel_delayed_work(&priv->dwork_auth);
+        cancel_delayed_work(&priv->dwork_assoc);
+        at76_set_mac_state(priv, MAC_JOINING);
+        schedule_work(&priv->work_join);
 }
 
-/* Load firmware into kernel memory and parse it */
-static struct fwentry *at76_load_firmware(struct usb_device *udev,
-                                          enum board_type board_type)
+static void at76_rx_mgmt_auth(struct at76_priv *priv,
+                              struct at76_rx_buffer *buf)
 {
-        int ret;
-        char *str;
-        struct at76_fw_header *fwh;
-        struct fwentry *fwe = &firmwares[board_type];
-
-        mutex_lock(&fw_mutex);
-
-        if (fwe->loaded) {
-                at76_dbg(DBG_FW, "re-using previously loaded fw");
-                goto exit;
+        struct ieee80211_auth *resp = (struct ieee80211_auth *)buf->packet;
+        struct ieee80211_hdr_3addr *mgmt = &resp->header;
+        int seq_nr = le16_to_cpu(resp->transaction);
+        int alg = le16_to_cpu(resp->algorithm);
+        int status = le16_to_cpu(resp->status);
+
+        at76_dbg(DBG_RX_MGMT,
+                 "%s: rx AuthFrame bssid %s alg %d seq_nr %d status %d "
+                 "destination %s", priv->netdev->name, mac2str(mgmt->addr3),
+                 alg, seq_nr, status, mac2str(mgmt->addr1));
+
+        if (alg == WLAN_AUTH_SHARED_KEY && seq_nr == 2)
+                at76_dbg(DBG_RX_MGMT, "%s: AuthFrame challenge %s ...",
+                         priv->netdev->name, hex2str(resp->info_element, 18));
+
+        if (priv->mac_state != MAC_AUTH) {
+                printk(KERN_INFO "%s: ignored AuthFrame in state %s\n",
+                       priv->netdev->name, mac_states[priv->mac_state]);
+                return;
         }
-
-        at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname);
-        ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev);
-        if (ret < 0) {
-                dev_printk(KERN_ERR, &udev->dev, "firmware %s not found!\n",
-                           fwe->fwname);
-                dev_printk(KERN_ERR, &udev->dev,
-                           "you may need to download the firmware from "
-                           "http://developer.berlios.de/projects/at76c503a/\n");
-                goto exit;
+        if (priv->auth_mode != alg) {
+                printk(KERN_INFO "%s: ignored AuthFrame for alg %d\n",
+                       priv->netdev->name, alg);
+                return;
         }
 
-        at76_dbg(DBG_FW, "got it.");
-        fwh = (struct at76_fw_header *)(fwe->fw->data);
+        BUG_ON(!priv->curr_bss);
 
-        if (fwe->fw->size <= sizeof(*fwh)) {
-                dev_printk(KERN_ERR, &udev->dev,
-                           "firmware is too short (0x%zx)\n", fwe->fw->size);
-                goto exit;
+        /* Not our BSSID or not for our STA, ignore */
+        if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid)
+            || compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1))
+                return;
+
+        cancel_delayed_work(&priv->dwork_auth);
+        if (status != WLAN_STATUS_SUCCESS) {
+                /* try to join next bss */
+                at76_set_mac_state(priv, MAC_JOINING);
+                schedule_work(&priv->work_join);
+                return;
         }
 
-        /* CRC currently not checked */
-        fwe->board_type = le32_to_cpu(fwh->board_type);
-        if (fwe->board_type != board_type) {
-                dev_printk(KERN_ERR, &udev->dev,
-                           "board type mismatch, requested %u, got %u\n",
-                           board_type, fwe->board_type);
-                goto exit;
+        if (priv->auth_mode == WLAN_AUTH_OPEN || seq_nr == 4) {
+                priv->retries = ASSOC_RETRIES;
+                at76_set_mac_state(priv, MAC_ASSOC);
+                at76_assoc_req(priv, priv->curr_bss);
+                at76_dbg(DBG_MGMT_TIMER,
+                         "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__);
+                schedule_delayed_work(&priv->dwork_assoc, ASSOC_TIMEOUT);
+                return;
         }
 
-        fwe->fw_version.major = fwh->major;
-        fwe->fw_version.minor = fwh->minor;
-        fwe->fw_version.patch = fwh->patch;
-        fwe->fw_version.build = fwh->build;
+        WARN_ON(seq_nr != 2);
+        at76_auth_req(priv, priv->curr_bss, seq_nr + 1, resp->info_element);
+        at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ", __func__,
+                 __LINE__);
+        schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT);
+}
 
-        str = (char *)fwh + le32_to_cpu(fwh->str_offset);
-        fwe->intfw = (u8 *)fwh + le32_to_cpu(fwh->int_fw_offset);
-        fwe->intfw_size = le32_to_cpu(fwh->int_fw_len);
-        fwe->extfw = (u8 *)fwh + le32_to_cpu(fwh->ext_fw_offset);
-        fwe->extfw_size = le32_to_cpu(fwh->ext_fw_len);
+static void at76_rx_mgmt_deauth(struct at76_priv *priv,
+                                struct at76_rx_buffer *buf)
+{
+        struct ieee80211_disassoc *resp =
+            (struct ieee80211_disassoc *)buf->packet;
+        struct ieee80211_hdr_3addr *mgmt = &resp->header;
+
+        at76_dbg(DBG_RX_MGMT | DBG_PROGRESS,
+                 "%s: rx DeAuth bssid %s reason 0x%04x destination %s",
+                 priv->netdev->name, mac2str(mgmt->addr3),
+                 le16_to_cpu(resp->reason), mac2str(mgmt->addr1));
+
+        if (priv->mac_state != MAC_AUTH && priv->mac_state != MAC_ASSOC
+            && priv->mac_state != MAC_CONNECTED) {
+                printk(KERN_INFO "%s: DeAuth in state %s ignored\n",
+                       priv->netdev->name, mac_states[priv->mac_state]);
+                return;
+        }
 
-        fwe->loaded = 1;
+        BUG_ON(!priv->curr_bss);
 
-        dev_printk(KERN_DEBUG, &udev->dev,
-                   "using firmware %s (version %d.%d.%d-%d)\n",
-                   fwe->fwname, fwh->major, fwh->minor, fwh->patch, fwh->build);
+        /* Not our BSSID, ignore */
+        if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid))
+                return;
 
-        at76_dbg(DBG_DEVSTART, "board %u, int %d:%d, ext %d:%d", board_type,
-                 le32_to_cpu(fwh->int_fw_offset), le32_to_cpu(fwh->int_fw_len),
-                 le32_to_cpu(fwh->ext_fw_offset), le32_to_cpu(fwh->ext_fw_len));
-        at76_dbg(DBG_DEVSTART, "firmware id %s", str);
+        /* Not for our STA and not broadcast, ignore */
+        if (compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1)
+            && !is_broadcast_ether_addr(mgmt->addr1))
+                return;
 
-exit:
-        mutex_unlock(&fw_mutex);
+        if (priv->mac_state == MAC_CONNECTED)
+                at76_iwevent_bss_disconnect(priv->netdev);
 
-        if (fwe->loaded)
-                return fwe;
-        else
-                return NULL;
+        at76_set_mac_state(priv, MAC_JOINING);
+        schedule_work(&priv->work_join);
+        cancel_delayed_work(&priv->dwork_get_scan);
+        cancel_delayed_work(&priv->dwork_beacon);
+        cancel_delayed_work(&priv->dwork_auth);
+        cancel_delayed_work(&priv->dwork_assoc);
 }
 
-static void at76_mac80211_tx_callback(struct urb *urb)
+static void at76_rx_mgmt_beacon(struct at76_priv *priv,
+                                struct at76_rx_buffer *buf)
 {
-        struct at76_priv *priv = urb->context;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(priv->tx_skb);
+        int varpar_len;
+        /* beacon content */
+        struct ieee80211_beacon *bdata = (struct ieee80211_beacon *)buf->packet;
+        struct ieee80211_hdr_3addr *mgmt = &bdata->header;
+
+        struct list_head *lptr;
+        struct bss_info *match; /* entry matching addr3 with its bssid */
+        int new_entry = 0;
+        int len;
+        struct ieee80211_info_element *ie;
+        int have_ssid = 0;
+        int have_rates = 0;
+        int have_channel = 0;
+        int keep_going = 1;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->bss_list_spinlock, flags);
+        if (priv->mac_state == MAC_CONNECTED) {
+                /* in state MAC_CONNECTED we use the mgmt_timer to control
+                   the beacon of the BSS */
+                BUG_ON(!priv->curr_bss);
+
+                if (!compare_ether_addr(priv->curr_bss->bssid, mgmt->addr3)) {
+                        /* We got our AP's beacon, defer the timeout handler.
+                           Kill pending work first, as schedule_delayed_work()
+                           won't do it. */
+                        cancel_delayed_work(&priv->dwork_beacon);
+                        schedule_delayed_work(&priv->dwork_beacon,
+                                              BEACON_TIMEOUT);
+                        priv->curr_bss->rssi = buf->rssi;
+                        priv->beacons_received++;
+                        goto exit;
+                }
+        }
 
-        at76_dbg(DBG_MAC80211, "%s()", __func__);
+        /* look if we have this BSS already in the list */
+        match = NULL;
 
-        switch (urb->status) {
-        case 0:
-                /* success */
-                /* FIXME:
-                 * is the frame really ACKed when tx_callback is called ? */
-                info->flags |= IEEE80211_TX_STAT_ACK;
-                break;
-        case -ENOENT:
-        case -ECONNRESET:
-                /* fail, urb has been unlinked */
-                /* FIXME: add error message */
-                break;
-        default:
-                at76_dbg(DBG_URB, "%s - nonzero tx status received: %d",
-                         __func__, urb->status);
-                break;
+        if (!list_empty(&priv->bss_list)) {
+                list_for_each(lptr, &priv->bss_list) {
+                        struct bss_info *bss_ptr =
+                            list_entry(lptr, struct bss_info, list);
+                        if (!compare_ether_addr(bss_ptr->bssid, mgmt->addr3)) {
+                                match = bss_ptr;
+                                break;
+                        }
+                }
         }
 
-        memset(&info->status, 0, sizeof(info->status));
+        if (!match) {
+                /* BSS not in the list - append it */
+                match = kzalloc(sizeof(struct bss_info), GFP_ATOMIC);
+                if (!match) {
+                        at76_dbg(DBG_BSS_TABLE,
+                                 "%s: cannot kmalloc new bss info (%zd byte)",
+                                 priv->netdev->name, sizeof(struct bss_info));
+                        goto exit;
+                }
+                new_entry = 1;
+                list_add_tail(&match->list, &priv->bss_list);
+        }
 
-        ieee80211_tx_status_irqsafe(priv->hw, priv->tx_skb);
+        match->capa = le16_to_cpu(bdata->capability);
+        match->beacon_interval = le16_to_cpu(bdata->beacon_interval);
+        match->rssi = buf->rssi;
+        match->link_qual = buf->link_quality;
+        match->noise_level = buf->noise_level;
+        memcpy(match->bssid, mgmt->addr3, ETH_ALEN);
+        at76_dbg(DBG_RX_BEACON, "%s: bssid %s", priv->netdev->name,
+                 mac2str(match->bssid));
+
+        ie = bdata->info_element;
+
+        /* length of var length beacon parameters */
+        varpar_len = min_t(int, le16_to_cpu(buf->wlength) -
+                           sizeof(struct ieee80211_beacon),
+                           BEACON_MAX_DATA_LENGTH);
+
+        /* This routine steps through the bdata->data array to get
+         * some useful information about the access point.
+         * Currently, this implementation supports receipt of: SSID,
+         * supported transfer rates and channel, in any order, with some
+         * tolerance for intermittent unknown codes (although this
+         * functionality may not be necessary as the useful information will
+         * usually arrive in consecutively, but there have been some
+         * reports of some of the useful information fields arriving in a
+         * different order).
+         * It does not support any more IE types although MFIE_TYPE_TIM may
+         * be supported (on my AP at least).
+         * The bdata->data array is about 1500 bytes long but only ~36 of those
+         * bytes are useful, hence the have_ssid etc optimizations. */
+
+        while (keep_going &&
+               ((&ie->data[ie->len] - (u8 *)bdata->info_element) <=
+                varpar_len)) {
+
+                switch (ie->id) {
+
+                case MFIE_TYPE_SSID:
+                        if (have_ssid)
+                                break;
 
-        priv->tx_skb = NULL;
+                        len = min_t(int, IW_ESSID_MAX_SIZE, ie->len);
 
-        ieee80211_wake_queues(priv->hw);
-}
+                        /* we copy only if this is a new entry,
+                           or the incoming SSID is not a hidden SSID. This
+                           will protect us from overwriting a real SSID read
+                           in a ProbeResponse with a hidden one from a
+                           following beacon. */
+                        if (!new_entry && at76_is_hidden_ssid(ie->data, len)) {
+                                have_ssid = 1;
+                                break;
+                        }
 
-static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-        struct at76_priv *priv = hw->priv;
-        struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        int padding, submit_len, ret;
+                        match->ssid_len = len;
+                        memcpy(match->ssid, ie->data, len);
+                        at76_dbg(DBG_RX_BEACON, "%s: SSID - %.*s",
+                                 priv->netdev->name, len, match->ssid);
+                        have_ssid = 1;
+                        break;
 
-        at76_dbg(DBG_MAC80211, "%s()", __func__);
+                case MFIE_TYPE_RATES:
+                        if (have_rates)
+                                break;
 
-        if (priv->tx_urb->status == -EINPROGRESS) {
-                printk(KERN_ERR "%s: %s called while tx urb is pending\n",
-                       wiphy_name(priv->hw->wiphy), __func__);
-                return NETDEV_TX_BUSY;
-        }
+                        match->rates_len =
+                            min_t(int, sizeof(match->rates), ie->len);
+                        memcpy(match->rates, ie->data, match->rates_len);
+                        have_rates = 1;
+                        at76_dbg(DBG_RX_BEACON, "%s: SUPPORTED RATES %s",
+                                 priv->netdev->name,
+                                 hex2str(ie->data, ie->len));
+                        break;
 
-        ieee80211_stop_queues(hw);
+                case MFIE_TYPE_DS_SET:
+                        if (have_channel)
+                                break;
 
-        at76_ledtrig_tx_activity();     /* tell ledtrigger we send a packet */
+                        match->channel = ie->data[0];
+                        have_channel = 1;
+                        at76_dbg(DBG_RX_BEACON, "%s: CHANNEL - %d",
+                                 priv->netdev->name, match->channel);
+                        break;
 
-        WARN_ON(priv->tx_skb != NULL);
+                case MFIE_TYPE_CF_SET:
+                case MFIE_TYPE_TIM:
+                case MFIE_TYPE_IBSS_SET:
+                default:
+                        at76_dbg(DBG_RX_BEACON, "%s: beacon IE id %d len %d %s",
+                                 priv->netdev->name, ie->id, ie->len,
+                                 hex2str(ie->data, ie->len));
+                        break;
+                }
 
-        priv->tx_skb = skb;
-        padding = at76_calc_padding(skb->len);
-        submit_len = AT76_TX_HDRLEN + skb->len + padding;
+                /* advance to the next informational element */
+                next_ie(&ie);
 
-        /* setup 'Atmel' header */
-        memset(tx_buffer, 0, sizeof(*tx_buffer));
-        tx_buffer->padding = padding;
-        tx_buffer->wlength = cpu_to_le16(skb->len);
-        tx_buffer->tx_rate = ieee80211_get_tx_rate(hw, info)->hw_value;
-        if (FIRMWARE_IS_WPA(priv->fw_version) && info->control.hw_key) {
-                tx_buffer->key_id = (info->control.hw_key->keyidx);
-                tx_buffer->cipher_type =
-                        priv->keys[info->control.hw_key->keyidx].cipher;
-                tx_buffer->cipher_length =
-                        priv->keys[info->control.hw_key->keyidx].keylen;
-                tx_buffer->reserved = 0;
-        } else {
-                tx_buffer->key_id = 0;
-                tx_buffer->cipher_type = 0;
-                tx_buffer->cipher_length = 0;
-                tx_buffer->reserved = 0;
-        };
-        /* memset(tx_buffer->reserved, 0, sizeof(tx_buffer->reserved)); */
-        memcpy(tx_buffer->packet, skb->data, skb->len);
+                /* Optimization: after all, the bdata->data array is
+                 * varpar_len bytes long, whereas we get all of the useful
+                 * information after only ~36 bytes, this saves us a lot of
+                 * time (and trouble as the remaining portion of the array
+                 * could be full of junk)
+                 * Comment this out if you want to see what other information
+                 * comes from the AP - although little of it may be useful */
+        }
 
-        at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr",
-                 wiphy_name(priv->hw->wiphy), le16_to_cpu(tx_buffer->wlength),
-                 tx_buffer->padding, tx_buffer->tx_rate);
+        at76_dbg(DBG_RX_BEACON, "%s: Finished processing beacon data",
+                 priv->netdev->name);
 
-        /* send stuff */
-        at76_dbg_dump(DBG_TX_DATA_CONTENT, tx_buffer, submit_len,
-                      "%s(): tx_buffer %d bytes:", __func__, submit_len);
-        usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, tx_buffer,
-                          submit_len, at76_mac80211_tx_callback, priv);
-        ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC);
-        if (ret) {
-                printk(KERN_ERR "%s: error in tx submit urb: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
-                if (ret == -EINVAL)
-                        printk(KERN_ERR
-                               "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n",
-                               wiphy_name(priv->hw->wiphy), priv->tx_urb,
-                               priv->tx_urb->hcpriv, priv->tx_urb->complete);
-        }
+        match->last_rx = jiffies;       /* record last rx of beacon */
 
-        return 0;
+exit:
+        spin_unlock_irqrestore(&priv->bss_list_spinlock, flags);
 }
 
-static int at76_mac80211_start(struct ieee80211_hw *hw)
+/* Calculate the link level from a given rx_buffer */
+static void at76_calc_level(struct at76_priv *priv, struct at76_rx_buffer *buf,
+                            struct iw_quality *qual)
 {
-        struct at76_priv *priv = hw->priv;
-        int ret;
-
-        at76_dbg(DBG_MAC80211, "%s()", __func__);
+        /* just a guess for now, might be different for other chips */
+        int max_rssi = 42;
 
-        mutex_lock(&priv->mtx);
-
-        ret = at76_submit_rx_urb(priv);
-        if (ret < 0) {
-                printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
-                goto error;
-        }
+        qual->level = (buf->rssi * 100 / max_rssi);
+        if (qual->level > 100)
+                qual->level = 100;
+        qual->updated |= IW_QUAL_LEVEL_UPDATED;
+}
 
-        at76_startup_device(priv);
+/* Calculate the link quality from a given rx_buffer */
+static void at76_calc_qual(struct at76_priv *priv, struct at76_rx_buffer *buf,
+                           struct iw_quality *qual)
+{
+        if (at76_is_intersil(priv->board_type))
+                qual->qual = buf->link_quality;
+        else {
+                unsigned long elapsed;
 
-        at76_start_monitor(priv);
+                /* Update qual at most once a second */
+                elapsed = jiffies - priv->beacons_last_qual;
+                if (elapsed < 1 * HZ)
+                        return;
 
-error:
-        mutex_unlock(&priv->mtx);
+                qual->qual = qual->level * priv->beacons_received *
+                    msecs_to_jiffies(priv->beacon_period) / elapsed;
 
-        return 0;
+                priv->beacons_last_qual = jiffies;
+                priv->beacons_received = 0;
+        }
+        qual->qual = (qual->qual > 100) ? 100 : qual->qual;
+        qual->updated |= IW_QUAL_QUAL_UPDATED;
 }
 
-static void at76_mac80211_stop(struct ieee80211_hw *hw)
+/* Calculate the noise quality from a given rx_buffer */
+static void at76_calc_noise(struct at76_priv *priv, struct at76_rx_buffer *buf,
+                            struct iw_quality *qual)
 {
-        struct at76_priv *priv = hw->priv;
-
-        at76_dbg(DBG_MAC80211, "%s()", __func__);
-
-        mutex_lock(&priv->mtx);
+        qual->noise = 0;
+        qual->updated |= IW_QUAL_NOISE_INVALID;
+}
 
-        if (!priv->device_unplugged) {
-                /* We are called by "ifconfig ethX down", not because the
-                 * device is not available anymore. */
-                if (at76_set_radio(priv, 0) == 1)
-                        at76_wait_completion(priv, CMD_RADIO_ON);
+static void at76_update_wstats(struct at76_priv *priv,
+                               struct at76_rx_buffer *buf)
+{
+        struct iw_quality *qual = &priv->wstats.qual;
 
-                /* We unlink rx_urb because at76_open() re-submits it.
-                 * If unplugged, at76_delete_device() takes care of it. */
-                usb_kill_urb(priv->rx_urb);
+        if (buf->rssi && priv->mac_state == MAC_CONNECTED) {
+                qual->updated = 0;
+                at76_calc_level(priv, buf, qual);
+                at76_calc_qual(priv, buf, qual);
+                at76_calc_noise(priv, buf, qual);
+        } else {
+                qual->qual = 0;
+                qual->level = 0;
+                qual->noise = 0;
+                qual->updated = IW_QUAL_ALL_INVALID;
         }
-
-        mutex_unlock(&priv->mtx);
 }
 
-static int at76_add_interface(struct ieee80211_hw *hw,
-                              struct ieee80211_if_init_conf *conf)
+static void at76_rx_mgmt(struct at76_priv *priv, struct at76_rx_buffer *buf)
 {
-        struct at76_priv *priv = hw->priv;
-        int ret = 0;
+        struct ieee80211_hdr_3addr *mgmt =
+            (struct ieee80211_hdr_3addr *)buf->packet;
+        u16 framectl = le16_to_cpu(mgmt->frame_ctl);
+
+        /* update wstats */
+        if (priv->mac_state != MAC_INIT && priv->mac_state != MAC_SCANNING) {
+                /* jal: this is a dirty hack needed by Tim in ad-hoc mode */
+                /* Data packets always seem to have a 0 link level, so we
+                   only read link quality info from management packets.
+                   Atmel driver actually averages the present, and previous
+                   values, we just present the raw value at the moment - TJS */
+                if (priv->iw_mode == IW_MODE_ADHOC
+                    || (priv->curr_bss
+                        && !compare_ether_addr(mgmt->addr3,
+                                               priv->curr_bss->bssid)))
+                        at76_update_wstats(priv, buf);
+        }
 
-        at76_dbg(DBG_MAC80211, "%s()", __func__);
+        at76_dbg(DBG_RX_MGMT_CONTENT, "%s rx mgmt framectl 0x%x %s",
+                 priv->netdev->name, framectl,
+                 hex2str(mgmt, le16_to_cpu(buf->wlength)));
 
-        mutex_lock(&priv->mtx);
+        switch (framectl & IEEE80211_FCTL_STYPE) {
+        case IEEE80211_STYPE_BEACON:
+        case IEEE80211_STYPE_PROBE_RESP:
+                at76_rx_mgmt_beacon(priv, buf);
+                break;
+
+        case IEEE80211_STYPE_ASSOC_RESP:
+                at76_rx_mgmt_assoc(priv, buf);
+                break;
 
-        switch (conf->type) {
-        case NL80211_IFTYPE_STATION:
-                priv->iw_mode = IW_MODE_INFRA;
+        case IEEE80211_STYPE_DISASSOC:
+                at76_rx_mgmt_disassoc(priv, buf);
                 break;
+
+        case IEEE80211_STYPE_AUTH:
+                at76_rx_mgmt_auth(priv, buf);
+                break;
+
+        case IEEE80211_STYPE_DEAUTH:
+                at76_rx_mgmt_deauth(priv, buf);
+                break;
+
         default:
-                ret = -EOPNOTSUPP;
-                goto exit;
+                printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n",
+                       priv->netdev->name, framectl);
         }
 
-exit:
-        mutex_unlock(&priv->mtx);
-
-        return ret;
+        return;
 }
 
-static void at76_remove_interface(struct ieee80211_hw *hw,
-                                  struct ieee80211_if_init_conf *conf)
+/* Convert the 802.11 header into an ethernet-style header, make skb
+ * ready for consumption by netif_rx() */
+static void at76_ieee80211_to_eth(struct sk_buff *skb, int iw_mode)
 {
-        at76_dbg(DBG_MAC80211, "%s()", __func__);
-}
+        struct ieee80211_hdr_3addr *i802_11_hdr;
+        struct ethhdr *eth_hdr_p;
+        u8 *src_addr;
+        u8 *dest_addr;
 
-static int at76_join(struct at76_priv *priv)
-{
-        struct at76_req_join join;
-        int ret;
+        i802_11_hdr = (struct ieee80211_hdr_3addr *)skb->data;
 
-        memset(&join, 0, sizeof(struct at76_req_join));
-        memcpy(join.essid, priv->essid, priv->essid_size);
-        join.essid_size = priv->essid_size;
-        memcpy(join.bssid, priv->bssid, ETH_ALEN);
-        join.bss_type = INFRASTRUCTURE_MODE;
-        join.channel = priv->channel;
-        join.timeout = cpu_to_le16(2000);
+        /* That would be the ethernet header if the hardware converted
+         * the frame for us.  Make sure the source and the destination
+         * match the 802.11 header.  Which hardware does it? */
+        eth_hdr_p = (struct ethhdr *)skb_pull(skb, IEEE80211_3ADDR_LEN);
 
-        at76_dbg(DBG_MAC80211, "%s: sending CMD_JOIN", __func__);
-        ret = at76_set_card_command(priv->udev, CMD_JOIN, &join,
-                                    sizeof(struct at76_req_join));
+        dest_addr = i802_11_hdr->addr1;
+        if (iw_mode == IW_MODE_ADHOC)
+                src_addr = i802_11_hdr->addr2;
+        else
+                src_addr = i802_11_hdr->addr3;
 
-        if (ret < 0) {
-                printk(KERN_ERR "%s: at76_set_card_command failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
-                return 0;
-        }
+        if (!compare_ether_addr(eth_hdr_p->h_source, src_addr) &&
+            !compare_ether_addr(eth_hdr_p->h_dest, dest_addr))
+                /* Yes, we already have an ethernet header */
+                skb_reset_mac_header(skb);
+        else {
+                u16 len;
+
+                /* Need to build an ethernet header */
+                if (!memcmp(skb->data, snapsig, sizeof(snapsig))) {
+                        /* SNAP frame - decapsulate, keep proto */
+                        skb_push(skb, offsetof(struct ethhdr, h_proto) -
+                                 sizeof(rfc1042sig));
+                        len = 0;
+                } else {
+                        /* 802.3 frame, proto is length */
+                        len = skb->len;
+                        skb_push(skb, ETH_HLEN);
+                }
 
-        ret = at76_wait_completion(priv, CMD_JOIN);
-        at76_dbg(DBG_MAC80211, "%s: CMD_JOIN returned: 0x%02x", __func__, ret);
-        if (ret != CMD_STATUS_COMPLETE) {
-                printk(KERN_ERR "%s: at76_wait_completion failed: %d\n",
-                       wiphy_name(priv->hw->wiphy), ret);
-                return 0;
+                skb_reset_mac_header(skb);
+                eth_hdr_p = eth_hdr(skb);
+                /* This needs to be done in this order (eth_hdr_p->h_dest may
+                 * overlap src_addr) */
+                memcpy(eth_hdr_p->h_source, src_addr, ETH_ALEN);
+                memcpy(eth_hdr_p->h_dest, dest_addr, ETH_ALEN);
+                if (len)
+                        eth_hdr_p->h_proto = htons(len);
         }
 
-        at76_set_tkip_bssid(priv, priv->bssid);
-        at76_set_pm_mode(priv);
-
-        return 0;
+        skb->protocol = eth_type_trans(skb, skb->dev);
 }
 
-static void at76_dwork_hw_scan(struct work_struct *work)
+/* Check for fragmented data in priv->rx_skb. If the packet was no fragment
+   or it was the last of a fragment set a skb containing the whole packet
+   is returned for further processing. Otherwise we get NULL and are
+   done and the packet is either stored inside the fragment buffer
+   or thrown away.  Every returned skb starts with the ieee802_11 header
+   and contains _no_ FCS at the end */
+static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *priv)
 {
-        struct at76_priv *priv = container_of(work, struct at76_priv,
-                                              dwork_hw_scan.work);
-        int ret;
+        struct sk_buff *skb = priv->rx_skb;
+        struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data;
+        struct ieee80211_hdr_3addr *i802_11_hdr =
+            (struct ieee80211_hdr_3addr *)buf->packet;
+        /* seq_ctrl, fragment_number, sequence number of new packet */
+        u16 sctl = le16_to_cpu(i802_11_hdr->seq_ctl);
+        u16 fragnr = sctl & 0xf;
+        u16 seqnr = sctl >> 4;
+        u16 frame_ctl = le16_to_cpu(i802_11_hdr->frame_ctl);
 
-        ret = at76_get_cmd_status(priv->udev, CMD_SCAN);
-        at76_dbg(DBG_MAC80211, "%s: CMD_SCAN status 0x%02x", __func__, ret);
+        /* Length including the IEEE802.11 header, but without the trailing
+         * FCS and without the Atmel Rx header */
+        int length = le16_to_cpu(buf->wlength) - IEEE80211_FCS_LEN;
 
-        /* FIXME: add maximum time for scan to complete */
+        /* where does the data payload start in skb->data ? */
+        u8 *data = i802_11_hdr->payload;
 
-        if (ret != CMD_STATUS_COMPLETE) {
-                queue_delayed_work(priv->hw->workqueue, &priv->dwork_hw_scan,
-                                   SCAN_POLL_INTERVAL);
-                goto exit;
+        /* length of payload, excl. the trailing FCS */
+        int data_len = length - IEEE80211_3ADDR_LEN;
+
+        int i;
+        struct rx_data_buf *bptr, *optr;
+        unsigned long oldest = ~0UL;
+
+        at76_dbg(DBG_RX_FRAGS,
+                 "%s: rx data frame_ctl %04x addr2 %s seq/frag %d/%d "
+                 "length %d data %d: %s ...", priv->netdev->name, frame_ctl,
+                 mac2str(i802_11_hdr->addr2), seqnr, fragnr, length, data_len,
+                 hex2str(data, 32));
+
+        at76_dbg(DBG_RX_FRAGS_SKB, "%s: incoming skb: head %p data %p "
+                 "tail %p end %p len %d", priv->netdev->name, skb->head,
+                 skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
+                 skb->len);
+
+        if (data_len < 0) {
+                /* make sure data starts in the buffer */
+                printk(KERN_INFO "%s: data frame too short\n",
+                       priv->netdev->name);
+                return NULL;
         }
 
-        ieee80211_scan_completed(priv->hw);
+        WARN_ON(length <= AT76_RX_HDRLEN);
+        if (length <= AT76_RX_HDRLEN)
+                return NULL;
 
-        if (is_valid_ether_addr(priv->bssid)) {
-                ieee80211_wake_queues(priv->hw);
-                at76_join(priv);
+        /* remove the at76_rx_buffer header - we don't need it anymore */
+        /* we need the IEEE802.11 header (for the addresses) if this packet
+           is the first of a chain */
+        skb_pull(skb, AT76_RX_HDRLEN);
+
+        /* remove FCS at end */
+        skb_trim(skb, length);
+
+        at76_dbg(DBG_RX_FRAGS_SKB, "%s: trimmed skb: head %p data %p tail %p "
+                 "end %p len %d data %p data_len %d", priv->netdev->name,
+                 skb->head, skb->data, skb_tail_pointer(skb),
+                 skb_end_pointer(skb), skb->len, data, data_len);
+
+        if (fragnr == 0 && !(frame_ctl & IEEE80211_FCTL_MOREFRAGS)) {
+                /* unfragmented packet received */
+                /* Use a new skb for the next receive */
+                priv->rx_skb = NULL;
+                at76_dbg(DBG_RX_FRAGS, "%s: unfragmented", priv->netdev->name);
+                return skb;
         }
 
-        ieee80211_wake_queues(priv->hw);
+        /* look if we've got a chain for the sender address.
+           afterwards optr points to first free or the oldest entry,
+           or, if i < NR_RX_DATA_BUF, bptr points to the entry for the
+           sender address */
+        /* determining the oldest entry doesn't cope with jiffies wrapping
+           but I don't care to delete a young entry at these rare moments ... */
+
+        bptr = priv->rx_data;
+        optr = NULL;
+        for (i = 0; i < NR_RX_DATA_BUF; i++, bptr++) {
+                if (!bptr->skb) {
+                        optr = bptr;
+                        oldest = 0UL;
+                        continue;
+                }
 
-exit:
-        return;
-}
+                if (!compare_ether_addr(i802_11_hdr->addr2, bptr->sender))
+                        break;
 
-static int at76_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
-{
-        struct at76_priv *priv = hw->priv;
-        struct at76_req_scan scan;
-        int ret;
+                if (!optr) {
+                        optr = bptr;
+                        oldest = bptr->last_rx;
+                } else if (bptr->last_rx < oldest)
+                        optr = bptr;
+        }
 
-        at76_dbg(DBG_MAC80211, "%s():", __func__);
-        at76_dbg_dump(DBG_MAC80211, ssid, len, "ssid %zd bytes:", len);
+        if (i < NR_RX_DATA_BUF) {
+
+                at76_dbg(DBG_RX_FRAGS, "%s: %d. cacheentry (seq/frag = %d/%d) "
+                         "matched sender addr",
+                         priv->netdev->name, i, bptr->seqnr, bptr->fragnr);
+
+                /* bptr points to an entry for the sender address */
+                if (bptr->seqnr == seqnr) {
+                        int left;
+                        /* the fragment has the current sequence number */
+                        if (((bptr->fragnr + 1) & 0xf) != fragnr) {
+                                /* wrong fragment number -> ignore it */
+                                /* is & 0xf necessary above ??? */
+                                at76_dbg(DBG_RX_FRAGS,
+                                         "%s: frag nr mismatch: %d + 1 != %d",
+                                         priv->netdev->name, bptr->fragnr,
+                                         fragnr);
+                                return NULL;
+                        }
+                        bptr->last_rx = jiffies;
+                        /* the next following fragment number ->
+                           add the data at the end */
+
+                        /* for test only ??? */
+                        left = skb_tailroom(bptr->skb);
+                        if (left < data_len)
+                                printk(KERN_INFO
+                                       "%s: only %d byte free (need %d)\n",
+                                       priv->netdev->name, left, data_len);
+                        else
+                                memcpy(skb_put(bptr->skb, data_len), data,
+                                       data_len);
+
+                        bptr->fragnr = fragnr;
+                        if (frame_ctl & IEEE80211_FCTL_MOREFRAGS)
+                                return NULL;
+
+                        /* this was the last fragment - send it */
+                        skb = bptr->skb;
+                        bptr->skb = NULL;       /* free the entry */
+                        at76_dbg(DBG_RX_FRAGS, "%s: last frag of seq %d",
+                                 priv->netdev->name, seqnr);
+                        return skb;
+                }
 
-        mutex_lock(&priv->mtx);
+                /* got another sequence number */
+                if (fragnr == 0) {
+                        /* it's the start of a new chain - replace the
+                           old one by this */
+                        /* bptr->sender has the correct value already */
+                        at76_dbg(DBG_RX_FRAGS,
+                                 "%s: start of new seq %d, removing old seq %d",
+                                 priv->netdev->name, seqnr, bptr->seqnr);
+                        bptr->seqnr = seqnr;
+                        bptr->fragnr = 0;
+                        bptr->last_rx = jiffies;
+                        /* swap bptr->skb and priv->rx_skb */
+                        skb = bptr->skb;
+                        bptr->skb = priv->rx_skb;
+                        priv->rx_skb = skb;
+                } else {
+                        /* it from the middle of a new chain ->
+                           delete the old entry and skip the new one */
+                        at76_dbg(DBG_RX_FRAGS,
+                                 "%s: middle of new seq %d (%d) "
+                                 "removing old seq %d",
+                                 priv->netdev->name, seqnr, fragnr,
+                                 bptr->seqnr);
+                        dev_kfree_skb(bptr->skb);
+                        bptr->skb = NULL;
+                }
+                return NULL;
+        }
 
-        ieee80211_stop_queues(hw);
+        /* if we didn't find a chain for the sender address, optr
+           points either to the first free or the oldest entry */
 
-        memset(&scan, 0, sizeof(struct at76_req_scan));
-        memset(scan.bssid, 0xFF, ETH_ALEN);
-        scan.scan_type = SCAN_TYPE_ACTIVE;
-        if (priv->essid_size > 0) {
-                memcpy(scan.essid, ssid, len);
-                scan.essid_size = len;
+        if (fragnr != 0) {
+                /* this is not the begin of a fragment chain ... */
+                at76_dbg(DBG_RX_FRAGS,
+                         "%s: no chain for non-first fragment (%d)",
+                         priv->netdev->name, fragnr);
+                return NULL;
         }
-        scan.min_channel_time = cpu_to_le16(priv->scan_min_time);
-        scan.max_channel_time = cpu_to_le16(priv->scan_max_time);
-        scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000);
-        scan.international_scan = 0;
 
-        at76_dbg(DBG_MAC80211, "%s: sending CMD_SCAN", __func__);
-        ret = at76_set_card_command(priv->udev, CMD_SCAN, &scan, sizeof(scan));
+        BUG_ON(!optr);
+        if (optr->skb) {
+                /* swap the skb's */
+                skb = optr->skb;
+                optr->skb = priv->rx_skb;
+                priv->rx_skb = skb;
 
-        if (ret < 0) {
-                err("CMD_SCAN failed: %d", ret);
-                goto exit;
-        }
+                at76_dbg(DBG_RX_FRAGS,
+                         "%s: free old contents: sender %s seq/frag %d/%d",
+                         priv->netdev->name, mac2str(optr->sender),
+                         optr->seqnr, optr->fragnr);
 
-        queue_delayed_work(priv->hw->workqueue, &priv->dwork_hw_scan,
-                           SCAN_POLL_INTERVAL);
+        } else {
+                /* take the skb from priv->rx_skb */
+                optr->skb = priv->rx_skb;
+                /* let at76_submit_rx_urb() allocate a new skb */
+                priv->rx_skb = NULL;
 
-exit:
-        mutex_unlock(&priv->mtx);
+                at76_dbg(DBG_RX_FRAGS, "%s: use a free entry",
+                         priv->netdev->name);
+        }
+        memcpy(optr->sender, i802_11_hdr->addr2, ETH_ALEN);
+        optr->seqnr = seqnr;
+        optr->fragnr = 0;
+        optr->last_rx = jiffies;
 
-        return 0;
+        return NULL;
 }
 
-static int at76_config(struct ieee80211_hw *hw, u32 changed)
+/* Rx interrupt: we expect the complete data buffer in priv->rx_skb */
+static void at76_rx_data(struct at76_priv *priv)
 {
-        struct at76_priv *priv = hw->priv;
-        struct ieee80211_conf *conf = &hw->conf;
+        struct net_device *netdev = priv->netdev;
+        struct net_device_stats *stats = &priv->stats;
+        struct sk_buff *skb = priv->rx_skb;
+        struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data;
+        struct ieee80211_hdr_3addr *i802_11_hdr;
+        int length = le16_to_cpu(buf->wlength);
 
-        at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d",
-                 __func__, conf->channel->hw_value, conf->radio_enabled);
-        at76_dbg_dump(DBG_MAC80211, priv->essid, priv->essid_size, "ssid:");
-        at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:");
+        at76_dbg(DBG_RX_DATA, "%s received data packet: %s", netdev->name,
+                 hex2str(skb->data, AT76_RX_HDRLEN));
 
-        mutex_lock(&priv->mtx);
+        at76_dbg(DBG_RX_DATA_CONTENT, "rx packet: %s",
+                 hex2str(skb->data + AT76_RX_HDRLEN, length));
 
-        priv->channel = conf->channel->hw_value;
+        skb = at76_check_for_rx_frags(priv);
+        if (!skb)
+                return;
 
-        if (is_valid_ether_addr(priv->bssid)) {
-                at76_join(priv);
-                ieee80211_wake_queues(priv->hw);
-        } else {
-                ieee80211_stop_queues(priv->hw);
-                at76_start_monitor(priv);
-        };
+        /* Atmel header and the FCS are already removed */
+        i802_11_hdr = (struct ieee80211_hdr_3addr *)skb->data;
 
-        mutex_unlock(&priv->mtx);
+        skb->dev = netdev;
+        skb->ip_summed = CHECKSUM_NONE; /* TODO: should check CRC */
 
-        return 0;
-}
+        if (is_broadcast_ether_addr(i802_11_hdr->addr1)) {
+                if (!compare_ether_addr(i802_11_hdr->addr1, netdev->broadcast))
+                        skb->pkt_type = PACKET_BROADCAST;
+                else
+                        skb->pkt_type = PACKET_MULTICAST;
+        } else if (compare_ether_addr(i802_11_hdr->addr1, netdev->dev_addr))
+                skb->pkt_type = PACKET_OTHERHOST;
 
-static int at76_config_interface(struct ieee80211_hw *hw,
-                                 struct ieee80211_vif *vif,
-                                 struct ieee80211_if_conf *conf)
-{
-        struct at76_priv *priv = hw->priv;
+        at76_ieee80211_to_eth(skb, priv->iw_mode);
 
-        at76_dbg_dump(DBG_MAC80211, conf->bssid, ETH_ALEN, "bssid:");
+        netdev->last_rx = jiffies;
+        netif_rx(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += length;
 
-        mutex_lock(&priv->mtx);
+        return;
+}
 
-        memcpy(priv->bssid, conf->bssid, ETH_ALEN);
-//      memcpy(priv->essid, conf->ssid, conf->ssid_len);
-//      priv->essid_size = conf->ssid_len;
+static void at76_rx_monitor_mode(struct at76_priv *priv)
+{
+        struct at76_rx_radiotap *rt;
+        u8 *payload;
+        int skblen;
+        struct net_device *netdev = priv->netdev;
+        struct at76_rx_buffer *buf =
+            (struct at76_rx_buffer *)priv->rx_skb->data;
+        /* length including the IEEE802.11 header and the trailing FCS,
+           but not at76_rx_buffer */
+        int length = le16_to_cpu(buf->wlength);
+        struct sk_buff *skb = priv->rx_skb;
+        struct net_device_stats *stats = &priv->stats;
 
-        if (is_valid_ether_addr(priv->bssid)) {
-                /* mac80211 is joining a bss */
-                ieee80211_wake_queues(priv->hw);
-                at76_join(priv);
-        } else
-                ieee80211_stop_queues(priv->hw);
+        if (length < IEEE80211_FCS_LEN) {
+                /* buffer contains no data */
+                at76_dbg(DBG_MONITOR_MODE,
+                         "%s: MONITOR MODE: rx skb without data",
+                         priv->netdev->name);
+                return;
+        }
 
-        mutex_unlock(&priv->mtx);
+        skblen = sizeof(struct at76_rx_radiotap) + length;
 
-        return 0;
+        skb = dev_alloc_skb(skblen);
+        if (!skb) {
+                printk(KERN_ERR "%s: MONITOR MODE: dev_alloc_skb for radiotap "
+                       "header returned NULL\n", priv->netdev->name);
+                return;
+        }
+
+        skb_put(skb, skblen);
+
+        rt = (struct at76_rx_radiotap *)skb->data;
+        payload = skb->data + sizeof(struct at76_rx_radiotap);
+
+        rt->rt_hdr.it_version = 0;
+        rt->rt_hdr.it_pad = 0;
+        rt->rt_hdr.it_len = cpu_to_le16(sizeof(struct at76_rx_radiotap));
+        rt->rt_hdr.it_present = cpu_to_le32(AT76_RX_RADIOTAP_PRESENT);
+
+        rt->rt_tsft = cpu_to_le64(le32_to_cpu(buf->rx_time));
+        rt->rt_rate = hw_rates[buf->rx_rate] & (~0x80);
+        rt->rt_signal = buf->rssi;
+        rt->rt_noise = buf->noise_level;
+        rt->rt_flags = IEEE80211_RADIOTAP_F_FCS;
+        if (buf->fragmentation)
+                rt->rt_flags |= IEEE80211_RADIOTAP_F_FRAG;
+
+        memcpy(payload, buf->packet, length);
+        skb->dev = netdev;
+        skb->ip_summed = CHECKSUM_NONE;
+        skb_reset_mac_header(skb);
+        skb->pkt_type = PACKET_OTHERHOST;
+        skb->protocol = htons(ETH_P_802_2);
+
+        netdev->last_rx = jiffies;
+        netif_rx(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += length;
 }
 
-/* must be atomic */
-static void at76_configure_filter(struct ieee80211_hw *hw,
-                                  unsigned int changed_flags,
-                                  unsigned int *total_flags, int mc_count,
-                                  struct dev_addr_list *mc_list)
+/* Check if we spy on the sender address in buf and update stats */
+static void at76_iwspy_update(struct at76_priv *priv,
+                              struct at76_rx_buffer *buf)
 {
-        struct at76_priv *priv = hw->priv;
-        int flags;
-
-        at76_dbg(DBG_MAC80211, "%s(): changed_flags=0x%08x "
-                 "total_flags=0x%08x mc_count=%d",
-                 __func__, changed_flags, *total_flags, mc_count);
+        struct ieee80211_hdr_3addr *hdr =
+            (struct ieee80211_hdr_3addr *)buf->packet;
+        struct iw_quality qual;
 
-        flags = changed_flags & AT76_SUPPORTED_FILTERS;
-        *total_flags = AT76_SUPPORTED_FILTERS;
+        /* We can only set the level here */
+        qual.updated = IW_QUAL_QUAL_INVALID | IW_QUAL_NOISE_INVALID;
+        qual.level = 0;
+        qual.noise = 0;
+        at76_calc_level(priv, buf, &qual);
 
-        /* FIXME: access to priv->promisc should be protected with
-         * priv->mtx, but it's impossible because this function needs to be
-         * atomic */
+        spin_lock_bh(&priv->spy_spinlock);
 
-        if (flags && !priv->promisc) {
-                /* mac80211 wants us to enable promiscuous mode */
-                priv->promisc = 1;
-        } else if (!flags && priv->promisc) {
-                /* we need to disable promiscuous mode */
-                priv->promisc = 0;
-        } else
-                return;
+        if (priv->spy_data.spy_number > 0)
+                wireless_spy_update(priv->netdev, hdr->addr2, &qual);
 
-        queue_work(hw->workqueue, &priv->work_set_promisc);
+        spin_unlock_bh(&priv->spy_spinlock);
 }
 
-static int at76_set_key_oldfw(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                        const u8 *local_address, const u8 *address,
-                        struct ieee80211_key_conf *key)
+static void at76_rx_tasklet(unsigned long param)
 {
-        struct at76_priv *priv = hw->priv;
-
-        int i;
-
-        at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "
-                 "key->keylen %d",
-                 __func__, cmd, key->alg, key->keyidx, key->keylen);
+        struct urb *urb = (struct urb *)param;
+        struct at76_priv *priv = urb->context;
+        struct net_device *netdev = priv->netdev;
+        struct at76_rx_buffer *buf;
+        struct ieee80211_hdr_3addr *i802_11_hdr;
+        u16 frame_ctl;
 
-        if (key->alg != ALG_WEP)
-                return -EOPNOTSUPP;
+        if (priv->device_unplugged) {
+                at76_dbg(DBG_DEVSTART, "device unplugged");
+                if (urb)
+                        at76_dbg(DBG_DEVSTART, "urb status %d", urb->status);
+                return;
+        }
 
-        key->hw_key_idx = key->keyidx;
+        if (!priv->rx_skb || !netdev || !priv->rx_skb->data)
+                return;
 
-        mutex_lock(&priv->mtx);
+        buf = (struct at76_rx_buffer *)priv->rx_skb->data;
 
-        switch (cmd) {
-        case SET_KEY:
-                memcpy(priv->wep_keys[key->keyidx], key->key, key->keylen);
-                priv->wep_keys_len[key->keyidx] = key->keylen;
+        i802_11_hdr = (struct ieee80211_hdr_3addr *)buf->packet;
 
-                /* FIXME: find out how to do this properly */
-                priv->wep_key_id = key->keyidx;
+        frame_ctl = le16_to_cpu(i802_11_hdr->frame_ctl);
 
-                break;
-        case DISABLE_KEY:
-        default:
-                priv->wep_keys_len[key->keyidx] = 0;
-                break;
+        if (urb->status != 0) {
+                if (urb->status != -ENOENT && urb->status != -ECONNRESET)
+                        at76_dbg(DBG_URB,
+                                 "%s %s: - nonzero Rx bulk status received: %d",
+                                 __func__, netdev->name, urb->status);
+                return;
         }
 
-        priv->wep_enabled = 0;
+        at76_dbg(DBG_RX_ATMEL_HDR,
+                 "%s: rx frame: rate %d rssi %d noise %d link %d %s",
+                 priv->netdev->name, buf->rx_rate, buf->rssi, buf->noise_level,
+                 buf->link_quality, hex2str(i802_11_hdr, 48));
+        if (priv->iw_mode == IW_MODE_MONITOR) {
+                at76_rx_monitor_mode(priv);
+                goto exit;
+        }
 
-        for (i = 0; i < WEP_KEYS; i++) {
-                if (priv->wep_keys_len[i] != 0)
-                        priv->wep_enabled = 1;
+        /* there is a new bssid around, accept it: */
+        if (buf->newbss && priv->iw_mode == IW_MODE_ADHOC) {
+                at76_dbg(DBG_PROGRESS, "%s: rx newbss", netdev->name);
+                schedule_work(&priv->work_new_bss);
         }
 
-        at76_startup_device(priv);
+        switch (frame_ctl & IEEE80211_FCTL_FTYPE) {
+        case IEEE80211_FTYPE_DATA:
+                at76_rx_data(priv);
+                break;
 
-        mutex_unlock(&priv->mtx);
+        case IEEE80211_FTYPE_MGMT:
+                /* jal: TODO: find out if we can update iwspy also on
+                   other frames than management (might depend on the
+                   radio chip / firmware version !) */
 
-        return 0;
-}
+                at76_iwspy_update(priv, buf);
 
-static int at76_set_key_newfw(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                        const u8 *local_address, const u8 *address,
-                        struct ieee80211_key_conf *key)
-{
-        struct at76_priv *priv = hw->priv;
-        int ret = -EOPNOTSUPP;
-
-        at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "
-                 "key->keylen %d",
-                 __func__, cmd, key->alg, key->keyidx, key->keylen);
+                at76_rx_mgmt(priv, buf);
+                break;
 
-        mutex_lock(&priv->mtx);
+        case IEEE80211_FTYPE_CTL:
+                at76_dbg(DBG_RX_CTRL, "%s: ignored ctrl frame: %04x",
+                         priv->netdev->name, frame_ctl);
+                break;
 
-        priv->mib_buf.type = MIB_MAC_ENCRYPTION;
+        default:
+                printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n",
+                       priv->netdev->name, frame_ctl);
+        }
+exit:
+        at76_submit_rx_urb(priv);
+}
 
-        if (cmd == DISABLE_KEY) {
-                priv->mib_buf.size = CIPHER_KEY_LEN;
-                priv->mib_buf.index = offsetof(struct mib_mac_encryption,
-                                cipher_default_keyvalue[key->keyidx]);
-                memset(priv->mib_buf.data.data, 0, CIPHER_KEY_LEN);
-                if (at76_set_mib(priv, &priv->mib_buf) != CMD_STATUS_COMPLETE)
-                        ret = -EOPNOTSUPP; /* -EIO would be probably better */
-                else {
+/* Load firmware into kernel memory and parse it */
+static struct fwentry *at76_load_firmware(struct usb_device *udev,
+                                          enum board_type board_type)
+{
+        int ret;
+        char *str;
+        struct at76_fw_header *fwh;
+        struct fwentry *fwe = &firmwares[board_type];
 
-                        priv->keys[key->keyidx].cipher = CIPHER_NONE;
-                        priv->keys[key->keyidx].keylen = 0;
-                };
-                if (priv->default_group_key == key->keyidx)
-                        priv->default_group_key = 0xff;
+        mutex_lock(&fw_mutex);
 
-                if (priv->default_pairwise_key == key->keyidx)
-                        priv->default_pairwise_key = 0xff;
-                /* If default pairwise key is removed, fall back to
-                 * group key? */
-                ret = 0;
+        if (fwe->loaded) {
+                at76_dbg(DBG_FW, "re-using previously loaded fw");
                 goto exit;
-        };
-
-        if (cmd == SET_KEY) {
-                /* store key into MIB */
-                priv->mib_buf.size = CIPHER_KEY_LEN;
-                priv->mib_buf.index = offsetof(struct mib_mac_encryption,
-                                cipher_default_keyvalue[key->keyidx]);
-                memset(priv->mib_buf.data.data, 0, CIPHER_KEY_LEN);
-                memcpy(priv->mib_buf.data.data, key->key, key->keylen);
-
-                switch (key->alg) {
-                case ALG_WEP:
-                        if (key->keylen == 5) {
-                                priv->keys[key->keyidx].cipher =
-                                        CIPHER_WEP64;
-                                priv->keys[key->keyidx].keylen = 8;
-                        } else if (key->keylen == 13) {
-                                priv->keys[key->keyidx].cipher =
-                                        CIPHER_WEP128;
-                                /* Firmware needs this */
-                                priv->keys[key->keyidx].keylen = 8;
-                        } else {
-                                ret = -EOPNOTSUPP;
-                                goto exit;
-                        };
-                        break;
-                case ALG_TKIP:
-                        key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
-                        priv->keys[key->keyidx].cipher = CIPHER_TKIP;
-                        priv->keys[key->keyidx].keylen = 12;
-                        break;
+        }
 
-                case ALG_CCMP:
-                        if (!at76_is_505a(priv->board_type)) {
-                                ret = -EOPNOTSUPP;
-                                goto exit;
-                        };
-                        key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
-                        priv->keys[key->keyidx].cipher = CIPHER_CCMP;
-                        priv->keys[key->keyidx].keylen = 16;
-                        break;
+        at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname);
+        ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev);
+        if (ret < 0) {
+                dev_printk(KERN_ERR, &udev->dev, "firmware %s not found!\n",
+                           fwe->fwname);
+                dev_printk(KERN_ERR, &udev->dev,
+                           "you may need to download the firmware from "
+                           "http://developer.berlios.de/projects/at76c503a/");
+                goto exit;
+        }
 
-                default:
-                        ret = -EOPNOTSUPP;
-                        goto exit;
-                };
-
-                priv->mib_buf.data.data[38] = priv->keys[key->keyidx].cipher;
-                priv->mib_buf.data.data[39] = 1; /* Taken from atmelwlandriver,
-                                                    not documented */
-
-                if (is_valid_ether_addr(address))
-                        /* Pairwise key */
-                        priv->mib_buf.data.data[39] |= (KEY_PAIRWISE | KEY_TX);
-                else if (is_broadcast_ether_addr(address))
-                        /* Group key */
-                        priv->mib_buf.data.data[39] |= (KEY_TX);
-                else    /* Key used only for transmission ??? */
-                        priv->mib_buf.data.data[39] |= (KEY_TX);
-
-                if (at76_set_mib(priv, &priv->mib_buf) !=
-                                CMD_STATUS_COMPLETE) {
-                        ret = -EOPNOTSUPP; /* -EIO would be probably better */
-                        goto exit;
-                };
+        at76_dbg(DBG_FW, "got it.");
+        fwh = (struct at76_fw_header *)(fwe->fw->data);
 
-                if ((key->alg == ALG_TKIP) || (key->alg == ALG_CCMP))
-                        at76_reset_rsc(priv);
+        if (fwe->fw->size <= sizeof(*fwh)) {
+                dev_printk(KERN_ERR, &udev->dev,
+                           "firmware is too short (0x%zx)\n", fwe->fw->size);
+                goto exit;
+        }
 
-                key->hw_key_idx = key->keyidx;
+        /* CRC currently not checked */
+        fwe->board_type = le32_to_cpu(fwh->board_type);
+        if (fwe->board_type != board_type) {
+                dev_printk(KERN_ERR, &udev->dev,
+                           "board type mismatch, requested %u, got %u\n",
+                           board_type, fwe->board_type);
+                goto exit;
+        }
 
-                /* Set up default keys */
-                if (is_broadcast_ether_addr(address))
-                        priv->default_group_key = key->keyidx;
-                if (is_valid_ether_addr(address))
-                        priv->default_pairwise_key = key->keyidx;
+        fwe->fw_version.major = fwh->major;
+        fwe->fw_version.minor = fwh->minor;
+        fwe->fw_version.patch = fwh->patch;
+        fwe->fw_version.build = fwh->build;
 
-                /* Set up encryption MIBs */
+        str = (char *)fwh + le32_to_cpu(fwh->str_offset);
+        fwe->intfw = (u8 *)fwh + le32_to_cpu(fwh->int_fw_offset);
+        fwe->intfw_size = le32_to_cpu(fwh->int_fw_len);
+        fwe->extfw = (u8 *)fwh + le32_to_cpu(fwh->ext_fw_offset);
+        fwe->extfw_size = le32_to_cpu(fwh->ext_fw_len);
 
-                /* first block of settings */
-                priv->mib_buf.size = 3;
-                priv->mib_buf.index = offsetof(struct mib_mac_encryption,
-                                privacy_invoked);
-                priv->mib_buf.data.data[0] = 1; /* privacy_invoked */
-                priv->mib_buf.data.data[1] = priv->default_pairwise_key;
-                priv->mib_buf.data.data[2] = priv->default_group_key;
+        fwe->loaded = 1;
 
-                ret = at76_set_mib(priv, &priv->mib_buf);
-                if (ret != CMD_STATUS_COMPLETE)
-                        goto exit;
+        dev_printk(KERN_DEBUG, &udev->dev,
+                   "using firmware %s (version %d.%d.%d-%d)\n",
+                   fwe->fwname, fwh->major, fwh->minor, fwh->patch, fwh->build);
 
-                /* second block of settings */
-                priv->mib_buf.size = 3;
-                priv->mib_buf.index = offsetof(struct mib_mac_encryption,
-                                exclude_unencrypted);
-                priv->mib_buf.data.data[0] = 1; /* exclude_unencrypted */
-                priv->mib_buf.data.data[1] = 0; /* wep_encryption_type */
-                priv->mib_buf.data.data[2] = 0; /* ckip_key_permutation */
+        at76_dbg(DBG_DEVSTART, "board %u, int %d:%d, ext %d:%d", board_type,
+                 le32_to_cpu(fwh->int_fw_offset), le32_to_cpu(fwh->int_fw_len),
+                 le32_to_cpu(fwh->ext_fw_offset), le32_to_cpu(fwh->ext_fw_len));
+        at76_dbg(DBG_DEVSTART, "firmware id %s", str);
 
-                ret = at76_set_mib(priv, &priv->mib_buf);
-                if (ret != CMD_STATUS_COMPLETE)
-                        goto exit;
-                ret = 0;
-        };
 exit:
-        at76_dump_mib_mac_encryption(priv);
-        mutex_unlock(&priv->mtx);
-        return ret;
-}
-
-static int at76_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                        const u8 *local_address, const u8 *address,
-                        struct ieee80211_key_conf *key)
-{
-        struct at76_priv *priv = hw->priv;
-
-        at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "
-                 "key->keylen %d",
-                 __func__, cmd, key->alg, key->keyidx, key->keylen);
+        mutex_unlock(&fw_mutex);
 
-        if (FIRMWARE_IS_WPA(priv->fw_version))
-                return at76_set_key_newfw(hw, cmd, local_address, address, key);
+        if (fwe->loaded)
+                return fwe;
         else
-                return at76_set_key_oldfw(hw, cmd, local_address, address, key);
-
+                return NULL;
 }
 
-static const struct ieee80211_ops at76_ops = {
-        .tx = at76_mac80211_tx,
-        .add_interface = at76_add_interface,
-        .remove_interface = at76_remove_interface,
-        .config = at76_config,
-        .config_interface = at76_config_interface,
-        .configure_filter = at76_configure_filter,
-        .start = at76_mac80211_start,
-        .stop = at76_mac80211_stop,
-        .hw_scan = at76_hw_scan,
-        .set_key = at76_set_key,
-};
-
 /* Allocate network device and initialize private data */
 static struct at76_priv *at76_alloc_new_device(struct usb_device *udev)
 {
-        struct ieee80211_hw *hw;
+        struct net_device *netdev;
         struct at76_priv *priv;
+        int i;
 
-        hw = ieee80211_alloc_hw(sizeof(struct at76_priv), &at76_ops);
-        if (!hw) {
-                printk(KERN_ERR DRIVER_NAME ": could not register"
-                       " ieee80211_hw\n");
+        /* allocate memory for our device state and initialize it */
+        netdev = alloc_etherdev(sizeof(struct at76_priv));
+        if (!netdev) {
+                dev_printk(KERN_ERR, &udev->dev, "out of memory\n");
                 return NULL;
         }
 
-        priv = hw->priv;
-        priv->hw = hw;
+        priv = netdev_priv(netdev);
 
         priv->udev = udev;
+        priv->netdev = netdev;
 
         mutex_init(&priv->mtx);
+        INIT_WORK(&priv->work_assoc_done, at76_work_assoc_done);
+        INIT_WORK(&priv->work_join, at76_work_join);
+        INIT_WORK(&priv->work_new_bss, at76_work_new_bss);
+        INIT_WORK(&priv->work_start_scan, at76_work_start_scan);
         INIT_WORK(&priv->work_set_promisc, at76_work_set_promisc);
         INIT_WORK(&priv->work_submit_rx, at76_work_submit_rx);
-        INIT_DELAYED_WORK(&priv->dwork_hw_scan, at76_dwork_hw_scan);
+        INIT_DELAYED_WORK(&priv->dwork_restart, at76_dwork_restart);
+        INIT_DELAYED_WORK(&priv->dwork_get_scan, at76_dwork_get_scan);
+        INIT_DELAYED_WORK(&priv->dwork_beacon, at76_dwork_beacon);
+        INIT_DELAYED_WORK(&priv->dwork_auth, at76_dwork_auth);
+        INIT_DELAYED_WORK(&priv->dwork_assoc, at76_dwork_assoc);
+
+        spin_lock_init(&priv->mgmt_spinlock);
+        priv->next_mgmt_bulk = NULL;
+        priv->mac_state = MAC_INIT;
+
+        /* initialize empty BSS list */
+        priv->curr_bss = NULL;
+        INIT_LIST_HEAD(&priv->bss_list);
+        spin_lock_init(&priv->bss_list_spinlock);
+
+        init_timer(&priv->bss_list_timer);
+        priv->bss_list_timer.data = (unsigned long)priv;
+        priv->bss_list_timer.function = at76_bss_list_timeout;
+
+        spin_lock_init(&priv->spy_spinlock);
+
+        /* mark all rx data entries as unused */
+        for (i = 0; i < NR_RX_DATA_BUF; i++)
+                priv->rx_data[i].skb = NULL;
 
         priv->rx_tasklet.func = at76_rx_tasklet;
         priv->rx_tasklet.data = 0;
@@ -2371,9 +5197,6 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev)
         priv->pm_mode = AT76_PM_OFF;
         priv->pm_period = 0;
 
-        /* unit us */
-        priv->hw->channel_change_time = 100000;
-
         return priv;
 }
 
@@ -2436,42 +5259,11 @@ static int at76_alloc_urbs(struct at76_priv *priv,
         return 0;
 }
 
-static struct ieee80211_rate at76_rates[] = {
-        { .bitrate = 10, .hw_value = TX_RATE_1MBIT, },
-        { .bitrate = 20, .hw_value = TX_RATE_2MBIT, },
-        { .bitrate = 55, .hw_value = TX_RATE_5_5MBIT, },
-        { .bitrate = 110, .hw_value = TX_RATE_11MBIT, },
-};
-
-static struct ieee80211_channel at76_channels[] = {
-        { .center_freq = 2412, .hw_value = 1 },
-        { .center_freq = 2417, .hw_value = 2 },
-        { .center_freq = 2422, .hw_value = 3 },
-        { .center_freq = 2427, .hw_value = 4 },
-        { .center_freq = 2432, .hw_value = 5 },
-        { .center_freq = 2437, .hw_value = 6 },
-        { .center_freq = 2442, .hw_value = 7 },
-        { .center_freq = 2447, .hw_value = 8 },
-        { .center_freq = 2452, .hw_value = 9 },
-        { .center_freq = 2457, .hw_value = 10 },
-        { .center_freq = 2462, .hw_value = 11 },
-        { .center_freq = 2467, .hw_value = 12 },
-        { .center_freq = 2472, .hw_value = 13 },
-        { .center_freq = 2484, .hw_value = 14 }
-};
-
-static struct ieee80211_supported_band at76_supported_band = {
-        .channels = at76_channels,
-        .n_channels = ARRAY_SIZE(at76_channels),
-        .bitrates = at76_rates,
-        .n_bitrates = ARRAY_SIZE(at76_rates),
-};
-
 /* Register network device and initialize the hardware */
 static int at76_init_new_device(struct at76_priv *priv,
                                 struct usb_interface *interface)
 {
-        struct device *dev = &interface->dev;
+        struct net_device *netdev = priv->netdev;
         int ret;
 
         /* set up the endpoint information */
@@ -2487,11 +5279,14 @@ static int at76_init_new_device(struct at76_priv *priv,
         /* MAC address */
         ret = at76_get_hw_config(priv);
         if (ret < 0) {
-                dev_err(dev, "cannot get MAC address\n");
+                dev_printk(KERN_ERR, &interface->dev,
+                           "cannot get MAC address\n");
                 goto exit;
         }
 
         priv->domain = at76_get_reg_domain(priv->regulatory_domain);
+        /* init. netdev->dev_addr */
+        memcpy(netdev->dev_addr, priv->mac_addr, ETH_ALEN);
 
         priv->channel = DEF_CHANNEL;
         priv->iw_mode = IW_MODE_INFRA;
@@ -2501,54 +5296,47 @@ static int at76_init_new_device(struct at76_priv *priv,
         priv->txrate = TX_RATE_AUTO;
         priv->preamble_type = PREAMBLE_TYPE_LONG;
         priv->beacon_period = 100;
+        priv->beacons_last_qual = jiffies;
         priv->auth_mode = WLAN_AUTH_OPEN;
         priv->scan_min_time = DEF_SCAN_MIN_TIME;
         priv->scan_max_time = DEF_SCAN_MAX_TIME;
         priv->scan_mode = SCAN_TYPE_ACTIVE;
-        priv->default_pairwise_key = 0xff;
-        priv->default_group_key = 0xff;
-
-        /* mac80211 initialisation */
-        priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &at76_supported_band;
 
-        if (FIRMWARE_IS_WPA(priv->fw_version) &&
-                (at76_is_503rfmd(priv->board_type) ||
-                 at76_is_505(priv->board_type)))
-                priv->hw->flags = IEEE80211_HW_SIGNAL_UNSPEC;
-        else
-                priv->hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
-                                  IEEE80211_HW_SIGNAL_UNSPEC;
-
-        priv->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
-
-        SET_IEEE80211_DEV(priv->hw, &interface->dev);
-        SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
-
-        ret = ieee80211_register_hw(priv->hw);
+        netdev->flags &= ~IFF_MULTICAST;        /* not yet or never */
+        netdev->open = at76_open;
+        netdev->stop = at76_stop;
+        netdev->get_stats = at76_get_stats;
+        netdev->ethtool_ops = &at76_ethtool_ops;
+
+        /* Add pointers to enable iwspy support. */
+        priv->wireless_data.spy_data = &priv->spy_data;
+        netdev->wireless_data = &priv->wireless_data;
+
+        netdev->hard_start_xmit = at76_tx;
+        netdev->tx_timeout = at76_tx_timeout;
+        netdev->watchdog_timeo = 2 * HZ;
+        netdev->wireless_handlers = &at76_handler_def;
+        netdev->set_multicast_list = at76_set_multicast;
+        netdev->set_mac_address = at76_set_mac_address;
+        dev_alloc_name(netdev, "wlan%d");
+
+        ret = register_netdev(priv->netdev);
         if (ret) {
-                dev_err(dev, "cannot register mac80211 hw (status %d)!\n", ret);
+                dev_printk(KERN_ERR, &interface->dev,
+                           "cannot register netdevice (status %d)!\n", ret);
                 goto exit;
         }
+        priv->netdev_registered = 1;
 
-        priv->mac80211_registered = 1;
+        printk(KERN_INFO "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n",
+               netdev->name, dev_name(&interface->dev), mac2str(priv->mac_addr),
+               priv->fw_version.major, priv->fw_version.minor,
+               priv->fw_version.patch, priv->fw_version.build);
+        printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n", netdev->name,
+               priv->regulatory_domain, priv->domain->name);
 
-        dev_info(dev, "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n",
-                 wiphy_name(priv->hw->wiphy),
-                 dev_name(&interface->dev), mac2str(priv->mac_addr),
-                 priv->fw_version.major, priv->fw_version.minor,
-                 priv->fw_version.patch, priv->fw_version.build);
-        dev_info(dev, "%s: regulatory domain 0x%02x: %s\n",
-                 wiphy_name(priv->hw->wiphy),
-                 priv->regulatory_domain, priv->domain->name);
-        dev_info(dev, "%s: WPA support: ", wiphy_name(priv->hw->wiphy));
-        if (!FIRMWARE_IS_WPA(priv->fw_version))
-                printk("none\n");
-        else {
-                if (!at76_is_505a(priv->board_type))
-                        printk("TKIP\n");
-                else
-                        printk("TKIP, AES/CCMP\n");
-        };
+        /* we let this timer run the whole time this driver instance lives */
+        mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT);
 
 exit:
         return ret;
@@ -2556,13 +5344,15 @@ exit:
 
 static void at76_delete_device(struct at76_priv *priv)
 {
+        int i;
+
         at76_dbg(DBG_PROC_ENTRY, "%s: ENTER", __func__);
 
         /* The device is gone, don't bother turning it off */
         priv->device_unplugged = 1;
 
-        if (priv->mac80211_registered)
-                ieee80211_unregister_hw(priv->hw);
+        if (priv->netdev_registered)
+                unregister_netdev(priv->netdev);
 
         /* assuming we used keventd, it must quiesce too */
         flush_scheduled_work();
@@ -2583,11 +5373,25 @@ static void at76_delete_device(struct at76_priv *priv)
         if (priv->rx_skb)
                 kfree_skb(priv->rx_skb);
 
+        at76_free_bss_list(priv);
+        del_timer_sync(&priv->bss_list_timer);
+        cancel_delayed_work(&priv->dwork_get_scan);
+        cancel_delayed_work(&priv->dwork_beacon);
+        cancel_delayed_work(&priv->dwork_auth);
+        cancel_delayed_work(&priv->dwork_assoc);
+
+        if (priv->mac_state == MAC_CONNECTED)
+                at76_iwevent_bss_disconnect(priv->netdev);
+
+        for (i = 0; i < NR_RX_DATA_BUF; i++)
+                if (priv->rx_data[i].skb) {
+                        dev_kfree_skb(priv->rx_data[i].skb);
+                        priv->rx_data[i].skb = NULL;
+                }
         usb_put_dev(priv->udev);
 
-        at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/ieee80211_hw",
-                 __func__);
-        ieee80211_free_hw(priv->hw);
+        at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/netdev", __func__);
+        free_netdev(priv->netdev);      /* priv is in netdev */
 
         at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__);
 }
@@ -2621,8 +5425,8 @@ static int at76_probe(struct usb_interface *interface,
            we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */
 
         if (op_mode == OPMODE_HW_CONFIG_MODE) {
-                dev_err(&interface->dev,
-                        "cannot handle a device in HW_CONFIG_MODE\n");
+                dev_printk(KERN_ERR, &interface->dev,
+                           "cannot handle a device in HW_CONFIG_MODE\n");
                 ret = -EBUSY;
                 goto error;
         }
@@ -2630,12 +5434,13 @@ static int at76_probe(struct usb_interface *interface,
         if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH
             && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) {
                 /* download internal firmware part */
-                dev_dbg(&interface->dev, "downloading internal firmware\n");
+                dev_printk(KERN_DEBUG, &interface->dev,
+                           "downloading internal firmware\n");
                 ret = at76_load_internal_fw(udev, fwe);
                 if (ret < 0) {
-                        dev_err(&interface->dev,
-                                "error %d downloading internal firmware\n",
-                                ret);
+                        dev_printk(KERN_ERR, &interface->dev,
+                                   "error %d downloading internal firmware\n",
+                                   ret);
                         goto error;
                 }
                 usb_put_dev(udev);
@@ -2660,7 +5465,8 @@ static int at76_probe(struct usb_interface *interface,
                 need_ext_fw = 1;
 
         if (need_ext_fw) {
-                dev_dbg(&interface->dev, "downloading external firmware\n");
+                dev_printk(KERN_DEBUG, &interface->dev,
+                           "downloading external firmware\n");
 
                 ret = at76_load_external_fw(udev, fwe);
                 if (ret)
@@ -2669,8 +5475,8 @@ static int at76_probe(struct usb_interface *interface,
                 /* Re-check firmware version */
                 ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv));
                 if (ret < 0) {
-                        dev_err(&interface->dev,
-                                "error %d getting firmware version\n", ret);
+                        dev_printk(KERN_ERR, &interface->dev,
+                                   "error %d getting firmware version\n", ret);
                         goto error;
                 }
         }
@@ -2681,6 +5487,7 @@ static int at76_probe(struct usb_interface *interface,
                 goto error;
         }
 
+        SET_NETDEV_DEV(priv->netdev, &interface->dev);
         usb_set_intfdata(interface, priv);
 
         memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version));
@@ -2708,7 +5515,7 @@ static void at76_disconnect(struct usb_interface *interface)
         if (!priv)
                 return;
 
-        printk(KERN_INFO "%s: disconnecting\n", wiphy_name(priv->hw->wiphy));
+        printk(KERN_INFO "%s: disconnecting\n", priv->netdev->name);
         at76_delete_device(priv);
         dev_printk(KERN_INFO, &interface->dev, "disconnected\n");
 }
@@ -2764,8 +5571,5 @@ MODULE_AUTHOR("Alex <alex@foogod.com>");
 MODULE_AUTHOR("Nick Jones");
 MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453@hotmail.com>");
 MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>");
-MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
-MODULE_AUTHOR("Kalle Valo <kalle.valo@iki.fi>");
-MODULE_AUTHOR("Milan Plzik <milan.plzik@gmail.com>");
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/at76_usb/at76_usb.h b/drivers/staging/at76_usb/at76_usb.h
index 8bb352f16d45..b20be9da1fa1 100644
--- a/drivers/staging/at76_usb/at76_usb.h
+++ b/drivers/staging/at76_usb/at76_usb.h
@@ -34,6 +34,23 @@ enum board_type {
         BOARD_505AMX = 8
 };
 
+/* our private ioctl's */
+/* preamble length (0 - long, 1 - short, 2 - auto) */
+#define AT76_SET_SHORT_PREAMBLE         (SIOCIWFIRSTPRIV + 0)
+#define AT76_GET_SHORT_PREAMBLE         (SIOCIWFIRSTPRIV + 1)
+/* which debug channels are enabled */
+#define AT76_SET_DEBUG                  (SIOCIWFIRSTPRIV + 2)
+#define AT76_GET_DEBUG                  (SIOCIWFIRSTPRIV + 3)
+/* power save mode (incl. the Atmel proprietary smart save mode) */
+#define AT76_SET_POWERSAVE_MODE         (SIOCIWFIRSTPRIV + 4)
+#define AT76_GET_POWERSAVE_MODE         (SIOCIWFIRSTPRIV + 5)
+/* min and max channel times for scan */
+#define AT76_SET_SCAN_TIMES             (SIOCIWFIRSTPRIV + 6)
+#define AT76_GET_SCAN_TIMES             (SIOCIWFIRSTPRIV + 7)
+/* scan mode (0 - active, 1 - passive) */
+#define AT76_SET_SCAN_MODE              (SIOCIWFIRSTPRIV + 8)
+#define AT76_GET_SCAN_MODE              (SIOCIWFIRSTPRIV + 9)
+
 #define CMD_STATUS_IDLE                         0x00
 #define CMD_STATUS_COMPLETE                     0x01
 #define CMD_STATUS_UNKNOWN                      0x02
@@ -65,7 +82,6 @@ enum board_type {
 #define MIB_MAC                 0x03
 #define MIB_MAC_MGMT            0x05
 #define MIB_MAC_WEP             0x06
-#define MIB_MAC_ENCRYPTION      0x06
 #define MIB_PHY                 0x07
 #define MIB_FW_VERSION          0x08
 #define MIB_MDOMAIN             0x09
@@ -90,26 +106,6 @@ enum board_type {
 #define AT76_PM_ON              2
 #define AT76_PM_SMART           3
 
-/* cipher values for encryption keys */
-#define CIPHER_NONE             0       /* this value is only guessed */
-#define CIPHER_WEP64            1
-#define CIPHER_TKIP             2
-#define CIPHER_CCMP             3
-#define CIPHER_CCX              4       /* for consistency sake only */
-#define CIPHER_WEP128           5
-
-/* bit flags key types for encryption keys */
-#define KEY_PAIRWISE            2
-#define KEY_TX                  4
-
-#define CIPHER_KEYS             (4)
-#define CIPHER_KEY_LEN          (40)
-
-struct key_config {
-        u8 cipher;
-        u8 keylen;
-};
-
 struct hwcfg_r505 {
         u8 cr39_values[14];
         u8 reserved1[14];
@@ -151,9 +147,6 @@ union at76_hwcfg {
 
 #define WEP_SMALL_KEY_LEN       (40 / 8)
 #define WEP_LARGE_KEY_LEN       (104 / 8)
-#define WEP_KEYS                (4)
-
-
 
 struct at76_card_config {
         u8 exclude_unencrypted;
@@ -168,7 +161,7 @@ struct at76_card_config {
         u8 privacy_invoked;
         u8 wep_default_key_id;  /* 0..3 */
         u8 current_ssid[32];
-        u8 wep_default_key_value[4][WEP_LARGE_KEY_LEN];
+        u8 wep_default_key_value[4][WEP_KEY_LEN];
         u8 ssid_len;
         u8 short_preamble;
         __le16 beacon_period;
@@ -193,7 +186,7 @@ struct at76_rx_buffer {
         u8 link_quality;
         u8 noise_level;
         __le32 rx_time;
-        u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
+        u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN];
 } __attribute__((packed));
 
 /* Length of Atmel-specific Tx header before 802.11 frame */
@@ -203,11 +196,8 @@ struct at76_tx_buffer {
         __le16 wlength;
         u8 tx_rate;
         u8 padding;
-        u8 key_id;
-        u8 cipher_type;
-        u8 cipher_length;
-        u8 reserved;
-        u8 packet[IEEE80211_MAX_FRAG_THRESHOLD];
+        u8 reserved[4];
+        u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN];
 } __attribute__((packed));
 
 /* defines for scan_type below */
@@ -254,7 +244,6 @@ struct set_mib_buffer {
                 u8 byte;
                 __le16 word;
                 u8 addr[ETH_ALEN];
-                u8 data[256];   /* we need more space for mib_mac_encryption */
         } data;
 } __attribute__((packed));
 
@@ -328,24 +317,10 @@ struct mib_mac_wep {
         u8 exclude_unencrypted;
         __le32 wep_icv_error_count;
         __le32 wep_excluded_count;
-        u8 wep_default_keyvalue[WEP_KEYS][WEP_LARGE_KEY_LEN];
+        u8 wep_default_keyvalue[WEP_KEYS][WEP_KEY_LEN];
         u8 encryption_level;    /* 1 for 40bit, 2 for 104bit encryption */
 } __attribute__((packed));
 
-struct mib_mac_encryption {
-        u8 cipher_default_keyvalue[CIPHER_KEYS][CIPHER_KEY_LEN];
-        u8 tkip_bssid[6];
-        u8 privacy_invoked;
-        u8 cipher_default_key_id;
-        u8 cipher_default_group_key_id;
-        u8 exclude_unencrypted;
-        u8 wep_encryption_type;
-        u8 ckip_key_permutation;        /* bool */
-        __le32 wep_icv_error_count;
-        __le32 wep_excluded_count;
-        u8 key_rsc[CIPHER_KEYS][8];
-} __attribute__((packed));
-
 struct mib_phy {
         __le32 ed_threshold;
 
@@ -389,6 +364,16 @@ struct at76_fw_header {
         __le32 ext_fw_len;      /* external firmware image length */
 } __attribute__((packed));
 
+enum mac_state {
+        MAC_INIT,
+        MAC_SCANNING,
+        MAC_AUTH,
+        MAC_ASSOC,
+        MAC_JOINING,
+        MAC_CONNECTED,
+        MAC_OWN_IBSS
+};
+
 /* a description of a regulatory domain and the allowed channels */
 struct reg_domain {
         u16 code;
@@ -396,6 +381,47 @@ struct reg_domain {
         u32 channel_map;        /* if bit N is set, channel (N+1) is allowed */
 };
 
+/* how long do we keep a (I)BSS in the bss_list in jiffies
+   this should be long enough for the user to retrieve the table
+   (by iwlist ?) after the device started, because all entries from
+   other channels than the one the device locks on get removed, too */
+#define BSS_LIST_TIMEOUT        (120 * HZ)
+/* struct to store BSS info found during scan */
+#define BSS_LIST_MAX_RATE_LEN   32      /* 32 rates should be enough ... */
+
+struct bss_info {
+        struct list_head list;
+
+        u8 bssid[ETH_ALEN];     /* bssid */
+        u8 ssid[IW_ESSID_MAX_SIZE];     /* essid */
+        u8 ssid_len;            /* length of ssid above */
+        u8 channel;
+        u16 capa;               /* BSS capabilities */
+        u16 beacon_interval;    /* beacon interval, Kus (1024 microseconds) */
+        u8 rates[BSS_LIST_MAX_RATE_LEN];        /* supported rates in units of
+                                                   500 kbps, ORed with 0x80 for
+                                                   basic rates */
+        u8 rates_len;
+
+        /* quality of received beacon */
+        u8 rssi;
+        u8 link_qual;
+        u8 noise_level;
+
+        unsigned long last_rx;  /* time (jiffies) of last beacon received */
+};
+
+/* a rx data buffer to collect rx fragments */
+struct rx_data_buf {
+        u8 sender[ETH_ALEN];    /* sender address */
+        u16 seqnr;              /* sequence number */
+        u16 fragnr;             /* last fragment received */
+        unsigned long last_rx;  /* jiffies of last rx */
+        struct sk_buff *skb;    /* == NULL if entry is free */
+};
+
+#define NR_RX_DATA_BUF          8
+
 /* Data for one loaded firmware file */
 struct fwentry {
         const char *const fwname;
@@ -412,9 +438,11 @@ struct fwentry {
 
 struct at76_priv {
         struct usb_device *udev;        /* USB device pointer */
+        struct net_device *netdev;      /* net device pointer */
+        struct net_device_stats stats;  /* net device stats */
+        struct iw_statistics wstats;    /* wireless stats */
 
         struct sk_buff *rx_skb; /* skbuff for receiving data */
-        struct sk_buff *tx_skb; /* skbuff for transmitting data */
         void *bulk_out_buffer;  /* buffer for sending data */
 
         struct urb *tx_urb;     /* URB for sending data */
@@ -426,17 +454,26 @@ struct at76_priv {
         struct mutex mtx;       /* locks this structure */
 
         /* work queues */
+        struct work_struct work_assoc_done;
+        struct work_struct work_join;
+        struct work_struct work_new_bss;
+        struct work_struct work_start_scan;
         struct work_struct work_set_promisc;
         struct work_struct work_submit_rx;
-        struct delayed_work dwork_hw_scan;
+        struct delayed_work dwork_restart;
+        struct delayed_work dwork_get_scan;
+        struct delayed_work dwork_beacon;
+        struct delayed_work dwork_auth;
+        struct delayed_work dwork_assoc;
 
         struct tasklet_struct rx_tasklet;
 
         /* the WEP stuff */
         int wep_enabled;        /* 1 if WEP is enabled */
         int wep_key_id;         /* key id to be used */
-        u8 wep_keys[WEP_KEYS][WEP_LARGE_KEY_LEN];       /* WEP keys */
-        u8 wep_keys_len[WEP_KEYS];      /* length of WEP keys */
+        u8 wep_keys[WEP_KEYS][WEP_KEY_LEN];     /* the four WEP keys,
+                                                   5 or 13 bytes are used */
+        u8 wep_keys_len[WEP_KEYS];      /* the length of the above keys */
 
         int channel;
         int iw_mode;
@@ -458,13 +495,44 @@ struct at76_priv {
         int scan_mode;          /* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */
         int scan_need_any;      /* if set, need to scan for any ESSID */
 
+        /* the list we got from scanning */
+        spinlock_t bss_list_spinlock;   /* protects bss_list operations */
+        struct list_head bss_list;      /* list of BSS we got beacons from */
+        struct timer_list bss_list_timer;       /* timer to purge old entries
+                                                   from bss_list */
+        struct bss_info *curr_bss;      /* current BSS */
         u16 assoc_id;           /* current association ID, if associated */
 
+        u8 wanted_bssid[ETH_ALEN];
+        int wanted_bssid_valid; /* != 0 if wanted_bssid is to be used */
+
+        /* some data for infrastructure mode only */
+        spinlock_t mgmt_spinlock;       /* this spinlock protects access to
+                                           next_mgmt_bulk */
+
+        struct at76_tx_buffer *next_mgmt_bulk;  /* pending management msg to
+                                                   send via bulk out */
+        enum mac_state mac_state;
+        enum {
+                SCAN_IDLE,
+                SCAN_IN_PROGRESS,
+                SCAN_COMPLETED
+        } scan_state;
+        time_t last_scan;
+
+        int retries;            /* remaining retries in case of timeout when
+                                 * sending AuthReq or AssocReq */
         u8 pm_mode;             /* power management mode */
         u32 pm_period;          /* power management period in microseconds */
 
         struct reg_domain const *domain;        /* reg domain description */
 
+        /* iwspy support */
+        spinlock_t spy_spinlock;
+        struct iw_spy_data spy_data;
+
+        struct iw_public_data wireless_data;
+
         /* These fields contain HW config provided by the device (not all of
          * these fields are used by all board types) */
         u8 mac_addr[ETH_ALEN];
@@ -472,6 +540,9 @@ struct at76_priv {
 
         struct at76_card_config card_config;
 
+        /* store rx fragments until complete */
+        struct rx_data_buf rx_data[NR_RX_DATA_BUF];
+
         enum board_type board_type;
         struct mib_fw_version fw_version;
 
@@ -479,20 +550,58 @@ struct at76_priv {
         unsigned int netdev_registered:1;
         struct set_mib_buffer mib_buf;  /* global buffer for set_mib calls */
 
+        /* beacon counting */
         int beacon_period;      /* period of mgmt beacons, Kus */
+        int beacons_received;
+        unsigned long beacons_last_qual;        /* time we restarted counting
+                                                   beacons */
+};
 
-        struct ieee80211_hw *hw;
-        int mac80211_registered;
-
-        struct key_config keys[4];      /* installed key types */
-        u8 default_pairwise_key;
-        u8 default_group_key;
+struct at76_rx_radiotap {
+        struct ieee80211_radiotap_header rt_hdr;
+        __le64 rt_tsft;
+        u8 rt_flags;
+        u8 rt_rate;
+        s8 rt_signal;
+        s8 rt_noise;
 };
 
-#define AT76_SUPPORTED_FILTERS FIF_PROMISC_IN_BSS
+#define AT76_RX_RADIOTAP_PRESENT                  \
+        ((1 << IEEE80211_RADIOTAP_TSFT)         | \
+        (1 << IEEE80211_RADIOTAP_FLAGS)         | \
+        (1 << IEEE80211_RADIOTAP_RATE)          | \
+        (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL)  | \
+        (1 << IEEE80211_RADIOTAP_DB_ANTNOISE))
+
+#define BEACON_MAX_DATA_LENGTH  1500
+
+/* the maximum size of an AssocReq packet */
+#define ASSOCREQ_MAX_SIZE \
+  (AT76_TX_HDRLEN + sizeof(struct ieee80211_assoc_request) + \
+   1 + 1 + IW_ESSID_MAX_SIZE + 1 + 1 + 4)
+
+/* for shared secret auth, add the challenge text size */
+#define AUTH_FRAME_SIZE (AT76_TX_HDRLEN + sizeof(struct ieee80211_auth))
+
+/* Maximal number of AuthReq retries */
+#define AUTH_RETRIES            3
 
+/* Maximal number of AssocReq retries */
+#define ASSOC_RETRIES           3
+
+/* Beacon timeout in managed mode when we are connected */
+#define BEACON_TIMEOUT          (10 * HZ)
+
+/* Timeout for authentication response */
+#define AUTH_TIMEOUT            (1 * HZ)
+
+/* Timeout for association response */
+#define ASSOC_TIMEOUT           (1 * HZ)
+
+/* Polling interval when scan is running */
 #define SCAN_POLL_INTERVAL      (HZ / 4)
 
+/* Command completion timeout */
 #define CMD_COMPLETION_TIMEOUT  (5 * HZ)
 
 #define DEF_RTS_THRESHOLD       1536
@@ -502,6 +611,8 @@ struct at76_priv {
 #define DEF_SCAN_MIN_TIME       10
 #define DEF_SCAN_MAX_TIME       120
 
+#define MAX_RTS_THRESHOLD       (MAX_FRAG_THRESHOLD + 1)
+
 /* the max padding size for tx in bytes (see calc_padding) */
 #define MAX_PADDING_SIZE        53
 
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 5ffe269c2382..ab69c1bf36a8 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -622,7 +622,7 @@ static int set_ctrl_bits(void)
 }
 
 /* sets ctrl & data port bits according to current signals values */
-static void set_bits(void)
+static void panel_set_bits(void)
 {
         set_data_bits();
         set_ctrl_bits();
@@ -707,12 +707,12 @@ static void lcd_send_serial(int byte)
          */
         for (bit = 0; bit < 8; bit++) {
                 bits.cl = BIT_CLR;      /* CLK low */
-                set_bits();
+                panel_set_bits();
                 bits.da = byte & 1;
-                set_bits();
+                panel_set_bits();
                 udelay(2);      /* maintain the data during 2 us before CLK up */
                 bits.cl = BIT_SET;      /* CLK high */
-                set_bits();
+                panel_set_bits();
                 udelay(1);      /* maintain the strobe during 1 us */
                 byte >>= 1;
         }
@@ -727,7 +727,7 @@ static void lcd_backlight(int on)
         /* The backlight is activated by seting the AUTOFEED line to +5V  */
         spin_lock(&pprt_lock);
         bits.bl = on;
-        set_bits();
+        panel_set_bits();
         spin_unlock(&pprt_lock);
 }
 
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 8bcde8cde554..b2ceb4aff233 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_USB_MON)		+= mon/
 obj-$(CONFIG_PCI)               += host/
 obj-$(CONFIG_USB_EHCI_HCD)      += host/
 obj-$(CONFIG_USB_ISP116X_HCD)   += host/
+obj-$(CONFIG_USB_ISP1760_HCD)   += host/
 obj-$(CONFIG_USB_OHCI_HCD)      += host/
 obj-$(CONFIG_USB_UHCI_HCD)      += host/
 obj-$(CONFIG_USB_FHCI_HCD)      += host/
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 97ba4a985edc..326dd7f65ee9 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1349,9 +1349,6 @@ static struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x0e8d, 0x0003), /* FIREFLY, MediaTek Inc; andrey.arapov@gmail.com */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
-        { USB_DEVICE(0x0e8d, 0x3329), /* i-blue 747, Qstarz BT-Q1000, Holux M-241 */
-        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
-        },
         { USB_DEVICE(0x0e8d, 0x3329), /* MediaTek Inc GPS */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index c54fc40458b1..a4301dc02d27 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -298,19 +298,6 @@ int usb_hcd_pci_suspend(struct pci_dev *dev, pm_message_t message)
 EXPORT_SYMBOL_GPL(usb_hcd_pci_suspend);
 
 /**
- * usb_hcd_pci_resume_early - resume a PCI-based HCD before IRQs are enabled
- * @dev: USB Host Controller being resumed
- *
- * Store this function in the HCD's struct pci_driver as .resume_early.
- */
-int usb_hcd_pci_resume_early(struct pci_dev *dev)
-{
-        pci_restore_state(dev);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(usb_hcd_pci_resume_early);
-
-/**
  * usb_hcd_pci_resume - power management resume of a PCI-based HCD
  * @dev: USB Host Controller being resumed
  *
@@ -333,6 +320,8 @@ int usb_hcd_pci_resume(struct pci_dev *dev)
         }
 #endif
 
+        pci_restore_state(dev);
+
         hcd = pci_get_drvdata(dev);
         if (hcd->state != HC_STATE_SUSPENDED) {
                 dev_dbg(hcd->self.controller,
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 5b94a56bec23..f750eb1ab595 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -257,7 +257,6 @@ extern void usb_hcd_pci_remove(struct pci_dev *dev);
 
 #ifdef CONFIG_PM
 extern int usb_hcd_pci_suspend(struct pci_dev *dev, pm_message_t msg);
-extern int usb_hcd_pci_resume_early(struct pci_dev *dev);
 extern int usb_hcd_pci_resume(struct pci_dev *dev);
 #endif /* CONFIG_PM */
 
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index d6c5bcd40064..d701bf4698d2 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -1622,6 +1622,8 @@ static int qe_ep_disable(struct usb_ep *_ep)
         nuke(ep, -ESHUTDOWN);
         ep->desc = NULL;
         ep->stopped = 1;
+        ep->tx_req = NULL;
+        qe_ep_reset(udc, ep->epnum);
         spin_unlock_irqrestore(&udc->lock, flags);
 
         cpm_muram_free(cpm_muram_offset(ep->rxbase));
@@ -1681,14 +1683,11 @@ static void qe_free_request(struct usb_ep *_ep, struct usb_request *_req)
                 kfree(req);
 }
 
-/* queues (submits) an I/O request to an endpoint */
-static int qe_ep_queue(struct usb_ep *_ep, struct usb_request *_req,
-                                gfp_t gfp_flags)
+static int __qe_ep_queue(struct usb_ep *_ep, struct usb_request *_req)
 {
         struct qe_ep *ep = container_of(_ep, struct qe_ep, ep);
         struct qe_req *req = container_of(_req, struct qe_req, req);
         struct qe_udc *udc;
-        unsigned long flags;
         int reval;
 
         udc = ep->udc;
@@ -1732,7 +1731,7 @@ static int qe_ep_queue(struct usb_ep *_ep, struct usb_request *_req,
         list_add_tail(&req->queue, &ep->queue);
         dev_vdbg(udc->dev, "gadget have request in %s! %d\n",
                         ep->name, req->req.length);
-        spin_lock_irqsave(&udc->lock, flags);
+
         /* push the request to device */
         if (ep_is_in(ep))
                 reval = ep_req_send(ep, req);
@@ -1748,11 +1747,24 @@ static int qe_ep_queue(struct usb_ep *_ep, struct usb_request *_req,
         if (ep->dir == USB_DIR_OUT)
                 reval = ep_req_receive(ep, req);
 
-        spin_unlock_irqrestore(&udc->lock, flags);
-
         return 0;
 }
 
+/* queues (submits) an I/O request to an endpoint */
+static int qe_ep_queue(struct usb_ep *_ep, struct usb_request *_req,
+                       gfp_t gfp_flags)
+{
+        struct qe_ep *ep = container_of(_ep, struct qe_ep, ep);
+        struct qe_udc *udc = ep->udc;
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&udc->lock, flags);
+        ret = __qe_ep_queue(_ep, _req);
+        spin_unlock_irqrestore(&udc->lock, flags);
+        return ret;
+}
+
 /* dequeues (cancels, unlinks) an I/O request from an endpoint */
 static int qe_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 {
@@ -2008,7 +2020,7 @@ static void ch9getstatus(struct qe_udc *udc, u8 request_type, u16 value,
         udc->ep0_dir = USB_DIR_IN;
 
         /* data phase */
-        status = qe_ep_queue(&ep->ep, &req->req, GFP_ATOMIC);
+        status = __qe_ep_queue(&ep->ep, &req->req);
 
         if (status == 0)
                 return;
@@ -2151,6 +2163,9 @@ static int reset_irq(struct qe_udc *udc)
 {
         unsigned char i;
 
+        if (udc->usb_state == USB_STATE_DEFAULT)
+                return 0;
+
         qe_usb_disable();
         out_8(&udc->usb_regs->usb_usadr, 0);
 
@@ -2442,8 +2457,12 @@ static int __devinit qe_udc_reg_init(struct qe_udc *udc)
         struct usb_ctlr __iomem *qe_usbregs;
         qe_usbregs = udc->usb_regs;
 
-        /* Init the usb register */
+        /* Spec says that we must enable the USB controller to change mode. */
         out_8(&qe_usbregs->usb_usmod, 0x01);
+        /* Mode changed, now disable it, since muram isn't initialized yet. */
+        out_8(&qe_usbregs->usb_usmod, 0x00);
+
+        /* Initialize the rest. */
         out_be16(&qe_usbregs->usb_usbmr, 0);
         out_8(&qe_usbregs->usb_uscom, 0);
         out_be16(&qe_usbregs->usb_usber, USBER_ALL_CLEAR);
@@ -2604,6 +2623,10 @@ static int __devinit qe_udc_probe(struct of_device *ofdev,
                         (unsigned long)udc_controller);
         /* request irq and disable DR  */
         udc_controller->usb_irq = irq_of_parse_and_map(np, 0);
+        if (!udc_controller->usb_irq) {
+                ret = -EINVAL;
+                goto err_noirq;
+        }
 
         ret = request_irq(udc_controller->usb_irq, qe_udc_irq, 0,
                                 driver_name, udc_controller);
@@ -2625,6 +2648,8 @@ static int __devinit qe_udc_probe(struct of_device *ofdev,
 err6:
         free_irq(udc_controller->usb_irq, udc_controller);
 err5:
+        irq_dispose_mapping(udc_controller->usb_irq);
+err_noirq:
         if (udc_controller->nullmap) {
                 dma_unmap_single(udc_controller->gadget.dev.parent,
                         udc_controller->nullp, 256,
@@ -2648,7 +2673,7 @@ err2:
         iounmap(udc_controller->usb_regs);
 err1:
         kfree(udc_controller);
-
+        udc_controller = NULL;
         return ret;
 }
 
@@ -2710,6 +2735,7 @@ static int __devexit qe_udc_remove(struct of_device *ofdev)
         kfree(ep->txframe);
 
         free_irq(udc_controller->usb_irq, udc_controller);
+        irq_dispose_mapping(udc_controller->usb_irq);
 
         tasklet_kill(&udc_controller->rx_tasklet);
 
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 9b36205c5759..0ce4e2819847 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -904,8 +904,8 @@ static void pxa25x_ep_fifo_flush(struct usb_ep *_ep)
 
         /* most IN status is the same, but ISO can't stall */
         *ep->reg_udccs = UDCCS_BI_TPC|UDCCS_BI_FTF|UDCCS_BI_TUR
-                | (ep->bmAttributes == USB_ENDPOINT_XFER_ISOC)
-                        ? 0 : UDCCS_BI_SST;
+                | (ep->bmAttributes == USB_ENDPOINT_XFER_ISOC
+                        ? 0 : UDCCS_BI_SST);
 }
 
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index bb21fb0a4969..abb9a7706ec7 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -432,7 +432,6 @@ static struct pci_driver ehci_pci_driver = {
 
 #ifdef  CONFIG_PM
         .suspend =      usb_hcd_pci_suspend,
-        .resume_early = usb_hcd_pci_resume_early,
         .resume =       usb_hcd_pci_resume,
 #endif
         .shutdown =     usb_hcd_pci_shutdown,
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 5d625c3fd423..f9961b4c0da3 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -487,7 +487,6 @@ static struct pci_driver ohci_pci_driver = {
 
 #ifdef  CONFIG_PM
         .suspend =      usb_hcd_pci_suspend,
-        .resume_early = usb_hcd_pci_resume_early,
         .resume =       usb_hcd_pci_resume,
 #endif
 
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 944f7e0ca4df..cf5e4cf7ea42 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -942,7 +942,6 @@ static struct pci_driver uhci_pci_driver = {
 
 #ifdef  CONFIG_PM
         .suspend =      usb_hcd_pci_suspend,
-        .resume_early = usb_hcd_pci_resume_early,
         .resume =       usb_hcd_pci_resume,
 #endif  /* PM */
 };
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c
index 2291c5f5af51..958751ccea43 100644
--- a/drivers/usb/host/whci/asl.c
+++ b/drivers/usb/host/whci/asl.c
@@ -227,13 +227,13 @@ void scan_async_work(struct work_struct *work)
          * Now that the ASL is updated, complete the removal of any
          * removed qsets.
          */
-        spin_lock(&whc->lock);
+        spin_lock_irq(&whc->lock);
 
         list_for_each_entry_safe(qset, t, &whc->async_removed_list, list_node) {
                 qset_remove_complete(whc, qset);
         }
 
-        spin_unlock(&whc->lock);
+        spin_unlock_irq(&whc->lock);
 }
 
 /**
diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c
index 7dc85a0bee7c..df8b85f07092 100644
--- a/drivers/usb/host/whci/pzl.c
+++ b/drivers/usb/host/whci/pzl.c
@@ -255,13 +255,13 @@ void scan_periodic_work(struct work_struct *work)
          * Now that the PZL is updated, complete the removal of any
          * removed qsets.
          */
-        spin_lock(&whc->lock);
+        spin_lock_irq(&whc->lock);
 
         list_for_each_entry_safe(qset, t, &whc->periodic_removed_list, list_node) {
                 qset_remove_complete(whc, qset);
         }
 
-        spin_unlock(&whc->lock);
+        spin_unlock_irq(&whc->lock);
 }
 
 /**
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 537f953bd7f8..6d106e74265e 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -621,9 +621,9 @@ static int __init aircable_init(void)
                 goto failed_usb_register;
         return 0;
 
-failed_serial_register:
-        usb_serial_deregister(&aircable_device);
 failed_usb_register:
+        usb_serial_deregister(&aircable_device);
+failed_serial_register:
         return retval;
 }
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 75597337583e..f92f4d773374 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -662,6 +662,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) },
         { USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) },
         { USB_DEVICE(FTDI_VID, DIEBOLD_BCS_SE923_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_NDI_HUC_PID) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
@@ -1064,8 +1065,10 @@ static int set_serial_info(struct tty_struct *tty,
 
         if (!capable(CAP_SYS_ADMIN)) {
                 if (((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (priv->flags & ~ASYNC_USR_MASK)))
+                     (priv->flags & ~ASYNC_USR_MASK))) {
+                        unlock_kernel();
                         return -EPERM;
+                }
                 priv->flags = ((priv->flags & ~ASYNC_USR_MASK) |
                                (new_serial.flags & ASYNC_USR_MASK));
                 priv->custom_divisor = new_serial.custom_divisor;
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 1b62eff475d2..e300c840f8ca 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -844,6 +844,9 @@
 #define TML_VID                 0x1B91  /* Vendor ID */
 #define TML_USB_SERIAL_PID      0x0064  /* USB - Serial Converter */
 
+/* NDI Polaris System */
+#define FTDI_NDI_HUC_PID        0xDA70
+
 /* Propox devices */
 #define FTDI_PROPOX_JTAGCABLEII_PID     0xD738
 
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 6c89da9c6fea..bfd0b68ceccd 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -199,14 +199,15 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 #define NOVATELWIRELESS_PRODUCT_MC950D          0x4400
 
 /* FUTURE NOVATEL PRODUCTS */
-#define NOVATELWIRELESS_PRODUCT_EVDO_1          0x6000
-#define NOVATELWIRELESS_PRODUCT_HSPA_1          0x7000
-#define NOVATELWIRELESS_PRODUCT_EMBEDDED_1      0x8000
-#define NOVATELWIRELESS_PRODUCT_GLOBAL_1        0x9000
-#define NOVATELWIRELESS_PRODUCT_EVDO_2          0x6001
-#define NOVATELWIRELESS_PRODUCT_HSPA_2          0x7001
-#define NOVATELWIRELESS_PRODUCT_EMBEDDED_2      0x8001
-#define NOVATELWIRELESS_PRODUCT_GLOBAL_2        0x9001
+#define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED  0X6000
+#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED  0X6001
+#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED  0X7000
+#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED  0X7001
+#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0X8000
+#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0X8001
+#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0X9000
+#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0X9001
+#define NOVATELWIRELESS_PRODUCT_GLOBAL          0XA001
 
 /* AMOI PRODUCTS */
 #define AMOI_VENDOR_ID                          0x1614
@@ -216,6 +217,27 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 
 #define DELL_VENDOR_ID                          0x413C
 
+/* Dell modems */
+#define DELL_PRODUCT_5700_MINICARD              0x8114
+#define DELL_PRODUCT_5500_MINICARD              0x8115
+#define DELL_PRODUCT_5505_MINICARD              0x8116
+#define DELL_PRODUCT_5700_EXPRESSCARD           0x8117
+#define DELL_PRODUCT_5510_EXPRESSCARD           0x8118
+
+#define DELL_PRODUCT_5700_MINICARD_SPRINT       0x8128
+#define DELL_PRODUCT_5700_MINICARD_TELUS        0x8129
+
+#define DELL_PRODUCT_5720_MINICARD_VZW          0x8133
+#define DELL_PRODUCT_5720_MINICARD_SPRINT       0x8134
+#define DELL_PRODUCT_5720_MINICARD_TELUS        0x8135
+#define DELL_PRODUCT_5520_MINICARD_CINGULAR     0x8136
+#define DELL_PRODUCT_5520_MINICARD_GENERIC_L    0x8137
+#define DELL_PRODUCT_5520_MINICARD_GENERIC_I    0x8138
+
+#define DELL_PRODUCT_5730_MINICARD_SPRINT       0x8180
+#define DELL_PRODUCT_5730_MINICARD_TELUS        0x8181
+#define DELL_PRODUCT_5730_MINICARD_VZW          0x8182
+
 #define KYOCERA_VENDOR_ID                       0x0c88
 #define KYOCERA_PRODUCT_KPC650                  0x17da
 #define KYOCERA_PRODUCT_KPC680                  0x180a
@@ -274,12 +296,6 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 #define ERICSSON_VENDOR_ID                      0x0bdb
 #define ERICSSON_PRODUCT_F3507G                 0x1900
 
-/* Pantech products */
-#define PANTECH_VENDOR_ID                       0x106c
-#define PANTECH_PRODUCT_PC5740                  0x3701
-#define PANTECH_PRODUCT_PC5750                  0x3702  /* PX-500 */
-#define PANTECH_PRODUCT_UM150                   0x3711
-
 static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -395,31 +411,37 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_1) }, /* Novatel Global product */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_2) }, /* Novatel EVDO product */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_2) }, /* Novatel HSPA product */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_2) }, /* Novatel Embedded product */
-        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_2) }, /* Novatel Global product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) }, /* Novatel EVDO product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, /* Novatel HSPA Embedded product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, /* Novatel EVDO product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) }, /* Novatel HSPA product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, /* Novatel EVDO Embedded product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, /* Novatel HSPA Embedded product */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL) }, /* Novatel Global product */
 
         { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
         { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
         { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) },
 
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8116) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8129) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8133) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8136) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8137) }, /* Dell Wireless HSDPA 5520 */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
-        { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD) },             /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5500_MINICARD) },             /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5505_MINICARD) },             /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_EXPRESSCARD) },          /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5510_EXPRESSCARD) },          /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_SPRINT) },      /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_TELUS) },       /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_VZW) },         /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_SPRINT) },      /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_TELUS) },       /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) },    /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) },   /* Dell Wireless HSDPA 5520 */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) },   /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
+        { USB_DEVICE(DELL_VENDOR_ID, 0x8147) },                                 /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) },      /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) },       /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
+        { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) },         /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },   /* ADU-E100, ADU-310 */
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
@@ -488,9 +510,6 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
         { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
         { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) },
-        { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5740) },
-        { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5750) },
-        { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_UM150) },
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index baf591137b80..2620bf6fe5e1 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -176,7 +176,7 @@ static unsigned int product_5052_count;
 /* the array dimension is the number of default entries plus */
 /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */
 /* null entry */
-static struct usb_device_id ti_id_table_3410[7+TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_3410[10+TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
         { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -185,9 +185,11 @@ static struct usb_device_id ti_id_table_3410[7+TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_PRODUCT_ID) },
         { USB_DEVICE(MTS_VENDOR_ID, MTS_EDGE_PRODUCT_ID) },
         { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
+        { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
+        { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
 };
 
-static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
@@ -195,7 +197,7 @@ static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
 };
 
-static struct usb_device_id ti_id_table_combined[6+2*TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_combined[14+2*TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
         { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -208,6 +210,8 @@ static struct usb_device_id ti_id_table_combined[6+2*TI_EXTRA_VID_PID_COUNT+1] =
         { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
         { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
+        { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
+        { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
         { }
 };
 
diff --git a/drivers/usb/serial/ti_usb_3410_5052.h b/drivers/usb/serial/ti_usb_3410_5052.h
index b7ea5dbadee5..f323c6025858 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.h
+++ b/drivers/usb/serial/ti_usb_3410_5052.h
@@ -30,6 +30,8 @@
 #define IBM_VENDOR_ID                   0x04b3
 #define TI_3410_PRODUCT_ID              0x3410
 #define IBM_4543_PRODUCT_ID             0x4543
+#define IBM_454B_PRODUCT_ID             0x454b
+#define IBM_454C_PRODUCT_ID             0x454c
 #define TI_3410_EZ430_ID                0xF430  /* TI ez430 development tool */
 #define TI_5052_BOOT_PRODUCT_ID         0x5052  /* no EEPROM, no firmware */
 #define TI_5152_BOOT_PRODUCT_ID         0x5152  /* no EEPROM, no firmware */
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 2a42b862aa9f..727c506417cc 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -64,6 +64,7 @@
  */
 #define VENDOR_ID_NOKIA         0x0421
 #define VENDOR_ID_NIKON         0x04b0
+#define VENDOR_ID_PENTAX        0x0a17
 #define VENDOR_ID_MOTOROLA      0x22b8
 
 /***********************************************************************
@@ -158,6 +159,7 @@ static int slave_configure(struct scsi_device *sdev)
                 switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) {
                 case VENDOR_ID_NOKIA:
                 case VENDOR_ID_NIKON:
+                case VENDOR_ID_PENTAX:
                 case VENDOR_ID_MOTOROLA:
                         if (!(us->fflags & (US_FL_FIX_CAPACITY |
                                         US_FL_CAPACITY_OK)))
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 1d5438e6363b..fb65d221cedf 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -558,32 +558,10 @@ static void last_sector_hacks(struct us_data *us, struct scsi_cmnd *srb)
 
         if (srb->result == SAM_STAT_GOOD && scsi_get_resid(srb) == 0) {
 
-                /* The command succeeded.  If the capacity is odd
-                 * (i.e., if the sector number is even) then the
-                 * "always-even" heuristic would be wrong for this
-                 * device.  Issue a WARN() so that the kerneloops.org
-                 * project will be notified and we will then know to
-                 * mark the device with a CAPACITY_OK flag.  Hopefully
-                 * this will occur for only a few devices.
-                 *
-                 * Use the sign of us->last_sector_hacks to tell whether
-                 * the warning has already been issued; we don't need
-                 * more than one warning per device.
+                /* The command succeeded.  We know this device doesn't
+                 * have the last-sector bug, so stop checking it.
                  */
-                if (!(sector & 1) && us->use_last_sector_hacks > 0) {
-                        unsigned vid = le16_to_cpu(
-                                        us->pusb_dev->descriptor.idVendor);
-                        unsigned pid = le16_to_cpu(
-                                        us->pusb_dev->descriptor.idProduct);
-                        unsigned rev = le16_to_cpu(
-                                        us->pusb_dev->descriptor.bcdDevice);
-
-                        WARN(1, "%s: Successful last sector success at %u, "
-                                        "device %04x:%04x:%04x\n",
-                                        sdkp->disk->disk_name, sector,
-                                        vid, pid, rev);
-                        us->use_last_sector_hacks = -1;
-                }
+                us->use_last_sector_hacks = 0;
 
         } else {
                 /* The command failed.  Allow up to 3 retries in case this
@@ -599,14 +577,6 @@ static void last_sector_hacks(struct us_data *us, struct scsi_cmnd *srb)
                 srb->result = SAM_STAT_CHECK_CONDITION;
                 memcpy(srb->sense_buffer, record_not_found,
                                 sizeof(record_not_found));
-
-                /* In theory we might want to issue a WARN() here if the
-                 * capacity is even, since it could indicate the device
-                 * has the READ CAPACITY bug _and_ the real capacity is
-                 * odd.  But it could also indicate that the device
-                 * simply can't access its last sector, a failure mode
-                 * which is surprisingly common.  So no warning.
-                 */
         }
 
  done:
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 69269f739563..50dc33a6065b 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1214,7 +1214,7 @@ UNUSUAL_DEV(  0x07c4, 0xa400, 0x0000, 0xffff,
                 "Datafab",
                 "KECF-USB",
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
-                US_FL_FIX_INQUIRY ),
+                US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY ),
 
 /* Reported by Rauch Wolke <rauchwolke@gmx.net> */
 UNUSUAL_DEV(  0x07c4, 0xa4a5, 0x0000, 0xffff,
@@ -1354,21 +1354,6 @@ UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1000,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_INQUIRY ),
 
-
-/* Submitted by Per Winkvist <per.winkvist@uk.com> */
-UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff,
-                "Pentax",
-                "Optio S/S4",
-                US_SC_DEVICE, US_PR_DEVICE, NULL,
-                US_FL_FIX_INQUIRY ),
-
-/* Reported by Jaak Ristioja <Ristioja@gmail.com> */
-UNUSUAL_DEV( 0x0a17, 0x006e, 0x0100, 0x0100,
-                "Pentax",
-                "K10D",
-                US_SC_DEVICE, US_PR_DEVICE, NULL,
-                US_FL_FIX_CAPACITY ),
-
 /* These are virtual windows driver CDs, which the zd1211rw driver
  * automatically converts into WLAN devices. */
 UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101,
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index f0267706cb45..fb19803060cf 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1054,9 +1054,7 @@ config FB_RIVA_BACKLIGHT
 
 config FB_I810
         tristate "Intel 810/815 support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86_32
-        select AGP
-        select AGP_INTEL
+        depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -1119,9 +1117,7 @@ config FB_CARILLO_RANCH
 
 config FB_INTEL
         tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86
-        select AGP
-        select AGP_INTEL
+        depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
         select FB_MODE_HELPERS
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 8058572a7428..018850c116c6 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -841,7 +841,7 @@ static int tt_detect(void)
                 tt_dmasnd.ctrl = DMASND_CTRL_OFF;
                 udelay(20);             /* wait a while for things to settle down */
         }
-        mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+        mono_moni = (st_mfp.par_dt_reg & 0x80) == 0;
 
         tt_get_par(&par);
         tt_encode_var(&atafb_predefined[0], &par);
@@ -2035,7 +2035,7 @@ static int stste_detect(void)
                 tt_dmasnd.ctrl = DMASND_CTRL_OFF;
                 udelay(20);             /* wait a while for things to settle down */
         }
-        mono_moni = (mfp.par_dt_reg & 0x80) == 0;
+        mono_moni = (st_mfp.par_dt_reg & 0x80) == 0;
 
         stste_get_par(&par);
         stste_encode_var(&atafb_predefined[0], &par);
@@ -2086,20 +2086,20 @@ static void st_ovsc_switch(void)
                 return;
         local_irq_save(flags);
 
-        mfp.tim_ct_b = 0x10;
-        mfp.active_edge |= 8;
-        mfp.tim_ct_b = 0;
-        mfp.tim_dt_b = 0xf0;
-        mfp.tim_ct_b = 8;
-        while (mfp.tim_dt_b > 1)        /* TOS does it this way, don't ask why */
+        st_mfp.tim_ct_b = 0x10;
+        st_mfp.active_edge |= 8;
+        st_mfp.tim_ct_b = 0;
+        st_mfp.tim_dt_b = 0xf0;
+        st_mfp.tim_ct_b = 8;
+        while (st_mfp.tim_dt_b > 1)     /* TOS does it this way, don't ask why */
                 ;
-        new = mfp.tim_dt_b;
+        new = st_mfp.tim_dt_b;
         do {
                 udelay(LINE_DELAY);
                 old = new;
-                new = mfp.tim_dt_b;
+                new = st_mfp.tim_dt_b;
         } while (old != new);
-        mfp.tim_ct_b = 0x10;
+        st_mfp.tim_ct_b = 0x10;
         udelay(SYNC_DELAY);
 
         if (atari_switches & ATARI_SWITCH_OVSC_IKBD)
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index db16112cf197..2181ce4d7ebd 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1475,7 +1475,7 @@ static int aty128fb_set_par(struct fb_info *info)
         aty128_set_pll(&par->pll, par);
         aty128_set_fifo(&par->fifo_reg, par);
 
-        config = aty_ld_le32(CONFIG_CNTL) & ~3;
+        config = aty_ld_le32(CNFG_CNTL) & ~3;
 
 #if defined(__BIG_ENDIAN)
         if (par->crtc.bpp == 32)
@@ -1484,7 +1484,7 @@ static int aty128fb_set_par(struct fb_info *info)
                 config |= 1;    /* make aperture do 16 bit swapping */
 #endif
 
-        aty_st_le32(CONFIG_CNTL, config);
+        aty_st_le32(CNFG_CNTL, config);
         aty_st_8(CRTC_EXT_CNTL + 1, 0); /* turn the video back on */
 
         info->fix.line_length = (par->crtc.vxres * par->crtc.bpp) >> 3;
@@ -1875,7 +1875,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
         u32 dac;
 
         /* Get the chip revision */
-        chip_rev = (aty_ld_le32(CONFIG_CNTL) >> 16) & 0x1F;
+        chip_rev = (aty_ld_le32(CNFG_CNTL) >> 16) & 0x1F;
 
         strcpy(video_card, "Rage128 XX ");
         video_card[8] = ent->device >> 8;
@@ -2057,7 +2057,7 @@ static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_
 
         /* Grab memory size from the card */
         // How does this relate to the resource length from the PCI hardware?
-        par->vram_size = aty_ld_le32(CONFIG_MEMSIZE) & 0x03FFFFFF;
+        par->vram_size = aty_ld_le32(CNFG_MEMSIZE) & 0x03FFFFFF;
 
         /* Virtualize the framebuffer */
         info->screen_base = ioremap(fb_addr, par->vram_size);
@@ -2365,7 +2365,6 @@ static void fbcon_aty128_bmove(struct display *p, int sy, int sx, int dy, int dx
 static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
 {
         u32     pmgt;
-        u16     pwr_command;
         struct pci_dev *pdev = par->pdev;
 
         if (!par->pm_reg)
@@ -2374,6 +2373,8 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
         /* Set the chip into the appropriate suspend mode (we use D2,
          * D3 would require a complete re-initialisation of the chip,
          * including PCI config registers, clocks, AGP configuration, ...)
+         *
+         * For resume, the core will have already brought us back to D0
          */
         if (suspend) {
                 /* Make sure CRTC2 is reset. Remove that the day we decide to
@@ -2391,17 +2392,9 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
                 aty_st_le32(BUS_CNTL1, 0x00000010);
                 aty_st_le32(MEM_POWER_MISC, 0x0c830000);
                 mdelay(100);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
+
                 /* Switch PCI power management to D2 */
-                pci_write_config_word(pdev, par->pm_reg+PCI_PM_CTRL,
-                        (pwr_command & ~PCI_PM_CTRL_STATE_MASK) | 2);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
-        } else {
-                /* Switch back PCI power management to D0 */
-                mdelay(100);
-                pci_write_config_word(pdev, par->pm_reg+PCI_PM_CTRL, 0);
-                pci_read_config_word(pdev, par->pm_reg+PCI_PM_CTRL, &pwr_command);
-                mdelay(100);
+                pci_set_power_state(pdev, PCI_D2);
         }
 }
 
@@ -2410,6 +2403,12 @@ static int aty128_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
 
+        /* Because we may change PCI D state ourselves, we need to
+         * first save the config space content so the core can
+         * restore it properly on resume.
+         */
+        pci_save_state(pdev);
+
         /* We don't do anything but D2, for now we return 0, but
          * we may want to change that. How do we know if the BIOS
          * can properly take care of D3 ? Also, with swsusp, we
@@ -2476,6 +2475,11 @@ static int aty128_do_resume(struct pci_dev *pdev)
         if (pdev->dev.power.power_state.event == PM_EVENT_ON)
                 return 0;
 
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
+
         /* Wakeup chip */
         aty128_set_suspend(par, 0);
         par->asleep = 0;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index cc6b470073da..1207c208a30b 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -135,7 +135,7 @@
 #if defined(CONFIG_PM) || defined(CONFIG_PMAC_BACKLIGHT) || \
 defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_FB_ATY_BACKLIGHT)
 static const u32 lt_lcd_regs[] = {
-        CONFIG_PANEL_LG,
+        CNFG_PANEL_LG,
         LCD_GEN_CNTL_LG,
         DSTN_CONTROL_LG,
         HFB_PITCH_ADDR_LG,
@@ -446,7 +446,7 @@ static int __devinit correct_chipset(struct atyfb_par *par)
         par->pll_limits.ecp_max = aty_chips[i].ecp_max;
         par->features = aty_chips[i].features;
 
-        chip_id = aty_ld_le32(CONFIG_CHIP_ID, par);
+        chip_id = aty_ld_le32(CNFG_CHIP_ID, par);
         type = chip_id & CFG_CHIP_TYPE;
         rev = (chip_id & CFG_CHIP_REV) >> 24;
 
@@ -629,7 +629,7 @@ static void aty_get_crtc(const struct atyfb_par *par, struct crtc *crtc)
                     crtc->lcd_index = aty_ld_le32(LCD_INDEX, par);
                     aty_st_le32(LCD_INDEX, crtc->lcd_index, par);
                 }
-                crtc->lcd_config_panel = aty_ld_lcd(CONFIG_PANEL, par);
+                crtc->lcd_config_panel = aty_ld_lcd(CNFG_PANEL, par);
                 crtc->lcd_gen_cntl = aty_ld_lcd(LCD_GEN_CNTL, par);
 
 
@@ -676,7 +676,7 @@ static void aty_set_crtc(const struct atyfb_par *par, const struct crtc *crtc)
                 aty_st_le32(CRTC_GEN_CNTL, crtc->gen_cntl & ~(CRTC_EXT_DISP_EN | CRTC_EN), par);
 
                 /* update non-shadow registers first */
-                aty_st_lcd(CONFIG_PANEL, crtc->lcd_config_panel, par);
+                aty_st_lcd(CNFG_PANEL, crtc->lcd_config_panel, par);
                 aty_st_lcd(LCD_GEN_CNTL, crtc->lcd_gen_cntl &
                         ~(CRTC_RW_SELECT | SHADOW_EN | SHADOW_RW_EN), par);
 
@@ -858,7 +858,7 @@ static int aty_var_to_crtc(const struct fb_info *info,
                 if (!M64_HAS(MOBIL_BUS))
                         crtc->lcd_index |= CRTC2_DISPLAY_DIS;
 
-                crtc->lcd_config_panel = aty_ld_lcd(CONFIG_PANEL, par) | 0x4000;
+                crtc->lcd_config_panel = aty_ld_lcd(CNFG_PANEL, par) | 0x4000;
                 crtc->lcd_gen_cntl = aty_ld_lcd(LCD_GEN_CNTL, par) & ~CRTC_RW_SELECT;
 
                 crtc->lcd_gen_cntl &=
@@ -1978,7 +1978,7 @@ static int aty_power_mgmt(int sleep, struct atyfb_par *par)
 
         return timeout ? 0 : -EIO;
 }
-#endif
+#endif /* CONFIG_PPC_PMAC */
 
 static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -2002,9 +2002,15 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         par->asleep = 1;
         par->lock_blank = 1;
 
+        /* Because we may change PCI D state ourselves, we need to
+         * first save the config space content so the core can
+         * restore it properly on resume.
+         */
+        pci_save_state(pdev);
+
 #ifdef CONFIG_PPC_PMAC
         /* Set chip to "suspend" mode */
-        if (aty_power_mgmt(1, par)) {
+        if (machine_is(powermac) && aty_power_mgmt(1, par)) {
                 par->asleep = 0;
                 par->lock_blank = 0;
                 atyfb_blank(FB_BLANK_UNBLANK, info);
@@ -2047,11 +2053,15 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
         acquire_console_sem();
 
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
+
 #ifdef CONFIG_PPC_PMAC
-        if (pdev->dev.power.power_state.event == 2)
+        if (machine_is(powermac) &&
+            pdev->dev.power.power_state.event == PM_EVENT_SUSPEND)
                 aty_power_mgmt(0, par);
-#else
-        pci_set_power_state(pdev, PCI_D0);
 #endif
 
         aty_resume_chip(info);
@@ -2254,7 +2264,7 @@ static int __devinit aty_init(struct fb_info *info)
         if (!M64_HAS(INTEGRATED)) {
                 u32 stat0;
                 u8 dac_type, dac_subtype, clk_type;
-                stat0 = aty_ld_le32(CONFIG_STAT0, par);
+                stat0 = aty_ld_le32(CNFG_STAT0, par);
                 par->bus_type = (stat0 >> 0) & 0x07;
                 par->ram_type = (stat0 >> 3) & 0x07;
                 ramname = aty_gx_ram[par->ram_type];
@@ -2324,7 +2334,7 @@ static int __devinit aty_init(struct fb_info *info)
                 par->dac_ops = &aty_dac_ct;
                 par->pll_ops = &aty_pll_ct;
                 par->bus_type = PCI;
-                par->ram_type = (aty_ld_le32(CONFIG_STAT0, par) & 0x07);
+                par->ram_type = (aty_ld_le32(CNFG_STAT0, par) & 0x07);
                 ramname = aty_ct_ram[par->ram_type];
                 /* for many chips, the mclk is 67 MHz for SDRAM, 63 MHz otherwise */
                 if (par->pll_limits.mclk == 67 && par->ram_type < SDRAM)
@@ -2433,7 +2443,7 @@ static int __devinit aty_init(struct fb_info *info)
                 }
 
         if (M64_HAS(MAGIC_VRAM_SIZE)) {
-                if (aty_ld_le32(CONFIG_STAT1, par) & 0x40000000)
+                if (aty_ld_le32(CNFG_STAT1, par) & 0x40000000)
                         info->fix.smem_len += 0x400000;
         }
 
@@ -2946,7 +2956,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                  * Fix PROMs idea of MEM_CNTL settings...
                  */
                 mem = aty_ld_le32(MEM_CNTL, par);
-                chip_id = aty_ld_le32(CONFIG_CHIP_ID, par);
+                chip_id = aty_ld_le32(CNFG_CHIP_ID, par);
                 if (((chip_id & CFG_CHIP_TYPE) == VT_CHIP_ID) && !((chip_id >> 24) & 1)) {
                         switch (mem & 0x0f) {
                         case 3:
@@ -2964,7 +2974,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                         default:
                                 break;
                         }
-                        if ((aty_ld_le32(CONFIG_STAT0, par) & 7) >= SDRAM)
+                        if ((aty_ld_le32(CNFG_STAT0, par) & 7) >= SDRAM)
                                 mem &= ~(0x00700000);
                 }
                 mem &= ~(0xcf80e000);   /* Turn off all undocumented bits. */
@@ -3572,7 +3582,7 @@ static int __init atyfb_atari_probe(void)
                 }
 
                 /* Fake pci_id for correct_chipset() */
-                switch (aty_ld_le32(CONFIG_CHIP_ID, par) & CFG_CHIP_TYPE) {
+                switch (aty_ld_le32(CNFG_CHIP_ID, par) & CFG_CHIP_TYPE) {
                 case 0x00d7:
                         par->pci_id = PCI_CHIP_MACH64GX;
                         break;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index d0f1a7fc2c9d..16bb7e3c0310 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -1936,8 +1936,8 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo)
         OUTREG(CRTC_GEN_CNTL, save_crtc_gen_cntl | CRTC_DISP_REQ_EN_B);
         mdelay(100);
 
-        aper_base = INREG(CONFIG_APER_0_BASE);
-        aper_size = INREG(CONFIG_APER_SIZE);
+        aper_base = INREG(CNFG_APER_0_BASE);
+        aper_size = INREG(CNFG_APER_SIZE);
 
 #ifdef SET_MC_FB_FROM_APERTURE
         /* Set framebuffer to be at the same address as set in PCI BAR */
@@ -2024,11 +2024,11 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
                      ~CRTC_H_CUTOFF_ACTIVE_EN);
           }
         } else {
-          tmp = INREG(CONFIG_MEMSIZE);
+          tmp = INREG(CNFG_MEMSIZE);
         }
 
         /* mem size is bits [28:0], mask off the rest */
-        rinfo->video_ram = tmp & CONFIG_MEMSIZE_MASK;
+        rinfo->video_ram = tmp & CNFG_MEMSIZE_MASK;
 
         /*
          * Hack to get around some busted production M6's
@@ -2228,7 +2228,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
          */
         rinfo->errata = 0;
         if (rinfo->family == CHIP_FAMILY_R300 &&
-            (INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK)
+            (INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK)
             == CFG_ATI_REV_A11)
                 rinfo->errata |= CHIP_ERRATA_R300_CG;
 
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 675abdafc2d8..ca5f0dc28546 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -333,7 +333,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
         if (!rinfo->has_CRTC2) {
                 tmp = INPLL(pllSCLK_CNTL);
 
-                if ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) > CFG_ATI_REV_A13)
+                if ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) > CFG_ATI_REV_A13)
                     tmp &= ~(SCLK_CNTL__FORCE_CP        | SCLK_CNTL__FORCE_RB);
                 tmp &= ~(SCLK_CNTL__FORCE_HDP           | SCLK_CNTL__FORCE_DISP1 |
                          SCLK_CNTL__FORCE_TOP           | SCLK_CNTL__FORCE_SE   |
@@ -468,9 +468,9 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
 
         /*RAGE_6::A11 A12 A12N1 A13, RV250::A11 A12, R300*/
         if ((rinfo->family == CHIP_FAMILY_RV250 &&
-             ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) ||
+             ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) ||
             ((rinfo->family == CHIP_FAMILY_RV100) &&
-             ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) <= CFG_ATI_REV_A13))) {
+             ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) <= CFG_ATI_REV_A13))) {
                 tmp |= SCLK_CNTL__FORCE_CP;
                 tmp |= SCLK_CNTL__FORCE_VIP;
         }
@@ -486,7 +486,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
                 /* RV200::A11 A12 RV250::A11 A12 */
                 if (((rinfo->family == CHIP_FAMILY_RV200) ||
                      (rinfo->family == CHIP_FAMILY_RV250)) &&
-                    ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13))
+                    ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13))
                         tmp |= SCLK_MORE_CNTL__FORCEON;
 
                 OUTPLL(pllSCLK_MORE_CNTL, tmp);
@@ -497,7 +497,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
         /* RV200::A11 A12, RV250::A11 A12 */
         if (((rinfo->family == CHIP_FAMILY_RV200) ||
              (rinfo->family == CHIP_FAMILY_RV250)) &&
-            ((INREG(CONFIG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) {
+            ((INREG(CNFG_CNTL) & CFG_ATI_REV_ID_MASK) < CFG_ATI_REV_A13)) {
                 tmp = INPLL(pllPLL_PWRMGT_CNTL);
                 tmp |= PLL_PWRMGT_CNTL__TCL_BYPASS_DISABLE;
                 OUTPLL(pllPLL_PWRMGT_CNTL, tmp);
@@ -702,7 +702,7 @@ static void radeon_pm_restore_regs(struct radeonfb_info *rinfo)
         OUTREG(DISPLAY_BASE_ADDR, rinfo->save_regs[31]);
         OUTREG(MC_AGP_LOCATION, rinfo->save_regs[32]);
         OUTREG(CRTC2_DISPLAY_BASE_ADDR, rinfo->save_regs[33]);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         OUTREG(DISP_MISC_CNTL, rinfo->save_regs[9]);
         OUTREG(DISP_PWR_MAN, rinfo->save_regs[10]);
@@ -1723,7 +1723,7 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo)
         OUTREG(CRTC2_DISPLAY_BASE_ADDR, rinfo->save_regs[33]);
         OUTREG(MC_FB_LOCATION, rinfo->save_regs[30]);
         OUTREG(OV0_BASE_ADDR, rinfo->save_regs[80]);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
         OUTREG(BUS_CNTL, rinfo->save_regs[36]);
         OUTREG(BUS_CNTL1, rinfo->save_regs[14]);
         OUTREG(MPP_TB_CONFIG, rinfo->save_regs[37]);
@@ -1961,7 +1961,7 @@ static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo)
         OUTMC(rinfo, ixMC_CHP_IO_CNTL_B1, rinfo->save_regs[68] /*0x141555ff*/);
         OUTMC(rinfo, ixMC_IMP_CNTL_0, rinfo->save_regs[71] /*0x00009249*/);
         OUTREG(MC_IND_INDEX, 0);
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         mdelay(20);
 }
@@ -2361,7 +2361,7 @@ static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
         OUTMC(rinfo, ixMC_IMP_CNTL_0, 0x00009249);
         OUTREG(MC_IND_INDEX, 0);
 
-        OUTREG(CONFIG_MEMSIZE, rinfo->video_ram);
+        OUTREG(CNFG_MEMSIZE, rinfo->video_ram);
 
         radeon_pm_full_reset_sdram(rinfo);
 
@@ -2509,9 +2509,7 @@ static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
 
 static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
 {
-        u16 pwr_cmd;
         u32 tmp;
-        int i;
 
         if (!rinfo->pm_reg)
                 return;
@@ -2557,32 +2555,14 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
                         }
                 }
 
-                for (i = 0; i < 64; ++i)
-                        pci_read_config_dword(rinfo->pdev, i * 4,
-                                              &rinfo->cfg_save[i]);
-
                 /* Switch PCI power management to D2. */
                 pci_disable_device(rinfo->pdev);
-                for (;;) {
-                        pci_read_config_word(
-                                rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL,
-                                &pwr_cmd);
-                        if (pwr_cmd & 2)
-                                break;                  
-                        pci_write_config_word(
-                                rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL,
-                                (pwr_cmd & ~PCI_PM_CTRL_STATE_MASK) | 2);
-                        mdelay(500);
-                }
+                pci_save_state(rinfo->pdev);
+                pci_set_power_state(rinfo->pdev, PCI_D2);
         } else {
                 printk(KERN_DEBUG "radeonfb (%s): switching to D0 state...\n",
                        pci_name(rinfo->pdev));
 
-                /* Switch back PCI powermanagment to D0 */
-                mdelay(200);
-                pci_write_config_word(rinfo->pdev, rinfo->pm_reg+PCI_PM_CTRL, 0);
-                mdelay(500);
-
                 if (rinfo->family <= CHIP_FAMILY_RV250) {
                         /* Reset the SDRAM controller  */
                         radeon_pm_full_reset_sdram(rinfo);
@@ -2598,37 +2578,10 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
         }
 }
 
-static int radeon_restore_pci_cfg(struct radeonfb_info *rinfo)
-{
-        int i;
-        static u32 radeon_cfg_after_resume[64];
-
-        for (i = 0; i < 64; ++i)
-                pci_read_config_dword(rinfo->pdev, i * 4,
-                                      &radeon_cfg_after_resume[i]);
-
-        if (radeon_cfg_after_resume[PCI_BASE_ADDRESS_0/4]
-            == rinfo->cfg_save[PCI_BASE_ADDRESS_0/4])
-                return 0;       /* assume everything is ok */
-
-        for (i = PCI_BASE_ADDRESS_0/4; i < 64; ++i) {
-                if (radeon_cfg_after_resume[i] != rinfo->cfg_save[i])
-                        pci_write_config_dword(rinfo->pdev, i * 4,
-                                               rinfo->cfg_save[i]);
-        }
-        pci_write_config_word(rinfo->pdev, PCI_CACHE_LINE_SIZE,
-                              rinfo->cfg_save[PCI_CACHE_LINE_SIZE/4]);
-        pci_write_config_word(rinfo->pdev, PCI_COMMAND,
-                              rinfo->cfg_save[PCI_COMMAND/4]);
-        return 1;
-}
-
-
 int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct radeonfb_info *rinfo = info->par;
-        int i;
 
         if (mesg.event == pdev->dev.power.power_state.event)
                 return 0;
@@ -2674,6 +2627,11 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pmac_suspend_agp_for_card(pdev);
 #endif /* CONFIG_PPC_PMAC */
 
+        /* It's unclear whether or when the generic code will do that, so let's
+         * do it ourselves. We save state before we do any power management
+         */
+        pci_save_state(pdev);
+
         /* If we support wakeup from poweroff, we save all regs we can including cfg
          * space
          */
@@ -2698,9 +2656,6 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
                         mdelay(20);
                         OUTREG(LVDS_GEN_CNTL, INREG(LVDS_GEN_CNTL) & ~(LVDS_DIGON));
                 }
-                // FIXME: Use PCI layer
-                for (i = 0; i < 64; ++i)
-                        pci_read_config_dword(pdev, i * 4, &rinfo->cfg_save[i]);
                 pci_disable_device(pdev);
         }
         /* If we support D2, we go to it (should be fixed later with a flag forcing
@@ -2717,6 +2672,13 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         return 0;
 }
 
+static int radeon_check_power_loss(struct radeonfb_info *rinfo)
+{
+        return rinfo->save_regs[4] != INPLL(CLK_PIN_CNTL) ||
+               rinfo->save_regs[2] != INPLL(MCLK_CNTL) ||
+               rinfo->save_regs[3] != INPLL(SCLK_CNTL);
+}
+
 int radeonfb_pci_resume(struct pci_dev *pdev)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
@@ -2735,20 +2697,13 @@ int radeonfb_pci_resume(struct pci_dev *pdev)
         printk(KERN_DEBUG "radeonfb (%s): resuming from state: %d...\n",
                pci_name(pdev), pdev->dev.power.power_state.event);
 
-
-        if (pci_enable_device(pdev)) {
-                rc = -ENODEV;
-                printk(KERN_ERR "radeonfb (%s): can't enable PCI device !\n",
-                       pci_name(pdev));
-                goto bail;
-        }
-        pci_set_master(pdev);
-
+        /* PCI state will have been restored by the core, so
+         * we should be in D0 now with our config space fully
+         * restored
+         */
         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)
-                 */
-                if ((rinfo->pm_mode & radeon_pm_off) && radeon_restore_pci_cfg(rinfo)) {
+                /* Wakeup chip */
+                if ((rinfo->pm_mode & radeon_pm_off) && radeon_check_power_loss(rinfo)) {
                         if (rinfo->reinit_func != NULL)
                                 rinfo->reinit_func(rinfo);
                         else {
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 3ea1b00fdd22..7351e66c7f54 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -361,8 +361,6 @@ struct radeonfb_info {
 #ifdef CONFIG_FB_RADEON_I2C
         struct radeon_i2c_chan  i2c[4];
 #endif
-
-        u32                     cfg_save[64];
 };
 
 
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 363b3cb2f01b..63d759498165 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_BACKLIGHT_OMAP1)	+= omap1_bl.o
 obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
-obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x.o
+obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x_bl.o
 obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
 obj-$(CONFIG_BACKLIGHT_TOSA)    += tosa_bl.o
 obj-$(CONFIG_BACKLIGHT_SAHARA)  += kb3886_bl.o
diff --git a/drivers/video/backlight/da903x.c b/drivers/video/backlight/da903x_bl.c
index 93bb4340cc64..93bb4340cc64 100644
--- a/drivers/video/backlight/da903x.c
+++ b/drivers/video/backlight/da903x_bl.c
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index 2a423d3a2a8e..90cfddabf1f7 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -447,7 +447,7 @@ static irqreturn_t bfin_t350mcqb_irq_error(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
+static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
 {
         struct bfin_t350mcqbfb_info *info;
         struct fb_info *fbinfo;
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index 91b78e691505..f53b9f1d6aba 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -250,10 +250,6 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
         int rc, size = cmap->len * sizeof(u16);
         struct fb_cmap umap;
 
-        if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
-                                !info->fbops->fb_setcmap))
-                return -EINVAL;
-
         memset(&umap, 0, sizeof(struct fb_cmap));
         rc = fb_alloc_cmap(&umap, cmap->len, cmap->transp != NULL);
         if (rc)
@@ -262,11 +258,23 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
             copy_from_user(umap.green, cmap->green, size) ||
             copy_from_user(umap.blue, cmap->blue, size) ||
             (cmap->transp && copy_from_user(umap.transp, cmap->transp, size))) {
-                fb_dealloc_cmap(&umap);
-                return -EFAULT;
+                rc = -EFAULT;
+                goto out;
         }
         umap.start = cmap->start;
+        if (!lock_fb_info(info)) {
+                rc = -ENODEV;
+                goto out;
+        }
+        if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
+                                !info->fbops->fb_setcmap)) {
+                rc = -EINVAL;
+                goto out1;
+        }
         rc = fb_set_cmap(&umap, info);
+out1:
+        unlock_fb_info(info);
+out:
         fb_dealloc_cmap(&umap);
         return rc;
 }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 756efeb91abc..cfd9dce1ce0b 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1013,132 +1013,139 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
         struct fb_var_screeninfo var;
         struct fb_fix_screeninfo fix;
         struct fb_con2fbmap con2fb;
+        struct fb_cmap cmap_from;
         struct fb_cmap_user cmap;
         struct fb_event event;
         void __user *argp = (void __user *)arg;
         long ret = 0;
 
-        fb = info->fbops;
-        if (!fb)
-                return -ENODEV;
-
         switch (cmd) {
         case FBIOGET_VSCREENINFO:
-                ret = copy_to_user(argp, &info->var,
-                                    sizeof(var)) ? -EFAULT : 0;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                var = info->var;
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &var, sizeof(var)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_VSCREENINFO:
-                if (copy_from_user(&var, argp, sizeof(var))) {
-                        ret =  -EFAULT;
-                        break;
-                }
+                if (copy_from_user(&var, argp, sizeof(var)))
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_set_var(info, &var);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
+                unlock_fb_info(info);
+                if (!ret && copy_to_user(argp, &var, sizeof(var)))
                         ret = -EFAULT;
                 break;
         case FBIOGET_FSCREENINFO:
-                ret = copy_to_user(argp, &info->fix,
-                                    sizeof(fix)) ? -EFAULT : 0;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                fix = info->fix;
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &fix, sizeof(fix)) ? -EFAULT : 0;
                 break;
         case FBIOPUTCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        ret = -EFAULT;
-                else
-                        ret = fb_set_user_cmap(&cmap, info);
+                        return -EFAULT;
+                ret = fb_set_user_cmap(&cmap, info);
                 break;
         case FBIOGETCMAP:
                 if (copy_from_user(&cmap, argp, sizeof(cmap)))
-                        ret = -EFAULT;
-                else
-                        ret = fb_cmap_to_user(&info->cmap, &cmap);
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                cmap_from = info->cmap;
+                unlock_fb_info(info);
+                ret = fb_cmap_to_user(&cmap_from, &cmap);
                 break;
         case FBIOPAN_DISPLAY:
-                if (copy_from_user(&var, argp, sizeof(var))) {
-                        ret = -EFAULT;
-                        break;
-                }
+                if (copy_from_user(&var, argp, sizeof(var)))
+                        return -EFAULT;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 ret = fb_pan_display(info, &var);
                 release_console_sem();
+                unlock_fb_info(info);
                 if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
-                        ret = -EFAULT;
+                        return -EFAULT;
                 break;
         case FBIO_CURSOR:
                 ret = -EINVAL;
                 break;
         case FBIOGET_CON2FBMAP:
                 if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
-                        ret = -EFAULT;
-                else if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                        ret = -EINVAL;
-                else {
-                        con2fb.framebuffer = -1;
-                        event.info = info;
-                        event.data = &con2fb;
-                        fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP,
-                                                                &event);
-                        ret = copy_to_user(argp, &con2fb,
-                                    sizeof(con2fb)) ? -EFAULT : 0;
-                }
+                        return -EFAULT;
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                        return -EINVAL;
+                con2fb.framebuffer = -1;
+                event.data = &con2fb;
+
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                event.info = info;
+                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
+                unlock_fb_info(info);
+
+                ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
                 break;
         case FBIOPUT_CON2FBMAP:
-                if (copy_from_user(&con2fb, argp, sizeof(con2fb))) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) {
-                        ret = -EINVAL;
-                        break;
-                }
-                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX) {
-                        ret = -EINVAL;
-                        break;
-                }
+                if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+                        return -EFAULT;
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                        return -EINVAL;
+                if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
+                        return -EINVAL;
                 if (!registered_fb[con2fb.framebuffer])
                         request_module("fb%d", con2fb.framebuffer);
                 if (!registered_fb[con2fb.framebuffer]) {
                         ret = -EINVAL;
                         break;
                 }
-                event.info = info;
                 event.data = &con2fb;
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                event.info = info;
                 ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
                                               &event);
+                unlock_fb_info(info);
                 break;
         case FBIOBLANK:
+                if (!lock_fb_info(info))
+                        return -ENODEV;
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
                 ret = fb_blank(info, arg);
                 info->flags &= ~FBINFO_MISC_USEREVENT;
                 release_console_sem();
-                break;;
+                unlock_fb_info(info);
+                break;
         default:
-                if (fb->fb_ioctl == NULL)
-                        ret = -ENOTTY;
-                else
+                if (!lock_fb_info(info))
+                        return -ENODEV;
+                fb = info->fbops;
+                if (fb->fb_ioctl)
                         ret = fb->fb_ioctl(info, cmd, arg);
+                else
+                        ret = -ENOTTY;
+                unlock_fb_info(info);
         }
         return ret;
 }
 
 static long fb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-__acquires(&info->lock)
-__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
-        struct fb_info *info;
-        long ret;
+        struct fb_info *info = registered_fb[fbidx];
 
-        info = registered_fb[fbidx];
-        mutex_lock(&info->lock);
-        ret = do_fb_ioctl(info, cmd, arg);
-        mutex_unlock(&info->lock);
-        return ret;
+        return do_fb_ioctl(info, cmd, arg);
 }
 
 #ifdef CONFIG_COMPAT
@@ -1257,8 +1264,6 @@ static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,
 
 static long fb_compat_ioctl(struct file *file, unsigned int cmd,
                             unsigned long arg)
-__acquires(&info->lock)
-__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
@@ -1266,7 +1271,6 @@ __releases(&info->lock)
         struct fb_ops *fb = info->fbops;
         long ret = -ENOIOCTLCMD;
 
-        mutex_lock(&info->lock);
         switch(cmd) {
         case FBIOGET_VSCREENINFO:
         case FBIOPUT_VSCREENINFO:
@@ -1292,7 +1296,6 @@ __releases(&info->lock)
                         ret = fb->fb_compat_ioctl(info, cmd, arg);
                 break;
         }
-        mutex_unlock(&info->lock);
         return ret;
 }
 #endif
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 751e491ca8c8..f20eff8c4a81 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -136,13 +136,10 @@ static int gx1fb_set_par(struct fb_info *info)
 {
         struct geodefb_par *par = info->par;
 
-        if (info->var.bits_per_pixel == 16) {
+        if (info->var.bits_per_pixel == 16)
                 info->fix.visual = FB_VISUAL_TRUECOLOR;
-                fb_dealloc_cmap(&info->cmap);
-        } else {
+        else
                 info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-                fb_alloc_cmap(&info->cmap, 1<<info->var.bits_per_pixel, 0);
-        }
 
         info->fix.line_length = gx1_line_delta(info->var.xres, info->var.bits_per_pixel);
 
@@ -315,6 +312,10 @@ static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)
         if (!par->panel_x)
                 par->enable_crt = 1; /* fall back to CRT if no panel is specified */
 
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                framebuffer_release(info);
+                return NULL;
+        }
         return info;
 }
 
@@ -374,8 +375,11 @@ static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *
                 release_mem_region(gx1_gx_base() + 0x8300, 0x100);
         }
 
-        if (info)
+        if (info) {
+                fb_dealloc_cmap(&info->cmap);
                 framebuffer_release(info);
+        }
+
         return ret;
 }
 
@@ -395,6 +399,7 @@ static void gx1fb_remove(struct pci_dev *pdev)
         iounmap(par->dc_regs);
         release_mem_region(gx1_gx_base() + 0x8300, 0x100);
 
+        fb_dealloc_cmap(&info->cmap);
         pci_set_drvdata(pdev, NULL);
 
         framebuffer_release(info);
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 484118926318..2552cac39e1c 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -171,13 +171,10 @@ static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
 static int gxfb_set_par(struct fb_info *info)
 {
-        if (info->var.bits_per_pixel > 8) {
+        if (info->var.bits_per_pixel > 8)
                 info->fix.visual = FB_VISUAL_TRUECOLOR;
-                fb_dealloc_cmap(&info->cmap);
-        } else {
+        else
                 info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-                fb_alloc_cmap(&info->cmap, 1<<info->var.bits_per_pixel, 0);
-        }
 
         info->fix.line_length = gx_line_delta(info->var.xres, info->var.bits_per_pixel);
 
@@ -331,6 +328,11 @@ static struct fb_info * __init gxfb_init_fbinfo(struct device *dev)
 
         info->var.grayscale     = 0;
 
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                framebuffer_release(info);
+                return NULL;
+        }
+
         return info;
 }
 
@@ -443,8 +445,10 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
                 pci_release_region(pdev, 1);
         }
 
-        if (info)
+        if (info) {
+                fb_dealloc_cmap(&info->cmap);
                 framebuffer_release(info);
+        }
         return ret;
 }
 
@@ -467,6 +471,7 @@ static void gxfb_remove(struct pci_dev *pdev)
         iounmap(par->gp_regs);
         pci_release_region(pdev, 1);
 
+        fb_dealloc_cmap(&info->cmap);
         pci_set_drvdata(pdev, NULL);
 
         framebuffer_release(info);
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index b965ecdbc604..889cbe39e580 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -278,13 +278,10 @@ static int lxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
 static int lxfb_set_par(struct fb_info *info)
 {
-        if (info->var.bits_per_pixel > 8) {
+        if (info->var.bits_per_pixel > 8)
                 info->fix.visual = FB_VISUAL_TRUECOLOR;
-                fb_dealloc_cmap(&info->cmap);
-        } else {
+        else
                 info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-                fb_alloc_cmap(&info->cmap, 1<<info->var.bits_per_pixel, 0);
-        }
 
         info->fix.line_length = lx_get_pitch(info->var.xres,
                 info->var.bits_per_pixel);
@@ -451,6 +448,11 @@ static struct fb_info * __init lxfb_init_fbinfo(struct device *dev)
 
         info->pseudo_palette    = (void *)par + sizeof(struct lxfb_par);
 
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                framebuffer_release(info);
+                return NULL;
+        }
+
         info->var.grayscale     = 0;
 
         return info;
@@ -579,8 +581,10 @@ err:
                 pci_release_region(pdev, 3);
         }
 
-        if (info)
+        if (info) {
+                fb_dealloc_cmap(&info->cmap);
                 framebuffer_release(info);
+        }
 
         return ret;
 }
@@ -604,6 +608,7 @@ static void lxfb_remove(struct pci_dev *pdev)
         iounmap(par->vp_regs);
         pci_release_region(pdev, 3);
 
+        fb_dealloc_cmap(&info->cmap);
         pci_set_drvdata(pdev, NULL);
         framebuffer_release(info);
 }
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 2c8dff9f77da..1ed3d554e372 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -115,7 +115,7 @@ static struct w1_therm_family_converter w1_therm_families[] = {
 
 static inline int w1_DS18B20_convert_temp(u8 rom[9])
 {
-        s16 t = (rom[1] << 8) | rom[0];
+        int t = ((s16)rom[1] << 8) | rom[0];
         t = t*1000/16;
         return t;
 }
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 09a3d5522b43..325c10ff6a2c 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -406,7 +406,7 @@ config ITCO_WDT
         ---help---
           Hardware driver for the intel TCO timer based watchdog devices.
           These drivers are included in the Intel 82801 I/O Controller
-          Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB
+          Hub family (from ICH0 up to ICH10) and in the Intel 63xxESB
           controller hub.
 
           The TCO (Total Cost of Ownership) timer is a watchdog timer
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 5531691f46ea..e35d54589232 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -107,10 +107,10 @@ static int at91_wdt_close(struct inode *inode, struct file *file)
 static int at91_wdt_settimeout(int new_time)
 {
         /*
-         * All counting occurs at SLOW_CLOCK / 128 = 0.256 Hz
+         * All counting occurs at SLOW_CLOCK / 128 = 256 Hz
          *
          * Since WDV is a 16-bit counter, the maximum period is
-         * 65536 / 0.256 = 256 seconds.
+         * 65536 / 256 = 256 seconds.
          */
         if ((new_time <= 0) || (new_time > WDT_MAX_TIME))
                 return -EINVAL;
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index b1da287f90ec..a56ac84381b1 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c
index 2474ebca88f6..d8264ad0be41 100644
--- a/drivers/watchdog/iTCO_vendor_support.c
+++ b/drivers/watchdog/iTCO_vendor_support.c
@@ -1,7 +1,7 @@
 /*
  *      intel TCO vendor specific watchdog driver support
  *
- *      (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>.
+ *      (c) Copyright 2006-2009 Wim Van Sebroeck <wim@iguana.be>.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@
 
 /* Module and version information */
 #define DRV_NAME        "iTCO_vendor_support"
-#define DRV_VERSION     "1.02"
+#define DRV_VERSION     "1.03"
 #define PFX             DRV_NAME ": "
 
 /* Includes */
@@ -77,6 +77,26 @@ MODULE_PARM_DESC(vendorsupport, "iTCO vendor specific support mode, default=0 (n
  *          20.6 seconds.
  */
 
+static void supermicro_old_pre_start(unsigned long acpibase)
+{
+        unsigned long val32;
+
+        /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
+        val32 = inl(SMI_EN);
+        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+        outl(val32, SMI_EN);    /* Needed to activate watchdog */
+}
+
+static void supermicro_old_pre_stop(unsigned long acpibase)
+{
+        unsigned long val32;
+
+        /* Bit 13: TCO_EN -> 1 = Enables the TCO logic to generate SMI# */
+        val32 = inl(SMI_EN);
+        val32 |= 0x00002000;    /* Turn on SMI clearing watchdog */
+        outl(val32, SMI_EN);    /* Needed to deactivate watchdog */
+}
+
 static void supermicro_old_pre_keepalive(unsigned long acpibase)
 {
         /* Reload TCO Timer (done in iTCO_wdt_keepalive) + */
@@ -228,14 +248,18 @@ static void supermicro_new_pre_set_heartbeat(unsigned int heartbeat)
 void iTCO_vendor_pre_start(unsigned long acpibase,
                            unsigned int heartbeat)
 {
-        if (vendorsupport == SUPERMICRO_NEW_BOARD)
+        if (vendorsupport == SUPERMICRO_OLD_BOARD)
+                supermicro_old_pre_start(acpibase);
+        else if (vendorsupport == SUPERMICRO_NEW_BOARD)
                 supermicro_new_pre_start(heartbeat);
 }
 EXPORT_SYMBOL(iTCO_vendor_pre_start);
 
 void iTCO_vendor_pre_stop(unsigned long acpibase)
 {
-        if (vendorsupport == SUPERMICRO_NEW_BOARD)
+        if (vendorsupport == SUPERMICRO_OLD_BOARD)
+                supermicro_old_pre_stop(acpibase);
+        else if (vendorsupport == SUPERMICRO_NEW_BOARD)
                 supermicro_new_pre_stop();
 }
 EXPORT_SYMBOL(iTCO_vendor_pre_stop);
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 5b395a4ddfdf..352334947ea3 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -1,7 +1,7 @@
 /*
- *      intel TCO Watchdog Driver (Used in i82801 and i6300ESB chipsets)
+ *      intel TCO Watchdog Driver (Used in i82801 and i63xxESB chipsets)
  *
- *      (c) Copyright 2006-2008 Wim Van Sebroeck <wim@iguana.be>.
+ *      (c) Copyright 2006-2009 Wim Van Sebroeck <wim@iguana.be>.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -63,7 +63,7 @@
 
 /* Module and version information */
 #define DRV_NAME        "iTCO_wdt"
-#define DRV_VERSION     "1.04"
+#define DRV_VERSION     "1.05"
 #define PFX             DRV_NAME ": "
 
 /* Includes */
@@ -236,16 +236,16 @@ MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
 
 /* Address definitions for the TCO */
 /* TCO base address */
-#define TCOBASE         iTCO_wdt_private.ACPIBASE + 0x60
+#define TCOBASE         iTCO_wdt_private.ACPIBASE + 0x60
 /* SMI Control and Enable Register */
-#define SMI_EN          iTCO_wdt_private.ACPIBASE + 0x30
+#define SMI_EN          iTCO_wdt_private.ACPIBASE + 0x30
 
 #define TCO_RLD         TCOBASE + 0x00  /* TCO Timer Reload and Curr. Value */
 #define TCOv1_TMR       TCOBASE + 0x01  /* TCOv1 Timer Initial Value    */
-#define TCO_DAT_IN      TCOBASE + 0x02  /* TCO Data In Register         */
-#define TCO_DAT_OUT     TCOBASE + 0x03  /* TCO Data Out Register        */
-#define TCO1_STS        TCOBASE + 0x04  /* TCO1 Status Register         */
-#define TCO2_STS        TCOBASE + 0x06  /* TCO2 Status Register         */
+#define TCO_DAT_IN      TCOBASE + 0x02  /* TCO Data In Register         */
+#define TCO_DAT_OUT     TCOBASE + 0x03  /* TCO Data Out Register        */
+#define TCO1_STS        TCOBASE + 0x04  /* TCO1 Status Register         */
+#define TCO2_STS        TCOBASE + 0x06  /* TCO2 Status Register         */
 #define TCO1_CNT        TCOBASE + 0x08  /* TCO1 Control Register        */
 #define TCO2_CNT        TCOBASE + 0x0a  /* TCO2 Control Register        */
 #define TCOv2_TMR       TCOBASE + 0x12  /* TCOv2 Timer Initial Value    */
@@ -338,7 +338,6 @@ static int iTCO_wdt_unset_NO_REBOOT_bit(void)
 static int iTCO_wdt_start(void)
 {
         unsigned int val;
-        unsigned long val32;
 
         spin_lock(&iTCO_wdt_private.io_lock);
 
@@ -351,11 +350,6 @@ static int iTCO_wdt_start(void)
                 return -EIO;
         }
 
-        /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
-        val32 = inl(SMI_EN);
-        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
-        outl(val32, SMI_EN);
-
         /* Force the timer to its reload value by writing to the TCO_RLD
            register */
         if (iTCO_wdt_private.iTCO_version == 2)
@@ -378,7 +372,6 @@ static int iTCO_wdt_start(void)
 static int iTCO_wdt_stop(void)
 {
         unsigned int val;
-        unsigned long val32;
 
         spin_lock(&iTCO_wdt_private.io_lock);
 
@@ -390,11 +383,6 @@ static int iTCO_wdt_stop(void)
         outw(val, TCO1_CNT);
         val = inw(TCO1_CNT);
 
-        /* Bit 13: TCO_EN -> 1 = Enables the TCO logic to generate SMI# */
-        val32 = inl(SMI_EN);
-        val32 |= 0x00002000;
-        outl(val32, SMI_EN);
-
         /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
         iTCO_wdt_set_NO_REBOOT_bit();
 
@@ -649,6 +637,7 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
         int ret;
         u32 base_address;
         unsigned long RCBA;
+        unsigned long val32;
 
         /*
          *      Find the ACPI/PM base I/O address which is the base
@@ -695,6 +684,10 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
                 ret = -EIO;
                 goto out;
         }
+        /* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
+        val32 = inl(SMI_EN);
+        val32 &= 0xffffdfff;    /* Turn off SMI clearing watchdog */
+        outl(val32, SMI_EN);
 
         /* The TCO I/O registers reside in a 32-byte range pointed to
            by the TCOBASE value */
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 9b91617b9582..56892a142ee2 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -45,6 +45,13 @@ static int xen_suspend(void *data)
                        err);
                 return err;
         }
+        err = sysdev_suspend(PMSG_SUSPEND);
+        if (err) {
+                printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
+                        err);
+                device_power_up(PMSG_RESUME);
+                return err;
+        }
 
         xen_mm_pin_all();
         gnttab_suspend();
@@ -61,6 +68,7 @@ static int xen_suspend(void *data)
         gnttab_resume();
         xen_mm_unpin_all();
 
+        sysdev_resume();
         device_power_up(PMSG_RESUME);
 
         if (!*cancelled) {