Merge branch 'master' of ../linux-2.6/

326 files changed, 11048 insertions, 3089 deletions

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 9ce983ed60f0..ea92bac42c53 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -186,6 +186,12 @@ static int __init dmi_unknown_osi_linux(const struct dmi_system_id *d)
         acpi_dmi_osi_linux(-1, d);      /* unknown */
         return 0;
 }
+static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)
+{
+        printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
+        acpi_osi_setup("!Windows 2006");
+        return 0;
+}
 
 /*
  * Most BIOS that invoke OSI(Linux) do nothing with it.
@@ -228,10 +234,10 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
          * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5520"),
          * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 6460"),
          * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 7510"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "Extensa 5220"),
          *
          * _OSI(Linux) is a NOP:
          * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5315"),
+         * DMI_MATCH(DMI_PRODUCT_NAME, "Extensa 5220"),
          */
         {
         .callback = dmi_disable_osi_linux,
@@ -327,12 +333,20 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
         },
         { /* OSI(Linux) effect unknown */
         .callback = dmi_unknown_osi_linux,
-        .ident = "Dell OP GX620",
+        .ident = "Dell OptiPlex GX620",
         .matches = {
                      DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                      DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex GX620"),
                 },
         },
+        { /* OSI(Linux) causes some USB initialization to not run */
+        .callback = dmi_unknown_osi_linux,
+        .ident = "Dell OptiPlex 755",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 755"),
+                },
+        },
         { /* OSI(Linux) effect unknown */
         .callback = dmi_unknown_osi_linux,
         .ident = "Dell PE 1900",
@@ -342,6 +356,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                 },
         },
         { /* OSI(Linux) is a NOP */
+        .callback = dmi_unknown_osi_linux,
+        .ident = "Dell PE 1950",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1950"),
+                },
+        },
+        { /* OSI(Linux) is a NOP */
         .callback = dmi_disable_osi_linux,
         .ident = "Dell PE R200",
         .matches = {
@@ -357,6 +379,22 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                      DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation 390"),
                 },
         },
+        { /* OSI(Linux) touches USB */
+        .callback = dmi_unknown_osi_linux,
+        .ident = "Dell PR 390",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation 690"),
+                },
+        },
+        { /* OSI(Linux) unknown - ASL looks benign, but may effect dock/SMM */
+        .callback = dmi_unknown_osi_linux,
+        .ident = "Dell PR M4300",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "Precision M4300"),
+                },
+        },
         { /* OSI(Linux) is a NOP */
         .callback = dmi_disable_osi_linux,
         .ident = "Dell Vostro 1000",
@@ -390,10 +428,10 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
          * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 1536"),
          * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 1556"),
          * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 1546"),
+         * DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"),
          * _OSI(Linux) unknown effect:
          * DMI_MATCH(DMI_PRODUCT_NAME, "Amilo M1425"),
          * DMI_MATCH(DMI_PRODUCT_NAME, "Amilo Si 1520"),
-         * DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"),
          */
         {
         .callback = dmi_disable_osi_linux,
@@ -402,6 +440,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                      DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
                 },
         },
+        {
+        .callback = dmi_disable_osi_vista,
+        .ident = "Fujitsu Siemens",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"),
+                },
+        },
         /*
          * Disable OSI(Linux) warnings on all "Hewlett-Packard"
          *
@@ -443,10 +489,11 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
          * _OSI(Linux) helps sound
          * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R61"),
          * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T61"),
+         * _OSI(Linux) has Linux specific hooks
+         * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
          * _OSI(Linux) is a NOP:
          * DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
-         * _OSI(Linux) effect unknown
-         * DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
+         * DMI_MATCH(DMI_PRODUCT_VERSION, "LENOVO3000 V100"),
          */
         {
         .callback = dmi_enable_osi_linux,
@@ -465,7 +512,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                 },
         },
         {
-        .callback = dmi_unknown_osi_linux,
+        .callback = dmi_enable_osi_linux,
         .ident = "Lenovo ThinkPad X61",
         .matches = {
                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
@@ -473,7 +520,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                 },
         },
         {
-        .callback = dmi_unknown_osi_linux,
+        .callback = dmi_disable_osi_linux,
         .ident = "Lenovo 3000 V100",
         .matches = {
                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
@@ -543,8 +590,9 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
          * Disable OSI(Linux) warnings on all "Sony Corporation"
          *
          * _OSI(Linux) is a NOP:
-         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SZ650N"),
+         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NR11S_S"),
          * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SZ38GP_C"),
+         * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SZ650N"),
          * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-TZ21MN_N"),
          * _OSI(Linux) unknown effect:
          * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ11M"),
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 7222a18a0319..caf873c14bfb 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -943,7 +943,11 @@ int __init acpi_ec_ecdt_probe(void)
                 boot_ec->command_addr = ecdt_ptr->control.address;
                 boot_ec->data_addr = ecdt_ptr->data.address;
                 boot_ec->gpe = ecdt_ptr->gpe;
-                boot_ec->handle = ACPI_ROOT_OBJECT;
+                if (ACPI_FAILURE(acpi_get_handle(NULL, ecdt_ptr->id,
+                                &boot_ec->handle))) {
+                        pr_info("Failed to locate handle for boot EC\n");
+                        boot_ec->handle = ACPI_ROOT_OBJECT;
+                }
         } else {
                 /* This workaround is needed only on some broken machines,
                  * which require early EC, but fail to provide ECDT */
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 5479dc0eeeec..abec1ca94cf4 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -110,7 +110,7 @@ static const struct file_operations acpi_system_event_ops = {
 #endif  /* CONFIG_ACPI_PROC_EVENT */
 
 /* ACPI notifier chain */
-BLOCKING_NOTIFIER_HEAD(acpi_chain_head);
+static BLOCKING_NOTIFIER_HEAD(acpi_chain_head);
 
 int acpi_notifier_call_chain(struct acpi_device *dev, u32 type, u32 data)
 {
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 2e9ce94798c7..3f51b7e84a17 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -338,6 +338,7 @@ acpi_ex_pci_config_space_handler(u32 function,
         acpi_status status = AE_OK;
         struct acpi_pci_id *pci_id;
         u16 pci_register;
+        u32 value32;
 
         ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);
 
@@ -364,9 +365,9 @@ acpi_ex_pci_config_space_handler(u32 function,
         switch (function) {
         case ACPI_READ:
 
-                *value = 0;
                 status = acpi_os_read_pci_configuration(pci_id, pci_register,
-                                                        value, bit_width);
+                                                        &value32, bit_width);
+                *value = value32;
                 break;
 
         case ACPI_WRITE:
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 48cb705b274a..c8e3cba423ef 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -256,22 +256,28 @@ static int acpi_fan_add(struct acpi_device *device)
 
         cdev = thermal_cooling_device_register("Fan", device,
                                                 &fan_cooling_ops);
-        if (cdev)
+        if (IS_ERR(cdev)) {
+                result = PTR_ERR(cdev);
+                goto end;
+        }
+        if (cdev) {
                 printk(KERN_INFO PREFIX
                         "%s is registered as cooling_device%d\n",
                         device->dev.bus_id, cdev->id);
-        else
-                goto end;
-        acpi_driver_data(device) = cdev;
-        result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj,
-                                        "thermal_cooling");
-        if (result)
-                return result;
 
-        result = sysfs_create_link(&cdev->device.kobj, &device->dev.kobj,
-                                       "device");
-        if (result)
-                return result;
+                acpi_driver_data(device) = cdev;
+                result = sysfs_create_link(&device->dev.kobj,
+                                           &cdev->device.kobj,
+                                           "thermal_cooling");
+                if (result)
+                        return result;
+
+                result = sysfs_create_link(&cdev->device.kobj,
+                                           &device->dev.kobj,
+                                           "device");
+                if (result)
+                        return result;
+        }
 
         result = acpi_fan_add_fs(device);
         if (result)
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 058d0be5cbe2..4290e0193097 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
                 return_ACPI_STATUS(status);
         }
 
+        arg.integer.value = sleep_state;
         status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
                 ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 34b3386dedca..8edba7b678eb 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -325,7 +325,7 @@ acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
 }
 
 #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-struct acpi_table_header *acpi_find_dsdt_initrd(void)
+static struct acpi_table_header *acpi_find_dsdt_initrd(void)
 {
         struct file *firmware_file;
         mm_segment_t oldfs;
@@ -419,7 +419,7 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
 }
 
 #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-int __init acpi_no_initrd_override_setup(char *s)
+static int __init acpi_no_initrd_override_setup(char *s)
 {
         acpi_no_initrd_override = 1;
         return 1;
@@ -623,7 +623,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 
 acpi_status
 acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
-                               void *value, u32 width)
+                               u32 *value, u32 width)
 {
         int result, size;
 
@@ -689,7 +689,6 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
         acpi_status status;
         unsigned long temp;
         acpi_object_type type;
-        u8 tu8;
 
         acpi_get_parent(chandle, &handle);
         if (handle != rhandle) {
@@ -704,6 +703,7 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
                     acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
                                           &temp);
                 if (ACPI_SUCCESS(status)) {
+                        u32 val;
                         pci_id->device = ACPI_HIWORD(ACPI_LODWORD(temp));
                         pci_id->function = ACPI_LOWORD(ACPI_LODWORD(temp));
 
@@ -712,24 +712,24 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
 
                         /* any nicer way to get bus number of bridge ? */
                         status =
-                            acpi_os_read_pci_configuration(pci_id, 0x0e, &tu8,
+                            acpi_os_read_pci_configuration(pci_id, 0x0e, &val,
                                                            8);
                         if (ACPI_SUCCESS(status)
-                            && ((tu8 & 0x7f) == 1 || (tu8 & 0x7f) == 2)) {
+                            && ((val & 0x7f) == 1 || (val & 0x7f) == 2)) {
                                 status =
                                     acpi_os_read_pci_configuration(pci_id, 0x18,
-                                                                   &tu8, 8);
+                                                                   &val, 8);
                                 if (!ACPI_SUCCESS(status)) {
                                         /* Certainly broken...  FIX ME */
                                         return;
                                 }
                                 *is_bridge = 1;
-                                pci_id->bus = tu8;
+                                pci_id->bus = val;
                                 status =
                                     acpi_os_read_pci_configuration(pci_id, 0x19,
-                                                                   &tu8, 8);
+                                                                   &val, 8);
                                 if (ACPI_SUCCESS(status)) {
-                                        *bus_number = tu8;
+                                        *bus_number = val;
                                 }
                         } else
                                 *is_bridge = 0;
@@ -1109,7 +1109,7 @@ void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)
  * string starting with '!' disables that string
  * otherwise string is added to list, augmenting built-in strings
  */
-static int __init acpi_osi_setup(char *str)
+int __init acpi_osi_setup(char *str)
 {
         if (str == NULL || *str == '\0') {
                 printk(KERN_INFO PREFIX "_OSI method disabled\n");
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 75ccf5d18bf4..a3cc8a98255c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -670,21 +670,26 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
 
         pr->cdev = thermal_cooling_device_register("Processor", device,
                                                 &processor_cooling_ops);
-        if (pr->cdev)
+        if (IS_ERR(pr->cdev)) {
+                result = PTR_ERR(pr->cdev);
+                goto end;
+        }
+        if (pr->cdev) {
                 printk(KERN_INFO PREFIX
                         "%s is registered as cooling_device%d\n",
                         device->dev.bus_id, pr->cdev->id);
-        else
-                goto end;
 
-        result = sysfs_create_link(&device->dev.kobj, &pr->cdev->device.kobj,
-                                        "thermal_cooling");
-        if (result)
-                return result;
-        result = sysfs_create_link(&pr->cdev->device.kobj, &device->dev.kobj,
-                                        "device");
-        if (result)
-                return result;
+                result = sysfs_create_link(&device->dev.kobj,
+                                           &pr->cdev->device.kobj,
+                                           "thermal_cooling");
+                if (result)
+                        return result;
+                result = sysfs_create_link(&pr->cdev->device.kobj,
+                                           &device->dev.kobj,
+                                           "device");
+                if (result)
+                        return result;
+        }
 
         if (pr->flags.throttling) {
                 printk(KERN_INFO PREFIX "%s [%s] (supports",
@@ -809,10 +814,12 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 
         acpi_processor_remove_fs(device);
 
-        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-        sysfs_remove_link(&pr->cdev->device.kobj, "device");
-        thermal_cooling_device_unregister(pr->cdev);
-        pr->cdev = NULL;
+        if (pr->cdev) {
+                sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+                sysfs_remove_link(&pr->cdev->device.kobj, "device");
+                thermal_cooling_device_unregister(pr->cdev);
+                pr->cdev = NULL;
+        }
 
         processors[pr->id] = NULL;
 
@@ -826,8 +833,6 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
  *      Acpi processor hotplug support                                      *
  ****************************************************************************/
 
-static int is_processor_present(acpi_handle handle);
-
 static int is_processor_present(acpi_handle handle)
 {
         acpi_status status;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 32003fdc91e8..6f3b217699e9 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -364,7 +364,7 @@ int acpi_processor_resume(struct acpi_device * device)
         return 0;
 }
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
 static int tsc_halts_in_c(int state)
 {
         switch (boot_cpu_data.x86_vendor) {
@@ -544,7 +544,7 @@ static void acpi_processor_idle(void)
                 /* Get end time (ticks) */
                 t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#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");
@@ -609,7 +609,7 @@ static void acpi_processor_idle(void)
                         acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
                 }
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#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");
@@ -945,11 +945,16 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                                  * Otherwise, ignore this info and continue.
                                  */
                                 cx.entry_method = ACPI_CSTATE_HALT;
+                                snprintf(cx.desc, ACPI_CX_DESC_LEN, "ACPI HLT");
                         } else {
                                 continue;
                         }
+                } else {
+                        snprintf(cx.desc, ACPI_CX_DESC_LEN, "ACPI IOPORT 0x%x",
+                                 cx.address);
                 }
 
+
                 obj = &(element->package.elements[2]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
@@ -1420,6 +1425,14 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
                 return 0;
 
         local_irq_disable();
+
+        /* Do not access any ACPI IO ports in suspend path */
+        if (acpi_idle_suspend) {
+                acpi_safe_halt();
+                local_irq_enable();
+                return 0;
+        }
+
         if (pr->flags.bm_check)
                 acpi_idle_update_bm_rld(pr, cx);
 
@@ -1487,7 +1500,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         acpi_idle_do_entry(cx);
         t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
         /* TSC could halt in idle, so notify users */
         if (tsc_halts_in_c(cx->type))
                 mark_tsc_unstable("TSC halts in idle");;
@@ -1601,7 +1614,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 spin_unlock(&c3_lock);
         }
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
         /* TSC could halt in idle, so notify users */
         if (tsc_halts_in_c(ACPI_STATE_C3))
                 mark_tsc_unstable("TSC halts in idle");
@@ -1643,6 +1656,11 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                 return -EINVAL;
         }
 
+        for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
+                dev->states[i].name[0] = '\0';
+                dev->states[i].desc[0] = '\0';
+        }
+
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
                 cx = &pr->power.states[i];
                 state = &dev->states[count];
@@ -1659,6 +1677,7 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                 cpuidle_set_statedata(state, cx);
 
                 snprintf(state->name, CPUIDLE_NAME_LEN, "C%d", i);
+                strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN);
                 state->exit_latency = cx->latency;
                 state->target_residency = cx->latency * latency_factor;
                 state->power_usage = cx->power;
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 34f157571080..eba55b7d6c95 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -36,16 +36,20 @@ ACPI_MODULE_NAME("utils");
 /* --------------------------------------------------------------------------
                             Object Evaluation Helpers
    -------------------------------------------------------------------------- */
+static void
+acpi_util_eval_error(acpi_handle h, acpi_string p, acpi_status s)
+{
 #ifdef ACPI_DEBUG_OUTPUT
-#define acpi_util_eval_error(h,p,s) {\
-        char prefix[80] = {'\0'};\
-        struct acpi_buffer buffer = {sizeof(prefix), prefix};\
-        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);\
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",\
-                (char *) prefix, p, acpi_format_exception(s))); }
+        char prefix[80] = {'\0'};
+        struct acpi_buffer buffer = {sizeof(prefix), prefix};
+        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",
+                (char *) prefix, p, acpi_format_exception(s)));
 #else
-#define acpi_util_eval_error(h,p,s)
+        return;
 #endif
+}
+
 acpi_status
 acpi_extract_package(union acpi_object *package,
                      struct acpi_buffer *format, struct acpi_buffer *buffer)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 7f714fa2a454..12cce69b5441 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -731,6 +731,9 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 
                 device->cdev = thermal_cooling_device_register("LCD",
                                         device->dev, &video_cooling_ops);
+                if (IS_ERR(device->cdev))
+                        return;
+
                 if (device->cdev) {
                         printk(KERN_INFO PREFIX
                                 "%s is registered as cooling_device%d\n",
diff --git a/drivers/acpi/wmi.c b/drivers/acpi/wmi.c
index 457ed3d3f51c..efacc9f8bfe3 100644
--- a/drivers/acpi/wmi.c
+++ b/drivers/acpi/wmi.c
@@ -247,7 +247,7 @@ u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out)
         block = &wblock->gblock;
         handle = wblock->handle;
 
-        if (!block->flags & ACPI_WMI_METHOD)
+        if (!(block->flags & ACPI_WMI_METHOD))
                 return AE_BAD_DATA;
 
         if (block->instance_count < instance)
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 29e71bddd6ff..6dd12f7019a0 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1932,7 +1932,7 @@ static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
         void __iomem *mmio = host->iomap[AHCI_PCI_BAR];
         u32 ctl;
 
-        if (mesg.event == PM_EVENT_SUSPEND) {
+        if (mesg.event & PM_EVENT_SLEEP) {
                 /* AHCI spec rev1.1 section 8.3.3:
                  * Software must disable interrupts prior to requesting a
                  * transition of the HBA to D3 state.
@@ -1975,16 +1975,11 @@ static int ahci_port_start(struct ata_port *ap)
         struct ahci_port_priv *pp;
         void *mem;
         dma_addr_t mem_dma;
-        int rc;
 
         pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
         if (!pp)
                 return -ENOMEM;
 
-        rc = ata_pad_alloc(ap, dev);
-        if (rc)
-                return rc;
-
         mem = dmam_alloc_coherent(dev, AHCI_PORT_PRIV_DMA_SZ, &mem_dma,
                                   GFP_KERNEL);
         if (!mem)
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 9c2515f67de5..fae8404254c0 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1339,7 +1339,7 @@ static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
          * cycles and power trying to do something to the sleeping
          * beauty.
          */
-        if (piix_broken_suspend() && mesg.event == PM_EVENT_SUSPEND) {
+        if (piix_broken_suspend() && (mesg.event & PM_EVENT_SLEEP)) {
                 pci_save_state(pdev);
 
                 /* mark its power state as "unknown", since we don't
@@ -1652,7 +1652,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
                 u8 tmp;
                 pci_read_config_byte(pdev, PIIX_SCC, &tmp);
                 if (tmp == PIIX_AHCI_DEVICE) {
-                        int rc = piix_disable_ahci(pdev);
+                        rc = piix_disable_ahci(pdev);
                         if (rc)
                                 return rc;
                 }
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 004dae4ea5bc..4cf8662df99e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -87,6 +87,28 @@ static struct workqueue_struct *ata_wq;
 
 struct workqueue_struct *ata_aux_wq;
 
+struct ata_force_param {
+        const char      *name;
+        unsigned int    cbl;
+        int             spd_limit;
+        unsigned long   xfer_mask;
+        unsigned int    horkage_on;
+        unsigned int    horkage_off;
+};
+
+struct ata_force_ent {
+        int                     port;
+        int                     device;
+        struct ata_force_param  param;
+};
+
+static struct ata_force_ent *ata_force_tbl;
+static int ata_force_tbl_size;
+
+static char ata_force_param_buf[PAGE_SIZE] __initdata;
+module_param_string(force, ata_force_param_buf, sizeof(ata_force_param_buf), 0444);
+MODULE_PARM_DESC(force, "Force ATA configurations including cable type, link speed and transfer mode (see Documentation/kernel-parameters.txt for details)");
+
 int atapi_enabled = 1;
 module_param(atapi_enabled, int, 0444);
 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
@@ -130,6 +152,179 @@ MODULE_VERSION(DRV_VERSION);
 
 
 /**
+ *      ata_force_cbl - force cable type according to libata.force
+ *      @link: ATA link of interest
+ *
+ *      Force cable type according to libata.force and whine about it.
+ *      The last entry which has matching port number is used, so it
+ *      can be specified as part of device force parameters.  For
+ *      example, both "a:40c,1.00:udma4" and "1.00:40c,udma4" have the
+ *      same effect.
+ *
+ *      LOCKING:
+ *      EH context.
+ */
+void ata_force_cbl(struct ata_port *ap)
+{
+        int i;
+
+        for (i = ata_force_tbl_size - 1; i >= 0; i--) {
+                const struct ata_force_ent *fe = &ata_force_tbl[i];
+
+                if (fe->port != -1 && fe->port != ap->print_id)
+                        continue;
+
+                if (fe->param.cbl == ATA_CBL_NONE)
+                        continue;
+
+                ap->cbl = fe->param.cbl;
+                ata_port_printk(ap, KERN_NOTICE,
+                                "FORCE: cable set to %s\n", fe->param.name);
+                return;
+        }
+}
+
+/**
+ *      ata_force_spd_limit - force SATA spd limit according to libata.force
+ *      @link: ATA link of interest
+ *
+ *      Force SATA spd limit according to libata.force and whine about
+ *      it.  When only the port part is specified (e.g. 1:), the limit
+ *      applies to all links connected to both the host link and all
+ *      fan-out ports connected via PMP.  If the device part is
+ *      specified as 0 (e.g. 1.00:), it specifies the first fan-out
+ *      link not the host link.  Device number 15 always points to the
+ *      host link whether PMP is attached or not.
+ *
+ *      LOCKING:
+ *      EH context.
+ */
+static void ata_force_spd_limit(struct ata_link *link)
+{
+        int linkno, i;
+
+        if (ata_is_host_link(link))
+                linkno = 15;
+        else
+                linkno = link->pmp;
+
+        for (i = ata_force_tbl_size - 1; i >= 0; i--) {
+                const struct ata_force_ent *fe = &ata_force_tbl[i];
+
+                if (fe->port != -1 && fe->port != link->ap->print_id)
+                        continue;
+
+                if (fe->device != -1 && fe->device != linkno)
+                        continue;
+
+                if (!fe->param.spd_limit)
+                        continue;
+
+                link->hw_sata_spd_limit = (1 << fe->param.spd_limit) - 1;
+                ata_link_printk(link, KERN_NOTICE,
+                        "FORCE: PHY spd limit set to %s\n", fe->param.name);
+                return;
+        }
+}
+
+/**
+ *      ata_force_xfermask - force xfermask according to libata.force
+ *      @dev: ATA device of interest
+ *
+ *      Force xfer_mask according to libata.force and whine about it.
+ *      For consistency with link selection, device number 15 selects
+ *      the first device connected to the host link.
+ *
+ *      LOCKING:
+ *      EH context.
+ */
+static void ata_force_xfermask(struct ata_device *dev)
+{
+        int devno = dev->link->pmp + dev->devno;
+        int alt_devno = devno;
+        int i;
+
+        /* allow n.15 for the first device attached to host port */
+        if (ata_is_host_link(dev->link) && devno == 0)
+                alt_devno = 15;
+
+        for (i = ata_force_tbl_size - 1; i >= 0; i--) {
+                const struct ata_force_ent *fe = &ata_force_tbl[i];
+                unsigned long pio_mask, mwdma_mask, udma_mask;
+
+                if (fe->port != -1 && fe->port != dev->link->ap->print_id)
+                        continue;
+
+                if (fe->device != -1 && fe->device != devno &&
+                    fe->device != alt_devno)
+                        continue;
+
+                if (!fe->param.xfer_mask)
+                        continue;
+
+                ata_unpack_xfermask(fe->param.xfer_mask,
+                                    &pio_mask, &mwdma_mask, &udma_mask);
+                if (udma_mask)
+                        dev->udma_mask = udma_mask;
+                else if (mwdma_mask) {
+                        dev->udma_mask = 0;
+                        dev->mwdma_mask = mwdma_mask;
+                } else {
+                        dev->udma_mask = 0;
+                        dev->mwdma_mask = 0;
+                        dev->pio_mask = pio_mask;
+                }
+
+                ata_dev_printk(dev, KERN_NOTICE,
+                        "FORCE: xfer_mask set to %s\n", fe->param.name);
+                return;
+        }
+}
+
+/**
+ *      ata_force_horkage - force horkage according to libata.force
+ *      @dev: ATA device of interest
+ *
+ *      Force horkage according to libata.force and whine about it.
+ *      For consistency with link selection, device number 15 selects
+ *      the first device connected to the host link.
+ *
+ *      LOCKING:
+ *      EH context.
+ */
+static void ata_force_horkage(struct ata_device *dev)
+{
+        int devno = dev->link->pmp + dev->devno;
+        int alt_devno = devno;
+        int i;
+
+        /* allow n.15 for the first device attached to host port */
+        if (ata_is_host_link(dev->link) && devno == 0)
+                alt_devno = 15;
+
+        for (i = 0; i < ata_force_tbl_size; i++) {
+                const struct ata_force_ent *fe = &ata_force_tbl[i];
+
+                if (fe->port != -1 && fe->port != dev->link->ap->print_id)
+                        continue;
+
+                if (fe->device != -1 && fe->device != devno &&
+                    fe->device != alt_devno)
+                        continue;
+
+                if (!(~dev->horkage & fe->param.horkage_on) &&
+                    !(dev->horkage & fe->param.horkage_off))
+                        continue;
+
+                dev->horkage |= fe->param.horkage_on;
+                dev->horkage &= ~fe->param.horkage_off;
+
+                ata_dev_printk(dev, KERN_NOTICE,
+                        "FORCE: horkage modified (%s)\n", fe->param.name);
+        }
+}
+
+/**
  *      ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure
  *      @tf: Taskfile to convert
  *      @pmp: Port multiplier port
@@ -2067,6 +2262,7 @@ int ata_dev_configure(struct ata_device *dev)
 
         /* set horkage */
         dev->horkage |= ata_dev_blacklisted(dev);
+        ata_force_horkage(dev);
 
         /* let ACPI work its magic */
         rc = ata_acpi_on_devcfg(dev);
@@ -3150,6 +3346,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
                         mode_mask = ATA_DMA_MASK_CFA;
 
                 ata_dev_xfermask(dev);
+                ata_force_xfermask(dev);
 
                 pio_mask = ata_pack_xfermask(dev->pio_mask, 0, 0);
                 dma_mask = ata_pack_xfermask(0, dev->mwdma_mask, dev->udma_mask);
@@ -4190,6 +4387,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         /* Devices which report 1 sector over size HPA */
         { "ST340823A",          NULL,           ATA_HORKAGE_HPA_SIZE, },
         { "ST320413A",          NULL,           ATA_HORKAGE_HPA_SIZE, },
+        { "ST310211A",          NULL,           ATA_HORKAGE_HPA_SIZE, },
 
         /* Devices which get the IVB wrong */
         { "QUANTUM FIREBALLlct10 05", "A03.0900", ATA_HORKAGE_IVB, },
@@ -4492,30 +4690,13 @@ void ata_sg_clean(struct ata_queued_cmd *qc)
         struct ata_port *ap = qc->ap;
         struct scatterlist *sg = qc->sg;
         int dir = qc->dma_dir;
-        void *pad_buf = NULL;
 
         WARN_ON(sg == NULL);
 
-        VPRINTK("unmapping %u sg elements\n", qc->mapped_n_elem);
+        VPRINTK("unmapping %u sg elements\n", qc->n_elem);
 
-        /* if we padded the buffer out to 32-bit bound, and data
-         * xfer direction is from-device, we must copy from the
-         * pad buffer back into the supplied buffer
-         */
-        if (qc->pad_len && !(qc->tf.flags & ATA_TFLAG_WRITE))
-                pad_buf = ap->pad + (qc->tag * ATA_DMA_PAD_SZ);
-
-        if (qc->mapped_n_elem)
-                dma_unmap_sg(ap->dev, sg, qc->mapped_n_elem, dir);
-        /* restore last sg */
-        if (qc->last_sg)
-                *qc->last_sg = qc->saved_last_sg;
-        if (pad_buf) {
-                struct scatterlist *psg = &qc->extra_sg[1];
-                void *addr = kmap_atomic(sg_page(psg), KM_IRQ0);
-                memcpy(addr + psg->offset, pad_buf, qc->pad_len);
-                kunmap_atomic(addr, KM_IRQ0);
-        }
+        if (qc->n_elem)
+                dma_unmap_sg(ap->dev, sg, qc->n_elem, dir);
 
         qc->flags &= ~ATA_QCFLAG_DMAMAP;
         qc->sg = NULL;
@@ -4658,43 +4839,6 @@ int ata_check_atapi_dma(struct ata_queued_cmd *qc)
 }
 
 /**
- *      atapi_qc_may_overflow - Check whether data transfer may overflow
- *      @qc: ATA command in question
- *
- *      ATAPI commands which transfer variable length data to host
- *      might overflow due to application error or hardare bug.  This
- *      function checks whether overflow should be drained and ignored
- *      for @qc.
- *
- *      LOCKING:
- *      None.
- *
- *      RETURNS:
- *      1 if @qc may overflow; otherwise, 0.
- */
-static int atapi_qc_may_overflow(struct ata_queued_cmd *qc)
-{
-        if (qc->tf.protocol != ATAPI_PROT_PIO &&
-            qc->tf.protocol != ATAPI_PROT_DMA)
-                return 0;
-
-        if (qc->tf.flags & ATA_TFLAG_WRITE)
-                return 0;
-
-        switch (qc->cdb[0]) {
-        case READ_10:
-        case READ_12:
-        case WRITE_10:
-        case WRITE_12:
-        case GPCMD_READ_CD:
-        case GPCMD_READ_CD_MSF:
-                return 0;
-        }
-
-        return 1;
-}
-
-/**
  *      ata_std_qc_defer - Check whether a qc needs to be deferred
  *      @qc: ATA command in question
  *
@@ -4781,97 +4925,6 @@ void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
         qc->cursg = qc->sg;
 }
 
-static unsigned int ata_sg_setup_extra(struct ata_queued_cmd *qc,
-                                       unsigned int *n_elem_extra,
-                                       unsigned int *nbytes_extra)
-{
-        struct ata_port *ap = qc->ap;
-        unsigned int n_elem = qc->n_elem;
-        struct scatterlist *lsg, *copy_lsg = NULL, *tsg = NULL, *esg = NULL;
-
-        *n_elem_extra = 0;
-        *nbytes_extra = 0;
-
-        /* needs padding? */
-        qc->pad_len = qc->nbytes & 3;
-
-        if (likely(!qc->pad_len))
-                return n_elem;
-
-        /* locate last sg and save it */
-        lsg = sg_last(qc->sg, n_elem);
-        qc->last_sg = lsg;
-        qc->saved_last_sg = *lsg;
-
-        sg_init_table(qc->extra_sg, ARRAY_SIZE(qc->extra_sg));
-
-        if (qc->pad_len) {
-                struct scatterlist *psg = &qc->extra_sg[1];
-                void *pad_buf = ap->pad + (qc->tag * ATA_DMA_PAD_SZ);
-                unsigned int offset;
-
-                WARN_ON(qc->dev->class != ATA_DEV_ATAPI);
-
-                memset(pad_buf, 0, ATA_DMA_PAD_SZ);
-
-                /* psg->page/offset are used to copy to-be-written
-                 * data in this function or read data in ata_sg_clean.
-                 */
-                offset = lsg->offset + lsg->length - qc->pad_len;
-                sg_set_page(psg, nth_page(sg_page(lsg), offset >> PAGE_SHIFT),
-                            qc->pad_len, offset_in_page(offset));
-
-                if (qc->tf.flags & ATA_TFLAG_WRITE) {
-                        void *addr = kmap_atomic(sg_page(psg), KM_IRQ0);
-                        memcpy(pad_buf, addr + psg->offset, qc->pad_len);
-                        kunmap_atomic(addr, KM_IRQ0);
-                }
-
-                sg_dma_address(psg) = ap->pad_dma + (qc->tag * ATA_DMA_PAD_SZ);
-                sg_dma_len(psg) = ATA_DMA_PAD_SZ;
-
-                /* Trim the last sg entry and chain the original and
-                 * padding sg lists.
-                 *
-                 * Because chaining consumes one sg entry, one extra
-                 * sg entry is allocated and the last sg entry is
-                 * copied to it if the length isn't zero after padded
-                 * amount is removed.
-                 *
-                 * If the last sg entry is completely replaced by
-                 * padding sg entry, the first sg entry is skipped
-                 * while chaining.
-                 */
-                lsg->length -= qc->pad_len;
-                if (lsg->length) {
-                        copy_lsg = &qc->extra_sg[0];
-                        tsg = &qc->extra_sg[0];
-                } else {
-                        n_elem--;
-                        tsg = &qc->extra_sg[1];
-                }
-
-                esg = &qc->extra_sg[1];
-
-                (*n_elem_extra)++;
-                (*nbytes_extra) += 4 - qc->pad_len;
-        }
-
-        if (copy_lsg)
-                sg_set_page(copy_lsg, sg_page(lsg), lsg->length, lsg->offset);
-
-        sg_chain(lsg, 1, tsg);
-        sg_mark_end(esg);
-
-        /* sglist can't start with chaining sg entry, fast forward */
-        if (qc->sg == lsg) {
-                qc->sg = tsg;
-                qc->cursg = tsg;
-        }
-
-        return n_elem;
-}
-
 /**
  *      ata_sg_setup - DMA-map the scatter-gather table associated with a command.
  *      @qc: Command with scatter-gather table to be mapped.
@@ -4888,26 +4941,17 @@ static unsigned int ata_sg_setup_extra(struct ata_queued_cmd *qc,
 static int ata_sg_setup(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
-        unsigned int n_elem, n_elem_extra, nbytes_extra;
+        unsigned int n_elem;
 
         VPRINTK("ENTER, ata%u\n", ap->print_id);
 
-        n_elem = ata_sg_setup_extra(qc, &n_elem_extra, &nbytes_extra);
+        n_elem = dma_map_sg(ap->dev, qc->sg, qc->n_elem, qc->dma_dir);
+        if (n_elem < 1)
+                return -1;
 
-        if (n_elem) {
-                n_elem = dma_map_sg(ap->dev, qc->sg, n_elem, qc->dma_dir);
-                if (n_elem < 1) {
-                        /* restore last sg */
-                        if (qc->last_sg)
-                                *qc->last_sg = qc->saved_last_sg;
-                        return -1;
-                }
-                DPRINTK("%d sg elements mapped\n", n_elem);
-        }
+        DPRINTK("%d sg elements mapped\n", n_elem);
 
-        qc->n_elem = qc->mapped_n_elem = n_elem;
-        qc->n_elem += n_elem_extra;
-        qc->nbytes += nbytes_extra;
+        qc->n_elem = n_elem;
         qc->flags |= ATA_QCFLAG_DMAMAP;
 
         return 0;
@@ -5145,46 +5189,22 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
  */
 static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
 {
-        int do_write = (qc->tf.flags & ATA_TFLAG_WRITE);
+        int rw = (qc->tf.flags & ATA_TFLAG_WRITE) ? WRITE : READ;
         struct ata_port *ap = qc->ap;
-        struct ata_eh_info *ehi = &qc->dev->link->eh_info;
+        struct ata_device *dev = qc->dev;
+        struct ata_eh_info *ehi = &dev->link->eh_info;
         struct scatterlist *sg;
         struct page *page;
         unsigned char *buf;
-        unsigned int offset, count;
+        unsigned int offset, count, consumed;
 
 next_sg:
         sg = qc->cursg;
         if (unlikely(!sg)) {
-                /*
-                 * The end of qc->sg is reached and the device expects
-                 * more data to transfer. In order not to overrun qc->sg
-                 * and fulfill length specified in the byte count register,
-                 *    - for read case, discard trailing data from the device
-                 *    - for write case, padding zero data to the device
-                 */
-                u16 pad_buf[1] = { 0 };
-                unsigned int i;
-
-                if (bytes > qc->curbytes - qc->nbytes + ATAPI_MAX_DRAIN) {
-                        ata_ehi_push_desc(ehi, "too much trailing data "
-                                          "buf=%u cur=%u bytes=%u",
-                                          qc->nbytes, qc->curbytes, bytes);
-                        return -1;
-                }
-
-                 /* overflow is exptected for misc ATAPI commands */
-                if (bytes && !atapi_qc_may_overflow(qc))
-                        ata_dev_printk(qc->dev, KERN_WARNING, "ATAPI %u bytes "
-                                       "trailing data (cdb=%02x nbytes=%u)\n",
-                                       bytes, qc->cdb[0], qc->nbytes);
-
-                for (i = 0; i < (bytes + 1) / 2; i++)
-                        ap->ops->data_xfer(qc->dev, (unsigned char *)pad_buf, 2, do_write);
-
-                qc->curbytes += bytes;
-
-                return 0;
+                ata_ehi_push_desc(ehi, "unexpected or too much trailing data "
+                                  "buf=%u cur=%u bytes=%u",
+                                  qc->nbytes, qc->curbytes, bytes);
+                return -1;
         }
 
         page = sg_page(sg);
@@ -5210,18 +5230,16 @@ next_sg:
                 buf = kmap_atomic(page, KM_IRQ0);
 
                 /* do the actual data transfer */
-                ap->ops->data_xfer(qc->dev,  buf + offset, count, do_write);
+                consumed = ap->ops->data_xfer(dev,  buf + offset, count, rw);
 
                 kunmap_atomic(buf, KM_IRQ0);
                 local_irq_restore(flags);
         } else {
                 buf = page_address(page);
-                ap->ops->data_xfer(qc->dev,  buf + offset, count, do_write);
+                consumed = ap->ops->data_xfer(dev,  buf + offset, count, rw);
         }
 
-        bytes -= count;
-        if ((count & 1) && bytes)
-                bytes--;
+        bytes -= min(bytes, consumed);
         qc->curbytes += count;
         qc->cursg_ofs += count;
 
@@ -5230,9 +5248,11 @@ next_sg:
                 qc->cursg_ofs = 0;
         }
 
+        /* consumed can be larger than count only for the last transfer */
+        WARN_ON(qc->cursg && count != consumed);
+
         if (bytes)
                 goto next_sg;
-
         return 0;
 }
 
@@ -5250,6 +5270,7 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct ata_device *dev = qc->dev;
+        struct ata_eh_info *ehi = &dev->link->eh_info;
         unsigned int ireason, bc_lo, bc_hi, bytes;
         int i_write, do_write = (qc->tf.flags & ATA_TFLAG_WRITE) ? 1 : 0;
 
@@ -5267,26 +5288,28 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)
 
         /* shall be cleared to zero, indicating xfer of data */
         if (unlikely(ireason & (1 << 0)))
-                goto err_out;
+                goto atapi_check;
 
         /* make sure transfer direction matches expected */
         i_write = ((ireason & (1 << 1)) == 0) ? 1 : 0;
         if (unlikely(do_write != i_write))
-                goto err_out;
+                goto atapi_check;
 
         if (unlikely(!bytes))
-                goto err_out;
+                goto atapi_check;
 
         VPRINTK("ata%u: xfering %d bytes\n", ap->print_id, bytes);
 
-        if (__atapi_pio_bytes(qc, bytes))
+        if (unlikely(__atapi_pio_bytes(qc, bytes)))
                 goto err_out;
         ata_altstatus(ap); /* flush */
 
         return;
 
-err_out:
-        ata_dev_printk(dev, KERN_INFO, "ATAPI check failed\n");
+ atapi_check:
+        ata_ehi_push_desc(ehi, "ATAPI check failed (ireason=0x%x bytes=%u)",
+                          ireason, bytes);
+ err_out:
         qc->err_mask |= AC_ERR_HSM;
         ap->hsm_task_state = HSM_ST_ERR;
 }
@@ -5971,9 +5994,6 @@ void ata_qc_issue(struct ata_queued_cmd *qc)
          */
         BUG_ON(ata_is_data(prot) && (!qc->sg || !qc->n_elem || !qc->nbytes));
 
-        /* ata_sg_setup() may update nbytes */
-        qc->raw_nbytes = qc->nbytes;
-
         if (ata_is_dma(prot) || (ata_is_pio(prot) &&
                                  (ap->flags & ATA_FLAG_PIO_DMA)))
                 if (ata_sg_setup(qc))
@@ -6582,19 +6602,12 @@ void ata_host_resume(struct ata_host *host)
 int ata_port_start(struct ata_port *ap)
 {
         struct device *dev = ap->dev;
-        int rc;
 
         ap->prd = dmam_alloc_coherent(dev, ATA_PRD_TBL_SZ, &ap->prd_dma,
                                       GFP_KERNEL);
         if (!ap->prd)
                 return -ENOMEM;
 
-        rc = ata_pad_alloc(ap, dev);
-        if (rc)
-                return rc;
-
-        DPRINTK("prd alloc, virt %p, dma %llx\n", ap->prd,
-                (unsigned long long)ap->prd_dma);
         return 0;
 }
 
@@ -6681,7 +6694,8 @@ void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp)
  */
 int sata_link_init_spd(struct ata_link *link)
 {
-        u32 scontrol, spd;
+        u32 scontrol;
+        u8 spd;
         int rc;
 
         rc = sata_scr_read(link, SCR_CONTROL, &scontrol);
@@ -6692,6 +6706,8 @@ int sata_link_init_spd(struct ata_link *link)
         if (spd)
                 link->hw_sata_spd_limit &= (1 << spd) - 1;
 
+        ata_force_spd_limit(link);
+
         link->sata_spd_limit = link->hw_sata_spd_limit;
 
         return 0;
@@ -7086,7 +7102,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
         DPRINTK("probe begin\n");
         for (i = 0; i < host->n_ports; i++) {
                 struct ata_port *ap = host->ports[i];
-                int rc;
 
                 /* probe */
                 if (ap->ops->error_handler) {
@@ -7353,7 +7368,7 @@ void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pci_save_state(pdev);
         pci_disable_device(pdev);
 
-        if (mesg.event == PM_EVENT_SUSPEND)
+        if (mesg.event & PM_EVENT_SLEEP)
                 pci_set_power_state(pdev, PCI_D3hot);
 }
 
@@ -7403,10 +7418,187 @@ int ata_pci_device_resume(struct pci_dev *pdev)
 
 #endif /* CONFIG_PCI */
 
+static int __init ata_parse_force_one(char **cur,
+                                      struct ata_force_ent *force_ent,
+                                      const char **reason)
+{
+        /* FIXME: Currently, there's no way to tag init const data and
+         * using __initdata causes build failure on some versions of
+         * gcc.  Once __initdataconst is implemented, add const to the
+         * following structure.
+         */
+        static struct ata_force_param force_tbl[] __initdata = {
+                { "40c",        .cbl            = ATA_CBL_PATA40 },
+                { "80c",        .cbl            = ATA_CBL_PATA80 },
+                { "short40c",   .cbl            = ATA_CBL_PATA40_SHORT },
+                { "unk",        .cbl            = ATA_CBL_PATA_UNK },
+                { "ign",        .cbl            = ATA_CBL_PATA_IGN },
+                { "sata",       .cbl            = ATA_CBL_SATA },
+                { "1.5Gbps",    .spd_limit      = 1 },
+                { "3.0Gbps",    .spd_limit      = 2 },
+                { "noncq",      .horkage_on     = ATA_HORKAGE_NONCQ },
+                { "ncq",        .horkage_off    = ATA_HORKAGE_NONCQ },
+                { "pio0",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 0) },
+                { "pio1",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 1) },
+                { "pio2",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 2) },
+                { "pio3",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 3) },
+                { "pio4",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 4) },
+                { "pio5",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 5) },
+                { "pio6",       .xfer_mask      = 1 << (ATA_SHIFT_PIO + 6) },
+                { "mwdma0",     .xfer_mask      = 1 << (ATA_SHIFT_MWDMA + 0) },
+                { "mwdma1",     .xfer_mask      = 1 << (ATA_SHIFT_MWDMA + 1) },
+                { "mwdma2",     .xfer_mask      = 1 << (ATA_SHIFT_MWDMA + 2) },
+                { "mwdma3",     .xfer_mask      = 1 << (ATA_SHIFT_MWDMA + 3) },
+                { "mwdma4",     .xfer_mask      = 1 << (ATA_SHIFT_MWDMA + 4) },
+                { "udma0",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 0) },
+                { "udma16",     .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 0) },
+                { "udma/16",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 0) },
+                { "udma1",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 1) },
+                { "udma25",     .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 1) },
+                { "udma/25",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 1) },
+                { "udma2",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 2) },
+                { "udma33",     .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 2) },
+                { "udma/33",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 2) },
+                { "udma3",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 3) },
+                { "udma44",     .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 3) },
+                { "udma/44",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 3) },
+                { "udma4",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 4) },
+                { "udma66",     .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 4) },
+                { "udma/66",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 4) },
+                { "udma5",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 5) },
+                { "udma100",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 5) },
+                { "udma/100",   .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 5) },
+                { "udma6",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 6) },
+                { "udma133",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 6) },
+                { "udma/133",   .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 6) },
+                { "udma7",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 7) },
+        };
+        char *start = *cur, *p = *cur;
+        char *id, *val, *endp;
+        const struct ata_force_param *match_fp = NULL;
+        int nr_matches = 0, i;
+
+        /* find where this param ends and update *cur */
+        while (*p != '\0' && *p != ',')
+                p++;
+
+        if (*p == '\0')
+                *cur = p;
+        else
+                *cur = p + 1;
+
+        *p = '\0';
+
+        /* parse */
+        p = strchr(start, ':');
+        if (!p) {
+                val = strstrip(start);
+                goto parse_val;
+        }
+        *p = '\0';
+
+        id = strstrip(start);
+        val = strstrip(p + 1);
+
+        /* parse id */
+        p = strchr(id, '.');
+        if (p) {
+                *p++ = '\0';
+                force_ent->device = simple_strtoul(p, &endp, 10);
+                if (p == endp || *endp != '\0') {
+                        *reason = "invalid device";
+                        return -EINVAL;
+                }
+        }
+
+        force_ent->port = simple_strtoul(id, &endp, 10);
+        if (p == endp || *endp != '\0') {
+                *reason = "invalid port/link";
+                return -EINVAL;
+        }
+
+ parse_val:
+        /* parse val, allow shortcuts so that both 1.5 and 1.5Gbps work */
+        for (i = 0; i < ARRAY_SIZE(force_tbl); i++) {
+                const struct ata_force_param *fp = &force_tbl[i];
+
+                if (strncasecmp(val, fp->name, strlen(val)))
+                        continue;
+
+                nr_matches++;
+                match_fp = fp;
+
+                if (strcasecmp(val, fp->name) == 0) {
+                        nr_matches = 1;
+                        break;
+                }
+        }
+
+        if (!nr_matches) {
+                *reason = "unknown value";
+                return -EINVAL;
+        }
+        if (nr_matches > 1) {
+                *reason = "ambigious value";
+                return -EINVAL;
+        }
+
+        force_ent->param = *match_fp;
+
+        return 0;
+}
+
+static void __init ata_parse_force_param(void)
+{
+        int idx = 0, size = 1;
+        int last_port = -1, last_device = -1;
+        char *p, *cur, *next;
+
+        /* calculate maximum number of params and allocate force_tbl */
+        for (p = ata_force_param_buf; *p; p++)
+                if (*p == ',')
+                        size++;
+
+        ata_force_tbl = kzalloc(sizeof(ata_force_tbl[0]) * size, GFP_KERNEL);
+        if (!ata_force_tbl) {
+                printk(KERN_WARNING "ata: failed to extend force table, "
+                       "libata.force ignored\n");
+                return;
+        }
+
+        /* parse and populate the table */
+        for (cur = ata_force_param_buf; *cur != '\0'; cur = next) {
+                const char *reason = "";
+                struct ata_force_ent te = { .port = -1, .device = -1 };
+
+                next = cur;
+                if (ata_parse_force_one(&next, &te, &reason)) {
+                        printk(KERN_WARNING "ata: failed to parse force "
+                               "parameter \"%s\" (%s)\n",
+                               cur, reason);
+                        continue;
+                }
+
+                if (te.port == -1) {
+                        te.port = last_port;
+                        te.device = last_device;
+                }
+
+                ata_force_tbl[idx++] = te;
+
+                last_port = te.port;
+                last_device = te.device;
+        }
+
+        ata_force_tbl_size = idx;
+}
 
 static int __init ata_init(void)
 {
         ata_probe_timeout *= HZ;
+
+        ata_parse_force_param();
+
         ata_wq = create_workqueue("ata");
         if (!ata_wq)
                 return -ENOMEM;
@@ -7423,6 +7615,7 @@ static int __init ata_init(void)
 
 static void __exit ata_exit(void)
 {
+        kfree(ata_force_tbl);
         destroy_workqueue(ata_wq);
         destroy_workqueue(ata_aux_wq);
 }
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 4e31071acc02..698ce2cea52c 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2393,9 +2393,11 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
         }
 
         /* PDIAG- should have been released, ask cable type if post-reset */
-        if (ata_is_host_link(link) && ap->ops->cable_detect &&
-            (ehc->i.flags & ATA_EHI_DID_RESET))
-                ap->cbl = ap->ops->cable_detect(ap);
+        if ((ehc->i.flags & ATA_EHI_DID_RESET) && ata_is_host_link(link)) {
+                if (ap->ops->cable_detect)
+                        ap->cbl = ap->ops->cable_detect(ap);
+                ata_force_cbl(ap);
+        }
 
         /* Configure new devices forward such that user doesn't see
          * device detection messages backwards.
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index c02c490122dc..f888babc8283 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -826,30 +826,61 @@ static void ata_scsi_sdev_config(struct scsi_device *sdev)
         sdev->max_device_blocked = 1;
 }
 
-static void ata_scsi_dev_config(struct scsi_device *sdev,
-                                struct ata_device *dev)
+/**
+ *      atapi_drain_needed - Check whether data transfer may overflow
+ *      @rq: request to be checked
+ *
+ *      ATAPI commands which transfer variable length data to host
+ *      might overflow due to application error or hardare bug.  This
+ *      function checks whether overflow should be drained and ignored
+ *      for @request.
+ *
+ *      LOCKING:
+ *      None.
+ *
+ *      RETURNS:
+ *      1 if ; otherwise, 0.
+ */
+static int atapi_drain_needed(struct request *rq)
+{
+        if (likely(!blk_pc_request(rq)))
+                return 0;
+
+        if (!rq->data_len || (rq->cmd_flags & REQ_RW))
+                return 0;
+
+        return atapi_cmd_type(rq->cmd[0]) == ATAPI_MISC;
+}
+
+static int ata_scsi_dev_config(struct scsi_device *sdev,
+                               struct ata_device *dev)
 {
         /* configure max sectors */
         blk_queue_max_sectors(sdev->request_queue, dev->max_sectors);
 
-        /* SATA DMA transfers must be multiples of 4 byte, so
-         * we need to pad ATAPI transfers using an extra sg.
-         * Decrement max hw segments accordingly.
-         */
         if (dev->class == ATA_DEV_ATAPI) {
                 struct request_queue *q = sdev->request_queue;
-                blk_queue_max_hw_segments(q, q->max_hw_segments - 1);
+                void *buf;
 
                 /* set the min alignment */
                 blk_queue_update_dma_alignment(sdev->request_queue,
                                                ATA_DMA_PAD_SZ - 1);
-        } else
+
+                /* configure draining */
+                buf = kmalloc(ATAPI_MAX_DRAIN, q->bounce_gfp | GFP_KERNEL);
+                if (!buf) {
+                        ata_dev_printk(dev, KERN_ERR,
+                                       "drain buffer allocation failed\n");
+                        return -ENOMEM;
+                }
+
+                blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN);
+        } else {
                 /* ATA devices must be sector aligned */
                 blk_queue_update_dma_alignment(sdev->request_queue,
                                                ATA_SECT_SIZE - 1);
-
-        if (dev->class == ATA_DEV_ATA)
                 sdev->manage_start_stop = 1;
+        }
 
         if (dev->flags & ATA_DFLAG_AN)
                 set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);
@@ -861,6 +892,8 @@ static void ata_scsi_dev_config(struct scsi_device *sdev,
                 depth = min(ATA_MAX_QUEUE - 1, depth);
                 scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
         }
+
+        return 0;
 }
 
 /**
@@ -879,13 +912,14 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
 {
         struct ata_port *ap = ata_shost_to_port(sdev->host);
         struct ata_device *dev = __ata_scsi_find_dev(ap, sdev);
+        int rc = 0;
 
         ata_scsi_sdev_config(sdev);
 
         if (dev)
-                ata_scsi_dev_config(sdev, dev);
+                rc = ata_scsi_dev_config(sdev, dev);
 
-        return 0;
+        return rc;
 }
 
 /**
@@ -905,6 +939,7 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
 void ata_scsi_slave_destroy(struct scsi_device *sdev)
 {
         struct ata_port *ap = ata_shost_to_port(sdev->host);
+        struct request_queue *q = sdev->request_queue;
         unsigned long flags;
         struct ata_device *dev;
 
@@ -920,6 +955,10 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev)
                 ata_port_schedule_eh(ap);
         }
         spin_unlock_irqrestore(ap->lock, flags);
+
+        kfree(q->dma_drain_buffer);
+        q->dma_drain_buffer = NULL;
+        q->dma_drain_size = 0;
 }
 
 /**
@@ -1862,7 +1901,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,
  *      spin_lock_irqsave(host lock)
  */
 
-unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf,
+static unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf,
                               unsigned int buflen)
 {
         u8 pbuf[60];
@@ -2500,7 +2539,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
          * want to set it properly, and for DMA where it is
          * effectively meaningless.
          */
-        nbytes = min(qc->nbytes, (unsigned int)63 * 1024);
+        nbytes = min(scmd->request->raw_data_len, (unsigned int)63 * 1024);
 
         /* Most ATAPI devices which honor transfer chunk size don't
          * behave according to the spec when odd chunk size which
@@ -3555,7 +3594,7 @@ EXPORT_SYMBOL_GPL(ata_sas_port_alloc);
  *      @ap: Port to initialize
  *
  *      Called just after data structures for each port are
- *      initialized.  Allocates DMA pad.
+ *      initialized.
  *
  *      May be used as the port_start() entry in ata_port_operations.
  *
@@ -3564,7 +3603,7 @@ EXPORT_SYMBOL_GPL(ata_sas_port_alloc);
  */
 int ata_sas_port_start(struct ata_port *ap)
 {
-        return ata_pad_alloc(ap, ap->dev);
+        return 0;
 }
 EXPORT_SYMBOL_GPL(ata_sas_port_start);
 
@@ -3572,8 +3611,6 @@ EXPORT_SYMBOL_GPL(ata_sas_port_start);
  *      ata_port_stop - Undo ata_sas_port_start()
  *      @ap: Port to shut down
  *
- *      Frees the DMA pad.
- *
  *      May be used as the port_stop() entry in ata_port_operations.
  *
  *      LOCKING:
@@ -3582,7 +3619,6 @@ EXPORT_SYMBOL_GPL(ata_sas_port_start);
 
 void ata_sas_port_stop(struct ata_port *ap)
 {
-        ata_pad_free(ap, ap->dev);
 }
 EXPORT_SYMBOL_GPL(ata_sas_port_stop);
 
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 409ffb9af163..6036dedfe377 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -61,6 +61,7 @@ extern int atapi_passthru16;
 extern int libata_fua;
 extern int libata_noacpi;
 extern int libata_allow_tpm;
+extern void ata_force_cbl(struct ata_port *ap);
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev);
 extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
                            u64 block, u32 n_block, unsigned int tf_flags,
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index 244098a80ce4..bdc3b9d7395c 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -77,8 +77,8 @@ static int pacpi_cable_detect(struct ata_port *ap)
 
 static void pacpi_error_handler(struct ata_port *ap)
 {
-        return ata_bmdma_drive_eh(ap, pacpi_pre_reset, ata_std_softreset,
-                                  NULL, ata_std_postreset);
+        ata_bmdma_drive_eh(ap, pacpi_pre_reset, ata_std_softreset, NULL,
+                           ata_std_postreset);
 }
 
 /**
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index ea567e2b1703..4b8d9b592ca4 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -146,9 +146,8 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline)
 
 static void amd_error_handler(struct ata_port *ap)
 {
-        return ata_bmdma_drive_eh(ap, amd_pre_reset,
-                                      ata_std_softreset, NULL,
-                                      ata_std_postreset);
+        ata_bmdma_drive_eh(ap, amd_pre_reset, ata_std_softreset, NULL,
+                           ata_std_postreset);
 }
 
 static int amd_cable_detect(struct ata_port *ap)
@@ -506,7 +505,6 @@ static struct ata_port_operations amd133_port_ops = {
 static struct ata_port_operations nv100_port_ops = {
         .set_piomode    = nv100_set_piomode,
         .set_dmamode    = nv100_set_dmamode,
-        .mode_filter    = ata_pci_default_filter,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
@@ -541,7 +539,6 @@ static struct ata_port_operations nv100_port_ops = {
 static struct ata_port_operations nv133_port_ops = {
         .set_piomode    = nv133_set_piomode,
         .set_dmamode    = nv133_set_dmamode,
-        .mode_filter    = ata_pci_default_filter,
         .tf_load        = ata_tf_load,
         .tf_read        = ata_tf_read,
         .check_status   = ata_check_status,
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index d753e568588e..1c4ff9b52b5c 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -40,7 +40,7 @@
 #include <asm/msr.h>
 
 #define DRV_NAME        "pata_cs5536"
-#define DRV_VERSION     "0.0.6"
+#define DRV_VERSION     "0.0.7"
 
 enum {
         CFG                     = 0,
@@ -85,7 +85,7 @@ static const u8 pci_reg[4] = {
         PCI_IDE_CFG, PCI_IDE_DTC, PCI_IDE_CAST, PCI_IDE_ETC,
 };
 
-static inline int cs5536_read(struct pci_dev *pdev, int reg, int *val)
+static inline int cs5536_read(struct pci_dev *pdev, int reg, u32 *val)
 {
         if (unlikely(use_msr)) {
                 u32 dummy;
@@ -153,8 +153,8 @@ static void cs5536_set_piomode(struct ata_port *ap, struct ata_device *adev)
         struct ata_device *pair = ata_dev_pair(adev);
         int mode = adev->pio_mode - XFER_PIO_0;
         int cmdmode = mode;
-        int dshift = ap->port_no ? IDE_D1_SHIFT : IDE_D0_SHIFT;
-        int cshift = ap->port_no ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;
+        int dshift = adev->devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;
+        int cshift = adev->devno ? IDE_CAST_D1_SHIFT : IDE_CAST_D0_SHIFT;
         u32 dtc, cast, etc;
 
         if (pair)
@@ -201,7 +201,7 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev)
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
         u32 dtc, etc;
         int mode = adev->dma_mode;
-        int dshift = ap->port_no ? IDE_D1_SHIFT : IDE_D0_SHIFT;
+        int dshift = adev->devno ? IDE_D1_SHIFT : IDE_D0_SHIFT;
 
         if (mode >= XFER_UDMA_0) {
                 cs5536_read(pdev, ETC, &etc);
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 5b8586dac63b..f97068be2d79 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -304,12 +304,6 @@ static int icside_dma_init(struct pata_icside_info *info)
 }
 
 
-static int pata_icside_port_start(struct ata_port *ap)
-{
-        /* No PRD to alloc */
-        return ata_pad_alloc(ap, ap->dev);
-}
-
 static struct scsi_host_template pata_icside_sht = {
         .module                 = THIS_MODULE,
         .name                   = DRV_NAME,
@@ -389,8 +383,6 @@ static struct ata_port_operations pata_icside_port_ops = {
         .irq_clear              = ata_dummy_noret,
         .irq_on                 = ata_irq_on,
 
-        .port_start             = pata_icside_port_start,
-
         .bmdma_stop             = pata_icside_bmdma_stop,
         .bmdma_status           = pata_icside_bmdma_status,
 };
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 5b8174d94067..00bbbbd50e97 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -115,7 +115,8 @@ static int jmicron_pre_reset(struct ata_link *link, unsigned long deadline)
 
 static void jmicron_error_handler(struct ata_port *ap)
 {
-        return ata_bmdma_drive_eh(ap, jmicron_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
+        ata_bmdma_drive_eh(ap, jmicron_pre_reset, ata_std_softreset, NULL,
+                           ata_std_postreset);
 }
 
 /* No PIO or DMA methods needed for this device */
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 6c59969fd50b..50fe08ebe23c 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -774,14 +774,14 @@ static struct ata_port_operations opti82c46x_port_ops = {
 static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
 {
         struct ata_timing t;
-        struct legacy_data *qdi = ap->host->private_data;
+        struct legacy_data *ld_qdi = ap->host->private_data;
         int active, recovery;
         u8 timing;
 
         /* Get the timing data in cycles */
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
-        if (qdi->fast) {
+        if (ld_qdi->fast) {
                 active = 8 - FIT(t.active, 1, 8);
                 recovery = 18 - FIT(t.recover, 3, 18);
         } else {
@@ -790,9 +790,9 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
         }
         timing = (recovery << 4) | active | 0x08;
 
-        qdi->clock[adev->devno] = timing;
+        ld_qdi->clock[adev->devno] = timing;
 
-        outb(timing, qdi->timing);
+        outb(timing, ld_qdi->timing);
 }
 
 /**
@@ -808,14 +808,14 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
 static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev)
 {
         struct ata_timing t;
-        struct legacy_data *qdi = ap->host->private_data;
+        struct legacy_data *ld_qdi = ap->host->private_data;
         int active, recovery;
         u8 timing;
 
         /* Get the timing data in cycles */
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
-        if (qdi->fast) {
+        if (ld_qdi->fast) {
                 active = 8 - FIT(t.active, 1, 8);
                 recovery = 18 - FIT(t.recover, 3, 18);
         } else {
@@ -824,12 +824,12 @@ static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev)
         }
         timing = (recovery << 4) | active | 0x08;
 
-        qdi->clock[adev->devno] = timing;
+        ld_qdi->clock[adev->devno] = timing;
 
-        outb(timing, qdi->timing + 2 * ap->port_no);
+        outb(timing, ld_qdi->timing + 2 * ap->port_no);
         /* Clear the FIFO */
         if (adev->class != ATA_DEV_ATA)
-                outb(0x5F, qdi->timing + 3);
+                outb(0x5F, ld_qdi->timing + 3);
 }
 
 /**
@@ -845,14 +845,14 @@ static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev)
 static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
 {
         struct ata_timing t;
-        struct legacy_data *qdi = ap->host->private_data;
+        struct legacy_data *ld_qdi = ap->host->private_data;
         int active, recovery;
         u8 timing;
 
         /* Get the timing data in cycles */
         ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
 
-        if (qdi->fast) {
+        if (ld_qdi->fast) {
                 active = 8 - FIT(t.active, 1, 8);
                 recovery = 18 - FIT(t.recover, 3, 18);
         } else {
@@ -860,11 +860,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
                 recovery = 15 - FIT(t.recover, 0, 15);
         }
         timing = (recovery << 4) | active | 0x08;
-        qdi->clock[adev->devno] = timing;
-        outb(timing, qdi->timing + 2 * adev->devno);
+        ld_qdi->clock[adev->devno] = timing;
+        outb(timing, ld_qdi->timing + 2 * adev->devno);
         /* Clear the FIFO */
         if (adev->class != ATA_DEV_ATA)
-                outb(0x5F, qdi->timing + 3);
+                outb(0x5F, ld_qdi->timing + 3);
 }
 
 /**
@@ -879,12 +879,12 @@ static unsigned int qdi_qc_issue_prot(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
         struct ata_device *adev = qc->dev;
-        struct legacy_data *qdi = ap->host->private_data;
+        struct legacy_data *ld_qdi = ap->host->private_data;
 
-        if (qdi->clock[adev->devno] != qdi->last) {
+        if (ld_qdi->clock[adev->devno] != ld_qdi->last) {
                 if (adev->pio_mode) {
-                        qdi->last = qdi->clock[adev->devno];
-                        outb(qdi->clock[adev->devno], qdi->timing +
+                        ld_qdi->last = ld_qdi->clock[adev->devno];
+                        outb(ld_qdi->clock[adev->devno], ld_qdi->timing +
                                                         2 * ap->port_no);
                 }
         }
@@ -1037,12 +1037,12 @@ static u8 winbond_readcfg(unsigned long port, u8 reg)
 static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
 {
         struct ata_timing t;
-        struct legacy_data *winbond = ap->host->private_data;
+        struct legacy_data *ld_winbond = ap->host->private_data;
         int active, recovery;
         u8 reg;
         int timing = 0x88 + (ap->port_no * 4) + (adev->devno * 2);
 
-        reg = winbond_readcfg(winbond->timing, 0x81);
+        reg = winbond_readcfg(ld_winbond->timing, 0x81);
 
         /* Get the timing data in cycles */
         if (reg & 0x40)         /* Fast VLB bus, assume 50MHz */
@@ -1053,7 +1053,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
         active = (FIT(t.active, 3, 17) - 1) & 0x0F;
         recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
         timing = (active << 4) | recovery;
-        winbond_writecfg(winbond->timing, timing, reg);
+        winbond_writecfg(ld_winbond->timing, timing, reg);
 
         /* Load the setup timing */
 
@@ -1063,7 +1063,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
         if (!ata_pio_need_iordy(adev))
                 reg |= 0x02;    /* IORDY off */
         reg |= (FIT(t.setup, 0, 3) << 6);
-        winbond_writecfg(winbond->timing, timing + 1, reg);
+        winbond_writecfg(ld_winbond->timing, timing + 1, reg);
 }
 
 static int winbond_port(struct platform_device *dev,
@@ -1278,8 +1278,6 @@ static __init int legacy_init_one(struct legacy_probe *probe)
                 }
         }
 fail:
-        if (host)
-                ata_host_detach(host);
         platform_device_unregister(pdev);
         return ret;
 }
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 9afc8a32b226..a81f25d87235 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -85,8 +85,8 @@ static int marvell_cable_detect(struct ata_port *ap)
 
 static void marvell_error_handler(struct ata_port *ap)
 {
-        return ata_bmdma_drive_eh(ap, marvell_pre_reset, ata_std_softreset,
-                                  NULL, ata_std_postreset);
+        ata_bmdma_drive_eh(ap, marvell_pre_reset, ata_std_softreset, NULL,
+                           ata_std_postreset);
 }
 
 /* No PIO or DMA methods needed for this device */
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 55055b27524c..6c016deeaed8 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -1007,6 +1007,8 @@ static const struct ata_port_operations scc_pata_ops = {
         .qc_issue               = ata_qc_issue_prot,
 
         .freeze                 = scc_bmdma_freeze,
+        .thaw                   = ata_bmdma_thaw,
+
         .error_handler          = scc_error_handler,
         .post_internal_cmd      = scc_bmdma_stop,
 
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index efcb66b6ccef..9323dd0c7d8d 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -601,21 +601,9 @@ static int sata_fsl_port_start(struct ata_port *ap)
         if (!pp)
                 return -ENOMEM;
 
-        /*
-         * allocate per command dma alignment pad buffer, which is used
-         * internally by libATA to ensure that all transfers ending on
-         * unaligned boundaries are padded, to align on Dword boundaries
-         */
-        retval = ata_pad_alloc(ap, dev);
-        if (retval) {
-                kfree(pp);
-                return retval;
-        }
-
         mem = dma_alloc_coherent(dev, SATA_FSL_PORT_PRIV_DMA_SZ, &mem_dma,
                                  GFP_KERNEL);
         if (!mem) {
-                ata_pad_free(ap, dev);
                 kfree(pp);
                 return -ENOMEM;
         }
@@ -694,7 +682,6 @@ static void sata_fsl_port_stop(struct ata_port *ap)
         dma_free_coherent(dev, SATA_FSL_PORT_PRIV_DMA_SZ,
                           pp->cmdslot, pp->cmdslot_paddr);
 
-        ata_pad_free(ap, dev);
         kfree(pp);
 }
 
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 04b571764aff..6ebebde8454a 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -870,7 +870,7 @@ static void mv_start_dma(struct ata_port *ap, void __iomem *port_mmio,
                 struct mv_host_priv *hpriv = ap->host->private_data;
                 int hard_port = mv_hardport_from_port(ap->port_no);
                 void __iomem *hc_mmio = mv_hc_base_from_port(
-                                ap->host->iomap[MV_PRIMARY_BAR], hard_port);
+                                        mv_host_base(ap->host), hard_port);
                 u32 hc_irq_cause, ipending;
 
                 /* clear EDMA event indicators, if any */
@@ -1158,17 +1158,13 @@ static int mv_port_start(struct ata_port *ap)
         struct mv_port_priv *pp;
         void __iomem *port_mmio = mv_ap_base(ap);
         unsigned long flags;
-        int tag, rc;
+        int tag;
 
         pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
         if (!pp)
                 return -ENOMEM;
         ap->private_data = pp;
 
-        rc = ata_pad_alloc(ap, dev);
-        if (rc)
-                return rc;
-
         pp->crqb = dma_pool_alloc(hpriv->crqb_pool, GFP_KERNEL, &pp->crqb_dma);
         if (!pp->crqb)
                 return -ENOMEM;
@@ -1542,7 +1538,7 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
                 eh_freeze_mask = EDMA_EH_FREEZE_5;
 
                 if (edma_err_cause & EDMA_ERR_SELF_DIS_5) {
-                        struct mv_port_priv *pp = ap->private_data;
+                        pp = ap->private_data;
                         pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN;
                         ata_ehi_push_desc(ehi, "EDMA self-disable");
                 }
@@ -1550,7 +1546,7 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
                 eh_freeze_mask = EDMA_EH_FREEZE;
 
                 if (edma_err_cause & EDMA_ERR_SELF_DIS) {
-                        struct mv_port_priv *pp = ap->private_data;
+                        pp = ap->private_data;
                         pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN;
                         ata_ehi_push_desc(ehi, "EDMA self-disable");
                 }
@@ -2951,7 +2947,8 @@ static int mv_platform_probe(struct platform_device *pdev)
         hpriv->n_ports = n_ports;
 
         host->iomap = NULL;
-        hpriv->base = ioremap(res->start, res->end - res->start + 1);
+        hpriv->base = devm_ioremap(&pdev->dev, res->start,
+                                   res->end - res->start + 1);
         hpriv->base -= MV_SATAHC0_REG_BASE;
 
         rc = mv_create_dma_pools(hpriv, &pdev->dev);
@@ -2983,11 +2980,8 @@ static int __devexit mv_platform_remove(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct ata_host *host = dev_get_drvdata(dev);
-        struct mv_host_priv *hpriv = host->private_data;
-        void __iomem *base = hpriv->base;
 
         ata_host_detach(host);
-        iounmap(base);
         return 0;
 }
 
@@ -3198,6 +3192,7 @@ MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("platform:sata_mv");
 
 #ifdef CONFIG_PCI
 module_param(msi, int, 0444);
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index a07d319f6e8c..f251a5f569d5 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -543,7 +543,7 @@ static void pdc_fill_sg(struct ata_queued_cmd *qc)
         idx = 0;
         for_each_sg(qc->sg, sg, qc->n_elem, si) {
                 u32 addr, offset;
-                u32 sg_len, len;
+                u32 sg_len;
 
                 /* determine if physical DMA addr spans 64K boundary.
                  * Note h/w doesn't support 64-bit, so we unconditionally
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index b4b1f91ea693..df7988df7908 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1234,7 +1234,6 @@ static int sil24_port_start(struct ata_port *ap)
         union sil24_cmd_block *cb;
         size_t cb_size = sizeof(*cb) * SIL24_MAX_CMDS;
         dma_addr_t cb_dma;
-        int rc;
 
         pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
         if (!pp)
@@ -1247,10 +1246,6 @@ static int sil24_port_start(struct ata_port *ap)
                 return -ENOMEM;
         memset(cb, 0, cb_size);
 
-        rc = ata_pad_alloc(ap, dev);
-        if (rc)
-                return rc;
-
         pp->cmd_block = cb;
         pp->cmd_block_dma = cb_dma;
 
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 30caa0337190..0d03f44824fb 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -333,8 +333,8 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)
 
 static void vt6420_error_handler(struct ata_port *ap)
 {
-        return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
-                                  NULL, ata_std_postreset);
+        ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset, NULL,
+                           ata_std_postreset);
 }
 
 static int vt6421_pata_cable_detect(struct ata_port *ap)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 055989e94799..2d207ad30336 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -658,9 +658,10 @@ int bus_add_driver(struct device_driver *drv)
         pr_debug("bus: '%s': add driver %s\n", bus->name, drv->name);
 
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv)
-                return -ENOMEM;
-
+        if (!priv) {
+                error = -ENOMEM;
+                goto out_put_bus;
+        }
         klist_init(&priv->klist_devices, NULL, NULL);
         priv->driver = drv;
         drv->p = priv;
@@ -668,7 +669,7 @@ int bus_add_driver(struct device_driver *drv)
         error = kobject_init_and_add(&priv->kobj, &driver_ktype, NULL,
                                      "%s", drv->name);
         if (error)
-                goto out_put_bus;
+                goto out_unregister;
 
         if (drv->bus->p->drivers_autoprobe) {
                 error = driver_attach(drv);
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index ba75184c653c..bf31a0170a48 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -120,6 +120,9 @@ EXPORT_SYMBOL_GPL(driver_remove_file);
 
 /**
  * driver_add_kobj - add a kobject below the specified driver
+ * @drv: requesting device driver
+ * @kobj: kobject to add below this driver
+ * @fmt: format string that names the kobject
  *
  * You really don't want to do this, this is only here due to one looney
  * iseries driver, go poke those developers if you are annoyed about
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index bdc03f7e8424..ee9d1c8db0d6 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(device_power_down);
  *      @dev:   Device.
  *      @state: Power state device is entering.
  */
-int suspend_device(struct device *dev, pm_message_t state)
+static int suspend_device(struct device *dev, pm_message_t state)
 {
         int error = 0;
 
@@ -479,7 +479,6 @@ static int dpm_suspend(pm_message_t state)
                         mutex_lock(&dpm_list_mtx);
                         if (list_empty(&dev->power.entry))
                                 list_add(&dev->power.entry, &dpm_locked);
-                        mutex_unlock(&dpm_list_mtx);
                         break;
                 }
                 mutex_lock(&dpm_list_mtx);
@@ -523,6 +522,7 @@ static void lock_all_devices(void)
 
 /**
  *      device_suspend - Save state and stop all devices in system.
+ *      @state: new power management state
  *
  *      Prevent new devices from being registered, then lock all devices
  *      and suspend them.
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 018753c59b8e..b53fdb0a282c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -655,6 +655,7 @@ static int __init nbd_init(void)
 
         for (i = 0; i < nbds_max; i++) {
                 struct gendisk *disk = alloc_disk(1);
+                elevator_t *old_e;
                 if (!disk)
                         goto out;
                 nbd_dev[i].disk = disk;
@@ -668,6 +669,11 @@ static int __init nbd_init(void)
                         put_disk(disk);
                         goto out;
                 }
+                old_e = disk->queue->elevator;
+                if (elevator_init(disk->queue, "deadline") == 0 ||
+                        elevator_init(disk->queue, "noop") == 0) {
+                                elevator_exit(old_e);
+                }
         }
 
         if (register_blkdev(NBD_MAJOR, "nbd")) {
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index b4e462f154ea..730ccea78e45 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -251,10 +251,6 @@ static int floppy_release(struct inode *inode, struct file *filp);
 static int floppy_check_change(struct gendisk *disk);
 static int floppy_revalidate(struct gendisk *disk);
 
-#ifndef CONFIG_PMAC_MEDIABAY
-#define check_media_bay(which, what)    1
-#endif
-
 static void swim3_select(struct floppy_state *fs, int sel)
 {
         struct swim3 __iomem *sw = fs->swim3;
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 8afce67c0aa5..9c6f3f99208d 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -37,6 +37,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
+#include <linux/hdreg.h>
 #include <linux/module.h>
 
 #include <xen/xenbus.h>
@@ -135,6 +136,22 @@ static void blkif_restart_queue_callback(void *arg)
         schedule_work(&info->work);
 }
 
+int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)
+{
+        /* We don't have real geometry info, but let's at least return
+           values consistent with the size of the device */
+        sector_t nsect = get_capacity(bd->bd_disk);
+        sector_t cylinders = nsect;
+
+        hg->heads = 0xff;
+        hg->sectors = 0x3f;
+        sector_div(cylinders, hg->heads * hg->sectors);
+        hg->cylinders = cylinders;
+        if ((sector_t)(hg->cylinders + 1) * hg->heads * hg->sectors < nsect)
+                hg->cylinders = 0xffff;
+        return 0;
+}
+
 /*
  * blkif_queue_request
  *
@@ -937,6 +954,7 @@ static struct block_device_operations xlvbd_block_fops =
         .owner = THIS_MODULE,
         .open = blkif_open,
         .release = blkif_release,
+        .getgeo = blkif_getgeo,
 };
 
 
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
index 87be46406daf..d28669992147 100644
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
@@ -41,6 +41,7 @@ static int amd_create_page_map(struct amd_page_map *page_map)
         if (page_map->real == NULL)
                 return -ENOMEM;
 
+#ifndef CONFIG_X86
         SetPageReserved(virt_to_page(page_map->real));
         global_cache_flush();
         page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
@@ -52,6 +53,10 @@ static int amd_create_page_map(struct amd_page_map *page_map)
                 return -ENOMEM;
         }
         global_cache_flush();
+#else
+        set_memory_uc((unsigned long)page_map->real, 1);
+        page_map->remapped = page_map->real;
+#endif
 
         for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
                 writel(agp_bridge->scratch_page, page_map->remapped+i);
@@ -63,8 +68,12 @@ static int amd_create_page_map(struct amd_page_map *page_map)
 
 static void amd_free_page_map(struct amd_page_map *page_map)
 {
+#ifndef CONFIG_X86
         iounmap(page_map->remapped);
         ClearPageReserved(virt_to_page(page_map->real));
+#else
+        set_memory_wb((unsigned long)page_map->real, 1);
+#endif
         free_page((unsigned long) page_map->real);
 }
 
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 2d46b713c8f2..55c97f623242 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -60,18 +60,9 @@ static int ati_create_page_map(struct ati_page_map *page_map)
         if (page_map->real == NULL)
                 return -ENOMEM;
 
-        SetPageReserved(virt_to_page(page_map->real));
+        set_memory_uc((unsigned long)page_map->real, 1);
         err = map_page_into_agp(virt_to_page(page_map->real));
-        page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
-                                            PAGE_SIZE);
-        if (page_map->remapped == NULL || err) {
-                ClearPageReserved(virt_to_page(page_map->real));
-                free_page((unsigned long) page_map->real);
-                page_map->real = NULL;
-                return -ENOMEM;
-        }
-        /*CACHE_FLUSH();*/
-        global_cache_flush();
+        page_map->remapped = page_map->real;
 
         for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
                 writel(agp_bridge->scratch_page, page_map->remapped+i);
@@ -85,8 +76,7 @@ static int ati_create_page_map(struct ati_page_map *page_map)
 static void ati_free_page_map(struct ati_page_map *page_map)
 {
         unmap_page_from_agp(virt_to_page(page_map->real));
-        iounmap(page_map->remapped);
-        ClearPageReserved(virt_to_page(page_map->real));
+        set_memory_wb((unsigned long)page_map->real, 1);
         free_page((unsigned long) page_map->real);
 }
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 7484bc759c4c..7fc0c99a3a58 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -932,9 +932,14 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
         agp_gatt_table = (void *)table;
 
         bridge->driver->cache_flush();
+#ifdef CONFIG_X86
+        set_memory_uc((unsigned long)table, 1 << page_order);
+        bridge->gatt_table = (void *)table;
+#else
         bridge->gatt_table = ioremap_nocache(virt_to_gart(table),
                                         (PAGE_SIZE * (1 << page_order)));
         bridge->driver->cache_flush();
+#endif
 
         if (bridge->gatt_table == NULL) {
                 for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
@@ -991,7 +996,11 @@ int agp_generic_free_gatt_table(struct agp_bridge_data *bridge)
          * called, then all agp memory is deallocated and removed
          * from the table. */
 
+#ifdef CONFIG_X86
+        set_memory_wb((unsigned long)bridge->gatt_table, 1 << page_order);
+#else
         iounmap(bridge->gatt_table);
+#endif
         table = (char *) bridge->gatt_table_real;
         table_end = table + ((PAGE_SIZE * (1 << page_order)) - 1);
 
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index eb1a1c738190..b6791846809f 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -14,6 +14,9 @@
 #define SIS_TLBCNTRL    0x97
 #define SIS_TLBFLUSH    0x98
 
+#define PCI_DEVICE_ID_SI_662    0x0662
+#define PCI_DEVICE_ID_SI_671    0x0671
+
 static int __devinitdata agp_sis_force_delay = 0;
 static int __devinitdata agp_sis_agp_spec = -1;
 
@@ -27,8 +30,8 @@ static int sis_fetch_size(void)
         values = A_SIZE_8(agp_bridge->driver->aperture_sizes);
         for (i = 0; i < agp_bridge->driver->num_aperture_sizes; i++) {
                 if ((temp_size == values[i].size_value) ||
-                    ((temp_size & ~(0x03)) ==
-                     (values[i].size_value & ~(0x03)))) {
+                    ((temp_size & ~(0x07)) ==
+                     (values[i].size_value & ~(0x07)))) {
                         agp_bridge->previous_size =
                             agp_bridge->current_size = (void *) (values + i);
 
@@ -214,6 +217,26 @@ static void __devexit agp_sis_remove(struct pci_dev *pdev)
         agp_put_bridge(bridge);
 }
 
+#ifdef CONFIG_PM
+
+static int agp_sis_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        pci_save_state(pdev);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        return 0;
+}
+
+static int agp_sis_resume(struct pci_dev *pdev)
+{
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+
+        return sis_driver.configure();
+}
+
+#endif /* CONFIG_PM */
+
 static struct pci_device_id agp_sis_pci_table[] = {
         {
                 .class          = (PCI_CLASS_BRIDGE_HOST << 8),
@@ -331,6 +354,22 @@ static struct pci_device_id agp_sis_pci_table[] = {
                 .class          = (PCI_CLASS_BRIDGE_HOST << 8),
                 .class_mask     = ~0,
                 .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_662,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
+                .device         = PCI_DEVICE_ID_SI_671,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+        },
+        {
+                .class          = (PCI_CLASS_BRIDGE_HOST << 8),
+                .class_mask     = ~0,
+                .vendor         = PCI_VENDOR_ID_SI,
                 .device         = PCI_DEVICE_ID_SI_730,
                 .subvendor      = PCI_ANY_ID,
                 .subdevice      = PCI_ANY_ID,
@@ -393,6 +432,10 @@ static struct pci_driver agp_sis_pci_driver = {
         .id_table       = agp_sis_pci_table,
         .probe          = agp_sis_probe,
         .remove         = agp_sis_remove,
+#ifdef CONFIG_PM
+        .suspend        = agp_sis_suspend,
+        .resume         = agp_sis_resume,
+#endif
 };
 
 static int __init agp_sis_init(void)
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 551ef25063ef..e08934e58f32 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -52,28 +52,20 @@ static int serverworks_create_page_map(struct serverworks_page_map *page_map)
         if (page_map->real == NULL) {
                 return -ENOMEM;
         }
-        SetPageReserved(virt_to_page(page_map->real));
-        global_cache_flush();
-        page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
-                                            PAGE_SIZE);
-        if (page_map->remapped == NULL) {
-                ClearPageReserved(virt_to_page(page_map->real));
-                free_page((unsigned long) page_map->real);
-                page_map->real = NULL;
-                return -ENOMEM;
-        }
-        global_cache_flush();
+
+        set_memory_uc((unsigned long)page_map->real, 1);
+        page_map->remapped = page_map->real;
 
         for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++)
                 writel(agp_bridge->scratch_page, page_map->remapped+i);
+                /* Red Pen: Everyone else does pci posting flush here */
 
         return 0;
 }
 
 static void serverworks_free_page_map(struct serverworks_page_map *page_map)
 {
-        iounmap(page_map->remapped);
-        ClearPageReserved(virt_to_page(page_map->real));
+        set_memory_wb((unsigned long)page_map->real, 1);
         free_page((unsigned long) page_map->real);
 }
 
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 19d3be5c4b2d..a6789f25009b 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -568,7 +568,7 @@ struct drm_driver {
         void (*postclose) (struct drm_device *, struct drm_file *);
         void (*lastclose) (struct drm_device *);
         int (*unload) (struct drm_device *);
-        int (*suspend) (struct drm_device *);
+        int (*suspend) (struct drm_device *, pm_message_t state);
         int (*resume) (struct drm_device *);
         int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
         void (*dma_ready) (struct drm_device *);
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index f52468843678..715b361f0c2b 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -83,6 +83,7 @@
         {0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
         {0x1002, 0x5462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
         {0x1002, 0x5464, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
+        {0x1002, 0x5657, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x5548, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x5549, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x554A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420|RADEON_NEW_MEMMAP}, \
@@ -236,6 +237,7 @@
         {0x1002, 0x7297, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV560|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
         {0, 0, 0}
 
 #define r128_PCI_IDS \
@@ -313,6 +315,7 @@
         {0x1039, 0x5300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1039, 0x6300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1039, 0x6330, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
+        {0x1039, 0x6351, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
         {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index fa36153619e8..05ed5043254f 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -36,7 +36,7 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state)
         printk(KERN_ERR "%s\n", __FUNCTION__);
 
         if (drm_dev->driver->suspend)
-                return drm_dev->driver->suspend(drm_dev);
+                return drm_dev->driver->suspend(drm_dev, state);
 
         return 0;
 }
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index cea4105374b2..3d65c4dcd0c6 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -66,7 +66,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
 }
 
 /**
- * \c nopage method for AGP virtual memory.
+ * \c fault method for AGP virtual memory.
  *
  * \param vma virtual memory area.
  * \param address access address.
@@ -76,8 +76,7 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
  * map, get the page, increment the use count and return it.
  */
 #if __OS_HAS_AGP
-static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
-                                                unsigned long address)
+static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_file *priv = vma->vm_file->private_data;
         struct drm_device *dev = priv->head->dev;
@@ -89,19 +88,24 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
          * Find the right map
          */
         if (!drm_core_has_AGP(dev))
-                goto vm_nopage_error;
+                goto vm_fault_error;
 
         if (!dev->agp || !dev->agp->cant_use_aperture)
-                goto vm_nopage_error;
+                goto vm_fault_error;
 
         if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff, &hash))
-                goto vm_nopage_error;
+                goto vm_fault_error;
 
         r_list = drm_hash_entry(hash, struct drm_map_list, hash);
         map = r_list->map;
 
         if (map && map->type == _DRM_AGP) {
-                unsigned long offset = address - vma->vm_start;
+                /*
+                 * Using vm_pgoff as a selector forces us to use this unusual
+                 * addressing scheme.
+                 */
+                unsigned long offset = (unsigned long)vmf->virtual_address -
+                                                                vma->vm_start;
                 unsigned long baddr = map->offset + offset;
                 struct drm_agp_mem *agpmem;
                 struct page *page;
@@ -123,7 +127,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
                 }
 
                 if (!agpmem)
-                        goto vm_nopage_error;
+                        goto vm_fault_error;
 
                 /*
                  * Get the page, inc the use count, and return it
@@ -131,22 +135,21 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
                 offset = (baddr - agpmem->bound) >> PAGE_SHIFT;
                 page = virt_to_page(__va(agpmem->memory->memory[offset]));
                 get_page(page);
+                vmf->page = page;
 
                 DRM_DEBUG
                     ("baddr = 0x%lx page = 0x%p, offset = 0x%lx, count=%d\n",
                      baddr, __va(agpmem->memory->memory[offset]), offset,
                      page_count(page));
-
-                return page;
+                return 0;
         }
-      vm_nopage_error:
-        return NOPAGE_SIGBUS;   /* Disallow mremap */
+vm_fault_error:
+        return VM_FAULT_SIGBUS; /* Disallow mremap */
 }
 #else                           /* __OS_HAS_AGP */
-static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
-                                                unsigned long address)
+static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        return NOPAGE_SIGBUS;
+        return VM_FAULT_SIGBUS;
 }
 #endif                          /* __OS_HAS_AGP */
 
@@ -160,28 +163,26 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
  * Get the mapping, find the real physical page to map, get the page, and
  * return it.
  */
-static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
-                                                    unsigned long address)
+static int drm_do_vm_shm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_map *map = (struct drm_map *) vma->vm_private_data;
         unsigned long offset;
         unsigned long i;
         struct page *page;
 
-        if (address > vma->vm_end)
-                return NOPAGE_SIGBUS;   /* Disallow mremap */
         if (!map)
-                return NOPAGE_SIGBUS;   /* Nothing allocated */
+                return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = address - vma->vm_start;
+        offset = (unsigned long)vmf->virtual_address - vma->vm_start;
         i = (unsigned long)map->handle + offset;
         page = vmalloc_to_page((void *)i);
         if (!page)
-                return NOPAGE_SIGBUS;
+                return VM_FAULT_SIGBUS;
         get_page(page);
+        vmf->page = page;
 
-        DRM_DEBUG("0x%lx\n", address);
-        return page;
+        DRM_DEBUG("shm_fault 0x%lx\n", offset);
+        return 0;
 }
 
 /**
@@ -263,7 +264,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
 }
 
 /**
- * \c nopage method for DMA virtual memory.
+ * \c fault method for DMA virtual memory.
  *
  * \param vma virtual memory area.
  * \param address access address.
@@ -271,8 +272,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
  *
  * Determine the page number from the page offset and get it from drm_device_dma::pagelist.
  */
-static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
-                                                    unsigned long address)
+static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_file *priv = vma->vm_file->private_data;
         struct drm_device *dev = priv->head->dev;
@@ -282,24 +282,23 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
         struct page *page;
 
         if (!dma)
-                return NOPAGE_SIGBUS;   /* Error */
-        if (address > vma->vm_end)
-                return NOPAGE_SIGBUS;   /* Disallow mremap */
+                return VM_FAULT_SIGBUS; /* Error */
         if (!dma->pagelist)
-                return NOPAGE_SIGBUS;   /* Nothing allocated */
+                return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = address - vma->vm_start;       /* vm_[pg]off[set] should be 0 */
-        page_nr = offset >> PAGE_SHIFT;
+        offset = (unsigned long)vmf->virtual_address - vma->vm_start;   /* vm_[pg]off[set] should be 0 */
+        page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */
         page = virt_to_page((dma->pagelist[page_nr] + (offset & (~PAGE_MASK))));
 
         get_page(page);
+        vmf->page = page;
 
-        DRM_DEBUG("0x%lx (page %lu)\n", address, page_nr);
-        return page;
+        DRM_DEBUG("dma_fault 0x%lx (page %lu)\n", offset, page_nr);
+        return 0;
 }
 
 /**
- * \c nopage method for scatter-gather virtual memory.
+ * \c fault method for scatter-gather virtual memory.
  *
  * \param vma virtual memory area.
  * \param address access address.
@@ -307,8 +306,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
  *
  * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist.
  */
-static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
-                                                   unsigned long address)
+static int drm_do_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_map *map = (struct drm_map *) vma->vm_private_data;
         struct drm_file *priv = vma->vm_file->private_data;
@@ -320,77 +318,64 @@ static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
         struct page *page;
 
         if (!entry)
-                return NOPAGE_SIGBUS;   /* Error */
-        if (address > vma->vm_end)
-                return NOPAGE_SIGBUS;   /* Disallow mremap */
+                return VM_FAULT_SIGBUS; /* Error */
         if (!entry->pagelist)
-                return NOPAGE_SIGBUS;   /* Nothing allocated */
+                return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = address - vma->vm_start;
+        offset = (unsigned long)vmf->virtual_address - vma->vm_start;
         map_offset = map->offset - (unsigned long)dev->sg->virtual;
         page_offset = (offset >> PAGE_SHIFT) + (map_offset >> PAGE_SHIFT);
         page = entry->pagelist[page_offset];
         get_page(page);
+        vmf->page = page;
 
-        return page;
+        return 0;
 }
 
-static struct page *drm_vm_nopage(struct vm_area_struct *vma,
-                                  unsigned long address, int *type)
+static int drm_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        if (type)
-                *type = VM_FAULT_MINOR;
-        return drm_do_vm_nopage(vma, address);
+        return drm_do_vm_fault(vma, vmf);
 }
 
-static struct page *drm_vm_shm_nopage(struct vm_area_struct *vma,
-                                      unsigned long address, int *type)
+static int drm_vm_shm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        if (type)
-                *type = VM_FAULT_MINOR;
-        return drm_do_vm_shm_nopage(vma, address);
+        return drm_do_vm_shm_fault(vma, vmf);
 }
 
-static struct page *drm_vm_dma_nopage(struct vm_area_struct *vma,
-                                      unsigned long address, int *type)
+static int drm_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        if (type)
-                *type = VM_FAULT_MINOR;
-        return drm_do_vm_dma_nopage(vma, address);
+        return drm_do_vm_dma_fault(vma, vmf);
 }
 
-static struct page *drm_vm_sg_nopage(struct vm_area_struct *vma,
-                                     unsigned long address, int *type)
+static int drm_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        if (type)
-                *type = VM_FAULT_MINOR;
-        return drm_do_vm_sg_nopage(vma, address);
+        return drm_do_vm_sg_fault(vma, vmf);
 }
 
 /** AGP virtual memory operations */
 static struct vm_operations_struct drm_vm_ops = {
-        .nopage = drm_vm_nopage,
+        .fault = drm_vm_fault,
         .open = drm_vm_open,
         .close = drm_vm_close,
 };
 
 /** Shared virtual memory operations */
 static struct vm_operations_struct drm_vm_shm_ops = {
-        .nopage = drm_vm_shm_nopage,
+        .fault = drm_vm_shm_fault,
         .open = drm_vm_open,
         .close = drm_vm_shm_close,
 };
 
 /** DMA virtual memory operations */
 static struct vm_operations_struct drm_vm_dma_ops = {
-        .nopage = drm_vm_dma_nopage,
+        .fault = drm_vm_dma_fault,
         .open = drm_vm_open,
         .close = drm_vm_close,
 };
 
 /** Scatter-gather virtual memory operations */
 static struct vm_operations_struct drm_vm_sg_ops = {
-        .nopage = drm_vm_sg_nopage,
+        .fault = drm_vm_sg_fault,
         .open = drm_vm_open,
         .close = drm_vm_close,
 };
@@ -604,7 +589,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                         /*
                          * On some platforms we can't talk to bus dma address from the CPU, so for
                          * memory of type DRM_AGP, we'll deal with sorting out the real physical
-                         * pages and mappings in nopage()
+                         * pages and mappings in fault()
                          */
 #if defined(__powerpc__)
                         pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
@@ -634,7 +619,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                 break;
         case _DRM_CONSISTENT:
                 /* Consistent memory is really like shared memory. But
-                 * it's allocated in a different way, so avoid nopage */
+                 * it's allocated in a different way, so avoid fault */
                 if (remap_pfn_range(vma, vma->vm_start,
                     page_to_pfn(virt_to_page(map->handle)),
                     vma->vm_end - vma->vm_start, vma->vm_page_prot))
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 379cbdad4921..9df08105f4f3 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -36,7 +36,7 @@
 #include "i830_drm.h"
 #include "i830_drv.h"
 #include <linux/interrupt.h>    /* For task queue support */
-#include <linux/pagemap.h>      /* For FASTCALL on unlock_page() */
+#include <linux/pagemap.h>
 #include <linux/delay.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 43986d81ae34..e9d6663bec73 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -171,7 +171,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
         dev_priv->allow_batchbuffer = 1;
 
         /* Program Hardware Status Page */
-        if (!IS_G33(dev)) {
+        if (!I915_NEED_GFX_HWS(dev)) {
                 dev_priv->status_page_dmah =
                         drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
 
@@ -720,6 +720,9 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
         drm_i915_private_t *dev_priv = dev->dev_private;
         drm_i915_hws_addr_t *hws = data;
 
+        if (!I915_NEED_GFX_HWS(dev))
+                return -EINVAL;
+
         if (!dev_priv) {
                 DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index 52e51033d32c..b2b451dc4460 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -160,6 +160,7 @@ static void i915_save_vga(struct drm_device *dev)
                 dev_priv->saveAR[i] = i915_read_ar(st01, i, 0);
         inb(st01);
         outb(dev_priv->saveAR_INDEX, VGA_AR_INDEX);
+        inb(st01);
 
         /* Graphics controller registers */
         for (i = 0; i < 9; i++)
@@ -221,10 +222,12 @@ static void i915_restore_vga(struct drm_device *dev)
                            dev_priv->saveGR[0x18]);
 
         /* Attribute controller registers */
+        inb(st01);
         for (i = 0; i < 20; i++)
                 i915_write_ar(st01, i, dev_priv->saveAR[i], 0);
         inb(st01); /* switch back to index mode */
         outb(dev_priv->saveAR_INDEX | 0x20, VGA_AR_INDEX);
+        inb(st01);
 
         /* VGA color palette registers */
         outb(dev_priv->saveDACMASK, VGA_DACMASK);
@@ -236,7 +239,7 @@ static void i915_restore_vga(struct drm_device *dev)
 
 }
 
-static int i915_suspend(struct drm_device *dev)
+static int i915_suspend(struct drm_device *dev, pm_message_t state)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         int i;
@@ -247,6 +250,9 @@ static int i915_suspend(struct drm_device *dev)
                 return -ENODEV;
         }
 
+        if (state.event == PM_EVENT_PRETHAW)
+                return 0;
+
         pci_save_state(dev->pdev);
         pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB);
 
@@ -276,6 +282,7 @@ static int i915_suspend(struct drm_device *dev)
                 dev_priv->saveDSPATILEOFF = I915_READ(DSPATILEOFF);
         }
         i915_save_palette(dev, PIPE_A);
+        dev_priv->savePIPEASTAT = I915_READ(I915REG_PIPEASTAT);
 
         /* Pipe & plane B info */
         dev_priv->savePIPEBCONF = I915_READ(PIPEBCONF);
@@ -303,6 +310,7 @@ static int i915_suspend(struct drm_device *dev)
                 dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);
         }
         i915_save_palette(dev, PIPE_B);
+        dev_priv->savePIPEBSTAT = I915_READ(I915REG_PIPEBSTAT);
 
         /* CRT state */
         dev_priv->saveADPA = I915_READ(ADPA);
@@ -329,12 +337,26 @@ static int i915_suspend(struct drm_device *dev)
         dev_priv->saveFBC_CONTROL2 = I915_READ(FBC_CONTROL2);
         dev_priv->saveFBC_CONTROL = I915_READ(FBC_CONTROL);
 
+        /* Interrupt state */
+        dev_priv->saveIIR = I915_READ(I915REG_INT_IDENTITY_R);
+        dev_priv->saveIER = I915_READ(I915REG_INT_ENABLE_R);
+        dev_priv->saveIMR = I915_READ(I915REG_INT_MASK_R);
+
         /* VGA state */
         dev_priv->saveVCLK_DIVISOR_VGA0 = I915_READ(VCLK_DIVISOR_VGA0);
         dev_priv->saveVCLK_DIVISOR_VGA1 = I915_READ(VCLK_DIVISOR_VGA1);
         dev_priv->saveVCLK_POST_DIV = I915_READ(VCLK_POST_DIV);
         dev_priv->saveVGACNTRL = I915_READ(VGACNTRL);
 
+        /* Clock gating state */
+        dev_priv->saveDSPCLK_GATE_D = I915_READ(DSPCLK_GATE_D);
+
+        /* Cache mode state */
+        dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);
+
+        /* Memory Arbitration state */
+        dev_priv->saveMI_ARB_STATE = I915_READ(MI_ARB_STATE);
+
         /* Scratch space */
         for (i = 0; i < 16; i++) {
                 dev_priv->saveSWF0[i] = I915_READ(SWF0 + (i << 2));
@@ -345,9 +367,11 @@ static int i915_suspend(struct drm_device *dev)
 
         i915_save_vga(dev);
 
-        /* Shut down the device */
-        pci_disable_device(dev->pdev);
-        pci_set_power_state(dev->pdev, PCI_D3hot);
+        if (state.event == PM_EVENT_SUSPEND) {
+                /* Shut down the device */
+                pci_disable_device(dev->pdev);
+                pci_set_power_state(dev->pdev, PCI_D3hot);
+        }
 
         return 0;
 }
@@ -400,9 +424,7 @@ static int i915_resume(struct drm_device *dev)
                 I915_WRITE(DSPATILEOFF, dev_priv->saveDSPATILEOFF);
         }
 
-        if ((dev_priv->saveDPLL_A & DPLL_VCO_ENABLE) &&
-            (dev_priv->saveDPLL_A & DPLL_VGA_MODE_DIS))
-                I915_WRITE(PIPEACONF, dev_priv->savePIPEACONF);
+        I915_WRITE(PIPEACONF, dev_priv->savePIPEACONF);
 
         i915_restore_palette(dev, PIPE_A);
         /* Enable the plane */
@@ -444,10 +466,9 @@ static int i915_resume(struct drm_device *dev)
                 I915_WRITE(DSPBTILEOFF, dev_priv->saveDSPBTILEOFF);
         }
 
-        if ((dev_priv->saveDPLL_B & DPLL_VCO_ENABLE) &&
-            (dev_priv->saveDPLL_B & DPLL_VGA_MODE_DIS))
-                I915_WRITE(PIPEBCONF, dev_priv->savePIPEBCONF);
-        i915_restore_palette(dev, PIPE_A);
+        I915_WRITE(PIPEBCONF, dev_priv->savePIPEBCONF);
+
+        i915_restore_palette(dev, PIPE_B);
         /* Enable the plane */
         I915_WRITE(DSPBCNTR, dev_priv->saveDSPBCNTR);
         I915_WRITE(DSPBBASE, I915_READ(DSPBBASE));
@@ -485,6 +506,15 @@ static int i915_resume(struct drm_device *dev)
         I915_WRITE(VCLK_POST_DIV, dev_priv->saveVCLK_POST_DIV);
         udelay(150);
 
+        /* Clock gating state */
+        I915_WRITE (DSPCLK_GATE_D, dev_priv->saveDSPCLK_GATE_D);
+
+        /* Cache mode state */
+        I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);
+
+        /* Memory arbitration state */
+        I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000);
+
         for (i = 0; i < 16; i++) {
                 I915_WRITE(SWF0 + (i << 2), dev_priv->saveSWF0[i]);
                 I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i+7]);
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index f8308bfb2613..c10d128e34db 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -134,6 +134,7 @@ typedef struct drm_i915_private {
         u32 saveVBLANK_A;
         u32 saveVSYNC_A;
         u32 saveBCLRPAT_A;
+        u32 savePIPEASTAT;
         u32 saveDSPASTRIDE;
         u32 saveDSPASIZE;
         u32 saveDSPAPOS;
@@ -154,6 +155,7 @@ typedef struct drm_i915_private {
         u32 saveVBLANK_B;
         u32 saveVSYNC_B;
         u32 saveBCLRPAT_B;
+        u32 savePIPEBSTAT;
         u32 saveDSPBSTRIDE;
         u32 saveDSPBSIZE;
         u32 saveDSPBPOS;
@@ -182,6 +184,12 @@ typedef struct drm_i915_private {
         u32 saveFBC_LL_BASE;
         u32 saveFBC_CONTROL;
         u32 saveFBC_CONTROL2;
+        u32 saveIER;
+        u32 saveIIR;
+        u32 saveIMR;
+        u32 saveCACHE_MODE_0;
+        u32 saveDSPCLK_GATE_D;
+        u32 saveMI_ARB_STATE;
         u32 saveSWF0[16];
         u32 saveSWF1[16];
         u32 saveSWF2[3];
@@ -450,6 +458,10 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  */
 #define DMA_FADD_S              0x20d4
 
+/* Memory Interface Arbitration State
+ */
+#define MI_ARB_STATE            0x20e4
+
 /* Cache mode 0 reg.
  *  - Manipulating render cache behaviour is central
  *    to the concept of zone rendering, tuning this reg can help avoid
@@ -460,6 +472,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
  * bit of interest either set or cleared.  EG: (BIT<<16) | BIT to set.
  */
 #define Cache_Mode_0            0x2120
+#define CACHE_MODE_0            0x2120
 #define CM0_MASK_SHIFT          16
 #define CM0_IZ_OPT_DISABLE      (1<<6)
 #define CM0_ZR_OPT_DISABLE      (1<<5)
@@ -655,6 +668,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 /** P1 value is 2 greater than this field */
 # define VGA0_PD_P1_MASK        (0x1f << 0)
 
+#define DSPCLK_GATE_D   0x6200
+
 /* I830 CRTC registers */
 #define HTOTAL_A        0x60000
 #define HBLANK_A        0x60004
@@ -1101,6 +1116,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \
                         IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev))
 
+#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev))
+
 #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
 
 #endif
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 5dc799ab86b8..833abc7e55fb 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -825,11 +825,19 @@ static u32 RADEON_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)
         return ret;
 }
 
+static u32 RS690_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)
+{
+        RADEON_WRITE(RS690_MC_INDEX, (addr & RS690_MC_INDEX_MASK));
+        return RADEON_READ(RS690_MC_DATA);
+}
+
 u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv)
 {
 
         if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515)
                 return RADEON_READ_MCIND(dev_priv, RV515_MC_FB_LOCATION);
+        else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690)
+                return RS690_READ_MCIND(dev_priv, RS690_MC_FB_LOCATION);
         else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515)
                 return RADEON_READ_MCIND(dev_priv, R520_MC_FB_LOCATION);
         else
@@ -840,6 +848,8 @@ static void radeon_write_fb_location(drm_radeon_private_t *dev_priv, u32 fb_loc)
 {
         if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515)
                 RADEON_WRITE_MCIND(RV515_MC_FB_LOCATION, fb_loc);
+        else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690)
+                RS690_WRITE_MCIND(RS690_MC_FB_LOCATION, fb_loc);
         else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515)
                 RADEON_WRITE_MCIND(R520_MC_FB_LOCATION, fb_loc);
         else
@@ -850,6 +860,8 @@ static void radeon_write_agp_location(drm_radeon_private_t *dev_priv, u32 agp_lo
 {
         if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV515)
                 RADEON_WRITE_MCIND(RV515_MC_AGP_LOCATION, agp_loc);
+        else if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690)
+                RS690_WRITE_MCIND(RS690_MC_AGP_LOCATION, agp_loc);
         else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515)
                 RADEON_WRITE_MCIND(R520_MC_AGP_LOCATION, agp_loc);
         else
@@ -1362,6 +1374,70 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
        }
 }
 
+/* Enable or disable RS690 GART on the chip */
+static void radeon_set_rs690gart(drm_radeon_private_t *dev_priv, int on)
+{
+        u32 temp;
+
+        if (on) {
+                DRM_DEBUG("programming rs690 gart %08X %08lX %08X\n",
+                          dev_priv->gart_vm_start,
+                          (long)dev_priv->gart_info.bus_addr,
+                          dev_priv->gart_size);
+
+                temp = RS690_READ_MCIND(dev_priv, RS690_MC_MISC_CNTL);
+                RS690_WRITE_MCIND(RS690_MC_MISC_CNTL, 0x5000);
+
+                RS690_WRITE_MCIND(RS690_MC_AGP_SIZE,
+                                  RS690_MC_GART_EN | RS690_MC_AGP_SIZE_32MB);
+
+                temp = RS690_READ_MCIND(dev_priv, RS690_MC_GART_FEATURE_ID);
+                RS690_WRITE_MCIND(RS690_MC_GART_FEATURE_ID, 0x42040800);
+
+                RS690_WRITE_MCIND(RS690_MC_GART_BASE,
+                                  dev_priv->gart_info.bus_addr);
+
+                temp = RS690_READ_MCIND(dev_priv, RS690_MC_AGP_MODE_CONTROL);
+                RS690_WRITE_MCIND(RS690_MC_AGP_MODE_CONTROL, 0x01400000);
+
+                RS690_WRITE_MCIND(RS690_MC_AGP_BASE,
+                                  (unsigned int)dev_priv->gart_vm_start);
+
+                dev_priv->gart_size = 32*1024*1024;
+                temp = (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) &
+                         0xffff0000) | (dev_priv->gart_vm_start >> 16));
+
+                RS690_WRITE_MCIND(RS690_MC_AGP_LOCATION, temp);
+
+                temp = RS690_READ_MCIND(dev_priv, RS690_MC_AGP_SIZE);
+                RS690_WRITE_MCIND(RS690_MC_AGP_SIZE,
+                                  RS690_MC_GART_EN | RS690_MC_AGP_SIZE_32MB);
+
+                do {
+                        temp = RS690_READ_MCIND(dev_priv, RS690_MC_GART_CACHE_CNTL);
+                        if ((temp & RS690_MC_GART_CLEAR_STATUS) ==
+                            RS690_MC_GART_CLEAR_DONE)
+                                break;
+                        DRM_UDELAY(1);
+                } while (1);
+
+                RS690_WRITE_MCIND(RS690_MC_GART_CACHE_CNTL,
+                                  RS690_MC_GART_CC_CLEAR);
+                do {
+                        temp = RS690_READ_MCIND(dev_priv, RS690_MC_GART_CACHE_CNTL);
+                        if ((temp & RS690_MC_GART_CLEAR_STATUS) ==
+                                   RS690_MC_GART_CLEAR_DONE)
+                                break;
+                        DRM_UDELAY(1);
+                } while (1);
+
+                RS690_WRITE_MCIND(RS690_MC_GART_CACHE_CNTL,
+                                  RS690_MC_GART_CC_NO_CHANGE);
+        } else {
+                RS690_WRITE_MCIND(RS690_MC_AGP_SIZE, RS690_MC_GART_DIS);
+        }
+}
+
 static void radeon_set_pciegart(drm_radeon_private_t * dev_priv, int on)
 {
         u32 tmp = RADEON_READ_PCIE(dev_priv, RADEON_PCIE_TX_GART_CNTL);
@@ -1396,6 +1472,11 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
 {
         u32 tmp;
 
+        if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) {
+                radeon_set_rs690gart(dev_priv, on);
+                return;
+        }
+
         if (dev_priv->flags & RADEON_IS_IGPGART) {
                 radeon_set_igpgart(dev_priv, on);
                 return;
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 4434332c79bc..173ae620223a 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -123,6 +123,7 @@ enum radeon_family {
         CHIP_R420,
         CHIP_RV410,
         CHIP_RS400,
+        CHIP_RS690,
         CHIP_RV515,
         CHIP_R520,
         CHIP_RV530,
@@ -467,6 +468,36 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
 #define RADEON_IGPGART_ENABLE           0x38
 #define RADEON_IGPGART_UNK_39           0x39
 
+#define RS690_MC_INDEX                  0x78
+#   define RS690_MC_INDEX_MASK          0x1ff
+#   define RS690_MC_INDEX_WR_EN         (1 << 9)
+#   define RS690_MC_INDEX_WR_ACK        0x7f
+#define RS690_MC_DATA                   0x7c
+
+#define RS690_MC_MISC_CNTL              0x18
+#define RS690_MC_GART_FEATURE_ID        0x2b
+#define RS690_MC_GART_BASE              0x2c
+#define RS690_MC_GART_CACHE_CNTL        0x2e
+#   define RS690_MC_GART_CC_NO_CHANGE   0x0
+#   define RS690_MC_GART_CC_CLEAR       0x1
+#   define RS690_MC_GART_CLEAR_STATUS   (1 << 1)
+#       define RS690_MC_GART_CLEAR_DONE     (0 << 1)
+#       define RS690_MC_GART_CLEAR_PENDING  (1 << 1)
+#define RS690_MC_AGP_SIZE               0x38
+#   define RS690_MC_GART_DIS            0x0
+#   define RS690_MC_GART_EN             0x1
+#   define RS690_MC_AGP_SIZE_32MB       (0 << 1)
+#   define RS690_MC_AGP_SIZE_64MB       (1 << 1)
+#   define RS690_MC_AGP_SIZE_128MB      (2 << 1)
+#   define RS690_MC_AGP_SIZE_256MB      (3 << 1)
+#   define RS690_MC_AGP_SIZE_512MB      (4 << 1)
+#   define RS690_MC_AGP_SIZE_1GB        (5 << 1)
+#   define RS690_MC_AGP_SIZE_2GB        (6 << 1)
+#define RS690_MC_AGP_MODE_CONTROL       0x39
+#define RS690_MC_FB_LOCATION            0x100
+#define RS690_MC_AGP_LOCATION           0x101
+#define RS690_MC_AGP_BASE               0x102
+
 #define R520_MC_IND_INDEX 0x70
 #define R520_MC_IND_WR_EN (1<<24)
 #define R520_MC_IND_DATA  0x74
@@ -1076,6 +1107,13 @@ do {									\
                 RADEON_WRITE(R520_MC_IND_INDEX, 0);     \
         } while (0)
 
+#define RS690_WRITE_MCIND( addr, val )                                  \
+do {                                                            \
+        RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_WR_EN | ((addr) & RS690_MC_INDEX_MASK));    \
+        RADEON_WRITE(RS690_MC_DATA, val);                       \
+        RADEON_WRITE(RS690_MC_INDEX, RS690_MC_INDEX_WR_ACK);    \
+} while (0)
+
 #define CP_PACKET0( reg, n )                                            \
         (RADEON_CP_PACKET0 | ((n) << 16) | ((reg) >> 2))
 #define CP_PACKET0_TABLE( reg, n )                                      \
diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
index bb09413d5a21..88590d040046 100644
--- a/drivers/char/hvc_rtas.c
+++ b/drivers/char/hvc_rtas.c
@@ -76,7 +76,7 @@ static struct hv_ops hvc_rtas_get_put_ops = {
         .put_chars = hvc_rtas_write_console,
 };
 
-static int hvc_rtas_init(void)
+static int __init hvc_rtas_init(void)
 {
         struct hvc_struct *hp;
 
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index 00b8a84b0319..ffa0efce0aed 100644
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -45,7 +45,7 @@ config CARDMAN_4040
 
 config IPWIRELESS
         tristate "IPWireless 3G UMTS PCMCIA card support"
-        depends on PCMCIA
+        depends on PCMCIA && NETDEVICES
         select PPP
         help
           This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 64926aa990db..89a29cd93783 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1006,14 +1006,6 @@ static int __cpufreq_remove_dev (struct sys_device * sys_dev)
         }
 #endif
 
-
-        if (!kobject_get(&data->kobj)) {
-                spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
-                cpufreq_debug_enable_ratelimit();
-                unlock_policy_rwsem_write(cpu);
-                return -EFAULT;
-        }
-
 #ifdef CONFIG_SMP
 
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 60f71e6345e3..d73663a52324 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -219,7 +219,8 @@ static void poll_idle_init(struct cpuidle_device *dev)
 
         cpuidle_set_statedata(state, NULL);
 
-        snprintf(state->name, CPUIDLE_NAME_LEN, "C0 (poll idle)");
+        snprintf(state->name, CPUIDLE_NAME_LEN, "C0");
+        snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
         state->exit_latency = 0;
         state->target_residency = 0;
         state->power_usage = -1;
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 088ea74edd34..69102ca05685 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -218,16 +218,23 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
         return sprintf(buf, "%u\n", state->_name);\
 }
 
-static ssize_t show_state_name(struct cpuidle_state *state, char *buf)
-{
-        return sprintf(buf, "%s\n", state->name);
+#define define_show_state_str_function(_name) \
+static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
+{ \
+        if (state->_name[0] == '\0')\
+                return sprintf(buf, "<null>\n");\
+        return sprintf(buf, "%s\n", state->_name);\
 }
 
 define_show_state_function(exit_latency)
 define_show_state_function(power_usage)
 define_show_state_function(usage)
 define_show_state_function(time)
+define_show_state_str_function(name)
+define_show_state_str_function(desc)
+
 define_one_state_ro(name, show_state_name);
+define_one_state_ro(desc, show_state_desc);
 define_one_state_ro(latency, show_state_exit_latency);
 define_one_state_ro(power, show_state_power_usage);
 define_one_state_ro(usage, show_state_usage);
@@ -235,6 +242,7 @@ define_one_state_ro(time, show_state_time);
 
 static struct attribute *cpuidle_state_default_attrs[] = {
         &attr_name.attr,
+        &attr_desc.attr,
         &attr_latency.attr,
         &attr_power.attr,
         &attr_usage.attr,
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index dfbf24c4033c..3110bf7014f7 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -463,7 +463,7 @@ struct hifn_device
 
         unsigned int            pk_clk_freq;
 
-#ifdef CRYPTO_DEV_HIFN_795X_RNG
+#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
         unsigned int            rng_wait_time;
         ktime_t                 rngtime;
         struct hwrng            rng;
@@ -795,7 +795,7 @@ static struct pci2id {
         }
 };
 
-#ifdef CRYPTO_DEV_HIFN_795X_RNG
+#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
 static int hifn_rng_data_present(struct hwrng *rng, int wait)
 {
         struct hifn_device *dev = (struct hifn_device *)rng->priv;
@@ -880,7 +880,7 @@ static int hifn_init_pubrng(struct hifn_device *dev)
         dprintk("Chip %s: RNG engine has been successfully initialised.\n",
                         dev->name);
 
-#ifdef CRYPTO_DEV_HIFN_795X_RNG
+#ifdef CONFIG_CRYPTO_DEV_HIFN_795X_RNG
         /* First value must be discarded */
         hifn_read_1(dev, HIFN_1_RNG_DATA);
         dev->rngtime = ktime_get();
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 653265a40b7f..4072449ad1cd 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -10,10 +10,9 @@
 
 static char dmi_empty_string[] = "        ";
 
-static char * __init dmi_string(const struct dmi_header *dm, u8 s)
+static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)
 {
         const u8 *bp = ((u8 *) dm) + dm->length;
-        char *str = "";
 
         if (s) {
                 s--;
@@ -28,14 +27,29 @@ static char * __init dmi_string(const struct dmi_header *dm, u8 s)
 
                         if (!memcmp(bp, dmi_empty_string, cmp_len))
                                 return dmi_empty_string;
-                        str = dmi_alloc(len);
-                        if (str != NULL)
-                                strcpy(str, bp);
-                        else
-                                printk(KERN_ERR "dmi_string: cannot allocate %Zu bytes.\n", len);
+                        return bp;
                 }
         }
 
+        return "";
+}
+
+static char * __init dmi_string(const struct dmi_header *dm, u8 s)
+{
+        const char *bp = dmi_string_nosave(dm, s);
+        char *str;
+        size_t len;
+
+        if (bp == dmi_empty_string)
+                return dmi_empty_string;
+
+        len = strlen(bp) + 1;
+        str = dmi_alloc(len);
+        if (str != NULL)
+                strcpy(str, bp);
+        else
+                printk(KERN_ERR "dmi_string: cannot allocate %Zu bytes.\n", len);
+
         return str;
 }
 
@@ -167,10 +181,30 @@ static void __init dmi_save_type(const struct dmi_header *dm, int slot, int inde
         dmi_ident[slot] = s;
 }
 
+static void __init dmi_save_one_device(int type, const char *name)
+{
+        struct dmi_device *dev;
+
+        /* No duplicate device */
+        if (dmi_find_device(type, name, NULL))
+                return;
+
+        dev = dmi_alloc(sizeof(*dev) + strlen(name) + 1);
+        if (!dev) {
+                printk(KERN_ERR "dmi_save_one_device: out of memory.\n");
+                return;
+        }
+
+        dev->type = type;
+        strcpy((char *)(dev + 1), name);
+        dev->name = (char *)(dev + 1);
+        dev->device_data = NULL;
+        list_add(&dev->list, &dmi_devices);
+}
+
 static void __init dmi_save_devices(const struct dmi_header *dm)
 {
         int i, count = (dm->length - sizeof(struct dmi_header)) / 2;
-        struct dmi_device *dev;
 
         for (i = 0; i < count; i++) {
                 const char *d = (char *)(dm + 1) + (i * 2);
@@ -179,23 +213,10 @@ static void __init dmi_save_devices(const struct dmi_header *dm)
                 if ((*d & 0x80) == 0)
                         continue;
 
-                dev = dmi_alloc(sizeof(*dev));
-                if (!dev) {
-                        printk(KERN_ERR "dmi_save_devices: out of memory.\n");
-                        break;
-                }
-
-                dev->type = *d++ & 0x7f;
-                dev->name = dmi_string(dm, *d);
-                dev->device_data = NULL;
-                list_add(&dev->list, &dmi_devices);
+                dmi_save_one_device(*d & 0x7f, dmi_string_nosave(dm, *(d + 1)));
         }
 }
 
-static struct dmi_device empty_oem_string_dev = {
-        .name = dmi_empty_string,
-};
-
 static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
 {
         int i, count = *(u8 *)(dm + 1);
@@ -204,10 +225,8 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
         for (i = 1; i <= count; i++) {
                 char *devname = dmi_string(dm, i);
 
-                if (!strcmp(devname, dmi_empty_string)) {
-                        list_add(&empty_oem_string_dev.list, &dmi_devices);
+                if (devname == dmi_empty_string)
                         continue;
-                }
 
                 dev = dmi_alloc(sizeof(*dev));
                 if (!dev) {
@@ -253,23 +272,12 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm)
 static void __init dmi_save_extended_devices(const struct dmi_header *dm)
 {
         const u8 *d = (u8*) dm + 5;
-        struct dmi_device *dev;
 
         /* Skip disabled device */
         if ((*d & 0x80) == 0)
                 return;
 
-        dev = dmi_alloc(sizeof(*dev));
-        if (!dev) {
-                printk(KERN_ERR "dmi_save_extended_devices: out of memory.\n");
-                return;
-        }
-
-        dev->type = *d-- & 0x7f;
-        dev->name = dmi_string(dm, *d);
-        dev->device_data = NULL;
-
-        list_add(&dev->list, &dmi_devices);
+        dmi_save_one_device(*d & 0x7f, dmi_string_nosave(dm, *(d - 1)));
 }
 
 /*
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
index a870ba58faa3..dceadd0c1419 100644
--- a/drivers/hid/hid-input-quirks.c
+++ b/drivers/hid/hid-input-quirks.c
@@ -352,7 +352,7 @@ int hidinput_mapping_quirks(struct hid_usage *usage,
         return 0;
 }
 
-void hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
+int hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
 {
         struct input_dev *input;
 
@@ -362,34 +362,34 @@ void hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, stru
                 || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007))) {
                 if (value) hid->quirks |=  HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
                 else       hid->quirks &= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
-                return;
+                return 1;
         }
 
         if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &&
                         (usage->type == EV_REL) &&
                         (usage->code == REL_WHEEL)) {
                 hid->delayed_value = value;
-                return;
+                return 1;
         }
 
         if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_B8) &&
                         (usage->hid == 0x000100b8)) {
                 input_event(input, EV_REL, value ? REL_HWHEEL : REL_WHEEL, hid->delayed_value);
-                return;
+                return 1;
         }
 
         if ((hid->quirks & HID_QUIRK_INVERT_HWHEEL) && (usage->code == REL_HWHEEL)) {
                 input_event(input, usage->type, usage->code, -value);
-                return;
+                return 1;
         }
 
         if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_ON) && (usage->code == REL_WHEEL)) {
                 input_event(input, usage->type, REL_HWHEEL, value);
-                return;
+                return 1;
         }
 
         if ((hid->quirks & HID_QUIRK_APPLE_HAS_FN) && hidinput_apple_event(hid, input, usage, value))
-                return;
+                return 1;
 
         /* Handling MS keyboards special buttons */
         if (hid->quirks & HID_QUIRK_MICROSOFT_KEYS && 
@@ -416,8 +416,9 @@ void hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, stru
         if (hid->quirks & HID_QUIRK_HWHEEL_WHEEL_INVERT &&
                         usage->type == EV_REL && usage->code == REL_HWHEEL) {
                 input_event(input, usage->type, REL_WHEEL, -value);
-                return;
+                return 1;
         }
+        return 0;
 }
 
 
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 5325d98b4328..5a38fb27d69f 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -97,6 +97,7 @@ struct hidinput_key_translation {
 #define APPLE_FLAG_FKEY 0x01
 
 static struct hidinput_key_translation apple_fn_keys[] = {
+        { KEY_BACKSPACE, KEY_DELETE },
         { KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },
         { KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
         { KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */
@@ -109,6 +110,10 @@ static struct hidinput_key_translation apple_fn_keys[] = {
         { KEY_F10,      KEY_MUTE,               APPLE_FLAG_FKEY },
         { KEY_F11,      KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },
         { KEY_F12,      KEY_VOLUMEUP,           APPLE_FLAG_FKEY },
+        { KEY_UP,       KEY_PAGEUP },
+        { KEY_DOWN,     KEY_PAGEDOWN },
+        { KEY_LEFT,     KEY_HOME },
+        { KEY_RIGHT,    KEY_END },
         { }
 };
 
@@ -854,7 +859,8 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
                 return;
 
         /* handle input events for quirky devices */
-        hidinput_event_quirks(hid, field, usage, value);
+        if (hidinput_event_quirks(hid, field, usage, value))
+                return;
 
         if (usage->hat_min < usage->hat_max || usage->hat_dir) {
                 int hat_dir = usage->hat_dir;
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index b77b61e0cd7b..e6d05f6b1c1c 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -66,6 +66,12 @@
 #define USB_DEVICE_ID_APPLE_ALU_ANSI    0x0220
 #define USB_DEVICE_ID_APPLE_ALU_ISO     0x0221
 #define USB_DEVICE_ID_APPLE_ALU_JIS     0x0222
+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229
+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a
+#define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e
 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
 #define USB_DEVICE_ID_APPLE_IRCONTROL4  0x8242
@@ -193,6 +199,17 @@
 #define USB_DEVICE_ID_GTCO_502          0x0502
 #define USB_DEVICE_ID_GTCO_503          0x0503
 #define USB_DEVICE_ID_GTCO_504          0x0504
+#define USB_DEVICE_ID_GTCO_600          0x0600
+#define USB_DEVICE_ID_GTCO_601          0x0601
+#define USB_DEVICE_ID_GTCO_602          0x0602
+#define USB_DEVICE_ID_GTCO_603          0x0603
+#define USB_DEVICE_ID_GTCO_604          0x0604
+#define USB_DEVICE_ID_GTCO_605          0x0605
+#define USB_DEVICE_ID_GTCO_606          0x0606
+#define USB_DEVICE_ID_GTCO_607          0x0607
+#define USB_DEVICE_ID_GTCO_608          0x0608
+#define USB_DEVICE_ID_GTCO_609          0x0609
+#define USB_DEVICE_ID_GTCO_609          0x0609
 #define USB_DEVICE_ID_GTCO_1000         0x1000
 #define USB_DEVICE_ID_GTCO_1001         0x1001
 #define USB_DEVICE_ID_GTCO_1002         0x1002
@@ -200,7 +217,7 @@
 #define USB_DEVICE_ID_GTCO_1004         0x1004
 #define USB_DEVICE_ID_GTCO_1005         0x1005
 #define USB_DEVICE_ID_GTCO_1006         0x1006
-
+#define USB_DEVICE_ID_GTCO_1007         0x1007
 #define USB_VENDOR_ID_HAPP              0x078b
 #define USB_DEVICE_ID_UGCI_DRIVING      0x0010
 #define USB_DEVICE_ID_UGCI_FLYING       0x0020
@@ -368,6 +385,7 @@
 #define USB_DEVICE_ID_VERNIER_GOTEMP    0x0002
 #define USB_DEVICE_ID_VERNIER_SKIP      0x0003
 #define USB_DEVICE_ID_VERNIER_CYCLOPS   0x0004
+#define USB_DEVICE_ID_VERNIER_LCSPEC    0x0006
 
 #define USB_VENDOR_ID_WACOM             0x056a
 
@@ -496,6 +514,16 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_503, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_504, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_600, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_601, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_602, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_603, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_604, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_605, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_606, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_607, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_608, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_609, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1000, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1001, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1002, HID_QUIRK_IGNORE },
@@ -503,6 +531,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },
@@ -541,6 +570,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT, HID_QUIRK_IGNORE },
@@ -593,6 +623,12 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_HAS_FN },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
 
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 410ffe4e9d80..368879ff5d8c 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -143,6 +143,16 @@ config SENSORS_ADT7470
           This driver can also be built as a module. If so, the module
           will be called adt7470.
 
+config SENSORS_ADT7473
+        tristate "Analog Devices ADT7473"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Analog Devices
+          ADT7473 temperature monitoring chips.
+
+          This driver can also be built as a module. If so, the module
+          will be called adt7473.
+
 config SENSORS_K8TEMP
         tristate "AMD Athlon64/FX or Opteron temperature sensor"
         depends on X86 && PCI && EXPERIMENTAL
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 824161337f1c..3bdb05a5cbd7 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_SENSORS_ADM1031)	+= adm1031.o
 obj-$(CONFIG_SENSORS_ADM9240)   += adm9240.o
 obj-$(CONFIG_SENSORS_ADS7828)   += ads7828.o
 obj-$(CONFIG_SENSORS_ADT7470)   += adt7470.o
+obj-$(CONFIG_SENSORS_ADT7473)   += adt7473.o
 obj-$(CONFIG_SENSORS_APPLESMC)  += applesmc.o
 obj-$(CONFIG_SENSORS_AMS)       += ams/
 obj-$(CONFIG_SENSORS_ATXP1)     += atxp1.o
diff --git a/drivers/hwmon/ad7418.c b/drivers/hwmon/ad7418.c
index fcd7fe78f3f9..466b9ee92797 100644
--- a/drivers/hwmon/ad7418.c
+++ b/drivers/hwmon/ad7418.c
@@ -26,7 +26,7 @@
 #define DRV_VERSION "0.3"
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END };
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_3(ad7416, ad7417, ad7418);
 
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index b96be772e498..ecbf69484bf5 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -31,10 +31,8 @@
 
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
-                                        0x29, 0x2a, 0x2b,
-                                        0x4c, 0x4d, 0x4e,
-                                        I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = {
+        0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm,
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index e96c3725203d..1d76de7d75c7 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -62,7 +62,7 @@
  * NE1619 has two possible addresses: 0x2c and 0x2d.
  */
 
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index 8002f68240c4..904c6ce9d83f 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -35,7 +35,7 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(adm1026);
@@ -1624,6 +1624,7 @@ static struct attribute *adm1026_attributes_temp3[] = {
         &dev_attr_temp3_crit_enable.attr,
         &dev_attr_temp3_auto_point1_pwm.attr,
         &dev_attr_temp3_auto_point2_pwm.attr,
+        NULL
 };
 
 static const struct attribute_group adm1026_group_temp3 = {
@@ -1639,6 +1640,7 @@ static struct attribute *adm1026_attributes_in8_9[] = {
         &sensor_dev_attr_in9_max.dev_attr.attr,
         &sensor_dev_attr_in9_min.dev_attr.attr,
         &sensor_dev_attr_in9_alarm.dev_attr.attr,
+        NULL
 };
 
 static const struct attribute_group adm1026_group_in8_9 = {
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c
index 0bc897dffa27..2c6608d453c2 100644
--- a/drivers/hwmon/adm1029.c
+++ b/drivers/hwmon/adm1029.c
@@ -39,10 +39,8 @@
  * Addresses to scan
  */
 
-static unsigned short normal_i2c[] = {
-        0x28, 0x29, 0x2a,
-        0x2b, 0x2c, 0x2d,
-        0x2e, 0x2f, I2C_CLIENT_END
+static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
+                                                0x2e, 0x2f, I2C_CLIENT_END
 };
 
 /*
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 5aaad3636c98..2bffcab7dc9f 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -61,7 +61,7 @@
 #define ADM1031_CONF2_TEMP_ENABLE(chan) (0x10 << (chan))
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_2(adm1030, adm1031);
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 7671d2bf7800..149ef25252e7 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -52,7 +52,7 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                         I2C_CLIENT_END };
 
 /* Insmod parameters */
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c
index 6b8a73ef404c..ed71a8bc70dc 100644
--- a/drivers/hwmon/ads7828.c
+++ b/drivers/hwmon/ads7828.c
@@ -44,7 +44,7 @@
 #define ADS7828_INT_VREF_MV 2500 /* Internal vref is 2.5V, 2500mV */
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
         I2C_CLIENT_END };
 
 /* Insmod parameters */
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
index 747693ab2ff1..6b5325f33a2c 100644
--- a/drivers/hwmon/adt7470.c
+++ b/drivers/hwmon/adt7470.c
@@ -30,7 +30,7 @@
 #include <linux/log2.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(adt7470);
diff --git a/drivers/hwmon/adt7473.c b/drivers/hwmon/adt7473.c
new file mode 100644
index 000000000000..9587869bdba0
--- /dev/null
+++ b/drivers/hwmon/adt7473.c
@@ -0,0 +1,1157 @@
+/*
+ * A hwmon driver for the Analog Devices ADT7473
+ * Copyright (C) 2007 IBM
+ *
+ * Author: Darrick J. Wong <djwong@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/log2.h>
+
+/* Addresses to scan */
+static const unsigned short normal_i2c[] = { 0x2C, 0x2D, 0x2E, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(adt7473);
+
+/* ADT7473 registers */
+#define ADT7473_REG_BASE_ADDR                   0x20
+
+#define ADT7473_REG_VOLT_BASE_ADDR              0x21
+#define ADT7473_REG_VOLT_MAX_ADDR               0x22
+#define ADT7473_REG_VOLT_MIN_BASE_ADDR          0x46
+#define ADT7473_REG_VOLT_MIN_MAX_ADDR           0x49
+
+#define ADT7473_REG_TEMP_BASE_ADDR              0x25
+#define ADT7473_REG_TEMP_MAX_ADDR               0x27
+#define ADT7473_REG_TEMP_LIMITS_BASE_ADDR       0x4E
+#define ADT7473_REG_TEMP_LIMITS_MAX_ADDR        0x53
+#define ADT7473_REG_TEMP_TMIN_BASE_ADDR         0x67
+#define ADT7473_REG_TEMP_TMIN_MAX_ADDR          0x69
+#define ADT7473_REG_TEMP_TMAX_BASE_ADDR         0x6A
+#define ADT7473_REG_TEMP_TMAX_MAX_ADDR          0x6C
+
+#define ADT7473_REG_FAN_BASE_ADDR               0x28
+#define ADT7473_REG_FAN_MAX_ADDR                0x2F
+#define ADT7473_REG_FAN_MIN_BASE_ADDR           0x54
+#define ADT7473_REG_FAN_MIN_MAX_ADDR            0x5B
+
+#define ADT7473_REG_PWM_BASE_ADDR               0x30
+#define ADT7473_REG_PWM_MAX_ADDR                0x32
+#define ADT7473_REG_PWM_MIN_BASE_ADDR           0x64
+#define ADT7473_REG_PWM_MIN_MAX_ADDR            0x66
+#define ADT7473_REG_PWM_MAX_BASE_ADDR           0x38
+#define ADT7473_REG_PWM_MAX_MAX_ADDR            0x3A
+#define ADT7473_REG_PWM_BHVR_BASE_ADDR          0x5C
+#define ADT7473_REG_PWM_BHVR_MAX_ADDR           0x5E
+#define         ADT7473_PWM_BHVR_MASK           0xE0
+#define         ADT7473_PWM_BHVR_SHIFT          5
+
+#define ADT7473_REG_CFG1                        0x40
+#define         ADT7473_CFG1_START              0x01
+#define         ADT7473_CFG1_READY              0x04
+#define ADT7473_REG_CFG2                        0x73
+#define ADT7473_REG_CFG3                        0x78
+#define ADT7473_REG_CFG4                        0x7D
+#define         ADT7473_CFG4_MAX_DUTY_AT_OVT    0x08
+#define ADT7473_REG_CFG5                        0x7C
+#define         ADT7473_CFG5_TEMP_TWOS          0x01
+#define         ADT7473_CFG5_TEMP_OFFSET        0x02
+
+#define ADT7473_REG_DEVICE                      0x3D
+#define         ADT7473_VENDOR                  0x41
+#define ADT7473_REG_VENDOR                      0x3E
+#define         ADT7473_DEVICE                  0x73
+#define ADT7473_REG_REVISION                    0x3F
+#define         ADT7473_REV_68                  0x68
+#define         ADT7473_REV_69                  0x69
+
+#define ADT7473_REG_ALARM1                      0x41
+#define         ADT7473_VCCP_ALARM              0x02
+#define         ADT7473_VCC_ALARM               0x04
+#define         ADT7473_R1T_ALARM               0x10
+#define         ADT7473_LT_ALARM                0x20
+#define         ADT7473_R2T_ALARM               0x40
+#define         ADT7473_OOL                     0x80
+#define ADT7473_REG_ALARM2                      0x42
+#define         ADT7473_OVT_ALARM               0x02
+#define         ADT7473_FAN1_ALARM              0x04
+#define         ADT7473_FAN2_ALARM              0x08
+#define         ADT7473_FAN3_ALARM              0x10
+#define         ADT7473_FAN4_ALARM              0x20
+#define         ADT7473_R1T_SHORT               0x40
+#define         ADT7473_R2T_SHORT               0x80
+#define ADT7473_REG_MAX_ADDR                    0x80
+
+#define ALARM2(x)       ((x) << 8)
+
+#define ADT7473_VOLT_COUNT      2
+#define ADT7473_REG_VOLT(x)     (ADT7473_REG_VOLT_BASE_ADDR + (x))
+#define ADT7473_REG_VOLT_MIN(x) (ADT7473_REG_VOLT_MIN_BASE_ADDR + ((x) * 2))
+#define ADT7473_REG_VOLT_MAX(x) (ADT7473_REG_VOLT_MIN_BASE_ADDR + \
+                                ((x) * 2) + 1)
+
+#define ADT7473_TEMP_COUNT      3
+#define ADT7473_REG_TEMP(x)     (ADT7473_REG_TEMP_BASE_ADDR + (x))
+#define ADT7473_REG_TEMP_MIN(x) (ADT7473_REG_TEMP_LIMITS_BASE_ADDR + ((x) * 2))
+#define ADT7473_REG_TEMP_MAX(x) (ADT7473_REG_TEMP_LIMITS_BASE_ADDR + \
+                                ((x) * 2) + 1)
+#define ADT7473_REG_TEMP_TMIN(x)        (ADT7473_REG_TEMP_TMIN_BASE_ADDR + (x))
+#define ADT7473_REG_TEMP_TMAX(x)        (ADT7473_REG_TEMP_TMAX_BASE_ADDR + (x))
+
+#define ADT7473_FAN_COUNT       4
+#define ADT7473_REG_FAN(x)      (ADT7473_REG_FAN_BASE_ADDR + ((x) * 2))
+#define ADT7473_REG_FAN_MIN(x)  (ADT7473_REG_FAN_MIN_BASE_ADDR + ((x) * 2))
+
+#define ADT7473_PWM_COUNT       3
+#define ADT7473_REG_PWM(x)      (ADT7473_REG_PWM_BASE_ADDR + (x))
+#define ADT7473_REG_PWM_MAX(x)  (ADT7473_REG_PWM_MAX_BASE_ADDR + (x))
+#define ADT7473_REG_PWM_MIN(x)  (ADT7473_REG_PWM_MIN_BASE_ADDR + (x))
+#define ADT7473_REG_PWM_BHVR(x) (ADT7473_REG_PWM_BHVR_BASE_ADDR + (x))
+
+/* How often do we reread sensors values? (In jiffies) */
+#define SENSOR_REFRESH_INTERVAL (2 * HZ)
+
+/* How often do we reread sensor limit values? (In jiffies) */
+#define LIMIT_REFRESH_INTERVAL  (60 * HZ)
+
+/* datasheet says to divide this number by the fan reading to get fan rpm */
+#define FAN_PERIOD_TO_RPM(x)    ((90000 * 60) / (x))
+#define FAN_RPM_TO_PERIOD       FAN_PERIOD_TO_RPM
+#define FAN_PERIOD_INVALID      65535
+#define FAN_DATA_VALID(x)       ((x) && (x) != FAN_PERIOD_INVALID)
+
+struct adt7473_data {
+        struct i2c_client       client;
+        struct device           *hwmon_dev;
+        struct attribute_group  attrs;
+        struct mutex            lock;
+        char                    sensors_valid;
+        char                    limits_valid;
+        unsigned long           sensors_last_updated;   /* In jiffies */
+        unsigned long           limits_last_updated;    /* In jiffies */
+
+        u8                      volt[ADT7473_VOLT_COUNT];
+        s8                      volt_min[ADT7473_VOLT_COUNT];
+        s8                      volt_max[ADT7473_VOLT_COUNT];
+
+        s8                      temp[ADT7473_TEMP_COUNT];
+        s8                      temp_min[ADT7473_TEMP_COUNT];
+        s8                      temp_max[ADT7473_TEMP_COUNT];
+        s8                      temp_tmin[ADT7473_TEMP_COUNT];
+        /* This is called the !THERM limit in the datasheet */
+        s8                      temp_tmax[ADT7473_TEMP_COUNT];
+
+        u16                     fan[ADT7473_FAN_COUNT];
+        u16                     fan_min[ADT7473_FAN_COUNT];
+
+        u8                      pwm[ADT7473_PWM_COUNT];
+        u8                      pwm_max[ADT7473_PWM_COUNT];
+        u8                      pwm_min[ADT7473_PWM_COUNT];
+        u8                      pwm_behavior[ADT7473_PWM_COUNT];
+
+        u8                      temp_twos_complement;
+        u8                      temp_offset;
+
+        u16                     alarm;
+        u8                      max_duty_at_overheat;
+};
+
+static int adt7473_attach_adapter(struct i2c_adapter *adapter);
+static int adt7473_detect(struct i2c_adapter *adapter, int address, int kind);
+static int adt7473_detach_client(struct i2c_client *client);
+
+static struct i2c_driver adt7473_driver = {
+        .driver = {
+                .name   = "adt7473",
+        },
+        .attach_adapter = adt7473_attach_adapter,
+        .detach_client  = adt7473_detach_client,
+};
+
+/*
+ * 16-bit registers on the ADT7473 are low-byte first.  The data sheet says
+ * that the low byte must be read before the high byte.
+ */
+static inline int adt7473_read_word_data(struct i2c_client *client, u8 reg)
+{
+        u16 foo;
+        foo = i2c_smbus_read_byte_data(client, reg);
+        foo |= ((u16)i2c_smbus_read_byte_data(client, reg + 1) << 8);
+        return foo;
+}
+
+static inline int adt7473_write_word_data(struct i2c_client *client, u8 reg,
+                                          u16 value)
+{
+        return i2c_smbus_write_byte_data(client, reg, value & 0xFF)
+               && i2c_smbus_write_byte_data(client, reg + 1, value >> 8);
+}
+
+static void adt7473_init_client(struct i2c_client *client)
+{
+        int reg = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG1);
+
+        if (!(reg & ADT7473_CFG1_READY)) {
+                dev_err(&client->dev, "Chip not ready.\n");
+        } else {
+                /* start monitoring */
+                i2c_smbus_write_byte_data(client, ADT7473_REG_CFG1,
+                                          reg | ADT7473_CFG1_START);
+        }
+}
+
+static struct adt7473_data *adt7473_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        unsigned long local_jiffies = jiffies;
+        u8 cfg;
+        int i;
+
+        mutex_lock(&data->lock);
+        if (time_before(local_jiffies, data->sensors_last_updated +
+                SENSOR_REFRESH_INTERVAL)
+                && data->sensors_valid)
+                goto no_sensor_update;
+
+        for (i = 0; i < ADT7473_VOLT_COUNT; i++)
+                data->volt[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_VOLT(i));
+
+        /* Determine temperature encoding */
+        cfg = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG5);
+        data->temp_twos_complement = (cfg & ADT7473_CFG5_TEMP_TWOS);
+
+        /*
+         * What does this do? it implies a variable temperature sensor
+         * offset, but the datasheet doesn't say anything about this bit
+         * and other parts of the datasheet imply that "offset64" mode
+         * means that you shift temp values by -64 if the above bit was set.
+         */
+        data->temp_offset = (cfg & ADT7473_CFG5_TEMP_OFFSET);
+
+        for (i = 0; i < ADT7473_TEMP_COUNT; i++)
+                data->temp[i] = i2c_smbus_read_byte_data(client,
+                                                         ADT7473_REG_TEMP(i));
+
+        for (i = 0; i < ADT7473_FAN_COUNT; i++)
+                data->fan[i] = adt7473_read_word_data(client,
+                                                ADT7473_REG_FAN(i));
+
+        for (i = 0; i < ADT7473_PWM_COUNT; i++)
+                data->pwm[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_PWM(i));
+
+        data->alarm = i2c_smbus_read_byte_data(client, ADT7473_REG_ALARM1);
+        if (data->alarm & ADT7473_OOL)
+                data->alarm |= ALARM2(i2c_smbus_read_byte_data(client,
+                                                         ADT7473_REG_ALARM2));
+
+        data->sensors_last_updated = local_jiffies;
+        data->sensors_valid = 1;
+
+no_sensor_update:
+        if (time_before(local_jiffies, data->limits_last_updated +
+                LIMIT_REFRESH_INTERVAL)
+                && data->limits_valid)
+                goto out;
+
+        for (i = 0; i < ADT7473_VOLT_COUNT; i++) {
+                data->volt_min[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_VOLT_MIN(i));
+                data->volt_max[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_VOLT_MAX(i));
+        }
+
+        for (i = 0; i < ADT7473_TEMP_COUNT; i++) {
+                data->temp_min[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_TEMP_MIN(i));
+                data->temp_max[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_TEMP_MAX(i));
+                data->temp_tmin[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_TEMP_TMIN(i));
+                data->temp_tmax[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_TEMP_TMAX(i));
+        }
+
+        for (i = 0; i < ADT7473_FAN_COUNT; i++)
+                data->fan_min[i] = adt7473_read_word_data(client,
+                                                ADT7473_REG_FAN_MIN(i));
+
+        for (i = 0; i < ADT7473_PWM_COUNT; i++) {
+                data->pwm_max[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_PWM_MAX(i));
+                data->pwm_min[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_PWM_MIN(i));
+                data->pwm_behavior[i] = i2c_smbus_read_byte_data(client,
+                                                ADT7473_REG_PWM_BHVR(i));
+        }
+
+        data->limits_last_updated = local_jiffies;
+        data->limits_valid = 1;
+
+out:
+        mutex_unlock(&data->lock);
+        return data;
+}
+
+/*
+ * On this chip, voltages are given as a count of steps between a minimum
+ * and maximum voltage, not a direct voltage.
+ */
+static const int volt_convert_table[][2] = {
+        {2997, 3},
+        {4395, 4},
+};
+
+static int decode_volt(int volt_index, u8 raw)
+{
+        int cmax = volt_convert_table[volt_index][0];
+        int cmin = volt_convert_table[volt_index][1];
+        return ((raw * (cmax - cmin)) / 255) + cmin;
+}
+
+static u8 encode_volt(int volt_index, int cooked)
+{
+        int cmax = volt_convert_table[volt_index][0];
+        int cmin = volt_convert_table[volt_index][1];
+        u8 x;
+
+        if (cooked > cmax)
+                cooked = cmax;
+        else if (cooked < cmin)
+                cooked = cmin;
+
+        x = ((cooked - cmin) * 255) / (cmax - cmin);
+
+        return x;
+}
+
+static ssize_t show_volt_min(struct device *dev,
+                             struct device_attribute *devattr,
+                             char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       decode_volt(attr->index, data->volt_min[attr->index]));
+}
+
+static ssize_t set_volt_min(struct device *dev,
+                            struct device_attribute *devattr,
+                            const char *buf,
+                            size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int volt = encode_volt(attr->index, simple_strtol(buf, NULL, 10));
+
+        mutex_lock(&data->lock);
+        data->volt_min[attr->index] = volt;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_VOLT_MIN(attr->index),
+                                  volt);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_volt_max(struct device *dev,
+                             struct device_attribute *devattr,
+                             char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       decode_volt(attr->index, data->volt_max[attr->index]));
+}
+
+static ssize_t set_volt_max(struct device *dev,
+                            struct device_attribute *devattr,
+                            const char *buf,
+                            size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int volt = encode_volt(attr->index, simple_strtol(buf, NULL, 10));
+
+        mutex_lock(&data->lock);
+        data->volt_max[attr->index] = volt;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_VOLT_MAX(attr->index),
+                                  volt);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_volt(struct device *dev, struct device_attribute *devattr,
+                         char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+
+        return sprintf(buf, "%d\n",
+                       decode_volt(attr->index, data->volt[attr->index]));
+}
+
+/*
+ * This chip can report temperature data either as a two's complement
+ * number in the range -128 to 127, or as an unsigned number that must
+ * be offset by 64.
+ */
+static int decode_temp(struct adt7473_data *data, u8 raw)
+{
+        if (data->temp_twos_complement)
+                return (s8)raw;
+        return raw - 64;
+}
+
+static u8 encode_temp(struct adt7473_data *data, int cooked)
+{
+        if (data->temp_twos_complement)
+                return (cooked & 0xFF);
+        return cooked + 64;
+}
+
+static ssize_t show_temp_min(struct device *dev,
+                             struct device_attribute *devattr,
+                             char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       1000 * decode_temp(data, data->temp_min[attr->index]));
+}
+
+static ssize_t set_temp_min(struct device *dev,
+                            struct device_attribute *devattr,
+                            const char *buf,
+                            size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10) / 1000;
+        temp = encode_temp(data, temp);
+
+        mutex_lock(&data->lock);
+        data->temp_min[attr->index] = temp;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_TEMP_MIN(attr->index),
+                                  temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_temp_max(struct device *dev,
+                             struct device_attribute *devattr,
+                             char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       1000 * decode_temp(data, data->temp_max[attr->index]));
+}
+
+static ssize_t set_temp_max(struct device *dev,
+                            struct device_attribute *devattr,
+                            const char *buf,
+                            size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10) / 1000;
+        temp = encode_temp(data, temp);
+
+        mutex_lock(&data->lock);
+        data->temp_max[attr->index] = temp;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_TEMP_MAX(attr->index),
+                                  temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
+                         char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       1000 * decode_temp(data, data->temp[attr->index]));
+}
+
+static ssize_t show_fan_min(struct device *dev,
+                            struct device_attribute *devattr,
+                            char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+
+        if (FAN_DATA_VALID(data->fan_min[attr->index]))
+                return sprintf(buf, "%d\n",
+                               FAN_PERIOD_TO_RPM(data->fan_min[attr->index]));
+        else
+                return sprintf(buf, "0\n");
+}
+
+static ssize_t set_fan_min(struct device *dev,
+                           struct device_attribute *devattr,
+                           const char *buf, size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+
+        if (!temp)
+                return -EINVAL;
+        temp = FAN_RPM_TO_PERIOD(temp);
+
+        mutex_lock(&data->lock);
+        data->fan_min[attr->index] = temp;
+        adt7473_write_word_data(client, ADT7473_REG_FAN_MIN(attr->index), temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+
+        if (FAN_DATA_VALID(data->fan[attr->index]))
+                return sprintf(buf, "%d\n",
+                               FAN_PERIOD_TO_RPM(data->fan[attr->index]));
+        else
+                return sprintf(buf, "0\n");
+}
+
+static ssize_t show_max_duty_at_crit(struct device *dev,
+                                     struct device_attribute *devattr,
+                                     char *buf)
+{
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n", data->max_duty_at_overheat);
+}
+
+static ssize_t set_max_duty_at_crit(struct device *dev,
+                                    struct device_attribute *devattr,
+                                    const char *buf,
+                                    size_t count)
+{
+        u8 reg;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+        temp = temp && 0xFF;
+
+        mutex_lock(&data->lock);
+        data->max_duty_at_overheat = temp;
+        reg = i2c_smbus_read_byte_data(client, ADT7473_REG_CFG4);
+        if (temp)
+                reg |= ADT7473_CFG4_MAX_DUTY_AT_OVT;
+        else
+                reg &= ~ADT7473_CFG4_MAX_DUTY_AT_OVT;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_CFG4, reg);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm[attr->index]);
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->lock);
+        data->pwm[attr->index] = temp;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_PWM(attr->index), temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_pwm_max(struct device *dev,
+                            struct device_attribute *devattr,
+                            char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm_max[attr->index]);
+}
+
+static ssize_t set_pwm_max(struct device *dev,
+                           struct device_attribute *devattr,
+                           const char *buf,
+                           size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->lock);
+        data->pwm_max[attr->index] = temp;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_PWM_MAX(attr->index),
+                                  temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_pwm_min(struct device *dev,
+                            struct device_attribute *devattr,
+                            char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm_min[attr->index]);
+}
+
+static ssize_t set_pwm_min(struct device *dev,
+                           struct device_attribute *devattr,
+                           const char *buf,
+                           size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->lock);
+        data->pwm_min[attr->index] = temp;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_PWM_MIN(attr->index),
+                                  temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_temp_tmax(struct device *dev,
+                              struct device_attribute *devattr,
+                              char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       1000 * decode_temp(data, data->temp_tmax[attr->index]));
+}
+
+static ssize_t set_temp_tmax(struct device *dev,
+                             struct device_attribute *devattr,
+                             const char *buf,
+                             size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10) / 1000;
+        temp = encode_temp(data, temp);
+
+        mutex_lock(&data->lock);
+        data->temp_tmax[attr->index] = temp;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_TEMP_TMAX(attr->index),
+                                  temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_temp_tmin(struct device *dev,
+                              struct device_attribute *devattr,
+                              char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        return sprintf(buf, "%d\n",
+                       1000 * decode_temp(data, data->temp_tmin[attr->index]));
+}
+
+static ssize_t set_temp_tmin(struct device *dev,
+                             struct device_attribute *devattr,
+                             const char *buf,
+                             size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10) / 1000;
+        temp = encode_temp(data, temp);
+
+        mutex_lock(&data->lock);
+        data->temp_tmin[attr->index] = temp;
+        i2c_smbus_write_byte_data(client, ADT7473_REG_TEMP_TMIN(attr->index),
+                                  temp);
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_pwm_enable(struct device *dev,
+                               struct device_attribute *devattr,
+                               char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+
+        switch (data->pwm_behavior[attr->index] >> ADT7473_PWM_BHVR_SHIFT) {
+        case 3:
+                return sprintf(buf, "0\n");
+        case 7:
+                return sprintf(buf, "1\n");
+        default:
+                return sprintf(buf, "2\n");
+        }
+}
+
+static ssize_t set_pwm_enable(struct device *dev,
+                              struct device_attribute *devattr,
+                              const char *buf,
+                              size_t count)
+{
+        u8 reg;
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+
+        switch (temp) {
+        case 0:
+                temp = 3;
+                break;
+        case 1:
+                temp = 7;
+                break;
+        case 2:
+                /* Enter automatic mode with fans off */
+                temp = 4;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        mutex_lock(&data->lock);
+        reg = i2c_smbus_read_byte_data(client,
+                                       ADT7473_REG_PWM_BHVR(attr->index));
+        reg = (temp << ADT7473_PWM_BHVR_SHIFT) |
+              (reg & ~ADT7473_PWM_BHVR_MASK);
+        i2c_smbus_write_byte_data(client, ADT7473_REG_PWM_BHVR(attr->index),
+                                  reg);
+        data->pwm_behavior[attr->index] = reg;
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_pwm_auto_temp(struct device *dev,
+                                  struct device_attribute *devattr,
+                                  char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+        int bhvr = data->pwm_behavior[attr->index] >> ADT7473_PWM_BHVR_SHIFT;
+
+        switch (bhvr) {
+        case 3:
+        case 4:
+        case 7:
+                return sprintf(buf, "0\n");
+        case 0:
+        case 1:
+        case 5:
+        case 6:
+                return sprintf(buf, "%d\n", bhvr + 1);
+        case 2:
+                return sprintf(buf, "4\n");
+        }
+        /* shouldn't ever get here */
+        BUG();
+}
+
+static ssize_t set_pwm_auto_temp(struct device *dev,
+                                 struct device_attribute *devattr,
+                                 const char *buf,
+                                 size_t count)
+{
+        u8 reg;
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adt7473_data *data = i2c_get_clientdata(client);
+        int temp = simple_strtol(buf, NULL, 10);
+
+        switch (temp) {
+        case 1:
+        case 2:
+        case 6:
+        case 7:
+                temp--;
+                break;
+        case 0:
+                temp = 4;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        mutex_lock(&data->lock);
+        reg = i2c_smbus_read_byte_data(client,
+                                       ADT7473_REG_PWM_BHVR(attr->index));
+        reg = (temp << ADT7473_PWM_BHVR_SHIFT) |
+              (reg & ~ADT7473_PWM_BHVR_MASK);
+        i2c_smbus_write_byte_data(client, ADT7473_REG_PWM_BHVR(attr->index),
+                                  reg);
+        data->pwm_behavior[attr->index] = reg;
+        mutex_unlock(&data->lock);
+
+        return count;
+}
+
+static ssize_t show_alarm(struct device *dev,
+                          struct device_attribute *devattr,
+                          char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct adt7473_data *data = adt7473_update_device(dev);
+
+        if (data->alarm & attr->index)
+                return sprintf(buf, "1\n");
+        else
+                return sprintf(buf, "0\n");
+}
+
+
+static SENSOR_DEVICE_ATTR(in1_max, S_IWUSR | S_IRUGO, show_volt_max,
+                          set_volt_max, 0);
+static SENSOR_DEVICE_ATTR(in2_max, S_IWUSR | S_IRUGO, show_volt_max,
+                          set_volt_max, 1);
+
+static SENSOR_DEVICE_ATTR(in1_min, S_IWUSR | S_IRUGO, show_volt_min,
+                          set_volt_min, 0);
+static SENSOR_DEVICE_ATTR(in2_min, S_IWUSR | S_IRUGO, show_volt_min,
+                          set_volt_min, 1);
+
+static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_volt, NULL, 0);
+static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_volt, NULL, 1);
+
+static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL,
+                          ADT7473_VCCP_ALARM);
+static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL,
+                          ADT7473_VCC_ALARM);
+
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max,
+                          set_temp_max, 0);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_max,
+                          set_temp_max, 1);
+static SENSOR_DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp_max,
+                          set_temp_max, 2);
+
+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp_min,
+                          set_temp_min, 0);
+static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp_min,
+                          set_temp_min, 1);
+static SENSOR_DEVICE_ATTR(temp3_min, S_IWUSR | S_IRUGO, show_temp_min,
+                          set_temp_min, 2);
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);
+
+static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL,
+                          ADT7473_R1T_ALARM | ALARM2(ADT7473_R1T_SHORT));
+static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL,
+                          ADT7473_LT_ALARM);
+static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL,
+                          ADT7473_R2T_ALARM | ALARM2(ADT7473_R2T_SHORT));
+
+static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan_min,
+                          set_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan2_min, S_IWUSR | S_IRUGO, show_fan_min,
+                          set_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan3_min, S_IWUSR | S_IRUGO, show_fan_min,
+                          set_fan_min, 2);
+static SENSOR_DEVICE_ATTR(fan4_min, S_IWUSR | S_IRUGO, show_fan_min,
+                          set_fan_min, 3);
+
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 3);
+
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL,
+                          ALARM2(ADT7473_FAN1_ALARM));
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL,
+                          ALARM2(ADT7473_FAN2_ALARM));
+static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL,
+                          ALARM2(ADT7473_FAN3_ALARM));
+static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL,
+                          ALARM2(ADT7473_FAN4_ALARM));
+
+static SENSOR_DEVICE_ATTR(pwm_use_point2_pwm_at_crit, S_IWUSR | S_IRUGO,
+                          show_max_duty_at_crit, set_max_duty_at_crit, 0);
+
+static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 2);
+
+static SENSOR_DEVICE_ATTR(pwm1_auto_point1_pwm, S_IWUSR | S_IRUGO,
+                          show_pwm_min, set_pwm_min, 0);
+static SENSOR_DEVICE_ATTR(pwm2_auto_point1_pwm, S_IWUSR | S_IRUGO,
+                          show_pwm_min, set_pwm_min, 1);
+static SENSOR_DEVICE_ATTR(pwm3_auto_point1_pwm, S_IWUSR | S_IRUGO,
+                          show_pwm_min, set_pwm_min, 2);
+
+static SENSOR_DEVICE_ATTR(pwm1_auto_point2_pwm, S_IWUSR | S_IRUGO,
+                          show_pwm_max, set_pwm_max, 0);
+static SENSOR_DEVICE_ATTR(pwm2_auto_point2_pwm, S_IWUSR | S_IRUGO,
+                          show_pwm_max, set_pwm_max, 1);
+static SENSOR_DEVICE_ATTR(pwm3_auto_point2_pwm, S_IWUSR | S_IRUGO,
+                          show_pwm_max, set_pwm_max, 2);
+
+static SENSOR_DEVICE_ATTR(temp1_auto_point1_temp, S_IWUSR | S_IRUGO,
+                          show_temp_tmin, set_temp_tmin, 0);
+static SENSOR_DEVICE_ATTR(temp2_auto_point1_temp, S_IWUSR | S_IRUGO,
+                          show_temp_tmin, set_temp_tmin, 1);
+static SENSOR_DEVICE_ATTR(temp3_auto_point1_temp, S_IWUSR | S_IRUGO,
+                          show_temp_tmin, set_temp_tmin, 2);
+
+static SENSOR_DEVICE_ATTR(temp1_auto_point2_temp, S_IWUSR | S_IRUGO,
+                          show_temp_tmax, set_temp_tmax, 0);
+static SENSOR_DEVICE_ATTR(temp2_auto_point2_temp, S_IWUSR | S_IRUGO,
+                          show_temp_tmax, set_temp_tmax, 1);
+static SENSOR_DEVICE_ATTR(temp3_auto_point2_temp, S_IWUSR | S_IRUGO,
+                          show_temp_tmax, set_temp_tmax, 2);
+
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IWUSR | S_IRUGO, show_pwm_enable,
+                          set_pwm_enable, 0);
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IWUSR | S_IRUGO, show_pwm_enable,
+                          set_pwm_enable, 1);
+static SENSOR_DEVICE_ATTR(pwm3_enable, S_IWUSR | S_IRUGO, show_pwm_enable,
+                          set_pwm_enable, 2);
+
+static SENSOR_DEVICE_ATTR(pwm1_auto_channels_temp, S_IWUSR | S_IRUGO,
+                          show_pwm_auto_temp, set_pwm_auto_temp, 0);
+static SENSOR_DEVICE_ATTR(pwm2_auto_channels_temp, S_IWUSR | S_IRUGO,
+                          show_pwm_auto_temp, set_pwm_auto_temp, 1);
+static SENSOR_DEVICE_ATTR(pwm3_auto_channels_temp, S_IWUSR | S_IRUGO,
+                          show_pwm_auto_temp, set_pwm_auto_temp, 2);
+
+static struct attribute *adt7473_attr[] =
+{
+        &sensor_dev_attr_in1_max.dev_attr.attr,
+        &sensor_dev_attr_in2_max.dev_attr.attr,
+        &sensor_dev_attr_in1_min.dev_attr.attr,
+        &sensor_dev_attr_in2_min.dev_attr.attr,
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        &sensor_dev_attr_in2_input.dev_attr.attr,
+        &sensor_dev_attr_in1_alarm.dev_attr.attr,
+        &sensor_dev_attr_in2_alarm.dev_attr.attr,
+
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp2_max.dev_attr.attr,
+        &sensor_dev_attr_temp3_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_min.dev_attr.attr,
+        &sensor_dev_attr_temp2_min.dev_attr.attr,
+        &sensor_dev_attr_temp3_min.dev_attr.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_temp3_input.dev_attr.attr,
+        &sensor_dev_attr_temp1_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp3_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp1_auto_point1_temp.dev_attr.attr,
+        &sensor_dev_attr_temp2_auto_point1_temp.dev_attr.attr,
+        &sensor_dev_attr_temp3_auto_point1_temp.dev_attr.attr,
+        &sensor_dev_attr_temp1_auto_point2_temp.dev_attr.attr,
+        &sensor_dev_attr_temp2_auto_point2_temp.dev_attr.attr,
+        &sensor_dev_attr_temp3_auto_point2_temp.dev_attr.attr,
+
+        &sensor_dev_attr_fan1_min.dev_attr.attr,
+        &sensor_dev_attr_fan2_min.dev_attr.attr,
+        &sensor_dev_attr_fan3_min.dev_attr.attr,
+        &sensor_dev_attr_fan4_min.dev_attr.attr,
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan3_input.dev_attr.attr,
+        &sensor_dev_attr_fan4_input.dev_attr.attr,
+        &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan4_alarm.dev_attr.attr,
+
+        &sensor_dev_attr_pwm_use_point2_pwm_at_crit.dev_attr.attr,
+
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm2.dev_attr.attr,
+        &sensor_dev_attr_pwm3.dev_attr.attr,
+        &sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr,
+        &sensor_dev_attr_pwm2_auto_point1_pwm.dev_attr.attr,
+        &sensor_dev_attr_pwm3_auto_point1_pwm.dev_attr.attr,
+        &sensor_dev_attr_pwm1_auto_point2_pwm.dev_attr.attr,
+        &sensor_dev_attr_pwm2_auto_point2_pwm.dev_attr.attr,
+        &sensor_dev_attr_pwm3_auto_point2_pwm.dev_attr.attr,
+
+        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm3_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm1_auto_channels_temp.dev_attr.attr,
+        &sensor_dev_attr_pwm2_auto_channels_temp.dev_attr.attr,
+        &sensor_dev_attr_pwm3_auto_channels_temp.dev_attr.attr,
+
+        NULL
+};
+
+static int adt7473_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, adt7473_detect);
+}
+
+static int adt7473_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        struct adt7473_data *data;
+        int err = 0;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        data = kzalloc(sizeof(struct adt7473_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        client = &data->client;
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &adt7473_driver;
+
+        i2c_set_clientdata(client, data);
+
+        mutex_init(&data->lock);
+
+        if (kind <= 0) {
+                int vendor, device, revision;
+
+                vendor = i2c_smbus_read_byte_data(client, ADT7473_REG_VENDOR);
+                if (vendor != ADT7473_VENDOR) {
+                        err = -ENODEV;
+                        goto exit_free;
+                }
+
+                device = i2c_smbus_read_byte_data(client, ADT7473_REG_DEVICE);
+                if (device != ADT7473_DEVICE) {
+                        err = -ENODEV;
+                        goto exit_free;
+                }
+
+                revision = i2c_smbus_read_byte_data(client,
+                                                    ADT7473_REG_REVISION);
+                if (revision != ADT7473_REV_68 && revision != ADT7473_REV_69) {
+                        err = -ENODEV;
+                        goto exit_free;
+                }
+        } else
+                dev_dbg(&adapter->dev, "detection forced\n");
+
+        strlcpy(client->name, "adt7473", I2C_NAME_SIZE);
+
+        err = i2c_attach_client(client);
+        if (err)
+                goto exit_free;
+
+        dev_info(&client->dev, "%s chip found\n", client->name);
+
+        /* Initialize the ADT7473 chip */
+        adt7473_init_client(client);
+
+        /* Register sysfs hooks */
+        data->attrs.attrs = adt7473_attr;
+        err = sysfs_create_group(&client->dev.kobj, &data->attrs);
+        if (err)
+                goto exit_detach;
+
+        data->hwmon_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
+                goto exit_remove;
+        }
+
+        return 0;
+
+exit_remove:
+        sysfs_remove_group(&client->dev.kobj, &data->attrs);
+exit_detach:
+        i2c_detach_client(client);
+exit_free:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int adt7473_detach_client(struct i2c_client *client)
+{
+        struct adt7473_data *data = i2c_get_clientdata(client);
+
+        hwmon_device_unregister(data->hwmon_dev);
+        sysfs_remove_group(&client->dev.kobj, &data->attrs);
+        i2c_detach_client(client);
+        kfree(data);
+        return 0;
+}
+
+static int __init adt7473_init(void)
+{
+        return i2c_add_driver(&adt7473_driver);
+}
+
+static void __exit adt7473_exit(void)
+{
+        i2c_del_driver(&adt7473_driver);
+}
+
+MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
+MODULE_DESCRIPTION("ADT7473 driver");
+MODULE_LICENSE("GPL");
+
+module_init(adt7473_init);
+module_exit(adt7473_exit);
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 0c94770b7f83..aacc0c4b809c 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -84,12 +84,15 @@ static const char* temperature_sensors_sets[][36] = {
 /* Set 0: Macbook Pro */
         { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
           "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
-/* Set 1: Macbook set */
+/* Set 1: Macbook2 set */
+        { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "TTF0", "Th0H",
+          "Th0S", "Th1H", NULL },
+/* Set 2: Macbook set */
         { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S",
           "Th1H", "Ts0P", NULL },
-/* Set 2: Macmini set */
+/* Set 3: Macmini set */
         { "TC0D", "TC0P", NULL },
-/* Set 3: Mac Pro (2 x Quad-Core) */
+/* Set 4: Mac Pro (2 x Quad-Core) */
         { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", "TC0C", "TC0D", "TC0P",
           "TC1C", "TC1D", "TC2C", "TC2D", "TC3C", "TC3D", "THTG", "TH0P",
           "TH1P", "TH2P", "TH3P", "TMAP", "TMAS", "TMBS", "TM0P", "TM0S",
@@ -1212,12 +1215,14 @@ static void applesmc_release_accelerometer(void)
 static __initdata struct dmi_match_data applesmc_dmi_data[] = {
 /* MacBook Pro: accelerometer, backlight and temperature set 0 */
         { .accelerometer = 1, .light = 1, .temperature_set = 0 },
-/* MacBook: accelerometer and temperature set 1 */
+/* MacBook2: accelerometer and temperature set 1 */
         { .accelerometer = 1, .light = 0, .temperature_set = 1 },
-/* MacMini: temperature set 2 */
-        { .accelerometer = 0, .light = 0, .temperature_set = 2 },
-/* MacPro: temperature set 3 */
+/* MacBook: accelerometer and temperature set 2 */
+        { .accelerometer = 1, .light = 0, .temperature_set = 2 },
+/* MacMini: temperature set 3 */
         { .accelerometer = 0, .light = 0, .temperature_set = 3 },
+/* MacPro: temperature set 4 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 4 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1229,16 +1234,20 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
                 (void*)&applesmc_dmi_data[0]},
         { applesmc_dmi_match, "Apple MacBook", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
-          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
+          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },
                 (void*)&applesmc_dmi_data[1]},
+        { applesmc_dmi_match, "Apple MacBook", {
+          DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
+                (void*)&applesmc_dmi_data[2]},
         { applesmc_dmi_match, "Apple Macmini", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
-                (void*)&applesmc_dmi_data[2]},
+                (void*)&applesmc_dmi_data[3]},
         { applesmc_dmi_match, "Apple MacPro2", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
-                (void*)&applesmc_dmi_data[3]},
+                (void*)&applesmc_dmi_data[4]},
         { .ident = NULL }
 };
 
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 950cea8d1d65..84712a22acea 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -49,7 +49,7 @@
 #include "lm75.h"
 
 /* I2C addresses to scan */
-static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(asb100);
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index cce3350e539e..01c17e387f03 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -42,7 +42,7 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
 #define ATXP1_VIDMASK   0x1f
 #define ATXP1_GPIO1MASK 0x0f
 
-static unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD_1(atxp1);
 
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 3ee60d26e3a2..70239acecc8e 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -38,7 +38,8 @@
 
 #define DRVNAME "coretemp"
 
-typedef enum { SHOW_TEMP, SHOW_TJMAX, SHOW_LABEL, SHOW_NAME } SHOW;
+typedef enum { SHOW_TEMP, SHOW_TJMAX, SHOW_TTARGET, SHOW_LABEL,
+                SHOW_NAME } SHOW;
 
 /*
  * Functions declaration
@@ -55,6 +56,7 @@ struct coretemp_data {
         unsigned long last_updated;     /* in jiffies */
         int temp;
         int tjmax;
+        int ttarget;
         u8 alarm;
 };
 
@@ -93,9 +95,10 @@ static ssize_t show_temp(struct device *dev,
 
         if (attr->index == SHOW_TEMP)
                 err = data->valid ? sprintf(buf, "%d\n", data->temp) : -EAGAIN;
-        else
+        else if (attr->index == SHOW_TJMAX)
                 err = sprintf(buf, "%d\n", data->tjmax);
-
+        else
+                err = sprintf(buf, "%d\n", data->ttarget);
         return err;
 }
 
@@ -103,6 +106,8 @@ static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL,
                           SHOW_TEMP);
 static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp, NULL,
                           SHOW_TJMAX);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO, show_temp, NULL,
+                          SHOW_TTARGET);
 static DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL);
 static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_name, NULL, SHOW_LABEL);
 static SENSOR_DEVICE_ATTR(name, S_IRUGO, show_name, NULL, SHOW_NAME);
@@ -147,6 +152,56 @@ static struct coretemp_data *coretemp_update_device(struct device *dev)
         return data;
 }
 
+static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
+{
+        /* The 100C is default for both mobile and non mobile CPUs */
+
+        int tjmax = 100000;
+        int ismobile = 1;
+        int err;
+        u32 eax, edx;
+
+        /* Early chips have no MSR for TjMax */
+
+        if ((c->x86_model == 0xf) && (c->x86_mask < 4)) {
+                ismobile = 0;
+        }
+
+        if ((c->x86_model > 0xe) && (ismobile)) {
+
+                /* Now we can detect the mobile CPU using Intel provided table
+                   http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
+                   For Core2 cores, check MSR 0x17, bit 28 1 = Mobile CPU
+                */
+
+                err = rdmsr_safe_on_cpu(id, 0x17, &eax, &edx);
+                if (err) {
+                        dev_warn(dev,
+                                 "Unable to access MSR 0x17, assuming desktop"
+                                 " CPU\n");
+                        ismobile = 0;
+                } else if (!(eax & 0x10000000)) {
+                        ismobile = 0;
+                }
+        }
+
+        if (ismobile) {
+
+                err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx);
+                if (err) {
+                        dev_warn(dev,
+                                 "Unable to access MSR 0xEE, for Tjmax, left"
+                                 " at default");
+                } else if (eax & 0x40000000) {
+                        tjmax = 85000;
+                }
+        } else {
+                dev_warn(dev, "Using relative temperature scale!\n");
+        }
+
+        return tjmax;
+}
+
 static int __devinit coretemp_probe(struct platform_device *pdev)
 {
         struct coretemp_data *data;
@@ -163,8 +218,6 @@ static int __devinit coretemp_probe(struct platform_device *pdev)
         data->id = pdev->id;
         data->name = "coretemp";
         mutex_init(&data->update_lock);
-        /* Tjmax default is 100 degrees C */
-        data->tjmax = 100000;
 
         /* test if we can access the THERM_STATUS MSR */
         err = rdmsr_safe_on_cpu(data->id, MSR_IA32_THERM_STATUS, &eax, &edx);
@@ -191,40 +244,29 @@ static int __devinit coretemp_probe(struct platform_device *pdev)
                 }
         }
 
-        /* Some processors have Tjmax 85 following magic should detect it
-           Intel won't disclose the information without signed NDA, but
-           individuals cannot sign it. Catch(ed) 22.
-        */
+        data->tjmax = adjust_tjmax(c, data->id, &pdev->dev);
+        platform_set_drvdata(pdev, data);
 
-        if (((c->x86_model == 0xf) && (c->x86_mask > 3)) ||
-                (c->x86_model == 0xe))  {
-                err = rdmsr_safe_on_cpu(data->id, 0xee, &eax, &edx);
+        /* read the still undocumented IA32_TEMPERATURE_TARGET it exists
+           on older CPUs but not in this register */
+
+        if (c->x86_model > 0xe) {
+                err = rdmsr_safe_on_cpu(data->id, 0x1a2, &eax, &edx);
                 if (err) {
-                        dev_warn(&pdev->dev,
-                                 "Unable to access MSR 0xEE, Tjmax left at %d "
-                                 "degrees C\n", data->tjmax/1000);
-                } else if (eax & 0x40000000) {
-                        data->tjmax = 85000;
+                        dev_warn(&pdev->dev, "Unable to read"
+                                        " IA32_TEMPERATURE_TARGET MSR\n");
+                } else {
+                        data->ttarget = data->tjmax -
+                                        (((eax >> 8) & 0xff) * 1000);
+                        err = device_create_file(&pdev->dev,
+                                        &sensor_dev_attr_temp1_max.dev_attr);
+                        if (err)
+                                goto exit_free;
                 }
         }
 
-        /* Intel says that above should not work for desktop Core2 processors,
-           but it seems to work. There is no other way how get the absolute
-           readings. Warn the user about this. First check if are desktop,
-           bit 50 of MSR_IA32_PLATFORM_ID should be 0.
-        */
-
-        rdmsr_safe_on_cpu(data->id, MSR_IA32_PLATFORM_ID, &eax, &edx);
-
-        if ((c->x86_model == 0xf) && (!(edx & 0x00040000))) {
-                dev_warn(&pdev->dev, "Using undocumented features, absolute "
-                         "temperature might be wrong!\n");
-        }
-
-        platform_set_drvdata(pdev, data);
-
         if ((err = sysfs_create_group(&pdev->dev.kobj, &coretemp_group)))
-                goto exit_free;
+                goto exit_dev;
 
         data->hwmon_dev = hwmon_device_register(&pdev->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -238,6 +280,8 @@ static int __devinit coretemp_probe(struct platform_device *pdev)
 
 exit_class:
         sysfs_remove_group(&pdev->dev.kobj, &coretemp_group);
+exit_dev:
+        device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
 exit_free:
         kfree(data);
 exit:
@@ -250,6 +294,7 @@ static int __devexit coretemp_remove(struct platform_device *pdev)
 
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&pdev->dev.kobj, &coretemp_group);
+        device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
         platform_set_drvdata(pdev, NULL);
         kfree(data);
         return 0;
@@ -330,7 +375,7 @@ static void coretemp_device_remove(unsigned int cpu)
         mutex_unlock(&pdev_list_mutex);
 }
 
-static int coretemp_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
                                  unsigned long action, void *hcpu)
 {
         unsigned int cpu = (unsigned long) hcpu;
@@ -347,7 +392,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
         return NOTIFY_OK;
 }
 
-static struct notifier_block coretemp_cpu_notifier = {
+static struct notifier_block coretemp_cpu_notifier __refdata = {
         .notifier_call = coretemp_cpu_callback,
 };
 #endif                          /* !CONFIG_HOTPLUG_CPU */
@@ -368,10 +413,10 @@ static int __init coretemp_init(void)
         for_each_online_cpu(i) {
                 struct cpuinfo_x86 *c = &cpu_data(i);
 
-                /* check if family 6, models e, f, 16 */
+                /* check if family 6, models 0xe, 0xf, 0x16, 0x17 */
                 if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
                     !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
-                        (c->x86_model == 0x16))) {
+                        (c->x86_model == 0x16) || (c->x86_model == 0x17))) {
 
                         /* supported CPU not found, but report the unknown
                            family 6 CPU */
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index ddddd9f34c19..7673f65877e1 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -49,7 +49,7 @@ module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
+static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(dme1737);
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 3f5163de13c1..5f300ffed657 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -34,7 +34,7 @@
 #include "lm75.h"
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
 /* Insmod parameters */
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index 6892f76fc18a..1464338e4e11 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -37,7 +37,7 @@
 #include <linux/f75375s.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_2(f75373, f75375);
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index 721c70177b17..ed26b66e0831 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -40,7 +40,7 @@
  * Addresses to scan
  */
 
-static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index b7c9eef0f928..bd89d270a5ed 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -44,7 +44,7 @@
 #include <linux/dmi.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd);
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 2f1075323a1e..00f48484e54b 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -43,7 +43,7 @@
 /*
  * Addresses to scan
  */
-static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 3b1ac48fce23..33e9e8a8d1ce 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -44,7 +44,7 @@
 #include <linux/sysfs.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80);
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 03ecdc334764..8984ef141627 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -39,7 +39,7 @@ module_param(extra_sensor_type, ushort, 0);
 MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=temperature, 2=voltage)");
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(gl520sm);
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 650b07d5b902..116287008083 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -53,7 +53,7 @@
  * Address is fully defined internally and cannot be changed.
  */
 
-static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index e5c35a355a57..115f4090b98e 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -31,7 +31,7 @@
 
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
 /* Insmod parameters */
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index 459b70ad6bee..36d5a8c3ad8c 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -36,7 +36,8 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
+                                                I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(lm77);
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 0a9eb1f6f4e4..ed7859f0e16a 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -37,8 +37,8 @@
 static struct platform_device *pdev;
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
-                                       0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
+                                                0x2e, 0x2f, I2C_CLIENT_END };
 static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index a2ca055f3922..26c91c9d4769 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -32,8 +32,8 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c,
-                                        0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
+                                                0x2e, 0x2f, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(lm80);
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 6e8903a6e902..6a8642fa25fb 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -48,10 +48,8 @@
  * addresses.
  */
 
-static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
-                                        0x29, 0x2a, 0x2b,
-                                        0x4c, 0x4d, 0x4e,
-                                        I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = {
+        0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 4bb0f291a6b8..182fe6a5605f 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -35,7 +35,7 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 8ee07c5c97a1..e1c183f0aae0 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -73,7 +73,7 @@
  * LM87 has three possible addresses: 0x2c, 0x2d and 0x2e.
  */
 
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index f7ec95bedbf6..d1a3da3dd8e0 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -101,10 +101,8 @@
  * 0x4c, 0x4d or 0x4e.
  */
 
-static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
-                                       0x29, 0x2a, 0x2b,
-                                       0x4c, 0x4d, 0x4e,
-                                       I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = {
+        0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index af5c77d568fe..c31942e08246 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -45,13 +45,14 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
 
 /* The LM92 and MAX6635 have 2 two-state pins for address selection,
    resulting in 4 possible addresses. */
-static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
-                                       I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
+                                                I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(lm92);
@@ -209,6 +210,14 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
         return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->temp1_input));
 }
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        int bitnr = to_sensor_dev_attr(attr)->index;
+        struct lm92_data *data = lm92_update_device(dev);
+        return sprintf(buf, "%d\n", (data->temp1_input >> bitnr) & 1);
+}
+
 static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1_input, NULL);
 static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp1_crit,
         set_temp1_crit);
@@ -221,6 +230,9 @@ static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp1_max,
         set_temp1_max);
 static DEVICE_ATTR(temp1_max_hyst, S_IRUGO, show_temp1_max_hyst, NULL);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 1);
 
 
 /*
@@ -297,7 +309,9 @@ static struct attribute *lm92_attributes[] = {
         &dev_attr_temp1_max.attr,
         &dev_attr_temp1_max_hyst.attr,
         &dev_attr_alarms.attr,
-
+        &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
         NULL
 };
 
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index ea61946a4bf7..5e678f5c883d 100644
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -142,7 +142,7 @@
                 I2C_FUNC_SMBUS_WORD_DATA)
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(lm93);
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 38a44c3d6cee..7e7267a04544 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -32,14 +32,13 @@
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
 
-static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
-                                        0x29, 0x2a, 0x2b,
-                                        0x4c, 0x4d, 0x4e,
-                                        I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = {
+        0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
@@ -161,6 +160,14 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
         return sprintf(buf, "%d\n", data->alarms);
 }
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        int bitnr = to_sensor_dev_attr(attr)->index;
+        struct max1619_data *data = max1619_update_device(dev);
+        return sprintf(buf, "%d\n", (data->alarms >> bitnr) & 1);
+}
+
 static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);
 static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input2, NULL);
 static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp_low2,
@@ -172,6 +179,10 @@ static DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp_crit2,
 static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_temp_hyst2,
         set_temp_hyst2);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 4);
 
 static struct attribute *max1619_attributes[] = {
         &dev_attr_temp1_input.attr,
@@ -182,6 +193,10 @@ static struct attribute *max1619_attributes[] = {
         &dev_attr_temp2_crit_hyst.attr,
 
         &dev_attr_alarms.attr,
+        &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_fault.dev_attr.attr,
+        &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
         NULL
 };
 
diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c
index 755570c1f4eb..52d528b76cc3 100644
--- a/drivers/hwmon/max6650.c
+++ b/drivers/hwmon/max6650.c
@@ -44,7 +44,8 @@
  * Addresses to scan. There are four disjoint possibilities, by pin config.
  */
 
-static unsigned short normal_i2c[] = {0x1b, 0x1f, 0x48, 0x4b, I2C_CLIENT_END};
+static const unsigned short normal_i2c[] = {0x1b, 0x1f, 0x48, 0x4b,
+                                                I2C_CLIENT_END};
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 0d7f0c4d06bb..d1b498548736 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -198,6 +198,14 @@ static ssize_t get_fan_div(struct device *dev, struct device_attribute
         return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[attr->index]));
 }
 
+static ssize_t get_fan_alarm(struct device *dev, struct device_attribute
+                             *devattr, char *buf)
+{
+        int bitnr = to_sensor_dev_attr(devattr)->index;
+        struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
+        return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
+}
+
 static ssize_t get_pwm(struct device *dev, struct device_attribute
                        *devattr, char *buf)
 {
@@ -347,6 +355,8 @@ static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\
                 get_fan_min, set_fan_min, offset - 1);                  \
 static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,         \
                 get_fan_div, set_fan_div, offset - 1);                  \
+static SENSOR_DEVICE_ATTR(fan##offset##_alarm, S_IRUGO, get_fan_alarm,  \
+                NULL, offset - 1);                                      \
 static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,               \
                 get_pwm, set_pwm, offset - 1);                          \
 static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,      \
@@ -374,12 +384,15 @@ static struct attribute *smsc47m1_attributes[] = {
         &sensor_dev_attr_fan1_input.dev_attr.attr,
         &sensor_dev_attr_fan1_min.dev_attr.attr,
         &sensor_dev_attr_fan1_div.dev_attr.attr,
+        &sensor_dev_attr_fan1_alarm.dev_attr.attr,
         &sensor_dev_attr_fan2_input.dev_attr.attr,
         &sensor_dev_attr_fan2_min.dev_attr.attr,
         &sensor_dev_attr_fan2_div.dev_attr.attr,
+        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
         &sensor_dev_attr_fan3_input.dev_attr.attr,
         &sensor_dev_attr_fan3_min.dev_attr.attr,
         &sensor_dev_attr_fan3_div.dev_attr.attr,
+        &sensor_dev_attr_fan3_alarm.dev_attr.attr,
 
         &sensor_dev_attr_pwm1.dev_attr.attr,
         &sensor_dev_attr_pwm1_enable.dev_attr.attr,
@@ -533,7 +546,9 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
                  || (err = device_create_file(dev,
                                 &sensor_dev_attr_fan1_min.dev_attr))
                  || (err = device_create_file(dev,
-                                &sensor_dev_attr_fan1_div.dev_attr)))
+                                &sensor_dev_attr_fan1_div.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan1_alarm.dev_attr)))
                         goto error_remove_files;
         } else
                 dev_dbg(dev, "Fan 1 not enabled by hardware, skipping\n");
@@ -544,7 +559,9 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
                  || (err = device_create_file(dev,
                                 &sensor_dev_attr_fan2_min.dev_attr))
                  || (err = device_create_file(dev,
-                                &sensor_dev_attr_fan2_div.dev_attr)))
+                                &sensor_dev_attr_fan2_div.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan2_alarm.dev_attr)))
                         goto error_remove_files;
         } else
                 dev_dbg(dev, "Fan 2 not enabled by hardware, skipping\n");
@@ -555,7 +572,9 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
                  || (err = device_create_file(dev,
                                 &sensor_dev_attr_fan3_min.dev_attr))
                  || (err = device_create_file(dev,
-                                &sensor_dev_attr_fan3_div.dev_attr)))
+                                &sensor_dev_attr_fan3_div.dev_attr))
+                 || (err = device_create_file(dev,
+                                &sensor_dev_attr_fan3_alarm.dev_attr)))
                         goto error_remove_files;
         } else if (data->type == smsc47m2)
                 dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n");
diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c
index 8b0c188e60f6..3c9db6598ba7 100644
--- a/drivers/hwmon/smsc47m192.c
+++ b/drivers/hwmon/smsc47m192.c
@@ -34,7 +34,7 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(smsc47m192);
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c
index 04dd7699b3ac..76a3859c3fbe 100644
--- a/drivers/hwmon/thmc50.c
+++ b/drivers/hwmon/thmc50.c
@@ -32,7 +32,7 @@
 MODULE_LICENSE("GPL");
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_2(thmc50, adm1022);
@@ -52,9 +52,9 @@ I2C_CLIENT_MODULE_PARM(adm1022_temp3, "List of adapter,address pairs "
  */
 #define THMC50_REG_INTR                         0x41
 
-const static u8 THMC50_REG_TEMP[] = { 0x27, 0x26, 0x20 };
-const static u8 THMC50_REG_TEMP_MIN[] = { 0x3A, 0x38, 0x2C };
-const static u8 THMC50_REG_TEMP_MAX[] = { 0x39, 0x37, 0x2B };
+static const u8 THMC50_REG_TEMP[] = { 0x27, 0x26, 0x20 };
+static const u8 THMC50_REG_TEMP_MIN[] = { 0x3A, 0x38, 0x2C };
+static const u8 THMC50_REG_TEMP_MAX[] = { 0x39, 0x37, 0x2B };
 
 #define THMC50_REG_CONF_nFANOFF                 0x20
 
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 2635bba1e3fc..f1ee5e731968 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -533,6 +533,24 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        int bitnr = to_sensor_dev_attr(attr)->index;
+        struct via686a_data *data = via686a_update_device(dev);
+        return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
+}
+static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 15);
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);
+
 static ssize_t show_name(struct device *dev, struct device_attribute
                          *devattr, char *buf)
 {
@@ -557,6 +575,11 @@ static struct attribute *via686a_attributes[] = {
         &sensor_dev_attr_in2_max.dev_attr.attr,
         &sensor_dev_attr_in3_max.dev_attr.attr,
         &sensor_dev_attr_in4_max.dev_attr.attr,
+        &sensor_dev_attr_in0_alarm.dev_attr.attr,
+        &sensor_dev_attr_in1_alarm.dev_attr.attr,
+        &sensor_dev_attr_in2_alarm.dev_attr.attr,
+        &sensor_dev_attr_in3_alarm.dev_attr.attr,
+        &sensor_dev_attr_in4_alarm.dev_attr.attr,
 
         &sensor_dev_attr_temp1_input.dev_attr.attr,
         &sensor_dev_attr_temp2_input.dev_attr.attr,
@@ -567,6 +590,9 @@ static struct attribute *via686a_attributes[] = {
         &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
         &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
         &sensor_dev_attr_temp3_max_hyst.dev_attr.attr,
+        &sensor_dev_attr_temp1_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp2_alarm.dev_attr.attr,
+        &sensor_dev_attr_temp3_alarm.dev_attr.attr,
 
         &sensor_dev_attr_fan1_input.dev_attr.attr,
         &sensor_dev_attr_fan2_input.dev_attr.attr,
@@ -574,6 +600,8 @@ static struct attribute *via686a_attributes[] = {
         &sensor_dev_attr_fan2_min.dev_attr.attr,
         &sensor_dev_attr_fan1_div.dev_attr.attr,
         &sensor_dev_attr_fan2_div.dev_attr.attr,
+        &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
 
         &dev_attr_alarms.attr,
         &dev_attr_name.attr,
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index f87661775fe0..5bc57275cae8 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -2,7 +2,7 @@
         vt8231.c - Part of lm_sensors, Linux kernel modules
                                 for hardware monitoring
 
-        Copyright (c) 2005 Roger Lucas <roger@planbit.co.uk>
+        Copyright (c) 2005 Roger Lucas <vt8231@hiddenengine.co.uk>
         Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
                            Aaron M. Marsh <amarsh@sdf.lonestar.org>
 
@@ -541,6 +541,28 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        int bitnr = to_sensor_dev_attr(attr)->index;
+        struct vt8231_data *data = vt8231_update_device(dev);
+        return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
+}
+static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp4_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp5_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp6_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);
+
 static ssize_t show_name(struct device *dev, struct device_attribute
                          *devattr, char *buf)
 {
@@ -549,36 +571,42 @@ static ssize_t show_name(struct device *dev, struct device_attribute
 }
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-static struct attribute *vt8231_attributes_temps[6][4] = {
+static struct attribute *vt8231_attributes_temps[6][5] = {
         {
                 &dev_attr_temp1_input.attr,
                 &dev_attr_temp1_max_hyst.attr,
                 &dev_attr_temp1_max.attr,
+                &sensor_dev_attr_temp1_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_temp2_input.dev_attr.attr,
                 &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
                 &sensor_dev_attr_temp2_max.dev_attr.attr,
+                &sensor_dev_attr_temp2_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_temp3_input.dev_attr.attr,
                 &sensor_dev_attr_temp3_max_hyst.dev_attr.attr,
                 &sensor_dev_attr_temp3_max.dev_attr.attr,
+                &sensor_dev_attr_temp3_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_temp4_input.dev_attr.attr,
                 &sensor_dev_attr_temp4_max_hyst.dev_attr.attr,
                 &sensor_dev_attr_temp4_max.dev_attr.attr,
+                &sensor_dev_attr_temp4_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_temp5_input.dev_attr.attr,
                 &sensor_dev_attr_temp5_max_hyst.dev_attr.attr,
                 &sensor_dev_attr_temp5_max.dev_attr.attr,
+                &sensor_dev_attr_temp5_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_temp6_input.dev_attr.attr,
                 &sensor_dev_attr_temp6_max_hyst.dev_attr.attr,
                 &sensor_dev_attr_temp6_max.dev_attr.attr,
+                &sensor_dev_attr_temp6_alarm.dev_attr.attr,
                 NULL
         }
 };
@@ -592,36 +620,42 @@ static const struct attribute_group vt8231_group_temps[6] = {
         { .attrs = vt8231_attributes_temps[5] },
 };
 
-static struct attribute *vt8231_attributes_volts[6][4] = {
+static struct attribute *vt8231_attributes_volts[6][5] = {
         {
                 &sensor_dev_attr_in0_input.dev_attr.attr,
                 &sensor_dev_attr_in0_min.dev_attr.attr,
                 &sensor_dev_attr_in0_max.dev_attr.attr,
+                &sensor_dev_attr_in0_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_in1_input.dev_attr.attr,
                 &sensor_dev_attr_in1_min.dev_attr.attr,
                 &sensor_dev_attr_in1_max.dev_attr.attr,
+                &sensor_dev_attr_in1_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_in2_input.dev_attr.attr,
                 &sensor_dev_attr_in2_min.dev_attr.attr,
                 &sensor_dev_attr_in2_max.dev_attr.attr,
+                &sensor_dev_attr_in2_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_in3_input.dev_attr.attr,
                 &sensor_dev_attr_in3_min.dev_attr.attr,
                 &sensor_dev_attr_in3_max.dev_attr.attr,
+                &sensor_dev_attr_in3_alarm.dev_attr.attr,
                 NULL
         }, {
                 &sensor_dev_attr_in4_input.dev_attr.attr,
                 &sensor_dev_attr_in4_min.dev_attr.attr,
                 &sensor_dev_attr_in4_max.dev_attr.attr,
+                &sensor_dev_attr_in4_alarm.dev_attr.attr,
                 NULL
         }, {
                 &dev_attr_in5_input.attr,
                 &dev_attr_in5_min.attr,
                 &dev_attr_in5_max.attr,
+                &sensor_dev_attr_in5_alarm.dev_attr.attr,
                 NULL
         }
 };
@@ -642,6 +676,8 @@ static struct attribute *vt8231_attributes[] = {
         &sensor_dev_attr_fan2_min.dev_attr.attr,
         &sensor_dev_attr_fan1_div.dev_attr.attr,
         &sensor_dev_attr_fan2_div.dev_attr.attr,
+        &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
         &dev_attr_alarms.attr,
         &dev_attr_name.attr,
         NULL
@@ -963,7 +999,7 @@ static void __exit sm_vt8231_exit(void)
         }
 }
 
-MODULE_AUTHOR("Roger Lucas <roger@planbit.co.uk>");
+MODULE_AUTHOR("Roger Lucas <vt8231@hiddenengine.co.uk>");
 MODULE_DESCRIPTION("VT8231 sensors");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 7421f6ea53e1..5c85670e2d16 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -53,8 +53,8 @@
 static struct platform_device *pdev;
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
-                                       0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
+                                                0x2e, 0x2f, I2C_CLIENT_END };
 static unsigned short isa_address = 0x290;
 
 /* Insmod parameters */
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index 85bd21ee3298..85077c4c8039 100644
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -47,7 +47,8 @@
 #define NUMBER_OF_TEMPIN        3
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
+                                                I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83791d);
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
index 007449d3e16e..299629d47ed6 100644
--- a/drivers/hwmon/w83792d.c
+++ b/drivers/hwmon/w83792d.c
@@ -46,7 +46,8 @@
 #include <linux/sysfs.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
+                                                I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83792d);
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 3ba1d6b33473..ee35af93b574 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -37,7 +37,8 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
+                                                I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83793);
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 1d6259d29e74..77f2d482888b 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -49,7 +49,7 @@
  * Address is fully defined internally and cannot be changed.
  */
 
-static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c
index 1dbee4fa23ad..41e22ddb568a 100644
--- a/drivers/hwmon/w83l786ng.c
+++ b/drivers/hwmon/w83l786ng.c
@@ -35,7 +35,7 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(w83l786ng);
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 2598d29fd7a4..2b557bfd7f70 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -138,11 +138,13 @@ static const struct bits icr_bits[] = {
         PXA_BIT(ICR_UR,     "UR",               "ur"),
 };
 
+#ifdef CONFIG_I2C_PXA_SLAVE
 static void decode_ICR(unsigned int val)
 {
         decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val);
         printk("\n");
 }
+#endif
 
 static unsigned int i2c_debug = DEBUG;
 
@@ -1122,7 +1124,7 @@ static int __init i2c_adap_pxa_init(void)
 
 static void i2c_adap_pxa_exit(void)
 {
-        return platform_driver_unregister(&i2c_pxa_driver);
+        platform_driver_unregister(&i2c_pxa_driver);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 354c91d06a6d..310e497b5838 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1207,9 +1207,13 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 end_request:
         if (blk_pc_request(rq)) {
                 unsigned long flags;
+                unsigned int dlen = rq->data_len;
+
+                if (dma)
+                        rq->data_len = 0;
 
                 spin_lock_irqsave(&ide_lock, flags);
-                if (__blk_end_request(rq, 0, rq->data_len))
+                if (__blk_end_request(rq, 0, dlen))
                         BUG();
                 HWGROUP(drive)->rq = NULL;
                 spin_unlock_irqrestore(&ide_lock, flags);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index aed8b31ca561..8f5bed471050 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -397,6 +397,7 @@ static inline int idedisk_supports_lba48(const struct hd_driveid *id)
 static const struct drive_list_entry hpa_list[] = {
         { "ST340823A",  NULL },
         { "ST320413A",  NULL },
+        { "ST310211A",  NULL },
         { NULL,         NULL }
 };
 
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 709b9e4d2871..9ebec08eefd9 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -17,9 +17,6 @@ static int __init ide_generic_init(void)
         u8 idx[MAX_HWIFS];
         int i;
 
-        if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-                ide_get_lock(NULL, NULL); /* for atari only */
-
         for (i = 0; i < MAX_HWIFS; i++) {
                 ide_hwif_t *hwif = &ide_hwifs[i];
 
@@ -31,9 +28,6 @@ static int __init ide_generic_init(void)
 
         ide_device_add_all(idx, NULL);
 
-        if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
-                ide_release_lock();     /* for atari only */
-
         return 0;
 }
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 4a8952a6c3da..477833f0daf5 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1229,7 +1229,7 @@ static int __init ide_setup(char *s)
         if (!strcmp(s, "ide=reverse")) {
                 ide_scan_direction = 1;
                 printk(" : Enabled support for IDE inverse scan order.\n");
-                return 1;
+                goto obsolete_option;
         }
 #endif
 
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index f044048903b3..8949ce71bddc 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -54,7 +54,7 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
         for (i = 1; i < 8; i++)
                 hw->io_ports[i] = ATA_HD_BASE + 1 + i * 4;
 
-        hw->io_ports[IDE_CONTROL_OFFSET] = ATA_HD_CONTROL;
+        hw->io_ports[IDE_CONTROL_OFFSET] = ATA_HD_BASE + ATA_HD_CONTROL;
 
         hw->irq = IRQ_MFP_IDE;
         hw->ack_intr = NULL;
@@ -84,7 +84,9 @@ static int __init falconide_init(void)
                 ide_init_port_data(hwif, index);
                 ide_init_port_hw(hwif, &hw);
 
+                ide_get_lock(NULL, NULL);
                 ide_device_add(idx, NULL);
+                ide_release_lock();
         }
 
         return 0;
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 02d12c74764a..78ca68e60f97 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -21,18 +21,21 @@
  *                      "Prefetch" mode bit OFF for ide disks and
  *                      ON for anything else.
  *
+ *  Version 0.08        Need to force prefetch for CDs and other non-disk
+ *                      devices. (not sure which devices exactly need
+ *                      prefetch)
  *
  *  HT-6560B EIDE-controller support
  *  To activate controller support use kernel parameter "ide0=ht6560b".
  *  Use hdparm utility to enable PIO mode support.
  *
  *  Author:    Mikko Ala-Fossi            <maf@iki.fi>
- *             Jan Evert van Grootheest   <janevert@iae.nl>
+ *             Jan Evert van Grootheest   <janevert@caiway.nl>
  *
  *  Try:  http://www.maf.iki.fi/~maf/ht6560b/
  */
 
-#define HT6560B_VERSION "v0.07"
+#define HT6560B_VERSION "v0.08"
 
 #include <linux/module.h>
 #include <linux/types.h>
@@ -130,15 +133,20 @@ static void ht6560b_selectproc (ide_drive_t *drive)
         u8 select, timing;
         
         local_irq_save(flags);
-        
+
         select = HT_CONFIG(drive);
         timing = HT_TIMING(drive);
-        
+
+        /*
+         * Need to enforce prefetch sometimes because otherwise
+         * it'll hang (hard).
+         */
+        if (drive->media != ide_disk || !drive->present)
+                select |= HT_PREFETCH_MODE;
+
         if (select != current_select || timing != current_timing) {
                 current_select = select;
                 current_timing = timing;
-                if (drive->media != ide_disk || !drive->present)
-                        select |= HT_PREFETCH_MODE;
                 (void)inb(HT_CONFIG_PORT);
                 (void)inb(HT_CONFIG_PORT);
                 (void)inb(HT_CONFIG_PORT);
@@ -188,11 +196,12 @@ static int __init try_to_init_ht6560b(void)
         outb(HT_TIMING_DEFAULT, 0x1f6);  /* IDE_SELECT_REG */
         (void) inb(0x1f7);               /* IDE_STATUS_REG */
         
-        printk("\nht6560b " HT6560B_VERSION
+        printk("ht6560b " HT6560B_VERSION
                ": chipset detected and initialized"
 #ifdef DEBUG
                " with debug enabled"
 #endif
+               "\n"
                 );
         return 1;
 }
@@ -323,7 +332,7 @@ static const struct ide_port_info ht6560b_port_info __initdata = {
                                   IDE_HFLAG_NO_DMA |
                                   IDE_HFLAG_NO_AUTOTUNE |
                                   IDE_HFLAG_ABUSE_PREFETCH,
-        .pio_mask               = ATA_PIO5,
+        .pio_mask               = ATA_PIO4,
 };
 
 static int __init ht6560b_init(void)
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index a61e60737dc7..9a79098d9eb4 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -74,7 +74,7 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base,
         for (i = 0; i < 8; i++)
                 hw->io_ports[i] = base + i * 4;
 
-        hw->io_ports[IDE_CONTROL_OFFSET] = IDE_CONTROL;
+        hw->io_ports[IDE_CONTROL_OFFSET] = base + IDE_CONTROL;
 
         hw->irq = irq;
         hw->ack_intr = ack_intr;
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index f3f79f805813..9004e7521889 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -479,6 +479,7 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
 static const struct pci_device_id via_pci_tbl[] = {
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C576_1),  0 },
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C586_1),  0 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_CX700_IDE), 0 },
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_6410),      1 },
         { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_SATA_EIDE), 1 },
         { 0, },
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 12ac3bfb4f9a..78c9eeb85634 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1254,7 +1254,7 @@ pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t mesg)
         int             rc = 0;
 
         if (mesg.event != mdev->ofdev.dev.power.power_state.event
-                        && mesg.event == PM_EVENT_SUSPEND) {
+                        && (mesg.event & PM_EVENT_SLEEP)) {
                 rc = pmac_ide_do_suspend(hwif);
                 if (rc == 0)
                         mdev->ofdev.dev.power.power_state = mesg;
@@ -1364,7 +1364,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
         int             rc = 0;
         
         if (mesg.event != pdev->dev.power.power_state.event
-                        && mesg.event == PM_EVENT_SUSPEND) {
+                        && (mesg.event & PM_EVENT_SLEEP)) {
                 rc = pmac_ide_do_suspend(hwif);
                 if (rc == 0)
                         pdev->dev.power.power_state = mesg;
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 638b727d42e0..b10ade92efed 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3587,8 +3587,6 @@ static void cm_release_port_obj(struct kobject *obj)
 {
         struct cm_port *cm_port;
 
-        printk(KERN_ERR "free cm port\n");
-
         cm_port = container_of(obj, struct cm_port, port_obj);
         kfree(cm_port);
 }
@@ -3601,8 +3599,6 @@ static void cm_release_dev_obj(struct kobject *obj)
 {
         struct cm_device *cm_dev;
 
-        printk(KERN_ERR "free cm dev\n");
-
         cm_dev = container_of(obj, struct cm_device, dev_obj);
         kfree(cm_dev);
 }
@@ -3616,18 +3612,12 @@ struct class cm_class = {
 };
 EXPORT_SYMBOL(cm_class);
 
-static void cm_remove_fs_obj(struct kobject *obj)
-{
-        kobject_put(obj->parent);
-        kobject_put(obj);
-}
-
 static int cm_create_port_fs(struct cm_port *port)
 {
         int i, ret;
 
         ret = kobject_init_and_add(&port->port_obj, &cm_port_obj_type,
-                                   kobject_get(&port->cm_dev->dev_obj),
+                                   &port->cm_dev->dev_obj,
                                    "%d", port->port_num);
         if (ret) {
                 kfree(port);
@@ -3637,7 +3627,7 @@ static int cm_create_port_fs(struct cm_port *port)
         for (i = 0; i < CM_COUNTER_GROUPS; i++) {
                 ret = kobject_init_and_add(&port->counter_group[i].obj,
                                            &cm_counter_obj_type,
-                                           kobject_get(&port->port_obj),
+                                           &port->port_obj,
                                            "%s", counter_group_names[i]);
                 if (ret)
                         goto error;
@@ -3647,8 +3637,8 @@ static int cm_create_port_fs(struct cm_port *port)
 
 error:
         while (i--)
-                cm_remove_fs_obj(&port->counter_group[i].obj);
-        cm_remove_fs_obj(&port->port_obj);
+                kobject_put(&port->counter_group[i].obj);
+        kobject_put(&port->port_obj);
         return ret;
 
 }
@@ -3658,9 +3648,9 @@ static void cm_remove_port_fs(struct cm_port *port)
         int i;
 
         for (i = 0; i < CM_COUNTER_GROUPS; i++)
-                cm_remove_fs_obj(&port->counter_group[i].obj);
+                kobject_put(&port->counter_group[i].obj);
 
-        cm_remove_fs_obj(&port->port_obj);
+        kobject_put(&port->port_obj);
 }
 
 static void cm_add_one(struct ib_device *device)
@@ -3744,7 +3734,7 @@ error1:
                 ib_unregister_mad_agent(port->mad_agent);
                 cm_remove_port_fs(port);
         }
-        cm_remove_fs_obj(&cm_dev->dev_obj);
+        kobject_put(&cm_dev->dev_obj);
 }
 
 static void cm_remove_one(struct ib_device *device)
@@ -3771,7 +3761,7 @@ static void cm_remove_one(struct ib_device *device)
                 ib_unregister_mad_agent(port->mad_agent);
                 cm_remove_port_fs(port);
         }
-        cm_remove_fs_obj(&cm_dev->dev_obj);
+        kobject_put(&cm_dev->dev_obj);
 }
 
 static int __init ib_cm_init(void)
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 1eff1b2c0e08..34507daaf9b6 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1107,7 +1107,6 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
                 event.param.ud.private_data_len =
                                 IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE - offset;
         } else {
-                ib_send_cm_mra(cm_id, CMA_CM_MRA_SETTING, NULL, 0);
                 conn_id = cma_new_conn_id(&listen_id->id, ib_event);
                 cma_set_req_event_data(&event, &ib_event->param.req_rcvd,
                                        ib_event->private_data, offset);
@@ -1130,6 +1129,15 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
 
         ret = conn_id->id.event_handler(&conn_id->id, &event);
         if (!ret) {
+                /*
+                 * Acquire mutex to prevent user executing rdma_destroy_id()
+                 * while we're accessing the cm_id.
+                 */
+                mutex_lock(&lock);
+                if (cma_comp(conn_id, CMA_CONNECT) &&
+                    !cma_is_ud_ps(conn_id->id.ps))
+                        ib_send_cm_mra(cm_id, CMA_CM_MRA_SETTING, NULL, 0);
+                mutex_unlock(&lock);
                 cma_enable_remove(conn_id);
                 goto out;
         }
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index c864ef70fdf9..5a4b2e65534b 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -686,8 +686,10 @@ int ib_device_register_sysfs(struct ib_device *device)
 
         device->ports_parent = kobject_create_and_add("ports",
                                         kobject_get(&class_dev->kobj));
-        if (!device->ports_parent)
+        if (!device->ports_parent) {
+                ret = -ENOMEM;
                 goto err_put;
+        }
 
         if (device->node_type == RDMA_NODE_IB_SWITCH) {
                 ret = add_port(device, 0);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index e9a08fa3dffe..320f2b6ddee6 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -35,6 +35,7 @@
 #include <linux/skbuff.h>
 #include <linux/timer.h>
 #include <linux/notifier.h>
+#include <linux/inetdevice.h>
 
 #include <net/neighbour.h>
 #include <net/netevent.h>
@@ -1784,6 +1785,17 @@ err:
         return err;
 }
 
+static int is_loopback_dst(struct iw_cm_id *cm_id)
+{
+        struct net_device *dev;
+
+        dev = ip_dev_find(&init_net, cm_id->remote_addr.sin_addr.s_addr);
+        if (!dev)
+                return 0;
+        dev_put(dev);
+        return 1;
+}
+
 int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
 {
         int err = 0;
@@ -1791,6 +1803,11 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         struct iwch_ep *ep;
         struct rtable *rt;
 
+        if (is_loopback_dst(cm_id)) {
+                err = -ENOSYS;
+                goto out;
+        }
+
         ep = alloc_ep(sizeof(*ep), GFP_KERNEL);
         if (!ep) {
                 printk(KERN_ERR MOD "%s - cannot alloc ep.\n", __FUNCTION__);
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 7dc91a3e712d..fe2c2e94a5f8 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -199,7 +199,7 @@ struct ib_fmr *mlx4_ib_fmr_alloc(struct ib_pd *pd, int acc,
         if (err)
                 goto err_free;
 
-        err = mlx4_mr_enable(to_mdev(pd->device)->dev, &fmr->mfmr.mr);
+        err = mlx4_fmr_enable(to_mdev(pd->device)->dev, &fmr->mfmr);
         if (err)
                 goto err_mr;
 
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index 6bd9f1393349..1e1e336d3ef9 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -473,7 +473,7 @@ static void handle_error_cqe(struct mthca_dev *dev, struct mthca_cq *cq,
         if (!(new_wqe & cpu_to_be32(0x3f)) || (!cqe->db_cnt && dbd))
                 return;
 
-        cqe->db_cnt   = cpu_to_be16(be16_to_cpu(cqe->db_cnt) - dbd);
+        be16_add_cpu(&cqe->db_cnt, -dbd);
         cqe->wqe      = new_wqe;
         cqe->syndrome = SYNDROME_WR_FLUSH_ERR;
 
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index 1f4d27d7c16d..252db0822f6c 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -542,6 +542,7 @@ struct mthca_user_db_table *mthca_init_user_db_tab(struct mthca_dev *dev)
         for (i = 0; i < npages; ++i) {
                 db_tab->page[i].refcount = 0;
                 db_tab->page[i].uvirt    = 0;
+                sg_init_table(&db_tab->page[i].mem, 1);
         }
 
         return db_tab;
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index 3b6985557cb2..3538da16e3fe 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -686,7 +686,7 @@ err_out_table:
         mthca_table_put(dev, dev->mr_table.mpt_table, key);
 
 err_out_mpt_free:
-        mthca_free(&dev->mr_table.mpt_alloc, mr->ibmr.lkey);
+        mthca_free(&dev->mr_table.mpt_alloc, key);
         return err;
 }
 
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index b6cc265aa9a4..eee77da61935 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -148,14 +148,15 @@ static int nes_netdev_open(struct net_device *netdev)
         struct nes_device *nesdev = nesvnic->nesdev;
         int ret;
         int i;
-        struct nes_vnic *first_nesvnic;
+        struct nes_vnic *first_nesvnic = NULL;
         u32 nic_active_bit;
         u32 nic_active;
+        struct list_head *list_pos, *list_temp;
 
         assert(nesdev != NULL);
 
-        first_nesvnic = list_entry(nesdev->nesadapter->nesvnic_list[nesdev->mac_index].next,
-                        struct nes_vnic, list);
+        if (nesvnic->netdev_open == 1)
+                return 0;
 
         if (netif_msg_ifup(nesvnic))
                 printk(KERN_INFO PFX "%s: enabling interface\n", netdev->name);
@@ -225,7 +226,18 @@ static int nes_netdev_open(struct net_device *netdev)
         nes_write32(nesdev->regs+NES_CQE_ALLOC, NES_CQE_ALLOC_NOTIFY_NEXT |
                         nesvnic->nic_cq.cq_number);
         nes_read32(nesdev->regs+NES_CQE_ALLOC);
-
+        list_for_each_safe(list_pos, list_temp, &nesdev->nesadapter->nesvnic_list[nesdev->mac_index]) {
+                first_nesvnic = container_of(list_pos, struct nes_vnic, list);
+                if (first_nesvnic->netdev_open == 1)
+                        break;
+        }
+        if (first_nesvnic->netdev_open == 0) {
+                nes_debug(NES_DBG_INIT, "Setting up MAC interrupt mask.\n");
+                nes_write_indexed(nesdev, NES_IDX_MAC_INT_MASK + (0x200 * nesdev->mac_index),
+                                ~(NES_MAC_INT_LINK_STAT_CHG | NES_MAC_INT_XGMII_EXT |
+                                NES_MAC_INT_TX_UNDERFLOW | NES_MAC_INT_TX_ERROR));
+                first_nesvnic = nesvnic;
+        }
         if (first_nesvnic->linkup) {
                 /* Enable network packets */
                 nesvnic->linkup = 1;
@@ -248,6 +260,8 @@ static int nes_netdev_stop(struct net_device *netdev)
         struct nes_device *nesdev = nesvnic->nesdev;
         u32 nic_active_mask;
         u32 nic_active;
+        struct nes_vnic *first_nesvnic = NULL;
+        struct list_head *list_pos, *list_temp;
 
         nes_debug(NES_DBG_SHUTDOWN, "nesvnic=%p, nesdev=%p, netdev=%p %s\n",
                         nesvnic, nesdev, netdev, netdev->name);
@@ -260,9 +274,20 @@ static int nes_netdev_stop(struct net_device *netdev)
         /* Disable network packets */
         napi_disable(&nesvnic->napi);
         netif_stop_queue(netdev);
-        if ((nesdev->netdev[0] == netdev) & (nesvnic->logical_port == nesdev->mac_index)) {
-                nes_write_indexed(nesdev,
-                                NES_IDX_MAC_INT_MASK+(0x200*nesdev->mac_index), 0xffffffff);
+        list_for_each_safe(list_pos, list_temp, &nesdev->nesadapter->nesvnic_list[nesdev->mac_index]) {
+                first_nesvnic = container_of(list_pos, struct nes_vnic, list);
+                if ((first_nesvnic->netdev_open == 1) && (first_nesvnic != nesvnic))
+                        break;
+        }
+
+        if (first_nesvnic->netdev_open == 0)
+                nes_write_indexed(nesdev, NES_IDX_MAC_INT_MASK+(0x200*nesdev->mac_index), 0xffffffff);
+        else if ((first_nesvnic != nesvnic) &&
+                 (PCI_FUNC(first_nesvnic->nesdev->pcidev->devfn) != PCI_FUNC(nesvnic->nesdev->pcidev->devfn))) {
+                nes_write_indexed(nesdev, NES_IDX_MAC_INT_MASK + (0x200 * nesdev->mac_index), 0xffffffff);
+                nes_write_indexed(first_nesvnic->nesdev, NES_IDX_MAC_INT_MASK + (0x200 * first_nesvnic->nesdev->mac_index),
+                                ~(NES_MAC_INT_LINK_STAT_CHG | NES_MAC_INT_XGMII_EXT |
+                                NES_MAC_INT_TX_UNDERFLOW | NES_MAC_INT_TX_ERROR));
         }
 
         nic_active_mask = ~((u32)(1 << nesvnic->nic_index));
@@ -859,7 +884,6 @@ void nes_netdev_set_multicast_list(struct net_device *netdev)
                 for (mc_index=0; mc_index < NES_MULTICAST_PF_MAX; mc_index++) {
                         while (multicast_addr && nesvnic->mcrq_mcast_filter && ((mc_nic_index = nesvnic->mcrq_mcast_filter(nesvnic, multicast_addr->dmi_addr)) == 0))
                                 multicast_addr = multicast_addr->next;
-
                         if (mc_nic_index < 0)
                                 mc_nic_index = nesvnic->nic_index;
                         if (multicast_addr) {
@@ -908,7 +932,7 @@ static int nes_netdev_change_mtu(struct	net_device *netdev,	int	new_mtu)
                 return -EINVAL;
 
         netdev->mtu     = new_mtu;
-        nesvnic->max_frame_size = new_mtu+ETH_HLEN;
+        nesvnic->max_frame_size = new_mtu + VLAN_ETH_HLEN;
 
         if (netdev->mtu > 1500) {
                 jumbomode=1;
@@ -1470,10 +1494,15 @@ static void nes_netdev_vlan_rx_register(struct net_device *netdev, struct vlan_g
 {
         struct nes_vnic *nesvnic = netdev_priv(netdev);
         struct nes_device *nesdev = nesvnic->nesdev;
+        struct nes_adapter *nesadapter = nesdev->nesadapter;
         u32 u32temp;
+        unsigned long flags;
 
+        spin_lock_irqsave(&nesadapter->phy_lock, flags);
         nesvnic->vlan_grp = grp;
 
+        nes_debug(NES_DBG_NETDEV, "%s: %s\n", __func__, netdev->name);
+
         /* Enable/Disable VLAN Stripping */
         u32temp = nes_read_indexed(nesdev, NES_IDX_PCIX_DIAG);
         if (grp)
@@ -1482,6 +1511,7 @@ static void nes_netdev_vlan_rx_register(struct net_device *netdev, struct vlan_g
                 u32temp |= 0x02000000;
 
         nes_write_indexed(nesdev, NES_IDX_PCIX_DIAG, u32temp);
+        spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
 }
 
 
@@ -1540,7 +1570,7 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
         nesvnic->msg_enable = netif_msg_init(debug, default_msg);
         nesvnic->netdev_index = nesdev->netdev_count;
         nesvnic->perfect_filter_index = nesdev->nesadapter->netdev_count;
-        nesvnic->max_frame_size = netdev->mtu+netdev->hard_header_len;
+        nesvnic->max_frame_size = netdev->mtu + netdev->hard_header_len + VLAN_HLEN;
 
         curr_qp_map = nic_qp_mapping_per_function[PCI_FUNC(nesdev->pcidev->devfn)];
         nesvnic->nic.qp_id = curr_qp_map[nesdev->netdev_count].qpid;
@@ -1610,7 +1640,7 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
         list_add_tail(&nesvnic->list, &nesdev->nesadapter->nesvnic_list[nesdev->mac_index]);
 
         if ((nesdev->netdev_count == 0) &&
-                        (PCI_FUNC(nesdev->pcidev->devfn) == nesdev->mac_index)) {
+            (PCI_FUNC(nesdev->pcidev->devfn) == nesdev->mac_index)) {
                 nes_debug(NES_DBG_INIT, "Setting up PHY interrupt mask. Using register index 0x%04X\n",
                                 NES_IDX_PHY_PCS_CONTROL_STATUS0+(0x200*(nesvnic->logical_port&1)));
                 u32temp = nes_read_indexed(nesdev, NES_IDX_PHY_PCS_CONTROL_STATUS0 +
@@ -1648,18 +1678,14 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
                                 nesvnic->linkup = 1;
                         }
                 }
-                nes_debug(NES_DBG_INIT, "Setting up MAC interrupt mask.\n");
                 /* clear the MAC interrupt status, assumes direct logical to physical mapping */
-                u32temp = nes_read_indexed(nesdev, NES_IDX_MAC_INT_STATUS+(0x200*nesvnic->logical_port));
+                u32temp = nes_read_indexed(nesdev, NES_IDX_MAC_INT_STATUS + (0x200 * nesdev->mac_index));
                 nes_debug(NES_DBG_INIT, "Phy interrupt status = 0x%X.\n", u32temp);
-                nes_write_indexed(nesdev, NES_IDX_MAC_INT_STATUS+(0x200*nesvnic->logical_port), u32temp);
+                nes_write_indexed(nesdev, NES_IDX_MAC_INT_STATUS + (0x200 * nesdev->mac_index), u32temp);
 
-                if (nesdev->nesadapter->phy_type[nesvnic->logical_port] != NES_PHY_TYPE_IRIS)
+                if (nesdev->nesadapter->phy_type[nesdev->mac_index] != NES_PHY_TYPE_IRIS)
                         nes_init_phy(nesdev);
 
-                nes_write_indexed(nesdev, NES_IDX_MAC_INT_MASK+(0x200*nesvnic->logical_port),
-                                ~(NES_MAC_INT_LINK_STAT_CHG | NES_MAC_INT_XGMII_EXT |
-                                NES_MAC_INT_TX_UNDERFLOW | NES_MAC_INT_TX_ERROR));
         }
 
         return netdev;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index ffd4b425567f..4dafbe16e82a 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1337,7 +1337,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
                                                                    NES_MAX_USER_WQ_REGIONS, nes_ucontext->first_free_wq);
                                         /* nes_debug(NES_DBG_QP, "find_first_zero_biton wqs returned %u\n",
                                                         nespd->mmap_db_index); */
-                                        if (nesqp->mmap_sq_db_index > NES_MAX_USER_WQ_REGIONS) {
+                                        if (nesqp->mmap_sq_db_index >= NES_MAX_USER_WQ_REGIONS) {
                                                 nes_debug(NES_DBG_QP,
                                                           "db index > max user regions, failing create QP\n");
                                                 nes_free_resource(nesadapter, nesadapter->allocated_qps, qp_num);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index f9b7caa54143..054fab8e27a0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -209,7 +209,6 @@ struct ipoib_cm_tx {
         unsigned             tx_tail;
         unsigned long        flags;
         u32                  mtu;
-        struct ib_wc         ibwc[IPOIB_NUM_WC];
 };
 
 struct ipoib_cm_rx_buf {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 7dd2ec473d24..52b1bebfa744 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -824,7 +824,6 @@ void ipoib_cm_dev_stop(struct net_device *dev)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_cm_rx *p;
         unsigned long begin;
-        LIST_HEAD(list);
         int ret;
 
         if (!IPOIB_CM_SUPPORTED(dev->dev_addr) || !priv->cm.id)
@@ -857,9 +856,12 @@ void ipoib_cm_dev_stop(struct net_device *dev)
                         /*
                          * assume the HW is wedged and just free up everything.
                          */
-                        list_splice_init(&priv->cm.rx_flush_list, &list);
-                        list_splice_init(&priv->cm.rx_error_list, &list);
-                        list_splice_init(&priv->cm.rx_drain_list, &list);
+                        list_splice_init(&priv->cm.rx_flush_list,
+                                         &priv->cm.rx_reap_list);
+                        list_splice_init(&priv->cm.rx_error_list,
+                                         &priv->cm.rx_reap_list);
+                        list_splice_init(&priv->cm.rx_drain_list,
+                                         &priv->cm.rx_reap_list);
                         break;
                 }
                 spin_unlock_irq(&priv->lock);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 9d3e778dc56d..08c4396cf418 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -780,6 +780,7 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv, int pkey_event)
                 if (ib_find_pkey(priv->ca, priv->port, priv->pkey, &new_index)) {
                         clear_bit(IPOIB_PKEY_ASSIGNED, &priv->flags);
                         ipoib_ib_dev_down(dev, 0);
+                        ipoib_ib_dev_stop(dev, 0);
                         ipoib_pkey_dev_delay_open(dev);
                         return;
                 }
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 936788272a5f..bd8a1d14b45d 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -416,7 +416,6 @@ static void poll_media_bay(struct media_bay_info* bay)
         }
 }
 
-#ifdef CONFIG_MAC_FLOPPY
 int check_media_bay(struct device_node *which_bay, int what)
 {
         int     i;
@@ -431,7 +430,6 @@ int check_media_bay(struct device_node *which_bay, int what)
         return -ENODEV;
 }
 EXPORT_SYMBOL(check_media_bay);
-#endif /* CONFIG_MAC_FLOPPY */
 
 #ifdef CONFIG_BLK_DEV_IDE_PMAC
 int check_media_bay_by_base(unsigned long base, int what)
@@ -700,7 +698,8 @@ static int media_bay_suspend(struct macio_dev *mdev, pm_message_t state)
 {
         struct media_bay_info   *bay = macio_get_drvdata(mdev);
 
-        if (state.event != mdev->ofdev.dev.power.power_state.event && state.event == PM_EVENT_SUSPEND) {
+        if (state.event != mdev->ofdev.dev.power.power_state.event
+            && (state.event & PM_EVENT_SLEEP)) {
                 down(&bay->lock);
                 bay->sleeping = 1;
                 set_mb_power(bay, 0);
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index a0585fb6da94..7aeceedcf7d4 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -206,16 +206,10 @@ static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
 /* copy the pathname of a file to a buffer */
 char *file_path(struct file *file, char *buf, int count)
 {
-        struct dentry *d;
-        struct vfsmount *v;
-
         if (!buf)
                 return NULL;
 
-        d = file->f_path.dentry;
-        v = file->f_path.mnt;
-
-        buf = d_path(d, v, buf, count);
+        buf = d_path(&file->f_path, buf, count);
 
         return IS_ERR(buf) ? NULL : buf;
 }
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index edc057f5cdcc..51605870f898 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -124,7 +124,7 @@ enum dm_raid1_error {
 struct mirror {
         struct mirror_set *ms;
         atomic_t error_count;
-        uint32_t error_type;
+        unsigned long error_type;
         struct dm_dev *dev;
         sector_t offset;
 };
@@ -1695,14 +1695,15 @@ static int mirror_end_io(struct dm_target *ti, struct bio *bio,
                          * information for a retry or there was no other
                          * mirror in-sync.
                          */
-                        DMERR_LIMIT("Mirror read failed from %s.",
-                                    m->dev->name);
+                        DMERR_LIMIT("Mirror read failed.");
                         return -EIO;
                 }
+
+                m = read_record->m;
+
                 DMERR("Mirror read failed from %s. Trying alternative device.",
                       m->dev->name);
 
-                m = read_record->m;
                 fail_mirror(m, DM_RAID1_READ_ERROR);
 
                 /*
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index f16062982383..e75b1437b58b 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -361,7 +361,7 @@ static int lookup_device(const char *path, dev_t *dev)
         if ((r = path_lookup(path, LOOKUP_FOLLOW, &nd)))
                 return r;
 
-        inode = nd.dentry->d_inode;
+        inode = nd.path.dentry->d_inode;
         if (!inode) {
                 r = -ENOENT;
                 goto out;
@@ -375,7 +375,7 @@ static int lookup_device(const char *path, dev_t *dev)
         *dev = inode->i_rdev;
 
  out:
-        path_release(&nd);
+        path_put(&nd.path);
         return r;
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 5fc326d3970e..7da6ec244e15 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5197,8 +5197,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
                                 chunk_kb ? "KB" : "B");
                         if (bitmap->file) {
                                 seq_printf(seq, ", file: ");
-                                seq_path(seq, bitmap->file->f_path.mnt,
-                                         bitmap->file->f_path.dentry," \t\n");
+                                seq_path(seq, &bitmap->file->f_path, " \t\n");
                         }
 
                         seq_printf(seq, "\n");
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 8f4a45346de7..11950698a2e7 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -25,11 +25,16 @@ config VIDEO_DEV
           To compile this driver as a module, choose M here: the
           module will be called videodev.
 
+config VIDEO_V4L2_COMMON
+        tristate
+        depends on (I2C || I2C=n) && VIDEO_DEV
+        default (I2C || I2C=n) && VIDEO_DEV
+
 config VIDEO_V4L1
         bool "Enable Video For Linux API 1 (DEPRECATED)"
-        depends on VIDEO_DEV
+        depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+        default VIDEO_DEV && VIDEO_V4L2_COMMON
         select VIDEO_V4L1_COMPAT
-        default y
         ---help---
           Enables a compatibility API used by most V4L2 devices to allow
           its usage with legacy applications that supports only V4L1 api.
@@ -39,7 +44,7 @@ config VIDEO_V4L1
 config VIDEO_V4L1_COMPAT
         bool "Enable Video For Linux API 1 compatible Layer"
         depends on VIDEO_DEV
-        default y
+        default VIDEO_DEV
         ---help---
           This api were developed to be used at Kernel 2.2 and 2.4, but
           lacks support for several video standards. There are several
@@ -55,8 +60,8 @@ config VIDEO_V4L1_COMPAT
 
 config VIDEO_V4L2
         bool
-        depends on VIDEO_DEV
-        default y
+        depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+        default VIDEO_DEV && VIDEO_V4L2_COMMON
 
 source "drivers/media/video/Kconfig"
 
@@ -93,7 +98,7 @@ if VIDEO_TUNER_CUSTOMIZE
 
 config TUNER_XC2028
         tristate "XCeive xc2028/xc3028 tuners"
-        depends on I2C
+        depends on I2C && FW_LOADER
         default m if VIDEO_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the xc2028/xc3028 tuners.
@@ -180,7 +185,6 @@ config VIDEO_TVEEPROM
 
 config DAB
         boolean "DAB adapters"
-        default y
         ---help---
           Allow selecting support for for Digital Audio Broadcasting (DAB)
           Receiver adapters.
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 06ca75911b7f..769c6f8142d2 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -4,6 +4,6 @@ config VIDEO_SAA7146
 
 config VIDEO_SAA7146_VV
         tristate
-        depends on VIDEO_DEV
+        depends on VIDEO_V4L2
         select VIDEOBUF_DMA_SG
         select VIDEO_SAA7146
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index a4a937c90534..2ab5a120470d 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1987,3 +1987,49 @@ IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE] = {
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_behold);
+
+/*
+ * Remote control for the Genius TVGO A11MCE
+ * Adrian Pardini <pardo.bsso@gmail.com>
+ */
+IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE] = {
+        /* Keys 0 to 9 */
+        [0x48] = KEY_0,
+        [0x09] = KEY_1,
+        [0x1d] = KEY_2,
+        [0x1f] = KEY_3,
+        [0x19] = KEY_4,
+        [0x1b] = KEY_5,
+        [0x11] = KEY_6,
+        [0x17] = KEY_7,
+        [0x12] = KEY_8,
+        [0x16] = KEY_9,
+
+        [0x54] = KEY_RECORD,            /* recording */
+        [0x06] = KEY_MUTE,              /* mute */
+        [0x10] = KEY_POWER,
+        [0x40] = KEY_LAST,              /* recall */
+        [0x4c] = KEY_CHANNELUP,         /* channel / program + */
+        [0x00] = KEY_CHANNELDOWN,       /* channel / program - */
+        [0x0d] = KEY_VOLUMEUP,
+        [0x15] = KEY_VOLUMEDOWN,
+        [0x4d] = KEY_OK,                /* also labeled as Pause */
+        [0x1c] = KEY_ZOOM,              /* full screen and Stop*/
+        [0x02] = KEY_MODE,              /* AV Source or Rewind*/
+        [0x04] = KEY_LIST,              /* -/-- */
+        /* small arrows above numbers */
+        [0x1a] = KEY_NEXT,              /* also Fast Forward */
+        [0x0e] = KEY_PREVIOUS,  /* also Rewind */
+        /* these are in a rather non standard layout and have
+        an alternate name written */
+        [0x1e] = KEY_UP,                /* Video Setting */
+        [0x0a] = KEY_DOWN,              /* Video Default */
+        [0x05] = KEY_LEFT,              /* Snapshot */
+        [0x0c] = KEY_RIGHT,             /* Hide Panel */
+        /* Four buttons without label */
+        [0x49] = KEY_RED,
+        [0x0b] = KEY_GREEN,
+        [0x13] = KEY_YELLOW,
+        [0x50] = KEY_BLUE,
+};
+EXPORT_SYMBOL_GPL(ir_codes_genius_tvgo_a11mce);
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index c32dda973e92..bfbd5a841ebf 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -413,7 +413,6 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file)
                             V4L2_FIELD_SEQ_TB, // FIXME: does this really work?
                             sizeof(struct saa7146_buf),
                             file);
-        mutex_init(&fh->vbi_q.lock);
 
         init_timer(&fh->vbi_read_timeout);
         fh->vbi_read_timeout.function = vbi_read_timeout;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index c31ab480d8e1..66fdbd0e6a6d 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1417,8 +1417,6 @@ static int video_open(struct saa7146_dev *dev, struct file *file)
                             sizeof(struct saa7146_buf),
                             file);
 
-        mutex_init(&fh->video_q.lock);
-
         return 0;
 }
 
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index c7bbb40223f5..56d8fab688bb 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -75,7 +75,11 @@ EXPORT_SYMBOL(bt878);
 #if defined(dprintk)
 #undef dprintk
 #endif
-#define dprintk if(bt878_debug) printk
+#define dprintk(fmt, arg...) \
+        do { \
+                if (bt878_debug) \
+                        printk(KERN_DEBUG fmt, ##arg); \
+        } while (0)
 
 static void bt878_mem_free(struct bt878 *bt)
 {
@@ -154,7 +158,7 @@ static int bt878_make_risc(struct bt878 *bt)
         }
 
         if (bt->line_count > 255) {
-                printk("bt878: buffer size error!\n");
+                printk(KERN_ERR "bt878: buffer size error!\n");
                 return -EINVAL;
         }
         return 0;
@@ -285,7 +289,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
 
                 if (astat & (BT878_ASCERR | BT878_AOCERR)) {
                         if (bt878_verbose) {
-                                printk("bt878(%d): irq%s%s risc_pc=%08x\n",
+                                printk(KERN_INFO
+                                       "bt878(%d): irq%s%s risc_pc=%08x\n",
                                        bt->nr,
                                        (astat & BT878_ASCERR) ? " SCERR" :
                                        "",
@@ -295,8 +300,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
                 }
                 if (astat & (BT878_APABORT | BT878_ARIPERR | BT878_APPERR)) {
                         if (bt878_verbose) {
-                                printk
-                                    ("bt878(%d): irq%s%s%s risc_pc=%08x\n",
+                                printk(KERN_INFO
+                                     "bt878(%d): irq%s%s%s risc_pc=%08x\n",
                                      bt->nr,
                                      (astat & BT878_APABORT) ? " PABORT" :
                                      "",
@@ -308,8 +313,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
                 }
                 if (astat & (BT878_AFDSR | BT878_AFTRGT | BT878_AFBUS)) {
                         if (bt878_verbose) {
-                                printk
-                                    ("bt878(%d): irq%s%s%s risc_pc=%08x\n",
+                                printk(KERN_INFO
+                                     "bt878(%d): irq%s%s%s risc_pc=%08x\n",
                                      bt->nr,
                                      (astat & BT878_AFDSR) ? " FDSR" : "",
                                      (astat & BT878_AFTRGT) ? " FTRGT" :
@@ -510,7 +515,7 @@ static int __devinit bt878_probe(struct pci_dev *dev,
 */
 
         if ((result = bt878_mem_alloc(bt))) {
-                printk("bt878: failed to allocate memory!\n");
+                printk(KERN_ERR "bt878: failed to allocate memory!\n");
                 goto fail2;
         }
 
@@ -536,7 +541,7 @@ static void __devexit bt878_remove(struct pci_dev *pci_dev)
         struct bt878 *bt = pci_get_drvdata(pci_dev);
 
         if (bt878_verbose)
-                printk("bt878(%d): unloading\n", bt->nr);
+                printk(KERN_INFO "bt878(%d): unloading\n", bt->nr);
 
         /* turn off all capturing, DMA and IRQs */
         btand(~0x13, BT878_AGPIO_DMA_CTL);
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c
index 88dc4367a2e3..3b9da9c25c6e 100644
--- a/drivers/media/dvb/dvb-usb/ttusb2.c
+++ b/drivers/media/dvb/dvb-usb/ttusb2.c
@@ -144,6 +144,7 @@ static int ttusb2_power_ctrl(struct dvb_usb_device *d, int onoff)
 static struct tda10086_config tda10086_config = {
         .demod_address = 0x0e,
         .invert = 0,
+        .diseqc_tone = 1,
 };
 
 static int ttusb2_frontend_attach(struct dvb_usb_adapter *adap)
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c
index 9d26ace65151..0d2b69a99ad4 100644
--- a/drivers/media/dvb/frontends/tda10086.c
+++ b/drivers/media/dvb/frontends/tda10086.c
@@ -106,9 +106,12 @@ static int tda10086_write_mask(struct tda10086_state *state, int reg, int mask,
 static int tda10086_init(struct dvb_frontend* fe)
 {
         struct tda10086_state* state = fe->demodulator_priv;
+        u8 t22k_off = 0x80;
 
         dprintk ("%s\n", __FUNCTION__);
 
+        if (state->config->diseqc_tone)
+                t22k_off = 0;
         // reset
         tda10086_write_byte(state, 0x00, 0x00);
         msleep(10);
@@ -158,7 +161,7 @@ static int tda10086_init(struct dvb_frontend* fe)
         tda10086_write_byte(state, 0x3d, 0x80);
 
         // setup SEC
-        tda10086_write_byte(state, 0x36, 0x80); // all SEC off, no 22k tone
+        tda10086_write_byte(state, 0x36, t22k_off); // all SEC off, 22k tone
         tda10086_write_byte(state, 0x34, (((1<<19) * (22000/1000)) / (SACLK/1000)));      // } tone frequency
         tda10086_write_byte(state, 0x35, (((1<<19) * (22000/1000)) / (SACLK/1000)) >> 8); // }
 
@@ -180,16 +183,20 @@ static void tda10086_diseqc_wait(struct tda10086_state *state)
 static int tda10086_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
         struct tda10086_state* state = fe->demodulator_priv;
+        u8 t22k_off = 0x80;
 
         dprintk ("%s\n", __FUNCTION__);
 
+        if (state->config->diseqc_tone)
+                t22k_off = 0;
+
         switch (tone) {
         case SEC_TONE_OFF:
-                tda10086_write_byte(state, 0x36, 0x80);
+                tda10086_write_byte(state, 0x36, t22k_off);
                 break;
 
         case SEC_TONE_ON:
-                tda10086_write_byte(state, 0x36, 0x81);
+                tda10086_write_byte(state, 0x36, 0x01 + t22k_off);
                 break;
         }
 
@@ -202,9 +209,13 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,
         struct tda10086_state* state = fe->demodulator_priv;
         int i;
         u8 oldval;
+        u8 t22k_off = 0x80;
 
         dprintk ("%s\n", __FUNCTION__);
 
+        if (state->config->diseqc_tone)
+                t22k_off = 0;
+
         if (cmd->msg_len > 6)
                 return -EINVAL;
         oldval = tda10086_read_byte(state, 0x36);
@@ -212,7 +223,8 @@ static int tda10086_send_master_cmd (struct dvb_frontend* fe,
         for(i=0; i< cmd->msg_len; i++) {
                 tda10086_write_byte(state, 0x48+i, cmd->msg[i]);
         }
-        tda10086_write_byte(state, 0x36, 0x88 | ((cmd->msg_len - 1) << 4));
+        tda10086_write_byte(state, 0x36, (0x08 + t22k_off)
+                                        | ((cmd->msg_len - 1) << 4));
 
         tda10086_diseqc_wait(state);
 
@@ -225,16 +237,20 @@ static int tda10086_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t minic
 {
         struct tda10086_state* state = fe->demodulator_priv;
         u8 oldval = tda10086_read_byte(state, 0x36);
+        u8 t22k_off = 0x80;
 
         dprintk ("%s\n", __FUNCTION__);
 
+        if (state->config->diseqc_tone)
+                t22k_off = 0;
+
         switch(minicmd) {
         case SEC_MINI_A:
-                tda10086_write_byte(state, 0x36, 0x84);
+                tda10086_write_byte(state, 0x36, 0x04 + t22k_off);
                 break;
 
         case SEC_MINI_B:
-                tda10086_write_byte(state, 0x36, 0x86);
+                tda10086_write_byte(state, 0x36, 0x06 + t22k_off);
                 break;
         }
 
diff --git a/drivers/media/dvb/frontends/tda10086.h b/drivers/media/dvb/frontends/tda10086.h
index ed584a8f4a89..eeceaeee78ff 100644
--- a/drivers/media/dvb/frontends/tda10086.h
+++ b/drivers/media/dvb/frontends/tda10086.h
@@ -33,6 +33,9 @@ struct tda10086_config
 
         /* does the "inversion" need inverted? */
         u8 invert;
+
+        /* do we need the diseqc signal with carrier? */
+        u8 diseqc_tone;
 };
 
 #if defined(CONFIG_DVB_TDA10086) || (defined(CONFIG_DVB_TDA10086_MODULE) && defined(MODULE))
diff --git a/drivers/media/dvb/frontends/tda18271-common.c b/drivers/media/dvb/frontends/tda18271-common.c
index cebb6b90b7e0..bca570990613 100644
--- a/drivers/media/dvb/frontends/tda18271-common.c
+++ b/drivers/media/dvb/frontends/tda18271-common.c
@@ -171,7 +171,7 @@ int tda18271_read_extended(struct dvb_frontend *fe)
         if (ret != 2)
                 tda_err("ERROR: i2c_transfer returned: %d\n", ret);
 
-        for (i = 0; i <= TDA18271_NUM_REGS; i++) {
+        for (i = 0; i < TDA18271_NUM_REGS; i++) {
                 /* don't update write-only registers */
                 if ((i != R_EB9)  &&
                     (i != R_EB16) &&
diff --git a/drivers/media/dvb/frontends/xc5000.h b/drivers/media/dvb/frontends/xc5000.h
index e0e84562aed1..32a5f1c86a16 100644
--- a/drivers/media/dvb/frontends/xc5000.h
+++ b/drivers/media/dvb/frontends/xc5000.h
@@ -45,7 +45,8 @@ struct xc5000_config {
 /* xc5000 callback command */
 #define XC5000_TUNER_RESET              0
 
-#if defined(CONFIG_DVB_TUNER_XC5000) || defined(CONFIG_DVB_TUNER_XC5000_MODULE)
+#if defined(CONFIG_DVB_TUNER_XC5000) || \
+    (defined(CONFIG_DVB_TUNER_XC5000_MODULE) && defined(MODULE))
 extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                           struct i2c_adapter *i2c,
                                           struct xc5000_config *cfg);
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index aef6e36d7c5c..3e6b650fbb81 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -966,6 +966,7 @@ static u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x
 static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len, int nonblock)
 {
         int i, n;
+        int progressive = 0;
 
         dprintk(2, "av7110:%p, \n", av7110);
 
@@ -974,6 +975,14 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len
                         return -EBUSY;
         }
 
+        for (i = 0; i < len - 5; i++) {
+                /* get progressive flag from picture extension */
+                if (buf[i] == 0x00 && buf[i+1] == 0x00 &&
+                    buf[i+2] == 0x01 && (unsigned char)buf[i+3] == 0xb5 &&
+                    (buf[i+4] & 0xf0) == 0x10)
+                        progressive = buf[i+5] & 0x08;
+        }
+
         /* setting n always > 1, fixes problems when playing stillframes
            consisting of I- and P-Frames */
         n = MIN_IFRAME / len + 1;
@@ -985,7 +994,11 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len
                 dvb_play(av7110, buf, len, 0, 1);
 
         av7110_ipack_flush(&av7110->ipack[1]);
-        return 0;
+
+        if (progressive)
+                return vidcom(av7110, AV_VIDEO_CMD_FREEZE, 1);
+        else
+                return 0;
 }
 
 
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 3439c9864f67..2d64d557b977 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -896,6 +896,7 @@ static u8 read_pwm(struct budget_av *budget_av)
 #define SUBID_DVBS_CINERGY1200          0x1154
 #define SUBID_DVBS_CYNERGY1200N         0x1155
 #define SUBID_DVBS_TV_STAR              0x0014
+#define SUBID_DVBS_TV_STAR_PLUS_X4      0x0015
 #define SUBID_DVBS_TV_STAR_CI           0x0016
 #define SUBID_DVBS_EASYWATCH_1          0x001a
 #define SUBID_DVBS_EASYWATCH_2          0x001b
@@ -910,6 +911,7 @@ static u8 read_pwm(struct budget_av *budget_av)
 #define SUBID_DVBC_CINERGY1200          0x1156
 #define SUBID_DVBC_CINERGY1200_MK3      0x1176
 
+#define SUBID_DVBT_EASYWATCH            0x003a
 #define SUBID_DVBT_KNC1_PLUS            0x0031
 #define SUBID_DVBT_KNC1                 0x0030
 #define SUBID_DVBT_CINERGY1200          0x1157
@@ -957,6 +959,7 @@ static void frontend_init(struct budget_av *budget_av)
                 break;
 
         case SUBID_DVBS_TV_STAR:
+        case SUBID_DVBS_TV_STAR_PLUS_X4:
         case SUBID_DVBS_TV_STAR_CI:
         case SUBID_DVBS_CYNERGY1200N:
         case SUBID_DVBS_EASYWATCH:
@@ -1018,6 +1021,7 @@ static void frontend_init(struct budget_av *budget_av)
                 }
                 break;
 
+        case SUBID_DVBT_EASYWATCH:
         case SUBID_DVBT_KNC1:
         case SUBID_DVBT_KNC1_PLUS:
         case SUBID_DVBT_CINERGY1200:
@@ -1248,7 +1252,9 @@ MAKE_BUDGET_INFO(satewpls1, "Satelco EasyWatch DVB-S light", BUDGET_KNC1S);
 MAKE_BUDGET_INFO(satewps, "Satelco EasyWatch DVB-S", BUDGET_KNC1S);
 MAKE_BUDGET_INFO(satewplc, "Satelco EasyWatch DVB-C", BUDGET_KNC1CP);
 MAKE_BUDGET_INFO(satewcmk3, "Satelco EasyWatch DVB-C MK3", BUDGET_KNC1C_MK3);
+MAKE_BUDGET_INFO(satewt, "Satelco EasyWatch DVB-T", BUDGET_KNC1T);
 MAKE_BUDGET_INFO(knc1sp, "KNC1 DVB-S Plus", BUDGET_KNC1SP);
+MAKE_BUDGET_INFO(knc1spx4, "KNC1 DVB-S Plus X4", BUDGET_KNC1SP);
 MAKE_BUDGET_INFO(knc1cp, "KNC1 DVB-C Plus", BUDGET_KNC1CP);
 MAKE_BUDGET_INFO(knc1cmk3, "KNC1 DVB-C MK3", BUDGET_KNC1C_MK3);
 MAKE_BUDGET_INFO(knc1cpmk3, "KNC1 DVB-C Plus MK3", BUDGET_KNC1CP_MK3);
@@ -1266,12 +1272,14 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(knc1sp, 0x1131, 0x0011),
         MAKE_EXTENSION_PCI(knc1sp, 0x1894, 0x0011),
         MAKE_EXTENSION_PCI(kncxs, 0x1894, 0x0014),
+        MAKE_EXTENSION_PCI(knc1spx4, 0x1894, 0x0015),
         MAKE_EXTENSION_PCI(kncxs, 0x1894, 0x0016),
         MAKE_EXTENSION_PCI(satewpls, 0x1894, 0x001e),
         MAKE_EXTENSION_PCI(satewpls1, 0x1894, 0x001a),
         MAKE_EXTENSION_PCI(satewps, 0x1894, 0x001b),
         MAKE_EXTENSION_PCI(satewplc, 0x1894, 0x002a),
         MAKE_EXTENSION_PCI(satewcmk3, 0x1894, 0x002c),
+        MAKE_EXTENSION_PCI(satewt, 0x1894, 0x003a),
         MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020),
         MAKE_EXTENSION_PCI(knc1cp, 0x1894, 0x0021),
         MAKE_EXTENSION_PCI(knc1cmk3, 0x1894, 0x0022),
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 9268a82bada6..14b00f57b5de 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -351,6 +351,7 @@ static struct s5h1420_config s5h1420_config = {
 static struct tda10086_config tda10086_config = {
         .demod_address = 0x0e,
         .invert = 0,
+        .diseqc_tone = 1,
 };
 
 static u8 read_pwm(struct budget* budget)
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 8d5214f18cf0..1b41b3f77cf9 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -4,12 +4,12 @@
 
 menuconfig RADIO_ADAPTERS
         bool "Radio Adapters"
-        depends on VIDEO_DEV
+        depends on VIDEO_V4L2
         default y
         ---help---
           Say Y here to enable selecting AM/FM radio adapters.
 
-if RADIO_ADAPTERS && VIDEO_DEV
+if RADIO_ADAPTERS && VIDEO_V4L2
 
 config RADIO_CADET
         tristate "ADS Cadet AM/FM Tuner"
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 3118bdab3183..53e114857377 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -361,6 +361,7 @@ static int __init fmi_init(void)
         }
         if (!request_region(io, 2, "radio-sf16fmi")) {
                 printk(KERN_ERR "radio-sf16fmi: port 0x%x already in use\n", io);
+                pnp_device_detach(dev);
                 return -EBUSY;
         }
 
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index f7c8b000404f..ebc5fbbc38bb 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -470,9 +470,8 @@ static int __init fmr2_init(void)
 
         mutex_init(&lock);
 
-        if (request_region(io, 2, "sf16fmr2"))
-        {
-                printk(KERN_ERR "fmr2: port 0x%x already in use\n", io);
+        if (!request_region(io, 2, "sf16fmr2")) {
+                printk(KERN_ERR "radio-sf16fmr2: request_region failed!\n");
                 return -EBUSY;
         }
 
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 8e4bd4769048..649f14d2c013 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -62,6 +62,29 @@
  *              - code cleaned of unnecessary rds_commands
  *              - USB Vendor/Product ID for ADS/Tech FM Radio Receiver verified
  *                (thanks to Guillaume RAMOUSSE)
+ * 2008-01-27   Tobias Lorenz <tobias.lorenz@gmx.net>
+ *              Version 1.0.5
+ *              - number of seek_retries changed to tune_timeout
+ *              - fixed problem with incomplete tune operations by own buffers
+ *              - optimization of variables and printf types
+ *              - improved error logging
+ * 2008-01-31   Tobias Lorenz <tobias.lorenz@gmx.net>
+ *              Oliver Neukum <oliver@neukum.org>
+ *              Version 1.0.6
+ *              - fixed coverity checker warnings in *_usb_driver_disconnect
+ *              - probe()/open() race by correct ordering in probe()
+ *              - DMA coherency rules by separate allocation of all buffers
+ *              - use of endianness macros
+ *              - abuse of spinlock, replaced by mutex
+ *              - racy handling of timer in disconnect,
+ *                replaced by delayed_work
+ *              - racy interruptible_sleep_on(),
+ *                replaced with wait_event_interruptible()
+ *              - handle signals in read()
+ * 2008-02-08   Tobias Lorenz <tobias.lorenz@gmx.net>
+ *              Oliver Neukum <oliver@neukum.org>
+ *              Version 1.0.7
+ *              - usb autosuspend support
  *
  * ToDo:
  * - add seeking support
@@ -74,9 +97,10 @@
 /* driver definitions */
 #define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>"
 #define DRIVER_NAME "radio-si470x"
-#define DRIVER_VERSION KERNEL_VERSION(1, 0, 4)
+#define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 6)
 #define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"
 #define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers"
+#define DRIVER_VERSION "1.0.6"
 
 
 /* kernel includes */
@@ -89,8 +113,10 @@
 #include <linux/hid.h>
 #include <linux/version.h>
 #include <linux/videodev2.h>
+#include <linux/mutex.h>
 #include <media/v4l2-common.h>
 #include <media/rds.h>
+#include <asm/unaligned.h>
 
 
 /* USB Device ID List */
@@ -119,56 +145,56 @@ MODULE_PARM_DESC(radio_nr, "Radio Nr");
 /* 0: 200 kHz (USA, Australia) */
 /* 1: 100 kHz (Europe, Japan) */
 /* 2:  50 kHz */
-static int space = 2;
-module_param(space, int, 0);
+static unsigned short space = 2;
+module_param(space, ushort, 0);
 MODULE_PARM_DESC(radio_nr, "Spacing: 0=200kHz 1=100kHz *2=50kHz*");
 
 /* Bottom of Band (MHz) */
 /* 0: 87.5 - 108 MHz (USA, Europe)*/
 /* 1: 76   - 108 MHz (Japan wide band) */
 /* 2: 76   -  90 MHz (Japan) */
-static int band = 1;
-module_param(band, int, 0);
+static unsigned short band = 1;
+module_param(band, ushort, 0);
 MODULE_PARM_DESC(radio_nr, "Band: 0=87.5..108MHz *1=76..108MHz* 2=76..90MHz");
 
 /* De-emphasis */
 /* 0: 75 us (USA) */
 /* 1: 50 us (Europe, Australia, Japan) */
-static int de = 1;
-module_param(de, int, 0);
+static unsigned short de = 1;
+module_param(de, ushort, 0);
 MODULE_PARM_DESC(radio_nr, "De-emphasis: 0=75us *1=50us*");
 
 /* USB timeout */
-static int usb_timeout = 500;
-module_param(usb_timeout, int, 0);
+static unsigned int usb_timeout = 500;
+module_param(usb_timeout, uint, 0);
 MODULE_PARM_DESC(usb_timeout, "USB timeout (ms): *500*");
 
-/* Seek retries */
-static int seek_retries = 100;
-module_param(seek_retries, int, 0);
-MODULE_PARM_DESC(seek_retries, "Seek retries: *100*");
+/* Tune timeout */
+static unsigned int tune_timeout = 3000;
+module_param(tune_timeout, uint, 0);
+MODULE_PARM_DESC(tune_timeout, "Tune timeout: *3000*");
 
 /* RDS buffer blocks */
-static int rds_buf = 100;
-module_param(rds_buf, int, 0);
+static unsigned int rds_buf = 100;
+module_param(rds_buf, uint, 0);
 MODULE_PARM_DESC(rds_buf, "RDS buffer entries: *100*");
 
 /* RDS maximum block errors */
-static int max_rds_errors = 1;
+static unsigned short max_rds_errors = 1;
 /* 0 means   0  errors requiring correction */
 /* 1 means 1-2  errors requiring correction (used by original USBRadio.exe) */
 /* 2 means 3-5  errors requiring correction */
 /* 3 means   6+ errors or errors in checkword, correction not possible */
-module_param(max_rds_errors, int, 0);
+module_param(max_rds_errors, ushort, 0);
 MODULE_PARM_DESC(max_rds_errors, "RDS maximum block errors: *1*");
 
 /* RDS poll frequency */
-static int rds_poll_time = 40;
+static unsigned int rds_poll_time = 40;
 /* 40 is used by the original USBRadio.exe */
 /* 50 is used by radio-cadet */
 /* 75 should be okay */
 /* 80 is the usual RDS receive interval */
-module_param(rds_poll_time, int, 0);
+module_param(rds_poll_time, uint, 0);
 MODULE_PARM_DESC(rds_poll_time, "RDS poll time (ms): *40*");
 
 
@@ -393,22 +419,19 @@ MODULE_PARM_DESC(rds_poll_time, "RDS poll time (ms): *40*");
 struct si470x_device {
         /* reference to USB and video device */
         struct usb_device *usbdev;
+        struct usb_interface *intf;
         struct video_device *videodev;
 
-        /* are these really necessary ? */
-        int users;
-
-        /* report buffer (maximum 64 bytes) */
-        unsigned char buf[64];
+        /* driver management */
+        unsigned int users;
 
         /* Silabs internal registers (0..15) */
         unsigned short registers[RADIO_REGISTER_NUM];
 
         /* RDS receive buffer */
-        struct work_struct work;
+        struct delayed_work work;
         wait_queue_head_t read_queue;
-        struct timer_list timer;
-        spinlock_t lock;                /* buffer locking */
+        struct mutex lock;              /* buffer locking */
         unsigned char *buffer;          /* size is always multiple of three */
         unsigned int buf_size;
         unsigned int rd_index;
@@ -434,28 +457,46 @@ struct si470x_device {
 /*
  * si470x_get_report - receive a HID report
  */
-static int si470x_get_report(struct si470x_device *radio, int size)
+static int si470x_get_report(struct si470x_device *radio, void *buf, int size)
 {
-        return usb_control_msg(radio->usbdev,
+        unsigned char *report = (unsigned char *) buf;
+        int retval;
+
+        retval = usb_control_msg(radio->usbdev,
                 usb_rcvctrlpipe(radio->usbdev, 0),
                 HID_REQ_GET_REPORT,
                 USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-                radio->buf[0], 2,
-                radio->buf, size, usb_timeout);
+                report[0], 2,
+                buf, size, usb_timeout);
+        if (retval < 0)
+                printk(KERN_WARNING DRIVER_NAME
+                        ": si470x_get_report: usb_control_msg returned %d\n",
+                        retval);
+
+        return retval;
 }
 
 
 /*
  * si470x_set_report - send a HID report
  */
-static int si470x_set_report(struct si470x_device *radio, int size)
+static int si470x_set_report(struct si470x_device *radio, void *buf, int size)
 {
-        return usb_control_msg(radio->usbdev,
+        unsigned char *report = (unsigned char *) buf;
+        int retval;
+
+        retval = usb_control_msg(radio->usbdev,
                 usb_sndctrlpipe(radio->usbdev, 0),
                 HID_REQ_SET_REPORT,
                 USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
-                radio->buf[0], 2,
-                radio->buf, size, usb_timeout);
+                report[0], 2,
+                buf, size, usb_timeout);
+        if (retval < 0)
+                printk(KERN_WARNING DRIVER_NAME
+                        ": si470x_set_report: usb_control_msg returned %d\n",
+                        retval);
+
+        return retval;
 }
 
 
@@ -464,13 +505,16 @@ static int si470x_set_report(struct si470x_device *radio, int size)
  */
 static int si470x_get_register(struct si470x_device *radio, int regnr)
 {
+        unsigned char buf[REGISTER_REPORT_SIZE];
         int retval;
 
-        radio->buf[0] = REGISTER_REPORT(regnr);
+        buf[0] = REGISTER_REPORT(regnr);
+
+        retval = si470x_get_report(radio, (void *) &buf, sizeof(buf));
 
-        retval = si470x_get_report(radio, REGISTER_REPORT_SIZE);
         if (retval >= 0)
-                radio->registers[regnr] = (radio->buf[1] << 8) | radio->buf[2];
+                radio->registers[regnr] = be16_to_cpu(get_unaligned(
+                        (unsigned short *) &buf[1]));
 
         return (retval < 0) ? -EINVAL : 0;
 }
@@ -481,13 +525,14 @@ static int si470x_get_register(struct si470x_device *radio, int regnr)
  */
 static int si470x_set_register(struct si470x_device *radio, int regnr)
 {
+        unsigned char buf[REGISTER_REPORT_SIZE];
         int retval;
 
-        radio->buf[0] = REGISTER_REPORT(regnr);
-        radio->buf[1] = (radio->registers[regnr] & 0xff00) >> 8;
-        radio->buf[2] = (radio->registers[regnr] & 0x00ff);
+        buf[0] = REGISTER_REPORT(regnr);
+        put_unaligned(cpu_to_be16(radio->registers[regnr]),
+                (unsigned short *) &buf[1]);
 
-        retval = si470x_set_report(radio, REGISTER_REPORT_SIZE);
+        retval = si470x_set_report(radio, (void *) &buf, sizeof(buf));
 
         return (retval < 0) ? -EINVAL : 0;
 }
@@ -498,18 +543,19 @@ static int si470x_set_register(struct si470x_device *radio, int regnr)
  */
 static int si470x_get_all_registers(struct si470x_device *radio)
 {
+        unsigned char buf[ENTIRE_REPORT_SIZE];
         int retval;
-        int regnr;
+        unsigned char regnr;
 
-        radio->buf[0] = ENTIRE_REPORT;
+        buf[0] = ENTIRE_REPORT;
 
-        retval = si470x_get_report(radio, ENTIRE_REPORT_SIZE);
+        retval = si470x_get_report(radio, (void *) &buf, sizeof(buf));
 
         if (retval >= 0)
                 for (regnr = 0; regnr < RADIO_REGISTER_NUM; regnr++)
-                        radio->registers[regnr] =
-                        (radio->buf[regnr * RADIO_REGISTER_SIZE + 1] << 8) |
-                         radio->buf[regnr * RADIO_REGISTER_SIZE + 2];
+                        radio->registers[regnr] = be16_to_cpu(get_unaligned(
+                                (unsigned short *)
+                                &buf[regnr * RADIO_REGISTER_SIZE + 1]));
 
         return (retval < 0) ? -EINVAL : 0;
 }
@@ -520,21 +566,28 @@ static int si470x_get_all_registers(struct si470x_device *radio)
  */
 static int si470x_get_rds_registers(struct si470x_device *radio)
 {
+        unsigned char buf[RDS_REPORT_SIZE];
         int retval;
-        int regnr;
         int size;
+        unsigned char regnr;
 
-        radio->buf[0] = RDS_REPORT;
+        buf[0] = RDS_REPORT;
 
         retval = usb_interrupt_msg(radio->usbdev,
-                usb_rcvctrlpipe(radio->usbdev, 1),
-                radio->buf, RDS_REPORT_SIZE, &size, usb_timeout);
+                usb_rcvintpipe(radio->usbdev, 1),
+                (void *) &buf, sizeof(buf), &size, usb_timeout);
+        if (size != sizeof(buf))
+                printk(KERN_WARNING DRIVER_NAME ": si470x_get_rds_register: "
+                        "return size differs: %d != %zu\n", size, sizeof(buf));
+        if (retval < 0)
+                printk(KERN_WARNING DRIVER_NAME ": si470x_get_rds_registers: "
+                        "usb_interrupt_msg returned %d\n", retval);
 
         if (retval >= 0)
                 for (regnr = 0; regnr < RDS_REGISTER_NUM; regnr++)
                         radio->registers[STATUSRSSI + regnr] =
-                        (radio->buf[regnr * RADIO_REGISTER_SIZE + 1] << 8) |
-                         radio->buf[regnr * RADIO_REGISTER_SIZE + 2];
+                                be16_to_cpu(get_unaligned((unsigned short *)
+                                &buf[regnr * RADIO_REGISTER_SIZE + 1]));
 
         return (retval < 0) ? -EINVAL : 0;
 }
@@ -543,9 +596,11 @@ static int si470x_get_rds_registers(struct si470x_device *radio)
 /*
  * si470x_set_chan - set the channel
  */
-static int si470x_set_chan(struct si470x_device *radio, int chan)
+static int si470x_set_chan(struct si470x_device *radio, unsigned short chan)
 {
-        int retval, i;
+        int retval;
+        unsigned long timeout;
+        bool timed_out = 0;
 
         /* start tuning */
         radio->registers[CHANNEL] &= ~CHANNEL_CHAN;
@@ -555,16 +610,17 @@ static int si470x_set_chan(struct si470x_device *radio, int chan)
                 return retval;
 
         /* wait till seek operation has completed */
-        i = 0;
+        timeout = jiffies + msecs_to_jiffies(tune_timeout);
         do {
                 retval = si470x_get_register(radio, STATUSRSSI);
                 if (retval < 0)
                         return retval;
-        } while ((radio->registers[STATUSRSSI] & STATUSRSSI_STC) &&
-                (++i < seek_retries));
-        if (i >= seek_retries)
+                timed_out = time_after(jiffies, timeout);
+        } while (((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0) &&
+                (!timed_out));
+        if (timed_out)
                 printk(KERN_WARNING DRIVER_NAME
-                        ": seek does not finish after %d tries\n", i);
+                        ": seek does not finish after %u ms\n", tune_timeout);
 
         /* stop tuning */
         radio->registers[CHANNEL] &= ~CHANNEL_TUNE;
@@ -575,9 +631,10 @@ static int si470x_set_chan(struct si470x_device *radio, int chan)
 /*
  * si470x_get_freq - get the frequency
  */
-static int si470x_get_freq(struct si470x_device *radio)
+static unsigned int si470x_get_freq(struct si470x_device *radio)
 {
-        int spacing, band_bottom, chan, freq;
+        unsigned int spacing, band_bottom, freq;
+        unsigned short chan;
         int retval;
 
         /* Spacing (kHz) */
@@ -616,9 +673,10 @@ static int si470x_get_freq(struct si470x_device *radio)
 /*
  * si470x_set_freq - set the frequency
  */
-static int si470x_set_freq(struct si470x_device *radio, int freq)
+static int si470x_set_freq(struct si470x_device *radio, unsigned int freq)
 {
-        int spacing, band_bottom, chan;
+        unsigned int spacing, band_bottom;
+        unsigned short chan;
 
         /* Spacing (kHz) */
         switch (space) {
@@ -709,9 +767,17 @@ static int si470x_stop(struct si470x_device *radio)
  */
 static int si470x_rds_on(struct si470x_device *radio)
 {
+        int retval;
+
         /* sysconfig 1 */
+        mutex_lock(&radio->lock);
         radio->registers[SYSCONFIG1] |= SYSCONFIG1_RDS;
-        return si470x_set_register(radio, SYSCONFIG1);
+        retval = si470x_set_register(radio, SYSCONFIG1);
+        if (retval < 0)
+                radio->registers[SYSCONFIG1] &= ~SYSCONFIG1_RDS;
+        mutex_unlock(&radio->lock);
+
+        return retval;
 }
 
 
@@ -725,11 +791,10 @@ static int si470x_rds_on(struct si470x_device *radio)
  */
 static void si470x_rds(struct si470x_device *radio)
 {
-        unsigned char tmpbuf[3];
         unsigned char blocknum;
-        unsigned char bler; /* rds block errors */
+        unsigned short bler; /* rds block errors */
         unsigned short rds;
-        unsigned int i;
+        unsigned char tmpbuf[3];
 
         /* get rds blocks */
         if (si470x_get_rds_registers(radio) < 0)
@@ -743,63 +808,58 @@ static void si470x_rds(struct si470x_device *radio)
                 return;
         }
 
-        /* copy four RDS blocks to internal buffer */
-        if (spin_trylock(&radio->lock)) {
-                /* process each rds block */
-                for (blocknum = 0; blocknum < 4; blocknum++) {
-                        switch (blocknum) {
-                        default:
-                                bler = (radio->registers[STATUSRSSI] &
-                                                STATUSRSSI_BLERA) >> 9;
-                                rds = radio->registers[RDSA];
-                                break;
-                        case 1:
-                                bler = (radio->registers[READCHAN] &
-                                                READCHAN_BLERB) >> 14;
-                                rds = radio->registers[RDSB];
-                                break;
-                        case 2:
-                                bler = (radio->registers[READCHAN] &
-                                                READCHAN_BLERC) >> 12;
-                                rds = radio->registers[RDSC];
-                                break;
-                        case 3:
-                                bler = (radio->registers[READCHAN] &
-                                                READCHAN_BLERD) >> 10;
-                                rds = radio->registers[RDSD];
-                                break;
-                        };
-
-                        /* Fill the V4L2 RDS buffer */
-                        tmpbuf[0] = rds & 0x00ff;       /* LSB */
-                        tmpbuf[1] = (rds & 0xff00) >> 8;/* MSB */
-                        tmpbuf[2] = blocknum;           /* offset name */
-                        tmpbuf[2] |= blocknum << 3;     /* received offset */
-                        if (bler > max_rds_errors)
-                                tmpbuf[2] |= 0x80; /* uncorrectable errors */
-                        else if (bler > 0)
-                                tmpbuf[2] |= 0x40; /* corrected error(s) */
-
-                        /* copy RDS block to internal buffer */
-                        for (i = 0; i < 3; i++) {
-                                radio->buffer[radio->wr_index] = tmpbuf[i];
-                                radio->wr_index++;
-                        }
-
-                        /* wrap write pointer */
-                        if (radio->wr_index >= radio->buf_size)
-                                radio->wr_index = 0;
-
-                        /* check for overflow */
-                        if (radio->wr_index == radio->rd_index) {
-                                /* increment and wrap read pointer */
-                                radio->rd_index += 3;
-                                if (radio->rd_index >= radio->buf_size)
-                                        radio->rd_index = 0;
-                        }
+        /* copy all four RDS blocks to internal buffer */
+        mutex_lock(&radio->lock);
+        for (blocknum = 0; blocknum < 4; blocknum++) {
+                switch (blocknum) {
+                default:
+                        bler = (radio->registers[STATUSRSSI] &
+                                        STATUSRSSI_BLERA) >> 9;
+                        rds = radio->registers[RDSA];
+                        break;
+                case 1:
+                        bler = (radio->registers[READCHAN] &
+                                        READCHAN_BLERB) >> 14;
+                        rds = radio->registers[RDSB];
+                        break;
+                case 2:
+                        bler = (radio->registers[READCHAN] &
+                                        READCHAN_BLERC) >> 12;
+                        rds = radio->registers[RDSC];
+                        break;
+                case 3:
+                        bler = (radio->registers[READCHAN] &
+                                        READCHAN_BLERD) >> 10;
+                        rds = radio->registers[RDSD];
+                        break;
+                };
+
+                /* Fill the V4L2 RDS buffer */
+                put_unaligned(cpu_to_le16(rds), (unsigned short *) &tmpbuf);
+                tmpbuf[2] = blocknum;           /* offset name */
+                tmpbuf[2] |= blocknum << 3;     /* received offset */
+                if (bler > max_rds_errors)
+                        tmpbuf[2] |= 0x80; /* uncorrectable errors */
+                else if (bler > 0)
+                        tmpbuf[2] |= 0x40; /* corrected error(s) */
+
+                /* copy RDS block to internal buffer */
+                memcpy(&radio->buffer[radio->wr_index], &tmpbuf, 3);
+                radio->wr_index += 3;
+
+                /* wrap write pointer */
+                if (radio->wr_index >= radio->buf_size)
+                        radio->wr_index = 0;
+
+                /* check for overflow */
+                if (radio->wr_index == radio->rd_index) {
+                        /* increment and wrap read pointer */
+                        radio->rd_index += 3;
+                        if (radio->rd_index >= radio->buf_size)
+                                radio->rd_index = 0;
                 }
-                spin_unlock(&radio->lock);
         }
+        mutex_unlock(&radio->lock);
 
         /* wake up read queue */
         if (radio->wr_index != radio->rd_index)
@@ -808,29 +868,18 @@ static void si470x_rds(struct si470x_device *radio)
 
 
 /*
- * si470x_timer - rds timer function
- */
-static void si470x_timer(unsigned long data)
-{
-        struct si470x_device *radio = (struct si470x_device *) data;
-
-        schedule_work(&radio->work);
-}
-
-
-/*
  * si470x_work - rds work function
  */
 static void si470x_work(struct work_struct *work)
 {
         struct si470x_device *radio = container_of(work, struct si470x_device,
-                work);
+                work.work);
 
         if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
                 return;
 
         si470x_rds(radio);
-        mod_timer(&radio->timer, jiffies + msecs_to_jiffies(rds_poll_time));
+        schedule_delayed_work(&radio->work, msecs_to_jiffies(rds_poll_time));
 }
 
 
@@ -852,44 +901,44 @@ static ssize_t si470x_fops_read(struct file *file, char __user *buf,
         /* switch on rds reception */
         if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0) {
                 si470x_rds_on(radio);
-                schedule_work(&radio->work);
+                schedule_delayed_work(&radio->work,
+                        msecs_to_jiffies(rds_poll_time));
         }
 
         /* block if no new data available */
         while (radio->wr_index == radio->rd_index) {
                 if (file->f_flags & O_NONBLOCK)
                         return -EWOULDBLOCK;
-                interruptible_sleep_on(&radio->read_queue);
+                if (wait_event_interruptible(radio->read_queue,
+                        radio->wr_index != radio->rd_index) < 0)
+                        return -EINTR;
         }
 
         /* calculate block count from byte count */
         count /= 3;
 
         /* copy RDS block out of internal buffer and to user buffer */
-        if (spin_trylock(&radio->lock)) {
-                while (block_count < count) {
-                        if (radio->rd_index == radio->wr_index)
-                                break;
-
-                        /* always transfer rds complete blocks */
-                        if (copy_to_user(buf,
-                                        &radio->buffer[radio->rd_index], 3))
-                                /* retval = -EFAULT; */
-                                break;
-
-                        /* increment and wrap read pointer */
-                        radio->rd_index += 3;
-                        if (radio->rd_index >= radio->buf_size)
-                                radio->rd_index = 0;
-
-                        /* increment counters */
-                        block_count++;
-                        buf += 3;
-                        retval += 3;
-                }
-
-                spin_unlock(&radio->lock);
+        mutex_lock(&radio->lock);
+        while (block_count < count) {
+                if (radio->rd_index == radio->wr_index)
+                        break;
+
+                /* always transfer rds complete blocks */
+                if (copy_to_user(buf, &radio->buffer[radio->rd_index], 3))
+                        /* retval = -EFAULT; */
+                        break;
+
+                /* increment and wrap read pointer */
+                radio->rd_index += 3;
+                if (radio->rd_index >= radio->buf_size)
+                        radio->rd_index = 0;
+
+                /* increment counters */
+                block_count++;
+                buf += 3;
+                retval += 3;
         }
+        mutex_unlock(&radio->lock);
 
         return retval;
 }
@@ -906,7 +955,8 @@ static unsigned int si470x_fops_poll(struct file *file,
         /* switch on rds reception */
         if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0) {
                 si470x_rds_on(radio);
-                schedule_work(&radio->work);
+                schedule_delayed_work(&radio->work,
+                        msecs_to_jiffies(rds_poll_time));
         }
 
         poll_wait(file, &radio->read_queue, pts);
@@ -924,10 +974,22 @@ static unsigned int si470x_fops_poll(struct file *file,
 static int si470x_fops_open(struct inode *inode, struct file *file)
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        int retval;
 
         radio->users++;
-        if (radio->users == 1)
-                return si470x_start(radio);
+
+        retval = usb_autopm_get_interface(radio->intf);
+        if (retval < 0) {
+                radio->users--;
+                return -EIO;
+        }
+
+        if (radio->users == 1) {
+                retval = si470x_start(radio);
+                if (retval < 0)
+                        usb_autopm_put_interface(radio->intf);
+                return retval;
+        }
 
         return 0;
 }
@@ -939,6 +1001,7 @@ static int si470x_fops_open(struct inode *inode, struct file *file)
 static int si470x_fops_release(struct inode *inode, struct file *file)
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        int retval;
 
         if (!radio)
                 return -ENODEV;
@@ -946,13 +1009,14 @@ static int si470x_fops_release(struct inode *inode, struct file *file)
         radio->users--;
         if (radio->users == 0) {
                 /* stop rds reception */
-                del_timer_sync(&radio->timer);
-                flush_scheduled_work();
+                cancel_delayed_work_sync(&radio->work);
 
                 /* cancel read processes */
                 wake_up_interruptible(&radio->read_queue);
 
-                return si470x_stop(radio);
+                retval = si470x_stop(radio);
+                usb_autopm_put_interface(radio->intf);
+                return retval;
         }
 
         return 0;
@@ -1030,7 +1094,7 @@ static int si470x_vidioc_querycap(struct file *file, void *priv,
         strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));
         strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));
         sprintf(capability->bus_info, "USB");
-        capability->version = DRIVER_VERSION;
+        capability->version = DRIVER_KERNEL_VERSION;
         capability->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
 
         return 0;
@@ -1067,16 +1131,21 @@ static int si470x_vidioc_s_input(struct file *filp, void *priv, unsigned int i)
 static int si470x_vidioc_queryctrl(struct file *file, void *priv,
                 struct v4l2_queryctrl *qc)
 {
-        int i;
+        unsigned char i;
+        int retval = -EINVAL;
 
         for (i = 0; i < ARRAY_SIZE(si470x_v4l2_queryctrl); i++) {
                 if (qc->id && qc->id == si470x_v4l2_queryctrl[i].id) {
                         memcpy(qc, &(si470x_v4l2_queryctrl[i]), sizeof(*qc));
-                        return 0;
+                        retval = 0;
+                        break;
                 }
         }
+        if (retval < 0)
+                printk(KERN_WARNING DRIVER_NAME
+                        ": query control failed with %d\n", retval);
 
-        return -EINVAL;
+        return retval;
 }
 
 
@@ -1110,21 +1179,29 @@ static int si470x_vidioc_s_ctrl(struct file *file, void *priv,
                 struct v4l2_control *ctrl)
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        int retval;
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_VOLUME:
                 radio->registers[SYSCONFIG2] &= ~SYSCONFIG2_VOLUME;
                 radio->registers[SYSCONFIG2] |= ctrl->value;
-                return si470x_set_register(radio, SYSCONFIG2);
+                retval = si470x_set_register(radio, SYSCONFIG2);
+                break;
         case V4L2_CID_AUDIO_MUTE:
                 if (ctrl->value == 1)
                         radio->registers[POWERCFG] &= ~POWERCFG_DMUTE;
                 else
                         radio->registers[POWERCFG] |= POWERCFG_DMUTE;
-                return si470x_set_register(radio, POWERCFG);
+                retval = si470x_set_register(radio, POWERCFG);
+                break;
+        default:
+                retval = -EINVAL;
         }
+        if (retval < 0)
+                printk(KERN_WARNING DRIVER_NAME
+                        ": set control failed with %d\n", retval);
 
-        return -EINVAL;
+        return retval;
 }
 
 
@@ -1163,8 +1240,8 @@ static int si470x_vidioc_s_audio(struct file *file, void *priv,
 static int si470x_vidioc_g_tuner(struct file *file, void *priv,
                 struct v4l2_tuner *tuner)
 {
-        int retval;
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        int retval;
 
         if (tuner->index > 0)
                 return -EINVAL;
@@ -1220,6 +1297,7 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
                 struct v4l2_tuner *tuner)
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        int retval;
 
         if (tuner->index > 0)
                 return -EINVAL;
@@ -1229,7 +1307,12 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
         else
                 radio->registers[POWERCFG] &= ~POWERCFG_MONO; /* try stereo */
 
-        return si470x_set_register(radio, POWERCFG);
+        retval = si470x_set_register(radio, POWERCFG);
+        if (retval < 0)
+                printk(KERN_WARNING DRIVER_NAME
+                        ": set tuner failed with %d\n", retval);
+
+        return retval;
 }
 
 
@@ -1255,11 +1338,17 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
                 struct v4l2_frequency *freq)
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
+        int retval;
 
         if (freq->type != V4L2_TUNER_RADIO)
                 return -EINVAL;
 
-        return si470x_set_freq(radio, freq->frequency);
+        retval = si470x_set_freq(radio, freq->frequency);
+        if (retval < 0)
+                printk(KERN_WARNING DRIVER_NAME
+                        ": set frequency failed with %d\n", retval);
+
+        return 0;
 }
 
 
@@ -1299,71 +1388,116 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
 {
         struct si470x_device *radio;
+        int retval = -ENOMEM;
 
-        /* memory and interface allocations */
-        radio = kmalloc(sizeof(struct si470x_device), GFP_KERNEL);
+        /* private data allocation */
+        radio = kzalloc(sizeof(struct si470x_device), GFP_KERNEL);
         if (!radio)
-                return -ENOMEM;
+                goto err_initial;
+
+        /* video device allocation */
         radio->videodev = video_device_alloc();
-        if (!radio->videodev) {
-                kfree(radio);
-                return -ENOMEM;
-        }
+        if (!radio->videodev)
+                goto err_radio;
+
+        /* initial configuration */
         memcpy(radio->videodev, &si470x_viddev_template,
                         sizeof(si470x_viddev_template));
         radio->users = 0;
         radio->usbdev = interface_to_usbdev(intf);
+        radio->intf = intf;
+        mutex_init(&radio->lock);
         video_set_drvdata(radio->videodev, radio);
-        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) {
-                printk(KERN_WARNING DRIVER_NAME
-                                ": Could not register video device\n");
-                video_device_release(radio->videodev);
-                kfree(radio);
-                return -EIO;
-        }
-        usb_set_intfdata(intf, radio);
 
         /* show some infos about the specific device */
-        if (si470x_get_all_registers(radio) < 0) {
-                video_device_release(radio->videodev);
-                kfree(radio);
-                return -EIO;
-        }
-        printk(KERN_INFO DRIVER_NAME ": DeviceID=0x%4.4x ChipID=0x%4.4x\n",
+        retval = -EIO;
+        if (si470x_get_all_registers(radio) < 0)
+                goto err_all;
+        printk(KERN_INFO DRIVER_NAME ": DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
                         radio->registers[DEVICEID], radio->registers[CHIPID]);
 
         /* check if firmware is current */
         if ((radio->registers[CHIPID] & CHIPID_FIRMWARE)
-                        < RADIO_SW_VERSION_CURRENT)
+                        < RADIO_SW_VERSION_CURRENT) {
+                printk(KERN_WARNING DRIVER_NAME
+                        ": This driver is known to work with "
+                        "firmware version %hu,\n", RADIO_SW_VERSION_CURRENT);
+                printk(KERN_WARNING DRIVER_NAME
+                        ": but the device has firmware version %hu.\n",
+                        radio->registers[CHIPID] & CHIPID_FIRMWARE);
+                printk(KERN_WARNING DRIVER_NAME
+                        ": If you have some trouble using this driver,\n");
                 printk(KERN_WARNING DRIVER_NAME
-                        ": This driver is known to work with chip version %d, "
-                        "but the device has firmware %d.\n"
-                        DRIVER_NAME
-                        "If you have some trouble using this driver, please "
-                        "report to V4L ML at video4linux-list@redhat.com\n",
-                        radio->registers[CHIPID] & CHIPID_FIRMWARE,
-                        RADIO_SW_VERSION_CURRENT);
+                        ": please report to V4L ML at "
+                        "video4linux-list@redhat.com\n");
+        }
 
         /* set initial frequency */
         si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */
 
-        /* rds initialization */
+        /* rds buffer allocation */
         radio->buf_size = rds_buf * 3;
         radio->buffer = kmalloc(radio->buf_size, GFP_KERNEL);
-        if (!radio->buffer) {
-                video_device_release(radio->videodev);
-                kfree(radio);
-                return -ENOMEM;
-        }
+        if (!radio->buffer)
+                goto err_all;
+
+        /* rds buffer configuration */
         radio->wr_index = 0;
         radio->rd_index = 0;
         init_waitqueue_head(&radio->read_queue);
 
-        /* prepare polling via eventd */
-        INIT_WORK(&radio->work, si470x_work);
-        init_timer(&radio->timer);
-        radio->timer.function = si470x_timer;
-        radio->timer.data = (unsigned long) radio;
+        /* prepare rds work function */
+        INIT_DELAYED_WORK(&radio->work, si470x_work);
+
+        /* register video device */
+        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) {
+                printk(KERN_WARNING DRIVER_NAME
+                                ": Could not register video device\n");
+                goto err_all;
+        }
+        usb_set_intfdata(intf, radio);
+
+        return 0;
+err_all:
+        video_device_release(radio->videodev);
+        kfree(radio->buffer);
+err_radio:
+        kfree(radio);
+err_initial:
+        return retval;
+}
+
+
+/*
+ * si470x_usb_driver_suspend - suspend the device
+ */
+static int si470x_usb_driver_suspend(struct usb_interface *intf,
+                pm_message_t message)
+{
+        struct si470x_device *radio = usb_get_intfdata(intf);
+
+        printk(KERN_INFO DRIVER_NAME ": suspending now...\n");
+
+        cancel_delayed_work_sync(&radio->work);
+
+        return 0;
+}
+
+
+/*
+ * si470x_usb_driver_resume - resume the device
+ */
+static int si470x_usb_driver_resume(struct usb_interface *intf)
+{
+        struct si470x_device *radio = usb_get_intfdata(intf);
+
+        printk(KERN_INFO DRIVER_NAME ": resuming now...\n");
+
+        mutex_lock(&radio->lock);
+        if (radio->users && radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS)
+                schedule_delayed_work(&radio->work,
+                        msecs_to_jiffies(rds_poll_time));
+        mutex_unlock(&radio->lock);
 
         return 0;
 }
@@ -1376,15 +1510,11 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
 {
         struct si470x_device *radio = usb_get_intfdata(intf);
 
-        del_timer_sync(&radio->timer);
-        flush_scheduled_work();
-
+        cancel_delayed_work_sync(&radio->work);
         usb_set_intfdata(intf, NULL);
-        if (radio) {
-                video_unregister_device(radio->videodev);
-                kfree(radio->buffer);
-                kfree(radio);
-        }
+        video_unregister_device(radio->videodev);
+        kfree(radio->buffer);
+        kfree(radio);
 }
 
 
@@ -1392,10 +1522,13 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
  * si470x_usb_driver - usb driver interface
  */
 static struct usb_driver si470x_usb_driver = {
-        .name           = DRIVER_NAME,
-        .probe          = si470x_usb_driver_probe,
-        .disconnect     = si470x_usb_driver_disconnect,
-        .id_table       = si470x_usb_driver_id_table,
+        .name                   = DRIVER_NAME,
+        .probe                  = si470x_usb_driver_probe,
+        .disconnect             = si470x_usb_driver_disconnect,
+        .suspend                = si470x_usb_driver_suspend,
+        .resume                 = si470x_usb_driver_resume,
+        .id_table               = si470x_usb_driver_id_table,
+        .supports_autosuspend   = 1,
 };
 
 
@@ -1409,7 +1542,7 @@ static struct usb_driver si470x_usb_driver = {
  */
 static int __init si470x_module_init(void)
 {
-        printk(KERN_INFO DRIVER_DESC "\n");
+        printk(KERN_INFO DRIVER_DESC ", Version " DRIVER_VERSION "\n");
         return usb_register(&si470x_usb_driver);
 }
 
@@ -1429,4 +1562,4 @@ module_exit(si470x_module_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION("1.0.4");
+MODULE_VERSION(DRIVER_VERSION);
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index a2e8987a6195..37072a21d8c9 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -4,14 +4,14 @@
 
 menuconfig VIDEO_CAPTURE_DRIVERS
         bool "Video capture adapters"
-        depends on VIDEO_DEV
+        depends on VIDEO_V4L2
         default y
         ---help---
           Say Y here to enable selecting the video adapters for
           webcams, analog TV, and hybrid analog/digital TV.
           Some of those devices also supports FM radio.
 
-if VIDEO_CAPTURE_DRIVERS && VIDEO_DEV
+if VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2
 
 config VIDEO_ADV_DEBUG
         bool "Enable advanced debug functionality"
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 850b8c6f4577..3f209b32eeac 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -10,8 +10,9 @@ msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 
 stkwebcam-objs  :=      stk-webcam.o stk-sensor.o
 
-obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o \
-                           v4l2-int-device.o
+obj-$(CONFIG_VIDEO_DEV) += videodev.o compat_ioctl32.o v4l2-int-device.o
+
+obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
 
 ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
   obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 907dc62c1783..5404fcc5276d 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -2354,8 +2354,8 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
                 BUG();
         }
 
-        mutex_lock(&fh->cap.lock);
-                kfree(fh->ov.clips);
+        mutex_lock(&fh->cap.vb_lock);
+        kfree(fh->ov.clips);
         fh->ov.clips    = clips;
         fh->ov.nclips   = n;
 
@@ -2376,7 +2376,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
                 bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
                 retval = bttv_switch_overlay(btv,fh,new);
         }
-        mutex_unlock(&fh->cap.lock);
+        mutex_unlock(&fh->cap.vb_lock);
         return retval;
 }
 
@@ -2576,7 +2576,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv,
         fmt = format_by_fourcc(f->fmt.pix.pixelformat);
 
         /* update our state informations */
-        mutex_lock(&fh->cap.lock);
+        mutex_lock(&fh->cap.vb_lock);
         fh->fmt              = fmt;
         fh->cap.field        = f->fmt.pix.field;
         fh->cap.last         = V4L2_FIELD_NONE;
@@ -2585,7 +2585,7 @@ static int bttv_s_fmt_cap(struct file *file, void *priv,
         btv->init.fmt        = fmt;
         btv->init.width      = f->fmt.pix.width;
         btv->init.height     = f->fmt.pix.height;
-        mutex_unlock(&fh->cap.lock);
+        mutex_unlock(&fh->cap.vb_lock);
 
         return 0;
 }
@@ -2611,11 +2611,11 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
         unsigned int i;
         struct bttv_fh *fh = priv;
 
-        mutex_lock(&fh->cap.lock);
+        mutex_lock(&fh->cap.vb_lock);
         retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
                                      V4L2_MEMORY_MMAP);
         if (retval < 0) {
-                mutex_unlock(&fh->cap.lock);
+                mutex_unlock(&fh->cap.vb_lock);
                 return retval;
         }
 
@@ -2627,7 +2627,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
         for (i = 0; i < gbuffers; i++)
                 mbuf->offsets[i] = i * gbufsize;
 
-        mutex_unlock(&fh->cap.lock);
+        mutex_unlock(&fh->cap.vb_lock);
         return 0;
 }
 #endif
@@ -2756,10 +2756,11 @@ static int bttv_overlay(struct file *file, void *f, unsigned int on)
         if (!check_alloc_btres(btv, fh, RESOURCE_OVERLAY))
                 return -EBUSY;
 
-        mutex_lock(&fh->cap.lock);
+        mutex_lock(&fh->cap.vb_lock);
         if (on) {
                 fh->ov.tvnorm = btv->tvnorm;
                 new = videobuf_pci_alloc(sizeof(*new));
+                new->crop = btv->crop[!!fh->do_crop].rect;
                 bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
         } else {
                 new = NULL;
@@ -2767,7 +2768,7 @@ static int bttv_overlay(struct file *file, void *f, unsigned int on)
 
         /* switch over */
         retval = bttv_switch_overlay(btv, fh, new);
-        mutex_unlock(&fh->cap.lock);
+        mutex_unlock(&fh->cap.vb_lock);
         return retval;
 }
 
@@ -2806,7 +2807,7 @@ static int bttv_s_fbuf(struct file *file, void *f,
         }
 
         /* ok, accept it */
-        mutex_lock(&fh->cap.lock);
+        mutex_lock(&fh->cap.vb_lock);
         btv->fbuf.base       = fb->base;
         btv->fbuf.fmt.width  = fb->fmt.width;
         btv->fbuf.fmt.height = fb->fmt.height;
@@ -2838,7 +2839,7 @@ static int bttv_s_fbuf(struct file *file, void *f,
                         retval = bttv_switch_overlay(btv, fh, new);
                 }
         }
-        mutex_unlock(&fh->cap.lock);
+        mutex_unlock(&fh->cap.vb_lock);
         return retval;
 }
 
@@ -3090,7 +3091,7 @@ static int bttv_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
 
         fh->do_crop = 1;
 
-        mutex_lock(&fh->cap.lock);
+        mutex_lock(&fh->cap.vb_lock);
 
         if (fh->width < c.min_scaled_width) {
                 fh->width = c.min_scaled_width;
@@ -3108,7 +3109,7 @@ static int bttv_s_crop(struct file *file, void *f, struct v4l2_crop *crop)
                 btv->init.height = c.max_scaled_height;
         }
 
-        mutex_unlock(&fh->cap.lock);
+        mutex_unlock(&fh->cap.vb_lock);
 
         return 0;
 }
@@ -3177,30 +3178,25 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
                 buf = list_entry(fh->cap.stream.next,struct bttv_buffer,vb.stream);
         } else {
                 /* read() capture */
-                mutex_lock(&fh->cap.lock);
+                mutex_lock(&fh->cap.vb_lock);
                 if (NULL == fh->cap.read_buf) {
                         /* need to capture a new frame */
-                        if (locked_btres(fh->btv,RESOURCE_VIDEO_STREAM)) {
-                                mutex_unlock(&fh->cap.lock);
-                                return POLLERR;
-                        }
+                        if (locked_btres(fh->btv,RESOURCE_VIDEO_STREAM))
+                                goto err;
                         fh->cap.read_buf = videobuf_pci_alloc(fh->cap.msize);
-                        if (NULL == fh->cap.read_buf) {
-                                mutex_unlock(&fh->cap.lock);
-                                return POLLERR;
-                        }
+                        if (NULL == fh->cap.read_buf)
+                                goto err;
                         fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR;
                         field = videobuf_next_field(&fh->cap);
                         if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,field)) {
                                 kfree (fh->cap.read_buf);
                                 fh->cap.read_buf = NULL;
-                                mutex_unlock(&fh->cap.lock);
-                                return POLLERR;
+                                goto err;
                         }
                         fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf);
                         fh->cap.read_off = 0;
                 }
-                mutex_unlock(&fh->cap.lock);
+                mutex_unlock(&fh->cap.vb_lock);
                 buf = (struct bttv_buffer*)fh->cap.read_buf;
         }
 
@@ -3209,6 +3205,9 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
             buf->vb.state == VIDEOBUF_ERROR)
                 return POLLIN|POLLRDNORM;
         return 0;
+err:
+        mutex_unlock(&fh->cap.vb_lock);
+        return POLLERR;
 }
 
 static int bttv_open(struct inode *inode, struct file *file)
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 1f0cc79e2a33..75fa82c7c735 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -352,13 +352,13 @@ int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt)
            because vbi_fmt.end counts field lines times two. */
         end = max(frt->fmt.vbi.start[0], start1) * 2 + 2;
 
-        mutex_lock(&fh->vbi.lock);
+        mutex_lock(&fh->vbi.vb_lock);
 
         fh->vbi_fmt.fmt    = frt->fmt.vbi;
         fh->vbi_fmt.tvnorm = tvnorm;
         fh->vbi_fmt.end    = end;
 
-        mutex_unlock(&fh->vbi.lock);
+        mutex_unlock(&fh->vbi.vb_lock);
 
         rc = 0;
 
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 0aedbeaf94cd..e357f415db06 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -609,13 +609,19 @@ static int cx8802_request_acquire(struct cx8802_driver *drv)
         struct cx88_core *core = drv->core;
 
         /* Fail a request for hardware if the device is busy. */
-        if (core->active_type_id != CX88_BOARD_NONE)
+        if (core->active_type_id != CX88_BOARD_NONE &&
+            core->active_type_id != drv->type_id)
                 return -EBUSY;
 
         if (drv->advise_acquire)
         {
-                core->active_type_id = drv->type_id;
-                drv->advise_acquire(drv);
+                mutex_lock(&drv->core->lock);
+                core->active_ref++;
+                if (core->active_type_id == CX88_BOARD_NONE) {
+                        core->active_type_id = drv->type_id;
+                        drv->advise_acquire(drv);
+                }
+                mutex_unlock(&drv->core->lock);
 
                 mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO));
         }
@@ -628,12 +634,14 @@ static int cx8802_request_release(struct cx8802_driver *drv)
 {
         struct cx88_core *core = drv->core;
 
-        if (drv->advise_release)
+        mutex_lock(&drv->core->lock);
+        if (drv->advise_release && --core->active_ref == 0)
         {
                 drv->advise_release(drv);
                 core->active_type_id = CX88_BOARD_NONE;
                 mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO));
         }
+        mutex_unlock(&drv->core->lock);
 
         return 0;
 }
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 4e823f2a539a..37e6d2e4002f 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -336,6 +336,7 @@ struct cx88_core {
         /* cx88-video needs to access cx8802 for hybrid tuner pll access. */
         struct cx8802_dev          *dvbdev;
         enum cx88_board_type       active_type_id;
+        int                        active_ref;
 };
 
 struct cx8800_dev;
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 941357c4f3f5..8c67f678266a 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -35,7 +35,6 @@
 #include <linux/vmalloc.h>
 #include <linux/proc_fs.h>
 #include <linux/module.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -270,8 +269,11 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream)
         dprintk("opening device and trying to acquire exclusive lock\n");
 
         /* Sets volume, mute, etc */
+
         dev->mute = 0;
+        mutex_lock(&dev->lock);
         ret = em28xx_audio_analog_set(dev);
+        mutex_unlock(&dev->lock);
         if (ret < 0)
                 goto err;
 
@@ -303,7 +305,9 @@ static int snd_em28xx_pcm_close(struct snd_pcm_substream *substream)
         dprintk("closing device\n");
 
         dev->mute = 1;
+        mutex_lock(&dev->lock);
         em28xx_audio_analog_set(dev);
+        mutex_unlock(&dev->lock);
 
         if (dev->adev->users == 0 && dev->adev->shutdown == 1) {
                 dprintk("audio users: %d\n", dev->adev->users);
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 2159d0160df2..aae7753fef11 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -393,15 +393,15 @@ struct em28xx_board em28xx_boards[] = {
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = SAA7115_COMPOSITE2,
-                        .amux     = 1,
+                        .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
                         .type     = EM28XX_VMUX_COMPOSITE1,
                         .vmux     = SAA7115_COMPOSITE0,
-                        .amux     = 1,
+                        .amux     = EM28XX_AMUX_LINE_IN,
                 }, {
                         .type     = EM28XX_VMUX_SVIDEO,
                         .vmux     = SAA7115_SVIDEO3,
-                        .amux     = 1,
+                        .amux     = EM28XX_AMUX_LINE_IN,
                 } },
         },
 };
@@ -441,6 +441,8 @@ struct usb_device_id em28xx_id_table [] = {
                         .driver_info = EM2820_BOARD_PINNACLE_DVC_90 },
         { USB_DEVICE(0x2040, 0x6500),
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
+        { USB_DEVICE(0x2040, 0x6502),
+                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
         { USB_DEVICE(0x2040, 0x6513),
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
         { USB_DEVICE(0x0ccd, 0x0042),
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index f6b78357f0e5..7d1537cab867 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -72,7 +72,8 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count)
         const size_t imagesize = PAGE_ALIGN(dev->frame_size);   /*needs to be page aligned cause the buffers can be mapped individually! */
         void *buff = NULL;
         u32 i;
-        em28xx_coredbg("requested %i buffers with size %zi", count, imagesize);
+        em28xx_coredbg("requested %i buffers with size %zi\n",
+                        count, imagesize);
         if (count > EM28XX_NUM_FRAMES)
                 count = EM28XX_NUM_FRAMES;
 
@@ -150,7 +151,7 @@ int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
         if (reg_debug){
                 printk(ret < 0 ? " failed!\n" : "%02x values: ", ret);
                 for (byte = 0; byte < len; byte++) {
-                        printk(" %02x", buf[byte]);
+                        printk(" %02x", (unsigned char)buf[byte]);
                 }
                 printk("\n");
         }
@@ -177,7 +178,8 @@ int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg)
                               0x0000, reg, &val, 1, HZ);
 
         if (reg_debug)
-                printk(ret < 0 ? " failed!\n" : "%02x\n", val);
+                printk(ret < 0 ? " failed!\n" :
+                                 "%02x\n", (unsigned char) val);
 
         if (ret < 0)
                 return ret;
@@ -237,7 +239,7 @@ int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len)
  * sets only some bits (specified by bitmask) of a register, by first reading
  * the actual value
  */
-int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
+static int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
                                  u8 bitmask)
 {
         int oldval;
@@ -254,26 +256,31 @@ int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
  */
 static int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 *val)
 {
-        int ret;
+        int ret, i;
         u8 addr = reg & 0x7f;
         if ((ret = em28xx_write_regs(dev, AC97LSB_REG, val, 2)) < 0)
                 return ret;
         if ((ret = em28xx_write_regs(dev, AC97ADDR_REG, &addr, 1)) < 0)
                 return ret;
-        if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
-                return ret;
-        else if (((u8) ret) & 0x01) {
-                em28xx_warn ("AC97 command still being executed: not handled properly!\n");
+
+        /* Wait up to 50 ms for AC97 command to complete */
+        for (i = 0; i < 10; i++) {
+                if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
+                        return ret;
+                if (!((u8) ret) & 0x01)
+                        return 0;
+                msleep(5);
         }
+        em28xx_warn ("AC97 command still being executed: not handled properly!\n");
         return 0;
 }
 
-int em28xx_set_audio_source(struct em28xx *dev)
+static int em28xx_set_audio_source(struct em28xx *dev)
 {
         static char *enable  = "\x08\x08";
         static char *disable = "\x08\x88";
         char *video = enable, *line = disable;
-        int ret, no_ac97;
+        int ret;
         u8 input;
 
         if (dev->is_em2800) {
@@ -293,11 +300,9 @@ int em28xx_set_audio_source(struct em28xx *dev)
                 switch (dev->ctl_ainput) {
                 case EM28XX_AMUX_VIDEO:
                         input = EM28XX_AUDIO_SRC_TUNER;
-                        no_ac97 = 1;
                         break;
                 case EM28XX_AMUX_LINE_IN:
                         input = EM28XX_AUDIO_SRC_LINE;
-                        no_ac97 = 1;
                         break;
                 case EM28XX_AMUX_AC97_VIDEO:
                         input = EM28XX_AUDIO_SRC_LINE;
@@ -313,12 +318,11 @@ int em28xx_set_audio_source(struct em28xx *dev)
         ret = em28xx_write_reg_bits(dev, AUDIOSRC_REG, input, 0xc0);
         if (ret < 0)
                 return ret;
+        msleep(5);
 
-        if (no_ac97)
-                return 0;
-
-        /* Sets AC97 mixer registers */
-
+        /* Sets AC97 mixer registers
+           This is seems to be needed, even for non-ac97 configs
+         */
         ret = em28xx_write_ac97(dev, VIDEO_AC97, video);
         if (ret < 0)
                 return ret;
@@ -337,9 +341,10 @@ int em28xx_audio_analog_set(struct em28xx *dev)
         s[0] |= 0x1f - dev->volume;
         s[1] |= 0x1f - dev->volume;
 
-        if (dev->mute)
-                s[1] |= 0x80;
+        /* Mute */
+        s[1] |= 0x80;
         ret = em28xx_write_ac97(dev, MASTER_AC97, s);
+
         if (ret < 0)
                 return ret;
 
@@ -357,6 +362,11 @@ int em28xx_audio_analog_set(struct em28xx *dev)
         /* Selects the proper audio input */
         ret = em28xx_set_audio_source(dev);
 
+        /* Unmute device */
+        if (!dev->mute)
+                s[1] &= ~0x80;
+        ret = em28xx_write_ac97(dev, MASTER_AC97, s);
+
         return ret;
 }
 EXPORT_SYMBOL_GPL(em28xx_audio_analog_set);
@@ -667,7 +677,7 @@ static void em28xx_isocIrq(struct urb *urb)
                                 continue;
                         }
                         if (urb->iso_frame_desc[i].actual_length >
-                                                 dev->max_pkt_size) {
+                            urb->iso_frame_desc[i].length) {
                                 em28xx_isocdbg("packet bigger than packet size");
                                 continue;
                         }
@@ -713,8 +723,11 @@ void em28xx_uninit_isoc(struct em28xx *dev)
         for (i = 0; i < EM28XX_NUM_BUFS; i++) {
                 if (dev->urb[i]) {
                         usb_kill_urb(dev->urb[i]);
-                        if (dev->transfer_buffer[i]){
-                                usb_buffer_free(dev->udev,(EM28XX_NUM_PACKETS*dev->max_pkt_size),dev->transfer_buffer[i],dev->urb[i]->transfer_dma);
+                        if (dev->transfer_buffer[i]) {
+                                usb_buffer_free(dev->udev,
+                                                dev->urb[i]->transfer_buffer_length,
+                                                dev->transfer_buffer[i],
+                                                dev->urb[i]->transfer_dma);
                         }
                         usb_free_urb(dev->urb[i]);
                 }
@@ -732,7 +745,10 @@ int em28xx_init_isoc(struct em28xx *dev)
 {
         /* change interface to 3 which allows the biggest packet sizes */
         int i, errCode;
-        const int sb_size = EM28XX_NUM_PACKETS * dev->max_pkt_size;
+        int sb_size;
+
+        em28xx_set_alternate(dev);
+        sb_size = EM28XX_NUM_PACKETS * dev->max_pkt_size;
 
         /* reset streaming vars */
         dev->frame_current = NULL;
@@ -741,7 +757,7 @@ int em28xx_init_isoc(struct em28xx *dev)
         /* allocate urbs */
         for (i = 0; i < EM28XX_NUM_BUFS; i++) {
                 struct urb *urb;
-                int j, k;
+                int j;
                 /* allocate transfer buffer */
                 urb = usb_alloc_urb(EM28XX_NUM_PACKETS, GFP_KERNEL);
                 if (!urb){
@@ -749,7 +765,9 @@ int em28xx_init_isoc(struct em28xx *dev)
                         em28xx_uninit_isoc(dev);
                         return -ENOMEM;
                 }
-                dev->transfer_buffer[i] = usb_buffer_alloc(dev->udev, sb_size, GFP_KERNEL,&urb->transfer_dma);
+                dev->transfer_buffer[i] = usb_buffer_alloc(dev->udev, sb_size,
+                                                           GFP_KERNEL,
+                                                           &urb->transfer_dma);
                 if (!dev->transfer_buffer[i]) {
                         em28xx_errdev
                                         ("unable to allocate %i bytes for transfer buffer %i\n",
@@ -762,22 +780,22 @@ int em28xx_init_isoc(struct em28xx *dev)
                 urb->dev = dev->udev;
                 urb->context = dev;
                 urb->pipe = usb_rcvisocpipe(dev->udev, 0x82);
-                urb->transfer_flags = URB_ISO_ASAP;
+                urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
                 urb->interval = 1;
                 urb->transfer_buffer = dev->transfer_buffer[i];
                 urb->complete = em28xx_isocIrq;
                 urb->number_of_packets = EM28XX_NUM_PACKETS;
                 urb->transfer_buffer_length = sb_size;
-                for (j = k = 0; j < EM28XX_NUM_PACKETS;
-                                j++, k += dev->max_pkt_size) {
-                        urb->iso_frame_desc[j].offset = k;
-                        urb->iso_frame_desc[j].length =
-                                dev->max_pkt_size;
+                for (j = 0; j < EM28XX_NUM_PACKETS; j++) {
+                        urb->iso_frame_desc[j].offset = j * dev->max_pkt_size;
+                        urb->iso_frame_desc[j].length = dev->max_pkt_size;
                 }
                 dev->urb[i] = urb;
         }
 
         /* submit urbs */
+        em28xx_coredbg("Submitting %d urbs of %d packets (%d each)\n",
+                       EM28XX_NUM_BUFS, EM28XX_NUM_PACKETS, dev->max_pkt_size);
         for (i = 0; i < EM28XX_NUM_BUFS; i++) {
                 errCode = usb_submit_urb(dev->urb[i], GFP_KERNEL);
                 if (errCode) {
@@ -794,22 +812,31 @@ int em28xx_init_isoc(struct em28xx *dev)
 int em28xx_set_alternate(struct em28xx *dev)
 {
         int errCode, prev_alt = dev->alt;
-        dev->alt = alt;
-        if (dev->alt == 0) {
-                int i;
-                for(i=0;i< dev->num_alt; i++)
-                        if(dev->alt_max_pkt_size[i]>dev->alt_max_pkt_size[dev->alt])
-                                dev->alt=i;
-        }
+        int i;
+        unsigned int min_pkt_size = dev->bytesperline+4;
+
+        /* When image size is bigger than a ceirtain value,
+           the frame size should be increased, otherwise, only
+           green screen will be received.
+         */
+        if (dev->frame_size > 720*240*2)
+                min_pkt_size *= 2;
+
+        for (i = 0; i < dev->num_alt; i++)
+                if (dev->alt_max_pkt_size[i] >= min_pkt_size)
+                        break;
+        dev->alt = i;
 
         if (dev->alt != prev_alt) {
+                em28xx_coredbg("minimum isoc packet size: %u (alt=%d)\n",
+                                min_pkt_size, dev->alt);
                 dev->max_pkt_size = dev->alt_max_pkt_size[dev->alt];
-                em28xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n", dev->alt,
-                       dev->max_pkt_size);
+                em28xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n",
+                               dev->alt, dev->max_pkt_size);
                 errCode = usb_set_interface(dev->udev, 0, dev->alt);
                 if (errCode < 0) {
                         em28xx_errdev ("cannot change alternate number to %d (error=%i)\n",
-                                                        dev->alt, errCode);
+                                        dev->alt, errCode);
                         return errCode;
                 }
         }
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a0c334672488..4abe6701a770 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -189,7 +189,7 @@ static void video_mux(struct em28xx *dev, int index)
                 em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING, &route);
         }
 
-        em28xx_set_audio_source(dev);
+        em28xx_audio_analog_set(dev);
 }
 
 /* Usage lock check functions */
@@ -830,6 +830,63 @@ static int vidioc_s_frequency(struct file *file, void *priv,
         return 0;
 }
 
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int em28xx_reg_len(int reg)
+{
+        switch (reg) {
+        case AC97LSB_REG:
+        case HSCALELOW_REG:
+        case VSCALELOW_REG:
+                return 2;
+        default:
+                return 1;
+        }
+}
+
+static int vidioc_g_register(struct file *file, void *priv,
+                             struct v4l2_register *reg)
+{
+        struct em28xx_fh      *fh  = priv;
+        struct em28xx         *dev = fh->dev;
+        int ret;
+
+        if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
+                return -EINVAL;
+
+        if (em28xx_reg_len(reg->reg) == 1) {
+                ret = em28xx_read_reg(dev, reg->reg);
+                if (ret < 0)
+                        return ret;
+
+                reg->val = ret;
+        } else {
+                u64 val = 0;
+                ret = em28xx_read_reg_req_len(dev, USB_REQ_GET_STATUS,
+                                                   reg->reg, (char *)&val, 2);
+                if (ret < 0)
+                        return ret;
+
+                reg->val = cpu_to_le64((__u64)val);
+        }
+
+        return 0;
+}
+
+static int vidioc_s_register(struct file *file, void *priv,
+                             struct v4l2_register *reg)
+{
+        struct em28xx_fh      *fh  = priv;
+        struct em28xx         *dev = fh->dev;
+        u64 buf;
+
+        buf = le64_to_cpu((__u64)reg->val);
+
+        return em28xx_write_regs(dev, reg->reg, (char *)&buf,
+                                 em28xx_reg_len(reg->reg));
+}
+#endif
+
+
 static int vidioc_cropcap(struct file *file, void *priv,
                                         struct v4l2_cropcap *cc)
 {
@@ -1295,8 +1352,6 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         filp->private_data = fh;
 
         if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) {
-                em28xx_set_alternate(dev);
-
                 dev->width = norm_maxw(dev);
                 dev->height = norm_maxh(dev);
                 dev->frame_size = dev->width * dev->height * 2;
@@ -1305,6 +1360,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                 dev->hscale = 0;
                 dev->vscale = 0;
 
+                em28xx_set_alternate(dev);
                 em28xx_capture_start(dev, 1);
                 em28xx_resolution_set(dev);
 
@@ -1730,6 +1786,10 @@ static const struct video_device em28xx_video_template = {
         .vidioc_s_tuner             = vidioc_s_tuner,
         .vidioc_g_frequency         = vidioc_g_frequency,
         .vidioc_s_frequency         = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .vidioc_g_register          = vidioc_g_register,
+        .vidioc_s_register          = vidioc_s_register,
+#endif
 
         .tvnorms                    = V4L2_STD_ALL,
         .current_norm               = V4L2_STD_PAL,
@@ -1752,6 +1812,10 @@ static struct video_device em28xx_radio_template = {
         .vidioc_s_ctrl        = vidioc_s_ctrl,
         .vidioc_g_frequency   = vidioc_g_frequency,
         .vidioc_s_frequency   = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        .vidioc_g_register    = vidioc_g_register,
+        .vidioc_s_register    = vidioc_s_register,
+#endif
 };
 
 /******************************** usb interface *****************************************/
@@ -1796,10 +1860,10 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
 }
 EXPORT_SYMBOL(em28xx_unregister_extension);
 
-struct video_device *em28xx_vdev_init(struct em28xx *dev,
-                                      const struct video_device *template,
-                                      const int type,
-                                      const char *type_name)
+static struct video_device *em28xx_vdev_init(struct em28xx *dev,
+                                             const struct video_device *template,
+                                             const int type,
+                                             const char *type_name)
 {
         struct video_device *vfd;
 
@@ -2064,6 +2128,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         snprintf(dev->name, 29, "em28xx #%d", nr);
         dev->devno = nr;
         dev->model = id->driver_info;
+        dev->alt   = -1;
 
         /* Checks if audio is provided by some interface */
         for (i = 0; i < udev->config->desc.bNumInterfaces; i++) {
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index f3bad0c1c517..04e0e48ecabe 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -33,7 +33,7 @@
 #define UNSET -1
 
 /* maximum number of em28xx boards */
-#define EM28XX_MAXBOARDS 1 /*FIXME: should be bigger */
+#define EM28XX_MAXBOARDS 4 /*FIXME: should be bigger */
 
 /* maximum number of frames that can be queued */
 #define EM28XX_NUM_FRAMES 5
@@ -345,9 +345,6 @@ int em28xx_read_reg(struct em28xx *dev, u16 reg);
 int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
                           int len);
 int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
-int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
-                          u8 bitmask);
-int em28xx_set_audio_source(struct em28xx *dev);
 int em28xx_audio_analog_set(struct em28xx *dev);
 
 int em28xx_colorlevels_set_default(struct em28xx *dev);
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 7d7f383b404f..262830da08c8 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -928,27 +928,38 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
+                .gpiomask       = 0x03,
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
                         .amux = TV,
                         .tv   = 1,
-                },{
+                        .gpio = 0x00,
+                }, {
                         .name = name_comp1,
-                        .vmux = 0,
-                        .amux = LINE2,
-                },{
-                        .name = name_comp2,
                         .vmux = 3,
-                        .amux = LINE2,
-                },{
+                        .amux = LINE1,
+                        .gpio = 0x02,
+                }, {
+                        .name = name_comp2,
+                        .vmux = 0,
+                        .amux = LINE1,
+                        .gpio = 0x02,
+                }, {
                         .name = name_svideo,
                         .vmux = 8,
-                        .amux = LINE2,
-                }},
+                        .amux = LINE1,
+                        .gpio = 0x02,
+                } },
                 .radio = {
                         .name = name_radio,
-                        .amux = LINE2,
+                        .amux = LINE1,
+                        .gpio = 0x01,
+                },
+                .mute  = {
+                        .name = name_mute,
+                        .amux = TV,
+                        .gpio = 0x00,
                 },
         },
         [SAA7134_BOARD_BMK_MPEX_TUNER] = {
@@ -3912,6 +3923,74 @@ struct saa7134_board saa7134_boards[] = {
                 },
                 .mpeg  = SAA7134_MPEG_EMPRESS,
         },
+        [SAA7134_BOARD_TWINHAN_DTV_DVB_3056] = {
+                .name           = "Twinhan Hybrid DTV-DVB 3056 PCI",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 2,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 0x0200000,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                }, {
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                }, {
+                        .name   = name_svideo,
+                        .vmux   = 8,            /* untested */
+                        .amux   = LINE1,
+                } },
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = TV,
+                        .gpio   = 0x0200000,
+                },
+        },
+        [SAA7134_BOARD_GENIUS_TVGO_A11MCE] = {
+                /* Adrian Pardini <pardo.bsso@gmail.com> */
+                .name           = "Genius TVGO AM11MCE",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_TNF_5335MF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0xf000,
+                .inputs         = {{
+                        .name = name_tv_mono,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .gpio = 0x0000,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+                        .tv = 1
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+        } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+                        .gpio = 0x1000,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = LINE2,
+                        .gpio = 0x6000,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4511,6 +4590,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x5168,
+                .subdevice    = 0x3307, /* FlyDVB-T Hybrid Mini PCI */
+                .driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x16be,
                 .subdevice    = 0x0007,
                 .driver_data  = SAA7134_BOARD_MEDION_MD8800_QUADRO,
@@ -4523,6 +4608,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x16be,
+                .subdevice    = 0x000d, /* triple CTX948_V1.1.1 */
+                .driver_data  = SAA7134_BOARD_MEDION_MD8800_QUADRO,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x1461,
                 .subdevice    = 0x2c05,
                 .driver_data  = SAA7134_BOARD_AVERMEDIA_777,
@@ -4843,7 +4934,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x4e42,
                 .subdevice    = 0x3502,
-                .driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS
+                .driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1822, /*Twinhan Technology Co. Ltd*/
+                .subdevice    = 0x0022,
+                .driver_data  = SAA7134_BOARD_TWINHAN_DTV_DVB_3056,
         },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -4995,6 +5092,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_BEHOLD_409:
         case SAA7134_BOARD_BEHOLD_505FM:
         case SAA7134_BOARD_BEHOLD_507_9FM:
+        case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
@@ -5232,7 +5330,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
         case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
         case SAA7134_BOARD_MEDION_MD8800_QUADRO:
-       case SAA7134_BOARD_AVERMEDIA_SUPER_007:
+        case SAA7134_BOARD_AVERMEDIA_SUPER_007:
+        case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:
                 /* this is a hybrid board, initialize to analog mode
                  * and configure firmware eeprom address
                  */
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index a9ca5730826f..ea2be9eceeb8 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -779,6 +779,21 @@ static struct tda1004x_config avermedia_super_007_config = {
         .request_firmware = philips_tda1004x_request_firmware
 };
 
+static struct tda1004x_config twinhan_dtv_dvb_3056_config = {
+        .demod_address = 0x08,
+        .invert        = 1,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_16M,
+        .agc_config    = TDA10046_AGC_TDA827X,
+        .gpio_config   = TDA10046_GP01_I,
+        .if_freq       = TDA10046_FREQ_045,
+        .i2c_gate      = 0x42,
+        .tuner_address = 0x61,
+        .tuner_config  = 2,
+        .antenna_switch = 1,
+        .request_firmware = philips_tda1004x_request_firmware
+};
+
 /* ------------------------------------------------------------------
  * special case: this card uses saa713x GPIO22 for the mode switch
  */
@@ -826,6 +841,7 @@ static struct tda1004x_config ads_tech_duo_config = {
 static struct tda10086_config flydvbs = {
         .demod_address = 0x0e,
         .invert = 0,
+        .diseqc_tone = 0,
 };
 
 /* ==================================================================
@@ -940,9 +956,9 @@ static int dvb_init(struct saa7134_dev *dev)
                 configure_tda827x_fe(dev, &tda827x_lifeview_config);
                 break;
         case SAA7134_BOARD_FLYDVB_TRIO:
-                if(! use_frontend) {    //terrestrial
+                if(! use_frontend) {    /* terrestrial */
                         configure_tda827x_fe(dev, &lifeview_trio_config);
-                } else {              //satellite
+                } else {                /* satellite */
                         dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap);
                         if (dev->dvb.frontend) {
                                 if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x63,
@@ -1007,8 +1023,9 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
-                dev->dvb.frontend = tda10046_attach(&medion_cardbus,
-                                                    &dev->i2c_adap);
+                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                                               &medion_cardbus,
+                                               &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
                         dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
@@ -1044,6 +1061,9 @@ static int dvb_init(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_SUPER_007:
                 configure_tda827x_fe(dev, &avermedia_super_007_config);
                 break;
+        case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:
+                configure_tda827x_fe(dev, &twinhan_dtv_dvb_3056_config);
+                break;
         default:
                 wprintk("Huh? unknown DVB card?\n");
                 break;
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index b1b01fa86720..3d2ec30de227 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -87,7 +87,7 @@ static int ts_open(struct inode *inode, struct file *file)
 
         dprintk("open minor=%d\n",minor);
         err = -EBUSY;
-        if (!mutex_trylock(&dev->empress_tsq.lock))
+        if (!mutex_trylock(&dev->empress_tsq.vb_lock))
                 goto done;
         if (dev->empress_users)
                 goto done_up;
@@ -101,7 +101,7 @@ static int ts_open(struct inode *inode, struct file *file)
         err = 0;
 
 done_up:
-        mutex_unlock(&dev->empress_tsq.lock);
+        mutex_unlock(&dev->empress_tsq.vb_lock);
 done:
         return err;
 }
@@ -110,7 +110,6 @@ static int ts_release(struct inode *inode, struct file *file)
 {
         struct saa7134_dev *dev = file->private_data;
 
-        mutex_lock(&dev->empress_tsq.lock);
         videobuf_stop(&dev->empress_tsq);
         videobuf_mmap_free(&dev->empress_tsq);
         dev->empress_users--;
@@ -122,7 +121,6 @@ static int ts_release(struct inode *inode, struct file *file)
         saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
                 saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6));
 
-        mutex_unlock(&dev->empress_tsq.lock);
         return 0;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 0db955c2d9b9..b4188819782f 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -406,6 +406,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x8000000;
                 polling      = 50; //ms
                 break;
+        case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
+                ir_codes     = ir_codes_genius_tvgo_a11mce;
+                mask_keycode = 0xff;
+                mask_keydown = 0xf00000;
+                polling = 50; /* ms */
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 1184d359e848..39c41ad97d0e 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1414,21 +1414,17 @@ video_poll(struct file *file, struct poll_table_struct *wait)
                 if (!list_empty(&fh->cap.stream))
                         buf = list_entry(fh->cap.stream.next, struct videobuf_buffer, stream);
         } else {
-                mutex_lock(&fh->cap.lock);
+                mutex_lock(&fh->cap.vb_lock);
                 if (UNSET == fh->cap.read_off) {
                         /* need to capture a new frame */
-                        if (res_locked(fh->dev,RESOURCE_VIDEO)) {
-                                mutex_unlock(&fh->cap.lock);
-                                return POLLERR;
-                        }
-                        if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) {
-                                mutex_unlock(&fh->cap.lock);
-                                return POLLERR;
-                        }
+                        if (res_locked(fh->dev,RESOURCE_VIDEO))
+                                goto err;
+                        if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field))
+                                goto err;
                         fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf);
                         fh->cap.read_off = 0;
                 }
-                mutex_unlock(&fh->cap.lock);
+                mutex_unlock(&fh->cap.vb_lock);
                 buf = fh->cap.read_buf;
         }
 
@@ -1440,6 +1436,10 @@ video_poll(struct file *file, struct poll_table_struct *wait)
             buf->state == VIDEOBUF_ERROR)
                 return POLLIN|POLLRDNORM;
         return 0;
+
+err:
+        mutex_unlock(&fh->cap.vb_lock);
+        return POLLERR;
 }
 
 static int video_release(struct inode *inode, struct file *file)
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index b88ca995fafb..f940d0254798 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -252,6 +252,8 @@ struct saa7134_format {
 #define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128
 #define SAA7134_BOARD_BEHOLD_607_9FM    129
 #define SAA7134_BOARD_BEHOLD_M6         130
+#define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131
+#define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
diff --git a/drivers/media/video/stk-sensor.c b/drivers/media/video/stk-sensor.c
index 4a9a0b62efa3..e546b014d7ad 100644
--- a/drivers/media/video/stk-sensor.c
+++ b/drivers/media/video/stk-sensor.c
@@ -225,7 +225,7 @@
 
 
 /* Returns 0 if OK */
-int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
+static int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
 {
         int i = 0;
         int tmpval = 0;
@@ -250,7 +250,7 @@ int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
                 return 0;
 }
 
-int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val)
+static int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val)
 {
         int i = 0;
         int tmpval = 0;
@@ -380,7 +380,7 @@ int stk_sensor_init(struct stk_camera *dev)
                 STK_ERROR("Strange error reading sensor ID\n");
                 return -ENODEV;
         }
-        if (idh != 0x7F || idl != 0xA2) {
+        if (idh != 0x7f || idl != 0xa2) {
                 STK_ERROR("Huh? you don't have a sensor from ovt\n");
                 return -ENODEV;
         }
@@ -409,6 +409,19 @@ static struct regval ov_fmt_uyvy[] = {
         {REG_COM15, COM15_R00FF },
         {0xff, 0xff}, /* END MARKER */
 };
+/* V4L2_PIX_FMT_YUYV */
+static struct regval ov_fmt_yuyv[] = {
+        {REG_TSLB, 0 },
+        { 0x4f, 0x80 },         /* "matrix coefficient 1" */
+        { 0x50, 0x80 },         /* "matrix coefficient 2" */
+        { 0x51, 0    },         /* vb */
+        { 0x52, 0x22 },         /* "matrix coefficient 4" */
+        { 0x53, 0x5e },         /* "matrix coefficient 5" */
+        { 0x54, 0x80 },         /* "matrix coefficient 6" */
+        {REG_COM13, COM13_UVSAT|COM13_CMATRIX},
+        {REG_COM15, COM15_R00FF },
+        {0xff, 0xff}, /* END MARKER */
+};
 
 /* V4L2_PIX_FMT_RGB565X rrrrrggg gggbbbbb */
 static struct regval ov_fmt_rgbr[] = {
@@ -519,6 +532,10 @@ int stk_sensor_configure(struct stk_camera *dev)
                 com7 |= COM7_YUV;
                 rv = ov_fmt_uyvy;
                 break;
+        case V4L2_PIX_FMT_YUYV:
+                com7 |= COM7_YUV;
+                rv = ov_fmt_yuyv;
+                break;
         case V4L2_PIX_FMT_RGB565:
                 com7 |= COM7_RGB;
                 rv = ov_fmt_rgbp;
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index d37e5e2594b4..ceba45ad0294 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -63,7 +63,7 @@ static struct usb_device_id stkwebcam_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, stkwebcam_table);
 
-void stk_camera_cleanup(struct kref *kref)
+static void stk_camera_cleanup(struct kref *kref)
 {
         struct stk_camera *dev = to_stk_camera(kref);
 
@@ -682,6 +682,7 @@ static int v4l_stk_open(struct inode *inode, struct file *fp)
                 return -ENXIO;
         fp->private_data = vdev;
         kref_get(&dev->kref);
+        usb_autopm_get_interface(dev->interface);
 
         return 0;
 }
@@ -703,6 +704,7 @@ static int v4l_stk_release(struct inode *inode, struct file *fp)
         }
 
         if (dev->owner != fp) {
+                usb_autopm_put_interface(dev->interface);
                 kref_put(&dev->kref, stk_camera_cleanup);
                 return 0;
         }
@@ -713,6 +715,7 @@ static int v4l_stk_release(struct inode *inode, struct file *fp)
 
         dev->owner = NULL;
 
+        usb_autopm_put_interface(dev->interface);
         kref_put(&dev->kref, stk_camera_cleanup);
 
         return 0;
@@ -993,6 +996,10 @@ static int stk_vidioc_enum_fmt_cap(struct file *filp,
                 fmtd->pixelformat = V4L2_PIX_FMT_SBGGR8;
                 strcpy(fmtd->description, "Raw bayer");
                 break;
+        case 4:
+                fmtd->pixelformat = V4L2_PIX_FMT_YUYV;
+                strcpy(fmtd->description, "yuv4:2:2");
+                break;
         default:
                 return -EINVAL;
         }
@@ -1048,6 +1055,7 @@ static int stk_vidioc_try_fmt_cap(struct file *filp,
         case V4L2_PIX_FMT_RGB565:
         case V4L2_PIX_FMT_RGB565X:
         case V4L2_PIX_FMT_UYVY:
+        case V4L2_PIX_FMT_YUYV:
         case V4L2_PIX_FMT_SBGGR8:
                 break;
         default:
@@ -1080,6 +1088,42 @@ static int stk_vidioc_try_fmt_cap(struct file *filp,
         return 0;
 }
 
+static int stk_setup_format(struct stk_camera *dev)
+{
+        int i = 0;
+        int depth;
+        if (dev->vsettings.palette == V4L2_PIX_FMT_SBGGR8)
+                depth = 1;
+        else
+                depth = 2;
+        while (stk_sizes[i].m != dev->vsettings.mode
+                        && i < ARRAY_SIZE(stk_sizes))
+                i++;
+        if (i == ARRAY_SIZE(stk_sizes)) {
+                STK_ERROR("Something is broken in %s\n", __FUNCTION__);
+                return -EFAULT;
+        }
+        /* This registers controls some timings, not sure of what. */
+        stk_camera_write_reg(dev, 0x001b, 0x0e);
+        if (dev->vsettings.mode == MODE_SXGA)
+                stk_camera_write_reg(dev, 0x001c, 0x0e);
+        else
+                stk_camera_write_reg(dev, 0x001c, 0x46);
+        /*
+         * Registers 0x0115 0x0114 are the size of each line (bytes),
+         * regs 0x0117 0x0116 are the heigth of the image.
+         */
+        stk_camera_write_reg(dev, 0x0115,
+                ((stk_sizes[i].w * depth) >> 8) & 0xff);
+        stk_camera_write_reg(dev, 0x0114,
+                (stk_sizes[i].w * depth) & 0xff);
+        stk_camera_write_reg(dev, 0x0117,
+                (stk_sizes[i].h >> 8) & 0xff);
+        stk_camera_write_reg(dev, 0x0116,
+                stk_sizes[i].h & 0xff);
+        return stk_sensor_configure(dev);
+}
+
 static int stk_vidioc_s_fmt_cap(struct file *filp,
                 void *priv, struct v4l2_format *fmtd)
 {
@@ -1094,10 +1138,10 @@ static int stk_vidioc_s_fmt_cap(struct file *filp,
                 return -EBUSY;
         if (dev->owner && dev->owner != filp)
                 return -EBUSY;
-        dev->owner = filp;
         ret = stk_vidioc_try_fmt_cap(filp, priv, fmtd);
         if (ret)
                 return ret;
+        dev->owner = filp;
 
         dev->vsettings.palette = fmtd->fmt.pix.pixelformat;
         stk_free_buffers(dev);
@@ -1105,25 +1149,7 @@ static int stk_vidioc_s_fmt_cap(struct file *filp,
         dev->vsettings.mode = stk_sizes[fmtd->fmt.pix.priv].m;
 
         stk_initialise(dev);
-        /* This registers controls some timings, not sure of what. */
-        stk_camera_write_reg(dev, 0x001b, 0x0e);
-        if (dev->vsettings.mode == MODE_SXGA)
-                stk_camera_write_reg(dev, 0x001c, 0x0e);
-        else
-                stk_camera_write_reg(dev, 0x001c, 0x46);
-        /*
-         * Registers 0x0115 0x0114 are the size of each line (bytes),
-         * regs 0x0117 0x0116 are the heigth of the image.
-         */
-        stk_camera_write_reg(dev, 0x0115,
-                (fmtd->fmt.pix.bytesperline >> 8) & 0xff);
-        stk_camera_write_reg(dev, 0x0114,
-                fmtd->fmt.pix.bytesperline & 0xff);
-        stk_camera_write_reg(dev, 0x0117,
-                (fmtd->fmt.pix.height >> 8) & 0xff);
-        stk_camera_write_reg(dev, 0x0116,
-                fmtd->fmt.pix.height & 0xff);
-        return stk_sensor_configure(dev);
+        return stk_setup_format(dev);
 }
 
 static int stk_vidioc_reqbufs(struct file *filp,
@@ -1288,6 +1314,9 @@ static struct file_operations v4l_stk_fops = {
         .poll = v4l_stk_poll,
         .mmap = v4l_stk_mmap,
         .ioctl = video_ioctl2,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = v4l_compat_ioctl32,
+#endif
         .llseek = no_llseek
 };
 
@@ -1403,7 +1432,7 @@ static int stk_camera_probe(struct usb_interface *interface,
         dev->vsettings.brightness = 0x7fff;
         dev->vsettings.palette = V4L2_PIX_FMT_RGB565;
         dev->vsettings.mode = MODE_VGA;
-        dev->frame_size = 640*480*2;
+        dev->frame_size = 640 * 480 * 2;
 
         INIT_LIST_HEAD(&dev->sio_avail);
         INIT_LIST_HEAD(&dev->sio_full);
@@ -1417,6 +1446,7 @@ static int stk_camera_probe(struct usb_interface *interface,
         }
 
         stk_create_sysfs_files(&dev->vdev);
+        usb_autopm_enable(dev->interface);
 
         return 0;
 }
@@ -1434,11 +1464,41 @@ static void stk_camera_disconnect(struct usb_interface *interface)
         kref_put(&dev->kref, stk_camera_cleanup);
 }
 
+#ifdef CONFIG_PM
+int stk_camera_suspend(struct usb_interface *intf, pm_message_t message)
+{
+        struct stk_camera *dev = usb_get_intfdata(intf);
+        if (is_streaming(dev)) {
+                stk_stop_stream(dev);
+                /* yes, this is ugly */
+                set_streaming(dev);
+        }
+        return 0;
+}
+
+int stk_camera_resume(struct usb_interface *intf)
+{
+        struct stk_camera *dev = usb_get_intfdata(intf);
+        if (!is_initialised(dev))
+                return 0;
+        unset_initialised(dev);
+        stk_initialise(dev);
+        stk_setup_format(dev);
+        if (is_streaming(dev))
+                stk_start_stream(dev);
+        return 0;
+}
+#endif
+
 static struct usb_driver stk_camera_driver = {
         .name = "stkwebcam",
         .probe = stk_camera_probe,
         .disconnect = stk_camera_disconnect,
         .id_table = stkwebcam_table,
+#ifdef CONFIG_PM
+        .suspend = stk_camera_suspend,
+        .resume = stk_camera_resume,
+#endif
 };
 
 
diff --git a/drivers/media/video/stk-webcam.h b/drivers/media/video/stk-webcam.h
index 7e989d1ac1e0..df4dfefc5327 100644
--- a/drivers/media/video/stk-webcam.h
+++ b/drivers/media/video/stk-webcam.h
@@ -79,6 +79,7 @@ enum stk_status {
 #define unset_present(dev)      ((dev)->status &= \
                                         ~(S_PRESENT|S_INITIALISED|S_STREAMING))
 #define set_initialised(dev)    ((dev)->status |= S_INITIALISED)
+#define unset_initialised(dev)  ((dev)->status &= ~S_INITIALISED)
 #define set_memallocd(dev)      ((dev)->status |= S_MEMALLOCD)
 #define unset_memallocd(dev)    ((dev)->status &= ~S_MEMALLOCD)
 #define set_streaming(dev)      ((dev)->status |= S_STREAMING)
@@ -127,8 +128,6 @@ void stk_camera_delete(struct kref *);
 int stk_camera_write_reg(struct stk_camera *, u16, u8);
 int stk_camera_read_reg(struct stk_camera *, u16, int *);
 
-int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val);
-int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val);
 int stk_sensor_init(struct stk_camera *);
 int stk_sensor_configure(struct stk_camera *);
 int stk_sensor_sleep(struct stk_camera *dev);
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index 41cd6a0b0485..fb895f6684a3 100644
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -851,7 +851,7 @@ static int tcm825x_probe(struct i2c_client *client)
         sensor->platform_data = client->dev.platform_data;
 
         if (sensor->platform_data == NULL
-            && !sensor->platform_data->is_okay())
+            || !sensor->platform_data->is_okay())
                 return -ENODEV;
 
         sensor->v4l2_int_device = &tcm825x_int_device;
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index ba538f6fbcc3..78a09a2a4857 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1038,7 +1038,7 @@ static int tuner_resume(struct i2c_client *c)
 
 /* ---------------------------------------------------------------------- */
 
-LIST_HEAD(tuner_list);
+static LIST_HEAD(tuner_list);
 
 /* Search for existing radio and/or TV tuners on the given I2C adapter.
    Note that when this function is called from tuner_probe you can be
diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index f191f6a48070..50cf876f020f 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -754,6 +754,9 @@ skip_std_specific:
                 goto check_device;
         }
 
+        if (new_fw.type & FM)
+                goto check_device;
+
         /* Load SCODE firmware, if exists */
         tuner_dbg("Trying to load scode %d\n", new_fw.scode_nr);
 
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index a75560540e79..01ebcec040c4 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1571,14 +1571,14 @@ static int tvaudio_get_ctrl(struct CHIPSTATE *chip,
                 ctrl->value=chip->muted;
                 return 0;
         case V4L2_CID_AUDIO_VOLUME:
-                if (!desc->flags & CHIP_HAS_VOLUME)
+                if (!(desc->flags & CHIP_HAS_VOLUME))
                         break;
                 ctrl->value = max(chip->left,chip->right);
                 return 0;
         case V4L2_CID_AUDIO_BALANCE:
         {
                 int volume;
-                if (!desc->flags & CHIP_HAS_VOLUME)
+                if (!(desc->flags & CHIP_HAS_VOLUME))
                         break;
                 volume = max(chip->left,chip->right);
                 if (volume)
@@ -1621,7 +1621,7 @@ static int tvaudio_set_ctrl(struct CHIPSTATE *chip,
         {
                 int volume,balance;
 
-                if (!desc->flags & CHIP_HAS_VOLUME)
+                if (!(desc->flags & CHIP_HAS_VOLUME))
                         break;
 
                 volume = max(chip->left,chip->right);
@@ -1642,7 +1642,7 @@ static int tvaudio_set_ctrl(struct CHIPSTATE *chip,
         case V4L2_CID_AUDIO_BALANCE:
         {
                 int volume, balance;
-                if (!desc->flags & CHIP_HAS_VOLUME)
+                if (!(desc->flags & CHIP_HAS_VOLUME))
                         break;
 
                 volume = max(chip->left,chip->right);
@@ -1702,7 +1702,7 @@ static int chip_command(struct i2c_client *client,
                                 break;
                         case V4L2_CID_AUDIO_VOLUME:
                         case V4L2_CID_AUDIO_BALANCE:
-                                if (!desc->flags & CHIP_HAS_VOLUME)
+                                if (!(desc->flags & CHIP_HAS_VOLUME))
                                         return -EINVAL;
                                 break;
                         case V4L2_CID_AUDIO_BASS:
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 0b8fbad3c721..dc0da44a5af6 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -242,7 +242,7 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,                 "TCL M2523_3DBH_E"},
         { TUNER_ABSENT,                 "TCL M2523_3DIH_E"},
         { TUNER_ABSENT,                 "TCL MFPE05_2_U"},
-        { TUNER_ABSENT,                 "Philips FMD1216MEX"},
+        { TUNER_PHILIPS_FMD1216ME_MK3,  "Philips FMD1216MEX"},
         { TUNER_ABSENT,                 "Philips FRH2036B"},
         { TUNER_ABSENT,                 "Panasonic ENGF75_01GF"},
         { TUNER_ABSENT,                 "MaxLinear MXL5005"},
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index c056ff6d810c..34deb68ae568 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -56,7 +56,6 @@
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/div64.h>
-#include <linux/video_decoder.h>
 #define __OLD_VIDIOC_ /* To allow fixing old calls*/
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
@@ -82,108 +81,6 @@ MODULE_LICENSE("GPL");
  */
 
 
-char *v4l2_norm_to_name(v4l2_std_id id)
-{
-        char *name;
-        u32 myid = id;
-
-        /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle
-           64 bit comparations. So, on that architecture, with some gcc variants,
-           compilation fails. Currently, the max value is 30bit wide.
-         */
-        BUG_ON(myid != id);
-
-        switch (myid) {
-        case V4L2_STD_PAL:
-                name="PAL";             break;
-        case V4L2_STD_PAL_BG:
-                name="PAL-BG";          break;
-        case V4L2_STD_PAL_DK:
-                name="PAL-DK";          break;
-        case V4L2_STD_PAL_B:
-                name="PAL-B";           break;
-        case V4L2_STD_PAL_B1:
-                name="PAL-B1";          break;
-        case V4L2_STD_PAL_G:
-                name="PAL-G";           break;
-        case V4L2_STD_PAL_H:
-                name="PAL-H";           break;
-        case V4L2_STD_PAL_I:
-                name="PAL-I";           break;
-        case V4L2_STD_PAL_D:
-                name="PAL-D";           break;
-        case V4L2_STD_PAL_D1:
-                name="PAL-D1";          break;
-        case V4L2_STD_PAL_K:
-                name="PAL-K";           break;
-        case V4L2_STD_PAL_M:
-                name="PAL-M";           break;
-        case V4L2_STD_PAL_N:
-                name="PAL-N";           break;
-        case V4L2_STD_PAL_Nc:
-                name="PAL-Nc";          break;
-        case V4L2_STD_PAL_60:
-                name="PAL-60";          break;
-        case V4L2_STD_NTSC:
-                name="NTSC";            break;
-        case V4L2_STD_NTSC_M:
-                name="NTSC-M";          break;
-        case V4L2_STD_NTSC_M_JP:
-                name="NTSC-M-JP";       break;
-        case V4L2_STD_NTSC_443:
-                name="NTSC-443";        break;
-        case V4L2_STD_NTSC_M_KR:
-                name="NTSC-M-KR";       break;
-        case V4L2_STD_SECAM:
-                name="SECAM";           break;
-        case V4L2_STD_SECAM_DK:
-                name="SECAM-DK";        break;
-        case V4L2_STD_SECAM_B:
-                name="SECAM-B";         break;
-        case V4L2_STD_SECAM_D:
-                name="SECAM-D";         break;
-        case V4L2_STD_SECAM_G:
-                name="SECAM-G";         break;
-        case V4L2_STD_SECAM_H:
-                name="SECAM-H";         break;
-        case V4L2_STD_SECAM_K:
-                name="SECAM-K";         break;
-        case V4L2_STD_SECAM_K1:
-                name="SECAM-K1";        break;
-        case V4L2_STD_SECAM_L:
-                name="SECAM-L";         break;
-        case V4L2_STD_SECAM_LC:
-                name="SECAM-LC";        break;
-        default:
-                name="Unknown";         break;
-        }
-
-        return name;
-}
-
-/* Fill in the fields of a v4l2_standard structure according to the
-   'id' and 'transmission' parameters.  Returns negative on error.  */
-int v4l2_video_std_construct(struct v4l2_standard *vs,
-                             int id, char *name)
-{
-        u32 index = vs->index;
-
-        memset(vs, 0, sizeof(struct v4l2_standard));
-        vs->index = index;
-        vs->id    = id;
-        if (id & V4L2_STD_525_60) {
-                vs->frameperiod.numerator = 1001;
-                vs->frameperiod.denominator = 30000;
-                vs->framelines = 525;
-        } else {
-                vs->frameperiod.numerator = 1;
-                vs->frameperiod.denominator = 25;
-                vs->framelines = 625;
-        }
-        strlcpy(vs->name,name,sizeof(vs->name));
-        return 0;
-}
-
 /* ----------------------------------------------------------------- */
 /* priority handling                                                 */
 
@@ -196,6 +93,7 @@ int v4l2_prio_init(struct v4l2_prio_state *global)
         memset(global,0,sizeof(*global));
         return 0;
 }
+EXPORT_SYMBOL(v4l2_prio_init);
 
 int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
                      enum v4l2_priority new)
@@ -211,11 +109,13 @@ int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
         *local = new;
         return 0;
 }
+EXPORT_SYMBOL(v4l2_prio_change);
 
 int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local)
 {
         return v4l2_prio_change(global,local,V4L2_PRIORITY_DEFAULT);
 }
+EXPORT_SYMBOL(v4l2_prio_open);
 
 int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local)
 {
@@ -223,6 +123,7 @@ int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local)
                 atomic_dec(&global->prios[*local]);
         return 0;
 }
+EXPORT_SYMBOL(v4l2_prio_close);
 
 enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global)
 {
@@ -234,6 +135,7 @@ enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global)
                 return V4L2_PRIORITY_BACKGROUND;
         return V4L2_PRIORITY_UNSET;
 }
+EXPORT_SYMBOL(v4l2_prio_max);
 
 int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local)
 {
@@ -241,225 +143,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local)
                 return -EBUSY;
         return 0;
 }
-
-
-/* ----------------------------------------------------------------- */
-/* some arrays for pretty-printing debug messages of enum types      */
-
-char *v4l2_field_names[] = {
-        [V4L2_FIELD_ANY]        = "any",
-        [V4L2_FIELD_NONE]       = "none",
-        [V4L2_FIELD_TOP]        = "top",
-        [V4L2_FIELD_BOTTOM]     = "bottom",
-        [V4L2_FIELD_INTERLACED] = "interlaced",
-        [V4L2_FIELD_SEQ_TB]     = "seq-tb",
-        [V4L2_FIELD_SEQ_BT]     = "seq-bt",
-        [V4L2_FIELD_ALTERNATE]  = "alternate",
-        [V4L2_FIELD_INTERLACED_TB] = "interlaced-tb",
-        [V4L2_FIELD_INTERLACED_BT] = "interlaced-bt",
-};
-
-char *v4l2_type_names[] = {
-        [V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "video-cap",
-        [V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "video-over",
-        [V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "video-out",
-        [V4L2_BUF_TYPE_VBI_CAPTURE]        = "vbi-cap",
-        [V4L2_BUF_TYPE_VBI_OUTPUT]         = "vbi-out",
-        [V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-cap",
-        [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "sliced-vbi-out",
-        [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "video-out-over",
-};
-
-
-#define prt_names(a,arr) (((a)>=0)&&((a)<ARRAY_SIZE(arr)))?arr[a]:"unknown"
-
-/* ------------------------------------------------------------------ */
-/* debug help functions                                               */
-
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-static const char *v4l1_ioctls[] = {
-        [_IOC_NR(VIDIOCGCAP)]       = "VIDIOCGCAP",
-        [_IOC_NR(VIDIOCGCHAN)]      = "VIDIOCGCHAN",
-        [_IOC_NR(VIDIOCSCHAN)]      = "VIDIOCSCHAN",
-        [_IOC_NR(VIDIOCGTUNER)]     = "VIDIOCGTUNER",
-        [_IOC_NR(VIDIOCSTUNER)]     = "VIDIOCSTUNER",
-        [_IOC_NR(VIDIOCGPICT)]      = "VIDIOCGPICT",
-        [_IOC_NR(VIDIOCSPICT)]      = "VIDIOCSPICT",
-        [_IOC_NR(VIDIOCCAPTURE)]    = "VIDIOCCAPTURE",
-        [_IOC_NR(VIDIOCGWIN)]       = "VIDIOCGWIN",
-        [_IOC_NR(VIDIOCSWIN)]       = "VIDIOCSWIN",
-        [_IOC_NR(VIDIOCGFBUF)]      = "VIDIOCGFBUF",
-        [_IOC_NR(VIDIOCSFBUF)]      = "VIDIOCSFBUF",
-        [_IOC_NR(VIDIOCKEY)]        = "VIDIOCKEY",
-        [_IOC_NR(VIDIOCGFREQ)]      = "VIDIOCGFREQ",
-        [_IOC_NR(VIDIOCSFREQ)]      = "VIDIOCSFREQ",
-        [_IOC_NR(VIDIOCGAUDIO)]     = "VIDIOCGAUDIO",
-        [_IOC_NR(VIDIOCSAUDIO)]     = "VIDIOCSAUDIO",
-        [_IOC_NR(VIDIOCSYNC)]       = "VIDIOCSYNC",
-        [_IOC_NR(VIDIOCMCAPTURE)]   = "VIDIOCMCAPTURE",
-        [_IOC_NR(VIDIOCGMBUF)]      = "VIDIOCGMBUF",
-        [_IOC_NR(VIDIOCGUNIT)]      = "VIDIOCGUNIT",
-        [_IOC_NR(VIDIOCGCAPTURE)]   = "VIDIOCGCAPTURE",
-        [_IOC_NR(VIDIOCSCAPTURE)]   = "VIDIOCSCAPTURE",
-        [_IOC_NR(VIDIOCSPLAYMODE)]  = "VIDIOCSPLAYMODE",
-        [_IOC_NR(VIDIOCSWRITEMODE)] = "VIDIOCSWRITEMODE",
-        [_IOC_NR(VIDIOCGPLAYINFO)]  = "VIDIOCGPLAYINFO",
-        [_IOC_NR(VIDIOCSMICROCODE)] = "VIDIOCSMICROCODE",
-        [_IOC_NR(VIDIOCGVBIFMT)]    = "VIDIOCGVBIFMT",
-        [_IOC_NR(VIDIOCSVBIFMT)]    = "VIDIOCSVBIFMT"
-};
-#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
-#endif
-
-static const char *v4l2_ioctls[] = {
-        [_IOC_NR(VIDIOC_QUERYCAP)]         = "VIDIOC_QUERYCAP",
-        [_IOC_NR(VIDIOC_RESERVED)]         = "VIDIOC_RESERVED",
-        [_IOC_NR(VIDIOC_ENUM_FMT)]         = "VIDIOC_ENUM_FMT",
-        [_IOC_NR(VIDIOC_G_FMT)]            = "VIDIOC_G_FMT",
-        [_IOC_NR(VIDIOC_S_FMT)]            = "VIDIOC_S_FMT",
-        [_IOC_NR(VIDIOC_REQBUFS)]          = "VIDIOC_REQBUFS",
-        [_IOC_NR(VIDIOC_QUERYBUF)]         = "VIDIOC_QUERYBUF",
-        [_IOC_NR(VIDIOC_G_FBUF)]           = "VIDIOC_G_FBUF",
-        [_IOC_NR(VIDIOC_S_FBUF)]           = "VIDIOC_S_FBUF",
-        [_IOC_NR(VIDIOC_OVERLAY)]          = "VIDIOC_OVERLAY",
-        [_IOC_NR(VIDIOC_QBUF)]             = "VIDIOC_QBUF",
-        [_IOC_NR(VIDIOC_DQBUF)]            = "VIDIOC_DQBUF",
-        [_IOC_NR(VIDIOC_STREAMON)]         = "VIDIOC_STREAMON",
-        [_IOC_NR(VIDIOC_STREAMOFF)]        = "VIDIOC_STREAMOFF",
-        [_IOC_NR(VIDIOC_G_PARM)]           = "VIDIOC_G_PARM",
-        [_IOC_NR(VIDIOC_S_PARM)]           = "VIDIOC_S_PARM",
-        [_IOC_NR(VIDIOC_G_STD)]            = "VIDIOC_G_STD",
-        [_IOC_NR(VIDIOC_S_STD)]            = "VIDIOC_S_STD",
-        [_IOC_NR(VIDIOC_ENUMSTD)]          = "VIDIOC_ENUMSTD",
-        [_IOC_NR(VIDIOC_ENUMINPUT)]        = "VIDIOC_ENUMINPUT",
-        [_IOC_NR(VIDIOC_G_CTRL)]           = "VIDIOC_G_CTRL",
-        [_IOC_NR(VIDIOC_S_CTRL)]           = "VIDIOC_S_CTRL",
-        [_IOC_NR(VIDIOC_G_TUNER)]          = "VIDIOC_G_TUNER",
-        [_IOC_NR(VIDIOC_S_TUNER)]          = "VIDIOC_S_TUNER",
-        [_IOC_NR(VIDIOC_G_AUDIO)]          = "VIDIOC_G_AUDIO",
-        [_IOC_NR(VIDIOC_S_AUDIO)]          = "VIDIOC_S_AUDIO",
-        [_IOC_NR(VIDIOC_QUERYCTRL)]        = "VIDIOC_QUERYCTRL",
-        [_IOC_NR(VIDIOC_QUERYMENU)]        = "VIDIOC_QUERYMENU",
-        [_IOC_NR(VIDIOC_G_INPUT)]          = "VIDIOC_G_INPUT",
-        [_IOC_NR(VIDIOC_S_INPUT)]          = "VIDIOC_S_INPUT",
-        [_IOC_NR(VIDIOC_G_OUTPUT)]         = "VIDIOC_G_OUTPUT",
-        [_IOC_NR(VIDIOC_S_OUTPUT)]         = "VIDIOC_S_OUTPUT",
-        [_IOC_NR(VIDIOC_ENUMOUTPUT)]       = "VIDIOC_ENUMOUTPUT",
-        [_IOC_NR(VIDIOC_G_AUDOUT)]         = "VIDIOC_G_AUDOUT",
-        [_IOC_NR(VIDIOC_S_AUDOUT)]         = "VIDIOC_S_AUDOUT",
-        [_IOC_NR(VIDIOC_G_MODULATOR)]      = "VIDIOC_G_MODULATOR",
-        [_IOC_NR(VIDIOC_S_MODULATOR)]      = "VIDIOC_S_MODULATOR",
-        [_IOC_NR(VIDIOC_G_FREQUENCY)]      = "VIDIOC_G_FREQUENCY",
-        [_IOC_NR(VIDIOC_S_FREQUENCY)]      = "VIDIOC_S_FREQUENCY",
-        [_IOC_NR(VIDIOC_CROPCAP)]          = "VIDIOC_CROPCAP",
-        [_IOC_NR(VIDIOC_G_CROP)]           = "VIDIOC_G_CROP",
-        [_IOC_NR(VIDIOC_S_CROP)]           = "VIDIOC_S_CROP",
-        [_IOC_NR(VIDIOC_G_JPEGCOMP)]       = "VIDIOC_G_JPEGCOMP",
-        [_IOC_NR(VIDIOC_S_JPEGCOMP)]       = "VIDIOC_S_JPEGCOMP",
-        [_IOC_NR(VIDIOC_QUERYSTD)]         = "VIDIOC_QUERYSTD",
-        [_IOC_NR(VIDIOC_TRY_FMT)]          = "VIDIOC_TRY_FMT",
-        [_IOC_NR(VIDIOC_ENUMAUDIO)]        = "VIDIOC_ENUMAUDIO",
-        [_IOC_NR(VIDIOC_ENUMAUDOUT)]       = "VIDIOC_ENUMAUDOUT",
-        [_IOC_NR(VIDIOC_G_PRIORITY)]       = "VIDIOC_G_PRIORITY",
-        [_IOC_NR(VIDIOC_S_PRIORITY)]       = "VIDIOC_S_PRIORITY",
-        [_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP",
-        [_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS",
-        [_IOC_NR(VIDIOC_G_EXT_CTRLS)]      = "VIDIOC_G_EXT_CTRLS",
-        [_IOC_NR(VIDIOC_S_EXT_CTRLS)]      = "VIDIOC_S_EXT_CTRLS",
-        [_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS",
-#if 1
-        [_IOC_NR(VIDIOC_ENUM_FRAMESIZES)]  = "VIDIOC_ENUM_FRAMESIZES",
-        [_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
-        [_IOC_NR(VIDIOC_G_ENC_INDEX)]      = "VIDIOC_G_ENC_INDEX",
-        [_IOC_NR(VIDIOC_ENCODER_CMD)]      = "VIDIOC_ENCODER_CMD",
-        [_IOC_NR(VIDIOC_TRY_ENCODER_CMD)]  = "VIDIOC_TRY_ENCODER_CMD",
-
-        [_IOC_NR(VIDIOC_DBG_S_REGISTER)]   = "VIDIOC_DBG_S_REGISTER",
-        [_IOC_NR(VIDIOC_DBG_G_REGISTER)]   = "VIDIOC_DBG_G_REGISTER",
-
-        [_IOC_NR(VIDIOC_G_CHIP_IDENT)]     = "VIDIOC_G_CHIP_IDENT",
-#endif
-};
-#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
-
-static const char *v4l2_int_ioctls[] = {
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        [_IOC_NR(DECODER_GET_CAPABILITIES)]    = "DECODER_GET_CAPABILITIES",
-        [_IOC_NR(DECODER_GET_STATUS)]          = "DECODER_GET_STATUS",
-        [_IOC_NR(DECODER_SET_NORM)]            = "DECODER_SET_NORM",
-        [_IOC_NR(DECODER_SET_INPUT)]           = "DECODER_SET_INPUT",
-        [_IOC_NR(DECODER_SET_OUTPUT)]          = "DECODER_SET_OUTPUT",
-        [_IOC_NR(DECODER_ENABLE_OUTPUT)]       = "DECODER_ENABLE_OUTPUT",
-        [_IOC_NR(DECODER_SET_PICTURE)]         = "DECODER_SET_PICTURE",
-        [_IOC_NR(DECODER_SET_GPIO)]            = "DECODER_SET_GPIO",
-        [_IOC_NR(DECODER_INIT)]                = "DECODER_INIT",
-        [_IOC_NR(DECODER_SET_VBI_BYPASS)]      = "DECODER_SET_VBI_BYPASS",
-        [_IOC_NR(DECODER_DUMP)]                = "DECODER_DUMP",
-#endif
-        [_IOC_NR(AUDC_SET_RADIO)]              = "AUDC_SET_RADIO",
-
-        [_IOC_NR(TUNER_SET_TYPE_ADDR)]         = "TUNER_SET_TYPE_ADDR",
-        [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
-        [_IOC_NR(TUNER_SET_CONFIG)]            = "TUNER_SET_CONFIG",
-
-        [_IOC_NR(VIDIOC_INT_S_TUNER_MODE)]     = "VIDIOC_INT_S_TUNER_MODE",
-        [_IOC_NR(VIDIOC_INT_RESET)]            = "VIDIOC_INT_RESET",
-        [_IOC_NR(VIDIOC_INT_AUDIO_CLOCK_FREQ)] = "VIDIOC_INT_AUDIO_CLOCK_FREQ",
-        [_IOC_NR(VIDIOC_INT_DECODE_VBI_LINE)]  = "VIDIOC_INT_DECODE_VBI_LINE",
-        [_IOC_NR(VIDIOC_INT_S_VBI_DATA)]       = "VIDIOC_INT_S_VBI_DATA",
-        [_IOC_NR(VIDIOC_INT_G_VBI_DATA)]       = "VIDIOC_INT_G_VBI_DATA",
-        [_IOC_NR(VIDIOC_INT_I2S_CLOCK_FREQ)]   = "VIDIOC_INT_I2S_CLOCK_FREQ",
-        [_IOC_NR(VIDIOC_INT_S_STANDBY)]        = "VIDIOC_INT_S_STANDBY",
-        [_IOC_NR(VIDIOC_INT_S_AUDIO_ROUTING)]  = "VIDIOC_INT_S_AUDIO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)]  = "VIDIOC_INT_G_AUDIO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)]  = "VIDIOC_INT_S_VIDEO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)]  = "VIDIOC_INT_G_VIDEO_ROUTING",
-        [_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)]   = "VIDIOC_INT_S_CRYSTAL_FREQ",
-        [_IOC_NR(VIDIOC_INT_INIT)]             = "VIDIOC_INT_INIT",
-        [_IOC_NR(VIDIOC_INT_G_STD_OUTPUT)]     = "VIDIOC_INT_G_STD_OUTPUT",
-        [_IOC_NR(VIDIOC_INT_S_STD_OUTPUT)]     = "VIDIOC_INT_S_STD_OUTPUT",
-};
-#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
-
-
-/* Common ioctl debug function. This function can be used by
-   external ioctl messages as well as internal V4L ioctl */
-void v4l_printk_ioctl(unsigned int cmd)
-{
-        char *dir;
-
-        switch (_IOC_DIR(cmd)) {
-        case _IOC_NONE:              dir = "--"; break;
-        case _IOC_READ:              dir = "r-"; break;
-        case _IOC_WRITE:             dir = "-w"; break;
-        case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
-        default:                     dir = "*ERR*"; break;
-        }
-        switch (_IOC_TYPE(cmd)) {
-        case 'd':
-                printk("v4l2_int ioctl %s, dir=%s (0x%08x)\n",
-                       (_IOC_NR(cmd) < V4L2_INT_IOCTLS) ?
-                       v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
-                break;
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        case 'v':
-                printk("v4l1 ioctl %s, dir=%s (0x%08x)\n",
-                       (_IOC_NR(cmd) < V4L1_IOCTLS) ?
-                       v4l1_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
-                break;
-#endif
-        case 'V':
-                printk("v4l2 ioctl %s, dir=%s (0x%08x)\n",
-                       (_IOC_NR(cmd) < V4L2_IOCTLS) ?
-                       v4l2_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
-                break;
-
-        default:
-                printk("unknown ioctl '%c', dir=%s, #%d (0x%08x)\n",
-                       _IOC_TYPE(cmd), dir, _IOC_NR(cmd), cmd);
-        }
-}
-
+EXPORT_SYMBOL(v4l2_prio_check);
 
 /* ----------------------------------------------------------------- */
 
@@ -488,6 +172,7 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
         }
         return 0;
 }
+EXPORT_SYMBOL(v4l2_ctrl_check);
 
 /* Returns NULL or a character pointer array containing the menu for
    the given control ID. The pointer array ends with a NULL pointer.
@@ -648,6 +333,7 @@ const char **v4l2_ctrl_get_menu(u32 id)
                         return NULL;
         }
 }
+EXPORT_SYMBOL(v4l2_ctrl_get_menu);
 
 /* Fill in a struct v4l2_queryctrl */
 int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def)
@@ -770,6 +456,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
         snprintf(qctrl->name, sizeof(qctrl->name), name);
         return 0;
 }
+EXPORT_SYMBOL(v4l2_ctrl_query_fill);
 
 /* Fill in a struct v4l2_queryctrl with standard values based on
    the control ID. */
@@ -904,6 +591,7 @@ int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl)
                 return -EINVAL;
         }
 }
+EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);
 
 /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and
    the menu. The qctrl pointer may be NULL, in which case it is ignored. */
@@ -922,6 +610,7 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qc
         qmenu->reserved = 0;
         return 0;
 }
+EXPORT_SYMBOL(v4l2_ctrl_query_menu);
 
 /* ctrl_classes points to an array of u32 pointers, the last element is
    a NULL pointer. Each u32 array is a 0-terminated array of control IDs.
@@ -972,7 +661,20 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)
                 return 0;
         return **ctrl_classes;
 }
+EXPORT_SYMBOL(v4l2_ctrl_next);
 
+int v4l2_chip_match_host(u32 match_type, u32 match_chip)
+{
+        switch (match_type) {
+        case V4L2_CHIP_MATCH_HOST:
+                return match_chip == 0;
+        default:
+                return 0;
+        }
+}
+EXPORT_SYMBOL(v4l2_chip_match_host);
+
+#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
 int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 match_type, u32 match_chip)
 {
         switch (match_type) {
@@ -984,6 +686,7 @@ int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 match_type, u32 match_c
                 return 0;
         }
 }
+EXPORT_SYMBOL(v4l2_chip_match_i2c_client);
 
 int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_chip_ident *chip,
                 u32 ident, u32 revision)
@@ -1000,16 +703,7 @@ int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_chip_ident *chi
         }
         return 0;
 }
-
-int v4l2_chip_match_host(u32 match_type, u32 match_chip)
-{
-        switch (match_type) {
-        case V4L2_CHIP_MATCH_HOST:
-                return match_chip == 0;
-        default:
-                return 0;
-        }
-}
+EXPORT_SYMBOL(v4l2_chip_ident_i2c_client);
 
 /* ----------------------------------------------------------------- */
 
@@ -1038,38 +732,5 @@ int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver
         }
         return err != -ENOMEM ? 0 : err;
 }
-
-/* ----------------------------------------------------------------- */
-
-EXPORT_SYMBOL(v4l2_norm_to_name);
-EXPORT_SYMBOL(v4l2_video_std_construct);
-
-EXPORT_SYMBOL(v4l2_prio_init);
-EXPORT_SYMBOL(v4l2_prio_change);
-EXPORT_SYMBOL(v4l2_prio_open);
-EXPORT_SYMBOL(v4l2_prio_close);
-EXPORT_SYMBOL(v4l2_prio_max);
-EXPORT_SYMBOL(v4l2_prio_check);
-
-EXPORT_SYMBOL(v4l2_field_names);
-EXPORT_SYMBOL(v4l2_type_names);
-EXPORT_SYMBOL(v4l_printk_ioctl);
-
-EXPORT_SYMBOL(v4l2_ctrl_next);
-EXPORT_SYMBOL(v4l2_ctrl_check);
-EXPORT_SYMBOL(v4l2_ctrl_get_menu);
-EXPORT_SYMBOL(v4l2_ctrl_query_menu);
-EXPORT_SYMBOL(v4l2_ctrl_query_fill);
-EXPORT_SYMBOL(v4l2_ctrl_query_fill_std);
-
-EXPORT_SYMBOL(v4l2_chip_match_i2c_client);
-EXPORT_SYMBOL(v4l2_chip_ident_i2c_client);
-EXPORT_SYMBOL(v4l2_chip_match_host);
-
 EXPORT_SYMBOL(v4l2_i2c_attach);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
+#endif
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 80a14da9acef..eab79ffdf56a 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -147,7 +147,7 @@ void videobuf_queue_core_init(struct videobuf_queue *q,
         /* Having implementations for abstract methods are mandatory */
         BUG_ON(!q->int_ops);
 
-        mutex_init(&q->lock);
+        mutex_init(&q->vb_lock);
         INIT_LIST_HEAD(&q->stream);
 }
 
@@ -189,7 +189,7 @@ int videobuf_queue_is_busy(struct videobuf_queue *q)
         return 0;
 }
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 void videobuf_queue_cancel(struct videobuf_queue *q)
 {
         unsigned long flags = 0;
@@ -220,7 +220,7 @@ void videobuf_queue_cancel(struct videobuf_queue *q)
 
 /* --------------------------------------------------------------------- */
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 enum v4l2_field videobuf_next_field(struct videobuf_queue *q)
 {
         enum v4l2_field field = q->field;
@@ -239,7 +239,7 @@ enum v4l2_field videobuf_next_field(struct videobuf_queue *q)
         return field;
 }
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
                             struct videobuf_buffer *vb, enum v4l2_buf_type type)
 {
@@ -295,7 +295,7 @@ static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
         b->sequence  = vb->field_count >> 1;
 }
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 static int __videobuf_mmap_free(struct videobuf_queue *q)
 {
         int i;
@@ -328,13 +328,13 @@ static int __videobuf_mmap_free(struct videobuf_queue *q)
 int videobuf_mmap_free(struct videobuf_queue *q)
 {
         int ret;
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         ret = __videobuf_mmap_free(q);
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return ret;
 }
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 static int __videobuf_mmap_setup(struct videobuf_queue *q,
                         unsigned int bcount, unsigned int bsize,
                         enum v4l2_memory memory)
@@ -384,9 +384,9 @@ int videobuf_mmap_setup(struct videobuf_queue *q,
                         enum v4l2_memory memory)
 {
         int ret;
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         ret = __videobuf_mmap_setup(q, bcount, bsize, memory);
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return ret;
 }
 
@@ -408,7 +408,7 @@ int videobuf_reqbufs(struct videobuf_queue *q,
                 return -EINVAL;
         }
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         if (req->type != q->type) {
                 dprintk(1, "reqbufs: queue type invalid\n");
                 retval = -EINVAL;
@@ -444,7 +444,7 @@ int videobuf_reqbufs(struct videobuf_queue *q,
         req->count = retval;
 
  done:
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return retval;
 }
 
@@ -452,7 +452,7 @@ int videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b)
 {
         int ret = -EINVAL;
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         if (unlikely(b->type != q->type)) {
                 dprintk(1, "querybuf: Wrong type.\n");
                 goto done;
@@ -470,7 +470,7 @@ int videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b)
 
         ret = 0;
 done:
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return ret;
 }
 
@@ -487,7 +487,7 @@ int videobuf_qbuf(struct videobuf_queue *q,
         if (b->memory == V4L2_MEMORY_MMAP)
                 down_read(&current->mm->mmap_sem);
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         retval = -EBUSY;
         if (q->reading) {
                 dprintk(1, "qbuf: Reading running...\n");
@@ -573,7 +573,7 @@ int videobuf_qbuf(struct videobuf_queue *q,
         retval = 0;
 
  done:
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
 
         if (b->memory == V4L2_MEMORY_MMAP)
                 up_read(&current->mm->mmap_sem);
@@ -589,7 +589,7 @@ int videobuf_dqbuf(struct videobuf_queue *q,
 
         MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         retval = -EBUSY;
         if (q->reading) {
                 dprintk(1, "dqbuf: Reading running...\n");
@@ -632,7 +632,7 @@ int videobuf_dqbuf(struct videobuf_queue *q,
         videobuf_status(q, b, buf, q->type);
 
  done:
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return retval;
 }
 
@@ -642,7 +642,7 @@ int videobuf_streamon(struct videobuf_queue *q)
         unsigned long flags = 0;
         int retval;
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         retval = -EBUSY;
         if (q->reading)
                 goto done;
@@ -659,11 +659,11 @@ int videobuf_streamon(struct videobuf_queue *q)
                 spin_unlock_irqrestore(q->irqlock, flags);
 
  done:
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return retval;
 }
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 static int __videobuf_streamoff(struct videobuf_queue *q)
 {
         if (!q->streaming)
@@ -679,14 +679,14 @@ int videobuf_streamoff(struct videobuf_queue *q)
 {
         int retval;
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         retval = __videobuf_streamoff(q);
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
 
         return retval;
 }
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 static ssize_t videobuf_read_zerocopy(struct videobuf_queue *q,
                                       char __user *data,
                                       size_t count, loff_t *ppos)
@@ -745,7 +745,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
 
         MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
 
         nbufs = 1; size = 0;
         q->ops->buf_setup(q, &nbufs, &size);
@@ -817,11 +817,11 @@ ssize_t videobuf_read_one(struct videobuf_queue *q,
         }
 
  done:
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return retval;
 }
 
-/* Locking: Caller holds q->lock */
+/* Locking: Caller holds q->vb_lock */
 static int __videobuf_read_start(struct videobuf_queue *q)
 {
         enum v4l2_field field;
@@ -882,23 +882,23 @@ int videobuf_read_start(struct videobuf_queue *q)
 {
         int rc;
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         rc = __videobuf_read_start(q);
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
 
         return rc;
 }
 
 void videobuf_read_stop(struct videobuf_queue *q)
 {
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         __videobuf_read_stop(q);
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
 }
 
 void videobuf_stop(struct videobuf_queue *q)
 {
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
 
         if (q->streaming)
                 __videobuf_streamoff(q);
@@ -906,7 +906,7 @@ void videobuf_stop(struct videobuf_queue *q)
         if (q->reading)
                 __videobuf_read_stop(q);
 
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
 }
 
 
@@ -920,7 +920,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
         MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
         dprintk(2, "%s\n", __FUNCTION__);
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         retval = -EBUSY;
         if (q->streaming)
                 goto done;
@@ -980,7 +980,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q,
         }
 
  done:
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return retval;
 }
 
@@ -991,7 +991,7 @@ unsigned int videobuf_poll_stream(struct file *file,
         struct videobuf_buffer *buf = NULL;
         unsigned int rc = 0;
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         if (q->streaming) {
                 if (!list_empty(&q->stream))
                         buf = list_entry(q->stream.next,
@@ -1019,7 +1019,7 @@ unsigned int videobuf_poll_stream(struct file *file,
                     buf->state == VIDEOBUF_ERROR)
                         rc = POLLIN|POLLRDNORM;
         }
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
         return rc;
 }
 
@@ -1030,10 +1030,10 @@ int videobuf_mmap_mapper(struct videobuf_queue *q,
 
         MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
-        mutex_lock(&q->lock);
+        mutex_lock(&q->vb_lock);
         retval = CALL(q, mmap_mapper, q, vma);
         q->is_mmapped = 1;
-        mutex_unlock(&q->lock);
+        mutex_unlock(&q->vb_lock);
 
         return retval;
 }
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 98efd7ab1f50..53fed4b74ce9 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -356,7 +356,7 @@ videobuf_vm_close(struct vm_area_struct *vma)
         map->count--;
         if (0 == map->count) {
                 dprintk(1,"munmap %p q=%p\n",map,q);
-                mutex_lock(&q->lock);
+                mutex_lock(&q->vb_lock);
                 for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                         if (NULL == q->bufs[i])
                                 continue;
@@ -373,7 +373,7 @@ videobuf_vm_close(struct vm_area_struct *vma)
                         q->bufs[i]->baddr = 0;
                         q->ops->buf_release(q,q->bufs[i]);
                 }
-                mutex_unlock(&q->lock);
+                mutex_unlock(&q->vb_lock);
                 kfree(map);
         }
         return;
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index 9b3898347ca5..5266ecc91dab 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -70,7 +70,7 @@ videobuf_vm_close(struct vm_area_struct *vma)
         map->count--;
         if (0 == map->count) {
                 dprintk(1,"munmap %p q=%p\n",map,q);
-                mutex_lock(&q->lock);
+                mutex_lock(&q->vb_lock);
                 for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                         if (NULL == q->bufs[i])
                                 continue;
@@ -83,7 +83,7 @@ videobuf_vm_close(struct vm_area_struct *vma)
                         q->bufs[i]->map   = NULL;
                         q->bufs[i]->baddr = 0;
                 }
-                mutex_unlock(&q->lock);
+                mutex_unlock(&q->vb_lock);
                 kfree(map);
         }
         return;
@@ -107,7 +107,7 @@ static struct vm_operations_struct videobuf_vm_ops =
 
 static void *__videobuf_alloc(size_t size)
 {
-        struct videbuf_vmalloc_memory *mem;
+        struct videobuf_vmalloc_memory *mem;
         struct videobuf_buffer *vb;
 
         vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
@@ -127,9 +127,7 @@ static int __videobuf_iolock (struct videobuf_queue* q,
                               struct v4l2_framebuffer *fbuf)
 {
         int pages;
-
-        struct videbuf_vmalloc_memory *mem=vb->priv;
-
+        struct videobuf_vmalloc_memory *mem=vb->priv;
 
         BUG_ON(!mem);
 
@@ -195,7 +193,7 @@ static int __videobuf_mmap_free(struct videobuf_queue *q)
 static int __videobuf_mmap_mapper(struct videobuf_queue *q,
                          struct vm_area_struct *vma)
 {
-        struct videbuf_vmalloc_memory *mem;
+        struct videobuf_vmalloc_memory *mem;
         struct videobuf_mapping *map;
         unsigned int first;
         int retval;
@@ -267,7 +265,7 @@ static int __videobuf_copy_to_user ( struct videobuf_queue *q,
                                 char __user *data, size_t count,
                                 int nonblocking )
 {
-        struct videbuf_vmalloc_memory *mem=q->read_buf->priv;
+        struct videobuf_vmalloc_memory *mem=q->read_buf->priv;
         BUG_ON (!mem);
         MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
 
@@ -288,7 +286,7 @@ static int __videobuf_copy_stream ( struct videobuf_queue *q,
                                 int vbihack, int nonblocking )
 {
         unsigned int  *fc;
-        struct videbuf_vmalloc_memory *mem=q->read_buf->priv;
+        struct videobuf_vmalloc_memory *mem=q->read_buf->priv;
         BUG_ON (!mem);
         MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
 
@@ -341,7 +339,7 @@ EXPORT_SYMBOL_GPL(videobuf_queue_vmalloc_init);
 
 void *videobuf_to_vmalloc (struct videobuf_buffer *buf)
 {
-        struct videbuf_vmalloc_memory *mem=buf->priv;
+        struct videobuf_vmalloc_memory *mem=buf->priv;
         BUG_ON (!mem);
         MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
 
@@ -351,7 +349,7 @@ EXPORT_SYMBOL_GPL(videobuf_to_vmalloc);
 
 void videobuf_vmalloc_free (struct videobuf_buffer *buf)
 {
-        struct videbuf_vmalloc_memory *mem=buf->priv;
+        struct videobuf_vmalloc_memory *mem=buf->priv;
         BUG_ON (!mem);
 
         MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 28655f8983c6..0d9b63762a48 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -46,10 +46,373 @@
 #include <linux/videodev.h>
 #endif
 #include <media/v4l2-common.h>
+#include <linux/video_decoder.h>
 
 #define VIDEO_NUM_DEVICES       256
 #define VIDEO_NAME              "video4linux"
 
+/* video4linux standard ID conversion to standard name
+ */
+char *v4l2_norm_to_name(v4l2_std_id id)
+{
+        char *name;
+        u32 myid = id;
+
+        /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle
+           64 bit comparations. So, on that architecture, with some gcc
+           variants, compilation fails. Currently, the max value is 30bit wide.
+         */
+        BUG_ON(myid != id);
+
+        switch (myid) {
+        case V4L2_STD_PAL:
+                name = "PAL";
+                break;
+        case V4L2_STD_PAL_BG:
+                name = "PAL-BG";
+                break;
+        case V4L2_STD_PAL_DK:
+                name = "PAL-DK";
+                break;
+        case V4L2_STD_PAL_B:
+                name = "PAL-B";
+                break;
+        case V4L2_STD_PAL_B1:
+                name = "PAL-B1";
+                break;
+        case V4L2_STD_PAL_G:
+                name = "PAL-G";
+                break;
+        case V4L2_STD_PAL_H:
+                name = "PAL-H";
+                break;
+        case V4L2_STD_PAL_I:
+                name = "PAL-I";
+                break;
+        case V4L2_STD_PAL_D:
+                name = "PAL-D";
+                break;
+        case V4L2_STD_PAL_D1:
+                name = "PAL-D1";
+                break;
+        case V4L2_STD_PAL_K:
+                name = "PAL-K";
+                break;
+        case V4L2_STD_PAL_M:
+                name = "PAL-M";
+                break;
+        case V4L2_STD_PAL_N:
+                name = "PAL-N";
+                break;
+        case V4L2_STD_PAL_Nc:
+                name = "PAL-Nc";
+                break;
+        case V4L2_STD_PAL_60:
+                name = "PAL-60";
+                break;
+        case V4L2_STD_NTSC:
+                name = "NTSC";
+                break;
+        case V4L2_STD_NTSC_M:
+                name = "NTSC-M";
+                break;
+        case V4L2_STD_NTSC_M_JP:
+                name = "NTSC-M-JP";
+                break;
+        case V4L2_STD_NTSC_443:
+                name = "NTSC-443";
+                break;
+        case V4L2_STD_NTSC_M_KR:
+                name = "NTSC-M-KR";
+                break;
+        case V4L2_STD_SECAM:
+                name = "SECAM";
+                break;
+        case V4L2_STD_SECAM_DK:
+                name = "SECAM-DK";
+                break;
+        case V4L2_STD_SECAM_B:
+                name = "SECAM-B";
+                break;
+        case V4L2_STD_SECAM_D:
+                name = "SECAM-D";
+                break;
+        case V4L2_STD_SECAM_G:
+                name = "SECAM-G";
+                break;
+        case V4L2_STD_SECAM_H:
+                name = "SECAM-H";
+                break;
+        case V4L2_STD_SECAM_K:
+                name = "SECAM-K";
+                break;
+        case V4L2_STD_SECAM_K1:
+                name = "SECAM-K1";
+                break;
+        case V4L2_STD_SECAM_L:
+                name = "SECAM-L";
+                break;
+        case V4L2_STD_SECAM_LC:
+                name = "SECAM-LC";
+                break;
+        default:
+                name = "Unknown";
+                break;
+        }
+
+        return name;
+}
+EXPORT_SYMBOL(v4l2_norm_to_name);
+
+/* Fill in the fields of a v4l2_standard structure according to the
+   'id' and 'transmission' parameters.  Returns negative on error.  */
+int v4l2_video_std_construct(struct v4l2_standard *vs,
+                             int id, char *name)
+{
+        u32 index = vs->index;
+
+        memset(vs, 0, sizeof(struct v4l2_standard));
+        vs->index = index;
+        vs->id    = id;
+        if (id & V4L2_STD_525_60) {
+                vs->frameperiod.numerator = 1001;
+                vs->frameperiod.denominator = 30000;
+                vs->framelines = 525;
+        } else {
+                vs->frameperiod.numerator = 1;
+                vs->frameperiod.denominator = 25;
+                vs->framelines = 625;
+        }
+        strlcpy(vs->name, name, sizeof(vs->name));
+        return 0;
+}
+EXPORT_SYMBOL(v4l2_video_std_construct);
+
+/* ----------------------------------------------------------------- */
+/* some arrays for pretty-printing debug messages of enum types      */
+
+char *v4l2_field_names[] = {
+        [V4L2_FIELD_ANY]        = "any",
+        [V4L2_FIELD_NONE]       = "none",
+        [V4L2_FIELD_TOP]        = "top",
+        [V4L2_FIELD_BOTTOM]     = "bottom",
+        [V4L2_FIELD_INTERLACED] = "interlaced",
+        [V4L2_FIELD_SEQ_TB]     = "seq-tb",
+        [V4L2_FIELD_SEQ_BT]     = "seq-bt",
+        [V4L2_FIELD_ALTERNATE]  = "alternate",
+        [V4L2_FIELD_INTERLACED_TB] = "interlaced-tb",
+        [V4L2_FIELD_INTERLACED_BT] = "interlaced-bt",
+};
+EXPORT_SYMBOL(v4l2_field_names);
+
+char *v4l2_type_names[] = {
+        [V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "video-cap",
+        [V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "video-over",
+        [V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "video-out",
+        [V4L2_BUF_TYPE_VBI_CAPTURE]        = "vbi-cap",
+        [V4L2_BUF_TYPE_VBI_OUTPUT]         = "vbi-out",
+        [V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-cap",
+        [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "sliced-vbi-out",
+        [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "video-out-over",
+};
+EXPORT_SYMBOL(v4l2_type_names);
+
+static char *v4l2_memory_names[] = {
+        [V4L2_MEMORY_MMAP]    = "mmap",
+        [V4L2_MEMORY_USERPTR] = "userptr",
+        [V4L2_MEMORY_OVERLAY] = "overlay",
+};
+
+#define prt_names(a, arr) ((((a) >= 0) && ((a) < ARRAY_SIZE(arr))) ? \
+                           arr[a] : "unknown")
+
+/* ------------------------------------------------------------------ */
+/* debug help functions                                               */
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+static const char *v4l1_ioctls[] = {
+        [_IOC_NR(VIDIOCGCAP)]       = "VIDIOCGCAP",
+        [_IOC_NR(VIDIOCGCHAN)]      = "VIDIOCGCHAN",
+        [_IOC_NR(VIDIOCSCHAN)]      = "VIDIOCSCHAN",
+        [_IOC_NR(VIDIOCGTUNER)]     = "VIDIOCGTUNER",
+        [_IOC_NR(VIDIOCSTUNER)]     = "VIDIOCSTUNER",
+        [_IOC_NR(VIDIOCGPICT)]      = "VIDIOCGPICT",
+        [_IOC_NR(VIDIOCSPICT)]      = "VIDIOCSPICT",
+        [_IOC_NR(VIDIOCCAPTURE)]    = "VIDIOCCAPTURE",
+        [_IOC_NR(VIDIOCGWIN)]       = "VIDIOCGWIN",
+        [_IOC_NR(VIDIOCSWIN)]       = "VIDIOCSWIN",
+        [_IOC_NR(VIDIOCGFBUF)]      = "VIDIOCGFBUF",
+        [_IOC_NR(VIDIOCSFBUF)]      = "VIDIOCSFBUF",
+        [_IOC_NR(VIDIOCKEY)]        = "VIDIOCKEY",
+        [_IOC_NR(VIDIOCGFREQ)]      = "VIDIOCGFREQ",
+        [_IOC_NR(VIDIOCSFREQ)]      = "VIDIOCSFREQ",
+        [_IOC_NR(VIDIOCGAUDIO)]     = "VIDIOCGAUDIO",
+        [_IOC_NR(VIDIOCSAUDIO)]     = "VIDIOCSAUDIO",
+        [_IOC_NR(VIDIOCSYNC)]       = "VIDIOCSYNC",
+        [_IOC_NR(VIDIOCMCAPTURE)]   = "VIDIOCMCAPTURE",
+        [_IOC_NR(VIDIOCGMBUF)]      = "VIDIOCGMBUF",
+        [_IOC_NR(VIDIOCGUNIT)]      = "VIDIOCGUNIT",
+        [_IOC_NR(VIDIOCGCAPTURE)]   = "VIDIOCGCAPTURE",
+        [_IOC_NR(VIDIOCSCAPTURE)]   = "VIDIOCSCAPTURE",
+        [_IOC_NR(VIDIOCSPLAYMODE)]  = "VIDIOCSPLAYMODE",
+        [_IOC_NR(VIDIOCSWRITEMODE)] = "VIDIOCSWRITEMODE",
+        [_IOC_NR(VIDIOCGPLAYINFO)]  = "VIDIOCGPLAYINFO",
+        [_IOC_NR(VIDIOCSMICROCODE)] = "VIDIOCSMICROCODE",
+        [_IOC_NR(VIDIOCGVBIFMT)]    = "VIDIOCGVBIFMT",
+        [_IOC_NR(VIDIOCSVBIFMT)]    = "VIDIOCSVBIFMT"
+};
+#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)
+#endif
+
+static const char *v4l2_ioctls[] = {
+        [_IOC_NR(VIDIOC_QUERYCAP)]         = "VIDIOC_QUERYCAP",
+        [_IOC_NR(VIDIOC_RESERVED)]         = "VIDIOC_RESERVED",
+        [_IOC_NR(VIDIOC_ENUM_FMT)]         = "VIDIOC_ENUM_FMT",
+        [_IOC_NR(VIDIOC_G_FMT)]            = "VIDIOC_G_FMT",
+        [_IOC_NR(VIDIOC_S_FMT)]            = "VIDIOC_S_FMT",
+        [_IOC_NR(VIDIOC_REQBUFS)]          = "VIDIOC_REQBUFS",
+        [_IOC_NR(VIDIOC_QUERYBUF)]         = "VIDIOC_QUERYBUF",
+        [_IOC_NR(VIDIOC_G_FBUF)]           = "VIDIOC_G_FBUF",
+        [_IOC_NR(VIDIOC_S_FBUF)]           = "VIDIOC_S_FBUF",
+        [_IOC_NR(VIDIOC_OVERLAY)]          = "VIDIOC_OVERLAY",
+        [_IOC_NR(VIDIOC_QBUF)]             = "VIDIOC_QBUF",
+        [_IOC_NR(VIDIOC_DQBUF)]            = "VIDIOC_DQBUF",
+        [_IOC_NR(VIDIOC_STREAMON)]         = "VIDIOC_STREAMON",
+        [_IOC_NR(VIDIOC_STREAMOFF)]        = "VIDIOC_STREAMOFF",
+        [_IOC_NR(VIDIOC_G_PARM)]           = "VIDIOC_G_PARM",
+        [_IOC_NR(VIDIOC_S_PARM)]           = "VIDIOC_S_PARM",
+        [_IOC_NR(VIDIOC_G_STD)]            = "VIDIOC_G_STD",
+        [_IOC_NR(VIDIOC_S_STD)]            = "VIDIOC_S_STD",
+        [_IOC_NR(VIDIOC_ENUMSTD)]          = "VIDIOC_ENUMSTD",
+        [_IOC_NR(VIDIOC_ENUMINPUT)]        = "VIDIOC_ENUMINPUT",
+        [_IOC_NR(VIDIOC_G_CTRL)]           = "VIDIOC_G_CTRL",
+        [_IOC_NR(VIDIOC_S_CTRL)]           = "VIDIOC_S_CTRL",
+        [_IOC_NR(VIDIOC_G_TUNER)]          = "VIDIOC_G_TUNER",
+        [_IOC_NR(VIDIOC_S_TUNER)]          = "VIDIOC_S_TUNER",
+        [_IOC_NR(VIDIOC_G_AUDIO)]          = "VIDIOC_G_AUDIO",
+        [_IOC_NR(VIDIOC_S_AUDIO)]          = "VIDIOC_S_AUDIO",
+        [_IOC_NR(VIDIOC_QUERYCTRL)]        = "VIDIOC_QUERYCTRL",
+        [_IOC_NR(VIDIOC_QUERYMENU)]        = "VIDIOC_QUERYMENU",
+        [_IOC_NR(VIDIOC_G_INPUT)]          = "VIDIOC_G_INPUT",
+        [_IOC_NR(VIDIOC_S_INPUT)]          = "VIDIOC_S_INPUT",
+        [_IOC_NR(VIDIOC_G_OUTPUT)]         = "VIDIOC_G_OUTPUT",
+        [_IOC_NR(VIDIOC_S_OUTPUT)]         = "VIDIOC_S_OUTPUT",
+        [_IOC_NR(VIDIOC_ENUMOUTPUT)]       = "VIDIOC_ENUMOUTPUT",
+        [_IOC_NR(VIDIOC_G_AUDOUT)]         = "VIDIOC_G_AUDOUT",
+        [_IOC_NR(VIDIOC_S_AUDOUT)]         = "VIDIOC_S_AUDOUT",
+        [_IOC_NR(VIDIOC_G_MODULATOR)]      = "VIDIOC_G_MODULATOR",
+        [_IOC_NR(VIDIOC_S_MODULATOR)]      = "VIDIOC_S_MODULATOR",
+        [_IOC_NR(VIDIOC_G_FREQUENCY)]      = "VIDIOC_G_FREQUENCY",
+        [_IOC_NR(VIDIOC_S_FREQUENCY)]      = "VIDIOC_S_FREQUENCY",
+        [_IOC_NR(VIDIOC_CROPCAP)]          = "VIDIOC_CROPCAP",
+        [_IOC_NR(VIDIOC_G_CROP)]           = "VIDIOC_G_CROP",
+        [_IOC_NR(VIDIOC_S_CROP)]           = "VIDIOC_S_CROP",
+        [_IOC_NR(VIDIOC_G_JPEGCOMP)]       = "VIDIOC_G_JPEGCOMP",
+        [_IOC_NR(VIDIOC_S_JPEGCOMP)]       = "VIDIOC_S_JPEGCOMP",
+        [_IOC_NR(VIDIOC_QUERYSTD)]         = "VIDIOC_QUERYSTD",
+        [_IOC_NR(VIDIOC_TRY_FMT)]          = "VIDIOC_TRY_FMT",
+        [_IOC_NR(VIDIOC_ENUMAUDIO)]        = "VIDIOC_ENUMAUDIO",
+        [_IOC_NR(VIDIOC_ENUMAUDOUT)]       = "VIDIOC_ENUMAUDOUT",
+        [_IOC_NR(VIDIOC_G_PRIORITY)]       = "VIDIOC_G_PRIORITY",
+        [_IOC_NR(VIDIOC_S_PRIORITY)]       = "VIDIOC_S_PRIORITY",
+        [_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP",
+        [_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS",
+        [_IOC_NR(VIDIOC_G_EXT_CTRLS)]      = "VIDIOC_G_EXT_CTRLS",
+        [_IOC_NR(VIDIOC_S_EXT_CTRLS)]      = "VIDIOC_S_EXT_CTRLS",
+        [_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS",
+#if 1
+        [_IOC_NR(VIDIOC_ENUM_FRAMESIZES)]  = "VIDIOC_ENUM_FRAMESIZES",
+        [_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
+        [_IOC_NR(VIDIOC_G_ENC_INDEX)]      = "VIDIOC_G_ENC_INDEX",
+        [_IOC_NR(VIDIOC_ENCODER_CMD)]      = "VIDIOC_ENCODER_CMD",
+        [_IOC_NR(VIDIOC_TRY_ENCODER_CMD)]  = "VIDIOC_TRY_ENCODER_CMD",
+
+        [_IOC_NR(VIDIOC_DBG_S_REGISTER)]   = "VIDIOC_DBG_S_REGISTER",
+        [_IOC_NR(VIDIOC_DBG_G_REGISTER)]   = "VIDIOC_DBG_G_REGISTER",
+
+        [_IOC_NR(VIDIOC_G_CHIP_IDENT)]     = "VIDIOC_G_CHIP_IDENT",
+#endif
+};
+#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
+
+static const char *v4l2_int_ioctls[] = {
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        [_IOC_NR(DECODER_GET_CAPABILITIES)]    = "DECODER_GET_CAPABILITIES",
+        [_IOC_NR(DECODER_GET_STATUS)]          = "DECODER_GET_STATUS",
+        [_IOC_NR(DECODER_SET_NORM)]            = "DECODER_SET_NORM",
+        [_IOC_NR(DECODER_SET_INPUT)]           = "DECODER_SET_INPUT",
+        [_IOC_NR(DECODER_SET_OUTPUT)]          = "DECODER_SET_OUTPUT",
+        [_IOC_NR(DECODER_ENABLE_OUTPUT)]       = "DECODER_ENABLE_OUTPUT",
+        [_IOC_NR(DECODER_SET_PICTURE)]         = "DECODER_SET_PICTURE",
+        [_IOC_NR(DECODER_SET_GPIO)]            = "DECODER_SET_GPIO",
+        [_IOC_NR(DECODER_INIT)]                = "DECODER_INIT",
+        [_IOC_NR(DECODER_SET_VBI_BYPASS)]      = "DECODER_SET_VBI_BYPASS",
+        [_IOC_NR(DECODER_DUMP)]                = "DECODER_DUMP",
+#endif
+        [_IOC_NR(AUDC_SET_RADIO)]              = "AUDC_SET_RADIO",
+
+        [_IOC_NR(TUNER_SET_TYPE_ADDR)]         = "TUNER_SET_TYPE_ADDR",
+        [_IOC_NR(TUNER_SET_STANDBY)]           = "TUNER_SET_STANDBY",
+        [_IOC_NR(TUNER_SET_CONFIG)]            = "TUNER_SET_CONFIG",
+
+        [_IOC_NR(VIDIOC_INT_S_TUNER_MODE)]     = "VIDIOC_INT_S_TUNER_MODE",
+        [_IOC_NR(VIDIOC_INT_RESET)]            = "VIDIOC_INT_RESET",
+        [_IOC_NR(VIDIOC_INT_AUDIO_CLOCK_FREQ)] = "VIDIOC_INT_AUDIO_CLOCK_FREQ",
+        [_IOC_NR(VIDIOC_INT_DECODE_VBI_LINE)]  = "VIDIOC_INT_DECODE_VBI_LINE",
+        [_IOC_NR(VIDIOC_INT_S_VBI_DATA)]       = "VIDIOC_INT_S_VBI_DATA",
+        [_IOC_NR(VIDIOC_INT_G_VBI_DATA)]       = "VIDIOC_INT_G_VBI_DATA",
+        [_IOC_NR(VIDIOC_INT_I2S_CLOCK_FREQ)]   = "VIDIOC_INT_I2S_CLOCK_FREQ",
+        [_IOC_NR(VIDIOC_INT_S_STANDBY)]        = "VIDIOC_INT_S_STANDBY",
+        [_IOC_NR(VIDIOC_INT_S_AUDIO_ROUTING)]  = "VIDIOC_INT_S_AUDIO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)]  = "VIDIOC_INT_G_AUDIO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)]  = "VIDIOC_INT_S_VIDEO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)]  = "VIDIOC_INT_G_VIDEO_ROUTING",
+        [_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)]   = "VIDIOC_INT_S_CRYSTAL_FREQ",
+        [_IOC_NR(VIDIOC_INT_INIT)]             = "VIDIOC_INT_INIT",
+        [_IOC_NR(VIDIOC_INT_G_STD_OUTPUT)]     = "VIDIOC_INT_G_STD_OUTPUT",
+        [_IOC_NR(VIDIOC_INT_S_STD_OUTPUT)]     = "VIDIOC_INT_S_STD_OUTPUT",
+};
+#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
+
+/* Common ioctl debug function. This function can be used by
+   external ioctl messages as well as internal V4L ioctl */
+void v4l_printk_ioctl(unsigned int cmd)
+{
+        char *dir;
+
+        switch (_IOC_DIR(cmd)) {
+        case _IOC_NONE:              dir = "--"; break;
+        case _IOC_READ:              dir = "r-"; break;
+        case _IOC_WRITE:             dir = "-w"; break;
+        case _IOC_READ | _IOC_WRITE: dir = "rw"; break;
+        default:                     dir = "*ERR*"; break;
+        }
+        switch (_IOC_TYPE(cmd)) {
+        case 'd':
+                printk("v4l2_int ioctl %s, dir=%s (0x%08x)\n",
+                       (_IOC_NR(cmd) < V4L2_INT_IOCTLS) ?
+                       v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
+                break;
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+        case 'v':
+                printk("v4l1 ioctl %s, dir=%s (0x%08x)\n",
+                       (_IOC_NR(cmd) < V4L1_IOCTLS) ?
+                       v4l1_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
+                break;
+#endif
+        case 'V':
+                printk("v4l2 ioctl %s, dir=%s (0x%08x)\n",
+                       (_IOC_NR(cmd) < V4L2_IOCTLS) ?
+                       v4l2_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);
+                break;
+
+        default:
+                printk("unknown ioctl '%c', dir=%s, #%d (0x%08x)\n",
+                       _IOC_TYPE(cmd), dir, _IOC_NR(cmd), cmd);
+        }
+}
+EXPORT_SYMBOL(v4l_printk_ioctl);
+
 /*
  *      sysfs stuff
  */
@@ -69,11 +432,13 @@ struct video_device *video_device_alloc(void)
         vfd = kzalloc(sizeof(*vfd),GFP_KERNEL);
         return vfd;
 }
+EXPORT_SYMBOL(video_device_alloc);
 
 void video_device_release(struct video_device *vfd)
 {
         kfree(vfd);
 }
+EXPORT_SYMBOL(video_device_release);
 
 static void video_release(struct device *cd)
 {
@@ -110,6 +475,7 @@ struct video_device* video_devdata(struct file *file)
 {
         return video_device[iminor(file->f_path.dentry->d_inode)];
 }
+EXPORT_SYMBOL(video_devdata);
 
 /*
  *      Open a video device - FIXME: Obsoleted
@@ -278,6 +644,7 @@ out:
         kfree(mbuf);
         return err;
 }
+EXPORT_SYMBOL(video_usercopy);
 
 /*
  * open/release helper functions -- handle exclusive opens
@@ -297,6 +664,7 @@ int video_exclusive_open(struct inode *inode, struct file *file)
         mutex_unlock(&vfl->lock);
         return retval;
 }
+EXPORT_SYMBOL(video_exclusive_open);
 
 int video_exclusive_release(struct inode *inode, struct file *file)
 {
@@ -305,41 +673,7 @@ int video_exclusive_release(struct inode *inode, struct file *file)
         vfl->users--;
         return 0;
 }
-
-static char *v4l2_memory_names[] = {
-        [V4L2_MEMORY_MMAP]    = "mmap",
-        [V4L2_MEMORY_USERPTR] = "userptr",
-        [V4L2_MEMORY_OVERLAY] = "overlay",
-};
-
-
-/* FIXME: Those stuff are replicated also on v4l2-common.c */
-static char *v4l2_type_names_FIXME[] = {
-        [V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "video-cap",
-        [V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "video-over",
-        [V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "video-out",
-        [V4L2_BUF_TYPE_VBI_CAPTURE]        = "vbi-cap",
-        [V4L2_BUF_TYPE_VBI_OUTPUT]         = "vbi-out",
-        [V4L2_BUF_TYPE_SLICED_VBI_OUTPUT]  = "sliced-vbi-out",
-        [V4L2_BUF_TYPE_SLICED_VBI_CAPTURE] = "sliced-vbi-capture",
-        [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "video-out-over",
-        [V4L2_BUF_TYPE_PRIVATE]            = "private",
-};
-
-static char *v4l2_field_names_FIXME[] = {
-        [V4L2_FIELD_ANY]        = "any",
-        [V4L2_FIELD_NONE]       = "none",
-        [V4L2_FIELD_TOP]        = "top",
-        [V4L2_FIELD_BOTTOM]     = "bottom",
-        [V4L2_FIELD_INTERLACED] = "interlaced",
-        [V4L2_FIELD_SEQ_TB]     = "seq-tb",
-        [V4L2_FIELD_SEQ_BT]     = "seq-bt",
-        [V4L2_FIELD_ALTERNATE]  = "alternate",
-        [V4L2_FIELD_INTERLACED_TB] = "interlaced-tb",
-        [V4L2_FIELD_INTERLACED_BT] = "interlaced-bt",
-};
-
-#define prt_names(a,arr) (((a)>=0)&&((a)<ARRAY_SIZE(arr)))?arr[a]:"unknown"
+EXPORT_SYMBOL(video_exclusive_release);
 
 static void dbgbuf(unsigned int cmd, struct video_device *vfd,
                                         struct v4l2_buffer *p)
@@ -354,10 +688,10 @@ static void dbgbuf(unsigned int cmd, struct video_device *vfd,
                         (int)(p->timestamp.tv_sec%60),
                         p->timestamp.tv_usec,
                         p->index,
-                        prt_names(p->type,v4l2_type_names_FIXME),
-                        p->bytesused,p->flags,
-                        p->field,p->sequence,
-                        prt_names(p->memory,v4l2_memory_names),
+                        prt_names(p->type, v4l2_type_names),
+                        p->bytesused, p->flags,
+                        p->field, p->sequence,
+                        prt_names(p->memory, v4l2_memory_names),
                         p->m.userptr, p->length);
         dbgarg2 ("timecode= %02d:%02d:%02d type=%d, "
                 "flags=0x%08d, frames=%d, userbits=0x%08x\n",
@@ -382,8 +716,8 @@ static inline void v4l_print_pix_fmt (struct video_device *vfd,
                 (fmt->pixelformat >>  8) & 0xff,
                 (fmt->pixelformat >> 16) & 0xff,
                 (fmt->pixelformat >> 24) & 0xff,
-                prt_names(fmt->field,v4l2_field_names_FIXME),
-                fmt->bytesperline,fmt->sizeimage,fmt->colorspace);
+                prt_names(fmt->field, v4l2_field_names),
+                fmt->bytesperline, fmt->sizeimage, fmt->colorspace);
 };
 
 
@@ -597,7 +931,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 
                 /* FIXME: Should be one dump per type */
                 dbgarg (cmd, "type=%s\n", prt_names(type,
-                                        v4l2_type_names_FIXME));
+                                        v4l2_type_names));
 
                 switch (type) {
                 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
@@ -650,7 +984,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 
                 /* FIXME: Should be one dump per type */
                 dbgarg (cmd, "type=%s\n", prt_names(f->type,
-                                        v4l2_type_names_FIXME));
+                                        v4l2_type_names));
 
                 switch (f->type) {
                 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
@@ -702,7 +1036,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 
                 /* FIXME: Should be one dump per type */
                 dbgarg (cmd, "type=%s\n", prt_names(f->type,
-                                                v4l2_type_names_FIXME));
+                                                v4l2_type_names));
                 switch (f->type) {
                 case V4L2_BUF_TYPE_VIDEO_CAPTURE:
                         if (vfd->vidioc_try_fmt_cap)
@@ -768,8 +1102,8 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                 ret=vfd->vidioc_reqbufs(file, fh, p);
                 dbgarg (cmd, "count=%d, type=%s, memory=%s\n",
                                 p->count,
-                                prt_names(p->type,v4l2_type_names_FIXME),
-                                prt_names(p->memory,v4l2_memory_names));
+                                prt_names(p->type, v4l2_type_names),
+                                prt_names(p->memory, v4l2_memory_names));
                 break;
         }
         case VIDIOC_QUERYBUF:
@@ -858,7 +1192,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                 enum v4l2_buf_type i = *(int *)arg;
                 if (!vfd->vidioc_streamon)
                         break;
-                dbgarg (cmd, "type=%s\n", prt_names(i,v4l2_type_names_FIXME));
+                dbgarg(cmd, "type=%s\n", prt_names(i, v4l2_type_names));
                 ret=vfd->vidioc_streamon(file, fh,i);
                 break;
         }
@@ -868,7 +1202,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 
                 if (!vfd->vidioc_streamoff)
                         break;
-                dbgarg (cmd, "type=%s\n", prt_names(i,v4l2_type_names_FIXME));
+                dbgarg(cmd, "type=%s\n", prt_names(i, v4l2_type_names));
                 ret=vfd->vidioc_streamoff(file, fh, i);
                 break;
         }
@@ -1624,7 +1958,7 @@ out:
         kfree(mbuf);
         return err;
 }
-
+EXPORT_SYMBOL(video_ioctl2);
 
 static const struct file_operations video_fops;
 
@@ -1743,6 +2077,7 @@ fail_minor:
         mutex_unlock(&videodev_lock);
         return ret;
 }
+EXPORT_SYMBOL(video_register_device);
 
 /**
  *      video_unregister_device - unregister a video4linux device
@@ -1762,6 +2097,7 @@ void video_unregister_device(struct video_device *vfd)
         device_unregister(&vfd->class_dev);
         mutex_unlock(&videodev_lock);
 }
+EXPORT_SYMBOL(video_unregister_device);
 
 /*
  * Video fs operations
@@ -1806,16 +2142,6 @@ static void __exit videodev_exit(void)
 module_init(videodev_init)
 module_exit(videodev_exit)
 
-EXPORT_SYMBOL(video_register_device);
-EXPORT_SYMBOL(video_unregister_device);
-EXPORT_SYMBOL(video_devdata);
-EXPORT_SYMBOL(video_usercopy);
-EXPORT_SYMBOL(video_exclusive_open);
-EXPORT_SYMBOL(video_exclusive_release);
-EXPORT_SYMBOL(video_ioctl2);
-EXPORT_SYMBOL(video_device_alloc);
-EXPORT_SYMBOL(video_device_release);
-
 MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab <mchehab@infradead.org>");
 MODULE_DESCRIPTION("Device registrar for Video4Linux drivers v2");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 937c4a616c0e..498a43c1f2b1 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -221,15 +221,15 @@ enum zoran_map_mode {
 };
 
 enum gpio_type {
-        GPIO_JPEG_SLEEP = 0,
-        GPIO_JPEG_RESET,
-        GPIO_JPEG_FRAME,
-        GPIO_VID_DIR,
-        GPIO_VID_EN,
-        GPIO_VID_RESET,
-        GPIO_CLK_SEL1,
-        GPIO_CLK_SEL2,
-        GPIO_MAX,
+        ZR_GPIO_JPEG_SLEEP = 0,
+        ZR_GPIO_JPEG_RESET,
+        ZR_GPIO_JPEG_FRAME,
+        ZR_GPIO_VID_DIR,
+        ZR_GPIO_VID_EN,
+        ZR_GPIO_VID_RESET,
+        ZR_GPIO_CLK_SEL1,
+        ZR_GPIO_CLK_SEL2,
+        ZR_GPIO_MAX,
 };
 
 enum gpcs_type {
@@ -378,11 +378,11 @@ struct card_info {
 
         u32 jpeg_int;           /* JPEG interrupt */
         u32 vsync_int;          /* VSYNC interrupt */
-        s8 gpio[GPIO_MAX];
+        s8 gpio[ZR_GPIO_MAX];
         u8 gpcs[GPCS_MAX];
 
         struct vfe_polarity vfe_pol;
-        u8 gpio_pol[GPIO_MAX];
+        u8 gpio_pol[ZR_GPIO_MAX];
 
         /* is the /GWS line conected? */
         u8 gws_not_connected;
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 68c7c505587e..f97c20692057 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -250,7 +250,7 @@ void
 jpeg_codec_sleep (struct zoran *zr,
                   int           sleep)
 {
-        GPIO(zr, zr->card.gpio[GPIO_JPEG_SLEEP], !sleep);
+        GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_SLEEP], !sleep);
         if (!sleep) {
                 dprintk(3,
                         KERN_DEBUG
@@ -277,9 +277,9 @@ jpeg_codec_reset (struct zoran *zr)
                                   0);
                 udelay(2);
         } else {
-                GPIO(zr, zr->card.gpio[GPIO_JPEG_RESET], 0);
+                GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_RESET], 0);
                 udelay(2);
-                GPIO(zr, zr->card.gpio[GPIO_JPEG_RESET], 1);
+                GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_RESET], 1);
                 udelay(2);
         }
 
@@ -688,7 +688,7 @@ static inline void
 set_frame (struct zoran *zr,
            int           val)
 {
-        GPIO(zr, zr->card.gpio[GPIO_JPEG_FRAME], val);
+        GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_FRAME], val);
 }
 
 static void
@@ -704,8 +704,8 @@ set_videobus_dir (struct zoran *zr,
                         GPIO(zr, 5, 1);
                 break;
         default:
-                GPIO(zr, zr->card.gpio[GPIO_VID_DIR],
-                     zr->card.gpio_pol[GPIO_VID_DIR] ? !val : val);
+                GPIO(zr, zr->card.gpio[ZR_GPIO_VID_DIR],
+                     zr->card.gpio_pol[ZR_GPIO_VID_DIR] ? !val : val);
                 break;
         }
 }
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 1fdbb46de7f3..1b44784d0efb 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -93,6 +93,8 @@ static struct usb_device_id device_table[] = {
         {USB_DEVICE(0x06d6, 0x0034), .driver_info = METHOD0 },
         {USB_DEVICE(0x0a17, 0x0062), .driver_info = METHOD2 },
         {USB_DEVICE(0x06d6, 0x003b), .driver_info = METHOD0 },
+        {USB_DEVICE(0x0a17, 0x004e), .driver_info = METHOD2 },
+        {USB_DEVICE(0x041e, 0x405d), .driver_info = METHOD2 },
         {}                      /* Terminating entry */
 };
 
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index f55b71a4337d..4fb24215bd95 100644
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -282,7 +282,7 @@ static int tifm_ms_issue_cmd(struct tifm_ms *host)
 
                         writel(TIFM_MS_SYS_LATCH
                                | readl(sock->addr + SOCK_MS_SYSTEM),
-                               sock + SOCK_MS_SYSTEM);
+                               sock->addr + SOCK_MS_SYSTEM);
                         writel(0, sock->addr + SOCK_MS_DATA);
                         dev_dbg(&sock->dev, "writing %x\n", 0);
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 425f60c21fdd..0c303c84b37b 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1470,9 +1470,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         if (mpt_debug_level)
                 printk(KERN_INFO MYNAM ": mpt_debug_level=%xh\n", mpt_debug_level);
 
-        if (pci_enable_device(pdev))
-                return r;
-
         ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);
         if (ioc == NULL) {
                 printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
@@ -1482,6 +1479,20 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->id = mpt_ids++;
         sprintf(ioc->name, "ioc%d", ioc->id);
 
+        ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
+        if (pci_enable_device_mem(pdev)) {
+                printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "
+                       "failed\n", ioc->name);
+                kfree(ioc);
+                return r;
+        }
+        if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
+                printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
+                       "MEM failed\n", ioc->name);
+                kfree(ioc);
+                return r;
+        }
+
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT ": mpt_adapter_install\n", ioc->name));
 
         if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
@@ -1658,6 +1669,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->active = 0;
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
 
+        /* Set IOC ptr in the pcidev's driver data. */
+        pci_set_drvdata(ioc->pcidev, ioc);
+
         /* Set lookup ptr. */
         list_add_tail(&ioc->list, &ioc_list);
 
@@ -1791,6 +1805,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
 
         pci_disable_device(pdev);
+        pci_release_selected_regions(pdev, ioc->bars);
         pci_set_power_state(pdev, device_state);
 
         return 0;
@@ -1807,7 +1822,6 @@ mpt_resume(struct pci_dev *pdev)
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
         u32 device_state = pdev->current_state;
         int recovery_state;
-        int err;
 
         printk(MYIOC_s_INFO_FMT
         "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
@@ -1815,9 +1829,18 @@ mpt_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, 0);
         pci_restore_state(pdev);
-        err = pci_enable_device(pdev);
-        if (err)
-                return err;
+        if (ioc->facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) {
+                ioc->bars = pci_select_bars(ioc->pcidev, IORESOURCE_MEM |
+                        IORESOURCE_IO);
+                if (pci_enable_device(pdev))
+                        return 0;
+        } else {
+                ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
+                if (pci_enable_device_mem(pdev))
+                        return 0;
+        }
+        if (pci_request_selected_regions(pdev, ioc->bars, "mpt"))
+                return 0;
 
         /* enable interrupts */
         CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);
@@ -1878,6 +1901,7 @@ mpt_signal_reset(u8 index, MPT_ADAPTER *ioc, int reset_phase)
  *              -2 if READY but IOCFacts Failed
  *              -3 if READY but PrimeIOCFifos Failed
  *              -4 if READY but IOCInit Failed
+ *              -5 if failed to enable_device and/or request_selected_regions
  */
 static int
 mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
@@ -1976,6 +2000,18 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                 }
         }
 
+        if ((ret == 0) && (reason == MPT_HOSTEVENT_IOC_BRINGUP) &&
+            (ioc->facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT)) {
+                pci_release_selected_regions(ioc->pcidev, ioc->bars);
+                ioc->bars = pci_select_bars(ioc->pcidev, IORESOURCE_MEM |
+                    IORESOURCE_IO);
+                if (pci_enable_device(ioc->pcidev))
+                        return -5;
+                if (pci_request_selected_regions(ioc->pcidev, ioc->bars,
+                        "mpt"))
+                        return -5;
+        }
+
         /*
          * Device is reset now. It must have de-asserted the interrupt line
          * (if it was asserted) and it should be safe to register for the
@@ -1999,7 +2035,6 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                         irq_allocated = 1;
                         ioc->pci_irq = ioc->pcidev->irq;
                         pci_set_master(ioc->pcidev);            /* ?? */
-                        pci_set_drvdata(ioc->pcidev, ioc);
                         dprintk(ioc, printk(MYIOC_s_INFO_FMT "installed at interrupt "
                             "%d\n", ioc->name, ioc->pcidev->irq));
                 }
@@ -2381,6 +2416,9 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc)
                 ioc->memmap = NULL;
         }
 
+        pci_disable_device(ioc->pcidev);
+        pci_release_selected_regions(ioc->pcidev, ioc->bars);
+
 #if defined(CONFIG_MTRR) && 0
         if (ioc->mtrr_reg > 0) {
                 mtrr_del(ioc->mtrr_reg, 0, 0);
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index b49b706c0020..caadc68c3000 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -629,6 +629,7 @@ typedef struct _MPT_ADAPTER
         dma_addr_t              HostPageBuffer_dma;
         int                      mtrr_reg;
         struct pci_dev          *pcidev;        /* struct pci_dev pointer */
+        int                     bars;           /* bitmask of BAR's that must be configured */
         u8                      __iomem *memmap;        /* mmap address */
         struct Scsi_Host        *sh;            /* Scsi Host pointer */
         SpiCfgData              spi_data;       /* Scsi config. data */
@@ -922,7 +923,7 @@ extern struct proc_dir_entry	*mpt_proc_root_dir;
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 #endif          /* } __KERNEL__ */
 
-#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) || defined(__powerpc__)
+#ifdef CONFIG_64BIT
 #define CAST_U32_TO_PTR(x)      ((void *)(u64)x)
 #define CAST_PTR_TO_U32(x)      ((u32)(u64)x)
 #else
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 1abc95ca9dfa..982e27b86d10 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -258,6 +258,23 @@ config THINKPAD_ACPI_BAY
 
           If you are not sure, say Y here.
 
+config THINKPAD_ACPI_VIDEO
+        bool "Video output control support"
+        depends on THINKPAD_ACPI
+        default y
+        ---help---
+          Allows the thinkpad_acpi driver to provide an interface to control
+          the various video output ports.
+
+          This feature often won't work well, depending on ThinkPad model,
+          display state, video output devices in use, whether there is a X
+          server running, phase of the moon, and the current mood of
+          Schroedinger's cat.  If you can use X.org's RandR to control
+          your ThinkPad's video output ports instead of this feature,
+          don't think twice: do it and say N here to save some memory.
+
+          If you are not sure, say Y here.
+
 config THINKPAD_ACPI_HOTKEY_POLL
         bool "Suport NVRAM polling for hot keys"
         depends on THINKPAD_ACPI
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index d7aea93081f2..74d12b4a3abd 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -273,6 +273,15 @@ static struct dmi_system_id acer_quirks[] = {
         },
         {
                 .callback = dmi_matched,
+                .ident = "Acer TravelMate 4200",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4200"),
+                },
+                .driver_data = &quirk_acer_travelmate_2490,
+        },
+        {
+                .callback = dmi_matched,
                 .ident = "Medion MD 98300",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c
index f70984ab1e1b..de16e88eb8d3 100644
--- a/drivers/misc/intel_menlow.c
+++ b/drivers/misc/intel_menlow.c
@@ -170,10 +170,13 @@ static int intel_menlow_memory_add(struct acpi_device *device)
 
         cdev = thermal_cooling_device_register("Memory controller", device,
                                                &memory_cooling_ops);
-        acpi_driver_data(device) = cdev;
-        if (!cdev)
-                result = -ENODEV;
-        else {
+        if (IS_ERR(cdev)) {
+                result = PTR_ERR(cdev);
+                goto end;
+        }
+
+        if (cdev) {
+                acpi_driver_data(device) = cdev;
                 result = sysfs_create_link(&device->dev.kobj,
                                         &cdev->device.kobj, "thermal_cooling");
                 if (result)
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 7ba1acad5402..bb269d0c677e 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -221,6 +221,7 @@ static struct {
         u32 hotkey:1;
         u32 hotkey_mask:1;
         u32 hotkey_wlsw:1;
+        u32 hotkey_tablet:1;
         u32 light:1;
         u32 light_status:1;
         u32 bright_16levels:1;
@@ -301,6 +302,13 @@ TPACPI_HANDLE(hkey, ec, "\\_SB.HKEY",	/* 600e/x, 770e, 770x */
            "HKEY",              /* all others */
            );                   /* 570 */
 
+TPACPI_HANDLE(vid, root, "\\_SB.PCI.AGP.VGA",   /* 570 */
+           "\\_SB.PCI0.AGP0.VID0",      /* 600e/x, 770x */
+           "\\_SB.PCI0.VID0",   /* 770e */
+           "\\_SB.PCI0.VID",    /* A21e, G4x, R50e, X30, X40 */
+           "\\_SB.PCI0.AGP.VID",        /* all others */
+           );                           /* R30, R31 */
+
 
 /*************************************************************************
  * ACPI helpers
@@ -1053,6 +1061,9 @@ static struct attribute_set *hotkey_dev_attributes;
 #define HOTKEY_CONFIG_CRITICAL_END
 #endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
 
+/* HKEY.MHKG() return bits */
+#define TP_HOTKEY_TABLET_MASK (1 << 3)
+
 static int hotkey_get_wlsw(int *status)
 {
         if (!acpi_evalf(hkey_handle, status, "WLSW", "d"))
@@ -1060,6 +1071,16 @@ static int hotkey_get_wlsw(int *status)
         return 0;
 }
 
+static int hotkey_get_tablet_mode(int *status)
+{
+        int s;
+
+        if (!acpi_evalf(hkey_handle, &s, "MHKG", "d"))
+                return -EIO;
+
+        return ((s & TP_HOTKEY_TABLET_MASK) != 0);
+}
+
 /*
  * Call with hotkey_mutex held
  */
@@ -1154,15 +1175,31 @@ static void tpacpi_input_send_radiosw(void)
 {
         int wlsw;
 
-        mutex_lock(&tpacpi_inputdev_send_mutex);
-
         if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw)) {
+                mutex_lock(&tpacpi_inputdev_send_mutex);
+
                 input_report_switch(tpacpi_inputdev,
                                     SW_RADIO, !!wlsw);
                 input_sync(tpacpi_inputdev);
+
+                mutex_unlock(&tpacpi_inputdev_send_mutex);
         }
+}
+
+static void tpacpi_input_send_tabletsw(void)
+{
+        int state;
+
+        if (tp_features.hotkey_tablet &&
+            !hotkey_get_tablet_mode(&state)) {
+                mutex_lock(&tpacpi_inputdev_send_mutex);
 
-        mutex_unlock(&tpacpi_inputdev_send_mutex);
+                input_report_switch(tpacpi_inputdev,
+                                    SW_TABLET_MODE, !!state);
+                input_sync(tpacpi_inputdev);
+
+                mutex_unlock(&tpacpi_inputdev_send_mutex);
+        }
 }
 
 static void tpacpi_input_send_key(unsigned int scancode)
@@ -1417,6 +1454,14 @@ static void hotkey_poll_setup_safe(int may_warn)
         mutex_unlock(&hotkey_mutex);
 }
 
+#else /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
+
+static void hotkey_poll_setup_safe(int __unused)
+{
+}
+
+#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
+
 static int hotkey_inputdev_open(struct input_dev *dev)
 {
         switch (tpacpi_lifecycle) {
@@ -1444,7 +1489,6 @@ static void hotkey_inputdev_close(struct input_dev *dev)
         if (tpacpi_lifecycle == TPACPI_LIFE_RUNNING)
                 hotkey_poll_setup_safe(0);
 }
-#endif /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
 
 /* sysfs hotkey enable ------------------------------------------------- */
 static ssize_t hotkey_enable_show(struct device *dev,
@@ -1666,6 +1710,29 @@ static void hotkey_radio_sw_notify_change(void)
                              "hotkey_radio_sw");
 }
 
+/* sysfs hotkey tablet mode (pollable) --------------------------------- */
+static ssize_t hotkey_tablet_mode_show(struct device *dev,
+                           struct device_attribute *attr,
+                           char *buf)
+{
+        int res, s;
+        res = hotkey_get_tablet_mode(&s);
+        if (res < 0)
+                return res;
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", !!s);
+}
+
+static struct device_attribute dev_attr_hotkey_tablet_mode =
+        __ATTR(hotkey_tablet_mode, S_IRUGO, hotkey_tablet_mode_show, NULL);
+
+static void hotkey_tablet_mode_notify_change(void)
+{
+        if (tp_features.hotkey_tablet)
+                sysfs_notify(&tpacpi_pdev->dev.kobj, NULL,
+                             "hotkey_tablet_mode");
+}
+
 /* sysfs hotkey report_mode -------------------------------------------- */
 static ssize_t hotkey_report_mode_show(struct device *dev,
                            struct device_attribute *attr,
@@ -1689,7 +1756,7 @@ static ssize_t hotkey_wakeup_reason_show(struct device *dev,
 static struct device_attribute dev_attr_hotkey_wakeup_reason =
         __ATTR(wakeup_reason, S_IRUGO, hotkey_wakeup_reason_show, NULL);
 
-void hotkey_wakeup_reason_notify_change(void)
+static void hotkey_wakeup_reason_notify_change(void)
 {
         if (tp_features.hotkey_mask)
                 sysfs_notify(&tpacpi_pdev->dev.kobj, NULL,
@@ -1708,7 +1775,7 @@ static struct device_attribute dev_attr_hotkey_wakeup_hotunplug_complete =
         __ATTR(wakeup_hotunplug_complete, S_IRUGO,
                hotkey_wakeup_hotunplug_complete_show, NULL);
 
-void hotkey_wakeup_hotunplug_complete_notify_change(void)
+static void hotkey_wakeup_hotunplug_complete_notify_change(void)
 {
         if (tp_features.hotkey_mask)
                 sysfs_notify(&tpacpi_pdev->dev.kobj, NULL,
@@ -1878,7 +1945,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                 str_supported(tp_features.hotkey));
 
         if (tp_features.hotkey) {
-                hotkey_dev_attributes = create_attr_set(12, NULL);
+                hotkey_dev_attributes = create_attr_set(13, NULL);
                 if (!hotkey_dev_attributes)
                         return -ENOMEM;
                 res = add_many_to_attr_set(hotkey_dev_attributes,
@@ -1957,6 +2024,18 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                                         &dev_attr_hotkey_radio_sw.attr);
                 }
 
+                /* For X41t, X60t, X61t Tablets... */
+                if (!res && acpi_evalf(hkey_handle, &status, "MHKG", "qd")) {
+                        tp_features.hotkey_tablet = 1;
+                        printk(TPACPI_INFO
+                                "possible tablet mode switch found; "
+                                "ThinkPad in %s mode\n",
+                                (status & TP_HOTKEY_TABLET_MASK)?
+                                        "tablet" : "laptop");
+                        res = add_to_attr_set(hotkey_dev_attributes,
+                                        &dev_attr_hotkey_tablet_mode.attr);
+                }
+
                 if (!res)
                         res = register_attr_set_with_sysfs(
                                         hotkey_dev_attributes,
@@ -2006,6 +2085,10 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                         set_bit(EV_SW, tpacpi_inputdev->evbit);
                         set_bit(SW_RADIO, tpacpi_inputdev->swbit);
                 }
+                if (tp_features.hotkey_tablet) {
+                        set_bit(EV_SW, tpacpi_inputdev->evbit);
+                        set_bit(SW_TABLET_MODE, tpacpi_inputdev->swbit);
+                }
 
                 dbg_printk(TPACPI_DBG_INIT,
                                 "enabling hot key handling\n");
@@ -2023,12 +2106,12 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
                                 (hotkey_report_mode < 2) ?
                                         "enabled" : "disabled");
 
-#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
                 tpacpi_inputdev->open = &hotkey_inputdev_open;
                 tpacpi_inputdev->close = &hotkey_inputdev_close;
 
                 hotkey_poll_setup_safe(1);
-#endif
+                tpacpi_input_send_radiosw();
+                tpacpi_input_send_tabletsw();
         }
 
         return (tp_features.hotkey)? 0 : 1;
@@ -2156,11 +2239,15 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
                         /* 0x5000-0x5FFF: human interface helpers */
                         switch (hkey) {
                         case 0x5010: /* Lenovo new BIOS: brightness changed */
-                        case 0x5009: /* X61t: swivel up (tablet mode) */
-                        case 0x500a: /* X61t: swivel down (normal mode) */
                         case 0x500b: /* X61t: tablet pen inserted into bay */
                         case 0x500c: /* X61t: tablet pen removed from bay */
                                 break;
+                        case 0x5009: /* X41t-X61t: swivel up (tablet mode) */
+                        case 0x500a: /* X41t-X61t: swivel down (normal mode) */
+                                tpacpi_input_send_tabletsw();
+                                hotkey_tablet_mode_notify_change();
+                                send_acpi_ev = 0;
+                                break;
                         case 0x5001:
                         case 0x5002:
                                 /* LID switch events.  Do not propagate */
@@ -2219,11 +2306,10 @@ static void hotkey_resume(void)
                        "from firmware\n");
         tpacpi_input_send_radiosw();
         hotkey_radio_sw_notify_change();
+        hotkey_tablet_mode_notify_change();
         hotkey_wakeup_reason_notify_change();
         hotkey_wakeup_hotunplug_complete_notify_change();
-#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
         hotkey_poll_setup_safe(0);
-#endif
 }
 
 /* procfs -------------------------------------------------------------- */
@@ -2676,6 +2762,8 @@ static struct ibm_struct wan_driver_data = {
  * Video subdriver
  */
 
+#ifdef CONFIG_THINKPAD_ACPI_VIDEO
+
 enum video_access_mode {
         TPACPI_VIDEO_NONE = 0,
         TPACPI_VIDEO_570,       /* 570 */
@@ -2703,13 +2791,6 @@ static int video_orig_autosw;
 static int video_autosw_get(void);
 static int video_autosw_set(int enable);
 
-TPACPI_HANDLE(vid, root, "\\_SB.PCI.AGP.VGA",   /* 570 */
-           "\\_SB.PCI0.AGP0.VID0",      /* 600e/x, 770x */
-           "\\_SB.PCI0.VID0",   /* 770e */
-           "\\_SB.PCI0.VID",    /* A21e, G4x, R50e, X30, X40 */
-           "\\_SB.PCI0.AGP.VID",        /* all others */
-           );                           /* R30, R31 */
-
 TPACPI_HANDLE(vid2, root, "\\_SB.PCI0.AGPB.VID");       /* G41 */
 
 static int __init video_init(struct ibm_init_struct *iibm)
@@ -3019,6 +3100,8 @@ static struct ibm_struct video_driver_data = {
         .exit = video_exit,
 };
 
+#endif /* CONFIG_THINKPAD_ACPI_VIDEO */
+
 /*************************************************************************
  * Light (thinklight) subdriver
  */
@@ -5803,10 +5886,12 @@ static struct ibm_init_struct ibms_init[] __initdata = {
                 .init = wan_init,
                 .data = &wan_driver_data,
         },
+#ifdef CONFIG_THINKPAD_ACPI_VIDEO
         {
                 .init = video_init,
                 .data = &video_driver_data,
         },
+#endif
         {
                 .init = light_init,
                 .data = &light_driver_data,
@@ -5918,7 +6003,7 @@ MODULE_PARM_DESC(hotkey_report_mode,
 
 #define TPACPI_PARAM(feature) \
         module_param_call(feature, set_ibm_param, NULL, NULL, 0); \
-        MODULE_PARM_DESC(feature, "Simulates thinkpad-aci procfs command " \
+        MODULE_PARM_DESC(feature, "Simulates thinkpad-acpi procfs command " \
                          "at module load, see documentation")
 
 TPACPI_PARAM(hotkey);
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index 9b430f20b640..28cc6787a800 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -184,26 +184,26 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
         ret = path_lookup(dev_name, LOOKUP_FOLLOW, &nd);
 
         DEBUG(1, "MTDSB: path_lookup() returned %d, inode %p\n",
-              ret, nd.dentry ? nd.dentry->d_inode : NULL);
+              ret, nd.path.dentry ? nd.path.dentry->d_inode : NULL);
 
         if (ret)
                 return ret;
 
         ret = -EINVAL;
 
-        if (!S_ISBLK(nd.dentry->d_inode->i_mode))
+        if (!S_ISBLK(nd.path.dentry->d_inode->i_mode))
                 goto out;
 
-        if (nd.mnt->mnt_flags & MNT_NODEV) {
+        if (nd.path.mnt->mnt_flags & MNT_NODEV) {
                 ret = -EACCES;
                 goto out;
         }
 
-        if (imajor(nd.dentry->d_inode) != MTD_BLOCK_MAJOR)
+        if (imajor(nd.path.dentry->d_inode) != MTD_BLOCK_MAJOR)
                 goto not_an_MTD_device;
 
-        mtdnr = iminor(nd.dentry->d_inode);
-        path_release(&nd);
+        mtdnr = iminor(nd.path.dentry->d_inode);
+        path_put(&nd.path);
 
         return get_sb_mtd_nr(fs_type, flags, dev_name, data, mtdnr, fill_super,
                              mnt);
@@ -214,7 +214,7 @@ not_an_MTD_device:
                        "MTD: Attempt to mount non-MTD device \"%s\"\n",
                        dev_name);
 out:
-        path_release(&nd);
+        path_put(&nd.path);
         return ret;
 
 }
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index 9bc1132fa788..5757788227be 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -302,7 +302,6 @@ static int __devexit rgmii_remove(struct of_device *ofdev)
 static struct of_device_id rgmii_match[] =
 {
         {
-                .type           = "rgmii-interface",
                 .compatible     = "ibm,rgmii",
         },
         {
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index 679dfdb6807f..79b317b88c86 100644
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
@@ -578,13 +578,6 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
                 goto err_free;
         }
 
-        fmr->mpt = mlx4_table_find(&priv->mr_table.dmpt_table,
-                                    key_to_hw_index(fmr->mr.key), NULL);
-        if (!fmr->mpt) {
-                err = -ENOMEM;
-                goto err_free;
-        }
-
         return 0;
 
 err_free:
@@ -595,7 +588,19 @@ EXPORT_SYMBOL_GPL(mlx4_fmr_alloc);
 
 int mlx4_fmr_enable(struct mlx4_dev *dev, struct mlx4_fmr *fmr)
 {
-        return mlx4_mr_enable(dev, &fmr->mr);
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int err;
+
+        err = mlx4_mr_enable(dev, &fmr->mr);
+        if (err)
+                return err;
+
+        fmr->mpt = mlx4_table_find(&priv->mr_table.dmpt_table,
+                                    key_to_hw_index(fmr->mr.key), NULL);
+        if (!fmr->mpt)
+                return -ENOMEM;
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(mlx4_fmr_enable);
 
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 8134c7e198a5..b07ba2a14119 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -187,23 +187,22 @@ void sync_stop(void)
         end_sync();
 }
 
- 
+
 /* Optimisation. We can manage without taking the dcookie sem
  * because we cannot reach this code without at least one
  * dcookie user still being registered (namely, the reader
  * of the event buffer). */
-static inline unsigned long fast_get_dcookie(struct dentry * dentry,
-        struct vfsmount * vfsmnt)
+static inline unsigned long fast_get_dcookie(struct path *path)
 {
         unsigned long cookie;
- 
-        if (dentry->d_cookie)
-                return (unsigned long)dentry;
-        get_dcookie(dentry, vfsmnt, &cookie);
+
+        if (path->dentry->d_cookie)
+                return (unsigned long)path->dentry;
+        get_dcookie(path, &cookie);
         return cookie;
 }
 
- 
+
 /* Look up the dcookie for the task's first VM_EXECUTABLE mapping,
  * which corresponds loosely to "application name". This is
  * not strictly necessary but allows oprofile to associate
@@ -222,8 +221,7 @@ static unsigned long get_exec_dcookie(struct mm_struct * mm)
                         continue;
                 if (!(vma->vm_flags & VM_EXECUTABLE))
                         continue;
-                cookie = fast_get_dcookie(vma->vm_file->f_path.dentry,
-                        vma->vm_file->f_path.mnt);
+                cookie = fast_get_dcookie(&vma->vm_file->f_path);
                 break;
         }
 
@@ -248,8 +246,7 @@ static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, o
                         continue;
 
                 if (vma->vm_file) {
-                        cookie = fast_get_dcookie(vma->vm_file->f_path.dentry,
-                                vma->vm_file->f_path.mnt);
+                        cookie = fast_get_dcookie(&vma->vm_file->f_path);
                         *offset = (vma->vm_pgoff << PAGE_SHIFT) + addr -
                                 vma->vm_start;
                 } else {
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 238628d3a854..d76d37bcb9cc 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1768,7 +1768,7 @@ static int parport_PS2_supported(struct parport *pb)
 }
 
 #ifdef CONFIG_PARPORT_PC_FIFO
-static int __devinit parport_ECP_supported(struct parport *pb)
+static int parport_ECP_supported(struct parport *pb)
 {
         int i;
         int config, configb;
@@ -1992,7 +1992,7 @@ static int parport_ECPEPP_supported(struct parport *pb)
 /* Don't bother probing for modes we know we won't use. */
 static int __devinit parport_PS2_supported(struct parport *pb) { return 0; }
 #ifdef CONFIG_PARPORT_PC_FIFO
-static int __devinit parport_ECP_supported(struct parport *pb) { return 0; }
+static int parport_ECP_supported(struct parport *pb) { return 0; }
 #endif
 static int __devinit parport_EPP_supported(struct parport *pb) { return 0; }
 static int __devinit parport_ECPEPP_supported(struct parport *pb){return 0;}
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 8ed26480371f..f941f609dbf3 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -14,11 +14,12 @@
  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  *
- *      Copyright (C) Ashok Raj <ashok.raj@intel.com>
- *      Copyright (C) Shaohua Li <shaohua.li@intel.com>
- *      Copyright (C) Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
+ * Copyright (C) 2006-2008 Intel Corporation
+ * Author: Ashok Raj <ashok.raj@intel.com>
+ * Author: Shaohua Li <shaohua.li@intel.com>
+ * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  *
- *      This file implements early detection/parsing of DMA Remapping Devices
+ * This file implements early detection/parsing of DMA Remapping Devices
  * reported to OS through BIOS via DMA remapping reporting (DMAR) ACPI
  * tables.
  */
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index c8c263875c21..9279d5ba62e6 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -392,6 +392,9 @@ static int __init acpiphp_init(void)
 {
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
+        if (acpi_pci_disabled)
+                return 0;
+
         acpiphp_debug = debug;
 
         /* read all the ACPI info from the system */
@@ -401,6 +404,9 @@ static int __init acpiphp_init(void)
 
 static void __exit acpiphp_exit(void)
 {
+        if (acpi_pci_disabled)
+                return;
+
         /* deallocate internal data structures etc. */
         acpiphp_glue_exit();
 }
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 750ebd7a4c10..b0a22b92717e 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -395,33 +395,34 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
 {
         acpi_handle *phandle = (acpi_handle *)context;
         acpi_status status; 
-        struct acpi_device_info info; 
-        struct acpi_buffer info_buffer = {
-                .length = sizeof(struct acpi_device_info),
-                .pointer = &info,
-        };
+        struct acpi_device_info *info;
+        struct acpi_buffer info_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        int retval = 0;
 
         status = acpi_get_object_info(handle, &info_buffer);
         if (ACPI_FAILURE(status)) {
-                err("%s:  Failed to get device information\n", __FUNCTION__);
-                return 0;
+                err("%s:  Failed to get device information status=0x%x\n",
+                        __FUNCTION__, status);
+                return retval;
         }
-        info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
-
-        if (info.current_status && (info.valid & ACPI_VALID_HID) &&
-                        (!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) ||
-                        !strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) {
-                dbg("found hardware: %s, handle: %p\n", info.hardware_id.value,
-                                handle);
+        info = info_buffer.pointer;
+        info->hardware_id.value[sizeof(info->hardware_id.value) - 1] = '\0';
+
+        if (info->current_status && (info->valid & ACPI_VALID_HID) &&
+                        (!strcmp(info->hardware_id.value, IBM_HARDWARE_ID1) ||
+                         !strcmp(info->hardware_id.value, IBM_HARDWARE_ID2))) {
+                dbg("found hardware: %s, handle: %p\n",
+                        info->hardware_id.value, handle);
                 *phandle = handle;
                 /* returning non-zero causes the search to stop
                  * and returns this value to the caller of 
                  * acpi_walk_namespace, but it also causes some warnings
                  * in the acpi debug code to print...
                  */
-                return FOUND_APCI;
+                retval = FOUND_APCI;
         }
-        return 0;
+        kfree(info);
+        return retval;
 }
 
 static int __init ibm_acpiphp_init(void)
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index a4c3089f892a..977d29b32295 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -14,9 +14,10 @@
  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  *
- * Copyright (C) Ashok Raj <ashok.raj@intel.com>
- * Copyright (C) Shaohua Li <shaohua.li@intel.com>
- * Copyright (C) Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
+ * Copyright (C) 2006-2008 Intel Corporation
+ * Author: Ashok Raj <ashok.raj@intel.com>
+ * Author: Shaohua Li <shaohua.li@intel.com>
+ * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  */
 
 #include <linux/init.h>
diff --git a/drivers/pci/intel-iommu.h b/drivers/pci/intel-iommu.h
index 07f5f6353bda..afc0ad96122e 100644
--- a/drivers/pci/intel-iommu.h
+++ b/drivers/pci/intel-iommu.h
@@ -14,8 +14,9 @@
  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  *
- * Copyright (C) Ashok Raj <ashok.raj@intel.com>
- * Copyright (C) Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
+ * Copyright (C) 2006-2008 Intel Corporation
+ * Author: Ashok Raj <ashok.raj@intel.com>
+ * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  */
 
 #ifndef _INTEL_IOMMU_H_
diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c
index 8de7ab6c6d0c..dbcdd6bfa63a 100644
--- a/drivers/pci/iova.c
+++ b/drivers/pci/iova.c
@@ -3,7 +3,8 @@
  *
  * This file is released under the GPLv2.
  *
- * Copyright (C) 2006 Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
+ * Copyright (C) 2006-2008 Intel Corporation
+ * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  */
 
 #include "iova.h"
diff --git a/drivers/pci/iova.h b/drivers/pci/iova.h
index d521b5b7319c..228f6c94b69c 100644
--- a/drivers/pci/iova.h
+++ b/drivers/pci/iova.h
@@ -3,7 +3,8 @@
  *
  * This file is released under the GPLv2.
  *
- * Copyright (C) 2006 Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
+ * Copyright (C) 2006-2008 Intel Corporation
+ * Author: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  *
  */
 
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index e569645d59e2..4a23654184fc 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -158,6 +158,7 @@ run_osc_out:
 /**
  * __pci_osc_support_set - register OS support to Firmware
  * @flags: OS support bits
+ * @hid: hardware ID
  *
  * Update OS support fields and doing a _OSC Query to obtain an update
  * from Firmware on supported control bits.
@@ -241,8 +242,6 @@ EXPORT_SYMBOL(pci_osc_control_set);
  *      choose from highest power _SxD to lowest power _SxW
  * else // no _PRW at S-state x
  *      choose highest power _SxD or any lower power
- *
- * currently we simply return _SxD, if present.
  */
 
 static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ae3df46eaabf..183fddaa38b7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -554,6 +554,7 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
         case PM_EVENT_PRETHAW:
                 /* REVISIT both freeze and pre-thaw "should" use D0 */
         case PM_EVENT_SUSPEND:
+        case PM_EVENT_HIBERNATE:
                 return PCI_D3hot;
         default:
                 printk("Unrecognized suspend event %d\n", state.event);
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 68aeeb7206de..ef18fcd641e2 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -422,7 +422,7 @@ int pci_proc_detach_device(struct pci_dev *dev)
         struct proc_dir_entry *e;
 
         if ((e = dev->procent)) {
-                if (atomic_read(&e->count))
+                if (atomic_read(&e->count) > 1)
                         return -EBUSY;
                 remove_proc_entry(e->name, dev->bus->procdir);
                 dev->procent = NULL;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 0a953d43b9a2..bbad4a9f264f 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -867,13 +867,13 @@ static void quirk_disable_pxb(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb);
 DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb);
 
-
-static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
+static void __devinit quirk_amd_ide_mode(struct pci_dev *pdev)
 {
-        /* set sb600 sata to ahci mode */
-        if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
-                u8 tmp;
+        /* set sb600/sb700/sb800 sata to ahci mode */
+        u8 tmp;
 
+        pci_read_config_byte(pdev, PCI_CLASS_DEVICE, &tmp);
+        if (tmp == 0x01) {
                 pci_read_config_byte(pdev, 0x40, &tmp);
                 pci_write_config_byte(pdev, 0x40, tmp|1);
                 pci_write_config_byte(pdev, 0x9, 1);
@@ -881,10 +881,13 @@ static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
                 pci_write_config_byte(pdev, 0x40, tmp);
 
                 pdev->class = PCI_CLASS_STORAGE_SATA_AHCI;
+                dev_info(&pdev->dev, "set SATA to AHCI mode\n");
         }
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_sb600_sata);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
 
 /*
  *      Serverworks CSB5 IDE does not fully support native mode
@@ -1775,6 +1778,68 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                         quirk_nvidia_ck804_msi_ht_cap);
 
+/*
+ *  Force enable MSI mapping capability on HT bridges  */
+static inline void ht_enable_msi_mapping(struct pci_dev *dev)
+{
+        int pos, ttl = 48;
+
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);
+        while (pos && ttl--) {
+                u8 flags;
+
+                if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,
+                                         &flags) == 0) {
+                        dev_info(&dev->dev, "Enabling HT MSI Mapping\n");
+
+                        pci_write_config_byte(dev, pos + HT_MSI_FLAGS,
+                                              flags | HT_MSI_FLAGS_ENABLE);
+                }
+                pos = pci_find_next_ht_capability(dev, pos,
+                                                  HT_CAPTYPE_MSI_MAPPING);
+        }
+}
+
+static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev)
+{
+        struct pci_dev *host_bridge;
+        int pos, ttl = 48;
+
+        /*
+         * HT MSI mapping should be disabled on devices that are below
+         * a non-Hypertransport host bridge. Locate the host bridge...
+         */
+        host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
+        if (host_bridge == NULL) {
+                dev_warn(&dev->dev,
+                         "nv_msi_ht_cap_quirk didn't locate host bridge\n");
+                return;
+        }
+
+        pos = pci_find_ht_capability(host_bridge, HT_CAPTYPE_SLAVE);
+        if (pos != 0) {
+                /* Host bridge is to HT */
+                ht_enable_msi_mapping(dev);
+                return;
+        }
+
+        /* Host bridge is not to HT, disable HT MSI mapping on this device */
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);
+        while (pos && ttl--) {
+                u8 flags;
+
+                if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,
+                                         &flags) == 0) {
+                        dev_info(&dev->dev, "Quirk disabling HT MSI mapping");
+                        pci_write_config_byte(dev, pos + HT_MSI_FLAGS,
+                                              flags & ~HT_MSI_FLAGS_ENABLE);
+                }
+                pos = pci_find_next_ht_capability(dev, pos,
+                                                  HT_CAPTYPE_MSI_MAPPING);
+        }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, nv_msi_ht_cap_quirk);
+
 static void __devinit quirk_msi_intx_disable_bug(struct pci_dev *dev)
 {
         dev->dev_flags |= PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 262b0439abe9..125e7b7f34ff 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -206,10 +206,8 @@ pci_setup_bridge(struct pci_bus *bus)
         if (bus->resource[2]->flags & IORESOURCE_PREFETCH) {
                 l = (region.start >> 16) & 0xfff0;
                 l |= region.end & 0xfff00000;
-#ifdef CONFIG_RESOURCES_64BIT
-                bu = region.start >> 32;
-                lu = region.end >> 32;
-#endif
+                bu = upper_32_bits(region.start);
+                lu = upper_32_bits(region.end);
                 DBG(KERN_INFO "  PREFETCH window: 0x%016llx-0x%016llx\n",
                     (unsigned long long)region.start,
                     (unsigned long long)region.end);
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 749515534cc0..e54ecc580d9e 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -647,7 +647,12 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
         if ( (mem->card_start > 0x3ffffff) || (region.start > region.end) ||
              (mem->speed > 1000) ) {
                 leave("i82092aa_set_mem_map: invalid address / speed");
-                printk("invalid mem map for socket %i : %lx to %lx with a start of %x \n",sock,region.start, region.end, mem->card_start);
+                printk("invalid mem map for socket %i: %llx to %llx with a "
+                        "start of %x\n",
+                        sock,
+                        (unsigned long long)region.start,
+                        (unsigned long long)region.end,
+                        mem->card_start);
                 return -EINVAL;
         }
         
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 662b4c279cfc..c283a9a70d83 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -36,7 +36,7 @@ static int num = 0;
  * have irqs (PIC, Timer) because we call acpi_register_gsi.
  * Finally, only devices that have a CRS method need to be in this list.
  */
-static struct __initdata acpi_device_id excluded_id_list[] = {
+static struct acpi_device_id excluded_id_list[] __initdata = {
         {"PNP0C09", 0},         /* EC */
         {"PNP0C0F", 0},         /* Link device */
         {"PNP0000", 0},         /* PIC */
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index f7e67197a568..a8a51500e1e9 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -105,8 +105,6 @@ static int pnp_dock_event(int dock, struct pnp_docking_station_info *info)
         char *argv[3], **envp, *buf, *scratch;
         int i = 0, value;
 
-        if (!current->fs->root)
-                return -EAGAIN;
         if (!(envp = kcalloc(20, sizeof(char *), GFP_KERNEL)))
                 return -ENOMEM;
         if (!(buf = kzalloc(256, GFP_KERNEL))) {
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c
index 4c066545d176..6c9592ce4996 100644
--- a/drivers/ps3/ps3-lpm.c
+++ b/drivers/ps3/ps3-lpm.c
@@ -76,7 +76,6 @@
  *
  * @pm_control: Shadow of the processor's pm_control register.
  * @pm_start_stop: Shadow of the processor's pm_start_stop register.
- * @pm_interval: Shadow of the processor's pm_interval register.
  * @group_control: Shadow of the processor's group_control register.
  * @debug_bus_control: Shadow of the processor's debug_bus_control register.
  *
@@ -91,7 +90,6 @@
 struct ps3_lpm_shadow_regs {
         u64 pm_control;
         u64 pm_start_stop;
-        u64 pm_interval;
         u64 group_control;
         u64 debug_bus_control;
 };
@@ -181,9 +179,9 @@ void ps3_set_bookmark(u64 bookmark)
          * includes cycles before the call.
          */
 
-        asm volatile("or 29, 29, 29;"); /* db10cyc */
+        asm volatile("nop;nop;nop;nop;nop;nop;nop;nop;nop;");
         mtspr(SPRN_BKMK, bookmark);
-        asm volatile("or 29, 29, 29;"); /* db10cyc */
+        asm volatile("nop;nop;nop;nop;nop;nop;nop;nop;nop;");
 }
 EXPORT_SYMBOL_GPL(ps3_set_bookmark);
 
@@ -408,7 +406,14 @@ u32 ps3_read_pm(u32 cpu, enum pm_reg_name reg)
         case pm_start_stop:
                 return lpm_priv->shadow.pm_start_stop;
         case pm_interval:
-                return lpm_priv->shadow.pm_interval;
+                result = lv1_set_lpm_interval(lpm_priv->lpm_id, 0, 0, &val);
+                if (result) {
+                        val = 0;
+                        dev_dbg(sbd_core(), "%s:%u: lv1 set_inteval failed: "
+                                "reg %u, %s\n", __func__, __LINE__, reg,
+                                ps3_result(result));
+                }
+                return (u32)val;
         case group_control:
                 return lpm_priv->shadow.group_control;
         case debug_bus_control:
@@ -475,10 +480,8 @@ void ps3_write_pm(u32 cpu, enum pm_reg_name reg, u32 val)
                 lpm_priv->shadow.pm_control = val;
                 break;
         case pm_interval:
-                if (val != lpm_priv->shadow.pm_interval)
-                        result = lv1_set_lpm_interval(lpm_priv->lpm_id, val,
-                                                   PS3_WRITE_PM_MASK, &dummy);
-                lpm_priv->shadow.pm_interval = val;
+                result = lv1_set_lpm_interval(lpm_priv->lpm_id, val,
+                                              PS3_WRITE_PM_MASK, &dummy);
                 break;
         case pm_start_stop:
                 if (val != lpm_priv->shadow.pm_start_stop)
@@ -1140,7 +1143,6 @@ int ps3_lpm_open(enum ps3_lpm_tb_type tb_type, void *tb_cache,
 
         lpm_priv->shadow.pm_control = PS3_LPM_SHADOW_REG_INIT;
         lpm_priv->shadow.pm_start_stop = PS3_LPM_SHADOW_REG_INIT;
-        lpm_priv->shadow.pm_interval = PS3_LPM_SHADOW_REG_INIT;
         lpm_priv->shadow.group_control = PS3_LPM_SHADOW_REG_INIT;
         lpm_priv->shadow.debug_bus_control = PS3_LPM_SHADOW_REG_INIT;
 
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index c3c3aba3ffce..d4f6f960dd18 100644
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
@@ -28,10 +28,6 @@
 
 #include "vuart.h"
 
-MODULE_AUTHOR("Sony Corporation");
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("PS3 System Manager");
-
 /**
  * ps3_sys_manager - PS3 system manager driver.
  *
@@ -142,9 +138,11 @@ enum ps3_sys_manager_attr {
 
 /**
  * enum ps3_sys_manager_event - External event type, reported by system manager.
- * @PS3_SM_EVENT_POWER_PRESSED: payload.value not used.
+ * @PS3_SM_EVENT_POWER_PRESSED: payload.value =
+ *  enum ps3_sys_manager_button_event.
  * @PS3_SM_EVENT_POWER_RELEASED: payload.value = time pressed in millisec.
- * @PS3_SM_EVENT_RESET_PRESSED: payload.value not used.
+ * @PS3_SM_EVENT_RESET_PRESSED: payload.value =
+ *  enum ps3_sys_manager_button_event.
  * @PS3_SM_EVENT_RESET_RELEASED: payload.value = time pressed in millisec.
  * @PS3_SM_EVENT_THERMAL_ALERT: payload.value = thermal zone id.
  * @PS3_SM_EVENT_THERMAL_CLEARED: payload.value = thermal zone id.
@@ -162,6 +160,17 @@ enum ps3_sys_manager_event {
 };
 
 /**
+ * enum ps3_sys_manager_button_event - Button event payload values.
+ * @PS3_SM_BUTTON_EVENT_HARD: Hardware generated event.
+ * @PS3_SM_BUTTON_EVENT_SOFT: Software generated event.
+ */
+
+enum ps3_sys_manager_button_event {
+        PS3_SM_BUTTON_EVENT_HARD = 0,
+        PS3_SM_BUTTON_EVENT_SOFT = 1,
+};
+
+/**
  * enum ps3_sys_manager_next_op - Operation to perform after lpar is destroyed.
  */
 
@@ -181,7 +190,9 @@ enum ps3_sys_manager_next_op {
  * @PS3_SM_WAKE_P_O_R: Power on reset.
  *
  * Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN.
- * System will always wake from the PS3_SM_WAKE_DEFAULT sources.
+ * The system will always wake from the PS3_SM_WAKE_DEFAULT sources.
+ * Sources listed here are the only ones available to guests in the
+ * other-os lpar.
  */
 
 enum ps3_sys_manager_wake_source {
@@ -189,7 +200,7 @@ enum ps3_sys_manager_wake_source {
         PS3_SM_WAKE_DEFAULT   = 0,
         PS3_SM_WAKE_RTC       = 0x00000040,
         PS3_SM_WAKE_RTC_ERROR = 0x00000080,
-        PS3_SM_WAKE_P_O_R     = 0x10000000,
+        PS3_SM_WAKE_P_O_R     = 0x80000000,
 };
 
 /**
@@ -418,8 +429,10 @@ static int ps3_sys_manager_handle_event(struct ps3_system_bus_device *dev)
 
         switch (event.type) {
         case PS3_SM_EVENT_POWER_PRESSED:
-                dev_dbg(&dev->core, "%s:%d: POWER_PRESSED\n",
-                        __func__, __LINE__);
+                dev_dbg(&dev->core, "%s:%d: POWER_PRESSED (%s)\n",
+                        __func__, __LINE__,
+                        (event.value == PS3_SM_BUTTON_EVENT_SOFT ? "soft"
+                        : "hard"));
                 ps3_sm_force_power_off = 1;
                 /*
                  * A memory barrier is use here to sync memory since
@@ -434,8 +447,10 @@ static int ps3_sys_manager_handle_event(struct ps3_system_bus_device *dev)
                         __func__, __LINE__, event.value);
                 break;
         case PS3_SM_EVENT_RESET_PRESSED:
-                dev_dbg(&dev->core, "%s:%d: RESET_PRESSED\n",
-                        __func__, __LINE__);
+                dev_dbg(&dev->core, "%s:%d: RESET_PRESSED (%s)\n",
+                        __func__, __LINE__,
+                        (event.value == PS3_SM_BUTTON_EVENT_SOFT ? "soft"
+                        : "hard"));
                 ps3_sm_force_power_off = 0;
                 /*
                  * A memory barrier is use here to sync memory since
@@ -622,7 +637,7 @@ static void ps3_sys_manager_final_restart(struct ps3_system_bus_device *dev)
         ps3_vuart_cancel_async(dev);
 
         ps3_sys_manager_send_attr(dev, 0);
-        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_LPAR_REBOOT,
+        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT,
                 PS3_SM_WAKE_DEFAULT);
         ps3_sys_manager_send_request_shutdown(dev);
 
@@ -699,4 +714,7 @@ static int __init ps3_sys_manager_init(void)
 module_init(ps3_sys_manager_init);
 /* Module remove not supported. */
 
+MODULE_AUTHOR("Sony Corporation");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("PS3 System Manager");
 MODULE_ALIAS(PS3_MODULE_ALIAS_SYSTEM_MANAGER);
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index e059f94c79eb..f3ee2ad566b4 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -388,6 +388,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
         return seq_printf(seq,
                         "periodic_IRQ\t: %s\n"
                         "update_IRQ\t: %s\n"
+                        "HPET_emulated\t: %s\n"
                         // "square_wave\t: %s\n"
                         // "BCD\t\t: %s\n"
                         "DST_enable\t: %s\n"
@@ -395,6 +396,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
                         "batt_status\t: %s\n",
                         (rtc_control & RTC_PIE) ? "yes" : "no",
                         (rtc_control & RTC_UIE) ? "yes" : "no",
+                        is_hpet_enabled() ? "yes" : "no",
                         // (rtc_control & RTC_SQWE) ? "yes" : "no",
                         // (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
                         (rtc_control & RTC_DST_EN) ? "yes" : "no",
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d984e0fae630..ccf46c96adb4 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1149,12 +1149,14 @@ static void __dasd_device_process_final_queue(struct dasd_device *device,
 {
         struct list_head *l, *n;
         struct dasd_ccw_req *cqr;
+        struct dasd_block *block;
 
         list_for_each_safe(l, n, final_queue) {
                 cqr = list_entry(l, struct dasd_ccw_req, devlist);
                 list_del_init(&cqr->devlist);
-                if (cqr->block)
-                        spin_lock_bh(&cqr->block->queue_lock);
+                block = cqr->block;
+                if (block)
+                        spin_lock_bh(&block->queue_lock);
                 switch (cqr->status) {
                 case DASD_CQR_SUCCESS:
                         cqr->status = DASD_CQR_DONE;
@@ -1172,15 +1174,13 @@ static void __dasd_device_process_final_queue(struct dasd_device *device,
                                     cqr, cqr->status);
                         BUG();
                 }
-                if (cqr->block)
-                        spin_unlock_bh(&cqr->block->queue_lock);
                 if (cqr->callback != NULL)
                         (cqr->callback)(cqr, cqr->callback_data);
+                if (block)
+                        spin_unlock_bh(&block->queue_lock);
         }
 }
 
-
-
 /*
  * Take a look at the first request on the ccw queue and check
  * if it reached its expire time. If so, terminate the IO.
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 3faf0538b328..e6c94dbfdeaa 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -666,7 +666,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
                 page_addr = (unsigned long)
                         page_address(bvec->bv_page) + bvec->bv_offset;
                 source_addr = dev_info->start + (index<<12) + bytes_done;
-                if (unlikely(page_addr & 4095) != 0 || (bvec->bv_len & 4095) != 0)
+                if (unlikely((page_addr & 4095) != 0) || (bvec->bv_len & 4095) != 0)
                         // More paranoia.
                         goto fail;
                 if (bio_data_dir(bio) == READ) {
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 25629b92dec3..2c7a1ee6b041 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -29,10 +29,10 @@ static ext_int_info_t ext_int_info_hwc;
 /* Lock to protect internal data consistency. */
 static DEFINE_SPINLOCK(sclp_lock);
 
-/* Mask of events that we can receive from the sclp interface. */
+/* Mask of events that we can send to the sclp interface. */
 static sccb_mask_t sclp_receive_mask;
 
-/* Mask of events that we can send to the sclp interface. */
+/* Mask of events that we can receive from the sclp interface. */
 static sccb_mask_t sclp_send_mask;
 
 /* List of registered event listeners and senders. */
@@ -380,7 +380,7 @@ sclp_interrupt_handler(__u16 code)
                 }
                 sclp_running_state = sclp_running_state_idle;
         }
-        if (evbuf_pending && sclp_receive_mask != 0 &&
+        if (evbuf_pending &&
             sclp_activation_state == sclp_activation_state_active)
                 __sclp_queue_read_req();
         spin_unlock(&sclp_lock);
@@ -459,8 +459,8 @@ sclp_dispatch_state_change(void)
                 reg = NULL;
                 list_for_each(l, &sclp_reg_list) {
                         reg = list_entry(l, struct sclp_register, list);
-                        receive_mask = reg->receive_mask & sclp_receive_mask;
-                        send_mask = reg->send_mask & sclp_send_mask;
+                        receive_mask = reg->send_mask & sclp_receive_mask;
+                        send_mask = reg->receive_mask & sclp_send_mask;
                         if (reg->sclp_receive_mask != receive_mask ||
                             reg->sclp_send_mask != send_mask) {
                                 reg->sclp_receive_mask = receive_mask;
@@ -615,8 +615,8 @@ struct init_sccb {
         u16 mask_length;
         sccb_mask_t receive_mask;
         sccb_mask_t send_mask;
-        sccb_mask_t sclp_send_mask;
         sccb_mask_t sclp_receive_mask;
+        sccb_mask_t sclp_send_mask;
 } __attribute__((packed));
 
 /* Prepare init mask request. Called while sclp_lock is locked. */
diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h
index aa8186d18aee..bac80e856f97 100644
--- a/drivers/s390/char/sclp.h
+++ b/drivers/s390/char/sclp.h
@@ -122,11 +122,13 @@ struct sclp_req {
 /* of some routines it wants to be called from the low level driver */
 struct sclp_register {
         struct list_head list;
-        /* event masks this user is registered for */
+        /* User wants to receive: */
         sccb_mask_t receive_mask;
+        /* User wants to send: */
         sccb_mask_t send_mask;
-        /* actually present events */
+        /* H/W can receive: */
         sccb_mask_t sclp_receive_mask;
+        /* H/W can send: */
         sccb_mask_t sclp_send_mask;
         /* called if event type availability changes */
         void (*state_change_fn)(struct sclp_register *);
diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index 9dc77f14fa52..b8f35bc52b7b 100644
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -64,7 +64,7 @@ static int __init sclp_conf_init(void)
                 return rc;
         }
 
-        if (!(sclp_conf_register.sclp_receive_mask & EVTYP_CONFMGMDATA_MASK)) {
+        if (!(sclp_conf_register.sclp_send_mask & EVTYP_CONFMGMDATA_MASK)) {
                 printk(KERN_WARNING TAG "no configuration management.\n");
                 sclp_unregister(&sclp_conf_register);
                 rc = -ENOSYS;
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 41617032afdc..9f37456222e9 100644
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -129,7 +129,7 @@ static int cpi_req(void)
                         "to hardware console.\n");
                 goto out;
         }
-        if (!(sclp_cpi_event.sclp_send_mask & EVTYP_CTLPROGIDENT_MASK)) {
+        if (!(sclp_cpi_event.sclp_receive_mask & EVTYP_CTLPROGIDENT_MASK)) {
                 printk(KERN_WARNING "cpi: no control program "
                         "identification support\n");
                 rc = -EOPNOTSUPP;
diff --git a/drivers/s390/char/sclp_rw.c b/drivers/s390/char/sclp_rw.c
index ad7195d3de0c..da09781b32f7 100644
--- a/drivers/s390/char/sclp_rw.c
+++ b/drivers/s390/char/sclp_rw.c
@@ -452,10 +452,10 @@ sclp_emit_buffer(struct sclp_buffer *buffer,
                 return -EIO;
 
         sccb = buffer->sccb;
-        if (sclp_rw_event.sclp_send_mask & EVTYP_MSG_MASK)
+        if (sclp_rw_event.sclp_receive_mask & EVTYP_MSG_MASK)
                 /* Use normal write message */
                 sccb->msg_buf.header.type = EVTYP_MSG;
-        else if (sclp_rw_event.sclp_send_mask & EVTYP_PMSGCMD_MASK)
+        else if (sclp_rw_event.sclp_receive_mask & EVTYP_PMSGCMD_MASK)
                 /* Use write priority message */
                 sccb->msg_buf.header.type = EVTYP_PMSGCMD;
         else
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index f47f4a768be5..92f527201792 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -202,7 +202,7 @@ sclp_vt220_callback(struct sclp_req *request, void *data)
 static int
 __sclp_vt220_emit(struct sclp_vt220_request *request)
 {
-        if (!(sclp_vt220_register.sclp_send_mask & EVTYP_VT220MSG_MASK)) {
+        if (!(sclp_vt220_register.sclp_receive_mask & EVTYP_VT220MSG_MASK)) {
                 request->sclp_req.status = SCLP_REQ_FAILED;
                 return -EIO;
         }
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index d35dc3f25d06..fec004f62bcf 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -32,7 +32,7 @@
 #include "io_sch.h"
 
 static struct timer_list recovery_timer;
-static spinlock_t recovery_lock;
+static DEFINE_SPINLOCK(recovery_lock);
 static int recovery_phase;
 static const unsigned long recovery_delay[] = { 3, 30, 300 };
 
@@ -1535,7 +1535,7 @@ static int recovery_check(struct device *dev, void *data)
         return 0;
 }
 
-static void recovery_func(unsigned long data)
+static void recovery_work_func(struct work_struct *unused)
 {
         int redo = 0;
 
@@ -1553,6 +1553,17 @@ static void recovery_func(unsigned long data)
                 CIO_MSG_EVENT(2, "recovery: end\n");
 }
 
+static DECLARE_WORK(recovery_work, recovery_work_func);
+
+static void recovery_func(unsigned long data)
+{
+        /*
+         * We can't do our recovery in softirq context and it's not
+         * performance critical, so we schedule it.
+         */
+        schedule_work(&recovery_work);
+}
+
 void ccw_device_schedule_recovery(void)
 {
         unsigned long flags;
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 097fc0967e9d..2b5bfb7c69e5 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -32,7 +32,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-
+#include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
@@ -1215,9 +1215,6 @@ tiqdio_is_inbound_q_done(struct qdio_q *q)
 
         if (!no_used)
                 return 1;
-        if (!q->siga_sync && !irq->is_qebsm)
-                /* we'll check for more primed buffers in qeth_stop_polling */
-                return 0;
         if (irq->is_qebsm) {
                 count = 1;
                 start_buf = q->first_to_check;
@@ -3332,13 +3329,7 @@ qdio_activate(struct ccw_device *cdev, int flags)
                 }
         }
 
-        wait_event_interruptible_timeout(cdev->private->wait_q,
-                                         ((irq_ptr->state ==
-                                          QDIO_IRQ_STATE_STOPPED) ||
-                                          (irq_ptr->state ==
-                                           QDIO_IRQ_STATE_ERR)),
-                                         QDIO_ACTIVATE_TIMEOUT);
-
+        msleep(QDIO_ACTIVATE_TIMEOUT);
         switch (irq_ptr->state) {
         case QDIO_IRQ_STATE_STOPPED:
         case QDIO_IRQ_STATE_ERR:
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index 37870e4e938e..da8a272fd75b 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -57,10 +57,10 @@
                                             of the queue to 0 */
 
 #define QDIO_ESTABLISH_TIMEOUT (1*HZ)
-#define QDIO_ACTIVATE_TIMEOUT (5*HZ)
 #define QDIO_CLEANUP_CLEAR_TIMEOUT (20*HZ)
 #define QDIO_CLEANUP_HALT_TIMEOUT (10*HZ)
 #define QDIO_FORCE_CHECK_TIMEOUT (10*HZ)
+#define QDIO_ACTIVATE_TIMEOUT (5) /* 5 ms */
 
 enum qdio_irq_states {
         QDIO_IRQ_STATE_INACTIVE,
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index a5f0aaaf0dd4..c46666a24809 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -722,7 +722,7 @@ config SCSI_FD_MCS
 
 config SCSI_GDTH
         tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"
-        depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API && PCI_LEGACY
+        depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API
         ---help---
           Formerly called GDT SCSI Disk Array Controller Support.
 
@@ -992,6 +992,16 @@ config SCSI_IZIP_SLOW_CTR
 
           Generally, saying N is fine.
 
+config SCSI_MVSAS
+        tristate "Marvell 88SE6440 SAS/SATA support"
+        depends on PCI && SCSI
+        select SCSI_SAS_LIBSAS
+        help
+          This driver supports Marvell SAS/SATA PCI devices.
+
+          To compiler this driver as a module, choose M here: the module
+          will be called mvsas.
+
 config SCSI_NCR53C406A
         tristate "NCR53c406a SCSI support"
         depends on ISA && SCSI
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 925c26b4fff9..23e6ecbd4778 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -119,6 +119,7 @@ obj-$(CONFIG_SCSI_IBMVSCSI)	+= ibmvscsi/
 obj-$(CONFIG_SCSI_IBMVSCSIS)    += ibmvscsi/
 obj-$(CONFIG_SCSI_HPTIOP)       += hptiop.o
 obj-$(CONFIG_SCSI_STEX)         += stex.o
+obj-$(CONFIG_SCSI_MVSAS)        += mvsas.o
 obj-$(CONFIG_PS3_ROM)           += ps3rom.o
 
 obj-$(CONFIG_ARM)               += arm/
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index bfd0e64964ac..c05092fd3a9d 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -144,51 +144,77 @@ static char *aac_get_status_string(u32 status);
  */
 
 static int nondasd = -1;
-static int aac_cache = 0;
+static int aac_cache;
 static int dacmode = -1;
-
+int aac_msi;
 int aac_commit = -1;
 int startup_timeout = 180;
 int aif_timeout = 120;
 
 module_param(nondasd, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices. 0=off, 1=on");
+MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices."
+        " 0=off, 1=on");
 module_param_named(cache, aac_cache, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(cache, "Disable Queue Flush commands:\n\tbit 0 - Disable FUA in WRITE SCSI commands\n\tbit 1 - Disable SYNCHRONIZE_CACHE SCSI command\n\tbit 2 - Disable only if Battery not protecting Cache");
+MODULE_PARM_DESC(cache, "Disable Queue Flush commands:\n"
+        "\tbit 0 - Disable FUA in WRITE SCSI commands\n"
+        "\tbit 1 - Disable SYNCHRONIZE_CACHE SCSI command\n"
+        "\tbit 2 - Disable only if Battery not protecting Cache");
 module_param(dacmode, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC. 0=off, 1=on");
+MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC."
+        " 0=off, 1=on");
 module_param_named(commit, aac_commit, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the adapter for foreign arrays.\nThis is typically needed in systems that do not have a BIOS. 0=off, 1=on");
+MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the"
+        " adapter for foreign arrays.\n"
+        "This is typically needed in systems that do not have a BIOS."
+        " 0=off, 1=on");
+module_param_named(msi, aac_msi, int, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(msi, "IRQ handling."
+        " 0=PIC(default), 1=MSI, 2=MSI-X(unsupported, uses MSI)");
 module_param(startup_timeout, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for adapter to have it's kernel up and\nrunning. This is typically adjusted for large systems that do not have a BIOS.");
+MODULE_PARM_DESC(startup_timeout, "The duration of time in seconds to wait for"
+        " adapter to have it's kernel up and\n"
+        "running. This is typically adjusted for large systems that do not"
+        " have a BIOS.");
 module_param(aif_timeout, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(aif_timeout, "The duration of time in seconds to wait for applications to pick up AIFs before\nderegistering them. This is typically adjusted for heavily burdened systems.");
+MODULE_PARM_DESC(aif_timeout, "The duration of time in seconds to wait for"
+        " applications to pick up AIFs before\n"
+        "deregistering them. This is typically adjusted for heavily burdened"
+        " systems.");
 
 int numacb = -1;
 module_param(numacb, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(numacb, "Request a limit to the number of adapter control blocks (FIB) allocated. Valid values are 512 and down. Default is to use suggestion from Firmware.");
+MODULE_PARM_DESC(numacb, "Request a limit to the number of adapter control"
+        " blocks (FIB) allocated. Valid values are 512 and down. Default is"
+        " to use suggestion from Firmware.");
 
 int acbsize = -1;
 module_param(acbsize, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB) size. Valid values are 512, 2048, 4096 and 8192. Default is to use suggestion from Firmware.");
+MODULE_PARM_DESC(acbsize, "Request a specific adapter control block (FIB)"
+        " size. Valid values are 512, 2048, 4096 and 8192. Default is to use"
+        " suggestion from Firmware.");
 
 int update_interval = 30 * 60;
 module_param(update_interval, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(update_interval, "Interval in seconds between time sync updates issued to adapter.");
+MODULE_PARM_DESC(update_interval, "Interval in seconds between time sync"
+        " updates issued to adapter.");
 
 int check_interval = 24 * 60 * 60;
 module_param(check_interval, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health checks.");
+MODULE_PARM_DESC(check_interval, "Interval in seconds between adapter health"
+        " checks.");
 
 int aac_check_reset = 1;
 module_param_named(check_reset, aac_check_reset, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(aac_check_reset, "If adapter fails health check, reset the adapter. a value of -1 forces the reset to adapters programmed to ignore it.");
+MODULE_PARM_DESC(aac_check_reset, "If adapter fails health check, reset the"
+        " adapter. a value of -1 forces the reset to adapters programmed to"
+        " ignore it.");
 
 int expose_physicals = -1;
 module_param(expose_physicals, int, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(expose_physicals, "Expose physical components of the arrays. -1=protect 0=off, 1=on");
+MODULE_PARM_DESC(expose_physicals, "Expose physical components of the arrays."
+        " -1=protect 0=off, 1=on");
 
-int aac_reset_devices = 0;
+int aac_reset_devices;
 module_param_named(reset_devices, aac_reset_devices, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(reset_devices, "Force an adapter reset at initialization.");
 
@@ -1315,7 +1341,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
                           (int)sizeof(dev->supplement_adapter_info.VpdInfo.Tsid),
                           dev->supplement_adapter_info.VpdInfo.Tsid);
                 }
-                if (!aac_check_reset || ((aac_check_reset != 1) &&
+                if (!aac_check_reset || ((aac_check_reset == 1) &&
                   (dev->supplement_adapter_info.SupportedOptions2 &
                   AAC_OPTION_IGNORE_RESET))) {
                         printk(KERN_INFO "%s%d: Reset Adapter Ignored\n",
@@ -1353,13 +1379,14 @@ int aac_get_adapter_info(struct aac_dev* dev)
 
         if (nondasd != -1)
                 dev->nondasd_support = (nondasd!=0);
-        if(dev->nondasd_support != 0) {
+        if (dev->nondasd_support && !dev->in_reset)
                 printk(KERN_INFO "%s%d: Non-DASD support enabled.\n",dev->name, dev->id);
-        }
 
         dev->dac_support = 0;
         if( (sizeof(dma_addr_t) > 4) && (dev->adapter_info.options & AAC_OPT_SGMAP_HOST64)){
-                printk(KERN_INFO "%s%d: 64bit support enabled.\n", dev->name, dev->id);
+                if (!dev->in_reset)
+                        printk(KERN_INFO "%s%d: 64bit support enabled.\n",
+                                dev->name, dev->id);
                 dev->dac_support = 1;
         }
 
@@ -1369,8 +1396,9 @@ int aac_get_adapter_info(struct aac_dev* dev)
         if(dev->dac_support != 0) {
                 if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&
                         !pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {
-                        printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
-                                dev->name, dev->id);
+                        if (!dev->in_reset)
+                                printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
+                                        dev->name, dev->id);
                 } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
                         !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
                         printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 3195d29f2177..ace0b751c131 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1026,6 +1026,7 @@ struct aac_dev
         u8                      raw_io_64;
         u8                      printf_enabled;
         u8                      in_reset;
+        u8                      msi;
 };
 
 #define aac_adapter_interrupt(dev) \
@@ -1881,6 +1882,7 @@ extern int startup_timeout;
 extern int aif_timeout;
 extern int expose_physicals;
 extern int aac_reset_devices;
+extern int aac_msi;
 extern int aac_commit;
 extern int update_interval;
 extern int check_interval;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 81b36923e0ef..47434499e82b 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1458,7 +1458,7 @@ int aac_check_health(struct aac_dev * aac)
 
         printk(KERN_ERR "%s: Host adapter BLINK LED 0x%x\n", aac->name, BlinkLED);
 
-        if (!aac_check_reset || ((aac_check_reset != 1) &&
+        if (!aac_check_reset || ((aac_check_reset == 1) &&
                 (aac->supplement_adapter_info.SupportedOptions2 &
                         AAC_OPTION_IGNORE_RESET)))
                 goto out;
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index e80d2a0c46af..ae5f74fb62d5 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -275,9 +275,9 @@ static const char *aac_info(struct Scsi_Host *shost)
 
 /**
  *      aac_get_driver_ident
- *      @devtype: index into lookup table
+ *      @devtype: index into lookup table
  *
- *      Returns a pointer to the entry in the driver lookup table.
+ *      Returns a pointer to the entry in the driver lookup table.
  */
 
 struct aac_driver_ident* aac_get_driver_ident(int devtype)
@@ -494,13 +494,14 @@ static int aac_change_queue_depth(struct scsi_device *sdev, int depth)
 
 static ssize_t aac_show_raid_level(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct scsi_device * sdev = to_scsi_device(dev);
+        struct scsi_device *sdev = to_scsi_device(dev);
+        struct aac_dev *aac = (struct aac_dev *)(sdev->host->hostdata);
         if (sdev_channel(sdev) != CONTAINER_CHANNEL)
                 return snprintf(buf, PAGE_SIZE, sdev->no_uld_attach
-                  ? "Hidden\n" : "JBOD");
+                  ? "Hidden\n" :
+                  ((aac->jbod && (sdev->type == TYPE_DISK)) ? "JBOD\n" : ""));
         return snprintf(buf, PAGE_SIZE, "%s\n",
-          get_container_type(((struct aac_dev *)(sdev->host->hostdata))
-            ->fsa_dev[sdev_id(sdev)].type));
+          get_container_type(aac->fsa_dev[sdev_id(sdev)].type));
 }
 
 static struct device_attribute aac_raid_level_attr = {
@@ -641,7 +642,7 @@ static int aac_eh_reset(struct scsi_cmnd* cmd)
            AAC_OPTION_MU_RESET) &&
           aac_check_reset &&
           ((aac_check_reset != 1) ||
-           (aac->supplement_adapter_info.SupportedOptions2 &
+           !(aac->supplement_adapter_info.SupportedOptions2 &
             AAC_OPTION_IGNORE_RESET)))
                 aac_reset_adapter(aac, 2); /* Bypass wait for command quiesce */
         return SUCCESS; /* Cause an immediate retry of the command with a ten second delay after successful tur */
@@ -860,8 +861,8 @@ ssize_t aac_show_serial_number(struct class_device *class_dev, char *buf)
                   le32_to_cpu(dev->adapter_info.serial[0]));
         if (len &&
           !memcmp(&dev->supplement_adapter_info.MfgPcbaSerialNo[
-            sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo)+2-len],
-          buf, len))
+            sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo)-len],
+          buf, len-1))
                 len = snprintf(buf, PAGE_SIZE, "%.*s\n",
                   (int)sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo),
                   dev->supplement_adapter_info.MfgPcbaSerialNo);
@@ -1004,32 +1005,32 @@ static const struct file_operations aac_cfg_fops = {
 
 static struct scsi_host_template aac_driver_template = {
         .module                         = THIS_MODULE,
-        .name                           = "AAC",
+        .name                           = "AAC",
         .proc_name                      = AAC_DRIVERNAME,
-        .info                           = aac_info,
-        .ioctl                          = aac_ioctl,
+        .info                           = aac_info,
+        .ioctl                          = aac_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl                   = aac_compat_ioctl,
 #endif
-        .queuecommand                   = aac_queuecommand,
-        .bios_param                     = aac_biosparm,
+        .queuecommand                   = aac_queuecommand,
+        .bios_param                     = aac_biosparm,
         .shost_attrs                    = aac_attrs,
         .slave_configure                = aac_slave_configure,
         .change_queue_depth             = aac_change_queue_depth,
         .sdev_attrs                     = aac_dev_attrs,
         .eh_abort_handler               = aac_eh_abort,
         .eh_host_reset_handler          = aac_eh_reset,
-        .can_queue                      = AAC_NUM_IO_FIB,
-        .this_id                        = MAXIMUM_NUM_CONTAINERS,
-        .sg_tablesize                   = 16,
-        .max_sectors                    = 128,
+        .can_queue                      = AAC_NUM_IO_FIB,
+        .this_id                        = MAXIMUM_NUM_CONTAINERS,
+        .sg_tablesize                   = 16,
+        .max_sectors                    = 128,
 #if (AAC_NUM_IO_FIB > 256)
         .cmd_per_lun                    = 256,
 #else
-        .cmd_per_lun                    = AAC_NUM_IO_FIB,
+        .cmd_per_lun                    = AAC_NUM_IO_FIB,
 #endif
         .use_clustering                 = ENABLE_CLUSTERING,
-        .emulated                       = 1,
+        .emulated                       = 1,
 };
 
 static void __aac_shutdown(struct aac_dev * aac)
@@ -1039,6 +1040,8 @@ static void __aac_shutdown(struct aac_dev * aac)
         aac_send_shutdown(aac);
         aac_adapter_disable_int(aac);
         free_irq(aac->pdev->irq, aac);
+        if (aac->msi)
+                pci_disable_msi(aac->pdev);
 }
 
 static int __devinit aac_probe_one(struct pci_dev *pdev,
@@ -1254,7 +1257,7 @@ static struct pci_driver aac_pci_driver = {
         .id_table       = aac_pci_tbl,
         .probe          = aac_probe_one,
         .remove         = __devexit_p(aac_remove_one),
-        .shutdown       = aac_shutdown,
+        .shutdown       = aac_shutdown,
 };
 
 static int __init aac_init(void)
@@ -1271,7 +1274,7 @@ static int __init aac_init(void)
         aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);
         if (aac_cfg_major < 0) {
                 printk(KERN_WARNING
-                       "aacraid: unable to register \"aac\" device.\n");
+                        "aacraid: unable to register \"aac\" device.\n");
         }
 
         return 0;
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index a08bbf1fd76c..1f18b83e1e02 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -625,8 +625,11 @@ int _aac_rx_init(struct aac_dev *dev)
         if (aac_init_adapter(dev) == NULL)
                 goto error_iounmap;
         aac_adapter_comm(dev, dev->comm_interface);
-        if (request_irq(dev->scsi_host_ptr->irq, dev->a_ops.adapter_intr,
+        dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
+        if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
                         IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {
+                if (dev->msi)
+                        pci_disable_msi(dev->pdev);
                 printk(KERN_ERR "%s%d: Interrupt unavailable.\n",
                         name, instance);
                 goto error_iounmap;
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 85b91bc578c9..cfc3410ec073 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -31,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/blkdev.h>
@@ -385,7 +386,7 @@ int aac_sa_init(struct aac_dev *dev)
 
         if(aac_init_adapter(dev) == NULL)
                 goto error_irq;
-        if (request_irq(dev->scsi_host_ptr->irq, dev->a_ops.adapter_intr,
+        if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
                         IRQF_SHARED|IRQF_DISABLED,
                         "aacraid", (void *)dev ) < 0) {
                 printk(KERN_WARNING "%s%d: Interrupt unavailable.\n",
@@ -403,7 +404,7 @@ int aac_sa_init(struct aac_dev *dev)
 
 error_irq:
         aac_sa_disable_interrupt(dev);
-        free_irq(dev->scsi_host_ptr->irq, (void *)dev);
+        free_irq(dev->pdev->irq, (void *)dev);
 
 error_iounmap:
 
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index ccef891d642f..3c2d6888bb8c 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -566,7 +566,7 @@ typedef struct asc_dvc_var {
         ASC_SCSI_BIT_ID_TYPE unit_not_ready;
         ASC_SCSI_BIT_ID_TYPE queue_full_or_busy;
         ASC_SCSI_BIT_ID_TYPE start_motor;
-        uchar overrun_buf[ASC_OVERRUN_BSIZE] __aligned(8);
+        uchar *overrun_buf;
         dma_addr_t overrun_dma;
         uchar scsi_reset_wait;
         uchar chip_no;
@@ -13833,6 +13833,12 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost,
          */
         if (ASC_NARROW_BOARD(boardp)) {
                 ASC_DBG(2, "AscInitAsc1000Driver()\n");
+
+                asc_dvc_varp->overrun_buf = kzalloc(ASC_OVERRUN_BSIZE, GFP_KERNEL);
+                if (!asc_dvc_varp->overrun_buf) {
+                        ret = -ENOMEM;
+                        goto err_free_wide_mem;
+                }
                 warn_code = AscInitAsc1000Driver(asc_dvc_varp);
 
                 if (warn_code || asc_dvc_varp->err_code) {
@@ -13840,8 +13846,10 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost,
                                         "warn 0x%x, error 0x%x\n",
                                         asc_dvc_varp->init_state, warn_code,
                                         asc_dvc_varp->err_code);
-                        if (asc_dvc_varp->err_code)
+                        if (asc_dvc_varp->err_code) {
                                 ret = -ENODEV;
+                                kfree(asc_dvc_varp->overrun_buf);
+                        }
                 }
         } else {
                 if (advansys_wide_init_chip(shost))
@@ -13894,6 +13902,7 @@ static int advansys_release(struct Scsi_Host *shost)
                 dma_unmap_single(board->dev,
                                         board->dvc_var.asc_dvc_var.overrun_dma,
                                         ASC_OVERRUN_BSIZE, DMA_FROM_DEVICE);
+                kfree(board->dvc_var.asc_dvc_var.overrun_buf);
         } else {
                 iounmap(board->ioremap_addr);
                 advansys_wide_free_mem(board);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 4150c8a8fdc2..dfaaae5e73ae 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -89,7 +89,7 @@ ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pci_save_state(pdev);
         pci_disable_device(pdev);
 
-        if (mesg.event == PM_EVENT_SUSPEND)
+        if (mesg.event & PM_EVENT_SLEEP)
                 pci_set_power_state(pdev, PCI_D3hot);
 
         return rc;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 6d2ae641273c..64e62ce59c15 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -695,15 +695,16 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
                         scb_index = ahc_inb(ahc, SCB_TAG);
                         scb = ahc_lookup_scb(ahc, scb_index);
                         if (devinfo.role == ROLE_INITIATOR) {
-                                if (scb == NULL)
-                                        panic("HOST_MSG_LOOP with "
-                                              "invalid SCB %x\n", scb_index);
+                                if (bus_phase == P_MESGOUT) {
+                                        if (scb == NULL)
+                                                panic("HOST_MSG_LOOP with "
+                                                      "invalid SCB %x\n",
+                                                      scb_index);
 
-                                if (bus_phase == P_MESGOUT)
                                         ahc_setup_initiator_msgout(ahc,
                                                                    &devinfo,
                                                                    scb);
-                                else {
+                                } else {
                                         ahc->msg_type =
                                             MSG_TYPE_INITIATOR_MSGIN;
                                         ahc->msgin_index = 0;
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index dd6e21d6f1dd..3d3eaef65fb3 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -134,7 +134,7 @@ ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
         pci_save_state(pdev);
         pci_disable_device(pdev);
 
-        if (mesg.event == PM_EVENT_SUSPEND)
+        if (mesg.event & PM_EVENT_SLEEP)
                 pci_set_power_state(pdev, PCI_D3hot);
 
         return rc;
diff --git a/drivers/scsi/aic94xx/aic94xx_sas.h b/drivers/scsi/aic94xx/aic94xx_sas.h
index fa7c5290257d..912e6b755f74 100644
--- a/drivers/scsi/aic94xx/aic94xx_sas.h
+++ b/drivers/scsi/aic94xx/aic94xx_sas.h
@@ -292,7 +292,7 @@ struct scb_header {
 #define INITIATE_SSP_TASK       0x00
 #define INITIATE_LONG_SSP_TASK  0x01
 #define INITIATE_BIDIR_SSP_TASK 0x02
-#define ABORT_TASK              0x03
+#define SCB_ABORT_TASK          0x03
 #define INITIATE_SSP_TMF        0x04
 #define SSP_TARG_GET_DATA       0x05
 #define SSP_TARG_GET_DATA_GOOD  0x06
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index 0febad4dd75f..ab350504ca5a 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -458,13 +458,19 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                 tc_abort = le16_to_cpu(tc_abort);
 
                 list_for_each_entry_safe(a, b, &asd_ha->seq.pend_q, list) {
-                        struct sas_task *task = ascb->uldd_task;
+                        struct sas_task *task = a->uldd_task;
+
+                        if (a->tc_index != tc_abort)
+                                continue;
 
-                        if (task && a->tc_index == tc_abort) {
+                        if (task) {
                                 failed_dev = task->dev;
                                 sas_task_abort(task);
-                                break;
+                        } else {
+                                ASD_DPRINTK("R_T_A for non TASK scb 0x%x\n",
+                                            a->scb->header.opcode);
                         }
+                        break;
                 }
 
                 if (!failed_dev) {
@@ -478,7 +484,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                  * that the EH will wake up and do something.
                  */
                 list_for_each_entry_safe(a, b, &asd_ha->seq.pend_q, list) {
-                        struct sas_task *task = ascb->uldd_task;
+                        struct sas_task *task = a->uldd_task;
 
                         if (task &&
                             task->dev == failed_dev &&
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c
index 87b2f6e6adfe..144f5ad20453 100644
--- a/drivers/scsi/aic94xx/aic94xx_tmf.c
+++ b/drivers/scsi/aic94xx/aic94xx_tmf.c
@@ -151,8 +151,6 @@ static int asd_clear_nexus_I_T(struct domain_device *dev)
         CLEAR_NEXUS_PRE;
         scb->clear_nexus.nexus = NEXUS_I_T;
         scb->clear_nexus.flags = SEND_Q | EXEC_Q | NOTINQ;
-        if (dev->tproto)
-                scb->clear_nexus.flags |= SUSPEND_TX;
         scb->clear_nexus.conn_handle = cpu_to_le16((u16)(unsigned long)
                                                    dev->lldd_dev);
         CLEAR_NEXUS_POST;
@@ -169,8 +167,6 @@ static int asd_clear_nexus_I_T_L(struct domain_device *dev, u8 *lun)
         CLEAR_NEXUS_PRE;
         scb->clear_nexus.nexus = NEXUS_I_T_L;
         scb->clear_nexus.flags = SEND_Q | EXEC_Q | NOTINQ;
-        if (dev->tproto)
-                scb->clear_nexus.flags |= SUSPEND_TX;
         memcpy(scb->clear_nexus.ssp_task.lun, lun, 8);
         scb->clear_nexus.conn_handle = cpu_to_le16((u16)(unsigned long)
                                                    dev->lldd_dev);
@@ -369,7 +365,7 @@ int asd_abort_task(struct sas_task *task)
                 return -ENOMEM;
         scb = ascb->scb;
 
-        scb->header.opcode = ABORT_TASK;
+        scb->header.opcode = SCB_ABORT_TASK;
 
         switch (task->task_proto) {
         case SAS_PROTOCOL_SATA:
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 4f9ff32cfed0..f91f79c8007d 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -1387,18 +1387,16 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \
         switch(controlcode) {
 
         case ARCMSR_MESSAGE_READ_RQBUFFER: {
-                unsigned long *ver_addr;
+                unsigned char *ver_addr;
                 uint8_t *pQbuffer, *ptmpQbuffer;
                 int32_t allxfer_len = 0;
-                void *tmp;
 
-                tmp = kmalloc(1032, GFP_KERNEL|GFP_DMA);
-                ver_addr = (unsigned long *)tmp;
-                if (!tmp) {
+                ver_addr = kmalloc(1032, GFP_ATOMIC);
+                if (!ver_addr) {
                         retvalue = ARCMSR_MESSAGE_FAIL;
                         goto message_out;
                 }
-                ptmpQbuffer = (uint8_t *) ver_addr;
+                ptmpQbuffer = ver_addr;
                 while ((acb->rqbuf_firstindex != acb->rqbuf_lastindex)
                         && (allxfer_len < 1031)) {
                         pQbuffer = &acb->rqbuffer[acb->rqbuf_firstindex];
@@ -1427,26 +1425,24 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \
                         }
                         arcmsr_iop_message_read(acb);
                 }
-                memcpy(pcmdmessagefld->messagedatabuffer, (uint8_t *)ver_addr, allxfer_len);
+                memcpy(pcmdmessagefld->messagedatabuffer, ver_addr, allxfer_len);
                 pcmdmessagefld->cmdmessage.Length = allxfer_len;
                 pcmdmessagefld->cmdmessage.ReturnCode = ARCMSR_MESSAGE_RETURNCODE_OK;
-                kfree(tmp);
+                kfree(ver_addr);
                 }
                 break;
 
         case ARCMSR_MESSAGE_WRITE_WQBUFFER: {
-                unsigned long *ver_addr;
+                unsigned char *ver_addr;
                 int32_t my_empty_len, user_len, wqbuf_firstindex, wqbuf_lastindex;
                 uint8_t *pQbuffer, *ptmpuserbuffer;
-                void *tmp;
 
-                tmp = kmalloc(1032, GFP_KERNEL|GFP_DMA);
-                ver_addr = (unsigned long *)tmp;
-                if (!tmp) {
+                ver_addr = kmalloc(1032, GFP_ATOMIC);
+                if (!ver_addr) {
                         retvalue = ARCMSR_MESSAGE_FAIL;
                         goto message_out;
                 }
-                ptmpuserbuffer = (uint8_t *)ver_addr;
+                ptmpuserbuffer = ver_addr;
                 user_len = pcmdmessagefld->cmdmessage.Length;
                 memcpy(ptmpuserbuffer, pcmdmessagefld->messagedatabuffer, user_len);
                 wqbuf_lastindex = acb->wqbuf_lastindex;
@@ -1492,7 +1488,7 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \
                                 retvalue = ARCMSR_MESSAGE_FAIL;
                         }
                         }
-                        kfree(tmp);
+                        kfree(ver_addr);
                 }
                 break;
 
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index fb5f20284389..a715632e19d4 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2018,6 +2018,7 @@ static void fas216_rq_sns_done(FAS216_Info *info, struct scsi_cmnd *SCpnt,
          * the upper layers to process.  This would have been set
          * correctly by fas216_std_done.
          */
+        scsi_eh_restore_cmnd(SCpnt, &info->ses);
         SCpnt->scsi_done(SCpnt);
 }
 
@@ -2103,23 +2104,12 @@ request_sense:
         if (SCpnt->cmnd[0] == REQUEST_SENSE)
                 goto done;
 
+        scsi_eh_prep_cmnd(SCpnt, &info->ses, NULL, 0, ~0);
         fas216_log_target(info, LOG_CONNECT, SCpnt->device->id,
                           "requesting sense");
-        memset(SCpnt->cmnd, 0, sizeof (SCpnt->cmnd));
-        SCpnt->cmnd[0] = REQUEST_SENSE;
-        SCpnt->cmnd[1] = SCpnt->device->lun << 5;
-        SCpnt->cmnd[4] = sizeof(SCpnt->sense_buffer);
-        SCpnt->cmd_len = COMMAND_SIZE(SCpnt->cmnd[0]);
-        SCpnt->SCp.buffer = NULL;
-        SCpnt->SCp.buffers_residual = 0;
-        SCpnt->SCp.ptr = (char *)SCpnt->sense_buffer;
-        SCpnt->SCp.this_residual = sizeof(SCpnt->sense_buffer);
-        SCpnt->SCp.phase = sizeof(SCpnt->sense_buffer);
+        init_SCp(SCpnt);
         SCpnt->SCp.Message = 0;
         SCpnt->SCp.Status = 0;
-        SCpnt->request_bufflen = sizeof(SCpnt->sense_buffer);
-        SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-        SCpnt->use_sg = 0;
         SCpnt->tag = 0;
         SCpnt->host_scribble = (void *)fas216_rq_sns_done;
 
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index 00e5f055afdc..b65f4cf0eec9 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -16,6 +16,8 @@
 #define NO_IRQ 255
 #endif
 
+#include <scsi/scsi_eh.h>
+
 #include "queue.h"
 #include "msgqueue.h"
 
@@ -311,6 +313,7 @@ typedef struct {
 
         /* miscellaneous */
         int                     internal_done;          /* flag to indicate request done */
+        struct scsi_eh_save     ses;            /* holds request sense restore info */
         unsigned long           magic_end;
 } FAS216_Info;
 
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index c82523908c2e..6d67f5c0eb8e 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -642,12 +642,15 @@ static void __init gdth_search_dev(gdth_pci_str *pcistr, ushort *cnt,
           *cnt, vendor, device));
 
     pdev = NULL;
-    while ((pdev = pci_find_device(vendor, device, pdev)) 
+    while ((pdev = pci_get_device(vendor, device, pdev))
            != NULL) {
         if (pci_enable_device(pdev))
             continue;
-        if (*cnt >= MAXHA)
+        if (*cnt >= MAXHA) {
+            pci_dev_put(pdev);
             return;
+        }
+
         /* GDT PCI controller found, resources are already in pdev */
         pcistr[*cnt].pdev = pdev;
         pcistr[*cnt].irq = pdev->irq;
@@ -4836,6 +4839,9 @@ static int __init gdth_isa_probe_one(ulong32 isa_bios)
         if (error)
                 goto out_free_coal_stat;
         list_add_tail(&ha->list, &gdth_instances);
+
+        scsi_scan_host(shp);
+
         return 0;
 
  out_free_coal_stat:
@@ -4963,6 +4969,9 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot)
         if (error)
                 goto out_free_coal_stat;
         list_add_tail(&ha->list, &gdth_instances);
+
+        scsi_scan_host(shp);
+
         return 0;
 
  out_free_ccb_phys:
@@ -5100,6 +5109,9 @@ static int __init gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr)
         if (error)
                 goto out_free_coal_stat;
         list_add_tail(&ha->list, &gdth_instances);
+
+        scsi_scan_host(shp);
+
         return 0;
 
  out_free_coal_stat:
diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
index de5773443c62..ce0228e26aec 100644
--- a/drivers/scsi/gdth_proc.c
+++ b/drivers/scsi/gdth_proc.c
@@ -694,15 +694,13 @@ static void gdth_ioctl_free(gdth_ha_str *ha, int size, char *buf, ulong64 paddr)
 {
     ulong flags;
 
-    spin_lock_irqsave(&ha->smp_lock, flags);
-
     if (buf == ha->pscratch) {
+        spin_lock_irqsave(&ha->smp_lock, flags);
         ha->scratch_busy = FALSE;
+        spin_unlock_irqrestore(&ha->smp_lock, flags);
     } else {
         pci_free_consistent(ha->pdev, size, buf, paddr);
     }
-
-    spin_unlock_irqrestore(&ha->smp_lock, flags);
 }
 
 #ifdef GDTH_IOCTL_PROC
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 2074701f7e76..c72014a3e7d4 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5140,7 +5140,7 @@ static void ipr_build_ata_ioadl(struct ipr_cmnd *ipr_cmd,
         struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
         struct ipr_ioadl_desc *ioadl = ipr_cmd->ioadl;
         struct ipr_ioadl_desc *last_ioadl = NULL;
-        int len = qc->nbytes + qc->pad_len;
+        int len = qc->nbytes;
         struct scatterlist *sg;
         unsigned int si;
 
@@ -5206,7 +5206,7 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
         ioarcb->cmd_pkt.request_type = IPR_RQTYPE_ATA_PASSTHRU;
         ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_LINK_DESC;
         ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_ULEN_CHK;
-        ipr_cmd->dma_use_sg = qc->pad_len ? qc->n_elem + 1 : qc->n_elem;
+        ipr_cmd->dma_use_sg = qc->n_elem;
 
         ipr_build_ata_ioadl(ipr_cmd, qc);
         regs->flags |= IPR_ATA_FLAG_STATUS_ON_GOOD_COMPLETION;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index bb152fb9fec7..7ed568f180ae 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -1576,7 +1576,7 @@ ips_make_passthru(ips_ha_t *ha, struct scsi_cmnd *SC, ips_scb_t *scb, int intr)
         METHOD_TRACE("ips_make_passthru", 1);
 
         scsi_for_each_sg(SC, sg, scsi_sg_count(SC), i)
-                length += sg[i].length;
+                length += sg->length;
 
         if (length < sizeof (ips_passthru_t)) {
                 /* wrong size */
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 0996f866f14c..7cd05b599a12 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -178,8 +178,8 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
         task->uldd_task = qc;
         if (ata_is_atapi(qc->tf.protocol)) {
                 memcpy(task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
-                task->total_xfer_len = qc->nbytes + qc->pad_len;
-                task->num_scatter = qc->pad_len ? qc->n_elem + 1 : qc->n_elem;
+                task->total_xfer_len = qc->nbytes;
+                task->num_scatter = qc->n_elem;
         } else {
                 for_each_sg(qc->sg, sg, qc->n_elem, si)
                         xfer += sg->length;
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index f869fba86807..704ea06a6e50 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -51,10 +51,14 @@ static void sas_scsi_task_done(struct sas_task *task)
 {
         struct task_status_struct *ts = &task->task_status;
         struct scsi_cmnd *sc = task->uldd_task;
-        struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(sc->device->host);
-        unsigned ts_flags = task->task_state_flags;
         int hs = 0, stat = 0;
 
+        if (unlikely(task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
+                /* Aborted tasks will be completed by the error handler */
+                SAS_DPRINTK("task done but aborted\n");
+                return;
+        }
+
         if (unlikely(!sc)) {
                 SAS_DPRINTK("task_done called with non existing SCSI cmnd!\n");
                 list_del_init(&task->list);
@@ -120,11 +124,7 @@ static void sas_scsi_task_done(struct sas_task *task)
         sc->result = (hs << 16) | stat;
         list_del_init(&task->list);
         sas_free_task(task);
-        /* This is very ugly but this is how SCSI Core works. */
-        if (ts_flags & SAS_TASK_STATE_ABORTED)
-                scsi_eh_finish_cmd(sc, &sas_ha->eh_done_q);
-        else
-                sc->scsi_done(sc);
+        sc->scsi_done(sc);
 }
 
 static enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd)
@@ -255,13 +255,34 @@ out:
         return res;
 }
 
+static void sas_eh_finish_cmd(struct scsi_cmnd *cmd)
+{
+        struct sas_task *task = TO_SAS_TASK(cmd);
+        struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(cmd->device->host);
+
+        /* remove the aborted task flag to allow the task to be
+         * completed now. At this point, we only get called following
+         * an actual abort of the task, so we should be guaranteed not
+         * to be racing with any completions from the LLD (hence we
+         * don't need the task state lock to clear the flag) */
+        task->task_state_flags &= ~SAS_TASK_STATE_ABORTED;
+        /* Now call task_done.  However, task will be free'd after
+         * this */
+        task->task_done(task);
+        /* now finish the command and move it on to the error
+         * handler done list, this also takes it off the
+         * error handler pending list */
+        scsi_eh_finish_cmd(cmd, &sas_ha->eh_done_q);
+}
+
 static void sas_scsi_clear_queue_lu(struct list_head *error_q, struct scsi_cmnd *my_cmd)
 {
         struct scsi_cmnd *cmd, *n;
 
         list_for_each_entry_safe(cmd, n, error_q, eh_entry) {
-                if (cmd == my_cmd)
-                        list_del_init(&cmd->eh_entry);
+                if (cmd->device->sdev_target == my_cmd->device->sdev_target &&
+                    cmd->device->lun == my_cmd->device->lun)
+                        sas_eh_finish_cmd(cmd);
         }
 }
 
@@ -274,7 +295,7 @@ static void sas_scsi_clear_queue_I_T(struct list_head *error_q,
                 struct domain_device *x = cmd_to_domain_dev(cmd);
 
                 if (x == dev)
-                        list_del_init(&cmd->eh_entry);
+                        sas_eh_finish_cmd(cmd);
         }
 }
 
@@ -288,7 +309,7 @@ static void sas_scsi_clear_queue_port(struct list_head *error_q,
                 struct asd_sas_port *x = dev->port;
 
                 if (x == port)
-                        list_del_init(&cmd->eh_entry);
+                        sas_eh_finish_cmd(cmd);
         }
 }
 
@@ -528,14 +549,14 @@ Again:
                 case TASK_IS_DONE:
                         SAS_DPRINTK("%s: task 0x%p is done\n", __FUNCTION__,
                                     task);
-                        task->task_done(task);
+                        sas_eh_finish_cmd(cmd);
                         if (need_reset)
                                 try_to_reset_cmd_device(shost, cmd);
                         continue;
                 case TASK_IS_ABORTED:
                         SAS_DPRINTK("%s: task 0x%p is aborted\n",
                                     __FUNCTION__, task);
-                        task->task_done(task);
+                        sas_eh_finish_cmd(cmd);
                         if (need_reset)
                                 try_to_reset_cmd_device(shost, cmd);
                         continue;
@@ -547,7 +568,7 @@ Again:
                                             "recovered\n",
                                             SAS_ADDR(task->dev),
                                             cmd->device->lun);
-                                task->task_done(task);
+                                sas_eh_finish_cmd(cmd);
                                 if (need_reset)
                                         try_to_reset_cmd_device(shost, cmd);
                                 sas_scsi_clear_queue_lu(work_q, cmd);
@@ -562,7 +583,7 @@ Again:
                         if (tmf_resp == TMF_RESP_FUNC_COMPLETE) {
                                 SAS_DPRINTK("I_T %016llx recovered\n",
                                             SAS_ADDR(task->dev->sas_addr));
-                                task->task_done(task);
+                                sas_eh_finish_cmd(cmd);
                                 if (need_reset)
                                         try_to_reset_cmd_device(shost, cmd);
                                 sas_scsi_clear_queue_I_T(work_q, task->dev);
@@ -577,7 +598,7 @@ Again:
                                 if (res == TMF_RESP_FUNC_COMPLETE) {
                                         SAS_DPRINTK("clear nexus port:%d "
                                                     "succeeded\n", port->id);
-                                        task->task_done(task);
+                                        sas_eh_finish_cmd(cmd);
                                         if (need_reset)
                                                 try_to_reset_cmd_device(shost, cmd);
                                         sas_scsi_clear_queue_port(work_q,
@@ -591,10 +612,10 @@ Again:
                                 if (res == TMF_RESP_FUNC_COMPLETE) {
                                         SAS_DPRINTK("clear nexus ha "
                                                     "succeeded\n");
-                                        task->task_done(task);
+                                        sas_eh_finish_cmd(cmd);
                                         if (need_reset)
                                                 try_to_reset_cmd_device(shost, cmd);
-                                        goto out;
+                                        goto clear_q;
                                 }
                         }
                         /* If we are here -- this means that no amount
@@ -606,21 +627,18 @@ Again:
                                     SAS_ADDR(task->dev->sas_addr),
                                     cmd->device->lun);
 
-                        task->task_done(task);
+                        sas_eh_finish_cmd(cmd);
                         if (need_reset)
                                 try_to_reset_cmd_device(shost, cmd);
                         goto clear_q;
                 }
         }
-out:
         return list_empty(work_q);
 clear_q:
         SAS_DPRINTK("--- Exit %s -- clear_q\n", __FUNCTION__);
-        list_for_each_entry_safe(cmd, n, work_q, eh_entry) {
-                struct sas_task *task = TO_SAS_TASK(cmd);
-                list_del_init(&cmd->eh_entry);
-                task->task_done(task);
-        }
+        list_for_each_entry_safe(cmd, n, work_q, eh_entry)
+                sas_eh_finish_cmd(cmd);
+
         return list_empty(work_q);
 }
 
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 83567b9755b4..2ab2d24dcc15 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -307,6 +307,7 @@ struct lpfc_vport {
 
         uint32_t fc_nlp_cnt;    /* outstanding NODELIST requests */
         uint32_t fc_rscn_id_cnt;        /* count of RSCNs payloads in list */
+        uint32_t fc_rscn_flush;         /* flag use of fc_rscn_id_list */
         struct lpfc_dmabuf *fc_rscn_id_list[FC_MAX_HOLD_RSCN];
         struct lpfc_name fc_nodename;   /* fc nodename */
         struct lpfc_name fc_portname;   /* fc portname */
@@ -392,6 +393,13 @@ enum hba_temp_state {
         HBA_OVER_TEMP
 };
 
+enum intr_type_t {
+        NONE = 0,
+        INTx,
+        MSI,
+        MSIX,
+};
+
 struct lpfc_hba {
         struct lpfc_sli sli;
         uint32_t sli_rev;               /* SLI2 or SLI3 */
@@ -409,7 +417,7 @@ struct lpfc_hba {
                                         /* This flag is set while issuing */
                                         /* INIT_LINK mailbox command */
 #define LS_NPIV_FAB_SUPPORTED 0x2       /* Fabric supports NPIV */
-#define LS_IGNORE_ERATT       0x3       /* intr handler should ignore ERATT */
+#define LS_IGNORE_ERATT       0x4       /* intr handler should ignore ERATT */
 
         struct lpfc_sli2_slim *slim2p;
         struct lpfc_dmabuf hbqslimp;
@@ -487,6 +495,8 @@ struct lpfc_hba {
         wait_queue_head_t    *work_wait;
         struct task_struct   *worker_thread;
 
+        uint32_t hbq_in_use;            /* HBQs in use flag */
+        struct list_head hbqbuf_in_list;  /* in-fly hbq buffer list */
         uint32_t hbq_count;             /* Count of configured HBQs */
         struct hbq_s hbqs[LPFC_MAX_HBQS]; /* local copy of hbq indicies  */
 
@@ -555,7 +565,8 @@ struct lpfc_hba {
         mempool_t *nlp_mem_pool;
 
         struct fc_host_statistics link_stats;
-        uint8_t using_msi;
+        enum intr_type_t intr_type;
+        struct msix_entry msix_entries[1];
 
         struct list_head port_list;
         struct lpfc_vport *pport;       /* physical lpfc_vport pointer */
@@ -595,6 +606,8 @@ struct lpfc_hba {
         unsigned long last_completion_time;
         struct timer_list hb_tmofunc;
         uint8_t hb_outstanding;
+        /* ndlp reference management */
+        spinlock_t ndlp_lock;
         /*
          * Following bit will be set for all buffer tags which are not
          * associated with any HBQ.
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 4bae4a2ed2f1..b12a841703ca 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1191,7 +1191,7 @@ lpfc_update_rport_devloss_tmo(struct lpfc_vport *vport)
         shost = lpfc_shost_from_vport(vport);
         spin_lock_irq(shost->host_lock);
         list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp)
-                if (ndlp->rport)
+                if (NLP_CHK_NODE_ACT(ndlp) && ndlp->rport)
                         ndlp->rport->dev_loss_tmo = vport->cfg_devloss_tmo;
         spin_unlock_irq(shost->host_lock);
 }
@@ -1592,9 +1592,11 @@ LPFC_ATTR_RW(poll_tmo, 10, 1, 255,
 #               support this feature
 #       0  = MSI disabled (default)
 #       1  = MSI enabled
-# Value range is [0,1]. Default value is 0.
+#       2  = MSI-X enabled
+# Value range is [0,2]. Default value is 0.
 */
-LPFC_ATTR_R(use_msi, 0, 0, 1, "Use Message Signaled Interrupts, if possible");
+LPFC_ATTR_R(use_msi, 0, 0, 2, "Use Message Signaled Interrupts (1) or "
+            "MSI-X (2), if possible");
 
 /*
 # lpfc_enable_hba_reset: Allow or prevent HBA resets to the hardware.
@@ -1946,11 +1948,13 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,
                 }
 
                 /* If HBA encountered an error attention, allow only DUMP
-                 * mailbox command until the HBA is restarted.
+                 * or RESTART mailbox commands until the HBA is restarted.
                  */
                 if ((phba->pport->stopped) &&
-                        (phba->sysfs_mbox.mbox->mb.mbxCommand
-                                != MBX_DUMP_MEMORY)) {
+                        (phba->sysfs_mbox.mbox->mb.mbxCommand !=
+                                MBX_DUMP_MEMORY &&
+                         phba->sysfs_mbox.mbox->mb.mbxCommand !=
+                                MBX_RESTART)) {
                         sysfs_mbox_idle(phba);
                         spin_unlock_irq(&phba->hbalock);
                         return -EPERM;
@@ -2384,7 +2388,8 @@ lpfc_get_node_by_target(struct scsi_target *starget)
         spin_lock_irq(shost->host_lock);
         /* Search for this, mapped, target ID */
         list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
-                if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&
+                if (NLP_CHK_NODE_ACT(ndlp) &&
+                    ndlp->nlp_state == NLP_STE_MAPPED_NODE &&
                     starget->id == ndlp->nlp_sid) {
                         spin_unlock_irq(shost->host_lock);
                         return ndlp;
diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index 50fcb7c930bc..0819f5f39de5 100644
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -53,7 +53,10 @@ void lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
+void lpfc_enqueue_node(struct lpfc_vport *, struct lpfc_nodelist *);
 void lpfc_dequeue_node(struct lpfc_vport *, struct lpfc_nodelist *);
+struct lpfc_nodelist *lpfc_enable_node(struct lpfc_vport *,
+                                        struct lpfc_nodelist *, int);
 void lpfc_nlp_set_state(struct lpfc_vport *, struct lpfc_nodelist *, int);
 void lpfc_drop_node(struct lpfc_vport *, struct lpfc_nodelist *);
 void lpfc_set_disctmo(struct lpfc_vport *);
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 92441ce610ed..3d0ccd9b341d 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -294,7 +294,7 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,
         /* Save for completion so we can release these resources */
         geniocb->context1 = (uint8_t *) inp;
         geniocb->context2 = (uint8_t *) outp;
-        geniocb->context_un.ndlp = ndlp;
+        geniocb->context_un.ndlp = lpfc_nlp_get(ndlp);
 
         /* Fill in payload, bp points to frame payload */
         icmd->ulpCommand = CMD_GEN_REQUEST64_CR;
@@ -489,8 +489,10 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                                                  */
                                                 ndlp = lpfc_findnode_did(vport,
                                                         Did);
-                                                if (ndlp && (ndlp->nlp_type &
-                                                        NLP_FCP_TARGET))
+                                                if (ndlp &&
+                                                    NLP_CHK_NODE_ACT(ndlp)
+                                                    && (ndlp->nlp_type &
+                                                     NLP_FCP_TARGET))
                                                         lpfc_setup_disc_node
                                                                 (vport, Did);
                                                 else if (lpfc_ns_cmd(vport,
@@ -773,7 +775,7 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                                  "0267 NameServer GFF Rsp "
                                  "x%x Error (%d %d) Data: x%x x%x\n",
                                  did, irsp->ulpStatus, irsp->un.ulpWord[4],
-                                 vport->fc_flag, vport->fc_rscn_id_cnt)
+                                 vport->fc_flag, vport->fc_rscn_id_cnt);
         }
 
         /* This is a target port, unregistered port, or the GFF_ID failed */
@@ -1064,7 +1066,8 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         int rc = 0;
 
         ndlp = lpfc_findnode_did(vport, NameServer_DID);
-        if (ndlp == NULL || ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) {
+        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)
+            || ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) {
                 rc=1;
                 goto ns_cmd_exit;
         }
@@ -1213,8 +1216,9 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
                 cmpl = lpfc_cmpl_ct_cmd_rff_id;
                 break;
         }
-        lpfc_nlp_get(ndlp);
-
+        /* The lpfc_ct_cmd/lpfc_get_req shall increment ndlp reference count
+         * to hold ndlp reference for the corresponding callback function.
+         */
         if (!lpfc_ct_cmd(vport, mp, bmp, ndlp, cmpl, rsp_size, retry)) {
                 /* On success, The cmpl function will free the buffers */
                 lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,
@@ -1222,9 +1226,13 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
                         cmdcode, ndlp->nlp_DID, 0);
                 return 0;
         }
-
         rc=6;
+
+        /* Decrement ndlp reference count to release ndlp reference held
+         * for the failed command's callback function.
+         */
         lpfc_nlp_put(ndlp);
+
         lpfc_mbuf_free(phba, bmp->virt, bmp->phys);
 ns_cmd_free_bmp:
         kfree(bmp);
@@ -1271,6 +1279,9 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         }
 
         ndlp = lpfc_findnode_did(vport, FDMI_DID);
+        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))
+                goto fail_out;
+
         if (fdmi_rsp == be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) {
                 /* FDMI rsp failed */
                 lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
@@ -1294,6 +1305,8 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_RHBA);
                 break;
         }
+
+fail_out:
         lpfc_ct_free_iocb(phba, cmdiocb);
         return;
 }
@@ -1650,12 +1663,18 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
         bpl->tus.w = le32_to_cpu(bpl->tus.w);
 
         cmpl = lpfc_cmpl_ct_cmd_fdmi;
-        lpfc_nlp_get(ndlp);
 
+        /* The lpfc_ct_cmd/lpfc_get_req shall increment ndlp reference count
+         * to hold ndlp reference for the corresponding callback function.
+         */
         if (!lpfc_ct_cmd(vport, mp, bmp, ndlp, cmpl, FC_MAX_NS_RSP, 0))
                 return 0;
 
+        /* Decrement ndlp reference count to release ndlp reference held
+         * for the failed command's callback function.
+         */
         lpfc_nlp_put(ndlp);
+
         lpfc_mbuf_free(phba, bmp->virt, bmp->phys);
 fdmi_cmd_free_bmp:
         kfree(bmp);
@@ -1698,7 +1717,7 @@ lpfc_fdmi_timeout_handler(struct lpfc_vport *vport)
         struct lpfc_nodelist *ndlp;
 
         ndlp = lpfc_findnode_did(vport, FDMI_DID);
-        if (ndlp) {
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp)) {
                 if (init_utsname()->nodename[0] != '\0')
                         lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);
                 else
diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
index cfe81c50529a..2db0b74b6fad 100644
--- a/drivers/scsi/lpfc/lpfc_disc.h
+++ b/drivers/scsi/lpfc/lpfc_disc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -73,6 +73,12 @@ struct lpfc_nodelist {
         uint8_t         nlp_fcp_info;           /* class info, bits 0-3 */
 #define NLP_FCP_2_DEVICE   0x10                 /* FCP-2 device */
 
+        uint16_t        nlp_usg_map;    /* ndlp management usage bitmap */
+#define NLP_USG_NODE_ACT_BIT    0x1     /* Indicate ndlp is actively used */
+#define NLP_USG_IACT_REQ_BIT    0x2     /* Request to inactivate ndlp */
+#define NLP_USG_FREE_REQ_BIT    0x4     /* Request to invoke ndlp memory free */
+#define NLP_USG_FREE_ACK_BIT    0x8     /* Indicate ndlp memory free invoked */
+
         struct timer_list   nlp_delayfunc;      /* Used for delayed ELS cmds */
         struct fc_rport *rport;                 /* Corresponding FC transport
                                                    port structure */
@@ -85,25 +91,51 @@ struct lpfc_nodelist {
 };
 
 /* Defines for nlp_flag (uint32) */
-#define NLP_PLOGI_SND      0x20         /* sent PLOGI request for this entry */
-#define NLP_PRLI_SND       0x40         /* sent PRLI request for this entry */
-#define NLP_ADISC_SND      0x80         /* sent ADISC request for this entry */
-#define NLP_LOGO_SND       0x100        /* sent LOGO request for this entry */
-#define NLP_RNID_SND       0x400        /* sent RNID request for this entry */
-#define NLP_ELS_SND_MASK   0x7e0        /* sent ELS request for this entry */
-#define NLP_DEFER_RM       0x10000      /* Remove this ndlp if no longer used */
-#define NLP_DELAY_TMO      0x20000      /* delay timeout is running for node */
-#define NLP_NPR_2B_DISC    0x40000      /* node is included in num_disc_nodes */
-#define NLP_RCV_PLOGI      0x80000      /* Rcv'ed PLOGI from remote system */
-#define NLP_LOGO_ACC       0x100000     /* Process LOGO after ACC completes */
-#define NLP_TGT_NO_SCSIID  0x200000     /* good PRLI but no binding for scsid */
-#define NLP_ACC_REGLOGIN   0x1000000    /* Issue Reg Login after successful
+#define NLP_PLOGI_SND      0x00000020   /* sent PLOGI request for this entry */
+#define NLP_PRLI_SND       0x00000040   /* sent PRLI request for this entry */
+#define NLP_ADISC_SND      0x00000080   /* sent ADISC request for this entry */
+#define NLP_LOGO_SND       0x00000100   /* sent LOGO request for this entry */
+#define NLP_RNID_SND       0x00000400   /* sent RNID request for this entry */
+#define NLP_ELS_SND_MASK   0x000007e0   /* sent ELS request for this entry */
+#define NLP_DEFER_RM       0x00010000   /* Remove this ndlp if no longer used */
+#define NLP_DELAY_TMO      0x00020000   /* delay timeout is running for node */
+#define NLP_NPR_2B_DISC    0x00040000   /* node is included in num_disc_nodes */
+#define NLP_RCV_PLOGI      0x00080000   /* Rcv'ed PLOGI from remote system */
+#define NLP_LOGO_ACC       0x00100000   /* Process LOGO after ACC completes */
+#define NLP_TGT_NO_SCSIID  0x00200000   /* good PRLI but no binding for scsid */
+#define NLP_ACC_REGLOGIN   0x01000000   /* Issue Reg Login after successful
                                            ACC */
-#define NLP_NPR_ADISC      0x2000000    /* Issue ADISC when dq'ed from
+#define NLP_NPR_ADISC      0x02000000   /* Issue ADISC when dq'ed from
                                            NPR list */
-#define NLP_RM_DFLT_RPI    0x4000000    /* need to remove leftover dflt RPI */
-#define NLP_NODEV_REMOVE   0x8000000    /* Defer removal till discovery ends */
+#define NLP_RM_DFLT_RPI    0x04000000   /* need to remove leftover dflt RPI */
+#define NLP_NODEV_REMOVE   0x08000000   /* Defer removal till discovery ends */
 #define NLP_TARGET_REMOVE  0x10000000   /* Target remove in process */
+#define NLP_SC_REQ         0x20000000   /* Target requires authentication */
+
+/* ndlp usage management macros */
+#define NLP_CHK_NODE_ACT(ndlp)          (((ndlp)->nlp_usg_map \
+                                                & NLP_USG_NODE_ACT_BIT) \
+                                        && \
+                                        !((ndlp)->nlp_usg_map \
+                                                & NLP_USG_FREE_ACK_BIT))
+#define NLP_SET_NODE_ACT(ndlp)          ((ndlp)->nlp_usg_map \
+                                                |= NLP_USG_NODE_ACT_BIT)
+#define NLP_INT_NODE_ACT(ndlp)          ((ndlp)->nlp_usg_map \
+                                                = NLP_USG_NODE_ACT_BIT)
+#define NLP_CLR_NODE_ACT(ndlp)          ((ndlp)->nlp_usg_map \
+                                                &= ~NLP_USG_NODE_ACT_BIT)
+#define NLP_CHK_IACT_REQ(ndlp)          ((ndlp)->nlp_usg_map \
+                                                & NLP_USG_IACT_REQ_BIT)
+#define NLP_SET_IACT_REQ(ndlp)          ((ndlp)->nlp_usg_map \
+                                                |= NLP_USG_IACT_REQ_BIT)
+#define NLP_CHK_FREE_REQ(ndlp)          ((ndlp)->nlp_usg_map \
+                                                & NLP_USG_FREE_REQ_BIT)
+#define NLP_SET_FREE_REQ(ndlp)          ((ndlp)->nlp_usg_map \
+                                                |= NLP_USG_FREE_REQ_BIT)
+#define NLP_CHK_FREE_ACK(ndlp)          ((ndlp)->nlp_usg_map \
+                                                & NLP_USG_FREE_ACK_BIT)
+#define NLP_SET_FREE_ACK(ndlp)          ((ndlp)->nlp_usg_map \
+                                                |= NLP_USG_FREE_ACK_BIT)
 
 /* There are 4 different double linked lists nodelist entries can reside on.
  * The Port Login (PLOGI) list and Address Discovery (ADISC) list are used
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index c6b739dc6bc3..cbb68a942255 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -113,6 +113,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,
 
         if (elsiocb == NULL)
                 return NULL;
+
         icmd = &elsiocb->iocb;
 
         /* fill in BDEs for command */
@@ -134,9 +135,8 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,
                 if (!prsp || !prsp->virt)
                         goto els_iocb_free_prsp_exit;
                 INIT_LIST_HEAD(&prsp->list);
-        } else {
+        } else
                 prsp = NULL;
-        }
 
         /* Allocate buffer for Buffer ptr list */
         pbuflist = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);
@@ -246,7 +246,7 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)
 
         sp = &phba->fc_fabparam;
         ndlp = lpfc_findnode_did(vport, Fabric_DID);
-        if (!ndlp) {
+        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {
                 err = 1;
                 goto fail;
         }
@@ -282,6 +282,9 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)
 
         mbox->mbox_cmpl = lpfc_mbx_cmpl_fabric_reg_login;
         mbox->vport = vport;
+        /* increment the reference count on ndlp to hold reference
+         * for the callback routine.
+         */
         mbox->context2 = lpfc_nlp_get(ndlp);
 
         rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);
@@ -293,6 +296,9 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)
         return 0;
 
 fail_issue_reg_login:
+        /* decrement the reference count on ndlp just incremented
+         * for the failed mbox command.
+         */
         lpfc_nlp_put(ndlp);
         mp = (struct lpfc_dmabuf *) mbox->context1;
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
@@ -381,6 +387,8 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                  */
                 list_for_each_entry_safe(np, next_np,
                                         &vport->fc_nodes, nlp_listp) {
+                        if (!NLP_CHK_NODE_ACT(ndlp))
+                                continue;
                         if ((np->nlp_state != NLP_STE_NPR_NODE) ||
                                    !(np->nlp_flag & NLP_NPR_ADISC))
                                 continue;
@@ -456,6 +464,9 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                         mempool_free(mbox, phba->mbox_mem_pool);
                         goto fail;
                 }
+                /* Decrement ndlp reference count indicating that ndlp can be
+                 * safely released when other references to it are done.
+                 */
                 lpfc_nlp_put(ndlp);
 
                 ndlp = lpfc_findnode_did(vport, PT2PT_RemoteID);
@@ -467,22 +478,29 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                         ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
                         if (!ndlp)
                                 goto fail;
-
                         lpfc_nlp_init(vport, ndlp, PT2PT_RemoteID);
+                } else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                        ndlp = lpfc_enable_node(vport, ndlp,
+                                                NLP_STE_UNUSED_NODE);
+                        if(!ndlp)
+                                goto fail;
                 }
 
                 memcpy(&ndlp->nlp_portname, &sp->portName,
                        sizeof(struct lpfc_name));
                 memcpy(&ndlp->nlp_nodename, &sp->nodeName,
                        sizeof(struct lpfc_name));
+                /* Set state will put ndlp onto node list if not already done */
                 lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
                 spin_lock_irq(shost->host_lock);
                 ndlp->nlp_flag |= NLP_NPR_2B_DISC;
                 spin_unlock_irq(shost->host_lock);
-        } else {
-                /* This side will wait for the PLOGI */
+        } else
+                /* This side will wait for the PLOGI, decrement ndlp reference
+                 * count indicating that ndlp can be released when other
+                 * references to it are done.
+                 */
                 lpfc_nlp_put(ndlp);
-        }
 
         /* If we are pt2pt with another NPort, force NPIV off! */
         phba->sli3_options &= ~LPFC_SLI3_NPIV_ENABLED;
@@ -728,16 +746,21 @@ lpfc_initial_flogi(struct lpfc_vport *vport)
                 if (!ndlp)
                         return 0;
                 lpfc_nlp_init(vport, ndlp, Fabric_DID);
-        } else {
-                lpfc_dequeue_node(vport, ndlp);
+                /* Put ndlp onto node list */
+                lpfc_enqueue_node(vport, ndlp);
+        } else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                /* re-setup ndlp without removing from node list */
+                ndlp = lpfc_enable_node(vport, ndlp, NLP_STE_UNUSED_NODE);
+                if (!ndlp)
+                        return 0;
         }
 
-        if (lpfc_issue_els_flogi(vport, ndlp, 0)) {
+        if (lpfc_issue_els_flogi(vport, ndlp, 0))
                 /* This decrement of reference count to node shall kick off
                  * the release of the node.
                  */
                 lpfc_nlp_put(ndlp);
-        }
+
         return 1;
 }
 
@@ -755,9 +778,15 @@ lpfc_initial_fdisc(struct lpfc_vport *vport)
                 if (!ndlp)
                         return 0;
                 lpfc_nlp_init(vport, ndlp, Fabric_DID);
-        } else {
-                lpfc_dequeue_node(vport, ndlp);
+                /* Put ndlp onto node list */
+                lpfc_enqueue_node(vport, ndlp);
+        } else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                /* re-setup ndlp without removing from node list */
+                ndlp = lpfc_enable_node(vport, ndlp, NLP_STE_UNUSED_NODE);
+                if (!ndlp)
+                        return 0;
         }
+
         if (lpfc_issue_els_fdisc(vport, ndlp, 0)) {
                 /* decrement node reference count to trigger the release of
                  * the node.
@@ -816,7 +845,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
          */
         new_ndlp = lpfc_findnode_wwpn(vport, &sp->portName);
 
-        if (new_ndlp == ndlp)
+        if (new_ndlp == ndlp && NLP_CHK_NODE_ACT(new_ndlp))
                 return ndlp;
 
         if (!new_ndlp) {
@@ -827,8 +856,12 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
                 new_ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_ATOMIC);
                 if (!new_ndlp)
                         return ndlp;
-
                 lpfc_nlp_init(vport, new_ndlp, ndlp->nlp_DID);
+        } else if (!NLP_CHK_NODE_ACT(new_ndlp)) {
+                new_ndlp = lpfc_enable_node(vport, new_ndlp,
+                                                NLP_STE_UNUSED_NODE);
+                if (!new_ndlp)
+                        return ndlp;
         }
 
         lpfc_unreg_rpi(vport, new_ndlp);
@@ -839,6 +872,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
                 new_ndlp->nlp_flag |= NLP_NPR_2B_DISC;
         ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
 
+        /* Set state will put new_ndlp on to node list if not already done */
         lpfc_nlp_set_state(vport, new_ndlp, ndlp->nlp_state);
 
         /* Move this back to NPR state */
@@ -912,7 +946,7 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 irsp->un.elsreq64.remoteID);
 
         ndlp = lpfc_findnode_did(vport, irsp->un.elsreq64.remoteID);
-        if (!ndlp) {
+        if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
                                  "0136 PLOGI completes to NPort x%x "
                                  "with no ndlp. Data: x%x x%x x%x\n",
@@ -962,12 +996,11 @@ lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 }
                 /* PLOGI failed */
                 /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
-                if (lpfc_error_lost_link(irsp)) {
+                if (lpfc_error_lost_link(irsp))
                         rc = NLP_STE_FREED_NODE;
-                } else {
+                else
                         rc = lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                                      NLP_EVT_CMPL_PLOGI);
-                }
         } else {
                 /* Good status, call state machine */
                 prsp = list_entry(((struct lpfc_dmabuf *)
@@ -1015,8 +1048,10 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)
         pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
 
         ndlp = lpfc_findnode_did(vport, did);
-        /* If ndlp if not NULL, we will bump the reference count on it */
+        if (ndlp && !NLP_CHK_NODE_ACT(ndlp))
+                ndlp = NULL;
 
+        /* If ndlp is not NULL, we will bump the reference count on it */
         cmdsize = (sizeof(uint32_t) + sizeof(struct serv_parm));
         elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp, did,
                                      ELS_CMD_PLOGI);
@@ -1097,18 +1132,15 @@ lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 }
                 /* PRLI failed */
                 /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
-                if (lpfc_error_lost_link(irsp)) {
+                if (lpfc_error_lost_link(irsp))
                         goto out;
-                } else {
+                else
                         lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                                 NLP_EVT_CMPL_PRLI);
-                }
-        } else {
+        } else
                 /* Good status, call state machine */
                 lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                         NLP_EVT_CMPL_PRLI);
-        }
-
 out:
         lpfc_els_free_iocb(phba, cmdiocb);
         return;
@@ -1275,15 +1307,13 @@ lpfc_cmpl_els_adisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 }
                 /* ADISC failed */
                 /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
-                if (!lpfc_error_lost_link(irsp)) {
+                if (!lpfc_error_lost_link(irsp))
                         lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                                 NLP_EVT_CMPL_ADISC);
-                }
-        } else {
+        } else
                 /* Good status, call state machine */
                 lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                         NLP_EVT_CMPL_ADISC);
-        }
 
         if (disc && vport->num_disc_nodes) {
                 /* Check to see if there are more ADISCs to be sent */
@@ -1443,14 +1473,12 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 else
                         lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                                 NLP_EVT_CMPL_LOGO);
-        } else {
+        } else
                 /* Good status, call state machine.
                  * This will unregister the rpi if needed.
                  */
                 lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                         NLP_EVT_CMPL_LOGO);
-        }
-
 out:
         lpfc_els_free_iocb(phba, cmdiocb);
         return;
@@ -1556,11 +1584,19 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
         psli = &phba->sli;
         pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
         cmdsize = (sizeof(uint32_t) + sizeof(SCR));
-        ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
-        if (!ndlp)
-                return 1;
 
-        lpfc_nlp_init(vport, ndlp, nportid);
+        ndlp = lpfc_findnode_did(vport, nportid);
+        if (!ndlp) {
+                ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+                if (!ndlp)
+                        return 1;
+                lpfc_nlp_init(vport, ndlp, nportid);
+                lpfc_enqueue_node(vport, ndlp);
+        } else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                ndlp = lpfc_enable_node(vport, ndlp, NLP_STE_UNUSED_NODE);
+                if (!ndlp)
+                        return 1;
+        }
 
         elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
                                      ndlp->nlp_DID, ELS_CMD_SCR);
@@ -1623,11 +1659,19 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
         psli = &phba->sli;
         pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
         cmdsize = (sizeof(uint32_t) + sizeof(FARP));
-        ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
-        if (!ndlp)
-                return 1;
 
-        lpfc_nlp_init(vport, ndlp, nportid);
+        ndlp = lpfc_findnode_did(vport, nportid);
+        if (!ndlp) {
+                ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+                if (!ndlp)
+                        return 1;
+                lpfc_nlp_init(vport, ndlp, nportid);
+                lpfc_enqueue_node(vport, ndlp);
+        } else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                ndlp = lpfc_enable_node(vport, ndlp, NLP_STE_UNUSED_NODE);
+                if (!ndlp)
+                        return 1;
+        }
 
         elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
                                      ndlp->nlp_DID, ELS_CMD_RNID);
@@ -1657,7 +1701,7 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
         memcpy(&fp->RportName, &vport->fc_portname, sizeof(struct lpfc_name));
         memcpy(&fp->RnodeName, &vport->fc_nodename, sizeof(struct lpfc_name));
         ondlp = lpfc_findnode_did(vport, nportid);
-        if (ondlp) {
+        if (ondlp && NLP_CHK_NODE_ACT(ondlp)) {
                 memcpy(&fp->OportName, &ondlp->nlp_portname,
                        sizeof(struct lpfc_name));
                 memcpy(&fp->OnodeName, &ondlp->nlp_nodename,
@@ -1690,6 +1734,7 @@ void
 lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp)
 {
         struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+        struct lpfc_work_evt *evtp;
 
         spin_lock_irq(shost->host_lock);
         nlp->nlp_flag &= ~NLP_DELAY_TMO;
@@ -1697,8 +1742,12 @@ lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp)
         del_timer_sync(&nlp->nlp_delayfunc);
         nlp->nlp_last_elscmd = 0;
 
-        if (!list_empty(&nlp->els_retry_evt.evt_listp))
+        if (!list_empty(&nlp->els_retry_evt.evt_listp)) {
                 list_del_init(&nlp->els_retry_evt.evt_listp);
+                /* Decrement nlp reference count held for the delayed retry */
+                evtp = &nlp->els_retry_evt;
+                lpfc_nlp_put((struct lpfc_nodelist *)evtp->evt_arg1);
+        }
 
         if (nlp->nlp_flag & NLP_NPR_2B_DISC) {
                 spin_lock_irq(shost->host_lock);
@@ -1842,13 +1891,14 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 cmd = *elscmd++;
         }
 
-        if (ndlp)
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp))
                 did = ndlp->nlp_DID;
         else {
                 /* We should only hit this case for retrying PLOGI */
                 did = irsp->un.elsreq64.remoteID;
                 ndlp = lpfc_findnode_did(vport, did);
-                if (!ndlp && (cmd != ELS_CMD_PLOGI))
+                if ((!ndlp || !NLP_CHK_NODE_ACT(ndlp))
+                    && (cmd != ELS_CMD_PLOGI))
                         return 1;
         }
 
@@ -1870,18 +1920,15 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                         break;
 
                 case IOERR_ILLEGAL_COMMAND:
-                        if ((phba->sli3_options & LPFC_SLI3_VPORT_TEARDOWN) &&
-                            (cmd == ELS_CMD_FDISC)) {
-                                lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
-                                                 "0124 FDISC failed (3/6) "
-                                                 "retrying...\n");
-                                lpfc_mbx_unreg_vpi(vport);
-                                retry = 1;
-                                /* FDISC retry policy */
-                                maxretry = 48;
-                                if (cmdiocb->retry >= 32)
-                                        delay = 1000;
-                        }
+                        lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                         "0124 Retry illegal cmd x%x "
+                                         "retry:x%x delay:x%x\n",
+                                         cmd, cmdiocb->retry, delay);
+                        retry = 1;
+                        /* All command's retry policy */
+                        maxretry = 8;
+                        if (cmdiocb->retry > 2)
+                                delay = 1000;
                         break;
 
                 case IOERR_NO_RESOURCES:
@@ -1967,6 +2014,17 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                         break;
 
                 case LSRJT_LOGICAL_ERR:
+                        /* There are some cases where switches return this
+                         * error when they are not ready and should be returning
+                         * Logical Busy. We should delay every time.
+                         */
+                        if (cmd == ELS_CMD_FDISC &&
+                            stat.un.b.lsRjtRsnCodeExp == LSEXP_PORT_LOGIN_REQ) {
+                                maxretry = 3;
+                                delay = 1000;
+                                retry = 1;
+                                break;
+                        }
                 case LSRJT_PROTOCOL_ERR:
                         if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
                           (cmd == ELS_CMD_FDISC) &&
@@ -1996,7 +2054,8 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 retry = 1;
 
         if ((cmd == ELS_CMD_FLOGI) &&
-            (phba->fc_topology != TOPOLOGY_LOOP)) {
+            (phba->fc_topology != TOPOLOGY_LOOP) &&
+            !lpfc_error_lost_link(irsp)) {
                 /* FLOGI retry policy */
                 retry = 1;
                 maxretry = 48;
@@ -2322,6 +2381,9 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 if ((rspiocb->iocb.ulpStatus == 0)
                     && (ndlp->nlp_flag & NLP_ACC_REGLOGIN)) {
                         lpfc_unreg_rpi(vport, ndlp);
+                        /* Increment reference count to ndlp to hold the
+                         * reference to ndlp for the callback function.
+                         */
                         mbox->context2 = lpfc_nlp_get(ndlp);
                         mbox->vport = vport;
                         if (ndlp->nlp_flag & NLP_RM_DFLT_RPI) {
@@ -2335,9 +2397,13 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                                            NLP_STE_REG_LOGIN_ISSUE);
                         }
                         if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT)
-                            != MBX_NOT_FINISHED) {
+                            != MBX_NOT_FINISHED)
                                 goto out;
-                        }
+                        else
+                                /* Decrement the ndlp reference count we
+                                 * set for this failed mailbox command.
+                                 */
+                                lpfc_nlp_put(ndlp);
 
                         /* ELS rsp: Cannot issue reg_login for <NPortid> */
                         lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
@@ -2796,6 +2862,8 @@ lpfc_els_disc_adisc(struct lpfc_vport *vport)
 
         /* go thru NPR nodes and issue any remaining ELS ADISCs */
         list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
                 if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
                     (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
                     (ndlp->nlp_flag & NLP_NPR_ADISC) != 0) {
@@ -2833,6 +2901,8 @@ lpfc_els_disc_plogi(struct lpfc_vport *vport)
 
         /* go thru NPR nodes and issue any remaining ELS PLOGIs */
         list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
                 if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
                     (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
                     (ndlp->nlp_flag & NLP_DELAY_TMO) == 0 &&
@@ -2869,6 +2939,16 @@ lpfc_els_flush_rscn(struct lpfc_vport *vport)
         struct lpfc_hba  *phba = vport->phba;
         int i;
 
+        spin_lock_irq(shost->host_lock);
+        if (vport->fc_rscn_flush) {
+                /* Another thread is walking fc_rscn_id_list on this vport */
+                spin_unlock_irq(shost->host_lock);
+                return;
+        }
+        /* Indicate we are walking lpfc_els_flush_rscn on this vport */
+        vport->fc_rscn_flush = 1;
+        spin_unlock_irq(shost->host_lock);
+
         for (i = 0; i < vport->fc_rscn_id_cnt; i++) {
                 lpfc_in_buf_free(phba, vport->fc_rscn_id_list[i]);
                 vport->fc_rscn_id_list[i] = NULL;
@@ -2878,6 +2958,8 @@ lpfc_els_flush_rscn(struct lpfc_vport *vport)
         vport->fc_flag &= ~(FC_RSCN_MODE | FC_RSCN_DISCOVERY);
         spin_unlock_irq(shost->host_lock);
         lpfc_can_disctmo(vport);
+        /* Indicate we are done walking this fc_rscn_id_list */
+        vport->fc_rscn_flush = 0;
 }
 
 int
@@ -2887,6 +2969,7 @@ lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did)
         D_ID rscn_did;
         uint32_t *lp;
         uint32_t payload_len, i;
+        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
 
         ns_did.un.word = did;
 
@@ -2898,6 +2981,15 @@ lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did)
         if (vport->fc_flag & FC_RSCN_DISCOVERY)
                 return did;
 
+        spin_lock_irq(shost->host_lock);
+        if (vport->fc_rscn_flush) {
+                /* Another thread is walking fc_rscn_id_list on this vport */
+                spin_unlock_irq(shost->host_lock);
+                return 0;
+        }
+        /* Indicate we are walking fc_rscn_id_list on this vport */
+        vport->fc_rscn_flush = 1;
+        spin_unlock_irq(shost->host_lock);
         for (i = 0; i < vport->fc_rscn_id_cnt; i++) {
                 lp = vport->fc_rscn_id_list[i]->virt;
                 payload_len = be32_to_cpu(*lp++ & ~ELS_CMD_MASK);
@@ -2908,16 +3000,16 @@ lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did)
                         switch (rscn_did.un.b.resv) {
                         case 0: /* Single N_Port ID effected */
                                 if (ns_did.un.word == rscn_did.un.word)
-                                        return did;
+                                        goto return_did_out;
                                 break;
                         case 1: /* Whole N_Port Area effected */
                                 if ((ns_did.un.b.domain == rscn_did.un.b.domain)
                                     && (ns_did.un.b.area == rscn_did.un.b.area))
-                                        return did;
+                                        goto return_did_out;
                                 break;
                         case 2: /* Whole N_Port Domain effected */
                                 if (ns_did.un.b.domain == rscn_did.un.b.domain)
-                                        return did;
+                                        goto return_did_out;
                                 break;
                         default:
                                 /* Unknown Identifier in RSCN node */
@@ -2926,11 +3018,17 @@ lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did)
                                                  "RSCN payload Data: x%x\n",
                                                  rscn_did.un.word);
                         case 3: /* Whole Fabric effected */
-                                return did;
+                                goto return_did_out;
                         }
                 }
         }
+        /* Indicate we are done with walking fc_rscn_id_list on this vport */
+        vport->fc_rscn_flush = 0;
         return 0;
+return_did_out:
+        /* Indicate we are done with walking fc_rscn_id_list on this vport */
+        vport->fc_rscn_flush = 0;
+        return did;
 }
 
 static int
@@ -2943,7 +3041,8 @@ lpfc_rscn_recovery_check(struct lpfc_vport *vport)
          */
 
         list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
-                if (ndlp->nlp_state == NLP_STE_UNUSED_NODE ||
+                if (!NLP_CHK_NODE_ACT(ndlp) ||
+                    ndlp->nlp_state == NLP_STE_UNUSED_NODE ||
                     lpfc_rscn_payload_check(vport, ndlp->nlp_DID) == 0)
                         continue;
 
@@ -2971,7 +3070,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
         uint32_t *lp, *datap;
         IOCB_t *icmd;
         uint32_t payload_len, length, nportid, *cmd;
-        int rscn_cnt = vport->fc_rscn_id_cnt;
+        int rscn_cnt;
         int rscn_id = 0, hba_id = 0;
         int i;
 
@@ -2984,7 +3083,8 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
         /* RSCN received */
         lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                          "0214 RSCN received Data: x%x x%x x%x x%x\n",
-                         vport->fc_flag, payload_len, *lp, rscn_cnt);
+                         vport->fc_flag, payload_len, *lp,
+                         vport->fc_rscn_id_cnt);
         for (i = 0; i < payload_len/sizeof(uint32_t); i++)
                 fc_host_post_event(shost, fc_get_event_number(),
                         FCH_EVT_RSCN, lp[i]);
@@ -3022,7 +3122,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                                          "0214 Ignore RSCN "
                                          "Data: x%x x%x x%x x%x\n",
                                          vport->fc_flag, payload_len,
-                                         *lp, rscn_cnt);
+                                         *lp, vport->fc_rscn_id_cnt);
                         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_UNSOL,
                                 "RCV RSCN vport:  did:x%x/ste:x%x flg:x%x",
                                 ndlp->nlp_DID, vport->port_state,
@@ -3034,6 +3134,18 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 }
         }
 
+        spin_lock_irq(shost->host_lock);
+        if (vport->fc_rscn_flush) {
+                /* Another thread is walking fc_rscn_id_list on this vport */
+                spin_unlock_irq(shost->host_lock);
+                vport->fc_flag |= FC_RSCN_DISCOVERY;
+                return 0;
+        }
+        /* Indicate we are walking fc_rscn_id_list on this vport */
+        vport->fc_rscn_flush = 1;
+        spin_unlock_irq(shost->host_lock);
+        /* Get the array count after sucessfully have the token */
+        rscn_cnt = vport->fc_rscn_id_cnt;
         /* If we are already processing an RSCN, save the received
          * RSCN payload buffer, cmdiocb->context2 to process later.
          */
@@ -3055,7 +3167,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                         if ((rscn_cnt) &&
                             (payload_len + length <= LPFC_BPL_SIZE)) {
                                 *cmd &= ELS_CMD_MASK;
-                                *cmd |= be32_to_cpu(payload_len + length);
+                                *cmd |= cpu_to_be32(payload_len + length);
                                 memcpy(((uint8_t *)cmd) + length, lp,
                                        payload_len);
                         } else {
@@ -3066,7 +3178,6 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                                  */
                                 cmdiocb->context2 = NULL;
                         }
-
                         /* Deferred RSCN */
                         lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                                          "0235 Deferred RSCN "
@@ -3083,9 +3194,10 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                                          vport->fc_rscn_id_cnt, vport->fc_flag,
                                          vport->port_state);
                 }
+                /* Indicate we are done walking fc_rscn_id_list on this vport */
+                vport->fc_rscn_flush = 0;
                 /* Send back ACC */
                 lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
-
                 /* send RECOVERY event for ALL nodes that match RSCN payload */
                 lpfc_rscn_recovery_check(vport);
                 spin_lock_irq(shost->host_lock);
@@ -3093,7 +3205,6 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 spin_unlock_irq(shost->host_lock);
                 return 0;
         }
-
         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_UNSOL,
                 "RCV RSCN:        did:x%x/ste:x%x flg:x%x",
                 ndlp->nlp_DID, vport->port_state, ndlp->nlp_flag);
@@ -3102,20 +3213,18 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
         vport->fc_flag |= FC_RSCN_MODE;
         spin_unlock_irq(shost->host_lock);
         vport->fc_rscn_id_list[vport->fc_rscn_id_cnt++] = pcmd;
+        /* Indicate we are done walking fc_rscn_id_list on this vport */
+        vport->fc_rscn_flush = 0;
         /*
          * If we zero, cmdiocb->context2, the calling routine will
          * not try to free it.
          */
         cmdiocb->context2 = NULL;
-
         lpfc_set_disctmo(vport);
-
         /* Send back ACC */
         lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
-
         /* send RECOVERY event for ALL nodes that match RSCN payload */
         lpfc_rscn_recovery_check(vport);
-
         return lpfc_els_handle_rscn(vport);
 }
 
@@ -3145,7 +3254,8 @@ lpfc_els_handle_rscn(struct lpfc_vport *vport)
         vport->num_disc_nodes = 0;
 
         ndlp = lpfc_findnode_did(vport, NameServer_DID);
-        if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp)
+            && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
                 /* Good ndlp, issue CT Request to NameServer */
                 if (lpfc_ns_cmd(vport, SLI_CTNS_GID_FT, 0, 0) == 0)
                         /* Wait for NameServer query cmpl before we can
@@ -3155,25 +3265,35 @@ lpfc_els_handle_rscn(struct lpfc_vport *vport)
                 /* If login to NameServer does not exist, issue one */
                 /* Good status, issue PLOGI to NameServer */
                 ndlp = lpfc_findnode_did(vport, NameServer_DID);
-                if (ndlp)
+                if (ndlp && NLP_CHK_NODE_ACT(ndlp))
                         /* Wait for NameServer login cmpl before we can
                            continue */
                         return 1;
 
-                ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
-                if (!ndlp) {
-                        lpfc_els_flush_rscn(vport);
-                        return 0;
+                if (ndlp) {
+                        ndlp = lpfc_enable_node(vport, ndlp,
+                                                NLP_STE_PLOGI_ISSUE);
+                        if (!ndlp) {
+                                lpfc_els_flush_rscn(vport);
+                                return 0;
+                        }
+                        ndlp->nlp_prev_state = NLP_STE_UNUSED_NODE;
                 } else {
+                        ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+                        if (!ndlp) {
+                                lpfc_els_flush_rscn(vport);
+                                return 0;
+                        }
                         lpfc_nlp_init(vport, ndlp, NameServer_DID);
-                        ndlp->nlp_type |= NLP_FABRIC;
                         ndlp->nlp_prev_state = ndlp->nlp_state;
                         lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
-                        lpfc_issue_els_plogi(vport, NameServer_DID, 0);
-                        /* Wait for NameServer login cmpl before we can
-                           continue */
-                        return 1;
                 }
+                ndlp->nlp_type |= NLP_FABRIC;
+                lpfc_issue_els_plogi(vport, NameServer_DID, 0);
+                /* Wait for NameServer login cmpl before we can
+                 * continue
+                 */
+                return 1;
         }
 
         lpfc_els_flush_rscn(vport);
@@ -3672,6 +3792,8 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
 
                         list_for_each_entry_safe(ndlp, next_ndlp,
                                                  &vport->fc_nodes, nlp_listp) {
+                                if (!NLP_CHK_NODE_ACT(ndlp))
+                                        continue;
                                 if (ndlp->nlp_state != NLP_STE_NPR_NODE)
                                         continue;
                                 if (ndlp->nlp_type & NLP_FABRIC) {
@@ -3697,6 +3819,8 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                  */
                 list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes,
                                          nlp_listp) {
+                        if (!NLP_CHK_NODE_ACT(ndlp))
+                                continue;
                         if (ndlp->nlp_state != NLP_STE_NPR_NODE)
                                 continue;
 
@@ -3936,7 +4060,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         uint32_t cmd, did, newnode, rjt_err = 0;
         IOCB_t *icmd = &elsiocb->iocb;
 
-        if (vport == NULL || elsiocb->context2 == NULL)
+        if (!vport || !(elsiocb->context2))
                 goto dropit;
 
         newnode = 0;
@@ -3971,14 +4095,20 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 lpfc_nlp_init(vport, ndlp, did);
                 lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
                 newnode = 1;
-                if ((did & Fabric_DID_MASK) == Fabric_DID_MASK) {
+                if ((did & Fabric_DID_MASK) == Fabric_DID_MASK)
                         ndlp->nlp_type |= NLP_FABRIC;
+        } else {
+                if (!NLP_CHK_NODE_ACT(ndlp)) {
+                        ndlp = lpfc_enable_node(vport, ndlp,
+                                                NLP_STE_UNUSED_NODE);
+                        if (!ndlp)
+                                goto dropit;
                 }
-        }
-        else {
                 if (ndlp->nlp_state == NLP_STE_UNUSED_NODE) {
                         /* This is simular to the new node path */
-                        lpfc_nlp_get(ndlp);
+                        ndlp = lpfc_nlp_get(ndlp);
+                        if (!ndlp)
+                                goto dropit;
                         lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
                         newnode = 1;
                 }
@@ -3987,6 +4117,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         phba->fc_stat.elsRcvFrame++;
         if (elsiocb->context1)
                 lpfc_nlp_put(elsiocb->context1);
+
         elsiocb->context1 = lpfc_nlp_get(ndlp);
         elsiocb->vport = vport;
 
@@ -4007,8 +4138,15 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 ndlp = lpfc_plogi_confirm_nport(phba, payload, ndlp);
 
                 if (vport->port_state < LPFC_DISC_AUTH) {
-                        rjt_err = LSRJT_UNABLE_TPC;
-                        break;
+                        if (!(phba->pport->fc_flag & FC_PT2PT) ||
+                                (phba->pport->fc_flag & FC_PT2PT_PLOGI)) {
+                                rjt_err = LSRJT_UNABLE_TPC;
+                                break;
+                        }
+                        /* We get here, and drop thru, if we are PT2PT with
+                         * another NPort and the other side has initiated
+                         * the PLOGI before responding to our FLOGI.
+                         */
                 }
 
                 shost = lpfc_shost_from_vport(vport);
@@ -4251,15 +4389,15 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                         vport = lpfc_find_vport_by_vpid(phba, vpi);
                 }
         }
-                                /* If there are no BDEs associated
-                                 * with this IOCB, there is nothing to do.
-                                 */
+        /* If there are no BDEs associated
+         * with this IOCB, there is nothing to do.
+         */
         if (icmd->ulpBdeCount == 0)
                 return;
 
-                                /* type of ELS cmd is first 32bit word
-                                 * in packet
-                                 */
+        /* type of ELS cmd is first 32bit word
+         * in packet
+         */
         if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
                 elsiocb->context2 = bdeBuf1;
         } else {
@@ -4314,6 +4452,18 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)
                 }
                 lpfc_nlp_init(vport, ndlp, NameServer_DID);
                 ndlp->nlp_type |= NLP_FABRIC;
+        } else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                ndlp = lpfc_enable_node(vport, ndlp, NLP_STE_UNUSED_NODE);
+                if (!ndlp) {
+                        if (phba->fc_topology == TOPOLOGY_LOOP) {
+                                lpfc_disc_start(vport);
+                                return;
+                        }
+                        lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+                        lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                        "0348 NameServer login: node freed\n");
+                        return;
+                }
         }
 
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
@@ -4360,6 +4510,7 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                 switch (mb->mbxStatus) {
                 case 0x11:      /* unsupported feature */
                 case 0x9603:    /* max_vpi exceeded */
+                case 0x9602:    /* Link event since CLEAR_LA */
                         /* giving up on vport registration */
                         lpfc_vport_set_state(vport, FC_VPORT_FAILED);
                         spin_lock_irq(shost->host_lock);
@@ -4373,7 +4524,10 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                         spin_lock_irq(shost->host_lock);
                         vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
                         spin_unlock_irq(shost->host_lock);
-                        lpfc_initial_fdisc(vport);
+                        if (vport->port_type == LPFC_PHYSICAL_PORT)
+                                lpfc_initial_flogi(vport);
+                        else
+                                lpfc_initial_fdisc(vport);
                         break;
                 }
 
@@ -4471,7 +4625,6 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                                  irsp->ulpStatus, irsp->un.ulpWord[4]);
                 if (vport->fc_vport->vport_state == FC_VPORT_INITIALIZING)
                         lpfc_vport_set_state(vport, FC_VPORT_FAILED);
-
                 lpfc_nlp_put(ndlp);
                 /* giving up on FDISC. Cancel discovery timer */
                 lpfc_can_disctmo(vport);
@@ -4492,8 +4645,9 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                          */
                         list_for_each_entry_safe(np, next_np,
                                 &vport->fc_nodes, nlp_listp) {
-                                if (np->nlp_state != NLP_STE_NPR_NODE
-                                   || !(np->nlp_flag & NLP_NPR_ADISC))
+                                if (!NLP_CHK_NODE_ACT(ndlp) ||
+                                    (np->nlp_state != NLP_STE_NPR_NODE) ||
+                                    !(np->nlp_flag & NLP_NPR_ADISC))
                                         continue;
                                 spin_lock_irq(shost->host_lock);
                                 np->nlp_flag &= ~NLP_NPR_ADISC;
@@ -4599,6 +4753,8 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 {
         struct lpfc_vport *vport = cmdiocb->vport;
         IOCB_t *irsp;
+        struct lpfc_nodelist *ndlp;
+        ndlp = (struct lpfc_nodelist *)cmdiocb->context1;
 
         irsp = &rspiocb->iocb;
         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
@@ -4607,6 +4763,9 @@ lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
         lpfc_els_free_iocb(phba, cmdiocb);
         vport->unreg_vpi_cmpl = VPORT_ERROR;
+
+        /* Trigger the release of the ndlp after logo */
+        lpfc_nlp_put(ndlp);
 }
 
 int
@@ -4686,11 +4845,12 @@ lpfc_resume_fabric_iocbs(struct lpfc_hba *phba)
 repeat:
         iocb = NULL;
         spin_lock_irqsave(&phba->hbalock, iflags);
-                                /* Post any pending iocb to the SLI layer */
+        /* Post any pending iocb to the SLI layer */
         if (atomic_read(&phba->fabric_iocb_count) == 0) {
                 list_remove_head(&phba->fabric_iocb_list, iocb, typeof(*iocb),
                                  list);
                 if (iocb)
+                        /* Increment fabric iocb count to hold the position */
                         atomic_inc(&phba->fabric_iocb_count);
         }
         spin_unlock_irqrestore(&phba->hbalock, iflags);
@@ -4737,9 +4897,7 @@ lpfc_block_fabric_iocbs(struct lpfc_hba *phba)
         int blocked;
 
         blocked = test_and_set_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags);
-                                /* Start a timer to unblock fabric
-                                 * iocbs after 100ms
-                                 */
+        /* Start a timer to unblock fabric iocbs after 100ms */
         if (!blocked)
                 mod_timer(&phba->fabric_block_timer, jiffies + HZ/10 );
 
@@ -4787,8 +4945,8 @@ lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
         atomic_dec(&phba->fabric_iocb_count);
         if (!test_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags)) {
-                                /* Post any pending iocbs to HBA */
-                    lpfc_resume_fabric_iocbs(phba);
+                /* Post any pending iocbs to HBA */
+                lpfc_resume_fabric_iocbs(phba);
         }
 }
 
@@ -4807,6 +4965,9 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)
         ready = atomic_read(&phba->fabric_iocb_count) == 0 &&
                 !test_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags);
 
+        if (ready)
+                /* Increment fabric iocb count to hold the position */
+                atomic_inc(&phba->fabric_iocb_count);
         spin_unlock_irqrestore(&phba->hbalock, iflags);
         if (ready) {
                 iocb->fabric_iocb_cmpl = iocb->iocb_cmpl;
@@ -4817,7 +4978,6 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)
                         "Fabric sched2:   ste:x%x",
                         iocb->vport->port_state, 0, 0);
 
-                atomic_inc(&phba->fabric_iocb_count);
                 ret = lpfc_sli_issue_iocb(phba, pring, iocb, 0);
 
                 if (ret == IOCB_ERROR) {
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index dc042bd97baa..976653440fba 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -272,9 +272,8 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)
         if (!(vport->load_flag & FC_UNLOADING) &&
             !(ndlp->nlp_flag & NLP_DELAY_TMO) &&
             !(ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
-            (ndlp->nlp_state != NLP_STE_UNMAPPED_NODE)) {
+            (ndlp->nlp_state != NLP_STE_UNMAPPED_NODE))
                 lpfc_disc_state_machine(vport, ndlp, NULL, NLP_EVT_DEVICE_RM);
-        }
 }
 
 
@@ -566,9 +565,10 @@ lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove)
         int  rc;
 
         list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
                 if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
                         continue;
-
                 if ((phba->sli3_options & LPFC_SLI3_VPORT_TEARDOWN) ||
                         ((vport->port_type == LPFC_NPIV_PORT) &&
                         (ndlp->nlp_DID == NameServer_DID)))
@@ -629,9 +629,8 @@ lpfc_linkdown(struct lpfc_hba *phba)
         LPFC_MBOXQ_t          *mb;
         int i;
 
-        if (phba->link_state == LPFC_LINK_DOWN) {
+        if (phba->link_state == LPFC_LINK_DOWN)
                 return 0;
-        }
         spin_lock_irq(&phba->hbalock);
         if (phba->link_state > LPFC_LINK_DOWN) {
                 phba->link_state = LPFC_LINK_DOWN;
@@ -684,20 +683,21 @@ lpfc_linkup_cleanup_nodes(struct lpfc_vport *vport)
         struct lpfc_nodelist *ndlp;
 
         list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
                 if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
                         continue;
-
                 if (ndlp->nlp_type & NLP_FABRIC) {
-                                /* On Linkup its safe to clean up the ndlp
-                                 * from Fabric connections.
-                                 */
+                        /* On Linkup its safe to clean up the ndlp
+                         * from Fabric connections.
+                         */
                         if (ndlp->nlp_DID != Fabric_DID)
                                 lpfc_unreg_rpi(vport, ndlp);
                         lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
                 } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
-                                /* Fail outstanding IO now since device is
-                                 * marked for PLOGI.
-                                 */
+                        /* Fail outstanding IO now since device is
+                         * marked for PLOGI.
+                         */
                         lpfc_unreg_rpi(vport, ndlp);
                 }
         }
@@ -799,21 +799,9 @@ lpfc_mbx_cmpl_clear_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         writel(control, phba->HCregaddr);
         readl(phba->HCregaddr); /* flush */
         spin_unlock_irq(&phba->hbalock);
+        mempool_free(pmb, phba->mbox_mem_pool);
         return;
 
-        vport->num_disc_nodes = 0;
-        /* go thru NPR nodes and issue ELS PLOGIs */
-        if (vport->fc_npr_cnt)
-                lpfc_els_disc_plogi(vport);
-
-        if (!vport->num_disc_nodes) {
-                spin_lock_irq(shost->host_lock);
-                vport->fc_flag &= ~FC_NDISC_ACTIVE;
-                spin_unlock_irq(shost->host_lock);
-        }
-
-        vport->port_state = LPFC_VPORT_READY;
-
 out:
         /* Device Discovery completes */
         lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
@@ -1133,7 +1121,7 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         if (la->attType == AT_LINK_UP) {
                 phba->fc_stat.LinkUp++;
                 if (phba->link_flag & LS_LOOPBACK_MODE) {
-                        lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
+                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
                                         "1306 Link Up Event in loop back mode "
                                         "x%x received Data: x%x x%x x%x x%x\n",
                                         la->eventTag, phba->fc_eventTag,
@@ -1150,11 +1138,21 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                 lpfc_mbx_process_link_up(phba, la);
         } else {
                 phba->fc_stat.LinkDown++;
-                lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
+                if (phba->link_flag & LS_LOOPBACK_MODE) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
+                                "1308 Link Down Event in loop back mode "
+                                "x%x received "
+                                "Data: x%x x%x x%x\n",
+                                la->eventTag, phba->fc_eventTag,
+                                phba->pport->port_state, vport->fc_flag);
+                }
+                else {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
                                 "1305 Link Down Event x%x received "
                                 "Data: x%x x%x x%x\n",
                                 la->eventTag, phba->fc_eventTag,
                                 phba->pport->port_state, vport->fc_flag);
+                }
                 lpfc_mbx_issue_link_down(phba);
         }
 
@@ -1305,7 +1303,6 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                 kfree(mp);
                 mempool_free(pmb, phba->mbox_mem_pool);
-                lpfc_nlp_put(ndlp);
 
                 if (phba->fc_topology == TOPOLOGY_LOOP) {
                         /* FLOGI failed, use loop map to make discovery list */
@@ -1313,6 +1310,10 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
                         /* Start discovery */
                         lpfc_disc_start(vport);
+                        /* Decrement the reference count to ndlp after the
+                         * reference to the ndlp are done.
+                         */
+                        lpfc_nlp_put(ndlp);
                         return;
                 }
 
@@ -1320,6 +1321,10 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
                                  "0258 Register Fabric login error: 0x%x\n",
                                  mb->mbxStatus);
+                /* Decrement the reference count to ndlp after the reference
+                 * to the ndlp are done.
+                 */
+                lpfc_nlp_put(ndlp);
                 return;
         }
 
@@ -1327,8 +1332,6 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         ndlp->nlp_type |= NLP_FABRIC;
         lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
 
-        lpfc_nlp_put(ndlp);     /* Drop the reference from the mbox */
-
         if (vport->port_state == LPFC_FABRIC_CFG_LINK) {
                 vports = lpfc_create_vport_work_array(phba);
                 if (vports != NULL)
@@ -1356,6 +1359,11 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         lpfc_mbuf_free(phba, mp->virt, mp->phys);
         kfree(mp);
         mempool_free(pmb, phba->mbox_mem_pool);
+
+        /* Drop the reference count from the mbox at the end after
+         * all the current reference to the ndlp have been done.
+         */
+        lpfc_nlp_put(ndlp);
         return;
 }
 
@@ -1463,9 +1471,8 @@ lpfc_register_remote_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
          * registered the port.
          */
         if (ndlp->rport && ndlp->rport->dd_data &&
-            ((struct lpfc_rport_data *) ndlp->rport->dd_data)->pnode == ndlp) {
+            ((struct lpfc_rport_data *) ndlp->rport->dd_data)->pnode == ndlp)
                 lpfc_nlp_put(ndlp);
-        }
 
         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_RPORT,
                 "rport add:       did:x%x flg:x%x type x%x",
@@ -1660,6 +1667,18 @@ lpfc_nlp_set_state(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 }
 
 void
+lpfc_enqueue_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
+{
+        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+        if (list_empty(&ndlp->nlp_listp)) {
+                spin_lock_irq(shost->host_lock);
+                list_add_tail(&ndlp->nlp_listp, &vport->fc_nodes);
+                spin_unlock_irq(shost->host_lock);
+        }
+}
+
+void
 lpfc_dequeue_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 {
         struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
@@ -1672,7 +1691,80 @@ lpfc_dequeue_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         list_del_init(&ndlp->nlp_listp);
         spin_unlock_irq(shost->host_lock);
         lpfc_nlp_state_cleanup(vport, ndlp, ndlp->nlp_state,
-                               NLP_STE_UNUSED_NODE);
+                                NLP_STE_UNUSED_NODE);
+}
+
+static void
+lpfc_disable_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
+{
+        if ((ndlp->nlp_flag & NLP_DELAY_TMO) != 0)
+                lpfc_cancel_retry_delay_tmo(vport, ndlp);
+        if (ndlp->nlp_state && !list_empty(&ndlp->nlp_listp))
+                lpfc_nlp_counters(vport, ndlp->nlp_state, -1);
+        lpfc_nlp_state_cleanup(vport, ndlp, ndlp->nlp_state,
+                                NLP_STE_UNUSED_NODE);
+}
+
+struct lpfc_nodelist *
+lpfc_enable_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                 int state)
+{
+        struct lpfc_hba *phba = vport->phba;
+        uint32_t did;
+        unsigned long flags;
+
+        if (!ndlp)
+                return NULL;
+
+        spin_lock_irqsave(&phba->ndlp_lock, flags);
+        /* The ndlp should not be in memory free mode */
+        if (NLP_CHK_FREE_REQ(ndlp)) {
+                spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+                lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,
+                                "0277 lpfc_enable_node: ndlp:x%p "
+                                "usgmap:x%x refcnt:%d\n",
+                                (void *)ndlp, ndlp->nlp_usg_map,
+                                atomic_read(&ndlp->kref.refcount));
+                return NULL;
+        }
+        /* The ndlp should not already be in active mode */
+        if (NLP_CHK_NODE_ACT(ndlp)) {
+                spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+                lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,
+                                "0278 lpfc_enable_node: ndlp:x%p "
+                                "usgmap:x%x refcnt:%d\n",
+                                (void *)ndlp, ndlp->nlp_usg_map,
+                                atomic_read(&ndlp->kref.refcount));
+                return NULL;
+        }
+
+        /* Keep the original DID */
+        did = ndlp->nlp_DID;
+
+        /* re-initialize ndlp except of ndlp linked list pointer */
+        memset((((char *)ndlp) + sizeof (struct list_head)), 0,
+                sizeof (struct lpfc_nodelist) - sizeof (struct list_head));
+        INIT_LIST_HEAD(&ndlp->els_retry_evt.evt_listp);
+        INIT_LIST_HEAD(&ndlp->dev_loss_evt.evt_listp);
+        init_timer(&ndlp->nlp_delayfunc);
+        ndlp->nlp_delayfunc.function = lpfc_els_retry_delay;
+        ndlp->nlp_delayfunc.data = (unsigned long)ndlp;
+        ndlp->nlp_DID = did;
+        ndlp->vport = vport;
+        ndlp->nlp_sid = NLP_NO_SID;
+        /* ndlp management re-initialize */
+        kref_init(&ndlp->kref);
+        NLP_INT_NODE_ACT(ndlp);
+
+        spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+
+        if (state != NLP_STE_UNUSED_NODE)
+                lpfc_nlp_set_state(vport, ndlp, state);
+
+        lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_NODE,
+                "node enable:       did:x%x",
+                ndlp->nlp_DID, 0, 0);
+        return ndlp;
 }
 
 void
@@ -1972,7 +2064,21 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                          "Data: x%x x%x x%x\n",
                          ndlp->nlp_DID, ndlp->nlp_flag,
                          ndlp->nlp_state, ndlp->nlp_rpi);
-        lpfc_dequeue_node(vport, ndlp);
+        if (NLP_CHK_FREE_REQ(ndlp)) {
+                lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,
+                                "0280 lpfc_cleanup_node: ndlp:x%p "
+                                "usgmap:x%x refcnt:%d\n",
+                                (void *)ndlp, ndlp->nlp_usg_map,
+                                atomic_read(&ndlp->kref.refcount));
+                lpfc_dequeue_node(vport, ndlp);
+        } else {
+                lpfc_printf_vlog(vport, KERN_WARNING, LOG_NODE,
+                                "0281 lpfc_cleanup_node: ndlp:x%p "
+                                "usgmap:x%x refcnt:%d\n",
+                                (void *)ndlp, ndlp->nlp_usg_map,
+                                atomic_read(&ndlp->kref.refcount));
+                lpfc_disable_node(vport, ndlp);
+        }
 
         /* cleanup any ndlp on mbox q waiting for reglogin cmpl */
         if ((mb = phba->sli.mbox_active)) {
@@ -1994,12 +2100,16 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                         }
                         list_del(&mb->list);
                         mempool_free(mb, phba->mbox_mem_pool);
-                        lpfc_nlp_put(ndlp);
+                        /* We shall not invoke the lpfc_nlp_put to decrement
+                         * the ndlp reference count as we are in the process
+                         * of lpfc_nlp_release.
+                         */
                 }
         }
         spin_unlock_irq(&phba->hbalock);
 
-        lpfc_els_abort(phba,ndlp);
+        lpfc_els_abort(phba, ndlp);
+
         spin_lock_irq(shost->host_lock);
         ndlp->nlp_flag &= ~NLP_DELAY_TMO;
         spin_unlock_irq(shost->host_lock);
@@ -2057,7 +2167,6 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                         }
                 }
         }
-
         lpfc_cleanup_node(vport, ndlp);
 
         /*
@@ -2182,7 +2291,16 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
                 ndlp->nlp_flag |= NLP_NPR_2B_DISC;
                 spin_unlock_irq(shost->host_lock);
                 return ndlp;
+        } else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                ndlp = lpfc_enable_node(vport, ndlp, NLP_STE_NPR_NODE);
+                if (!ndlp)
+                        return NULL;
+                spin_lock_irq(shost->host_lock);
+                ndlp->nlp_flag |= NLP_NPR_2B_DISC;
+                spin_unlock_irq(shost->host_lock);
+                return ndlp;
         }
+
         if (vport->fc_flag & FC_RSCN_MODE) {
                 if (lpfc_rscn_payload_check(vport, did)) {
                         /* If we've already recieved a PLOGI from this NPort
@@ -2363,6 +2481,7 @@ lpfc_disc_start(struct lpfc_vport *vport)
          * continue discovery.
          */
         if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+            !(vport->fc_flag & FC_PT2PT) &&
             !(vport->fc_flag & FC_RSCN_MODE)) {
                 lpfc_issue_reg_vpi(phba, vport);
                 return;
@@ -2485,6 +2604,8 @@ lpfc_disc_flush_list(struct lpfc_vport *vport)
         if (vport->fc_plogi_cnt || vport->fc_adisc_cnt) {
                 list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes,
                                          nlp_listp) {
+                        if (!NLP_CHK_NODE_ACT(ndlp))
+                                continue;
                         if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE ||
                             ndlp->nlp_state == NLP_STE_ADISC_ISSUE) {
                                 lpfc_free_tx(phba, ndlp);
@@ -2572,6 +2693,8 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
                 /* Start discovery by sending FLOGI, clean up old rpis */
                 list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes,
                                          nlp_listp) {
+                        if (!NLP_CHK_NODE_ACT(ndlp))
+                                continue;
                         if (ndlp->nlp_state != NLP_STE_NPR_NODE)
                                 continue;
                         if (ndlp->nlp_type & NLP_FABRIC) {
@@ -2618,7 +2741,7 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
                                  "NameServer login\n");
                 /* Next look for NameServer ndlp */
                 ndlp = lpfc_findnode_did(vport, NameServer_DID);
-                if (ndlp)
+                if (ndlp && NLP_CHK_NODE_ACT(ndlp))
                         lpfc_els_abort(phba, ndlp);
 
                 /* ReStart discovery */
@@ -2897,6 +3020,7 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         ndlp->nlp_sid = NLP_NO_SID;
         INIT_LIST_HEAD(&ndlp->nlp_listp);
         kref_init(&ndlp->kref);
+        NLP_INT_NODE_ACT(ndlp);
 
         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_NODE,
                 "node init:       did:x%x",
@@ -2911,6 +3035,8 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 static void
 lpfc_nlp_release(struct kref *kref)
 {
+        struct lpfc_hba *phba;
+        unsigned long flags;
         struct lpfc_nodelist *ndlp = container_of(kref, struct lpfc_nodelist,
                                                   kref);
 
@@ -2918,8 +3044,24 @@ lpfc_nlp_release(struct kref *kref)
                 "node release:    did:x%x flg:x%x type:x%x",
                 ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);
 
+        lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_NODE,
+                        "0279 lpfc_nlp_release: ndlp:x%p "
+                        "usgmap:x%x refcnt:%d\n",
+                        (void *)ndlp, ndlp->nlp_usg_map,
+                        atomic_read(&ndlp->kref.refcount));
+
+        /* remove ndlp from action. */
         lpfc_nlp_remove(ndlp->vport, ndlp);
-        mempool_free(ndlp, ndlp->vport->phba->nlp_mem_pool);
+
+        /* clear the ndlp active flag for all release cases */
+        phba = ndlp->vport->phba;
+        spin_lock_irqsave(&phba->ndlp_lock, flags);
+        NLP_CLR_NODE_ACT(ndlp);
+        spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+
+        /* free ndlp memory for final ndlp release */
+        if (NLP_CHK_FREE_REQ(ndlp))
+                mempool_free(ndlp, ndlp->vport->phba->nlp_mem_pool);
 }
 
 /* This routine bumps the reference count for a ndlp structure to ensure
@@ -2929,37 +3071,108 @@ lpfc_nlp_release(struct kref *kref)
 struct lpfc_nodelist *
 lpfc_nlp_get(struct lpfc_nodelist *ndlp)
 {
+        struct lpfc_hba *phba;
+        unsigned long flags;
+
         if (ndlp) {
                 lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_NODE,
                         "node get:        did:x%x flg:x%x refcnt:x%x",
                         ndlp->nlp_DID, ndlp->nlp_flag,
                         atomic_read(&ndlp->kref.refcount));
-                kref_get(&ndlp->kref);
+                /* The check of ndlp usage to prevent incrementing the
+                 * ndlp reference count that is in the process of being
+                 * released.
+                 */
+                phba = ndlp->vport->phba;
+                spin_lock_irqsave(&phba->ndlp_lock, flags);
+                if (!NLP_CHK_NODE_ACT(ndlp) || NLP_CHK_FREE_ACK(ndlp)) {
+                        spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+                        lpfc_printf_vlog(ndlp->vport, KERN_WARNING, LOG_NODE,
+                                "0276 lpfc_nlp_get: ndlp:x%p "
+                                "usgmap:x%x refcnt:%d\n",
+                                (void *)ndlp, ndlp->nlp_usg_map,
+                                atomic_read(&ndlp->kref.refcount));
+                        return NULL;
+                } else
+                        kref_get(&ndlp->kref);
+                spin_unlock_irqrestore(&phba->ndlp_lock, flags);
         }
         return ndlp;
 }
 
-
 /* This routine decrements the reference count for a ndlp structure. If the
- * count goes to 0, this indicates the the associated nodelist should be freed.
+ * count goes to 0, this indicates the the associated nodelist should be
+ * freed. Returning 1 indicates the ndlp resource has been released; on the
+ * other hand, returning 0 indicates the ndlp resource has not been released
+ * yet.
  */
 int
 lpfc_nlp_put(struct lpfc_nodelist *ndlp)
 {
-        if (ndlp) {
-                lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_NODE,
-                "node put:        did:x%x flg:x%x refcnt:x%x",
-                        ndlp->nlp_DID, ndlp->nlp_flag,
-                        atomic_read(&ndlp->kref.refcount));
+        struct lpfc_hba *phba;
+        unsigned long flags;
+
+        if (!ndlp)
+                return 1;
+
+        lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_NODE,
+        "node put:        did:x%x flg:x%x refcnt:x%x",
+                ndlp->nlp_DID, ndlp->nlp_flag,
+                atomic_read(&ndlp->kref.refcount));
+        phba = ndlp->vport->phba;
+        spin_lock_irqsave(&phba->ndlp_lock, flags);
+        /* Check the ndlp memory free acknowledge flag to avoid the
+         * possible race condition that kref_put got invoked again
+         * after previous one has done ndlp memory free.
+         */
+        if (NLP_CHK_FREE_ACK(ndlp)) {
+                spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+                lpfc_printf_vlog(ndlp->vport, KERN_WARNING, LOG_NODE,
+                                "0274 lpfc_nlp_put: ndlp:x%p "
+                                "usgmap:x%x refcnt:%d\n",
+                                (void *)ndlp, ndlp->nlp_usg_map,
+                                atomic_read(&ndlp->kref.refcount));
+                return 1;
         }
-        return ndlp ? kref_put(&ndlp->kref, lpfc_nlp_release) : 0;
+        /* Check the ndlp inactivate log flag to avoid the possible
+         * race condition that kref_put got invoked again after ndlp
+         * is already in inactivating state.
+         */
+        if (NLP_CHK_IACT_REQ(ndlp)) {
+                spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+                lpfc_printf_vlog(ndlp->vport, KERN_WARNING, LOG_NODE,
+                                "0275 lpfc_nlp_put: ndlp:x%p "
+                                "usgmap:x%x refcnt:%d\n",
+                                (void *)ndlp, ndlp->nlp_usg_map,
+                                atomic_read(&ndlp->kref.refcount));
+                return 1;
+        }
+        /* For last put, mark the ndlp usage flags to make sure no
+         * other kref_get and kref_put on the same ndlp shall get
+         * in between the process when the final kref_put has been
+         * invoked on this ndlp.
+         */
+        if (atomic_read(&ndlp->kref.refcount) == 1) {
+                /* Indicate ndlp is put to inactive state. */
+                NLP_SET_IACT_REQ(ndlp);
+                /* Acknowledge ndlp memory free has been seen. */
+                if (NLP_CHK_FREE_REQ(ndlp))
+                        NLP_SET_FREE_ACK(ndlp);
+        }
+        spin_unlock_irqrestore(&phba->ndlp_lock, flags);
+        /* Note, the kref_put returns 1 when decrementing a reference
+         * count that was 1, it invokes the release callback function,
+         * but it still left the reference count as 1 (not actually
+         * performs the last decrementation). Otherwise, it actually
+         * decrements the reference count and returns 0.
+         */
+        return kref_put(&ndlp->kref, lpfc_nlp_release);
 }
 
 /* This routine free's the specified nodelist if it is not in use
- * by any other discovery thread. This routine returns 1 if the ndlp
- * is not being used by anyone and has been freed. A return value of
- * 0 indicates it is being used by another discovery thread and the
- * refcount is left unchanged.
+ * by any other discovery thread. This routine returns 1 if the
+ * ndlp has been freed. A return value of 0 indicates the ndlp is
+ * not yet been released.
  */
 int
 lpfc_nlp_not_used(struct lpfc_nodelist *ndlp)
@@ -2968,11 +3181,8 @@ lpfc_nlp_not_used(struct lpfc_nodelist *ndlp)
                 "node not used:   did:x%x flg:x%x refcnt:x%x",
                 ndlp->nlp_DID, ndlp->nlp_flag,
                 atomic_read(&ndlp->kref.refcount));
-
-        if (atomic_read(&ndlp->kref.refcount) == 1) {
-                lpfc_nlp_put(ndlp);
-                return 1;
-        }
+        if (atomic_read(&ndlp->kref.refcount) == 1)
+                if (lpfc_nlp_put(ndlp))
+                        return 1;
         return 0;
 }
-
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 041f83e7634a..7773b949aa7c 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -581,6 +581,7 @@ struct ls_rjt {	/* Structure is in Big Endian format */
 #define LSEXP_INVALID_O_SID     0x15
 #define LSEXP_INVALID_OX_RX     0x17
 #define LSEXP_CMD_IN_PROGRESS   0x19
+#define LSEXP_PORT_LOGIN_REQ    0x1E
 #define LSEXP_INVALID_NPORT_ID  0x1F
 #define LSEXP_INVALID_SEQ_ID    0x21
 #define LSEXP_INVALID_XCHG      0x23
@@ -1376,11 +1377,26 @@ typedef struct {		/* FireFly BIU registers */
 #define CMD_QUE_XRI64_CX        0xB3
 #define CMD_IOCB_RCV_SEQ64_CX   0xB5
 #define CMD_IOCB_RCV_ELS64_CX   0xB7
+#define CMD_IOCB_RET_XRI64_CX   0xB9
 #define CMD_IOCB_RCV_CONT64_CX  0xBB
 
 #define CMD_GEN_REQUEST64_CR    0xC2
 #define CMD_GEN_REQUEST64_CX    0xC3
 
+/* Unhandled SLI-3 Commands */
+#define CMD_IOCB_XMIT_MSEQ64_CR         0xB0
+#define CMD_IOCB_XMIT_MSEQ64_CX         0xB1
+#define CMD_IOCB_RCV_SEQ_LIST64_CX      0xC1
+#define CMD_IOCB_RCV_ELS_LIST64_CX      0xCD
+#define CMD_IOCB_CLOSE_EXTENDED_CN      0xB6
+#define CMD_IOCB_ABORT_EXTENDED_CN      0xBA
+#define CMD_IOCB_RET_HBQE64_CN          0xCA
+#define CMD_IOCB_FCP_IBIDIR64_CR        0xAC
+#define CMD_IOCB_FCP_IBIDIR64_CX        0xAD
+#define CMD_IOCB_FCP_ITASKMGT64_CX      0xAF
+#define CMD_IOCB_LOGENTRY_CN            0x94
+#define CMD_IOCB_LOGENTRY_ASYNC_CN      0x96
+
 #define CMD_MAX_IOCB_CMD        0xE6
 #define CMD_IOCB_MASK           0xff
 
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 6cfeba7454d4..22843751c2ca 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -461,11 +461,21 @@ lpfc_config_port_post(struct lpfc_hba *phba)
 int
 lpfc_hba_down_prep(struct lpfc_hba *phba)
 {
+        struct lpfc_vport **vports;
+        int i;
         /* Disable interrupts */
         writel(0, phba->HCregaddr);
         readl(phba->HCregaddr); /* flush */
 
-        lpfc_cleanup_discovery_resources(phba->pport);
+        if (phba->pport->load_flag & FC_UNLOADING)
+                lpfc_cleanup_discovery_resources(phba->pport);
+        else {
+                vports = lpfc_create_vport_work_array(phba);
+                if (vports != NULL)
+                        for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++)
+                                lpfc_cleanup_discovery_resources(vports[i]);
+                lpfc_destroy_vport_work_array(phba, vports);
+        }
         return 0;
 }
 
@@ -1422,9 +1432,32 @@ lpfc_cleanup(struct lpfc_vport *vport)
                 lpfc_port_link_failure(vport);
 
         list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp)) {
+                        ndlp = lpfc_enable_node(vport, ndlp,
+                                                NLP_STE_UNUSED_NODE);
+                        if (!ndlp)
+                                continue;
+                        spin_lock_irq(&phba->ndlp_lock);
+                        NLP_SET_FREE_REQ(ndlp);
+                        spin_unlock_irq(&phba->ndlp_lock);
+                        /* Trigger the release of the ndlp memory */
+                        lpfc_nlp_put(ndlp);
+                        continue;
+                }
+                spin_lock_irq(&phba->ndlp_lock);
+                if (NLP_CHK_FREE_REQ(ndlp)) {
+                        /* The ndlp should not be in memory free mode already */
+                        spin_unlock_irq(&phba->ndlp_lock);
+                        continue;
+                } else
+                        /* Indicate request for freeing ndlp memory */
+                        NLP_SET_FREE_REQ(ndlp);
+                spin_unlock_irq(&phba->ndlp_lock);
+
                 if (ndlp->nlp_type & NLP_FABRIC)
                         lpfc_disc_state_machine(vport, ndlp, NULL,
                                         NLP_EVT_DEVICE_RECOVERY);
+
                 lpfc_disc_state_machine(vport, ndlp, NULL,
                                              NLP_EVT_DEVICE_RM);
         }
@@ -1438,6 +1471,17 @@ lpfc_cleanup(struct lpfc_vport *vport)
                 if (i++ > 3000) {
                         lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
                                 "0233 Nodelist not empty\n");
+                        list_for_each_entry_safe(ndlp, next_ndlp,
+                                                &vport->fc_nodes, nlp_listp) {
+                                lpfc_printf_vlog(ndlp->vport, KERN_ERR,
+                                                LOG_NODE,
+                                                "0282: did:x%x ndlp:x%p "
+                                                "usgmap:x%x refcnt:%d\n",
+                                                ndlp->nlp_DID, (void *)ndlp,
+                                                ndlp->nlp_usg_map,
+                                                atomic_read(
+                                                        &ndlp->kref.refcount));
+                        }
                         break;
                 }
 
@@ -1586,6 +1630,8 @@ lpfc_offline_prep(struct lpfc_hba * phba)
                         list_for_each_entry_safe(ndlp, next_ndlp,
                                                  &vports[i]->fc_nodes,
                                                  nlp_listp) {
+                                if (!NLP_CHK_NODE_ACT(ndlp))
+                                        continue;
                                 if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
                                         continue;
                                 if (ndlp->nlp_type & NLP_FABRIC) {
@@ -1695,9 +1741,9 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
 
         vport = (struct lpfc_vport *) shost->hostdata;
         vport->phba = phba;
-
         vport->load_flag |= FC_LOADING;
         vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+        vport->fc_rscn_flush = 0;
 
         lpfc_get_vport_cfgparam(vport);
         shost->unique_id = instance;
@@ -1879,6 +1925,42 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost)
         spin_unlock_irq(shost->host_lock);
 }
 
+static int
+lpfc_enable_msix(struct lpfc_hba *phba)
+{
+        int error;
+
+        phba->msix_entries[0].entry = 0;
+        phba->msix_entries[0].vector = 0;
+
+        error = pci_enable_msix(phba->pcidev, phba->msix_entries,
+                                ARRAY_SIZE(phba->msix_entries));
+        if (error) {
+                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                "0420 Enable MSI-X failed (%d), continuing "
+                                "with MSI\n", error);
+                pci_disable_msix(phba->pcidev);
+                return error;
+        }
+
+        error = request_irq(phba->msix_entries[0].vector, lpfc_intr_handler, 0,
+                            LPFC_DRIVER_NAME, phba);
+        if (error) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "0421 MSI-X request_irq failed (%d), "
+                                "continuing with MSI\n", error);
+                pci_disable_msix(phba->pcidev);
+        }
+        return error;
+}
+
+static void
+lpfc_disable_msix(struct lpfc_hba *phba)
+{
+        free_irq(phba->msix_entries[0].vector, phba);
+        pci_disable_msix(phba->pcidev);
+}
+
 static int __devinit
 lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 {
@@ -1905,6 +1987,9 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 
         spin_lock_init(&phba->hbalock);
 
+        /* Initialize ndlp management spinlock */
+        spin_lock_init(&phba->ndlp_lock);
+
         phba->pcidev = pdev;
 
         /* Assign an unused board number */
@@ -2002,6 +2087,8 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 
         memset(phba->hbqslimp.virt, 0, lpfc_sli_hbq_size());
 
+        INIT_LIST_HEAD(&phba->hbqbuf_in_list);
+
         /* Initialize the SLI Layer to run with lpfc HBAs. */
         lpfc_sli_setup(phba);
         lpfc_sli_queue_setup(phba);
@@ -2077,24 +2164,36 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         lpfc_debugfs_initialize(vport);
 
         pci_set_drvdata(pdev, shost);
+        phba->intr_type = NONE;
 
-        if (phba->cfg_use_msi) {
+        if (phba->cfg_use_msi == 2) {
+                error = lpfc_enable_msix(phba);
+                if (!error)
+                        phba->intr_type = MSIX;
+        }
+
+        /* Fallback to MSI if MSI-X initialization failed */
+        if (phba->cfg_use_msi >= 1 && phba->intr_type == NONE) {
                 retval = pci_enable_msi(phba->pcidev);
                 if (!retval)
-                        phba->using_msi = 1;
+                        phba->intr_type = MSI;
                 else
                         lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                         "0452 Enable MSI failed, continuing "
                                         "with IRQ\n");
         }
 
-        retval = request_irq(phba->pcidev->irq, lpfc_intr_handler, IRQF_SHARED,
-                            LPFC_DRIVER_NAME, phba);
-        if (retval) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                        "0451 Enable interrupt handler failed\n");
-                error = retval;
-                goto out_disable_msi;
+        /* MSI-X is the only case the doesn't need to call request_irq */
+        if (phba->intr_type != MSIX) {
+                retval = request_irq(phba->pcidev->irq, lpfc_intr_handler,
+                                     IRQF_SHARED, LPFC_DRIVER_NAME, phba);
+                if (retval) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_INIT, "0451 Enable "
+                                        "interrupt handler failed\n");
+                        error = retval;
+                        goto out_disable_msi;
+                } else if (phba->intr_type != MSI)
+                        phba->intr_type = INTx;
         }
 
         phba->MBslimaddr = phba->slim_memmap_p;
@@ -2139,9 +2238,14 @@ out_remove_device:
 out_free_irq:
         lpfc_stop_phba_timers(phba);
         phba->pport->work_port_events = 0;
-        free_irq(phba->pcidev->irq, phba);
+
+        if (phba->intr_type == MSIX)
+                lpfc_disable_msix(phba);
+        else
+                free_irq(phba->pcidev->irq, phba);
+
 out_disable_msi:
-        if (phba->using_msi)
+        if (phba->intr_type == MSI)
                 pci_disable_msi(phba->pcidev);
         destroy_port(vport);
 out_kthread_stop:
@@ -2214,10 +2318,13 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
 
         lpfc_debugfs_terminate(vport);
 
-        /* Release the irq reservation */
-        free_irq(phba->pcidev->irq, phba);
-        if (phba->using_msi)
-                pci_disable_msi(phba->pcidev);
+        if (phba->intr_type == MSIX)
+                lpfc_disable_msix(phba);
+        else {
+                free_irq(phba->pcidev->irq, phba);
+                if (phba->intr_type == MSI)
+                        pci_disable_msi(phba->pcidev);
+        }
 
         pci_set_drvdata(pdev, NULL);
         scsi_host_put(shost);
@@ -2276,10 +2383,13 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
         pring = &psli->ring[psli->fcp_ring];
         lpfc_sli_abort_iocb_ring(phba, pring);
 
-        /* Release the irq reservation */
-        free_irq(phba->pcidev->irq, phba);
-        if (phba->using_msi)
-                pci_disable_msi(phba->pcidev);
+        if (phba->intr_type == MSIX)
+                lpfc_disable_msix(phba);
+        else {
+                free_irq(phba->pcidev->irq, phba);
+                if (phba->intr_type == MSI)
+                        pci_disable_msi(phba->pcidev);
+        }
 
         /* Request a slot reset. */
         return PCI_ERS_RESULT_NEED_RESET;
diff --git a/drivers/scsi/lpfc/lpfc_logmsg.h b/drivers/scsi/lpfc/lpfc_logmsg.h
index c5841d7565f7..39fd2b843bec 100644
--- a/drivers/scsi/lpfc/lpfc_logmsg.h
+++ b/drivers/scsi/lpfc/lpfc_logmsg.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2005 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -35,11 +35,15 @@
 #define LOG_ALL_MSG                   0xffff    /* LOG all messages */
 
 #define lpfc_printf_vlog(vport, level, mask, fmt, arg...) \
+        do { \
         { if (((mask) &(vport)->cfg_log_verbose) || (level[1] <= '3')) \
                 dev_printk(level, &((vport)->phba->pcidev)->dev, "%d:(%d):" \
-                           fmt, (vport)->phba->brd_no, vport->vpi, ##arg); }
+                           fmt, (vport)->phba->brd_no, vport->vpi, ##arg); } \
+        } while (0)
 
 #define lpfc_printf_log(phba, level, mask, fmt, arg...) \
+        do { \
         { if (((mask) &(phba)->pport->cfg_log_verbose) || (level[1] <= '3')) \
                 dev_printk(level, &((phba)->pcidev)->dev, "%d:" \
-                           fmt, phba->brd_no, ##arg); }
+                           fmt, phba->brd_no, ##arg); } \
+        } while (0)
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index 6dc5ab8d6716..3c0cebc71800 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -264,19 +264,30 @@ void
 lpfc_in_buf_free(struct lpfc_hba *phba, struct lpfc_dmabuf *mp)
 {
         struct hbq_dmabuf *hbq_entry;
+        unsigned long flags;
+
+        if (!mp)
+                return;
 
         if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
+                /* Check whether HBQ is still in use */
+                spin_lock_irqsave(&phba->hbalock, flags);
+                if (!phba->hbq_in_use) {
+                        spin_unlock_irqrestore(&phba->hbalock, flags);
+                        return;
+                }
                 hbq_entry = container_of(mp, struct hbq_dmabuf, dbuf);
+                list_del(&hbq_entry->dbuf.list);
                 if (hbq_entry->tag == -1) {
                         (phba->hbqs[LPFC_ELS_HBQ].hbq_free_buffer)
                                 (phba, hbq_entry);
                 } else {
                         lpfc_sli_free_hbq(phba, hbq_entry);
                 }
+                spin_unlock_irqrestore(&phba->hbalock, flags);
         } else {
                 lpfc_mbuf_free(phba, mp->virt, mp->phys);
                 kfree(mp);
         }
         return;
 }
-
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 4a0e3406e37a..d513813f6697 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1,7 +1,7 @@
  /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -249,6 +249,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);
         struct lpfc_hba    *phba = vport->phba;
         struct lpfc_dmabuf *pcmd;
+        struct lpfc_work_evt *evtp;
         uint32_t *lp;
         IOCB_t *icmd;
         struct serv_parm *sp;
@@ -435,8 +436,14 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 del_timer_sync(&ndlp->nlp_delayfunc);
                 ndlp->nlp_last_elscmd = 0;
 
-                if (!list_empty(&ndlp->els_retry_evt.evt_listp))
+                if (!list_empty(&ndlp->els_retry_evt.evt_listp)) {
                         list_del_init(&ndlp->els_retry_evt.evt_listp);
+                        /* Decrement ndlp reference count held for the
+                         * delayed retry
+                         */
+                        evtp = &ndlp->els_retry_evt;
+                        lpfc_nlp_put((struct lpfc_nodelist *)evtp->evt_arg1);
+                }
 
                 if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
                         spin_lock_irq(shost->host_lock);
@@ -638,13 +645,15 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                 return 0;
         }
 
-        /* Check config parameter use-adisc or FCP-2 */
-        if ((vport->cfg_use_adisc && (vport->fc_flag & FC_RSCN_MODE)) ||
-            ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) {
-                spin_lock_irq(shost->host_lock);
-                ndlp->nlp_flag |= NLP_NPR_ADISC;
-                spin_unlock_irq(shost->host_lock);
-                return 1;
+        if (!(vport->fc_flag & FC_PT2PT)) {
+                /* Check config parameter use-adisc or FCP-2 */
+                if ((vport->cfg_use_adisc && (vport->fc_flag & FC_RSCN_MODE)) ||
+                    ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) {
+                        spin_lock_irq(shost->host_lock);
+                        ndlp->nlp_flag |= NLP_NPR_ADISC;
+                        spin_unlock_irq(shost->host_lock);
+                        return 1;
+                }
         }
         ndlp->nlp_flag &= ~NLP_NPR_ADISC;
         lpfc_unreg_rpi(vport, ndlp);
@@ -656,7 +665,7 @@ lpfc_disc_illegal(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                   void *arg, uint32_t evt)
 {
         lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
-                         "0253 Illegal State Transition: node x%x "
+                         "0271 Illegal State Transition: node x%x "
                          "event x%x, state x%x Data: x%x x%x\n",
                          ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi,
                          ndlp->nlp_flag);
@@ -674,7 +683,7 @@ lpfc_cmpl_plogi_illegal(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
          */
         if (!(ndlp->nlp_flag & NLP_RCV_PLOGI)) {
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
-                         "0253 Illegal State Transition: node x%x "
+                         "0272 Illegal State Transition: node x%x "
                          "event x%x, state x%x Data: x%x x%x\n",
                          ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi,
                          ndlp->nlp_flag);
@@ -2144,8 +2153,11 @@ lpfc_disc_state_machine(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         uint32_t cur_state, rc;
         uint32_t(*func) (struct lpfc_vport *, struct lpfc_nodelist *, void *,
                          uint32_t);
+        uint32_t got_ndlp = 0;
+
+        if (lpfc_nlp_get(ndlp))
+                got_ndlp = 1;
 
-        lpfc_nlp_get(ndlp);
         cur_state = ndlp->nlp_state;
 
         /* DSM in event <evt> on NPort <nlp_DID> in state <cur_state> */
@@ -2162,15 +2174,24 @@ lpfc_disc_state_machine(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         rc = (func) (vport, ndlp, arg, evt);
 
         /* DSM out state <rc> on NPort <nlp_DID> */
-        lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+        if (got_ndlp) {
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                          "0212 DSM out state %d on NPort x%x Data: x%x\n",
                          rc, ndlp->nlp_DID, ndlp->nlp_flag);
 
-        lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,
-                 "DSM out:         ste:%d did:x%x flg:x%x",
-                rc, ndlp->nlp_DID, ndlp->nlp_flag);
+                lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,
+                        "DSM out:         ste:%d did:x%x flg:x%x",
+                        rc, ndlp->nlp_DID, ndlp->nlp_flag);
+                /* Decrement the ndlp reference count held for this function */
+                lpfc_nlp_put(ndlp);
+        } else {
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                        "0212 DSM out state %d on NPort free\n", rc);
 
-        lpfc_nlp_put(ndlp);
+                lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,
+                        "DSM out:         ste:%d did:x%x flg:x%x",
+                        rc, 0, 0);
+        }
 
         return rc;
 }
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index fc5c3a42b05a..70255c11d3ad 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -1283,6 +1283,8 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)
                 match = 0;
                 spin_lock_irq(shost->host_lock);
                 list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
+                        if (!NLP_CHK_NODE_ACT(ndlp))
+                                continue;
                         if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&
                             i == ndlp->nlp_sid &&
                             ndlp->rport) {
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index fdd01e384e36..fc0d9501aba6 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -203,8 +203,25 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)
         case CMD_IOCB_RCV_SEQ64_CX:
         case CMD_IOCB_RCV_ELS64_CX:
         case CMD_IOCB_RCV_CONT64_CX:
+        case CMD_IOCB_RET_XRI64_CX:
                 type = LPFC_UNSOL_IOCB;
                 break;
+        case CMD_IOCB_XMIT_MSEQ64_CR:
+        case CMD_IOCB_XMIT_MSEQ64_CX:
+        case CMD_IOCB_RCV_SEQ_LIST64_CX:
+        case CMD_IOCB_RCV_ELS_LIST64_CX:
+        case CMD_IOCB_CLOSE_EXTENDED_CN:
+        case CMD_IOCB_ABORT_EXTENDED_CN:
+        case CMD_IOCB_RET_HBQE64_CN:
+        case CMD_IOCB_FCP_IBIDIR64_CR:
+        case CMD_IOCB_FCP_IBIDIR64_CX:
+        case CMD_IOCB_FCP_ITASKMGT64_CX:
+        case CMD_IOCB_LOGENTRY_CN:
+        case CMD_IOCB_LOGENTRY_ASYNC_CN:
+                printk("%s - Unhandled SLI-3 Command x%x\n",
+                                __FUNCTION__, iocb_cmnd);
+                type = LPFC_UNKNOWN_IOCB;
+                break;
         default:
                 type = LPFC_UNKNOWN_IOCB;
                 break;
@@ -529,10 +546,13 @@ lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba)
 {
         struct lpfc_dmabuf *dmabuf, *next_dmabuf;
         struct hbq_dmabuf *hbq_buf;
+        unsigned long flags;
         int i, hbq_count;
+        uint32_t hbqno;
 
         hbq_count = lpfc_sli_hbq_count();
         /* Return all memory used by all HBQs */
+        spin_lock_irqsave(&phba->hbalock, flags);
         for (i = 0; i < hbq_count; ++i) {
                 list_for_each_entry_safe(dmabuf, next_dmabuf,
                                 &phba->hbqs[i].hbq_buffer_list, list) {
@@ -542,6 +562,28 @@ lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba)
                 }
                 phba->hbqs[i].buffer_count = 0;
         }
+        /* Return all HBQ buffer that are in-fly */
+        list_for_each_entry_safe(dmabuf, next_dmabuf,
+                        &phba->hbqbuf_in_list, list) {
+                hbq_buf = container_of(dmabuf, struct hbq_dmabuf, dbuf);
+                list_del(&hbq_buf->dbuf.list);
+                if (hbq_buf->tag == -1) {
+                        (phba->hbqs[LPFC_ELS_HBQ].hbq_free_buffer)
+                                (phba, hbq_buf);
+                } else {
+                        hbqno = hbq_buf->tag >> 16;
+                        if (hbqno >= LPFC_MAX_HBQS)
+                                (phba->hbqs[LPFC_ELS_HBQ].hbq_free_buffer)
+                                        (phba, hbq_buf);
+                        else
+                                (phba->hbqs[hbqno].hbq_free_buffer)(phba,
+                                        hbq_buf);
+                }
+        }
+
+        /* Mark the HBQs not in use */
+        phba->hbq_in_use = 0;
+        spin_unlock_irqrestore(&phba->hbalock, flags);
 }
 
 static struct lpfc_hbq_entry *
@@ -603,30 +645,40 @@ static int
 lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
 {
         uint32_t i, start, end;
+        unsigned long flags;
         struct hbq_dmabuf *hbq_buffer;
 
-        if (!phba->hbqs[hbqno].hbq_alloc_buffer) {
+        if (!phba->hbqs[hbqno].hbq_alloc_buffer)
                 return 0;
-        }
 
         start = phba->hbqs[hbqno].buffer_count;
         end = count + start;
-        if (end > lpfc_hbq_defs[hbqno]->entry_count) {
+        if (end > lpfc_hbq_defs[hbqno]->entry_count)
                 end = lpfc_hbq_defs[hbqno]->entry_count;
-        }
+
+        /* Check whether HBQ is still in use */
+        spin_lock_irqsave(&phba->hbalock, flags);
+        if (!phba->hbq_in_use)
+                goto out;
 
         /* Populate HBQ entries */
         for (i = start; i < end; i++) {
                 hbq_buffer = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
                 if (!hbq_buffer)
-                        return 1;
+                        goto err;
                 hbq_buffer->tag = (i | (hbqno << 16));
                 if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer))
                         phba->hbqs[hbqno].buffer_count++;
                 else
                         (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
         }
+
+ out:
+        spin_unlock_irqrestore(&phba->hbalock, flags);
         return 0;
+ err:
+        spin_unlock_irqrestore(&phba->hbalock, flags);
+        return 1;
 }
 
 int
@@ -910,16 +962,29 @@ lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
         uint32_t hbqno;
         void *virt;             /* virtual address ptr */
         dma_addr_t phys;        /* mapped address */
+        unsigned long flags;
+
+        /* Check whether HBQ is still in use */
+        spin_lock_irqsave(&phba->hbalock, flags);
+        if (!phba->hbq_in_use) {
+                spin_unlock_irqrestore(&phba->hbalock, flags);
+                return NULL;
+        }
 
         hbq_entry = lpfc_sli_hbqbuf_find(phba, tag);
-        if (hbq_entry == NULL)
+        if (hbq_entry == NULL) {
+                spin_unlock_irqrestore(&phba->hbalock, flags);
                 return NULL;
+        }
         list_del(&hbq_entry->dbuf.list);
 
         hbqno = tag >> 16;
         new_hbq_entry = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
-        if (new_hbq_entry == NULL)
+        if (new_hbq_entry == NULL) {
+                list_add_tail(&hbq_entry->dbuf.list, &phba->hbqbuf_in_list);
+                spin_unlock_irqrestore(&phba->hbalock, flags);
                 return &hbq_entry->dbuf;
+        }
         new_hbq_entry->tag = -1;
         phys = new_hbq_entry->dbuf.phys;
         virt = new_hbq_entry->dbuf.virt;
@@ -928,6 +993,9 @@ lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
         hbq_entry->dbuf.phys = phys;
         hbq_entry->dbuf.virt = virt;
         lpfc_sli_free_hbq(phba, hbq_entry);
+        list_add_tail(&new_hbq_entry->dbuf.list, &phba->hbqbuf_in_list);
+        spin_unlock_irqrestore(&phba->hbalock, flags);
+
         return &new_hbq_entry->dbuf;
 }
 
@@ -951,6 +1019,7 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         uint32_t           Rctl, Type;
         uint32_t           match, i;
         struct lpfc_iocbq *iocbq;
+        struct lpfc_dmabuf *dmzbuf;
 
         match = 0;
         irsp = &(saveq->iocb);
@@ -972,6 +1041,29 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 return 1;
         }
 
+        if ((irsp->ulpCommand == CMD_IOCB_RET_XRI64_CX) &&
+                (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED)) {
+                if (irsp->ulpBdeCount > 0) {
+                        dmzbuf = lpfc_sli_get_buff(phba, pring,
+                                        irsp->un.ulpWord[3]);
+                        lpfc_in_buf_free(phba, dmzbuf);
+                }
+
+                if (irsp->ulpBdeCount > 1) {
+                        dmzbuf = lpfc_sli_get_buff(phba, pring,
+                                        irsp->unsli3.sli3Words[3]);
+                        lpfc_in_buf_free(phba, dmzbuf);
+                }
+
+                if (irsp->ulpBdeCount > 2) {
+                        dmzbuf = lpfc_sli_get_buff(phba, pring,
+                                irsp->unsli3.sli3Words[7]);
+                        lpfc_in_buf_free(phba, dmzbuf);
+                }
+
+                return 1;
+        }
+
         if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
                 if (irsp->ulpBdeCount != 0) {
                         saveq->context2 = lpfc_sli_get_buff(phba, pring,
@@ -2293,6 +2385,7 @@ lpfc_sli_hbq_setup(struct lpfc_hba *phba)
 
         /* Initialize the struct lpfc_sli_hbq structure for each hbq */
         phba->link_state = LPFC_INIT_MBX_CMDS;
+        phba->hbq_in_use = 1;
 
         hbq_entry_index = 0;
         for (hbqno = 0; hbqno < hbq_count; ++hbqno) {
@@ -2404,9 +2497,7 @@ lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)
         if ((pmb->mb.un.varCfgPort.sli_mode == 3) &&
                 (!pmb->mb.un.varCfgPort.cMA)) {
                 rc = -ENXIO;
-                goto do_prep_failed;
         }
-        return rc;
 
 do_prep_failed:
         mempool_free(pmb, phba->mbox_mem_pool);
@@ -2625,14 +2716,14 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                 spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
 
                 /* Mbox command <mbxCommand> cannot issue */
-                LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag)
+                LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
                 return MBX_NOT_FINISHED;
         }
 
         if (mb->mbxCommand != MBX_KILL_BOARD && flag & MBX_NOWAIT &&
             !(readl(phba->HCregaddr) & HC_MBINT_ENA)) {
                 spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
-                LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag)
+                LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
                 return MBX_NOT_FINISHED;
         }
 
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index 4b633d39a82a..ca540d1d041e 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -18,7 +18,7 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "8.2.4"
+#define LPFC_DRIVER_VERSION "8.2.5"
 
 #define LPFC_DRIVER_NAME "lpfc"
 
diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index 9fad7663c117..86d05beb00b8 100644
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -327,7 +327,8 @@ lpfc_vport_create(struct fc_vport *fc_vport, bool disable)
          * up and ready to FDISC.
          */
         ndlp = lpfc_findnode_did(phba->pport, Fabric_DID);
-        if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp) &&
+            ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
                 if (phba->link_flag & LS_NPIV_FAB_SUPPORTED) {
                         lpfc_set_disctmo(vport);
                         lpfc_initial_fdisc(vport);
@@ -358,7 +359,8 @@ disable_vport(struct fc_vport *fc_vport)
         long timeout;
 
         ndlp = lpfc_findnode_did(vport, Fabric_DID);
-        if (ndlp && phba->link_state >= LPFC_LINK_UP) {
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp)
+            && phba->link_state >= LPFC_LINK_UP) {
                 vport->unreg_vpi_cmpl = VPORT_INVAL;
                 timeout = msecs_to_jiffies(phba->fc_ratov * 2000);
                 if (!lpfc_issue_els_npiv_logo(vport, ndlp))
@@ -372,6 +374,8 @@ disable_vport(struct fc_vport *fc_vport)
          * calling lpfc_cleanup_rpis(vport, 1)
          */
         list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+                if (!NLP_CHK_NODE_ACT(ndlp))
+                        continue;
                 if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
                         continue;
                 lpfc_disc_state_machine(vport, ndlp, NULL,
@@ -414,7 +418,8 @@ enable_vport(struct fc_vport *fc_vport)
          * up and ready to FDISC.
          */
         ndlp = lpfc_findnode_did(phba->pport, Fabric_DID);
-        if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp)
+            && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
                 if (phba->link_flag & LS_NPIV_FAB_SUPPORTED) {
                         lpfc_set_disctmo(vport);
                         lpfc_initial_fdisc(vport);
@@ -498,7 +503,41 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
         scsi_remove_host(lpfc_shost_from_vport(vport));
 
         ndlp = lpfc_findnode_did(phba->pport, Fabric_DID);
-        if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE &&
+
+        /* In case of driver unload, we shall not perform fabric logo as the
+         * worker thread already stopped at this stage and, in this case, we
+         * can safely skip the fabric logo.
+         */
+        if (phba->pport->load_flag & FC_UNLOADING) {
+                if (ndlp && NLP_CHK_NODE_ACT(ndlp) &&
+                    ndlp->nlp_state == NLP_STE_UNMAPPED_NODE &&
+                    phba->link_state >= LPFC_LINK_UP) {
+                        /* First look for the Fabric ndlp */
+                        ndlp = lpfc_findnode_did(vport, Fabric_DID);
+                        if (!ndlp)
+                                goto skip_logo;
+                        else if (!NLP_CHK_NODE_ACT(ndlp)) {
+                                ndlp = lpfc_enable_node(vport, ndlp,
+                                                        NLP_STE_UNUSED_NODE);
+                                if (!ndlp)
+                                        goto skip_logo;
+                        }
+                        /* Remove ndlp from vport npld list */
+                        lpfc_dequeue_node(vport, ndlp);
+
+                        /* Indicate free memory when release */
+                        spin_lock_irq(&phba->ndlp_lock);
+                        NLP_SET_FREE_REQ(ndlp);
+                        spin_unlock_irq(&phba->ndlp_lock);
+                        /* Kick off release ndlp when it can be safely done */
+                        lpfc_nlp_put(ndlp);
+                }
+                goto skip_logo;
+        }
+
+        /* Otherwise, we will perform fabric logo as needed */
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp) &&
+            ndlp->nlp_state == NLP_STE_UNMAPPED_NODE &&
             phba->link_state >= LPFC_LINK_UP) {
                 if (vport->cfg_enable_da_id) {
                         timeout = msecs_to_jiffies(phba->fc_ratov * 2000);
@@ -519,8 +558,27 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
                         if (!ndlp)
                                 goto skip_logo;
                         lpfc_nlp_init(vport, ndlp, Fabric_DID);
+                        /* Indicate free memory when release */
+                        NLP_SET_FREE_REQ(ndlp);
                 } else {
+                        if (!NLP_CHK_NODE_ACT(ndlp))
+                                ndlp = lpfc_enable_node(vport, ndlp,
+                                                NLP_STE_UNUSED_NODE);
+                                if (!ndlp)
+                                        goto skip_logo;
+
+                        /* Remove ndlp from vport npld list */
                         lpfc_dequeue_node(vport, ndlp);
+                        spin_lock_irq(&phba->ndlp_lock);
+                        if (!NLP_CHK_FREE_REQ(ndlp))
+                                /* Indicate free memory when release */
+                                NLP_SET_FREE_REQ(ndlp);
+                        else {
+                                /* Skip this if ndlp is already in free mode */
+                                spin_unlock_irq(&phba->ndlp_lock);
+                                goto skip_logo;
+                        }
+                        spin_unlock_irq(&phba->ndlp_lock);
                 }
                 vport->unreg_vpi_cmpl = VPORT_INVAL;
                 timeout = msecs_to_jiffies(phba->fc_ratov * 2000);
@@ -534,9 +592,9 @@ skip_logo:
         lpfc_sli_host_down(vport);
 
         lpfc_stop_vport_timers(vport);
-        lpfc_unreg_all_rpis(vport);
 
         if (!(phba->pport->load_flag & FC_UNLOADING)) {
+                lpfc_unreg_all_rpis(vport);
                 lpfc_unreg_default_rpis(vport);
                 /*
                  * Completion of unreg_vpi (lpfc_mbx_cmpl_unreg_vpi)
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 4d59ae8491a4..b135a1ed4b2c 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -151,19 +151,19 @@ mega_setup_mailbox(adapter_t *adapter)
          */
         if( adapter->flag & BOARD_IOMAP ) {
 
-                outb_p(adapter->mbox_dma & 0xFF,
+                outb(adapter->mbox_dma & 0xFF,
                                 adapter->host->io_port + MBOX_PORT0);
 
-                outb_p((adapter->mbox_dma >> 8) & 0xFF,
+                outb((adapter->mbox_dma >> 8) & 0xFF,
                                 adapter->host->io_port + MBOX_PORT1);
 
-                outb_p((adapter->mbox_dma >> 16) & 0xFF,
+                outb((adapter->mbox_dma >> 16) & 0xFF,
                                 adapter->host->io_port + MBOX_PORT2);
 
-                outb_p((adapter->mbox_dma >> 24) & 0xFF,
+                outb((adapter->mbox_dma >> 24) & 0xFF,
                                 adapter->host->io_port + MBOX_PORT3);
 
-                outb_p(ENABLE_MBOX_BYTE,
+                outb(ENABLE_MBOX_BYTE,
                                 adapter->host->io_port + ENABLE_MBOX_REGION);
 
                 irq_ack(adapter);
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index b6587a6d8486..0ad215e27b83 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -59,7 +59,6 @@ EXPORT_SYMBOL(mraid_mm_register_adp);
 EXPORT_SYMBOL(mraid_mm_unregister_adp);
 EXPORT_SYMBOL(mraid_mm_adapter_app_handle);
 
-static int majorno;
 static uint32_t drvr_ver        = 0x02200207;
 
 static int adapters_count_g;
@@ -76,6 +75,12 @@ static const struct file_operations lsi_fops = {
         .owner  = THIS_MODULE,
 };
 
+static struct miscdevice megaraid_mm_dev = {
+        .minor  = MISC_DYNAMIC_MINOR,
+        .name   = "megadev0",
+        .fops   = &lsi_fops,
+};
+
 /**
  * mraid_mm_open - open routine for char node interface
  * @inode       : unused
@@ -1184,15 +1189,16 @@ mraid_mm_teardown_dma_pools(mraid_mmadp_t *adp)
 static int __init
 mraid_mm_init(void)
 {
+        int err;
+
         // Announce the driver version
         con_log(CL_ANN, (KERN_INFO "megaraid cmm: %s %s\n",
                 LSI_COMMON_MOD_VERSION, LSI_COMMON_MOD_EXT_VERSION));
 
-        majorno = register_chrdev(0, "megadev", &lsi_fops);
-
-        if (majorno < 0) {
-                con_log(CL_ANN, ("megaraid cmm: cannot get major\n"));
-                return majorno;
+        err = misc_register(&megaraid_mm_dev);
+        if (err < 0) {
+                con_log(CL_ANN, ("megaraid cmm: cannot register misc device\n"));
+                return err;
         }
 
         init_waitqueue_head(&wait_q);
@@ -1230,7 +1236,7 @@ mraid_mm_exit(void)
 {
         con_log(CL_DLEVEL1 , ("exiting common mod\n"));
 
-        unregister_chrdev(majorno, "megadev");
+        misc_deregister(&megaraid_mm_dev);
 }
 
 module_init(mraid_mm_init);
diff --git a/drivers/scsi/megaraid/megaraid_mm.h b/drivers/scsi/megaraid/megaraid_mm.h
index c8762b2b8ed1..55b425c0a654 100644
--- a/drivers/scsi/megaraid/megaraid_mm.h
+++ b/drivers/scsi/megaraid/megaraid_mm.h
@@ -22,6 +22,7 @@
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
 #include <linux/list.h>
+#include <linux/miscdevice.h>
 
 #include "mbox_defs.h"
 #include "megaraid_ioctl.h"
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 651d09b08f2a..fd63b06d9ef1 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1759,6 +1759,7 @@ static int mesh_suspend(struct macio_dev *mdev, pm_message_t mesg)
 
         switch (mesg.event) {
         case PM_EVENT_SUSPEND:
+        case PM_EVENT_HIBERNATE:
         case PM_EVENT_FREEZE:
                 break;
         default:
diff --git a/drivers/scsi/mvsas.c b/drivers/scsi/mvsas.c
new file mode 100644
index 000000000000..d4a6ac3c9c47
--- /dev/null
+++ b/drivers/scsi/mvsas.c
@@ -0,0 +1,2970 @@
+/*
+        mvsas.c - Marvell 88SE6440 SAS/SATA support
+
+        Copyright 2007 Red Hat, Inc.
+        Copyright 2008 Marvell. <kewei@marvell.com>
+
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU General Public License as
+        published by the Free Software Foundation; either version 2,
+        or (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty
+        of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+        See the GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public
+        License along with this program; see the file COPYING.  If not,
+        write to the Free Software Foundation, 675 Mass Ave, Cambridge,
+        MA 02139, USA.
+
+        ---------------------------------------------------------------
+
+        Random notes:
+        * hardware supports controlling the endian-ness of data
+          structures.  this permits elimination of all the le32_to_cpu()
+          and cpu_to_le32() conversions.
+
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/ctype.h>
+#include <scsi/libsas.h>
+#include <asm/io.h>
+
+#define DRV_NAME        "mvsas"
+#define DRV_VERSION     "0.5"
+#define _MV_DUMP 0
+#define MVS_DISABLE_NVRAM
+#define MVS_DISABLE_MSI
+
+#define mr32(reg)       readl(regs + MVS_##reg)
+#define mw32(reg,val)   writel((val), regs + MVS_##reg)
+#define mw32_f(reg,val) do {                    \
+        writel((val), regs + MVS_##reg);        \
+        readl(regs + MVS_##reg);                \
+        } while (0)
+
+#define MVS_ID_NOT_MAPPED       0xff
+#define MVS_CHIP_SLOT_SZ        (1U << mvi->chip->slot_width)
+
+/* offset for D2H FIS in the Received FIS List Structure */
+#define SATA_RECEIVED_D2H_FIS(reg_set)  \
+        ((void *) mvi->rx_fis + 0x400 + 0x100 * reg_set + 0x40)
+#define SATA_RECEIVED_PIO_FIS(reg_set)  \
+        ((void *) mvi->rx_fis + 0x400 + 0x100 * reg_set + 0x20)
+#define UNASSOC_D2H_FIS(id)             \
+        ((void *) mvi->rx_fis + 0x100 * id)
+
+#define for_each_phy(__lseq_mask, __mc, __lseq, __rest)                 \
+        for ((__mc) = (__lseq_mask), (__lseq) = 0;                      \
+                                        (__mc) != 0 && __rest;          \
+                                        (++__lseq), (__mc) >>= 1)
+
+/* driver compile-time configuration */
+enum driver_configuration {
+        MVS_TX_RING_SZ          = 1024, /* TX ring size (12-bit) */
+        MVS_RX_RING_SZ          = 1024, /* RX ring size (12-bit) */
+                                        /* software requires power-of-2
+                                           ring size */
+
+        MVS_SLOTS               = 512,  /* command slots */
+        MVS_SLOT_BUF_SZ         = 8192, /* cmd tbl + IU + status + PRD */
+        MVS_SSP_CMD_SZ          = 64,   /* SSP command table buffer size */
+        MVS_ATA_CMD_SZ          = 96,   /* SATA command table buffer size */
+        MVS_OAF_SZ              = 64,   /* Open address frame buffer size */
+
+        MVS_RX_FIS_COUNT        = 17,   /* Optional rx'd FISs (max 17) */
+
+        MVS_QUEUE_SIZE          = 30,   /* Support Queue depth */
+};
+
+/* unchangeable hardware details */
+enum hardware_details {
+        MVS_MAX_PHYS            = 8,    /* max. possible phys */
+        MVS_MAX_PORTS           = 8,    /* max. possible ports */
+        MVS_RX_FISL_SZ          = 0x400 + (MVS_RX_FIS_COUNT * 0x100),
+};
+
+/* peripheral registers (BAR2) */
+enum peripheral_registers {
+        SPI_CTL                 = 0x10, /* EEPROM control */
+        SPI_CMD                 = 0x14, /* EEPROM command */
+        SPI_DATA                = 0x18, /* EEPROM data */
+};
+
+enum peripheral_register_bits {
+        TWSI_RDY                = (1U << 7),    /* EEPROM interface ready */
+        TWSI_RD                 = (1U << 4),    /* EEPROM read access */
+
+        SPI_ADDR_MASK           = 0x3ffff,      /* bits 17:0 */
+};
+
+/* enhanced mode registers (BAR4) */
+enum hw_registers {
+        MVS_GBL_CTL             = 0x04,  /* global control */
+        MVS_GBL_INT_STAT        = 0x08,  /* global irq status */
+        MVS_GBL_PI              = 0x0C,  /* ports implemented bitmask */
+        MVS_GBL_PORT_TYPE       = 0xa0,  /* port type */
+
+        MVS_CTL                 = 0x100, /* SAS/SATA port configuration */
+        MVS_PCS                 = 0x104, /* SAS/SATA port control/status */
+        MVS_CMD_LIST_LO         = 0x108, /* cmd list addr */
+        MVS_CMD_LIST_HI         = 0x10C,
+        MVS_RX_FIS_LO           = 0x110, /* RX FIS list addr */
+        MVS_RX_FIS_HI           = 0x114,
+
+        MVS_TX_CFG              = 0x120, /* TX configuration */
+        MVS_TX_LO               = 0x124, /* TX (delivery) ring addr */
+        MVS_TX_HI               = 0x128,
+
+        MVS_TX_PROD_IDX         = 0x12C, /* TX producer pointer */
+        MVS_TX_CONS_IDX         = 0x130, /* TX consumer pointer (RO) */
+        MVS_RX_CFG              = 0x134, /* RX configuration */
+        MVS_RX_LO               = 0x138, /* RX (completion) ring addr */
+        MVS_RX_HI               = 0x13C,
+        MVS_RX_CONS_IDX         = 0x140, /* RX consumer pointer (RO) */
+
+        MVS_INT_COAL            = 0x148, /* Int coalescing config */
+        MVS_INT_COAL_TMOUT      = 0x14C, /* Int coalescing timeout */
+        MVS_INT_STAT            = 0x150, /* Central int status */
+        MVS_INT_MASK            = 0x154, /* Central int enable */
+        MVS_INT_STAT_SRS        = 0x158, /* SATA register set status */
+        MVS_INT_MASK_SRS        = 0x15C,
+
+                                         /* ports 1-3 follow after this */
+        MVS_P0_INT_STAT         = 0x160, /* port0 interrupt status */
+        MVS_P0_INT_MASK         = 0x164, /* port0 interrupt mask */
+        MVS_P4_INT_STAT         = 0x200, /* Port 4 interrupt status */
+        MVS_P4_INT_MASK         = 0x204, /* Port 4 interrupt enable mask */
+
+                                         /* ports 1-3 follow after this */
+        MVS_P0_SER_CTLSTAT      = 0x180, /* port0 serial control/status */
+        MVS_P4_SER_CTLSTAT      = 0x220, /* port4 serial control/status */
+
+        MVS_CMD_ADDR            = 0x1B8, /* Command register port (addr) */
+        MVS_CMD_DATA            = 0x1BC, /* Command register port (data) */
+
+                                         /* ports 1-3 follow after this */
+        MVS_P0_CFG_ADDR         = 0x1C0, /* port0 phy register address */
+        MVS_P0_CFG_DATA         = 0x1C4, /* port0 phy register data */
+        MVS_P4_CFG_ADDR         = 0x230, /* Port 4 config address */
+        MVS_P4_CFG_DATA         = 0x234, /* Port 4 config data */
+
+                                         /* ports 1-3 follow after this */
+        MVS_P0_VSR_ADDR         = 0x1E0, /* port0 VSR address */
+        MVS_P0_VSR_DATA         = 0x1E4, /* port0 VSR data */
+        MVS_P4_VSR_ADDR         = 0x250, /* port 4 VSR addr */
+        MVS_P4_VSR_DATA         = 0x254, /* port 4 VSR data */
+};
+
+enum hw_register_bits {
+        /* MVS_GBL_CTL */
+        INT_EN                  = (1U << 1),    /* Global int enable */
+        HBA_RST                 = (1U << 0),    /* HBA reset */
+
+        /* MVS_GBL_INT_STAT */
+        INT_XOR                 = (1U << 4),    /* XOR engine event */
+        INT_SAS_SATA            = (1U << 0),    /* SAS/SATA event */
+
+        /* MVS_GBL_PORT_TYPE */                 /* shl for ports 1-3 */
+        SATA_TARGET             = (1U << 16),   /* port0 SATA target enable */
+        MODE_AUTO_DET_PORT7 = (1U << 15),       /* port0 SAS/SATA autodetect */
+        MODE_AUTO_DET_PORT6 = (1U << 14),
+        MODE_AUTO_DET_PORT5 = (1U << 13),
+        MODE_AUTO_DET_PORT4 = (1U << 12),
+        MODE_AUTO_DET_PORT3 = (1U << 11),
+        MODE_AUTO_DET_PORT2 = (1U << 10),
+        MODE_AUTO_DET_PORT1 = (1U << 9),
+        MODE_AUTO_DET_PORT0 = (1U << 8),
+        MODE_AUTO_DET_EN    =   MODE_AUTO_DET_PORT0 | MODE_AUTO_DET_PORT1 |
+                                MODE_AUTO_DET_PORT2 | MODE_AUTO_DET_PORT3 |
+                                MODE_AUTO_DET_PORT4 | MODE_AUTO_DET_PORT5 |
+                                MODE_AUTO_DET_PORT6 | MODE_AUTO_DET_PORT7,
+        MODE_SAS_PORT7_MASK = (1U << 7),  /* port0 SAS(1), SATA(0) mode */
+        MODE_SAS_PORT6_MASK = (1U << 6),
+        MODE_SAS_PORT5_MASK = (1U << 5),
+        MODE_SAS_PORT4_MASK = (1U << 4),
+        MODE_SAS_PORT3_MASK = (1U << 3),
+        MODE_SAS_PORT2_MASK = (1U << 2),
+        MODE_SAS_PORT1_MASK = (1U << 1),
+        MODE_SAS_PORT0_MASK = (1U << 0),
+        MODE_SAS_SATA   =       MODE_SAS_PORT0_MASK | MODE_SAS_PORT1_MASK |
+                                MODE_SAS_PORT2_MASK | MODE_SAS_PORT3_MASK |
+                                MODE_SAS_PORT4_MASK | MODE_SAS_PORT5_MASK |
+                                MODE_SAS_PORT6_MASK | MODE_SAS_PORT7_MASK,
+
+                                /* SAS_MODE value may be
+                                 * dictated (in hw) by values
+                                 * of SATA_TARGET & AUTO_DET
+                                 */
+
+        /* MVS_TX_CFG */
+        TX_EN                   = (1U << 16),   /* Enable TX */
+        TX_RING_SZ_MASK         = 0xfff,        /* TX ring size, bits 11:0 */
+
+        /* MVS_RX_CFG */
+        RX_EN                   = (1U << 16),   /* Enable RX */
+        RX_RING_SZ_MASK         = 0xfff,        /* RX ring size, bits 11:0 */
+
+        /* MVS_INT_COAL */
+        COAL_EN                 = (1U << 16),   /* Enable int coalescing */
+
+        /* MVS_INT_STAT, MVS_INT_MASK */
+        CINT_I2C                = (1U << 31),   /* I2C event */
+        CINT_SW0                = (1U << 30),   /* software event 0 */
+        CINT_SW1                = (1U << 29),   /* software event 1 */
+        CINT_PRD_BC             = (1U << 28),   /* PRD BC err for read cmd */
+        CINT_DMA_PCIE           = (1U << 27),   /* DMA to PCIE timeout */
+        CINT_MEM                = (1U << 26),   /* int mem parity err */
+        CINT_I2C_SLAVE          = (1U << 25),   /* slave I2C event */
+        CINT_SRS                = (1U << 3),    /* SRS event */
+        CINT_CI_STOP            = (1U << 1),    /* cmd issue stopped */
+        CINT_DONE               = (1U << 0),    /* cmd completion */
+
+                                                /* shl for ports 1-3 */
+        CINT_PORT_STOPPED       = (1U << 16),   /* port0 stopped */
+        CINT_PORT               = (1U << 8),    /* port0 event */
+        CINT_PORT_MASK_OFFSET   = 8,
+        CINT_PORT_MASK          = (0xFF << CINT_PORT_MASK_OFFSET),
+
+        /* TX (delivery) ring bits */
+        TXQ_CMD_SHIFT           = 29,
+        TXQ_CMD_SSP             = 1,            /* SSP protocol */
+        TXQ_CMD_SMP             = 2,            /* SMP protocol */
+        TXQ_CMD_STP             = 3,            /* STP/SATA protocol */
+        TXQ_CMD_SSP_FREE_LIST   = 4,            /* add to SSP targ free list */
+        TXQ_CMD_SLOT_RESET      = 7,            /* reset command slot */
+        TXQ_MODE_I              = (1U << 28),   /* mode: 0=target,1=initiator */
+        TXQ_PRIO_HI             = (1U << 27),   /* priority: 0=normal, 1=high */
+        TXQ_SRS_SHIFT           = 20,           /* SATA register set */
+        TXQ_SRS_MASK            = 0x7f,
+        TXQ_PHY_SHIFT           = 12,           /* PHY bitmap */
+        TXQ_PHY_MASK            = 0xff,
+        TXQ_SLOT_MASK           = 0xfff,        /* slot number */
+
+        /* RX (completion) ring bits */
+        RXQ_GOOD                = (1U << 23),   /* Response good */
+        RXQ_SLOT_RESET          = (1U << 21),   /* Slot reset complete */
+        RXQ_CMD_RX              = (1U << 20),   /* target cmd received */
+        RXQ_ATTN                = (1U << 19),   /* attention */
+        RXQ_RSP                 = (1U << 18),   /* response frame xfer'd */
+        RXQ_ERR                 = (1U << 17),   /* err info rec xfer'd */
+        RXQ_DONE                = (1U << 16),   /* cmd complete */
+        RXQ_SLOT_MASK           = 0xfff,        /* slot number */
+
+        /* mvs_cmd_hdr bits */
+        MCH_PRD_LEN_SHIFT       = 16,           /* 16-bit PRD table len */
+        MCH_SSP_FR_TYPE_SHIFT   = 13,           /* SSP frame type */
+
+                                                /* SSP initiator only */
+        MCH_SSP_FR_CMD          = 0x0,          /* COMMAND frame */
+
+                                                /* SSP initiator or target */
+        MCH_SSP_FR_TASK         = 0x1,          /* TASK frame */
+
+                                                /* SSP target only */
+        MCH_SSP_FR_XFER_RDY     = 0x4,          /* XFER_RDY frame */
+        MCH_SSP_FR_RESP         = 0x5,          /* RESPONSE frame */
+        MCH_SSP_FR_READ         = 0x6,          /* Read DATA frame(s) */
+        MCH_SSP_FR_READ_RESP    = 0x7,          /* ditto, plus RESPONSE */
+
+        MCH_PASSTHRU            = (1U << 12),   /* pass-through (SSP) */
+        MCH_FBURST              = (1U << 11),   /* first burst (SSP) */
+        MCH_CHK_LEN             = (1U << 10),   /* chk xfer len (SSP) */
+        MCH_RETRY               = (1U << 9),    /* tport layer retry (SSP) */
+        MCH_PROTECTION          = (1U << 8),    /* protection info rec (SSP) */
+        MCH_RESET               = (1U << 7),    /* Reset (STP/SATA) */
+        MCH_FPDMA               = (1U << 6),    /* First party DMA (STP/SATA) */
+        MCH_ATAPI               = (1U << 5),    /* ATAPI (STP/SATA) */
+        MCH_BIST                = (1U << 4),    /* BIST activate (STP/SATA) */
+        MCH_PMP_MASK            = 0xf,          /* PMP from cmd FIS (STP/SATA)*/
+
+        CCTL_RST                = (1U << 5),    /* port logic reset */
+
+                                                /* 0(LSB first), 1(MSB first) */
+        CCTL_ENDIAN_DATA        = (1U << 3),    /* PRD data */
+        CCTL_ENDIAN_RSP         = (1U << 2),    /* response frame */
+        CCTL_ENDIAN_OPEN        = (1U << 1),    /* open address frame */
+        CCTL_ENDIAN_CMD         = (1U << 0),    /* command table */
+
+        /* MVS_Px_SER_CTLSTAT (per-phy control) */
+        PHY_SSP_RST             = (1U << 3),    /* reset SSP link layer */
+        PHY_BCAST_CHG           = (1U << 2),    /* broadcast(change) notif */
+        PHY_RST_HARD            = (1U << 1),    /* hard reset + phy reset */
+        PHY_RST                 = (1U << 0),    /* phy reset */
+        PHY_MIN_SPP_PHYS_LINK_RATE_MASK = (0xF << 8),
+        PHY_MAX_SPP_PHYS_LINK_RATE_MASK = (0xF << 12),
+        PHY_NEG_SPP_PHYS_LINK_RATE_MASK_OFFSET = (16),
+        PHY_NEG_SPP_PHYS_LINK_RATE_MASK =
+                        (0xF << PHY_NEG_SPP_PHYS_LINK_RATE_MASK_OFFSET),
+        PHY_READY_MASK          = (1U << 20),
+
+        /* MVS_Px_INT_STAT, MVS_Px_INT_MASK (per-phy events) */
+        PHYEV_DEC_ERR           = (1U << 24),   /* Phy Decoding Error */
+        PHYEV_UNASSOC_FIS       = (1U << 19),   /* unassociated FIS rx'd */
+        PHYEV_AN                = (1U << 18),   /* SATA async notification */
+        PHYEV_BIST_ACT          = (1U << 17),   /* BIST activate FIS */
+        PHYEV_SIG_FIS           = (1U << 16),   /* signature FIS */
+        PHYEV_POOF              = (1U << 12),   /* phy ready from 1 -> 0 */
+        PHYEV_IU_BIG            = (1U << 11),   /* IU too long err */
+        PHYEV_IU_SMALL          = (1U << 10),   /* IU too short err */
+        PHYEV_UNK_TAG           = (1U << 9),    /* unknown tag */
+        PHYEV_BROAD_CH          = (1U << 8),    /* broadcast(CHANGE) */
+        PHYEV_COMWAKE           = (1U << 7),    /* COMWAKE rx'd */
+        PHYEV_PORT_SEL          = (1U << 6),    /* port selector present */
+        PHYEV_HARD_RST          = (1U << 5),    /* hard reset rx'd */
+        PHYEV_ID_TMOUT          = (1U << 4),    /* identify timeout */
+        PHYEV_ID_FAIL           = (1U << 3),    /* identify failed */
+        PHYEV_ID_DONE           = (1U << 2),    /* identify done */
+        PHYEV_HARD_RST_DONE     = (1U << 1),    /* hard reset done */
+        PHYEV_RDY_CH            = (1U << 0),    /* phy ready changed state */
+
+        /* MVS_PCS */
+        PCS_EN_SATA_REG_SHIFT   = (16),         /* Enable SATA Register Set */
+        PCS_EN_PORT_XMT_SHIFT   = (12),         /* Enable Port Transmit */
+        PCS_EN_PORT_XMT_SHIFT2  = (8),          /* For 6480 */
+        PCS_SATA_RETRY          = (1U << 8),    /* retry ctl FIS on R_ERR */
+        PCS_RSP_RX_EN           = (1U << 7),    /* raw response rx */
+        PCS_SELF_CLEAR          = (1U << 5),    /* self-clearing int mode */
+        PCS_FIS_RX_EN           = (1U << 4),    /* FIS rx enable */
+        PCS_CMD_STOP_ERR        = (1U << 3),    /* cmd stop-on-err enable */
+        PCS_CMD_RST             = (1U << 1),    /* reset cmd issue */
+        PCS_CMD_EN              = (1U << 0),    /* enable cmd issue */
+
+        /* Port n Attached Device Info */
+        PORT_DEV_SSP_TRGT       = (1U << 19),
+        PORT_DEV_SMP_TRGT       = (1U << 18),
+        PORT_DEV_STP_TRGT       = (1U << 17),
+        PORT_DEV_SSP_INIT       = (1U << 11),
+        PORT_DEV_SMP_INIT       = (1U << 10),
+        PORT_DEV_STP_INIT       = (1U << 9),
+        PORT_PHY_ID_MASK        = (0xFFU << 24),
+        PORT_DEV_TRGT_MASK      = (0x7U << 17),
+        PORT_DEV_INIT_MASK      = (0x7U << 9),
+        PORT_DEV_TYPE_MASK      = (0x7U << 0),
+
+        /* Port n PHY Status */
+        PHY_RDY                 = (1U << 2),
+        PHY_DW_SYNC             = (1U << 1),
+        PHY_OOB_DTCTD           = (1U << 0),
+
+        /* VSR */
+        /* PHYMODE 6 (CDB) */
+        PHY_MODE6_DTL_SPEED     = (1U << 27),
+};
+
+enum mvs_info_flags {
+        MVF_MSI                 = (1U << 0),    /* MSI is enabled */
+        MVF_PHY_PWR_FIX         = (1U << 1),    /* bug workaround */
+};
+
+enum sas_cmd_port_registers {
+        CMD_CMRST_OOB_DET       = 0x100, /* COMRESET OOB detect register */
+        CMD_CMWK_OOB_DET        = 0x104, /* COMWAKE OOB detect register */
+        CMD_CMSAS_OOB_DET       = 0x108, /* COMSAS OOB detect register */
+        CMD_BRST_OOB_DET        = 0x10c, /* burst OOB detect register */
+        CMD_OOB_SPACE           = 0x110, /* OOB space control register */
+        CMD_OOB_BURST           = 0x114, /* OOB burst control register */
+        CMD_PHY_TIMER           = 0x118, /* PHY timer control register */
+        CMD_PHY_CONFIG0         = 0x11c, /* PHY config register 0 */
+        CMD_PHY_CONFIG1         = 0x120, /* PHY config register 1 */
+        CMD_SAS_CTL0            = 0x124, /* SAS control register 0 */
+        CMD_SAS_CTL1            = 0x128, /* SAS control register 1 */
+        CMD_SAS_CTL2            = 0x12c, /* SAS control register 2 */
+        CMD_SAS_CTL3            = 0x130, /* SAS control register 3 */
+        CMD_ID_TEST             = 0x134, /* ID test register */
+        CMD_PL_TIMER            = 0x138, /* PL timer register */
+        CMD_WD_TIMER            = 0x13c, /* WD timer register */
+        CMD_PORT_SEL_COUNT      = 0x140, /* port selector count register */
+        CMD_APP_MEM_CTL         = 0x144, /* Application Memory Control */
+        CMD_XOR_MEM_CTL         = 0x148, /* XOR Block Memory Control */
+        CMD_DMA_MEM_CTL         = 0x14c, /* DMA Block Memory Control */
+        CMD_PORT_MEM_CTL0       = 0x150, /* Port Memory Control 0 */
+        CMD_PORT_MEM_CTL1       = 0x154, /* Port Memory Control 1 */
+        CMD_SATA_PORT_MEM_CTL0  = 0x158, /* SATA Port Memory Control 0 */
+        CMD_SATA_PORT_MEM_CTL1  = 0x15c, /* SATA Port Memory Control 1 */
+        CMD_XOR_MEM_BIST_CTL    = 0x160, /* XOR Memory BIST Control */
+        CMD_XOR_MEM_BIST_STAT   = 0x164, /* XOR Memroy BIST Status */
+        CMD_DMA_MEM_BIST_CTL    = 0x168, /* DMA Memory BIST Control */
+        CMD_DMA_MEM_BIST_STAT   = 0x16c, /* DMA Memory BIST Status */
+        CMD_PORT_MEM_BIST_CTL   = 0x170, /* Port Memory BIST Control */
+        CMD_PORT_MEM_BIST_STAT0 = 0x174, /* Port Memory BIST Status 0 */
+        CMD_PORT_MEM_BIST_STAT1 = 0x178, /* Port Memory BIST Status 1 */
+        CMD_STP_MEM_BIST_CTL    = 0x17c, /* STP Memory BIST Control */
+        CMD_STP_MEM_BIST_STAT0  = 0x180, /* STP Memory BIST Status 0 */
+        CMD_STP_MEM_BIST_STAT1  = 0x184, /* STP Memory BIST Status 1 */
+        CMD_RESET_COUNT         = 0x188, /* Reset Count */
+        CMD_MONTR_DATA_SEL      = 0x18C, /* Monitor Data/Select */
+        CMD_PLL_PHY_CONFIG      = 0x190, /* PLL/PHY Configuration */
+        CMD_PHY_CTL             = 0x194, /* PHY Control and Status */
+        CMD_PHY_TEST_COUNT0     = 0x198, /* Phy Test Count 0 */
+        CMD_PHY_TEST_COUNT1     = 0x19C, /* Phy Test Count 1 */
+        CMD_PHY_TEST_COUNT2     = 0x1A0, /* Phy Test Count 2 */
+        CMD_APP_ERR_CONFIG      = 0x1A4, /* Application Error Configuration */
+        CMD_PND_FIFO_CTL0       = 0x1A8, /* Pending FIFO Control 0 */
+        CMD_HOST_CTL            = 0x1AC, /* Host Control Status */
+        CMD_HOST_WR_DATA        = 0x1B0, /* Host Write Data */
+        CMD_HOST_RD_DATA        = 0x1B4, /* Host Read Data */
+        CMD_PHY_MODE_21         = 0x1B8, /* Phy Mode 21 */
+        CMD_SL_MODE0            = 0x1BC, /* SL Mode 0 */
+        CMD_SL_MODE1            = 0x1C0, /* SL Mode 1 */
+        CMD_PND_FIFO_CTL1       = 0x1C4, /* Pending FIFO Control 1 */
+};
+
+/* SAS/SATA configuration port registers, aka phy registers */
+enum sas_sata_config_port_regs {
+        PHYR_IDENTIFY           = 0x00, /* info for IDENTIFY frame */
+        PHYR_ADDR_LO            = 0x04, /* my SAS address (low) */
+        PHYR_ADDR_HI            = 0x08, /* my SAS address (high) */
+        PHYR_ATT_DEV_INFO       = 0x0C, /* attached device info */
+        PHYR_ATT_ADDR_LO        = 0x10, /* attached dev SAS addr (low) */
+        PHYR_ATT_ADDR_HI        = 0x14, /* attached dev SAS addr (high) */
+        PHYR_SATA_CTL           = 0x18, /* SATA control */
+        PHYR_PHY_STAT           = 0x1C, /* PHY status */
+        PHYR_SATA_SIG0          = 0x20, /*port SATA signature FIS(Byte 0-3) */
+        PHYR_SATA_SIG1          = 0x24, /*port SATA signature FIS(Byte 4-7) */
+        PHYR_SATA_SIG2          = 0x28, /*port SATA signature FIS(Byte 8-11) */
+        PHYR_SATA_SIG3          = 0x2c, /*port SATA signature FIS(Byte 12-15) */
+        PHYR_R_ERR_COUNT        = 0x30, /* port R_ERR count register */
+        PHYR_CRC_ERR_COUNT      = 0x34, /* port CRC error count register */
+        PHYR_WIDE_PORT          = 0x38, /* wide port participating */
+        PHYR_CURRENT0           = 0x80, /* current connection info 0 */
+        PHYR_CURRENT1           = 0x84, /* current connection info 1 */
+        PHYR_CURRENT2           = 0x88, /* current connection info 2 */
+};
+
+/*  SAS/SATA Vendor Specific Port Registers */
+enum sas_sata_vsp_regs {
+        VSR_PHY_STAT            = 0x00, /* Phy Status */
+        VSR_PHY_MODE1           = 0x01, /* phy tx */
+        VSR_PHY_MODE2           = 0x02, /* tx scc */
+        VSR_PHY_MODE3           = 0x03, /* pll */
+        VSR_PHY_MODE4           = 0x04, /* VCO */
+        VSR_PHY_MODE5           = 0x05, /* Rx */
+        VSR_PHY_MODE6           = 0x06, /* CDR */
+        VSR_PHY_MODE7           = 0x07, /* Impedance */
+        VSR_PHY_MODE8           = 0x08, /* Voltage */
+        VSR_PHY_MODE9           = 0x09, /* Test */
+        VSR_PHY_MODE10          = 0x0A, /* Power */
+        VSR_PHY_MODE11          = 0x0B, /* Phy Mode */
+        VSR_PHY_VS0             = 0x0C, /* Vednor Specific 0 */
+        VSR_PHY_VS1             = 0x0D, /* Vednor Specific 1 */
+};
+
+enum pci_cfg_registers {
+        PCR_PHY_CTL     = 0x40,
+        PCR_PHY_CTL2    = 0x90,
+        PCR_DEV_CTRL    = 0xE8,
+};
+
+enum pci_cfg_register_bits {
+        PCTL_PWR_ON     = (0xFU << 24),
+        PCTL_OFF        = (0xFU << 12),
+        PRD_REQ_SIZE    = (0x4000),
+        PRD_REQ_MASK    = (0x00007000),
+};
+
+enum nvram_layout_offsets {
+        NVR_SIG         = 0x00,         /* 0xAA, 0x55 */
+        NVR_SAS_ADDR    = 0x02,         /* 8-byte SAS address */
+};
+
+enum chip_flavors {
+        chip_6320,
+        chip_6440,
+        chip_6480,
+};
+
+enum port_type {
+        PORT_TYPE_SAS   =  (1L << 1),
+        PORT_TYPE_SATA  =  (1L << 0),
+};
+
+/* Command Table Format */
+enum ct_format {
+        /* SSP */
+        SSP_F_H         =  0x00,
+        SSP_F_IU        =  0x18,
+        SSP_F_MAX       =  0x4D,
+        /* STP */
+        STP_CMD_FIS     =  0x00,
+        STP_ATAPI_CMD   =  0x40,
+        STP_F_MAX       =  0x10,
+        /* SMP */
+        SMP_F_T         =  0x00,
+        SMP_F_DEP       =  0x01,
+        SMP_F_MAX       =  0x101,
+};
+
+enum status_buffer {
+        SB_EIR_OFF      =  0x00,        /* Error Information Record */
+        SB_RFB_OFF      =  0x08,        /* Response Frame Buffer */
+        SB_RFB_MAX      =  0x400,       /* RFB size*/
+};
+
+enum error_info_rec {
+        CMD_ISS_STPD    =  (1U << 31),  /* Cmd Issue Stopped */
+};
+
+struct mvs_chip_info {
+        u32             n_phy;
+        u32             srs_sz;
+        u32             slot_width;
+};
+
+struct mvs_err_info {
+        __le32                  flags;
+        __le32                  flags2;
+};
+
+struct mvs_prd {
+        __le64                  addr;           /* 64-bit buffer address */
+        __le32                  reserved;
+        __le32                  len;            /* 16-bit length */
+};
+
+struct mvs_cmd_hdr {
+        __le32                  flags;          /* PRD tbl len; SAS, SATA ctl */
+        __le32                  lens;           /* cmd, max resp frame len */
+        __le32                  tags;           /* targ port xfer tag; tag */
+        __le32                  data_len;       /* data xfer len */
+        __le64                  cmd_tbl;        /* command table address */
+        __le64                  open_frame;     /* open addr frame address */
+        __le64                  status_buf;     /* status buffer address */
+        __le64                  prd_tbl;        /* PRD tbl address */
+        __le32                  reserved[4];
+};
+
+struct mvs_slot_info {
+        struct sas_task         *task;
+        u32                     n_elem;
+        u32                     tx;
+
+        /* DMA buffer for storing cmd tbl, open addr frame, status buffer,
+         * and PRD table
+         */
+        void                    *buf;
+        dma_addr_t              buf_dma;
+#if _MV_DUMP
+        u32                     cmd_size;
+#endif
+
+        void                    *response;
+};
+
+struct mvs_port {
+        struct asd_sas_port     sas_port;
+        u8                      port_attached;
+        u8                      taskfileset;
+        u8                      wide_port_phymap;
+};
+
+struct mvs_phy {
+        struct mvs_port         *port;
+        struct asd_sas_phy      sas_phy;
+        struct sas_identify     identify;
+        struct scsi_device      *sdev;
+        u64             dev_sas_addr;
+        u64             att_dev_sas_addr;
+        u32             att_dev_info;
+        u32             dev_info;
+        u32             phy_type;
+        u32             phy_status;
+        u32             irq_status;
+        u32             frame_rcvd_size;
+        u8              frame_rcvd[32];
+        u8              phy_attached;
+};
+
+struct mvs_info {
+        unsigned long           flags;
+
+        spinlock_t              lock;           /* host-wide lock */
+        struct pci_dev          *pdev;          /* our device */
+        void __iomem            *regs;          /* enhanced mode registers */
+        void __iomem            *peri_regs;     /* peripheral registers */
+
+        u8                      sas_addr[SAS_ADDR_SIZE];
+        struct sas_ha_struct    sas;            /* SCSI/SAS glue */
+        struct Scsi_Host        *shost;
+
+        __le32                  *tx;            /* TX (delivery) DMA ring */
+        dma_addr_t              tx_dma;
+        u32                     tx_prod;        /* cached next-producer idx */
+
+        __le32                  *rx;            /* RX (completion) DMA ring */
+        dma_addr_t              rx_dma;
+        u32                     rx_cons;        /* RX consumer idx */
+
+        __le32                  *rx_fis;        /* RX'd FIS area */
+        dma_addr_t              rx_fis_dma;
+
+        struct mvs_cmd_hdr      *slot;  /* DMA command header slots */
+        dma_addr_t              slot_dma;
+
+        const struct mvs_chip_info *chip;
+
+        unsigned long           tags[MVS_SLOTS];
+        struct mvs_slot_info    slot_info[MVS_SLOTS];
+                                /* further per-slot information */
+        struct mvs_phy          phy[MVS_MAX_PHYS];
+        struct mvs_port         port[MVS_MAX_PHYS];
+
+        u32                     can_queue;      /* per adapter */
+        u32                     tag_out;        /*Get*/
+        u32                     tag_in;         /*Give*/
+};
+
+struct mvs_queue_task {
+        struct list_head list;
+
+        void   *uldd_task;
+};
+
+static int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
+                           void *funcdata);
+static u32 mvs_read_phy_ctl(struct mvs_info *mvi, u32 port);
+static void mvs_write_phy_ctl(struct mvs_info *mvi, u32 port, u32 val);
+static u32 mvs_read_port_irq_stat(struct mvs_info *mvi, u32 port);
+static void mvs_write_port_irq_stat(struct mvs_info *mvi, u32 port, u32 val);
+static void mvs_write_port_irq_mask(struct mvs_info *mvi, u32 port, u32 val);
+static u32 mvs_read_port_irq_mask(struct mvs_info *mvi, u32 port);
+
+static u32 mvs_is_phy_ready(struct mvs_info *mvi, int i);
+static void mvs_detect_porttype(struct mvs_info *mvi, int i);
+static void mvs_update_phyinfo(struct mvs_info *mvi, int i, int get_st);
+
+static int mvs_scan_finished(struct Scsi_Host *, unsigned long);
+static void mvs_scan_start(struct Scsi_Host *);
+static int mvs_sas_slave_alloc(struct scsi_device *scsi_dev);
+
+static struct scsi_transport_template *mvs_stt;
+
+static const struct mvs_chip_info mvs_chips[] = {
+        [chip_6320] =           { 2, 16, 9  },
+        [chip_6440] =           { 4, 16, 9  },
+        [chip_6480] =           { 8, 32, 10 },
+};
+
+static struct scsi_host_template mvs_sht = {
+        .module                 = THIS_MODULE,
+        .name                   = DRV_NAME,
+        .queuecommand           = sas_queuecommand,
+        .target_alloc           = sas_target_alloc,
+        .slave_configure        = sas_slave_configure,
+        .slave_destroy          = sas_slave_destroy,
+        .scan_finished          = mvs_scan_finished,
+        .scan_start             = mvs_scan_start,
+        .change_queue_depth     = sas_change_queue_depth,
+        .change_queue_type      = sas_change_queue_type,
+        .bios_param             = sas_bios_param,
+        .can_queue              = 1,
+        .cmd_per_lun            = 1,
+        .this_id                = -1,
+        .sg_tablesize           = SG_ALL,
+        .max_sectors            = SCSI_DEFAULT_MAX_SECTORS,
+        .use_clustering         = ENABLE_CLUSTERING,
+        .eh_device_reset_handler        = sas_eh_device_reset_handler,
+        .eh_bus_reset_handler   = sas_eh_bus_reset_handler,
+        .slave_alloc            = mvs_sas_slave_alloc,
+        .target_destroy         = sas_target_destroy,
+        .ioctl                  = sas_ioctl,
+};
+
+static void mvs_hexdump(u32 size, u8 *data, u32 baseaddr)
+{
+        u32 i;
+        u32 run;
+        u32 offset;
+
+        offset = 0;
+        while (size) {
+                printk("%08X : ", baseaddr + offset);
+                if (size >= 16)
+                        run = 16;
+                else
+                        run = size;
+                size -= run;
+                for (i = 0; i < 16; i++) {
+                        if (i < run)
+                                printk("%02X ", (u32)data[i]);
+                        else
+                                printk("   ");
+                }
+                printk(": ");
+                for (i = 0; i < run; i++)
+                        printk("%c", isalnum(data[i]) ? data[i] : '.');
+                printk("\n");
+                data = &data[16];
+                offset += run;
+        }
+        printk("\n");
+}
+
+static void mvs_hba_sb_dump(struct mvs_info *mvi, u32 tag,
+                                   enum sas_protocol proto)
+{
+#if _MV_DUMP
+        u32 offset;
+        struct pci_dev *pdev = mvi->pdev;
+        struct mvs_slot_info *slot = &mvi->slot_info[tag];
+
+        offset = slot->cmd_size + MVS_OAF_SZ +
+            sizeof(struct mvs_prd) * slot->n_elem;
+        dev_printk(KERN_DEBUG, &pdev->dev, "+---->Status buffer[%d] :\n",
+                        tag);
+        mvs_hexdump(32, (u8 *) slot->response,
+                    (u32) slot->buf_dma + offset);
+#endif
+}
+
+static void mvs_hba_memory_dump(struct mvs_info *mvi, u32 tag,
+                                enum sas_protocol proto)
+{
+#if _MV_DUMP
+        u32 sz, w_ptr, r_ptr;
+        u64 addr;
+        void __iomem *regs = mvi->regs;
+        struct pci_dev *pdev = mvi->pdev;
+        struct mvs_slot_info *slot = &mvi->slot_info[tag];
+
+        /*Delivery Queue */
+        sz = mr32(TX_CFG) & TX_RING_SZ_MASK;
+        w_ptr = mr32(TX_PROD_IDX) & TX_RING_SZ_MASK;
+        r_ptr = mr32(TX_CONS_IDX) & TX_RING_SZ_MASK;
+        addr = mr32(TX_HI) << 16 << 16 | mr32(TX_LO);
+        dev_printk(KERN_DEBUG, &pdev->dev,
+                "Delivery Queue Size=%04d , WRT_PTR=%04X , RD_PTR=%04X\n",
+                sz, w_ptr, r_ptr);
+        dev_printk(KERN_DEBUG, &pdev->dev,
+                "Delivery Queue Base Address=0x%llX (PA)"
+                "(tx_dma=0x%llX), Entry=%04d\n",
+                addr, mvi->tx_dma, w_ptr);
+        mvs_hexdump(sizeof(u32), (u8 *)(&mvi->tx[mvi->tx_prod]),
+                        (u32) mvi->tx_dma + sizeof(u32) * w_ptr);
+        /*Command List */
+        addr = mr32(CMD_LIST_HI) << 16 << 16 | mr32(CMD_LIST_LO);
+        dev_printk(KERN_DEBUG, &pdev->dev,
+                "Command List Base Address=0x%llX (PA)"
+                "(slot_dma=0x%llX), Header=%03d\n",
+                addr, mvi->slot_dma, tag);
+        dev_printk(KERN_DEBUG, &pdev->dev, "Command Header[%03d]:\n", tag);
+        /*mvs_cmd_hdr */
+        mvs_hexdump(sizeof(struct mvs_cmd_hdr), (u8 *)(&mvi->slot[tag]),
+                (u32) mvi->slot_dma + tag * sizeof(struct mvs_cmd_hdr));
+        /*1.command table area */
+        dev_printk(KERN_DEBUG, &pdev->dev, "+---->Command Table :\n");
+        mvs_hexdump(slot->cmd_size, (u8 *) slot->buf, (u32) slot->buf_dma);
+        /*2.open address frame area */
+        dev_printk(KERN_DEBUG, &pdev->dev, "+---->Open Address Frame :\n");
+        mvs_hexdump(MVS_OAF_SZ, (u8 *) slot->buf + slot->cmd_size,
+                                (u32) slot->buf_dma + slot->cmd_size);
+        /*3.status buffer */
+        mvs_hba_sb_dump(mvi, tag, proto);
+        /*4.PRD table */
+        dev_printk(KERN_DEBUG, &pdev->dev, "+---->PRD table :\n");
+        mvs_hexdump(sizeof(struct mvs_prd) * slot->n_elem,
+                (u8 *) slot->buf + slot->cmd_size + MVS_OAF_SZ,
+                (u32) slot->buf_dma + slot->cmd_size + MVS_OAF_SZ);
+#endif
+}
+
+static void mvs_hba_cq_dump(struct mvs_info *mvi)
+{
+#if _MV_DUMP
+        u64 addr;
+        void __iomem *regs = mvi->regs;
+        struct pci_dev *pdev = mvi->pdev;
+        u32 entry = mvi->rx_cons + 1;
+        u32 rx_desc = le32_to_cpu(mvi->rx[entry]);
+
+        /*Completion Queue */
+        addr = mr32(RX_HI) << 16 << 16 | mr32(RX_LO);
+        dev_printk(KERN_DEBUG, &pdev->dev, "Completion Task = 0x%08X\n",
+                   (u32) mvi->slot_info[rx_desc & RXQ_SLOT_MASK].task);
+        dev_printk(KERN_DEBUG, &pdev->dev,
+                "Completion List Base Address=0x%llX (PA), "
+                "CQ_Entry=%04d, CQ_WP=0x%08X\n",
+                addr, entry - 1, mvi->rx[0]);
+        mvs_hexdump(sizeof(u32), (u8 *)(&rx_desc),
+                    mvi->rx_dma + sizeof(u32) * entry);
+#endif
+}
+
+static void mvs_hba_interrupt_enable(struct mvs_info *mvi)
+{
+        void __iomem *regs = mvi->regs;
+        u32 tmp;
+
+        tmp = mr32(GBL_CTL);
+
+        mw32(GBL_CTL, tmp | INT_EN);
+}
+
+static void mvs_hba_interrupt_disable(struct mvs_info *mvi)
+{
+        void __iomem *regs = mvi->regs;
+        u32 tmp;
+
+        tmp = mr32(GBL_CTL);
+
+        mw32(GBL_CTL, tmp & ~INT_EN);
+}
+
+static int mvs_int_rx(struct mvs_info *mvi, bool self_clear);
+
+/* move to PCI layer or libata core? */
+static int pci_go_64(struct pci_dev *pdev)
+{
+        int rc;
+
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+                rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                if (rc) {
+                        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                        if (rc) {
+                                dev_printk(KERN_ERR, &pdev->dev,
+                                           "64-bit DMA enable failed\n");
+                                return rc;
+                        }
+                }
+        } else {
+                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                if (rc) {
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                   "32-bit DMA enable failed\n");
+                        return rc;
+                }
+                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                if (rc) {
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                   "32-bit consistent DMA enable failed\n");
+                        return rc;
+                }
+        }
+
+        return rc;
+}
+
+static void mvs_tag_clear(struct mvs_info *mvi, u32 tag)
+{
+        mvi->tag_in = (mvi->tag_in + 1) & (MVS_SLOTS - 1);
+        mvi->tags[mvi->tag_in] = tag;
+}
+
+static void mvs_tag_free(struct mvs_info *mvi, u32 tag)
+{
+        mvi->tag_out = (mvi->tag_out - 1) & (MVS_SLOTS - 1);
+}
+
+static int mvs_tag_alloc(struct mvs_info *mvi, u32 *tag_out)
+{
+        if (mvi->tag_out != mvi->tag_in) {
+                *tag_out = mvi->tags[mvi->tag_out];
+                mvi->tag_out = (mvi->tag_out + 1) & (MVS_SLOTS - 1);
+                return 0;
+        }
+        return -EBUSY;
+}
+
+static void mvs_tag_init(struct mvs_info *mvi)
+{
+        int i;
+        for (i = 0; i < MVS_SLOTS; ++i)
+                mvi->tags[i] = i;
+        mvi->tag_out = 0;
+        mvi->tag_in = MVS_SLOTS - 1;
+}
+
+#ifndef MVS_DISABLE_NVRAM
+static int mvs_eep_read(void __iomem *regs, u32 addr, u32 *data)
+{
+        int timeout = 1000;
+
+        if (addr & ~SPI_ADDR_MASK)
+                return -EINVAL;
+
+        writel(addr, regs + SPI_CMD);
+        writel(TWSI_RD, regs + SPI_CTL);
+
+        while (timeout-- > 0) {
+                if (readl(regs + SPI_CTL) & TWSI_RDY) {
+                        *data = readl(regs + SPI_DATA);
+                        return 0;
+                }
+
+                udelay(10);
+        }
+
+        return -EBUSY;
+}
+
+static int mvs_eep_read_buf(void __iomem *regs, u32 addr,
+                            void *buf, u32 buflen)
+{
+        u32 addr_end, tmp_addr, i, j;
+        u32 tmp = 0;
+        int rc;
+        u8 *tmp8, *buf8 = buf;
+
+        addr_end = addr + buflen;
+        tmp_addr = ALIGN(addr, 4);
+        if (addr > 0xff)
+                return -EINVAL;
+
+        j = addr & 0x3;
+        if (j) {
+                rc = mvs_eep_read(regs, tmp_addr, &tmp);
+                if (rc)
+                        return rc;
+
+                tmp8 = (u8 *)&tmp;
+                for (i = j; i < 4; i++)
+                        *buf8++ = tmp8[i];
+
+                tmp_addr += 4;
+        }
+
+        for (j = ALIGN(addr_end, 4); tmp_addr < j; tmp_addr += 4) {
+                rc = mvs_eep_read(regs, tmp_addr, &tmp);
+                if (rc)
+                        return rc;
+
+                memcpy(buf8, &tmp, 4);
+                buf8 += 4;
+        }
+
+        if (tmp_addr < addr_end) {
+                rc = mvs_eep_read(regs, tmp_addr, &tmp);
+                if (rc)
+                        return rc;
+
+                tmp8 = (u8 *)&tmp;
+                j = addr_end - tmp_addr;
+                for (i = 0; i < j; i++)
+                        *buf8++ = tmp8[i];
+
+                tmp_addr += 4;
+        }
+
+        return 0;
+}
+#endif
+
+static int mvs_nvram_read(struct mvs_info *mvi, u32 addr,
+                          void *buf, u32 buflen)
+{
+#ifndef MVS_DISABLE_NVRAM
+        void __iomem *regs = mvi->regs;
+        int rc, i;
+        u32 sum;
+        u8 hdr[2], *tmp;
+        const char *msg;
+
+        rc = mvs_eep_read_buf(regs, addr, &hdr, 2);
+        if (rc) {
+                msg = "nvram hdr read failed";
+                goto err_out;
+        }
+        rc = mvs_eep_read_buf(regs, addr + 2, buf, buflen);
+        if (rc) {
+                msg = "nvram read failed";
+                goto err_out;
+        }
+
+        if (hdr[0] != 0x5A) {
+                /* entry id */
+                msg = "invalid nvram entry id";
+                rc = -ENOENT;
+                goto err_out;
+        }
+
+        tmp = buf;
+        sum = ((u32)hdr[0]) + ((u32)hdr[1]);
+        for (i = 0; i < buflen; i++)
+                sum += ((u32)tmp[i]);
+
+        if (sum) {
+                msg = "nvram checksum failure";
+                rc = -EILSEQ;
+                goto err_out;
+        }
+
+        return 0;
+
+err_out:
+        dev_printk(KERN_ERR, &mvi->pdev->dev, "%s", msg);
+        return rc;
+#else
+        /* FIXME , For SAS target mode */
+        memcpy(buf, "\x00\x00\xab\x11\x30\x04\x05\x50", 8);
+        return 0;
+#endif
+}
+
+static void mvs_bytes_dmaed(struct mvs_info *mvi, int i)
+{
+        struct mvs_phy *phy = &mvi->phy[i];
+
+        if (!phy->phy_attached)
+                return;
+
+        if (phy->phy_type & PORT_TYPE_SAS) {
+                struct sas_identify_frame *id;
+
+                id = (struct sas_identify_frame *)phy->frame_rcvd;
+                id->dev_type = phy->identify.device_type;
+                id->initiator_bits = SAS_PROTOCOL_ALL;
+                id->target_bits = phy->identify.target_port_protocols;
+        } else if (phy->phy_type & PORT_TYPE_SATA) {
+                /* TODO */
+        }
+        mvi->sas.sas_phy[i]->frame_rcvd_size = phy->frame_rcvd_size;
+        mvi->sas.notify_port_event(mvi->sas.sas_phy[i],
+                                   PORTE_BYTES_DMAED);
+}
+
+static int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time)
+{
+        /* give the phy enabling interrupt event time to come in (1s
+         * is empirically about all it takes) */
+        if (time < HZ)
+                return 0;
+        /* Wait for discovery to finish */
+        scsi_flush_work(shost);
+        return 1;
+}
+
+static void mvs_scan_start(struct Scsi_Host *shost)
+{
+        int i;
+        struct mvs_info *mvi = SHOST_TO_SAS_HA(shost)->lldd_ha;
+
+        for (i = 0; i < mvi->chip->n_phy; ++i) {
+                mvs_bytes_dmaed(mvi, i);
+        }
+}
+
+static int mvs_sas_slave_alloc(struct scsi_device *scsi_dev)
+{
+        int rc;
+
+        rc = sas_slave_alloc(scsi_dev);
+
+        return rc;
+}
+
+static void mvs_int_port(struct mvs_info *mvi, int port_no, u32 events)
+{
+        struct pci_dev *pdev = mvi->pdev;
+        struct sas_ha_struct *sas_ha = &mvi->sas;
+        struct mvs_phy *phy = &mvi->phy[port_no];
+        struct asd_sas_phy *sas_phy = &phy->sas_phy;
+
+        phy->irq_status = mvs_read_port_irq_stat(mvi, port_no);
+        /*
+        * events is port event now ,
+        * we need check the interrupt status which belongs to per port.
+        */
+        dev_printk(KERN_DEBUG, &pdev->dev,
+                "Port %d Event = %X\n",
+                port_no, phy->irq_status);
+
+        if (phy->irq_status & (PHYEV_POOF | PHYEV_DEC_ERR)) {
+                if (!mvs_is_phy_ready(mvi, port_no)) {
+                        sas_phy_disconnected(sas_phy);
+                        sas_ha->notify_phy_event(sas_phy, PHYE_LOSS_OF_SIGNAL);
+                } else
+                        mvs_phy_control(sas_phy, PHY_FUNC_LINK_RESET, NULL);
+        }
+        if (!(phy->irq_status & PHYEV_DEC_ERR)) {
+                if (phy->irq_status & PHYEV_COMWAKE) {
+                        u32 tmp = mvs_read_port_irq_mask(mvi, port_no);
+                        mvs_write_port_irq_mask(mvi, port_no,
+                                                tmp | PHYEV_SIG_FIS);
+                }
+                if (phy->irq_status & (PHYEV_SIG_FIS | PHYEV_ID_DONE)) {
+                        phy->phy_status = mvs_is_phy_ready(mvi, port_no);
+                        if (phy->phy_status) {
+                                mvs_detect_porttype(mvi, port_no);
+
+                                if (phy->phy_type & PORT_TYPE_SATA) {
+                                        u32 tmp = mvs_read_port_irq_mask(mvi,
+                                                                port_no);
+                                        tmp &= ~PHYEV_SIG_FIS;
+                                        mvs_write_port_irq_mask(mvi,
+                                                                port_no, tmp);
+                                }
+
+                                mvs_update_phyinfo(mvi, port_no, 0);
+                                sas_ha->notify_phy_event(sas_phy,
+                                                        PHYE_OOB_DONE);
+                                mvs_bytes_dmaed(mvi, port_no);
+                        } else {
+                                dev_printk(KERN_DEBUG, &pdev->dev,
+                                        "plugin interrupt but phy is gone\n");
+                                mvs_phy_control(sas_phy, PHY_FUNC_LINK_RESET,
+                                                        NULL);
+                        }
+                } else if (phy->irq_status & PHYEV_BROAD_CH)
+                        sas_ha->notify_port_event(sas_phy,
+                                                PORTE_BROADCAST_RCVD);
+        }
+        mvs_write_port_irq_stat(mvi, port_no, phy->irq_status);
+}
+
+static void mvs_int_sata(struct mvs_info *mvi)
+{
+        /* FIXME */
+}
+
+static void mvs_slot_free(struct mvs_info *mvi, struct sas_task *task,
+                          struct mvs_slot_info *slot, u32 slot_idx)
+{
+        if (!sas_protocol_ata(task->task_proto))
+                if (slot->n_elem)
+                        pci_unmap_sg(mvi->pdev, task->scatter,
+                                     slot->n_elem, task->data_dir);
+
+        switch (task->task_proto) {
+        case SAS_PROTOCOL_SMP:
+                pci_unmap_sg(mvi->pdev, &task->smp_task.smp_resp, 1,
+                             PCI_DMA_FROMDEVICE);
+                pci_unmap_sg(mvi->pdev, &task->smp_task.smp_req, 1,
+                             PCI_DMA_TODEVICE);
+                break;
+
+        case SAS_PROTOCOL_SATA:
+        case SAS_PROTOCOL_STP:
+        case SAS_PROTOCOL_SSP:
+        default:
+                /* do nothing */
+                break;
+        }
+
+        slot->task = NULL;
+        mvs_tag_clear(mvi, slot_idx);
+}
+
+static void mvs_slot_err(struct mvs_info *mvi, struct sas_task *task,
+                         u32 slot_idx)
+{
+        struct mvs_slot_info *slot = &mvi->slot_info[slot_idx];
+        u64 err_dw0 = *(u32 *) slot->response;
+        void __iomem *regs = mvi->regs;
+        u32 tmp;
+
+        if (err_dw0 & CMD_ISS_STPD)
+                if (sas_protocol_ata(task->task_proto)) {
+                        tmp = mr32(INT_STAT_SRS);
+                        mw32(INT_STAT_SRS, tmp & 0xFFFF);
+                }
+
+        mvs_hba_sb_dump(mvi, slot_idx, task->task_proto);
+}
+
+static int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc)
+{
+        u32 slot_idx = rx_desc & RXQ_SLOT_MASK;
+        struct mvs_slot_info *slot = &mvi->slot_info[slot_idx];
+        struct sas_task *task = slot->task;
+        struct task_status_struct *tstat = &task->task_status;
+        struct mvs_port *port = &mvi->port[task->dev->port->id];
+        bool aborted;
+        void *to;
+
+        spin_lock(&task->task_state_lock);
+        aborted = task->task_state_flags & SAS_TASK_STATE_ABORTED;
+        if (!aborted) {
+                task->task_state_flags &=
+                    ~(SAS_TASK_STATE_PENDING | SAS_TASK_AT_INITIATOR);
+                task->task_state_flags |= SAS_TASK_STATE_DONE;
+        }
+        spin_unlock(&task->task_state_lock);
+
+        if (aborted)
+                return -1;
+
+        memset(tstat, 0, sizeof(*tstat));
+        tstat->resp = SAS_TASK_COMPLETE;
+
+
+        if (unlikely(!port->port_attached)) {
+                tstat->stat = SAS_PHY_DOWN;
+                goto out;
+        }
+
+        /* error info record present */
+        if ((rx_desc & RXQ_ERR) && (*(u64 *) slot->response)) {
+                tstat->stat = SAM_CHECK_COND;
+                mvs_slot_err(mvi, task, slot_idx);
+                goto out;
+        }
+
+        switch (task->task_proto) {
+        case SAS_PROTOCOL_SSP:
+                /* hw says status == 0, datapres == 0 */
+                if (rx_desc & RXQ_GOOD) {
+                        tstat->stat = SAM_GOOD;
+                        tstat->resp = SAS_TASK_COMPLETE;
+                }
+                /* response frame present */
+                else if (rx_desc & RXQ_RSP) {
+                        struct ssp_response_iu *iu =
+                            slot->response + sizeof(struct mvs_err_info);
+                        sas_ssp_task_response(&mvi->pdev->dev, task, iu);
+                }
+
+                /* should never happen? */
+                else
+                        tstat->stat = SAM_CHECK_COND;
+                break;
+
+        case SAS_PROTOCOL_SMP: {
+                        struct scatterlist *sg_resp = &task->smp_task.smp_resp;
+                        tstat->stat = SAM_GOOD;
+                        to = kmap_atomic(sg_page(sg_resp), KM_IRQ0);
+                        memcpy(to + sg_resp->offset,
+                                slot->response + sizeof(struct mvs_err_info),
+                                sg_dma_len(sg_resp));
+                        kunmap_atomic(to, KM_IRQ0);
+                        break;
+                }
+
+        case SAS_PROTOCOL_SATA:
+        case SAS_PROTOCOL_STP:
+        case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP: {
+                        struct ata_task_resp *resp =
+                            (struct ata_task_resp *)tstat->buf;
+
+                        if ((rx_desc & (RXQ_DONE | RXQ_ERR | RXQ_ATTN)) ==
+                            RXQ_DONE)
+                                tstat->stat = SAM_GOOD;
+                        else
+                                tstat->stat = SAM_CHECK_COND;
+
+                        resp->frame_len = sizeof(struct dev_to_host_fis);
+                        memcpy(&resp->ending_fis[0],
+                               SATA_RECEIVED_D2H_FIS(port->taskfileset),
+                               sizeof(struct dev_to_host_fis));
+                        if (resp->ending_fis[2] & ATA_ERR)
+                                mvs_hexdump(16, resp->ending_fis, 0);
+                        break;
+                }
+
+        default:
+                tstat->stat = SAM_CHECK_COND;
+                break;
+        }
+
+out:
+        mvs_slot_free(mvi, task, slot, slot_idx);
+        task->task_done(task);
+        return tstat->stat;
+}
+
+static void mvs_int_full(struct mvs_info *mvi)
+{
+        void __iomem *regs = mvi->regs;
+        u32 tmp, stat;
+        int i;
+
+        stat = mr32(INT_STAT);
+
+        mvs_int_rx(mvi, false);
+
+        for (i = 0; i < MVS_MAX_PORTS; i++) {
+                tmp = (stat >> i) & (CINT_PORT | CINT_PORT_STOPPED);
+                if (tmp)
+                        mvs_int_port(mvi, i, tmp);
+        }
+
+        if (stat & CINT_SRS)
+                mvs_int_sata(mvi);
+
+        mw32(INT_STAT, stat);
+}
+
+static int mvs_int_rx(struct mvs_info *mvi, bool self_clear)
+{
+        void __iomem *regs = mvi->regs;
+        u32 rx_prod_idx, rx_desc;
+        bool attn = false;
+        struct pci_dev *pdev = mvi->pdev;
+
+        /* the first dword in the RX ring is special: it contains
+         * a mirror of the hardware's RX producer index, so that
+         * we don't have to stall the CPU reading that register.
+         * The actual RX ring is offset by one dword, due to this.
+         */
+        rx_prod_idx = mr32(RX_CONS_IDX) & RX_RING_SZ_MASK;
+        if (rx_prod_idx == 0xfff) {     /* h/w hasn't touched RX ring yet */
+                mvi->rx_cons = 0xfff;
+                return 0;
+        }
+
+        /* The CMPL_Q may come late, read from register and try again
+        * note: if coalescing is enabled,
+        * it will need to read from register every time for sure
+        */
+        if (mvi->rx_cons == rx_prod_idx)
+                return 0;
+
+        if (mvi->rx_cons == 0xfff)
+                mvi->rx_cons = MVS_RX_RING_SZ - 1;
+
+        while (mvi->rx_cons != rx_prod_idx) {
+
+                /* increment our internal RX consumer pointer */
+                mvi->rx_cons = (mvi->rx_cons + 1) & (MVS_RX_RING_SZ - 1);
+
+                rx_desc = le32_to_cpu(mvi->rx[mvi->rx_cons + 1]);
+
+                mvs_hba_cq_dump(mvi);
+
+                if (unlikely(rx_desc & RXQ_DONE))
+                        mvs_slot_complete(mvi, rx_desc);
+                if (rx_desc & RXQ_ATTN) {
+                        attn = true;
+                        dev_printk(KERN_DEBUG, &pdev->dev, "ATTN %X\n",
+                                rx_desc);
+                } else if (rx_desc & RXQ_ERR) {
+                        dev_printk(KERN_DEBUG, &pdev->dev, "RXQ_ERR %X\n",
+                                rx_desc);
+                }
+        }
+
+        if (attn && self_clear)
+                mvs_int_full(mvi);
+
+        return 0;
+}
+
+static irqreturn_t mvs_interrupt(int irq, void *opaque)
+{
+        struct mvs_info *mvi = opaque;
+        void __iomem *regs = mvi->regs;
+        u32 stat;
+
+        stat = mr32(GBL_INT_STAT);
+
+        /* clear CMD_CMPLT ASAP */
+        mw32_f(INT_STAT, CINT_DONE);
+
+        if (stat == 0 || stat == 0xffffffff)
+                return IRQ_NONE;
+
+        spin_lock(&mvi->lock);
+
+        mvs_int_full(mvi);
+
+        spin_unlock(&mvi->lock);
+
+        return IRQ_HANDLED;
+}
+
+#ifndef MVS_DISABLE_MSI
+static irqreturn_t mvs_msi_interrupt(int irq, void *opaque)
+{
+        struct mvs_info *mvi = opaque;
+
+        spin_lock(&mvi->lock);
+
+        mvs_int_rx(mvi, true);
+
+        spin_unlock(&mvi->lock);
+
+        return IRQ_HANDLED;
+}
+#endif
+
+struct mvs_task_exec_info {
+        struct sas_task *task;
+        struct mvs_cmd_hdr *hdr;
+        struct mvs_port *port;
+        u32 tag;
+        int n_elem;
+};
+
+static int mvs_task_prep_smp(struct mvs_info *mvi,
+                             struct mvs_task_exec_info *tei)
+{
+        int elem, rc, i;
+        struct sas_task *task = tei->task;
+        struct mvs_cmd_hdr *hdr = tei->hdr;
+        struct scatterlist *sg_req, *sg_resp;
+        u32 req_len, resp_len, tag = tei->tag;
+        void *buf_tmp;
+        u8 *buf_oaf;
+        dma_addr_t buf_tmp_dma;
+        struct mvs_prd *buf_prd;
+        struct scatterlist *sg;
+        struct mvs_slot_info *slot = &mvi->slot_info[tag];
+        struct asd_sas_port *sas_port = task->dev->port;
+        u32 flags = (tei->n_elem << MCH_PRD_LEN_SHIFT);
+#if _MV_DUMP
+        u8 *buf_cmd;
+        void *from;
+#endif
+        /*
+         * DMA-map SMP request, response buffers
+         */
+        sg_req = &task->smp_task.smp_req;
+        elem = pci_map_sg(mvi->pdev, sg_req, 1, PCI_DMA_TODEVICE);
+        if (!elem)
+                return -ENOMEM;
+        req_len = sg_dma_len(sg_req);
+
+        sg_resp = &task->smp_task.smp_resp;
+        elem = pci_map_sg(mvi->pdev, sg_resp, 1, PCI_DMA_FROMDEVICE);
+        if (!elem) {
+                rc = -ENOMEM;
+                goto err_out;
+        }
+        resp_len = sg_dma_len(sg_resp);
+
+        /* must be in dwords */
+        if ((req_len & 0x3) || (resp_len & 0x3)) {
+                rc = -EINVAL;
+                goto err_out_2;
+        }
+
+        /*
+         * arrange MVS_SLOT_BUF_SZ-sized DMA buffer according to our needs
+         */
+
+        /* region 1: command table area (MVS_SSP_CMD_SZ bytes) ************** */
+        buf_tmp = slot->buf;
+        buf_tmp_dma = slot->buf_dma;
+
+#if _MV_DUMP
+        buf_cmd = buf_tmp;
+        hdr->cmd_tbl = cpu_to_le64(buf_tmp_dma);
+        buf_tmp += req_len;
+        buf_tmp_dma += req_len;
+        slot->cmd_size = req_len;
+#else
+        hdr->cmd_tbl = cpu_to_le64(sg_dma_address(sg_req));
+#endif
+
+        /* region 2: open address frame area (MVS_OAF_SZ bytes) ********* */
+        buf_oaf = buf_tmp;
+        hdr->open_frame = cpu_to_le64(buf_tmp_dma);
+
+        buf_tmp += MVS_OAF_SZ;
+        buf_tmp_dma += MVS_OAF_SZ;
+
+        /* region 3: PRD table ********************************************* */
+        buf_prd = buf_tmp;
+        if (tei->n_elem)
+                hdr->prd_tbl = cpu_to_le64(buf_tmp_dma);
+        else
+                hdr->prd_tbl = 0;
+
+        i = sizeof(struct mvs_prd) * tei->n_elem;
+        buf_tmp += i;
+        buf_tmp_dma += i;
+
+        /* region 4: status buffer (larger the PRD, smaller this buf) ****** */
+        slot->response = buf_tmp;
+        hdr->status_buf = cpu_to_le64(buf_tmp_dma);
+
+        /*
+         * Fill in TX ring and command slot header
+         */
+        slot->tx = mvi->tx_prod;
+        mvi->tx[mvi->tx_prod] = cpu_to_le32((TXQ_CMD_SMP << TXQ_CMD_SHIFT) |
+                                        TXQ_MODE_I | tag |
+                                        (sas_port->phy_mask << TXQ_PHY_SHIFT));
+
+        hdr->flags |= flags;
+        hdr->lens = cpu_to_le32(((resp_len / 4) << 16) | ((req_len - 4) / 4));
+        hdr->tags = cpu_to_le32(tag);
+        hdr->data_len = 0;
+
+        /* generate open address frame hdr (first 12 bytes) */
+        buf_oaf[0] = (1 << 7) | (0 << 4) | 0x01; /* initiator, SMP, ftype 1h */
+        buf_oaf[1] = task->dev->linkrate & 0xf;
+        *(u16 *)(buf_oaf + 2) = 0xFFFF;         /* SAS SPEC */
+        memcpy(buf_oaf + 4, task->dev->sas_addr, SAS_ADDR_SIZE);
+
+        /* fill in PRD (scatter/gather) table, if any */
+        for_each_sg(task->scatter, sg, tei->n_elem, i) {
+                buf_prd->addr = cpu_to_le64(sg_dma_address(sg));
+                buf_prd->len = cpu_to_le32(sg_dma_len(sg));
+                buf_prd++;
+        }
+
+#if _MV_DUMP
+        /* copy cmd table */
+        from = kmap_atomic(sg_page(sg_req), KM_IRQ0);
+        memcpy(buf_cmd, from + sg_req->offset, req_len);
+        kunmap_atomic(from, KM_IRQ0);
+#endif
+        return 0;
+
+err_out_2:
+        pci_unmap_sg(mvi->pdev, &tei->task->smp_task.smp_resp, 1,
+                     PCI_DMA_FROMDEVICE);
+err_out:
+        pci_unmap_sg(mvi->pdev, &tei->task->smp_task.smp_req, 1,
+                     PCI_DMA_TODEVICE);
+        return rc;
+}
+
+static void mvs_free_reg_set(struct mvs_info *mvi, struct mvs_port *port)
+{
+        void __iomem *regs = mvi->regs;
+        u32 tmp, offs;
+        u8 *tfs = &port->taskfileset;
+
+        if (*tfs == MVS_ID_NOT_MAPPED)
+                return;
+
+        offs = 1U << ((*tfs & 0x0f) + PCS_EN_SATA_REG_SHIFT);
+        if (*tfs < 16) {
+                tmp = mr32(PCS);
+                mw32(PCS, tmp & ~offs);
+        } else {
+                tmp = mr32(CTL);
+                mw32(CTL, tmp & ~offs);
+        }
+
+        tmp = mr32(INT_STAT_SRS) & (1U << *tfs);
+        if (tmp)
+                mw32(INT_STAT_SRS, tmp);
+
+        *tfs = MVS_ID_NOT_MAPPED;
+}
+
+static u8 mvs_assign_reg_set(struct mvs_info *mvi, struct mvs_port *port)
+{
+        int i;
+        u32 tmp, offs;
+        void __iomem *regs = mvi->regs;
+
+        if (port->taskfileset != MVS_ID_NOT_MAPPED)
+                return 0;
+
+        tmp = mr32(PCS);
+
+        for (i = 0; i < mvi->chip->srs_sz; i++) {
+                if (i == 16)
+                        tmp = mr32(CTL);
+                offs = 1U << ((i & 0x0f) + PCS_EN_SATA_REG_SHIFT);
+                if (!(tmp & offs)) {
+                        port->taskfileset = i;
+
+                        if (i < 16)
+                                mw32(PCS, tmp | offs);
+                        else
+                                mw32(CTL, tmp | offs);
+                        tmp = mr32(INT_STAT_SRS) & (1U << i);
+                        if (tmp)
+                                mw32(INT_STAT_SRS, tmp);
+                        return 0;
+                }
+        }
+        return MVS_ID_NOT_MAPPED;
+}
+
+static u32 mvs_get_ncq_tag(struct sas_task *task)
+{
+        u32 tag = 0;
+        struct ata_queued_cmd *qc = task->uldd_task;
+
+        if (qc)
+                tag = qc->tag;
+
+        return tag;
+}
+
+static int mvs_task_prep_ata(struct mvs_info *mvi,
+                             struct mvs_task_exec_info *tei)
+{
+        struct sas_task *task = tei->task;
+        struct domain_device *dev = task->dev;
+        struct mvs_cmd_hdr *hdr = tei->hdr;
+        struct asd_sas_port *sas_port = dev->port;
+        struct mvs_slot_info *slot;
+        struct scatterlist *sg;
+        struct mvs_prd *buf_prd;
+        struct mvs_port *port = tei->port;
+        u32 tag = tei->tag;
+        u32 flags = (tei->n_elem << MCH_PRD_LEN_SHIFT);
+        void *buf_tmp;
+        u8 *buf_cmd, *buf_oaf;
+        dma_addr_t buf_tmp_dma;
+        u32 i, req_len, resp_len;
+        const u32 max_resp_len = SB_RFB_MAX;
+
+        if (mvs_assign_reg_set(mvi, port) == MVS_ID_NOT_MAPPED)
+                return -EBUSY;
+
+        slot = &mvi->slot_info[tag];
+        slot->tx = mvi->tx_prod;
+        mvi->tx[mvi->tx_prod] = cpu_to_le32(TXQ_MODE_I | tag |
+                                        (TXQ_CMD_STP << TXQ_CMD_SHIFT) |
+                                        (sas_port->phy_mask << TXQ_PHY_SHIFT) |
+                                        (port->taskfileset << TXQ_SRS_SHIFT));
+
+        if (task->ata_task.use_ncq)
+                flags |= MCH_FPDMA;
+        if (dev->sata_dev.command_set == ATAPI_COMMAND_SET) {
+                if (task->ata_task.fis.command != ATA_CMD_ID_ATAPI)
+                        flags |= MCH_ATAPI;
+        }
+
+        /* FIXME: fill in port multiplier number */
+
+        hdr->flags = cpu_to_le32(flags);
+
+        /* FIXME: the low order order 5 bits for the TAG if enable NCQ */
+        if (task->ata_task.use_ncq) {
+                hdr->tags = cpu_to_le32(mvs_get_ncq_tag(task));
+                /*Fill in task file */
+                task->ata_task.fis.sector_count = hdr->tags << 3;
+        } else
+                hdr->tags = cpu_to_le32(tag);
+        hdr->data_len = cpu_to_le32(task->total_xfer_len);
+
+        /*
+         * arrange MVS_SLOT_BUF_SZ-sized DMA buffer according to our needs
+         */
+
+        /* region 1: command table area (MVS_ATA_CMD_SZ bytes) ************** */
+        buf_cmd = buf_tmp = slot->buf;
+        buf_tmp_dma = slot->buf_dma;
+
+        hdr->cmd_tbl = cpu_to_le64(buf_tmp_dma);
+
+        buf_tmp += MVS_ATA_CMD_SZ;
+        buf_tmp_dma += MVS_ATA_CMD_SZ;
+#if _MV_DUMP
+        slot->cmd_size = MVS_ATA_CMD_SZ;
+#endif
+
+        /* region 2: open address frame area (MVS_OAF_SZ bytes) ********* */
+        /* used for STP.  unused for SATA? */
+        buf_oaf = buf_tmp;
+        hdr->open_frame = cpu_to_le64(buf_tmp_dma);
+
+        buf_tmp += MVS_OAF_SZ;
+        buf_tmp_dma += MVS_OAF_SZ;
+
+        /* region 3: PRD table ********************************************* */
+        buf_prd = buf_tmp;
+        if (tei->n_elem)
+                hdr->prd_tbl = cpu_to_le64(buf_tmp_dma);
+        else
+                hdr->prd_tbl = 0;
+
+        i = sizeof(struct mvs_prd) * tei->n_elem;
+        buf_tmp += i;
+        buf_tmp_dma += i;
+
+        /* region 4: status buffer (larger the PRD, smaller this buf) ****** */
+        /* FIXME: probably unused, for SATA.  kept here just in case
+         * we get a STP/SATA error information record
+         */
+        slot->response = buf_tmp;
+        hdr->status_buf = cpu_to_le64(buf_tmp_dma);
+
+        req_len = sizeof(struct host_to_dev_fis);
+        resp_len = MVS_SLOT_BUF_SZ - MVS_ATA_CMD_SZ -
+            sizeof(struct mvs_err_info) - i;
+
+        /* request, response lengths */
+        resp_len = min(resp_len, max_resp_len);
+        hdr->lens = cpu_to_le32(((resp_len / 4) << 16) | (req_len / 4));
+
+        task->ata_task.fis.flags |= 0x80; /* C=1: update ATA cmd reg */
+        /* fill in command FIS and ATAPI CDB */
+        memcpy(buf_cmd, &task->ata_task.fis, sizeof(struct host_to_dev_fis));
+        if (dev->sata_dev.command_set == ATAPI_COMMAND_SET)
+                memcpy(buf_cmd + STP_ATAPI_CMD,
+                        task->ata_task.atapi_packet, 16);
+
+        /* generate open address frame hdr (first 12 bytes) */
+        buf_oaf[0] = (1 << 7) | (2 << 4) | 0x1; /* initiator, STP, ftype 1h */
+        buf_oaf[1] = task->dev->linkrate & 0xf;
+        *(u16 *)(buf_oaf + 2) = cpu_to_be16(tag);
+        memcpy(buf_oaf + 4, task->dev->sas_addr, SAS_ADDR_SIZE);
+
+        /* fill in PRD (scatter/gather) table, if any */
+        for_each_sg(task->scatter, sg, tei->n_elem, i) {
+                buf_prd->addr = cpu_to_le64(sg_dma_address(sg));
+                buf_prd->len = cpu_to_le32(sg_dma_len(sg));
+                buf_prd++;
+        }
+
+        return 0;
+}
+
+static int mvs_task_prep_ssp(struct mvs_info *mvi,
+                             struct mvs_task_exec_info *tei)
+{
+        struct sas_task *task = tei->task;
+        struct mvs_cmd_hdr *hdr = tei->hdr;
+        struct mvs_port *port = tei->port;
+        struct mvs_slot_info *slot;
+        struct scatterlist *sg;
+        struct mvs_prd *buf_prd;
+        struct ssp_frame_hdr *ssp_hdr;
+        void *buf_tmp;
+        u8 *buf_cmd, *buf_oaf, fburst = 0;
+        dma_addr_t buf_tmp_dma;
+        u32 flags;
+        u32 resp_len, req_len, i, tag = tei->tag;
+        const u32 max_resp_len = SB_RFB_MAX;
+
+        slot = &mvi->slot_info[tag];
+
+        slot->tx = mvi->tx_prod;
+        mvi->tx[mvi->tx_prod] = cpu_to_le32(TXQ_MODE_I | tag |
+                                (TXQ_CMD_SSP << TXQ_CMD_SHIFT) |
+                                (port->wide_port_phymap << TXQ_PHY_SHIFT));
+
+        flags = MCH_RETRY;
+        if (task->ssp_task.enable_first_burst) {
+                flags |= MCH_FBURST;
+                fburst = (1 << 7);
+        }
+        hdr->flags = cpu_to_le32(flags |
+                                 (tei->n_elem << MCH_PRD_LEN_SHIFT) |
+                                 (MCH_SSP_FR_CMD << MCH_SSP_FR_TYPE_SHIFT));
+
+        hdr->tags = cpu_to_le32(tag);
+        hdr->data_len = cpu_to_le32(task->total_xfer_len);
+
+        /*
+         * arrange MVS_SLOT_BUF_SZ-sized DMA buffer according to our needs
+         */
+
+        /* region 1: command table area (MVS_SSP_CMD_SZ bytes) ************** */
+        buf_cmd = buf_tmp = slot->buf;
+        buf_tmp_dma = slot->buf_dma;
+
+        hdr->cmd_tbl = cpu_to_le64(buf_tmp_dma);
+
+        buf_tmp += MVS_SSP_CMD_SZ;
+        buf_tmp_dma += MVS_SSP_CMD_SZ;
+#if _MV_DUMP
+        slot->cmd_size = MVS_SSP_CMD_SZ;
+#endif
+
+        /* region 2: open address frame area (MVS_OAF_SZ bytes) ********* */
+        buf_oaf = buf_tmp;
+        hdr->open_frame = cpu_to_le64(buf_tmp_dma);
+
+        buf_tmp += MVS_OAF_SZ;
+        buf_tmp_dma += MVS_OAF_SZ;
+
+        /* region 3: PRD table ********************************************* */
+        buf_prd = buf_tmp;
+        if (tei->n_elem)
+                hdr->prd_tbl = cpu_to_le64(buf_tmp_dma);
+        else
+                hdr->prd_tbl = 0;
+
+        i = sizeof(struct mvs_prd) * tei->n_elem;
+        buf_tmp += i;
+        buf_tmp_dma += i;
+
+        /* region 4: status buffer (larger the PRD, smaller this buf) ****** */
+        slot->response = buf_tmp;
+        hdr->status_buf = cpu_to_le64(buf_tmp_dma);
+
+        resp_len = MVS_SLOT_BUF_SZ - MVS_SSP_CMD_SZ - MVS_OAF_SZ -
+            sizeof(struct mvs_err_info) - i;
+        resp_len = min(resp_len, max_resp_len);
+
+        req_len = sizeof(struct ssp_frame_hdr) + 28;
+
+        /* request, response lengths */
+        hdr->lens = cpu_to_le32(((resp_len / 4) << 16) | (req_len / 4));
+
+        /* generate open address frame hdr (first 12 bytes) */
+        buf_oaf[0] = (1 << 7) | (1 << 4) | 0x1; /* initiator, SSP, ftype 1h */
+        buf_oaf[1] = task->dev->linkrate & 0xf;
+        *(u16 *)(buf_oaf + 2) = cpu_to_be16(tag);
+        memcpy(buf_oaf + 4, task->dev->sas_addr, SAS_ADDR_SIZE);
+
+        /* fill in SSP frame header (Command Table.SSP frame header) */
+        ssp_hdr = (struct ssp_frame_hdr *)buf_cmd;
+        ssp_hdr->frame_type = SSP_COMMAND;
+        memcpy(ssp_hdr->hashed_dest_addr, task->dev->hashed_sas_addr,
+               HASHED_SAS_ADDR_SIZE);
+        memcpy(ssp_hdr->hashed_src_addr,
+               task->dev->port->ha->hashed_sas_addr, HASHED_SAS_ADDR_SIZE);
+        ssp_hdr->tag = cpu_to_be16(tag);
+
+        /* fill in command frame IU */
+        buf_cmd += sizeof(*ssp_hdr);
+        memcpy(buf_cmd, &task->ssp_task.LUN, 8);
+        buf_cmd[9] = fburst | task->ssp_task.task_attr |
+                        (task->ssp_task.task_prio << 3);
+        memcpy(buf_cmd + 12, &task->ssp_task.cdb, 16);
+
+        /* fill in PRD (scatter/gather) table, if any */
+        for_each_sg(task->scatter, sg, tei->n_elem, i) {
+                buf_prd->addr = cpu_to_le64(sg_dma_address(sg));
+                buf_prd->len = cpu_to_le32(sg_dma_len(sg));
+                buf_prd++;
+        }
+
+        return 0;
+}
+
+static int mvs_task_exec(struct sas_task *task, const int num, gfp_t gfp_flags)
+{
+        struct domain_device *dev = task->dev;
+        struct mvs_info *mvi = dev->port->ha->lldd_ha;
+        struct pci_dev *pdev = mvi->pdev;
+        void __iomem *regs = mvi->regs;
+        struct mvs_task_exec_info tei;
+        struct sas_task *t = task;
+        u32 tag = 0xdeadbeef, rc, n_elem = 0;
+        unsigned long flags;
+        u32 n = num, pass = 0;
+
+        spin_lock_irqsave(&mvi->lock, flags);
+
+        do {
+                tei.port = &mvi->port[dev->port->id];
+
+                if (!tei.port->port_attached) {
+                        struct task_status_struct *ts = &t->task_status;
+                        ts->stat = SAS_PHY_DOWN;
+                        t->task_done(t);
+                        rc = 0;
+                        goto exec_exit;
+                }
+                if (!sas_protocol_ata(t->task_proto)) {
+                        if (t->num_scatter) {
+                                n_elem = pci_map_sg(mvi->pdev, t->scatter,
+                                                    t->num_scatter,
+                                                    t->data_dir);
+                                if (!n_elem) {
+                                        rc = -ENOMEM;
+                                        goto err_out;
+                                }
+                        }
+                } else {
+                        n_elem = t->num_scatter;
+                }
+
+                rc = mvs_tag_alloc(mvi, &tag);
+                if (rc)
+                        goto err_out;
+
+                mvi->slot_info[tag].task = t;
+                mvi->slot_info[tag].n_elem = n_elem;
+                memset(mvi->slot_info[tag].buf, 0, MVS_SLOT_BUF_SZ);
+                tei.task = t;
+                tei.hdr = &mvi->slot[tag];
+                tei.tag = tag;
+                tei.n_elem = n_elem;
+
+                switch (t->task_proto) {
+                case SAS_PROTOCOL_SMP:
+                        rc = mvs_task_prep_smp(mvi, &tei);
+                        break;
+                case SAS_PROTOCOL_SSP:
+                        rc = mvs_task_prep_ssp(mvi, &tei);
+                        break;
+                case SAS_PROTOCOL_SATA:
+                case SAS_PROTOCOL_STP:
+                case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:
+                        rc = mvs_task_prep_ata(mvi, &tei);
+                        break;
+                default:
+                        dev_printk(KERN_ERR, &pdev->dev,
+                                "unknown sas_task proto: 0x%x\n",
+                                t->task_proto);
+                        rc = -EINVAL;
+                        break;
+                }
+
+                if (rc)
+                        goto err_out_tag;
+
+                /* TODO: select normal or high priority */
+
+                spin_lock(&t->task_state_lock);
+                t->task_state_flags |= SAS_TASK_AT_INITIATOR;
+                spin_unlock(&t->task_state_lock);
+
+                if (n == 1) {
+                        spin_unlock_irqrestore(&mvi->lock, flags);
+                        mw32(TX_PROD_IDX, mvi->tx_prod);
+                }
+                mvs_hba_memory_dump(mvi, tag, t->task_proto);
+
+                ++pass;
+                mvi->tx_prod = (mvi->tx_prod + 1) & (MVS_CHIP_SLOT_SZ - 1);
+
+                if (n == 1)
+                        break;
+
+                t = list_entry(t->list.next, struct sas_task, list);
+        } while (--n);
+
+        return 0;
+
+err_out_tag:
+        mvs_tag_free(mvi, tag);
+err_out:
+        dev_printk(KERN_ERR, &pdev->dev, "mvsas exec failed[%d]!\n", rc);
+        if (!sas_protocol_ata(t->task_proto))
+                if (n_elem)
+                        pci_unmap_sg(mvi->pdev, t->scatter, n_elem,
+                                     t->data_dir);
+exec_exit:
+        if (pass)
+                mw32(TX_PROD_IDX, (mvi->tx_prod - 1) & (MVS_CHIP_SLOT_SZ - 1));
+        spin_unlock_irqrestore(&mvi->lock, flags);
+        return rc;
+}
+
+static int mvs_task_abort(struct sas_task *task)
+{
+        int rc = 1;
+        unsigned long flags;
+        struct mvs_info *mvi = task->dev->port->ha->lldd_ha;
+        struct pci_dev *pdev = mvi->pdev;
+
+        spin_lock_irqsave(&task->task_state_lock, flags);
+        if (task->task_state_flags & SAS_TASK_STATE_DONE) {
+                rc = TMF_RESP_FUNC_COMPLETE;
+                goto out_done;
+        }
+        spin_unlock_irqrestore(&task->task_state_lock, flags);
+
+        /*FIXME*/
+        rc = TMF_RESP_FUNC_COMPLETE;
+
+        switch (task->task_proto) {
+        case SAS_PROTOCOL_SMP:
+                dev_printk(KERN_DEBUG, &pdev->dev, "SMP Abort! ");
+                break;
+        case SAS_PROTOCOL_SSP:
+                dev_printk(KERN_DEBUG, &pdev->dev, "SSP Abort! ");
+                break;
+        case SAS_PROTOCOL_SATA:
+        case SAS_PROTOCOL_STP:
+        case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:{
+                dev_printk(KERN_DEBUG, &pdev->dev, "STP Abort! "
+                        "Dump D2H FIS: \n");
+                mvs_hexdump(sizeof(struct host_to_dev_fis),
+                                (void *)&task->ata_task.fis, 0);
+                dev_printk(KERN_DEBUG, &pdev->dev, "Dump ATAPI Cmd : \n");
+                mvs_hexdump(16, task->ata_task.atapi_packet, 0);
+                break;
+        }
+        default:
+                break;
+        }
+out_done:
+        return rc;
+}
+
+static void mvs_free(struct mvs_info *mvi)
+{
+        int i;
+
+        if (!mvi)
+                return;
+
+        for (i = 0; i < MVS_SLOTS; i++) {
+                struct mvs_slot_info *slot = &mvi->slot_info[i];
+
+                if (slot->buf)
+                        dma_free_coherent(&mvi->pdev->dev, MVS_SLOT_BUF_SZ,
+                                          slot->buf, slot->buf_dma);
+        }
+
+        if (mvi->tx)
+                dma_free_coherent(&mvi->pdev->dev,
+                                  sizeof(*mvi->tx) * MVS_CHIP_SLOT_SZ,
+                                  mvi->tx, mvi->tx_dma);
+        if (mvi->rx_fis)
+                dma_free_coherent(&mvi->pdev->dev, MVS_RX_FISL_SZ,
+                                  mvi->rx_fis, mvi->rx_fis_dma);
+        if (mvi->rx)
+                dma_free_coherent(&mvi->pdev->dev,
+                                  sizeof(*mvi->rx) * MVS_RX_RING_SZ,
+                                  mvi->rx, mvi->rx_dma);
+        if (mvi->slot)
+                dma_free_coherent(&mvi->pdev->dev,
+                                  sizeof(*mvi->slot) * MVS_SLOTS,
+                                  mvi->slot, mvi->slot_dma);
+#ifdef MVS_ENABLE_PERI
+        if (mvi->peri_regs)
+                iounmap(mvi->peri_regs);
+#endif
+        if (mvi->regs)
+                iounmap(mvi->regs);
+        if (mvi->shost)
+                scsi_host_put(mvi->shost);
+        kfree(mvi->sas.sas_port);
+        kfree(mvi->sas.sas_phy);
+        kfree(mvi);
+}
+
+/* FIXME: locking? */
+static int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
+                           void *funcdata)
+{
+        struct mvs_info *mvi = sas_phy->ha->lldd_ha;
+        int rc = 0, phy_id = sas_phy->id;
+        u32 tmp;
+
+        tmp = mvs_read_phy_ctl(mvi, phy_id);
+
+        switch (func) {
+        case PHY_FUNC_SET_LINK_RATE:{
+                        struct sas_phy_linkrates *rates = funcdata;
+                        u32 lrmin = 0, lrmax = 0;
+
+                        lrmin = (rates->minimum_linkrate << 8);
+                        lrmax = (rates->maximum_linkrate << 12);
+
+                        if (lrmin) {
+                                tmp &= ~(0xf << 8);
+                                tmp |= lrmin;
+                        }
+                        if (lrmax) {
+                                tmp &= ~(0xf << 12);
+                                tmp |= lrmax;
+                        }
+                        mvs_write_phy_ctl(mvi, phy_id, tmp);
+                        break;
+                }
+
+        case PHY_FUNC_HARD_RESET:
+                if (tmp & PHY_RST_HARD)
+                        break;
+                mvs_write_phy_ctl(mvi, phy_id, tmp | PHY_RST_HARD);
+                break;
+
+        case PHY_FUNC_LINK_RESET:
+                mvs_write_phy_ctl(mvi, phy_id, tmp | PHY_RST);
+                break;
+
+        case PHY_FUNC_DISABLE:
+        case PHY_FUNC_RELEASE_SPINUP_HOLD:
+        default:
+                rc = -EOPNOTSUPP;
+        }
+
+        return rc;
+}
+
+static void __devinit mvs_phy_init(struct mvs_info *mvi, int phy_id)
+{
+        struct mvs_phy *phy = &mvi->phy[phy_id];
+        struct asd_sas_phy *sas_phy = &phy->sas_phy;
+
+        sas_phy->enabled = (phy_id < mvi->chip->n_phy) ? 1 : 0;
+        sas_phy->class = SAS;
+        sas_phy->iproto = SAS_PROTOCOL_ALL;
+        sas_phy->tproto = 0;
+        sas_phy->type = PHY_TYPE_PHYSICAL;
+        sas_phy->role = PHY_ROLE_INITIATOR;
+        sas_phy->oob_mode = OOB_NOT_CONNECTED;
+        sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
+
+        sas_phy->id = phy_id;
+        sas_phy->sas_addr = &mvi->sas_addr[0];
+        sas_phy->frame_rcvd = &phy->frame_rcvd[0];
+        sas_phy->ha = &mvi->sas;
+        sas_phy->lldd_phy = phy;
+}
+
+static struct mvs_info *__devinit mvs_alloc(struct pci_dev *pdev,
+                                            const struct pci_device_id *ent)
+{
+        struct mvs_info *mvi;
+        unsigned long res_start, res_len, res_flag;
+        struct asd_sas_phy **arr_phy;
+        struct asd_sas_port **arr_port;
+        const struct mvs_chip_info *chip = &mvs_chips[ent->driver_data];
+        int i;
+
+        /*
+         * alloc and init our per-HBA mvs_info struct
+         */
+
+        mvi = kzalloc(sizeof(*mvi), GFP_KERNEL);
+        if (!mvi)
+                return NULL;
+
+        spin_lock_init(&mvi->lock);
+        mvi->pdev = pdev;
+        mvi->chip = chip;
+
+        if (pdev->device == 0x6440 && pdev->revision == 0)
+                mvi->flags |= MVF_PHY_PWR_FIX;
+
+        /*
+         * alloc and init SCSI, SAS glue
+         */
+
+        mvi->shost = scsi_host_alloc(&mvs_sht, sizeof(void *));
+        if (!mvi->shost)
+                goto err_out;
+
+        arr_phy = kcalloc(MVS_MAX_PHYS, sizeof(void *), GFP_KERNEL);
+        arr_port = kcalloc(MVS_MAX_PHYS, sizeof(void *), GFP_KERNEL);
+        if (!arr_phy || !arr_port)
+                goto err_out;
+
+        for (i = 0; i < MVS_MAX_PHYS; i++) {
+                mvs_phy_init(mvi, i);
+                arr_phy[i] = &mvi->phy[i].sas_phy;
+                arr_port[i] = &mvi->port[i].sas_port;
+        }
+
+        SHOST_TO_SAS_HA(mvi->shost) = &mvi->sas;
+        mvi->shost->transportt = mvs_stt;
+        mvi->shost->max_id = 21;
+        mvi->shost->max_lun = ~0;
+        mvi->shost->max_channel = 0;
+        mvi->shost->max_cmd_len = 16;
+
+        mvi->sas.sas_ha_name = DRV_NAME;
+        mvi->sas.dev = &pdev->dev;
+        mvi->sas.lldd_module = THIS_MODULE;
+        mvi->sas.sas_addr = &mvi->sas_addr[0];
+        mvi->sas.sas_phy = arr_phy;
+        mvi->sas.sas_port = arr_port;
+        mvi->sas.num_phys = chip->n_phy;
+        mvi->sas.lldd_max_execute_num = MVS_CHIP_SLOT_SZ - 1;
+        mvi->sas.lldd_queue_size = MVS_QUEUE_SIZE;
+        mvi->can_queue = (MVS_CHIP_SLOT_SZ >> 1) - 1;
+        mvi->sas.lldd_ha = mvi;
+        mvi->sas.core.shost = mvi->shost;
+
+        mvs_tag_init(mvi);
+
+        /*
+         * ioremap main and peripheral registers
+         */
+
+#ifdef MVS_ENABLE_PERI
+        res_start = pci_resource_start(pdev, 2);
+        res_len = pci_resource_len(pdev, 2);
+        if (!res_start || !res_len)
+                goto err_out;
+
+        mvi->peri_regs = ioremap_nocache(res_start, res_len);
+        if (!mvi->peri_regs)
+                goto err_out;
+#endif
+
+        res_start = pci_resource_start(pdev, 4);
+        res_len = pci_resource_len(pdev, 4);
+        if (!res_start || !res_len)
+                goto err_out;
+
+        res_flag = pci_resource_flags(pdev, 4);
+        if (res_flag & IORESOURCE_CACHEABLE)
+                mvi->regs = ioremap(res_start, res_len);
+        else
+                mvi->regs = ioremap_nocache(res_start, res_len);
+
+        if (!mvi->regs)
+                goto err_out;
+
+        /*
+         * alloc and init our DMA areas
+         */
+
+        mvi->tx = dma_alloc_coherent(&pdev->dev,
+                                     sizeof(*mvi->tx) * MVS_CHIP_SLOT_SZ,
+                                     &mvi->tx_dma, GFP_KERNEL);
+        if (!mvi->tx)
+                goto err_out;
+        memset(mvi->tx, 0, sizeof(*mvi->tx) * MVS_CHIP_SLOT_SZ);
+
+        mvi->rx_fis = dma_alloc_coherent(&pdev->dev, MVS_RX_FISL_SZ,
+                                         &mvi->rx_fis_dma, GFP_KERNEL);
+        if (!mvi->rx_fis)
+                goto err_out;
+        memset(mvi->rx_fis, 0, MVS_RX_FISL_SZ);
+
+        mvi->rx = dma_alloc_coherent(&pdev->dev,
+                                     sizeof(*mvi->rx) * MVS_RX_RING_SZ,
+                                     &mvi->rx_dma, GFP_KERNEL);
+        if (!mvi->rx)
+                goto err_out;
+        memset(mvi->rx, 0, sizeof(*mvi->rx) * MVS_RX_RING_SZ);
+
+        mvi->rx[0] = cpu_to_le32(0xfff);
+        mvi->rx_cons = 0xfff;
+
+        mvi->slot = dma_alloc_coherent(&pdev->dev,
+                                       sizeof(*mvi->slot) * MVS_SLOTS,
+                                       &mvi->slot_dma, GFP_KERNEL);
+        if (!mvi->slot)
+                goto err_out;
+        memset(mvi->slot, 0, sizeof(*mvi->slot) * MVS_SLOTS);
+
+        for (i = 0; i < MVS_SLOTS; i++) {
+                struct mvs_slot_info *slot = &mvi->slot_info[i];
+
+                slot->buf = dma_alloc_coherent(&pdev->dev, MVS_SLOT_BUF_SZ,
+                                               &slot->buf_dma, GFP_KERNEL);
+                if (!slot->buf)
+                        goto err_out;
+                memset(slot->buf, 0, MVS_SLOT_BUF_SZ);
+        }
+
+        /* finally, read NVRAM to get our SAS address */
+        if (mvs_nvram_read(mvi, NVR_SAS_ADDR, &mvi->sas_addr, 8))
+                goto err_out;
+        return mvi;
+
+err_out:
+        mvs_free(mvi);
+        return NULL;
+}
+
+static u32 mvs_cr32(void __iomem *regs, u32 addr)
+{
+        mw32(CMD_ADDR, addr);
+        return mr32(CMD_DATA);
+}
+
+static void mvs_cw32(void __iomem *regs, u32 addr, u32 val)
+{
+        mw32(CMD_ADDR, addr);
+        mw32(CMD_DATA, val);
+}
+
+static u32 mvs_read_phy_ctl(struct mvs_info *mvi, u32 port)
+{
+        void __iomem *regs = mvi->regs;
+        return (port < 4)?mr32(P0_SER_CTLSTAT + port * 4):
+                mr32(P4_SER_CTLSTAT + (port - 4) * 4);
+}
+
+static void mvs_write_phy_ctl(struct mvs_info *mvi, u32 port, u32 val)
+{
+        void __iomem *regs = mvi->regs;
+        if (port < 4)
+                mw32(P0_SER_CTLSTAT + port * 4, val);
+        else
+                mw32(P4_SER_CTLSTAT + (port - 4) * 4, val);
+}
+
+static u32 mvs_read_port(struct mvs_info *mvi, u32 off, u32 off2, u32 port)
+{
+        void __iomem *regs = mvi->regs + off;
+        void __iomem *regs2 = mvi->regs + off2;
+        return (port < 4)?readl(regs + port * 8):
+                readl(regs2 + (port - 4) * 8);
+}
+
+static void mvs_write_port(struct mvs_info *mvi, u32 off, u32 off2,
+                                u32 port, u32 val)
+{
+        void __iomem *regs = mvi->regs + off;
+        void __iomem *regs2 = mvi->regs + off2;
+        if (port < 4)
+                writel(val, regs + port * 8);
+        else
+                writel(val, regs2 + (port - 4) * 8);
+}
+
+static u32 mvs_read_port_cfg_data(struct mvs_info *mvi, u32 port)
+{
+        return mvs_read_port(mvi, MVS_P0_CFG_DATA, MVS_P4_CFG_DATA, port);
+}
+
+static void mvs_write_port_cfg_data(struct mvs_info *mvi, u32 port, u32 val)
+{
+        mvs_write_port(mvi, MVS_P0_CFG_DATA, MVS_P4_CFG_DATA, port, val);
+}
+
+static void mvs_write_port_cfg_addr(struct mvs_info *mvi, u32 port, u32 addr)
+{
+        mvs_write_port(mvi, MVS_P0_CFG_ADDR, MVS_P4_CFG_ADDR, port, addr);
+}
+
+static u32 mvs_read_port_vsr_data(struct mvs_info *mvi, u32 port)
+{
+        return mvs_read_port(mvi, MVS_P0_VSR_DATA, MVS_P4_VSR_DATA, port);
+}
+
+static void mvs_write_port_vsr_data(struct mvs_info *mvi, u32 port, u32 val)
+{
+        mvs_write_port(mvi, MVS_P0_VSR_DATA, MVS_P4_VSR_DATA, port, val);
+}
+
+static void mvs_write_port_vsr_addr(struct mvs_info *mvi, u32 port, u32 addr)
+{
+        mvs_write_port(mvi, MVS_P0_VSR_ADDR, MVS_P4_VSR_ADDR, port, addr);
+}
+
+static u32 mvs_read_port_irq_stat(struct mvs_info *mvi, u32 port)
+{
+        return mvs_read_port(mvi, MVS_P0_INT_STAT, MVS_P4_INT_STAT, port);
+}
+
+static void mvs_write_port_irq_stat(struct mvs_info *mvi, u32 port, u32 val)
+{
+        mvs_write_port(mvi, MVS_P0_INT_STAT, MVS_P4_INT_STAT, port, val);
+}
+
+static u32 mvs_read_port_irq_mask(struct mvs_info *mvi, u32 port)
+{
+        return mvs_read_port(mvi, MVS_P0_INT_MASK, MVS_P4_INT_MASK, port);
+}
+
+static void mvs_write_port_irq_mask(struct mvs_info *mvi, u32 port, u32 val)
+{
+        mvs_write_port(mvi, MVS_P0_INT_MASK, MVS_P4_INT_MASK, port, val);
+}
+
+static void __devinit mvs_phy_hacks(struct mvs_info *mvi)
+{
+        void __iomem *regs = mvi->regs;
+        u32 tmp;
+
+        /* workaround for SATA R-ERR, to ignore phy glitch */
+        tmp = mvs_cr32(regs, CMD_PHY_TIMER);
+        tmp &= ~(1 << 9);
+        tmp |= (1 << 10);
+        mvs_cw32(regs, CMD_PHY_TIMER, tmp);
+
+        /* enable retry 127 times */
+        mvs_cw32(regs, CMD_SAS_CTL1, 0x7f7f);
+
+        /* extend open frame timeout to max */
+        tmp = mvs_cr32(regs, CMD_SAS_CTL0);
+        tmp &= ~0xffff;
+        tmp |= 0x3fff;
+        mvs_cw32(regs, CMD_SAS_CTL0, tmp);
+
+        /* workaround for WDTIMEOUT , set to 550 ms */
+        mvs_cw32(regs, CMD_WD_TIMER, 0xffffff);
+
+        /* not to halt for different port op during wideport link change */
+        mvs_cw32(regs, CMD_APP_ERR_CONFIG, 0xffefbf7d);
+
+        /* workaround for Seagate disk not-found OOB sequence, recv
+         * COMINIT before sending out COMWAKE */
+        tmp = mvs_cr32(regs, CMD_PHY_MODE_21);
+        tmp &= 0x0000ffff;
+        tmp |= 0x00fa0000;
+        mvs_cw32(regs, CMD_PHY_MODE_21, tmp);
+
+        tmp = mvs_cr32(regs, CMD_PHY_TIMER);
+        tmp &= 0x1fffffff;
+        tmp |= (2U << 29);      /* 8 ms retry */
+        mvs_cw32(regs, CMD_PHY_TIMER, tmp);
+
+        /* TEST - for phy decoding error, adjust voltage levels */
+        mw32(P0_VSR_ADDR + 0, 0x8);
+        mw32(P0_VSR_DATA + 0, 0x2F0);
+
+        mw32(P0_VSR_ADDR + 8, 0x8);
+        mw32(P0_VSR_DATA + 8, 0x2F0);
+
+        mw32(P0_VSR_ADDR + 16, 0x8);
+        mw32(P0_VSR_DATA + 16, 0x2F0);
+
+        mw32(P0_VSR_ADDR + 24, 0x8);
+        mw32(P0_VSR_DATA + 24, 0x2F0);
+
+}
+
+static void mvs_enable_xmt(struct mvs_info *mvi, int PhyId)
+{
+        void __iomem *regs = mvi->regs;
+        u32 tmp;
+
+        tmp = mr32(PCS);
+        if (mvi->chip->n_phy <= 4)
+                tmp |= 1 << (PhyId + PCS_EN_PORT_XMT_SHIFT);
+        else
+                tmp |= 1 << (PhyId + PCS_EN_PORT_XMT_SHIFT2);
+        mw32(PCS, tmp);
+}
+
+static void mvs_detect_porttype(struct mvs_info *mvi, int i)
+{
+        void __iomem *regs = mvi->regs;
+        u32 reg;
+        struct mvs_phy *phy = &mvi->phy[i];
+
+        /* TODO check & save device type */
+        reg = mr32(GBL_PORT_TYPE);
+
+        if (reg & MODE_SAS_SATA & (1 << i))
+                phy->phy_type |= PORT_TYPE_SAS;
+        else
+                phy->phy_type |= PORT_TYPE_SATA;
+}
+
+static void *mvs_get_d2h_reg(struct mvs_info *mvi, int i, void *buf)
+{
+        u32 *s = (u32 *) buf;
+
+        if (!s)
+                return NULL;
+
+        mvs_write_port_cfg_addr(mvi, i, PHYR_SATA_SIG3);
+        s[3] = mvs_read_port_cfg_data(mvi, i);
+
+        mvs_write_port_cfg_addr(mvi, i, PHYR_SATA_SIG2);
+        s[2] = mvs_read_port_cfg_data(mvi, i);
+
+        mvs_write_port_cfg_addr(mvi, i, PHYR_SATA_SIG1);
+        s[1] = mvs_read_port_cfg_data(mvi, i);
+
+        mvs_write_port_cfg_addr(mvi, i, PHYR_SATA_SIG0);
+        s[0] = mvs_read_port_cfg_data(mvi, i);
+
+        return (void *)s;
+}
+
+static u32 mvs_is_sig_fis_received(u32 irq_status)
+{
+        return irq_status & PHYEV_SIG_FIS;
+}
+
+static void mvs_update_wideport(struct mvs_info *mvi, int i)
+{
+        struct mvs_phy *phy = &mvi->phy[i];
+        struct mvs_port *port = phy->port;
+        int j, no;
+
+        for_each_phy(port->wide_port_phymap, no, j, mvi->chip->n_phy)
+                if (no & 1) {
+                        mvs_write_port_cfg_addr(mvi, no, PHYR_WIDE_PORT);
+                        mvs_write_port_cfg_data(mvi, no,
+                                                port->wide_port_phymap);
+                } else {
+                        mvs_write_port_cfg_addr(mvi, no, PHYR_WIDE_PORT);
+                        mvs_write_port_cfg_data(mvi, no, 0);
+                }
+}
+
+static u32 mvs_is_phy_ready(struct mvs_info *mvi, int i)
+{
+        u32 tmp;
+        struct mvs_phy *phy = &mvi->phy[i];
+        struct mvs_port *port;
+
+        tmp = mvs_read_phy_ctl(mvi, i);
+
+        if ((tmp & PHY_READY_MASK) && !(phy->irq_status & PHYEV_POOF)) {
+                if (!phy->port)
+                        phy->phy_attached = 1;
+                return tmp;
+        }
+
+        port = phy->port;
+        if (port) {
+                if (phy->phy_type & PORT_TYPE_SAS) {
+                        port->wide_port_phymap &= ~(1U << i);
+                        if (!port->wide_port_phymap)
+                                port->port_attached = 0;
+                        mvs_update_wideport(mvi, i);
+                } else if (phy->phy_type & PORT_TYPE_SATA)
+                        port->port_attached = 0;
+                mvs_free_reg_set(mvi, phy->port);
+                phy->port = NULL;
+                phy->phy_attached = 0;
+                phy->phy_type &= ~(PORT_TYPE_SAS | PORT_TYPE_SATA);
+        }
+        return 0;
+}
+
+static void mvs_update_phyinfo(struct mvs_info *mvi, int i,
+                                        int get_st)
+{
+        struct mvs_phy *phy = &mvi->phy[i];
+        struct pci_dev *pdev = mvi->pdev;
+        u32 tmp, j;
+        u64 tmp64;
+
+        mvs_write_port_cfg_addr(mvi, i, PHYR_IDENTIFY);
+        phy->dev_info = mvs_read_port_cfg_data(mvi, i);
+
+        mvs_write_port_cfg_addr(mvi, i, PHYR_ADDR_HI);
+        phy->dev_sas_addr = (u64) mvs_read_port_cfg_data(mvi, i) << 32;
+
+        mvs_write_port_cfg_addr(mvi, i, PHYR_ADDR_LO);
+        phy->dev_sas_addr |= mvs_read_port_cfg_data(mvi, i);
+
+        if (get_st) {
+                phy->irq_status = mvs_read_port_irq_stat(mvi, i);
+                phy->phy_status = mvs_is_phy_ready(mvi, i);
+        }
+
+        if (phy->phy_status) {
+                u32 phy_st;
+                struct asd_sas_phy *sas_phy = mvi->sas.sas_phy[i];
+
+                mvs_write_port_cfg_addr(mvi, i, PHYR_PHY_STAT);
+                phy_st = mvs_read_port_cfg_data(mvi, i);
+
+                sas_phy->linkrate =
+                        (phy->phy_status & PHY_NEG_SPP_PHYS_LINK_RATE_MASK) >>
+                                PHY_NEG_SPP_PHYS_LINK_RATE_MASK_OFFSET;
+
+                /* Updated attached_sas_addr */
+                mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_ADDR_HI);
+                phy->att_dev_sas_addr =
+                                (u64) mvs_read_port_cfg_data(mvi, i) << 32;
+
+                mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_ADDR_LO);
+                phy->att_dev_sas_addr |= mvs_read_port_cfg_data(mvi, i);
+
+                dev_printk(KERN_DEBUG, &pdev->dev,
+                        "phy[%d] Get Attached Address 0x%llX ,"
+                        " SAS Address 0x%llX\n",
+                        i, phy->att_dev_sas_addr, phy->dev_sas_addr);
+                dev_printk(KERN_DEBUG, &pdev->dev,
+                        "Rate = %x , type = %d\n",
+                        sas_phy->linkrate, phy->phy_type);
+
+#if 1
+                /*
+                * If the device is capable of supporting a wide port
+                * on its phys, it may configure the phys as a wide port.
+                */
+                if (phy->phy_type & PORT_TYPE_SAS)
+                        for (j = 0; j < mvi->chip->n_phy && j != i; ++j) {
+                                if ((mvi->phy[j].phy_attached) &&
+                                        (mvi->phy[j].phy_type & PORT_TYPE_SAS))
+                                        if (phy->att_dev_sas_addr ==
+                                        mvi->phy[j].att_dev_sas_addr - 1) {
+                                                phy->att_dev_sas_addr =
+                                                mvi->phy[j].att_dev_sas_addr;
+                                                break;
+                                        }
+                        }
+
+#endif
+
+                tmp64 = cpu_to_be64(phy->att_dev_sas_addr);
+                memcpy(sas_phy->attached_sas_addr, &tmp64, SAS_ADDR_SIZE);
+
+                if (phy->phy_type & PORT_TYPE_SAS) {
+                        mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_DEV_INFO);
+                        phy->att_dev_info = mvs_read_port_cfg_data(mvi, i);
+                        phy->identify.device_type =
+                            phy->att_dev_info & PORT_DEV_TYPE_MASK;
+
+                        if (phy->identify.device_type == SAS_END_DEV)
+                                phy->identify.target_port_protocols =
+                                                        SAS_PROTOCOL_SSP;
+                        else if (phy->identify.device_type != NO_DEVICE)
+                                phy->identify.target_port_protocols =
+                                                        SAS_PROTOCOL_SMP;
+                        if (phy_st & PHY_OOB_DTCTD)
+                                sas_phy->oob_mode = SAS_OOB_MODE;
+                        phy->frame_rcvd_size =
+                            sizeof(struct sas_identify_frame);
+                } else if (phy->phy_type & PORT_TYPE_SATA) {
+                        phy->identify.target_port_protocols = SAS_PROTOCOL_STP;
+                        if (mvs_is_sig_fis_received(phy->irq_status)) {
+                                if (phy_st & PHY_OOB_DTCTD)
+                                        sas_phy->oob_mode = SATA_OOB_MODE;
+                                phy->frame_rcvd_size =
+                                    sizeof(struct dev_to_host_fis);
+                                mvs_get_d2h_reg(mvi, i,
+                                                (void *)sas_phy->frame_rcvd);
+                        } else {
+                                dev_printk(KERN_DEBUG, &pdev->dev,
+                                        "No sig fis\n");
+                        }
+                }
+                /* workaround for HW phy decoding error on 1.5g disk drive */
+                mvs_write_port_vsr_addr(mvi, i, VSR_PHY_MODE6);
+                tmp = mvs_read_port_vsr_data(mvi, i);
+                if (((phy->phy_status & PHY_NEG_SPP_PHYS_LINK_RATE_MASK) >>
+                     PHY_NEG_SPP_PHYS_LINK_RATE_MASK_OFFSET) ==
+                        SAS_LINK_RATE_1_5_GBPS)
+                        tmp &= ~PHY_MODE6_DTL_SPEED;
+                else
+                        tmp |= PHY_MODE6_DTL_SPEED;
+                mvs_write_port_vsr_data(mvi, i, tmp);
+
+        }
+        if (get_st)
+                mvs_write_port_irq_stat(mvi, i, phy->irq_status);
+}
+
+static void mvs_port_formed(struct asd_sas_phy *sas_phy)
+{
+        struct sas_ha_struct *sas_ha = sas_phy->ha;
+        struct mvs_info *mvi = sas_ha->lldd_ha;
+        struct asd_sas_port *sas_port = sas_phy->port;
+        struct mvs_phy *phy = sas_phy->lldd_phy;
+        struct mvs_port *port = &mvi->port[sas_port->id];
+        unsigned long flags;
+
+        spin_lock_irqsave(&mvi->lock, flags);
+        port->port_attached = 1;
+        phy->port = port;
+        port->taskfileset = MVS_ID_NOT_MAPPED;
+        if (phy->phy_type & PORT_TYPE_SAS) {
+                port->wide_port_phymap = sas_port->phy_mask;
+                mvs_update_wideport(mvi, sas_phy->id);
+        }
+        spin_unlock_irqrestore(&mvi->lock, flags);
+}
+
+static int __devinit mvs_hw_init(struct mvs_info *mvi)
+{
+        void __iomem *regs = mvi->regs;
+        int i;
+        u32 tmp, cctl;
+
+        /* make sure interrupts are masked immediately (paranoia) */
+        mw32(GBL_CTL, 0);
+        tmp = mr32(GBL_CTL);
+
+        /* Reset Controller */
+        if (!(tmp & HBA_RST)) {
+                if (mvi->flags & MVF_PHY_PWR_FIX) {
+                        pci_read_config_dword(mvi->pdev, PCR_PHY_CTL, &tmp);
+                        tmp &= ~PCTL_PWR_ON;
+                        tmp |= PCTL_OFF;
+                        pci_write_config_dword(mvi->pdev, PCR_PHY_CTL, tmp);
+
+                        pci_read_config_dword(mvi->pdev, PCR_PHY_CTL2, &tmp);
+                        tmp &= ~PCTL_PWR_ON;
+                        tmp |= PCTL_OFF;
+                        pci_write_config_dword(mvi->pdev, PCR_PHY_CTL2, tmp);
+                }
+
+                /* global reset, incl. COMRESET/H_RESET_N (self-clearing) */
+                mw32_f(GBL_CTL, HBA_RST);
+        }
+
+        /* wait for reset to finish; timeout is just a guess */
+        i = 1000;
+        while (i-- > 0) {
+                msleep(10);
+
+                if (!(mr32(GBL_CTL) & HBA_RST))
+                        break;
+        }
+        if (mr32(GBL_CTL) & HBA_RST) {
+                dev_printk(KERN_ERR, &mvi->pdev->dev, "HBA reset failed\n");
+                return -EBUSY;
+        }
+
+        /* Init Chip */
+        /* make sure RST is set; HBA_RST /should/ have done that for us */
+        cctl = mr32(CTL);
+        if (cctl & CCTL_RST)
+                cctl &= ~CCTL_RST;
+        else
+                mw32_f(CTL, cctl | CCTL_RST);
+
+        /* write to device control _AND_ device status register? - A.C. */
+        pci_read_config_dword(mvi->pdev, PCR_DEV_CTRL, &tmp);
+        tmp &= ~PRD_REQ_MASK;
+        tmp |= PRD_REQ_SIZE;
+        pci_write_config_dword(mvi->pdev, PCR_DEV_CTRL, tmp);
+
+        pci_read_config_dword(mvi->pdev, PCR_PHY_CTL, &tmp);
+        tmp |= PCTL_PWR_ON;
+        tmp &= ~PCTL_OFF;
+        pci_write_config_dword(mvi->pdev, PCR_PHY_CTL, tmp);
+
+        pci_read_config_dword(mvi->pdev, PCR_PHY_CTL2, &tmp);
+        tmp |= PCTL_PWR_ON;
+        tmp &= ~PCTL_OFF;
+        pci_write_config_dword(mvi->pdev, PCR_PHY_CTL2, tmp);
+
+        mw32_f(CTL, cctl);
+
+        /* reset control */
+        mw32(PCS, 0);           /*MVS_PCS */
+
+        mvs_phy_hacks(mvi);
+
+        mw32(CMD_LIST_LO, mvi->slot_dma);
+        mw32(CMD_LIST_HI, (mvi->slot_dma >> 16) >> 16);
+
+        mw32(RX_FIS_LO, mvi->rx_fis_dma);
+        mw32(RX_FIS_HI, (mvi->rx_fis_dma >> 16) >> 16);
+
+        mw32(TX_CFG, MVS_CHIP_SLOT_SZ);
+        mw32(TX_LO, mvi->tx_dma);
+        mw32(TX_HI, (mvi->tx_dma >> 16) >> 16);
+
+        mw32(RX_CFG, MVS_RX_RING_SZ);
+        mw32(RX_LO, mvi->rx_dma);
+        mw32(RX_HI, (mvi->rx_dma >> 16) >> 16);
+
+        /* enable auto port detection */
+        mw32(GBL_PORT_TYPE, MODE_AUTO_DET_EN);
+        msleep(100);
+        /* init and reset phys */
+        for (i = 0; i < mvi->chip->n_phy; i++) {
+                /* FIXME: is this the correct dword order? */
+                u32 lo = *((u32 *)&mvi->sas_addr[0]);
+                u32 hi = *((u32 *)&mvi->sas_addr[4]);
+
+                mvs_detect_porttype(mvi, i);
+
+                /* set phy local SAS address */
+                mvs_write_port_cfg_addr(mvi, i, PHYR_ADDR_LO);
+                mvs_write_port_cfg_data(mvi, i, lo);
+                mvs_write_port_cfg_addr(mvi, i, PHYR_ADDR_HI);
+                mvs_write_port_cfg_data(mvi, i, hi);
+
+                /* reset phy */
+                tmp = mvs_read_phy_ctl(mvi, i);
+                tmp |= PHY_RST;
+                mvs_write_phy_ctl(mvi, i, tmp);
+        }
+
+        msleep(100);
+
+        for (i = 0; i < mvi->chip->n_phy; i++) {
+                /* clear phy int status */
+                tmp = mvs_read_port_irq_stat(mvi, i);
+                tmp &= ~PHYEV_SIG_FIS;
+                mvs_write_port_irq_stat(mvi, i, tmp);
+
+                /* set phy int mask */
+                tmp = PHYEV_RDY_CH | PHYEV_BROAD_CH | PHYEV_UNASSOC_FIS |
+                        PHYEV_ID_DONE | PHYEV_DEC_ERR;
+                mvs_write_port_irq_mask(mvi, i, tmp);
+
+                msleep(100);
+                mvs_update_phyinfo(mvi, i, 1);
+                mvs_enable_xmt(mvi, i);
+        }
+
+        /* FIXME: update wide port bitmaps */
+
+        /* little endian for open address and command table, etc. */
+        /* A.C.
+         * it seems that ( from the spec ) turning on big-endian won't
+         * do us any good on big-endian machines, need further confirmation
+         */
+        cctl = mr32(CTL);
+        cctl |= CCTL_ENDIAN_CMD;
+        cctl |= CCTL_ENDIAN_DATA;
+        cctl &= ~CCTL_ENDIAN_OPEN;
+        cctl |= CCTL_ENDIAN_RSP;
+        mw32_f(CTL, cctl);
+
+        /* reset CMD queue */
+        tmp = mr32(PCS);
+        tmp |= PCS_CMD_RST;
+        mw32(PCS, tmp);
+        /* interrupt coalescing may cause missing HW interrput in some case,
+         * and the max count is 0x1ff, while our max slot is 0x200,
+         * it will make count 0.
+         */
+        tmp = 0;
+        mw32(INT_COAL, tmp);
+
+        tmp = 0x100;
+        mw32(INT_COAL_TMOUT, tmp);
+
+        /* ladies and gentlemen, start your engines */
+        mw32(TX_CFG, 0);
+        mw32(TX_CFG, MVS_CHIP_SLOT_SZ | TX_EN);
+        mw32(RX_CFG, MVS_RX_RING_SZ | RX_EN);
+        /* enable CMD/CMPL_Q/RESP mode */
+        mw32(PCS, PCS_SATA_RETRY | PCS_FIS_RX_EN | PCS_CMD_EN);
+
+        /* re-enable interrupts globally */
+        mvs_hba_interrupt_enable(mvi);
+
+        /* enable completion queue interrupt */
+        tmp = (CINT_PORT_MASK | CINT_DONE | CINT_MEM);
+        mw32(INT_MASK, tmp);
+
+        return 0;
+}
+
+static void __devinit mvs_print_info(struct mvs_info *mvi)
+{
+        struct pci_dev *pdev = mvi->pdev;
+        static int printed_version;
+
+        if (!printed_version++)
+                dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
+
+        dev_printk(KERN_INFO, &pdev->dev, "%u phys, addr %llx\n",
+                   mvi->chip->n_phy, SAS_ADDR(mvi->sas_addr));
+}
+
+static int __devinit mvs_pci_init(struct pci_dev *pdev,
+                                  const struct pci_device_id *ent)
+{
+        int rc;
+        struct mvs_info *mvi;
+        irq_handler_t irq_handler = mvs_interrupt;
+
+        rc = pci_enable_device(pdev);
+        if (rc)
+                return rc;
+
+        pci_set_master(pdev);
+
+        rc = pci_request_regions(pdev, DRV_NAME);
+        if (rc)
+                goto err_out_disable;
+
+        rc = pci_go_64(pdev);
+        if (rc)
+                goto err_out_regions;
+
+        mvi = mvs_alloc(pdev, ent);
+        if (!mvi) {
+                rc = -ENOMEM;
+                goto err_out_regions;
+        }
+
+        rc = mvs_hw_init(mvi);
+        if (rc)
+                goto err_out_mvi;
+
+#ifndef MVS_DISABLE_MSI
+        if (!pci_enable_msi(pdev)) {
+                u32 tmp;
+                void __iomem *regs = mvi->regs;
+                mvi->flags |= MVF_MSI;
+                irq_handler = mvs_msi_interrupt;
+                tmp = mr32(PCS);
+                mw32(PCS, tmp | PCS_SELF_CLEAR);
+        }
+#endif
+
+        rc = request_irq(pdev->irq, irq_handler, IRQF_SHARED, DRV_NAME, mvi);
+        if (rc)
+                goto err_out_msi;
+
+        rc = scsi_add_host(mvi->shost, &pdev->dev);
+        if (rc)
+                goto err_out_irq;
+
+        rc = sas_register_ha(&mvi->sas);
+        if (rc)
+                goto err_out_shost;
+
+        pci_set_drvdata(pdev, mvi);
+
+        mvs_print_info(mvi);
+
+        scsi_scan_host(mvi->shost);
+
+        return 0;
+
+err_out_shost:
+        scsi_remove_host(mvi->shost);
+err_out_irq:
+        free_irq(pdev->irq, mvi);
+err_out_msi:
+        if (mvi->flags |= MVF_MSI)
+                pci_disable_msi(pdev);
+err_out_mvi:
+        mvs_free(mvi);
+err_out_regions:
+        pci_release_regions(pdev);
+err_out_disable:
+        pci_disable_device(pdev);
+        return rc;
+}
+
+static void __devexit mvs_pci_remove(struct pci_dev *pdev)
+{
+        struct mvs_info *mvi = pci_get_drvdata(pdev);
+
+        pci_set_drvdata(pdev, NULL);
+
+        if (mvi) {
+                sas_unregister_ha(&mvi->sas);
+                mvs_hba_interrupt_disable(mvi);
+                sas_remove_host(mvi->shost);
+                scsi_remove_host(mvi->shost);
+
+                free_irq(pdev->irq, mvi);
+                if (mvi->flags & MVF_MSI)
+                        pci_disable_msi(pdev);
+                mvs_free(mvi);
+                pci_release_regions(pdev);
+        }
+        pci_disable_device(pdev);
+}
+
+static struct sas_domain_function_template mvs_transport_ops = {
+        .lldd_execute_task      = mvs_task_exec,
+        .lldd_control_phy       = mvs_phy_control,
+        .lldd_abort_task        = mvs_task_abort,
+        .lldd_port_formed       = mvs_port_formed
+};
+
+static struct pci_device_id __devinitdata mvs_pci_table[] = {
+        { PCI_VDEVICE(MARVELL, 0x6320), chip_6320 },
+        { PCI_VDEVICE(MARVELL, 0x6340), chip_6440 },
+        { PCI_VDEVICE(MARVELL, 0x6440), chip_6440 },
+        { PCI_VDEVICE(MARVELL, 0x6480), chip_6480 },
+
+        { }     /* terminate list */
+};
+
+static struct pci_driver mvs_pci_driver = {
+        .name           = DRV_NAME,
+        .id_table       = mvs_pci_table,
+        .probe          = mvs_pci_init,
+        .remove         = __devexit_p(mvs_pci_remove),
+};
+
+static int __init mvs_init(void)
+{
+        int rc;
+
+        mvs_stt = sas_domain_attach_transport(&mvs_transport_ops);
+        if (!mvs_stt)
+                return -ENOMEM;
+
+        rc = pci_register_driver(&mvs_pci_driver);
+        if (rc)
+                goto err_out;
+
+        return 0;
+
+err_out:
+        sas_release_transport(mvs_stt);
+        return rc;
+}
+
+static void __exit mvs_exit(void)
+{
+        pci_unregister_driver(&mvs_pci_driver);
+        sas_release_transport(mvs_stt);
+}
+
+module_init(mvs_init);
+module_exit(mvs_exit);
+
+MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>");
+MODULE_DESCRIPTION("Marvell 88SE6440 SAS/SATA controller driver");
+MODULE_VERSION(DRV_VERSION);
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(pci, mvs_pci_table);
diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c
index 1479c60441c8..2cd899bfe84b 100644
--- a/drivers/scsi/qla2xxx/qla_dfs.c
+++ b/drivers/scsi/qla2xxx/qla_dfs.c
@@ -23,7 +23,7 @@ qla2x00_dfs_fce_show(struct seq_file *s, void *unused)
         mutex_lock(&ha->fce_mutex);
 
         seq_printf(s, "FCE Trace Buffer\n");
-        seq_printf(s, "In Pointer = %llx\n\n", ha->fce_wr);
+        seq_printf(s, "In Pointer = %llx\n\n", (unsigned long long)ha->fce_wr);
         seq_printf(s, "Base = %llx\n\n", (unsigned long long) ha->fce_dma);
         seq_printf(s, "FCE Enable Registers\n");
         seq_printf(s, "%08x %08x %08x %08x %08x %08x\n",
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 0f029d0d7315..fc84db4069f4 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -100,8 +100,7 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
 
                 if (sts_entry->iscsiFlags &ISCSI_FLAG_RESIDUAL_UNDER) {
                         scsi_set_resid(cmd, residual);
-                        if (!scsi_status && ((scsi_bufflen(cmd) - residual) <
-                                cmd->underflow)) {
+                        if ((scsi_bufflen(cmd) - residual) < cmd->underflow) {
 
                                 cmd->result = DID_ERROR << 16;
 
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 65455ab1f3b9..4a1cf6377f6c 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -651,7 +651,7 @@ static int qlogicpti_verify_tmon(struct qlogicpti *qpti)
 
 static irqreturn_t qpti_intr(int irq, void *dev_id);
 
-static void __init qpti_chain_add(struct qlogicpti *qpti)
+static void __devinit qpti_chain_add(struct qlogicpti *qpti)
 {
         spin_lock_irq(&qptichain_lock);
         if (qptichain != NULL) {
@@ -667,7 +667,7 @@ static void __init qpti_chain_add(struct qlogicpti *qpti)
         spin_unlock_irq(&qptichain_lock);
 }
 
-static void __init qpti_chain_del(struct qlogicpti *qpti)
+static void __devexit qpti_chain_del(struct qlogicpti *qpti)
 {
         spin_lock_irq(&qptichain_lock);
         if (qptichain == qpti) {
@@ -682,7 +682,7 @@ static void __init qpti_chain_del(struct qlogicpti *qpti)
         spin_unlock_irq(&qptichain_lock);
 }
 
-static int __init qpti_map_regs(struct qlogicpti *qpti)
+static int __devinit qpti_map_regs(struct qlogicpti *qpti)
 {
         struct sbus_dev *sdev = qpti->sdev;
 
@@ -705,7 +705,7 @@ static int __init qpti_map_regs(struct qlogicpti *qpti)
         return 0;
 }
 
-static int __init qpti_register_irq(struct qlogicpti *qpti)
+static int __devinit qpti_register_irq(struct qlogicpti *qpti)
 {
         struct sbus_dev *sdev = qpti->sdev;
 
@@ -730,7 +730,7 @@ fail:
         return -1;
 }
 
-static void __init qpti_get_scsi_id(struct qlogicpti *qpti)
+static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti)
 {
         qpti->scsi_id = prom_getintdefault(qpti->prom_node,
                                            "initiator-id",
@@ -783,7 +783,7 @@ static void qpti_get_clock(struct qlogicpti *qpti)
 /* The request and response queues must each be aligned
  * on a page boundary.
  */
-static int __init qpti_map_queues(struct qlogicpti *qpti)
+static int __devinit qpti_map_queues(struct qlogicpti *qpti)
 {
         struct sbus_dev *sdev = qpti->sdev;
 
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 1541c174937a..d1777a9a9625 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -222,7 +222,7 @@ static struct scsi_host_template sdebug_driver_template = {
         .cmd_per_lun =          16,
         .max_sectors =          0xffff,
         .unchecked_isa_dma =    0,
-        .use_clustering =       ENABLE_CLUSTERING,
+        .use_clustering =       DISABLE_CLUSTERING,
         .module =               THIS_MODULE,
 };
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 135c1d054701..ba21d97d1855 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1014,10 +1014,6 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
         }
 
         req->buffer = NULL;
-        if (blk_pc_request(req))
-                sdb->length = req->data_len;
-        else
-                sdb->length = req->nr_sectors << 9;
 
         /* 
          * Next, walk the list, and fill in the addresses and sizes of
@@ -1026,6 +1022,10 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
         count = blk_rq_map_sg(req->q, req, sdb->table.sgl);
         BUG_ON(count > sdb->table.nents);
         sdb->table.nents = count;
+        if (blk_pc_request(req))
+                sdb->length = req->data_len;
+        else
+                sdb->length = req->nr_sectors << 9;
         return BLKPREP_OK;
 }
 
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index fac7534f3ec4..9981682d5302 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -231,7 +231,7 @@ static struct {
         { ISCSI_SESSION_FREE,           "FREE" },
 };
 
-const char *iscsi_session_state_name(int state)
+static const char *iscsi_session_state_name(int state)
 {
         int i;
         char *name = NULL;
@@ -373,7 +373,7 @@ static void session_recovery_timedout(struct work_struct *work)
         scsi_target_unblock(&session->dev);
 }
 
-void __iscsi_unblock_session(struct iscsi_cls_session *session)
+static void __iscsi_unblock_session(struct iscsi_cls_session *session)
 {
         if (!cancel_delayed_work(&session->recovery_work))
                 flush_workqueue(iscsi_eh_timer_workq);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 37df8bbe7f46..7aee64dbfbeb 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1835,8 +1835,7 @@ static int sd_suspend(struct device *dev, pm_message_t mesg)
                         goto done;
         }
 
-        if (mesg.event == PM_EVENT_SUSPEND &&
-            sdkp->device->manage_start_stop) {
+        if ((mesg.event & PM_EVENT_SLEEP) && sdkp->device->manage_start_stop) {
                 sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
                 ret = sd_start_stop_device(sdkp, 0);
         }
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 2a6e4f472eaa..a6d96694d0a5 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -33,9 +33,9 @@
 #include <scsi/scsi_host.h>
 
 struct ses_device {
-        char *page1;
-        char *page2;
-        char *page10;
+        unsigned char *page1;
+        unsigned char *page2;
+        unsigned char *page10;
         short page1_len;
         short page2_len;
         short page10_len;
@@ -67,7 +67,7 @@ static int ses_probe(struct device *dev)
 static int ses_recv_diag(struct scsi_device *sdev, int page_code,
                          void *buf, int bufflen)
 {
-        char cmd[] = {
+        unsigned char cmd[] = {
                 RECEIVE_DIAGNOSTIC,
                 1,              /* Set PCV bit */
                 page_code,
@@ -85,7 +85,7 @@ static int ses_send_diag(struct scsi_device *sdev, int page_code,
 {
         u32 result;
 
-        char cmd[] = {
+        unsigned char cmd[] = {
                 SEND_DIAGNOSTIC,
                 0x10,           /* Set PF bit */
                 0,
@@ -104,13 +104,13 @@ static int ses_send_diag(struct scsi_device *sdev, int page_code,
 
 static int ses_set_page2_descriptor(struct enclosure_device *edev,
                                       struct enclosure_component *ecomp,
-                                      char *desc)
+                                      unsigned char *desc)
 {
         int i, j, count = 0, descriptor = ecomp->number;
         struct scsi_device *sdev = to_scsi_device(edev->cdev.dev);
         struct ses_device *ses_dev = edev->scratch;
-        char *type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
-        char *desc_ptr = ses_dev->page2 + 8;
+        unsigned char *type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
+        unsigned char *desc_ptr = ses_dev->page2 + 8;
 
         /* Clear everything */
         memset(desc_ptr, 0, ses_dev->page2_len - 8);
@@ -133,14 +133,14 @@ static int ses_set_page2_descriptor(struct enclosure_device *edev,
         return ses_send_diag(sdev, 2, ses_dev->page2, ses_dev->page2_len);
 }
 
-static char *ses_get_page2_descriptor(struct enclosure_device *edev,
+static unsigned char *ses_get_page2_descriptor(struct enclosure_device *edev,
                                       struct enclosure_component *ecomp)
 {
         int i, j, count = 0, descriptor = ecomp->number;
         struct scsi_device *sdev = to_scsi_device(edev->cdev.dev);
         struct ses_device *ses_dev = edev->scratch;
-        char *type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
-        char *desc_ptr = ses_dev->page2 + 8;
+        unsigned char *type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
+        unsigned char *desc_ptr = ses_dev->page2 + 8;
 
         ses_recv_diag(sdev, 2, ses_dev->page2, ses_dev->page2_len);
 
@@ -160,17 +160,18 @@ static char *ses_get_page2_descriptor(struct enclosure_device *edev,
 static void ses_get_fault(struct enclosure_device *edev,
                           struct enclosure_component *ecomp)
 {
-        char *desc;
+        unsigned char *desc;
 
         desc = ses_get_page2_descriptor(edev, ecomp);
-        ecomp->fault = (desc[3] & 0x60) >> 4;
+        if (desc)
+                ecomp->fault = (desc[3] & 0x60) >> 4;
 }
 
 static int ses_set_fault(struct enclosure_device *edev,
                           struct enclosure_component *ecomp,
                          enum enclosure_component_setting val)
 {
-        char desc[4] = {0 };
+        unsigned char desc[4] = {0 };
 
         switch (val) {
         case ENCLOSURE_SETTING_DISABLED:
@@ -190,26 +191,28 @@ static int ses_set_fault(struct enclosure_device *edev,
 static void ses_get_status(struct enclosure_device *edev,
                            struct enclosure_component *ecomp)
 {
-        char *desc;
+        unsigned char *desc;
 
         desc = ses_get_page2_descriptor(edev, ecomp);
-        ecomp->status = (desc[0] & 0x0f);
+        if (desc)
+                ecomp->status = (desc[0] & 0x0f);
 }
 
 static void ses_get_locate(struct enclosure_device *edev,
                            struct enclosure_component *ecomp)
 {
-        char *desc;
+        unsigned char *desc;
 
         desc = ses_get_page2_descriptor(edev, ecomp);
-        ecomp->locate = (desc[2] & 0x02) ? 1 : 0;
+        if (desc)
+                ecomp->locate = (desc[2] & 0x02) ? 1 : 0;
 }
 
 static int ses_set_locate(struct enclosure_device *edev,
                           struct enclosure_component *ecomp,
                           enum enclosure_component_setting val)
 {
-        char desc[4] = {0 };
+        unsigned char desc[4] = {0 };
 
         switch (val) {
         case ENCLOSURE_SETTING_DISABLED:
@@ -229,7 +232,7 @@ static int ses_set_active(struct enclosure_device *edev,
                           struct enclosure_component *ecomp,
                           enum enclosure_component_setting val)
 {
-        char desc[4] = {0 };
+        unsigned char desc[4] = {0 };
 
         switch (val) {
         case ENCLOSURE_SETTING_DISABLED:
@@ -409,18 +412,18 @@ static int ses_intf_add(struct class_device *cdev,
 {
         struct scsi_device *sdev = to_scsi_device(cdev->dev);
         struct scsi_device *tmp_sdev;
-        unsigned char *buf = NULL, *hdr_buf, *type_ptr, *desc_ptr,
-                *addl_desc_ptr;
+        unsigned char *buf = NULL, *hdr_buf, *type_ptr, *desc_ptr = NULL,
+                *addl_desc_ptr = NULL;
         struct ses_device *ses_dev;
         u32 result;
-        int i, j, types, len, components = 0;
+        int i, j, types, len, page7_len = 0, components = 0;
         int err = -ENOMEM;
         struct enclosure_device *edev;
-        struct ses_component *scomp;
+        struct ses_component *scomp = NULL;
 
         if (!scsi_device_enclosure(sdev)) {
                 /* not an enclosure, but might be in one */
-                edev =  enclosure_find(&sdev->host->shost_gendev);
+                edev = enclosure_find(&sdev->host->shost_gendev);
                 if (edev) {
                         ses_match_to_enclosure(edev, sdev);
                         class_device_put(&edev->cdev);
@@ -447,7 +450,7 @@ static int ses_intf_add(struct class_device *cdev,
                  * traversal routines more complex */
                 sdev_printk(KERN_ERR, sdev,
                         "FIXME driver has no support for subenclosures (%d)\n",
-                        buf[1]);
+                        hdr_buf[1]);
                 goto err_free;
         }
 
@@ -456,23 +459,22 @@ static int ses_intf_add(struct class_device *cdev,
         if (!buf)
                 goto err_free;
 
-        ses_dev->page1 = buf;
-        ses_dev->page1_len = len;
-
         result = ses_recv_diag(sdev, 1, buf, len);
         if (result)
                 goto recv_failed;
 
         types = buf[10];
-        len = buf[11];
 
-        type_ptr = buf + 12 + len;
+        type_ptr = buf + 12 + buf[11];
 
         for (i = 0; i < types; i++, type_ptr += 4) {
                 if (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE ||
                     type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE)
                         components += type_ptr[1];
         }
+        ses_dev->page1 = buf;
+        ses_dev->page1_len = len;
+        buf = NULL;
 
         result = ses_recv_diag(sdev, 2, hdr_buf, INIT_ALLOC_SIZE);
         if (result)
@@ -489,28 +491,29 @@ static int ses_intf_add(struct class_device *cdev,
                 goto recv_failed;
         ses_dev->page2 = buf;
         ses_dev->page2_len = len;
+        buf = NULL;
 
         /* The additional information page --- allows us
          * to match up the devices */
         result = ses_recv_diag(sdev, 10, hdr_buf, INIT_ALLOC_SIZE);
-        if (result)
-                goto no_page10;
-
-        len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
-        buf = kzalloc(len, GFP_KERNEL);
-        if (!buf)
-                goto err_free;
-
-        result = ses_recv_diag(sdev, 10, buf, len);
-        if (result)
-                goto recv_failed;
-        ses_dev->page10 = buf;
-        ses_dev->page10_len = len;
+        if (!result) {
+
+                len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
+                buf = kzalloc(len, GFP_KERNEL);
+                if (!buf)
+                        goto err_free;
+
+                result = ses_recv_diag(sdev, 10, buf, len);
+                if (result)
+                        goto recv_failed;
+                ses_dev->page10 = buf;
+                ses_dev->page10_len = len;
+                buf = NULL;
+        }
 
- no_page10:
-        scomp = kmalloc(sizeof(struct ses_component) * components, GFP_KERNEL);
+        scomp = kzalloc(sizeof(struct ses_component) * components, GFP_KERNEL);
         if (!scomp)
-                goto  err_free;
+                goto err_free;
 
         edev = enclosure_register(cdev->dev, sdev->sdev_gendev.bus_id,
                                   components, &ses_enclosure_callbacks);
@@ -521,17 +524,18 @@ static int ses_intf_add(struct class_device *cdev,
 
         edev->scratch = ses_dev;
         for (i = 0; i < components; i++)
-                edev->component[i].scratch = scomp++;
+                edev->component[i].scratch = scomp + i;
 
         /* Page 7 for the descriptors is optional */
-        buf = NULL;
         result = ses_recv_diag(sdev, 7, hdr_buf, INIT_ALLOC_SIZE);
         if (result)
                 goto simple_populate;
 
-        len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
+        page7_len = len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
         /* add 1 for trailing '\0' we'll use */
         buf = kzalloc(len + 1, GFP_KERNEL);
+        if (!buf)
+                goto simple_populate;
         result = ses_recv_diag(sdev, 7, buf, len);
         if (result) {
  simple_populate:
@@ -544,7 +548,8 @@ static int ses_intf_add(struct class_device *cdev,
                 len = (desc_ptr[2] << 8) + desc_ptr[3];
                 /* skip past overall descriptor */
                 desc_ptr += len + 4;
-                addl_desc_ptr = ses_dev->page10 + 8;
+                if (ses_dev->page10)
+                        addl_desc_ptr = ses_dev->page10 + 8;
         }
         type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
         components = 0;
@@ -554,29 +559,35 @@ static int ses_intf_add(struct class_device *cdev,
                         struct enclosure_component *ecomp;
 
                         if (desc_ptr) {
-                                len = (desc_ptr[2] << 8) + desc_ptr[3];
-                                desc_ptr += 4;
-                                /* Add trailing zero - pushes into
-                                 * reserved space */
-                                desc_ptr[len] = '\0';
-                                name = desc_ptr;
+                                if (desc_ptr >= buf + page7_len) {
+                                        desc_ptr = NULL;
+                                } else {
+                                        len = (desc_ptr[2] << 8) + desc_ptr[3];
+                                        desc_ptr += 4;
+                                        /* Add trailing zero - pushes into
+                                         * reserved space */
+                                        desc_ptr[len] = '\0';
+                                        name = desc_ptr;
+                                }
                         }
-                        if (type_ptr[0] != ENCLOSURE_COMPONENT_DEVICE &&
-                            type_ptr[0] != ENCLOSURE_COMPONENT_ARRAY_DEVICE)
-                                continue;
-                        ecomp = enclosure_component_register(edev,
+                        if (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE ||
+                            type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE) {
+
+                                ecomp = enclosure_component_register(edev,
                                                              components++,
                                                              type_ptr[0],
                                                              name);
-                        if (desc_ptr) {
-                                desc_ptr += len;
-                                if (!IS_ERR(ecomp))
+
+                                if (!IS_ERR(ecomp) && addl_desc_ptr)
                                         ses_process_descriptor(ecomp,
                                                                addl_desc_ptr);
-
-                                if (addl_desc_ptr)
-                                        addl_desc_ptr += addl_desc_ptr[1] + 2;
                         }
+                        if (desc_ptr)
+                                desc_ptr += len;
+
+                        if (addl_desc_ptr)
+                                addl_desc_ptr += addl_desc_ptr[1] + 2;
+
                 }
         }
         kfree(buf);
@@ -598,6 +609,7 @@ static int ses_intf_add(struct class_device *cdev,
         err = -ENODEV;
  err_free:
         kfree(buf);
+        kfree(scomp);
         kfree(ses_dev->page10);
         kfree(ses_dev->page2);
         kfree(ses_dev->page1);
@@ -630,6 +642,7 @@ static void ses_intf_remove(struct class_device *cdev,
         ses_dev = edev->scratch;
         edev->scratch = NULL;
 
+        kfree(ses_dev->page10);
         kfree(ses_dev->page1);
         kfree(ses_dev->page2);
         kfree(ses_dev);
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 71952703125a..0a52d9d2da2c 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -17,7 +17,7 @@
    Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
  */
 
-static const char *verstr = "20080117";
+static const char *verstr = "20080221";
 
 #include <linux/module.h>
 
@@ -1172,7 +1172,7 @@ static int st_open(struct inode *inode, struct file *filp)
         STp->try_dio_now = STp->try_dio;
         STp->recover_count = 0;
         DEB( STp->nbr_waits = STp->nbr_finished = 0;
-             STp->nbr_requests = STp->nbr_dio = STp->nbr_pages = STp->nbr_combinable = 0; )
+             STp->nbr_requests = STp->nbr_dio = STp->nbr_pages = 0; )
 
         retval = check_tape(STp, filp);
         if (retval < 0)
@@ -1226,8 +1226,8 @@ static int st_flush(struct file *filp, fl_owner_t id)
         }
 
         DEBC( if (STp->nbr_requests)
-                printk(KERN_DEBUG "%s: Number of r/w requests %d, dio used in %d, pages %d (%d).\n",
-                       name, STp->nbr_requests, STp->nbr_dio, STp->nbr_pages, STp->nbr_combinable));
+                printk(KERN_DEBUG "%s: Number of r/w requests %d, dio used in %d, pages %d.\n",
+                       name, STp->nbr_requests, STp->nbr_dio, STp->nbr_pages));
 
         if (STps->rw == ST_WRITING && !STp->pos_unknown) {
                 struct st_cmdstatus *cmdstatp = &STp->buffer->cmdstat;
@@ -1422,9 +1422,6 @@ static int setup_buffering(struct scsi_tape *STp, const char __user *buf,
                      if (STbp->do_dio) {
                         STp->nbr_dio++;
                         STp->nbr_pages += STbp->do_dio;
-                        for (i=1; i < STbp->do_dio; i++)
-                                if (page_to_pfn(STbp->sg[i].page) == page_to_pfn(STbp->sg[i-1].page) + 1)
-                                        STp->nbr_combinable++;
                      }
                 )
         } else
diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h
index 6c8075712974..5931726fcf93 100644
--- a/drivers/scsi/st.h
+++ b/drivers/scsi/st.h
@@ -164,7 +164,6 @@ struct scsi_tape {
         int nbr_requests;
         int nbr_dio;
         int nbr_pages;
-        int nbr_combinable;
         unsigned char last_cmnd[6];
         unsigned char last_sense[16];
 #endif
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 72f6d8015358..654430edf74d 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -461,30 +461,14 @@ static void stex_internal_copy(struct scsi_cmnd *cmd,
         }
 }
 
-static int stex_direct_copy(struct scsi_cmnd *cmd,
-        const void *src, size_t count)
-{
-        size_t cp_len = count;
-        int n_elem = 0;
-
-        n_elem = scsi_dma_map(cmd);
-        if (n_elem < 0)
-                return 0;
-
-        stex_internal_copy(cmd, src, &cp_len, n_elem, ST_TO_CMD);
-
-        scsi_dma_unmap(cmd);
-
-        return cp_len == count;
-}
-
 static void stex_controller_info(struct st_hba *hba, struct st_ccb *ccb)
 {
         struct st_frame *p;
         size_t count = sizeof(struct st_frame);
 
         p = hba->copy_buffer;
-        stex_internal_copy(ccb->cmd, p, &count, ccb->sg_count, ST_FROM_CMD);
+        stex_internal_copy(ccb->cmd, p, &count, scsi_sg_count(ccb->cmd),
+                           ST_FROM_CMD);
         memset(p->base, 0, sizeof(u32)*6);
         *(unsigned long *)(p->base) = pci_resource_start(hba->pdev, 0);
         p->rom_addr = 0;
@@ -502,7 +486,8 @@ static void stex_controller_info(struct st_hba *hba, struct st_ccb *ccb)
         p->subid =
                 hba->pdev->subsystem_vendor << 16 | hba->pdev->subsystem_device;
 
-        stex_internal_copy(ccb->cmd, p, &count, ccb->sg_count, ST_TO_CMD);
+        stex_internal_copy(ccb->cmd, p, &count, scsi_sg_count(ccb->cmd),
+                           ST_TO_CMD);
 }
 
 static void
@@ -569,8 +554,10 @@ stex_queuecommand(struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
                 unsigned char page;
                 page = cmd->cmnd[2] & 0x3f;
                 if (page == 0x8 || page == 0x3f) {
-                        stex_direct_copy(cmd, ms10_caching_page,
-                                        sizeof(ms10_caching_page));
+                        size_t cp_len = sizeof(ms10_caching_page);
+                        stex_internal_copy(cmd, ms10_caching_page,
+                                           &cp_len, scsi_sg_count(cmd),
+                                           ST_TO_CMD);
                         cmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;
                         done(cmd);
                 } else
@@ -599,8 +586,10 @@ stex_queuecommand(struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
                 if (id != host->max_id - 1)
                         break;
                 if (lun == 0 && (cmd->cmnd[1] & INQUIRY_EVPD) == 0) {
-                        stex_direct_copy(cmd, console_inq_page,
-                                sizeof(console_inq_page));
+                        size_t cp_len = sizeof(console_inq_page);
+                        stex_internal_copy(cmd, console_inq_page,
+                                           &cp_len, scsi_sg_count(cmd),
+                                           ST_TO_CMD);
                         cmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8;
                         done(cmd);
                 } else
@@ -609,6 +598,7 @@ stex_queuecommand(struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
         case PASSTHRU_CMD:
                 if (cmd->cmnd[1] == PASSTHRU_GET_DRVVER) {
                         struct st_drvver ver;
+                        size_t cp_len = sizeof(ver);
                         ver.major = ST_VER_MAJOR;
                         ver.minor = ST_VER_MINOR;
                         ver.oem = ST_OEM;
@@ -616,7 +606,9 @@ stex_queuecommand(struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
                         ver.signature[0] = PASSTHRU_SIGNATURE;
                         ver.console_id = host->max_id - 1;
                         ver.host_no = hba->host->host_no;
-                        cmd->result = stex_direct_copy(cmd, &ver, sizeof(ver)) ?
+                        stex_internal_copy(cmd, &ver, &cp_len,
+                                           scsi_sg_count(cmd), ST_TO_CMD);
+                        cmd->result = sizeof(ver) == cp_len ?
                                 DID_OK << 16 | COMMAND_COMPLETE << 8 :
                                 DID_ERROR << 16 | COMMAND_COMPLETE << 8;
                         done(cmd);
@@ -709,7 +701,7 @@ static void stex_copy_data(struct st_ccb *ccb,
         if (ccb->cmd == NULL)
                 return;
         stex_internal_copy(ccb->cmd,
-                resp->variable, &count, ccb->sg_count, ST_TO_CMD);
+                resp->variable, &count, scsi_sg_count(ccb->cmd), ST_TO_CMD);
 }
 
 static void stex_ys_commands(struct st_hba *hba,
@@ -734,7 +726,7 @@ static void stex_ys_commands(struct st_hba *hba,
 
                 count = STEX_EXTRA_SIZE;
                 stex_internal_copy(ccb->cmd, hba->copy_buffer,
-                        &count, ccb->sg_count, ST_FROM_CMD);
+                        &count, scsi_sg_count(ccb->cmd), ST_FROM_CMD);
                 inq_data = (ST_INQ *)hba->copy_buffer;
                 if (inq_data->DeviceTypeQualifier != 0)
                         ccb->srb_status = SRB_STATUS_SELECTION_TIMEOUT;
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index 6325901e5093..f7d279542fa5 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -187,10 +187,10 @@
 #define sym53c416_base_2 sym53c416_2
 #define sym53c416_base_3 sym53c416_3
 
-static unsigned int sym53c416_base[2] = {0,0};
-static unsigned int sym53c416_base_1[2] = {0,0};
-static unsigned int sym53c416_base_2[2] = {0,0};
-static unsigned int sym53c416_base_3[2] = {0,0};
+static unsigned int sym53c416_base[2];
+static unsigned int sym53c416_base_1[2];
+static unsigned int sym53c416_base_2[2];
+static unsigned int sym53c416_base_3[2];
 
 #endif
 
@@ -621,25 +621,25 @@ int __init sym53c416_detect(struct scsi_host_template *tpnt)
         int ints[3];
 
         ints[0] = 2;
-        if(sym53c416_base)
+        if(sym53c416_base[0])
         {
                 ints[1] = sym53c416_base[0];
                 ints[2] = sym53c416_base[1];
                 sym53c416_setup(NULL, ints);
         }
-        if(sym53c416_base_1)
+        if(sym53c416_base_1[0])
         {
                 ints[1] = sym53c416_base_1[0];
                 ints[2] = sym53c416_base_1[1];
                 sym53c416_setup(NULL, ints);
         }
-        if(sym53c416_base_2)
+        if(sym53c416_base_2[0])
         {
                 ints[1] = sym53c416_base_2[0];
                 ints[2] = sym53c416_base_2[1];
                 sym53c416_setup(NULL, ints);
         }
-        if(sym53c416_base_3)
+        if(sym53c416_base_3[0])
         {
                 ints[1] = sym53c416_base_3[0];
                 ints[2] = sym53c416_base_3[1];
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index fad245b064d6..d57bf3e708d8 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -549,7 +549,7 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id)
                 atmel_handle_transmit(port, pending);
         } while (pass_counter++ < ATMEL_ISR_PASS_LIMIT);
 
-        return IRQ_HANDLED;
+        return pass_counter ? IRQ_HANDLED : IRQ_NONE;
 }
 
 /*
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index ddf639144538..9ce12cb2cebc 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -393,7 +393,7 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
         if (cflag & CRTSCTS) {
                 fcr_val |= SCFCR_MCE;
         } else {
-#ifdef CONFIG_CPU_SUBTYPE_SH7343
+#if defined(CONFIG_CPU_SUBTYPE_SH7343) || defined(CONFIG_CPU_SUBTYPE_SH7366)
                 /* Nothing */
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
       defined(CONFIG_CPU_SUBTYPE_SH7780) || \
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index f5764ebcfe07..01a9dd715f5d 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -97,13 +97,18 @@
 # define SCSCR_INIT(port)       0x0038  /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
 # define PORT_PSCR              0xA405011E
+#elif defined(CONFIG_CPU_SUBTYPE_SH7366)
+# define SCPDR0                 0xA405013E      /* 16 bit SCIF0 PSDR */
+# define SCSPTR0                SCPDR0
+# define SCIF_ORER              0x0001  /* overrun error bit */
+# define SCSCR_INIT(port)       0x0038  /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
 # define SCSPTR2 0xffe80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
-# include <asm/hardware.h>
 # define SCIF_BASE_ADDR    0x01030000
 # define SCIF_ADDR_SH5     PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR
 # define SCIF_PTR2_OFFS    0x0000020
@@ -577,7 +582,7 @@ static inline int sci_rxd_in(struct uart_port *port)
                 return ctrl_inw(SCSPTR3) & 0x0001 ? 1 : 0; /* SCIF */
         return 1;
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7722)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7722) || defined(CONFIG_CPU_SUBTYPE_SH7366)
 static inline int sci_rxd_in(struct uart_port *port)
 {
         if (port->mapbase == 0xffe00000)
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index e52a6296ca46..9cfcfd8dad5e 100644
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -31,6 +31,7 @@
 #include <asm/mach/dma.h>
 #include <asm/mach/sysasic.h>
 #include <asm/mach/maple.h>
+#include <linux/delay.h>
 
 MODULE_AUTHOR("Yaegshi Takeshi, Paul Mundt, M.R. Brown, Adrian McMenamin");
 MODULE_DESCRIPTION("Maple bus driver for Dreamcast");
@@ -53,12 +54,12 @@ static struct device maple_bus;
 static int subdevice_map[MAPLE_PORTS];
 static unsigned long *maple_sendbuf, *maple_sendptr, *maple_lastptr;
 static unsigned long maple_pnp_time;
-static int started, scanning, liststatus;
+static int started, scanning, liststatus, realscan;
 static struct kmem_cache *maple_queue_cache;
 
 struct maple_device_specify {
-       int port;
-       int unit;
+        int port;
+        int unit;
 };
 
 /**
@@ -68,22 +69,22 @@ struct maple_device_specify {
  */
 int maple_driver_register(struct device_driver *drv)
 {
-       if (!drv)
-               return -EINVAL;
-       drv->bus = &maple_bus_type;
-       return driver_register(drv);
+        if (!drv)
+                return -EINVAL;
+        drv->bus = &maple_bus_type;
+        return driver_register(drv);
 }
 EXPORT_SYMBOL_GPL(maple_driver_register);
 
 /* set hardware registers to enable next round of dma */
 static void maplebus_dma_reset(void)
 {
-       ctrl_outl(MAPLE_MAGIC, MAPLE_RESET);
-       /* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */
-       ctrl_outl(1, MAPLE_TRIGTYPE);
-       ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(50000), MAPLE_SPEED);
-       ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR);
-       ctrl_outl(1, MAPLE_ENABLE);
+        ctrl_outl(MAPLE_MAGIC, MAPLE_RESET);
+        /* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */
+        ctrl_outl(1, MAPLE_TRIGTYPE);
+        ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(50000), MAPLE_SPEED);
+        ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR);
+        ctrl_outl(1, MAPLE_ENABLE);
 }
 
 /**
@@ -94,27 +95,36 @@ static void maplebus_dma_reset(void)
  * @function: the function code for the device
  */
 void maple_getcond_callback(struct maple_device *dev,
-                           void (*callback) (struct mapleq * mq),
-                           unsigned long interval, unsigned long function)
+                        void (*callback) (struct mapleq *mq),
+                        unsigned long interval, unsigned long function)
 {
-       dev->callback = callback;
-       dev->interval = interval;
-       dev->function = cpu_to_be32(function);
-       dev->when = jiffies;
+        dev->callback = callback;
+        dev->interval = interval;
+        dev->function = cpu_to_be32(function);
+        dev->when = jiffies;
 }
 EXPORT_SYMBOL_GPL(maple_getcond_callback);
 
 static int maple_dma_done(void)
 {
-       return (ctrl_inl(MAPLE_STATE) & 1) == 0;
+        return (ctrl_inl(MAPLE_STATE) & 1) == 0;
 }
 
 static void maple_release_device(struct device *dev)
 {
-       if (dev->type) {
-               kfree(dev->type->name);
-               kfree(dev->type);
-       }
+        struct maple_device *mdev;
+        struct mapleq *mq;
+        if (!dev)
+                return;
+        mdev = to_maple_dev(dev);
+        mq = mdev->mq;
+        if (mq) {
+                if (mq->recvbufdcsp)
+                        kmem_cache_free(maple_queue_cache, mq->recvbufdcsp);
+                kfree(mq);
+                mq = NULL;
+        }
+        kfree(mdev);
 }
 
 /**
@@ -123,60 +133,64 @@ static void maple_release_device(struct device *dev)
  */
 void maple_add_packet(struct mapleq *mq)
 {
-       mutex_lock(&maple_list_lock);
-       list_add(&mq->list, &maple_waitq);
-       mutex_unlock(&maple_list_lock);
+        mutex_lock(&maple_list_lock);
+        list_add(&mq->list, &maple_waitq);
+        mutex_unlock(&maple_list_lock);
 }
 EXPORT_SYMBOL_GPL(maple_add_packet);
 
-static struct mapleq *maple_allocq(struct maple_device *dev)
+static struct mapleq *maple_allocq(struct maple_device *mdev)
 {
-       struct mapleq *mq;
+        struct mapleq *mq;
 
-       mq = kmalloc(sizeof(*mq), GFP_KERNEL);
-       if (!mq)
-               return NULL;
+        mq = kmalloc(sizeof(*mq), GFP_KERNEL);
+        if (!mq)
+                return NULL;
 
-       mq->dev = dev;
-       mq->recvbufdcsp = kmem_cache_zalloc(maple_queue_cache, GFP_KERNEL);
-       mq->recvbuf = (void *) P2SEGADDR(mq->recvbufdcsp);
-       if (!mq->recvbuf) {
-               kfree(mq);
-               return NULL;
-       }
+        mq->dev = mdev;
+        mq->recvbufdcsp = kmem_cache_zalloc(maple_queue_cache, GFP_KERNEL);
+        mq->recvbuf = (void *) P2SEGADDR(mq->recvbufdcsp);
+        if (!mq->recvbuf) {
+                kfree(mq);
+                return NULL;
+        }
 
-       return mq;
+        return mq;
 }
 
 static struct maple_device *maple_alloc_dev(int port, int unit)
 {
-       struct maple_device *dev;
-
-       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-       if (!dev)
-               return NULL;
-
-       dev->port = port;
-       dev->unit = unit;
-       dev->mq = maple_allocq(dev);
-
-       if (!dev->mq) {
-               kfree(dev);
-               return NULL;
-       }
-
-       return dev;
+        struct maple_device *mdev;
+
+        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+        if (!mdev)
+                return NULL;
+
+        mdev->port = port;
+        mdev->unit = unit;
+        mdev->mq = maple_allocq(mdev);
+
+        if (!mdev->mq) {
+                kfree(mdev);
+                return NULL;
+        }
+        mdev->dev.bus = &maple_bus_type;
+        mdev->dev.parent = &maple_bus;
+        mdev->function = 0;
+        return mdev;
 }
 
 static void maple_free_dev(struct maple_device *mdev)
 {
-       if (!mdev)
-               return;
-       if (mdev->mq) {
-               kmem_cache_free(maple_queue_cache, mdev->mq->recvbufdcsp);
-               kfree(mdev->mq);
-       }
-       kfree(mdev);
+        if (!mdev)
+                return;
+        if (mdev->mq) {
+                if (mdev->mq->recvbufdcsp)
+                        kmem_cache_free(maple_queue_cache,
+                                mdev->mq->recvbufdcsp);
+                kfree(mdev->mq);
+        }
+        kfree(mdev);
 }
 
 /* process the command queue into a maple command block
@@ -184,153 +198,162 @@ static void maple_free_dev(struct maple_device *mdev)
  */
 static void maple_build_block(struct mapleq *mq)
 {
-       int port, unit, from, to, len;
-       unsigned long *lsendbuf = mq->sendbuf;
+        int port, unit, from, to, len;
+        unsigned long *lsendbuf = mq->sendbuf;
 
-       port = mq->dev->port & 3;
-       unit = mq->dev->unit;
-       len = mq->length;
-       from = port << 6;
-       to = (port << 6) | (unit > 0 ? (1 << (unit - 1)) & 0x1f : 0x20);
+        port = mq->dev->port & 3;
+        unit = mq->dev->unit;
+        len = mq->length;
+        from = port << 6;
+        to = (port << 6) | (unit > 0 ? (1 << (unit - 1)) & 0x1f : 0x20);
 
-       *maple_lastptr &= 0x7fffffff;
-       maple_lastptr = maple_sendptr;
+        *maple_lastptr &= 0x7fffffff;
+        maple_lastptr = maple_sendptr;
 
-       *maple_sendptr++ = (port << 16) | len | 0x80000000;
-       *maple_sendptr++ = PHYSADDR(mq->recvbuf);
-       *maple_sendptr++ =
-           mq->command | (to << 8) | (from << 16) | (len << 24);
+        *maple_sendptr++ = (port << 16) | len | 0x80000000;
+        *maple_sendptr++ = PHYSADDR(mq->recvbuf);
+        *maple_sendptr++ =
+            mq->command | (to << 8) | (from << 16) | (len << 24);
 
-       while (len-- > 0)
-               *maple_sendptr++ = *lsendbuf++;
+        while (len-- > 0)
+                *maple_sendptr++ = *lsendbuf++;
 }
 
 /* build up command queue */
 static void maple_send(void)
 {
-       int i;
-       int maple_packets;
-       struct mapleq *mq, *nmq;
-
-       if (!list_empty(&maple_sentq))
-               return;
-       if (list_empty(&maple_waitq) || !maple_dma_done())
-               return;
-       maple_packets = 0;
-       maple_sendptr = maple_lastptr = maple_sendbuf;
-       list_for_each_entry_safe(mq, nmq, &maple_waitq, list) {
-               maple_build_block(mq);
-               list_move(&mq->list, &maple_sentq);
-               if (maple_packets++ > MAPLE_MAXPACKETS)
-                       break;
-       }
-       if (maple_packets > 0) {
-               for (i = 0; i < (1 << MAPLE_DMA_PAGES); i++)
-                       dma_cache_sync(0, maple_sendbuf + i * PAGE_SIZE,
-                                      PAGE_SIZE, DMA_BIDIRECTIONAL);
-       }
+        int i;
+        int maple_packets;
+        struct mapleq *mq, *nmq;
+
+        if (!list_empty(&maple_sentq))
+                return;
+        if (list_empty(&maple_waitq) || !maple_dma_done())
+                return;
+        maple_packets = 0;
+        maple_sendptr = maple_lastptr = maple_sendbuf;
+        list_for_each_entry_safe(mq, nmq, &maple_waitq, list) {
+                maple_build_block(mq);
+                list_move(&mq->list, &maple_sentq);
+                if (maple_packets++ > MAPLE_MAXPACKETS)
+                        break;
+        }
+        if (maple_packets > 0) {
+                for (i = 0; i < (1 << MAPLE_DMA_PAGES); i++)
+                        dma_cache_sync(0, maple_sendbuf + i * PAGE_SIZE,
+                                       PAGE_SIZE, DMA_BIDIRECTIONAL);
+        }
 }
 
 static int attach_matching_maple_driver(struct device_driver *driver,
-                                       void *devptr)
+                                        void *devptr)
 {
-       struct maple_driver *maple_drv;
-       struct maple_device *mdev;
-
-       mdev = devptr;
-       maple_drv = to_maple_driver(driver);
-       if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {
-               if (maple_drv->connect(mdev) == 0) {
-                       mdev->driver = maple_drv;
-                       return 1;
-               }
-       }
-       return 0;
+        struct maple_driver *maple_drv;
+        struct maple_device *mdev;
+
+        mdev = devptr;
+        maple_drv = to_maple_driver(driver);
+        if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {
+                if (maple_drv->connect(mdev) == 0) {
+                        mdev->driver = maple_drv;
+                        return 1;
+                }
+        }
+        return 0;
 }
 
 static void maple_detach_driver(struct maple_device *mdev)
 {
-       if (!mdev)
-               return;
-       if (mdev->driver) {
-               if (mdev->driver->disconnect)
-                       mdev->driver->disconnect(mdev);
-       }
-       mdev->driver = NULL;
-       if (mdev->registered) {
-               maple_release_device(&mdev->dev);
-               device_unregister(&mdev->dev);
-       }
-       mdev->registered = 0;
-       maple_free_dev(mdev);
+        if (!mdev)
+                return;
+        if (mdev->driver) {
+                if (mdev->driver->disconnect)
+                        mdev->driver->disconnect(mdev);
+        }
+        mdev->driver = NULL;
+        device_unregister(&mdev->dev);
+        mdev = NULL;
 }
 
 /* process initial MAPLE_COMMAND_DEVINFO for each device or port */
-static void maple_attach_driver(struct maple_device *dev)
+static void maple_attach_driver(struct maple_device *mdev)
 {
-       char *p;
-
-       char *recvbuf;
-       unsigned long function;
-       int matched, retval;
-
-       recvbuf = dev->mq->recvbuf;
-       memcpy(&dev->devinfo, recvbuf + 4, sizeof(dev->devinfo));
-       memcpy(dev->product_name, dev->devinfo.product_name, 30);
-       memcpy(dev->product_licence, dev->devinfo.product_licence, 60);
-       dev->product_name[30] = '\0';
-       dev->product_licence[60] = '\0';
-
-       for (p = dev->product_name + 29; dev->product_name <= p; p--)
-               if (*p == ' ')
-                       *p = '\0';
-               else
-                       break;
-
-       for (p = dev->product_licence + 59; dev->product_licence <= p; p--)
-               if (*p == ' ')
-                       *p = '\0';
-               else
-                       break;
-
-       function = be32_to_cpu(dev->devinfo.function);
-
-       if (function > 0x200) {
-               /* Do this silently - as not a real device */
-               function = 0;
-               dev->driver = &maple_dummy_driver;
-               sprintf(dev->dev.bus_id, "%d:0.port", dev->port);
-       } else {
-               printk(KERN_INFO
-                      "Maple bus at (%d, %d): Connected function 0x%lX\n",
-                      dev->port, dev->unit, function);
-
-               matched =
-                   bus_for_each_drv(&maple_bus_type, NULL, dev,
-                                    attach_matching_maple_driver);
-
-               if (matched == 0) {
-                       /* Driver does not exist yet */
-                       printk(KERN_INFO
-                              "No maple driver found for this device\n");
-                       dev->driver = &maple_dummy_driver;
-               }
-
-               sprintf(dev->dev.bus_id, "%d:0%d.%lX", dev->port,
-                       dev->unit, function);
-       }
-       dev->function = function;
-       dev->dev.bus = &maple_bus_type;
-       dev->dev.parent = &maple_bus;
-       dev->dev.release = &maple_release_device;
-       retval = device_register(&dev->dev);
-       if (retval) {
-               printk(KERN_INFO
-                      "Maple bus: Attempt to register device (%x, %x) failed.\n",
-                      dev->port, dev->unit);
-               maple_free_dev(dev);
-       }
-       dev->registered = 1;
+        char *p, *recvbuf;
+        unsigned long function;
+        int matched, retval;
+
+        recvbuf = mdev->mq->recvbuf;
+        /* copy the data as individual elements in
+        * case of memory optimisation */
+        memcpy(&mdev->devinfo.function, recvbuf + 4, 4);
+        memcpy(&mdev->devinfo.function_data[0], recvbuf + 8, 12);
+        memcpy(&mdev->devinfo.area_code, recvbuf + 20, 1);
+        memcpy(&mdev->devinfo.connector_direction, recvbuf + 21, 1);
+        memcpy(&mdev->devinfo.product_name[0], recvbuf + 22, 30);
+        memcpy(&mdev->devinfo.product_licence[0], recvbuf + 52, 60);
+        memcpy(&mdev->devinfo.standby_power, recvbuf + 112, 2);
+        memcpy(&mdev->devinfo.max_power, recvbuf + 114, 2);
+        memcpy(mdev->product_name, mdev->devinfo.product_name, 30);
+        mdev->product_name[30] = '\0';
+        memcpy(mdev->product_licence, mdev->devinfo.product_licence, 60);
+        mdev->product_licence[60] = '\0';
+
+        for (p = mdev->product_name + 29; mdev->product_name <= p; p--)
+                if (*p == ' ')
+                        *p = '\0';
+                else
+                        break;
+        for (p = mdev->product_licence + 59; mdev->product_licence <= p; p--)
+                if (*p == ' ')
+                        *p = '\0';
+                else
+                        break;
+
+        if (realscan) {
+                printk(KERN_INFO "Maple device detected: %s\n",
+                        mdev->product_name);
+                printk(KERN_INFO "Maple device: %s\n", mdev->product_licence);
+        }
+
+        function = be32_to_cpu(mdev->devinfo.function);
+
+        if (function > 0x200) {
+                /* Do this silently - as not a real device */
+                function = 0;
+                mdev->driver = &maple_dummy_driver;
+                sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
+        } else {
+                if (realscan)
+                        printk(KERN_INFO
+                                "Maple bus at (%d, %d): Function 0x%lX\n",
+                                mdev->port, mdev->unit, function);
+
+                matched =
+                    bus_for_each_drv(&maple_bus_type, NULL, mdev,
+                                     attach_matching_maple_driver);
+
+                if (matched == 0) {
+                        /* Driver does not exist yet */
+                        if (realscan)
+                                printk(KERN_INFO
+                                        "No maple driver found.\n");
+                        mdev->driver = &maple_dummy_driver;
+                }
+                sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,
+                        mdev->unit, function);
+        }
+        mdev->function = function;
+        mdev->dev.release = &maple_release_device;
+        retval = device_register(&mdev->dev);
+        if (retval) {
+                printk(KERN_INFO
+                "Maple bus: Attempt to register device"
+                " (%x, %x) failed.\n",
+                mdev->port, mdev->unit);
+                maple_free_dev(mdev);
+                mdev = NULL;
+                return;
+        }
 }
 
 /*
@@ -340,270 +363,262 @@ static void maple_attach_driver(struct maple_device *dev)
  */
 static int detach_maple_device(struct device *device, void *portptr)
 {
-       struct maple_device_specify *ds;
-       struct maple_device *mdev;
-
-       ds = portptr;
-       mdev = to_maple_dev(device);
-       if (mdev->port == ds->port && mdev->unit == ds->unit)
-               return 1;
-       return 0;
+        struct maple_device_specify *ds;
+        struct maple_device *mdev;
+
+        ds = portptr;
+        mdev = to_maple_dev(device);
+        if (mdev->port == ds->port && mdev->unit == ds->unit)
+                return 1;
+        return 0;
 }
 
 static int setup_maple_commands(struct device *device, void *ignored)
 {
-       struct maple_device *maple_dev = to_maple_dev(device);
-
-       if ((maple_dev->interval > 0)
-           && time_after(jiffies, maple_dev->when)) {
-               maple_dev->when = jiffies + maple_dev->interval;
-               maple_dev->mq->command = MAPLE_COMMAND_GETCOND;
-               maple_dev->mq->sendbuf = &maple_dev->function;
-               maple_dev->mq->length = 1;
-               maple_add_packet(maple_dev->mq);
-               liststatus++;
-       } else {
-               if (time_after(jiffies, maple_pnp_time)) {
-                       maple_dev->mq->command = MAPLE_COMMAND_DEVINFO;
-                       maple_dev->mq->length = 0;
-                       maple_add_packet(maple_dev->mq);
-                       liststatus++;
-               }
-       }
-
-       return 0;
+        struct maple_device *maple_dev = to_maple_dev(device);
+
+        if ((maple_dev->interval > 0)
+            && time_after(jiffies, maple_dev->when)) {
+                maple_dev->when = jiffies + maple_dev->interval;
+                maple_dev->mq->command = MAPLE_COMMAND_GETCOND;
+                maple_dev->mq->sendbuf = &maple_dev->function;
+                maple_dev->mq->length = 1;
+                maple_add_packet(maple_dev->mq);
+                liststatus++;
+        } else {
+                if (time_after(jiffies, maple_pnp_time)) {
+                        maple_dev->mq->command = MAPLE_COMMAND_DEVINFO;
+                        maple_dev->mq->length = 0;
+                        maple_add_packet(maple_dev->mq);
+                        liststatus++;
+                }
+        }
+
+        return 0;
 }
 
 /* VBLANK bottom half - implemented via workqueue */
 static void maple_vblank_handler(struct work_struct *work)
 {
-       if (!maple_dma_done())
-               return;
-       if (!list_empty(&maple_sentq))
-               return;
-       ctrl_outl(0, MAPLE_ENABLE);
-       liststatus = 0;
-       bus_for_each_dev(&maple_bus_type, NULL, NULL,
-                        setup_maple_commands);
-       if (time_after(jiffies, maple_pnp_time))
-               maple_pnp_time = jiffies + MAPLE_PNP_INTERVAL;
-       if (liststatus && list_empty(&maple_sentq)) {
-               INIT_LIST_HEAD(&maple_sentq);
-               maple_send();
-       }
-       maplebus_dma_reset();
+        if (!maple_dma_done())
+                return;
+        if (!list_empty(&maple_sentq))
+                return;
+        ctrl_outl(0, MAPLE_ENABLE);
+        liststatus = 0;
+        bus_for_each_dev(&maple_bus_type, NULL, NULL,
+                         setup_maple_commands);
+        if (time_after(jiffies, maple_pnp_time))
+                maple_pnp_time = jiffies + MAPLE_PNP_INTERVAL;
+        if (liststatus && list_empty(&maple_sentq)) {
+                INIT_LIST_HEAD(&maple_sentq);
+                maple_send();
+        }
+        maplebus_dma_reset();
 }
 
 /* handle devices added via hotplugs - placing them on queue for DEVINFO*/
 static void maple_map_subunits(struct maple_device *mdev, int submask)
 {
-       int retval, k, devcheck;
-       struct maple_device *mdev_add;
-       struct maple_device_specify ds;
-
-       for (k = 0; k < 5; k++) {
-               ds.port = mdev->port;
-               ds.unit = k + 1;
-               retval =
-                   bus_for_each_dev(&maple_bus_type, NULL, &ds,
-                                    detach_maple_device);
-               if (retval) {
-                       submask = submask >> 1;
-                       continue;
-               }
-               devcheck = submask & 0x01;
-               if (devcheck) {
-                       mdev_add = maple_alloc_dev(mdev->port, k + 1);
-                       if (!mdev_add)
-                               return;
-                       mdev_add->mq->command = MAPLE_COMMAND_DEVINFO;
-                       mdev_add->mq->length = 0;
-                       maple_add_packet(mdev_add->mq);
-                       scanning = 1;
-               }
-               submask = submask >> 1;
-       }
+        int retval, k, devcheck;
+        struct maple_device *mdev_add;
+        struct maple_device_specify ds;
+
+        for (k = 0; k < 5; k++) {
+                ds.port = mdev->port;
+                ds.unit = k + 1;
+                retval =
+                    bus_for_each_dev(&maple_bus_type, NULL, &ds,
+                                     detach_maple_device);
+                if (retval) {
+                        submask = submask >> 1;
+                        continue;
+                }
+                devcheck = submask & 0x01;
+                if (devcheck) {
+                        mdev_add = maple_alloc_dev(mdev->port, k + 1);
+                        if (!mdev_add)
+                                return;
+                        mdev_add->mq->command = MAPLE_COMMAND_DEVINFO;
+                        mdev_add->mq->length = 0;
+                        maple_add_packet(mdev_add->mq);
+                        scanning = 1;
+                }
+                submask = submask >> 1;
+        }
 }
 
 /* mark a device as removed */
 static void maple_clean_submap(struct maple_device *mdev)
 {
-       int killbit;
+        int killbit;
 
-       killbit = (mdev->unit > 0 ? (1 << (mdev->unit - 1)) & 0x1f : 0x20);
-       killbit = ~killbit;
-       killbit &= 0xFF;
-       subdevice_map[mdev->port] = subdevice_map[mdev->port] & killbit;
+        killbit = (mdev->unit > 0 ? (1 << (mdev->unit - 1)) & 0x1f : 0x20);
+        killbit = ~killbit;
+        killbit &= 0xFF;
+        subdevice_map[mdev->port] = subdevice_map[mdev->port] & killbit;
 }
 
 /* handle empty port or hotplug removal */
 static void maple_response_none(struct maple_device *mdev,
-                               struct mapleq *mq)
+                                struct mapleq *mq)
 {
-       if (mdev->unit != 0) {
-               list_del(&mq->list);
-               maple_clean_submap(mdev);
-               printk(KERN_INFO
-                      "Maple bus device detaching at (%d, %d)\n",
-                      mdev->port, mdev->unit);
-               maple_detach_driver(mdev);
-               return;
-       }
-       if (!started) {
-               printk(KERN_INFO "No maple devices attached to port %d\n",
-                      mdev->port);
-               return;
-       }
-       maple_clean_submap(mdev);
+        if (mdev->unit != 0) {
+                list_del(&mq->list);
+                maple_clean_submap(mdev);
+                printk(KERN_INFO
+                       "Maple bus device detaching at (%d, %d)\n",
+                       mdev->port, mdev->unit);
+                maple_detach_driver(mdev);
+                return;
+        }
+        if (!started) {
+                printk(KERN_INFO "No maple devices attached to port %d\n",
+                       mdev->port);
+                return;
+        }
+        maple_clean_submap(mdev);
 }
 
 /* preprocess hotplugs or scans */
 static void maple_response_devinfo(struct maple_device *mdev,
-                                  char *recvbuf)
+                                   char *recvbuf)
 {
-       char submask;
-       if ((!started) || (scanning == 2)) {
-               maple_attach_driver(mdev);
-               return;
-       }
-       if (mdev->unit == 0) {
-               submask = recvbuf[2] & 0x1F;
-               if (submask ^ subdevice_map[mdev->port]) {
-                       maple_map_subunits(mdev, submask);
-                       subdevice_map[mdev->port] = submask;
-               }
-       }
+        char submask;
+        if ((!started) || (scanning == 2)) {
+                maple_attach_driver(mdev);
+                return;
+        }
+        if (mdev->unit == 0) {
+                submask = recvbuf[2] & 0x1F;
+                if (submask ^ subdevice_map[mdev->port]) {
+                        maple_map_subunits(mdev, submask);
+                        subdevice_map[mdev->port] = submask;
+                }
+        }
 }
 
 /* maple dma end bottom half - implemented via workqueue */
 static void maple_dma_handler(struct work_struct *work)
 {
-       struct mapleq *mq, *nmq;
-       struct maple_device *dev;
-       char *recvbuf;
-       enum maple_code code;
-
-       if (!maple_dma_done())
-               return;
-       ctrl_outl(0, MAPLE_ENABLE);
-       if (!list_empty(&maple_sentq)) {
-               list_for_each_entry_safe(mq, nmq, &maple_sentq, list) {
-                       recvbuf = mq->recvbuf;
-                       code = recvbuf[0];
-                       dev = mq->dev;
-                       switch (code) {
-                       case MAPLE_RESPONSE_NONE:
-                               maple_response_none(dev, mq);
-                               break;
-
-                       case MAPLE_RESPONSE_DEVINFO:
-                               maple_response_devinfo(dev, recvbuf);
-                               break;
-
-                       case MAPLE_RESPONSE_DATATRF:
-                               if (dev->callback)
-                                       dev->callback(mq);
-                               break;
-
-                       case MAPLE_RESPONSE_FILEERR:
-                       case MAPLE_RESPONSE_AGAIN:
-                       case MAPLE_RESPONSE_BADCMD:
-                       case MAPLE_RESPONSE_BADFUNC:
-                               printk(KERN_DEBUG
-                                      "Maple non-fatal error 0x%X\n",
-                                      code);
-                               break;
-
-                       case MAPLE_RESPONSE_ALLINFO:
-                               printk(KERN_DEBUG
-                                      "Maple - extended device information not supported\n");
-                               break;
-
-                       case MAPLE_RESPONSE_OK:
-                               break;
-
-                       default:
-                               break;
-                       }
-               }
-               INIT_LIST_HEAD(&maple_sentq);
-               if (scanning == 1) {
-                       maple_send();
-                       scanning = 2;
-               } else
-                       scanning = 0;
-
-               if (started == 0)
-                       started = 1;
-       }
-       maplebus_dma_reset();
+        struct mapleq *mq, *nmq;
+        struct maple_device *dev;
+        char *recvbuf;
+        enum maple_code code;
+
+        if (!maple_dma_done())
+                return;
+        ctrl_outl(0, MAPLE_ENABLE);
+        if (!list_empty(&maple_sentq)) {
+                list_for_each_entry_safe(mq, nmq, &maple_sentq, list) {
+                        recvbuf = mq->recvbuf;
+                        code = recvbuf[0];
+                        dev = mq->dev;
+                        switch (code) {
+                        case MAPLE_RESPONSE_NONE:
+                                maple_response_none(dev, mq);
+                                break;
+
+                        case MAPLE_RESPONSE_DEVINFO:
+                                maple_response_devinfo(dev, recvbuf);
+                                break;
+
+                        case MAPLE_RESPONSE_DATATRF:
+                                if (dev->callback)
+                                        dev->callback(mq);
+                                break;
+
+                        case MAPLE_RESPONSE_FILEERR:
+                        case MAPLE_RESPONSE_AGAIN:
+                        case MAPLE_RESPONSE_BADCMD:
+                        case MAPLE_RESPONSE_BADFUNC:
+                                printk(KERN_DEBUG
+                                       "Maple non-fatal error 0x%X\n",
+                                       code);
+                                break;
+
+                        case MAPLE_RESPONSE_ALLINFO:
+                                printk(KERN_DEBUG
+                                       "Maple - extended device information"
+                                        " not supported\n");
+                                break;
+
+                        case MAPLE_RESPONSE_OK:
+                                break;
+
+                        default:
+                                break;
+                        }
+                }
+                INIT_LIST_HEAD(&maple_sentq);
+                if (scanning == 1) {
+                        maple_send();
+                        scanning = 2;
+                } else
+                        scanning = 0;
+
+                if (started == 0)
+                        started = 1;
+        }
+        maplebus_dma_reset();
 }
 
 static irqreturn_t maplebus_dma_interrupt(int irq, void *dev_id)
 {
-       /* Load everything into the bottom half */
-       schedule_work(&maple_dma_process);
-       return IRQ_HANDLED;
+        /* Load everything into the bottom half */
+        schedule_work(&maple_dma_process);
+        return IRQ_HANDLED;
 }
 
 static irqreturn_t maplebus_vblank_interrupt(int irq, void *dev_id)
 {
-       schedule_work(&maple_vblank_process);
-       return IRQ_HANDLED;
+        schedule_work(&maple_vblank_process);
+        return IRQ_HANDLED;
 }
 
-static struct irqaction maple_dma_irq = {
-       .name = "maple bus DMA handler",
-       .handler = maplebus_dma_interrupt,
-       .flags = IRQF_SHARED,
-};
-
-static struct irqaction maple_vblank_irq = {
-       .name = "maple bus VBLANK handler",
-       .handler = maplebus_vblank_interrupt,
-       .flags = IRQF_SHARED,
-};
-
 static int maple_set_dma_interrupt_handler(void)
 {
-       return setup_irq(HW_EVENT_MAPLE_DMA, &maple_dma_irq);
+        return request_irq(HW_EVENT_MAPLE_DMA, maplebus_dma_interrupt,
+                IRQF_SHARED, "maple bus DMA", &maple_dummy_driver);
 }
 
 static int maple_set_vblank_interrupt_handler(void)
 {
-       return setup_irq(HW_EVENT_VSYNC, &maple_vblank_irq);
+        return request_irq(HW_EVENT_VSYNC, maplebus_vblank_interrupt,
+                IRQF_SHARED, "maple bus VBLANK", &maple_dummy_driver);
 }
 
 static int maple_get_dma_buffer(void)
 {
-       maple_sendbuf =
-           (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
-                                     MAPLE_DMA_PAGES);
-       if (!maple_sendbuf)
-               return -ENOMEM;
-       return 0;
+        maple_sendbuf =
+            (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
+                                      MAPLE_DMA_PAGES);
+        if (!maple_sendbuf)
+                return -ENOMEM;
+        return 0;
 }
 
 static int match_maple_bus_driver(struct device *devptr,
-                                 struct device_driver *drvptr)
+                                  struct device_driver *drvptr)
 {
-       struct maple_driver *maple_drv;
-       struct maple_device *maple_dev;
-
-       maple_drv = container_of(drvptr, struct maple_driver, drv);
-       maple_dev = container_of(devptr, struct maple_device, dev);
-       /* Trap empty port case */
-       if (maple_dev->devinfo.function == 0xFFFFFFFF)
-               return 0;
-       else if (maple_dev->devinfo.function &
-                be32_to_cpu(maple_drv->function))
-               return 1;
-       return 0;
+        struct maple_driver *maple_drv;
+        struct maple_device *maple_dev;
+
+        maple_drv = container_of(drvptr, struct maple_driver, drv);
+        maple_dev = container_of(devptr, struct maple_device, dev);
+        /* Trap empty port case */
+        if (maple_dev->devinfo.function == 0xFFFFFFFF)
+                return 0;
+        else if (maple_dev->devinfo.function &
+                 be32_to_cpu(maple_drv->function))
+                return 1;
+        return 0;
 }
 
-static int maple_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
+static int maple_bus_uevent(struct device *dev,
+                            struct kobj_uevent_env *env)
 {
-       return 0;
+        return 0;
 }
 
 static void maple_bus_release(struct device *dev)
@@ -611,124 +626,122 @@ static void maple_bus_release(struct device *dev)
 }
 
 static struct maple_driver maple_dummy_driver = {
-       .drv = {
-               .name = "maple_dummy_driver",
-               .bus =  &maple_bus_type,
-       },
+        .drv = {
+                .name = "maple_dummy_driver",
+                .bus = &maple_bus_type,
+        },
 };
 
 struct bus_type maple_bus_type = {
-       .name =         "maple",
-       .match =        match_maple_bus_driver,
-       .uevent =       maple_bus_uevent,
+        .name = "maple",
+        .match = match_maple_bus_driver,
+        .uevent = maple_bus_uevent,
 };
 EXPORT_SYMBOL_GPL(maple_bus_type);
 
 static struct device maple_bus = {
-       .bus_id = "maple",
-       .release = maple_bus_release,
+        .bus_id = "maple",
+        .release = maple_bus_release,
 };
 
 static int __init maple_bus_init(void)
 {
-       int retval, i;
-       struct maple_device *mdev[MAPLE_PORTS];
-       ctrl_outl(0, MAPLE_STATE);
-
-       retval = device_register(&maple_bus);
-       if (retval)
-               goto cleanup;
-
-       retval = bus_register(&maple_bus_type);
-       if (retval)
-               goto cleanup_device;
-
-       retval = driver_register(&maple_dummy_driver.drv);
-
-       if (retval)
-               goto cleanup_bus;
-
-       /* allocate memory for maple bus dma */
-       retval = maple_get_dma_buffer();
-       if (retval) {
-               printk(KERN_INFO
-                      "Maple bus: Failed to allocate Maple DMA buffers\n");
-               goto cleanup_basic;
-       }
-
-       /* set up DMA interrupt handler */
-       retval = maple_set_dma_interrupt_handler();
-       if (retval) {
-               printk(KERN_INFO
-                      "Maple bus: Failed to grab maple DMA IRQ\n");
-               goto cleanup_dma;
-       }
-
-       /* set up VBLANK interrupt handler */
-       retval = maple_set_vblank_interrupt_handler();
-       if (retval) {
-               printk(KERN_INFO "Maple bus: Failed to grab VBLANK IRQ\n");
-               goto cleanup_irq;
-       }
-
-       maple_queue_cache =
-           kmem_cache_create("maple_queue_cache", 0x400, 0,
-                             SLAB_HWCACHE_ALIGN, NULL);
-
-       if (!maple_queue_cache)
-               goto cleanup_bothirqs;
-
-       /* setup maple ports */
-       for (i = 0; i < MAPLE_PORTS; i++) {
-               mdev[i] = maple_alloc_dev(i, 0);
-               if (!mdev[i]) {
-                       while (i-- > 0)
-                               maple_free_dev(mdev[i]);
-                       goto cleanup_cache;
-               }
-               mdev[i]->registered = 0;
-               mdev[i]->mq->command = MAPLE_COMMAND_DEVINFO;
-               mdev[i]->mq->length = 0;
-               maple_attach_driver(mdev[i]);
-               maple_add_packet(mdev[i]->mq);
-               subdevice_map[i] = 0;
-       }
-
-       /* setup maplebus hardware */
-       maplebus_dma_reset();
-
-       /* initial detection */
-       maple_send();
-
-       maple_pnp_time = jiffies;
-
-       printk(KERN_INFO "Maple bus core now registered.\n");
-
-       return 0;
+        int retval, i;
+        struct maple_device *mdev[MAPLE_PORTS];
+        ctrl_outl(0, MAPLE_STATE);
+
+        retval = device_register(&maple_bus);
+        if (retval)
+                goto cleanup;
+
+        retval = bus_register(&maple_bus_type);
+        if (retval)
+                goto cleanup_device;
+
+        retval = driver_register(&maple_dummy_driver.drv);
+        if (retval)
+                goto cleanup_bus;
+
+        /* allocate memory for maple bus dma */
+        retval = maple_get_dma_buffer();
+        if (retval) {
+                printk(KERN_INFO
+                       "Maple bus: Failed to allocate Maple DMA buffers\n");
+                goto cleanup_basic;
+        }
+
+        /* set up DMA interrupt handler */
+        retval = maple_set_dma_interrupt_handler();
+        if (retval) {
+                printk(KERN_INFO
+                       "Maple bus: Failed to grab maple DMA IRQ\n");
+                goto cleanup_dma;
+        }
+
+        /* set up VBLANK interrupt handler */
+        retval = maple_set_vblank_interrupt_handler();
+        if (retval) {
+                printk(KERN_INFO "Maple bus: Failed to grab VBLANK IRQ\n");
+                goto cleanup_irq;
+        }
+
+        maple_queue_cache =
+            kmem_cache_create("maple_queue_cache", 0x400, 0,
+                              SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL);
+
+        if (!maple_queue_cache)
+                goto cleanup_bothirqs;
+
+        /* setup maple ports */
+        for (i = 0; i < MAPLE_PORTS; i++) {
+                mdev[i] = maple_alloc_dev(i, 0);
+                if (!mdev[i]) {
+                        while (i-- > 0)
+                                maple_free_dev(mdev[i]);
+                        goto cleanup_cache;
+                }
+                mdev[i]->mq->command = MAPLE_COMMAND_DEVINFO;
+                mdev[i]->mq->length = 0;
+                maple_add_packet(mdev[i]->mq);
+                /* delay aids hardware detection */
+                mdelay(5);
+                subdevice_map[i] = 0;
+        }
+
+        realscan = 1;
+        /* setup maplebus hardware */
+        maplebus_dma_reset();
+        /* initial detection */
+        maple_send();
+        maple_pnp_time = jiffies;
+        printk(KERN_INFO "Maple bus core now registered.\n");
+
+        return 0;
 
 cleanup_cache:
-       kmem_cache_destroy(maple_queue_cache);
+        kmem_cache_destroy(maple_queue_cache);
 
 cleanup_bothirqs:
-       free_irq(HW_EVENT_VSYNC, 0);
+        free_irq(HW_EVENT_VSYNC, 0);
 
 cleanup_irq:
-       free_irq(HW_EVENT_MAPLE_DMA, 0);
+        free_irq(HW_EVENT_MAPLE_DMA, 0);
 
 cleanup_dma:
-       free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES);
+        free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES);
 
 cleanup_basic:
-       driver_unregister(&maple_dummy_driver.drv);
+        driver_unregister(&maple_dummy_driver.drv);
 
 cleanup_bus:
-       bus_unregister(&maple_bus_type);
+        bus_unregister(&maple_bus_type);
 
 cleanup_device:
-       device_unregister(&maple_bus);
+        device_unregister(&maple_bus);
 
 cleanup:
-       printk(KERN_INFO "Maple bus registration failed\n");
-       return retval;
+        printk(KERN_INFO "Maple bus registration failed\n");
+        return retval;
 }
-subsys_initcall(maple_bus_init);
+/* Push init to later to ensure hardware gets detected */
+fs_initcall(maple_bus_init);
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 293b7cab3e57..85687aaf9cab 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -87,6 +87,16 @@ static void cs_activate(struct atmel_spi *as, struct spi_device *spi)
         unsigned gpio = (unsigned) spi->controller_data;
         unsigned active = spi->mode & SPI_CS_HIGH;
         u32 mr;
+        int i;
+        u32 csr;
+        u32 cpol = (spi->mode & SPI_CPOL) ? SPI_BIT(CPOL) : 0;
+
+        /* Make sure clock polarity is correct */
+        for (i = 0; i < spi->master->num_chipselect; i++) {
+                csr = spi_readl(as, CSR0 + 4 * i);
+                if ((csr ^ cpol) & SPI_BIT(CPOL))
+                        spi_writel(as, CSR0 + 4 * i, csr ^ SPI_BIT(CPOL));
+        }
 
         mr = spi_readl(as, MR);
         mr = SPI_BFINS(PCS, ~(1 << spi->chip_select), mr);
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 365e0e355aea..59deed79e0ab 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -51,13 +51,19 @@ MODULE_LICENSE("GPL");
 #define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK)
 #define IS_DMA_ALIGNED(x) (((u32)(x)&0x07)==0)
 
-/* for testing SSCR1 changes that require SSP restart, basically
- * everything except the service and interrupt enables */
-#define SSCR1_CHANGE_MASK (SSCR1_TTELP | SSCR1_TTE | SSCR1_EBCEI | SSCR1_SCFR \
+/*
+ * for testing SSCR1 changes that require SSP restart, basically
+ * everything except the service and interrupt enables, the pxa270 developer
+ * manual says only SSCR1_SCFR, SSCR1_SPH, SSCR1_SPO need to be in this
+ * list, but the PXA255 dev man says all bits without really meaning the
+ * service and interrupt enables
+ */
+#define SSCR1_CHANGE_MASK (SSCR1_TTELP | SSCR1_TTE | SSCR1_SCFR \
                                 | SSCR1_ECRA | SSCR1_ECRB | SSCR1_SCLKDIR \
-                                | SSCR1_RWOT | SSCR1_TRAIL | SSCR1_PINTE \
-                                | SSCR1_STRF | SSCR1_EFWR |SSCR1_RFT \
-                                | SSCR1_TFT | SSCR1_SPH | SSCR1_SPO | SSCR1_LBM)
+                                | SSCR1_SFRMDIR | SSCR1_RWOT | SSCR1_TRAIL \
+                                | SSCR1_IFS | SSCR1_STRF | SSCR1_EFWR \
+                                | SSCR1_RFT | SSCR1_TFT | SSCR1_MWDS \
+                                | SSCR1_SPH | SSCR1_SPO | SSCR1_LBM)
 
 #define DEFINE_SSP_REG(reg, off) \
 static inline u32 read_##reg(void *p) { return __raw_readl(p + (off)); } \
@@ -973,9 +979,6 @@ static void pump_transfers(unsigned long data)
                 if (drv_data->ssp_type == PXA25x_SSP)
                         DCMD(drv_data->tx_channel) |= DCMD_ENDIRQEN;
 
-                /* Fix me, need to handle cs polarity */
-                drv_data->cs_control(PXA2XX_CS_ASSERT);
-
                 /* Clear status and start DMA engine */
                 cr1 = chip->cr1 | dma_thresh | drv_data->dma_cr1;
                 write_SSSR(drv_data->clear_sr, reg);
@@ -985,9 +988,6 @@ static void pump_transfers(unsigned long data)
                 /* Ensure we have the correct interrupt handler */
                 drv_data->transfer_handler = interrupt_transfer;
 
-                /* Fix me, need to handle cs polarity */
-                drv_data->cs_control(PXA2XX_CS_ASSERT);
-
                 /* Clear status  */
                 cr1 = chip->cr1 | chip->threshold | drv_data->int_cr1;
                 write_SSSR(drv_data->clear_sr, reg);
@@ -998,16 +998,29 @@ static void pump_transfers(unsigned long data)
                 || (read_SSCR1(reg) & SSCR1_CHANGE_MASK) !=
                         (cr1 & SSCR1_CHANGE_MASK)) {
 
+                /* stop the SSP, and update the other bits */
                 write_SSCR0(cr0 & ~SSCR0_SSE, reg);
                 if (drv_data->ssp_type != PXA25x_SSP)
                         write_SSTO(chip->timeout, reg);
-                write_SSCR1(cr1, reg);
+                /* first set CR1 without interrupt and service enables */
+                write_SSCR1(cr1 & SSCR1_CHANGE_MASK, reg);
+                /* restart the SSP */
                 write_SSCR0(cr0, reg);
+
         } else {
                 if (drv_data->ssp_type != PXA25x_SSP)
                         write_SSTO(chip->timeout, reg);
-                write_SSCR1(cr1, reg);
         }
+
+        /* FIXME, need to handle cs polarity,
+         * this driver uses struct pxa2xx_spi_chip.cs_control to
+         * specify a CS handling function, and it ignores most
+         * struct spi_device.mode[s], including SPI_CS_HIGH */
+        drv_data->cs_control(PXA2XX_CS_ASSERT);
+
+        /* after chip select, release the data by enabling service
+         * requests and interrupts, without changing any mode bits */
+        write_SSCR1(cr1, reg);
 }
 
 static void pump_messages(struct work_struct *work)
diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c
index e782b3e7fcdb..8b86e53ccf7a 100644
--- a/drivers/thermal/thermal.c
+++ b/drivers/thermal/thermal.c
@@ -306,12 +306,23 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
 {
         struct thermal_cooling_device_instance *dev;
         struct thermal_cooling_device_instance *pos;
+        struct thermal_zone_device *pos1;
+        struct thermal_cooling_device *pos2;
         int result;
 
         if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
                 return -EINVAL;
 
-        if (!tz || !cdev)
+        list_for_each_entry(pos1, &thermal_tz_list, node) {
+                if (pos1 == tz)
+                        break;
+        }
+        list_for_each_entry(pos2, &thermal_cdev_list, node) {
+                if (pos2 == cdev)
+                        break;
+        }
+
+        if (tz != pos1 || cdev != pos2)
                 return -EINVAL;
 
         dev =
@@ -437,20 +448,20 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *type,
         int result;
 
         if (strlen(type) >= THERMAL_NAME_LENGTH)
-                return NULL;
+                return ERR_PTR(-EINVAL);
 
         if (!ops || !ops->get_max_state || !ops->get_cur_state ||
             !ops->set_cur_state)
-                return NULL;
+                return ERR_PTR(-EINVAL);
 
         cdev = kzalloc(sizeof(struct thermal_cooling_device), GFP_KERNEL);
         if (!cdev)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         result = get_idr(&thermal_cdev_idr, &thermal_idr_lock, &cdev->id);
         if (result) {
                 kfree(cdev);
-                return NULL;
+                return ERR_PTR(result);
         }
 
         strcpy(cdev->type, type);
@@ -462,7 +473,7 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *type,
         if (result) {
                 release_idr(&thermal_cdev_idr, &thermal_idr_lock, cdev->id);
                 kfree(cdev);
-                return NULL;
+                return ERR_PTR(result);
         }
 
         /* sys I/F */
@@ -498,7 +509,7 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *type,
       unregister:
         release_idr(&thermal_cdev_idr, &thermal_idr_lock, cdev->id);
         device_unregister(&cdev->device);
-        return NULL;
+        return ERR_PTR(result);
 }
 
 EXPORT_SYMBOL(thermal_cooling_device_register);
@@ -570,17 +581,17 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
         int count;
 
         if (strlen(type) >= THERMAL_NAME_LENGTH)
-                return NULL;
+                return ERR_PTR(-EINVAL);
 
         if (trips > THERMAL_MAX_TRIPS || trips < 0)
-                return NULL;
+                return ERR_PTR(-EINVAL);
 
         if (!ops || !ops->get_temp)
-                return NULL;
+                return ERR_PTR(-EINVAL);
 
         tz = kzalloc(sizeof(struct thermal_zone_device), GFP_KERNEL);
         if (!tz)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         INIT_LIST_HEAD(&tz->cooling_devices);
         idr_init(&tz->idr);
@@ -588,7 +599,7 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
         result = get_idr(&thermal_tz_idr, &thermal_idr_lock, &tz->id);
         if (result) {
                 kfree(tz);
-                return NULL;
+                return ERR_PTR(result);
         }
 
         strcpy(tz->type, type);
@@ -601,7 +612,7 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
         if (result) {
                 release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
                 kfree(tz);
-                return NULL;
+                return ERR_PTR(result);
         }
 
         /* sys I/F */
@@ -643,7 +654,7 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
       unregister:
         release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
         device_unregister(&tz->device);
-        return NULL;
+        return ERR_PTR(result);
 }
 
 EXPORT_SYMBOL(thermal_zone_device_register);
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 2a77e9d42c68..e8a01f264540 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -57,29 +57,29 @@ struct uio_map {
 };
 #define to_map(map) container_of(map, struct uio_map, kobj)
 
-
-static ssize_t map_attr_show(struct kobject *kobj, struct kobj_attribute *attr,
-                             char *buf)
+static ssize_t map_addr_show(struct uio_mem *mem, char *buf)
 {
-        struct uio_map *map = to_map(kobj);
-        struct uio_mem *mem = map->mem;
-
-        if (strncmp(attr->attr.name, "addr", 4) == 0)
-                return sprintf(buf, "0x%lx\n", mem->addr);
-
-        if (strncmp(attr->attr.name, "size", 4) == 0)
-                return sprintf(buf, "0x%lx\n", mem->size);
+        return sprintf(buf, "0x%lx\n", mem->addr);
+}
 
-        return -ENODEV;
+static ssize_t map_size_show(struct uio_mem *mem, char *buf)
+{
+        return sprintf(buf, "0x%lx\n", mem->size);
 }
 
-static struct kobj_attribute attr_attribute =
-        __ATTR(addr, S_IRUGO, map_attr_show, NULL);
-static struct kobj_attribute size_attribute =
-        __ATTR(size, S_IRUGO, map_attr_show, NULL);
+struct uio_sysfs_entry {
+        struct attribute attr;
+        ssize_t (*show)(struct uio_mem *, char *);
+        ssize_t (*store)(struct uio_mem *, const char *, size_t);
+};
+
+static struct uio_sysfs_entry addr_attribute =
+        __ATTR(addr, S_IRUGO, map_addr_show, NULL);
+static struct uio_sysfs_entry size_attribute =
+        __ATTR(size, S_IRUGO, map_size_show, NULL);
 
 static struct attribute *attrs[] = {
-        &attr_attribute.attr,
+        &addr_attribute.attr,
         &size_attribute.attr,
         NULL,   /* need to NULL terminate the list of attributes */
 };
@@ -90,8 +90,28 @@ static void map_release(struct kobject *kobj)
         kfree(map);
 }
 
+static ssize_t map_type_show(struct kobject *kobj, struct attribute *attr,
+                             char *buf)
+{
+        struct uio_map *map = to_map(kobj);
+        struct uio_mem *mem = map->mem;
+        struct uio_sysfs_entry *entry;
+
+        entry = container_of(attr, struct uio_sysfs_entry, attr);
+
+        if (!entry->show)
+                return -EIO;
+
+        return entry->show(mem, buf);
+}
+
+static struct sysfs_ops uio_sysfs_ops = {
+        .show = map_type_show,
+};
+
 static struct kobj_type map_attr_type = {
         .release        = map_release,
+        .sysfs_ops      = &uio_sysfs_ops,
         .default_attrs  = attrs,
 };
 
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index bcc42136c93f..0147ea39340e 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -496,13 +496,10 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
            otherwise it is scheduled, and with high data rates data can get lost. */
         tty->low_latency = 1;
 
-        if (usb_autopm_get_interface(acm->control)) {
-                mutex_unlock(&open_mutex);
-                return -EIO;
-        }
+        if (usb_autopm_get_interface(acm->control) < 0)
+                goto early_bail;
 
         mutex_lock(&acm->mutex);
-        mutex_unlock(&open_mutex);
         if (acm->used++) {
                 usb_autopm_put_interface(acm->control);
                 goto done;
@@ -536,6 +533,7 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
 done:
 err_out:
         mutex_unlock(&acm->mutex);
+        mutex_unlock(&open_mutex);
         return rv;
 
 full_bailout:
@@ -544,6 +542,8 @@ bail_out:
         usb_autopm_put_interface(acm->control);
         acm->used--;
         mutex_unlock(&acm->mutex);
+early_bail:
+        mutex_unlock(&open_mutex);
         return -EIO;
 }
 
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index ad632f2d6f94..0647164d36db 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -428,6 +428,7 @@ static int usblp_open(struct inode *inode, struct file *file)
         usblp->rcomplete = 0;
 
         if (handle_bidir(usblp) < 0) {
+                usb_autopm_put_interface(intf);
                 usblp->used = 0;
                 file->private_data = NULL;
                 retval = -EIO;
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index d42c561c75f1..f90ab5e94c58 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -28,11 +28,23 @@
  * devices is broken...
  */
 static const struct usb_device_id usb_quirk_list[] = {
+        /* Action Semiconductor flash disk */
+        { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255},
+
         /* CBM - Flash disk */
         { USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
         /* HP 5300/5370C scanner */
         { USB_DEVICE(0x03f0, 0x0701), .driver_info = USB_QUIRK_STRING_FETCH_255 },
 
+        /* Creative SB Audigy 2 NX */
+        { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
+
+        /* Roland SC-8820 */
+        { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },
+
+        /* Edirol SD-20 */
+        { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* INTEL VALUE SSD */
         { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
 
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a70e255402b8..e99872308144 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1561,6 +1561,7 @@ done_set_intf:
                                 memcpy(req->buf, buf, n);
                                 req->complete = rndis_response_complete;
                                 rndis_free_response(dev->rndis_config, buf);
+                                value = n;
                         }
                         /* else stalls ... spec says to avoid that */
                 }
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 3301167d4f2a..017a196d041f 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3563,8 +3563,7 @@ static ssize_t show_file(struct device *dev, struct device_attribute *attr,
 
         down_read(&fsg->filesem);
         if (backing_file_is_open(curlun)) {     // Get the complete pathname
-                p = d_path(curlun->filp->f_path.dentry,
-                                curlun->filp->f_path.mnt, buf, PAGE_SIZE - 1);
+                p = d_path(&curlun->filp->f_path, buf, PAGE_SIZE - 1);
                 if (IS_ERR(p))
                         rc = PTR_ERR(p);
                 else {
@@ -3981,9 +3980,8 @@ static int __init fsg_bind(struct usb_gadget *gadget)
                 if (backing_file_is_open(curlun)) {
                         p = NULL;
                         if (pathbuf) {
-                                p = d_path(curlun->filp->f_path.dentry,
-                                        curlun->filp->f_path.mnt,
-                                        pathbuf, PATH_MAX);
+                                p = d_path(&curlun->filp->f_path,
+                                           pathbuf, PATH_MAX);
                                 if (IS_ERR(p))
                                         p = NULL;
                         }
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 9fdabc8fcac4..4f6bfa100f2a 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -1299,7 +1299,7 @@ printer_unbind(struct usb_gadget *gadget)
                 printer_req_free(dev->in_ep, req);
         }
 
-        if (dev->current_rx_req != NULL);
+        if (dev->current_rx_req != NULL)
                 printer_req_free(dev->out_ep, dev->current_rx_req);
 
         while (!list_empty(&dev->rx_reqs)) {
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index d97b16b52efa..bf8be2a41a4a 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -69,10 +69,9 @@ config USB_EHCI_BIG_ENDIAN_DESC
         default y
 
 config USB_EHCI_FSL
-        bool
-        depends on USB_EHCI_HCD
+        bool "Support for Freescale on-chip EHCI USB controller"
+        depends on USB_EHCI_HCD && FSL_SOC
         select USB_EHCI_ROOT_HUB_TT
-        default y if MPC834x || PPC_MPC831x
         ---help---
           Variation of ARC USB block used in some Freescale chips.
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4caa6a8b9a37..b8ad55aff842 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -862,18 +862,18 @@ static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 /* reschedule QH iff another request is queued */
                 if (!list_empty (&qh->qtd_list)
                                 && HC_IS_RUNNING (hcd->state)) {
-                        int schedule_status;
-
-                        schedule_status = qh_schedule (ehci, qh);
-                        spin_unlock_irqrestore (&ehci->lock, flags);
-
-                        if (schedule_status != 0) {
-                                // shouldn't happen often, but ...
-                                // FIXME kill those tds' urbs
-                                err ("can't reschedule qh %p, err %d",
-                                        qh, schedule_status);
-                        }
-                        return status;
+                        rc = qh_schedule(ehci, qh);
+
+                        /* An error here likely indicates handshake failure
+                         * or no space left in the schedule.  Neither fault
+                         * should happen often ...
+                         *
+                         * FIXME kill the now-dysfunctional queued urbs
+                         */
+                        if (rc != 0)
+                                ehci_err(ehci,
+                                        "can't reschedule qh %p, err %d",
+                                        qh, rc);
                 }
                 break;
 
@@ -1014,7 +1014,7 @@ MODULE_LICENSE ("GPL");
 #endif
 
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-    !defined(PS3_SYSTEM_BUS_DRIVER)
+    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
 #error "missing bus glue for ehci-hcd"
 #endif
 
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index ba370c56172c..59be276ccd9d 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1766,6 +1766,7 @@ sl811h_suspend(struct platform_device *dev, pm_message_t state)
                 retval = sl811h_bus_suspend(hcd);
                 break;
         case PM_EVENT_SUSPEND:
+        case PM_EVENT_HIBERNATE:
         case PM_EVENT_PRETHAW:          /* explicitly discard hw state */
                 port_power(sl811, 0);
                 break;
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index ac283b09a63f..3033d6945202 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -3213,15 +3213,20 @@ static int u132_suspend(struct platform_device *pdev, pm_message_t state)
                 dev_err(&u132->platform_dev->dev, "device is being removed\n");
                 return -ESHUTDOWN;
         } else {
-                int retval = 0;
-                if (state.event == PM_EVENT_FREEZE) {
+                int retval = 0, ports;
+
+                switch (state.event) {
+                case PM_EVENT_FREEZE:
                         retval = u132_bus_suspend(hcd);
-                } else if (state.event == PM_EVENT_SUSPEND) {
-                        int ports = MAX_U132_PORTS;
+                        break;
+                case PM_EVENT_SUSPEND:
+                case PM_EVENT_HIBERNATE:
+                        ports = MAX_U132_PORTS;
                         while (ports-- > 0) {
                                 port_power(u132, ports, 0);
                         }
-                }
+                        break;
+                }
                 if (retval == 0)
                         pdev->dev.power.power_state = state;
                 return retval;
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 8208496dfc63..c730d20eec66 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -61,6 +61,7 @@
 #define USB_DEVICE_ID_VERNIER_GOTEMP    0x0002
 #define USB_DEVICE_ID_VERNIER_SKIP      0x0003
 #define USB_DEVICE_ID_VERNIER_CYCLOPS   0x0004
+#define USB_DEVICE_ID_VERNIER_LCSPEC    0x0006
 
 #define USB_VENDOR_ID_MICROCHIP         0x04d8
 #define USB_DEVICE_ID_PICDEM            0x000c
@@ -92,6 +93,7 @@ static struct usb_device_id ld_usb_table [] = {
         { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
         { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },
         { USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICDEM) },
+        { USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },
         { }                                     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, ld_usb_table);
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index 67e2fc20eeeb..03368edf3f22 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -59,13 +59,14 @@ static ssize_t set_speed(struct device *dev, struct device_attribute *attr,
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct trancevibrator *tv = usb_get_intfdata(intf);
-        int temp, retval;
+        int temp, retval, old;
 
         temp = simple_strtoul(buf, NULL, 10);
         if (temp > 255)
                 temp = 255;
         else if (temp < 0)
                 temp = 0;
+        old = tv->speed;
         tv->speed = temp;
 
         dev_dbg(&tv->udev->dev, "speed = %d\n", tv->speed);
@@ -77,6 +78,7 @@ static ssize_t set_speed(struct device *dev, struct device_attribute *attr,
                                  tv->speed, /* speed value */
                                  0, NULL, 0, USB_CTRL_GET_TIMEOUT);
         if (retval) {
+                tv->speed = old;
                 dev_dbg(&tv->udev->dev, "retval = %d\n", retval);
                 return retval;
         }
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 90dcc625f70d..76db2fef4657 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -393,8 +393,8 @@ static const char *ftdi_chip_name[] = {
 #define FTDI_STATUS_B1_MASK     (FTDI_RS_BI)
 /* End TIOCMIWAIT */
 
-#define FTDI_IMPL_ASYNC_FLAGS = ( ASYNC_SPD_HI | ASYNC_SPD_VHI \
- ASYNC_SPD_CUST | ASYNC_SPD_SHI | ASYNC_SPD_WARP )
+#define FTDI_IMPL_ASYNC_FLAGS = (ASYNC_SPD_HI | ASYNC_SPD_VHI \
+ | ASYNC_SPD_CUST | ASYNC_SPD_SHI | ASYNC_SPD_WARP)
 
 /* function prototypes for a FTDI serial converter */
 static int  ftdi_sio_probe      (struct usb_serial *serial, const struct usb_device_id *id);
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 5e8bf1bc1e50..af2674c57414 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -113,6 +113,9 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define NOVATELWIRELESS_VENDOR_ID               0x1410
 #define DELL_VENDOR_ID                          0x413C
 
+#define KYOCERA_VENDOR_ID                       0x0c88
+#define KYOCERA_PRODUCT_KPC680                  0x180a
+
 #define ANYDATA_VENDOR_ID                       0x16d5
 #define ANYDATA_PRODUCT_ADU_E100A               0x6501
 #define ANYDATA_PRODUCT_ADU_500A                0x6502
@@ -121,6 +124,8 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define BANDRICH_PRODUCT_C100_1                 0x1002
 #define BANDRICH_PRODUCT_C100_2                 0x1003
 
+#define QUALCOMM_VENDOR_ID                      0x05C6
+
 static struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -174,18 +179,23 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2410) }, /* Novatel EU740 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x4100) }, /* Novatel U727 */
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x4400) }, /* Novatel MC950 */
+        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x5010) }, /* Novatel U727 */
         { 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(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
         { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
+        { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
+        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
@@ -247,10 +257,10 @@ static int debug;
 struct option_port_private {
         /* Input endpoints and buffer for this port */
         struct urb *in_urbs[N_IN_URB];
-        char in_buffer[N_IN_URB][IN_BUFLEN];
+        u8 *in_buffer[N_IN_URB];
         /* Output endpoints and buffer for this port */
         struct urb *out_urbs[N_OUT_URB];
-        char out_buffer[N_OUT_URB][OUT_BUFLEN];
+        u8 *out_buffer[N_OUT_URB];
         unsigned long out_busy;         /* Bit vector of URBs in use */
 
         /* Settings for the port */
@@ -737,9 +747,10 @@ static int option_send_setup(struct usb_serial_port *port)
 
 static int option_startup(struct usb_serial *serial)
 {
-        int i, err;
+        int i, j, err;
         struct usb_serial_port *port;
         struct option_port_private *portdata;
+        u8 *buffer;
 
         dbg("%s", __FUNCTION__);
 
@@ -753,6 +764,20 @@ static int option_startup(struct usb_serial *serial)
                         return (1);
                 }
 
+                for (j = 0; j < N_IN_URB; j++) {
+                        buffer = (u8 *)__get_free_page(GFP_KERNEL);
+                        if (!buffer)
+                                goto bail_out_error;
+                        portdata->in_buffer[j] = buffer;
+                }
+
+                for (j = 0; j < N_OUT_URB; j++) {
+                        buffer = kmalloc(OUT_BUFLEN, GFP_KERNEL);
+                        if (!buffer)
+                                goto bail_out_error2;
+                        portdata->out_buffer[j] = buffer;
+                }
+
                 usb_set_serial_port_data(port, portdata);
 
                 if (! port->interrupt_in_urb)
@@ -766,6 +791,16 @@ static int option_startup(struct usb_serial *serial)
         option_setup_urbs(serial);
 
         return (0);
+
+bail_out_error2:
+        for (j = 0; j < N_OUT_URB; j++)
+                kfree(portdata->out_buffer[j]);
+bail_out_error:
+        for (j = 0; j < N_IN_URB; j++)
+                if (portdata->in_buffer[j])
+                        free_page((unsigned long)portdata->in_buffer[j]);
+        kfree(portdata);
+        return 1;
 }
 
 static void option_shutdown(struct usb_serial *serial)
@@ -794,12 +829,14 @@ static void option_shutdown(struct usb_serial *serial)
                 for (j = 0; j < N_IN_URB; j++) {
                         if (portdata->in_urbs[j]) {
                                 usb_free_urb(portdata->in_urbs[j]);
+                                free_page((unsigned long)portdata->in_buffer[j]);
                                 portdata->in_urbs[j] = NULL;
                         }
                 }
                 for (j = 0; j < N_OUT_URB; j++) {
                         if (portdata->out_urbs[j]) {
                                 usb_free_urb(portdata->out_urbs[j]);
+                                kfree(portdata->out_buffer[j]);
                                 portdata->out_urbs[j] = NULL;
                         }
                 }
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 4c925e3e8a63..e3d44ae8d448 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -178,7 +178,6 @@ static struct usb_device_id id_table [] = {
 
         { USB_DEVICE(0x1199, 0x0112), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 580 */
         { USB_DEVICE(0x0F3D, 0x0112), .driver_info = DEVICE_1_PORT }, /* Airprime/Sierra PC 5220 */
-        { USB_DEVICE(0x05C6, 0x6613), .driver_info = DEVICE_1_PORT }, /* Onda H600/ZTE MF330 */
 
         { USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER},
         { }
diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index a41ce21c0697..958f5b17847c 100644
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -150,13 +150,14 @@ void usb_stor_transparent_scsi_command(struct scsi_cmnd *srb,
 
 /* Copy a buffer of length buflen to/from the srb's transfer buffer.
  * Update the **sgptr and *offset variables so that the next copy will
- * pick up from where this one left off. */
-
+ * pick up from where this one left off.
+ */
 unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,
         unsigned int buflen, struct scsi_cmnd *srb, struct scatterlist **sgptr,
         unsigned int *offset, enum xfer_buf_dir dir)
 {
         unsigned int cnt;
+        struct scatterlist *sg = *sgptr;
 
         /* We have to go through the list one entry
          * at a time.  Each s-g entry contains some number of pages, and
@@ -164,22 +165,23 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,
          * in kernel-addressable memory then kmap() will return its address.
          * If the page is not directly accessible -- such as a user buffer
          * located in high memory -- then kmap() will map it to a temporary
-         * position in the kernel's virtual address space. */
-        struct scatterlist *sg = *sgptr;
+         * position in the kernel's virtual address space.
+         */
 
         if (!sg)
                 sg = scsi_sglist(srb);
+        buflen = min(buflen, scsi_bufflen(srb));
 
         /* This loop handles a single s-g list entry, which may
-                * include multiple pages.  Find the initial page structure
-                * and the starting offset within the page, and update
-                * the *offset and **sgptr values for the next loop. */
+         * include multiple pages.  Find the initial page structure
+         * and the starting offset within the page, and update
+         * the *offset and **sgptr values for the next loop.
+         */
         cnt = 0;
-        while (cnt < buflen) {
+        while (cnt < buflen && sg) {
                 struct page *page = sg_page(sg) +
                                 ((sg->offset + *offset) >> PAGE_SHIFT);
-                unsigned int poff =
-                                (sg->offset + *offset) & (PAGE_SIZE-1);
+                unsigned int poff = (sg->offset + *offset) & (PAGE_SIZE-1);
                 unsigned int sglen = sg->length - *offset;
 
                 if (sglen > buflen - cnt) {
@@ -222,14 +224,15 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,
 }
 
 /* Store the contents of buffer into srb's transfer buffer and set the
- * SCSI residue. */
+ * SCSI residue.
+ */
 void usb_stor_set_xfer_buf(unsigned char *buffer,
         unsigned int buflen, struct scsi_cmnd *srb)
 {
         unsigned int offset = 0;
         struct scatterlist *sg = NULL;
 
-        usb_stor_access_xfer_buf(buffer, buflen, srb, &sg, &offset,
+        buflen = usb_stor_access_xfer_buf(buffer, buflen, srb, &sg, &offset,
                         TO_XFER_BUF);
         if (buflen < scsi_bufflen(srb))
                 scsi_set_resid(srb, scsi_bufflen(srb) - buflen);
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index d9f4912f873d..5780ed15f1ad 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -891,17 +891,6 @@ int usb_stor_Bulk_max_lun(struct us_data *us)
         if (result > 0)
                 return us->iobuf[0];
 
-        /* 
-         * Some devices (i.e. Iomega Zip100) need this -- apparently
-         * the bulk pipes get STALLed when the GetMaxLUN request is
-         * processed.   This is, in theory, harmless to all other devices
-         * (regardless of if they stall or not).
-         */
-        if (result == -EPIPE) {
-                usb_stor_clear_halt(us, us->recv_bulk_pipe);
-                usb_stor_clear_halt(us, us->send_bulk_pipe);
-        }
-
         /*
          * Some devices don't like GetMaxLUN.  They may STALL the control
          * pipe, they may return a zero-length result, they may do nothing at
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index fe12737e0e2b..99679a8cfa02 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -357,7 +357,7 @@ UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
                 US_FL_FIX_CAPACITY),
 
 /* Reported by Emil Larsson <emil@swip.net> */
-UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0101,
+UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
                 "NIKON",
                 "NIKON DSC D80",
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
@@ -759,6 +759,18 @@ UNUSUAL_DEV(  0x0595, 0x4343, 0x0000, 0x2210,
                 "Digital Camera EX-20 DSC",
                 US_SC_8070, US_PR_DEVICE, NULL, 0 ),
 
+/* Reported by Andre Welter <a.r.welter@gmx.de>
+ * This antique device predates the release of the Bulk-only Transport
+ * spec, and if it gets a Get-Max-LUN then it requires the host to do a
+ * Clear-Halt on the bulk endpoints.  The SINGLE_LUN flag will prevent
+ * us from sending the request.
+ */
+UNUSUAL_DEV(  0x059b, 0x0001, 0x0100, 0x0100,
+                "Iomega",
+                "ZIP 100",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_SINGLE_LUN ),
+
 /* Reported by <Hendryk.Pfeiffer@gmx.de> */
 UNUSUAL_DEV(  0x059f, 0x0643, 0x0000, 0x0000,
                 "LaCie",
@@ -1412,6 +1424,17 @@ UNUSUAL_DEV(  0x0ed1, 0x7636, 0x0103, 0x0103,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE | US_FL_GO_SLOW | US_FL_MAX_SECTORS_64),
 
+/* Patch by Leonid Petrov mail at lpetrov.net
+ * Reported by Robert Spitzenpfeil <robert@spitzenpfeil.org>
+ * http://www.qbik.ch/usb/devices/showdev.php?id=1705
+ * Updated to 103 device by MJ Ray mjr at phonecoop.coop
+ */
+UNUSUAL_DEV(  0x0f19, 0x0103, 0x0100, 0x0100,
+                "Oracom Co., Ltd",
+                "ORC-200M",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE ),
+
 /* David Kuehling <dvdkhlng@gmx.de>:
  * for MP3-Player AVOX WSX-300ER (bought in Japan).  Reports lots of SCSI
  * errors when trying to write.
@@ -1477,6 +1500,15 @@ UNUSUAL_DEV(  0x1019, 0x0c55, 0x0000, 0x0110,
                 US_SC_DEVICE, US_PR_DEVICE, usb_stor_ucr61s2b_init,
                 0 ),
 
+/* Reported by Fabio Venturi <f.venturi@tdnet.it>
+ * The device reports a vendor-specific bDeviceClass.
+ */
+UNUSUAL_DEV(  0x10d6, 0x2200, 0x0100, 0x0100,
+                "Actions Semiconductor",
+                "Mtp device",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                0),
+
 /* Reported by Kevin Lloyd <linux@sierrawireless.com>
  * Entry is needed for the initializer function override,
  * which instructs the device to load as a modem
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index d775eb6590b6..62f9c6e387cc 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -1913,61 +1913,6 @@ static int atyfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
                 par->mmaped = 1;
         return 0;
 }
-
-static struct {
-        u32 yoffset;
-        u8 r[2][256];
-        u8 g[2][256];
-        u8 b[2][256];
-} atyfb_save;
-
-static void atyfb_save_palette(struct atyfb_par *par, int enter)
-{
-        int i, tmp;
-
-        for (i = 0; i < 256; i++) {
-                tmp = aty_ld_8(DAC_CNTL, par) & 0xfc;
-                if (M64_HAS(EXTRA_BRIGHT))
-                        tmp |= 0x2;
-                aty_st_8(DAC_CNTL, tmp, par);
-                aty_st_8(DAC_MASK, 0xff, par);
-
-                aty_st_8(DAC_R_INDEX, i, par);
-                atyfb_save.r[enter][i] = aty_ld_8(DAC_DATA, par);
-                atyfb_save.g[enter][i] = aty_ld_8(DAC_DATA, par);
-                atyfb_save.b[enter][i] = aty_ld_8(DAC_DATA, par);
-                aty_st_8(DAC_W_INDEX, i, par);
-                aty_st_8(DAC_DATA, atyfb_save.r[1 - enter][i], par);
-                aty_st_8(DAC_DATA, atyfb_save.g[1 - enter][i], par);
-                aty_st_8(DAC_DATA, atyfb_save.b[1 - enter][i], par);
-        }
-}
-
-static void atyfb_palette(int enter)
-{
-        struct atyfb_par *par;
-        struct fb_info *info;
-        int i;
-
-        for (i = 0; i < FB_MAX; i++) {
-                info = registered_fb[i];
-                if (info && info->fbops == &atyfb_ops) {
-                        par = (struct atyfb_par *) info->par;
-                        
-                        atyfb_save_palette(par, enter);
-                        if (enter) {
-                                atyfb_save.yoffset = info->var.yoffset;
-                                info->var.yoffset = 0;
-                                set_off_pitch(par, info);
-                        } else {
-                                info->var.yoffset = atyfb_save.yoffset;
-                                set_off_pitch(par, info);
-                        }
-                        aty_st_le32(CRTC_OFF_PITCH, par->crtc.off_pitch, par);
-                        break;
-                }
-        }
-}
 #endif /* __sparc__ */
 
 
@@ -2670,10 +2615,6 @@ static int __devinit aty_init(struct fb_info *info)
                 goto aty_init_exit;
         }
 
-#ifdef __sparc__
-        atyfb_save_palette(par, 0);
-#endif
-
 #ifdef CONFIG_FB_ATY_CT
         if (!noaccel && M64_HAS(INTEGRATED))
                 aty_init_cursor(info);
@@ -2900,8 +2841,6 @@ static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 
 #ifdef __sparc__
 
-extern void (*prom_palette) (int);
-
 static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
                         struct fb_info *info, unsigned long addr)
 {
@@ -3536,9 +3475,6 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
                 goto err_release_io;
 
 #ifdef __sparc__
-        if (!prom_palette)
-                prom_palette = atyfb_palette;
-
         /*
          * Add /dev/fb mmap values.
          */
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 41f6dbf61be7..fdc9f43ec30a 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/fb.h>
 #include <linux/mm.h>
+#include <linux/uaccess.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 6796ba62c3c6..777389c40988 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -459,7 +459,7 @@ static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 
         if (state.event == pdev->dev.power.power_state.event)
                 return 0;
-        if (state.event != PM_EVENT_SUSPEND)
+        if (!(state.event & PM_EVENT_SLEEP))
                 goto done;
 
         acquire_console_sem();
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 74517b1b26a6..596652d2831f 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1066,7 +1066,7 @@ static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
         acquire_console_sem();
         par->pm_state = mesg.event;
 
-        if (mesg.event == PM_EVENT_SUSPEND) {
+        if (mesg.event & PM_EVENT_SLEEP) {
                 fb_set_suspend(info, 1);
                 nvidiafb_blank(FB_BLANK_POWERDOWN, info);
                 nvidia_write_regs(par, &par->SavedReg);
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 10f912df2dad..97facb121c73 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1046,7 +1046,7 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data)
         switch (val) {
         case CPUFREQ_ADJUST:
         case CPUFREQ_INCOMPATIBLE:
-                printk(KERN_DEBUG "min dma period: %d ps, "
+                pr_debug("min dma period: %d ps, "
                         "new clock %d kHz\n", pxafb_display_dma_period(var),
                         policy->max);
                 // TODO: fill in min/max values
@@ -1361,7 +1361,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
 }
 #endif
 
-int __init pxafb_probe(struct platform_device *dev)
+static int __init pxafb_probe(struct platform_device *dev)
 {
         struct pxafb_info *fbi;
         struct pxafb_mach_info *inf;
@@ -1486,7 +1486,7 @@ static struct platform_driver pxafb_driver = {
 };
 
 #ifndef MODULE
-int __devinit pxafb_setup(char *options)
+static int __devinit pxafb_setup(char *options)
 {
 # ifdef CONFIG_FB_PXA_PARAMETERS
         if (options)
@@ -1501,7 +1501,7 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)");
 # endif
 #endif
 
-int __devinit pxafb_init(void)
+static int __devinit pxafb_init(void)
 {
 #ifndef MODULE
         char *option = NULL;
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 963a454b7074..4deaac05b938 100644
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -9,6 +9,7 @@
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/mm.h>
+#include <linux/uaccess.h>
 
 #include <asm/oplib.h>
 #include <asm/fbio.h>
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index be27b9c1ed72..93361656316c 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -44,7 +44,7 @@ static struct fb_fix_screeninfo uvesafb_fix __devinitdata = {
 
 static int mtrr         __devinitdata = 3; /* enable mtrr by default */
 static int blank        = 1;               /* enable blanking by default */
-static int ypan         __devinitdata = 1; /* 0: scroll, 1: ypan, 2: ywrap */
+static int ypan         = 1;             /* 0: scroll, 1: ypan, 2: ywrap */
 static int pmi_setpal   __devinitdata = 1; /* use PMI for palette changes */
 static int nocrtc       __devinitdata; /* ignore CRTC settings */
 static int noedid       __devinitdata; /* don't try DDC transfers */
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index afcdc69e37d6..254d115cafab 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -402,6 +402,18 @@ config IT8712F_WDT
           To compile this driver as a module, choose M here: the
           module will be called it8712f_wdt.
 
+config HP_WATCHDOG
+        tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
+        depends on X86
+        help
+          A software monitoring watchdog and NMI sourcing driver. This driver
+          will detect lockups and provide stack trace. Also, when an NMI
+          occurs this driver will make the necessary BIOS calls to log
+          the cause of the NMI. This is a driver that will only load on a
+          HP ProLiant system with a minimum of iLO2 support.
+          To compile this driver as a module, choose M here: the
+          module will be called hpwdt.
+
 config SC1200_WDT
         tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
         depends on X86
@@ -633,6 +645,19 @@ config WDT_RM9K_GPI
           To compile this driver as a module, choose M here: the
           module will be called rm9k_wdt.
 
+config SIBYTE_WDOG
+        tristate "Sibyte SoC hardware watchdog"
+        depends on CPU_SB1
+        help
+          Watchdog driver for the built in watchdog hardware in Sibyte
+          SoC processors.  There are apparently two watchdog timers
+          on such processors; this driver supports only the first one,
+          because currently Linux only supports exporting one watchdog
+          to userspace.
+
+          To compile this driver as a loadable module, choose M here.
+          The module will be called sb_wdog.
+
 config AR7_WDT
         tristate "TI AR7 Watchdog Timer"
         depends on AR7
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index ebc21146d40c..f3fb170fe5c6 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -67,6 +67,7 @@ obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
 obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
 obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o
 obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o
+obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
 obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
@@ -92,6 +93,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 obj-$(CONFIG_INDYDOG) += indydog.o
 obj-$(CONFIG_WDT_MTX1)  += mtx-1_wdt.o
 obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
 obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
 obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
 
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 472be10f0686..1237113dc14a 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -29,6 +29,7 @@
 
 #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args)
 #define stampit() stamp("here i am")
+#define pr_init(fmt, args...) ({ static const __initdata char __fmt[] = fmt; printk(__fmt, ## args); })
 
 #define WATCHDOG_NAME "bfin-wdt"
 #define PFX WATCHDOG_NAME ": "
@@ -445,19 +446,19 @@ static int __init bfin_wdt_init(void)
 
         ret = register_reboot_notifier(&bfin_wdt_notifier);
         if (ret) {
-                printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", ret);
+                pr_init(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n", ret);
                 return ret;
         }
 
         ret = misc_register(&bfin_wdt_miscdev);
         if (ret) {
-                printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+                pr_init(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
                        WATCHDOG_MINOR, ret);
                 unregister_reboot_notifier(&bfin_wdt_notifier);
                 return ret;
         }
 
-        printk(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
+        pr_init(KERN_INFO PFX "initialized: timeout=%d sec (nowayout=%d)\n",
                timeout, nowayout);
 
         return 0;
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
new file mode 100644
index 000000000000..a2e174b09fe7
--- /dev/null
+++ b/drivers/watchdog/hpwdt.c
@@ -0,0 +1,926 @@
+/*
+ *      HP WatchDog Driver
+ *      based on
+ *
+ *      SoftDog 0.05:   A Software Watchdog Device
+ *
+ *      (c) Copyright 2007 Hewlett-Packard Development Company, L.P.
+ *      Thomas Mingarelli <thomas.mingarelli@hp.com>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      version 2 as published by the Free Software Foundation
+ *
+ */
+
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/kdebug.h>
+#include <linux/moduleparam.h>
+#include <linux/notifier.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/reboot.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/types.h>
+#include <linux/uaccess.h>
+#include <linux/watchdog.h>
+#include <linux/dmi.h>
+#include <linux/efi.h>
+#include <linux/string.h>
+#include <linux/bootmem.h>
+#include <linux/slab.h>
+#include <asm/dmi.h>
+#include <asm/desc.h>
+#include <asm/kdebug.h>
+
+#define PCI_BIOS32_SD_VALUE             0x5F32335F      /* "_32_" */
+#define CRU_BIOS_SIGNATURE_VALUE        0x55524324
+#define PCI_BIOS32_PARAGRAPH_LEN        16
+#define PCI_ROM_BASE1                   0x000F0000
+#define ROM_SIZE                        0x10000
+
+struct bios32_service_dir {
+        u32 signature;
+        u32 entry_point;
+        u8 revision;
+        u8 length;
+        u8 checksum;
+        u8 reserved[5];
+};
+
+/*
+ * smbios_entry_point     - defines SMBIOS entry point structure
+ *
+ * anchor[4]              - anchor string (_SM_)
+ * checksum               - checksum of the entry point structure
+ * length                 - length of the entry point structure
+ * major_ver              - major version (02h for revision 2.1)
+ * minor_ver              - minor version (01h for revision 2.1)
+ * max_struct_size        - size of the largest SMBIOS structure
+ * revision               - entry point structure revision implemented
+ * formatted_area[5]      - reserved
+ * intermediate_anchor[5] - intermediate anchor string (_DMI_)
+ * intermediate_checksum  - intermediate checksum
+ * table_length           - structure table length
+ * table_address          - structure table address
+ * table_num_structs      - number of SMBIOS structures present
+ * bcd_revision           - BCD revision
+ */
+struct smbios_entry_point {
+        u8 anchor[4];
+        u8 checksum;
+        u8 length;
+        u8 major_ver;
+        u8 minor_ver;
+        u16 max_struct_size;
+        u8 revision;
+        u8 formatted_area[5];
+        u8 intermediate_anchor[5];
+        u8 intermediate_checksum;
+        u16 table_length;
+        u64 table_address;
+        u16 table_num_structs;
+        u8 bcd_revision;
+};
+
+/* type 212 */
+struct smbios_cru64_info {
+        u8 type;
+        u8 byte_length;
+        u16 handle;
+        u32 signature;
+        u64 physical_address;
+        u32 double_length;
+        u32 double_offset;
+};
+#define SMBIOS_CRU64_INFORMATION        212
+
+struct cmn_registers {
+        union {
+                struct {
+                        u8 ral;
+                        u8 rah;
+                        u16 rea2;
+                };
+                u32 reax;
+        } u1;
+        union {
+                struct {
+                        u8 rbl;
+                        u8 rbh;
+                        u8 reb2l;
+                        u8 reb2h;
+                };
+                u32 rebx;
+        } u2;
+        union {
+                struct {
+                        u8 rcl;
+                        u8 rch;
+                        u16 rec2;
+                };
+                u32 recx;
+        } u3;
+        union {
+                struct {
+                        u8 rdl;
+                        u8 rdh;
+                        u16 red2;
+                };
+                u32 redx;
+        } u4;
+
+        u32 resi;
+        u32 redi;
+        u16 rds;
+        u16 res;
+        u32 reflags;
+}  __attribute__((packed));
+
+#define DEFAULT_MARGIN  30
+static unsigned int soft_margin = DEFAULT_MARGIN;       /* in seconds */
+static unsigned int reload;                     /* the computed soft_margin */
+static int nowayout = WATCHDOG_NOWAYOUT;
+static char expect_release;
+static unsigned long hpwdt_is_open;
+
+static void __iomem *pci_mem_addr;              /* the PCI-memory address */
+static unsigned long __iomem *hpwdt_timer_reg;
+static unsigned long __iomem *hpwdt_timer_con;
+
+static DEFINE_SPINLOCK(rom_lock);
+
+static void *cru_rom_addr;
+
+static struct cmn_registers cmn_regs;
+
+static struct pci_device_id hpwdt_devices[] = {
+        {
+         .vendor = PCI_VENDOR_ID_COMPAQ,
+         .device = 0xB203,
+         .subvendor = PCI_ANY_ID,
+         .subdevice = PCI_ANY_ID,
+        },
+        {0},                    /* terminate list */
+};
+MODULE_DEVICE_TABLE(pci, hpwdt_devices);
+
+/*
+ *      bios_checksum
+ */
+static int __devinit bios_checksum(const char __iomem *ptr, int len)
+{
+        char sum = 0;
+        int i;
+
+        /*
+         * calculate checksum of size bytes. This should add up
+         * to zero if we have a valid header.
+         */
+        for (i = 0; i < len; i++)
+                sum += ptr[i];
+
+        return ((sum == 0) && (len > 0));
+}
+
+#ifndef CONFIG_X86_64
+/* --32 Bit Bios------------------------------------------------------------ */
+
+#define HPWDT_ARCH      32
+
+asmlinkage void asminline_call(struct cmn_registers *pi86Regs,
+                               unsigned long *pRomEntry)
+{
+        asm("pushl       %ebp               \n\t"
+            "movl        %esp, %ebp         \n\t"
+            "pusha                          \n\t"
+            "pushf                          \n\t"
+            "push        %es                \n\t"
+            "push        %ds                \n\t"
+            "pop         %es                \n\t"
+            "movl        8(%ebp),%eax       \n\t"
+            "movl        4(%eax),%ebx       \n\t"
+            "movl        8(%eax),%ecx       \n\t"
+            "movl        12(%eax),%edx      \n\t"
+            "movl        16(%eax),%esi      \n\t"
+            "movl        20(%eax),%edi      \n\t"
+            "movl        (%eax),%eax        \n\t"
+            "push        %cs                \n\t"
+            "call        *12(%ebp)          \n\t"
+            "pushf                          \n\t"
+            "pushl       %eax               \n\t"
+            "movl        8(%ebp),%eax       \n\t"
+            "movl        %ebx,4(%eax)       \n\t"
+            "movl        %ecx,8(%eax)       \n\t"
+            "movl        %edx,12(%eax)      \n\t"
+            "movl        %esi,16(%eax)      \n\t"
+            "movl        %edi,20(%eax)      \n\t"
+            "movw        %ds,24(%eax)       \n\t"
+            "movw        %es,26(%eax)       \n\t"
+            "popl        %ebx               \n\t"
+            "movl        %ebx,(%eax)        \n\t"
+            "popl        %ebx               \n\t"
+            "movl        %ebx,28(%eax)      \n\t"
+            "pop         %es                \n\t"
+            "popf                           \n\t"
+            "popa                           \n\t"
+            "leave                          \n\t" "ret");
+}
+
+/*
+ *      cru_detect
+ *
+ *      Routine Description:
+ *      This function uses the 32-bit BIOS Service Directory record to
+ *      search for a $CRU record.
+ *
+ *      Return Value:
+ *      0        :  SUCCESS
+ *      <0       :  FAILURE
+ */
+static int __devinit cru_detect(unsigned long map_entry,
+        unsigned long map_offset)
+{
+        void *bios32_map;
+        unsigned long *bios32_entrypoint;
+        unsigned long cru_physical_address;
+        unsigned long cru_length;
+        unsigned long physical_bios_base = 0;
+        unsigned long physical_bios_offset = 0;
+        int retval = -ENODEV;
+
+        bios32_map = ioremap(map_entry, (2 * PAGE_SIZE));
+
+        if (bios32_map == NULL)
+                return -ENODEV;
+
+        bios32_entrypoint = bios32_map + map_offset;
+
+        cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE;
+
+        asminline_call(&cmn_regs, bios32_entrypoint);
+
+        if (cmn_regs.u1.ral != 0) {
+                printk(KERN_WARNING
+                       "hpwdt: Call succeeded but with an error: 0x%x\n",
+                       cmn_regs.u1.ral);
+        } else {
+                physical_bios_base = cmn_regs.u2.rebx;
+                physical_bios_offset = cmn_regs.u4.redx;
+                cru_length = cmn_regs.u3.recx;
+                cru_physical_address =
+                    physical_bios_base + physical_bios_offset;
+
+                /* If the values look OK, then map it in. */
+                if ((physical_bios_base + physical_bios_offset)) {
+                        cru_rom_addr =
+                            ioremap(cru_physical_address, cru_length);
+                        if (cru_rom_addr)
+                                retval = 0;
+                }
+
+                printk(KERN_DEBUG "hpwdt: CRU Base Address:   0x%lx\n",
+                        physical_bios_base);
+                printk(KERN_DEBUG "hpwdt: CRU Offset Address: 0x%lx\n",
+                        physical_bios_offset);
+                printk(KERN_DEBUG "hpwdt: CRU Length:         0x%lx\n",
+                        cru_length);
+                printk(KERN_DEBUG "hpwdt: CRU Mapped Address: 0x%x\n",
+                        (unsigned int)&cru_rom_addr);
+        }
+        iounmap(bios32_map);
+        return retval;
+}
+
+/*
+ *      bios32_present
+ *
+ *      Routine Description:
+ *      This function finds the 32-bit BIOS Service Directory
+ *
+ *      Return Value:
+ *      0        :  SUCCESS
+ *      <0       :  FAILURE
+ */
+static int __devinit bios32_present(const char __iomem *p)
+{
+        struct bios32_service_dir *bios_32_ptr;
+        int length;
+        unsigned long map_entry, map_offset;
+
+        bios_32_ptr = (struct bios32_service_dir *) p;
+
+        /*
+         * Search for signature by checking equal to the swizzled value
+         * instead of calling another routine to perform a strcmp.
+         */
+        if (bios_32_ptr->signature == PCI_BIOS32_SD_VALUE) {
+                length = bios_32_ptr->length * PCI_BIOS32_PARAGRAPH_LEN;
+                if (bios_checksum(p, length)) {
+                        /*
+                         * According to the spec, we're looking for the
+                         * first 4KB-aligned address below the entrypoint
+                         * listed in the header. The Service Directory code
+                         * is guaranteed to occupy no more than 2 4KB pages.
+                         */
+                        map_entry = bios_32_ptr->entry_point & ~(PAGE_SIZE - 1);
+                        map_offset = bios_32_ptr->entry_point - map_entry;
+
+                        return cru_detect(map_entry, map_offset);
+                }
+        }
+        return -ENODEV;
+}
+
+static int __devinit detect_cru_service(void)
+{
+        char __iomem *p, *q;
+        int rc = -1;
+
+        /*
+         * Search from 0x0f0000 through 0x0fffff, inclusive.
+         */
+        p = ioremap(PCI_ROM_BASE1, ROM_SIZE);
+        if (p == NULL)
+                return -ENOMEM;
+
+        for (q = p; q < p + ROM_SIZE; q += 16) {
+                rc = bios32_present(q);
+                if (!rc)
+                        break;
+        }
+        iounmap(p);
+        return rc;
+}
+
+#else
+/* --64 Bit Bios------------------------------------------------------------ */
+
+#define HPWDT_ARCH      64
+
+asmlinkage void asminline_call(struct cmn_registers *pi86Regs,
+                               unsigned long *pRomEntry)
+{
+        asm("pushq      %rbp            \n\t"
+            "movq       %rsp, %rbp      \n\t"
+            "pushq      %rax            \n\t"
+            "pushq      %rbx            \n\t"
+            "pushq      %rdx            \n\t"
+            "pushq      %r12            \n\t"
+            "pushq      %r9             \n\t"
+            "movq       %rsi, %r12      \n\t"
+            "movq       %rdi, %r9       \n\t"
+            "movl       4(%r9),%ebx     \n\t"
+            "movl       8(%r9),%ecx     \n\t"
+            "movl       12(%r9),%edx    \n\t"
+            "movl       16(%r9),%esi    \n\t"
+            "movl       20(%r9),%edi    \n\t"
+            "movl       (%r9),%eax      \n\t"
+            "call       *%r12           \n\t"
+            "pushfq                     \n\t"
+            "popq        %r12           \n\t"
+            "popfq                      \n\t"
+            "movl       %eax, (%r9)     \n\t"
+            "movl       %ebx, 4(%r9)    \n\t"
+            "movl       %ecx, 8(%r9)    \n\t"
+            "movl       %edx, 12(%r9)   \n\t"
+            "movl       %esi, 16(%r9)   \n\t"
+            "movl       %edi, 20(%r9)   \n\t"
+            "movq       %r12, %rax      \n\t"
+            "movl       %eax, 28(%r9)   \n\t"
+            "popq       %r9             \n\t"
+            "popq       %r12            \n\t"
+            "popq       %rdx            \n\t"
+            "popq       %rbx            \n\t"
+            "popq       %rax            \n\t"
+            "leave                      \n\t" "ret");
+}
+
+/*
+ *      dmi_find_cru
+ *
+ *      Routine Description:
+ *      This function checks wether or not a SMBIOS/DMI record is
+ *      the 64bit CRU info or not
+ *
+ *      Return Value:
+ *      0        :  SUCCESS - if record found
+ *      <0       :  FAILURE - if record not found
+ */
+static void __devinit dmi_find_cru(const struct dmi_header *dm)
+{
+        struct smbios_cru64_info *smbios_cru64_ptr;
+        unsigned long cru_physical_address;
+
+        if (dm->type == SMBIOS_CRU64_INFORMATION) {
+                smbios_cru64_ptr = (struct smbios_cru64_info *) dm;
+                if (smbios_cru64_ptr->signature == CRU_BIOS_SIGNATURE_VALUE) {
+                        cru_physical_address =
+                            smbios_cru64_ptr->physical_address +
+                            smbios_cru64_ptr->double_offset;
+                        cru_rom_addr = ioremap(cru_physical_address,
+                                    smbios_cru64_ptr->double_length);
+                }
+        }
+}
+
+/*
+ *      dmi_table
+ *
+ *      Routine Description:
+ *      Decode the SMBIOS/DMI table and check if we have a 64bit CRU record
+ *      or not.
+ *
+ *      We have to be cautious here. We have seen BIOSes with DMI pointers
+ *      pointing to completely the wrong place for example
+ */
+static void __devinit dmi_table(u8 *buf, int len, int num,
+                      void (*decode)(const struct dmi_header *))
+{
+        u8 *data = buf;
+        int i = 0;
+
+        /*
+         *      Stop when we see all the items the table claimed to have
+         *      OR we run off the end of the table (also happens)
+         */
+        while ((i < num) && (data - buf + sizeof(struct dmi_header)) <= len) {
+                const struct dmi_header *dm = (const struct dmi_header *)data;
+
+                /*
+                 *  We want to know the total length (formated area and strings)
+                 *  before decoding to make sure we won't run off the table in
+                 *  dmi_decode or dmi_string
+                 */
+                data += dm->length;
+                while ((data - buf < len - 1) && (data[0] || data[1]))
+                        data++;
+                if (data - buf < len - 1)
+                        decode(dm);
+                data += 2;
+                i++;
+        }
+}
+
+/*
+ *      smbios_present
+ *
+ *      Routine Description:
+ *      This function parses the SMBIOS entry point table to retrieve
+ *      the 64 bit CRU Service.
+ *
+ *      Return Value:
+ *      0        :  SUCCESS
+ *      <0       :  FAILURE
+ */
+static int __devinit smbios_present(const char __iomem *p)
+{
+        struct smbios_entry_point *eps =
+                (struct smbios_entry_point *) p;
+        int length;
+        u8 *buf;
+
+        /* check if we have indeed the SMBIOS table entry point */
+        if ((strncmp((char *)eps->anchor, "_SM_",
+                             sizeof(eps->anchor))) == 0) {
+                length = eps->length;
+
+                /* SMBIOS v2.1 implementation might use 0x1e */
+                if ((length == 0x1e) &&
+                    (eps->major_ver == 2) &&
+                    (eps->minor_ver == 1))
+                        length = 0x1f;
+
+                /*
+                 * Now we will check:
+                 * - SMBIOS checksum must be 0
+                 * - intermediate anchor should be _DMI_
+                 * - intermediate checksum should be 0
+                 */
+                if ((bios_checksum(p, length)) &&
+                    (strncmp((char *)eps->intermediate_anchor, "_DMI_",
+                             sizeof(eps->intermediate_anchor)) == 0) &&
+                    (bios_checksum(p+0x10, 15))) {
+                        buf = ioremap(eps->table_address, eps->table_length);
+                        if (buf == NULL)
+                                return -ENODEV;
+
+
+                        /* Scan the DMI table for the 64 bit CRU service */
+                        dmi_table(buf, eps->table_length,
+                                  eps->table_num_structs, dmi_find_cru);
+
+                        iounmap(buf);
+                        return 0;
+                }
+        }
+
+        return -ENODEV;
+}
+
+static int __devinit smbios_scan_machine(void)
+{
+        char __iomem *p, *q;
+        int rc;
+
+        if (efi_enabled) {
+                if (efi.smbios == EFI_INVALID_TABLE_ADDR)
+                        return -ENODEV;
+
+                p = ioremap(efi.smbios, 32);
+                if (p == NULL)
+                        return -ENOMEM;
+
+                rc = smbios_present(p);
+                iounmap(p);
+        } else {
+                /*
+                 * Search from 0x0f0000 through 0x0fffff, inclusive.
+                 */
+                p = ioremap(PCI_ROM_BASE1, ROM_SIZE);
+                if (p == NULL)
+                        return -ENOMEM;
+
+                for (q = p; q < p + ROM_SIZE; q += 16) {
+                        rc = smbios_present(q);
+                        if (!rc) {
+                                break;
+                        }
+                }
+                iounmap(p);
+        }
+}
+
+static int __devinit detect_cru_service(void)
+{
+        cru_rom_addr = NULL;
+
+        smbios_scan_machine();  /* will become dmi_walk(dmi_find_cru); */
+
+        /* if cru_rom_addr has been set then we found a CRU service */
+        return ((cru_rom_addr != NULL)? 0: -ENODEV);
+}
+
+/* ------------------------------------------------------------------------- */
+
+#endif
+
+/*
+ *      NMI Handler
+ */
+static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
+                            void *data)
+{
+        static unsigned long rom_pl;
+        static int die_nmi_called;
+
+        if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
+                return NOTIFY_OK;
+
+        spin_lock_irqsave(&rom_lock, rom_pl);
+        if (!die_nmi_called)
+                asminline_call(&cmn_regs, cru_rom_addr);
+        die_nmi_called = 1;
+        spin_unlock_irqrestore(&rom_lock, rom_pl);
+        if (cmn_regs.u1.ral == 0) {
+                printk(KERN_WARNING "hpwdt: An NMI occurred, "
+                       "but unable to determine source.\n");
+        } else {
+                panic("An NMI occurred, please see the Integrated "
+                        "Management Log for details.\n");
+        }
+
+        return NOTIFY_STOP;
+}
+
+/*
+ *      Watchdog operations
+ */
+static void hpwdt_start(void)
+{
+        reload = (soft_margin * 1000) / 128;
+        iowrite16(reload, hpwdt_timer_reg);
+        iowrite16(0x85, hpwdt_timer_con);
+}
+
+static void hpwdt_stop(void)
+{
+        unsigned long data;
+
+        data = ioread16(hpwdt_timer_con);
+        data &= 0xFE;
+        iowrite16(data, hpwdt_timer_con);
+}
+
+static void hpwdt_ping(void)
+{
+        iowrite16(reload, hpwdt_timer_reg);
+}
+
+static int hpwdt_change_timer(int new_margin)
+{
+        /* Arbitrary, can't find the card's limits */
+        if (new_margin < 30 || new_margin > 600) {
+                printk(KERN_WARNING
+                        "hpwdt: New value passed in is invalid: %d seconds.\n",
+                        new_margin);
+                return -EINVAL;
+        }
+
+        soft_margin = new_margin;
+        printk(KERN_DEBUG
+                "hpwdt: New timer passed in is %d seconds.\n",
+                new_margin);
+        reload = (soft_margin * 1000) / 128;
+
+        return 0;
+}
+
+/*
+ *      /dev/watchdog handling
+ */
+static int hpwdt_open(struct inode *inode, struct file *file)
+{
+        /* /dev/watchdog can only be opened once */
+        if (test_and_set_bit(0, &hpwdt_is_open))
+                return -EBUSY;
+
+        /* Start the watchdog */
+        hpwdt_start();
+        hpwdt_ping();
+
+        return nonseekable_open(inode, file);
+}
+
+static int hpwdt_release(struct inode *inode, struct file *file)
+{
+        /* Stop the watchdog */
+        if (expect_release == 42) {
+                hpwdt_stop();
+        } else {
+                printk(KERN_CRIT
+                        "hpwdt: Unexpected close, not stopping watchdog!\n");
+                hpwdt_ping();
+        }
+
+        expect_release = 0;
+
+        /* /dev/watchdog is being closed, make sure it can be re-opened */
+        clear_bit(0, &hpwdt_is_open);
+
+        return 0;
+}
+
+static ssize_t hpwdt_write(struct file *file, const char __user *data,
+        size_t len, loff_t *ppos)
+{
+        /* See if we got the magic character 'V' and reload the timer */
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+
+                        /* note: just in case someone wrote the magic character
+                         * five months ago... */
+                        expect_release = 0;
+
+                        /* scan to see whether or not we got the magic char. */
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if (get_user(c, data+i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_release = 42;
+                        }
+                }
+
+                /* someone wrote to us, we should reload the timer */
+                hpwdt_ping();
+        }
+
+        return len;
+}
+
+static struct watchdog_info ident = {
+        .options = WDIOF_SETTIMEOUT |
+                   WDIOF_KEEPALIVEPING |
+                   WDIOF_MAGICCLOSE,
+        .identity = "HP iLO2 HW Watchdog Timer",
+};
+
+static long hpwdt_ioctl(struct file *file, unsigned int cmd,
+        unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        int __user *p = argp;
+        int new_margin;
+        int ret = -ENOTTY;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ret = 0;
+                if (copy_to_user(argp, &ident, sizeof(ident)))
+                        ret = -EFAULT;
+                break;
+
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                ret = put_user(0, p);
+                break;
+
+        case WDIOC_KEEPALIVE:
+                hpwdt_ping();
+                ret = 0;
+                break;
+
+        case WDIOC_SETTIMEOUT:
+                ret = get_user(new_margin, p);
+                if (ret)
+                        break;
+
+                ret = hpwdt_change_timer(new_margin);
+                if (ret)
+                        break;
+
+                hpwdt_ping();
+                /* Fall */
+        case WDIOC_GETTIMEOUT:
+                ret = put_user(soft_margin, p);
+                break;
+        }
+        return ret;
+}
+
+/*
+ *      Kernel interfaces
+ */
+static struct file_operations hpwdt_fops = {
+        .owner = THIS_MODULE,
+        .llseek = no_llseek,
+        .write = hpwdt_write,
+        .unlocked_ioctl = hpwdt_ioctl,
+        .open = hpwdt_open,
+        .release = hpwdt_release,
+};
+
+static struct miscdevice hpwdt_miscdev = {
+        .minor = WATCHDOG_MINOR,
+        .name = "watchdog",
+        .fops = &hpwdt_fops,
+};
+
+static struct notifier_block die_notifier = {
+        .notifier_call = hpwdt_pretimeout,
+        .priority = 0x7FFFFFFF,
+};
+
+/*
+ *      Init & Exit
+ */
+
+static int __devinit hpwdt_init_one(struct pci_dev *dev,
+                                    const struct pci_device_id *ent)
+{
+        int retval;
+
+        /*
+         * First let's find out if we are on an iLO2 server. We will
+         * not run on a legacy ASM box.
+         */
+        if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {
+                dev_warn(&dev->dev,
+                       "This server does not have an iLO2 ASIC.\n");
+                return -ENODEV;
+        }
+
+        if (pci_enable_device(dev)) {
+                dev_warn(&dev->dev,
+                        "Not possible to enable PCI Device: 0x%x:0x%x.\n",
+                        ent->vendor, ent->device);
+                return -ENODEV;
+        }
+
+        pci_mem_addr = pci_iomap(dev, 1, 0x80);
+        if (!pci_mem_addr) {
+                dev_warn(&dev->dev,
+                        "Unable to detect the iLO2 server memory.\n");
+                retval = -ENOMEM;
+                goto error_pci_iomap;
+        }
+        hpwdt_timer_reg = pci_mem_addr + 0x70;
+        hpwdt_timer_con = pci_mem_addr + 0x72;
+
+        /* Make sure that we have a valid soft_margin */
+        if (hpwdt_change_timer(soft_margin))
+                hpwdt_change_timer(DEFAULT_MARGIN);
+
+        /*
+         * We need to map the ROM to get the CRU service.
+         * For 32 bit Operating Systems we need to go through the 32 Bit
+         * BIOS Service Directory
+         * For 64 bit Operating Systems we get that service through SMBIOS.
+         */
+        retval = detect_cru_service();
+        if (retval < 0) {
+                dev_warn(&dev->dev,
+                       "Unable to detect the %d Bit CRU Service.\n",
+                        HPWDT_ARCH);
+                goto error_get_cru;
+        }
+
+        /*
+         * We know this is the only CRU call we need to make so lets keep as
+         * few instructions as possible once the NMI comes in.
+         */
+        cmn_regs.u1.rah = 0x0D;
+        cmn_regs.u1.ral = 0x02;
+
+        retval = register_die_notifier(&die_notifier);
+        if (retval != 0) {
+                dev_warn(&dev->dev,
+                       "Unable to register a die notifier (err=%d).\n",
+                        retval);
+                goto error_die_notifier;
+        }
+
+        retval = misc_register(&hpwdt_miscdev);
+        if (retval < 0) {
+                dev_warn(&dev->dev,
+                        "Unable to register miscdev on minor=%d (err=%d).\n",
+                        WATCHDOG_MINOR, retval);
+                goto error_misc_register;
+        }
+
+        printk(KERN_INFO
+                "hp Watchdog Timer Driver: 1.00"
+                ", timer margin: %d seconds( nowayout=%d).\n",
+                soft_margin, nowayout);
+
+        return 0;
+
+error_misc_register:
+        unregister_die_notifier(&die_notifier);
+error_die_notifier:
+        if (cru_rom_addr)
+                iounmap(cru_rom_addr);
+error_get_cru:
+        pci_iounmap(dev, pci_mem_addr);
+error_pci_iomap:
+        pci_disable_device(dev);
+        return retval;
+}
+
+static void __devexit hpwdt_exit(struct pci_dev *dev)
+{
+        if (!nowayout)
+                hpwdt_stop();
+
+        misc_deregister(&hpwdt_miscdev);
+        unregister_die_notifier(&die_notifier);
+
+        if (cru_rom_addr)
+                iounmap(cru_rom_addr);
+        pci_iounmap(dev, pci_mem_addr);
+        pci_disable_device(dev);
+}
+
+static struct pci_driver hpwdt_driver = {
+        .name = "hpwdt",
+        .id_table = hpwdt_devices,
+        .probe = hpwdt_init_one,
+        .remove = __devexit_p(hpwdt_exit),
+};
+
+static void __exit hpwdt_cleanup(void)
+{
+        pci_unregister_driver(&hpwdt_driver);
+}
+
+static int __init hpwdt_init(void)
+{
+        return pci_register_driver(&hpwdt_driver);
+}
+
+MODULE_AUTHOR("Tom Mingarelli");
+MODULE_DESCRIPTION("hp watchdog driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+
+module_param(soft_margin, int, 0);
+MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds");
+
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+module_init(hpwdt_init);
+module_exit(hpwdt_cleanup);
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 98451747d3cd..789831b3fa00 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -45,10 +45,13 @@
 #include <linux/completion.h>
 #include <linux/jiffies.h>
 #include <linux/watchdog.h>
+#include <linux/platform_device.h>
+
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
 #include <asm/mach-au1x00/au1000.h>
+#include <asm/gpio.h>
 
 #define MTX1_WDT_INTERVAL       (5 * HZ)
 
@@ -61,6 +64,7 @@ static struct {
         volatile int queue;
         int default_ticks;
         unsigned long inuse;
+        unsigned gpio;
 } mtx1_wdt_device;
 
 static void mtx1_wdt_trigger(unsigned long unused)
@@ -73,7 +77,8 @@ static void mtx1_wdt_trigger(unsigned long unused)
          * toggle GPIO2_15
          */
         tmp = au_readl(GPIO2_DIR);
-        tmp = (tmp & ~(1<<15)) | ((~tmp) & (1<<15));
+        tmp = (tmp & ~(1 << mtx1_wdt_device.gpio)) |
+              ((~tmp) & (1 << mtx1_wdt_device.gpio));
         au_writel (tmp, GPIO2_DIR);
 
         if (mtx1_wdt_device.queue && ticks)
@@ -93,7 +98,7 @@ static void mtx1_wdt_start(void)
 {
         if (!mtx1_wdt_device.queue) {
                 mtx1_wdt_device.queue = 1;
-                au_writel (au_readl(GPIO2_DIR) | (u32)(1<<15), GPIO2_DIR);
+                gpio_set_value(mtx1_wdt_device.gpio, 1);
                 mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL);
         }
         mtx1_wdt_device.running++;
@@ -103,7 +108,7 @@ static int mtx1_wdt_stop(void)
 {
         if (mtx1_wdt_device.queue) {
                 mtx1_wdt_device.queue = 0;
-                au_writel (au_readl(GPIO2_DIR) & ~((u32)(1<<15)), GPIO2_DIR);
+                gpio_set_value(mtx1_wdt_device.gpio, 0);
         }
 
         ticks = mtx1_wdt_device.default_ticks;
@@ -197,10 +202,12 @@ static struct miscdevice mtx1_wdt_misc = {
 };
 
 
-static int __init mtx1_wdt_init(void)
+static int mtx1_wdt_probe(struct platform_device *pdev)
 {
         int ret;
 
+        mtx1_wdt_device.gpio = pdev->resource[0].start;
+
         if ((ret = misc_register(&mtx1_wdt_misc)) < 0) {
                 printk(KERN_ERR " mtx-1_wdt : failed to register\n");
                 return ret;
@@ -222,13 +229,30 @@ static int __init mtx1_wdt_init(void)
         return 0;
 }
 
-static void __exit mtx1_wdt_exit(void)
+static int mtx1_wdt_remove(struct platform_device *pdev)
 {
         if (mtx1_wdt_device.queue) {
                 mtx1_wdt_device.queue = 0;
                 wait_for_completion(&mtx1_wdt_device.stop);
         }
         misc_deregister(&mtx1_wdt_misc);
+        return 0;
+}
+
+static struct platform_driver mtx1_wdt = {
+        .probe = mtx1_wdt_probe,
+        .remove = mtx1_wdt_remove,
+        .driver.name = "mtx1-wdt",
+};
+
+static int __init mtx1_wdt_init(void)
+{
+        return platform_driver_register(&mtx1_wdt);
+}
+
+static void __exit mtx1_wdt_exit(void)
+{
+        platform_driver_unregister(&mtx1_wdt);
 }
 
 module_init(mtx1_wdt_init);
@@ -237,3 +261,4 @@ module_exit(mtx1_wdt_exit);
 MODULE_AUTHOR("Michael Stickel, Florian Fainelli");
 MODULE_DESCRIPTION("Driver for the MTX-1 watchdog");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
new file mode 100644
index 000000000000..b94431433695
--- /dev/null
+++ b/drivers/watchdog/sb_wdog.c
@@ -0,0 +1,353 @@
+/*
+ * Watchdog driver for SiByte SB1 SoCs
+ *
+ * Copyright (C) 2007 OnStor, Inc. * Andrew Sharp <andy.sharp@onstor.com>
+ *
+ * This driver is intended to make the second of two hardware watchdogs
+ * on the Sibyte 12XX and 11XX SoCs available to the user.  There are two
+ * such devices available on the SoC, but it seems that there isn't an
+ * enumeration class for watchdogs in Linux like there is for RTCs.
+ * The second is used rather than the first because it uses IRQ 1,
+ * thereby avoiding all that IRQ 0 problematic nonsense.
+ *
+ * I have not tried this driver on a 1480 processor; it might work
+ * just well enough to really screw things up.
+ *
+ * It is a simple timer, and there is an interrupt that is raised the
+ * first time the timer expires.  The second time it expires, the chip
+ * is reset and there is no way to redirect that NMI.  Which could
+ * be problematic in some cases where this chip is sitting on the HT
+ * bus and has just taken responsibility for providing a cache block.
+ * Since the reset can't be redirected to the external reset pin, it is
+ * possible that other HT connected processors might hang and not reset.
+ * For Linux, a soft reset would probably be even worse than a hard reset.
+ * There you have it.
+ *
+ * The timer takes 23 bits of a 64 bit register (?) as a count value,
+ * and decrements the count every microsecond, for a max value of
+ * 0x7fffff usec or about 8.3ish seconds.
+ *
+ * This watchdog borrows some user semantics from the softdog driver,
+ * in that if you close the fd, it leaves the watchdog running, unless
+ * you previously wrote a 'V' to the fd, in which case it disables
+ * the watchdog when you close the fd like some other drivers.
+ *
+ * Based on various other watchdog drivers, which are probably all
+ * loosely based on something Alan Cox wrote years ago.
+ *
+ *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *                              http://www.redhat.com
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      version 1 or 2 as published by the Free Software Foundation.
+ *
+ */
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <linux/reboot.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/interrupt.h>
+
+#include <asm/sibyte/sb1250.h>
+#include <asm/sibyte/sb1250_regs.h>
+#include <asm/sibyte/sb1250_int.h>
+#include <asm/sibyte/sb1250_scd.h>
+
+
+/*
+ * set the initial count value of a timer
+ *
+ * wdog is the iomem address of the cfg register
+ */
+void sbwdog_set(char __iomem *wdog, unsigned long t)
+{
+        __raw_writeb(0, wdog - 0x10);
+        __raw_writeq(t & 0x7fffffUL, wdog);
+}
+
+/*
+ * cause the timer to [re]load it's initial count and start counting
+ * all over again
+ *
+ * wdog is the iomem address of the cfg register
+ */
+void sbwdog_pet(char __iomem *wdog)
+{
+        __raw_writeb(__raw_readb(wdog) | 1, wdog);
+}
+
+static unsigned long sbwdog_gate; /* keeps it to one thread only */
+static char __iomem *kern_dog = (char __iomem *)(IO_BASE + (A_SCD_WDOG_CFG_0));
+static char __iomem *user_dog = (char __iomem *)(IO_BASE + (A_SCD_WDOG_CFG_1));
+static unsigned long timeout = 0x7fffffUL;      /* useconds: 8.3ish secs. */
+static int expect_close;
+
+static struct watchdog_info ident = {
+        .options        = WDIOF_CARDRESET | WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+        .identity       = "SiByte Watchdog",
+};
+
+/*
+ * Allow only a single thread to walk the dog
+ */
+static int sbwdog_open(struct inode *inode, struct file *file)
+{
+        nonseekable_open(inode, file);
+        if (test_and_set_bit(0, &sbwdog_gate)) {
+                return -EBUSY;
+        }
+        __module_get(THIS_MODULE);
+
+        /*
+         * Activate the timer
+         */
+        sbwdog_set(user_dog, timeout);
+        __raw_writeb(1, user_dog);
+
+        return 0;
+}
+
+/*
+ * Put the dog back in the kennel.
+ */
+static int sbwdog_release(struct inode *inode, struct file *file)
+{
+        if (expect_close == 42) {
+                __raw_writeb(0, user_dog);
+                module_put(THIS_MODULE);
+        } else {
+                printk(KERN_CRIT "%s: Unexpected close, not stopping watchdog!\n",
+                        ident.identity);
+                sbwdog_pet(user_dog);
+        }
+        clear_bit(0, &sbwdog_gate);
+        expect_close = 0;
+
+        return 0;
+}
+
+/*
+ * 42 - the answer
+ */
+static ssize_t sbwdog_write(struct file *file, const char __user *data,
+                        size_t len, loff_t *ppos)
+{
+        int i;
+
+        if (len) {
+                /*
+                 * restart the timer
+                 */
+                expect_close = 0;
+
+                for (i = 0; i != len; i++) {
+                        char c;
+
+                        if (get_user(c, data + i)) {
+                                return -EFAULT;
+                        }
+                        if (c == 'V') {
+                                expect_close = 42;
+                        }
+                }
+                sbwdog_pet(user_dog);
+        }
+
+        return len;
+}
+
+static int sbwdog_ioctl(struct inode *inode, struct file *file,
+                        unsigned int cmd, unsigned long arg)
+{
+        int ret = -ENOTTY;
+        unsigned long time;
+        void __user *argp = (void __user *)arg;
+        int __user *p = argp;
+
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                ret = copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
+                break;
+
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                ret = put_user(0, p);
+                break;
+
+        case WDIOC_SETTIMEOUT:
+                ret = get_user(time, p);
+                if (ret) {
+                        break;
+                }
+
+                time *= 1000000;
+                if (time > 0x7fffffUL) {
+                        ret = -EINVAL;
+                        break;
+                }
+                timeout = time;
+                sbwdog_set(user_dog, timeout);
+                sbwdog_pet(user_dog);
+
+        case WDIOC_GETTIMEOUT:
+                /*
+                 * get the remaining count from the ... count register
+                 * which is 1*8 before the config register
+                 */
+                ret = put_user(__raw_readq(user_dog - 8) / 1000000, p);
+                break;
+
+        case WDIOC_KEEPALIVE:
+                sbwdog_pet(user_dog);
+                ret = 0;
+                break;
+        }
+        return ret;
+}
+
+/*
+ *      Notifier for system down
+ */
+static int
+sbwdog_notify_sys(struct notifier_block *this, unsigned long code, void *erf)
+{
+        if (code == SYS_DOWN || code == SYS_HALT) {
+                /*
+                 * sit and sit
+                 */
+                __raw_writeb(0, user_dog);
+                __raw_writeb(0, kern_dog);
+        }
+
+        return NOTIFY_DONE;
+}
+
+static const struct file_operations sbwdog_fops =
+{
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = sbwdog_write,
+        .ioctl          = sbwdog_ioctl,
+        .open           = sbwdog_open,
+        .release        = sbwdog_release,
+};
+
+static struct miscdevice sbwdog_miscdev =
+{
+        .minor          = WATCHDOG_MINOR,
+        .name           = "watchdog",
+        .fops           = &sbwdog_fops,
+};
+
+static struct notifier_block sbwdog_notifier = {
+        .notifier_call  = sbwdog_notify_sys,
+};
+
+/*
+ * interrupt handler
+ *
+ * doesn't do a whole lot for user, but oh so cleverly written so kernel
+ * code can use it to re-up the watchdog, thereby saving the kernel from
+ * having to create and maintain a timer, just to tickle another timer,
+ * which is just so wrong.
+ */
+irqreturn_t sbwdog_interrupt(int irq, void *addr)
+{
+        unsigned long wd_init;
+        char *wd_cfg_reg = (char *)addr;
+        u8 cfg;
+
+        cfg = __raw_readb(wd_cfg_reg);
+        wd_init = __raw_readq(wd_cfg_reg - 8) & 0x7fffff;
+
+        /*
+         * if it's the second watchdog timer, it's for those users
+         */
+        if (wd_cfg_reg == user_dog) {
+                printk(KERN_CRIT
+                        "%s in danger of initiating system reset in %ld.%01ld seconds\n",
+                        ident.identity, wd_init / 1000000, (wd_init / 100000) % 10);
+        } else {
+                cfg |= 1;
+        }
+
+        __raw_writeb(cfg, wd_cfg_reg);
+
+        return IRQ_HANDLED;
+}
+
+static int __init sbwdog_init(void)
+{
+        int ret;
+
+        /*
+         * register a reboot notifier
+         */
+        ret = register_reboot_notifier(&sbwdog_notifier);
+        if (ret) {
+                printk (KERN_ERR "%s: cannot register reboot notifier (err=%d)\n",
+                        ident.identity, ret);
+                return ret;
+        }
+
+        /*
+         * get the resources
+         */
+        ret = misc_register(&sbwdog_miscdev);
+        if (ret == 0) {
+                printk(KERN_INFO "%s: timeout is %ld.%ld secs\n", ident.identity,
+                        timeout / 1000000, (timeout / 100000) % 10);
+        }
+
+        ret = request_irq(1, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED,
+                ident.identity, (void *)user_dog);
+        if (ret) {
+                printk(KERN_ERR "%s: failed to request irq 1 - %d\n", ident.identity,
+                        ret);
+                misc_deregister(&sbwdog_miscdev);
+        }
+
+        return ret;
+}
+
+static void __exit sbwdog_exit(void)
+{
+        misc_deregister(&sbwdog_miscdev);
+}
+
+module_init(sbwdog_init);
+module_exit(sbwdog_exit);
+
+MODULE_AUTHOR("Andrew Sharp <andy.sharp@onstor.com>");
+MODULE_DESCRIPTION("SiByte Watchdog");
+
+module_param(timeout, ulong, 0);
+MODULE_PARM_DESC(timeout,
+        "Watchdog timeout in microseconds (max/default 8388607 or 8.3ish secs)");
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+
+/*
+ * example code that can be put in a platform code area to utilize the
+ * first watchdog timer for the kernels own purpose.
+
+ void
+platform_wd_setup(void)
+{
+        int ret;
+
+        ret = request_irq(0, sbwdog_interrupt, IRQF_DISABLED | IRQF_SHARED,
+                "Kernel Watchdog", IOADDR(A_SCD_WDOG_CFG_0));
+        if (ret) {
+                printk(KERN_CRIT "Watchdog IRQ zero(0) failed to be requested - %d\n",
+                        ret);
+        }
+}
+
+
+ */