Merge branch 'master'

542 files changed, 21934 insertions, 14252 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 619dd964c51c..5c69b86db624 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -69,7 +69,7 @@ obj-$(CONFIG_EISA)		+= eisa/
 obj-$(CONFIG_CPU_FREQ)          += cpufreq/
 obj-$(CONFIG_MMC)               += mmc/
 obj-$(CONFIG_INFINIBAND)        += infiniband/
-obj-$(CONFIG_SGI_IOC4)          += sn/
+obj-$(CONFIG_SGI_SN)            += sn/
 obj-y                           += firmware/
 obj-$(CONFIG_CRYPTO)            += crypto/
 obj-$(CONFIG_SUPERH)            += sh/
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 6d61945260a8..0cce28c4025b 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -267,7 +267,6 @@ config ACPI_DEBUG
 
 config ACPI_EC
         bool
-        depends on X86
         default y
         help
           This driver is required on some systems for the proper operation of
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 2143609d2936..d882bf87fa96 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -71,8 +71,8 @@ static struct acpi_driver acpi_memory_device_driver = {
 struct acpi_memory_device {
         acpi_handle handle;
         unsigned int state;     /* State of the memory device */
-        unsigned short cache_attribute; /* memory cache attribute */
-        unsigned short read_write_attribute;    /* memory read/write attribute */
+        unsigned short caching; /* memory cache attribute */
+        unsigned short write_protect;   /* memory read/write attribute */
         u64 start_addr;         /* Memory Range start physical addr */
         u64 end_addr;           /* Memory Range end physical addr */
 };
@@ -97,12 +97,12 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
         if (ACPI_SUCCESS(status)) {
                 if (address64.resource_type == ACPI_MEMORY_RANGE) {
                         /* Populate the structure */
-                        mem_device->cache_attribute =
-                            address64.attribute.memory.cache_attribute;
-                        mem_device->read_write_attribute =
-                            address64.attribute.memory.read_write_attribute;
-                        mem_device->start_addr = address64.min_address_range;
-                        mem_device->end_addr = address64.max_address_range;
+                        mem_device->caching =
+                            address64.info.mem.caching;
+                        mem_device->write_protect =
+                            address64.info.mem.write_protect;
+                        mem_device->start_addr = address64.minimum;
+                        mem_device->end_addr = address64.maximum;
                 }
         }
 
@@ -250,7 +250,6 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device)
         int result;
         u64 start = mem_device->start_addr;
         u64 len = mem_device->end_addr - start + 1;
-        unsigned long attr = mem_device->read_write_attribute;
 
         ACPI_FUNCTION_TRACE("acpi_memory_disable_device");
 
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index fec895af6ae6..f4c87750dbf2 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -78,9 +78,9 @@ MODULE_LICENSE("GPL");
 static uid_t asus_uid;
 static gid_t asus_gid;
 module_param(asus_uid, uint, 0);
-MODULE_PARM_DESC(uid, "UID for entries in /proc/acpi/asus.\n");
+MODULE_PARM_DESC(asus_uid, "UID for entries in /proc/acpi/asus.\n");
 module_param(asus_gid, uint, 0);
-MODULE_PARM_DESC(gid, "GID for entries in /proc/acpi/asus.\n");
+MODULE_PARM_DESC(asus_gid, "GID for entries in /proc/acpi/asus.\n");
 
 /* For each model, all features implemented, 
  * those marked with R are relative to HOTK, A for absolute */
@@ -302,7 +302,7 @@ static struct model_data model_conf[END_MODEL] = {
          .brightness_set = "SPLV",
          .brightness_get = "GPLV",
          .display_set = "SDSP",
-         .display_get = "\\SSTE"},
+         .display_get = "\\_SB.PCI0.P0P1.VGA.GETD"},
         {
          .name = "M6R",
          .mt_mled = "MLED",
@@ -851,6 +851,8 @@ static int __init asus_hotk_add_fs(struct acpi_device *device)
                 mode = S_IFREG | S_IRUGO | S_IWUGO;
         } else {
                 mode = S_IFREG | S_IRUSR | S_IRGRP | S_IWUSR | S_IWGRP;
+                printk(KERN_WARNING "  asus_uid and asus_gid parameters are "
+                       "deprecated, use chown and chmod instead!\n");
         }
 
         acpi_device_dir(device) = asus_proc_dir;
@@ -987,9 +989,21 @@ static int __init asus_hotk_get_info(void)
                 printk(KERN_NOTICE "  BSTS called, 0x%02x returned\n",
                        bsts_result);
 
-        /* Samsung P30 has a device with a valid _HID whose INIT does not 
-         * return anything. Catch this one and any similar here */
-        if (buffer.pointer == NULL) {
+        /* This is unlikely with implicit return */
+        if (buffer.pointer == NULL)
+                return -EINVAL;
+
+        model = (union acpi_object *) buffer.pointer;
+        /*
+         * Samsung P30 has a device with a valid _HID whose INIT does not 
+         * return anything. It used to be possible to catch this exception,
+         * but the implicit return code will now happily confuse the 
+         * driver. We assume that every ACPI_TYPE_STRING is a valid model
+         * identifier but it's still possible to get completely bogus data.
+         */
+        if (model->type == ACPI_TYPE_STRING) {
+                printk(KERN_NOTICE "  %s model detected, ", model->string.pointer);
+        } else {
                 if (asus_info &&        /* Samsung P30 */
                     strncmp(asus_info->oem_table_id, "ODEM", 4) == 0) {
                         hotk->model = P30;
@@ -1002,13 +1016,10 @@ static int __init asus_hotk_get_info(void)
                                "the developers with your DSDT\n");
                 }
                 hotk->methods = &model_conf[hotk->model];
-                return AE_OK;
-        }
+                
+                acpi_os_free(model);
 
-        model = (union acpi_object *)buffer.pointer;
-        if (model->type == ACPI_TYPE_STRING) {
-                printk(KERN_NOTICE "  %s model detected, ",
-                       model->string.pointer);
+                return AE_OK;
         }
 
         hotk->model = END_MODEL;
diff --git a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c
index 2022aeaecfbb..76bc0463f6de 100644
--- a/drivers/acpi/dispatcher/dsfield.c
+++ b/drivers/acpi/dispatcher/dsfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -128,7 +128,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
                                    ACPI_IMODE_LOAD_PASS1, flags, walk_state,
                                    &(node));
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_NSERROR(arg->common.value.string, status);
+                        ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
                         return_ACPI_STATUS(status);
                 }
         }
@@ -232,7 +232,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                             + (acpi_integer) arg->common.value.size;
 
                         if (position > ACPI_UINT32_MAX) {
-                                ACPI_REPORT_ERROR(("Bit offset within field too large (> 0xFFFFFFFF)\n"));
+                                ACPI_ERROR((AE_INFO,
+                                            "Bit offset within field too large (> 0xFFFFFFFF)"));
                                 return_ACPI_STATUS(AE_SUPPORT);
                         }
 
@@ -268,8 +269,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                                                 ACPI_NS_DONT_OPEN_SCOPE,
                                                 walk_state, &info->field_node);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_NSERROR((char *)&arg->named.name,
-                                                    status);
+                                ACPI_ERROR_NAMESPACE((char *)&arg->named.name,
+                                                     status);
                                 if (status != AE_ALREADY_EXISTS) {
                                         return_ACPI_STATUS(status);
                                 }
@@ -293,7 +294,11 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
                             + (acpi_integer) arg->common.value.size;
 
                         if (position > ACPI_UINT32_MAX) {
-                                ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", (char *)&info->field_node->name));
+                                ACPI_ERROR((AE_INFO,
+                                            "Field [%4.4s] bit offset too large (> 0xFFFFFFFF)",
+                                            ACPI_CAST_PTR(char,
+                                                          &info->field_node->
+                                                          name)));
                                 return_ACPI_STATUS(AE_SUPPORT);
                         }
 
@@ -302,9 +307,9 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,
 
                 default:
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Invalid opcode in field list: %X\n",
-                                          arg->common.aml_opcode));
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid opcode in field list: %X",
+                                    arg->common.aml_opcode));
                         return_ACPI_STATUS(AE_AML_BAD_OPCODE);
                 }
 
@@ -349,7 +354,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
                                    ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                    walk_state, &region_node);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_NSERROR(arg->common.value.name, status);
+                        ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
                         return_ACPI_STATUS(status);
                 }
         }
@@ -431,8 +436,8 @@ acpi_ds_init_field_objects(union acpi_parse_object *op,
                                                 ACPI_NS_ERROR_IF_FOUND,
                                                 walk_state, &node);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_NSERROR((char *)&arg->named.name,
-                                                    status);
+                                ACPI_ERROR_NAMESPACE((char *)&arg->named.name,
+                                                     status);
                                 if (status != AE_ALREADY_EXISTS) {
                                         return_ACPI_STATUS(status);
                                 }
@@ -488,7 +493,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
                                    ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                    walk_state, &region_node);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_NSERROR(arg->common.value.name, status);
+                        ACPI_ERROR_NAMESPACE(arg->common.value.name, status);
                         return_ACPI_STATUS(status);
                 }
         }
@@ -502,7 +507,7 @@ acpi_ds_create_bank_field(union acpi_parse_object *op,
                            ACPI_NS_SEARCH_PARENT, walk_state,
                            &info.register_node);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_NSERROR(arg->common.value.string, status);
+                ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
                 return_ACPI_STATUS(status);
         }
 
@@ -560,7 +565,7 @@ acpi_ds_create_index_field(union acpi_parse_object *op,
                            ACPI_NS_SEARCH_PARENT, walk_state,
                            &info.register_node);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_NSERROR(arg->common.value.string, status);
+                ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
                 return_ACPI_STATUS(status);
         }
 
@@ -573,7 +578,7 @@ acpi_ds_create_index_field(union acpi_parse_object *op,
                            ACPI_NS_SEARCH_PARENT, walk_state,
                            &info.data_register_node);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_NSERROR(arg->common.value.string, status);
+                ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
                 return_ACPI_STATUS(status);
         }
 
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index 8693c704aea6..e65a07ad2422 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
         acpi_object_type type;
         acpi_status status;
 
-        ACPI_FUNCTION_NAME("ds_init_one_object");
+        ACPI_FUNCTION_ENTRY();
 
         /*
          * We are only interested in NS nodes owned by the table that
@@ -105,11 +105,10 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
 
                 status = acpi_ds_initialize_region(obj_handle);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Region %p [%4.4s] - Init failure, %s\n",
-                                          obj_handle,
-                                          acpi_ut_get_node_name(obj_handle),
-                                          acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "During Region initialization %p [%4.4s]",
+                                        obj_handle,
+                                        acpi_ut_get_node_name(obj_handle)));
                 }
 
                 info->op_region_count++;
@@ -118,14 +117,6 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
         case ACPI_TYPE_METHOD:
 
                 /*
-                 * Print a dot for each method unless we are going to print
-                 * the entire pathname
-                 */
-                if (!(acpi_dbg_level & ACPI_LV_INIT_NAMES)) {
-                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));
-                }
-
-                /*
                  * Set the execution data width (32 or 64) based upon the
                  * revision number of the parent ACPI table.
                  * TBD: This is really for possible future support of integer width
@@ -134,6 +125,21 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
                 if (info->table_desc->pointer->revision == 1) {
                         node->flags |= ANOBJ_DATA_WIDTH_32;
                 }
+#ifdef ACPI_INIT_PARSE_METHODS
+                /*
+                 * Note 11/2005: Removed this code to parse all methods during table
+                 * load because it causes problems if there are any errors during the
+                 * parse. Also, it seems like overkill and we probably don't want to
+                 * abort a table load because of an issue with a single method.
+                 */
+
+                /*
+                 * Print a dot for each method unless we are going to print
+                 * the entire pathname
+                 */
+                if (!(acpi_dbg_level & ACPI_LV_INIT_NAMES)) {
+                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));
+                }
 
                 /*
                  * Always parse methods to detect errors, we will delete
@@ -141,15 +147,15 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
                  */
                 status = acpi_ds_parse_method(obj_handle);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "\n+Method %p [%4.4s] - parse failure, %s\n",
-                                          obj_handle,
-                                          acpi_ut_get_node_name(obj_handle),
-                                          acpi_format_exception(status)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Method %p [%4.4s] - parse failure, %s",
+                                    obj_handle,
+                                    acpi_ut_get_node_name(obj_handle),
+                                    acpi_format_exception(status)));
 
                         /* This parse failed, but we will continue parsing more methods */
                 }
-
+#endif
                 info->method_count++;
                 break;
 
@@ -207,8 +213,7 @@ acpi_ds_initialize_objects(struct acpi_table_desc * table_desc,
         status = acpi_walk_namespace(ACPI_TYPE_ANY, start_node, ACPI_UINT32_MAX,
                                      acpi_ds_init_one_object, &info, NULL);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed, %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 36c1ca0b9adb..c475546535b6 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,135 +47,66 @@
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 #include <acpi/acnamesp.h>
+#include <acpi/acdisasm.h>
 
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsmethod")
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ds_parse_method
+ * FUNCTION:    acpi_ds_method_error
  *
- * PARAMETERS:  Node        - Method node
+ * PARAMETERS:  Status          - Execution status
+ *              walk_state      - Current state
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Parse the AML that is associated with the method.
+ * DESCRIPTION: Called on method error. Invoke the global exception handler if
+ *              present, dump the method data if the disassembler is configured
  *
- * MUTEX:       Assumes parser is locked
+ *              Note: Allows the exception handler to change the status code
  *
  ******************************************************************************/
-acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node)
+acpi_status
+acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state)
 {
-        acpi_status status;
-        union acpi_operand_object *obj_desc;
-        union acpi_parse_object *op;
-        struct acpi_walk_state *walk_state;
-
-        ACPI_FUNCTION_TRACE_PTR("ds_parse_method", node);
+        ACPI_FUNCTION_ENTRY();
 
-        /* Parameter Validation */
+        /* Ignore AE_OK and control exception codes */
 
-        if (!node) {
-                return_ACPI_STATUS(AE_NULL_ENTRY);
+        if (ACPI_SUCCESS(status) || (status & AE_CODE_CONTROL)) {
+                return (status);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                          "**** Parsing [%4.4s] **** named_obj=%p\n",
-                          acpi_ut_get_node_name(node), node));
-
-        /* Extract the method object from the method Node */
+        /* Invoke the global exception handler */
 
-        obj_desc = acpi_ns_get_attached_object(node);
-        if (!obj_desc) {
-                return_ACPI_STATUS(AE_NULL_OBJECT);
-        }
+        if (acpi_gbl_exception_handler) {
+                /* Exit the interpreter, allow handler to execute methods */
 
-        /* Create a mutex for the method if there is a concurrency limit */
+                acpi_ex_exit_interpreter();
 
-        if ((obj_desc->method.concurrency != ACPI_INFINITE_CONCURRENCY) &&
-            (!obj_desc->method.semaphore)) {
-                status = acpi_os_create_semaphore(obj_desc->method.concurrency,
-                                                  obj_desc->method.concurrency,
-                                                  &obj_desc->method.semaphore);
-                if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
-                }
-        }
-
-        /*
-         * Allocate a new parser op to be the root of the parsed
-         * method tree
-         */
-        op = acpi_ps_alloc_op(AML_METHOD_OP);
-        if (!op) {
-                return_ACPI_STATUS(AE_NO_MEMORY);
-        }
-
-        /* Init new op with the method name and pointer back to the Node */
-
-        acpi_ps_set_name(op, node->name.integer);
-        op->common.node = node;
-
-        /*
-         * Get a new owner_id for objects created by this method. Namespace
-         * objects (such as Operation Regions) can be created during the
-         * first pass parse.
-         */
-        status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup;
-        }
-
-        /* Create and initialize a new walk state */
-
-        walk_state =
-            acpi_ds_create_walk_state(obj_desc->method.owner_id, NULL, NULL,
-                                      NULL);
-        if (!walk_state) {
-                status = AE_NO_MEMORY;
-                goto cleanup2;
+                /*
+                 * Handler can map the exception code to anything it wants, including
+                 * AE_OK, in which case the executing method will not be aborted.
+                 */
+                status = acpi_gbl_exception_handler(status,
+                                                    walk_state->method_node ?
+                                                    walk_state->method_node->
+                                                    name.integer : 0,
+                                                    walk_state->opcode,
+                                                    walk_state->aml_offset,
+                                                    NULL);
+                (void)acpi_ex_enter_interpreter();
         }
-
-        status = acpi_ds_init_aml_walk(walk_state, op, node,
-                                       obj_desc->method.aml_start,
-                                       obj_desc->method.aml_length, NULL, 1);
+#ifdef ACPI_DISASSEMBLER
         if (ACPI_FAILURE(status)) {
-                acpi_ds_delete_walk_state(walk_state);
-                goto cleanup2;
-        }
+                /* Display method locals/args if disassembler is present */
 
-        /*
-         * Parse the method, first pass
-         *
-         * The first pass load is where newly declared named objects are added into
-         * the namespace.  Actual evaluation of the named objects (what would be
-         * called a "second pass") happens during the actual execution of the
-         * method so that operands to the named objects can take on dynamic
-         * run-time values.
-         */
-        status = acpi_ps_parse_aml(walk_state);
-        if (ACPI_FAILURE(status)) {
-                goto cleanup2;
+                acpi_dm_dump_method_info(status, walk_state, walk_state->op);
         }
+#endif
 
-        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                          "**** [%4.4s] Parsed **** named_obj=%p Op=%p\n",
-                          acpi_ut_get_node_name(node), node, op));
-
-        /*
-         * Delete the parse tree. We simply re-parse the method for every
-         * execution since there isn't much overhead (compared to keeping lots
-         * of parse trees around)
-         */
-        acpi_ns_delete_namespace_subtree(node);
-        acpi_ns_delete_namespace_by_owner(obj_desc->method.owner_id);
-
-      cleanup2:
-        acpi_ut_release_owner_id(&obj_desc->method.owner_id);
-
-      cleanup:
-        acpi_ps_delete_parse_tree(op);
-        return_ACPI_STATUS(status);
+        return (status);
 }
 
 /*******************************************************************************
@@ -195,9 +126,9 @@ acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node)
  ******************************************************************************/
 
 acpi_status
-acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
-                               union acpi_operand_object *obj_desc,
-                               struct acpi_namespace_node *calling_method_node)
+acpi_ds_begin_method_execution(struct acpi_namespace_node * method_node,
+                               union acpi_operand_object * obj_desc,
+                               struct acpi_namespace_node * calling_method_node)
 {
         acpi_status status = AE_OK;
 
@@ -210,7 +141,8 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
         /* Prevent wraparound of thread count */
 
         if (obj_desc->method.thread_count == ACPI_UINT8_MAX) {
-                ACPI_REPORT_ERROR(("Method reached maximum reentrancy limit (255)\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Method reached maximum reentrancy limit (255)"));
                 return_ACPI_STATUS(AE_AML_METHOD_LIMIT);
         }
 
@@ -539,22 +471,61 @@ void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)
                     acpi_os_signal_semaphore(walk_state->method_desc->method.
                                              semaphore, 1);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not signal method semaphore\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not signal method semaphore"));
 
                         /* Ignore error and continue cleanup */
                 }
         }
 
+        /*
+         * There are no more threads executing this method.  Perform
+         * additional cleanup.
+         *
+         * The method Node is stored in the walk state
+         */
+        method_node = walk_state->method_node;
+
+        /* Lock namespace for possible update */
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                goto exit;
+        }
+
+        /*
+         * Delete any namespace entries created immediately underneath
+         * the method
+         */
+        if (method_node->child) {
+                acpi_ns_delete_namespace_subtree(method_node);
+        }
+
+        /*
+         * Delete any namespace entries created anywhere else within
+         * the namespace by the execution of this method
+         */
+        acpi_ns_delete_namespace_by_owner(walk_state->method_desc->method.
+                                          owner_id);
+        status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+
+        /* Are there any other threads currently executing this method? */
+
         if (walk_state->method_desc->method.thread_count) {
+                /*
+                 * Additional threads. Do not release the owner_id in this case,
+                 * we immediately reuse it for the next thread executing this method
+                 */
                 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "*** Not deleting method namespace, there are still %d threads\n",
+                                  "*** Completed execution of one thread, %d threads remaining\n",
                                   walk_state->method_desc->method.
                                   thread_count));
-        } else {                /* This is the last executing thread */
+        } else {
+                /* This is the only executing thread for this method */
 
                 /*
                  * Support to dynamically change a method from not_serialized to
-                 * Serialized if it appears that the method is written foolishly and
+                 * Serialized if it appears that the method is incorrectly written and
                  * does not support multiple thread execution.  The best example of this
                  * is if such a method creates namespace objects and blocks.  A second
                  * thread will fail with an AE_ALREADY_EXISTS exception
@@ -570,34 +541,8 @@ void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)
                                                           semaphore);
                 }
 
-                /*
-                 * There are no more threads executing this method.  Perform
-                 * additional cleanup.
-                 *
-                 * The method Node is stored in the walk state
-                 */
-                method_node = walk_state->method_node;
-
-                /*
-                 * Delete any namespace entries created immediately underneath
-                 * the method
-                 */
-                status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
-                if (ACPI_FAILURE(status)) {
-                        goto exit;
-                }
-
-                if (method_node->child) {
-                        acpi_ns_delete_namespace_subtree(method_node);
-                }
+                /* No more threads, we can free the owner_id */
 
-                /*
-                 * Delete any namespace entries created anywhere else within
-                 * the namespace
-                 */
-                acpi_ns_delete_namespace_by_owner(walk_state->method_desc->
-                                                  method.owner_id);
-                status = acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
                 acpi_ut_release_owner_id(&walk_state->method_desc->method.
                                          owner_id);
         }
@@ -606,3 +551,140 @@ void acpi_ds_terminate_control_method(struct acpi_walk_state *walk_state)
         (void)acpi_ut_release_mutex(ACPI_MTX_PARSER);
         return_VOID;
 }
+
+#ifdef ACPI_INIT_PARSE_METHODS
+        /*
+         * Note 11/2005: Removed this code to parse all methods during table
+         * load because it causes problems if there are any errors during the
+         * parse. Also, it seems like overkill and we probably don't want to
+         * abort a table load because of an issue with a single method.
+         */
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ds_parse_method
+ *
+ * PARAMETERS:  Node        - Method node
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Parse the AML that is associated with the method.
+ *
+ * MUTEX:       Assumes parser is locked
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ds_parse_method(struct acpi_namespace_node *node)
+{
+        acpi_status status;
+        union acpi_operand_object *obj_desc;
+        union acpi_parse_object *op;
+        struct acpi_walk_state *walk_state;
+
+        ACPI_FUNCTION_TRACE_PTR("ds_parse_method", node);
+
+        /* Parameter Validation */
+
+        if (!node) {
+                return_ACPI_STATUS(AE_NULL_ENTRY);
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                          "**** Parsing [%4.4s] **** named_obj=%p\n",
+                          acpi_ut_get_node_name(node), node));
+
+        /* Extract the method object from the method Node */
+
+        obj_desc = acpi_ns_get_attached_object(node);
+        if (!obj_desc) {
+                return_ACPI_STATUS(AE_NULL_OBJECT);
+        }
+
+        /* Create a mutex for the method if there is a concurrency limit */
+
+        if ((obj_desc->method.concurrency != ACPI_INFINITE_CONCURRENCY) &&
+            (!obj_desc->method.semaphore)) {
+                status = acpi_os_create_semaphore(obj_desc->method.concurrency,
+                                                  obj_desc->method.concurrency,
+                                                  &obj_desc->method.semaphore);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+        }
+
+        /*
+         * Allocate a new parser op to be the root of the parsed
+         * method tree
+         */
+        op = acpi_ps_alloc_op(AML_METHOD_OP);
+        if (!op) {
+                return_ACPI_STATUS(AE_NO_MEMORY);
+        }
+
+        /* Init new op with the method name and pointer back to the Node */
+
+        acpi_ps_set_name(op, node->name.integer);
+        op->common.node = node;
+
+        /*
+         * Get a new owner_id for objects created by this method. Namespace
+         * objects (such as Operation Regions) can be created during the
+         * first pass parse.
+         */
+        status = acpi_ut_allocate_owner_id(&obj_desc->method.owner_id);
+        if (ACPI_FAILURE(status)) {
+                goto cleanup;
+        }
+
+        /* Create and initialize a new walk state */
+
+        walk_state =
+            acpi_ds_create_walk_state(obj_desc->method.owner_id, NULL, NULL,
+                                      NULL);
+        if (!walk_state) {
+                status = AE_NO_MEMORY;
+                goto cleanup2;
+        }
+
+        status = acpi_ds_init_aml_walk(walk_state, op, node,
+                                       obj_desc->method.aml_start,
+                                       obj_desc->method.aml_length, NULL, 1);
+        if (ACPI_FAILURE(status)) {
+                acpi_ds_delete_walk_state(walk_state);
+                goto cleanup2;
+        }
+
+        /*
+         * Parse the method, first pass
+         *
+         * The first pass load is where newly declared named objects are added into
+         * the namespace.  Actual evaluation of the named objects (what would be
+         * called a "second pass") happens during the actual execution of the
+         * method so that operands to the named objects can take on dynamic
+         * run-time values.
+         */
+        status = acpi_ps_parse_aml(walk_state);
+        if (ACPI_FAILURE(status)) {
+                goto cleanup2;
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                          "**** [%4.4s] Parsed **** named_obj=%p Op=%p\n",
+                          acpi_ut_get_node_name(node), node, op));
+
+        /*
+         * Delete the parse tree. We simply re-parse the method for every
+         * execution since there isn't much overhead (compared to keeping lots
+         * of parse trees around)
+         */
+        acpi_ns_delete_namespace_subtree(node);
+        acpi_ns_delete_namespace_by_owner(obj_desc->method.owner_id);
+
+      cleanup2:
+        acpi_ut_release_owner_id(&obj_desc->method.owner_id);
+
+      cleanup:
+        acpi_ps_delete_parse_tree(op);
+        return_ACPI_STATUS(status);
+}
+#endif
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index 4095ce70982b..c025674f938b 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -260,9 +260,9 @@ acpi_ds_method_data_get_node(u16 opcode,
         case AML_LOCAL_OP:
 
                 if (index > ACPI_METHOD_MAX_LOCAL) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Local index %d is invalid (max %d)\n",
-                                          index, ACPI_METHOD_MAX_LOCAL));
+                        ACPI_ERROR((AE_INFO,
+                                    "Local index %d is invalid (max %d)",
+                                    index, ACPI_METHOD_MAX_LOCAL));
                         return_ACPI_STATUS(AE_AML_INVALID_INDEX);
                 }
 
@@ -274,9 +274,9 @@ acpi_ds_method_data_get_node(u16 opcode,
         case AML_ARG_OP:
 
                 if (index > ACPI_METHOD_MAX_ARG) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Arg index %d is invalid (max %d)\n",
-                                          index, ACPI_METHOD_MAX_ARG));
+                        ACPI_ERROR((AE_INFO,
+                                    "Arg index %d is invalid (max %d)",
+                                    index, ACPI_METHOD_MAX_ARG));
                         return_ACPI_STATUS(AE_AML_INVALID_INDEX);
                 }
 
@@ -286,8 +286,7 @@ acpi_ds_method_data_get_node(u16 opcode,
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Opcode %d is invalid\n",
-                                  opcode));
+                ACPI_ERROR((AE_INFO, "Opcode %d is invalid", opcode));
                 return_ACPI_STATUS(AE_AML_BAD_OPCODE);
         }
 
@@ -378,8 +377,7 @@ acpi_ds_method_data_get_value(u16 opcode,
         /* Validate the object descriptor */
 
         if (!dest_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null object descriptor pointer\n"));
+                ACPI_ERROR((AE_INFO, "Null object descriptor pointer"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -424,23 +422,24 @@ acpi_ds_method_data_get_value(u16 opcode,
                         switch (opcode) {
                         case AML_ARG_OP:
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Uninitialized Arg[%d] at node %p\n",
-                                                  index, node));
+                                ACPI_ERROR((AE_INFO,
+                                            "Uninitialized Arg[%d] at node %p",
+                                            index, node));
 
                                 return_ACPI_STATUS(AE_AML_UNINITIALIZED_ARG);
 
                         case AML_LOCAL_OP:
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Uninitialized Local[%d] at node %p\n",
-                                                  index, node));
+                                ACPI_ERROR((AE_INFO,
+                                            "Uninitialized Local[%d] at node %p",
+                                            index, node));
 
                                 return_ACPI_STATUS(AE_AML_UNINITIALIZED_LOCAL);
 
                         default:
-                                ACPI_REPORT_ERROR(("Not Arg/Local opcode: %X\n",
-                                                   opcode));
+                                ACPI_ERROR((AE_INFO,
+                                            "Not a Arg/Local opcode: %X",
+                                            opcode));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
         }
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index 8ac0cd93adb5..8b21f0f9e517 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,7 @@
 #define _COMPONENT          ACPI_DISPATCHER
 ACPI_MODULE_NAME("dsobject")
 
+/* Local prototypes */
 static acpi_status
 acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                               union acpi_parse_object *op,
@@ -85,7 +86,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
         *obj_desc_ptr = NULL;
         if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) {
                 /*
-                 * This is an named object reference.  If this name was
+                 * This is a named object reference. If this name was
                  * previously looked up in the namespace, it was stored in this op.
                  * Otherwise, go ahead and look it up now
                  */
@@ -96,18 +97,48 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
                                                 ACPI_IMODE_EXECUTE,
                                                 ACPI_NS_SEARCH_PARENT |
                                                 ACPI_NS_DONT_OPEN_SCOPE, NULL,
-                                                (struct acpi_namespace_node **)
-                                                &(op->common.node));
-
+                                                ACPI_CAST_INDIRECT_PTR(struct
+                                                                       acpi_namespace_node,
+                                                                       &(op->
+                                                                         common.
+                                                                         node)));
                         if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_NSERROR(op->common.value.string,
-                                                    status);
+                                /* Check if we are resolving a named reference within a package */
+
+                                if ((status == AE_NOT_FOUND)
+                                    && (acpi_gbl_enable_interpreter_slack)
+                                    &&
+                                    ((op->common.parent->common.aml_opcode ==
+                                      AML_PACKAGE_OP)
+                                     || (op->common.parent->common.aml_opcode ==
+                                         AML_VAR_PACKAGE_OP))) {
+                                        /*
+                                         * We didn't find the target and we are populating elements
+                                         * of a package - ignore if slack enabled. Some ASL code
+                                         * contains dangling invalid references in packages and
+                                         * expects that no exception will be issued. Leave the
+                                         * element as a null element. It cannot be used, but it
+                                         * can be overwritten by subsequent ASL code - this is
+                                         * typically the case.
+                                         */
+                                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                                          "Ignoring unresolved reference in package [%4.4s]\n",
+                                                          walk_state->
+                                                          scope_info->scope.
+                                                          node->name.ascii));
+
+                                        return_ACPI_STATUS(AE_OK);
+                                } else {
+                                        ACPI_ERROR_NAMESPACE(op->common.value.
+                                                             string, status);
+                                }
+
                                 return_ACPI_STATUS(status);
                         }
                 }
         }
 
-        /* Create and init the internal ACPI object */
+        /* Create and init a new internal ACPI object */
 
         obj_desc = acpi_ut_create_internal_object((acpi_ps_get_opcode_info
                                                    (op->common.aml_opcode))->
@@ -157,13 +188,13 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
 
         ACPI_FUNCTION_TRACE("ds_build_internal_buffer_obj");
 
+        /*
+         * If we are evaluating a Named buffer object "Name (xxxx, Buffer)".
+         * The buffer object already exists (from the NS node), otherwise it must
+         * be created.
+         */
         obj_desc = *obj_desc_ptr;
-        if (obj_desc) {
-                /*
-                 * We are evaluating a Named buffer object "Name (xxxx, Buffer)".
-                 * The buffer object already exists (from the NS node)
-                 */
-        } else {
+        if (!obj_desc) {
                 /* Create a new buffer object */
 
                 obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER);
@@ -183,10 +214,9 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
         byte_list = arg->named.next;
         if (byte_list) {
                 if (byte_list->common.aml_opcode != AML_INT_BYTELIST_OP) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Expecting bytelist, got AML opcode %X in op %p\n",
-                                          byte_list->common.aml_opcode,
-                                          byte_list));
+                        ACPI_ERROR((AE_INFO,
+                                    "Expecting bytelist, got AML opcode %X in op %p",
+                                    byte_list->common.aml_opcode, byte_list));
 
                         acpi_ut_remove_reference(obj_desc);
                         return (AE_TYPE);
@@ -259,7 +289,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
         union acpi_operand_object *obj_desc = NULL;
         u32 package_list_length;
         acpi_status status = AE_OK;
-        u32 i;
+        acpi_native_uint i;
 
         ACPI_FUNCTION_TRACE("ds_build_internal_package_obj");
 
@@ -271,13 +301,12 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                 parent = parent->common.parent;
         }
 
+        /*
+         * If we are evaluating a Named package object "Name (xxxx, Package)",
+         * the package object already exists, otherwise it must be created.
+         */
         obj_desc = *obj_desc_ptr;
-        if (obj_desc) {
-                /*
-                 * We are evaluating a Named package object "Name (xxxx, Package)".
-                 * Get the existing package object from the NS node
-                 */
-        } else {
+        if (!obj_desc) {
                 obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_PACKAGE);
                 *obj_desc_ptr = obj_desc;
                 if (!obj_desc) {
@@ -291,11 +320,9 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
 
         /* Count the number of items in the package list */
 
-        package_list_length = 0;
         arg = op->common.value.arg;
         arg = arg->common.next;
-        while (arg) {
-                package_list_length++;
+        for (package_list_length = 0; arg; package_list_length++) {
                 arg = arg->common.next;
         }
 
@@ -322,12 +349,11 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
         }
 
         /*
-         * Now init the elements of the package
+         * Initialize all elements of the package
          */
-        i = 0;
         arg = op->common.value.arg;
         arg = arg->common.next;
-        while (arg) {
+        for (i = 0; arg; i++) {
                 if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
                         /* Object (package or buffer) is already built */
 
@@ -340,8 +366,6 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
                                                                package.
                                                                elements[i]);
                 }
-
-                i++;
                 arg = arg->common.next;
         }
 
@@ -518,9 +542,9 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
                         default:
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Unknown constant opcode %X\n",
-                                                  opcode));
+                                ACPI_ERROR((AE_INFO,
+                                            "Unknown constant opcode %X",
+                                            opcode));
                                 status = AE_AML_OPERAND_TYPE;
                                 break;
                         }
@@ -535,9 +559,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
                         break;
 
                 default:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unknown Integer type %X\n",
-                                          op_info->type));
+                        ACPI_ERROR((AE_INFO, "Unknown Integer type %X",
+                                    op_info->type));
                         status = AE_AML_OPERAND_TYPE;
                         break;
                 }
@@ -615,9 +638,8 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unimplemented data type: %X\n",
-                                  ACPI_GET_OBJECT_TYPE(obj_desc)));
+                ACPI_ERROR((AE_INFO, "Unimplemented data type: %X",
+                            ACPI_GET_OBJECT_TYPE(obj_desc)));
 
                 status = AE_AML_OPERAND_TYPE;
                 break;
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index 939d167bf87b..6229c10674e1 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -245,7 +245,9 @@ acpi_status acpi_ds_get_buffer_arguments(union acpi_operand_object *obj_desc)
 
         node = obj_desc->buffer.node;
         if (!node) {
-                ACPI_REPORT_ERROR(("No pointer back to NS node in buffer obj %p\n", obj_desc));
+                ACPI_ERROR((AE_INFO,
+                            "No pointer back to NS node in buffer obj %p",
+                            obj_desc));
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
 
@@ -287,8 +289,9 @@ acpi_status acpi_ds_get_package_arguments(union acpi_operand_object *obj_desc)
 
         node = obj_desc->package.node;
         if (!node) {
-                ACPI_REPORT_ERROR(("No pointer back to NS node in package %p\n",
-                                   obj_desc));
+                ACPI_ERROR((AE_INFO,
+                            "No pointer back to NS node in package %p",
+                            obj_desc));
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
 
@@ -413,9 +416,9 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
         /* Host object must be a Buffer */
 
         if (ACPI_GET_OBJECT_TYPE(buffer_desc) != ACPI_TYPE_BUFFER) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Target of Create Field is not a Buffer object - %s\n",
-                                  acpi_ut_get_object_type_name(buffer_desc)));
+                ACPI_ERROR((AE_INFO,
+                            "Target of Create Field is not a Buffer object - %s",
+                            acpi_ut_get_object_type_name(buffer_desc)));
 
                 status = AE_AML_OPERAND_TYPE;
                 goto cleanup;
@@ -427,10 +430,10 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
          * after resolution in acpi_ex_resolve_operands().
          */
         if (ACPI_GET_DESCRIPTOR_TYPE(result_desc) != ACPI_DESC_TYPE_NAMED) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "(%s) destination not a NS Node [%s]\n",
-                                  acpi_ps_get_opcode_name(aml_opcode),
-                                  acpi_ut_get_descriptor_name(result_desc)));
+                ACPI_ERROR((AE_INFO,
+                            "(%s) destination not a NS Node [%s]",
+                            acpi_ps_get_opcode_name(aml_opcode),
+                            acpi_ut_get_descriptor_name(result_desc)));
 
                 status = AE_AML_OPERAND_TYPE;
                 goto cleanup;
@@ -453,8 +456,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
                 /* Must have a valid (>0) bit count */
 
                 if (bit_count == 0) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Attempt to create_field of length 0\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Attempt to create_field of length zero"));
                         status = AE_AML_OPERAND_VALUE;
                         goto cleanup;
                 }
@@ -507,9 +510,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown field creation opcode %02x\n",
-                                  aml_opcode));
+                ACPI_ERROR((AE_INFO,
+                            "Unknown field creation opcode %02x", aml_opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -517,13 +519,12 @@ acpi_ds_init_buffer_field(u16 aml_opcode,
         /* Entire field must fit within the current length of the buffer */
 
         if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n",
-                                  acpi_ut_get_node_name(result_desc),
-                                  bit_offset + bit_count,
-                                  acpi_ut_get_node_name(buffer_desc->buffer.
-                                                        node),
-                                  8 * (u32) buffer_desc->buffer.length));
+                ACPI_ERROR((AE_INFO,
+                            "Field [%4.4s] at %d exceeds Buffer [%4.4s] size %d (bits)",
+                            acpi_ut_get_node_name(result_desc),
+                            bit_offset + bit_count,
+                            acpi_ut_get_node_name(buffer_desc->buffer.node),
+                            8 * (u32) buffer_desc->buffer.length));
                 status = AE_AML_BUFFER_LIMIT;
                 goto cleanup;
         }
@@ -629,9 +630,9 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state,
                            "after acpi_ex_resolve_operands");
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "(%s) bad operand(s) (%X)\n",
-                                  acpi_ps_get_opcode_name(op->common.
-                                                          aml_opcode), status));
+                ACPI_ERROR((AE_INFO, "(%s) bad operand(s) (%X)",
+                            acpi_ps_get_opcode_name(op->common.aml_opcode),
+                            status));
 
                 return_ACPI_STATUS(status);
         }
@@ -1155,9 +1156,8 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown control opcode=%X Op=%p\n",
-                                  op->common.aml_opcode, op));
+                ACPI_ERROR((AE_INFO, "Unknown control opcode=%X Op=%p",
+                            op->common.aml_opcode, op));
 
                 status = AE_AML_BAD_OPCODE;
                 break;
diff --git a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c
index 83ae1c1aa286..53356a591ac1 100644
--- a/drivers/acpi/dispatcher/dsutils.c
+++ b/drivers/acpi/dispatcher/dsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -176,8 +176,8 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
         /* Must have both an Op and a Result Object */
 
         if (!op) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n"));
-                return_VALUE(TRUE);
+                ACPI_ERROR((AE_INFO, "Null Op"));
+                return_UINT8(TRUE);
         }
 
         /*
@@ -208,7 +208,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                                   "At Method level, result of [%s] not used\n",
                                   acpi_ps_get_opcode_name(op->common.
                                                           aml_opcode)));
-                return_VALUE(FALSE);
+                return_UINT8(FALSE);
         }
 
         /* Get info on the parent. The root_op is AML_SCOPE */
@@ -216,9 +216,8 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
         parent_info =
             acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);
         if (parent_info->class == AML_CLASS_UNKNOWN) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown parent opcode. Op=%p\n", op));
-                return_VALUE(FALSE);
+                ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op));
+                return_UINT8(FALSE);
         }
 
         /*
@@ -304,7 +303,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                           acpi_ps_get_opcode_name(op->common.parent->common.
                                                   aml_opcode), op));
 
-        return_VALUE(TRUE);
+        return_UINT8(TRUE);
 
       result_not_used:
         ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
@@ -313,7 +312,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                           acpi_ps_get_opcode_name(op->common.parent->common.
                                                   aml_opcode), op));
 
-        return_VALUE(FALSE);
+        return_UINT8(FALSE);
 }
 
 /*******************************************************************************
@@ -344,7 +343,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
         ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj);
 
         if (!op) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n"));
+                ACPI_ERROR((AE_INFO, "Null Op"));
                 return_VOID;
         }
 
@@ -567,7 +566,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                         }
 
                         if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_NSERROR(name_string, status);
+                                ACPI_ERROR_NAMESPACE(name_string, status);
                         }
                 }
 
@@ -616,7 +615,7 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
 
                 if (op_info->flags & AML_HAS_RETVAL) {
                         ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                          "Argument previously created, already stacked \n"));
+                                          "Argument previously created, already stacked\n"));
 
                         ACPI_DEBUGGER_EXEC(acpi_db_display_argument_object
                                            (walk_state->
@@ -635,10 +634,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                  * Only error is underflow, and this indicates
                                  * a missing or null operand!
                                  */
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Missing or null operand, %s\n",
-                                                  acpi_format_exception
-                                                  (status)));
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "Missing or null operand"));
                                 return_ACPI_STATUS(status);
                         }
                 } else {
@@ -730,7 +727,7 @@ acpi_ds_create_operands(struct acpi_walk_state *walk_state,
          */
         (void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "While creating Arg %d - %s\n",
-                          (arg_count + 1), acpi_format_exception(status)));
+        ACPI_EXCEPTION((AE_INFO, status, "While creating Arg %d",
+                        (arg_count + 1)));
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c
index e522763bb692..f1af655ff113 100644
--- a/drivers/acpi/dispatcher/dswexec.c
+++ b/drivers/acpi/dispatcher/dswexec.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -100,9 +100,8 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         if (result_obj) {
                 status = acpi_ds_result_pop(&obj_desc, walk_state);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not get result from predicate evaluation, %s\n",
-                                          acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not get result from predicate evaluation"));
 
                         return_ACPI_STATUS(status);
                 }
@@ -123,9 +122,9 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         }
 
         if (!obj_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No predicate obj_desc=%p State=%p\n",
-                                  obj_desc, walk_state));
+                ACPI_ERROR((AE_INFO,
+                            "No predicate obj_desc=%p State=%p",
+                            obj_desc, walk_state));
 
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
@@ -140,10 +139,10 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
         }
 
         if (ACPI_GET_OBJECT_TYPE(local_obj_desc) != ACPI_TYPE_INTEGER) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X\n",
-                                  obj_desc, walk_state,
-                                  ACPI_GET_OBJECT_TYPE(obj_desc)));
+                ACPI_ERROR((AE_INFO,
+                            "Bad predicate (not an integer) obj_desc=%p State=%p Type=%X",
+                            obj_desc, walk_state,
+                            ACPI_GET_OBJECT_TYPE(obj_desc)));
 
                 status = AE_AML_OPERAND_TYPE;
                 goto cleanup;
@@ -314,12 +313,13 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
 
         case AML_CLASS_EXECUTE:
         case AML_CLASS_CREATE:
-
                 /*
                  * Most operators with arguments.
                  * Start a new result/operand state
                  */
-                status = acpi_ds_result_stack_push(walk_state);
+                if (walk_state->opcode != AML_CREATE_FIELD_OP) {
+                        status = acpi_ds_result_stack_push(walk_state);
+                }
                 break;
 
         default:
@@ -361,8 +361,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         op_class = walk_state->op_info->class;
 
         if (op_class == AML_CLASS_UNKNOWN) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown opcode %X\n",
-                                  op->common.aml_opcode));
+                ACPI_ERROR((AE_INFO, "Unknown opcode %X",
+                            op->common.aml_opcode));
                 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
         }
 
@@ -452,12 +452,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                                 walk_state->operands[1]->reference.offset)) {
                                 status = AE_OK;
                         } else {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "[%s]: Could not resolve operands, %s\n",
-                                                  acpi_ps_get_opcode_name
-                                                  (walk_state->opcode),
-                                                  acpi_format_exception
-                                                  (status)));
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "While resolving operands for [%s]",
+                                                acpi_ps_get_opcode_name
+                                                (walk_state->opcode)));
                         }
                 }
 
@@ -676,8 +674,8 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                 case AML_TYPE_UNDEFINED:
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Undefined opcode type Op=%p\n", op));
+                        ACPI_ERROR((AE_INFO,
+                                    "Undefined opcode type Op=%p", op));
                         return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
 
                 case AML_TYPE_BOGUS:
@@ -689,10 +687,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
                 default:
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p\n",
-                                          op_class, op_type,
-                                          op->common.aml_opcode, op));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unimplemented opcode, class=%X type=%X Opcode=%X Op=%p",
+                                    op_class, op_type, op->common.aml_opcode,
+                                    op));
 
                         status = AE_NOT_IMPLEMENTED;
                         break;
@@ -723,20 +721,6 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
 
       cleanup:
 
-        /* Invoke exception handler on error */
-
-        if (ACPI_FAILURE(status) &&
-            acpi_gbl_exception_handler && !(status & AE_CODE_CONTROL)) {
-                acpi_ex_exit_interpreter();
-                status = acpi_gbl_exception_handler(status,
-                                                    walk_state->method_node->
-                                                    name.integer,
-                                                    walk_state->opcode,
-                                                    walk_state->aml_offset,
-                                                    NULL);
-                (void)acpi_ex_enter_interpreter();
-        }
-
         if (walk_state->result_obj) {
                 /* Break to debugger to display result */
 
@@ -758,18 +742,14 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
         }
 #endif
 
-        /* Always clear the object stack */
-
-        walk_state->num_operands = 0;
-
-#ifdef ACPI_DISASSEMBLER
-
-        /* On error, display method locals/args */
+        /* Invoke exception handler on error */
 
         if (ACPI_FAILURE(status)) {
-                acpi_dm_dump_method_info(status, walk_state, op);
+                status = acpi_ds_method_error(status, walk_state);
         }
-#endif
 
+        /* Always clear the object stack */
+
+        walk_state->num_operands = 0;
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 411731261c29..d3d24da31c81 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -127,7 +127,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
         char *path;
         u32 flags;
 
-        ACPI_FUNCTION_NAME("ds_load1_begin_op");
+        ACPI_FUNCTION_TRACE("ds_load1_begin_op");
 
         op = walk_state->op;
         ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,
@@ -138,14 +138,14 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
         if (op) {
                 if (!(walk_state->op_info->flags & AML_NAMED)) {
                         *out_op = op;
-                        return (AE_OK);
+                        return_ACPI_STATUS(AE_OK);
                 }
 
                 /* Check if this object has already been installed in the namespace */
 
                 if (op->common.node) {
                         *out_op = op;
-                        return (AE_OK);
+                        return_ACPI_STATUS(AE_OK);
                 }
         }
 
@@ -187,8 +187,8 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                 }
 #endif
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_NSERROR(path, status);
-                        return (status);
+                        ACPI_ERROR_NAMESPACE(path, status);
+                        return_ACPI_STATUS(status);
                 }
 
                 /*
@@ -233,9 +233,11 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
 
                         /* All other types are an error */
 
-                        ACPI_REPORT_ERROR(("Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)\n", acpi_ut_get_type_name(node->type), path));
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)",
+                                    acpi_ut_get_type_name(node->type), path));
 
-                        return (AE_AML_OPERAND_TYPE);
+                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
                 break;
 
@@ -257,6 +259,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                  *       buffer_field, or Package), the name of the object is already
                  *       in the namespace.
                  */
+
                 if (walk_state->deferred_node) {
                         /* This name is already in the namespace, get the node */
 
@@ -265,6 +268,16 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                         break;
                 }
 
+                /*
+                 * If we are executing a method, do not create any namespace objects
+                 * during the load phase, only during execution.
+                 */
+                if (walk_state->method_node) {
+                        node = NULL;
+                        status = AE_OK;
+                        break;
+                }
+
                 flags = ACPI_NS_NO_UPSEARCH;
                 if ((walk_state->opcode != AML_SCOPE_OP) &&
                     (!(walk_state->parse_flags & ACPI_PARSE_DEFERRED_OP))) {
@@ -289,8 +302,8 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                                    ACPI_IMODE_LOAD_PASS1, flags, walk_state,
                                    &(node));
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_NSERROR(path, status);
-                        return (status);
+                        ACPI_ERROR_NAMESPACE(path, status);
+                        return_ACPI_STATUS(status);
                 }
                 break;
         }
@@ -302,28 +315,29 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
 
                 op = acpi_ps_alloc_op(walk_state->opcode);
                 if (!op) {
-                        return (AE_NO_MEMORY);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                 }
         }
 
-        /* Initialize */
-
-        op->named.name = node->name.integer;
+        /* Initialize the op */
 
 #if (defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY))
-        op->named.path = (u8 *) path;
+        op->named.path = ACPI_CAST_PTR(u8, path);
 #endif
 
-        /*
-         * Put the Node in the "op" object that the parser uses, so we
-         * can get it again quickly when this scope is closed
-         */
-        op->common.node = node;
+        if (node) {
+                /*
+                 * Put the Node in the "op" object that the parser uses, so we
+                 * can get it again quickly when this scope is closed
+                 */
+                op->common.node = node;
+                op->named.name = node->name.integer;
+        }
+
         acpi_ps_append_arg(acpi_ps_get_parent_scope(&walk_state->parser_state),
                            op);
-
         *out_op = op;
-        return (status);
+        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
@@ -339,13 +353,13 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
  *
  ******************************************************************************/
 
-acpi_status acpi_ds_load1_end_op(struct acpi_walk_state * walk_state)
+acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
 {
         union acpi_parse_object *op;
         acpi_object_type object_type;
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_NAME("ds_load1_end_op");
+        ACPI_FUNCTION_TRACE("ds_load1_end_op");
 
         op = walk_state->op;
         ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op,
@@ -354,7 +368,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state * walk_state)
         /* We are only interested in opcodes that have an associated name */
 
         if (!(walk_state->op_info->flags & (AML_NAMED | AML_FIELD))) {
-                return (AE_OK);
+                return_ACPI_STATUS(AE_OK);
         }
 
         /* Get the object type to determine if we should pop the scope */
@@ -363,21 +377,37 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state * walk_state)
 
 #ifndef ACPI_NO_METHOD_EXECUTION
         if (walk_state->op_info->flags & AML_FIELD) {
-                if (walk_state->opcode == AML_FIELD_OP ||
-                    walk_state->opcode == AML_BANK_FIELD_OP ||
-                    walk_state->opcode == AML_INDEX_FIELD_OP) {
-                        status = acpi_ds_init_field_objects(op, walk_state);
+                /*
+                 * If we are executing a method, do not create any namespace objects
+                 * during the load phase, only during execution.
+                 */
+                if (!walk_state->method_node) {
+                        if (walk_state->opcode == AML_FIELD_OP ||
+                            walk_state->opcode == AML_BANK_FIELD_OP ||
+                            walk_state->opcode == AML_INDEX_FIELD_OP) {
+                                status =
+                                    acpi_ds_init_field_objects(op, walk_state);
+                        }
                 }
-                return (status);
+                return_ACPI_STATUS(status);
         }
 
-        if (op->common.aml_opcode == AML_REGION_OP) {
-                status = acpi_ex_create_region(op->named.data, op->named.length,
-                                               (acpi_adr_space_type)
-                                               ((op->common.value.arg)->common.
-                                                value.integer), walk_state);
-                if (ACPI_FAILURE(status)) {
-                        return (status);
+        /*
+         * If we are executing a method, do not create any namespace objects
+         * during the load phase, only during execution.
+         */
+        if (!walk_state->method_node) {
+                if (op->common.aml_opcode == AML_REGION_OP) {
+                        status =
+                            acpi_ex_create_region(op->named.data,
+                                                  op->named.length,
+                                                  (acpi_adr_space_type)
+                                                  ((op->common.value.arg)->
+                                                   common.value.integer),
+                                                  walk_state);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
+                        }
                 }
         }
 #endif
@@ -391,47 +421,63 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state * walk_state)
                                                                common.
                                                                aml_opcode))->
                             object_type;
-                        op->common.node->type = (u8) object_type;
+
+                        /* Set node type if we have a namespace node */
+
+                        if (op->common.node) {
+                                op->common.node->type = (u8) object_type;
+                        }
                 }
         }
 
-        if (op->common.aml_opcode == AML_METHOD_OP) {
-                /*
-                 * method_op pkg_length name_string method_flags term_list
-                 *
-                 * Note: We must create the method node/object pair as soon as we
-                 * see the method declaration.  This allows later pass1 parsing
-                 * of invocations of the method (need to know the number of
-                 * arguments.)
-                 */
-                ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
-                                  "LOADING-Method: State=%p Op=%p named_obj=%p\n",
-                                  walk_state, op, op->named.node));
+        /*
+         * If we are executing a method, do not create any namespace objects
+         * during the load phase, only during execution.
+         */
+        if (!walk_state->method_node) {
+                if (op->common.aml_opcode == AML_METHOD_OP) {
+                        /*
+                         * method_op pkg_length name_string method_flags term_list
+                         *
+                         * Note: We must create the method node/object pair as soon as we
+                         * see the method declaration.  This allows later pass1 parsing
+                         * of invocations of the method (need to know the number of
+                         * arguments.)
+                         */
+                        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                          "LOADING-Method: State=%p Op=%p named_obj=%p\n",
+                                          walk_state, op, op->named.node));
 
-                if (!acpi_ns_get_attached_object(op->named.node)) {
-                        walk_state->operands[0] = (void *)op->named.node;
-                        walk_state->num_operands = 1;
+                        if (!acpi_ns_get_attached_object(op->named.node)) {
+                                walk_state->operands[0] =
+                                    ACPI_CAST_PTR(void, op->named.node);
+                                walk_state->num_operands = 1;
 
-                        status =
-                            acpi_ds_create_operands(walk_state,
-                                                    op->common.value.arg);
-                        if (ACPI_SUCCESS(status)) {
-                                status = acpi_ex_create_method(op->named.data,
-                                                               op->named.length,
-                                                               walk_state);
-                        }
-                        walk_state->operands[0] = NULL;
-                        walk_state->num_operands = 0;
+                                status =
+                                    acpi_ds_create_operands(walk_state,
+                                                            op->common.value.
+                                                            arg);
+                                if (ACPI_SUCCESS(status)) {
+                                        status =
+                                            acpi_ex_create_method(op->named.
+                                                                  data,
+                                                                  op->named.
+                                                                  length,
+                                                                  walk_state);
+                                }
+                                walk_state->operands[0] = NULL;
+                                walk_state->num_operands = 0;
 
-                        if (ACPI_FAILURE(status)) {
-                                return (status);
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
                         }
                 }
         }
 
-        /* Pop the scope stack */
+        /* Pop the scope stack (only if loading a table) */
 
-        if (acpi_ns_opens_scope(object_type)) {
+        if (!walk_state->method_node && acpi_ns_opens_scope(object_type)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
                                   "(%s): Popping scope for Op %p\n",
                                   acpi_ut_get_type_name(object_type), op));
@@ -439,7 +485,7 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state * walk_state)
                 status = acpi_ds_scope_stack_pop(walk_state);
         }
 
-        return (status);
+        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
@@ -456,8 +502,8 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state * walk_state)
  ******************************************************************************/
 
 acpi_status
-acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state,
-                       union acpi_parse_object ** out_op)
+acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
+                       union acpi_parse_object **out_op)
 {
         union acpi_parse_object *op;
         struct acpi_namespace_node *node;
@@ -574,10 +620,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state,
                         if (status == AE_NOT_FOUND) {
                                 status = AE_OK;
                         } else {
-                                ACPI_REPORT_NSERROR(buffer_ptr, status);
+                                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
                         }
 #else
-                        ACPI_REPORT_NSERROR(buffer_ptr, status);
+                        ACPI_ERROR_NAMESPACE(buffer_ptr, status);
 #endif
                         return_ACPI_STATUS(status);
                 }
@@ -607,7 +653,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state,
                          *  Scope (DEB) { ... }
                          */
 
-                        ACPI_REPORT_WARNING(("Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n", buffer_ptr, acpi_ut_get_type_name(node->type)));
+                        ACPI_WARNING((AE_INFO,
+                                      "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)",
+                                      buffer_ptr,
+                                      acpi_ut_get_type_name(node->type)));
 
                         node->type = ACPI_TYPE_ANY;
                         walk_state->scope_info->common.value = ACPI_TYPE_ANY;
@@ -617,7 +666,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state,
 
                         /* All other types are an error */
 
-                        ACPI_REPORT_ERROR(("Invalid type (%s) for target of Scope operator [%4.4s]\n", acpi_ut_get_type_name(node->type), buffer_ptr));
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid type (%s) for target of Scope operator [%4.4s]",
+                                    acpi_ut_get_type_name(node->type),
+                                    buffer_ptr));
 
                         return (AE_AML_OPERAND_TYPE);
                 }
@@ -670,7 +722,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state,
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_NSERROR(buffer_ptr, status);
+                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
                 return_ACPI_STATUS(status);
         }
 
@@ -840,6 +892,13 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
 
         case AML_TYPE_NAMED_FIELD:
 
+                /*
+                 * If we are executing a method, initialize the field
+                 */
+                if (walk_state->method_node) {
+                        status = acpi_ds_init_field_objects(op, walk_state);
+                }
+
                 switch (op->common.aml_opcode) {
                 case AML_INDEX_FIELD_OP:
 
@@ -929,6 +988,24 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                 switch (op->common.aml_opcode) {
 #ifndef ACPI_NO_METHOD_EXECUTION
                 case AML_REGION_OP:
+
+                        /*
+                         * If we are executing a method, initialize the region
+                         */
+                        if (walk_state->method_node) {
+                                status =
+                                    acpi_ex_create_region(op->named.data,
+                                                          op->named.length,
+                                                          (acpi_adr_space_type)
+                                                          ((op->common.value.
+                                                            arg)->common.value.
+                                                           integer),
+                                                          walk_state);
+                                if (ACPI_FAILURE(status)) {
+                                        return (status);
+                                }
+                        }
+
                         /*
                          * The op_region is not fully parsed at this time. Only valid
                          * argument is the space_id. (We must save the address of the
@@ -957,11 +1034,50 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
 
                         status = acpi_ds_create_node(walk_state, node, op);
                         break;
+
+                case AML_METHOD_OP:
+                        /*
+                         * method_op pkg_length name_string method_flags term_list
+                         *
+                         * Note: We must create the method node/object pair as soon as we
+                         * see the method declaration.  This allows later pass1 parsing
+                         * of invocations of the method (need to know the number of
+                         * arguments.)
+                         */
+                        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                                          "LOADING-Method: State=%p Op=%p named_obj=%p\n",
+                                          walk_state, op, op->named.node));
+
+                        if (!acpi_ns_get_attached_object(op->named.node)) {
+                                walk_state->operands[0] =
+                                    ACPI_CAST_PTR(void, op->named.node);
+                                walk_state->num_operands = 1;
+
+                                status =
+                                    acpi_ds_create_operands(walk_state,
+                                                            op->common.value.
+                                                            arg);
+                                if (ACPI_SUCCESS(status)) {
+                                        status =
+                                            acpi_ex_create_method(op->named.
+                                                                  data,
+                                                                  op->named.
+                                                                  length,
+                                                                  walk_state);
+                                }
+                                walk_state->operands[0] = NULL;
+                                walk_state->num_operands = 0;
+
+                                if (ACPI_FAILURE(status)) {
+                                        return_ACPI_STATUS(status);
+                                }
+                        }
+                        break;
+
 #endif                          /* ACPI_NO_METHOD_EXECUTION */
 
                 default:
                         /* All NAMED_COMPLEX opcodes must be handled above */
-                        /* Note: Method objects were already created in Pass 1 */
                         break;
                 }
                 break;
@@ -1004,7 +1120,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                          */
                         op->common.node = new_node;
                 } else {
-                        ACPI_REPORT_NSERROR(arg->common.value.string, status);
+                        ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
                 }
                 break;
 
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index defe956ef751..ada21ef4a174 100644
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,14 +107,14 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
         if (!node) {
                 /* Invalid scope   */
 
-                ACPI_REPORT_ERROR(("ds_scope_stack_push: null scope passed\n"));
+                ACPI_ERROR((AE_INFO, "Null scope parameter"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /* Make sure object type is valid */
 
         if (!acpi_ut_valid_object_type(type)) {
-                ACPI_REPORT_WARNING(("ds_scope_stack_push: Invalid object type: 0x%X\n", type));
+                ACPI_WARNING((AE_INFO, "Invalid object type: 0x%X", type));
         }
 
         /* Allocate a new scope object */
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 7d68a5aaf3c4..fa78cb74ee36 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,26 +92,23 @@ acpi_ds_result_remove(union acpi_operand_object **object,
 
         state = walk_state->results;
         if (!state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No result object pushed! State=%p\n",
-                                  walk_state));
+                ACPI_ERROR((AE_INFO, "No result object pushed! State=%p",
+                            walk_state));
                 return (AE_NOT_EXIST);
         }
 
         if (index >= ACPI_OBJ_MAX_OPERAND) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Index out of range: %X State=%p Num=%X\n",
-                                  index, walk_state,
-                                  state->results.num_results));
+                ACPI_ERROR((AE_INFO,
+                            "Index out of range: %X State=%p Num=%X",
+                            index, walk_state, state->results.num_results));
         }
 
         /* Check for a valid result object */
 
         if (!state->results.obj_desc[index]) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null operand! State=%p #Ops=%X, Index=%X\n",
-                                  walk_state, state->results.num_results,
-                                  index));
+                ACPI_ERROR((AE_INFO,
+                            "Null operand! State=%p #Ops=%X, Index=%X",
+                            walk_state, state->results.num_results, index));
                 return (AE_AML_NO_RETURN_VALUE);
         }
 
@@ -163,9 +160,8 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
         }
 
         if (!state->results.num_results) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Result stack is empty! State=%p\n",
-                                  walk_state));
+                ACPI_ERROR((AE_INFO, "Result stack is empty! State=%p",
+                            walk_state));
                 return (AE_AML_NO_RETURN_VALUE);
         }
 
@@ -192,8 +188,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
                 }
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                          "No result objects! State=%p\n", walk_state));
+        ACPI_ERROR((AE_INFO, "No result objects! State=%p", walk_state));
         return (AE_AML_NO_RETURN_VALUE);
 }
 
@@ -222,15 +217,14 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
 
         state = walk_state->results;
         if (!state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Warning: No result object pushed! State=%p\n",
-                                  walk_state));
+                ACPI_ERROR((AE_INFO,
+                            "No result object pushed! State=%p", walk_state));
                 return (AE_NOT_EXIST);
         }
 
         if (!state->results.num_results) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No result objects! State=%p\n", walk_state));
+                ACPI_ERROR((AE_INFO, "No result objects! State=%p",
+                            walk_state));
                 return (AE_AML_NO_RETURN_VALUE);
         }
 
@@ -250,10 +244,10 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
         /* Check for a valid result object */
 
         if (!*object) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null operand! State=%p #Ops=%X Index=%X\n",
-                                  walk_state, state->results.num_results,
-                                  (u32) index));
+                ACPI_ERROR((AE_INFO,
+                            "Null operand! State=%p #Ops=%X Index=%X",
+                            walk_state, state->results.num_results,
+                            (u32) index));
                 return (AE_AML_NO_RETURN_VALUE);
         }
 
@@ -288,23 +282,21 @@ acpi_ds_result_push(union acpi_operand_object * object,
 
         state = walk_state->results;
         if (!state) {
-                ACPI_REPORT_ERROR(("No result stack frame during push\n"));
+                ACPI_ERROR((AE_INFO, "No result stack frame during push"));
                 return (AE_AML_INTERNAL);
         }
 
         if (state->results.num_results == ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Result stack overflow: Obj=%p State=%p Num=%X\n",
-                                  object, walk_state,
-                                  state->results.num_results));
+                ACPI_ERROR((AE_INFO,
+                            "Result stack overflow: Obj=%p State=%p Num=%X",
+                            object, walk_state, state->results.num_results));
                 return (AE_STACK_OVERFLOW);
         }
 
         if (!object) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null Object! Obj=%p State=%p Num=%X\n",
-                                  object, walk_state,
-                                  state->results.num_results));
+                ACPI_ERROR((AE_INFO,
+                            "Null Object! Obj=%p State=%p Num=%X",
+                            object, walk_state, state->results.num_results));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -413,10 +405,9 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
         /* Check for stack overflow */
 
         if (walk_state->num_operands >= ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "overflow! Obj=%p State=%p #Ops=%X\n",
-                                  object, walk_state,
-                                  walk_state->num_operands));
+                ACPI_ERROR((AE_INFO,
+                            "Object stack overflow! Obj=%p State=%p #Ops=%X",
+                            object, walk_state, walk_state->num_operands));
                 return (AE_STACK_OVERFLOW);
         }
 
@@ -460,10 +451,10 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
                 /* Check for stack underflow */
 
                 if (walk_state->num_operands == 0) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Underflow! Count=%X State=%p #Ops=%X\n",
-                                          pop_count, walk_state,
-                                          walk_state->num_operands));
+                        ACPI_ERROR((AE_INFO,
+                                    "Object stack underflow! Count=%X State=%p #Ops=%X",
+                                    pop_count, walk_state,
+                                    walk_state->num_operands));
                         return (AE_STACK_UNDERFLOW);
                 }
 
@@ -506,10 +497,10 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
                 /* Check for stack underflow */
 
                 if (walk_state->num_operands == 0) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Underflow! Count=%X State=%p #Ops=%X\n",
-                                          pop_count, walk_state,
-                                          walk_state->num_operands));
+                        ACPI_ERROR((AE_INFO,
+                                    "Object stack underflow! Count=%X State=%p #Ops=%X",
+                                    pop_count, walk_state,
+                                    walk_state->num_operands));
                         return (AE_STACK_UNDERFLOW);
                 }
 
@@ -826,16 +817,14 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
         }
 
         if (walk_state->data_type != ACPI_DESC_TYPE_WALK) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%p is not a valid walk state\n",
-                                  walk_state));
+                ACPI_ERROR((AE_INFO, "%p is not a valid walk state",
+                            walk_state));
                 return;
         }
 
         if (walk_state->parser_state.scope) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%p walk still has a scope list\n",
-                                  walk_state));
+                ACPI_ERROR((AE_INFO, "%p walk still has a scope list",
+                            walk_state));
         }
 
         /* Always must free any linked control states */
@@ -894,25 +883,24 @@ acpi_ds_result_insert(void *object,
 
         state = walk_state->results;
         if (!state) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No result object pushed! State=%p\n",
-                                  walk_state));
+                ACPI_ERROR((AE_INFO, "No result object pushed! State=%p",
+                            walk_state));
                 return (AE_NOT_EXIST);
         }
 
         if (index >= ACPI_OBJ_NUM_OPERANDS) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Index out of range: %X Obj=%p State=%p Num=%X\n",
-                                  index, object, walk_state,
-                                  state->results.num_results));
+                ACPI_ERROR((AE_INFO,
+                            "Index out of range: %X Obj=%p State=%p Num=%X",
+                            index, object, walk_state,
+                            state->results.num_results));
                 return (AE_BAD_PARAMETER);
         }
 
         if (!object) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null Object! Index=%X Obj=%p State=%p Num=%X\n",
-                                  index, object, walk_state,
-                                  state->results.num_results));
+                ACPI_ERROR((AE_INFO,
+                            "Null Object! Index=%X Obj=%p State=%p Num=%X",
+                            index, object, walk_state,
+                            state->results.num_results));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -986,9 +974,9 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
         /* Check for stack underflow */
 
         if (walk_state->num_operands == 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Missing operand/stack empty! State=%p #Ops=%X\n",
-                                  walk_state, walk_state->num_operands));
+                ACPI_ERROR((AE_INFO,
+                            "Missing operand/stack empty! State=%p #Ops=%X",
+                            walk_state, walk_state->num_operands));
                 *object = NULL;
                 return (AE_AML_NO_OPERAND);
         }
@@ -1000,9 +988,9 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
         /* Check for a valid operand */
 
         if (!walk_state->operands[walk_state->num_operands]) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null operand! State=%p #Ops=%X\n",
-                                  walk_state, walk_state->num_operands));
+                ACPI_ERROR((AE_INFO,
+                            "Null operand! State=%p #Ops=%X",
+                            walk_state, walk_state->num_operands));
                 *object = NULL;
                 return (AE_AML_NO_OPERAND);
         }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 3758b558d2b5..79b09d76c180 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -60,20 +60,20 @@ ACPI_MODULE_NAME("acpi_ec")
 #define ACPI_EC_BURST_ENABLE    0x82
 #define ACPI_EC_BURST_DISABLE   0x83
 #define ACPI_EC_COMMAND_QUERY   0x84
-#define EC_POLLING              0xFF
-#define EC_BURST                0x00
+#define EC_POLL                 0xFF
+#define EC_INTR                 0x00
 static int acpi_ec_remove(struct acpi_device *device, int type);
 static int acpi_ec_start(struct acpi_device *device);
 static int acpi_ec_stop(struct acpi_device *device, int type);
-static int acpi_ec_burst_add(struct acpi_device *device);
-static int acpi_ec_polling_add(struct acpi_device *device);
+static int acpi_ec_intr_add(struct acpi_device *device);
+static int acpi_ec_poll_add(struct acpi_device *device);
 
 static struct acpi_driver acpi_ec_driver = {
         .name = ACPI_EC_DRIVER_NAME,
         .class = ACPI_EC_CLASS,
         .ids = ACPI_EC_HID,
         .ops = {
-                .add = acpi_ec_polling_add,
+                .add = acpi_ec_intr_add,
                 .remove = acpi_ec_remove,
                 .start = acpi_ec_start,
                 .stop = acpi_ec_stop,
@@ -105,7 +105,7 @@ union acpi_ec {
                 atomic_t pending_gpe;
                 struct semaphore sem;
                 wait_queue_head_t wait;
-        } burst;
+        } intr;
 
         struct {
                 u32 mode;
@@ -117,37 +117,37 @@ union acpi_ec {
                 struct acpi_generic_address data_addr;
                 unsigned long global_lock;
                 spinlock_t lock;
-        } polling;
+        } poll;
 };
 
-static int acpi_ec_polling_wait(union acpi_ec *ec, u8 event);
-static int acpi_ec_burst_wait(union acpi_ec *ec, unsigned int event);
-static int acpi_ec_polling_read(union acpi_ec *ec, u8 address, u32 * data);
-static int acpi_ec_burst_read(union acpi_ec *ec, u8 address, u32 * data);
-static int acpi_ec_polling_write(union acpi_ec *ec, u8 address, u8 data);
-static int acpi_ec_burst_write(union acpi_ec *ec, u8 address, u8 data);
-static int acpi_ec_polling_query(union acpi_ec *ec, u32 * data);
-static int acpi_ec_burst_query(union acpi_ec *ec, u32 * data);
-static void acpi_ec_gpe_polling_query(void *ec_cxt);
-static void acpi_ec_gpe_burst_query(void *ec_cxt);
-static u32 acpi_ec_gpe_polling_handler(void *data);
-static u32 acpi_ec_gpe_burst_handler(void *data);
+static int acpi_ec_poll_wait(union acpi_ec *ec, u8 event);
+static int acpi_ec_intr_wait(union acpi_ec *ec, unsigned int event);
+static int acpi_ec_poll_read(union acpi_ec *ec, u8 address, u32 * data);
+static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data);
+static int acpi_ec_poll_write(union acpi_ec *ec, u8 address, u8 data);
+static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data);
+static int acpi_ec_poll_query(union acpi_ec *ec, u32 * data);
+static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data);
+static void acpi_ec_gpe_poll_query(void *ec_cxt);
+static void acpi_ec_gpe_intr_query(void *ec_cxt);
+static u32 acpi_ec_gpe_poll_handler(void *data);
+static u32 acpi_ec_gpe_intr_handler(void *data);
 static acpi_status __init
-acpi_fake_ecdt_polling_callback(acpi_handle handle,
+acpi_fake_ecdt_poll_callback(acpi_handle handle,
                                 u32 Level, void *context, void **retval);
 
 static acpi_status __init
-acpi_fake_ecdt_burst_callback(acpi_handle handle,
+acpi_fake_ecdt_intr_callback(acpi_handle handle,
                               u32 Level, void *context, void **retval);
 
-static int __init acpi_ec_polling_get_real_ecdt(void);
-static int __init acpi_ec_burst_get_real_ecdt(void);
+static int __init acpi_ec_poll_get_real_ecdt(void);
+static int __init acpi_ec_intr_get_real_ecdt(void);
 /* If we find an EC via the ECDT, we need to keep a ptr to its context */
 static union acpi_ec *ec_ecdt;
 
 /* External interfaces use first EC only, so remember */
 static struct acpi_device *first_ec;
-static int acpi_ec_polling_mode = EC_POLLING;
+static int acpi_ec_poll_mode = EC_INTR;
 
 /* --------------------------------------------------------------------------
                              Transaction Management
@@ -163,13 +163,13 @@ static u32 acpi_ec_read_status(union acpi_ec *ec)
 
 static int acpi_ec_wait(union acpi_ec *ec, u8 event)
 {
-        if (acpi_ec_polling_mode)
-                return acpi_ec_polling_wait(ec, event);
+        if (acpi_ec_poll_mode)
+                return acpi_ec_poll_wait(ec, event);
         else
-                return acpi_ec_burst_wait(ec, event);
+                return acpi_ec_intr_wait(ec, event);
 }
 
-static int acpi_ec_polling_wait(union acpi_ec *ec, u8 event)
+static int acpi_ec_poll_wait(union acpi_ec *ec, u8 event)
 {
         u32 acpi_ec_status = 0;
         u32 i = ACPI_EC_UDELAY_COUNT;
@@ -203,36 +203,31 @@ static int acpi_ec_polling_wait(union acpi_ec *ec, u8 event)
 
         return -ETIME;
 }
-static int acpi_ec_burst_wait(union acpi_ec *ec, unsigned int event)
+static int acpi_ec_intr_wait(union acpi_ec *ec, unsigned int event)
 {
         int result = 0;
 
         ACPI_FUNCTION_TRACE("acpi_ec_wait");
 
-        ec->burst.expect_event = event;
+        ec->intr.expect_event = event;
         smp_mb();
 
         switch (event) {
-        case ACPI_EC_EVENT_OBF:
-                if (acpi_ec_read_status(ec) & event) {
-                        ec->burst.expect_event = 0;
-                        return_VALUE(0);
-                }
-                break;
-
         case ACPI_EC_EVENT_IBE:
                 if (~acpi_ec_read_status(ec) & event) {
-                        ec->burst.expect_event = 0;
+                        ec->intr.expect_event = 0;
                         return_VALUE(0);
                 }
                 break;
+        default:
+                break;
         }
 
-        result = wait_event_timeout(ec->burst.wait,
-                                    !ec->burst.expect_event,
+        result = wait_event_timeout(ec->intr.wait,
+                                    !ec->intr.expect_event,
                                     msecs_to_jiffies(ACPI_EC_DELAY));
 
-        ec->burst.expect_event = 0;
+        ec->intr.expect_event = 0;
         smp_mb();
 
         /*
@@ -255,7 +250,12 @@ static int acpi_ec_burst_wait(union acpi_ec *ec, unsigned int event)
         return_VALUE(-ETIME);
 }
 
-static int acpi_ec_enter_burst_mode(union acpi_ec *ec)
+#ifdef ACPI_FUTURE_USAGE
+/*
+ * Note: samsung nv5000 doesn't work with ec burst mode.
+ * http://bugzilla.kernel.org/show_bug.cgi?id=4980
+ */
+int acpi_ec_enter_burst_mode(union acpi_ec *ec)
 {
         u32 tmp = 0;
         int status = 0;
@@ -270,45 +270,56 @@ static int acpi_ec_enter_burst_mode(union acpi_ec *ec)
                 acpi_hw_low_level_write(8, ACPI_EC_BURST_ENABLE,
                                         &ec->common.command_addr);
                 status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);
-                if (status)
-                        return_VALUE(-EINVAL);
                 acpi_hw_low_level_read(8, &tmp, &ec->common.data_addr);
                 if (tmp != 0x90) {      /* Burst ACK byte */
                         return_VALUE(-EINVAL);
                 }
         }
 
-        atomic_set(&ec->burst.leaving_burst, 0);
+        atomic_set(&ec->intr.leaving_burst, 0);
         return_VALUE(0);
       end:
-        printk("Error in acpi_ec_wait\n");
+        printk(KERN_WARNING PREFIX "Error in acpi_ec_wait\n");
         return_VALUE(-1);
 }
 
-static int acpi_ec_leave_burst_mode(union acpi_ec *ec)
+int acpi_ec_leave_burst_mode(union acpi_ec *ec)
 {
+        int status = 0;
 
         ACPI_FUNCTION_TRACE("acpi_ec_leave_burst_mode");
 
-        atomic_set(&ec->burst.leaving_burst, 1);
+        status = acpi_ec_read_status(ec);
+        if (status != -EINVAL && (status & ACPI_EC_FLAG_BURST)){
+                status = acpi_ec_wait(ec, ACPI_EC_FLAG_IBF);
+                if(status)
+                        goto end;
+                acpi_hw_low_level_write(8, ACPI_EC_BURST_DISABLE, &ec->common.command_addr);
+                acpi_ec_wait(ec, ACPI_EC_FLAG_IBF);
+        } 
+        atomic_set(&ec->intr.leaving_burst, 1);
         return_VALUE(0);
+end:
+        printk(KERN_WARNING PREFIX "leave burst_mode:error\n");
+        return_VALUE(-1);
 }
+#endif /* ACPI_FUTURE_USAGE */
 
 static int acpi_ec_read(union acpi_ec *ec, u8 address, u32 * data)
 {
-        if (acpi_ec_polling_mode)
-                return acpi_ec_polling_read(ec, address, data);
+        if (acpi_ec_poll_mode)
+                return acpi_ec_poll_read(ec, address, data);
         else
-                return acpi_ec_burst_read(ec, address, data);
+                return acpi_ec_intr_read(ec, address, data);
 }
 static int acpi_ec_write(union acpi_ec *ec, u8 address, u8 data)
 {
-        if (acpi_ec_polling_mode)
-                return acpi_ec_polling_write(ec, address, data);
+        if (acpi_ec_poll_mode)
+                return acpi_ec_poll_write(ec, address, data);
         else
-                return acpi_ec_burst_write(ec, address, data);
+                return acpi_ec_intr_write(ec, address, data);
 }
-static int acpi_ec_polling_read(union acpi_ec *ec, u8 address, u32 * data)
+static int acpi_ec_poll_read(union acpi_ec *ec, u8 address, u32 * data)
 {
         acpi_status status = AE_OK;
         int result = 0;
@@ -328,7 +339,7 @@ static int acpi_ec_polling_read(union acpi_ec *ec, u8 address, u32 * data)
                         return_VALUE(-ENODEV);
         }
 
-        spin_lock_irqsave(&ec->polling.lock, flags);
+        spin_lock_irqsave(&ec->poll.lock, flags);
 
         acpi_hw_low_level_write(8, ACPI_EC_COMMAND_READ,
                                 &ec->common.command_addr);
@@ -347,7 +358,7 @@ static int acpi_ec_polling_read(union acpi_ec *ec, u8 address, u32 * data)
                           *data, address));
 
       end:
-        spin_unlock_irqrestore(&ec->polling.lock, flags);
+        spin_unlock_irqrestore(&ec->poll.lock, flags);
 
         if (ec->common.global_lock)
                 acpi_release_global_lock(glk);
@@ -355,7 +366,7 @@ static int acpi_ec_polling_read(union acpi_ec *ec, u8 address, u32 * data)
         return_VALUE(result);
 }
 
-static int acpi_ec_polling_write(union acpi_ec *ec, u8 address, u8 data)
+static int acpi_ec_poll_write(union acpi_ec *ec, u8 address, u8 data)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -373,7 +384,7 @@ static int acpi_ec_polling_write(union acpi_ec *ec, u8 address, u8 data)
                         return_VALUE(-ENODEV);
         }
 
-        spin_lock_irqsave(&ec->polling.lock, flags);
+        spin_lock_irqsave(&ec->poll.lock, flags);
 
         acpi_hw_low_level_write(8, ACPI_EC_COMMAND_WRITE,
                                 &ec->common.command_addr);
@@ -395,7 +406,7 @@ static int acpi_ec_polling_write(union acpi_ec *ec, u8 address, u8 data)
                           data, address));
 
       end:
-        spin_unlock_irqrestore(&ec->polling.lock, flags);
+        spin_unlock_irqrestore(&ec->poll.lock, flags);
 
         if (ec->common.global_lock)
                 acpi_release_global_lock(glk);
@@ -403,7 +414,7 @@ static int acpi_ec_polling_write(union acpi_ec *ec, u8 address, u8 data)
         return_VALUE(result);
 }
 
-static int acpi_ec_burst_read(union acpi_ec *ec, u8 address, u32 * data)
+static int acpi_ec_intr_read(union acpi_ec *ec, u8 address, u32 * data)
 {
         int status = 0;
         u32 glk;
@@ -422,25 +433,24 @@ static int acpi_ec_burst_read(union acpi_ec *ec, u8 address, u32 * data)
         }
 
         WARN_ON(in_interrupt());
-        down(&ec->burst.sem);
+        down(&ec->intr.sem);
 
-        acpi_ec_enter_burst_mode(ec);
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
         if (status) {
-                printk("read EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX "read EC, IB not empty\n");
                 goto end;
         }
         acpi_hw_low_level_write(8, ACPI_EC_COMMAND_READ,
                                 &ec->common.command_addr);
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
         if (status) {
-                printk("read EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX "read EC, IB not empty\n");
         }
 
         acpi_hw_low_level_write(8, address, &ec->common.data_addr);
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);
         if (status) {
-                printk("read EC, OB not full\n");
+                printk(KERN_DEBUG PREFIX "read EC, OB not full\n");
                 goto end;
         }
         acpi_hw_low_level_read(8, data, &ec->common.data_addr);
@@ -448,8 +458,7 @@ static int acpi_ec_burst_read(union acpi_ec *ec, u8 address, u32 * data)
                           *data, address));
 
       end:
-        acpi_ec_leave_burst_mode(ec);
-        up(&ec->burst.sem);
+        up(&ec->intr.sem);
 
         if (ec->common.global_lock)
                 acpi_release_global_lock(glk);
@@ -457,7 +466,7 @@ static int acpi_ec_burst_read(union acpi_ec *ec, u8 address, u32 * data)
         return_VALUE(status);
 }
 
-static int acpi_ec_burst_write(union acpi_ec *ec, u8 address, u8 data)
+static int acpi_ec_intr_write(union acpi_ec *ec, u8 address, u8 data)
 {
         int status = 0;
         u32 glk;
@@ -474,25 +483,23 @@ static int acpi_ec_burst_write(union acpi_ec *ec, u8 address, u8 data)
         }
 
         WARN_ON(in_interrupt());
-        down(&ec->burst.sem);
-
-        acpi_ec_enter_burst_mode(ec);
+        down(&ec->intr.sem);
 
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
         if (status) {
-                printk("write EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX "write EC, IB not empty\n");
         }
         acpi_hw_low_level_write(8, ACPI_EC_COMMAND_WRITE,
                                 &ec->common.command_addr);
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
         if (status) {
-                printk("write EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX "write EC, IB not empty\n");
         }
 
         acpi_hw_low_level_write(8, address, &ec->common.data_addr);
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
         if (status) {
-                printk("write EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX "write EC, IB not empty\n");
         }
 
         acpi_hw_low_level_write(8, data, &ec->common.data_addr);
@@ -500,8 +507,7 @@ static int acpi_ec_burst_write(union acpi_ec *ec, u8 address, u8 data)
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Wrote [%02x] to address [%02x]\n",
                           data, address));
 
-        acpi_ec_leave_burst_mode(ec);
-        up(&ec->burst.sem);
+        up(&ec->intr.sem);
 
         if (ec->common.global_lock)
                 acpi_release_global_lock(glk);
@@ -553,12 +559,12 @@ EXPORT_SYMBOL(ec_write);
 
 static int acpi_ec_query(union acpi_ec *ec, u32 * data)
 {
-        if (acpi_ec_polling_mode)
-                return acpi_ec_polling_query(ec, data);
+        if (acpi_ec_poll_mode)
+                return acpi_ec_poll_query(ec, data);
         else
-                return acpi_ec_burst_query(ec, data);
+                return acpi_ec_intr_query(ec, data);
 }
-static int acpi_ec_polling_query(union acpi_ec *ec, u32 * data)
+static int acpi_ec_poll_query(union acpi_ec *ec, u32 * data)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -583,7 +589,7 @@ static int acpi_ec_polling_query(union acpi_ec *ec, u32 * data)
          * Note that successful completion of the query causes the ACPI_EC_SCI
          * bit to be cleared (and thus clearing the interrupt source).
          */
-        spin_lock_irqsave(&ec->polling.lock, flags);
+        spin_lock_irqsave(&ec->poll.lock, flags);
 
         acpi_hw_low_level_write(8, ACPI_EC_COMMAND_QUERY,
                                 &ec->common.command_addr);
@@ -596,14 +602,14 @@ static int acpi_ec_polling_query(union acpi_ec *ec, u32 * data)
                 result = -ENODATA;
 
       end:
-        spin_unlock_irqrestore(&ec->polling.lock, flags);
+        spin_unlock_irqrestore(&ec->poll.lock, flags);
 
         if (ec->common.global_lock)
                 acpi_release_global_lock(glk);
 
         return_VALUE(result);
 }
-static int acpi_ec_burst_query(union acpi_ec *ec, u32 * data)
+static int acpi_ec_intr_query(union acpi_ec *ec, u32 * data)
 {
         int status = 0;
         u32 glk;
@@ -620,11 +626,11 @@ static int acpi_ec_burst_query(union acpi_ec *ec, u32 * data)
                         return_VALUE(-ENODEV);
         }
 
-        down(&ec->burst.sem);
+        down(&ec->intr.sem);
 
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBE);
         if (status) {
-                printk("query EC, IB not empty\n");
+                printk(KERN_DEBUG PREFIX "query EC, IB not empty\n");
                 goto end;
         }
         /*
@@ -636,7 +642,7 @@ static int acpi_ec_burst_query(union acpi_ec *ec, u32 * data)
                                 &ec->common.command_addr);
         status = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF);
         if (status) {
-                printk("query EC, OB not full\n");
+                printk(KERN_DEBUG PREFIX "query EC, OB not full\n");
                 goto end;
         }
 
@@ -645,7 +651,7 @@ static int acpi_ec_burst_query(union acpi_ec *ec, u32 * data)
                 status = -ENODATA;
 
       end:
-        up(&ec->burst.sem);
+        up(&ec->intr.sem);
 
         if (ec->common.global_lock)
                 acpi_release_global_lock(glk);
@@ -664,13 +670,13 @@ union acpi_ec_query_data {
 
 static void acpi_ec_gpe_query(void *ec_cxt)
 {
-        if (acpi_ec_polling_mode)
-                acpi_ec_gpe_polling_query(ec_cxt);
+        if (acpi_ec_poll_mode)
+                acpi_ec_gpe_poll_query(ec_cxt);
         else
-                acpi_ec_gpe_burst_query(ec_cxt);
+                acpi_ec_gpe_intr_query(ec_cxt);
 }
 
-static void acpi_ec_gpe_polling_query(void *ec_cxt)
+static void acpi_ec_gpe_poll_query(void *ec_cxt)
 {
         union acpi_ec *ec = (union acpi_ec *)ec_cxt;
         u32 value = 0;
@@ -685,9 +691,9 @@ static void acpi_ec_gpe_polling_query(void *ec_cxt)
         if (!ec_cxt)
                 goto end;
 
-        spin_lock_irqsave(&ec->polling.lock, flags);
+        spin_lock_irqsave(&ec->poll.lock, flags);
         acpi_hw_low_level_read(8, &value, &ec->common.command_addr);
-        spin_unlock_irqrestore(&ec->polling.lock, flags);
+        spin_unlock_irqrestore(&ec->poll.lock, flags);
 
         /* TBD: Implement asynch events!
          * NOTE: All we care about are EC-SCI's.  Other EC events are
@@ -711,7 +717,7 @@ static void acpi_ec_gpe_polling_query(void *ec_cxt)
       end:
         acpi_enable_gpe(NULL, ec->common.gpe_bit, ACPI_NOT_ISR);
 }
-static void acpi_ec_gpe_burst_query(void *ec_cxt)
+static void acpi_ec_gpe_intr_query(void *ec_cxt)
 {
         union acpi_ec *ec = (union acpi_ec *)ec_cxt;
         u32 value;
@@ -736,18 +742,18 @@ static void acpi_ec_gpe_burst_query(void *ec_cxt)
 
         acpi_evaluate_object(ec->common.handle, object_name, NULL, NULL);
       end:
-        atomic_dec(&ec->burst.pending_gpe);
+        atomic_dec(&ec->intr.pending_gpe);
         return;
 }
 
 static u32 acpi_ec_gpe_handler(void *data)
 {
-        if (acpi_ec_polling_mode)
-                return acpi_ec_gpe_polling_handler(data);
+        if (acpi_ec_poll_mode)
+                return acpi_ec_gpe_poll_handler(data);
         else
-                return acpi_ec_gpe_burst_handler(data);
+                return acpi_ec_gpe_intr_handler(data);
 }
-static u32 acpi_ec_gpe_polling_handler(void *data)
+static u32 acpi_ec_gpe_poll_handler(void *data)
 {
         acpi_status status = AE_OK;
         union acpi_ec *ec = (union acpi_ec *)data;
@@ -765,7 +771,7 @@ static u32 acpi_ec_gpe_polling_handler(void *data)
         else
                 return ACPI_INTERRUPT_NOT_HANDLED;
 }
-static u32 acpi_ec_gpe_burst_handler(void *data)
+static u32 acpi_ec_gpe_intr_handler(void *data)
 {
         acpi_status status = AE_OK;
         u32 value;
@@ -777,22 +783,22 @@ static u32 acpi_ec_gpe_burst_handler(void *data)
         acpi_clear_gpe(NULL, ec->common.gpe_bit, ACPI_ISR);
         value = acpi_ec_read_status(ec);
 
-        switch (ec->burst.expect_event) {
+        switch (ec->intr.expect_event) {
         case ACPI_EC_EVENT_OBF:
                 if (!(value & ACPI_EC_FLAG_OBF))
                         break;
         case ACPI_EC_EVENT_IBE:
                 if ((value & ACPI_EC_FLAG_IBF))
                         break;
-                ec->burst.expect_event = 0;
-                wake_up(&ec->burst.wait);
+                ec->intr.expect_event = 0;
+                wake_up(&ec->intr.wait);
                 return ACPI_INTERRUPT_HANDLED;
         default:
                 break;
         }
 
         if (value & ACPI_EC_FLAG_SCI) {
-                atomic_add(1, &ec->burst.pending_gpe);
+                atomic_add(1, &ec->intr.pending_gpe);
                 status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
                                                      acpi_ec_gpe_query, ec);
                 return status == AE_OK ?
@@ -980,7 +986,7 @@ static int acpi_ec_remove_fs(struct acpi_device *device)
                                Driver Interface
    -------------------------------------------------------------------------- */
 
-static int acpi_ec_polling_add(struct acpi_device *device)
+static int acpi_ec_poll_add(struct acpi_device *device)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -999,7 +1005,7 @@ static int acpi_ec_polling_add(struct acpi_device *device)
 
         ec->common.handle = device->handle;
         ec->common.uid = -1;
-        spin_lock_init(&ec->polling.lock);
+        spin_lock_init(&ec->poll.lock);
         strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_EC_CLASS);
         acpi_driver_data(device) = ec;
@@ -1038,7 +1044,7 @@ static int acpi_ec_polling_add(struct acpi_device *device)
         if (result)
                 goto end;
 
-        printk(KERN_INFO PREFIX "%s [%s] (gpe %d)\n",
+        printk(KERN_INFO PREFIX "%s [%s] (gpe %d) polling mode.\n",
                acpi_device_name(device), acpi_device_bid(device),
                (u32) ec->common.gpe_bit);
 
@@ -1051,7 +1057,7 @@ static int acpi_ec_polling_add(struct acpi_device *device)
 
         return_VALUE(result);
 }
-static int acpi_ec_burst_add(struct acpi_device *device)
+static int acpi_ec_intr_add(struct acpi_device *device)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -1070,10 +1076,10 @@ static int acpi_ec_burst_add(struct acpi_device *device)
 
         ec->common.handle = device->handle;
         ec->common.uid = -1;
-        atomic_set(&ec->burst.pending_gpe, 0);
-        atomic_set(&ec->burst.leaving_burst, 1);
-        init_MUTEX(&ec->burst.sem);
-        init_waitqueue_head(&ec->burst.wait);
+        atomic_set(&ec->intr.pending_gpe, 0);
+        atomic_set(&ec->intr.leaving_burst, 1);
+        init_MUTEX(&ec->intr.sem);
+        init_waitqueue_head(&ec->intr.wait);
         strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_EC_CLASS);
         acpi_driver_data(device) = ec;
@@ -1112,8 +1118,7 @@ static int acpi_ec_burst_add(struct acpi_device *device)
         if (result)
                 goto end;
 
-        printk("burst-mode-ec-10-Aug\n");
-        printk(KERN_INFO PREFIX "%s [%s] (gpe %d)\n",
+        printk(KERN_INFO PREFIX "%s [%s] (gpe %d) interrupt mode.\n",
                acpi_device_name(device), acpi_device_bid(device),
                (u32) ec->common.gpe_bit);
 
@@ -1151,7 +1156,7 @@ acpi_ec_io_ports(struct acpi_resource *resource, void *context)
         union acpi_ec *ec = (union acpi_ec *)context;
         struct acpi_generic_address *addr;
 
-        if (resource->id != ACPI_RSTYPE_IO) {
+        if (resource->type != ACPI_RESOURCE_TYPE_IO) {
                 return AE_OK;
         }
 
@@ -1171,7 +1176,7 @@ acpi_ec_io_ports(struct acpi_resource *resource, void *context)
         addr->address_space_id = ACPI_ADR_SPACE_SYSTEM_IO;
         addr->register_bit_width = 8;
         addr->register_bit_offset = 0;
-        addr->address = resource->data.io.min_base_address;
+        addr->address = resource->data.io.minimum;
 
         return AE_OK;
 }
@@ -1267,16 +1272,16 @@ acpi_fake_ecdt_callback(acpi_handle handle,
                         u32 Level, void *context, void **retval)
 {
 
-        if (acpi_ec_polling_mode)
-                return acpi_fake_ecdt_polling_callback(handle,
+        if (acpi_ec_poll_mode)
+                return acpi_fake_ecdt_poll_callback(handle,
                                                        Level, context, retval);
         else
-                return acpi_fake_ecdt_burst_callback(handle,
+                return acpi_fake_ecdt_intr_callback(handle,
                                                      Level, context, retval);
 }
 
 static acpi_status __init
-acpi_fake_ecdt_polling_callback(acpi_handle handle,
+acpi_fake_ecdt_poll_callback(acpi_handle handle,
                                 u32 Level, void *context, void **retval)
 {
         acpi_status status;
@@ -1295,7 +1300,7 @@ acpi_fake_ecdt_polling_callback(acpi_handle handle,
                                   &ec_ecdt->common.gpe_bit);
         if (ACPI_FAILURE(status))
                 return status;
-        spin_lock_init(&ec_ecdt->polling.lock);
+        spin_lock_init(&ec_ecdt->poll.lock);
         ec_ecdt->common.global_lock = TRUE;
         ec_ecdt->common.handle = handle;
 
@@ -1308,13 +1313,13 @@ acpi_fake_ecdt_polling_callback(acpi_handle handle,
 }
 
 static acpi_status __init
-acpi_fake_ecdt_burst_callback(acpi_handle handle,
+acpi_fake_ecdt_intr_callback(acpi_handle handle,
                               u32 Level, void *context, void **retval)
 {
         acpi_status status;
 
-        init_MUTEX(&ec_ecdt->burst.sem);
-        init_waitqueue_head(&ec_ecdt->burst.wait);
+        init_MUTEX(&ec_ecdt->intr.sem);
+        init_waitqueue_head(&ec_ecdt->intr.wait);
         status = acpi_walk_resources(handle, METHOD_NAME__CRS,
                                      acpi_ec_io_ports, ec_ecdt);
         if (ACPI_FAILURE(status))
@@ -1380,13 +1385,13 @@ static int __init acpi_ec_fake_ecdt(void)
 
 static int __init acpi_ec_get_real_ecdt(void)
 {
-        if (acpi_ec_polling_mode)
-                return acpi_ec_polling_get_real_ecdt();
+        if (acpi_ec_poll_mode)
+                return acpi_ec_poll_get_real_ecdt();
         else
-                return acpi_ec_burst_get_real_ecdt();
+                return acpi_ec_intr_get_real_ecdt();
 }
 
-static int __init acpi_ec_polling_get_real_ecdt(void)
+static int __init acpi_ec_poll_get_real_ecdt(void)
 {
         acpi_status status;
         struct acpi_table_ecdt *ecdt_ptr;
@@ -1411,7 +1416,7 @@ static int __init acpi_ec_polling_get_real_ecdt(void)
         ec_ecdt->common.status_addr = ecdt_ptr->ec_control;
         ec_ecdt->common.data_addr = ecdt_ptr->ec_data;
         ec_ecdt->common.gpe_bit = ecdt_ptr->gpe_bit;
-        spin_lock_init(&ec_ecdt->polling.lock);
+        spin_lock_init(&ec_ecdt->poll.lock);
         /* use the GL just to be safe */
         ec_ecdt->common.global_lock = TRUE;
         ec_ecdt->common.uid = ecdt_ptr->uid;
@@ -1431,7 +1436,7 @@ static int __init acpi_ec_polling_get_real_ecdt(void)
         return -ENODEV;
 }
 
-static int __init acpi_ec_burst_get_real_ecdt(void)
+static int __init acpi_ec_intr_get_real_ecdt(void)
 {
         acpi_status status;
         struct acpi_table_ecdt *ecdt_ptr;
@@ -1452,8 +1457,8 @@ static int __init acpi_ec_burst_get_real_ecdt(void)
                 return -ENOMEM;
         memset(ec_ecdt, 0, sizeof(union acpi_ec));
 
-        init_MUTEX(&ec_ecdt->burst.sem);
-        init_waitqueue_head(&ec_ecdt->burst.wait);
+        init_MUTEX(&ec_ecdt->intr.sem);
+        init_waitqueue_head(&ec_ecdt->intr.wait);
         ec_ecdt->common.command_addr = ecdt_ptr->ec_control;
         ec_ecdt->common.status_addr = ecdt_ptr->ec_control;
         ec_ecdt->common.data_addr = ecdt_ptr->ec_data;
@@ -1571,22 +1576,22 @@ static int __init acpi_fake_ecdt_setup(char *str)
 }
 
 __setup("acpi_fake_ecdt", acpi_fake_ecdt_setup);
-static int __init acpi_ec_set_polling_mode(char *str)
+static int __init acpi_ec_set_intr_mode(char *str)
 {
-        int burst;
+        int intr;
 
-        if (!get_option(&str, &burst))
+        if (!get_option(&str, &intr))
                 return 0;
 
-        if (burst) {
-                acpi_ec_polling_mode = EC_BURST;
-                acpi_ec_driver.ops.add = acpi_ec_burst_add;
+        if (intr) {
+                acpi_ec_poll_mode = EC_INTR;
+                acpi_ec_driver.ops.add = acpi_ec_intr_add;
         } else {
-                acpi_ec_polling_mode = EC_POLLING;
-                acpi_ec_driver.ops.add = acpi_ec_polling_add;
+                acpi_ec_poll_mode = EC_POLL;
+                acpi_ec_driver.ops.add = acpi_ec_poll_add;
         }
-        printk(KERN_INFO PREFIX "EC %s mode.\n", burst ? "burst" : "polling");
+        printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling");
         return 0;
 }
 
-__setup("ec_burst=", acpi_ec_set_polling_mode);
+__setup("ec_intr=", acpi_ec_set_intr_mode);
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 842d1e3fb37b..c9ac05c4685f 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@ acpi_status acpi_ev_initialize_events(void)
         /* Make sure we have ACPI tables */
 
         if (!acpi_gbl_DSDT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "No ACPI tables present!\n"));
+                ACPI_WARNING((AE_INFO, "No ACPI tables present!"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
@@ -84,14 +84,15 @@ acpi_status acpi_ev_initialize_events(void)
          */
         status = acpi_ev_fixed_event_initialize();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Unable to initialize fixed events, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Unable to initialize fixed events"));
                 return_ACPI_STATUS(status);
         }
 
         status = acpi_ev_gpe_initialize();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Unable to initialize general purpose events, %s\n", acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Unable to initialize general purpose events"));
                 return_ACPI_STATUS(status);
         }
 
@@ -100,6 +101,48 @@ acpi_status acpi_ev_initialize_events(void)
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ev_install_fadt_gpes
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Completes initialization of the FADT-defined GPE blocks
+ *              (0 and 1). This causes the _PRW methods to be run, so the HW
+ *              must be fully initialized at this point, including global lock
+ *              support.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ev_install_fadt_gpes(void)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE("ev_install_fadt_gpes");
+
+        /* Namespace must be locked */
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* FADT GPE Block 0 */
+
+        (void)acpi_ev_initialize_gpe_block(acpi_gbl_fadt_gpe_device,
+                                           acpi_gbl_gpe_fadt_blocks[0]);
+
+        /* FADT GPE Block 1 */
+
+        (void)acpi_ev_initialize_gpe_block(acpi_gbl_fadt_gpe_device,
+                                           acpi_gbl_gpe_fadt_blocks[1]);
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ev_install_xrupt_handlers
  *
  * PARAMETERS:  None
@@ -120,7 +163,8 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
 
         status = acpi_ev_install_sci_handler();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Unable to install System Control Interrupt Handler, %s\n", acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Unable to install System Control Interrupt handler"));
                 return_ACPI_STATUS(status);
         }
 
@@ -128,7 +172,8 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
 
         status = acpi_ev_init_global_lock_handler();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Unable to initialize Global Lock handler, %s\n", acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Unable to initialize Global Lock handler"));
                 return_ACPI_STATUS(status);
         }
 
@@ -262,7 +307,9 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
                                         enable_register_id, 0,
                                         ACPI_MTX_DO_NOT_LOCK);
 
-                ACPI_REPORT_ERROR(("No installed handler for fixed event [%08X]\n", event));
+                ACPI_ERROR((AE_INFO,
+                            "No installed handler for fixed event [%08X]",
+                            event));
 
                 return (ACPI_INTERRUPT_NOT_HANDLED);
         }
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index b2f232df13d8..f64f977dd3d5 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -372,14 +372,14 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
 
 u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
 {
+        acpi_status status;
+        struct acpi_gpe_block_info *gpe_block;
+        struct acpi_gpe_register_info *gpe_register_info;
         u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
         u8 enabled_status_byte;
-        struct acpi_gpe_register_info *gpe_register_info;
         u32 status_reg;
         u32 enable_reg;
-        u32 flags;
-        acpi_status status;
-        struct acpi_gpe_block_info *gpe_block;
+        acpi_cpu_flags flags;
         acpi_native_uint i;
         acpi_native_uint j;
 
@@ -546,7 +546,11 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 
                 status = acpi_ns_evaluate_by_handle(&info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("%s while evaluating method [%4.4s] for GPE[%2X]\n", acpi_format_exception(status), acpi_ut_get_node_name(local_gpe_event_info.dispatch.method_node), gpe_number));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "While evaluating method [%4.4s] for GPE[%2X]",
+                                        acpi_ut_get_node_name
+                                        (local_gpe_event_info.dispatch.
+                                         method_node), gpe_number));
                 }
         }
 
@@ -599,8 +603,10 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
             ACPI_GPE_EDGE_TRIGGERED) {
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                        return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Unable to clear GPE[%2X]",
+                                        gpe_number));
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
         }
 
@@ -637,8 +643,10 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                     ACPI_GPE_LEVEL_TRIGGERED) {
                         status = acpi_hw_clear_gpe(gpe_event_info);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                                return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "Unable to clear GPE[%2X]",
+                                                gpe_number));
+                                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                         }
                 }
                 break;
@@ -651,8 +659,10 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                  */
                 status = acpi_ev_disable_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                        return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Unable to disable GPE[%2X]",
+                                        gpe_number));
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
 
                 /*
@@ -663,7 +673,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                                                      acpi_ev_asynch_execute_gpe_method,
                                                      gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Unable to queue handler for GPE[%2X] - event disabled",
+                                        gpe_number));
                 }
                 break;
 
@@ -671,7 +683,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
 
                 /* No handler or method to run! */
 
-                ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: No handler or method for GPE[%2X], disabling event\n", gpe_number));
+                ACPI_ERROR((AE_INFO,
+                            "No handler or method for GPE[%2X], disabling event",
+                            gpe_number));
 
                 /*
                  * Disable the GPE.  The GPE will remain disabled until the ACPI
@@ -679,13 +693,15 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                  */
                 status = acpi_ev_disable_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                        return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Unable to disable GPE[%2X]",
+                                        gpe_number));
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
                 break;
         }
 
-        return_VALUE(ACPI_INTERRUPT_HANDLED);
+        return_UINT32(ACPI_INTERRUPT_HANDLED);
 }
 
 #ifdef ACPI_GPE_NOTIFY_CHECK
@@ -722,7 +738,9 @@ acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info)
 
                 acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
 
-                ACPI_REPORT_INFO(("GPE %p was updated from wake/run to wake-only\n", gpe_event_info));
+                ACPI_INFO((AE_INFO,
+                           "GPE %p was updated from wake/run to wake-only",
+                           gpe_event_info));
 
                 /* This was a wake-only GPE */
 
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index b312eb33c43e..0fd00b5ad650 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -78,7 +78,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block);
  *
  * RETURN:      TRUE if the gpe_event is valid
  *
- * DESCRIPTION: Validate a GPE event.  DO NOT CALL FROM INTERRUPT LEVEL.
+ * DESCRIPTION: Validate a GPE event. DO NOT CALL FROM INTERRUPT LEVEL.
  *              Should be called only when the GPE lists are semaphore locked
  *              and not subject to change.
  *
@@ -136,7 +136,7 @@ acpi_status acpi_ev_walk_gpe_list(ACPI_GPE_CALLBACK gpe_walk_callback)
         struct acpi_gpe_block_info *gpe_block;
         struct acpi_gpe_xrupt_info *gpe_xrupt_info;
         acpi_status status = AE_OK;
-        u32 flags;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE("ev_walk_gpe_list");
 
@@ -264,7 +264,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
          * 2) Edge/Level determination is based on the 2nd character
          *    of the method name
          *
-         * NOTE: Default GPE type is RUNTIME.  May be changed later to WAKE
+         * NOTE: Default GPE type is RUNTIME. May be changed later to WAKE
          * if a _PRW object is found that points to this GPE.
          */
         switch (name[1]) {
@@ -279,9 +279,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
         default:
                 /* Unknown method type, just ignore it! */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n",
-                                  name));
+                ACPI_ERROR((AE_INFO,
+                            "Unknown GPE method type: %s (name not of form _Lxx or _Exx)",
+                            name));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -291,9 +291,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
         if (gpe_number == ACPI_UINT32_MAX) {
                 /* Conversion failed; invalid method, just ignore it */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n",
-                                  name));
+                ACPI_ERROR((AE_INFO,
+                            "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",
+                            name));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -313,14 +313,14 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
 
         /*
          * Now we can add this information to the gpe_event_info block
-         * for use during dispatch of this GPE.  Default type is RUNTIME, although
+         * for use during dispatch of this GPE. Default type is RUNTIME, although
          * this may change when the _PRW methods are executed later.
          */
         gpe_event_info =
             &gpe_block->event_info[gpe_number - gpe_block->block_base_number];
 
-        gpe_event_info->flags = (u8) (type | ACPI_GPE_DISPATCH_METHOD |
-                                      ACPI_GPE_TYPE_RUNTIME);
+        gpe_event_info->flags = (u8)
+            (type | ACPI_GPE_DISPATCH_METHOD | ACPI_GPE_TYPE_RUNTIME);
 
         gpe_event_info->dispatch.method_node =
             (struct acpi_namespace_node *)obj_handle;
@@ -341,11 +341,11 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
  *
  * PARAMETERS:  Callback from walk_namespace
  *
- * RETURN:      Status.  NOTE: We ignore errors so that the _PRW walk is
+ * RETURN:      Status. NOTE: We ignore errors so that the _PRW walk is
  *              not aborted on a single _PRW failure.
  *
  * DESCRIPTION: Called from acpi_walk_namespace. Expects each object to be a
- *              Device.  Run the _PRW method.  If present, extract the GPE
+ *              Device. Run the _PRW method. If present, extract the GPE
  *              number and mark the GPE as a WAKE GPE.
  *
  ******************************************************************************/
@@ -443,6 +443,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
 
                 gpe_event_info->flags &=
                     ~(ACPI_GPE_WAKE_ENABLED | ACPI_GPE_RUN_ENABLED);
+
                 status =
                     acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
                 if (ACPI_FAILURE(status)) {
@@ -466,7 +467,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
  *
  * RETURN:      A GPE interrupt block
  *
- * DESCRIPTION: Get or Create a GPE interrupt block.  There is one interrupt
+ * DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
  *              block per unique interrupt level used for GPEs.
  *              Should be called only when the GPE lists are semaphore locked
  *              and not subject to change.
@@ -479,7 +480,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
         struct acpi_gpe_xrupt_info *next_gpe_xrupt;
         struct acpi_gpe_xrupt_info *gpe_xrupt;
         acpi_status status;
-        u32 flags;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE("ev_get_gpe_xrupt_block");
 
@@ -526,9 +527,9 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
                                                            acpi_ev_gpe_xrupt_handler,
                                                            gpe_xrupt);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not install GPE interrupt handler at level 0x%X\n",
-                                          interrupt_number));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not install GPE interrupt handler at level 0x%X",
+                                    interrupt_number));
                         return_PTR(NULL);
                 }
         }
@@ -553,7 +554,7 @@ static acpi_status
 acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
 {
         acpi_status status;
-        u32 flags;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE("ev_delete_gpe_xrupt");
 
@@ -566,8 +567,9 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
 
         /* Disable this interrupt */
 
-        status = acpi_os_remove_interrupt_handler(gpe_xrupt->interrupt_number,
-                                                  acpi_ev_gpe_xrupt_handler);
+        status =
+            acpi_os_remove_interrupt_handler(gpe_xrupt->interrupt_number,
+                                             acpi_ev_gpe_xrupt_handler);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -610,7 +612,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
         struct acpi_gpe_block_info *next_gpe_block;
         struct acpi_gpe_xrupt_info *gpe_xrupt_block;
         acpi_status status;
-        u32 flags;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE("ev_install_gpe_block");
 
@@ -663,7 +665,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
 acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
 {
         acpi_status status;
-        u32 flags;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE("ev_install_gpe_block");
 
@@ -743,22 +745,22 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                                                sizeof(struct
                                                       acpi_gpe_register_info));
         if (!gpe_register_info) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not allocate the gpe_register_info table\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not allocate the gpe_register_info table"));
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
         /*
          * Allocate the GPE event_info block. There are eight distinct GPEs
-         * per register.  Initialization to zeros is sufficient.
+         * per register. Initialization to zeros is sufficient.
          */
         gpe_event_info = ACPI_MEM_CALLOCATE(((acpi_size) gpe_block->
                                              register_count *
                                              ACPI_GPE_REGISTER_WIDTH) *
                                             sizeof(struct acpi_gpe_event_info));
         if (!gpe_event_info) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not allocate the gpe_event_info table\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not allocate the gpe_event_info table"));
                 status = AE_NO_MEMORY;
                 goto error_exit;
         }
@@ -769,9 +771,9 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
         gpe_block->event_info = gpe_event_info;
 
         /*
-         * Initialize the GPE Register and Event structures.  A goal of these
+         * Initialize the GPE Register and Event structures. A goal of these
          * tables is to hide the fact that there are two separate GPE register sets
-         * in a given gpe hardware block, the status registers occupy the first half,
+         * in a given GPE hardware block, the status registers occupy the first half,
          * and the enable registers occupy the second half.
          */
         this_register = gpe_register_info;
@@ -812,11 +814,8 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                         this_event++;
                 }
 
-                /*
-                 * Clear the status/enable registers.  Note that status registers
-                 * are cleared by writing a '1', while enable registers are cleared
-                 * by writing a '0'.
-                 */
+                /* Disable all GPEs within this register */
+
                 status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, 0x00,
                                                  &this_register->
                                                  enable_address);
@@ -824,6 +823,8 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                         goto error_exit;
                 }
 
+                /* Clear any pending GPE events within this register */
+
                 status = acpi_hw_low_level_write(ACPI_GPE_REGISTER_WIDTH, 0xFF,
                                                  &this_register->
                                                  status_address);
@@ -860,7 +861,9 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Create and Install a block of GPE registers
+ * DESCRIPTION: Create and Install a block of GPE registers. All GPEs within
+ *              the block are disabled at exit.
+ *              Note: Assumes namespace is locked.
  *
  ******************************************************************************/
 
@@ -872,14 +875,8 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                          u32 interrupt_number,
                          struct acpi_gpe_block_info **return_gpe_block)
 {
-        struct acpi_gpe_block_info *gpe_block;
-        struct acpi_gpe_event_info *gpe_event_info;
-        acpi_native_uint i;
-        acpi_native_uint j;
-        u32 wake_gpe_count;
-        u32 gpe_enabled_count;
         acpi_status status;
-        struct acpi_gpe_walk_info gpe_info;
+        struct acpi_gpe_block_info *gpe_block;
 
         ACPI_FUNCTION_TRACE("ev_create_gpe_block");
 
@@ -896,22 +893,24 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
 
         /* Initialize the new GPE block */
 
+        gpe_block->node = gpe_device;
         gpe_block->register_count = register_count;
         gpe_block->block_base_number = gpe_block_base_number;
-        gpe_block->node = gpe_device;
 
         ACPI_MEMCPY(&gpe_block->block_address, gpe_block_address,
                     sizeof(struct acpi_generic_address));
 
-        /* Create the register_info and event_info sub-structures */
-
+        /*
+         * Create the register_info and event_info sub-structures
+         * Note: disables and clears all GPEs in the block
+         */
         status = acpi_ev_create_gpe_info_blocks(gpe_block);
         if (ACPI_FAILURE(status)) {
                 ACPI_MEM_FREE(gpe_block);
                 return_ACPI_STATUS(status);
         }
 
-        /* Install the new block in the global list(s) */
+        /* Install the new block in the global lists */
 
         status = acpi_ev_install_gpe_block(gpe_block, interrupt_number);
         if (ACPI_FAILURE(status)) {
@@ -926,16 +925,70 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                                         acpi_ev_save_method_info, gpe_block,
                                         NULL);
 
+        /* Return the new block */
+
+        if (return_gpe_block) {
+                (*return_gpe_block) = gpe_block;
+        }
+
+        ACPI_DEBUG_PRINT((ACPI_DB_INIT,
+                          "GPE %02X to %02X [%4.4s] %u regs on int 0x%X\n",
+                          (u32) gpe_block->block_base_number,
+                          (u32) (gpe_block->block_base_number +
+                                 ((gpe_block->register_count *
+                                   ACPI_GPE_REGISTER_WIDTH) - 1)),
+                          gpe_device->name.ascii, gpe_block->register_count,
+                          interrupt_number));
+
+        return_ACPI_STATUS(AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ev_initialize_gpe_block
+ *
+ * PARAMETERS:  gpe_device          - Handle to the parent GPE block
+ *              gpe_block           - Gpe Block info
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Initialize and enable a GPE block. First find and run any
+ *              _PRT methods associated with the block, then enable the
+ *              appropriate GPEs.
+ *              Note: Assumes namespace is locked.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
+                             struct acpi_gpe_block_info *gpe_block)
+{
+        acpi_status status;
+        struct acpi_gpe_event_info *gpe_event_info;
+        struct acpi_gpe_walk_info gpe_info;
+        u32 wake_gpe_count;
+        u32 gpe_enabled_count;
+        acpi_native_uint i;
+        acpi_native_uint j;
+
+        ACPI_FUNCTION_TRACE("ev_initialize_gpe_block");
+
+        /* Ignore a null GPE block (e.g., if no GPE block 1 exists) */
+
+        if (!gpe_block) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
         /*
-         * Runtime option: Should Wake GPEs be enabled at runtime?  The default
-         * is No, they should only be enabled just as the machine goes to sleep.
+         * Runtime option: Should wake GPEs be enabled at runtime?  The default
+         * is no, they should only be enabled just as the machine goes to sleep.
          */
         if (acpi_gbl_leave_wake_gpes_disabled) {
                 /*
-                 * Differentiate RUNTIME vs WAKE GPEs, via the _PRW control methods.
-                 * (Each GPE that has one or more _PRWs that reference it is by
-                 * definition a WAKE GPE and will not be enabled while the machine
-                 * is running.)
+                 * Differentiate runtime vs wake GPEs, via the _PRW control methods.
+                 * Each GPE that has one or more _PRWs that reference it is by
+                 * definition a wake GPE and will not be enabled while the machine
+                 * is running.
                  */
                 gpe_info.gpe_block = gpe_block;
                 gpe_info.gpe_device = gpe_device;
@@ -948,9 +1001,12 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
         }
 
         /*
-         * Enable all GPEs in this block that are 1) "runtime" or "run/wake" GPEs,
-         * and 2) have a corresponding _Lxx or _Exx method.  All other GPEs must
-         * be enabled via the acpi_enable_gpe() external interface.
+         * Enable all GPEs in this block that have these attributes:
+         * 1) are "runtime" or "run/wake" GPEs, and
+         * 2) have a corresponding _Lxx or _Exx method
+         *
+         * Any other GPEs within this block must be enabled via the acpi_enable_gpe()
+         * external interface.
          */
         wake_gpe_count = 0;
         gpe_enabled_count = 0;
@@ -976,32 +1032,19 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
                 }
         }
 
-        /* Dump info about this GPE block */
-
-        ACPI_DEBUG_PRINT((ACPI_DB_INIT,
-                          "GPE %02X to %02X [%4.4s] %u regs on int 0x%X\n",
-                          (u32) gpe_block->block_base_number,
-                          (u32) (gpe_block->block_base_number +
-                                 ((gpe_block->register_count *
-                                   ACPI_GPE_REGISTER_WIDTH) - 1)),
-                          gpe_device->name.ascii, gpe_block->register_count,
-                          interrupt_number));
-
-        /* Enable all valid GPEs found above */
-
-        status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block);
-
         ACPI_DEBUG_PRINT((ACPI_DB_INIT,
                           "Found %u Wake, Enabled %u Runtime GPEs in this block\n",
                           wake_gpe_count, gpe_enabled_count));
 
-        /* Return the new block */
+        /* Enable all valid runtime GPEs found above */
 
-        if (return_gpe_block) {
-                (*return_gpe_block) = gpe_block;
+        status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block);
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR((AE_INFO, "Could not enable GPEs in gpe_block %p",
+                            gpe_block));
         }
 
-        return_ACPI_STATUS(AE_OK);
+        return_ACPI_STATUS(status);
 }
 
 /*******************************************************************************
@@ -1072,8 +1115,8 @@ acpi_status acpi_ev_gpe_initialize(void)
                                                   &acpi_gbl_gpe_fadt_blocks[0]);
 
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not create GPE Block 0, %s\n",
-                                           acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not create GPE Block 0"));
                 }
         }
 
@@ -1086,7 +1129,12 @@ acpi_status acpi_ev_gpe_initialize(void)
 
                 if ((register_count0) &&
                     (gpe_number_max >= acpi_gbl_FADT->gpe1_base)) {
-                        ACPI_REPORT_ERROR(("GPE0 block (GPE 0 to %d) overlaps the GPE1 block (GPE %d to %d) - Ignoring GPE1\n", gpe_number_max, acpi_gbl_FADT->gpe1_base, acpi_gbl_FADT->gpe1_base + ((register_count1 * ACPI_GPE_REGISTER_WIDTH) - 1)));
+                        ACPI_ERROR((AE_INFO,
+                                    "GPE0 block (GPE 0 to %d) overlaps the GPE1 block (GPE %d to %d) - Ignoring GPE1",
+                                    gpe_number_max, acpi_gbl_FADT->gpe1_base,
+                                    acpi_gbl_FADT->gpe1_base +
+                                    ((register_count1 *
+                                      ACPI_GPE_REGISTER_WIDTH) - 1)));
 
                         /* Ignore GPE1 block by setting the register count to zero */
 
@@ -1104,7 +1152,8 @@ acpi_status acpi_ev_gpe_initialize(void)
                                                      [1]);
 
                         if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_ERROR(("Could not create GPE Block 1, %s\n", acpi_format_exception(status)));
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "Could not create GPE Block 1"));
                         }
 
                         /*
@@ -1130,7 +1179,9 @@ acpi_status acpi_ev_gpe_initialize(void)
         /* Check for Max GPE number out-of-range */
 
         if (gpe_number_max > ACPI_GPE_MAX) {
-                ACPI_REPORT_ERROR(("Maximum GPE number from FADT is too large: 0x%X\n", gpe_number_max));
+                ACPI_ERROR((AE_INFO,
+                            "Maximum GPE number from FADT is too large: 0x%X",
+                            gpe_number_max));
                 status = AE_BAD_VALUE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 7e57b8470f55..0909ba69577e 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -303,7 +303,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context)
                     acpi_os_signal_semaphore(acpi_gbl_global_lock_semaphore,
                                              acpi_gbl_global_lock_thread_count);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not signal Global Lock semaphore\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not signal Global Lock semaphore"));
                 }
         }
 }
@@ -344,7 +345,8 @@ static u32 acpi_ev_global_lock_handler(void *context)
                                                      acpi_ev_global_lock_thread,
                                                      context);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not queue Global Lock thread, %s\n", acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not queue Global Lock thread"));
 
                         return (ACPI_INTERRUPT_NOT_HANDLED);
                 }
@@ -384,7 +386,8 @@ acpi_status acpi_ev_init_global_lock_handler(void)
          * with an error.
          */
         if (status == AE_NO_HARDWARE_RESPONSE) {
-                ACPI_REPORT_ERROR(("No response from Global Lock hardware, disabling lock\n"));
+                ACPI_ERROR((AE_INFO,
+                            "No response from Global Lock hardware, disabling lock"));
 
                 acpi_gbl_global_lock_present = FALSE;
                 status = AE_OK;
@@ -480,7 +483,8 @@ acpi_status acpi_ev_release_global_lock(void)
         ACPI_FUNCTION_TRACE("ev_release_global_lock");
 
         if (!acpi_gbl_global_lock_thread_count) {
-                ACPI_REPORT_WARNING(("Cannot release HW Global Lock, it has not been acquired\n"));
+                ACPI_WARNING((AE_INFO,
+                              "Cannot release HW Global Lock, it has not been acquired"));
                 return_ACPI_STATUS(AE_NOT_ACQUIRED);
         }
 
@@ -542,9 +546,9 @@ void acpi_ev_terminate(void)
                 for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
                         status = acpi_disable_event((u32) i, 0);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Could not disable fixed event %d\n",
-                                                  (u32) i));
+                                ACPI_ERROR((AE_INFO,
+                                            "Could not disable fixed event %d",
+                                            (u32) i));
                         }
                 }
 
@@ -556,8 +560,7 @@ void acpi_ev_terminate(void)
 
                 status = acpi_ev_remove_sci_handler();
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not remove SCI handler\n"));
+                        ACPI_ERROR((AE_INFO, "Could not remove SCI handler"));
                 }
         }
 
@@ -570,8 +573,7 @@ void acpi_ev_terminate(void)
         if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
                 status = acpi_disable();
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                          "acpi_disable failed\n"));
+                        ACPI_WARNING((AE_INFO, "acpi_disable failed"));
                 }
         }
         return_VOID;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 84fad082d80d..6da58e776413 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -295,12 +295,12 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 
         handler_desc = region_obj->region.handler;
         if (!handler_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No handler for Region [%4.4s] (%p) [%s]\n",
-                                  acpi_ut_get_node_name(region_obj->region.
-                                                        node), region_obj,
-                                  acpi_ut_get_region_name(region_obj->region.
-                                                          space_id)));
+                ACPI_ERROR((AE_INFO,
+                            "No handler for Region [%4.4s] (%p) [%s]",
+                            acpi_ut_get_node_name(region_obj->region.node),
+                            region_obj,
+                            acpi_ut_get_region_name(region_obj->region.
+                                                    space_id)));
 
                 return_ACPI_STATUS(AE_NOT_EXIST);
         }
@@ -317,12 +317,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 if (!region_setup) {
                         /* No initialization routine, exit with error */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "No init routine for region(%p) [%s]\n",
-                                          region_obj,
-                                          acpi_ut_get_region_name(region_obj->
-                                                                  region.
-                                                                  space_id)));
+                        ACPI_ERROR((AE_INFO,
+                                    "No init routine for region(%p) [%s]",
+                                    region_obj,
+                                    acpi_ut_get_region_name(region_obj->region.
+                                                            space_id)));
                         return_ACPI_STATUS(AE_NOT_EXIST);
                 }
 
@@ -347,12 +346,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 /* Check for failure of the Region Setup */
 
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Region Init: %s [%s]\n",
-                                          acpi_format_exception(status),
-                                          acpi_ut_get_region_name(region_obj->
-                                                                  region.
-                                                                  space_id)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "During region initialization: [%s]",
+                                        acpi_ut_get_region_name(region_obj->
+                                                                region.
+                                                                space_id)));
                         return_ACPI_STATUS(status);
                 }
 
@@ -406,10 +404,9 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                          region_obj2->extra.region_context);
 
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Handler for [%s] returned %s\n",
-                                   acpi_ut_get_region_name(region_obj->region.
-                                                           space_id),
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Returned by Handler for [%s]",
+                                acpi_ut_get_region_name(region_obj->region.
+                                                        space_id)));
         }
 
         if (!
@@ -501,12 +498,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
 
                         status = acpi_ev_execute_reg_method(region_obj, 0);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "%s from region _REG, [%s]\n",
-                                                  acpi_format_exception(status),
-                                                  acpi_ut_get_region_name
-                                                  (region_obj->region.
-                                                   space_id)));
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "from region _REG, [%s]",
+                                                acpi_ut_get_region_name
+                                                (region_obj->region.space_id)));
                         }
 
                         if (acpi_ns_is_locked) {
@@ -528,12 +523,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
                         /* Init routine may fail, Just ignore errors */
 
                         if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "%s from region init, [%s]\n",
-                                                  acpi_format_exception(status),
-                                                  acpi_ut_get_region_name
-                                                  (region_obj->region.
-                                                   space_id)));
+                                ACPI_EXCEPTION((AE_INFO, status,
+                                                "from region init, [%s]",
+                                                acpi_ut_get_region_name
+                                                (region_obj->region.space_id)));
                         }
 
                         region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index a1bd2da27c45..baed8c1a1b9f 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -233,7 +233,11 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                                          */
                                                         status = AE_OK;
                                                 } else {
-                                                        ACPI_REPORT_ERROR(("Could not install pci_config handler for Root Bridge %4.4s, %s\n", acpi_ut_get_node_name(pci_root_node), acpi_format_exception(status)));
+                                                        ACPI_EXCEPTION((AE_INFO,
+                                                                        status,
+                                                                        "Could not install pci_config handler for Root Bridge %4.4s",
+                                                                        acpi_ut_get_node_name
+                                                                        (pci_root_node)));
                                                 }
                                         }
                                         break;
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index 141835977002..9a622169008a 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
          */
         interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
 
-        return_VALUE(interrupt_handled);
+        return_UINT32(interrupt_handled);
 }
 
 /*******************************************************************************
@@ -121,7 +121,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
          */
         interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
 
-        return_VALUE(interrupt_handled);
+        return_UINT32(interrupt_handled);
 }
 
 /******************************************************************************
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 43b33d19cdf9..b38b39dde543 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -143,8 +143,8 @@ acpi_install_fixed_event_handler(u32 event,
         if (ACPI_SUCCESS(status))
                 status = acpi_enable_event(event, 0);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "Could not enable fixed event.\n"));
+                ACPI_WARNING((AE_INFO, "Could not enable fixed event %X",
+                              event));
 
                 /* Remove the handler */
 
@@ -204,10 +204,11 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
         acpi_gbl_fixed_event_handlers[event].context = NULL;
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "Could not write to fixed event enable register.\n"));
+                ACPI_WARNING((AE_INFO,
+                              "Could not write to fixed event enable register %X",
+                              event));
         } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X.\n",
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
                                   event));
         }
 
@@ -434,7 +435,7 @@ acpi_remove_notify_handler(acpi_handle device,
 
         if (device == ACPI_ROOT_OBJECT) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Removing notify handler for ROOT object.\n"));
+                                  "Removing notify handler for namespace root object\n"));
 
                 if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
                      !acpi_gbl_system_notify.handler) ||
@@ -562,7 +563,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
         struct acpi_gpe_event_info *gpe_event_info;
         struct acpi_handler_info *handler;
         acpi_status status;
-        u32 flags;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE("acpi_install_gpe_handler");
 
@@ -653,7 +654,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
         struct acpi_gpe_event_info *gpe_event_info;
         struct acpi_handler_info *handler;
         acpi_status status;
-        u32 flags;
+        acpi_cpu_flags flags;
 
         ACPI_FUNCTION_TRACE("acpi_remove_gpe_handler");
 
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 887ff9f28a0d..ec9ce8429f15 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,8 +70,7 @@ acpi_status acpi_enable(void)
         /* Make sure we have the FADT */
 
         if (!acpi_gbl_FADT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "No FADT information present!\n"));
+                ACPI_WARNING((AE_INFO, "No FADT information present!"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
@@ -83,7 +82,8 @@ acpi_status acpi_enable(void)
 
                 status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not transition to ACPI mode.\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not transition to ACPI mode"));
                         return_ACPI_STATUS(status);
                 }
 
@@ -113,8 +113,7 @@ acpi_status acpi_disable(void)
         ACPI_FUNCTION_TRACE("acpi_disable");
 
         if (!acpi_gbl_FADT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "No FADT information present!\n"));
+                ACPI_WARNING((AE_INFO, "No FADT information present!"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
@@ -127,8 +126,8 @@ acpi_status acpi_disable(void)
                 status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY);
 
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not exit ACPI mode to legacy mode"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not exit ACPI mode to legacy mode"));
                         return_ACPI_STATUS(status);
                 }
 
@@ -185,9 +184,9 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
         }
 
         if (value != 1) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not enable %s event\n",
-                                  acpi_ut_get_event_name(event)));
+                ACPI_ERROR((AE_INFO,
+                            "Could not enable %s event",
+                            acpi_ut_get_event_name(event)));
                 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
         }
 
@@ -384,9 +383,9 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
         }
 
         if (value != 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not disable %s events\n",
-                                  acpi_ut_get_event_name(event)));
+                ACPI_ERROR((AE_INFO,
+                            "Could not disable %s events",
+                            acpi_ut_get_event_name(event)));
                 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
         }
 
@@ -626,6 +625,13 @@ acpi_install_gpe_block(acpi_handle gpe_device,
                 goto unlock_and_exit;
         }
 
+        /* Run the _PRW methods and enable the GPEs */
+
+        status = acpi_ev_initialize_gpe_block(node, gpe_block);
+        if (ACPI_FAILURE(status)) {
+                goto unlock_and_exit;
+        }
+
         /* Get the device_object attached to the node */
 
         obj_desc = acpi_ns_get_attached_object(node);
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 6f28ea2db5ba..abf5caca9ae5 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 1ce365d651d8..a29782fe3ecf 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -413,9 +413,9 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
             (!ACPI_STRNCMP(table_ptr->signature,
                            acpi_gbl_table_data[ACPI_TABLE_SSDT].signature,
                            acpi_gbl_table_data[ACPI_TABLE_SSDT].sig_length))) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Table has invalid signature [%4.4s], must be SSDT or PSDT\n",
-                                  table_ptr->signature));
+                ACPI_ERROR((AE_INFO,
+                            "Table has invalid signature [%4.4s], must be SSDT or PSDT",
+                            table_ptr->signature));
                 status = AE_BAD_SIGNATURE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c
index 04e5194989a6..e6d52e12d77a 100644
--- a/drivers/acpi/executer/exconvrt.c
+++ b/drivers/acpi/executer/exconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -504,18 +504,12 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 }
 
                 /*
-                 * Perform the conversion.
+                 * Create a new string object and string buffer
                  * (-1 because of extra separator included in string_length from above)
                  */
-                string_length--;
-                if (string_length > ACPI_MAX_STRING_CONVERSION) {       /* ACPI limit */
-                        return_ACPI_STATUS(AE_AML_STRING_LIMIT);
-                }
-
-                /* Create a new string object and string buffer */
-
                 return_desc =
-                    acpi_ut_create_string_object((acpi_size) string_length);
+                    acpi_ut_create_string_object((acpi_size)
+                                                 (string_length - 1));
                 if (!return_desc) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
@@ -647,7 +641,9 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                         break;
 
                 default:
-                        ACPI_REPORT_ERROR(("Bad destination type during conversion: %X\n", destination_type));
+                        ACPI_ERROR((AE_INFO,
+                                    "Bad destination type during conversion: %X",
+                                    destination_type));
                         status = AE_AML_INTERNAL;
                         break;
                 }
@@ -660,17 +656,13 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown Target type ID 0x%X Op %s dest_type %s\n",
-                                  GET_CURRENT_ARG_TYPE(walk_state->op_info->
-                                                       runtime_args),
-                                  walk_state->op_info->name,
-                                  acpi_ut_get_type_name(destination_type)));
-
-                ACPI_REPORT_ERROR(("Bad Target Type (ARGI): %X\n",
-                                   GET_CURRENT_ARG_TYPE(walk_state->op_info->
-                                                        runtime_args)))
-                    status = AE_AML_INTERNAL;
+                ACPI_ERROR((AE_INFO,
+                            "Unknown Target type ID 0x%X aml_opcode %X dest_type %s",
+                            GET_CURRENT_ARG_TYPE(walk_state->op_info->
+                                                 runtime_args),
+                            walk_state->opcode,
+                            acpi_ut_get_type_name(destination_type)));
+                status = AE_AML_INTERNAL;
         }
 
         /*
diff --git a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c
index 91c49188fb07..680575402835 100644
--- a/drivers/acpi/executer/excreate.c
+++ b/drivers/acpi/executer/excreate.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -300,8 +300,8 @@ acpi_ex_create_region(u8 * aml_start,
          */
         if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) &&
             (region_space < ACPI_USER_REGION_BEGIN)) {
-                ACPI_REPORT_ERROR(("Invalid address_space type %X\n",
-                                   region_space));
+                ACPI_ERROR((AE_INFO, "Invalid address_space type %X",
+                            region_space));
                 return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID);
         }
 
diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index bc2fa996047e..a7cca8d4f855 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,20 +55,386 @@ ACPI_MODULE_NAME("exdump")
  */
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 /* Local prototypes */
-#ifdef ACPI_FUTURE_USAGE
 static void acpi_ex_out_string(char *title, char *value);
 
 static void acpi_ex_out_pointer(char *title, void *value);
 
-static void acpi_ex_out_integer(char *title, u32 value);
-
 static void acpi_ex_out_address(char *title, acpi_physical_address value);
 
-static void acpi_ex_dump_reference(union acpi_operand_object *obj_desc);
+static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc);
 
 static void
-acpi_ex_dump_package(union acpi_operand_object *obj_desc, u32 level, u32 index);
-#endif                          /* ACPI_FUTURE_USAGE */
+acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
+                         u32 level, u32 index);
+
+/*******************************************************************************
+ *
+ * Object Descriptor info tables
+ *
+ * Note: The first table entry must be an INIT opcode and must contain
+ * the table length (number of table entries)
+ *
+ ******************************************************************************/
+
+static struct acpi_exdump_info acpi_ex_dump_integer[2] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_integer), NULL},
+        {ACPI_EXD_UINT64, ACPI_EXD_OFFSET(integer.value), "Value"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_string[4] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_string), NULL},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(string.length), "Length"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(string.pointer), "Pointer"},
+        {ACPI_EXD_STRING, 0, NULL}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_buffer[4] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_buffer), NULL},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(buffer.length), "Length"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer.pointer), "Pointer"},
+        {ACPI_EXD_BUFFER, 0, NULL}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_package[5] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_package), NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(package.flags), "Flags"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(package.count), "Elements"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(package.elements), "Element List"},
+        {ACPI_EXD_PACKAGE, 0, NULL}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_device[4] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_device), NULL},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.handler), "Handler"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.system_notify),
+         "System Notify"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(device.device_notify),
+         "Device Notify"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_event[2] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_event), NULL},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(event.semaphore), "Semaphore"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_method[8] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_method), NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.param_count), "param_count"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.concurrency), "Concurrency"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.semaphore), "Semaphore"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.owner_id), "Owner Id"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(method.thread_count), "Thread Count"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(method.aml_length), "Aml Length"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(method.aml_start), "Aml Start"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_mutex[5] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_mutex), NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(mutex.sync_level), "Sync Level"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.owner_thread), "Owner Thread"},
+        {ACPI_EXD_UINT16, ACPI_EXD_OFFSET(mutex.acquisition_depth),
+         "Acquire Depth"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.semaphore), "Semaphore"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_region[7] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_region), NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(region.space_id), "Space Id"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(region.flags), "Flags"},
+        {ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(region.address), "Address"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(region.length), "Length"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(region.handler), "Handler"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(region.next), "Next"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_power[5] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_power), NULL},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(power_resource.system_level),
+         "System Level"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(power_resource.resource_order),
+         "Resource Order"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.system_notify),
+         "System Notify"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(power_resource.device_notify),
+         "Device Notify"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_processor[7] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_processor), NULL},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.proc_id), "Processor ID"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(processor.length), "Length"},
+        {ACPI_EXD_ADDRESS, ACPI_EXD_OFFSET(processor.address), "Address"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.system_notify),
+         "System Notify"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.device_notify),
+         "Device Notify"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(processor.handler), "Handler"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_thermal[4] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_thermal), NULL},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.system_notify),
+         "System Notify"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.device_notify),
+         "Device Notify"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(thermal_zone.handler), "Handler"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_buffer_field[3] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_buffer_field), NULL},
+        {ACPI_EXD_FIELD, 0, NULL},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(buffer_field.buffer_obj),
+         "Buffer Object"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_region_field[3] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_region_field), NULL},
+        {ACPI_EXD_FIELD, 0, NULL},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_bank_field[5] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_bank_field), NULL},
+        {ACPI_EXD_FIELD, 0, NULL},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(bank_field.value), "Value"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(bank_field.region_obj),
+         "Region Object"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(bank_field.bank_obj), "Bank Object"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_index_field[5] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_bank_field), NULL},
+        {ACPI_EXD_FIELD, 0, NULL},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(index_field.value), "Value"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(index_field.index_obj),
+         "Index Object"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(index_field.data_obj), "Data Object"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_reference[7] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_reference), NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(reference.target_type), "Target Type"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(reference.offset), "Offset"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.object), "Object Desc"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.node), "Node"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(reference.where), "Where"},
+        {ACPI_EXD_REFERENCE, 0, NULL}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_address_handler[6] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_address_handler),
+         NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(address_space.space_id), "Space Id"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(address_space.next), "Next"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(address_space.region_list),
+         "Region List"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(address_space.node), "Node"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(address_space.context), "Context"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_notify[3] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_notify), NULL},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.node), "Node"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(notify.context), "Context"}
+};
+
+/* Miscellaneous tables */
+
+static struct acpi_exdump_info acpi_ex_dump_common[4] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_common), NULL},
+        {ACPI_EXD_TYPE, 0, NULL},
+        {ACPI_EXD_UINT16, ACPI_EXD_OFFSET(common.reference_count),
+         "Reference Count"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(common.flags), "Flags"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_field_common[7] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_field_common), NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(common_field.field_flags),
+         "Field Flags"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(common_field.access_byte_width),
+         "Access Byte Width"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(common_field.bit_length),
+         "Bit Length"},
+        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(common_field.start_field_bit_offset),
+         "Field Bit Offset"},
+        {ACPI_EXD_UINT32, ACPI_EXD_OFFSET(common_field.base_byte_offset),
+         "Base Byte Offset"},
+        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(common_field.node), "Parent Node"}
+};
+
+static struct acpi_exdump_info acpi_ex_dump_node[6] = {
+        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_node), NULL},
+        {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET(flags), "Flags"},
+        {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET(owner_id), "Owner Id"},
+        {ACPI_EXD_UINT16, ACPI_EXD_NSOFFSET(reference_count),
+         "Reference Count"},
+        {ACPI_EXD_POINTER, ACPI_EXD_NSOFFSET(child), "Child List"},
+        {ACPI_EXD_POINTER, ACPI_EXD_NSOFFSET(peer), "Next Peer"}
+};
+
+/* Dispatch table, indexed by object type */
+
+static struct acpi_exdump_info *acpi_ex_dump_info[] = {
+        NULL,
+        acpi_ex_dump_integer,
+        acpi_ex_dump_string,
+        acpi_ex_dump_buffer,
+        acpi_ex_dump_package,
+        NULL,
+        acpi_ex_dump_device,
+        acpi_ex_dump_event,
+        acpi_ex_dump_method,
+        acpi_ex_dump_mutex,
+        acpi_ex_dump_region,
+        acpi_ex_dump_power,
+        acpi_ex_dump_processor,
+        acpi_ex_dump_thermal,
+        acpi_ex_dump_buffer_field,
+        NULL,
+        NULL,
+        acpi_ex_dump_region_field,
+        acpi_ex_dump_bank_field,
+        acpi_ex_dump_index_field,
+        acpi_ex_dump_reference,
+        NULL,
+        NULL,
+        acpi_ex_dump_notify,
+        acpi_ex_dump_address_handler,
+        NULL,
+        NULL,
+        NULL
+};
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_dump_object
+ *
+ * PARAMETERS:  obj_desc            - Descriptor to dump
+ *              Info                - Info table corresponding to this object
+ *                                    type
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Walk the info table for this object
+ *
+ ******************************************************************************/
+
+static void
+acpi_ex_dump_object(union acpi_operand_object *obj_desc,
+                    struct acpi_exdump_info *info)
+{
+        u8 *target;
+        char *name;
+        u8 count;
+
+        if (!info) {
+                acpi_os_printf
+                    ("ex_dump_object: Display not implemented for object type %s\n",
+                     acpi_ut_get_object_type_name(obj_desc));
+                return;
+        }
+
+        /* First table entry must contain the table length (# of table entries) */
+
+        count = info->offset;
+
+        while (count) {
+                target = ACPI_ADD_PTR(u8, obj_desc, info->offset);
+                name = info->name;
+
+                switch (info->opcode) {
+                case ACPI_EXD_INIT:
+                        break;
+
+                case ACPI_EXD_TYPE:
+                        acpi_ex_out_string("Type",
+                                           acpi_ut_get_object_type_name
+                                           (obj_desc));
+                        break;
+
+                case ACPI_EXD_UINT8:
+
+                        acpi_os_printf("%20s : %2.2X\n", name, *target);
+                        break;
+
+                case ACPI_EXD_UINT16:
+
+                        acpi_os_printf("%20s : %4.4X\n", name,
+                                       ACPI_GET16(target));
+                        break;
+
+                case ACPI_EXD_UINT32:
+
+                        acpi_os_printf("%20s : %8.8X\n", name,
+                                       ACPI_GET32(target));
+                        break;
+
+                case ACPI_EXD_UINT64:
+
+                        acpi_os_printf("%20s : %8.8X%8.8X\n", "Value",
+                                       ACPI_FORMAT_UINT64(ACPI_GET64(target)));
+                        break;
+
+                case ACPI_EXD_POINTER:
+
+                        acpi_ex_out_pointer(name,
+                                            *ACPI_CAST_PTR(void *, target));
+                        break;
+
+                case ACPI_EXD_ADDRESS:
+
+                        acpi_ex_out_address(name,
+                                            *ACPI_CAST_PTR
+                                            (acpi_physical_address, target));
+                        break;
+
+                case ACPI_EXD_STRING:
+
+                        acpi_ut_print_string(obj_desc->string.pointer,
+                                             ACPI_UINT8_MAX);
+                        acpi_os_printf("\n");
+                        break;
+
+                case ACPI_EXD_BUFFER:
+
+                        ACPI_DUMP_BUFFER(obj_desc->buffer.pointer,
+                                         obj_desc->buffer.length);
+                        break;
+
+                case ACPI_EXD_PACKAGE:
+
+                        /* Dump the package contents */
+
+                        acpi_os_printf("\nPackage Contents:\n");
+                        acpi_ex_dump_package_obj(obj_desc, 0, 0);
+                        break;
+
+                case ACPI_EXD_FIELD:
+
+                        acpi_ex_dump_object(obj_desc,
+                                            acpi_ex_dump_field_common);
+                        break;
+
+                case ACPI_EXD_REFERENCE:
+
+                        acpi_ex_out_string("Opcode",
+                                           (acpi_ps_get_opcode_info
+                                            (obj_desc->reference.opcode))->
+                                           name);
+                        acpi_ex_dump_reference_obj(obj_desc);
+                        break;
+
+                default:
+                        acpi_os_printf("**** Invalid table opcode [%X] ****\n",
+                                       info->opcode);
+                        return;
+                }
+
+                info++;
+                count--;
+        }
+}
 
 /*******************************************************************************
  *
@@ -214,7 +580,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
         case ACPI_TYPE_BUFFER:
 
-                acpi_os_printf("Buffer len %X @ %p \n",
+                acpi_os_printf("Buffer len %X @ %p\n",
                                obj_desc->buffer.length,
                                obj_desc->buffer.pointer);
 
@@ -320,17 +686,17 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
         case ACPI_TYPE_BUFFER_FIELD:
 
-                acpi_os_printf("buffer_field: %X bits at byte %X bit %X of \n",
+                acpi_os_printf("buffer_field: %X bits at byte %X bit %X of\n",
                                obj_desc->buffer_field.bit_length,
                                obj_desc->buffer_field.base_byte_offset,
                                obj_desc->buffer_field.start_field_bit_offset);
 
                 if (!obj_desc->buffer_field.buffer_obj) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "*NULL* \n"));
+                        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "*NULL*\n"));
                 } else
                     if (ACPI_GET_OBJECT_TYPE(obj_desc->buffer_field.buffer_obj)
                         != ACPI_TYPE_BUFFER) {
-                        acpi_os_printf("*not a Buffer* \n");
+                        acpi_os_printf("*not a Buffer*\n");
                 } else {
                         acpi_ex_dump_operand(obj_desc->buffer_field.buffer_obj,
                                              depth + 1);
@@ -441,7 +807,6 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,
         return;
 }
 
-#ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_out* functions
@@ -465,11 +830,6 @@ static void acpi_ex_out_pointer(char *title, void *value)
         acpi_os_printf("%20s : %p\n", title, value);
 }
 
-static void acpi_ex_out_integer(char *title, u32 value)
-{
-        acpi_os_printf("%20s : %.2X\n", title, value);
-}
-
 static void acpi_ex_out_address(char *title, acpi_physical_address value)
 {
 
@@ -482,16 +842,16 @@ static void acpi_ex_out_address(char *title, acpi_physical_address value)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_dump_node
+ * FUNCTION:    acpi_ex_dump_namespace_node
  *
- * PARAMETERS:  *Node               - Descriptor to dump
+ * PARAMETERS:  Node                - Descriptor to dump
  *              Flags               - Force display if TRUE
  *
  * DESCRIPTION: Dumps the members of the given.Node
  *
  ******************************************************************************/
 
-void acpi_ex_dump_node(struct acpi_namespace_node *node, u32 flags)
+void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
 {
 
         ACPI_FUNCTION_ENTRY();
@@ -506,19 +866,17 @@ void acpi_ex_dump_node(struct acpi_namespace_node *node, u32 flags)
 
         acpi_os_printf("%20s : %4.4s\n", "Name", acpi_ut_get_node_name(node));
         acpi_ex_out_string("Type", acpi_ut_get_type_name(node->type));
-        acpi_ex_out_integer("Flags", node->flags);
-        acpi_ex_out_integer("Owner Id", node->owner_id);
-        acpi_ex_out_integer("Reference Count", node->reference_count);
         acpi_ex_out_pointer("Attached Object",
                             acpi_ns_get_attached_object(node));
-        acpi_ex_out_pointer("child_list", node->child);
-        acpi_ex_out_pointer("next_peer", node->peer);
         acpi_ex_out_pointer("Parent", acpi_ns_get_parent_node(node));
+
+        acpi_ex_dump_object(ACPI_CAST_PTR(union acpi_operand_object, node),
+                            acpi_ex_dump_node);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_dump_reference
+ * FUNCTION:    acpi_ex_dump_reference_obj
  *
  * PARAMETERS:  Object              - Descriptor to dump
  *
@@ -526,14 +884,16 @@ void acpi_ex_dump_node(struct acpi_namespace_node *node, u32 flags)
  *
  ******************************************************************************/
 
-static void acpi_ex_dump_reference(union acpi_operand_object *obj_desc)
+static void acpi_ex_dump_reference_obj(union acpi_operand_object *obj_desc)
 {
         struct acpi_buffer ret_buf;
         acpi_status status;
 
+        ret_buf.length = ACPI_ALLOCATE_LOCAL_BUFFER;
+
         if (obj_desc->reference.opcode == AML_INT_NAMEPATH_OP) {
                 acpi_os_printf("Named Object %p ", obj_desc->reference.node);
-                ret_buf.length = ACPI_ALLOCATE_LOCAL_BUFFER;
+
                 status =
                     acpi_ns_handle_to_pathname(obj_desc->reference.node,
                                                &ret_buf);
@@ -551,9 +911,9 @@ static void acpi_ex_dump_reference(union acpi_operand_object *obj_desc)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_dump_package
+ * FUNCTION:    acpi_ex_dump_package_obj
  *
- * PARAMETERS:  Object              - Descriptor to dump
+ * PARAMETERS:  obj_desc            - Descriptor to dump
  *              Level               - Indentation Level
  *              Index               - Package index for this object
  *
@@ -562,7 +922,8 @@ static void acpi_ex_dump_reference(union acpi_operand_object *obj_desc)
  ******************************************************************************/
 
 static void
-acpi_ex_dump_package(union acpi_operand_object *obj_desc, u32 level, u32 index)
+acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
+                         u32 level, u32 index)
 {
         u32 i;
 
@@ -608,7 +969,8 @@ acpi_ex_dump_package(union acpi_operand_object *obj_desc, u32 level, u32 index)
                 acpi_os_printf("[Buffer] Length %.2X = ",
                                obj_desc->buffer.length);
                 if (obj_desc->buffer.length) {
-                        acpi_ut_dump_buffer((u8 *) obj_desc->buffer.pointer,
+                        acpi_ut_dump_buffer(ACPI_CAST_PTR
+                                            (u8, obj_desc->buffer.pointer),
                                             obj_desc->buffer.length,
                                             DB_DWORD_DISPLAY, _COMPONENT);
                 } else {
@@ -618,19 +980,19 @@ acpi_ex_dump_package(union acpi_operand_object *obj_desc, u32 level, u32 index)
 
         case ACPI_TYPE_PACKAGE:
 
-                acpi_os_printf("[Package] Contains %d Elements: \n",
+                acpi_os_printf("[Package] Contains %d Elements:\n",
                                obj_desc->package.count);
 
                 for (i = 0; i < obj_desc->package.count; i++) {
-                        acpi_ex_dump_package(obj_desc->package.elements[i],
-                                             level + 1, i);
+                        acpi_ex_dump_package_obj(obj_desc->package.elements[i],
+                                                 level + 1, i);
                 }
                 break;
 
         case ACPI_TYPE_LOCAL_REFERENCE:
 
                 acpi_os_printf("[Object Reference] ");
-                acpi_ex_dump_reference(obj_desc);
+                acpi_ex_dump_reference_obj(obj_desc);
                 break;
 
         default:
@@ -645,7 +1007,7 @@ acpi_ex_dump_package(union acpi_operand_object *obj_desc, u32 level, u32 index)
  *
  * FUNCTION:    acpi_ex_dump_object_descriptor
  *
- * PARAMETERS:  Object              - Descriptor to dump
+ * PARAMETERS:  obj_desc            - Descriptor to dump
  *              Flags               - Force display if TRUE
  *
  * DESCRIPTION: Dumps the members of the object descriptor given.
@@ -670,11 +1032,13 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) == ACPI_DESC_TYPE_NAMED) {
-                acpi_ex_dump_node((struct acpi_namespace_node *)obj_desc,
-                                  flags);
+                acpi_ex_dump_namespace_node((struct acpi_namespace_node *)
+                                            obj_desc, flags);
+
                 acpi_os_printf("\nAttached Object (%p):\n",
                                ((struct acpi_namespace_node *)obj_desc)->
                                object);
+
                 acpi_ex_dump_object_descriptor(((struct acpi_namespace_node *)
                                                 obj_desc)->object, flags);
                 return_VOID;
@@ -687,233 +1051,18 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
                 return_VOID;
         }
 
-        /* Common Fields */
-
-        acpi_ex_out_string("Type", acpi_ut_get_object_type_name(obj_desc));
-        acpi_ex_out_integer("Reference Count",
-                            obj_desc->common.reference_count);
-        acpi_ex_out_integer("Flags", obj_desc->common.flags);
-
-        /* Object-specific Fields */
-
-        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
-        case ACPI_TYPE_INTEGER:
-
-                acpi_os_printf("%20s : %8.8X%8.8X\n", "Value",
-                               ACPI_FORMAT_UINT64(obj_desc->integer.value));
-                break;
-
-        case ACPI_TYPE_STRING:
-
-                acpi_ex_out_integer("Length", obj_desc->string.length);
-
-                acpi_os_printf("%20s : %p ", "Pointer",
-                               obj_desc->string.pointer);
-                acpi_ut_print_string(obj_desc->string.pointer, ACPI_UINT8_MAX);
-                acpi_os_printf("\n");
-                break;
-
-        case ACPI_TYPE_BUFFER:
-
-                acpi_ex_out_integer("Length", obj_desc->buffer.length);
-                acpi_ex_out_pointer("Pointer", obj_desc->buffer.pointer);
-                ACPI_DUMP_BUFFER(obj_desc->buffer.pointer,
-                                 obj_desc->buffer.length);
-                break;
-
-        case ACPI_TYPE_PACKAGE:
-
-                acpi_ex_out_integer("Flags", obj_desc->package.flags);
-                acpi_ex_out_integer("Elements", obj_desc->package.count);
-                acpi_ex_out_pointer("Element List", obj_desc->package.elements);
-
-                /* Dump the package contents */
-
-                acpi_os_printf("\nPackage Contents:\n");
-                acpi_ex_dump_package(obj_desc, 0, 0);
-                break;
-
-        case ACPI_TYPE_DEVICE:
-
-                acpi_ex_out_pointer("Handler", obj_desc->device.handler);
-                acpi_ex_out_pointer("system_notify",
-                                    obj_desc->device.system_notify);
-                acpi_ex_out_pointer("device_notify",
-                                    obj_desc->device.device_notify);
-                break;
-
-        case ACPI_TYPE_EVENT:
-
-                acpi_ex_out_pointer("Semaphore", obj_desc->event.semaphore);
-                break;
-
-        case ACPI_TYPE_METHOD:
-
-                acpi_ex_out_integer("param_count",
-                                    obj_desc->method.param_count);
-                acpi_ex_out_integer("Concurrency",
-                                    obj_desc->method.concurrency);
-                acpi_ex_out_pointer("Semaphore", obj_desc->method.semaphore);
-                acpi_ex_out_integer("owner_id", obj_desc->method.owner_id);
-                acpi_ex_out_integer("aml_length", obj_desc->method.aml_length);
-                acpi_ex_out_pointer("aml_start", obj_desc->method.aml_start);
-                break;
-
-        case ACPI_TYPE_MUTEX:
-
-                acpi_ex_out_integer("sync_level", obj_desc->mutex.sync_level);
-                acpi_ex_out_pointer("owner_thread",
-                                    obj_desc->mutex.owner_thread);
-                acpi_ex_out_integer("acquire_depth",
-                                    obj_desc->mutex.acquisition_depth);
-                acpi_ex_out_pointer("Semaphore", obj_desc->mutex.semaphore);
-                break;
-
-        case ACPI_TYPE_REGION:
-
-                acpi_ex_out_integer("space_id", obj_desc->region.space_id);
-                acpi_ex_out_integer("Flags", obj_desc->region.flags);
-                acpi_ex_out_address("Address", obj_desc->region.address);
-                acpi_ex_out_integer("Length", obj_desc->region.length);
-                acpi_ex_out_pointer("Handler", obj_desc->region.handler);
-                acpi_ex_out_pointer("Next", obj_desc->region.next);
-                break;
-
-        case ACPI_TYPE_POWER:
-
-                acpi_ex_out_integer("system_level",
-                                    obj_desc->power_resource.system_level);
-                acpi_ex_out_integer("resource_order",
-                                    obj_desc->power_resource.resource_order);
-                acpi_ex_out_pointer("system_notify",
-                                    obj_desc->power_resource.system_notify);
-                acpi_ex_out_pointer("device_notify",
-                                    obj_desc->power_resource.device_notify);
-                break;
-
-        case ACPI_TYPE_PROCESSOR:
-
-                acpi_ex_out_integer("Processor ID",
-                                    obj_desc->processor.proc_id);
-                acpi_ex_out_integer("Length", obj_desc->processor.length);
-                acpi_ex_out_address("Address",
-                                    (acpi_physical_address) obj_desc->processor.
-                                    address);
-                acpi_ex_out_pointer("system_notify",
-                                    obj_desc->processor.system_notify);
-                acpi_ex_out_pointer("device_notify",
-                                    obj_desc->processor.device_notify);
-                acpi_ex_out_pointer("Handler", obj_desc->processor.handler);
-                break;
-
-        case ACPI_TYPE_THERMAL:
-
-                acpi_ex_out_pointer("system_notify",
-                                    obj_desc->thermal_zone.system_notify);
-                acpi_ex_out_pointer("device_notify",
-                                    obj_desc->thermal_zone.device_notify);
-                acpi_ex_out_pointer("Handler", obj_desc->thermal_zone.handler);
-                break;
-
-        case ACPI_TYPE_BUFFER_FIELD:
-        case ACPI_TYPE_LOCAL_REGION_FIELD:
-        case ACPI_TYPE_LOCAL_BANK_FIELD:
-        case ACPI_TYPE_LOCAL_INDEX_FIELD:
-
-                acpi_ex_out_integer("field_flags",
-                                    obj_desc->common_field.field_flags);
-                acpi_ex_out_integer("access_byte_width",
-                                    obj_desc->common_field.access_byte_width);
-                acpi_ex_out_integer("bit_length",
-                                    obj_desc->common_field.bit_length);
-                acpi_ex_out_integer("fld_bit_offset",
-                                    obj_desc->common_field.
-                                    start_field_bit_offset);
-                acpi_ex_out_integer("base_byte_offset",
-                                    obj_desc->common_field.base_byte_offset);
-                acpi_ex_out_pointer("parent_node", obj_desc->common_field.node);
-
-                switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
-                case ACPI_TYPE_BUFFER_FIELD:
-                        acpi_ex_out_pointer("buffer_obj",
-                                            obj_desc->buffer_field.buffer_obj);
-                        break;
-
-                case ACPI_TYPE_LOCAL_REGION_FIELD:
-                        acpi_ex_out_pointer("region_obj",
-                                            obj_desc->field.region_obj);
-                        break;
-
-                case ACPI_TYPE_LOCAL_BANK_FIELD:
-                        acpi_ex_out_integer("Value",
-                                            obj_desc->bank_field.value);
-                        acpi_ex_out_pointer("region_obj",
-                                            obj_desc->bank_field.region_obj);
-                        acpi_ex_out_pointer("bank_obj",
-                                            obj_desc->bank_field.bank_obj);
-                        break;
-
-                case ACPI_TYPE_LOCAL_INDEX_FIELD:
-                        acpi_ex_out_integer("Value",
-                                            obj_desc->index_field.value);
-                        acpi_ex_out_pointer("Index",
-                                            obj_desc->index_field.index_obj);
-                        acpi_ex_out_pointer("Data",
-                                            obj_desc->index_field.data_obj);
-                        break;
-
-                default:
-                        /* All object types covered above */
-                        break;
-                }
-                break;
-
-        case ACPI_TYPE_LOCAL_REFERENCE:
-
-                acpi_ex_out_integer("target_type",
-                                    obj_desc->reference.target_type);
-                acpi_ex_out_string("Opcode",
-                                   (acpi_ps_get_opcode_info
-                                    (obj_desc->reference.opcode))->name);
-                acpi_ex_out_integer("Offset", obj_desc->reference.offset);
-                acpi_ex_out_pointer("obj_desc", obj_desc->reference.object);
-                acpi_ex_out_pointer("Node", obj_desc->reference.node);
-                acpi_ex_out_pointer("Where", obj_desc->reference.where);
-
-                acpi_ex_dump_reference(obj_desc);
-                break;
-
-        case ACPI_TYPE_LOCAL_ADDRESS_HANDLER:
-
-                acpi_ex_out_integer("space_id",
-                                    obj_desc->address_space.space_id);
-                acpi_ex_out_pointer("Next", obj_desc->address_space.next);
-                acpi_ex_out_pointer("region_list",
-                                    obj_desc->address_space.region_list);
-                acpi_ex_out_pointer("Node", obj_desc->address_space.node);
-                acpi_ex_out_pointer("Context", obj_desc->address_space.context);
-                break;
+        if (obj_desc->common.type > ACPI_TYPE_NS_NODE_MAX) {
+                return_VOID;
+        }
 
-        case ACPI_TYPE_LOCAL_NOTIFY:
+        /* Common Fields */
 
-                acpi_ex_out_pointer("Node", obj_desc->notify.node);
-                acpi_ex_out_pointer("Context", obj_desc->notify.context);
-                break;
+        acpi_ex_dump_object(obj_desc, acpi_ex_dump_common);
 
-        case ACPI_TYPE_LOCAL_ALIAS:
-        case ACPI_TYPE_LOCAL_METHOD_ALIAS:
-        case ACPI_TYPE_LOCAL_EXTRA:
-        case ACPI_TYPE_LOCAL_DATA:
-        default:
-
-                acpi_os_printf
-                    ("ex_dump_object_descriptor: Display not implemented for object type %s\n",
-                     acpi_ut_get_object_type_name(obj_desc));
-                break;
-        }
+        /* Object-specific fields */
 
+        acpi_ex_dump_object(obj_desc, acpi_ex_dump_info[obj_desc->common.type]);
         return_VOID;
 }
 
-#endif                          /*  ACPI_FUTURE_USAGE  */
 #endif
diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index ab1ba399aa28..e259201ce9a0 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -249,13 +249,18 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                  * Source must be a buffer of sufficient size (ACPI_SMBUS_BUFFER_SIZE).
                  */
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) {
-                        ACPI_REPORT_ERROR(("SMBus write requires Buffer, found type %s\n", acpi_ut_get_object_type_name(source_desc)));
+                        ACPI_ERROR((AE_INFO,
+                                    "SMBus write requires Buffer, found type %s",
+                                    acpi_ut_get_object_type_name(source_desc)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
                 if (source_desc->buffer.length < ACPI_SMBUS_BUFFER_SIZE) {
-                        ACPI_REPORT_ERROR(("SMBus write requires Buffer of length %X, found length %X\n", ACPI_SMBUS_BUFFER_SIZE, source_desc->buffer.length));
+                        ACPI_ERROR((AE_INFO,
+                                    "SMBus write requires Buffer of length %X, found length %X",
+                                    ACPI_SMBUS_BUFFER_SIZE,
+                                    source_desc->buffer.length));
 
                         return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);
                 }
diff --git a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c
index ba6e08843c29..bd1af35f7fcf 100644
--- a/drivers/acpi/executer/exfldio.c
+++ b/drivers/acpi/executer/exfldio.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,10 +94,9 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
         /* We must have a valid region */
 
         if (ACPI_GET_OBJECT_TYPE(rgn_desc) != ACPI_TYPE_REGION) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Needed Region, found type %X (%s)\n",
-                                  ACPI_GET_OBJECT_TYPE(rgn_desc),
-                                  acpi_ut_get_object_type_name(rgn_desc)));
+                ACPI_ERROR((AE_INFO, "Needed Region, found type %X (%s)",
+                            ACPI_GET_OBJECT_TYPE(rgn_desc),
+                            acpi_ut_get_object_type_name(rgn_desc)));
 
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
@@ -162,31 +161,28 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                          * than the region itself.  For example, a region of length one
                          * byte, and a field with Dword access specified.
                          */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)\n",
-                                          acpi_ut_get_node_name(obj_desc->
-                                                                common_field.
-                                                                node),
-                                          obj_desc->common_field.
-                                          access_byte_width,
-                                          acpi_ut_get_node_name(rgn_desc->
-                                                                region.node),
-                                          rgn_desc->region.length));
+                        ACPI_ERROR((AE_INFO,
+                                    "Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)",
+                                    acpi_ut_get_node_name(obj_desc->
+                                                          common_field.node),
+                                    obj_desc->common_field.access_byte_width,
+                                    acpi_ut_get_node_name(rgn_desc->region.
+                                                          node),
+                                    rgn_desc->region.length));
                 }
 
                 /*
                  * Offset rounded up to next multiple of field width
                  * exceeds region length, indicate an error
                  */
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)\n",
-                                  acpi_ut_get_node_name(obj_desc->common_field.
-                                                        node),
-                                  obj_desc->common_field.base_byte_offset,
-                                  field_datum_byte_offset,
-                                  obj_desc->common_field.access_byte_width,
-                                  acpi_ut_get_node_name(rgn_desc->region.node),
-                                  rgn_desc->region.length));
+                ACPI_ERROR((AE_INFO,
+                            "Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)",
+                            acpi_ut_get_node_name(obj_desc->common_field.node),
+                            obj_desc->common_field.base_byte_offset,
+                            field_datum_byte_offset,
+                            obj_desc->common_field.access_byte_width,
+                            acpi_ut_get_node_name(rgn_desc->region.node),
+                            rgn_desc->region.length));
 
                 return_ACPI_STATUS(AE_AML_REGION_LIMIT);
         }
@@ -270,18 +266,17 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
 
         if (ACPI_FAILURE(status)) {
                 if (status == AE_NOT_IMPLEMENTED) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Region %s(%X) not implemented\n",
-                                          acpi_ut_get_region_name(rgn_desc->
-                                                                  region.
-                                                                  space_id),
-                                          rgn_desc->region.space_id));
+                        ACPI_ERROR((AE_INFO,
+                                    "Region %s(%X) not implemented",
+                                    acpi_ut_get_region_name(rgn_desc->region.
+                                                            space_id),
+                                    rgn_desc->region.space_id));
                 } else if (status == AE_NOT_EXIST) {
-                        ACPI_REPORT_ERROR(("Region %s(%X) has no handler\n",
-                                           acpi_ut_get_region_name(rgn_desc->
-                                                                   region.
-                                                                   space_id),
-                                           rgn_desc->region.space_id));
+                        ACPI_ERROR((AE_INFO,
+                                    "Region %s(%X) has no handler",
+                                    acpi_ut_get_region_name(rgn_desc->region.
+                                                            space_id),
+                                    rgn_desc->region.space_id));
                 }
         }
 
@@ -514,8 +509,8 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
 
         default:
 
-                ACPI_REPORT_ERROR(("Wrong object type in field I/O %X\n",
-                                   ACPI_GET_OBJECT_TYPE(obj_desc)));
+                ACPI_ERROR((AE_INFO, "Wrong object type in field I/O %X",
+                            ACPI_GET_OBJECT_TYPE(obj_desc)));
                 status = AE_AML_INTERNAL;
                 break;
         }
@@ -618,11 +613,11 @@ acpi_ex_write_with_update_rule(union acpi_operand_object *obj_desc,
 
                 default:
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "write_with_update_rule: Unknown update_rule setting: %X\n",
-                                          (obj_desc->common_field.
-                                           field_flags &
-                                           AML_FIELD_UPDATE_RULE_MASK)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unknown update_rule value: %X",
+                                    (obj_desc->common_field.
+                                     field_flags &
+                                     AML_FIELD_UPDATE_RULE_MASK)));
                         return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
                 }
         }
@@ -677,10 +672,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
 
         if (buffer_length <
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Field size %X (bits) is too large for buffer (%X)\n",
-                                  obj_desc->common_field.bit_length,
-                                  buffer_length));
+                ACPI_ERROR((AE_INFO,
+                            "Field size %X (bits) is too large for buffer (%X)",
+                            obj_desc->common_field.bit_length, buffer_length));
 
                 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
         }
@@ -792,10 +786,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
         if (buffer_length <
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Field size %X (bits) is too large for buffer (%X)\n",
-                                  obj_desc->common_field.bit_length,
-                                  buffer_length));
+                ACPI_ERROR((AE_INFO,
+                            "Field size %X (bits) is too large for buffer (%X)",
+                            obj_desc->common_field.bit_length, buffer_length));
 
                 return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
         }
diff --git a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c
index a3f4d72bedc9..48c18d29222a 100644
--- a/drivers/acpi/executer/exmisc.c
+++ b/drivers/acpi/executer/exmisc.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 #include <acpi/acpi.h>
 #include <acpi/acinterp.h>
 #include <acpi/amlcode.h>
+#include <acpi/amlresrc.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exmisc")
@@ -97,7 +98,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("Unknown Reference opcode in get_reference %X\n", obj_desc->reference.opcode));
+                        ACPI_ERROR((AE_INFO, "Unknown Reference opcode %X",
+                                    obj_desc->reference.opcode));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
                 break;
@@ -112,7 +114,8 @@ acpi_ex_get_object_reference(union acpi_operand_object *obj_desc,
 
         default:
 
-                ACPI_REPORT_ERROR(("Invalid descriptor type in get_reference: %X\n", ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
+                ACPI_ERROR((AE_INFO, "Invalid descriptor type %X",
+                            ACPI_GET_DESCRIPTOR_TYPE(obj_desc)));
                 return_ACPI_STATUS(AE_TYPE);
         }
 
@@ -157,48 +160,65 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
                         union acpi_operand_object **actual_return_desc,
                         struct acpi_walk_state *walk_state)
 {
+        acpi_status status;
         union acpi_operand_object *return_desc;
         u8 *new_buf;
-        u8 *end_tag1;
-        u8 *end_tag2;
+        u8 *end_tag;
+        acpi_size length0;
         acpi_size length1;
-        acpi_size length2;
+        acpi_size new_length;
 
         ACPI_FUNCTION_TRACE("ex_concat_template");
 
-        /* Find the end_tags in each resource template */
+        /*
+         * Find the end_tag descriptor in each resource template.
+         * Note1: returned pointers point TO the end_tag, not past it.
+         * Note2: zero-length buffers are allowed; treated like one end_tag
+         */
+
+        /* Get the length of the first resource template */
 
-        end_tag1 = acpi_ut_get_resource_end_tag(operand0);
-        end_tag2 = acpi_ut_get_resource_end_tag(operand1);
-        if (!end_tag1 || !end_tag2) {
-                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
+        status = acpi_ut_get_resource_end_tag(operand0, &end_tag);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
         }
 
-        /* Compute the length of each part */
+        length0 = ACPI_PTR_DIFF(end_tag, operand0->buffer.pointer);
+
+        /* Get the length of the second resource template */
+
+        status = acpi_ut_get_resource_end_tag(operand1, &end_tag);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
 
-        length1 = ACPI_PTR_DIFF(end_tag1, operand0->buffer.pointer);
-        length2 = ACPI_PTR_DIFF(end_tag2, operand1->buffer.pointer) + 2;        /* Size of END_TAG */
+        length1 = ACPI_PTR_DIFF(end_tag, operand1->buffer.pointer);
 
-        /* Create a new buffer object for the result */
+        /* Combine both lengths, minimum size will be 2 for end_tag */
 
-        return_desc = acpi_ut_create_buffer_object(length1 + length2);
+        new_length = length0 + length1 + sizeof(struct aml_resource_end_tag);
+
+        /* Create a new buffer object for the result (with one end_tag) */
+
+        return_desc = acpi_ut_create_buffer_object(new_length);
         if (!return_desc) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
-        /* Copy the templates to the new descriptor */
-
+        /*
+         * Copy the templates to the new buffer, 0 first, then 1 follows. One
+         * end_tag descriptor is copied from Operand1.
+         */
         new_buf = return_desc->buffer.pointer;
-        ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length1);
-        ACPI_MEMCPY(new_buf + length1, operand1->buffer.pointer, length2);
+        ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length0);
+        ACPI_MEMCPY(new_buf + length0, operand1->buffer.pointer, length1);
 
-        /* Compute the new checksum */
+        /* Insert end_tag and set the checksum to zero, means "ignore checksum" */
 
-        new_buf[return_desc->buffer.length - 1] =
-            acpi_ut_generate_checksum(return_desc->buffer.pointer,
-                                      (return_desc->buffer.length - 1));
+        new_buf[new_length - 1] = 0;
+        new_buf[new_length - 2] = ACPI_RESOURCE_NAME_END_TAG | 1;
 
-        /* Return the completed template descriptor */
+        /* Return the completed resource template */
 
         *actual_return_desc = return_desc;
         return_ACPI_STATUS(AE_OK);
@@ -229,7 +249,6 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
         union acpi_operand_object *return_desc;
         char *new_buf;
         acpi_status status;
-        acpi_size new_length;
 
         ACPI_FUNCTION_TRACE("ex_do_concatenate");
 
@@ -256,8 +275,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                 break;
 
         default:
-                ACPI_REPORT_ERROR(("Concat - invalid obj type: %X\n",
-                                   ACPI_GET_OBJECT_TYPE(operand0)));
+                ACPI_ERROR((AE_INFO, "Invalid object type: %X",
+                            ACPI_GET_OBJECT_TYPE(operand0)));
                 status = AE_AML_INTERNAL;
         }
 
@@ -296,8 +315,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Copy the first integer, LSB first */
 
-                ACPI_MEMCPY(new_buf,
-                            &operand0->integer.value,
+                ACPI_MEMCPY(new_buf, &operand0->integer.value,
                             acpi_gbl_integer_byte_width);
 
                 /* Copy the second integer (LSB first) after the first */
@@ -311,14 +329,11 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Result of two Strings is a String */
 
-                new_length = (acpi_size) operand0->string.length +
-                    (acpi_size) local_operand1->string.length;
-                if (new_length > ACPI_MAX_STRING_CONVERSION) {
-                        status = AE_AML_STRING_LIMIT;
-                        goto cleanup;
-                }
-
-                return_desc = acpi_ut_create_string_object(new_length);
+                return_desc = acpi_ut_create_string_object((acpi_size)
+                                                           (operand0->string.
+                                                            length +
+                                                            local_operand1->
+                                                            string.length));
                 if (!return_desc) {
                         status = AE_NO_MEMORY;
                         goto cleanup;
@@ -338,11 +353,10 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
                 /* Result of two Buffers is a Buffer */
 
                 return_desc = acpi_ut_create_buffer_object((acpi_size)
-                                                           operand0->buffer.
-                                                           length +
-                                                           (acpi_size)
-                                                           local_operand1->
-                                                           buffer.length);
+                                                           (operand0->buffer.
+                                                            length +
+                                                            local_operand1->
+                                                            buffer.length));
                 if (!return_desc) {
                         status = AE_NO_MEMORY;
                         goto cleanup;
@@ -352,8 +366,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Concatenate the buffers */
 
-                ACPI_MEMCPY(new_buf,
-                            operand0->buffer.pointer, operand0->buffer.length);
+                ACPI_MEMCPY(new_buf, operand0->buffer.pointer,
+                            operand0->buffer.length);
                 ACPI_MEMCPY(new_buf + operand0->buffer.length,
                             local_operand1->buffer.pointer,
                             local_operand1->buffer.length);
@@ -363,8 +377,8 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                 /* Invalid object type, should not happen here */
 
-                ACPI_REPORT_ERROR(("Concatenate - Invalid object type: %X\n",
-                                   ACPI_GET_OBJECT_TYPE(operand0)));
+                ACPI_ERROR((AE_INFO, "Invalid object type: %X",
+                            ACPI_GET_OBJECT_TYPE(operand0)));
                 status = AE_AML_INTERNAL;
                 goto cleanup;
         }
@@ -625,9 +639,8 @@ acpi_ex_do_logical_op(u16 opcode,
 
                 /* Lexicographic compare: compare the data bytes */
 
-                compare = ACPI_MEMCMP((const char *)operand0->buffer.pointer,
-                                      (const char *)local_operand1->buffer.
-                                      pointer,
+                compare = ACPI_MEMCMP(operand0->buffer.pointer,
+                                      local_operand1->buffer.pointer,
                                       (length0 > length1) ? length1 : length0);
 
                 switch (opcode) {
diff --git a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c
index ab47f6d8b5c0..f843b22e20b9 100644
--- a/drivers/acpi/executer/exmutex.c
+++ b/drivers/acpi/executer/exmutex.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -153,7 +153,9 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
         /* Sanity check -- we must have a valid thread ID */
 
         if (!walk_state->thread) {
-                ACPI_REPORT_ERROR(("Cannot acquire Mutex [%4.4s], null thread info\n", acpi_ut_get_node_name(obj_desc->mutex.node)));
+                ACPI_ERROR((AE_INFO,
+                            "Cannot acquire Mutex [%4.4s], null thread info",
+                            acpi_ut_get_node_name(obj_desc->mutex.node)));
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
 
@@ -162,7 +164,9 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
          * mutex.  This mechanism provides some deadlock prevention
          */
         if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) {
-                ACPI_REPORT_ERROR(("Cannot acquire Mutex [%4.4s], incorrect sync_level\n", acpi_ut_get_node_name(obj_desc->mutex.node)));
+                ACPI_ERROR((AE_INFO,
+                            "Cannot acquire Mutex [%4.4s], incorrect sync_level",
+                            acpi_ut_get_node_name(obj_desc->mutex.node)));
                 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
         }
 
@@ -237,14 +241,18 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         /* The mutex must have been previously acquired in order to release it */
 
         if (!obj_desc->mutex.owner_thread) {
-                ACPI_REPORT_ERROR(("Cannot release Mutex [%4.4s], not acquired\n", acpi_ut_get_node_name(obj_desc->mutex.node)));
+                ACPI_ERROR((AE_INFO,
+                            "Cannot release Mutex [%4.4s], not acquired",
+                            acpi_ut_get_node_name(obj_desc->mutex.node)));
                 return_ACPI_STATUS(AE_AML_MUTEX_NOT_ACQUIRED);
         }
 
         /* Sanity check -- we must have a valid thread ID */
 
         if (!walk_state->thread) {
-                ACPI_REPORT_ERROR(("Cannot release Mutex [%4.4s], null thread info\n", acpi_ut_get_node_name(obj_desc->mutex.node)));
+                ACPI_ERROR((AE_INFO,
+                            "Cannot release Mutex [%4.4s], null thread info",
+                            acpi_ut_get_node_name(obj_desc->mutex.node)));
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
 
@@ -255,7 +263,11 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         if ((obj_desc->mutex.owner_thread->thread_id !=
              walk_state->thread->thread_id)
             && (obj_desc->mutex.semaphore != acpi_gbl_global_lock_semaphore)) {
-                ACPI_REPORT_ERROR(("Thread %X cannot release Mutex [%4.4s] acquired by thread %X\n", walk_state->thread->thread_id, acpi_ut_get_node_name(obj_desc->mutex.node), obj_desc->mutex.owner_thread->thread_id));
+                ACPI_ERROR((AE_INFO,
+                            "Thread %X cannot release Mutex [%4.4s] acquired by thread %X",
+                            walk_state->thread->thread_id,
+                            acpi_ut_get_node_name(obj_desc->mutex.node),
+                            obj_desc->mutex.owner_thread->thread_id));
                 return_ACPI_STATUS(AE_AML_NOT_OWNER);
         }
 
@@ -264,7 +276,9 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
          * equal to the current sync level
          */
         if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
-                ACPI_REPORT_ERROR(("Cannot release Mutex [%4.4s], incorrect sync_level\n", acpi_ut_get_node_name(obj_desc->mutex.node)));
+                ACPI_ERROR((AE_INFO,
+                            "Cannot release Mutex [%4.4s], incorrect sync_level",
+                            acpi_ut_get_node_name(obj_desc->mutex.node)));
                 return_ACPI_STATUS(AE_AML_MUTEX_ORDER);
         }
 
diff --git a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c
index 239d8473e9a5..054fe5e1a314 100644
--- a/drivers/acpi/executer/exnames.c
+++ b/drivers/acpi/executer/exnames.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -99,7 +99,8 @@ static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
          */
         name_string = ACPI_MEM_ALLOCATE(size_needed);
         if (!name_string) {
-                ACPI_REPORT_ERROR(("ex_allocate_name_string: Could not allocate size %d\n", size_needed));
+                ACPI_ERROR((AE_INFO,
+                            "Could not allocate size %d", size_needed));
                 return_PTR(NULL);
         }
 
@@ -167,8 +168,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
         char_buf[0] = *aml_address;
 
         if ('0' <= char_buf[0] && char_buf[0] <= '9') {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "leading digit: %c\n",
-                                  char_buf[0]));
+                ACPI_ERROR((AE_INFO, "Invalid leading digit: %c", char_buf[0]));
                 return_ACPI_STATUS(AE_CTRL_PENDING);
         }
 
@@ -191,10 +191,10 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
                 if (name_string) {
                         ACPI_STRCAT(name_string, char_buf);
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "Appended to - %s \n", name_string));
+                                          "Appended to - %s\n", name_string));
                 } else {
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "No Name string - %s \n", char_buf));
+                                          "No Name string - %s\n", char_buf));
                 }
         } else if (index == 0) {
                 /*
@@ -211,12 +211,12 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
                  * the required 4
                  */
                 status = AE_AML_BAD_NAME;
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Bad character %02x in name, at %p\n",
-                                  *aml_address, aml_address));
+                ACPI_ERROR((AE_INFO,
+                            "Bad character %02x in name, at %p",
+                            *aml_address, aml_address));
         }
 
-        *in_aml_address = (u8 *) aml_address;
+        *in_aml_address = ACPI_CAST_PTR(u8, aml_address);
         return_ACPI_STATUS(status);
 }
 
@@ -412,8 +412,7 @@ acpi_ex_get_name_string(acpi_object_type data_type,
         if (AE_CTRL_PENDING == status && has_prefix) {
                 /* Ran out of segments after processing a prefix */
 
-                ACPI_REPORT_ERROR(("ex_do_name: Malformed Name at %p\n",
-                                   name_string));
+                ACPI_ERROR((AE_INFO, "Malformed Name at %p", name_string));
                 status = AE_AML_BAD_NAME;
         }
 
diff --git a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c
index 97e34542f5e4..23d0823bcd5e 100644
--- a/drivers/acpi/executer/exoparg1.c
+++ b/drivers/acpi/executer/exoparg1.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -111,7 +111,8 @@ acpi_status acpi_ex_opcode_0A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:                /*  Unknown opcode  */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_0A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
         }
@@ -188,7 +189,8 @@ acpi_status acpi_ex_opcode_1A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:                /*  Unknown opcode  */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
         }
@@ -227,7 +229,8 @@ acpi_status acpi_ex_opcode_1A_1T_0R(struct acpi_walk_state *walk_state)
 
         default:                /* Unknown opcode */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -346,9 +349,9 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                                 /* Check the range of the digit */
 
                                 if (temp32 > 9) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "BCD digit too large (not decimal): 0x%X\n",
-                                                          temp32));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "BCD digit too large (not decimal): 0x%X",
+                                                    temp32));
 
                                         status = AE_AML_NUMERIC_OVERFLOW;
                                         goto cleanup;
@@ -393,12 +396,10 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
                         /* Overflow if there is any data left in Digit */
 
                         if (digit > 0) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Integer too large to convert to BCD: %8.8X%8.8X\n",
-                                                  ACPI_FORMAT_UINT64(operand
-                                                                     [0]->
-                                                                     integer.
-                                                                     value)));
+                                ACPI_ERROR((AE_INFO,
+                                            "Integer too large to convert to BCD: %8.8X%8.8X",
+                                            ACPI_FORMAT_UINT64(operand[0]->
+                                                               integer.value)));
                                 status = AE_AML_NUMERIC_OVERFLOW;
                                 goto cleanup;
                         }
@@ -525,15 +526,16 @@ acpi_status acpi_ex_opcode_1A_1T_1R(struct acpi_walk_state *walk_state)
 
                 /* These are two obsolete opcodes */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%s is obsolete and not implemented\n",
-                                  acpi_ps_get_opcode_name(walk_state->opcode)));
+                ACPI_ERROR((AE_INFO,
+                            "%s is obsolete and not implemented",
+                            acpi_ps_get_opcode_name(walk_state->opcode)));
                 status = AE_SUPPORT;
                 goto cleanup;
 
         default:                /* Unknown opcode */
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_1T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -639,11 +641,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                     acpi_ex_resolve_operands(AML_LNOT_OP, &temp_desc,
                                              walk_state);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "%s: bad operand(s) %s\n",
-                                          acpi_ps_get_opcode_name(walk_state->
-                                                                  opcode),
-                                          acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "While resolving operands for [%s]",
+                                        acpi_ps_get_opcode_name(walk_state->
+                                                                opcode)));
 
                         goto cleanup;
                 }
@@ -742,9 +743,9 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                         break;
 
                 default:
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "size_of - Operand is not Buf/Int/Str/Pkg - found type %s\n",
-                                          acpi_ut_get_type_name(type)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Operand is not Buf/Int/Str/Pkg - found type %s",
+                                    acpi_ut_get_type_name(type)));
                         status = AE_AML_OPERAND_TYPE;
                         goto cleanup;
                 }
@@ -941,11 +942,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                                 default:
 
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Unknown Index target_type %X in obj %p\n",
-                                                          operand[0]->reference.
-                                                          target_type,
-                                                          operand[0]));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Unknown Index target_type %X in obj %p",
+                                                    operand[0]->reference.
+                                                    target_type, operand[0]));
                                         status = AE_AML_OPERAND_TYPE;
                                         goto cleanup;
                                 }
@@ -971,11 +971,10 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Unknown opcode in ref(%p) - %X\n",
-                                                  operand[0],
-                                                  operand[0]->reference.
-                                                  opcode));
+                                ACPI_ERROR((AE_INFO,
+                                            "Unknown opcode in ref(%p) - %X",
+                                            operand[0],
+                                            operand[0]->reference.opcode));
 
                                 status = AE_TYPE;
                                 goto cleanup;
@@ -985,7 +984,8 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_1A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c
index 8d70c6beef00..e263a5ddd405 100644
--- a/drivers/acpi/executer/exoparg2.c
+++ b/drivers/acpi/executer/exoparg2.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -111,9 +111,9 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
                 /* Are notifies allowed on this object? */
 
                 if (!acpi_ev_is_notify_object(node)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unexpected notify object type [%s]\n",
-                                          acpi_ut_get_type_name(node->type)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unexpected notify object type [%s]",
+                                    acpi_ut_get_type_name(node->type)));
 
                         status = AE_AML_OPERAND_TYPE;
                         break;
@@ -157,7 +157,8 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
         }
 
@@ -221,7 +222,8 @@ acpi_status acpi_ex_opcode_2A_2T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_2T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -344,10 +346,6 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                        (length < operand[1]->integer.value) &&
                        (operand[0]->buffer.pointer[length])) {
                         length++;
-                        if (length > ACPI_MAX_STRING_CONVERSION) {
-                                status = AE_AML_STRING_LIMIT;
-                                goto cleanup;
-                        }
                 }
 
                 /* Allocate a new string object */
@@ -358,8 +356,10 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                         goto cleanup;
                 }
 
-                /* Copy the raw buffer data with no transform. NULL terminated already */
-
+                /*
+                 * Copy the raw buffer data with no transform.
+                 * (NULL terminated already)
+                 */
                 ACPI_MEMCPY(return_desc->string.pointer,
                             operand[0]->buffer.pointer, length);
                 break;
@@ -391,10 +391,10 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                         /* Object to be indexed is a Package */
 
                         if (index >= operand[0]->package.count) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Index value (%X%8.8X) beyond package end (%X)\n",
-                                                  ACPI_FORMAT_UINT64(index),
-                                                  operand[0]->package.count));
+                                ACPI_ERROR((AE_INFO,
+                                            "Index value (%X%8.8X) beyond package end (%X)",
+                                            ACPI_FORMAT_UINT64(index),
+                                            operand[0]->package.count));
                                 status = AE_AML_PACKAGE_LIMIT;
                                 goto cleanup;
                         }
@@ -407,10 +407,10 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                         /* Object to be indexed is a Buffer/String */
 
                         if (index >= operand[0]->buffer.length) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Index value (%X%8.8X) beyond end of buffer (%X)\n",
-                                                  ACPI_FORMAT_UINT64(index),
-                                                  operand[0]->buffer.length));
+                                ACPI_ERROR((AE_INFO,
+                                            "Index value (%X%8.8X) beyond end of buffer (%X)",
+                                            ACPI_FORMAT_UINT64(index),
+                                            operand[0]->buffer.length));
                                 status = AE_AML_BUFFER_LIMIT;
                                 goto cleanup;
                         }
@@ -442,7 +442,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_1T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 break;
         }
@@ -546,7 +547,8 @@ acpi_status acpi_ex_opcode_2A_0T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_2A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c
index 483365777670..6a3a883cb8a3 100644
--- a/drivers/acpi/executer/exoparg3.c
+++ b/drivers/acpi/executer/exoparg3.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -119,7 +119,8 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
@@ -223,8 +224,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
                         goto cleanup;
                 }
 
-                if (length > 0) {
-                        /* Copy the portion requested */
+                if (buffer) {
+                        /* We have a buffer, copy the portion requested */
 
                         ACPI_MEMCPY(buffer, operand[0]->string.pointer + index,
                                     length);
@@ -242,7 +243,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_3A_0T_0R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c
index 5dee77139576..e043d924444f 100644
--- a/drivers/acpi/executer/exoparg6.c
+++ b/drivers/acpi/executer/exoparg6.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -234,8 +234,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
 
                 if ((operand[1]->integer.value > MAX_MATCH_OPERATOR) ||
                     (operand[3]->integer.value > MAX_MATCH_OPERATOR)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Match operator out of range\n"));
+                        ACPI_ERROR((AE_INFO, "Match operator out of range"));
                         status = AE_AML_OPERAND_VALUE;
                         goto cleanup;
                 }
@@ -244,10 +243,10 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
 
                 index = operand[5]->integer.value;
                 if (index >= operand[0]->package.count) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Index (%X%8.8X) beyond package end (%X)\n",
-                                          ACPI_FORMAT_UINT64(index),
-                                          operand[0]->package.count));
+                        ACPI_ERROR((AE_INFO,
+                                    "Index (%X%8.8X) beyond package end (%X)",
+                                    ACPI_FORMAT_UINT64(index),
+                                    operand[0]->package.count));
                         status = AE_AML_PACKAGE_LIMIT;
                         goto cleanup;
                 }
@@ -316,7 +315,8 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
 
         default:
 
-                ACPI_REPORT_ERROR(("acpi_ex_opcode_6A_0T_1R: Unknown opcode %X\n", walk_state->opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X",
+                            walk_state->opcode));
                 status = AE_AML_BAD_OPCODE;
                 goto cleanup;
         }
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 7476c363e407..7719ae5d4f16 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -274,9 +274,8 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
         default:
                 /* Invalid field access type */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown field access type %X\n", access));
-                return_VALUE(0);
+                ACPI_ERROR((AE_INFO, "Unknown field access type %X", access));
+                return_UINT32(0);
         }
 
         if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_BUFFER_FIELD) {
@@ -289,7 +288,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
         }
 
         *return_byte_alignment = byte_alignment;
-        return_VALUE(bit_length);
+        return_UINT32(bit_length);
 }
 
 /*******************************************************************************
@@ -422,15 +421,15 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
 
         if (info->field_type != ACPI_TYPE_LOCAL_INDEX_FIELD) {
                 if (!info->region_node) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null region_node\n"));
+                        ACPI_ERROR((AE_INFO, "Null region_node"));
                         return_ACPI_STATUS(AE_AML_NO_OPERAND);
                 }
 
                 type = acpi_ns_get_type(info->region_node);
                 if (type != ACPI_TYPE_REGION) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Needed Region, found type %X (%s)\n",
-                                          type, acpi_ut_get_type_name(type)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Needed Region, found type %X (%s)",
+                                    type, acpi_ut_get_type_name(type)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -499,17 +498,17 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
 
         case ACPI_TYPE_LOCAL_INDEX_FIELD:
 
+                /* Get the Index and Data registers */
+
                 obj_desc->index_field.index_obj =
                     acpi_ns_get_attached_object(info->register_node);
                 obj_desc->index_field.data_obj =
                     acpi_ns_get_attached_object(info->data_register_node);
-                obj_desc->index_field.value = (u32)
-                    (info->field_bit_position /
-                     ACPI_MUL_8(obj_desc->field.access_byte_width));
 
                 if (!obj_desc->index_field.data_obj
                     || !obj_desc->index_field.index_obj) {
-                        ACPI_REPORT_ERROR(("Null Index Object during field prep\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Null Index Object during field prep"));
                         acpi_ut_delete_object_desc(obj_desc);
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
@@ -519,6 +518,15 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                 acpi_ut_add_reference(obj_desc->index_field.data_obj);
                 acpi_ut_add_reference(obj_desc->index_field.index_obj);
 
+                /*
+                 * The value written to the Index register is the byte offset of the
+                 * target field
+                 * Note: may change code to: ACPI_DIV_8 (Info->field_bit_position)
+                 */
+                obj_desc->index_field.value = (u32)
+                    (info->field_bit_position /
+                     ACPI_MUL_8(obj_desc->field.access_byte_width));
+
                 ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
                                   "index_field: bit_off %X, Off %X, Value %X, Gran %X, Index %p, Data %p\n",
                                   obj_desc->index_field.start_field_bit_offset,
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 9a2f5bea3afe..6a4cfdff606d 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ acpi_ex_system_memory_space_handler(u32 function,
         struct acpi_mem_space_context *mem_info = region_context;
         u32 length;
         acpi_size window_size;
-#ifndef ACPI_MISALIGNED_TRANSFERS
+#ifdef ACPI_MISALIGNMENT_NOT_SUPPORTED
         u32 remainder;
 #endif
 
@@ -103,13 +103,12 @@ acpi_ex_system_memory_space_handler(u32 function,
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Invalid system_memory width %d\n",
-                                  bit_width));
+                ACPI_ERROR((AE_INFO, "Invalid system_memory width %d",
+                            bit_width));
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
 
-#ifndef ACPI_MISALIGNED_TRANSFERS
+#ifdef ACPI_MISALIGNMENT_NOT_SUPPORTED
         /*
          * Hardware does not support non-aligned data transfers, we must verify
          * the request.
@@ -159,10 +158,10 @@ acpi_ex_system_memory_space_handler(u32 function,
                                             (void **)&mem_info->
                                             mapped_logical_address);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not map memory at %8.8X%8.8X, size %X\n",
-                                          ACPI_FORMAT_UINT64(address),
-                                          (u32) window_size));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not map memory at %8.8X%8.8X, size %X",
+                                    ACPI_FORMAT_UINT64(address),
+                                    (u32) window_size));
                         mem_info->mapped_length = 0;
                         return_ACPI_STATUS(status);
                 }
@@ -199,20 +198,20 @@ acpi_ex_system_memory_space_handler(u32 function,
                 *value = 0;
                 switch (bit_width) {
                 case 8:
-                        *value = (acpi_integer) * ((u8 *) logical_addr_ptr);
+                        *value = (acpi_integer) ACPI_GET8(logical_addr_ptr);
                         break;
 
                 case 16:
-                        *value = (acpi_integer) * ((u16 *) logical_addr_ptr);
+                        *value = (acpi_integer) ACPI_GET16(logical_addr_ptr);
                         break;
 
                 case 32:
-                        *value = (acpi_integer) * ((u32 *) logical_addr_ptr);
+                        *value = (acpi_integer) ACPI_GET32(logical_addr_ptr);
                         break;
 
 #if ACPI_MACHINE_WIDTH != 16
                 case 64:
-                        *value = (acpi_integer) * ((u64 *) logical_addr_ptr);
+                        *value = (acpi_integer) ACPI_GET64(logical_addr_ptr);
                         break;
 #endif
                 default:
@@ -225,20 +224,20 @@ acpi_ex_system_memory_space_handler(u32 function,
 
                 switch (bit_width) {
                 case 8:
-                        *(u8 *) logical_addr_ptr = (u8) * value;
+                        ACPI_SET8(logical_addr_ptr) = (u8) * value;
                         break;
 
                 case 16:
-                        *(u16 *) logical_addr_ptr = (u16) * value;
+                        ACPI_SET16(logical_addr_ptr) = (u16) * value;
                         break;
 
                 case 32:
-                        *(u32 *) logical_addr_ptr = (u32) * value;
+                        ACPI_SET32(logical_addr_ptr) = (u32) * value;
                         break;
 
 #if ACPI_MACHINE_WIDTH != 16
                 case 64:
-                        *(u64 *) logical_addr_ptr = (u64) * value;
+                        ACPI_SET64(logical_addr_ptr) = (u64) * value;
                         break;
 #endif
 
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c
index ff5d8f97e8eb..01b26c80d22b 100644
--- a/drivers/acpi/executer/exresnte.c
+++ b/drivers/acpi/executer/exresnte.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -122,8 +122,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         }
 
         if (!source_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No object attached to node %p\n", node));
+                ACPI_ERROR((AE_INFO, "No object attached to node %p", node));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
@@ -135,10 +134,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_PACKAGE:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_PACKAGE) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a Package, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_ERROR((AE_INFO, "Object not a Package, type %s",
+                                    acpi_ut_get_object_type_name(source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -154,10 +151,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_BUFFER:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a Buffer, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_ERROR((AE_INFO, "Object not a Buffer, type %s",
+                                    acpi_ut_get_object_type_name(source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -173,10 +168,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_STRING:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_STRING) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a String, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_ERROR((AE_INFO, "Object not a String, type %s",
+                                    acpi_ut_get_object_type_name(source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -189,10 +182,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         case ACPI_TYPE_INTEGER:
 
                 if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_INTEGER) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Object not a Integer, type %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_ERROR((AE_INFO, "Object not a Integer, type %s",
+                                    acpi_ut_get_object_type_name(source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -236,9 +227,8 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
 
         case ACPI_TYPE_ANY:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Untyped entry %p, no attached object!\n",
-                                  node));
+                ACPI_ERROR((AE_INFO,
+                            "Untyped entry %p, no attached object!", node));
 
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);        /* Cannot be AE_TYPE */
 
@@ -257,12 +247,11 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
                 default:
                         /* No named references are allowed here */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unsupported Reference opcode %X (%s)\n",
-                                          source_desc->reference.opcode,
-                                          acpi_ps_get_opcode_name(source_desc->
-                                                                  reference.
-                                                                  opcode)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unsupported Reference opcode %X (%s)",
+                                    source_desc->reference.opcode,
+                                    acpi_ps_get_opcode_name(source_desc->
+                                                            reference.opcode)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -272,9 +261,9 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
 
                 /* Default case is for unknown types */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Node %p - Unknown object type %X\n",
-                                  node, entry_type));
+                ACPI_ERROR((AE_INFO,
+                            "Node %p - Unknown object type %X",
+                            node, entry_type));
 
                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
 
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 97eecbd3242d..1deed492fe88 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,7 +81,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
         ACPI_FUNCTION_TRACE_PTR("ex_resolve_to_value", stack_ptr);
 
         if (!stack_ptr || !*stack_ptr) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Internal - null pointer\n"));
+                ACPI_ERROR((AE_INFO, "Internal - null pointer"));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
@@ -97,8 +97,7 @@ acpi_ex_resolve_to_value(union acpi_operand_object **stack_ptr,
                 }
 
                 if (!*stack_ptr) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Internal - null pointer\n"));
+                        ACPI_ERROR((AE_INFO, "Internal - null pointer"));
                         return_ACPI_STATUS(AE_AML_NO_OPERAND);
                 }
         }
@@ -228,9 +227,9 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
                                          * A NULL object descriptor means an unitialized element of
                                          * the package, can't dereference it
                                          */
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Attempt to deref an Index to NULL pkg element Idx=%p\n",
-                                                          stack_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Attempt to deref an Index to NULL pkg element Idx=%p",
+                                                    stack_desc));
                                         status = AE_AML_UNINITIALIZED_ELEMENT;
                                 }
                                 break;
@@ -239,7 +238,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
                                 /* Invalid reference object */
 
-                                ACPI_REPORT_ERROR(("During resolve, Unknown target_type %X in Index/Reference obj %p\n", stack_desc->reference.target_type, stack_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Unknown target_type %X in Index/Reference obj %p",
+                                            stack_desc->reference.target_type,
+                                            stack_desc));
                                 status = AE_AML_INTERNAL;
                                 break;
                         }
@@ -264,7 +266,10 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("During resolve, Unknown Reference opcode %X (%s) in %p\n", opcode, acpi_ps_get_opcode_name(opcode), stack_desc));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unknown Reference opcode %X (%s) in %p",
+                                    opcode, acpi_ps_get_opcode_name(opcode),
+                                    stack_desc));
                         status = AE_AML_INTERNAL;
                         break;
                 }
@@ -386,7 +391,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
                             ACPI_DESC_TYPE_NAMED) {
-                                ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n", node, acpi_ut_get_descriptor_name(node)));
+                                ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
+                                            node,
+                                            acpi_ut_get_descriptor_name(node)));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
 
@@ -442,7 +449,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                         if (ACPI_GET_DESCRIPTOR_TYPE(node) !=
                             ACPI_DESC_TYPE_NAMED) {
-                                ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n", node, acpi_ut_get_descriptor_name(node)));
+                                ACPI_ERROR((AE_INFO, "Not a NS node %p [%s]",
+                                            node,
+                                            acpi_ut_get_descriptor_name(node)));
                                 return_ACPI_STATUS(AE_AML_INTERNAL);
                         }
 
@@ -511,7 +520,9 @@ acpi_ex_resolve_multiple(struct acpi_walk_state *walk_state,
 
                 default:
 
-                        ACPI_REPORT_ERROR(("acpi_ex_resolve_multiple: Unknown Reference subtype %X\n", obj_desc->reference.opcode));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unknown Reference subtype %X",
+                                    obj_desc->reference.opcode));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
         }
diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index ff064e79ab90..a1c000f5a415 100644
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,7 @@
 #include <acpi/amlcode.h>
 #include <acpi/acparser.h>
 #include <acpi/acinterp.h>
+#include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exresop")
@@ -73,7 +74,7 @@ static acpi_status
 acpi_ex_check_object_type(acpi_object_type type_needed,
                           acpi_object_type this_type, void *object)
 {
-        ACPI_FUNCTION_NAME("ex_check_object_type");
+        ACPI_FUNCTION_ENTRY();
 
         if (type_needed == ACPI_TYPE_ANY) {
                 /* All types OK, so we don't perform any typechecks */
@@ -95,10 +96,10 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
         }
 
         if (type_needed != this_type) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Needed [%s], found [%s] %p\n",
-                                  acpi_ut_get_type_name(type_needed),
-                                  acpi_ut_get_type_name(this_type), object));
+                ACPI_ERROR((AE_INFO,
+                            "Needed type [%s], found [%s] %p",
+                            acpi_ut_get_type_name(type_needed),
+                            acpi_ut_get_type_name(this_type), object));
 
                 return (AE_AML_OPERAND_TYPE);
         }
@@ -151,13 +152,13 @@ acpi_ex_resolve_operands(u16 opcode,
 
         arg_types = op_info->runtime_args;
         if (arg_types == ARGI_INVALID_OPCODE) {
-                ACPI_REPORT_ERROR(("resolve_operands: %X is not a valid AML opcode\n", opcode));
+                ACPI_ERROR((AE_INFO, "Unknown AML opcode %X", opcode));
 
                 return_ACPI_STATUS(AE_AML_INTERNAL);
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "Opcode %X [%s] required_operand_types=%8.8X \n",
+                          "Opcode %X [%s] required_operand_types=%8.8X\n",
                           opcode, op_info->name, arg_types));
 
         /*
@@ -169,7 +170,8 @@ acpi_ex_resolve_operands(u16 opcode,
          */
         while (GET_CURRENT_ARG_TYPE(arg_types)) {
                 if (!stack_ptr || !*stack_ptr) {
-                        ACPI_REPORT_ERROR(("resolve_operands: Null stack entry at %p\n", stack_ptr));
+                        ACPI_ERROR((AE_INFO, "Null stack entry at %p",
+                                    stack_ptr));
 
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
@@ -187,6 +189,22 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         object_type =
                             ((struct acpi_namespace_node *)obj_desc)->type;
+
+                        /*
+                         * Resolve an alias object. The construction of these objects
+                         * guarantees that there is only one level of alias indirection;
+                         * thus, the attached object is always the aliased namespace node
+                         */
+                        if (object_type == ACPI_TYPE_LOCAL_ALIAS) {
+                                obj_desc =
+                                    acpi_ns_get_attached_object((struct
+                                                                 acpi_namespace_node
+                                                                 *)obj_desc);
+                                *stack_ptr = obj_desc;
+                                object_type =
+                                    ((struct acpi_namespace_node *)obj_desc)->
+                                    type;
+                        }
                         break;
 
                 case ACPI_DESC_TYPE_OPERAND:
@@ -198,9 +216,9 @@ acpi_ex_resolve_operands(u16 opcode,
                         /* Check for bad acpi_object_type */
 
                         if (!acpi_ut_valid_object_type(object_type)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Bad operand object type [%X]\n",
-                                                  object_type));
+                                ACPI_ERROR((AE_INFO,
+                                            "Bad operand object type [%X]",
+                                            object_type));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -238,13 +256,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                         break;
 
                                 default:
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Operand is a Reference, Unknown Reference Opcode %X [%s]\n",
-                                                          obj_desc->reference.
-                                                          opcode,
-                                                          (acpi_ps_get_opcode_info
-                                                           (obj_desc->reference.
-                                                            opcode))->name));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Operand is a Reference, Unknown Reference Opcode: %X",
+                                                    obj_desc->reference.
+                                                    opcode));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -255,11 +270,10 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Invalid descriptor */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Invalid descriptor %p [%s]\n",
-                                          obj_desc,
-                                          acpi_ut_get_descriptor_name
-                                          (obj_desc)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid descriptor %p [%s]",
+                                    obj_desc,
+                                    acpi_ut_get_descriptor_name(obj_desc)));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -417,11 +431,10 @@ acpi_ex_resolve_operands(u16 opcode,
                             acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                          acpi_ut_get_object_type_name
-                                                          (obj_desc),
-                                                          obj_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Needed [Integer/String/Buffer], found [%s] %p",
+                                                    acpi_ut_get_object_type_name
+                                                    (obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -444,11 +457,10 @@ acpi_ex_resolve_operands(u16 opcode,
                         status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                          acpi_ut_get_object_type_name
-                                                          (obj_desc),
-                                                          obj_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Needed [Integer/String/Buffer], found [%s] %p",
+                                                    acpi_ut_get_object_type_name
+                                                    (obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -472,11 +484,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                                            ACPI_IMPLICIT_CONVERT_HEX);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                          acpi_ut_get_object_type_name
-                                                          (obj_desc),
-                                                          obj_desc));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Needed [Integer/String/Buffer], found [%s] %p",
+                                                    acpi_ut_get_object_type_name
+                                                    (obj_desc), obj_desc));
 
                                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                 }
@@ -502,10 +513,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Integer/String/Buffer], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -539,10 +550,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Integer/String/Buffer], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -566,10 +577,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Buffer/String/Package/Reference], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Buffer/String/Package/Reference], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -588,10 +599,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Buffer/String/Package], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Buffer/String/Package], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -611,10 +622,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                 break;
 
                         default:
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed [Region/region_field], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed [Region/region_field], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -656,10 +667,10 @@ acpi_ex_resolve_operands(u16 opcode,
                                         break;
                                 }
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n",
-                                                  acpi_ut_get_object_type_name
-                                                  (obj_desc), obj_desc));
+                                ACPI_ERROR((AE_INFO,
+                                            "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p",
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc), obj_desc));
 
                                 return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                         }
@@ -669,9 +680,9 @@ acpi_ex_resolve_operands(u16 opcode,
 
                         /* Unknown type */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Internal - Unknown ARGI (required operand) type %X\n",
-                                          this_arg_type));
+                        ACPI_ERROR((AE_INFO,
+                                    "Internal - Unknown ARGI (required operand) type %X",
+                                    this_arg_type));
 
                         return_ACPI_STATUS(AE_BAD_PARAMETER);
                 }
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index a7d8eea305c2..3f020c0e2b95 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -250,7 +250,7 @@ acpi_ex_store(union acpi_operand_object *source_desc,
         /* Validate parameters */
 
         if (!source_desc || !dest_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null parameter\n"));
+                ACPI_ERROR((AE_INFO, "Null parameter"));
                 return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
@@ -290,10 +290,10 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
                 /* Destination is not a Reference object */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Target is not a Reference or Constant object - %s [%p]\n",
-                                  acpi_ut_get_object_type_name(dest_desc),
-                                  dest_desc));
+                ACPI_ERROR((AE_INFO,
+                            "Target is not a Reference or Constant object - %s [%p]",
+                            acpi_ut_get_object_type_name(dest_desc),
+                            dest_desc));
 
                 ACPI_DUMP_STACK_ENTRY(source_desc);
                 ACPI_DUMP_STACK_ENTRY(dest_desc);
@@ -360,8 +360,8 @@ acpi_ex_store(union acpi_operand_object *source_desc,
 
         default:
 
-                ACPI_REPORT_ERROR(("ex_store: Unknown Reference opcode %X\n",
-                                   ref_desc->reference.opcode));
+                ACPI_ERROR((AE_INFO, "Unknown Reference opcode %X",
+                            ref_desc->reference.opcode));
                 ACPI_DUMP_ENTRY(ref_desc, ACPI_LV_ERROR);
 
                 status = AE_AML_INTERNAL;
@@ -490,10 +490,9 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
 
                         /* All other types are invalid */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Source must be Integer/Buffer/String type, not %s\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Source must be Integer/Buffer/String type, not %s",
+                                    acpi_ut_get_object_type_name(source_desc)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
@@ -503,8 +502,8 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Target is not a Package or buffer_field\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Target is not a Package or buffer_field"));
                 status = AE_AML_OPERAND_TYPE;
                 break;
         }
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 382f63c14ea1..42967baf760d 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -7,7 +7,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,11 +123,10 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
                       && (source_desc->reference.opcode == AML_LOAD_OP))) {
                         /* Conversion successful but still not a valid type */
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Cannot assign type %s to %s (must be type Int/Str/Buf)\n",
-                                          acpi_ut_get_object_type_name
-                                          (source_desc),
-                                          acpi_ut_get_type_name(target_type)));
+                        ACPI_ERROR((AE_INFO,
+                                    "Cannot assign type %s to %s (must be type Int/Str/Buf)",
+                                    acpi_ut_get_object_type_name(source_desc),
+                                    acpi_ut_get_type_name(target_type)));
                         status = AE_AML_OPERAND_TYPE;
                 }
                 break;
@@ -135,9 +134,11 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
         case ACPI_TYPE_LOCAL_ALIAS:
         case ACPI_TYPE_LOCAL_METHOD_ALIAS:
 
-                /* Aliases are resolved by acpi_ex_prep_operands */
-
-                ACPI_REPORT_ERROR(("Store into Alias - should never happen\n"));
+                /*
+                 * All aliases should have been resolved earlier, during the
+                 * operand resolution phase.
+                 */
+                ACPI_ERROR((AE_INFO, "Store into an unresolved Alias object"));
                 status = AE_AML_INTERNAL;
                 break;
 
@@ -280,9 +281,8 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
                 /*
                  * All other types come here.
                  */
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "Store into type %s not implemented\n",
-                                  acpi_ut_get_object_type_name(dest_desc)));
+                ACPI_WARNING((AE_INFO, "Store into type %s not implemented",
+                              acpi_ut_get_object_type_name(dest_desc)));
 
                 status = AE_NOT_IMPLEMENTED;
                 break;
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index c4ff654a6697..6ab707087750 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,7 +71,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
 
         /* We know that source_desc is a buffer by now */
 
-        buffer = (u8 *) source_desc->buffer.pointer;
+        buffer = ACPI_CAST_PTR(u8, source_desc->buffer.pointer);
         length = source_desc->buffer.length;
 
         /*
@@ -160,7 +160,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
 
         /* We know that source_desc is a string by now */
 
-        buffer = (u8 *) source_desc->string.pointer;
+        buffer = ACPI_CAST_PTR(u8, source_desc->string.pointer);
         length = source_desc->string.length;
 
         /*
diff --git a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c
index 8a88b841237d..ea9144f42e1f 100644
--- a/drivers/acpi/executer/exsystem.c
+++ b/drivers/acpi/executer/exsystem.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -129,8 +129,8 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
                  * (ACPI specifies 100 usec as max, but this gives some slack in
                  * order to support existing BIOSs)
                  */
-                ACPI_REPORT_ERROR(("Stall: Time parameter is too large (%d)\n",
-                                   how_long));
+                ACPI_ERROR((AE_INFO, "Time parameter is too large (%d)",
+                            how_long));
                 status = AE_AML_OPERAND_VALUE;
         } else {
                 acpi_os_stall(how_long);
diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index 1ee79d8c8f88..f73a61aeb7ec 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@ acpi_status acpi_ex_enter_interpreter(void)
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not acquire interpreter mutex\n"));
+                ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
         }
 
         return_ACPI_STATUS(status);
@@ -127,7 +127,7 @@ void acpi_ex_exit_interpreter(void)
 
         status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not release interpreter mutex\n"));
+                ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
         }
 
         return_VOID;
@@ -200,13 +200,12 @@ u8 acpi_ex_acquire_global_lock(u32 field_flags)
                 if (ACPI_SUCCESS(status)) {
                         locked = TRUE;
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not acquire Global Lock, %s\n",
-                                          acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not acquire Global Lock"));
                 }
         }
 
-        return_VALUE(locked);
+        return_UINT8(locked);
 }
 
 /*******************************************************************************
@@ -237,7 +236,8 @@ void acpi_ex_release_global_lock(u8 locked_by_me)
                 if (ACPI_FAILURE(status)) {
                         /* Report the error, but there isn't much else we can do */
 
-                        ACPI_REPORT_ERROR(("Could not release ACPI Global Lock, %s\n", acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not release ACPI Global Lock"));
                 }
         }
 
@@ -268,7 +268,7 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
         /* acpi_integer is unsigned, so we don't worry about a '-' prefix */
 
         if (value == 0) {
-                return_VALUE(1);
+                return_UINT32(1);
         }
 
         current_value = value;
@@ -282,7 +282,7 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
                 num_digits++;
         }
 
-        return_VALUE(num_digits);
+        return_UINT32(num_digits);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index aa993715d644..8daef57b994c 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -99,15 +99,15 @@ do_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
         unsigned long *busnr = (unsigned long *)data;
         struct acpi_resource_address64 address;
 
-        if (resource->id != ACPI_RSTYPE_ADDRESS16 &&
-            resource->id != ACPI_RSTYPE_ADDRESS32 &&
-            resource->id != ACPI_RSTYPE_ADDRESS64)
+        if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
+            resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 &&
+            resource->type != ACPI_RESOURCE_TYPE_ADDRESS64)
                 return AE_OK;
 
         acpi_resource_to_address64(resource, &address);
         if ((address.address_length > 0) &&
             (address.resource_type == ACPI_BUS_NUMBER_RANGE))
-                *busnr = address.min_address_range;
+                *busnr = address.minimum;
 
         return AE_OK;
 }
diff --git a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c
index 1bb3463d7040..ea2f13271ff1 100644
--- a/drivers/acpi/hardware/hwacpi.c
+++ b/drivers/acpi/hardware/hwacpi.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,8 +68,7 @@ acpi_status acpi_hw_initialize(void)
         /* We must have the ACPI tables by the time we get here */
 
         if (!acpi_gbl_FADT) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No FADT is present\n"));
-
+                ACPI_ERROR((AE_INFO, "No FADT is present"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
@@ -108,7 +107,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
          * system does not support mode transition.
          */
         if (!acpi_gbl_FADT->smi_cmd) {
-                ACPI_REPORT_ERROR(("No SMI_CMD in FADT, mode transition failed.\n"));
+                ACPI_ERROR((AE_INFO,
+                            "No SMI_CMD in FADT, mode transition failed"));
                 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
         }
 
@@ -120,7 +120,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
          * transitions are not supported.
          */
         if (!acpi_gbl_FADT->acpi_enable && !acpi_gbl_FADT->acpi_disable) {
-                ACPI_REPORT_ERROR(("No ACPI mode transition supported in this system (enable/disable both zero)\n"));
+                ACPI_ERROR((AE_INFO,
+                            "No ACPI mode transition supported in this system (enable/disable both zero)"));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -154,8 +155,8 @@ acpi_status acpi_hw_set_mode(u32 mode)
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not write mode change, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not write ACPI mode change"));
                 return_ACPI_STATUS(status);
         }
 
@@ -175,7 +176,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
                 retry--;
         }
 
-        ACPI_REPORT_ERROR(("Hardware never changed modes\n"));
+        ACPI_ERROR((AE_INFO, "Hardware did not change modes"));
         return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
 }
 
@@ -204,18 +205,18 @@ u32 acpi_hw_get_mode(void)
          * system does not support mode transition.
          */
         if (!acpi_gbl_FADT->smi_cmd) {
-                return_VALUE(ACPI_SYS_MODE_ACPI);
+                return_UINT32(ACPI_SYS_MODE_ACPI);
         }
 
         status =
             acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value, ACPI_MTX_LOCK);
         if (ACPI_FAILURE(status)) {
-                return_VALUE(ACPI_SYS_MODE_LEGACY);
+                return_UINT32(ACPI_SYS_MODE_LEGACY);
         }
 
         if (value) {
-                return_VALUE(ACPI_SYS_MODE_ACPI);
+                return_UINT32(ACPI_SYS_MODE_ACPI);
         } else {
-                return_VALUE(ACPI_SYS_MODE_LEGACY);
+                return_UINT32(ACPI_SYS_MODE_LEGACY);
         }
 }
diff --git a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c
index 5c8e5dfd024e..d84942d22dd5 100644
--- a/drivers/acpi/hardware/hwgpe.c
+++ b/drivers/acpi/hardware/hwgpe.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c
index 536a7aea80c9..e1fe75498415 100644
--- a/drivers/acpi/hardware/hwregs.c
+++ b/drivers/acpi/hardware/hwregs.c
@@ -7,7 +7,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -144,7 +144,8 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
 
         info.parameters = NULL;
         info.return_object = NULL;
-        sleep_state_name = (char *)acpi_gbl_sleep_state_names[sleep_state];
+        sleep_state_name =
+            ACPI_CAST_PTR(char, acpi_gbl_sleep_state_names[sleep_state]);
 
         status = acpi_ns_evaluate_by_name(sleep_state_name, &info);
         if (ACPI_FAILURE(status)) {
@@ -159,15 +160,16 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
         /* Must have a return object */
 
         if (!info.return_object) {
-                ACPI_REPORT_ERROR(("No Sleep State object returned from [%s]\n",
-                                   sleep_state_name));
+                ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]",
+                            sleep_state_name));
                 status = AE_NOT_EXIST;
         }
 
         /* It must be of type Package */
 
         else if (ACPI_GET_OBJECT_TYPE(info.return_object) != ACPI_TYPE_PACKAGE) {
-                ACPI_REPORT_ERROR(("Sleep State return object is not a Package\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return object is not a Package"));
                 status = AE_AML_OPERAND_TYPE;
         }
 
@@ -179,7 +181,8 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
          * one per sleep type (A/B).
          */
         else if (info.return_object->package.count < 2) {
-                ACPI_REPORT_ERROR(("Sleep State return package does not have at least two elements\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return package does not have at least two elements"));
                 status = AE_AML_NO_OPERAND;
         }
 
@@ -189,7 +192,12 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
                   != ACPI_TYPE_INTEGER) ||
                  (ACPI_GET_OBJECT_TYPE(info.return_object->package.elements[1])
                   != ACPI_TYPE_INTEGER)) {
-                ACPI_REPORT_ERROR(("Sleep State return package elements are not both Integers (%s, %s)\n", acpi_ut_get_object_type_name(info.return_object->package.elements[0]), acpi_ut_get_object_type_name(info.return_object->package.elements[1])));
+                ACPI_ERROR((AE_INFO,
+                            "Sleep State return package elements are not both Integers (%s, %s)",
+                            acpi_ut_get_object_type_name(info.return_object->
+                                                         package.elements[0]),
+                            acpi_ut_get_object_type_name(info.return_object->
+                                                         package.elements[1])));
                 status = AE_AML_OPERAND_TYPE;
         } else {
                 /* Valid _Sx_ package size, type, and value */
@@ -201,12 +209,11 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b)
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%s While evaluating sleep_state [%s], bad Sleep object %p type %s\n",
-                                  acpi_format_exception(status),
-                                  sleep_state_name, info.return_object,
-                                  acpi_ut_get_object_type_name(info.
-                                                               return_object)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While evaluating sleep_state [%s], bad Sleep object %p type %s",
+                                sleep_state_name, info.return_object,
+                                acpi_ut_get_object_type_name(info.
+                                                             return_object)));
         }
 
         acpi_ut_remove_reference(info.return_object);
@@ -229,12 +236,11 @@ EXPORT_SYMBOL(acpi_get_sleep_type_data);
 
 struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id)
 {
-        ACPI_FUNCTION_NAME("hw_get_bit_register_info");
+        ACPI_FUNCTION_ENTRY();
 
         if (register_id > ACPI_BITREG_MAX) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Invalid bit_register ID: %X\n",
-                                  register_id));
+                ACPI_ERROR((AE_INFO, "Invalid bit_register ID: %X",
+                            register_id));
                 return (NULL);
         }
 
@@ -334,8 +340,8 @@ acpi_status acpi_set_register(u32 register_id, u32 value, u32 flags)
 
         bit_reg_info = acpi_hw_get_bit_register_info(register_id);
         if (!bit_reg_info) {
-                ACPI_REPORT_ERROR(("Bad ACPI HW register_id: %X\n",
-                                   register_id));
+                ACPI_ERROR((AE_INFO, "Bad ACPI HW register_id: %X",
+                            register_id));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -569,8 +575,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value)
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown Register ID: %X\n",
-                                  register_id));
+                ACPI_ERROR((AE_INFO, "Unknown Register ID: %X", register_id));
                 status = AE_BAD_PARAMETER;
                 break;
         }
@@ -765,9 +770,9 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg)
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unsupported address space: %X\n",
-                                  reg->address_space_id));
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported address space: %X",
+                            reg->address_space_id));
                 return (AE_BAD_PARAMETER);
         }
 
@@ -836,9 +841,9 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg)
                 break;
 
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unsupported address space: %X\n",
-                                  reg->address_space_id));
+                ACPI_ERROR((AE_INFO,
+                            "Unsupported address space: %X",
+                            reg->address_space_id));
                 return (AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index 34519069050c..89269272fd62 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -199,8 +199,8 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
 
         status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _SST failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "While executing method _SST"));
         }
 
         return_ACPI_STATUS(AE_OK);
@@ -232,9 +232,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
 
         if ((acpi_gbl_sleep_type_a > ACPI_SLEEP_TYPE_MAX) ||
             (acpi_gbl_sleep_type_b > ACPI_SLEEP_TYPE_MAX)) {
-                ACPI_REPORT_ERROR(("Sleep values out of range: A=%X B=%X\n",
-                                   acpi_gbl_sleep_type_a,
-                                   acpi_gbl_sleep_type_b));
+                ACPI_ERROR((AE_INFO, "Sleep values out of range: A=%X B=%X",
+                            acpi_gbl_sleep_type_a, acpi_gbl_sleep_type_b));
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
 
@@ -533,21 +532,18 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
         arg.integer.value = ACPI_SST_WAKING;
         status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _SST failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
         }
 
         arg.integer.value = sleep_state;
         status = acpi_evaluate_object(NULL, METHOD_NAME__BFS, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _BFS failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
         }
 
         status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _WAK failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
         }
         /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
 
@@ -582,8 +578,7 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
         arg.integer.value = ACPI_SST_WORKING;
         status = acpi_evaluate_object(NULL, METHOD_NAME__SST, &arg_list, NULL);
         if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-                ACPI_REPORT_ERROR(("Method _SST failed, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During Method _SST"));
         }
 
         return_ACPI_STATUS(status);
diff --git a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c
index aff6dc141784..fc10b7cb456f 100644
--- a/drivers/acpi/hardware/hwtimer.c
+++ b/drivers/acpi/hardware/hwtimer.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c
index e928e8c2c6ec..468244147ec1 100644
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@ -54,36 +54,36 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
 
         ACPI_FUNCTION_TRACE("acpi_reserve_io_ranges");
 
-        if (res->id == ACPI_RSTYPE_IO) {
+        if (res->type == ACPI_RESOURCE_TYPE_IO) {
                 struct acpi_resource_io *io_res = &res->data.io;
 
-                if (io_res->min_base_address != io_res->max_base_address)
+                if (io_res->minimum != io_res->maximum)
                         return_VALUE(AE_OK);
                 if (IS_RESERVED_ADDR
-                    (io_res->min_base_address, io_res->range_length)) {
+                    (io_res->minimum, io_res->address_length)) {
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                           "Motherboard resources 0x%08x - 0x%08x\n",
-                                          io_res->min_base_address,
-                                          io_res->min_base_address +
-                                          io_res->range_length));
+                                          io_res->minimum,
+                                          io_res->minimum +
+                                          io_res->address_length));
                         requested_res =
-                            request_region(io_res->min_base_address,
-                                           io_res->range_length, "motherboard");
+                            request_region(io_res->minimum,
+                                           io_res->address_length, "motherboard");
                 }
-        } else if (res->id == ACPI_RSTYPE_FIXED_IO) {
+        } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_IO) {
                 struct acpi_resource_fixed_io *fixed_io_res =
                     &res->data.fixed_io;
 
                 if (IS_RESERVED_ADDR
-                    (fixed_io_res->base_address, fixed_io_res->range_length)) {
+                    (fixed_io_res->address, fixed_io_res->address_length)) {
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                           "Motherboard resources 0x%08x - 0x%08x\n",
-                                          fixed_io_res->base_address,
-                                          fixed_io_res->base_address +
-                                          fixed_io_res->range_length));
+                                          fixed_io_res->address,
+                                          fixed_io_res->address +
+                                          fixed_io_res->address_length));
                         requested_res =
-                            request_region(fixed_io_res->base_address,
-                                           fixed_io_res->range_length,
+                            request_region(fixed_io_res->address,
+                                           fixed_io_res->address_length,
                                            "motherboard");
                 }
         } else {
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index edfbe34600f5..1149bc18fb35 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110,10 +110,9 @@ acpi_status acpi_ns_root_initialize(void)
                                         ACPI_NS_NO_UPSEARCH, NULL, &new_node);
 
                 if (ACPI_FAILURE(status) || (!new_node)) {      /* Must be on same line for code converter */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not create predefined name %s, %s\n",
-                                          init_val->name,
-                                          acpi_format_exception(status)));
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not create predefined name %s",
+                                        init_val->name));
                 }
 
                 /*
@@ -124,9 +123,9 @@ acpi_status acpi_ns_root_initialize(void)
                 if (init_val->val) {
                         status = acpi_os_predefined_override(init_val, &val);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Could not override predefined %s\n",
-                                                  init_val->name));
+                                ACPI_ERROR((AE_INFO,
+                                            "Could not override predefined %s",
+                                            init_val->name));
                         }
 
                         if (!val) {
@@ -233,7 +232,9 @@ acpi_status acpi_ns_root_initialize(void)
 
                         default:
 
-                                ACPI_REPORT_ERROR(("Unsupported initial type value %X\n", init_val->type));
+                                ACPI_ERROR((AE_INFO,
+                                            "Unsupported initial type value %X",
+                                            init_val->type));
                                 acpi_ut_remove_reference(obj_desc);
                                 obj_desc = NULL;
                                 continue;
@@ -339,7 +340,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                 prefix_node = scope_info->scope.node;
                 if (ACPI_GET_DESCRIPTOR_TYPE(prefix_node) !=
                     ACPI_DESC_TYPE_NAMED) {
-                        ACPI_REPORT_ERROR(("ns_lookup: %p is not a namespace node [%s]\n", prefix_node, acpi_ut_get_descriptor_name(prefix_node)));
+                        ACPI_ERROR((AE_INFO, "%p is not a namespace node [%s]",
+                                    prefix_node,
+                                    acpi_ut_get_descriptor_name(prefix_node)));
                         return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
 
@@ -429,7 +432,8 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                                 if (!this_node) {
                                         /* Current scope has no parent scope */
 
-                                        ACPI_REPORT_ERROR(("ACPI path has too many parent prefixes (^) - reached beyond root node\n"));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "ACPI path has too many parent prefixes (^) - reached beyond root node"));
                                         return_ACPI_STATUS(AE_NOT_FOUND);
                                 }
                         }
@@ -498,7 +502,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                         path++;
 
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-                                          "Multi Pathname (%d Segments, Flags=%X) \n",
+                                          "Multi Pathname (%d Segments, Flags=%X)\n",
                                           num_segments, flags));
                         break;
 
@@ -600,7 +604,12 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                     (this_node->type != type_to_check_for)) {
                         /* Complain about a type mismatch */
 
-                        ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", (char *)&simple_name, acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
+                        ACPI_WARNING((AE_INFO,
+                                      "ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)",
+                                      ACPI_CAST_PTR(char, &simple_name),
+                                      acpi_ut_get_type_name(this_node->type),
+                                      acpi_ut_get_type_name
+                                      (type_to_check_for)));
                 }
 
                 /*
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index cc7a85f8cfe6..9b871f38b61b 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -272,9 +272,8 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                 /* Grandchildren should have all been deleted already */
 
                 if (child_node->child) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Found a grandchild! P=%p C=%p\n",
-                                          parent_node, child_node));
+                        ACPI_ERROR((AE_INFO, "Found a grandchild! P=%p C=%p",
+                                    parent_node, child_node));
                 }
 
                 /* Now we can free this child object */
@@ -302,7 +301,9 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
                 /* There should be only one reference remaining on this node */
 
                 if (child_node->reference_count != 1) {
-                        ACPI_REPORT_WARNING(("Existing references (%d) on node being deleted (%p)\n", child_node->reference_count, child_node));
+                        ACPI_WARNING((AE_INFO,
+                                      "Existing references (%d) on node being deleted (%p)",
+                                      child_node->reference_count, child_node));
                 }
 
                 /* Now we can delete the node */
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 9faf1d5c86ed..a2807317a84b 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -198,12 +198,13 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                 /* Check the node type and name */
 
                 if (type > ACPI_TYPE_LOCAL_MAX) {
-                        ACPI_REPORT_WARNING(("Invalid ACPI Type %08X\n", type));
+                        ACPI_WARNING((AE_INFO, "Invalid ACPI Object Type %08X",
+                                      type));
                 }
 
                 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
-                        ACPI_REPORT_WARNING(("Invalid ACPI Name %08X\n",
-                                             this_node->name.integer));
+                        ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",
+                                      this_node->name.integer));
                 }
 
                 acpi_os_printf("%4.4s", acpi_ut_get_node_name(this_node));
@@ -212,7 +213,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
         /*
          * Now we can print out the pertinent information
          */
-        acpi_os_printf(" %-12s %p ", acpi_ut_get_type_name(type), this_node);
+        acpi_os_printf(" %-12s %p %2.2X ",
+                       acpi_ut_get_type_name(type), this_node,
+                       this_node->owner_id);
 
         dbg_level = acpi_dbg_level;
         acpi_dbg_level = 0;
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c
index 55de883943d6..aff899a935e3 100644
--- a/drivers/acpi/namespace/nsdumpdv.c
+++ b/drivers/acpi/namespace/nsdumpdv.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c
index 0191c7d92824..19d7b94d40c3 100644
--- a/drivers/acpi/namespace/nseval.c
+++ b/drivers/acpi/namespace/nseval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -373,8 +373,7 @@ acpi_ns_execute_control_method(struct acpi_parameter_info *info)
 
         info->obj_desc = acpi_ns_get_attached_object(info->node);
         if (!info->obj_desc) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No attached method object\n"));
+                ACPI_ERROR((AE_INFO, "No attached method object"));
 
                 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
                 return_ACPI_STATUS(AE_NULL_OBJECT);
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 0a08d2f04a06..9f929e479fd8 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,8 +93,7 @@ acpi_status acpi_ns_initialize_objects(void)
                                      ACPI_UINT32_MAX, acpi_ns_init_one_object,
                                      &info, NULL);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
@@ -159,12 +158,11 @@ acpi_status acpi_ns_initialize_devices(void)
         (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During walk_namespace"));
         }
 
         ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
-                              "\n%hd Devices found containing: %hd _STA, %hd _INI methods\n",
+                              "\n%hd Devices found - executed %hd _STA, %hd _INI methods\n",
                               info.device_count, info.num_STA, info.num_INI));
 
         return_ACPI_STATUS(status);
@@ -289,12 +287,10 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, "\n"));
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not execute arguments for [%4.4s] (%s), %s\n",
-                                  acpi_ut_get_node_name(node),
-                                  acpi_ut_get_type_name(type),
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not execute arguments for [%4.4s] (%s)",
+                                acpi_ut_get_node_name(node),
+                                acpi_ut_get_type_name(type)));
         }
 
         /*
@@ -336,23 +332,22 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
         struct acpi_parameter_info pinfo;
         u32 flags;
         acpi_status status;
+        struct acpi_namespace_node *ini_node;
+        struct acpi_namespace_node *device_node;
 
         ACPI_FUNCTION_TRACE("ns_init_one_device");
 
-        pinfo.parameters = NULL;
-        pinfo.parameter_type = ACPI_PARAM_ARGS;
-
-        pinfo.node = acpi_ns_map_handle_to_node(obj_handle);
-        if (!pinfo.node) {
+        device_node = acpi_ns_map_handle_to_node(obj_handle);
+        if (!device_node) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /*
          * We will run _STA/_INI on Devices, Processors and thermal_zones only
          */
-        if ((pinfo.node->type != ACPI_TYPE_DEVICE) &&
-            (pinfo.node->type != ACPI_TYPE_PROCESSOR) &&
-            (pinfo.node->type != ACPI_TYPE_THERMAL)) {
+        if ((device_node->type != ACPI_TYPE_DEVICE) &&
+            (device_node->type != ACPI_TYPE_PROCESSOR) &&
+            (device_node->type != ACPI_TYPE_THERMAL)) {
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -364,57 +359,69 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
         info->device_count++;
 
         /*
-         * Run _STA to determine if we can run _INI on the device.
+         * Check if the _INI method exists for this device -
+         * if _INI does not exist, there is no need to run _STA
+         * No _INI means device requires no initialization
+         */
+        status = acpi_ns_search_node(*ACPI_CAST_PTR(u32, METHOD_NAME__INI),
+                                     device_node, ACPI_TYPE_METHOD, &ini_node);
+        if (ACPI_FAILURE(status)) {
+                /* No _INI method found - move on to next device */
+
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /*
+         * Run _STA to determine if we can run _INI on the device -
+         * the device must be present before _INI can be run.
+         * However, _STA is not required - assume device present if no _STA
          */
         ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
-                                                      pinfo.node,
+                                                      device_node,
                                                       METHOD_NAME__STA));
-        status = acpi_ut_execute_STA(pinfo.node, &flags);
 
+        pinfo.node = device_node;
+        pinfo.parameters = NULL;
+        pinfo.parameter_type = ACPI_PARAM_ARGS;
+
+        status = acpi_ut_execute_STA(pinfo.node, &flags);
         if (ACPI_FAILURE(status)) {
-                if (pinfo.node->type == ACPI_TYPE_DEVICE) {
-                        /* Ignore error and move on to next device */
+                /* Ignore error and move on to next device */
 
-                        return_ACPI_STATUS(AE_OK);
-                }
+                return_ACPI_STATUS(AE_OK);
+        }
 
-                /* _STA is not required for Processor or thermal_zone objects */
-        } else {
+        if (flags != ACPI_UINT32_MAX) {
                 info->num_STA++;
+        }
 
-                if (!(flags & 0x01)) {
-                        /* Don't look at children of a not present device */
+        if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
+                /* Don't look at children of a not present device */
 
-                        return_ACPI_STATUS(AE_CTRL_DEPTH);
-                }
+                return_ACPI_STATUS(AE_CTRL_DEPTH);
         }
 
         /*
-         * The device is present. Run _INI.
+         * The device is present and _INI exists. Run the _INI method.
+         * (We already have the _INI node from above)
          */
         ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
                                                       pinfo.node,
                                                       METHOD_NAME__INI));
-        status = acpi_ns_evaluate_relative(METHOD_NAME__INI, &pinfo);
-        if (ACPI_FAILURE(status)) {
-                /* No _INI (AE_NOT_FOUND) means device requires no initialization */
 
-                if (status != AE_NOT_FOUND) {
-                        /* Ignore error and move on to next device */
+        pinfo.node = ini_node;
+        status = acpi_ns_evaluate_by_handle(&pinfo);
+        if (ACPI_FAILURE(status)) {
+                /* Ignore error and move on to next device */
 
 #ifdef ACPI_DEBUG_OUTPUT
-                        char *scope_name =
-                            acpi_ns_get_external_pathname(pinfo.node);
+                char *scope_name = acpi_ns_get_external_pathname(ini_node);
 
-                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n",
-                                          scope_name,
-                                          acpi_format_exception(status)));
+                ACPI_WARNING((AE_INFO, "%s._INI failed: %s",
+                              scope_name, acpi_format_exception(status)));
 
-                        ACPI_MEM_FREE(scope_name);
+                ACPI_MEM_FREE(scope_name);
 #endif
-                }
-
-                status = AE_OK;
         } else {
                 /* Delete any return object (especially if implicit_return is enabled) */
 
@@ -434,5 +441,5 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
                     acpi_gbl_init_handler(pinfo.node, ACPI_INIT_DEVICE_INI);
         }
 
-        return_ACPI_STATUS(status);
+        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index c28849de465a..4e0b0524c188 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,7 +92,7 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
         /* Check validity of the AML start and length */
 
         if (!table_desc->aml_start) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Null AML pointer\n"));
+                ACPI_ERROR((AE_INFO, "Null AML pointer"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -102,8 +102,8 @@ acpi_ns_load_table(struct acpi_table_desc *table_desc,
         /* Ignore table if there is no AML contained within */
 
         if (!table_desc->aml_length) {
-                ACPI_REPORT_WARNING(("Zero-length AML block in table [%4.4s]\n",
-                                     table_desc->pointer->signature));
+                ACPI_WARNING((AE_INFO, "Zero-length AML block in table [%4.4s]",
+                              table_desc->pointer->signature));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -263,7 +263,7 @@ acpi_status acpi_ns_load_namespace(void)
         /* There must be at least a DSDT installed */
 
         if (acpi_gbl_DSDT == NULL) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "DSDT is not in memory\n"));
+                ACPI_ERROR((AE_INFO, "DSDT is not in memory"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index d5e8dea61c27..639f653b4b6b 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
         acpi_size index;
         struct acpi_namespace_node *parent_node;
 
-        ACPI_FUNCTION_NAME("ns_build_external_path");
+        ACPI_FUNCTION_ENTRY();
 
         /* Special case for root */
 
@@ -110,9 +110,9 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node,
         name_buffer[index] = AML_ROOT_PREFIX;
 
         if (index != 0) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not construct pathname; index=%X, size=%X, Path=%s\n",
-                                  (u32) index, (u32) size, &name_buffer[size]));
+                ACPI_ERROR((AE_INFO,
+                            "Could not construct pathname; index=%X, size=%X, Path=%s",
+                            (u32) index, (u32) size, &name_buffer[size]));
         }
 
         return;
@@ -148,7 +148,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
         name_buffer = ACPI_MEM_CALLOCATE(size);
         if (!name_buffer) {
-                ACPI_REPORT_ERROR(("ns_get_table_pathname: allocation failure\n"));
+                ACPI_ERROR((AE_INFO, "Allocation failure"));
                 return_PTR(NULL);
         }
 
@@ -241,7 +241,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
 
         acpi_ns_build_external_path(node, required_size, buffer->pointer);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X] \n",
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n",
                           (char *)buffer->pointer, (u32) required_size));
         return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index fc9be946ebed..10ae6292bca4 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,22 +84,23 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
         if (!node) {
                 /* Invalid handle */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Null named_obj handle\n"));
+                ACPI_ERROR((AE_INFO, "Null named_obj handle"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         if (!object && (ACPI_TYPE_ANY != type)) {
                 /* Null object */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Null object, but type not ACPI_TYPE_ANY\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Null object, but type not ACPI_TYPE_ANY"));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) {
                 /* Not a name handle */
 
-                ACPI_REPORT_ERROR(("ns_attach_object: Invalid handle %p [%s]\n",
-                                   node, acpi_ut_get_descriptor_name(node)));
+                ACPI_ERROR((AE_INFO, "Invalid handle %p [%s]",
+                            node, acpi_ut_get_descriptor_name(node)));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -254,7 +255,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
         ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node);
 
         if (!node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Null Node ptr\n"));
+                ACPI_WARNING((AE_INFO, "Null Node ptr"));
                 return_PTR(NULL);
         }
 
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 433442a9ec74..232be4303653 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 50a3ca5470ed..d64b78952f24 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -99,8 +99,8 @@ acpi_ns_search_node(u32 target_name,
                 if (scope_name) {
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                           "Searching %s (%p) For [%4.4s] (%s)\n",
-                                          scope_name, node,
-                                          (char *)&target_name,
+                                          scope_name, node, ACPI_CAST_PTR(char,
+                                                                          &target_name),
                                           acpi_ut_get_type_name(type)));
 
                         ACPI_MEM_FREE(scope_name);
@@ -131,7 +131,7 @@ acpi_ns_search_node(u32 target_name,
                          */
                         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                           "Name [%4.4s] (%s) %p found in scope [%4.4s] %p\n",
-                                          (char *)&target_name,
+                                          ACPI_CAST_PTR(char, &target_name),
                                           acpi_ut_get_type_name(next_node->
                                                                 type),
                                           next_node,
@@ -160,7 +160,8 @@ acpi_ns_search_node(u32 target_name,
 
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "Name [%4.4s] (%s) not found in search in scope [%4.4s] %p first child %p\n",
-                          (char *)&target_name, acpi_ut_get_type_name(type),
+                          ACPI_CAST_PTR(char, &target_name),
+                          acpi_ut_get_type_name(type),
                           acpi_ut_get_node_name(node), node, node->child));
 
         return_ACPI_STATUS(AE_NOT_FOUND);
@@ -210,14 +211,14 @@ acpi_ns_search_parent_tree(u32 target_name,
          */
         if (!parent_node) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES, "[%4.4s] has no parent\n",
-                                  (char *)&target_name));
+                                  ACPI_CAST_PTR(char, &target_name)));
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
 
         if (acpi_ns_local(type)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                   "[%4.4s] type [%s] must be local to this scope (no parent search)\n",
-                                  (char *)&target_name,
+                                  ACPI_CAST_PTR(char, &target_name),
                                   acpi_ut_get_type_name(type)));
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
@@ -227,7 +228,7 @@ acpi_ns_search_parent_tree(u32 target_name,
         ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                           "Searching parent [%4.4s] for [%4.4s]\n",
                           acpi_ut_get_node_name(parent_node),
-                          (char *)&target_name));
+                          ACPI_CAST_PTR(char, &target_name)));
 
         /*
          * Search parents until target is found or we have backed up to the root
@@ -297,18 +298,17 @@ acpi_ns_search_and_enter(u32 target_name,
         /* Parameter validation */
 
         if (!node || !target_name || !return_node) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Null param: Node %p Name %X return_node %p\n",
-                                  node, target_name, return_node));
-
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Null parameter\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Null param: Node %p Name %X return_node %p",
+                            node, target_name, return_node));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /* Name must consist of printable characters */
 
         if (!acpi_ut_valid_acpi_name(target_name)) {
-                ACPI_REPORT_ERROR(("ns_search_and_enter: Bad character in ACPI Name: %X\n", target_name));
+                ACPI_ERROR((AE_INFO, "Bad character in ACPI Name: %X",
+                            target_name));
                 return_ACPI_STATUS(AE_BAD_CHARACTER);
         }
 
@@ -360,7 +360,7 @@ acpi_ns_search_and_enter(u32 target_name,
         if (interpreter_mode == ACPI_IMODE_EXECUTE) {
                 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                   "%4.4s Not found in %p [Not adding]\n",
-                                  (char *)&target_name, node));
+                                  ACPI_CAST_PTR(char, &target_name), node));
 
                 return_ACPI_STATUS(AE_NOT_FOUND);
         }
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index ebec036423c9..3e7cad549a38 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,6 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
  *              internal_name       - Name or path of the namespace node
  *              lookup_status       - Exception code from NS lookup
  *
@@ -76,19 +75,17 @@ acpi_name acpi_ns_find_parent_name(struct acpi_namespace_node *node_to_search);
 void
 acpi_ns_report_error(char *module_name,
                      u32 line_number,
-                     u32 component_id,
                      char *internal_name, acpi_status lookup_status)
 {
         acpi_status status;
         char *name = NULL;
 
-        acpi_os_printf("%8s-%04d: *** Error: Looking up ",
-                       module_name, line_number);
+        acpi_ut_report_error(module_name, line_number);
 
         if (lookup_status == AE_BAD_CHARACTER) {
                 /* There is a non-ascii character in the name */
 
-                acpi_os_printf("[0x%4.4X] (NON-ASCII)\n",
+                acpi_os_printf("[0x%4.4X] (NON-ASCII)",
                                *(ACPI_CAST_PTR(u32, internal_name)));
         } else {
                 /* Convert path to external format */
@@ -109,7 +106,7 @@ acpi_ns_report_error(char *module_name,
                 }
         }
 
-        acpi_os_printf(" in namespace, %s\n",
+        acpi_os_printf(" Namespace lookup failure, %s\n",
                        acpi_format_exception(lookup_status));
 }
 
@@ -119,10 +116,9 @@ acpi_ns_report_error(char *module_name,
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
  *              Message             - Error message to use on failure
  *              prefix_node         - Prefix relative to the path
- *              Path                - Path to the node
+ *              Path                - Path to the node (optional)
  *              method_status       - Execution status
  *
  * RETURN:      None
@@ -134,7 +130,6 @@ acpi_ns_report_error(char *module_name,
 void
 acpi_ns_report_method_error(char *module_name,
                             u32 line_number,
-                            u32 component_id,
                             char *message,
                             struct acpi_namespace_node *prefix_node,
                             char *path, acpi_status method_status)
@@ -142,17 +137,16 @@ acpi_ns_report_method_error(char *module_name,
         acpi_status status;
         struct acpi_namespace_node *node = prefix_node;
 
+        acpi_ut_report_error(module_name, line_number);
+
         if (path) {
                 status = acpi_ns_get_node_by_path(path, prefix_node,
                                                   ACPI_NS_NO_UPSEARCH, &node);
                 if (ACPI_FAILURE(status)) {
-                        acpi_os_printf
-                            ("report_method_error: Could not get node\n");
-                        return;
+                        acpi_os_printf("[Could not get node by pathname]");
                 }
         }
 
-        acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number);
         acpi_ns_print_node_pathname(node, message);
         acpi_os_printf(", %s\n", acpi_format_exception(method_status));
 }
@@ -248,11 +242,11 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
         ACPI_FUNCTION_TRACE("ns_get_type");
 
         if (!node) {
-                ACPI_REPORT_WARNING(("ns_get_type: Null Node input pointer\n"));
-                return_VALUE(ACPI_TYPE_ANY);
+                ACPI_WARNING((AE_INFO, "Null Node parameter"));
+                return_UINT32(ACPI_TYPE_ANY);
         }
 
-        return_VALUE((acpi_object_type) node->type);
+        return_UINT32((acpi_object_type) node->type);
 }
 
 /*******************************************************************************
@@ -275,11 +269,11 @@ u32 acpi_ns_local(acpi_object_type type)
         if (!acpi_ut_valid_object_type(type)) {
                 /* Type code out of range  */
 
-                ACPI_REPORT_WARNING(("ns_local: Invalid Object Type\n"));
-                return_VALUE(ACPI_NS_NORMAL);
+                ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));
+                return_UINT32(ACPI_NS_NORMAL);
         }
 
-        return_VALUE((u32) acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
+        return_UINT32((u32) acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
 }
 
 /*******************************************************************************
@@ -627,7 +621,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
          * with internal_name (invalid format).
          */
         if (required_length > internal_name_length) {
-                ACPI_REPORT_ERROR(("ns_externalize_name: Invalid internal name\n"));
+                ACPI_ERROR((AE_INFO, "Invalid internal name"));
                 return_ACPI_STATUS(AE_BAD_PATHNAME);
         }
 
@@ -803,12 +797,11 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
         if (!acpi_ut_valid_object_type(type)) {
                 /* type code out of range  */
 
-                ACPI_REPORT_WARNING(("ns_opens_scope: Invalid Object Type %X\n",
-                                     type));
-                return_VALUE(ACPI_NS_NORMAL);
+                ACPI_WARNING((AE_INFO, "Invalid Object Type %X", type));
+                return_UINT32(ACPI_NS_NORMAL);
         }
 
-        return_VALUE(((u32) acpi_gbl_ns_properties[type]) & ACPI_NS_NEWSCOPE);
+        return_UINT32(((u32) acpi_gbl_ns_properties[type]) & ACPI_NS_NEWSCOPE);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c
index 5f164c0df33b..fcab1e784b81 100644
--- a/drivers/acpi/namespace/nswalk.c
+++ b/drivers/acpi/namespace/nswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index c07b046659ff..a95f636dc35d 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -112,8 +112,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
         if (return_buffer->length == 0) {
                 /* Error because caller specifically asked for a return value */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No return value\n"));
-
+                ACPI_ERROR((AE_INFO, "No return value"));
                 return_ACPI_STATUS(AE_NULL_OBJECT);
         }
 
@@ -125,11 +124,11 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
         /* Return object type does not match requested type */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                          "Incorrect return type [%s] requested [%s]\n",
-                          acpi_ut_get_type_name(((union acpi_object *)
-                                                 return_buffer->pointer)->type),
-                          acpi_ut_get_type_name(return_type)));
+        ACPI_ERROR((AE_INFO,
+                    "Incorrect return type [%s] requested [%s]",
+                    acpi_ut_get_type_name(((union acpi_object *)return_buffer->
+                                           pointer)->type),
+                    acpi_ut_get_type_name(return_type)));
 
         if (must_free) {
                 /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
@@ -236,11 +235,11 @@ acpi_evaluate_object(acpi_handle handle,
                  * qualified names above, this is an error
                  */
                 if (!pathname) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Both Handle and Pathname are NULL\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Both Handle and Pathname are NULL"));
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Handle is NULL and Pathname is relative\n"));
+                        ACPI_ERROR((AE_INFO,
+                                    "Handle is NULL and Pathname is relative"));
                 }
 
                 status = AE_BAD_PARAMETER;
@@ -399,7 +398,7 @@ acpi_walk_namespace(acpi_object_type type,
 
         /* Parameter validation */
 
-        if ((type > ACPI_TYPE_EXTERNAL_MAX) || (!max_depth) || (!user_function)) {
+        if ((type > ACPI_TYPE_LOCAL_MAX) || (!max_depth) || (!user_function)) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -473,8 +472,8 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                 return (AE_CTRL_DEPTH);
         }
 
-        if (!(flags & 0x01)) {
-                /* Don't return at the device or children of the device if not there */
+        if (!(flags & ACPI_STA_DEVICE_PRESENT)) {
+                /* Don't examine children of the device if not present */
 
                 return (AE_CTRL_DEPTH);
         }
diff --git a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c
index 6b5f8d4481d1..8cd8675a47c0 100644
--- a/drivers/acpi/namespace/nsxfname.c
+++ b/drivers/acpi/namespace/nsxfname.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -300,8 +300,7 @@ acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
 
                 status = acpi_ut_execute_CID(node, &cid_list);
                 if (ACPI_SUCCESS(status)) {
-                        size += ((acpi_size) cid_list->count - 1) *
-                            sizeof(struct acpi_compatible_id);
+                        size += cid_list->size;
                         info->valid |= ACPI_VALID_CID;
                 }
 
diff --git a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c
index 0856d42e6909..a0332595677a 100644
--- a/drivers/acpi/namespace/nsxfobj.c
+++ b/drivers/acpi/namespace/nsxfobj.c
@@ -6,7 +6,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 20c9a37643c7..ac5bbaedac1b 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -838,7 +838,7 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
                         static const int quantum_ms = 1000 / HZ;
 
                         ret = down_trylock(sem);
-                        for (i = timeout; (i > 0 && ret < 0); i -= quantum_ms) {
+                        for (i = timeout; (i > 0 && ret != 0); i -= quantum_ms) {
                                 schedule_timeout_interruptible(1);
                                 ret = down_trylock(sem);
                         }
@@ -1060,13 +1060,11 @@ EXPORT_SYMBOL(max_cstate);
  * Acquire a spinlock.
  *
  * handle is a pointer to the spinlock_t.
- * flags is *not* the result of save_flags - it is an ACPI-specific flag variable
- *   that indicates whether we are at interrupt level.
  */
 
-unsigned long acpi_os_acquire_lock(acpi_handle handle)
+acpi_cpu_flags acpi_os_acquire_lock(acpi_handle handle)
 {
-        unsigned long flags;
+        acpi_cpu_flags flags;
         spin_lock_irqsave((spinlock_t *) handle, flags);
         return flags;
 }
@@ -1075,7 +1073,7 @@ unsigned long acpi_os_acquire_lock(acpi_handle handle)
  * Release a spinlock. See above.
  */
 
-void acpi_os_release_lock(acpi_handle handle, unsigned long flags)
+void acpi_os_release_lock(acpi_handle handle, acpi_cpu_flags flags)
 {
         spin_unlock_irqrestore((spinlock_t *) handle, flags);
 }
diff --git a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c
index 5858188f94a6..de573be52718 100644
--- a/drivers/acpi/parser/psargs.c
+++ b/drivers/acpi/parser/psargs.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
 #include <acpi/acparser.h>
 #include <acpi/amlcode.h>
 #include <acpi/acnamesp.h>
+#include <acpi/acdispat.h>
 
 #define _COMPONENT          ACPI_PARSER
 ACPI_MODULE_NAME("psargs")
@@ -62,61 +63,51 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
  *
  * PARAMETERS:  parser_state        - Current parser state object
  *
- * RETURN:      Decoded package length.  On completion, the AML pointer points
+ * RETURN:      Decoded package length. On completion, the AML pointer points
  *              past the length byte or bytes.
  *
- * DESCRIPTION: Decode and return a package length field
+ * DESCRIPTION: Decode and return a package length field.
+ *              Note: Largest package length is 28 bits, from ACPI specification
  *
  ******************************************************************************/
 
 static u32
 acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
 {
-        u32 encoded_length;
-        u32 length = 0;
+        u8 *aml = parser_state->aml;
+        u32 package_length = 0;
+        acpi_native_uint byte_count;
+        u8 byte_zero_mask = 0x3F;       /* Default [0:5] */
 
         ACPI_FUNCTION_TRACE("ps_get_next_package_length");
 
-        encoded_length = (u32) ACPI_GET8(parser_state->aml);
-        parser_state->aml++;
-
-        switch (encoded_length >> 6) {  /* bits 6-7 contain encoding scheme */
-        case 0:         /* 1-byte encoding (bits 0-5) */
-
-                length = (encoded_length & 0x3F);
-                break;
-
-        case 1:         /* 2-byte encoding (next byte + bits 0-3) */
-
-                length = ((ACPI_GET8(parser_state->aml) << 04) |
-                          (encoded_length & 0x0F));
-                parser_state->aml++;
-                break;
-
-        case 2:         /* 3-byte encoding (next 2 bytes + bits 0-3) */
-
-                length = ((ACPI_GET8(parser_state->aml + 1) << 12) |
-                          (ACPI_GET8(parser_state->aml) << 04) |
-                          (encoded_length & 0x0F));
-                parser_state->aml += 2;
-                break;
+        /*
+         * Byte 0 bits [6:7] contain the number of additional bytes
+         * used to encode the package length, either 0,1,2, or 3
+         */
+        byte_count = (aml[0] >> 6);
+        parser_state->aml += (byte_count + 1);
 
-        case 3:         /* 4-byte encoding (next 3 bytes + bits 0-3) */
+        /* Get bytes 3, 2, 1 as needed */
 
-                length = ((ACPI_GET8(parser_state->aml + 2) << 20) |
-                          (ACPI_GET8(parser_state->aml + 1) << 12) |
-                          (ACPI_GET8(parser_state->aml) << 04) |
-                          (encoded_length & 0x0F));
-                parser_state->aml += 3;
-                break;
-
-        default:
+        while (byte_count) {
+                /*
+                 * Final bit positions for the package length bytes:
+                 *      Byte3->[20:27]
+                 *      Byte2->[12:19]
+                 *      Byte1->[04:11]
+                 *      Byte0->[00:03]
+                 */
+                package_length |= (aml[byte_count] << ((byte_count << 3) - 4));
 
-                /* Can't get here, only 2 bits / 4 cases */
-                break;
+                byte_zero_mask = 0x0F;  /* Use bits [0:3] of byte 0 */
+                byte_count--;
         }
 
-        return_VALUE(length);
+        /* Byte 0 is a special case, either bits [0:3] or [0:5] are used */
+
+        package_length |= (aml[0] & byte_zero_mask);
+        return_UINT32(package_length);
 }
 
 /*******************************************************************************
@@ -135,16 +126,15 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
 u8 *acpi_ps_get_next_package_end(struct acpi_parse_state *parser_state)
 {
         u8 *start = parser_state->aml;
-        acpi_native_uint length;
+        u32 package_length;
 
         ACPI_FUNCTION_TRACE("ps_get_next_package_end");
 
-        /* Function below changes parser_state->Aml */
+        /* Function below updates parser_state->Aml */
 
-        length =
-            (acpi_native_uint) acpi_ps_get_next_package_length(parser_state);
+        package_length = acpi_ps_get_next_package_length(parser_state);
 
-        return_PTR(start + length);     /* end of package */
+        return_PTR(start + package_length);     /* end of package */
 }
 
 /*******************************************************************************
@@ -169,17 +159,15 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
 
         ACPI_FUNCTION_TRACE("ps_get_next_namestring");
 
-        /* Handle multiple prefix characters */
-
-        while (acpi_ps_is_prefix_char(ACPI_GET8(end))) {
-                /* Include prefix '\\' or '^' */
+        /* Point past any namestring prefix characters (backslash or carat) */
 
+        while (acpi_ps_is_prefix_char(*end)) {
                 end++;
         }
 
-        /* Decode the path */
+        /* Decode the path prefix character */
 
-        switch (ACPI_GET8(end)) {
+        switch (*end) {
         case 0:
 
                 /* null_name */
@@ -199,9 +187,9 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
 
         case AML_MULTI_NAME_PREFIX_OP:
 
-                /* Multiple name segments, 4 chars each */
+                /* Multiple name segments, 4 chars each, count in next byte */
 
-                end += 2 + ((acpi_size) ACPI_GET8(end + 1) * ACPI_NAME_SIZE);
+                end += 2 + (*(end + 1) * ACPI_NAME_SIZE);
                 break;
 
         default:
@@ -212,7 +200,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
                 break;
         }
 
-        parser_state->aml = (u8 *) end;
+        parser_state->aml = end;
         return_PTR((char *)start);
 }
 
@@ -224,7 +212,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
  *              Arg                 - Where the namepath will be stored
  *              arg_count           - If the namepath points to a control method
  *                                    the method's argument is returned here.
- *              method_call         - Whether the namepath can possibly be the
+ *              possible_method_call - Whether the namepath can possibly be the
  *                                    start of a method call
  *
  * RETURN:      Status
@@ -240,11 +228,11 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
 acpi_status
 acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
                           struct acpi_parse_state *parser_state,
-                          union acpi_parse_object *arg, u8 method_call)
+                          union acpi_parse_object *arg, u8 possible_method_call)
 {
         char *path;
         union acpi_parse_object *name_op;
-        acpi_status status = AE_OK;
+        acpi_status status;
         union acpi_operand_object *method_desc;
         struct acpi_namespace_node *node;
         union acpi_generic_state scope_info;
@@ -252,115 +240,129 @@ acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
         ACPI_FUNCTION_TRACE("ps_get_next_namepath");
 
         path = acpi_ps_get_next_namestring(parser_state);
+        acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP);
 
-        /* Null path case is allowed */
+        /* Null path case is allowed, just exit */
 
-        if (path) {
-                /*
-                 * Lookup the name in the internal namespace
-                 */
-                scope_info.scope.node = NULL;
-                node = parser_state->start_node;
-                if (node) {
-                        scope_info.scope.node = node;
-                }
+        if (!path) {
+                arg->common.value.name = path;
+                return_ACPI_STATUS(AE_OK);
+        }
 
-                /*
-                 * Lookup object.  We don't want to add anything new to the namespace
-                 * here, however.  So we use MODE_EXECUTE.  Allow searching of the
-                 * parent tree, but don't open a new scope -- we just want to lookup the
-                 * object  (MUST BE mode EXECUTE to perform upsearch)
-                 */
-                status = acpi_ns_lookup(&scope_info, path, ACPI_TYPE_ANY,
-                                        ACPI_IMODE_EXECUTE,
-                                        ACPI_NS_SEARCH_PARENT |
-                                        ACPI_NS_DONT_OPEN_SCOPE, NULL, &node);
-                if (ACPI_SUCCESS(status) && method_call) {
-                        if (node->type == ACPI_TYPE_METHOD) {
-                                /* This name is actually a control method invocation */
-
-                                method_desc = acpi_ns_get_attached_object(node);
-                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                                  "Control Method - %p Desc %p Path=%p\n",
-                                                  node, method_desc, path));
-
-                                name_op = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
-                                if (!name_op) {
-                                        return_ACPI_STATUS(AE_NO_MEMORY);
-                                }
+        /* Setup search scope info */
 
-                                /* Change arg into a METHOD CALL and attach name to it */
+        scope_info.scope.node = NULL;
+        node = parser_state->start_node;
+        if (node) {
+                scope_info.scope.node = node;
+        }
 
-                                acpi_ps_init_op(arg, AML_INT_METHODCALL_OP);
-                                name_op->common.value.name = path;
+        /*
+         * Lookup the name in the internal namespace. We don't want to add
+         * anything new to the namespace here, however, so we use MODE_EXECUTE.
+         * Allow searching of the parent tree, but don't open a new scope -
+         * we just want to lookup the object (must be mode EXECUTE to perform
+         * the upsearch)
+         */
+        status =
+            acpi_ns_lookup(&scope_info, path, ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
+                           ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
+                           NULL, &node);
 
-                                /* Point METHODCALL/NAME to the METHOD Node */
+        /*
+         * If this name is a control method invocation, we must
+         * setup the method call
+         */
+        if (ACPI_SUCCESS(status) &&
+            possible_method_call && (node->type == ACPI_TYPE_METHOD)) {
+                /* This name is actually a control method invocation */
 
-                                name_op->common.node = node;
-                                acpi_ps_append_arg(arg, name_op);
+                method_desc = acpi_ns_get_attached_object(node);
+                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                  "Control Method - %p Desc %p Path=%p\n", node,
+                                  method_desc, path));
 
-                                if (!method_desc) {
-                                        ACPI_REPORT_ERROR(("ps_get_next_namepath: Control Method %p has no attached object\n", node));
-                                        return_ACPI_STATUS(AE_AML_INTERNAL);
-                                }
+                name_op = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP);
+                if (!name_op) {
+                        return_ACPI_STATUS(AE_NO_MEMORY);
+                }
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
-                                                  "Control Method - %p Args %X\n",
-                                                  node,
-                                                  method_desc->method.
-                                                  param_count));
+                /* Change Arg into a METHOD CALL and attach name to it */
 
-                                /* Get the number of arguments to expect */
+                acpi_ps_init_op(arg, AML_INT_METHODCALL_OP);
+                name_op->common.value.name = path;
 
-                                walk_state->arg_count =
-                                    method_desc->method.param_count;
-                                return_ACPI_STATUS(AE_OK);
-                        }
+                /* Point METHODCALL/NAME to the METHOD Node */
 
-                        /*
-                         * Else this is normal named object reference.
-                         * Just init the NAMEPATH object with the pathname.
-                         * (See code below)
-                         */
-                }
+                name_op->common.node = node;
+                acpi_ps_append_arg(arg, name_op);
 
-                if (ACPI_FAILURE(status)) {
-                        /*
-                         * 1) Any error other than NOT_FOUND is always severe
-                         * 2) NOT_FOUND is only important if we are executing a method.
-                         * 3) If executing a cond_ref_of opcode, NOT_FOUND is ok.
-                         */
-                        if ((((walk_state->
-                               parse_flags & ACPI_PARSE_MODE_MASK) ==
-                              ACPI_PARSE_EXECUTE) && (status == AE_NOT_FOUND)
-                             && (walk_state->op->common.aml_opcode !=
-                                 AML_COND_REF_OF_OP))
-                            || (status != AE_NOT_FOUND)) {
-                                ACPI_REPORT_NSERROR(path, status);
-
-                                acpi_os_printf
-                                    ("search_node %p start_node %p return_node %p\n",
-                                     scope_info.scope.node,
-                                     parser_state->start_node, node);
-
-                        } else {
-                                /*
-                                 * We got a NOT_FOUND during table load or we encountered
-                                 * a cond_ref_of(x) where the target does not exist.
-                                 * Either case is ok
-                                 */
-                                status = AE_OK;
-                        }
+                if (!method_desc) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Control Method %p has no attached object",
+                                    node));
+                        return_ACPI_STATUS(AE_AML_INTERNAL);
                 }
+
+                ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
+                                  "Control Method - %p Args %X\n",
+                                  node, method_desc->method.param_count));
+
+                /* Get the number of arguments to expect */
+
+                walk_state->arg_count = method_desc->method.param_count;
+                return_ACPI_STATUS(AE_OK);
         }
 
         /*
-         * Regardless of success/failure above,
-         * Just initialize the Op with the pathname.
+         * Special handling if the name was not found during the lookup -
+         * some not_found cases are allowed
          */
-        acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP);
-        arg->common.value.name = path;
+        if (status == AE_NOT_FOUND) {
+                /* 1) not_found is ok during load pass 1/2 (allow forward references) */
+
+                if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) !=
+                    ACPI_PARSE_EXECUTE) {
+                        status = AE_OK;
+                }
+
+                /* 2) not_found during a cond_ref_of(x) is ok by definition */
+
+                else if (walk_state->op->common.aml_opcode ==
+                         AML_COND_REF_OF_OP) {
+                        status = AE_OK;
+                }
+
+                /*
+                 * 3) not_found while building a Package is ok at this point, we
+                 * may flag as an error later if slack mode is not enabled.
+                 * (Some ASL code depends on allowing this behavior)
+                 */
+                else if ((arg->common.parent) &&
+                         ((arg->common.parent->common.aml_opcode ==
+                           AML_PACKAGE_OP)
+                          || (arg->common.parent->common.aml_opcode ==
+                              AML_VAR_PACKAGE_OP))) {
+                        status = AE_OK;
+                }
+        }
+
+        /* Final exception check (may have been changed from code above) */
 
+        if (ACPI_FAILURE(status)) {
+                ACPI_ERROR_NAMESPACE(path, status);
+
+                if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
+                    ACPI_PARSE_EXECUTE) {
+                        /* Report a control method execution error */
+
+                        status = acpi_ds_method_error(status, walk_state);
+                }
+        }
+
+        /* Save the namepath */
+
+        arg->common.value.name = path;
         return_ACPI_STATUS(status);
 }
 
@@ -382,59 +384,63 @@ void
 acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
                             u32 arg_type, union acpi_parse_object *arg)
 {
+        u32 length;
+        u16 opcode;
+        u8 *aml = parser_state->aml;
 
         ACPI_FUNCTION_TRACE_U32("ps_get_next_simple_arg", arg_type);
 
         switch (arg_type) {
         case ARGP_BYTEDATA:
 
-                acpi_ps_init_op(arg, AML_BYTE_OP);
-                arg->common.value.integer = (u32) ACPI_GET8(parser_state->aml);
-                parser_state->aml++;
+                /* Get 1 byte from the AML stream */
+
+                opcode = AML_BYTE_OP;
+                arg->common.value.integer = (acpi_integer) * aml;
+                length = 1;
                 break;
 
         case ARGP_WORDDATA:
 
-                acpi_ps_init_op(arg, AML_WORD_OP);
-
                 /* Get 2 bytes from the AML stream */
 
-                ACPI_MOVE_16_TO_32(&arg->common.value.integer,
-                                   parser_state->aml);
-                parser_state->aml += 2;
+                opcode = AML_WORD_OP;
+                ACPI_MOVE_16_TO_64(&arg->common.value.integer, aml);
+                length = 2;
                 break;
 
         case ARGP_DWORDDATA:
 
-                acpi_ps_init_op(arg, AML_DWORD_OP);
-
                 /* Get 4 bytes from the AML stream */
 
-                ACPI_MOVE_32_TO_32(&arg->common.value.integer,
-                                   parser_state->aml);
-                parser_state->aml += 4;
+                opcode = AML_DWORD_OP;
+                ACPI_MOVE_32_TO_64(&arg->common.value.integer, aml);
+                length = 4;
                 break;
 
         case ARGP_QWORDDATA:
 
-                acpi_ps_init_op(arg, AML_QWORD_OP);
-
                 /* Get 8 bytes from the AML stream */
 
-                ACPI_MOVE_64_TO_64(&arg->common.value.integer,
-                                   parser_state->aml);
-                parser_state->aml += 8;
+                opcode = AML_QWORD_OP;
+                ACPI_MOVE_64_TO_64(&arg->common.value.integer, aml);
+                length = 8;
                 break;
 
         case ARGP_CHARLIST:
 
-                acpi_ps_init_op(arg, AML_STRING_OP);
-                arg->common.value.string = (char *)parser_state->aml;
+                /* Get a pointer to the string, point past the string */
+
+                opcode = AML_STRING_OP;
+                arg->common.value.string = ACPI_CAST_PTR(char, aml);
 
-                while (ACPI_GET8(parser_state->aml) != '\0') {
-                        parser_state->aml++;
+                /* Find the null terminator */
+
+                length = 0;
+                while (aml[length]) {
+                        length++;
                 }
-                parser_state->aml++;
+                length++;
                 break;
 
         case ARGP_NAME:
@@ -443,14 +449,16 @@ acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
                 acpi_ps_init_op(arg, AML_INT_NAMEPATH_OP);
                 arg->common.value.name =
                     acpi_ps_get_next_namestring(parser_state);
-                break;
+                return_VOID;
 
         default:
 
-                ACPI_REPORT_ERROR(("Invalid arg_type %X\n", arg_type));
-                break;
+                ACPI_ERROR((AE_INFO, "Invalid arg_type %X", arg_type));
+                return_VOID;
         }
 
+        acpi_ps_init_op(arg, opcode);
+        parser_state->aml += length;
         return_VOID;
 }
 
@@ -540,7 +548,7 @@ static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state
                  * access_type is first operand, access_attribute is second
                  */
                 field->common.value.integer =
-                    (ACPI_GET8(parser_state->aml) << 8);
+                    (((u32) ACPI_GET8(parser_state->aml) << 8));
                 parser_state->aml++;
                 field->common.value.integer |= ACPI_GET8(parser_state->aml);
                 parser_state->aml++;
@@ -703,7 +711,7 @@ acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
 
         default:
 
-                ACPI_REPORT_ERROR(("Invalid arg_type: %X\n", arg_type));
+                ACPI_ERROR((AE_INFO, "Invalid arg_type: %X", arg_type));
                 status = AE_AML_OPERAND_TYPE;
                 break;
         }
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index 088d33999d90..00b072e15d19 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,16 +123,12 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                     && ((status & AE_CODE_MASK) !=
                                         AE_CODE_CONTROL)) {
                                         if (status == AE_AML_NO_RETURN_VALUE) {
-                                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                                  "Invoked method did not return a value, %s\n",
-                                                                  acpi_format_exception
-                                                                  (status)));
+                                                ACPI_EXCEPTION((AE_INFO, status,
+                                                                "Invoked method did not return a value"));
 
                                         }
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "get_predicate Failed, %s\n",
-                                                          acpi_format_exception
-                                                          (status)));
+                                        ACPI_EXCEPTION((AE_INFO, status,
+                                                        "get_predicate Failed"));
                                         return_ACPI_STATUS(status);
                                 }
 
@@ -190,11 +186,11 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
 
                                 /* The opcode is unrecognized.  Just skip unknown opcodes */
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Found unknown opcode %X at AML address %p offset %X, ignoring\n",
-                                                  walk_state->opcode,
-                                                  parser_state->aml,
-                                                  walk_state->aml_offset));
+                                ACPI_ERROR((AE_INFO,
+                                            "Found unknown opcode %X at AML address %p offset %X, ignoring",
+                                            walk_state->opcode,
+                                            parser_state->aml,
+                                            walk_state->aml_offset));
 
                                 ACPI_DUMP_BUFFER(parser_state->aml, 128);
 
@@ -281,10 +277,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                     walk_state->descending_callback(walk_state,
                                                                     &op);
                                 if (ACPI_FAILURE(status)) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "During name lookup/catalog, %s\n",
-                                                          acpi_format_exception
-                                                          (status)));
+                                        ACPI_EXCEPTION((AE_INFO, status,
+                                                        "During name lookup/catalog"));
                                         goto close_this_op;
                                 }
 
@@ -704,6 +698,15 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
                                 acpi_ps_pop_scope(parser_state, &op,
                                                   &walk_state->arg_types,
                                                   &walk_state->arg_count);
+
+                                if (op->common.aml_opcode != AML_WHILE_OP) {
+                                        status2 =
+                                            acpi_ds_result_stack_pop
+                                            (walk_state);
+                                        if (ACPI_FAILURE(status2)) {
+                                                return_ACPI_STATUS(status2);
+                                        }
+                                }
                         }
 
                         /* Close this iteration of the While loop */
diff --git a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c
index 229ae86afe8b..11d6351ab8b2 100644
--- a/drivers/acpi/parser/psopcode.c
+++ b/drivers/acpi/parser/psopcode.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -747,7 +747,7 @@ const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
 
         /* Unknown AML opcode */
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                           "Unknown AML opcode [%4.4X]\n", opcode));
 
         return (&acpi_gbl_aml_op_info[_UNK]);
diff --git a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c
index 76d4d640d83c..a9f3229f4106 100644
--- a/drivers/acpi/parser/psparse.c
+++ b/drivers/acpi/parser/psparse.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -333,7 +333,6 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 
         switch (callback_status) {
         case AE_CTRL_TERMINATE:
-
                 /*
                  * A control method was terminated via a RETURN statement.
                  * The walk of this method is complete.
@@ -346,13 +345,19 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 
                 parser_state->aml = walk_state->aml_last_while;
                 walk_state->control_state->common.value = FALSE;
-                status = AE_CTRL_BREAK;
+                status = acpi_ds_result_stack_pop(walk_state);
+                if (ACPI_SUCCESS(status)) {
+                        status = AE_CTRL_BREAK;
+                }
                 break;
 
         case AE_CTRL_CONTINUE:
 
                 parser_state->aml = walk_state->aml_last_while;
-                status = AE_CTRL_CONTINUE;
+                status = acpi_ds_result_stack_pop(walk_state);
+                if (ACPI_SUCCESS(status)) {
+                        status = AE_CTRL_CONTINUE;
+                }
                 break;
 
         case AE_CTRL_PENDING:
@@ -369,16 +374,18 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
 #endif
 
         case AE_CTRL_TRUE:
-
                 /*
                  * Predicate of an IF was true, and we are at the matching ELSE.
                  * Just close out this package
                  */
                 parser_state->aml = acpi_ps_get_next_package_end(parser_state);
+                status = acpi_ds_result_stack_pop(walk_state);
+                if (ACPI_SUCCESS(status)) {
+                        status = AE_CTRL_PENDING;
+                }
                 break;
 
         case AE_CTRL_FALSE:
-
                 /*
                  * Either an IF/WHILE Predicate was false or we encountered a BREAK
                  * opcode.  In both cases, we do not execute the rest of the
@@ -503,22 +510,23 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                 } else if (status == AE_CTRL_TERMINATE) {
                         status = AE_OK;
                 } else if ((status != AE_OK) && (walk_state->method_desc)) {
-                        ACPI_REPORT_METHOD_ERROR("Method execution failed",
-                                                 walk_state->method_node, NULL,
-                                                 status);
-
-                        /* Ensure proper cleanup */
+                        /* Either the method parse or actual execution failed */
 
-                        walk_state->parse_flags |= ACPI_PARSE_EXECUTE;
+                        ACPI_ERROR_METHOD("Method parse/execution failed",
+                                          walk_state->method_node, NULL,
+                                          status);
 
                         /* Check for possible multi-thread reentrancy problem */
 
                         if ((status == AE_ALREADY_EXISTS) &&
                             (!walk_state->method_desc->method.semaphore)) {
                                 /*
-                                 * This method is marked not_serialized, but it tried to create
+                                 * Method tried to create an object twice. The probable cause is
+                                 * that the method cannot handle reentrancy.
+                                 *
+                                 * The method is marked not_serialized, but it tried to create
                                  * a named object, causing the second thread entrance to fail.
-                                 * We will workaround this by marking the method permanently
+                                 * Workaround this problem by marking the method permanently
                                  * as Serialized.
                                  */
                                 walk_state->method_desc->method.method_flags |=
@@ -536,15 +544,23 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                 acpi_ds_scope_stack_clear(walk_state);
 
                 /*
-                 * If we just returned from the execution of a control method,
-                 * there's lots of cleanup to do
+                 * If we just returned from the execution of a control method or if we
+                 * encountered an error during the method parse phase, there's lots of
+                 * cleanup to do
                  */
-                if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
-                    ACPI_PARSE_EXECUTE) {
+                if (((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
+                     ACPI_PARSE_EXECUTE) || (ACPI_FAILURE(status))) {
                         if (walk_state->method_desc) {
                                 /* Decrement the thread count on the method parse tree */
 
-                                walk_state->method_desc->method.thread_count--;
+                                if (walk_state->method_desc->method.
+                                    thread_count) {
+                                        walk_state->method_desc->method.
+                                            thread_count--;
+                                } else {
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Invalid zero thread count in method"));
+                                }
                         }
 
                         acpi_ds_terminate_control_method(walk_state);
@@ -553,7 +569,6 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
                 /* Delete this walk state and all linked control states */
 
                 acpi_ps_cleanup_scope(&walk_state->parser_state);
-
                 previous_walk_state = walk_state;
 
                 ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
diff --git a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c
index 1c953b6f1af1..bc6047caccd9 100644
--- a/drivers/acpi/parser/psscope.c
+++ b/drivers/acpi/parser/psscope.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c
index f0e755884eea..dd6f16726fc4 100644
--- a/drivers/acpi/parser/pstree.c
+++ b/drivers/acpi/parser/pstree.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -132,7 +132,8 @@ acpi_ps_append_arg(union acpi_parse_object *op, union acpi_parse_object *arg)
         if (op_info->class == AML_CLASS_UNKNOWN) {
                 /* Invalid opcode */
 
-                ACPI_REPORT_ERROR(("ps_append_arg: Invalid AML Opcode: 0x%2.2X\n", op->common.aml_opcode));
+                ACPI_ERROR((AE_INFO, "Invalid AML Opcode: 0x%2.2X",
+                            op->common.aml_opcode));
                 return;
         }
 
diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index 2075efbb4324..3e07cb9cb748 100644
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c
index 08f2321b6ded..06f05bfd7612 100644
--- a/drivers/acpi/parser/pswalk.c
+++ b/drivers/acpi/parser/pswalk.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index 4dcbd443160e..2dd48cbb7c02 100644
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,10 @@
 ACPI_MODULE_NAME("psxface")
 
 /* Local Prototypes */
+static void acpi_ps_start_trace(struct acpi_parameter_info *info);
+
+static void acpi_ps_stop_trace(struct acpi_parameter_info *info);
+
 static acpi_status acpi_ps_execute_pass(struct acpi_parameter_info *info);
 
 static void
@@ -57,6 +61,136 @@ acpi_ps_update_parameter_list(struct acpi_parameter_info *info, u16 action);
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_debug_trace
+ *
+ * PARAMETERS:  method_name     - Valid ACPI name string
+ *              debug_level     - Optional level mask. 0 to use default
+ *              debug_layer     - Optional layer mask. 0 to use default
+ *              Flags           - bit 1: one shot(1) or persistent(0)
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: External interface to enable debug tracing during control
+ *              method execution
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_debug_trace(char *name, u32 debug_level, u32 debug_layer, u32 flags)
+{
+        acpi_status status;
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* TBDs: Validate name, allow full path or just nameseg */
+
+        acpi_gbl_trace_method_name = *ACPI_CAST_PTR(u32, name);
+        acpi_gbl_trace_flags = flags;
+
+        if (debug_level) {
+                acpi_gbl_trace_dbg_level = debug_level;
+        }
+        if (debug_layer) {
+                acpi_gbl_trace_dbg_layer = debug_layer;
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ps_start_trace
+ *
+ * PARAMETERS:  Info        - Method info struct
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Start control method execution trace
+ *
+ ******************************************************************************/
+
+static void acpi_ps_start_trace(struct acpi_parameter_info *info)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_ENTRY();
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return;
+        }
+
+        if ((!acpi_gbl_trace_method_name) ||
+            (acpi_gbl_trace_method_name != info->node->name.integer)) {
+                goto exit;
+        }
+
+        acpi_gbl_original_dbg_level = acpi_dbg_level;
+        acpi_gbl_original_dbg_layer = acpi_dbg_layer;
+
+        acpi_dbg_level = 0x00FFFFFF;
+        acpi_dbg_layer = ACPI_UINT32_MAX;
+
+        if (acpi_gbl_trace_dbg_level) {
+                acpi_dbg_level = acpi_gbl_trace_dbg_level;
+        }
+        if (acpi_gbl_trace_dbg_layer) {
+                acpi_dbg_layer = acpi_gbl_trace_dbg_layer;
+        }
+
+      exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ps_stop_trace
+ *
+ * PARAMETERS:  Info        - Method info struct
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Stop control method execution trace
+ *
+ ******************************************************************************/
+
+static void acpi_ps_stop_trace(struct acpi_parameter_info *info)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_ENTRY();
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return;
+        }
+
+        if ((!acpi_gbl_trace_method_name) ||
+            (acpi_gbl_trace_method_name != info->node->name.integer)) {
+                goto exit;
+        }
+
+        /* Disable further tracing if type is one-shot */
+
+        if (acpi_gbl_trace_flags & 1) {
+                acpi_gbl_trace_method_name = 0;
+                acpi_gbl_trace_dbg_level = 0;
+                acpi_gbl_trace_dbg_layer = 0;
+        }
+
+        acpi_dbg_level = acpi_gbl_original_dbg_level;
+        acpi_dbg_layer = acpi_gbl_original_dbg_layer;
+
+      exit:
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ps_execute_method
  *
  * PARAMETERS:  Info            - Method info block, contains:
@@ -104,6 +238,10 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)
          */
         acpi_ps_update_parameter_list(info, REF_INCREMENT);
 
+        /* Begin tracing if requested */
+
+        acpi_ps_start_trace(info);
+
         /*
          * 1) Perform the first pass parse of the method to enter any
          *    named objects that it creates into the namespace
@@ -129,6 +267,10 @@ acpi_status acpi_ps_execute_method(struct acpi_parameter_info *info)
         status = acpi_ps_execute_pass(info);
 
       cleanup:
+        /* End optional tracing */
+
+        acpi_ps_stop_trace(info);
+
         /* Take away the extra reference that we gave the parameters above */
 
         acpi_ps_update_parameter_list(info, REF_DECREMENT);
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index e567c03b238e..65aee79b3971 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -258,7 +258,7 @@ typedef int (*irq_lookup_func) (struct acpi_prt_entry *, int *, int *, char **);
 
 static int
 acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
-                      int *edge_level, int *active_high_low, char **link)
+                      int *triggering, int *polarity, char **link)
 {
         int irq;
 
@@ -266,8 +266,8 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
 
         if (entry->link.handle) {
                 irq = acpi_pci_link_allocate_irq(entry->link.handle,
-                                                 entry->link.index, edge_level,
-                                                 active_high_low, link);
+                                                 entry->link.index, triggering,
+                                                 polarity, link);
                 if (irq < 0) {
                         ACPI_DEBUG_PRINT((ACPI_DB_WARN,
                                           "Invalid IRQ link routing entry\n"));
@@ -275,8 +275,8 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
                 }
         } else {
                 irq = entry->link.index;
-                *edge_level = ACPI_LEVEL_SENSITIVE;
-                *active_high_low = ACPI_ACTIVE_LOW;
+                *triggering = ACPI_LEVEL_SENSITIVE;
+                *polarity = ACPI_ACTIVE_LOW;
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found IRQ %d\n", irq));
@@ -285,7 +285,7 @@ acpi_pci_allocate_irq(struct acpi_prt_entry *entry,
 
 static int
 acpi_pci_free_irq(struct acpi_prt_entry *entry,
-                  int *edge_level, int *active_high_low, char **link)
+                  int *triggering, int *polarity, char **link)
 {
         int irq;
 
@@ -307,8 +307,8 @@ static int
 acpi_pci_irq_lookup(struct pci_bus *bus,
                     int device,
                     int pin,
-                    int *edge_level,
-                    int *active_high_low, char **link, irq_lookup_func func)
+                    int *triggering,
+                    int *polarity, char **link, irq_lookup_func func)
 {
         struct acpi_prt_entry *entry = NULL;
         int segment = pci_domain_nr(bus);
@@ -327,7 +327,7 @@ acpi_pci_irq_lookup(struct pci_bus *bus,
                 return_VALUE(-1);
         }
 
-        ret = func(entry, edge_level, active_high_low, link);
+        ret = func(entry, triggering, polarity, link);
         return_VALUE(ret);
 }
 
@@ -339,8 +339,8 @@ acpi_pci_irq_lookup(struct pci_bus *bus,
 static int
 acpi_pci_irq_derive(struct pci_dev *dev,
                     int pin,
-                    int *edge_level,
-                    int *active_high_low, char **link, irq_lookup_func func)
+                    int *triggering,
+                    int *polarity, char **link, irq_lookup_func func)
 {
         struct pci_dev *bridge = dev;
         int irq = -1;
@@ -374,7 +374,7 @@ acpi_pci_irq_derive(struct pci_dev *dev,
                 }
 
                 irq = acpi_pci_irq_lookup(bridge->bus, PCI_SLOT(bridge->devfn),
-                                          pin, edge_level, active_high_low,
+                                          pin, triggering, polarity,
                                           link, func);
         }
 
@@ -401,8 +401,8 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
 {
         int irq = 0;
         u8 pin = 0;
-        int edge_level = ACPI_LEVEL_SENSITIVE;
-        int active_high_low = ACPI_ACTIVE_LOW;
+        int triggering = ACPI_LEVEL_SENSITIVE;
+        int polarity = ACPI_ACTIVE_LOW;
         char *link = NULL;
         int rc;
 
@@ -431,7 +431,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
          * values override any BIOS-assigned IRQs set during boot.
          */
         irq = acpi_pci_irq_lookup(dev->bus, PCI_SLOT(dev->devfn), pin,
-                                  &edge_level, &active_high_low, &link,
+                                  &triggering, &polarity, &link,
                                   acpi_pci_allocate_irq);
 
         /*
@@ -439,8 +439,8 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
          * device's parent bridge.
          */
         if (irq < 0)
-                irq = acpi_pci_irq_derive(dev, pin, &edge_level,
-                                          &active_high_low, &link,
+                irq = acpi_pci_irq_derive(dev, pin, &triggering,
+                                          &polarity, &link,
                                           acpi_pci_allocate_irq);
 
         /*
@@ -462,7 +462,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
                 }
         }
 
-        rc = acpi_register_gsi(irq, edge_level, active_high_low);
+        rc = acpi_register_gsi(irq, triggering, polarity);
         if (rc < 0) {
                 printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "
                        "to register GSI\n", pci_name(dev), ('A' + pin));
@@ -477,8 +477,8 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
                 printk("Link [%s] -> ", link);
 
         printk("GSI %u (%s, %s) -> IRQ %d\n", irq,
-               (edge_level == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
-               (active_high_low == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
+               (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge",
+               (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq);
 
         return_VALUE(0);
 }
@@ -494,8 +494,8 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
 {
         int gsi = 0;
         u8 pin = 0;
-        int edge_level = ACPI_LEVEL_SENSITIVE;
-        int active_high_low = ACPI_ACTIVE_LOW;
+        int triggering = ACPI_LEVEL_SENSITIVE;
+        int polarity = ACPI_ACTIVE_LOW;
 
         ACPI_FUNCTION_TRACE("acpi_pci_irq_disable");
 
@@ -511,7 +511,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
          * First we check the PCI IRQ routing table (PRT) for an IRQ.
          */
         gsi = acpi_pci_irq_lookup(dev->bus, PCI_SLOT(dev->devfn), pin,
-                                  &edge_level, &active_high_low, NULL,
+                                  &triggering, &polarity, NULL,
                                   acpi_pci_free_irq);
         /*
          * If no PRT entry was found, we'll try to derive an IRQ from the
@@ -519,7 +519,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
          */
         if (gsi < 0)
                 gsi = acpi_pci_irq_derive(dev, pin,
-                                          &edge_level, &active_high_low, NULL,
+                                          &triggering, &polarity, NULL,
                                           acpi_pci_free_irq);
         if (gsi < 0)
                 return_VOID;
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 78927c0f1551..07bc6dfe662b 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -70,8 +70,8 @@ static struct acpi_driver acpi_pci_link_driver = {
  */
 struct acpi_pci_link_irq {
         u8 active;              /* Current IRQ */
-        u8 edge_level;          /* All IRQs */
-        u8 active_high_low;     /* All IRQs */
+        u8 triggering;          /* All IRQs */
+        u8 polarity;    /* All IRQs */
         u8 resource_type;
         u8 possible_count;
         u8 possible[ACPI_PCI_LINK_MAX_POSSIBLE];
@@ -108,19 +108,19 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
 
         ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible");
 
-        switch (resource->id) {
-        case ACPI_RSTYPE_START_DPF:
+        switch (resource->type) {
+        case ACPI_RESOURCE_TYPE_START_DEPENDENT:
                 return_ACPI_STATUS(AE_OK);
-        case ACPI_RSTYPE_IRQ:
+        case ACPI_RESOURCE_TYPE_IRQ:
                 {
                         struct acpi_resource_irq *p = &resource->data.irq;
-                        if (!p || !p->number_of_interrupts) {
+                        if (!p || !p->interrupt_count) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_WARN,
                                                   "Blank IRQ resource\n"));
                                 return_ACPI_STATUS(AE_OK);
                         }
                         for (i = 0;
-                             (i < p->number_of_interrupts
+                             (i < p->interrupt_count
                               && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                                 if (!p->interrupts[i]) {
                                         ACPI_DEBUG_PRINT((ACPI_DB_WARN,
@@ -131,22 +131,22 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
                                 link->irq.possible[i] = p->interrupts[i];
                                 link->irq.possible_count++;
                         }
-                        link->irq.edge_level = p->edge_level;
-                        link->irq.active_high_low = p->active_high_low;
-                        link->irq.resource_type = ACPI_RSTYPE_IRQ;
+                        link->irq.triggering = p->triggering;
+                        link->irq.polarity = p->polarity;
+                        link->irq.resource_type = ACPI_RESOURCE_TYPE_IRQ;
                         break;
                 }
-        case ACPI_RSTYPE_EXT_IRQ:
+        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                 {
-                        struct acpi_resource_ext_irq *p =
+                        struct acpi_resource_extended_irq *p =
                             &resource->data.extended_irq;
-                        if (!p || !p->number_of_interrupts) {
+                        if (!p || !p->interrupt_count) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_WARN,
                                                   "Blank EXT IRQ resource\n"));
                                 return_ACPI_STATUS(AE_OK);
                         }
                         for (i = 0;
-                             (i < p->number_of_interrupts
+                             (i < p->interrupt_count
                               && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                                 if (!p->interrupts[i]) {
                                         ACPI_DEBUG_PRINT((ACPI_DB_WARN,
@@ -157,9 +157,9 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
                                 link->irq.possible[i] = p->interrupts[i];
                                 link->irq.possible_count++;
                         }
-                        link->irq.edge_level = p->edge_level;
-                        link->irq.active_high_low = p->active_high_low;
-                        link->irq.resource_type = ACPI_RSTYPE_EXT_IRQ;
+                        link->irq.triggering = p->triggering;
+                        link->irq.polarity = p->polarity;
+                        link->irq.resource_type = ACPI_RESOURCE_TYPE_EXTENDED_IRQ;
                         break;
                 }
         default:
@@ -201,11 +201,11 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
 
         ACPI_FUNCTION_TRACE("acpi_pci_link_check_current");
 
-        switch (resource->id) {
-        case ACPI_RSTYPE_IRQ:
+        switch (resource->type) {
+        case ACPI_RESOURCE_TYPE_IRQ:
                 {
                         struct acpi_resource_irq *p = &resource->data.irq;
-                        if (!p || !p->number_of_interrupts) {
+                        if (!p || !p->interrupt_count) {
                                 /*
                                  * IRQ descriptors may have no IRQ# bits set,
                                  * particularly those those w/ _STA disabled
@@ -217,11 +217,11 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
                         *irq = p->interrupts[0];
                         break;
                 }
-        case ACPI_RSTYPE_EXT_IRQ:
+        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                 {
-                        struct acpi_resource_ext_irq *p =
+                        struct acpi_resource_extended_irq *p =
                             &resource->data.extended_irq;
-                        if (!p || !p->number_of_interrupts) {
+                        if (!p || !p->interrupt_count) {
                                 /*
                                  * extended IRQ descriptors must
                                  * return at least 1 IRQ
@@ -233,8 +233,10 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
                         *irq = p->interrupts[0];
                         break;
                 }
+                break;
         default:
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Resource isn't an IRQ\n"));
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Resource %d isn't an IRQ\n", resource->type));
+        case ACPI_RESOURCE_TYPE_END_TAG:
                 return_ACPI_STATUS(AE_OK);
         }
         return_ACPI_STATUS(AE_CTRL_TERMINATE);
@@ -325,36 +327,36 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
         buffer.pointer = resource;
 
         switch (link->irq.resource_type) {
-        case ACPI_RSTYPE_IRQ:
-                resource->res.id = ACPI_RSTYPE_IRQ;
+        case ACPI_RESOURCE_TYPE_IRQ:
+                resource->res.type = ACPI_RESOURCE_TYPE_IRQ;
                 resource->res.length = sizeof(struct acpi_resource);
-                resource->res.data.irq.edge_level = link->irq.edge_level;
-                resource->res.data.irq.active_high_low =
-                    link->irq.active_high_low;
-                if (link->irq.edge_level == ACPI_EDGE_SENSITIVE)
-                        resource->res.data.irq.shared_exclusive =
+                resource->res.data.irq.triggering = link->irq.triggering;
+                resource->res.data.irq.polarity =
+                    link->irq.polarity;
+                if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
+                        resource->res.data.irq.sharable =
                             ACPI_EXCLUSIVE;
                 else
-                        resource->res.data.irq.shared_exclusive = ACPI_SHARED;
-                resource->res.data.irq.number_of_interrupts = 1;
+                        resource->res.data.irq.sharable = ACPI_SHARED;
+                resource->res.data.irq.interrupt_count = 1;
                 resource->res.data.irq.interrupts[0] = irq;
                 break;
 
-        case ACPI_RSTYPE_EXT_IRQ:
-                resource->res.id = ACPI_RSTYPE_EXT_IRQ;
+        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+                resource->res.type = ACPI_RESOURCE_TYPE_EXTENDED_IRQ;
                 resource->res.length = sizeof(struct acpi_resource);
                 resource->res.data.extended_irq.producer_consumer =
                     ACPI_CONSUMER;
-                resource->res.data.extended_irq.edge_level =
-                    link->irq.edge_level;
-                resource->res.data.extended_irq.active_high_low =
-                    link->irq.active_high_low;
-                if (link->irq.edge_level == ACPI_EDGE_SENSITIVE)
-                        resource->res.data.irq.shared_exclusive =
+                resource->res.data.extended_irq.triggering =
+                    link->irq.triggering;
+                resource->res.data.extended_irq.polarity =
+                    link->irq.polarity;
+                if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
+                        resource->res.data.irq.sharable =
                             ACPI_EXCLUSIVE;
                 else
-                        resource->res.data.irq.shared_exclusive = ACPI_SHARED;
-                resource->res.data.extended_irq.number_of_interrupts = 1;
+                        resource->res.data.irq.sharable = ACPI_SHARED;
+                resource->res.data.extended_irq.interrupt_count = 1;
                 resource->res.data.extended_irq.interrupts[0] = irq;
                 /* ignore resource_source, it's optional */
                 break;
@@ -364,7 +366,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
                 goto end;
 
         }
-        resource->end.id = ACPI_RSTYPE_END_TAG;
+        resource->end.type = ACPI_RESOURCE_TYPE_END_TAG;
 
         /* Attempt to set the resource */
         status = acpi_set_current_resources(link->handle, &buffer);
@@ -613,7 +615,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
 int
 acpi_pci_link_allocate_irq(acpi_handle handle,
                            int index,
-                           int *edge_level, int *active_high_low, char **name)
+                           int *triggering, int *polarity, char **name)
 {
         int result = 0;
         struct acpi_device *device = NULL;
@@ -653,10 +655,10 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
         link->refcnt++;
         up(&acpi_link_lock);
 
-        if (edge_level)
-                *edge_level = link->irq.edge_level;
-        if (active_high_low)
-                *active_high_low = link->irq.active_high_low;
+        if (triggering)
+                *triggering = link->irq.triggering;
+        if (polarity)
+                *polarity = link->irq.polarity;
         if (name)
                 *name = acpi_device_bid(link->device);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 0fd9988c283d..4c313eab6313 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -122,15 +122,15 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
         int *busnr = (int *)data;
         struct acpi_resource_address64 address;
 
-        if (resource->id != ACPI_RSTYPE_ADDRESS16 &&
-            resource->id != ACPI_RSTYPE_ADDRESS32 &&
-            resource->id != ACPI_RSTYPE_ADDRESS64)
+        if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&
+            resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 &&
+            resource->type != ACPI_RESOURCE_TYPE_ADDRESS64)
                 return AE_OK;
 
         acpi_resource_to_address64(resource, &address);
         if ((address.address_length > 0) &&
             (address.resource_type == ACPI_BUS_NUMBER_RANGE))
-                *busnr = address.min_address_range;
+                *busnr = address.minimum;
 
         return AE_OK;
 }
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 1278aca96fe3..99a3a28594da 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -253,31 +253,21 @@ static int acpi_processor_errata(struct acpi_processor *pr)
  * _PDC is required for a BIOS-OS handshake for most of the newer
  * ACPI processor features.
  */
-
-int acpi_processor_set_pdc(struct acpi_processor *pr,
-                           struct acpi_object_list *pdc_in)
+static int acpi_processor_set_pdc(struct acpi_processor *pr)
 {
+        struct acpi_object_list *pdc_in = pr->pdc;
         acpi_status status = AE_OK;
-        u32 arg0_buf[3];
-        union acpi_object arg0 = { ACPI_TYPE_BUFFER };
-        struct acpi_object_list no_object = { 1, &arg0 };
-        struct acpi_object_list *pdc;
 
         ACPI_FUNCTION_TRACE("acpi_processor_set_pdc");
 
-        arg0.buffer.length = 12;
-        arg0.buffer.pointer = (u8 *) arg0_buf;
-        arg0_buf[0] = ACPI_PDC_REVISION_ID;
-        arg0_buf[1] = 0;
-        arg0_buf[2] = 0;
-
-        pdc = (pdc_in) ? pdc_in : &no_object;
+        if (!pdc_in)
+                return_VALUE(status);
 
-        status = acpi_evaluate_object(pr->handle, "_PDC", pdc, NULL);
+        status = acpi_evaluate_object(pr->handle, "_PDC", pdc_in, NULL);
 
-        if ((ACPI_FAILURE(status)) && (pdc_in))
+        if (ACPI_FAILURE(status))
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Error evaluating _PDC, using legacy perf. control...\n"));
+                    "Could not evaluate _PDC, using legacy perf. control...\n"));
 
         return_VALUE(status);
 }
@@ -357,7 +347,6 @@ static int acpi_processor_add_fs(struct acpi_device *device)
                                   ACPI_PROCESSOR_FILE_THROTTLING));
         else {
                 entry->proc_fops = &acpi_processor_throttling_fops;
-                entry->proc_fops->write = acpi_processor_write_throttling;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
@@ -372,7 +361,6 @@ static int acpi_processor_add_fs(struct acpi_device *device)
                                   ACPI_PROCESSOR_FILE_LIMIT));
         else {
                 entry->proc_fops = &acpi_processor_limit_fops;
-                entry->proc_fops->write = acpi_processor_write_limit;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
@@ -589,6 +577,10 @@ static int acpi_processor_start(struct acpi_device *device)
                                   "Error installing device notify handler\n"));
         }
 
+        /* _PDC call should be done before doing anything else (if reqd.). */
+        arch_acpi_processor_init_pdc(pr);
+        acpi_processor_set_pdc(pr);
+
         acpi_processor_power_init(pr, device);
 
         if (pr->flags.throttling) {
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index cc049338e418..eb730a80952c 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -94,23 +94,60 @@ static int set_max_cstate(struct dmi_system_id *id)
         return 0;
 }
 
-static struct dmi_system_id __initdata processor_power_dmi_table[] = {
-        {set_max_cstate, "IBM ThinkPad R40e", {
-                                               DMI_MATCH(DMI_BIOS_VENDOR,
-                                                         "IBM"),
-                                               DMI_MATCH(DMI_BIOS_VERSION,
-                                                         "1SET60WW")},
-         (void *)1},
-        {set_max_cstate, "Medion 41700", {
-                                          DMI_MATCH(DMI_BIOS_VENDOR,
-                                                    "Phoenix Technologies LTD"),
-                                          DMI_MATCH(DMI_BIOS_VERSION,
-                                                    "R01-A1J")}, (void *)1},
-        {set_max_cstate, "Clevo 5600D", {
-                                         DMI_MATCH(DMI_BIOS_VENDOR,
-                                                   "Phoenix Technologies LTD"),
-                                         DMI_MATCH(DMI_BIOS_VERSION,
-                                                   "SHE845M0.86C.0013.D.0302131307")},
+/* Actually this shouldn't be __cpuinitdata, would be better to fix the
+   callers to only run once -AK */
+static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET43WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }, (void*)1},
+        { set_max_cstate, "IBM ThinkPad R40e", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
+          DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1},
+        { set_max_cstate, "Medion 41700", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
+          DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1},
+        { set_max_cstate, "Clevo 5600D", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
+          DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},
          (void *)2},
         {},
 };
@@ -550,18 +587,10 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
         if (!pr->pblk)
                 return_VALUE(-ENODEV);
 
-        memset(pr->power.states, 0, sizeof(pr->power.states));
-
         /* if info is obtained from pblk/fadt, type equals state */
-        pr->power.states[ACPI_STATE_C1].type = ACPI_STATE_C1;
         pr->power.states[ACPI_STATE_C2].type = ACPI_STATE_C2;
         pr->power.states[ACPI_STATE_C3].type = ACPI_STATE_C3;
 
-        /* the C0 state only exists as a filler in our array,
-         * and all processors need to support C1 */
-        pr->power.states[ACPI_STATE_C0].valid = 1;
-        pr->power.states[ACPI_STATE_C1].valid = 1;
-
 #ifndef CONFIG_HOTPLUG_CPU
         /*
          * Check for P_LVL2_UP flag before entering C2 and above on
@@ -591,12 +620,11 @@ static int acpi_processor_get_power_info_default_c1(struct acpi_processor *pr)
 {
         ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_default_c1");
 
+        /* Zero initialize all the C-states info. */
         memset(pr->power.states, 0, sizeof(pr->power.states));
 
-        /* if info is obtained from pblk/fadt, type equals state */
+        /* set the first C-State to C1 */
         pr->power.states[ACPI_STATE_C1].type = ACPI_STATE_C1;
-        pr->power.states[ACPI_STATE_C2].type = ACPI_STATE_C2;
-        pr->power.states[ACPI_STATE_C3].type = ACPI_STATE_C3;
 
         /* the C0 state only exists as a filler in our array,
          * and all processors need to support C1 */
@@ -610,6 +638,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 {
         acpi_status status = 0;
         acpi_integer count;
+        int current_count;
         int i;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *cst;
@@ -619,10 +648,12 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
         if (nocst)
                 return_VALUE(-ENODEV);
 
-        pr->power.count = 0;
-        for (i = 0; i < ACPI_PROCESSOR_MAX_POWER; i++)
-                memset(&(pr->power.states[i]), 0,
-                       sizeof(struct acpi_processor_cx));
+        current_count = 1;
+
+        /* Zero initialize C2 onwards and prepare for fresh CST lookup */
+        for (i = 2; i < ACPI_PROCESSOR_MAX_POWER; i++)
+                memset(&(pr->power.states[i]), 0, 
+                                sizeof(struct acpi_processor_cx));
 
         status = acpi_evaluate_object(pr->handle, "_CST", NULL, &buffer);
         if (ACPI_FAILURE(status)) {
@@ -650,16 +681,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                 goto end;
         }
 
-        /* We support up to ACPI_PROCESSOR_MAX_POWER. */
-        if (count > ACPI_PROCESSOR_MAX_POWER) {
-                printk(KERN_WARNING
-                       "Limiting number of power states to max (%d)\n",
-                       ACPI_PROCESSOR_MAX_POWER);
-                printk(KERN_WARNING
-                       "Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");
-                count = ACPI_PROCESSOR_MAX_POWER;
-        }
-
         /* Tell driver that at least _CST is supported. */
         pr->flags.has_cst = 1;
 
@@ -703,7 +724,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                     (reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO))
                         continue;
 
-                if ((cx.type < ACPI_STATE_C1) || (cx.type > ACPI_STATE_C3))
+                if ((cx.type < ACPI_STATE_C2) || (cx.type > ACPI_STATE_C3))
                         continue;
 
                 obj = (union acpi_object *)&(element->package.elements[2]);
@@ -718,15 +739,28 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 
                 cx.power = obj->integer.value;
 
-                (pr->power.count)++;
-                memcpy(&(pr->power.states[pr->power.count]), &cx, sizeof(cx));
+                current_count++;
+                memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
+
+                /*
+                 * We support total ACPI_PROCESSOR_MAX_POWER - 1
+                 * (From 1 through ACPI_PROCESSOR_MAX_POWER - 1)
+                 */
+                if (current_count >= (ACPI_PROCESSOR_MAX_POWER - 1)) {
+                        printk(KERN_WARNING
+                               "Limiting number of power states to max (%d)\n",
+                               ACPI_PROCESSOR_MAX_POWER);
+                        printk(KERN_WARNING
+                               "Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");
+                        break;
+                }
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d power states\n",
-                          pr->power.count));
+                          current_count));
 
         /* Validate number of power states discovered */
-        if (pr->power.count < 2)
+        if (current_count < 2)
                 status = -EFAULT;
 
       end:
@@ -867,7 +901,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                 case ACPI_STATE_C3:
                         acpi_processor_power_verify_c3(pr, cx);
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
-                        if (c->x86_vendor == X86_VENDOR_INTEL) {
+                        if (cx->valid && c->x86_vendor == X86_VENDOR_INTEL) {
                                 on_each_cpu(switch_APIC_timer_to_ipi,
                                                 &mask, 1, 1);
                         }
@@ -892,12 +926,13 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
         /* NOTE: the idle thread may not be running while calling
          * this function */
 
+        /* Adding C1 state */
+        acpi_processor_get_power_info_default_c1(pr);
         result = acpi_processor_get_power_info_cst(pr);
         if (result == -ENODEV)
-                result = acpi_processor_get_power_info_fadt(pr);
+                acpi_processor_get_power_info_fadt(pr);
 
-        if ((result) || (acpi_processor_power_verify(pr) < 2))
-                result = acpi_processor_get_power_info_default_c1(pr);
+        pr->power.count = acpi_processor_power_verify(pr);
 
         /*
          * Set Default Policy
@@ -1066,8 +1101,6 @@ int acpi_processor_power_init(struct acpi_processor *pr,
                 }
         }
 
-        acpi_processor_power_init_pdc(&(pr->power), pr->id);
-        acpi_processor_set_pdc(pr, pr->power.pdc);
         acpi_processor_get_power_info(pr);
 
         /*
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 22c7bb66c200..abbdb37a7f5f 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -315,8 +315,6 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)
         if (!pr || !pr->performance || !pr->handle)
                 return_VALUE(-EINVAL);
 
-        acpi_processor_set_pdc(pr, pr->performance->pdc);
-
         status = acpi_get_handle(pr->handle, "_PCT", &handle);
         if (ACPI_FAILURE(status)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -520,8 +518,8 @@ static void acpi_cpufreq_add_file(struct acpi_processor *pr)
                                   "Unable to create '%s' fs entry\n",
                                   ACPI_PROCESSOR_FILE_PERFORMANCE));
         else {
+                acpi_processor_perf_fops.write = acpi_processor_write_performance;
                 entry->proc_fops = &acpi_processor_perf_fops;
-                entry->proc_fops->write = acpi_processor_write_performance;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index dc9817cfb882..f99ad05cd6a2 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -348,9 +348,9 @@ static int acpi_processor_limit_open_fs(struct inode *inode, struct file *file)
                            PDE(inode)->data);
 }
 
-ssize_t acpi_processor_write_limit(struct file * file,
-                                   const char __user * buffer,
-                                   size_t count, loff_t * data)
+static ssize_t acpi_processor_write_limit(struct file * file,
+                                          const char __user * buffer,
+                                          size_t count, loff_t * data)
 {
         int result = 0;
         struct seq_file *m = (struct seq_file *)file->private_data;
@@ -394,6 +394,7 @@ ssize_t acpi_processor_write_limit(struct file * file,
 struct file_operations acpi_processor_limit_fops = {
         .open = acpi_processor_limit_open_fs,
         .read = seq_read,
+        .write = acpi_processor_write_limit,
         .llseek = seq_lseek,
         .release = single_release,
 };
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 74a52d4e79ae..b966549ec000 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -306,9 +306,9 @@ static int acpi_processor_throttling_open_fs(struct inode *inode,
                            PDE(inode)->data);
 }
 
-ssize_t acpi_processor_write_throttling(struct file * file,
-                                        const char __user * buffer,
-                                        size_t count, loff_t * data)
+static ssize_t acpi_processor_write_throttling(struct file * file,
+                                               const char __user * buffer,
+                                               size_t count, loff_t * data)
 {
         int result = 0;
         struct seq_file *m = (struct seq_file *)file->private_data;
@@ -337,6 +337,7 @@ ssize_t acpi_processor_write_throttling(struct file * file,
 struct file_operations acpi_processor_throttling_fops = {
         .open = acpi_processor_throttling_open_fs,
         .read = seq_read,
+        .write = acpi_processor_write_throttling,
         .llseek = seq_lseek,
         .release = single_release,
 };
diff --git a/drivers/acpi/resources/Makefile b/drivers/acpi/resources/Makefile
index 2130b74170c3..8de4f69dfa09 100644
--- a/drivers/acpi/resources/Makefile
+++ b/drivers/acpi/resources/Makefile
@@ -2,7 +2,7 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-obj-y := rsaddr.o  rscreate.o  rsio.o   rslist.o    rsmisc.o   rsxface.o \
+obj-y := rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
          rscalc.o  rsirq.o  rsmemory.o  rsutils.o
 
 obj-$(ACPI_FUTURE_USAGE) += rsdump.o
diff --git a/drivers/acpi/resources/rsaddr.c b/drivers/acpi/resources/rsaddr.c
index 23b54baa0cb2..8fa3213ce000 100644
--- a/drivers/acpi/resources/rsaddr.c
+++ b/drivers/acpi/resources/rsaddr.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,1072 +47,334 @@
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsaddr")
 
-/* Local prototypes */
-static void
-acpi_rs_decode_general_flags(union acpi_resource_data *resource, u8 flags);
-
-static u8 acpi_rs_encode_general_flags(union acpi_resource_data *resource);
-
-static void
-acpi_rs_decode_specific_flags(union acpi_resource_data *resource, u8 flags);
-
-static u8 acpi_rs_encode_specific_flags(union acpi_resource_data *resource);
-
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_decode_general_flags
- *
- * PARAMETERS:  Resource            - Address resource data struct
- *              Flags               - Actual flag byte
- *
- * RETURN:      Decoded flag bits in resource struct
- *
- * DESCRIPTION: Decode a general flag byte to an address resource struct
+ * acpi_rs_convert_address16 - All WORD (16-bit) address resources
  *
  ******************************************************************************/
+struct acpi_rsconvert_info acpi_rs_convert_address16[5] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_ADDRESS16,
+         ACPI_RS_SIZE(struct acpi_resource_address16),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_address16)},
 
-static void
-acpi_rs_decode_general_flags(union acpi_resource_data *resource, u8 flags)
-{
-        ACPI_FUNCTION_ENTRY();
-
-        /* Producer / Consumer - flag bit[0] */
-
-        resource->address.producer_consumer = (u32) (flags & 0x01);
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_ADDRESS16,
+         sizeof(struct aml_resource_address16),
+         0},
 
-        /* Decode (_DEC) - flag bit[1] */
+        /* Resource Type, General Flags, and Type-Specific Flags */
 
-        resource->address.decode = (u32) ((flags >> 1) & 0x01);
+        {ACPI_RSC_ADDRESS, 0, 0, 0},
 
-        /* Min Address Fixed (_MIF) - flag bit[2] */
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Address Granularity
+         * Address Range Minimum
+         * Address Range Maximum
+         * Address Translation Offset
+         * Address Length
+         */
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.address16.granularity),
+         AML_OFFSET(address16.granularity),
+         5},
 
-        resource->address.min_address_fixed = (u32) ((flags >> 2) & 0x01);
+        /* Optional resource_source (Index and String) */
 
-        /* Max Address Fixed (_MAF) - flag bit[3] */
-
-        resource->address.max_address_fixed = (u32) ((flags >> 3) & 0x01);
-}
+        {ACPI_RSC_SOURCE, ACPI_RS_OFFSET(data.address16.resource_source),
+         0,
+         sizeof(struct aml_resource_address16)}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_encode_general_flags
- *
- * PARAMETERS:  Resource            - Address resource data struct
- *
- * RETURN:      Encoded general flag byte
- *
- * DESCRIPTION: Construct a general flag byte from an address resource struct
+ * acpi_rs_convert_address32 - All DWORD (32-bit) address resources
  *
  ******************************************************************************/
 
-static u8 acpi_rs_encode_general_flags(union acpi_resource_data *resource)
-{
-        u8 flags;
-
-        ACPI_FUNCTION_ENTRY();
-
-        /* Producer / Consumer - flag bit[0] */
-
-        flags = (u8) (resource->address.producer_consumer & 0x01);
-
-        /* Decode (_DEC) - flag bit[1] */
-
-        flags |= (u8) ((resource->address.decode & 0x01) << 1);
-
-        /* Min Address Fixed (_MIF) - flag bit[2] */
-
-        flags |= (u8) ((resource->address.min_address_fixed & 0x01) << 2);
+struct acpi_rsconvert_info acpi_rs_convert_address32[5] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_ADDRESS32,
+         ACPI_RS_SIZE(struct acpi_resource_address32),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_address32)},
 
-        /* Max Address Fixed (_MAF) - flag bit[3] */
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_ADDRESS32,
+         sizeof(struct aml_resource_address32),
+         0},
 
-        flags |= (u8) ((resource->address.max_address_fixed & 0x01) << 3);
+        /* Resource Type, General Flags, and Type-Specific Flags */
 
-        return (flags);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_decode_specific_flags
- *
- * PARAMETERS:  Resource            - Address resource data struct
- *              Flags               - Actual flag byte
- *
- * RETURN:      Decoded flag bits in attribute struct
- *
- * DESCRIPTION: Decode a type-specific flag byte to an attribute struct.
- *              Type-specific flags are only defined for the Memory and IO
- *              resource types.
- *
- ******************************************************************************/
+        {ACPI_RSC_ADDRESS, 0, 0, 0},
 
-static void
-acpi_rs_decode_specific_flags(union acpi_resource_data *resource, u8 flags)
-{
-        ACPI_FUNCTION_ENTRY();
-
-        if (resource->address.resource_type == ACPI_MEMORY_RANGE) {
-                /* Write Status (_RW) - flag bit[0] */
-
-                resource->address.attribute.memory.read_write_attribute =
-                    (u16) (flags & 0x01);
-
-                /* Memory Attributes (_MEM) - flag bits[2:1] */
-
-                resource->address.attribute.memory.cache_attribute =
-                    (u16) ((flags >> 1) & 0x03);
-        } else if (resource->address.resource_type == ACPI_IO_RANGE) {
-                /* Ranges (_RNG) - flag bits[1:0] */
-
-                resource->address.attribute.io.range_attribute =
-                    (u16) (flags & 0x03);
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Address Granularity
+         * Address Range Minimum
+         * Address Range Maximum
+         * Address Translation Offset
+         * Address Length
+         */
+        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.address32.granularity),
+         AML_OFFSET(address32.granularity),
+         5},
 
-                /* Translations (_TTP and _TRS) - flag bits[5:4] */
+        /* Optional resource_source (Index and String) */
 
-                resource->address.attribute.io.translation_attribute =
-                    (u16) ((flags >> 4) & 0x03);
-        }
-}
+        {ACPI_RSC_SOURCE, ACPI_RS_OFFSET(data.address32.resource_source),
+         0,
+         sizeof(struct aml_resource_address32)}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_encode_specific_flags
- *
- * PARAMETERS:  Resource            - Address resource data struct
- *
- * RETURN:      Encoded type-specific flag byte
- *
- * DESCRIPTION: Construct a type-specific flag byte from an attribute struct.
- *              Type-specific flags are only defined for the Memory and IO
- *              resource types.
+ * acpi_rs_convert_address64 - All QWORD (64-bit) address resources
  *
  ******************************************************************************/
 
-static u8 acpi_rs_encode_specific_flags(union acpi_resource_data *resource)
-{
-        u8 flags = 0;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (resource->address.resource_type == ACPI_MEMORY_RANGE) {
-                /* Write Status (_RW) - flag bit[0] */
+struct acpi_rsconvert_info acpi_rs_convert_address64[5] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_ADDRESS64,
+         ACPI_RS_SIZE(struct acpi_resource_address64),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_address64)},
 
-                flags = (u8)
-                    (resource->address.attribute.memory.
-                     read_write_attribute & 0x01);
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_ADDRESS64,
+         sizeof(struct aml_resource_address64),
+         0},
 
-                /* Memory Attributes (_MEM) - flag bits[2:1] */
+        /* Resource Type, General Flags, and Type-Specific Flags */
 
-                flags |= (u8)
-                    ((resource->address.attribute.memory.
-                      cache_attribute & 0x03) << 1);
-        } else if (resource->address.resource_type == ACPI_IO_RANGE) {
-                /* Ranges (_RNG) - flag bits[1:0] */
+        {ACPI_RSC_ADDRESS, 0, 0, 0},
 
-                flags = (u8)
-                    (resource->address.attribute.io.range_attribute & 0x03);
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Address Granularity
+         * Address Range Minimum
+         * Address Range Maximum
+         * Address Translation Offset
+         * Address Length
+         */
+        {ACPI_RSC_MOVE64, ACPI_RS_OFFSET(data.address64.granularity),
+         AML_OFFSET(address64.granularity),
+         5},
 
-                /* Translations (_TTP and _TRS) - flag bits[5:4] */
+        /* Optional resource_source (Index and String) */
 
-                flags |= (u8)
-                    ((resource->address.attribute.io.
-                      translation_attribute & 0x03) << 4);
-        }
-
-        return (flags);
-}
+        {ACPI_RSC_SOURCE, ACPI_RS_OFFSET(data.address64.resource_source),
+         0,
+         sizeof(struct aml_resource_address64)}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_address16_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_convert_ext_address64 - All Extended (64-bit) address resources
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_address16_resource(u8 * byte_stream_buffer,
-                           acpi_size * bytes_consumed,
-                           u8 ** output_buffer, acpi_size * structure_size)
-{
-        u32 index;
-        u16 temp16;
-        u8 temp8;
-        u8 *temp_ptr;
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_address16);
-
-        ACPI_FUNCTION_TRACE("rs_address16_resource");
-
-        /* Get the Descriptor Length field */
-
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-        /* Validate minimum descriptor length */
-
-        if (temp16 < 13) {
-                return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
-        }
-
-        *bytes_consumed = temp16 + 3;
-        output_struct->id = ACPI_RSTYPE_ADDRESS16;
-
-        /* Get the Resource Type (Byte3) */
+struct acpi_rsconvert_info acpi_rs_convert_ext_address64[5] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64,
+         ACPI_RS_SIZE(struct acpi_resource_extended_address64),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_ext_address64)},
 
-        buffer += 2;
-        temp8 = *buffer;
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64,
+         sizeof(struct aml_resource_extended_address64),
+         0},
 
-        /* Values 0-2 and 0xC0-0xFF are valid */
+        /* Resource Type, General Flags, and Type-Specific Flags */
 
-        if ((temp8 > 2) && (temp8 < 0xC0)) {
-                return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
-        }
-
-        output_struct->data.address16.resource_type = temp8;
-
-        /* Get the General Flags (Byte4) */
-
-        buffer += 1;
-        acpi_rs_decode_general_flags(&output_struct->data, *buffer);
-
-        /* Get the Type Specific Flags (Byte5) */
-
-        buffer += 1;
-        acpi_rs_decode_specific_flags(&output_struct->data, *buffer);
-
-        /* Get Granularity (Bytes 6-7) */
-
-        buffer += 1;
-        ACPI_MOVE_16_TO_32(&output_struct->data.address16.granularity, buffer);
-
-        /* Get min_address_range (Bytes 8-9) */
+        {ACPI_RSC_ADDRESS, 0, 0, 0},
 
-        buffer += 2;
-        ACPI_MOVE_16_TO_32(&output_struct->data.address16.min_address_range,
-                           buffer);
-
-        /* Get max_address_range (Bytes 10-11) */
-
-        buffer += 2;
-        ACPI_MOVE_16_TO_32(&output_struct->data.address16.max_address_range,
-                           buffer);
-
-        /* Get address_translation_offset (Bytes 12-13) */
-
-        buffer += 2;
-        ACPI_MOVE_16_TO_32(&output_struct->data.address16.
-                           address_translation_offset, buffer);
-
-        /* Get address_length (Bytes 14-15) */
-
-        buffer += 2;
-        ACPI_MOVE_16_TO_32(&output_struct->data.address16.address_length,
-                           buffer);
-
-        /* Resource Source Index (if present) */
-
-        buffer += 2;
+        /* Revision ID */
 
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.ext_address64.revision_iD),
+         AML_OFFSET(ext_address64.revision_iD),
+         1},
         /*
-         * This will leave us pointing to the Resource Source Index
-         * If it is present, then save it off and calculate the
-         * pointer to where the null terminated string goes:
-         * Each Interrupt takes 32-bits + the 5 bytes of the
-         * stream that are default.
-         *
-         * Note: Some resource descriptors will have an additional null, so
-         * we add 1 to the length.
+         * These fields are contiguous in both the source and destination:
+         * Address Granularity
+         * Address Range Minimum
+         * Address Range Maximum
+         * Address Translation Offset
+         * Address Length
+         * Type-Specific Attribute
          */
-        if (*bytes_consumed > (16 + 1)) {
-                /* Dereference the Index */
-
-                output_struct->data.address16.resource_source.index =
-                    (u32) * buffer;
-
-                /* Point to the String */
-
-                buffer += 1;
-
-                /* Point the String pointer to the end of this structure */
-
-                output_struct->data.address16.resource_source.string_ptr =
-                    (char *)((u8 *) output_struct + struct_size);
-
-                temp_ptr = (u8 *)
-                    output_struct->data.address16.resource_source.string_ptr;
-
-                /* Copy the resource_source string into the buffer */
-
-                index = 0;
-                while (*buffer) {
-                        *temp_ptr = *buffer;
-
-                        temp_ptr++;
-                        buffer++;
-                        index++;
-                }
-
-                /* Add the terminating null and set the string length */
-
-                *temp_ptr = 0;
-                output_struct->data.address16.resource_source.string_length =
-                    index + 1;
-
-                /*
-                 * In order for the struct_size to fall on a 32-bit boundary,
-                 * calculate the length of the string and expand the
-                 * struct_size to the next 32-bit boundary.
-                 */
-                temp8 = (u8) (index + 1);
-                struct_size += ACPI_ROUND_UP_to_32_bITS(temp8);
-        } else {
-                output_struct->data.address16.resource_source.index = 0;
-                output_struct->data.address16.resource_source.string_length = 0;
-                output_struct->data.address16.resource_source.string_ptr = NULL;
-        }
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_MOVE64, ACPI_RS_OFFSET(data.ext_address64.granularity),
+         AML_OFFSET(ext_address64.granularity),
+         6}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_address16_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_convert_general_flags - Flags common to all address descriptors
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_address16_stream(struct acpi_resource *linked_list,
-                         u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u8 *length_field;
-        acpi_size actual_bytes;
-
-        ACPI_FUNCTION_TRACE("rs_address16_stream");
-
-        /* Set the Descriptor Type field */
-
-        *buffer = ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE;
-        buffer += 1;
-
-        /* Save a pointer to the Length field - to be filled in later */
-
-        length_field = buffer;
-        buffer += 2;
-
-        /* Set the Resource Type (Memory, Io, bus_number) */
-
-        *buffer = (u8) (linked_list->data.address16.resource_type & 0x03);
-        buffer += 1;
-
-        /* Set the general flags */
-
-        *buffer = acpi_rs_encode_general_flags(&linked_list->data);
-        buffer += 1;
-
-        /* Set the type specific flags */
-
-        *buffer = acpi_rs_encode_specific_flags(&linked_list->data);
-        buffer += 1;
-
-        /* Set the address space granularity */
-
-        ACPI_MOVE_32_TO_16(buffer, &linked_list->data.address16.granularity);
-        buffer += 2;
-
-        /* Set the address range minimum */
+static struct acpi_rsconvert_info acpi_rs_convert_general_flags[6] = {
+        {ACPI_RSC_FLAGINIT, 0, AML_OFFSET(address.flags),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_general_flags)},
 
-        ACPI_MOVE_32_TO_16(buffer,
-                           &linked_list->data.address16.min_address_range);
-        buffer += 2;
+        /* Resource Type (Memory, Io, bus_number, etc.) */
 
-        /* Set the address range maximum */
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.address.resource_type),
+         AML_OFFSET(address.resource_type),
+         1},
 
-        ACPI_MOVE_32_TO_16(buffer,
-                           &linked_list->data.address16.max_address_range);
-        buffer += 2;
+        /* General Flags - Consume, Decode, min_fixed, max_fixed */
 
-        /* Set the address translation offset */
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.producer_consumer),
+         AML_OFFSET(address.flags),
+         0},
 
-        ACPI_MOVE_32_TO_16(buffer,
-                           &linked_list->data.address16.
-                           address_translation_offset);
-        buffer += 2;
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.decode),
+         AML_OFFSET(address.flags),
+         1},
 
-        /* Set the address length */
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.min_address_fixed),
+         AML_OFFSET(address.flags),
+         2},
 
-        ACPI_MOVE_32_TO_16(buffer, &linked_list->data.address16.address_length);
-        buffer += 2;
-
-        /* Resource Source Index and Resource Source are optional */
-
-        if (linked_list->data.address16.resource_source.string_length) {
-                *buffer =
-                    (u8) linked_list->data.address16.resource_source.index;
-                buffer += 1;
-
-                /* Copy the resource_source string */
-
-                ACPI_STRCPY((char *)buffer,
-                            linked_list->data.address16.resource_source.
-                            string_ptr);
-
-                /*
-                 * Buffer needs to be set to the length of the string + one for the
-                 * terminating null
-                 */
-                buffer +=
-                    (acpi_size) (ACPI_STRLEN
-                                 (linked_list->data.address16.resource_source.
-                                  string_ptr) + 1);
-        }
-
-        /* Return the number of bytes consumed in this operation */
-
-        actual_bytes = ACPI_PTR_DIFF(buffer, *output_buffer);
-        *bytes_consumed = actual_bytes;
-
-        /*
-         * Set the length field to the number of bytes consumed
-         * minus the header size (3 bytes)
-         */
-        actual_bytes -= 3;
-        ACPI_MOVE_SIZE_TO_16(length_field, &actual_bytes);
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.max_address_fixed),
+         AML_OFFSET(address.flags),
+         3}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_address32_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_convert_mem_flags - Flags common to Memory address descriptors
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_address32_resource(u8 * byte_stream_buffer,
-                           acpi_size * bytes_consumed,
-                           u8 ** output_buffer, acpi_size * structure_size)
-{
-        u16 temp16;
-        u8 temp8;
-        u8 *temp_ptr;
-        u32 index;
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_address32);
+static struct acpi_rsconvert_info acpi_rs_convert_mem_flags[5] = {
+        {ACPI_RSC_FLAGINIT, 0, AML_OFFSET(address.specific_flags),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_mem_flags)},
 
-        ACPI_FUNCTION_TRACE("rs_address32_resource");
+        /* Memory-specific flags */
 
-        /* Get the Descriptor Length field */
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.info.mem.write_protect),
+         AML_OFFSET(address.specific_flags),
+         0},
 
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.address.info.mem.caching),
+         AML_OFFSET(address.specific_flags),
+         1},
 
-        /* Validate minimum descriptor length */
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.address.info.mem.range_type),
+         AML_OFFSET(address.specific_flags),
+         3},
 
-        if (temp16 < 23) {
-                return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
-        }
-
-        *bytes_consumed = temp16 + 3;
-        output_struct->id = ACPI_RSTYPE_ADDRESS32;
-
-        /* Get the Resource Type (Byte3) */
-
-        buffer += 2;
-        temp8 = *buffer;
-
-        /* Values 0-2 and 0xC0-0xFF are valid */
-
-        if ((temp8 > 2) && (temp8 < 0xC0)) {
-                return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
-        }
-
-        output_struct->data.address32.resource_type = temp8;
-
-        /* Get the General Flags (Byte4) */
-
-        buffer += 1;
-        acpi_rs_decode_general_flags(&output_struct->data, *buffer);
-
-        /* Get the Type Specific Flags (Byte5) */
-
-        buffer += 1;
-        acpi_rs_decode_specific_flags(&output_struct->data, *buffer);
-
-        /* Get Granularity (Bytes 6-9) */
-
-        buffer += 1;
-        ACPI_MOVE_32_TO_32(&output_struct->data.address32.granularity, buffer);
-
-        /* Get min_address_range (Bytes 10-13) */
-
-        buffer += 4;
-        ACPI_MOVE_32_TO_32(&output_struct->data.address32.min_address_range,
-                           buffer);
-
-        /* Get max_address_range (Bytes 14-17) */
-
-        buffer += 4;
-        ACPI_MOVE_32_TO_32(&output_struct->data.address32.max_address_range,
-                           buffer);
-
-        /* Get address_translation_offset (Bytes 18-21) */
-
-        buffer += 4;
-        ACPI_MOVE_32_TO_32(&output_struct->data.address32.
-                           address_translation_offset, buffer);
-
-        /* Get address_length (Bytes 22-25) */
-
-        buffer += 4;
-        ACPI_MOVE_32_TO_32(&output_struct->data.address32.address_length,
-                           buffer);
-
-        /* Resource Source Index (if present) */
-
-        buffer += 4;
-
-        /*
-         * This will leave us pointing to the Resource Source Index
-         * If it is present, then save it off and calculate the
-         * pointer to where the null terminated string goes:
-         *
-         * Note: Some resource descriptors will have an additional null, so
-         * we add 1 to the length.
-         */
-        if (*bytes_consumed > (26 + 1)) {
-                /* Dereference the Index */
-
-                output_struct->data.address32.resource_source.index =
-                    (u32) * buffer;
-
-                /* Point to the String */
-
-                buffer += 1;
-
-                /* Point the String pointer to the end of this structure */
-
-                output_struct->data.address32.resource_source.string_ptr =
-                    (char *)((u8 *) output_struct + struct_size);
-
-                temp_ptr = (u8 *)
-                    output_struct->data.address32.resource_source.string_ptr;
-
-                /* Copy the resource_source string into the buffer */
-
-                index = 0;
-                while (*buffer) {
-                        *temp_ptr = *buffer;
-
-                        temp_ptr++;
-                        buffer++;
-                        index++;
-                }
-
-                /* Add the terminating null and set the string length */
-
-                *temp_ptr = 0;
-                output_struct->data.address32.resource_source.string_length =
-                    index + 1;
-
-                /*
-                 * In order for the struct_size to fall on a 32-bit boundary,
-                 * calculate the length of the string and expand the
-                 * struct_size to the next 32-bit boundary.
-                 */
-                temp8 = (u8) (index + 1);
-                struct_size += ACPI_ROUND_UP_to_32_bITS(temp8);
-        } else {
-                output_struct->data.address32.resource_source.index = 0;
-                output_struct->data.address32.resource_source.string_length = 0;
-                output_struct->data.address32.resource_source.string_ptr = NULL;
-        }
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.info.mem.translation),
+         AML_OFFSET(address.specific_flags),
+         5}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_address32_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_convert_io_flags - Flags common to I/O address descriptors
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_address32_stream(struct acpi_resource *linked_list,
-                         u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer;
-        u16 *length_field;
-
-        ACPI_FUNCTION_TRACE("rs_address32_stream");
-
-        buffer = *output_buffer;
-
-        /* Set the Descriptor Type field */
-
-        *buffer = ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE;
-        buffer += 1;
-
-        /* Save a pointer to the Length field - to be filled in later */
-
-        length_field = ACPI_CAST_PTR(u16, buffer);
-        buffer += 2;
-
-        /* Set the Resource Type (Memory, Io, bus_number) */
-
-        *buffer = (u8) (linked_list->data.address32.resource_type & 0x03);
-        buffer += 1;
-
-        /* Set the general flags */
-
-        *buffer = acpi_rs_encode_general_flags(&linked_list->data);
-        buffer += 1;
-
-        /* Set the type specific flags */
-
-        *buffer = acpi_rs_encode_specific_flags(&linked_list->data);
-        buffer += 1;
-
-        /* Set the address space granularity */
-
-        ACPI_MOVE_32_TO_32(buffer, &linked_list->data.address32.granularity);
-        buffer += 4;
-
-        /* Set the address range minimum */
-
-        ACPI_MOVE_32_TO_32(buffer,
-                           &linked_list->data.address32.min_address_range);
-        buffer += 4;
-
-        /* Set the address range maximum */
-
-        ACPI_MOVE_32_TO_32(buffer,
-                           &linked_list->data.address32.max_address_range);
-        buffer += 4;
-
-        /* Set the address translation offset */
-
-        ACPI_MOVE_32_TO_32(buffer,
-                           &linked_list->data.address32.
-                           address_translation_offset);
-        buffer += 4;
-
-        /* Set the address length */
-
-        ACPI_MOVE_32_TO_32(buffer, &linked_list->data.address32.address_length);
-        buffer += 4;
+static struct acpi_rsconvert_info acpi_rs_convert_io_flags[4] = {
+        {ACPI_RSC_FLAGINIT, 0, AML_OFFSET(address.specific_flags),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_io_flags)},
 
-        /* Resource Source Index and Resource Source are optional */
+        /* I/O-specific flags */
 
-        if (linked_list->data.address32.resource_source.string_length) {
-                *buffer =
-                    (u8) linked_list->data.address32.resource_source.index;
-                buffer += 1;
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.address.info.io.range_type),
+         AML_OFFSET(address.specific_flags),
+         0},
 
-                /* Copy the resource_source string */
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.address.info.io.translation),
+         AML_OFFSET(address.specific_flags),
+         4},
 
-                ACPI_STRCPY((char *)buffer,
-                            linked_list->data.address32.resource_source.
-                            string_ptr);
-
-                /*
-                 * Buffer needs to be set to the length of the string + one for the
-                 *  terminating null
-                 */
-                buffer +=
-                    (acpi_size) (ACPI_STRLEN
-                                 (linked_list->data.address32.resource_source.
-                                  string_ptr) + 1);
-        }
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-
-        /*
-         * Set the length field to the number of bytes consumed
-         * minus the header size (3 bytes)
-         */
-        *length_field = (u16) (*bytes_consumed - 3);
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_1BITFLAG,
+         ACPI_RS_OFFSET(data.address.info.io.translation_type),
+         AML_OFFSET(address.specific_flags),
+         5}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_address64_resource
+ * FUNCTION:    acpi_rs_get_address_common
  *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
+ * PARAMETERS:  Resource            - Pointer to the internal resource struct
+ *              Aml                 - Pointer to the AML resource descriptor
  *
- * RETURN:      Status
+ * RETURN:      TRUE if the resource_type field is OK, FALSE otherwise
  *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * DESCRIPTION: Convert common flag fields from a raw AML resource descriptor
+ *              to an internal resource descriptor
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_address64_resource(u8 * byte_stream_buffer,
-                           acpi_size * bytes_consumed,
-                           u8 ** output_buffer, acpi_size * structure_size)
+u8
+acpi_rs_get_address_common(struct acpi_resource *resource,
+                           union aml_resource *aml)
 {
-        u16 temp16;
-        u8 temp8;
-        u8 resource_type;
-        u8 *temp_ptr;
-        u32 index;
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64);
-
-        ACPI_FUNCTION_TRACE("rs_address64_resource");
-
-        /* Get the Descriptor Type */
-
-        resource_type = *buffer;
-
-        /* Get the Descriptor Length field */
-
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-        /* Validate minimum descriptor length */
-
-        if (temp16 < 43) {
-                return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
-        }
-
-        *bytes_consumed = temp16 + 3;
-        output_struct->id = ACPI_RSTYPE_ADDRESS64;
-
-        /* Get the Resource Type (Byte3) */
-
-        buffer += 2;
-        temp8 = *buffer;
-
-        /* Values 0-2 and 0xC0-0xFF are valid */
-
-        if ((temp8 > 2) && (temp8 < 0xC0)) {
-                return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
-        }
-
-        output_struct->data.address64.resource_type = temp8;
-
-        /* Get the General Flags (Byte4) */
-
-        buffer += 1;
-        acpi_rs_decode_general_flags(&output_struct->data, *buffer);
-
-        /* Get the Type Specific Flags (Byte5) */
-
-        buffer += 1;
-        acpi_rs_decode_specific_flags(&output_struct->data, *buffer);
+        ACPI_FUNCTION_ENTRY();
 
-        if (resource_type == ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE) {
-                /* Move past revision_id and Reserved byte */
+        /* Validate the Resource Type */
 
-                buffer += 2;
+        if ((aml->address.resource_type > 2)
+            && (aml->address.resource_type < 0xC0)) {
+                return (FALSE);
         }
 
-        /* Get Granularity (Bytes 6-13) or (Bytes 8-15) */
-
-        buffer += 1;
-        ACPI_MOVE_64_TO_64(&output_struct->data.address64.granularity, buffer);
-
-        /* Get min_address_range (Bytes 14-21) or (Bytes 16-23) */
-
-        buffer += 8;
-        ACPI_MOVE_64_TO_64(&output_struct->data.address64.min_address_range,
-                           buffer);
-
-        /* Get max_address_range (Bytes 22-29) or (Bytes 24-31) */
-
-        buffer += 8;
-        ACPI_MOVE_64_TO_64(&output_struct->data.address64.max_address_range,
-                           buffer);
-
-        /* Get address_translation_offset (Bytes 30-37) or (Bytes 32-39) */
-
-        buffer += 8;
-        ACPI_MOVE_64_TO_64(&output_struct->data.address64.
-                           address_translation_offset, buffer);
+        /* Get the Resource Type and General Flags */
 
-        /* Get address_length (Bytes 38-45) or (Bytes 40-47) */
+        (void)acpi_rs_convert_aml_to_resource(resource, aml,
+                                              acpi_rs_convert_general_flags);
 
-        buffer += 8;
-        ACPI_MOVE_64_TO_64(&output_struct->data.address64.address_length,
-                           buffer);
+        /* Get the Type-Specific Flags (Memory and I/O descriptors only) */
 
-        output_struct->data.address64.resource_source.index = 0;
-        output_struct->data.address64.resource_source.string_length = 0;
-        output_struct->data.address64.resource_source.string_ptr = NULL;
-
-        if (resource_type == ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE) {
-                /* Get type_specific_attribute (Bytes 48-55) */
-
-                buffer += 8;
-                ACPI_MOVE_64_TO_64(&output_struct->data.address64.
-                                   type_specific_attributes, buffer);
+        if (resource->data.address.resource_type == ACPI_MEMORY_RANGE) {
+                (void)acpi_rs_convert_aml_to_resource(resource, aml,
+                                                      acpi_rs_convert_mem_flags);
+        } else if (resource->data.address.resource_type == ACPI_IO_RANGE) {
+                (void)acpi_rs_convert_aml_to_resource(resource, aml,
+                                                      acpi_rs_convert_io_flags);
         } else {
-                output_struct->data.address64.type_specific_attributes = 0;
-
-                /* Resource Source Index (if present) */
-
-                buffer += 8;
-
-                /*
-                 * This will leave us pointing to the Resource Source Index
-                 * If it is present, then save it off and calculate the
-                 * pointer to where the null terminated string goes:
-                 * Each Interrupt takes 32-bits + the 5 bytes of the
-                 * stream that are default.
-                 *
-                 * Note: Some resource descriptors will have an additional null, so
-                 * we add 1 to the length.
-                 */
-                if (*bytes_consumed > (46 + 1)) {
-                        /* Dereference the Index */
-
-                        output_struct->data.address64.resource_source.index =
-                            (u32) * buffer;
-
-                        /* Point to the String */
-
-                        buffer += 1;
-
-                        /* Point the String pointer to the end of this structure */
-
-                        output_struct->data.address64.resource_source.
-                            string_ptr =
-                            (char *)((u8 *) output_struct + struct_size);
-
-                        temp_ptr = (u8 *)
-                            output_struct->data.address64.resource_source.
-                            string_ptr;
-
-                        /* Copy the resource_source string into the buffer */
-
-                        index = 0;
-                        while (*buffer) {
-                                *temp_ptr = *buffer;
-
-                                temp_ptr++;
-                                buffer++;
-                                index++;
-                        }
-
-                        /*
-                         * Add the terminating null and set the string length
-                         */
-                        *temp_ptr = 0;
-                        output_struct->data.address64.resource_source.
-                            string_length = index + 1;
-
-                        /*
-                         * In order for the struct_size to fall on a 32-bit boundary,
-                         * calculate the length of the string and expand the
-                         * struct_size to the next 32-bit boundary.
-                         */
-                        temp8 = (u8) (index + 1);
-                        struct_size += ACPI_ROUND_UP_to_32_bITS(temp8);
-                }
-        }
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
+                /* Generic resource type, just grab the type_specific byte */
 
-        /* Return the final size of the structure */
+                resource->data.address.info.type_specific =
+                    aml->address.specific_flags;
+        }
 
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
+        return (TRUE);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_address64_stream
+ * FUNCTION:    acpi_rs_set_address_common
  *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
+ * PARAMETERS:  Aml                 - Pointer to the AML resource descriptor
+ *              Resource            - Pointer to the internal resource struct
  *
- * RETURN:      Status
+ * RETURN:      None
  *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * DESCRIPTION: Convert common flag fields from a resource descriptor to an
+ *              AML descriptor
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_address64_stream(struct acpi_resource *linked_list,
-                         u8 ** output_buffer, acpi_size * bytes_consumed)
+void
+acpi_rs_set_address_common(union aml_resource *aml,
+                           struct acpi_resource *resource)
 {
-        u8 *buffer;
-        u16 *length_field;
-
-        ACPI_FUNCTION_TRACE("rs_address64_stream");
-
-        buffer = *output_buffer;
-
-        /* Set the Descriptor Type field */
-
-        *buffer = ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE;
-        buffer += 1;
-
-        /* Save a pointer to the Length field - to be filled in later */
-
-        length_field = ACPI_CAST_PTR(u16, buffer);
-        buffer += 2;
-
-        /* Set the Resource Type (Memory, Io, bus_number) */
-
-        *buffer = (u8) (linked_list->data.address64.resource_type & 0x03);
-        buffer += 1;
-
-        /* Set the general flags */
-
-        *buffer = acpi_rs_encode_general_flags(&linked_list->data);
-        buffer += 1;
-
-        /* Set the type specific flags */
-
-        *buffer = acpi_rs_encode_specific_flags(&linked_list->data);
-        buffer += 1;
-
-        /* Set the address space granularity */
-
-        ACPI_MOVE_64_TO_64(buffer, &linked_list->data.address64.granularity);
-        buffer += 8;
-
-        /* Set the address range minimum */
-
-        ACPI_MOVE_64_TO_64(buffer,
-                           &linked_list->data.address64.min_address_range);
-        buffer += 8;
-
-        /* Set the address range maximum */
-
-        ACPI_MOVE_64_TO_64(buffer,
-                           &linked_list->data.address64.max_address_range);
-        buffer += 8;
-
-        /* Set the address translation offset */
-
-        ACPI_MOVE_64_TO_64(buffer,
-                           &linked_list->data.address64.
-                           address_translation_offset);
-        buffer += 8;
-
-        /* Set the address length */
-
-        ACPI_MOVE_64_TO_64(buffer, &linked_list->data.address64.address_length);
-        buffer += 8;
+        ACPI_FUNCTION_ENTRY();
 
-        /* Resource Source Index and Resource Source are optional */
+        /* Set the Resource Type and General Flags */
 
-        if (linked_list->data.address64.resource_source.string_length) {
-                *buffer =
-                    (u8) linked_list->data.address64.resource_source.index;
-                buffer += 1;
+        (void)acpi_rs_convert_resource_to_aml(resource, aml,
+                                              acpi_rs_convert_general_flags);
 
-                /* Copy the resource_source string */
+        /* Set the Type-Specific Flags (Memory and I/O descriptors only) */
 
-                ACPI_STRCPY((char *)buffer,
-                            linked_list->data.address64.resource_source.
-                            string_ptr);
+        if (resource->data.address.resource_type == ACPI_MEMORY_RANGE) {
+                (void)acpi_rs_convert_resource_to_aml(resource, aml,
+                                                      acpi_rs_convert_mem_flags);
+        } else if (resource->data.address.resource_type == ACPI_IO_RANGE) {
+                (void)acpi_rs_convert_resource_to_aml(resource, aml,
+                                                      acpi_rs_convert_io_flags);
+        } else {
+                /* Generic resource type, just copy the type_specific byte */
 
-                /*
-                 * Buffer needs to be set to the length of the string + one for the
-                 * terminating null
-                 */
-                buffer +=
-                    (acpi_size) (ACPI_STRLEN
-                                 (linked_list->data.address64.resource_source.
-                                  string_ptr) + 1);
+                aml->address.specific_flags =
+                    resource->data.address.info.type_specific;
         }
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-
-        /*
-         * Set the length field to the number of bytes consumed
-         * minus the header size (3 bytes)
-         */
-        *length_field = (u16) (*bytes_consumed - 3);
-        return_ACPI_STATUS(AE_OK);
 }
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index 378f58390fc1..7d6481d9fbec 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,652 +49,433 @@
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rscalc")
 
+/* Local prototypes */
+static u8 acpi_rs_count_set_bits(u16 bit_field);
+
+static acpi_rs_length
+acpi_rs_struct_option_length(struct acpi_resource_source *resource_source);
+
+static u32
+acpi_rs_stream_option_length(u32 resource_length, u32 minimum_total_length);
+
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_get_byte_stream_length
+ * FUNCTION:    acpi_rs_count_set_bits
  *
- * PARAMETERS:  linked_list         - Pointer to the resource linked list
- *              size_needed         - u32 pointer of the size buffer needed
- *                                    to properly return the parsed data
+ * PARAMETERS:  bit_field       - Field in which to count bits
  *
- * RETURN:      Status
+ * RETURN:      Number of bits set within the field
  *
- * DESCRIPTION: Takes the resource byte stream and parses it once, calculating
- *              the size buffer needed to hold the linked list that conveys
- *              the resource data.
+ * DESCRIPTION: Count the number of bits set in a resource field. Used for
+ *              (Short descriptor) interrupt and DMA lists.
  *
  ******************************************************************************/
-acpi_status
-acpi_rs_get_byte_stream_length(struct acpi_resource *linked_list,
-                               acpi_size * size_needed)
-{
-        acpi_size byte_stream_size_needed = 0;
-        acpi_size segment_size;
-        u8 done = FALSE;
-
-        ACPI_FUNCTION_TRACE("rs_get_byte_stream_length");
-
-        while (!done) {
-                /* Init the variable that will hold the size to add to the total. */
-
-                segment_size = 0;
-
-                switch (linked_list->id) {
-                case ACPI_RSTYPE_IRQ:
-                        /*
-                         * IRQ Resource
-                         * For an IRQ Resource, Byte 3, although optional, will always be
-                         * created - it holds IRQ information.
-                         */
-                        segment_size = 4;
-                        break;
-
-                case ACPI_RSTYPE_DMA:
-                        /*
-                         * DMA Resource
-                         * For this resource the size is static
-                         */
-                        segment_size = 3;
-                        break;
-
-                case ACPI_RSTYPE_START_DPF:
-                        /*
-                         * Start Dependent Functions Resource
-                         * For a start_dependent_functions Resource, Byte 1, although
-                         * optional, will always be created.
-                         */
-                        segment_size = 2;
-                        break;
-
-                case ACPI_RSTYPE_END_DPF:
-                        /*
-                         * End Dependent Functions Resource
-                         * For this resource the size is static
-                         */
-                        segment_size = 1;
-                        break;
-
-                case ACPI_RSTYPE_IO:
-                        /*
-                         * IO Port Resource
-                         * For this resource the size is static
-                         */
-                        segment_size = 8;
-                        break;
 
-                case ACPI_RSTYPE_FIXED_IO:
-                        /*
-                         * Fixed IO Port Resource
-                         * For this resource the size is static
-                         */
-                        segment_size = 4;
-                        break;
-
-                case ACPI_RSTYPE_VENDOR:
-                        /*
-                         * Vendor Defined Resource
-                         * For a Vendor Specific resource, if the Length is between 1 and 7
-                         * it will be created as a Small Resource data type, otherwise it
-                         * is a Large Resource data type.
-                         */
-                        if (linked_list->data.vendor_specific.length > 7) {
-                                segment_size = 3;
-                        } else {
-                                segment_size = 1;
-                        }
-                        segment_size +=
-                            linked_list->data.vendor_specific.length;
-                        break;
-
-                case ACPI_RSTYPE_END_TAG:
-                        /*
-                         * End Tag
-                         * For this resource the size is static
-                         */
-                        segment_size = 2;
-                        done = TRUE;
-                        break;
-
-                case ACPI_RSTYPE_MEM24:
-                        /*
-                         * 24-Bit Memory Resource
-                         * For this resource the size is static
-                         */
-                        segment_size = 12;
-                        break;
+static u8 acpi_rs_count_set_bits(u16 bit_field)
+{
+        u8 bits_set;
 
-                case ACPI_RSTYPE_MEM32:
-                        /*
-                         * 32-Bit Memory Range Resource
-                         * For this resource the size is static
-                         */
-                        segment_size = 20;
-                        break;
+        ACPI_FUNCTION_ENTRY();
 
-                case ACPI_RSTYPE_FIXED_MEM32:
-                        /*
-                         * 32-Bit Fixed Memory Resource
-                         * For this resource the size is static
-                         */
-                        segment_size = 12;
-                        break;
+        for (bits_set = 0; bit_field; bits_set++) {
+                /* Zero the least significant bit that is set */
 
-                case ACPI_RSTYPE_ADDRESS16:
-                        /*
-                         * 16-Bit Address Resource
-                         * The base size of this byte stream is 16. If a Resource Source
-                         * string is not NULL, add 1 for the Index + the length of the null
-                         * terminated string Resource Source + 1 for the null.
-                         */
-                        segment_size = 16;
-
-                        if (linked_list->data.address16.resource_source.
-                            string_ptr) {
-                                segment_size +=
-                                    linked_list->data.address16.resource_source.
-                                    string_length;
-                                segment_size++;
-                        }
-                        break;
+                bit_field &= (bit_field - 1);
+        }
 
-                case ACPI_RSTYPE_ADDRESS32:
-                        /*
-                         * 32-Bit Address Resource
-                         * The base size of this byte stream is 26. If a Resource
-                         * Source string is not NULL, add 1 for the Index + the
-                         * length of the null terminated string Resource Source +
-                         * 1 for the null.
-                         */
-                        segment_size = 26;
-
-                        if (linked_list->data.address32.resource_source.
-                            string_ptr) {
-                                segment_size +=
-                                    linked_list->data.address32.resource_source.
-                                    string_length;
-                                segment_size++;
-                        }
-                        break;
+        return (bits_set);
+}
 
-                case ACPI_RSTYPE_ADDRESS64:
-                        /*
-                         * 64-Bit Address Resource
-                         * The base size of this byte stream is 46. If a resource_source
-                         * string is not NULL, add 1 for the Index + the length of the null
-                         * terminated string Resource Source + 1 for the null.
-                         */
-                        segment_size = 46;
-
-                        if (linked_list->data.address64.resource_source.
-                            string_ptr) {
-                                segment_size +=
-                                    linked_list->data.address64.resource_source.
-                                    string_length;
-                                segment_size++;
-                        }
-                        break;
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_struct_option_length
+ *
+ * PARAMETERS:  resource_source     - Pointer to optional descriptor field
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Common code to handle optional resource_source_index and
+ *              resource_source fields in some Large descriptors. Used during
+ *              list-to-stream conversion
+ *
+ ******************************************************************************/
 
-                case ACPI_RSTYPE_EXT_IRQ:
-                        /*
-                         * Extended IRQ Resource
-                         * The base size of this byte stream is 9. This is for an Interrupt
-                         * table length of 1.  For each additional interrupt, add 4.
-                         * If a Resource Source string is not NULL, add 1 for the
-                         * Index + the length of the null terminated string
-                         * Resource Source + 1 for the null.
-                         */
-                        segment_size = 9 + (((acpi_size)
-                                             linked_list->data.extended_irq.
-                                             number_of_interrupts - 1) * 4);
-
-                        if (linked_list->data.extended_irq.resource_source.
-                            string_ptr) {
-                                segment_size +=
-                                    linked_list->data.extended_irq.
-                                    resource_source.string_length;
-                                segment_size++;
-                        }
-                        break;
+static acpi_rs_length
+acpi_rs_struct_option_length(struct acpi_resource_source *resource_source)
+{
+        ACPI_FUNCTION_ENTRY();
 
-                default:
+        /*
+         * If the resource_source string is valid, return the size of the string
+         * (string_length includes the NULL terminator) plus the size of the
+         * resource_source_index (1).
+         */
+        if (resource_source->string_ptr) {
+                return ((acpi_rs_length) (resource_source->string_length + 1));
+        }
 
-                        /* If we get here, everything is out of sync, exit with error */
+        return (0);
+}
 
-                        return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_stream_option_length
+ *
+ * PARAMETERS:  resource_length     - Length from the resource header
+ *              minimum_total_length - Minimum length of this resource, before
+ *                                    any optional fields. Includes header size
+ *
+ * RETURN:      Length of optional string (0 if no string present)
+ *
+ * DESCRIPTION: Common code to handle optional resource_source_index and
+ *              resource_source fields in some Large descriptors. Used during
+ *              stream-to-list conversion
+ *
+ ******************************************************************************/
 
-                }               /* switch (linked_list->Id) */
+static u32
+acpi_rs_stream_option_length(u32 resource_length,
+                             u32 minimum_aml_resource_length)
+{
+        u32 string_length = 0;
 
-                /* Update the total */
+        ACPI_FUNCTION_ENTRY();
 
-                byte_stream_size_needed += segment_size;
+        /*
+         * The resource_source_index and resource_source are optional elements of some
+         * Large-type resource descriptors.
+         */
 
-                /* Point to the next object */
+        /*
+         * If the length of the actual resource descriptor is greater than the ACPI
+         * spec-defined minimum length, it means that a resource_source_index exists
+         * and is followed by a (required) null terminated string. The string length
+         * (including the null terminator) is the resource length minus the minimum
+         * length, minus one byte for the resource_source_index itself.
+         */
+        if (resource_length > minimum_aml_resource_length) {
+                /* Compute the length of the optional string */
 
-                linked_list = ACPI_PTR_ADD(struct acpi_resource,
-                                           linked_list, linked_list->length);
+                string_length =
+                    resource_length - minimum_aml_resource_length - 1;
         }
 
-        /* This is the data the caller needs */
+        /* Round up length to 32 bits for internal structure alignment */
 
-        *size_needed = byte_stream_size_needed;
-        return_ACPI_STATUS(AE_OK);
+        return (ACPI_ROUND_UP_to_32_bITS(string_length));
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_get_list_length
+ * FUNCTION:    acpi_rs_get_aml_length
  *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource byte stream
- *              byte_stream_buffer_length - Size of byte_stream_buffer
- *              size_needed             - u32 pointer of the size buffer
- *                                        needed to properly return the
- *                                        parsed data
+ * PARAMETERS:  Resource            - Pointer to the resource linked list
+ *              size_needed         - Where the required size is returned
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Takes the resource byte stream and parses it once, calculating
- *              the size buffer needed to hold the linked list that conveys
- *              the resource data.
+ * DESCRIPTION: Takes a linked list of internal resource descriptors and
+ *              calculates the size buffer needed to hold the corresponding
+ *              external resource byte stream.
  *
  ******************************************************************************/
 
 acpi_status
-acpi_rs_get_list_length(u8 * byte_stream_buffer,
-                        u32 byte_stream_buffer_length, acpi_size * size_needed)
+acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
 {
-        u32 buffer_size = 0;
-        u32 bytes_parsed = 0;
-        u8 number_of_interrupts = 0;
-        u8 number_of_channels = 0;
-        u8 resource_type;
-        u32 structure_size;
-        u32 bytes_consumed;
-        u8 *buffer;
-        u8 temp8;
-        u16 temp16;
-        u8 index;
-        u8 additional_bytes;
-
-        ACPI_FUNCTION_TRACE("rs_get_list_length");
+        acpi_size aml_size_needed = 0;
+        acpi_rs_length total_size;
 
-        while (bytes_parsed < byte_stream_buffer_length) {
-                /* The next byte in the stream is the resource type */
+        ACPI_FUNCTION_TRACE("rs_get_aml_length");
 
-                resource_type = acpi_rs_get_resource_type(*byte_stream_buffer);
+        /* Traverse entire list of internal resource descriptors */
 
-                switch (resource_type) {
-                case ACPI_RDESC_TYPE_MEMORY_24:
-                        /*
-                         * 24-Bit Memory Resource
-                         */
-                        bytes_consumed = 12;
-
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem24);
-                        break;
+        while (resource) {
+                /* Validate the descriptor type */
 
-                case ACPI_RDESC_TYPE_LARGE_VENDOR:
-                        /*
-                         * Vendor Defined Resource
-                         */
-                        buffer = byte_stream_buffer;
-                        ++buffer;
-
-                        ACPI_MOVE_16_TO_16(&temp16, buffer);
-                        bytes_consumed = temp16 + 3;
-
-                        /* Ensure a 32-bit boundary for the structure */
+                if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
+                        return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
+                }
 
-                        temp16 = (u16) ACPI_ROUND_UP_to_32_bITS(temp16);
+                /* Get the base size of the (external stream) resource descriptor */
 
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor) +
-                            (temp16 * sizeof(u8));
-                        break;
+                total_size = acpi_gbl_aml_resource_sizes[resource->type];
 
-                case ACPI_RDESC_TYPE_MEMORY_32:
+                /*
+                 * Augment the base size for descriptors with optional and/or
+                 * variable-length fields
+                 */
+                switch (resource->type) {
+                case ACPI_RESOURCE_TYPE_VENDOR:
                         /*
-                         * 32-Bit Memory Range Resource
+                         * Vendor Defined Resource:
+                         * For a Vendor Specific resource, if the Length is between 1 and 7
+                         * it will be created as a Small Resource data type, otherwise it
+                         * is a Large Resource data type.
                          */
-                        bytes_consumed = 20;
+                        if (resource->data.vendor.byte_length > 7) {
+                                /* Base size of a Large resource descriptor */
 
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem32);
-                        break;
+                                total_size =
+                                    sizeof(struct aml_resource_large_header);
+                        }
 
-                case ACPI_RDESC_TYPE_FIXED_MEMORY_32:
-                        /*
-                         * 32-Bit Fixed Memory Resource
-                         */
-                        bytes_consumed = 12;
+                        /* Add the size of the vendor-specific data */
 
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct
-                                                 acpi_resource_fixed_mem32);
+                        total_size = (acpi_rs_length)
+                            (total_size + resource->data.vendor.byte_length);
                         break;
 
-                case ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE:
+                case ACPI_RESOURCE_TYPE_END_TAG:
                         /*
-                         * 64-Bit Address Resource
+                         * End Tag:
+                         * We are done -- return the accumulated total size.
                          */
-                        buffer = byte_stream_buffer;
+                        *size_needed = aml_size_needed + total_size;
 
-                        ++buffer;
-                        ACPI_MOVE_16_TO_16(&temp16, buffer);
+                        /* Normal exit */
 
-                        bytes_consumed = temp16 + 3;
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct
-                                                 acpi_resource_address64);
-                        break;
+                        return_ACPI_STATUS(AE_OK);
 
-                case ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE:
+                case ACPI_RESOURCE_TYPE_ADDRESS16:
                         /*
-                         * 64-Bit Address Resource
+                         * 16-Bit Address Resource:
+                         * Add the size of the optional resource_source info
                          */
-                        buffer = byte_stream_buffer;
-
-                        ++buffer;
-                        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-                        bytes_consumed = temp16 + 3;
+                        total_size = (acpi_rs_length)
+                            (total_size +
+                             acpi_rs_struct_option_length(&resource->data.
+                                                          address16.
+                                                          resource_source));
+                        break;
 
+                case ACPI_RESOURCE_TYPE_ADDRESS32:
                         /*
-                         * Resource Source Index and Resource Source are optional elements.
-                         * Check the length of the Bytestream.  If it is greater than 43,
-                         * that means that an Index exists and is followed by a null
-                         * terminated string.  Therefore, set the temp variable to the
-                         * length minus the minimum byte stream length plus the byte for
-                         * the Index to determine the size of the NULL terminated string.
+                         * 32-Bit Address Resource:
+                         * Add the size of the optional resource_source info
                          */
-                        if (43 < temp16) {
-                                temp8 = (u8) (temp16 - 44);
-                        } else {
-                                temp8 = 0;
-                        }
-
-                        /* Ensure a 64-bit boundary for the structure */
-
-                        temp8 = (u8) ACPI_ROUND_UP_to_64_bITS(temp8);
-
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64)
-                            + (temp8 * sizeof(u8));
+                        total_size = (acpi_rs_length)
+                            (total_size +
+                             acpi_rs_struct_option_length(&resource->data.
+                                                          address32.
+                                                          resource_source));
                         break;
 
-                case ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE:
+                case ACPI_RESOURCE_TYPE_ADDRESS64:
                         /*
-                         * 32-Bit Address Resource
+                         * 64-Bit Address Resource:
+                         * Add the size of the optional resource_source info
                          */
-                        buffer = byte_stream_buffer;
-
-                        ++buffer;
-                        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-                        bytes_consumed = temp16 + 3;
+                        total_size = (acpi_rs_length)
+                            (total_size +
+                             acpi_rs_struct_option_length(&resource->data.
+                                                          address64.
+                                                          resource_source));
+                        break;
 
+                case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                         /*
-                         * Resource Source Index and Resource Source are optional elements.
-                         * Check the length of the Bytestream.  If it is greater than 23,
-                         * that means that an Index exists and is followed by a null
-                         * terminated string.  Therefore, set the temp variable to the
-                         * length minus the minimum byte stream length plus the byte for
-                         * the Index to determine the size of the NULL terminated string.
+                         * Extended IRQ Resource:
+                         * Add the size of each additional optional interrupt beyond the
+                         * required 1 (4 bytes for each u32 interrupt number)
                          */
-                        if (23 < temp16) {
-                                temp8 = (u8) (temp16 - 24);
-                        } else {
-                                temp8 = 0;
-                        }
-
-                        /* Ensure a 32-bit boundary for the structure */
-
-                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS(temp8);
+                        total_size = (acpi_rs_length)
+                            (total_size +
+                             ((resource->data.extended_irq.interrupt_count -
+                               1) * 4) +
+                             /* Add the size of the optional resource_source info */
+                             acpi_rs_struct_option_length(&resource->data.
+                                                          extended_irq.
+                                                          resource_source));
+                        break;
 
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_address32)
-                            + (temp8 * sizeof(u8));
+                default:
                         break;
+                }
 
-                case ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE:
-                        /*
-                         * 16-Bit Address Resource
-                         */
-                        buffer = byte_stream_buffer;
+                /* Update the total */
 
-                        ++buffer;
-                        ACPI_MOVE_16_TO_16(&temp16, buffer);
+                aml_size_needed += total_size;
 
-                        bytes_consumed = temp16 + 3;
+                /* Point to the next object */
 
-                        /*
-                         * Resource Source Index and Resource Source are optional elements.
-                         * Check the length of the Bytestream.  If it is greater than 13,
-                         * that means that an Index exists and is followed by a null
-                         * terminated string.  Therefore, set the temp variable to the
-                         * length minus the minimum byte stream length plus the byte for
-                         * the Index to determine the size of the NULL terminated string.
-                         */
-                        if (13 < temp16) {
-                                temp8 = (u8) (temp16 - 14);
-                        } else {
-                                temp8 = 0;
-                        }
+                resource =
+                    ACPI_ADD_PTR(struct acpi_resource, resource,
+                                 resource->length);
+        }
 
-                        /* Ensure a 32-bit boundary for the structure */
+        /* Did not find an end_tag resource descriptor */
 
-                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS(temp8);
+        return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
+}
 
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_address16)
-                            + (temp8 * sizeof(u8));
-                        break;
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_get_list_length
+ *
+ * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream
+ *              aml_buffer_length   - Size of aml_buffer
+ *              size_needed         - Where the size needed is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Takes an external resource byte stream and calculates the size
+ *              buffer needed to hold the corresponding internal resource
+ *              descriptor linked list.
+ *
+ ******************************************************************************/
 
-                case ACPI_RDESC_TYPE_EXTENDED_XRUPT:
-                        /*
-                         * Extended IRQ
-                         */
-                        buffer = byte_stream_buffer;
+acpi_status
+acpi_rs_get_list_length(u8 * aml_buffer,
+                        u32 aml_buffer_length, acpi_size * size_needed)
+{
+        acpi_status status;
+        u8 *end_aml;
+        u8 *buffer;
+        u32 buffer_size = 0;
+        u16 temp16;
+        u16 resource_length;
+        u32 extra_struct_bytes;
+        u8 resource_index;
+        u8 minimum_aml_resource_length;
 
-                        ++buffer;
-                        ACPI_MOVE_16_TO_16(&temp16, buffer);
+        ACPI_FUNCTION_TRACE("rs_get_list_length");
 
-                        bytes_consumed = temp16 + 3;
+        end_aml = aml_buffer + aml_buffer_length;
 
-                        /*
-                         * Point past the length field and the Interrupt vector flags to
-                         * save off the Interrupt table length to the Temp8 variable.
-                         */
-                        buffer += 3;
-                        temp8 = *buffer;
+        /* Walk the list of AML resource descriptors */
 
-                        /*
-                         * To compensate for multiple interrupt numbers, add 4 bytes for
-                         * each additional interrupts greater than 1
-                         */
-                        additional_bytes = (u8) ((temp8 - 1) * 4);
+        while (aml_buffer < end_aml) {
+                /* Validate the Resource Type and Resource Length */
 
-                        /*
-                         * Resource Source Index and Resource Source are optional elements.
-                         * Check the length of the Bytestream.  If it is greater than 9,
-                         * that means that an Index exists and is followed by a null
-                         * terminated string.  Therefore, set the temp variable to the
-                         * length minus the minimum byte stream length plus the byte for
-                         * the Index to determine the size of the NULL terminated string.
-                         */
-                        if (9 + additional_bytes < temp16) {
-                                temp8 = (u8) (temp16 - (9 + additional_bytes));
-                        } else {
-                                temp8 = 0;
-                        }
+                status = acpi_ut_validate_resource(aml_buffer, &resource_index);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
 
-                        /* Ensure a 32-bit boundary for the structure */
+                /* Get the resource length and base (minimum) AML size */
 
-                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS(temp8);
+                resource_length = acpi_ut_get_resource_length(aml_buffer);
+                minimum_aml_resource_length =
+                    acpi_gbl_resource_aml_sizes[resource_index];
 
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_ext_irq) +
-                            (additional_bytes * sizeof(u8)) +
-                            (temp8 * sizeof(u8));
-                        break;
+                /*
+                 * Augment the size for descriptors with optional
+                 * and/or variable length fields
+                 */
+                extra_struct_bytes = 0;
+                buffer =
+                    aml_buffer + acpi_ut_get_resource_header_length(aml_buffer);
 
-                case ACPI_RDESC_TYPE_IRQ_FORMAT:
+                switch (acpi_ut_get_resource_type(aml_buffer)) {
+                case ACPI_RESOURCE_NAME_IRQ:
                         /*
-                         * IRQ Resource.
-                         * Determine if it there are two or three trailing bytes
+                         * IRQ Resource:
+                         * Get the number of bits set in the 16-bit IRQ mask
                          */
-                        buffer = byte_stream_buffer;
-                        temp8 = *buffer;
-
-                        if (temp8 & 0x01) {
-                                bytes_consumed = 4;
-                        } else {
-                                bytes_consumed = 3;
-                        }
-
-                        /* Point past the descriptor */
-
-                        ++buffer;
-
-                        /* Look at the number of bits set */
-
                         ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-                        for (index = 0; index < 16; index++) {
-                                if (temp16 & 0x1) {
-                                        ++number_of_interrupts;
-                                }
-
-                                temp16 >>= 1;
-                        }
-
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_io) +
-                            (number_of_interrupts * sizeof(u32));
+                        extra_struct_bytes = acpi_rs_count_set_bits(temp16);
                         break;
 
-                case ACPI_RDESC_TYPE_DMA_FORMAT:
+                case ACPI_RESOURCE_NAME_DMA:
                         /*
-                         * DMA Resource
+                         * DMA Resource:
+                         * Get the number of bits set in the 8-bit DMA mask
                          */
-                        buffer = byte_stream_buffer;
-                        bytes_consumed = 3;
-
-                        /* Point past the descriptor */
-
-                        ++buffer;
-
-                        /* Look at the number of bits set */
-
-                        temp8 = *buffer;
-
-                        for (index = 0; index < 8; index++) {
-                                if (temp8 & 0x1) {
-                                        ++number_of_channels;
-                                }
-
-                                temp8 >>= 1;
-                        }
-
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_dma) +
-                            (number_of_channels * sizeof(u32));
+                        extra_struct_bytes = acpi_rs_count_set_bits(*buffer);
                         break;
 
-                case ACPI_RDESC_TYPE_START_DEPENDENT:
+                case ACPI_RESOURCE_NAME_VENDOR_SMALL:
                         /*
-                         * Start Dependent Functions Resource
-                         * Determine if it there are two or three trailing bytes
+                         * Vendor Resource:
+                         * Ensure a 32-bit boundary for the structure
                          */
-                        buffer = byte_stream_buffer;
-                        temp8 = *buffer;
-
-                        if (temp8 & 0x01) {
-                                bytes_consumed = 2;
-                        } else {
-                                bytes_consumed = 1;
-                        }
-
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct
-                                                 acpi_resource_start_dpf);
+                        extra_struct_bytes =
+                            ACPI_ROUND_UP_to_32_bITS(resource_length) -
+                            resource_length;
                         break;
 
-                case ACPI_RDESC_TYPE_END_DEPENDENT:
+                case ACPI_RESOURCE_NAME_END_TAG:
                         /*
-                         * End Dependent Functions Resource
+                         * End Tag: This is the normal exit, add size of end_tag
                          */
-                        bytes_consumed = 1;
-                        structure_size = ACPI_RESOURCE_LENGTH;
-                        break;
+                        *size_needed = buffer_size + ACPI_RS_SIZE_MIN;
+                        return_ACPI_STATUS(AE_OK);
 
-                case ACPI_RDESC_TYPE_IO_PORT:
+                case ACPI_RESOURCE_NAME_VENDOR_LARGE:
                         /*
-                         * IO Port Resource
+                         * Vendor Resource:
+                         * Add vendor data and ensure a 32-bit boundary for the structure
                          */
-                        bytes_consumed = 8;
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_io);
+                        extra_struct_bytes =
+                            ACPI_ROUND_UP_to_32_bITS(resource_length) -
+                            resource_length;
                         break;
 
-                case ACPI_RDESC_TYPE_FIXED_IO_PORT:
+                case ACPI_RESOURCE_NAME_ADDRESS32:
+                case ACPI_RESOURCE_NAME_ADDRESS16:
                         /*
-                         * Fixed IO Port Resource
+                         * 32-Bit or 16-bit Address Resource:
+                         * Add the size of any optional data (resource_source)
                          */
-                        bytes_consumed = 4;
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_io);
+                        extra_struct_bytes =
+                            acpi_rs_stream_option_length(resource_length,
+                                                         minimum_aml_resource_length);
                         break;
 
-                case ACPI_RDESC_TYPE_SMALL_VENDOR:
+                case ACPI_RESOURCE_NAME_EXTENDED_IRQ:
                         /*
-                         * Vendor Specific Resource
+                         * Extended IRQ:
+                         * Point past the interrupt_vector_flags to get the
+                         * interrupt_table_length.
                          */
-                        buffer = byte_stream_buffer;
+                        buffer++;
 
-                        temp8 = *buffer;
-                        temp8 = (u8) (temp8 & 0x7);
-                        bytes_consumed = temp8 + 1;
-
-                        /* Ensure a 32-bit boundary for the structure */
-
-                        temp8 = (u8) ACPI_ROUND_UP_to_32_bITS(temp8);
-                        structure_size =
-                            ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor) +
-                            (temp8 * sizeof(u8));
+                        extra_struct_bytes =
+                            /*
+                             * Add 4 bytes for each additional interrupt. Note: at
+                             * least one interrupt is required and is included in
+                             * the minimum descriptor size
+                             */
+                            ((*buffer - 1) * sizeof(u32)) +
+                            /* Add the size of any optional data (resource_source) */
+                            acpi_rs_stream_option_length(resource_length -
+                                                         extra_struct_bytes,
+                                                         minimum_aml_resource_length);
                         break;
 
-                case ACPI_RDESC_TYPE_END_TAG:
+                case ACPI_RESOURCE_NAME_ADDRESS64:
                         /*
-                         * End Tag
+                         * 64-Bit Address Resource:
+                         * Add the size of any optional data (resource_source)
+                         * Ensure a 64-bit boundary for the structure
                          */
-                        bytes_consumed = 2;
-                        structure_size = ACPI_RESOURCE_LENGTH;
-                        byte_stream_buffer_length = bytes_parsed;
+                        extra_struct_bytes =
+                            ACPI_ROUND_UP_to_64_bITS
+                            (acpi_rs_stream_option_length
+                             (resource_length, minimum_aml_resource_length));
                         break;
 
                 default:
-                        /*
-                         * If we get here, everything is out of sync,
-                         * exit with an error
-                         */
-                        return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
+                        break;
                 }
 
-                /* Update the return value and counter */
-
-                buffer_size += (u32) ACPI_ALIGN_RESOURCE_SIZE(structure_size);
-                bytes_parsed += bytes_consumed;
+                /* Update the required buffer size for the internal descriptor structs */
 
-                /* Set the byte stream to point to the next resource */
+                temp16 = (u16) (acpi_gbl_resource_struct_sizes[resource_index] +
+                                extra_struct_bytes);
+                buffer_size += (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(temp16);
 
-                byte_stream_buffer += bytes_consumed;
+                /*
+                 * Point to the next resource within the stream
+                 * using the size of the header plus the length contained in the header
+                 */
+                aml_buffer += acpi_ut_get_descriptor_length(aml_buffer);
         }
 
-        /* This is the data the caller needs */
+        /* Did not find an end_tag resource descriptor */
 
-        *size_needed = buffer_size;
-        return_ACPI_STATUS(AE_OK);
+        return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
 }
 
 /*******************************************************************************
@@ -760,13 +541,13 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
 
                 for (table_index = 0; table_index < 4 && !name_found;
                      table_index++) {
-                        if ((ACPI_TYPE_STRING ==
-                             ACPI_GET_OBJECT_TYPE(*sub_object_list))
-                            ||
-                            ((ACPI_TYPE_LOCAL_REFERENCE ==
-                              ACPI_GET_OBJECT_TYPE(*sub_object_list))
-                             && ((*sub_object_list)->reference.opcode ==
-                                 AML_INT_NAMEPATH_OP))) {
+                        if (*sub_object_list && /* Null object allowed */
+                            ((ACPI_TYPE_STRING ==
+                              ACPI_GET_OBJECT_TYPE(*sub_object_list)) ||
+                             ((ACPI_TYPE_LOCAL_REFERENCE ==
+                               ACPI_GET_OBJECT_TYPE(*sub_object_list)) &&
+                              ((*sub_object_list)->reference.opcode ==
+                               AML_INT_NAMEPATH_OP)))) {
                                 name_found = TRUE;
                         } else {
                                 /* Look at the next element */
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 0911526b7ad8..8c128dea3252 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,10 +53,10 @@ ACPI_MODULE_NAME("rscreate")
  *
  * FUNCTION:    acpi_rs_create_resource_list
  *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource byte stream
- *              output_buffer           - Pointer to the user's buffer
+ * PARAMETERS:  aml_buffer          - Pointer to the resource byte stream
+ *              output_buffer       - Pointer to the user's buffer
  *
- * RETURN:      Status  - AE_OK if okay, else a valid acpi_status code
+ * RETURN:      Status: AE_OK if okay, else a valid acpi_status code
  *              If output_buffer is not large enough, output_buffer_length
  *              indicates how large output_buffer should be, else it
  *              indicates how may u8 elements of output_buffer are valid.
@@ -67,33 +67,30 @@ ACPI_MODULE_NAME("rscreate")
  *
  ******************************************************************************/
 acpi_status
-acpi_rs_create_resource_list(union acpi_operand_object *byte_stream_buffer,
+acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
                              struct acpi_buffer *output_buffer)
 {
 
         acpi_status status;
-        u8 *byte_stream_start;
+        u8 *aml_start;
         acpi_size list_size_needed = 0;
-        u32 byte_stream_buffer_length;
+        u32 aml_buffer_length;
 
         ACPI_FUNCTION_TRACE("rs_create_resource_list");
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "byte_stream_buffer = %p\n",
-                          byte_stream_buffer));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_buffer = %p\n", aml_buffer));
 
         /* Params already validated, so we don't re-validate here */
 
-        byte_stream_buffer_length = byte_stream_buffer->buffer.length;
-        byte_stream_start = byte_stream_buffer->buffer.pointer;
+        aml_buffer_length = aml_buffer->buffer.length;
+        aml_start = aml_buffer->buffer.pointer;
 
         /*
-         * Pass the byte_stream_buffer into a module that can calculate
+         * Pass the aml_buffer into a module that can calculate
          * the buffer size needed for the linked list
          */
-        status =
-            acpi_rs_get_list_length(byte_stream_start,
-                                    byte_stream_buffer_length,
-                                    &list_size_needed);
+        status = acpi_rs_get_list_length(aml_start, aml_buffer_length,
+                                         &list_size_needed);
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Status=%X list_size_needed=%X\n",
                           status, (u32) list_size_needed));
@@ -110,10 +107,8 @@ acpi_rs_create_resource_list(union acpi_operand_object *byte_stream_buffer,
 
         /* Do the conversion */
 
-        status =
-            acpi_rs_byte_stream_to_list(byte_stream_start,
-                                        byte_stream_buffer_length,
-                                        output_buffer->pointer);
+        status = acpi_rs_convert_aml_to_resources(aml_start, aml_buffer_length,
+                                                  output_buffer->pointer);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -212,21 +207,20 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 /* Each element of the top-level package must also be a package */
 
                 if (ACPI_GET_OBJECT_TYPE(*top_object_list) != ACPI_TYPE_PACKAGE) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "(PRT[%X]) Need sub-package, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (*top_object_list)));
+                        ACPI_ERROR((AE_INFO,
+                                    "(PRT[%X]) Need sub-package, found %s",
+                                    index,
+                                    acpi_ut_get_object_type_name
+                                    (*top_object_list)));
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
                 /* Each sub-package must be of length 4 */
 
                 if ((*top_object_list)->package.count != 4) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "(PRT[%X]) Need package of length 4, found length %d\n",
-                                          index,
-                                          (*top_object_list)->package.count));
+                        ACPI_ERROR((AE_INFO,
+                                    "(PRT[%X]) Need package of length 4, found length %d",
+                                    index, (*top_object_list)->package.count));
                         return_ACPI_STATUS(AE_AML_PACKAGE_LIMIT);
                 }
 
@@ -243,11 +237,10 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
                         user_prt->address = obj_desc->integer.value;
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "(PRT[%X].Address) Need Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
+                        ACPI_ERROR((AE_INFO,
+                                    "(PRT[%X].Address) Need Integer, found %s",
+                                    index,
+                                    acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
@@ -257,76 +250,83 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
                         user_prt->pin = (u32) obj_desc->integer.value;
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "(PRT[%X].Pin) Need Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
+                        ACPI_ERROR((AE_INFO,
+                                    "(PRT[%X].Pin) Need Integer, found %s",
+                                    index,
+                                    acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
-                /* 3) Third subobject: Dereference the PRT.source_name */
-
+                /*
+                 * 3) Third subobject: Dereference the PRT.source_name
+                 * The name may be unresolved (slack mode), so allow a null object
+                 */
                 obj_desc = sub_object_list[2];
-                switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
-                case ACPI_TYPE_LOCAL_REFERENCE:
-
-                        if (obj_desc->reference.opcode != AML_INT_NAMEPATH_OP) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "(PRT[%X].Source) Need name, found reference op %X\n",
-                                                  index,
-                                                  obj_desc->reference.opcode));
+                if (obj_desc) {
+                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                        case ACPI_TYPE_LOCAL_REFERENCE:
+
+                                if (obj_desc->reference.opcode !=
+                                    AML_INT_NAMEPATH_OP) {
+                                        ACPI_ERROR((AE_INFO,
+                                                    "(PRT[%X].Source) Need name, found reference op %X",
+                                                    index,
+                                                    obj_desc->reference.
+                                                    opcode));
+                                        return_ACPI_STATUS(AE_BAD_DATA);
+                                }
+
+                                node = obj_desc->reference.node;
+
+                                /* Use *remaining* length of the buffer as max for pathname */
+
+                                path_buffer.length = output_buffer->length -
+                                    (u32) ((u8 *) user_prt->source -
+                                           (u8 *) output_buffer->pointer);
+                                path_buffer.pointer = user_prt->source;
+
+                                status =
+                                    acpi_ns_handle_to_pathname((acpi_handle)
+                                                               node,
+                                                               &path_buffer);
+
+                                /* +1 to include null terminator */
+
+                                user_prt->length +=
+                                    (u32) ACPI_STRLEN(user_prt->source) + 1;
+                                break;
+
+                        case ACPI_TYPE_STRING:
+
+                                ACPI_STRCPY(user_prt->source,
+                                            obj_desc->string.pointer);
+
+                                /*
+                                 * Add to the Length field the length of the string
+                                 * (add 1 for terminator)
+                                 */
+                                user_prt->length += obj_desc->string.length + 1;
+                                break;
+
+                        case ACPI_TYPE_INTEGER:
+                                /*
+                                 * If this is a number, then the Source Name is NULL, since the
+                                 * entire buffer was zeroed out, we can leave this alone.
+                                 *
+                                 * Add to the Length field the length of the u32 NULL
+                                 */
+                                user_prt->length += sizeof(u32);
+                                break;
+
+                        default:
+
+                                ACPI_ERROR((AE_INFO,
+                                            "(PRT[%X].Source) Need Ref/String/Integer, found %s",
+                                            index,
+                                            acpi_ut_get_object_type_name
+                                            (obj_desc)));
                                 return_ACPI_STATUS(AE_BAD_DATA);
                         }
-
-                        node = obj_desc->reference.node;
-
-                        /* Use *remaining* length of the buffer as max for pathname */
-
-                        path_buffer.length = output_buffer->length -
-                            (u32) ((u8 *) user_prt->source -
-                                   (u8 *) output_buffer->pointer);
-                        path_buffer.pointer = user_prt->source;
-
-                        status =
-                            acpi_ns_handle_to_pathname((acpi_handle) node,
-                                                       &path_buffer);
-
-                        /* +1 to include null terminator */
-
-                        user_prt->length +=
-                            (u32) ACPI_STRLEN(user_prt->source) + 1;
-                        break;
-
-                case ACPI_TYPE_STRING:
-
-                        ACPI_STRCPY(user_prt->source, obj_desc->string.pointer);
-
-                        /*
-                         * Add to the Length field the length of the string
-                         * (add 1 for terminator)
-                         */
-                        user_prt->length += obj_desc->string.length + 1;
-                        break;
-
-                case ACPI_TYPE_INTEGER:
-                        /*
-                         * If this is a number, then the Source Name is NULL, since the
-                         * entire buffer was zeroed out, we can leave this alone.
-                         *
-                         * Add to the Length field the length of the u32 NULL
-                         */
-                        user_prt->length += sizeof(u32);
-                        break;
-
-                default:
-
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "(PRT[%X].Source) Need Ref/String/Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
-                        return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
                 /* Now align the current length */
@@ -340,11 +340,10 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
                         user_prt->source_index = (u32) obj_desc->integer.value;
                 } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "(PRT[%X].source_index) Need Integer, found %s\n",
-                                          index,
-                                          acpi_ut_get_object_type_name
-                                          (obj_desc)));
+                        ACPI_ERROR((AE_INFO,
+                                    "(PRT[%X].source_index) Need Integer, found %s",
+                                    index,
+                                    acpi_ut_get_object_type_name(obj_desc)));
                         return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
@@ -360,7 +359,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_create_byte_stream
+ * FUNCTION:    acpi_rs_create_aml_resources
  *
  * PARAMETERS:  linked_list_buffer      - Pointer to the resource linked list
  *              output_buffer           - Pointer to the user's buffer
@@ -377,13 +376,13 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
  ******************************************************************************/
 
 acpi_status
-acpi_rs_create_byte_stream(struct acpi_resource *linked_list_buffer,
-                           struct acpi_buffer *output_buffer)
+acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
+                             struct acpi_buffer *output_buffer)
 {
         acpi_status status;
-        acpi_size byte_stream_size_needed = 0;
+        acpi_size aml_size_needed = 0;
 
-        ACPI_FUNCTION_TRACE("rs_create_byte_stream");
+        ACPI_FUNCTION_TRACE("rs_create_aml_resources");
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "linked_list_buffer = %p\n",
                           linked_list_buffer));
@@ -394,11 +393,10 @@ acpi_rs_create_byte_stream(struct acpi_resource *linked_list_buffer,
          * Pass the linked_list_buffer into a module that calculates
          * the buffer size needed for the byte stream.
          */
-        status = acpi_rs_get_byte_stream_length(linked_list_buffer,
-                                                &byte_stream_size_needed);
+        status = acpi_rs_get_aml_length(linked_list_buffer, &aml_size_needed);
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "byte_stream_size_needed=%X, %s\n",
-                          (u32) byte_stream_size_needed,
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "aml_size_needed=%X, %s\n",
+                          (u32) aml_size_needed,
                           acpi_format_exception(status)));
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
@@ -406,8 +404,7 @@ acpi_rs_create_byte_stream(struct acpi_resource *linked_list_buffer,
 
         /* Validate/Allocate/Clear caller buffer */
 
-        status =
-            acpi_ut_initialize_buffer(output_buffer, byte_stream_size_needed);
+        status = acpi_ut_initialize_buffer(output_buffer, aml_size_needed);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
@@ -415,9 +412,9 @@ acpi_rs_create_byte_stream(struct acpi_resource *linked_list_buffer,
         /* Do the conversion */
 
         status =
-            acpi_rs_list_to_byte_stream(linked_list_buffer,
-                                        byte_stream_size_needed,
-                                        output_buffer->pointer);
+            acpi_rs_convert_resources_to_aml(linked_list_buffer,
+                                             aml_size_needed,
+                                             output_buffer->pointer);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
diff --git a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c
index 75bd34d1783f..e7de061cf883 100644
--- a/drivers/acpi/resources/rsdump.c
+++ b/drivers/acpi/resources/rsdump.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,1063 +49,720 @@ ACPI_MODULE_NAME("rsdump")
 
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 /* Local prototypes */
-static void acpi_rs_dump_irq(union acpi_resource_data *data);
+static void acpi_rs_out_string(char *title, char *value);
 
-static void acpi_rs_dump_address16(union acpi_resource_data *data);
+static void acpi_rs_out_integer8(char *title, u8 value);
 
-static void acpi_rs_dump_address32(union acpi_resource_data *data);
+static void acpi_rs_out_integer16(char *title, u16 value);
 
-static void acpi_rs_dump_address64(union acpi_resource_data *data);
+static void acpi_rs_out_integer32(char *title, u32 value);
 
-static void acpi_rs_dump_dma(union acpi_resource_data *data);
+static void acpi_rs_out_integer64(char *title, u64 value);
 
-static void acpi_rs_dump_io(union acpi_resource_data *data);
+static void acpi_rs_out_title(char *title);
 
-static void acpi_rs_dump_extended_irq(union acpi_resource_data *data);
+static void acpi_rs_dump_byte_list(u16 length, u8 * data);
 
-static void acpi_rs_dump_fixed_io(union acpi_resource_data *data);
+static void acpi_rs_dump_dword_list(u8 length, u32 * data);
 
-static void acpi_rs_dump_fixed_memory32(union acpi_resource_data *data);
+static void acpi_rs_dump_short_byte_list(u8 length, u8 * data);
 
-static void acpi_rs_dump_memory24(union acpi_resource_data *data);
+static void
+acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source);
 
-static void acpi_rs_dump_memory32(union acpi_resource_data *data);
+static void acpi_rs_dump_address_common(union acpi_resource_data *resource);
 
-static void acpi_rs_dump_start_depend_fns(union acpi_resource_data *data);
+static void
+acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table);
 
-static void acpi_rs_dump_vendor_specific(union acpi_resource_data *data);
+#define ACPI_RSD_OFFSET(f)          (u8) ACPI_OFFSET (union acpi_resource_data,f)
+#define ACPI_PRT_OFFSET(f)          (u8) ACPI_OFFSET (struct acpi_pci_routing_table,f)
+#define ACPI_RSD_TABLE_SIZE(name)   (sizeof(name) / sizeof (struct acpi_rsdump_info))
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_irq
+ * Resource Descriptor info tables
  *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Prints out the various members of the Data structure type.
+ * Note: The first table entry must be a Title or Literal and must contain
+ * the table length (number of table entries)
  *
  ******************************************************************************/
 
-static void acpi_rs_dump_irq(union acpi_resource_data *data)
-{
-        struct acpi_resource_irq *irq_data = (struct acpi_resource_irq *)data;
-        u8 index = 0;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("IRQ Resource\n");
+struct acpi_rsdump_info acpi_rs_dump_irq[6] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_irq), "IRQ", NULL},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.triggering), "Triggering",
+         acpi_gbl_HEdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity",
+         acpi_gbl_LLdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.sharable), "Sharing",
+         acpi_gbl_SHRdecode},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count),
+         "Interrupt Count", NULL},
+        {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(irq.interrupts[0]),
+         "Interrupt List", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_dma[6] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_dma), "DMA", NULL},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.type), "Speed",
+         acpi_gbl_TYPdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(dma.bus_master), "Mastering",
+         acpi_gbl_BMdecode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(dma.transfer), "Transfer Type",
+         acpi_gbl_SIZdecode},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(dma.channel_count), "Channel Count",
+         NULL},
+        {ACPI_RSD_SHORTLIST, ACPI_RSD_OFFSET(dma.channels[0]), "Channel List",
+         NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_start_dpf[3] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_start_dpf),
+         "Start-Dependent-Functions", NULL},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(start_dpf.compatibility_priority),
+         "Compatibility Priority", acpi_gbl_config_decode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(start_dpf.performance_robustness),
+         "Performance/Robustness", acpi_gbl_config_decode}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_end_dpf[1] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_dpf),
+         "End-Dependent-Functions", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_io[6] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_io), "I/O", NULL},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(io.io_decode), "Address Decoding",
+         acpi_gbl_io_decode},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(io.minimum), "Address Minimum", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(io.maximum), "Address Maximum", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(io.alignment), "Alignment", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(io.address_length), "Address Length",
+         NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_fixed_io[3] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_io),
+         "Fixed I/O", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_io.address), "Address", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(fixed_io.address_length),
+         "Address Length", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_vendor[3] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_vendor),
+         "Vendor Specific", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(vendor.byte_length), "Length", NULL},
+        {ACPI_RSD_LONGLIST, ACPI_RSD_OFFSET(vendor.byte_data[0]), "Vendor Data",
+         NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_end_tag[1] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_end_tag), "end_tag",
+         NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_memory24[6] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory24),
+         "24-Bit Memory Range", NULL},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory24.write_protect),
+         "Write Protect", acpi_gbl_RWdecode},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.minimum), "Address Minimum",
+         NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.maximum), "Address Maximum",
+         NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.alignment), "Alignment",
+         NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(memory24.address_length),
+         "Address Length", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_memory32[6] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory32),
+         "32-Bit Memory Range", NULL},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(memory32.write_protect),
+         "Write Protect", acpi_gbl_RWdecode},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.minimum), "Address Minimum",
+         NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.maximum), "Address Maximum",
+         NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.alignment), "Alignment",
+         NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(memory32.address_length),
+         "Address Length", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_fixed_memory32[4] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_memory32),
+         "32-Bit Fixed Memory Range", NULL},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(fixed_memory32.write_protect),
+         "Write Protect", acpi_gbl_RWdecode},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address), "Address",
+         NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(fixed_memory32.address_length),
+         "Address Length", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_address16[8] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_address16),
+         "16-Bit WORD Address Space", NULL},
+        {ACPI_RSD_ADDRESS, 0, NULL, NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.granularity), "Granularity",
+         NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.minimum), "Address Minimum",
+         NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.maximum), "Address Maximum",
+         NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.translation_offset),
+         "Translation Offset", NULL},
+        {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.address_length),
+         "Address Length", NULL},
+        {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(address16.resource_source), NULL, NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_address32[8] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_address32),
+         "32-Bit DWORD Address Space", NULL},
+        {ACPI_RSD_ADDRESS, 0, NULL, NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.granularity), "Granularity",
+         NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.minimum), "Address Minimum",
+         NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.maximum), "Address Maximum",
+         NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.translation_offset),
+         "Translation Offset", NULL},
+        {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.address_length),
+         "Address Length", NULL},
+        {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(address32.resource_source), NULL, NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_address64[8] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_address64),
+         "64-Bit QWORD Address Space", NULL},
+        {ACPI_RSD_ADDRESS, 0, NULL, NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.granularity), "Granularity",
+         NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.minimum), "Address Minimum",
+         NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.maximum), "Address Maximum",
+         NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.translation_offset),
+         "Translation Offset", NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.address_length),
+         "Address Length", NULL},
+        {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(address64.resource_source), NULL, NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_ext_address64[8] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_ext_address64),
+         "64-Bit Extended Address Space", NULL},
+        {ACPI_RSD_ADDRESS, 0, NULL, NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.granularity),
+         "Granularity", NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.minimum),
+         "Address Minimum", NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.maximum),
+         "Address Maximum", NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.translation_offset),
+         "Translation Offset", NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.address_length),
+         "Address Length", NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.type_specific),
+         "Type-Specific Attribute", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_ext_irq[8] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_ext_irq),
+         "Extended IRQ", NULL},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.producer_consumer),
+         "Type", acpi_gbl_consume_decode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.triggering),
+         "Triggering", acpi_gbl_HEdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity",
+         acpi_gbl_LLdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.sharable), "Sharing",
+         acpi_gbl_SHRdecode},
+        {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL,
+         NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(extended_irq.interrupt_count),
+         "Interrupt Count", NULL},
+        {ACPI_RSD_DWORDLIST, ACPI_RSD_OFFSET(extended_irq.interrupts[0]),
+         "Interrupt List", NULL}
+};
+
+struct acpi_rsdump_info acpi_rs_dump_generic_reg[6] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_generic_reg),
+         "Generic Register", NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(generic_reg.space_id), "Space ID",
+         NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(generic_reg.bit_width), "Bit Width",
+         NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(generic_reg.bit_offset), "Bit Offset",
+         NULL},
+        {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(generic_reg.access_size),
+         "Access Size", NULL},
+        {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(generic_reg.address), "Address", NULL}
+};
 
-        acpi_os_printf("  %s Triggered\n",
-                       ACPI_LEVEL_SENSITIVE ==
-                       irq_data->edge_level ? "Level" : "Edge");
-
-        acpi_os_printf("  Active %s\n",
-                       ACPI_ACTIVE_LOW ==
-                       irq_data->active_high_low ? "Low" : "High");
-
-        acpi_os_printf("  %s\n",
-                       ACPI_SHARED ==
-                       irq_data->shared_exclusive ? "Shared" : "Exclusive");
-
-        acpi_os_printf("  %X Interrupts ( ", irq_data->number_of_interrupts);
-
-        for (index = 0; index < irq_data->number_of_interrupts; index++) {
-                acpi_os_printf("%X ", irq_data->interrupts[index]);
-        }
+/*
+ * Tables used for common address descriptor flag fields
+ */
+static struct acpi_rsdump_info acpi_rs_dump_general_flags[5] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_general_flags), NULL,
+         NULL},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.producer_consumer),
+         "Consumer/Producer", acpi_gbl_consume_decode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.decode), "Address Decode",
+         acpi_gbl_DECdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.min_address_fixed),
+         "Min Relocatability", acpi_gbl_min_decode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.max_address_fixed),
+         "Max Relocatability", acpi_gbl_max_decode}
+};
+
+static struct acpi_rsdump_info acpi_rs_dump_memory_flags[5] = {
+        {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_memory_flags),
+         "Resource Type", (void *)"Memory Range"},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.write_protect),
+         "Write Protect", acpi_gbl_RWdecode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.caching),
+         "Caching", acpi_gbl_MEMdecode},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.mem.range_type),
+         "Range Type", acpi_gbl_MTPdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.mem.translation),
+         "Translation", acpi_gbl_TTPdecode}
+};
+
+static struct acpi_rsdump_info acpi_rs_dump_io_flags[4] = {
+        {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_io_flags),
+         "Resource Type", (void *)"I/O Range"},
+        {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(address.info.io.range_type),
+         "Range Type", acpi_gbl_RNGdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation),
+         "Translation", acpi_gbl_TTPdecode},
+        {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(address.info.io.translation_type),
+         "Translation Type", acpi_gbl_TRSdecode}
+};
 
-        acpi_os_printf(")\n");
-        return;
-}
+/*
+ * Table used to dump _PRT contents
+ */
+static struct acpi_rsdump_info acpi_rs_dump_prt[5] = {
+        {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_prt), NULL, NULL},
+        {ACPI_RSD_UINT64, ACPI_PRT_OFFSET(address), "Address", NULL},
+        {ACPI_RSD_UINT32, ACPI_PRT_OFFSET(pin), "Pin", NULL},
+        {ACPI_RSD_STRING, ACPI_PRT_OFFSET(source[0]), "Source", NULL},
+        {ACPI_RSD_UINT32, ACPI_PRT_OFFSET(source_index), "Source Index", NULL}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_dma
+ * FUNCTION:    acpi_rs_dump_descriptor
  *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
+ * PARAMETERS:  Resource
  *
  * RETURN:      None
  *
- * DESCRIPTION: Prints out the various members of the Data structure type.
+ * DESCRIPTION:
  *
  ******************************************************************************/
 
-static void acpi_rs_dump_dma(union acpi_resource_data *data)
+static void
+acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
 {
-        struct acpi_resource_dma *dma_data = (struct acpi_resource_dma *)data;
-        u8 index = 0;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("DMA Resource\n");
-
-        switch (dma_data->type) {
-        case ACPI_COMPATIBILITY:
-                acpi_os_printf("  Compatibility mode\n");
-                break;
-
-        case ACPI_TYPE_A:
-                acpi_os_printf("  Type A\n");
-                break;
-
-        case ACPI_TYPE_B:
-                acpi_os_printf("  Type B\n");
-                break;
-
-        case ACPI_TYPE_F:
-                acpi_os_printf("  Type F\n");
-                break;
-
-        default:
-                acpi_os_printf("  Invalid DMA type\n");
-                break;
-        }
-
-        acpi_os_printf("  %sBus Master\n",
-                       ACPI_BUS_MASTER == dma_data->bus_master ? "" : "Not a ");
-
-        switch (dma_data->transfer) {
-        case ACPI_TRANSFER_8:
-                acpi_os_printf("  8-bit only transfer\n");
-                break;
+        u8 *target = NULL;
+        u8 *previous_target;
+        char *name;
+        u8 count;
+
+        /* First table entry must contain the table length (# of table entries) */
+
+        count = table->offset;
+
+        while (count) {
+                previous_target = target;
+                target = ACPI_ADD_PTR(u8, resource, table->offset);
+                name = table->name;
+
+                switch (table->opcode) {
+                case ACPI_RSD_TITLE:
+                        /*
+                         * Optional resource title
+                         */
+                        if (table->name) {
+                                acpi_os_printf("%s Resource\n", name);
+                        }
+                        break;
 
-        case ACPI_TRANSFER_8_16:
-                acpi_os_printf("  8 and 16-bit transfer\n");
-                break;
+                        /* Strings */
 
-        case ACPI_TRANSFER_16:
-                acpi_os_printf("  16 bit only transfer\n");
-                break;
+                case ACPI_RSD_LITERAL:
+                        acpi_rs_out_string(name,
+                                           ACPI_CAST_PTR(char, table->pointer));
+                        break;
 
-        default:
-                acpi_os_printf("  Invalid transfer preference\n");
-                break;
-        }
+                case ACPI_RSD_STRING:
+                        acpi_rs_out_string(name, ACPI_CAST_PTR(char, target));
+                        break;
 
-        acpi_os_printf("  Number of Channels: %X ( ",
-                       dma_data->number_of_channels);
+                        /* Data items, 8/16/32/64 bit */
 
-        for (index = 0; index < dma_data->number_of_channels; index++) {
-                acpi_os_printf("%X ", dma_data->channels[index]);
-        }
+                case ACPI_RSD_UINT8:
+                        acpi_rs_out_integer8(name, ACPI_GET8(target));
+                        break;
 
-        acpi_os_printf(")\n");
-        return;
-}
+                case ACPI_RSD_UINT16:
+                        acpi_rs_out_integer16(name, ACPI_GET16(target));
+                        break;
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_start_depend_fns
- *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Prints out the various members of the Data structure type.
- *
- ******************************************************************************/
+                case ACPI_RSD_UINT32:
+                        acpi_rs_out_integer32(name, ACPI_GET32(target));
+                        break;
 
-static void acpi_rs_dump_start_depend_fns(union acpi_resource_data *data)
-{
-        struct acpi_resource_start_dpf *sdf_data =
-            (struct acpi_resource_start_dpf *)data;
+                case ACPI_RSD_UINT64:
+                        acpi_rs_out_integer64(name, ACPI_GET64(target));
+                        break;
 
-        ACPI_FUNCTION_ENTRY();
+                        /* Flags: 1-bit and 2-bit flags supported */
 
-        acpi_os_printf("Start Dependent Functions Resource\n");
+                case ACPI_RSD_1BITFLAG:
+                        acpi_rs_out_string(name, ACPI_CAST_PTR(char,
+                                                               table->
+                                                               pointer[*target &
+                                                                       0x01]));
+                        break;
 
-        switch (sdf_data->compatibility_priority) {
-        case ACPI_GOOD_CONFIGURATION:
-                acpi_os_printf("  Good configuration\n");
-                break;
+                case ACPI_RSD_2BITFLAG:
+                        acpi_rs_out_string(name, ACPI_CAST_PTR(char,
+                                                               table->
+                                                               pointer[*target &
+                                                                       0x03]));
+                        break;
 
-        case ACPI_ACCEPTABLE_CONFIGURATION:
-                acpi_os_printf("  Acceptable configuration\n");
-                break;
+                case ACPI_RSD_SHORTLIST:
+                        /*
+                         * Short byte list (single line output) for DMA and IRQ resources
+                         * Note: The list length is obtained from the previous table entry
+                         */
+                        if (previous_target) {
+                                acpi_rs_out_title(name);
+                                acpi_rs_dump_short_byte_list(*previous_target,
+                                                             target);
+                        }
+                        break;
 
-        case ACPI_SUB_OPTIMAL_CONFIGURATION:
-                acpi_os_printf("  Sub-optimal configuration\n");
-                break;
+                case ACPI_RSD_LONGLIST:
+                        /*
+                         * Long byte list for Vendor resource data
+                         * Note: The list length is obtained from the previous table entry
+                         */
+                        if (previous_target) {
+                                acpi_rs_dump_byte_list(ACPI_GET16
+                                                       (previous_target),
+                                                       target);
+                        }
+                        break;
 
-        default:
-                acpi_os_printf("  Invalid compatibility priority\n");
-                break;
-        }
+                case ACPI_RSD_DWORDLIST:
+                        /*
+                         * Dword list for Extended Interrupt resources
+                         * Note: The list length is obtained from the previous table entry
+                         */
+                        if (previous_target) {
+                                acpi_rs_dump_dword_list(*previous_target,
+                                                        ACPI_CAST_PTR(u32,
+                                                                      target));
+                        }
+                        break;
 
-        switch (sdf_data->performance_robustness) {
-        case ACPI_GOOD_CONFIGURATION:
-                acpi_os_printf("  Good configuration\n");
-                break;
+                case ACPI_RSD_ADDRESS:
+                        /*
+                         * Common flags for all Address resources
+                         */
+                        acpi_rs_dump_address_common(ACPI_CAST_PTR
+                                                    (union acpi_resource_data,
+                                                     target));
+                        break;
 
-        case ACPI_ACCEPTABLE_CONFIGURATION:
-                acpi_os_printf("  Acceptable configuration\n");
-                break;
+                case ACPI_RSD_SOURCE:
+                        /*
+                         * Optional resource_source for Address resources
+                         */
+                        acpi_rs_dump_resource_source(ACPI_CAST_PTR
+                                                     (struct
+                                                      acpi_resource_source,
+                                                      target));
+                        break;
 
-        case ACPI_SUB_OPTIMAL_CONFIGURATION:
-                acpi_os_printf("  Sub-optimal configuration\n");
-                break;
+                default:
+                        acpi_os_printf("**** Invalid table opcode [%X] ****\n",
+                                       table->opcode);
+                        return;
+                }
 
-        default:
-                acpi_os_printf("  Invalid performance robustness preference\n");
-                break;
+                table++;
+                count--;
         }
-
-        return;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_io
- *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Prints out the various members of the Data structure type.
- *
- ******************************************************************************/
-
-static void acpi_rs_dump_io(union acpi_resource_data *data)
-{
-        struct acpi_resource_io *io_data = (struct acpi_resource_io *)data;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("Io Resource\n");
-
-        acpi_os_printf("  %d bit decode\n",
-                       ACPI_DECODE_16 == io_data->io_decode ? 16 : 10);
-
-        acpi_os_printf("  Range minimum base: %08X\n",
-                       io_data->min_base_address);
-
-        acpi_os_printf("  Range maximum base: %08X\n",
-                       io_data->max_base_address);
-
-        acpi_os_printf("  Alignment: %08X\n", io_data->alignment);
-
-        acpi_os_printf("  Range Length: %08X\n", io_data->range_length);
-
-        return;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_fixed_io
- *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Prints out the various members of the Data structure type.
- *
- ******************************************************************************/
-
-static void acpi_rs_dump_fixed_io(union acpi_resource_data *data)
-{
-        struct acpi_resource_fixed_io *fixed_io_data =
-            (struct acpi_resource_fixed_io *)data;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("Fixed Io Resource\n");
-        acpi_os_printf("  Range base address: %08X",
-                       fixed_io_data->base_address);
-
-        acpi_os_printf("  Range length: %08X", fixed_io_data->range_length);
-
-        return;
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_vendor_specific
+ * FUNCTION:    acpi_rs_dump_resource_source
  *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
+ * PARAMETERS:  resource_source     - Pointer to a Resource Source struct
  *
  * RETURN:      None
  *
- * DESCRIPTION: Prints out the various members of the Data structure type.
+ * DESCRIPTION: Common routine for dumping the optional resource_source and the
+ *              corresponding resource_source_index.
  *
  ******************************************************************************/
 
-static void acpi_rs_dump_vendor_specific(union acpi_resource_data *data)
+static void
+acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source)
 {
-        struct acpi_resource_vendor *vendor_data =
-            (struct acpi_resource_vendor *)data;
-        u16 index = 0;
-
         ACPI_FUNCTION_ENTRY();
 
-        acpi_os_printf("Vendor Specific Resource\n");
-
-        acpi_os_printf("  Length: %08X\n", vendor_data->length);
-
-        for (index = 0; index < vendor_data->length; index++) {
-                acpi_os_printf("  Byte %X: %08X\n",
-                               index, vendor_data->reserved[index]);
+        if (resource_source->index == 0xFF) {
+                return;
         }
 
-        return;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_memory24
- *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Prints out the various members of the Data structure type.
- *
- ******************************************************************************/
-
-static void acpi_rs_dump_memory24(union acpi_resource_data *data)
-{
-        struct acpi_resource_mem24 *memory24_data =
-            (struct acpi_resource_mem24 *)data;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("24-Bit Memory Range Resource\n");
-
-        acpi_os_printf("  Read%s\n",
-                       ACPI_READ_WRITE_MEMORY ==
-                       memory24_data->read_write_attribute ?
-                       "/Write" : " only");
-
-        acpi_os_printf("  Range minimum base: %08X\n",
-                       memory24_data->min_base_address);
-
-        acpi_os_printf("  Range maximum base: %08X\n",
-                       memory24_data->max_base_address);
-
-        acpi_os_printf("  Alignment: %08X\n", memory24_data->alignment);
-
-        acpi_os_printf("  Range length: %08X\n", memory24_data->range_length);
-
-        return;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_memory32
- *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Prints out the various members of the Data structure type.
- *
- ******************************************************************************/
-
-static void acpi_rs_dump_memory32(union acpi_resource_data *data)
-{
-        struct acpi_resource_mem32 *memory32_data =
-            (struct acpi_resource_mem32 *)data;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("32-Bit Memory Range Resource\n");
-
-        acpi_os_printf("  Read%s\n",
-                       ACPI_READ_WRITE_MEMORY ==
-                       memory32_data->read_write_attribute ?
-                       "/Write" : " only");
-
-        acpi_os_printf("  Range minimum base: %08X\n",
-                       memory32_data->min_base_address);
-
-        acpi_os_printf("  Range maximum base: %08X\n",
-                       memory32_data->max_base_address);
-
-        acpi_os_printf("  Alignment: %08X\n", memory32_data->alignment);
-
-        acpi_os_printf("  Range length: %08X\n", memory32_data->range_length);
+        acpi_rs_out_integer8("Resource Source Index", resource_source->index);
 
-        return;
+        acpi_rs_out_string("Resource Source",
+                           resource_source->string_ptr ?
+                           resource_source->string_ptr : "[Not Specified]");
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_fixed_memory32
+ * FUNCTION:    acpi_rs_dump_address_common
  *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
- *
- * RETURN:
- *
- * DESCRIPTION: Prints out the various members of the Data structure type.
- *
- ******************************************************************************/
-
-static void acpi_rs_dump_fixed_memory32(union acpi_resource_data *data)
-{
-        struct acpi_resource_fixed_mem32 *fixed_memory32_data =
-            (struct acpi_resource_fixed_mem32 *)data;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("32-Bit Fixed Location Memory Range Resource\n");
-
-        acpi_os_printf("  Read%s\n",
-                       ACPI_READ_WRITE_MEMORY ==
-                       fixed_memory32_data->
-                       read_write_attribute ? "/Write" : " Only");
-
-        acpi_os_printf("  Range base address: %08X\n",
-                       fixed_memory32_data->range_base_address);
-
-        acpi_os_printf("  Range length: %08X\n",
-                       fixed_memory32_data->range_length);
-
-        return;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_address16
- *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
+ * PARAMETERS:  Resource        - Pointer to an internal resource descriptor
  *
  * RETURN:      None
  *
- * DESCRIPTION: Prints out the various members of the Data structure type.
+ * DESCRIPTION: Dump the fields that are common to all Address resource
+ *              descriptors
  *
  ******************************************************************************/
 
-static void acpi_rs_dump_address16(union acpi_resource_data *data)
+static void acpi_rs_dump_address_common(union acpi_resource_data *resource)
 {
-        struct acpi_resource_address16 *address16_data =
-            (struct acpi_resource_address16 *)data;
-
         ACPI_FUNCTION_ENTRY();
 
-        acpi_os_printf("16-Bit Address Space Resource\n");
-        acpi_os_printf("  Resource Type: ");
+        /* Decode the type-specific flags */
 
-        switch (address16_data->resource_type) {
+        switch (resource->address.resource_type) {
         case ACPI_MEMORY_RANGE:
 
-                acpi_os_printf("Memory Range\n");
-
-                switch (address16_data->attribute.memory.cache_attribute) {
-                case ACPI_NON_CACHEABLE_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Noncacheable memory\n");
-                        break;
-
-                case ACPI_CACHABLE_MEMORY:
-                        acpi_os_printf("  Type Specific: Cacheable memory\n");
-                        break;
-
-                case ACPI_WRITE_COMBINING_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Write-combining memory\n");
-                        break;
-
-                case ACPI_PREFETCHABLE_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Prefetchable memory\n");
-                        break;
-
-                default:
-                        acpi_os_printf
-                            ("  Type Specific: Invalid cache attribute\n");
-                        break;
-                }
-
-                acpi_os_printf("  Type Specific: Read%s\n",
-                               ACPI_READ_WRITE_MEMORY ==
-                               address16_data->attribute.memory.
-                               read_write_attribute ? "/Write" : " Only");
+                acpi_rs_dump_descriptor(resource, acpi_rs_dump_memory_flags);
                 break;
 
         case ACPI_IO_RANGE:
 
-                acpi_os_printf("I/O Range\n");
-
-                switch (address16_data->attribute.io.range_attribute) {
-                case ACPI_NON_ISA_ONLY_RANGES:
-                        acpi_os_printf
-                            ("  Type Specific: Non-ISA Io Addresses\n");
-                        break;
-
-                case ACPI_ISA_ONLY_RANGES:
-                        acpi_os_printf("  Type Specific: ISA Io Addresses\n");
-                        break;
-
-                case ACPI_ENTIRE_RANGE:
-                        acpi_os_printf
-                            ("  Type Specific: ISA and non-ISA Io Addresses\n");
-                        break;
-
-                default:
-                        acpi_os_printf
-                            ("  Type Specific: Invalid range attribute\n");
-                        break;
-                }
-
-                acpi_os_printf("  Type Specific: %s Translation\n",
-                               ACPI_SPARSE_TRANSLATION ==
-                               address16_data->attribute.io.
-                               translation_attribute ? "Sparse" : "Dense");
+                acpi_rs_dump_descriptor(resource, acpi_rs_dump_io_flags);
                 break;
 
         case ACPI_BUS_NUMBER_RANGE:
 
-                acpi_os_printf("Bus Number Range\n");
+                acpi_rs_out_string("Resource Type", "Bus Number Range");
                 break;
 
         default:
 
-                acpi_os_printf("0x%2.2X\n", address16_data->resource_type);
+                acpi_rs_out_integer8("Resource Type",
+                                     (u8) resource->address.resource_type);
                 break;
         }
 
-        acpi_os_printf("  Resource %s\n",
-                       ACPI_CONSUMER == address16_data->producer_consumer ?
-                       "Consumer" : "Producer");
-
-        acpi_os_printf("  %s decode\n",
-                       ACPI_SUB_DECODE == address16_data->decode ?
-                       "Subtractive" : "Positive");
+        /* Decode the general flags */
 
-        acpi_os_printf("  Min address is %s fixed\n",
-                       ACPI_ADDRESS_FIXED == address16_data->min_address_fixed ?
-                       "" : "not");
-
-        acpi_os_printf("  Max address is %s fixed\n",
-                       ACPI_ADDRESS_FIXED == address16_data->max_address_fixed ?
-                       "" : "not");
-
-        acpi_os_printf("  Granularity: %08X\n", address16_data->granularity);
-
-        acpi_os_printf("  Address range min: %08X\n",
-                       address16_data->min_address_range);
-
-        acpi_os_printf("  Address range max: %08X\n",
-                       address16_data->max_address_range);
-
-        acpi_os_printf("  Address translation offset: %08X\n",
-                       address16_data->address_translation_offset);
-
-        acpi_os_printf("  Address Length: %08X\n",
-                       address16_data->address_length);
-
-        if (0xFF != address16_data->resource_source.index) {
-                acpi_os_printf("  Resource Source Index: %X\n",
-                               address16_data->resource_source.index);
-
-                acpi_os_printf("  Resource Source: %s\n",
-                               address16_data->resource_source.string_ptr);
-        }
-
-        return;
+        acpi_rs_dump_descriptor(resource, acpi_rs_dump_general_flags);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_address32
+ * FUNCTION:    acpi_rs_dump_resource_list
  *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
+ * PARAMETERS:  resource_list       - Pointer to a resource descriptor list
  *
  * RETURN:      None
  *
- * DESCRIPTION: Prints out the various members of the Data structure type.
+ * DESCRIPTION: Dispatches the structure to the correct dump routine.
  *
  ******************************************************************************/
 
-static void acpi_rs_dump_address32(union acpi_resource_data *data)
+void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
 {
-        struct acpi_resource_address32 *address32_data =
-            (struct acpi_resource_address32 *)data;
+        u32 count = 0;
+        u32 type;
 
         ACPI_FUNCTION_ENTRY();
 
-        acpi_os_printf("32-Bit Address Space Resource\n");
-
-        switch (address32_data->resource_type) {
-        case ACPI_MEMORY_RANGE:
-
-                acpi_os_printf("  Resource Type: Memory Range\n");
-
-                switch (address32_data->attribute.memory.cache_attribute) {
-                case ACPI_NON_CACHEABLE_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Noncacheable memory\n");
-                        break;
-
-                case ACPI_CACHABLE_MEMORY:
-                        acpi_os_printf("  Type Specific: Cacheable memory\n");
-                        break;
-
-                case ACPI_WRITE_COMBINING_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Write-combining memory\n");
-                        break;
-
-                case ACPI_PREFETCHABLE_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Prefetchable memory\n");
-                        break;
-
-                default:
-                        acpi_os_printf
-                            ("  Type Specific: Invalid cache attribute\n");
-                        break;
-                }
-
-                acpi_os_printf("  Type Specific: Read%s\n",
-                               ACPI_READ_WRITE_MEMORY ==
-                               address32_data->attribute.memory.
-                               read_write_attribute ? "/Write" : " Only");
-                break;
-
-        case ACPI_IO_RANGE:
-
-                acpi_os_printf("  Resource Type: Io Range\n");
+        if (!(acpi_dbg_level & ACPI_LV_RESOURCES)
+            || !(_COMPONENT & acpi_dbg_layer)) {
+                return;
+        }
 
-                switch (address32_data->attribute.io.range_attribute) {
-                case ACPI_NON_ISA_ONLY_RANGES:
-                        acpi_os_printf
-                            ("  Type Specific: Non-ISA Io Addresses\n");
-                        break;
+        /* Walk list and dump all resource descriptors (END_TAG terminates) */
 
-                case ACPI_ISA_ONLY_RANGES:
-                        acpi_os_printf("  Type Specific: ISA Io Addresses\n");
-                        break;
+        do {
+                acpi_os_printf("\n[%02X] ", count);
+                count++;
 
-                case ACPI_ENTIRE_RANGE:
-                        acpi_os_printf
-                            ("  Type Specific: ISA and non-ISA Io Addresses\n");
-                        break;
+                /* Validate Type before dispatch */
 
-                default:
+                type = resource_list->type;
+                if (type > ACPI_RESOURCE_TYPE_MAX) {
                         acpi_os_printf
-                            ("  Type Specific: Invalid Range attribute");
-                        break;
+                            ("Invalid descriptor type (%X) in resource list\n",
+                             resource_list->type);
+                        return;
                 }
 
-                acpi_os_printf("  Type Specific: %s Translation\n",
-                               ACPI_SPARSE_TRANSLATION ==
-                               address32_data->attribute.io.
-                               translation_attribute ? "Sparse" : "Dense");
-                break;
-
-        case ACPI_BUS_NUMBER_RANGE:
-
-                acpi_os_printf("  Resource Type: Bus Number Range\n");
-                break;
-
-        default:
-
-                acpi_os_printf("  Resource Type: 0x%2.2X\n",
-                               address32_data->resource_type);
-                break;
-        }
-
-        acpi_os_printf("  Resource %s\n",
-                       ACPI_CONSUMER == address32_data->producer_consumer ?
-                       "Consumer" : "Producer");
-
-        acpi_os_printf("  %s decode\n",
-                       ACPI_SUB_DECODE == address32_data->decode ?
-                       "Subtractive" : "Positive");
-
-        acpi_os_printf("  Min address is %s fixed\n",
-                       ACPI_ADDRESS_FIXED == address32_data->min_address_fixed ?
-                       "" : "not ");
-
-        acpi_os_printf("  Max address is %s fixed\n",
-                       ACPI_ADDRESS_FIXED == address32_data->max_address_fixed ?
-                       "" : "not ");
+                /* Dump the resource descriptor */
 
-        acpi_os_printf("  Granularity: %08X\n", address32_data->granularity);
+                acpi_rs_dump_descriptor(&resource_list->data,
+                                        acpi_gbl_dump_resource_dispatch[type]);
 
-        acpi_os_printf("  Address range min: %08X\n",
-                       address32_data->min_address_range);
+                /* Point to the next resource structure */
 
-        acpi_os_printf("  Address range max: %08X\n",
-                       address32_data->max_address_range);
+                resource_list =
+                    ACPI_ADD_PTR(struct acpi_resource, resource_list,
+                                 resource_list->length);
 
-        acpi_os_printf("  Address translation offset: %08X\n",
-                       address32_data->address_translation_offset);
+                /* Exit when END_TAG descriptor is reached */
 
-        acpi_os_printf("  Address Length: %08X\n",
-                       address32_data->address_length);
-
-        if (0xFF != address32_data->resource_source.index) {
-                acpi_os_printf("  Resource Source Index: %X\n",
-                               address32_data->resource_source.index);
-
-                acpi_os_printf("  Resource Source: %s\n",
-                               address32_data->resource_source.string_ptr);
-        }
-
-        return;
+        } while (type != ACPI_RESOURCE_TYPE_END_TAG);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_address64
+ * FUNCTION:    acpi_rs_dump_irq_list
  *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
+ * PARAMETERS:  route_table     - Pointer to the routing table to dump.
  *
  * RETURN:      None
  *
- * DESCRIPTION: Prints out the various members of the Data structure type.
+ * DESCRIPTION: Print IRQ routing table
  *
  ******************************************************************************/
 
-static void acpi_rs_dump_address64(union acpi_resource_data *data)
+void acpi_rs_dump_irq_list(u8 * route_table)
 {
-        struct acpi_resource_address64 *address64_data =
-            (struct acpi_resource_address64 *)data;
+        struct acpi_pci_routing_table *prt_element;
+        u8 count;
 
         ACPI_FUNCTION_ENTRY();
 
-        acpi_os_printf("64-Bit Address Space Resource\n");
-
-        switch (address64_data->resource_type) {
-        case ACPI_MEMORY_RANGE:
-
-                acpi_os_printf("  Resource Type: Memory Range\n");
-
-                switch (address64_data->attribute.memory.cache_attribute) {
-                case ACPI_NON_CACHEABLE_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Noncacheable memory\n");
-                        break;
-
-                case ACPI_CACHABLE_MEMORY:
-                        acpi_os_printf("  Type Specific: Cacheable memory\n");
-                        break;
-
-                case ACPI_WRITE_COMBINING_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Write-combining memory\n");
-                        break;
-
-                case ACPI_PREFETCHABLE_MEMORY:
-                        acpi_os_printf
-                            ("  Type Specific: Prefetchable memory\n");
-                        break;
-
-                default:
-                        acpi_os_printf
-                            ("  Type Specific: Invalid cache attribute\n");
-                        break;
-                }
-
-                acpi_os_printf("  Type Specific: Read%s\n",
-                               ACPI_READ_WRITE_MEMORY ==
-                               address64_data->attribute.memory.
-                               read_write_attribute ? "/Write" : " Only");
-                break;
-
-        case ACPI_IO_RANGE:
-
-                acpi_os_printf("  Resource Type: Io Range\n");
-
-                switch (address64_data->attribute.io.range_attribute) {
-                case ACPI_NON_ISA_ONLY_RANGES:
-                        acpi_os_printf
-                            ("  Type Specific: Non-ISA Io Addresses\n");
-                        break;
-
-                case ACPI_ISA_ONLY_RANGES:
-                        acpi_os_printf("  Type Specific: ISA Io Addresses\n");
-                        break;
-
-                case ACPI_ENTIRE_RANGE:
-                        acpi_os_printf
-                            ("  Type Specific: ISA and non-ISA Io Addresses\n");
-                        break;
-
-                default:
-                        acpi_os_printf
-                            ("  Type Specific: Invalid Range attribute");
-                        break;
-                }
-
-                acpi_os_printf("  Type Specific: %s Translation\n",
-                               ACPI_SPARSE_TRANSLATION ==
-                               address64_data->attribute.io.
-                               translation_attribute ? "Sparse" : "Dense");
-                break;
-
-        case ACPI_BUS_NUMBER_RANGE:
-
-                acpi_os_printf("  Resource Type: Bus Number Range\n");
-                break;
-
-        default:
-
-                acpi_os_printf("  Resource Type: 0x%2.2X\n",
-                               address64_data->resource_type);
-                break;
+        if (!(acpi_dbg_level & ACPI_LV_RESOURCES)
+            || !(_COMPONENT & acpi_dbg_layer)) {
+                return;
         }
 
-        acpi_os_printf("  Resource %s\n",
-                       ACPI_CONSUMER == address64_data->producer_consumer ?
-                       "Consumer" : "Producer");
-
-        acpi_os_printf("  %s decode\n",
-                       ACPI_SUB_DECODE == address64_data->decode ?
-                       "Subtractive" : "Positive");
-
-        acpi_os_printf("  Min address is %s fixed\n",
-                       ACPI_ADDRESS_FIXED == address64_data->min_address_fixed ?
-                       "" : "not ");
-
-        acpi_os_printf("  Max address is %s fixed\n",
-                       ACPI_ADDRESS_FIXED == address64_data->max_address_fixed ?
-                       "" : "not ");
+        prt_element = ACPI_CAST_PTR(struct acpi_pci_routing_table, route_table);
 
-        acpi_os_printf("  Granularity: %8.8X%8.8X\n",
-                       ACPI_FORMAT_UINT64(address64_data->granularity));
+        /* Dump all table elements, Exit on zero length element */
 
-        acpi_os_printf("  Address range min: %8.8X%8.8X\n",
-                       ACPI_FORMAT_UINT64(address64_data->min_address_range));
+        for (count = 0; prt_element->length; count++) {
+                acpi_os_printf("\n[%02X] PCI IRQ Routing Table Package\n",
+                               count);
+                acpi_rs_dump_descriptor(prt_element, acpi_rs_dump_prt);
 
-        acpi_os_printf("  Address range max: %8.8X%8.8X\n",
-                       ACPI_FORMAT_UINT64(address64_data->max_address_range));
-
-        acpi_os_printf("  Address translation offset: %8.8X%8.8X\n",
-                       ACPI_FORMAT_UINT64(address64_data->
-                                          address_translation_offset));
-
-        acpi_os_printf("  Address Length: %8.8X%8.8X\n",
-                       ACPI_FORMAT_UINT64(address64_data->address_length));
-
-        acpi_os_printf("  Type Specific Attributes: %8.8X%8.8X\n",
-                       ACPI_FORMAT_UINT64(address64_data->
-                                          type_specific_attributes));
-
-        if (0xFF != address64_data->resource_source.index) {
-                acpi_os_printf("  Resource Source Index: %X\n",
-                               address64_data->resource_source.index);
-
-                acpi_os_printf("  Resource Source: %s\n",
-                               address64_data->resource_source.string_ptr);
+                prt_element = ACPI_ADD_PTR(struct acpi_pci_routing_table,
+                                           prt_element, prt_element->length);
         }
-
-        return;
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_extended_irq
+ * FUNCTION:    acpi_rs_out*
  *
- * PARAMETERS:  Data            - pointer to the resource structure to dump.
+ * PARAMETERS:  Title       - Name of the resource field
+ *              Value       - Value of the resource field
  *
  * RETURN:      None
  *
- * DESCRIPTION: Prints out the various members of the Data structure type.
+ * DESCRIPTION: Miscellaneous helper functions to consistently format the
+ *              output of the resource dump routines
  *
  ******************************************************************************/
 
-static void acpi_rs_dump_extended_irq(union acpi_resource_data *data)
+static void acpi_rs_out_string(char *title, char *value)
 {
-        struct acpi_resource_ext_irq *ext_irq_data =
-            (struct acpi_resource_ext_irq *)data;
-        u8 index = 0;
-
-        ACPI_FUNCTION_ENTRY();
-
-        acpi_os_printf("Extended IRQ Resource\n");
-
-        acpi_os_printf("  Resource %s\n",
-                       ACPI_CONSUMER == ext_irq_data->producer_consumer ?
-                       "Consumer" : "Producer");
-
-        acpi_os_printf("  %s\n",
-                       ACPI_LEVEL_SENSITIVE == ext_irq_data->edge_level ?
-                       "Level" : "Edge");
-
-        acpi_os_printf("  Active %s\n",
-                       ACPI_ACTIVE_LOW == ext_irq_data->active_high_low ?
-                       "low" : "high");
-
-        acpi_os_printf("  %s\n",
-                       ACPI_SHARED == ext_irq_data->shared_exclusive ?
-                       "Shared" : "Exclusive");
-
-        acpi_os_printf("  Interrupts : %X ( ",
-                       ext_irq_data->number_of_interrupts);
-
-        for (index = 0; index < ext_irq_data->number_of_interrupts; index++) {
-                acpi_os_printf("%X ", ext_irq_data->interrupts[index]);
-        }
-
-        acpi_os_printf(")\n");
-
-        if (0xFF != ext_irq_data->resource_source.index) {
-                acpi_os_printf("  Resource Source Index: %X",
-                               ext_irq_data->resource_source.index);
-
-                acpi_os_printf("  Resource Source: %s",
-                               ext_irq_data->resource_source.string_ptr);
+        acpi_os_printf("%27s : %s", title, value);
+        if (!*value) {
+                acpi_os_printf("[NULL NAMESTRING]");
         }
-
-        return;
+        acpi_os_printf("\n");
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_dump_resource_list
- *
- * PARAMETERS:  Resource        - pointer to the resource structure to dump.
- *
- * RETURN:      None
- *
- * DESCRIPTION: Dispatches the structure to the correct dump routine.
- *
- ******************************************************************************/
-
-void acpi_rs_dump_resource_list(struct acpi_resource *resource)
+static void acpi_rs_out_integer8(char *title, u8 value)
 {
-        u8 count = 0;
-        u8 done = FALSE;
-
-        ACPI_FUNCTION_ENTRY();
-
-        if (acpi_dbg_level & ACPI_LV_RESOURCES && _COMPONENT & acpi_dbg_layer) {
-                while (!done) {
-                        acpi_os_printf("Resource structure %X.\n", count++);
-
-                        switch (resource->id) {
-                        case ACPI_RSTYPE_IRQ:
-                                acpi_rs_dump_irq(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_DMA:
-                                acpi_rs_dump_dma(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_START_DPF:
-                                acpi_rs_dump_start_depend_fns(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_END_DPF:
-                                acpi_os_printf
-                                    ("end_dependent_functions Resource\n");
-                                /* acpi_rs_dump_end_dependent_functions (Resource->Data); */
-                                break;
-
-                        case ACPI_RSTYPE_IO:
-                                acpi_rs_dump_io(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_FIXED_IO:
-                                acpi_rs_dump_fixed_io(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_VENDOR:
-                                acpi_rs_dump_vendor_specific(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_END_TAG:
-                                /*rs_dump_end_tag (Resource->Data); */
-                                acpi_os_printf("end_tag Resource\n");
-                                done = TRUE;
-                                break;
-
-                        case ACPI_RSTYPE_MEM24:
-                                acpi_rs_dump_memory24(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_MEM32:
-                                acpi_rs_dump_memory32(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_FIXED_MEM32:
-                                acpi_rs_dump_fixed_memory32(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_ADDRESS16:
-                                acpi_rs_dump_address16(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_ADDRESS32:
-                                acpi_rs_dump_address32(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_ADDRESS64:
-                                acpi_rs_dump_address64(&resource->data);
-                                break;
-
-                        case ACPI_RSTYPE_EXT_IRQ:
-                                acpi_rs_dump_extended_irq(&resource->data);
-                                break;
+        acpi_os_printf("%27s : %2.2X\n", title, value);
+}
 
-                        default:
-                                acpi_os_printf("Invalid resource type\n");
-                                break;
+static void acpi_rs_out_integer16(char *title, u16 value)
+{
+        acpi_os_printf("%27s : %4.4X\n", title, value);
+}
 
-                        }
+static void acpi_rs_out_integer32(char *title, u32 value)
+{
+        acpi_os_printf("%27s : %8.8X\n", title, value);
+}
 
-                        resource =
-                            ACPI_PTR_ADD(struct acpi_resource, resource,
-                                         resource->length);
-                }
-        }
+static void acpi_rs_out_integer64(char *title, u64 value)
+{
+        acpi_os_printf("%27s : %8.8X%8.8X\n", title, ACPI_FORMAT_UINT64(value));
+}
 
-        return;
+static void acpi_rs_out_title(char *title)
+{
+        acpi_os_printf("%27s : ", title);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dump_irq_list
+ * FUNCTION:    acpi_rs_dump*List
  *
- * PARAMETERS:  route_table     - pointer to the routing table to dump.
+ * PARAMETERS:  Length      - Number of elements in the list
+ *              Data        - Start of the list
  *
  * RETURN:      None
  *
- * DESCRIPTION: Dispatches the structures to the correct dump routine.
+ * DESCRIPTION: Miscellaneous functions to dump lists of raw data
  *
  ******************************************************************************/
 
-void acpi_rs_dump_irq_list(u8 * route_table)
+static void acpi_rs_dump_byte_list(u16 length, u8 * data)
 {
-        u8 *buffer = route_table;
-        u8 count = 0;
-        u8 done = FALSE;
-        struct acpi_pci_routing_table *prt_element;
+        u8 i;
 
-        ACPI_FUNCTION_ENTRY();
-
-        if (acpi_dbg_level & ACPI_LV_RESOURCES && _COMPONENT & acpi_dbg_layer) {
-                prt_element =
-                    ACPI_CAST_PTR(struct acpi_pci_routing_table, buffer);
-
-                while (!done) {
-                        acpi_os_printf("PCI IRQ Routing Table structure %X.\n",
-                                       count++);
-
-                        acpi_os_printf("  Address: %8.8X%8.8X\n",
-                                       ACPI_FORMAT_UINT64(prt_element->
-                                                          address));
+        for (i = 0; i < length; i++) {
+                acpi_os_printf("%25s%2.2X : %2.2X\n", "Byte", i, data[i]);
+        }
+}
 
-                        acpi_os_printf("  Pin: %X\n", prt_element->pin);
+static void acpi_rs_dump_short_byte_list(u8 length, u8 * data)
+{
+        u8 i;
 
-                        acpi_os_printf("  Source: %s\n", prt_element->source);
+        for (i = 0; i < length; i++) {
+                acpi_os_printf("%X ", data[i]);
+        }
+        acpi_os_printf("\n");
+}
 
-                        acpi_os_printf("  source_index: %X\n",
-                                       prt_element->source_index);
+static void acpi_rs_dump_dword_list(u8 length, u32 * data)
+{
+        u8 i;
 
-                        buffer += prt_element->length;
-                        prt_element =
-                            ACPI_CAST_PTR(struct acpi_pci_routing_table,
-                                          buffer);
-                        if (0 == prt_element->length) {
-                                done = TRUE;
-                        }
-                }
+        for (i = 0; i < length; i++) {
+                acpi_os_printf("%25s%2.2X : %8.8X\n", "Dword", i, data[i]);
         }
-
-        return;
 }
 
 #endif
diff --git a/drivers/acpi/resources/rsinfo.c b/drivers/acpi/resources/rsinfo.c
new file mode 100644
index 000000000000..d9ae64b77bd9
--- /dev/null
+++ b/drivers/acpi/resources/rsinfo.c
@@ -0,0 +1,204 @@
+/*******************************************************************************
+ *
+ * Module Name: rsinfo - Dispatch and Info tables
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2006, R. Byron Moore
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include <acpi/acresrc.h>
+
+#define _COMPONENT          ACPI_RESOURCES
+ACPI_MODULE_NAME("rsinfo")
+
+/*
+ * Resource dispatch and information tables. Any new resource types (either
+ * Large or Small) must be reflected in each of these tables, so they are here
+ * in one place.
+ *
+ * The tables for Large descriptors are indexed by bits 6:0 of the AML
+ * descriptor type byte. The tables for Small descriptors are indexed by
+ * bits 6:3 of the descriptor byte. The tables for internal resource
+ * descriptors are indexed by the acpi_resource_type field.
+ */
+/* Dispatch table for resource-to-AML (Set Resource) conversion functions */
+struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[] = {
+        acpi_rs_set_irq,        /* 0x00, ACPI_RESOURCE_TYPE_IRQ */
+        acpi_rs_convert_dma,    /* 0x01, ACPI_RESOURCE_TYPE_DMA */
+        acpi_rs_set_start_dpf,  /* 0x02, ACPI_RESOURCE_TYPE_START_DEPENDENT */
+        acpi_rs_convert_end_dpf,        /* 0x03, ACPI_RESOURCE_TYPE_END_DEPENDENT */
+        acpi_rs_convert_io,     /* 0x04, ACPI_RESOURCE_TYPE_IO */
+        acpi_rs_convert_fixed_io,       /* 0x05, ACPI_RESOURCE_TYPE_FIXED_IO */
+        acpi_rs_set_vendor,     /* 0x06, ACPI_RESOURCE_TYPE_VENDOR */
+        acpi_rs_convert_end_tag,        /* 0x07, ACPI_RESOURCE_TYPE_END_TAG */
+        acpi_rs_convert_memory24,       /* 0x08, ACPI_RESOURCE_TYPE_MEMORY24 */
+        acpi_rs_convert_memory32,       /* 0x09, ACPI_RESOURCE_TYPE_MEMORY32 */
+        acpi_rs_convert_fixed_memory32, /* 0x0A, ACPI_RESOURCE_TYPE_FIXED_MEMORY32 */
+        acpi_rs_convert_address16,      /* 0x0B, ACPI_RESOURCE_TYPE_ADDRESS16 */
+        acpi_rs_convert_address32,      /* 0x0C, ACPI_RESOURCE_TYPE_ADDRESS32 */
+        acpi_rs_convert_address64,      /* 0x0D, ACPI_RESOURCE_TYPE_ADDRESS64 */
+        acpi_rs_convert_ext_address64,  /* 0x0E, ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
+        acpi_rs_convert_ext_irq,        /* 0x0F, ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
+        acpi_rs_convert_generic_reg     /* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+};
+
+/* Dispatch tables for AML-to-resource (Get Resource) conversion functions */
+
+struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[] = {
+        /* Small descriptors */
+
+        NULL,                   /* 0x00, Reserved */
+        NULL,                   /* 0x01, Reserved */
+        NULL,                   /* 0x02, Reserved */
+        NULL,                   /* 0x03, Reserved */
+        acpi_rs_get_irq,        /* 0x04, ACPI_RESOURCE_NAME_IRQ */
+        acpi_rs_convert_dma,    /* 0x05, ACPI_RESOURCE_NAME_DMA */
+        acpi_rs_get_start_dpf,  /* 0x06, ACPI_RESOURCE_NAME_START_DEPENDENT */
+        acpi_rs_convert_end_dpf,        /* 0x07, ACPI_RESOURCE_NAME_END_DEPENDENT */
+        acpi_rs_convert_io,     /* 0x08, ACPI_RESOURCE_NAME_IO */
+        acpi_rs_convert_fixed_io,       /* 0x09, ACPI_RESOURCE_NAME_FIXED_IO */
+        NULL,                   /* 0x0A, Reserved */
+        NULL,                   /* 0x0B, Reserved */
+        NULL,                   /* 0x0C, Reserved */
+        NULL,                   /* 0x0D, Reserved */
+        acpi_rs_get_vendor_small,       /* 0x0E, ACPI_RESOURCE_NAME_VENDOR_SMALL */
+        acpi_rs_convert_end_tag,        /* 0x0F, ACPI_RESOURCE_NAME_END_TAG */
+
+        /* Large descriptors */
+
+        NULL,                   /* 0x00, Reserved */
+        acpi_rs_convert_memory24,       /* 0x01, ACPI_RESOURCE_NAME_MEMORY24 */
+        acpi_rs_convert_generic_reg,    /* 0x02, ACPI_RESOURCE_NAME_GENERIC_REGISTER */
+        NULL,                   /* 0x03, Reserved */
+        acpi_rs_get_vendor_large,       /* 0x04, ACPI_RESOURCE_NAME_VENDOR_LARGE */
+        acpi_rs_convert_memory32,       /* 0x05, ACPI_RESOURCE_NAME_MEMORY32 */
+        acpi_rs_convert_fixed_memory32, /* 0x06, ACPI_RESOURCE_NAME_FIXED_MEMORY32 */
+        acpi_rs_convert_address32,      /* 0x07, ACPI_RESOURCE_NAME_ADDRESS32 */
+        acpi_rs_convert_address16,      /* 0x08, ACPI_RESOURCE_NAME_ADDRESS16 */
+        acpi_rs_convert_ext_irq,        /* 0x09, ACPI_RESOURCE_NAME_EXTENDED_IRQ */
+        acpi_rs_convert_address64,      /* 0x0A, ACPI_RESOURCE_NAME_ADDRESS64 */
+        acpi_rs_convert_ext_address64   /* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */
+};
+
+#ifdef ACPI_FUTURE_USAGE
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+
+/* Dispatch table for resource dump functions */
+
+struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {
+        acpi_rs_dump_irq,       /* ACPI_RESOURCE_TYPE_IRQ */
+        acpi_rs_dump_dma,       /* ACPI_RESOURCE_TYPE_DMA */
+        acpi_rs_dump_start_dpf, /* ACPI_RESOURCE_TYPE_START_DEPENDENT */
+        acpi_rs_dump_end_dpf,   /* ACPI_RESOURCE_TYPE_END_DEPENDENT */
+        acpi_rs_dump_io,        /* ACPI_RESOURCE_TYPE_IO */
+        acpi_rs_dump_fixed_io,  /* ACPI_RESOURCE_TYPE_FIXED_IO */
+        acpi_rs_dump_vendor,    /* ACPI_RESOURCE_TYPE_VENDOR */
+        acpi_rs_dump_end_tag,   /* ACPI_RESOURCE_TYPE_END_TAG */
+        acpi_rs_dump_memory24,  /* ACPI_RESOURCE_TYPE_MEMORY24 */
+        acpi_rs_dump_memory32,  /* ACPI_RESOURCE_TYPE_MEMORY32 */
+        acpi_rs_dump_fixed_memory32,    /* ACPI_RESOURCE_TYPE_FIXED_MEMORY32 */
+        acpi_rs_dump_address16, /* ACPI_RESOURCE_TYPE_ADDRESS16 */
+        acpi_rs_dump_address32, /* ACPI_RESOURCE_TYPE_ADDRESS32 */
+        acpi_rs_dump_address64, /* ACPI_RESOURCE_TYPE_ADDRESS64 */
+        acpi_rs_dump_ext_address64,     /* ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
+        acpi_rs_dump_ext_irq,   /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
+        acpi_rs_dump_generic_reg,       /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+};
+#endif
+#endif  /* ACPI_FUTURE_USAGE */
+/*
+ * Base sizes for external AML resource descriptors, indexed by internal type.
+ * Includes size of the descriptor header (1 byte for small descriptors,
+ * 3 bytes for large descriptors)
+ */
+const u8 acpi_gbl_aml_resource_sizes[] = {
+        sizeof(struct aml_resource_irq),        /* ACPI_RESOURCE_TYPE_IRQ (optional Byte 3 always created) */
+        sizeof(struct aml_resource_dma),        /* ACPI_RESOURCE_TYPE_DMA */
+        sizeof(struct aml_resource_start_dependent),    /* ACPI_RESOURCE_TYPE_START_DEPENDENT (optional Byte 1 always created) */
+        sizeof(struct aml_resource_end_dependent),      /* ACPI_RESOURCE_TYPE_END_DEPENDENT */
+        sizeof(struct aml_resource_io), /* ACPI_RESOURCE_TYPE_IO */
+        sizeof(struct aml_resource_fixed_io),   /* ACPI_RESOURCE_TYPE_FIXED_IO */
+        sizeof(struct aml_resource_vendor_small),       /* ACPI_RESOURCE_TYPE_VENDOR */
+        sizeof(struct aml_resource_end_tag),    /* ACPI_RESOURCE_TYPE_END_TAG */
+        sizeof(struct aml_resource_memory24),   /* ACPI_RESOURCE_TYPE_MEMORY24 */
+        sizeof(struct aml_resource_memory32),   /* ACPI_RESOURCE_TYPE_MEMORY32 */
+        sizeof(struct aml_resource_fixed_memory32),     /* ACPI_RESOURCE_TYPE_FIXED_MEMORY32 */
+        sizeof(struct aml_resource_address16),  /* ACPI_RESOURCE_TYPE_ADDRESS16 */
+        sizeof(struct aml_resource_address32),  /* ACPI_RESOURCE_TYPE_ADDRESS32 */
+        sizeof(struct aml_resource_address64),  /* ACPI_RESOURCE_TYPE_ADDRESS64 */
+        sizeof(struct aml_resource_extended_address64), /*ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */
+        sizeof(struct aml_resource_extended_irq),       /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */
+        sizeof(struct aml_resource_generic_register)    /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */
+};
+
+const u8 acpi_gbl_resource_struct_sizes[] = {
+        /* Small descriptors */
+
+        0,
+        0,
+        0,
+        0,
+        ACPI_RS_SIZE(struct acpi_resource_irq),
+        ACPI_RS_SIZE(struct acpi_resource_dma),
+        ACPI_RS_SIZE(struct acpi_resource_start_dependent),
+        ACPI_RS_SIZE_MIN,
+        ACPI_RS_SIZE(struct acpi_resource_io),
+        ACPI_RS_SIZE(struct acpi_resource_fixed_io),
+        0,
+        0,
+        0,
+        0,
+        ACPI_RS_SIZE(struct acpi_resource_vendor),
+        ACPI_RS_SIZE_MIN,
+
+        /* Large descriptors */
+
+        0,
+        ACPI_RS_SIZE(struct acpi_resource_memory24),
+        ACPI_RS_SIZE(struct acpi_resource_generic_register),
+        0,
+        ACPI_RS_SIZE(struct acpi_resource_vendor),
+        ACPI_RS_SIZE(struct acpi_resource_memory32),
+        ACPI_RS_SIZE(struct acpi_resource_fixed_memory32),
+        ACPI_RS_SIZE(struct acpi_resource_address32),
+        ACPI_RS_SIZE(struct acpi_resource_address16),
+        ACPI_RS_SIZE(struct acpi_resource_extended_irq),
+        ACPI_RS_SIZE(struct acpi_resource_address64),
+        ACPI_RS_SIZE(struct acpi_resource_extended_address64)
+};
diff --git a/drivers/acpi/resources/rsio.c b/drivers/acpi/resources/rsio.c
index d53bbe89e851..ea567167c4f2 100644
--- a/drivers/acpi/resources/rsio.c
+++ b/drivers/acpi/resources/rsio.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,428 +49,206 @@ ACPI_MODULE_NAME("rsio")
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_io_resource
+ * acpi_rs_convert_io
  *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
+ ******************************************************************************/
+struct acpi_rsconvert_info acpi_rs_convert_io[5] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_IO,
+         ACPI_RS_SIZE(struct acpi_resource_io),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_io)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_IO,
+         sizeof(struct aml_resource_io),
+         0},
+
+        /* Decode flag */
+
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.io.io_decode),
+         AML_OFFSET(io.flags),
+         0},
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Address Alignment
+         * Length
+         * Minimum Base Address
+         * Maximum Base Address
+         */
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.io.alignment),
+         AML_OFFSET(io.alignment),
+         2},
+
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.io.minimum),
+         AML_OFFSET(io.minimum),
+         2}
+};
+
+/*******************************************************************************
  *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_convert_fixed_io
  *
  ******************************************************************************/
-acpi_status
-acpi_rs_io_resource(u8 * byte_stream_buffer,
-                    acpi_size * bytes_consumed,
-                    u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        acpi_size struct_size = ACPI_SIZEOF_RESOURCE(struct acpi_resource_io);
-
-        ACPI_FUNCTION_TRACE("rs_io_resource");
-
-        /* The number of bytes consumed are Constant */
-
-        *bytes_consumed = 8;
-
-        output_struct->id = ACPI_RSTYPE_IO;
-
-        /* Check Decode */
-
-        buffer += 1;
-        temp8 = *buffer;
-
-        output_struct->data.io.io_decode = temp8 & 0x01;
-
-        /* Check min_base Address */
-
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-        output_struct->data.io.min_base_address = temp16;
-
-        /* Check max_base Address */
 
-        buffer += 2;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-        output_struct->data.io.max_base_address = temp16;
-
-        /* Check Base alignment */
-
-        buffer += 2;
-        temp8 = *buffer;
-
-        output_struct->data.io.alignment = temp8;
-
-        /* Check range_length */
-
-        buffer += 1;
-        temp8 = *buffer;
-
-        output_struct->data.io.range_length = temp8;
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+struct acpi_rsconvert_info acpi_rs_convert_fixed_io[4] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_FIXED_IO,
+         ACPI_RS_SIZE(struct acpi_resource_fixed_io),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_fixed_io)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_FIXED_IO,
+         sizeof(struct aml_resource_fixed_io),
+         0},
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Base Address
+         * Length
+         */
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.fixed_io.address_length),
+         AML_OFFSET(fixed_io.address_length),
+         1},
+
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.fixed_io.address),
+         AML_OFFSET(fixed_io.address),
+         1}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_fixed_io_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_convert_generic_reg
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_fixed_io_resource(u8 * byte_stream_buffer,
-                          acpi_size * bytes_consumed,
-                          u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_io);
-
-        ACPI_FUNCTION_TRACE("rs_fixed_io_resource");
-
-        /* The number of bytes consumed are Constant */
-
-        *bytes_consumed = 4;
-
-        output_struct->id = ACPI_RSTYPE_FIXED_IO;
-
-        /* Check Range Base Address */
-
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-        output_struct->data.fixed_io.base_address = temp16;
-
-        /* Check range_length */
-
-        buffer += 2;
-        temp8 = *buffer;
-
-        output_struct->data.fixed_io.range_length = temp8;
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+struct acpi_rsconvert_info acpi_rs_convert_generic_reg[4] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_GENERIC_REGISTER,
+         ACPI_RS_SIZE(struct acpi_resource_generic_register),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_generic_reg)},
+
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_GENERIC_REGISTER,
+         sizeof(struct aml_resource_generic_register),
+         0},
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Address Space ID
+         * Register Bit Width
+         * Register Bit Offset
+         * Access Size
+         */
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.generic_reg.space_id),
+         AML_OFFSET(generic_reg.address_space_id),
+         4},
+
+        /* Get the Register Address */
+
+        {ACPI_RSC_MOVE64, ACPI_RS_OFFSET(data.generic_reg.address),
+         AML_OFFSET(generic_reg.address),
+         1}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_io_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_convert_end_dpf
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_io_stream(struct acpi_resource *linked_list,
-                  u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-
-        ACPI_FUNCTION_TRACE("rs_io_stream");
-
-        /* The descriptor field is static */
-
-        *buffer = 0x47;
-        buffer += 1;
-
-        /* Io Information Byte */
-
-        temp8 = (u8) (linked_list->data.io.io_decode & 0x01);
-
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Set the Range minimum base address */
-
-        temp16 = (u16) linked_list->data.io.min_base_address;
-
-        ACPI_MOVE_16_TO_16(buffer, &temp16);
-        buffer += 2;
-
-        /* Set the Range maximum base address */
-
-        temp16 = (u16) linked_list->data.io.max_base_address;
+struct acpi_rsconvert_info acpi_rs_convert_end_dpf[2] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_END_DEPENDENT,
+         ACPI_RS_SIZE_MIN,
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_end_dpf)},
 
-        ACPI_MOVE_16_TO_16(buffer, &temp16);
-        buffer += 2;
-
-        /* Set the base alignment */
-
-        temp8 = (u8) linked_list->data.io.alignment;
-
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Set the range length */
-
-        temp8 = (u8) linked_list->data.io.range_length;
-
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_END_DEPENDENT,
+         sizeof(struct aml_resource_end_dependent),
+         0}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_fixed_io_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_convert_end_tag
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_fixed_io_stream(struct acpi_resource *linked_list,
-                        u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-
-        ACPI_FUNCTION_TRACE("rs_fixed_io_stream");
-
-        /* The descriptor field is static */
-
-        *buffer = 0x4B;
-
-        buffer += 1;
-
-        /* Set the Range base address */
-
-        temp16 = (u16) linked_list->data.fixed_io.base_address;
-
-        ACPI_MOVE_16_TO_16(buffer, &temp16);
-        buffer += 2;
-
-        /* Set the range length */
-
-        temp8 = (u8) linked_list->data.fixed_io.range_length;
-
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
+struct acpi_rsconvert_info acpi_rs_convert_end_tag[2] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_END_TAG,
+         ACPI_RS_SIZE_MIN,
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_end_tag)},
+
+        /*
+         * Note: The checksum field is set to zero, meaning that the resource
+         * data is treated as if the checksum operation succeeded.
+         * (ACPI Spec 1.0b Section 6.4.2.8)
+         */
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_END_TAG,
+         sizeof(struct aml_resource_end_tag),
+         0}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dma_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_get_start_dpf
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_dma_resource(u8 * byte_stream_buffer,
-                     acpi_size * bytes_consumed,
-                     u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u8 temp8 = 0;
-        u8 index;
-        u8 i;
-        acpi_size struct_size = ACPI_SIZEOF_RESOURCE(struct acpi_resource_dma);
-
-        ACPI_FUNCTION_TRACE("rs_dma_resource");
-
-        /* The number of bytes consumed are Constant */
+struct acpi_rsconvert_info acpi_rs_get_start_dpf[5] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_START_DEPENDENT,
+         ACPI_RS_SIZE(struct acpi_resource_start_dependent),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_get_start_dpf)},
 
-        *bytes_consumed = 3;
-        output_struct->id = ACPI_RSTYPE_DMA;
+        /* Defaults for Compatibility and Performance priorities */
 
-        /* Point to the 8-bits of Byte 1 */
+        {ACPI_RSC_SET8, ACPI_RS_OFFSET(data.start_dpf.compatibility_priority),
+         ACPI_ACCEPTABLE_CONFIGURATION,
+         2},
 
-        buffer += 1;
-        temp8 = *buffer;
+        /* All done if there is no flag byte present in the descriptor */
 
-        /* Decode the DMA channel bits */
+        {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 1},
 
-        for (i = 0, index = 0; index < 8; index++) {
-                if ((temp8 >> index) & 0x01) {
-                        output_struct->data.dma.channels[i] = index;
-                        i++;
-                }
-        }
+        /* Flag byte is present, get the flags */
 
-        /* Zero DMA channels is valid */
+        {ACPI_RSC_2BITFLAG,
+         ACPI_RS_OFFSET(data.start_dpf.compatibility_priority),
+         AML_OFFSET(start_dpf.flags),
+         0},
 
-        output_struct->data.dma.number_of_channels = i;
-        if (i > 0) {
-                /* Calculate the structure size based upon the number of interrupts */
-
-                struct_size += ((acpi_size) i - 1) * 4;
-        }
-
-        /* Point to Byte 2 */
-
-        buffer += 1;
-        temp8 = *buffer;
-
-        /* Check for transfer preference (Bits[1:0]) */
-
-        output_struct->data.dma.transfer = temp8 & 0x03;
-
-        if (0x03 == output_struct->data.dma.transfer) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Invalid DMA.Transfer preference (3)\n"));
-                return_ACPI_STATUS(AE_BAD_DATA);
-        }
-
-        /* Get bus master preference (Bit[2]) */
-
-        output_struct->data.dma.bus_master = (temp8 >> 2) & 0x01;
-
-        /* Get channel speed support (Bits[6:5]) */
-
-        output_struct->data.dma.type = (temp8 >> 5) & 0x03;
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_2BITFLAG,
+         ACPI_RS_OFFSET(data.start_dpf.performance_robustness),
+         AML_OFFSET(start_dpf.flags),
+         2}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_dma_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_set_start_dpf
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_dma_stream(struct acpi_resource *linked_list,
-                   u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        u8 index;
-
-        ACPI_FUNCTION_TRACE("rs_dma_stream");
-
-        /* The descriptor field is static */
-
-        *buffer = 0x2A;
-        buffer += 1;
-        temp8 = 0;
-
-        /* Loop through all of the Channels and set the mask bits */
-
-        for (index = 0;
-             index < linked_list->data.dma.number_of_channels; index++) {
-                temp16 = (u16) linked_list->data.dma.channels[index];
-                temp8 |= 0x1 << temp16;
-        }
-
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Set the DMA Info */
-
-        temp8 = (u8) ((linked_list->data.dma.type & 0x03) << 5);
-        temp8 |= ((linked_list->data.dma.bus_master & 0x01) << 2);
-        temp8 |= (linked_list->data.dma.transfer & 0x03);
-
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
+struct acpi_rsconvert_info acpi_rs_set_start_dpf[6] = {
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_START_DEPENDENT,
+         sizeof(struct aml_resource_start_dependent),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_set_start_dpf)},
+
+        /* Set the default flag values */
+
+        {ACPI_RSC_2BITFLAG,
+         ACPI_RS_OFFSET(data.start_dpf.compatibility_priority),
+         AML_OFFSET(start_dpf.flags),
+         0},
+
+        {ACPI_RSC_2BITFLAG,
+         ACPI_RS_OFFSET(data.start_dpf.performance_robustness),
+         AML_OFFSET(start_dpf.flags),
+         2},
+        /*
+         * All done if flags byte is necessary -- if either priority value
+         * is not ACPI_ACCEPTABLE_CONFIGURATION
+         */
+        {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.start_dpf.compatibility_priority),
+         ACPI_ACCEPTABLE_CONFIGURATION},
+
+        {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.start_dpf.performance_robustness),
+         ACPI_ACCEPTABLE_CONFIGURATION},
+
+        /* Flag byte is not necessary */
+
+        {ACPI_RSC_LENGTH, 0, 0,
+         sizeof(struct aml_resource_start_dependent_noprio)}
+};
diff --git a/drivers/acpi/resources/rsirq.c b/drivers/acpi/resources/rsirq.c
index 56043fee96cb..1fa63bc2e36f 100644
--- a/drivers/acpi/resources/rsirq.c
+++ b/drivers/acpi/resources/rsirq.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,504 +49,182 @@ ACPI_MODULE_NAME("rsirq")
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_irq_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_get_irq
  *
  ******************************************************************************/
-acpi_status
-acpi_rs_irq_resource(u8 * byte_stream_buffer,
-                     acpi_size * bytes_consumed,
-                     u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        u8 index;
-        u8 i;
-        acpi_size struct_size = ACPI_SIZEOF_RESOURCE(struct acpi_resource_irq);
-
-        ACPI_FUNCTION_TRACE("rs_irq_resource");
-
-        /*
-         * The number of bytes consumed are contained in the descriptor
-         * (Bits:0-1)
-         */
-        temp8 = *buffer;
-        *bytes_consumed = (temp8 & 0x03) + 1;
-        output_struct->id = ACPI_RSTYPE_IRQ;
-
-        /* Point to the 16-bits of Bytes 1 and 2 */
-
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-        output_struct->data.irq.number_of_interrupts = 0;
-
-        /* Decode the IRQ bits */
-
-        for (i = 0, index = 0; index < 16; index++) {
-                if ((temp16 >> index) & 0x01) {
-                        output_struct->data.irq.interrupts[i] = index;
-                        i++;
-                }
-        }
+struct acpi_rsconvert_info acpi_rs_get_irq[7] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_IRQ,
+         ACPI_RS_SIZE(struct acpi_resource_irq),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_get_irq)},
 
-        /* Zero interrupts is valid */
+        /* Get the IRQ mask (bytes 1:2) */
 
-        output_struct->data.irq.number_of_interrupts = i;
-        if (i > 0) {
-                /* Calculate the structure size based upon the number of interrupts */
+        {ACPI_RSC_BITMASK16, ACPI_RS_OFFSET(data.irq.interrupts[0]),
+         AML_OFFSET(irq.irq_mask),
+         ACPI_RS_OFFSET(data.irq.interrupt_count)},
 
-                struct_size += ((acpi_size) i - 1) * 4;
-        }
+        /* Set default flags (others are zero) */
 
-        /* Point to Byte 3 if it is used */
+        {ACPI_RSC_SET8, ACPI_RS_OFFSET(data.irq.triggering),
+         ACPI_EDGE_SENSITIVE,
+         1},
 
-        if (4 == *bytes_consumed) {
-                buffer += 2;
-                temp8 = *buffer;
+        /* All done if no flag byte present in descriptor */
 
-                /* Check for HE, LL interrupts */
+        {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 3},
 
-                switch (temp8 & 0x09) {
-                case 0x01:      /* HE */
-                        output_struct->data.irq.edge_level =
-                            ACPI_EDGE_SENSITIVE;
-                        output_struct->data.irq.active_high_low =
-                            ACPI_ACTIVE_HIGH;
-                        break;
+        /* Get flags: Triggering[0], Polarity[3], Sharing[4] */
 
-                case 0x08:      /* LL */
-                        output_struct->data.irq.edge_level =
-                            ACPI_LEVEL_SENSITIVE;
-                        output_struct->data.irq.active_high_low =
-                            ACPI_ACTIVE_LOW;
-                        break;
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering),
+         AML_OFFSET(irq.flags),
+         0},
 
-                default:
-                        /*
-                         * Only _LL and _HE polarity/trigger interrupts
-                         * are allowed (ACPI spec, section "IRQ Format")
-                         * so 0x00 and 0x09 are illegal.
-                         */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Invalid interrupt polarity/trigger in resource list, %X\n",
-                                          temp8));
-                        return_ACPI_STATUS(AE_BAD_DATA);
-                }
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.polarity),
+         AML_OFFSET(irq.flags),
+         3},
 
-                /* Check for sharable */
-
-                output_struct->data.irq.shared_exclusive = (temp8 >> 3) & 0x01;
-        } else {
-                /*
-                 * Assume Edge Sensitive, Active High, Non-Sharable
-                 * per ACPI Specification
-                 */
-                output_struct->data.irq.edge_level = ACPI_EDGE_SENSITIVE;
-                output_struct->data.irq.active_high_low = ACPI_ACTIVE_HIGH;
-                output_struct->data.irq.shared_exclusive = ACPI_EXCLUSIVE;
-        }
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
+         AML_OFFSET(irq.flags),
+         4}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_irq_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_set_irq
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_irq_stream(struct acpi_resource *linked_list,
-                   u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        u8 index;
-        u8 IRqinfo_byte_needed;
-
-        ACPI_FUNCTION_TRACE("rs_irq_stream");
-
-        /*
-         * The descriptor field is set based upon whether a third byte is
-         * needed to contain the IRQ Information.
-         */
-        if (ACPI_EDGE_SENSITIVE == linked_list->data.irq.edge_level &&
-            ACPI_ACTIVE_HIGH == linked_list->data.irq.active_high_low &&
-            ACPI_EXCLUSIVE == linked_list->data.irq.shared_exclusive) {
-                *buffer = 0x22;
-                IRqinfo_byte_needed = FALSE;
-        } else {
-                *buffer = 0x23;
-                IRqinfo_byte_needed = TRUE;
-        }
-
-        buffer += 1;
-        temp16 = 0;
-
-        /* Loop through all of the interrupts and set the mask bits */
-
-        for (index = 0;
-             index < linked_list->data.irq.number_of_interrupts; index++) {
-                temp8 = (u8) linked_list->data.irq.interrupts[index];
-                temp16 |= 0x1 << temp8;
-        }
-
-        ACPI_MOVE_16_TO_16(buffer, &temp16);
-        buffer += 2;
-
-        /* Set the IRQ Info byte if needed. */
-
-        if (IRqinfo_byte_needed) {
-                temp8 = 0;
-                temp8 = (u8) ((linked_list->data.irq.shared_exclusive &
-                               0x01) << 4);
-
-                if (ACPI_LEVEL_SENSITIVE == linked_list->data.irq.edge_level &&
-                    ACPI_ACTIVE_LOW == linked_list->data.irq.active_high_low) {
-                        temp8 |= 0x08;
-                } else {
-                        temp8 |= 0x01;
-                }
-
-                *buffer = temp8;
-                buffer += 1;
-        }
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_extended_irq_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_extended_irq_resource(u8 * byte_stream_buffer,
-                              acpi_size * bytes_consumed,
-                              u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        u8 *temp_ptr;
-        u8 index;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_ext_irq);
-
-        ACPI_FUNCTION_TRACE("rs_extended_irq_resource");
-
-        /* Get the Descriptor Length field */
-
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-
-        /* Validate minimum descriptor length */
-
-        if (temp16 < 6) {
-                return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
-        }
-
-        *bytes_consumed = temp16 + 3;
-        output_struct->id = ACPI_RSTYPE_EXT_IRQ;
-
-        /* Point to the Byte3 */
-
-        buffer += 2;
-        temp8 = *buffer;
-
-        output_struct->data.extended_irq.producer_consumer = temp8 & 0x01;
+struct acpi_rsconvert_info acpi_rs_set_irq[9] = {
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_IRQ,
+         sizeof(struct aml_resource_irq),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_set_irq)},
 
-        /*
-         * Check for Interrupt Mode
-         *
-         * The definition of an Extended IRQ changed between ACPI spec v1.0b
-         * and ACPI spec 2.0 (section 6.4.3.6 in both).
-         *
-         * - Edge/Level are defined opposite in the table vs the headers
-         */
-        output_struct->data.extended_irq.edge_level =
-            (temp8 & 0x2) ? ACPI_EDGE_SENSITIVE : ACPI_LEVEL_SENSITIVE;
-
-        /* Check Interrupt Polarity */
-
-        output_struct->data.extended_irq.active_high_low = (temp8 >> 2) & 0x1;
-
-        /* Check for sharable */
-
-        output_struct->data.extended_irq.shared_exclusive = (temp8 >> 3) & 0x01;
+        /* Convert interrupt list to 16-bit IRQ bitmask */
 
-        /* Point to Byte4 (IRQ Table length) */
+        {ACPI_RSC_BITMASK16, ACPI_RS_OFFSET(data.irq.interrupts[0]),
+         AML_OFFSET(irq.irq_mask),
+         ACPI_RS_OFFSET(data.irq.interrupt_count)},
 
-        buffer += 1;
-        temp8 = *buffer;
+        /* Set the flags byte by default */
 
-        /* Must have at least one IRQ */
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering),
+         AML_OFFSET(irq.flags),
+         0},
 
-        if (temp8 < 1) {
-                return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
-        }
-
-        output_struct->data.extended_irq.number_of_interrupts = temp8;
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.polarity),
+         AML_OFFSET(irq.flags),
+         3},
 
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
+         AML_OFFSET(irq.flags),
+         4},
         /*
-         * Add any additional structure size to properly calculate
-         * the next pointer at the end of this function
+         * Check if the flags byte is necessary. Not needed if the flags are:
+         * ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_HIGH, ACPI_EXCLUSIVE
          */
-        struct_size += (temp8 - 1) * 4;
-
-        /* Point to Byte5 (First IRQ Number) */
-
-        buffer += 1;
-
-        /* Cycle through every IRQ in the table */
-
-        for (index = 0; index < temp8; index++) {
-                ACPI_MOVE_32_TO_32(&output_struct->data.extended_irq.
-                                   interrupts[index], buffer);
-
-                /* Point to the next IRQ */
-
-                buffer += 4;
-        }
-
-        /*
-         * This will leave us pointing to the Resource Source Index
-         * If it is present, then save it off and calculate the
-         * pointer to where the null terminated string goes:
-         * Each Interrupt takes 32-bits + the 5 bytes of the
-         * stream that are default.
-         *
-         * Note: Some resource descriptors will have an additional null, so
-         * we add 1 to the length.
-         */
-        if (*bytes_consumed >
-            ((acpi_size) output_struct->data.extended_irq.number_of_interrupts *
-             4) + (5 + 1)) {
-                /* Dereference the Index */
-
-                temp8 = *buffer;
-                output_struct->data.extended_irq.resource_source.index =
-                    (u32) temp8;
-
-                /* Point to the String */
-
-                buffer += 1;
-
-                /* Point the String pointer to the end of this structure. */
-
-                output_struct->data.extended_irq.resource_source.string_ptr =
-                    (char *)((char *)output_struct + struct_size);
+        {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.irq.triggering),
+         ACPI_EDGE_SENSITIVE},
 
-                temp_ptr = (u8 *)
-                    output_struct->data.extended_irq.resource_source.string_ptr;
+        {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.irq.polarity),
+         ACPI_ACTIVE_HIGH},
 
-                /* Copy the string into the buffer */
+        {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE,
+         ACPI_RS_OFFSET(data.irq.sharable),
+         ACPI_EXCLUSIVE},
 
-                index = 0;
-                while (*buffer) {
-                        *temp_ptr = *buffer;
+        /* irq_no_flags() descriptor can be used */
 
-                        temp_ptr += 1;
-                        buffer += 1;
-                        index += 1;
-                }
-
-                /* Add the terminating null */
-
-                *temp_ptr = 0;
-                output_struct->data.extended_irq.resource_source.string_length =
-                    index + 1;
-
-                /*
-                 * In order for the struct_size to fall on a 32-bit boundary,
-                 * calculate the length of the string and expand the
-                 * struct_size to the next 32-bit boundary.
-                 */
-                temp8 = (u8) (index + 1);
-                struct_size += ACPI_ROUND_UP_to_32_bITS(temp8);
-        } else {
-                output_struct->data.extended_irq.resource_source.index = 0;
-                output_struct->data.extended_irq.resource_source.string_length =
-                    0;
-                output_struct->data.extended_irq.resource_source.string_ptr =
-                    NULL;
-        }
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_LENGTH, 0, 0, sizeof(struct aml_resource_irq_noflags)}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_extended_irq_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_convert_ext_irq
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_extended_irq_stream(struct acpi_resource *linked_list,
-                            u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 *length_field;
-        u8 temp8 = 0;
-        u8 index;
+struct acpi_rsconvert_info acpi_rs_convert_ext_irq[9] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_EXTENDED_IRQ,
+         ACPI_RS_SIZE(struct acpi_resource_extended_irq),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_ext_irq)},
 
-        ACPI_FUNCTION_TRACE("rs_extended_irq_stream");
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_EXTENDED_IRQ,
+         sizeof(struct aml_resource_extended_irq),
+         0},
 
-        /* Set the Descriptor Type field */
+        /* Flag bits */
 
-        *buffer = ACPI_RDESC_TYPE_EXTENDED_XRUPT;
-        buffer += 1;
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.producer_consumer),
+         AML_OFFSET(extended_irq.flags),
+         0},
 
-        /* Save a pointer to the Length field - to be filled in later */
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.triggering),
+         AML_OFFSET(extended_irq.flags),
+         1},
 
-        length_field = ACPI_CAST_PTR(u16, buffer);
-        buffer += 2;
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.polarity),
+         AML_OFFSET(extended_irq.flags),
+         2},
 
-        /* Set the Interrupt vector flags */
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.sharable),
+         AML_OFFSET(extended_irq.flags),
+         3},
 
-        temp8 = (u8) (linked_list->data.extended_irq.producer_consumer & 0x01);
-        temp8 |=
-            ((linked_list->data.extended_irq.shared_exclusive & 0x01) << 3);
+        /* IRQ Table length (Byte4) */
 
-        /*
-         * Set the Interrupt Mode
-         *
-         * The definition of an Extended IRQ changed between ACPI spec v1.0b
-         * and ACPI spec 2.0 (section 6.4.3.6 in both).  This code does not
-         * implement the more restrictive definition of 1.0b
-         *
-         * - Edge/Level are defined opposite in the table vs the headers
-         */
-        if (ACPI_EDGE_SENSITIVE == linked_list->data.extended_irq.edge_level) {
-                temp8 |= 0x2;
-        }
-
-        /* Set the Interrupt Polarity */
+        {ACPI_RSC_COUNT, ACPI_RS_OFFSET(data.extended_irq.interrupt_count),
+         AML_OFFSET(extended_irq.interrupt_count),
+         sizeof(u32)}
+        ,
 
-        temp8 |= ((linked_list->data.extended_irq.active_high_low & 0x1) << 2);
+        /* Copy every IRQ in the table, each is 32 bits */
 
-        *buffer = temp8;
-        buffer += 1;
+        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.extended_irq.interrupts[0]),
+         AML_OFFSET(extended_irq.interrupts[0]),
+         0}
+        ,
 
-        /* Set the Interrupt table length */
+        /* Optional resource_source (Index and String) */
 
-        temp8 = (u8) linked_list->data.extended_irq.number_of_interrupts;
+        {ACPI_RSC_SOURCEX, ACPI_RS_OFFSET(data.extended_irq.resource_source),
+         ACPI_RS_OFFSET(data.extended_irq.interrupts[0]),
+         sizeof(struct aml_resource_extended_irq)}
+};
 
-        *buffer = temp8;
-        buffer += 1;
-
-        for (index = 0;
-             index < linked_list->data.extended_irq.number_of_interrupts;
-             index++) {
-                ACPI_MOVE_32_TO_32(buffer,
-                                   &linked_list->data.extended_irq.
-                                   interrupts[index]);
-                buffer += 4;
-        }
+/*******************************************************************************
+ *
+ * acpi_rs_convert_dma
+ *
+ ******************************************************************************/
 
-        /* Resource Source Index and Resource Source are optional */
+struct acpi_rsconvert_info acpi_rs_convert_dma[6] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_DMA,
+         ACPI_RS_SIZE(struct acpi_resource_dma),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_dma)},
 
-        if (0 != linked_list->data.extended_irq.resource_source.string_length) {
-                *buffer =
-                    (u8) linked_list->data.extended_irq.resource_source.index;
-                buffer += 1;
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_DMA,
+         sizeof(struct aml_resource_dma),
+         0},
 
-                /* Copy the string */
+        /* Flags: transfer preference, bus mastering, channel speed */
 
-                ACPI_STRCPY((char *)buffer,
-                            linked_list->data.extended_irq.resource_source.
-                            string_ptr);
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.dma.transfer),
+         AML_OFFSET(dma.flags),
+         0},
 
-                /*
-                 * Buffer needs to be set to the length of the string + one for the
-                 * terminating null
-                 */
-                buffer +=
-                    (acpi_size) (ACPI_STRLEN
-                                 (linked_list->data.extended_irq.
-                                  resource_source.string_ptr) + 1);
-        }
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.dma.bus_master),
+         AML_OFFSET(dma.flags),
+         2},
 
-        /* Return the number of bytes consumed in this operation */
+        {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.dma.type),
+         AML_OFFSET(dma.flags),
+         5},
 
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
+        /* DMA channel mask bits */
 
-        /*
-         * Set the length field to the number of bytes consumed
-         * minus the header size (3 bytes)
-         */
-        *length_field = (u16) (*bytes_consumed - 3);
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_BITMASK, ACPI_RS_OFFSET(data.dma.channels[0]),
+         AML_OFFSET(dma.dma_channel_mask),
+         ACPI_RS_OFFSET(data.dma.channel_count)}
+};
diff --git a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c
index 103eb31c284e..1434e786477e 100644
--- a/drivers/acpi/resources/rslist.c
+++ b/drivers/acpi/resources/rslist.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,52 +49,12 @@ ACPI_MODULE_NAME("rslist")
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_get_resource_type
+ * FUNCTION:    acpi_rs_convert_aml_to_resources
  *
- * PARAMETERS:  resource_start_byte     - Byte 0 of a resource descriptor
- *
- * RETURN:      The Resource Type with no extraneous bits
- *
- * DESCRIPTION: Extract the Resource Type/Name from the first byte of
- *              a resource descriptor.
- *
- ******************************************************************************/
-u8 acpi_rs_get_resource_type(u8 resource_start_byte)
-{
-
-        ACPI_FUNCTION_ENTRY();
-
-        /* Determine if this is a small or large resource */
-
-        switch (resource_start_byte & ACPI_RDESC_TYPE_MASK) {
-        case ACPI_RDESC_TYPE_SMALL:
-
-                /* Small Resource Type -- Only bits 6:3 are valid */
-
-                return ((u8) (resource_start_byte & ACPI_RDESC_SMALL_MASK));
-
-        case ACPI_RDESC_TYPE_LARGE:
-
-                /* Large Resource Type -- All bits are valid */
-
-                return (resource_start_byte);
-
-        default:
-                /* Invalid type */
-                break;
-        }
-
-        return (0xFF);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_byte_stream_to_list
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource byte stream
- *              byte_stream_buffer_length - Length of byte_stream_buffer
- *              output_buffer           - Pointer to the buffer that will
- *                                        contain the output structures
+ * PARAMETERS:  Aml                 - Pointer to the resource byte stream
+ *              aml_length          - Length of Aml
+ *              output_buffer       - Pointer to the buffer that will
+ *                                    contain the output structures
  *
  * RETURN:      Status
  *
@@ -102,241 +62,78 @@ u8 acpi_rs_get_resource_type(u8 resource_start_byte)
  *              linked list of resources in the caller's output buffer
  *
  ******************************************************************************/
-
 acpi_status
-acpi_rs_byte_stream_to_list(u8 * byte_stream_buffer,
-                            u32 byte_stream_buffer_length, u8 * output_buffer)
+acpi_rs_convert_aml_to_resources(u8 * aml, u32 aml_length, u8 * output_buffer)
 {
+        struct acpi_resource *resource = (void *)output_buffer;
         acpi_status status;
-        acpi_size bytes_parsed = 0;
-        u8 resource_type = 0;
-        acpi_size bytes_consumed = 0;
-        u8 *buffer = output_buffer;
-        acpi_size structure_size = 0;
-        u8 end_tag_processed = FALSE;
-        struct acpi_resource *resource;
-
-        ACPI_FUNCTION_TRACE("rs_byte_stream_to_list");
-
-        while (bytes_parsed < byte_stream_buffer_length && !end_tag_processed) {
-                /* The next byte in the stream is the resource type */
-
-                resource_type = acpi_rs_get_resource_type(*byte_stream_buffer);
-
-                switch (resource_type) {
-                case ACPI_RDESC_TYPE_MEMORY_24:
-                        /*
-                         * 24-Bit Memory Resource
-                         */
-                        status = acpi_rs_memory24_resource(byte_stream_buffer,
-                                                           &bytes_consumed,
-                                                           &buffer,
-                                                           &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_LARGE_VENDOR:
-                        /*
-                         * Vendor Defined Resource
-                         */
-                        status = acpi_rs_vendor_resource(byte_stream_buffer,
-                                                         &bytes_consumed,
-                                                         &buffer,
-                                                         &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_MEMORY_32:
-                        /*
-                         * 32-Bit Memory Range Resource
-                         */
-                        status =
-                            acpi_rs_memory32_range_resource(byte_stream_buffer,
-                                                            &bytes_consumed,
-                                                            &buffer,
-                                                            &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_FIXED_MEMORY_32:
-                        /*
-                         * 32-Bit Fixed Memory Resource
-                         */
-                        status =
-                            acpi_rs_fixed_memory32_resource(byte_stream_buffer,
-                                                            &bytes_consumed,
-                                                            &buffer,
-                                                            &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE:
-                case ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE:
-                        /*
-                         * 64-Bit Address Resource
-                         */
-                        status = acpi_rs_address64_resource(byte_stream_buffer,
-                                                            &bytes_consumed,
-                                                            &buffer,
-                                                            &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE:
-                        /*
-                         * 32-Bit Address Resource
-                         */
-                        status = acpi_rs_address32_resource(byte_stream_buffer,
-                                                            &bytes_consumed,
-                                                            &buffer,
-                                                            &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE:
-                        /*
-                         * 16-Bit Address Resource
-                         */
-                        status = acpi_rs_address16_resource(byte_stream_buffer,
-                                                            &bytes_consumed,
-                                                            &buffer,
-                                                            &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_EXTENDED_XRUPT:
-                        /*
-                         * Extended IRQ
-                         */
-                        status =
-                            acpi_rs_extended_irq_resource(byte_stream_buffer,
-                                                          &bytes_consumed,
-                                                          &buffer,
-                                                          &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_IRQ_FORMAT:
-                        /*
-                         * IRQ Resource
-                         */
-                        status = acpi_rs_irq_resource(byte_stream_buffer,
-                                                      &bytes_consumed, &buffer,
-                                                      &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_DMA_FORMAT:
-                        /*
-                         * DMA Resource
-                         */
-                        status = acpi_rs_dma_resource(byte_stream_buffer,
-                                                      &bytes_consumed, &buffer,
-                                                      &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_START_DEPENDENT:
-                        /*
-                         * Start Dependent Functions Resource
-                         */
-                        status =
-                            acpi_rs_start_depend_fns_resource
-                            (byte_stream_buffer, &bytes_consumed, &buffer,
-                             &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_END_DEPENDENT:
-                        /*
-                         * End Dependent Functions Resource
-                         */
-                        status =
-                            acpi_rs_end_depend_fns_resource(byte_stream_buffer,
-                                                            &bytes_consumed,
-                                                            &buffer,
-                                                            &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_IO_PORT:
-                        /*
-                         * IO Port Resource
-                         */
-                        status = acpi_rs_io_resource(byte_stream_buffer,
-                                                     &bytes_consumed, &buffer,
-                                                     &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_FIXED_IO_PORT:
-                        /*
-                         * Fixed IO Port Resource
-                         */
-                        status = acpi_rs_fixed_io_resource(byte_stream_buffer,
-                                                           &bytes_consumed,
-                                                           &buffer,
-                                                           &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_SMALL_VENDOR:
-                        /*
-                         * Vendor Specific Resource
-                         */
-                        status = acpi_rs_vendor_resource(byte_stream_buffer,
-                                                         &bytes_consumed,
-                                                         &buffer,
-                                                         &structure_size);
-                        break;
-
-                case ACPI_RDESC_TYPE_END_TAG:
-                        /*
-                         * End Tag
-                         */
-                        end_tag_processed = TRUE;
-                        status = acpi_rs_end_tag_resource(byte_stream_buffer,
-                                                          &bytes_consumed,
-                                                          &buffer,
-                                                          &structure_size);
-                        break;
-
-                default:
-                        /*
-                         * Invalid/Unknown resource type
-                         */
-                        status = AE_AML_INVALID_RESOURCE_TYPE;
-                        break;
-                }
+        u8 resource_index;
+        u8 *end_aml;
+
+        ACPI_FUNCTION_TRACE("rs_convert_aml_to_resources");
 
+        end_aml = aml + aml_length;
+
+        /* Loop until end-of-buffer or an end_tag is found */
+
+        while (aml < end_aml) {
+                /* Validate the Resource Type and Resource Length */
+
+                status = acpi_ut_validate_resource(aml, &resource_index);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }
 
-                /* Update the return value and counter */
+                /* Convert the AML byte stream resource to a local resource struct */
 
-                bytes_parsed += bytes_consumed;
+                status =
+                    acpi_rs_convert_aml_to_resource(resource,
+                                                    ACPI_CAST_PTR(union
+                                                                  aml_resource,
+                                                                  aml),
+                                                    acpi_gbl_get_resource_dispatch
+                                                    [resource_index]);
+                if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not convert AML resource (Type %X)",
+                                        *aml));
+                        return_ACPI_STATUS(status);
+                }
 
-                /* Set the byte stream to point to the next resource */
+                /* Normal exit on completion of an end_tag resource descriptor */
 
-                byte_stream_buffer += bytes_consumed;
+                if (acpi_ut_get_resource_type(aml) ==
+                    ACPI_RESOURCE_NAME_END_TAG) {
+                        return_ACPI_STATUS(AE_OK);
+                }
 
-                /* Set the Buffer to the next structure */
+                /* Point to the next input AML resource */
 
-                resource = ACPI_CAST_PTR(struct acpi_resource, buffer);
-                resource->length =
-                    (u32) ACPI_ALIGN_RESOURCE_SIZE(resource->length);
-                buffer += ACPI_ALIGN_RESOURCE_SIZE(structure_size);
-        }
+                aml += acpi_ut_get_descriptor_length(aml);
 
-        /* Check the reason for exiting the while loop */
+                /* Point to the next structure in the output buffer */
 
-        if (!end_tag_processed) {
-                return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
+                resource =
+                    ACPI_ADD_PTR(struct acpi_resource, resource,
+                                 resource->length);
         }
 
-        return_ACPI_STATUS(AE_OK);
+        /* Did not find an end_tag resource descriptor */
+
+        return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_list_to_byte_stream
+ * FUNCTION:    acpi_rs_convert_resources_to_aml
  *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              byte_steam_size_needed  - Calculated size of the byte stream
- *                                        needed from calling
- *                                        acpi_rs_get_byte_stream_length()
- *                                        The size of the output_buffer is
- *                                        guaranteed to be >=
- *                                        byte_stream_size_needed
- *              output_buffer           - Pointer to the buffer that will
- *                                        contain the byte stream
+ * PARAMETERS:  Resource            - Pointer to the resource linked list
+ *              aml_size_needed     - Calculated size of the byte stream
+ *                                    needed from calling acpi_rs_get_aml_length()
+ *                                    The size of the output_buffer is
+ *                                    guaranteed to be >= aml_size_needed
+ *              output_buffer       - Pointer to the buffer that will
+ *                                    contain the byte stream
  *
  * RETURN:      Status
  *
@@ -346,180 +143,73 @@ acpi_rs_byte_stream_to_list(u8 * byte_stream_buffer,
  ******************************************************************************/
 
 acpi_status
-acpi_rs_list_to_byte_stream(struct acpi_resource *linked_list,
-                            acpi_size byte_stream_size_needed,
-                            u8 * output_buffer)
+acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
+                                 acpi_size aml_size_needed, u8 * output_buffer)
 {
+        u8 *aml = output_buffer;
+        u8 *end_aml = output_buffer + aml_size_needed;
         acpi_status status;
-        u8 *buffer = output_buffer;
-        acpi_size bytes_consumed = 0;
-        u8 done = FALSE;
-
-        ACPI_FUNCTION_TRACE("rs_list_to_byte_stream");
-
-        while (!done) {
-                switch (linked_list->id) {
-                case ACPI_RSTYPE_IRQ:
-                        /*
-                         * IRQ Resource
-                         */
-                        status =
-                            acpi_rs_irq_stream(linked_list, &buffer,
-                                               &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_DMA:
-                        /*
-                         * DMA Resource
-                         */
-                        status =
-                            acpi_rs_dma_stream(linked_list, &buffer,
-                                               &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_START_DPF:
-                        /*
-                         * Start Dependent Functions Resource
-                         */
-                        status = acpi_rs_start_depend_fns_stream(linked_list,
-                                                                 &buffer,
-                                                                 &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_END_DPF:
-                        /*
-                         * End Dependent Functions Resource
-                         */
-                        status = acpi_rs_end_depend_fns_stream(linked_list,
-                                                               &buffer,
-                                                               &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_IO:
-                        /*
-                         * IO Port Resource
-                         */
-                        status =
-                            acpi_rs_io_stream(linked_list, &buffer,
-                                              &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_FIXED_IO:
-                        /*
-                         * Fixed IO Port Resource
-                         */
-                        status =
-                            acpi_rs_fixed_io_stream(linked_list, &buffer,
-                                                    &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_VENDOR:
-                        /*
-                         * Vendor Defined Resource
-                         */
-                        status =
-                            acpi_rs_vendor_stream(linked_list, &buffer,
-                                                  &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_END_TAG:
-                        /*
-                         * End Tag
-                         */
-                        status =
-                            acpi_rs_end_tag_stream(linked_list, &buffer,
-                                                   &bytes_consumed);
-
-                        /* An End Tag indicates the end of the Resource Template */
-
-                        done = TRUE;
-                        break;
-
-                case ACPI_RSTYPE_MEM24:
-                        /*
-                         * 24-Bit Memory Resource
-                         */
-                        status =
-                            acpi_rs_memory24_stream(linked_list, &buffer,
-                                                    &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_MEM32:
-                        /*
-                         * 32-Bit Memory Range Resource
-                         */
-                        status =
-                            acpi_rs_memory32_range_stream(linked_list, &buffer,
-                                                          &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_FIXED_MEM32:
-                        /*
-                         * 32-Bit Fixed Memory Resource
-                         */
-                        status =
-                            acpi_rs_fixed_memory32_stream(linked_list, &buffer,
-                                                          &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_ADDRESS16:
-                        /*
-                         * 16-Bit Address Descriptor Resource
-                         */
-                        status = acpi_rs_address16_stream(linked_list, &buffer,
-                                                          &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_ADDRESS32:
-                        /*
-                         * 32-Bit Address Descriptor Resource
-                         */
-                        status = acpi_rs_address32_stream(linked_list, &buffer,
-                                                          &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_ADDRESS64:
-                        /*
-                         * 64-Bit Address Descriptor Resource
-                         */
-                        status = acpi_rs_address64_stream(linked_list, &buffer,
-                                                          &bytes_consumed);
-                        break;
-
-                case ACPI_RSTYPE_EXT_IRQ:
-                        /*
-                         * Extended IRQ Resource
-                         */
-                        status =
-                            acpi_rs_extended_irq_stream(linked_list, &buffer,
-                                                        &bytes_consumed);
-                        break;
-
-                default:
-                        /*
-                         * If we get here, everything is out of sync,
-                         * so exit with an error
-                         */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Invalid descriptor type (%X) in resource list\n",
-                                          linked_list->id));
-                        status = AE_BAD_DATA;
-                        break;
+
+        ACPI_FUNCTION_TRACE("rs_convert_resources_to_aml");
+
+        /* Walk the resource descriptor list, convert each descriptor */
+
+        while (aml < end_aml) {
+                /* Validate the (internal) Resource Type */
+
+                if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid descriptor type (%X) in resource list",
+                                    resource->type));
+                        return_ACPI_STATUS(AE_BAD_DATA);
                 }
 
+                /* Perform the conversion */
+
+                status = acpi_rs_convert_resource_to_aml(resource,
+                                                         ACPI_CAST_PTR(union
+                                                                       aml_resource,
+                                                                       aml),
+                                                         acpi_gbl_set_resource_dispatch
+                                                         [resource->type]);
                 if (ACPI_FAILURE(status)) {
+                        ACPI_EXCEPTION((AE_INFO, status,
+                                        "Could not convert resource (type %X) to AML",
+                                        resource->type));
                         return_ACPI_STATUS(status);
                 }
 
-                /* Set the Buffer to point to the open byte */
+                /* Perform final sanity check on the new AML resource descriptor */
+
+                status =
+                    acpi_ut_validate_resource(ACPI_CAST_PTR
+                                              (union aml_resource, aml), NULL);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
 
-                buffer += bytes_consumed;
+                /* Check for end-of-list, normal exit */
 
-                /* Point to the next object */
+                if (resource->type == ACPI_RESOURCE_TYPE_END_TAG) {
+                        /* An End Tag indicates the end of the input Resource Template */
 
-                linked_list = ACPI_PTR_ADD(struct acpi_resource,
-                                           linked_list, linked_list->length);
+                        return_ACPI_STATUS(AE_OK);
+                }
+
+                /*
+                 * Extract the total length of the new descriptor and set the
+                 * Aml to point to the next (output) resource descriptor
+                 */
+                aml += acpi_ut_get_descriptor_length(aml);
+
+                /* Point to the next input resource descriptor */
+
+                resource =
+                    ACPI_ADD_PTR(struct acpi_resource, resource,
+                                 resource->length);
         }
 
-        return_ACPI_STATUS(AE_OK);
+        /* Completed buffer, but did not find an end_tag resource descriptor */
+
+        return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
 }
diff --git a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/resources/rsmemory.c
index daba1a1ed46d..a5131936d690 100644
--- a/drivers/acpi/resources/rsmemory.c
+++ b/drivers/acpi/resources/rsmemory.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,454 +49,187 @@ ACPI_MODULE_NAME("rsmemory")
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_memory24_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_convert_memory24
  *
  ******************************************************************************/
-acpi_status
-acpi_rs_memory24_resource(u8 * byte_stream_buffer,
-                          acpi_size * bytes_consumed,
-                          u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem24);
-
-        ACPI_FUNCTION_TRACE("rs_memory24_resource");
-
-        /* Point past the Descriptor to get the number of bytes consumed */
-
-        buffer += 1;
-
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-        buffer += 2;
-        *bytes_consumed = (acpi_size) temp16 + 3;
-        output_struct->id = ACPI_RSTYPE_MEM24;
-
-        /* Check Byte 3 the Read/Write bit */
-
-        temp8 = *buffer;
-        buffer += 1;
-        output_struct->data.memory24.read_write_attribute = temp8 & 0x01;
-
-        /* Get min_base_address (Bytes 4-5) */
-
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-        buffer += 2;
-        output_struct->data.memory24.min_base_address = temp16;
-
-        /* Get max_base_address (Bytes 6-7) */
-
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-        buffer += 2;
-        output_struct->data.memory24.max_base_address = temp16;
+struct acpi_rsconvert_info acpi_rs_convert_memory24[4] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_MEMORY24,
+         ACPI_RS_SIZE(struct acpi_resource_memory24),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_memory24)},
 
-        /* Get Alignment (Bytes 8-9) */
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_MEMORY24,
+         sizeof(struct aml_resource_memory24),
+         0},
 
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-        buffer += 2;
-        output_struct->data.memory24.alignment = temp16;
+        /* Read/Write bit */
 
-        /* Get range_length (Bytes 10-11) */
-
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-        output_struct->data.memory24.range_length = temp16;
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.memory24.write_protect),
+         AML_OFFSET(memory24.flags),
+         0},
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Minimum Base Address
+         * Maximum Base Address
+         * Address Base Alignment
+         * Range Length
+         */
+        {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.memory24.minimum),
+         AML_OFFSET(memory24.minimum),
+         4}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_memory24_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_convert_memory32
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_memory24_stream(struct acpi_resource *linked_list,
-                        u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-
-        ACPI_FUNCTION_TRACE("rs_memory24_stream");
-
-        /* The descriptor field is static */
-
-        *buffer = 0x81;
-        buffer += 1;
+struct acpi_rsconvert_info acpi_rs_convert_memory32[4] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_MEMORY32,
+         ACPI_RS_SIZE(struct acpi_resource_memory32),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_memory32)},
 
-        /* The length field is static */
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_MEMORY32,
+         sizeof(struct aml_resource_memory32),
+         0},
 
-        temp16 = 0x09;
-        ACPI_MOVE_16_TO_16(buffer, &temp16);
-        buffer += 2;
+        /* Read/Write bit */
 
-        /* Set the Information Byte */
-
-        temp8 = (u8) (linked_list->data.memory24.read_write_attribute & 0x01);
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Set the Range minimum base address */
-
-        ACPI_MOVE_32_TO_16(buffer,
-                           &linked_list->data.memory24.min_base_address);
-        buffer += 2;
-
-        /* Set the Range maximum base address */
-
-        ACPI_MOVE_32_TO_16(buffer,
-                           &linked_list->data.memory24.max_base_address);
-        buffer += 2;
-
-        /* Set the base alignment */
-
-        ACPI_MOVE_32_TO_16(buffer, &linked_list->data.memory24.alignment);
-        buffer += 2;
-
-        /* Set the range length */
-
-        ACPI_MOVE_32_TO_16(buffer, &linked_list->data.memory24.range_length);
-        buffer += 2;
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.memory32.write_protect),
+         AML_OFFSET(memory32.flags),
+         0},
+        /*
+         * These fields are contiguous in both the source and destination:
+         * Minimum Base Address
+         * Maximum Base Address
+         * Address Base Alignment
+         * Range Length
+         */
+        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.memory32.minimum),
+         AML_OFFSET(memory32.minimum),
+         4}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_memory32_range_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_convert_fixed_memory32
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_memory32_range_resource(u8 * byte_stream_buffer,
-                                acpi_size * bytes_consumed,
-                                u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem32);
-
-        ACPI_FUNCTION_TRACE("rs_memory32_range_resource");
-
-        /* Point past the Descriptor to get the number of bytes consumed */
-
-        buffer += 1;
+struct acpi_rsconvert_info acpi_rs_convert_fixed_memory32[4] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_FIXED_MEMORY32,
+         ACPI_RS_SIZE(struct acpi_resource_fixed_memory32),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_convert_fixed_memory32)},
 
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
-        buffer += 2;
-        *bytes_consumed = (acpi_size) temp16 + 3;
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_FIXED_MEMORY32,
+         sizeof(struct aml_resource_fixed_memory32),
+         0},
 
-        output_struct->id = ACPI_RSTYPE_MEM32;
+        /* Read/Write bit */
 
+        {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.fixed_memory32.write_protect),
+         AML_OFFSET(fixed_memory32.flags),
+         0},
         /*
-         *  Point to the place in the output buffer where the data portion will
-         *  begin.
-         *  1. Set the RESOURCE_DATA * Data to point to its own address, then
-         *  2. Set the pointer to the next address.
-         *
-         *  NOTE: output_struct->Data is cast to u8, otherwise, this addition adds
-         *  4 * sizeof(RESOURCE_DATA) instead of 4 * sizeof(u8)
+         * These fields are contiguous in both the source and destination:
+         * Base Address
+         * Range Length
          */
-
-        /* Check Byte 3 the Read/Write bit */
-
-        temp8 = *buffer;
-        buffer += 1;
-
-        output_struct->data.memory32.read_write_attribute = temp8 & 0x01;
-
-        /* Get min_base_address (Bytes 4-7) */
-
-        ACPI_MOVE_32_TO_32(&output_struct->data.memory32.min_base_address,
-                           buffer);
-        buffer += 4;
-
-        /* Get max_base_address (Bytes 8-11) */
-
-        ACPI_MOVE_32_TO_32(&output_struct->data.memory32.max_base_address,
-                           buffer);
-        buffer += 4;
-
-        /* Get Alignment (Bytes 12-15) */
-
-        ACPI_MOVE_32_TO_32(&output_struct->data.memory32.alignment, buffer);
-        buffer += 4;
-
-        /* Get range_length (Bytes 16-19) */
-
-        ACPI_MOVE_32_TO_32(&output_struct->data.memory32.range_length, buffer);
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.fixed_memory32.address),
+         AML_OFFSET(fixed_memory32.address),
+         2}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_fixed_memory32_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * acpi_rs_get_vendor_small
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_fixed_memory32_resource(u8 * byte_stream_buffer,
-                                acpi_size * bytes_consumed,
-                                u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_mem32);
-
-        ACPI_FUNCTION_TRACE("rs_fixed_memory32_resource");
+struct acpi_rsconvert_info acpi_rs_get_vendor_small[3] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_VENDOR,
+         ACPI_RS_SIZE(struct acpi_resource_vendor),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_get_vendor_small)},
 
-        /* Point past the Descriptor to get the number of bytes consumed */
+        /* Length of the vendor data (byte count) */
 
-        buffer += 1;
-        ACPI_MOVE_16_TO_16(&temp16, buffer);
+        {ACPI_RSC_COUNT16, ACPI_RS_OFFSET(data.vendor.byte_length),
+         0,
+         sizeof(u8)}
+        ,
 
-        buffer += 2;
-        *bytes_consumed = (acpi_size) temp16 + 3;
+        /* Vendor data */
 
-        output_struct->id = ACPI_RSTYPE_FIXED_MEM32;
-
-        /* Check Byte 3 the Read/Write bit */
-
-        temp8 = *buffer;
-        buffer += 1;
-        output_struct->data.fixed_memory32.read_write_attribute = temp8 & 0x01;
-
-        /* Get range_base_address (Bytes 4-7) */
-
-        ACPI_MOVE_32_TO_32(&output_struct->data.fixed_memory32.
-                           range_base_address, buffer);
-        buffer += 4;
-
-        /* Get range_length (Bytes 8-11) */
-
-        ACPI_MOVE_32_TO_32(&output_struct->data.fixed_memory32.range_length,
-                           buffer);
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.vendor.byte_data[0]),
+         sizeof(struct aml_resource_small_header),
+         0}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_memory32_range_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_get_vendor_large
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_memory32_range_stream(struct acpi_resource *linked_list,
-                              u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-
-        ACPI_FUNCTION_TRACE("rs_memory32_range_stream");
-
-        /* The descriptor field is static */
-
-        *buffer = 0x85;
-        buffer += 1;
-
-        /* The length field is static */
-
-        temp16 = 0x11;
-
-        ACPI_MOVE_16_TO_16(buffer, &temp16);
-        buffer += 2;
-
-        /* Set the Information Byte */
-
-        temp8 = (u8) (linked_list->data.memory32.read_write_attribute & 0x01);
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Set the Range minimum base address */
-
-        ACPI_MOVE_32_TO_32(buffer,
-                           &linked_list->data.memory32.min_base_address);
-        buffer += 4;
-
-        /* Set the Range maximum base address */
-
-        ACPI_MOVE_32_TO_32(buffer,
-                           &linked_list->data.memory32.max_base_address);
-        buffer += 4;
+struct acpi_rsconvert_info acpi_rs_get_vendor_large[3] = {
+        {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_VENDOR,
+         ACPI_RS_SIZE(struct acpi_resource_vendor),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_get_vendor_large)},
 
-        /* Set the base alignment */
+        /* Length of the vendor data (byte count) */
 
-        ACPI_MOVE_32_TO_32(buffer, &linked_list->data.memory32.alignment);
-        buffer += 4;
+        {ACPI_RSC_COUNT16, ACPI_RS_OFFSET(data.vendor.byte_length),
+         0,
+         sizeof(u8)}
+        ,
 
-        /* Set the range length */
+        /* Vendor data */
 
-        ACPI_MOVE_32_TO_32(buffer, &linked_list->data.memory32.range_length);
-        buffer += 4;
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.vendor.byte_data[0]),
+         sizeof(struct aml_resource_large_header),
+         0}
+};
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_fixed_memory32_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
+ * acpi_rs_set_vendor
  *
  ******************************************************************************/
 
-acpi_status
-acpi_rs_fixed_memory32_stream(struct acpi_resource *linked_list,
-                              u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-
-        ACPI_FUNCTION_TRACE("rs_fixed_memory32_stream");
+struct acpi_rsconvert_info acpi_rs_set_vendor[7] = {
+        /* Default is a small vendor descriptor */
 
-        /* The descriptor field is static */
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_VENDOR_SMALL,
+         sizeof(struct aml_resource_small_header),
+         ACPI_RSC_TABLE_SIZE(acpi_rs_set_vendor)},
 
-        *buffer = 0x86;
-        buffer += 1;
+        /* Get the length and copy the data */
 
-        /* The length field is static */
+        {ACPI_RSC_COUNT16, ACPI_RS_OFFSET(data.vendor.byte_length),
+         0,
+         0},
 
-        temp16 = 0x09;
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.vendor.byte_data[0]),
+         sizeof(struct aml_resource_small_header),
+         0},
 
-        ACPI_MOVE_16_TO_16(buffer, &temp16);
-        buffer += 2;
-
-        /* Set the Information Byte */
-
-        temp8 =
-            (u8) (linked_list->data.fixed_memory32.read_write_attribute & 0x01);
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Set the Range base address */
-
-        ACPI_MOVE_32_TO_32(buffer,
-                           &linked_list->data.fixed_memory32.
-                           range_base_address);
-        buffer += 4;
+        /*
+         * All done if the Vendor byte length is 7 or less, meaning that it will
+         * fit within a small descriptor
+         */
+        {ACPI_RSC_EXIT_LE, 0, 0, 7},
 
-        /* Set the range length */
+        /* Must create a large vendor descriptor */
 
-        ACPI_MOVE_32_TO_32(buffer,
-                           &linked_list->data.fixed_memory32.range_length);
-        buffer += 4;
+        {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_VENDOR_LARGE,
+         sizeof(struct aml_resource_large_header),
+         0},
 
-        /* Return the number of bytes consumed in this operation */
+        {ACPI_RSC_COUNT16, ACPI_RS_OFFSET(data.vendor.byte_length),
+         0,
+         0},
 
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
+        {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.vendor.byte_data[0]),
+         sizeof(struct aml_resource_large_header),
+         0}
+};
diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 7a8a34e757f5..ed866cf1c6d2 100644
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,481 +47,501 @@
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsmisc")
 
+#define INIT_RESOURCE_TYPE(i)       i->resource_offset
+#define INIT_RESOURCE_LENGTH(i)     i->aml_offset
+#define INIT_TABLE_LENGTH(i)        i->value
+#define COMPARE_OPCODE(i)           i->resource_offset
+#define COMPARE_TARGET(i)           i->aml_offset
+#define COMPARE_VALUE(i)            i->value
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_end_tag_resource
+ * FUNCTION:    acpi_rs_convert_aml_to_resource
  *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
+ * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ *              Aml                 - Where the AML descriptor is returned
+ *              Info                - Pointer to appropriate conversion table
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * DESCRIPTION: Convert an external AML resource descriptor to the corresponding
+ *              internal resource descriptor
  *
  ******************************************************************************/
 acpi_status
-acpi_rs_end_tag_resource(u8 * byte_stream_buffer,
-                         acpi_size * bytes_consumed,
-                         u8 ** output_buffer, acpi_size * structure_size)
+acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
+                                union aml_resource *aml,
+                                struct acpi_rsconvert_info *info)
 {
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        acpi_size struct_size = ACPI_RESOURCE_LENGTH;
-
-        ACPI_FUNCTION_TRACE("rs_end_tag_resource");
-
-        /* The number of bytes consumed is static */
-
-        *bytes_consumed = 2;
-
-        /*  Fill out the structure */
-
-        output_struct->id = ACPI_RSTYPE_END_TAG;
-
-        /* Set the Length parameter */
-
-        output_struct->length = 0;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_end_tag_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_end_tag_stream(struct acpi_resource *linked_list,
-                       u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u8 temp8 = 0;
-
-        ACPI_FUNCTION_TRACE("rs_end_tag_stream");
-
-        /* The descriptor field is static */
-
-        *buffer = 0x79;
-        buffer += 1;
-
-        /*
-         * Set the Checksum - zero means that the resource data is treated as if
-         * the checksum operation succeeded (ACPI Spec 1.0b Section 6.4.2.8)
-         */
-        temp8 = 0;
-
-        *buffer = temp8;
-        buffer += 1;
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_vendor_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_vendor_resource(u8 * byte_stream_buffer,
-                        acpi_size * bytes_consumed,
-                        u8 ** output_buffer, acpi_size * structure_size)
-{
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
+        acpi_rs_length aml_resource_length;
+        void *source;
+        void *destination;
+        char *target;
+        u8 count;
+        u8 flags_mode = FALSE;
+        u16 item_count = 0;
         u16 temp16 = 0;
-        u8 temp8 = 0;
-        u8 index;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor);
-
-        ACPI_FUNCTION_TRACE("rs_vendor_resource");
-
-        /* Dereference the Descriptor to find if this is a large or small item. */
-
-        temp8 = *buffer;
-
-        if (temp8 & 0x80) {
-                /* Large Item, point to the length field */
-
-                buffer += 1;
 
-                /* Dereference */
+        ACPI_FUNCTION_TRACE("rs_get_resource");
 
-                ACPI_MOVE_16_TO_16(&temp16, buffer);
+        if (((acpi_native_uint) resource) & 0x3) {
+                /* Each internal resource struct is expected to be 32-bit aligned */
 
-                /* Calculate bytes consumed */
-
-                *bytes_consumed = (acpi_size) temp16 + 3;
-
-                /* Point to the first vendor byte */
-
-                buffer += 2;
-        } else {
-                /* Small Item, dereference the size */
-
-                temp16 = (u8) (*buffer & 0x07);
-
-                /* Calculate bytes consumed */
-
-                *bytes_consumed = (acpi_size) temp16 + 1;
-
-                /* Point to the first vendor byte */
-
-                buffer += 1;
+                ACPI_WARNING((AE_INFO,
+                              "Misaligned resource pointer (get): %p Type %2.2X Len %X",
+                              resource, resource->type, resource->length));
         }
 
-        output_struct->id = ACPI_RSTYPE_VENDOR;
-        output_struct->data.vendor_specific.length = temp16;
+        /* Extract the resource Length field (does not include header length) */
 
-        for (index = 0; index < temp16; index++) {
-                output_struct->data.vendor_specific.reserved[index] = *buffer;
-                buffer += 1;
-        }
+        aml_resource_length = acpi_ut_get_resource_length(aml);
 
         /*
-         * In order for the struct_size to fall on a 32-bit boundary,
-         * calculate the length of the vendor string and expand the
-         * struct_size to the next 32-bit boundary.
+         * First table entry must be ACPI_RSC_INITxxx and must contain the
+         * table length (# of table entries)
          */
-        struct_size += ACPI_ROUND_UP_to_32_bITS(temp16);
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_vendor_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_vendor_stream(struct acpi_resource *linked_list,
-                      u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u16 temp16 = 0;
-        u8 temp8 = 0;
-        u8 index;
-
-        ACPI_FUNCTION_TRACE("rs_vendor_stream");
-
-        /* Dereference the length to find if this is a large or small item. */
-
-        if (linked_list->data.vendor_specific.length > 7) {
-                /* Large Item, Set the descriptor field and length bytes */
-
-                *buffer = 0x84;
-                buffer += 1;
-
-                temp16 = (u16) linked_list->data.vendor_specific.length;
-
-                ACPI_MOVE_16_TO_16(buffer, &temp16);
-                buffer += 2;
-        } else {
-                /* Small Item, Set the descriptor field */
-
-                temp8 = 0x70;
-                temp8 |= (u8) linked_list->data.vendor_specific.length;
+        count = INIT_TABLE_LENGTH(info);
+
+        while (count) {
+                /*
+                 * Source is the external AML byte stream buffer,
+                 * destination is the internal resource descriptor
+                 */
+                source = ACPI_ADD_PTR(void, aml, info->aml_offset);
+                destination =
+                    ACPI_ADD_PTR(void, resource, info->resource_offset);
+
+                switch (info->opcode) {
+                case ACPI_RSC_INITGET:
+                        /*
+                         * Get the resource type and the initial (minimum) length
+                         */
+                        ACPI_MEMSET(resource, 0, INIT_RESOURCE_LENGTH(info));
+                        resource->type = INIT_RESOURCE_TYPE(info);
+                        resource->length = INIT_RESOURCE_LENGTH(info);
+                        break;
+
+                case ACPI_RSC_INITSET:
+                        break;
+
+                case ACPI_RSC_FLAGINIT:
+
+                        flags_mode = TRUE;
+                        break;
+
+                case ACPI_RSC_1BITFLAG:
+                        /*
+                         * Mask and shift the flag bit
+                         */
+                        ACPI_SET8(destination) = (u8)
+                            ((ACPI_GET8(source) >> info->value) & 0x01);
+                        break;
+
+                case ACPI_RSC_2BITFLAG:
+                        /*
+                         * Mask and shift the flag bits
+                         */
+                        ACPI_SET8(destination) = (u8)
+                            ((ACPI_GET8(source) >> info->value) & 0x03);
+                        break;
+
+                case ACPI_RSC_COUNT:
+
+                        item_count = ACPI_GET8(source);
+                        ACPI_SET8(destination) = (u8) item_count;
+
+                        resource->length = resource->length +
+                            (info->value * (item_count - 1));
+                        break;
+
+                case ACPI_RSC_COUNT16:
+
+                        item_count = aml_resource_length;
+                        ACPI_SET16(destination) = item_count;
+
+                        resource->length = resource->length +
+                            (info->value * (item_count - 1));
+                        break;
+
+                case ACPI_RSC_LENGTH:
+
+                        resource->length = resource->length + info->value;
+                        break;
+
+                case ACPI_RSC_MOVE8:
+                case ACPI_RSC_MOVE16:
+                case ACPI_RSC_MOVE32:
+                case ACPI_RSC_MOVE64:
+                        /*
+                         * Raw data move. Use the Info value field unless item_count has
+                         * been previously initialized via a COUNT opcode
+                         */
+                        if (info->value) {
+                                item_count = info->value;
+                        }
+                        acpi_rs_move_data(destination, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_SET8:
+
+                        ACPI_MEMSET(destination, info->aml_offset, info->value);
+                        break;
+
+                case ACPI_RSC_DATA8:
+
+                        target = ACPI_ADD_PTR(char, resource, info->value);
+                        ACPI_MEMCPY(destination, source, ACPI_GET16(target));
+                        break;
+
+                case ACPI_RSC_ADDRESS:
+                        /*
+                         * Common handler for address descriptor flags
+                         */
+                        if (!acpi_rs_get_address_common(resource, aml)) {
+                                return_ACPI_STATUS
+                                    (AE_AML_INVALID_RESOURCE_TYPE);
+                        }
+                        break;
+
+                case ACPI_RSC_SOURCE:
+                        /*
+                         * Optional resource_source (Index and String)
+                         */
+                        resource->length +=
+                            acpi_rs_get_resource_source(aml_resource_length,
+                                                        info->value,
+                                                        destination, aml, NULL);
+                        break;
+
+                case ACPI_RSC_SOURCEX:
+                        /*
+                         * Optional resource_source (Index and String). This is the more
+                         * complicated case used by the Interrupt() macro
+                         */
+                        target =
+                            ACPI_ADD_PTR(char, resource,
+                                         info->aml_offset + (item_count * 4));
+
+                        resource->length +=
+                            acpi_rs_get_resource_source(aml_resource_length,
+                                                        (acpi_rs_length) (((item_count - 1) * sizeof(u32)) + info->value), destination, aml, target);
+                        break;
+
+                case ACPI_RSC_BITMASK:
+                        /*
+                         * 8-bit encoded bitmask (DMA macro)
+                         */
+                        item_count =
+                            acpi_rs_decode_bitmask(ACPI_GET8(source),
+                                                   destination);
+                        if (item_count) {
+                                resource->length += (item_count - 1);
+                        }
+
+                        target = ACPI_ADD_PTR(char, resource, info->value);
+                        ACPI_SET8(target) = (u8) item_count;
+                        break;
+
+                case ACPI_RSC_BITMASK16:
+                        /*
+                         * 16-bit encoded bitmask (IRQ macro)
+                         */
+                        ACPI_MOVE_16_TO_16(&temp16, source);
+
+                        item_count =
+                            acpi_rs_decode_bitmask(temp16, destination);
+                        if (item_count) {
+                                resource->length += (item_count - 1);
+                        }
+
+                        target = ACPI_ADD_PTR(char, resource, info->value);
+                        ACPI_SET8(target) = (u8) item_count;
+                        break;
+
+                case ACPI_RSC_EXIT_NE:
+                        /*
+                         * Control - Exit conversion if not equal
+                         */
+                        switch (info->resource_offset) {
+                        case ACPI_RSC_COMPARE_AML_LENGTH:
+                                if (aml_resource_length != info->value) {
+                                        goto exit;
+                                }
+                                break;
+
+                        case ACPI_RSC_COMPARE_VALUE:
+                                if (ACPI_GET8(source) != info->value) {
+                                        goto exit;
+                                }
+                                break;
+
+                        default:
+
+                                ACPI_ERROR((AE_INFO,
+                                            "Invalid conversion sub-opcode"));
+                                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                        }
+                        break;
+
+                default:
+
+                        ACPI_ERROR((AE_INFO, "Invalid conversion opcode"));
+                        return_ACPI_STATUS(AE_BAD_PARAMETER);
+                }
 
-                *buffer = temp8;
-                buffer += 1;
+                count--;
+                info++;
         }
 
-        /* Loop through all of the Vendor Specific fields */
+      exit:
+        if (!flags_mode) {
+                /* Round the resource struct length up to the next 32-bit boundary */
 
-        for (index = 0; index < linked_list->data.vendor_specific.length;
-             index++) {
-                temp8 = linked_list->data.vendor_specific.reserved[index];
-
-                *buffer = temp8;
-                buffer += 1;
+                resource->length = ACPI_ROUND_UP_to_32_bITS(resource->length);
         }
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
         return_ACPI_STATUS(AE_OK);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_rs_start_depend_fns_resource
+ * FUNCTION:    acpi_rs_convert_resource_to_aml
  *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
+ * PARAMETERS:  Resource            - Pointer to the resource descriptor
+ *              Aml                 - Where the AML descriptor is returned
+ *              Info                - Pointer to appropriate conversion table
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
+ * DESCRIPTION: Convert an internal resource descriptor to the corresponding
+ *              external AML resource descriptor.
  *
  ******************************************************************************/
 
 acpi_status
-acpi_rs_start_depend_fns_resource(u8 * byte_stream_buffer,
-                                  acpi_size * bytes_consumed,
-                                  u8 ** output_buffer,
-                                  acpi_size * structure_size)
+acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
+                                union aml_resource *aml,
+                                struct acpi_rsconvert_info *info)
 {
-        u8 *buffer = byte_stream_buffer;
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        u8 temp8 = 0;
-        acpi_size struct_size =
-            ACPI_SIZEOF_RESOURCE(struct acpi_resource_start_dpf);
-
-        ACPI_FUNCTION_TRACE("rs_start_depend_fns_resource");
-
-        /* The number of bytes consumed are found in the descriptor (Bits:0-1) */
-
-        temp8 = *buffer;
-
-        *bytes_consumed = (temp8 & 0x01) + 1;
-
-        output_struct->id = ACPI_RSTYPE_START_DPF;
-
-        /* Point to Byte 1 if it is used */
-
-        if (2 == *bytes_consumed) {
-                buffer += 1;
-                temp8 = *buffer;
-
-                /* Check Compatibility priority */
-
-                output_struct->data.start_dpf.compatibility_priority =
-                    temp8 & 0x03;
-
-                if (3 == output_struct->data.start_dpf.compatibility_priority) {
-                        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_VALUE);
-                }
-
-                /* Check Performance/Robustness preference */
+        void *source = NULL;
+        void *destination;
+        acpi_rsdesc_size aml_length = 0;
+        u8 count;
+        u16 temp16 = 0;
+        u16 item_count = 0;
 
-                output_struct->data.start_dpf.performance_robustness =
-                    (temp8 >> 2) & 0x03;
+        ACPI_FUNCTION_TRACE("rs_convert_resource_to_aml");
 
-                if (3 == output_struct->data.start_dpf.performance_robustness) {
-                        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_VALUE);
+        /*
+         * First table entry must be ACPI_RSC_INITxxx and must contain the
+         * table length (# of table entries)
+         */
+        count = INIT_TABLE_LENGTH(info);
+
+        while (count) {
+                /*
+                 * Source is the internal resource descriptor,
+                 * destination is the external AML byte stream buffer
+                 */
+                source = ACPI_ADD_PTR(void, resource, info->resource_offset);
+                destination = ACPI_ADD_PTR(void, aml, info->aml_offset);
+
+                switch (info->opcode) {
+                case ACPI_RSC_INITSET:
+
+                        ACPI_MEMSET(aml, 0, INIT_RESOURCE_LENGTH(info));
+                        aml_length = INIT_RESOURCE_LENGTH(info);
+                        acpi_rs_set_resource_header(INIT_RESOURCE_TYPE(info),
+                                                    aml_length, aml);
+                        break;
+
+                case ACPI_RSC_INITGET:
+                        break;
+
+                case ACPI_RSC_FLAGINIT:
+                        /*
+                         * Clear the flag byte
+                         */
+                        ACPI_SET8(destination) = 0;
+                        break;
+
+                case ACPI_RSC_1BITFLAG:
+                        /*
+                         * Mask and shift the flag bit
+                         */
+                        ACPI_SET8(destination) |= (u8)
+                            ((ACPI_GET8(source) & 0x01) << info->value);
+                        break;
+
+                case ACPI_RSC_2BITFLAG:
+                        /*
+                         * Mask and shift the flag bits
+                         */
+                        ACPI_SET8(destination) |= (u8)
+                            ((ACPI_GET8(source) & 0x03) << info->value);
+                        break;
+
+                case ACPI_RSC_COUNT:
+
+                        item_count = ACPI_GET8(source);
+                        ACPI_SET8(destination) = (u8) item_count;
+
+                        aml_length =
+                            (u16) (aml_length +
+                                   (info->value * (item_count - 1)));
+                        break;
+
+                case ACPI_RSC_COUNT16:
+
+                        item_count = ACPI_GET16(source);
+                        aml_length = (u16) (aml_length + item_count);
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
+                case ACPI_RSC_LENGTH:
+
+                        acpi_rs_set_resource_length(info->value, aml);
+                        break;
+
+                case ACPI_RSC_MOVE8:
+                case ACPI_RSC_MOVE16:
+                case ACPI_RSC_MOVE32:
+                case ACPI_RSC_MOVE64:
+
+                        if (info->value) {
+                                item_count = info->value;
+                        }
+                        acpi_rs_move_data(destination, source, item_count,
+                                          info->opcode);
+                        break;
+
+                case ACPI_RSC_ADDRESS:
+
+                        /* Set the Resource Type, General Flags, and Type-Specific Flags */
+
+                        acpi_rs_set_address_common(aml, resource);
+                        break;
+
+                case ACPI_RSC_SOURCEX:
+                        /*
+                         * Optional resource_source (Index and String)
+                         */
+                        aml_length =
+                            acpi_rs_set_resource_source(aml,
+                                                        (acpi_rs_length)
+                                                        aml_length, source);
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
+                case ACPI_RSC_SOURCE:
+                        /*
+                         * Optional resource_source (Index and String). This is the more
+                         * complicated case used by the Interrupt() macro
+                         */
+                        aml_length =
+                            acpi_rs_set_resource_source(aml, info->value,
+                                                        source);
+                        acpi_rs_set_resource_length(aml_length, aml);
+                        break;
+
+                case ACPI_RSC_BITMASK:
+                        /*
+                         * 8-bit encoded bitmask (DMA macro)
+                         */
+                        ACPI_SET8(destination) = (u8)
+                            acpi_rs_encode_bitmask(source,
+                                                   *ACPI_ADD_PTR(u8, resource,
+                                                                 info->value));
+                        break;
+
+                case ACPI_RSC_BITMASK16:
+                        /*
+                         * 16-bit encoded bitmask (IRQ macro)
+                         */
+                        temp16 = acpi_rs_encode_bitmask(source,
+                                                        *ACPI_ADD_PTR(u8,
+                                                                      resource,
+                                                                      info->
+                                                                      value));
+                        ACPI_MOVE_16_TO_16(destination, &temp16);
+                        break;
+
+                case ACPI_RSC_EXIT_LE:
+                        /*
+                         * Control - Exit conversion if less than or equal
+                         */
+                        if (item_count <= info->value) {
+                                goto exit;
+                        }
+                        break;
+
+                case ACPI_RSC_EXIT_NE:
+                        /*
+                         * Control - Exit conversion if not equal
+                         */
+                        switch (COMPARE_OPCODE(info)) {
+                        case ACPI_RSC_COMPARE_VALUE:
+
+                                if (*ACPI_ADD_PTR(u8, resource,
+                                                  COMPARE_TARGET(info)) !=
+                                    COMPARE_VALUE(info)) {
+                                        goto exit;
+                                }
+                                break;
+
+                        default:
+
+                                ACPI_ERROR((AE_INFO,
+                                            "Invalid conversion sub-opcode"));
+                                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                        }
+                        break;
+
+                default:
+
+                        ACPI_ERROR((AE_INFO, "Invalid conversion opcode"));
+                        return_ACPI_STATUS(AE_BAD_PARAMETER);
                 }
-        } else {
-                output_struct->data.start_dpf.compatibility_priority =
-                    ACPI_ACCEPTABLE_CONFIGURATION;
 
-                output_struct->data.start_dpf.performance_robustness =
-                    ACPI_ACCEPTABLE_CONFIGURATION;
+                count--;
+                info++;
         }
 
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
+      exit:
         return_ACPI_STATUS(AE_OK);
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_end_depend_fns_resource
- *
- * PARAMETERS:  byte_stream_buffer      - Pointer to the resource input byte
- *                                        stream
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        consumed the byte_stream_buffer is
- *                                        returned
- *              output_buffer           - Pointer to the return data buffer
- *              structure_size          - Pointer to where the number of bytes
- *                                        in the return data struct is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the resource byte stream and fill out the appropriate
- *              structure pointed to by the output_buffer. Return the
- *              number of bytes consumed from the byte stream.
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_end_depend_fns_resource(u8 * byte_stream_buffer,
-                                acpi_size * bytes_consumed,
-                                u8 ** output_buffer, acpi_size * structure_size)
-{
-        struct acpi_resource *output_struct = (void *)*output_buffer;
-        acpi_size struct_size = ACPI_RESOURCE_LENGTH;
-
-        ACPI_FUNCTION_TRACE("rs_end_depend_fns_resource");
-
-        /* The number of bytes consumed is static */
-
-        *bytes_consumed = 1;
+#if 0
+/* Previous resource validations */
 
-        /*  Fill out the structure */
-
-        output_struct->id = ACPI_RSTYPE_END_DPF;
-
-        /* Set the Length parameter */
-
-        output_struct->length = (u32) struct_size;
-
-        /* Return the final size of the structure */
-
-        *structure_size = struct_size;
-        return_ACPI_STATUS(AE_OK);
+if (aml->ext_address64.revision_iD != AML_RESOURCE_EXTENDED_ADDRESS_REVISION) {
+        return_ACPI_STATUS(AE_SUPPORT);
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_start_depend_fns_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - u32 pointer that is filled with
- *                                        the number of bytes of the
- *                                        output_buffer used
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_start_depend_fns_stream(struct acpi_resource *linked_list,
-                                u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-        u8 temp8 = 0;
-
-        ACPI_FUNCTION_TRACE("rs_start_depend_fns_stream");
+if (resource->data.start_dpf.performance_robustness >= 3) {
+        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_VALUE);
+}
 
+if (((aml->irq.flags & 0x09) == 0x00) || ((aml->irq.flags & 0x09) == 0x09)) {
         /*
-         * The descriptor field is set based upon whether a byte is needed
-         * to contain Priority data.
+         * Only [active_high, edge_sensitive] or [active_low, level_sensitive]
+         * polarity/trigger interrupts are allowed (ACPI spec, section
+         * "IRQ Format"), so 0x00 and 0x09 are illegal.
          */
-        if (ACPI_ACCEPTABLE_CONFIGURATION ==
-            linked_list->data.start_dpf.compatibility_priority &&
-            ACPI_ACCEPTABLE_CONFIGURATION ==
-            linked_list->data.start_dpf.performance_robustness) {
-                *buffer = 0x30;
-        } else {
-                *buffer = 0x31;
-                buffer += 1;
-
-                /* Set the Priority Byte Definition */
-
-                temp8 = 0;
-                temp8 =
-                    (u8) ((linked_list->data.start_dpf.
-                           performance_robustness & 0x03) << 2);
-                temp8 |=
-                    (linked_list->data.start_dpf.compatibility_priority & 0x03);
-                *buffer = temp8;
-        }
-
-        buffer += 1;
-
-        /* Return the number of bytes consumed in this operation */
-
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
+        ACPI_ERROR((AE_INFO,
+                    "Invalid interrupt polarity/trigger in resource list, %X",
+                    aml->irq.flags));
+        return_ACPI_STATUS(AE_BAD_DATA);
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_rs_end_depend_fns_stream
- *
- * PARAMETERS:  linked_list             - Pointer to the resource linked list
- *              output_buffer           - Pointer to the user's return buffer
- *              bytes_consumed          - Pointer to where the number of bytes
- *                                        used in the output_buffer is returned
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Take the linked list resource structure and fills in the
- *              the appropriate bytes in a byte stream
- *
- ******************************************************************************/
-
-acpi_status
-acpi_rs_end_depend_fns_stream(struct acpi_resource *linked_list,
-                              u8 ** output_buffer, acpi_size * bytes_consumed)
-{
-        u8 *buffer = *output_buffer;
-
-        ACPI_FUNCTION_TRACE("rs_end_depend_fns_stream");
-
-        /* The descriptor field is static */
-
-        *buffer = 0x38;
-        buffer += 1;
+resource->data.extended_irq.interrupt_count = temp8;
+if (temp8 < 1) {
+        /* Must have at least one IRQ */
 
-        /* Return the number of bytes consumed in this operation */
+        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
+}
 
-        *bytes_consumed = ACPI_PTR_DIFF(buffer, *output_buffer);
-        return_ACPI_STATUS(AE_OK);
+if (resource->data.dma.transfer == 0x03) {
+        ACPI_ERROR((AE_INFO, "Invalid DMA.Transfer preference (3)"));
+        return_ACPI_STATUS(AE_BAD_DATA);
 }
+#endif
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 4446778eaf79..25b5aedd6612 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,389 @@ ACPI_MODULE_NAME("rsutils")
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_rs_decode_bitmask
+ *
+ * PARAMETERS:  Mask            - Bitmask to decode
+ *              List            - Where the converted list is returned
+ *
+ * RETURN:      Count of bits set (length of list)
+ *
+ * DESCRIPTION: Convert a bit mask into a list of values
+ *
+ ******************************************************************************/
+u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
+{
+        acpi_native_uint i;
+        u8 bit_count;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* Decode the mask bits */
+
+        for (i = 0, bit_count = 0; mask; i++) {
+                if (mask & 0x0001) {
+                        list[bit_count] = (u8) i;
+                        bit_count++;
+                }
+
+                mask >>= 1;
+        }
+
+        return (bit_count);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_encode_bitmask
+ *
+ * PARAMETERS:  List            - List of values to encode
+ *              Count           - Length of list
+ *
+ * RETURN:      Encoded bitmask
+ *
+ * DESCRIPTION: Convert a list of values to an encoded bitmask
+ *
+ ******************************************************************************/
+
+u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
+{
+        acpi_native_uint i;
+        u16 mask;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* Encode the list into a single bitmask */
+
+        for (i = 0, mask = 0; i < count; i++) {
+                mask |= (0x0001 << list[i]);
+        }
+
+        return (mask);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_move_data
+ *
+ * PARAMETERS:  Destination         - Pointer to the destination descriptor
+ *              Source              - Pointer to the source descriptor
+ *              item_count          - How many items to move
+ *              move_type           - Byte width
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Move multiple data items from one descriptor to another. Handles
+ *              alignment issues and endian issues if necessary, as configured
+ *              via the ACPI_MOVE_* macros. (This is why a memcpy is not used)
+ *
+ ******************************************************************************/
+
+void
+acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
+{
+        acpi_native_uint i;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* One move per item */
+
+        for (i = 0; i < item_count; i++) {
+                switch (move_type) {
+                        /*
+                         * For the 8-bit case, we can perform the move all at once
+                         * since there are no alignment or endian issues
+                         */
+                case ACPI_RSC_MOVE8:
+                        ACPI_MEMCPY(destination, source, item_count);
+                        return;
+
+                        /*
+                         * 16-, 32-, and 64-bit cases must use the move macros that perform
+                         * endian conversion and/or accomodate hardware that cannot perform
+                         * misaligned memory transfers
+                         */
+                case ACPI_RSC_MOVE16:
+                        ACPI_MOVE_16_TO_16(&ACPI_CAST_PTR(u16, destination)[i],
+                                           &ACPI_CAST_PTR(u16, source)[i]);
+                        break;
+
+                case ACPI_RSC_MOVE32:
+                        ACPI_MOVE_32_TO_32(&ACPI_CAST_PTR(u32, destination)[i],
+                                           &ACPI_CAST_PTR(u32, source)[i]);
+                        break;
+
+                case ACPI_RSC_MOVE64:
+                        ACPI_MOVE_64_TO_64(&ACPI_CAST_PTR(u64, destination)[i],
+                                           &ACPI_CAST_PTR(u64, source)[i]);
+                        break;
+
+                default:
+                        return;
+                }
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_set_resource_length
+ *
+ * PARAMETERS:  total_length        - Length of the AML descriptor, including
+ *                                    the header and length fields.
+ *              Aml                 - Pointer to the raw AML descriptor
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Set the resource_length field of an AML
+ *              resource descriptor, both Large and Small descriptors are
+ *              supported automatically. Note: Descriptor Type field must
+ *              be valid.
+ *
+ ******************************************************************************/
+
+void
+acpi_rs_set_resource_length(acpi_rsdesc_size total_length,
+                            union aml_resource *aml)
+{
+        acpi_rs_length resource_length;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* Length is the total descriptor length minus the header length */
+
+        resource_length = (acpi_rs_length)
+            (total_length - acpi_ut_get_resource_header_length(aml));
+
+        /* Length is stored differently for large and small descriptors */
+
+        if (aml->small_header.descriptor_type & ACPI_RESOURCE_NAME_LARGE) {
+                /* Large descriptor -- bytes 1-2 contain the 16-bit length */
+
+                ACPI_MOVE_16_TO_16(&aml->large_header.resource_length,
+                                   &resource_length);
+        } else {
+                /* Small descriptor -- bits 2:0 of byte 0 contain the length */
+
+                aml->small_header.descriptor_type = (u8)
+
+                    /* Clear any existing length, preserving descriptor type bits */
+                    ((aml->small_header.
+                      descriptor_type & ~ACPI_RESOURCE_NAME_SMALL_LENGTH_MASK)
+
+                     | resource_length);
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_set_resource_header
+ *
+ * PARAMETERS:  descriptor_type     - Byte to be inserted as the type
+ *              total_length        - Length of the AML descriptor, including
+ *                                    the header and length fields.
+ *              Aml                 - Pointer to the raw AML descriptor
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Set the descriptor_type and resource_length fields of an AML
+ *              resource descriptor, both Large and Small descriptors are
+ *              supported automatically
+ *
+ ******************************************************************************/
+
+void
+acpi_rs_set_resource_header(u8 descriptor_type,
+                            acpi_rsdesc_size total_length,
+                            union aml_resource *aml)
+{
+        ACPI_FUNCTION_ENTRY();
+
+        /* Set the Resource Type */
+
+        aml->small_header.descriptor_type = descriptor_type;
+
+        /* Set the Resource Length */
+
+        acpi_rs_set_resource_length(total_length, aml);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_strcpy
+ *
+ * PARAMETERS:  Destination         - Pointer to the destination string
+ *              Source              - Pointer to the source string
+ *
+ * RETURN:      String length, including NULL terminator
+ *
+ * DESCRIPTION: Local string copy that returns the string length, saving a
+ *              strcpy followed by a strlen.
+ *
+ ******************************************************************************/
+
+static u16 acpi_rs_strcpy(char *destination, char *source)
+{
+        u16 i;
+
+        ACPI_FUNCTION_ENTRY();
+
+        for (i = 0; source[i]; i++) {
+                destination[i] = source[i];
+        }
+
+        destination[i] = 0;
+
+        /* Return string length including the NULL terminator */
+
+        return ((u16) (i + 1));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_get_resource_source
+ *
+ * PARAMETERS:  resource_length     - Length field of the descriptor
+ *              minimum_length      - Minimum length of the descriptor (minus
+ *                                    any optional fields)
+ *              resource_source     - Where the resource_source is returned
+ *              Aml                 - Pointer to the raw AML descriptor
+ *              string_ptr          - (optional) where to store the actual
+ *                                    resource_source string
+ *
+ * RETURN:      Length of the string plus NULL terminator, rounded up to 32 bit
+ *
+ * DESCRIPTION: Copy the optional resource_source data from a raw AML descriptor
+ *              to an internal resource descriptor
+ *
+ ******************************************************************************/
+
+acpi_rs_length
+acpi_rs_get_resource_source(acpi_rs_length resource_length,
+                            acpi_rs_length minimum_length,
+                            struct acpi_resource_source * resource_source,
+                            union aml_resource * aml, char *string_ptr)
+{
+        acpi_rsdesc_size total_length;
+        u8 *aml_resource_source;
+
+        ACPI_FUNCTION_ENTRY();
+
+        total_length =
+            resource_length + sizeof(struct aml_resource_large_header);
+        aml_resource_source = ACPI_ADD_PTR(u8, aml, minimum_length);
+
+        /*
+         * resource_source is present if the length of the descriptor is longer than
+         * the minimum length.
+         *
+         * Note: Some resource descriptors will have an additional null, so
+         * we add 1 to the minimum length.
+         */
+        if (total_length > (acpi_rsdesc_size) (minimum_length + 1)) {
+                /* Get the resource_source_index */
+
+                resource_source->index = aml_resource_source[0];
+
+                resource_source->string_ptr = string_ptr;
+                if (!string_ptr) {
+                        /*
+                         * String destination pointer is not specified; Set the String
+                         * pointer to the end of the current resource_source structure.
+                         */
+                        resource_source->string_ptr =
+                            ACPI_ADD_PTR(char, resource_source,
+                                         sizeof(struct acpi_resource_source));
+                }
+
+                /*
+                 * In order for the struct_size to fall on a 32-bit boundary, calculate
+                 * the length of the string (+1 for the NULL terminator) and expand the
+                 * struct_size to the next 32-bit boundary.
+                 *
+                 * Zero the entire area of the buffer.
+                 */
+                total_length =
+                    ACPI_ROUND_UP_to_32_bITS(ACPI_STRLEN
+                                             ((char *)&aml_resource_source[1]) +
+                                             1);
+                ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
+
+                /* Copy the resource_source string to the destination */
+
+                resource_source->string_length =
+                    acpi_rs_strcpy(resource_source->string_ptr,
+                                   (char *)&aml_resource_source[1]);
+
+                return ((acpi_rs_length) total_length);
+        }
+
+        /* resource_source is not present */
+
+        resource_source->index = 0;
+        resource_source->string_length = 0;
+        resource_source->string_ptr = NULL;
+        return (0);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_set_resource_source
+ *
+ * PARAMETERS:  Aml                 - Pointer to the raw AML descriptor
+ *              minimum_length      - Minimum length of the descriptor (minus
+ *                                    any optional fields)
+ *              resource_source     - Internal resource_source
+
+ *
+ * RETURN:      Total length of the AML descriptor
+ *
+ * DESCRIPTION: Convert an optional resource_source from internal format to a
+ *              raw AML resource descriptor
+ *
+ ******************************************************************************/
+
+acpi_rsdesc_size
+acpi_rs_set_resource_source(union aml_resource * aml,
+                            acpi_rs_length minimum_length,
+                            struct acpi_resource_source * resource_source)
+{
+        u8 *aml_resource_source;
+        acpi_rsdesc_size descriptor_length;
+
+        ACPI_FUNCTION_ENTRY();
+
+        descriptor_length = minimum_length;
+
+        /* Non-zero string length indicates presence of a resource_source */
+
+        if (resource_source->string_length) {
+                /* Point to the end of the AML descriptor */
+
+                aml_resource_source = ACPI_ADD_PTR(u8, aml, minimum_length);
+
+                /* Copy the resource_source_index */
+
+                aml_resource_source[0] = (u8) resource_source->index;
+
+                /* Copy the resource_source string */
+
+                ACPI_STRCPY((char *)&aml_resource_source[1],
+                            resource_source->string_ptr);
+
+                /*
+                 * Add the length of the string (+ 1 for null terminator) to the
+                 * final descriptor length
+                 */
+                descriptor_length +=
+                    ((acpi_rsdesc_size) resource_source->string_length + 1);
+        }
+
+        /* Return the new total length of the AML descriptor */
+
+        return (descriptor_length);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_rs_get_prt_method_data
  *
  * PARAMETERS:  Handle          - a handle to the containing object
@@ -65,8 +448,9 @@ ACPI_MODULE_NAME("rsutils")
  *              and the contents of the callers buffer is undefined.
  *
  ******************************************************************************/
+
 acpi_status
-acpi_rs_get_prt_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)
+acpi_rs_get_prt_method_data(acpi_handle handle, struct acpi_buffer * ret_buffer)
 {
         union acpi_operand_object *obj_desc;
         acpi_status status;
@@ -284,7 +668,7 @@ acpi_rs_set_srs_method_data(acpi_handle handle, struct acpi_buffer *in_buffer)
          * Convert the linked list into a byte stream
          */
         buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
-        status = acpi_rs_create_byte_stream(in_buffer->pointer, &buffer);
+        status = acpi_rs_create_aml_resources(in_buffer->pointer, &buffer);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c
index ee5a5c509199..88b67077aeeb 100644
--- a/drivers/acpi/resources/rsxface.c
+++ b/drivers/acpi/resources/rsxface.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,13 +57,17 @@ ACPI_MODULE_NAME("rsxface")
         ACPI_COPY_FIELD(out, in, decode);                    \
         ACPI_COPY_FIELD(out, in, min_address_fixed);         \
         ACPI_COPY_FIELD(out, in, max_address_fixed);         \
-        ACPI_COPY_FIELD(out, in, attribute);                 \
+        ACPI_COPY_FIELD(out, in, info);                      \
         ACPI_COPY_FIELD(out, in, granularity);               \
-        ACPI_COPY_FIELD(out, in, min_address_range);         \
-        ACPI_COPY_FIELD(out, in, max_address_range);         \
-        ACPI_COPY_FIELD(out, in, address_translation_offset); \
+        ACPI_COPY_FIELD(out, in, minimum);                   \
+        ACPI_COPY_FIELD(out, in, maximum);                   \
+        ACPI_COPY_FIELD(out, in, translation_offset);        \
         ACPI_COPY_FIELD(out, in, address_length);            \
         ACPI_COPY_FIELD(out, in, resource_source);
+/* Local prototypes */
+static acpi_status
+acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_irq_routing_table
@@ -86,6 +90,7 @@ ACPI_MODULE_NAME("rsxface")
  *              the object indicated by the passed device_handle.
  *
  ******************************************************************************/
+
 acpi_status
 acpi_get_irq_routing_table(acpi_handle device_handle,
                            struct acpi_buffer *ret_buffer)
@@ -222,12 +227,12 @@ EXPORT_SYMBOL(acpi_get_possible_resources);
  *
  * FUNCTION:    acpi_walk_resources
  *
- * PARAMETERS:  device_handle   - a handle to the device object for the
+ * PARAMETERS:  device_handle   - Handle to the device object for the
  *                                device we are querying
- *              Path            - method name of the resources we want
+ *              Name            - Method name of the resources we want
  *                                (METHOD_NAME__CRS or METHOD_NAME__PRS)
- *              user_function   - called for each resource
- *              Context         - passed to user_function
+ *              user_function   - Called for each resource
+ *              Context         - Passed to user_function
  *
  * RETURN:      Status
  *
@@ -239,79 +244,74 @@ EXPORT_SYMBOL(acpi_get_possible_resources);
 
 acpi_status
 acpi_walk_resources(acpi_handle device_handle,
-                    char *path,
+                    char *name,
                     ACPI_WALK_RESOURCE_CALLBACK user_function, void *context)
 {
         acpi_status status;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_buffer buffer;
         struct acpi_resource *resource;
-        struct acpi_resource *buffer_end;
+        struct acpi_resource *resource_end;
 
         ACPI_FUNCTION_TRACE("acpi_walk_resources");
 
-        if (!device_handle ||
-            (ACPI_STRNCMP(path, METHOD_NAME__CRS, sizeof(METHOD_NAME__CRS)) &&
-             ACPI_STRNCMP(path, METHOD_NAME__PRS, sizeof(METHOD_NAME__PRS)))) {
+        /* Parameter validation */
+
+        if (!device_handle || !user_function || !name ||
+            (ACPI_STRNCMP(name, METHOD_NAME__CRS, sizeof(METHOD_NAME__CRS)) &&
+             ACPI_STRNCMP(name, METHOD_NAME__PRS, sizeof(METHOD_NAME__PRS)))) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        status = acpi_rs_get_method_data(device_handle, path, &buffer);
+        /* Get the _CRS or _PRS resource list */
+
+        buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
+        status = acpi_rs_get_method_data(device_handle, name, &buffer);
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
 
-        /* Setup pointers */
+        /* Buffer now contains the resource list */
 
-        resource = (struct acpi_resource *)buffer.pointer;
-        buffer_end = ACPI_CAST_PTR(struct acpi_resource,
-                                   ((u8 *) buffer.pointer + buffer.length));
+        resource = ACPI_CAST_PTR(struct acpi_resource, buffer.pointer);
+        resource_end =
+            ACPI_ADD_PTR(struct acpi_resource, buffer.pointer, buffer.length);
 
-        /* Walk the resource list */
+        /* Walk the resource list until the end_tag is found (or buffer end) */
 
-        for (;;) {
-                if (!resource || resource->id == ACPI_RSTYPE_END_TAG) {
+        while (resource < resource_end) {
+                /* Sanity check the resource */
+
+                if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
+                        status = AE_AML_INVALID_RESOURCE_TYPE;
                         break;
                 }
 
-                status = user_function(resource, context);
-
-                switch (status) {
-                case AE_OK:
-                case AE_CTRL_DEPTH:
+                /* Invoke the user function, abort on any error returned */
 
-                        /* Just keep going */
+                status = user_function(resource, context);
+                if (ACPI_FAILURE(status)) {
+                        if (status == AE_CTRL_TERMINATE) {
+                                /* This is an OK termination by the user function */
 
-                        status = AE_OK;
+                                status = AE_OK;
+                        }
                         break;
+                }
 
-                case AE_CTRL_TERMINATE:
-
-                        /* Exit now, with OK stats */
-
-                        status = AE_OK;
-                        goto cleanup;
-
-                default:
-
-                        /* All others are valid exceptions */
+                /* end_tag indicates end-of-list */
 
-                        goto cleanup;
+                if (resource->type == ACPI_RESOURCE_TYPE_END_TAG) {
+                        break;
                 }
 
                 /* Get the next resource descriptor */
 
-                resource = ACPI_NEXT_RESOURCE(resource);
-
-                /* Check for end-of-buffer */
-
-                if (resource >= buffer_end) {
-                        goto cleanup;
-                }
+                resource =
+                    ACPI_ADD_PTR(struct acpi_resource, resource,
+                                 resource->length);
         }
 
-      cleanup:
-
-        acpi_os_free(buffer.pointer);
+        ACPI_MEM_FREE(buffer.pointer);
         return_ACPI_STATUS(status);
 }
 
@@ -360,8 +360,8 @@ EXPORT_SYMBOL(acpi_set_current_resources);
  *
  * FUNCTION:    acpi_resource_to_address64
  *
- * PARAMETERS:  resource                - Pointer to a resource
- *              out                     - Pointer to the users's return
+ * PARAMETERS:  Resource                - Pointer to a resource
+ *              Out                     - Pointer to the users's return
  *                                        buffer (a struct
  *                                        struct acpi_resource_address64)
  *
@@ -381,20 +381,26 @@ acpi_resource_to_address64(struct acpi_resource *resource,
         struct acpi_resource_address16 *address16;
         struct acpi_resource_address32 *address32;
 
-        switch (resource->id) {
-        case ACPI_RSTYPE_ADDRESS16:
+        if (!resource || !out) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        /* Convert 16 or 32 address descriptor to 64 */
+
+        switch (resource->type) {
+        case ACPI_RESOURCE_TYPE_ADDRESS16:
 
                 address16 = (struct acpi_resource_address16 *)&resource->data;
                 ACPI_COPY_ADDRESS(out, address16);
                 break;
 
-        case ACPI_RSTYPE_ADDRESS32:
+        case ACPI_RESOURCE_TYPE_ADDRESS32:
 
                 address32 = (struct acpi_resource_address32 *)&resource->data;
                 ACPI_COPY_ADDRESS(out, address32);
                 break;
 
-        case ACPI_RSTYPE_ADDRESS64:
+        case ACPI_RESOURCE_TYPE_ADDRESS64:
 
                 /* Simple copy for 64 bit source */
 
@@ -410,3 +416,113 @@ acpi_resource_to_address64(struct acpi_resource *resource,
 }
 
 EXPORT_SYMBOL(acpi_resource_to_address64);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_get_vendor_resource
+ *
+ * PARAMETERS:  device_handle       - Handle for the parent device object
+ *              Name                - Method name for the parent resource
+ *                                    (METHOD_NAME__CRS or METHOD_NAME__PRS)
+ *              Uuid                - Pointer to the UUID to be matched.
+ *                                    includes both subtype and 16-byte UUID
+ *              ret_buffer          - Where the vendor resource is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Walk a resource template for the specified evice to find a
+ *              vendor-defined resource that matches the supplied UUID and
+ *              UUID subtype. Returns a struct acpi_resource of type Vendor.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_get_vendor_resource(acpi_handle device_handle,
+                         char *name,
+                         struct acpi_vendor_uuid * uuid,
+                         struct acpi_buffer * ret_buffer)
+{
+        struct acpi_vendor_walk_info info;
+        acpi_status status;
+
+        /* Other parameters are validated by acpi_walk_resources */
+
+        if (!uuid || !ret_buffer) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        info.uuid = uuid;
+        info.buffer = ret_buffer;
+        info.status = AE_NOT_EXIST;
+
+        /* Walk the _CRS or _PRS resource list for this device */
+
+        status =
+            acpi_walk_resources(device_handle, name,
+                                acpi_rs_match_vendor_resource, &info);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        return (info.status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_rs_match_vendor_resource
+ *
+ * PARAMETERS:  ACPI_WALK_RESOURCE_CALLBACK
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Match a vendor resource via the ACPI 3.0 UUID
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
+{
+        struct acpi_vendor_walk_info *info = context;
+        struct acpi_resource_vendor_typed *vendor;
+        struct acpi_buffer *buffer;
+        acpi_status status;
+
+        /* Ignore all descriptors except Vendor */
+
+        if (resource->type != ACPI_RESOURCE_TYPE_VENDOR) {
+                return (AE_OK);
+        }
+
+        vendor = &resource->data.vendor_typed;
+
+        /*
+         * For a valid match, these conditions must hold:
+         *
+         * 1) Length of descriptor data must be at least as long as a UUID struct
+         * 2) The UUID subtypes must match
+         * 3) The UUID data must match
+         */
+        if ((vendor->byte_length < (ACPI_UUID_LENGTH + 1)) ||
+            (vendor->uuid_subtype != info->uuid->subtype) ||
+            (ACPI_MEMCMP(vendor->uuid, info->uuid->data, ACPI_UUID_LENGTH))) {
+                return (AE_OK);
+        }
+
+        /* Validate/Allocate/Clear caller buffer */
+
+        buffer = info->buffer;
+        status = acpi_ut_initialize_buffer(buffer, resource->length);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Found the correct resource, copy and return it */
+
+        ACPI_MEMCPY(buffer->pointer, resource, resource->length);
+        buffer->length = resource->length;
+
+        /* Found the desired descriptor, terminate resource walk */
+
+        info->status = AE_OK;
+        return (AE_CTRL_TERMINATE);
+}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 3b26a7104363..9271e5209ac1 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -851,7 +851,7 @@ static void acpi_device_set_id(struct acpi_device *device,
          * ----
          * Fix for the system root bus device -- the only root-level device.
          */
-        if ((parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) {
+        if (((acpi_handle)parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) {
                 hid = ACPI_BUS_HID;
                 strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
                 strcpy(device->pnp.device_class, ACPI_BUS_CLASS);
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
index af7935a95bcc..47fb4b394eec 100644
--- a/drivers/acpi/sleep/poweroff.c
+++ b/drivers/acpi/sleep/poweroff.c
@@ -33,9 +33,7 @@ int acpi_sleep_prepare(u32 acpi_state)
         ACPI_FLUSH_CPU_CACHE();
         acpi_enable_wakeup_device_prep(acpi_state);
 #endif
-        if (acpi_state == ACPI_STATE_S5) {
-                acpi_wakeup_gpe_poweroff_prepare();
-        }
+        acpi_gpe_sleep_prepare(acpi_state);
         acpi_enter_sleep_state_prep(acpi_state);
         return 0;
 }
@@ -53,11 +51,16 @@ void acpi_power_off(void)
 
 static int acpi_shutdown(struct sys_device *x)
 {
-        if (system_state == SYSTEM_POWER_OFF) {
-                /* Prepare if we are going to power off the system */
+        switch (system_state) {
+        case SYSTEM_POWER_OFF:
+                /* Prepare to power off the system */
                 return acpi_sleep_prepare(ACPI_STATE_S5);
+        case SYSTEM_SUSPEND_DISK:
+                /* Prepare to suspend the system to disk */
+                return acpi_sleep_prepare(ACPI_STATE_S4);
+        default:
+                return 0;
         }
-        return 0;
 }
 
 static struct sysdev_class acpi_sysclass = {
diff --git a/drivers/acpi/sleep/sleep.h b/drivers/acpi/sleep/sleep.h
index efd0001c6f05..f3e70397a7d6 100644
--- a/drivers/acpi/sleep/sleep.h
+++ b/drivers/acpi/sleep/sleep.h
@@ -5,4 +5,4 @@ extern int acpi_suspend (u32 state);
 extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
 extern void acpi_enable_wakeup_device(u8 sleep_state);
 extern void acpi_disable_wakeup_device(u8 sleep_state);
-extern void acpi_wakeup_gpe_poweroff_prepare(void);
+extern void acpi_gpe_sleep_prepare(u32 sleep_state);
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index 4134ed43d026..85df0ceda2a9 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -192,7 +192,7 @@ late_initcall(acpi_wakeup_device_init);
  * RUNTIME GPEs, we simply mark all GPES that
  * are not enabled for wakeup from S5 as RUNTIME.
  */
-void acpi_wakeup_gpe_poweroff_prepare(void)
+void acpi_gpe_sleep_prepare(u32 sleep_state)
 {
         struct list_head *node, *next;
 
@@ -201,8 +201,8 @@ void acpi_wakeup_gpe_poweroff_prepare(void)
                                                        struct acpi_device,
                                                        wakeup_list);
 
-                /* The GPE can wakeup system from S5, don't touch it */
-                if ((u32) dev->wakeup.sleep_state == ACPI_STATE_S5)
+                /* The GPE can wakeup system from this state, don't touch it */
+                if ((u32) dev->wakeup.sleep_state >= sleep_state)
                         continue;
                 /* acpi_set_gpe_type will automatically disable GPE */
                 acpi_set_gpe_type(dev->wakeup.gpe_device,
diff --git a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c
index a03939399fa9..03b37d2223bc 100644
--- a/drivers/acpi/tables/tbconvrt.c
+++ b/drivers/acpi/tables/tbconvrt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -501,8 +501,8 @@ acpi_status acpi_tb_convert_table_fadt(void)
          * at least as long as the version 1.0 FADT
          */
         if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev1)) {
-                ACPI_REPORT_ERROR(("FADT is invalid, too short: 0x%X\n",
-                                   acpi_gbl_FADT->length));
+                ACPI_ERROR((AE_INFO, "FADT is invalid, too short: 0x%X",
+                            acpi_gbl_FADT->length));
                 return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
         }
 
@@ -517,7 +517,10 @@ acpi_status acpi_tb_convert_table_fadt(void)
                 if (acpi_gbl_FADT->length < sizeof(struct fadt_descriptor_rev2)) {
                         /* Length is too short to be a V2.0 table */
 
-                        ACPI_REPORT_WARNING(("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n", acpi_gbl_FADT->length, acpi_gbl_FADT->revision));
+                        ACPI_WARNING((AE_INFO,
+                                      "Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table",
+                                      acpi_gbl_FADT->length,
+                                      acpi_gbl_FADT->revision));
 
                         acpi_tb_convert_fadt1(local_fadt,
                                               (void *)acpi_gbl_FADT);
@@ -554,7 +557,9 @@ acpi_status acpi_tb_convert_table_fadt(void)
         ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
                           "Hex dump of common internal FADT, size %d (%X)\n",
                           acpi_gbl_FADT->length, acpi_gbl_FADT->length));
-        ACPI_DUMP_BUFFER((u8 *) (acpi_gbl_FADT), acpi_gbl_FADT->length);
+
+        ACPI_DUMP_BUFFER(ACPI_CAST_PTR(u8, acpi_gbl_FADT),
+                         acpi_gbl_FADT->length);
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -580,13 +585,15 @@ acpi_status acpi_tb_build_common_facs(struct acpi_table_desc *table_info)
         /* Absolute minimum length is 24, but the ACPI spec says 64 */
 
         if (acpi_gbl_FACS->length < 24) {
-                ACPI_REPORT_ERROR(("Invalid FACS table length: 0x%X\n",
-                                   acpi_gbl_FACS->length));
+                ACPI_ERROR((AE_INFO, "Invalid FACS table length: 0x%X",
+                            acpi_gbl_FACS->length));
                 return_ACPI_STATUS(AE_INVALID_TABLE_LENGTH);
         }
 
         if (acpi_gbl_FACS->length < 64) {
-                ACPI_REPORT_WARNING(("FACS is shorter than the ACPI specification allows: 0x%X, using anyway\n", acpi_gbl_FACS->length));
+                ACPI_WARNING((AE_INFO,
+                              "FACS is shorter than the ACPI specification allows: 0x%X, using anyway",
+                              acpi_gbl_FACS->length));
         }
 
         /* Copy fields to the new FACS */
diff --git a/drivers/acpi/tables/tbget.c b/drivers/acpi/tables/tbget.c
index 6acd5aeb093e..09b4ee6dfd60 100644
--- a/drivers/acpi/tables/tbget.c
+++ b/drivers/acpi/tables/tbget.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -91,9 +91,9 @@ acpi_tb_get_table(struct acpi_pointer *address,
 
         status = acpi_tb_get_table_body(address, &header, table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not get ACPI table (size %X), %s\n",
-                                   header.length,
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not get ACPI table (size %X)",
+                                header.length));
                 return_ACPI_STATUS(status);
         }
 
@@ -148,7 +148,6 @@ acpi_tb_get_table_header(struct acpi_pointer *address,
                                             sizeof(struct acpi_table_header),
                                             (void *)&header);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not map memory at %8.8X%8.8X for length %X\n", ACPI_FORMAT_UINT64(address->pointer.physical), sizeof(struct acpi_table_header)));
                         return_ACPI_STATUS(status);
                 }
 
@@ -161,8 +160,8 @@ acpi_tb_get_table_header(struct acpi_pointer *address,
 
         default:
 
-                ACPI_REPORT_ERROR(("Invalid address flags %X\n",
-                                   address->pointer_type));
+                ACPI_ERROR((AE_INFO, "Invalid address flags %X",
+                            address->pointer_type));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
@@ -253,8 +252,8 @@ acpi_tb_table_override(struct acpi_table_header *header,
         if (ACPI_FAILURE(status)) {
                 /* Some severe error from the OSL, but we basically ignore it */
 
-                ACPI_REPORT_ERROR(("Could not override ACPI table, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not override ACPI table"));
                 return_ACPI_STATUS(status);
         }
 
@@ -273,15 +272,14 @@ acpi_tb_table_override(struct acpi_table_header *header,
 
         status = acpi_tb_get_this_table(&address, new_table, table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not copy override ACPI table, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Could not copy ACPI table"));
                 return_ACPI_STATUS(status);
         }
 
         /* Copy the table info */
 
-        ACPI_REPORT_INFO(("Table [%4.4s] replaced by host OS\n",
-                          table_info->pointer->signature));
+        ACPI_INFO((AE_INFO, "Table [%4.4s] replaced by host OS",
+                   table_info->pointer->signature));
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -327,7 +325,9 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
 
                 full_table = ACPI_MEM_ALLOCATE(header->length);
                 if (!full_table) {
-                        ACPI_REPORT_ERROR(("Could not allocate table memory for [%4.4s] length %X\n", header->signature, header->length));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not allocate table memory for [%4.4s] length %X",
+                                    header->signature, header->length));
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
@@ -351,7 +351,12 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
                                             (acpi_size) header->length,
                                             (void *)&full_table);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X\n", header->signature, ACPI_FORMAT_UINT64(address->pointer.physical), header->length));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X",
+                                    header->signature,
+                                    ACPI_FORMAT_UINT64(address->pointer.
+                                                       physical),
+                                    header->length));
                         return (status);
                 }
 
@@ -362,8 +367,8 @@ acpi_tb_get_this_table(struct acpi_pointer *address,
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid address flags %X\n",
-                                  address->pointer_type));
+                ACPI_ERROR((AE_INFO, "Invalid address flags %X",
+                            address->pointer_type));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
diff --git a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c
index 8d72343537e7..134e5dce0bc1 100644
--- a/drivers/acpi/tables/tbgetall.c
+++ b/drivers/acpi/tables/tbgetall.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -152,7 +152,9 @@ acpi_tb_get_secondary_table(struct acpi_pointer *address,
         /* Signature must match request */
 
         if (ACPI_STRNCMP(header.signature, signature, ACPI_NAME_SIZE)) {
-                ACPI_REPORT_ERROR(("Incorrect table signature - wanted [%s] found [%4.4s]\n", signature, header.signature));
+                ACPI_ERROR((AE_INFO,
+                            "Incorrect table signature - wanted [%s] found [%4.4s]",
+                            signature, header.signature));
                 return_ACPI_STATUS(AE_BAD_SIGNATURE);
         }
 
@@ -231,14 +233,18 @@ acpi_status acpi_tb_get_required_tables(void)
                  */
                 status = acpi_tb_get_primary_table(&address, &table_info);
                 if ((status != AE_OK) && (status != AE_TABLE_NOT_SUPPORTED)) {
-                        ACPI_REPORT_WARNING(("%s, while getting table at %8.8X%8.8X\n", acpi_format_exception(status), ACPI_FORMAT_UINT64(address.pointer.value)));
+                        ACPI_WARNING((AE_INFO,
+                                      "%s, while getting table at %8.8X%8.8X",
+                                      acpi_format_exception(status),
+                                      ACPI_FORMAT_UINT64(address.pointer.
+                                                         value)));
                 }
         }
 
         /* We must have a FADT to continue */
 
         if (!acpi_gbl_FADT) {
-                ACPI_REPORT_ERROR(("No FADT present in RSDT/XSDT\n"));
+                ACPI_ERROR((AE_INFO, "No FADT present in RSDT/XSDT"));
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
 
@@ -248,7 +254,8 @@ acpi_status acpi_tb_get_required_tables(void)
          */
         status = acpi_tb_convert_table_fadt();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not convert FADT to internal common format\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Could not convert FADT to internal common format"));
                 return_ACPI_STATUS(status);
         }
 
@@ -258,8 +265,8 @@ acpi_status acpi_tb_get_required_tables(void)
 
         status = acpi_tb_get_secondary_table(&address, FACS_SIG, &table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not get/install the FACS, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not get/install the FACS"));
                 return_ACPI_STATUS(status);
         }
 
@@ -278,7 +285,7 @@ acpi_status acpi_tb_get_required_tables(void)
 
         status = acpi_tb_get_secondary_table(&address, DSDT_SIG, &table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not get/install the DSDT\n"));
+                ACPI_ERROR((AE_INFO, "Could not get/install the DSDT"));
                 return_ACPI_STATUS(status);
         }
 
@@ -292,7 +299,9 @@ acpi_status acpi_tb_get_required_tables(void)
                           "Hex dump of entire DSDT, size %d (0x%X), Integer width = %d\n",
                           acpi_gbl_DSDT->length, acpi_gbl_DSDT->length,
                           acpi_gbl_integer_bit_width));
-        ACPI_DUMP_BUFFER((u8 *) acpi_gbl_DSDT, acpi_gbl_DSDT->length);
+
+        ACPI_DUMP_BUFFER(ACPI_CAST_PTR(u8, acpi_gbl_DSDT),
+                         acpi_gbl_DSDT->length);
 
         /* Always delete the RSDP mapping, we are done with it */
 
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c
index 10db8484e462..7ffd0fddb4e5 100644
--- a/drivers/acpi/tables/tbinstal.c
+++ b/drivers/acpi/tables/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -128,8 +128,8 @@ acpi_status acpi_tb_install_table(struct acpi_table_desc *table_info)
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not acquire table mutex, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not acquire table mutex"));
                 return_ACPI_STATUS(status);
         }
 
@@ -146,9 +146,9 @@ acpi_status acpi_tb_install_table(struct acpi_table_desc *table_info)
 
         status = acpi_tb_init_table_descriptor(table_info->type, table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Could not install table [%4.4s], %s\n",
-                                   table_info->pointer->signature,
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not install table [%4.4s]",
+                                table_info->pointer->signature));
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s located at %p\n",
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index ad0252c2f7db..4d308220225d 100644
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -176,7 +176,7 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
 {
         int no_match;
 
-        ACPI_FUNCTION_NAME("tb_validate_rsdt");
+        ACPI_FUNCTION_ENTRY();
 
         /*
          * Search for appropriate signature, RSDT or XSDT
@@ -192,24 +192,24 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
         if (no_match) {
                 /* Invalid RSDT or XSDT signature */
 
-                ACPI_REPORT_ERROR(("Invalid signature where RSDP indicates RSDT/XSDT should be located\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Invalid signature where RSDP indicates RSDT/XSDT should be located. RSDP:"));
 
                 ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
 
-                ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR,
-                                      "RSDT/XSDT signature at %X (%p) is invalid\n",
-                                      acpi_gbl_RSDP->rsdt_physical_address,
-                                      (void *)(acpi_native_uint) acpi_gbl_RSDP->
-                                      rsdt_physical_address));
+                ACPI_ERROR((AE_INFO,
+                            "RSDT/XSDT signature at %X (%p) is invalid",
+                            acpi_gbl_RSDP->rsdt_physical_address,
+                            (void *)(acpi_native_uint) acpi_gbl_RSDP->
+                            rsdt_physical_address));
 
                 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
-                        ACPI_REPORT_ERROR(("Looking for RSDT\n"))
+                        ACPI_ERROR((AE_INFO, "Looking for RSDT"));
                 } else {
-                        ACPI_REPORT_ERROR(("Looking for XSDT\n"))
+                        ACPI_ERROR((AE_INFO, "Looking for XSDT"));
                 }
 
                 ACPI_DUMP_BUFFER((char *)table_ptr, 48);
-
                 return (AE_BAD_SIGNATURE);
         }
 
@@ -243,15 +243,13 @@ acpi_status acpi_tb_get_table_rsdt(void)
         table_info.type = ACPI_TABLE_XSDT;
         status = acpi_tb_get_table(&address, &table_info);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Could not get the RSDT/XSDT, %s\n",
-                                  acpi_format_exception(status)));
-
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not get the RSDT/XSDT"));
                 return_ACPI_STATUS(status);
         }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "RSDP located at %p, points to RSDT physical=%8.8X%8.8X \n",
+                          "RSDP located at %p, points to RSDT physical=%8.8X%8.8X\n",
                           acpi_gbl_RSDP,
                           ACPI_FORMAT_UINT64(address.pointer.value)));
 
diff --git a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c
index 4b2fbb592f49..bc571592f087 100644
--- a/drivers/acpi/tables/tbutils.c
+++ b/drivers/acpi/tables/tbutils.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,9 +94,8 @@ acpi_status acpi_tb_is_table_installed(struct acpi_table_desc *new_table_desc)
                      new_table_desc->pointer->length)
                     &&
                     (!ACPI_MEMCMP
-                     ((const char *)table_desc->pointer,
-                      (const char *)new_table_desc->pointer,
-                      (acpi_size) new_table_desc->pointer->length))) {
+                     (table_desc->pointer, new_table_desc->pointer,
+                      new_table_desc->pointer->length))) {
                         /* Match: this table is already installed */
 
                         ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
@@ -145,14 +144,13 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
 {
         acpi_name signature;
 
-        ACPI_FUNCTION_NAME("tb_validate_table_header");
+        ACPI_FUNCTION_ENTRY();
 
         /* Verify that this is a valid address */
 
         if (!acpi_os_readable(table_header, sizeof(struct acpi_table_header))) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Cannot read table header at %p\n",
-                                  table_header));
+                ACPI_ERROR((AE_INFO,
+                            "Cannot read table header at %p", table_header));
 
                 return (AE_BAD_ADDRESS);
         }
@@ -161,12 +159,12 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
 
         ACPI_MOVE_32_TO_32(&signature, table_header->signature);
         if (!acpi_ut_valid_acpi_name(signature)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Table signature at %p [%p] has invalid characters\n",
-                                  table_header, &signature));
+                ACPI_ERROR((AE_INFO,
+                            "Table signature at %p [%p] has invalid characters",
+                            table_header, &signature));
 
-                ACPI_REPORT_WARNING(("Invalid table signature found: [%4.4s]\n",
-                                     (char *)&signature));
+                ACPI_WARNING((AE_INFO, "Invalid table signature found: [%4.4s]",
+                              ACPI_CAST_PTR(char, &signature)));
 
                 ACPI_DUMP_BUFFER(table_header,
                                  sizeof(struct acpi_table_header));
@@ -176,11 +174,13 @@ acpi_tb_validate_table_header(struct acpi_table_header *table_header)
         /* Validate the table length */
 
         if (table_header->length < sizeof(struct acpi_table_header)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Invalid length in table header %p name %4.4s\n",
-                                  table_header, (char *)&signature));
+                ACPI_ERROR((AE_INFO,
+                            "Invalid length in table header %p name %4.4s",
+                            table_header, (char *)&signature));
 
-                ACPI_REPORT_WARNING(("Invalid table header length (0x%X) found\n", (u32) table_header->length));
+                ACPI_WARNING((AE_INFO,
+                              "Invalid table header length (0x%X) found",
+                              (u32) table_header->length));
 
                 ACPI_DUMP_BUFFER(table_header,
                                  sizeof(struct acpi_table_header));
@@ -219,7 +219,10 @@ acpi_tb_verify_table_checksum(struct acpi_table_header * table_header)
         /* Return the appropriate exception */
 
         if (checksum) {
-                ACPI_REPORT_WARNING(("Invalid checksum in table [%4.4s] (%02X, sum %02X is not zero)\n", table_header->signature, (u32) table_header->checksum, (u32) checksum));
+                ACPI_WARNING((AE_INFO,
+                              "Invalid checksum in table [%4.4s] (%02X, sum %02X is not zero)",
+                              table_header->signature,
+                              (u32) table_header->checksum, (u32) checksum));
 
                 status = AE_BAD_CHECKSUM;
         }
@@ -241,16 +244,16 @@ acpi_tb_verify_table_checksum(struct acpi_table_header * table_header)
 
 u8 acpi_tb_generate_checksum(void *buffer, u32 length)
 {
-        const u8 *limit;
-        const u8 *rover;
+        u8 *end_buffer;
+        u8 *rover;
         u8 sum = 0;
 
         if (buffer && length) {
                 /*  Buffer and Length are valid   */
 
-                limit = (u8 *) buffer + length;
+                end_buffer = ACPI_ADD_PTR(u8, buffer, length);
 
-                for (rover = buffer; rover < limit; rover++) {
+                for (rover = buffer; rover < end_buffer; rover++) {
                         sum = (u8) (sum + *rover);
                 }
         }
@@ -292,8 +295,7 @@ acpi_tb_handle_to_object(u16 table_id,
                 }
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "table_id=%X does not exist\n",
-                          table_id));
+        ACPI_ERROR((AE_INFO, "table_id=%X does not exist", table_id));
         return (AE_BAD_PARAMETER);
 }
 #endif
diff --git a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c
index 3f96a4909aad..9fe53c9d5b9a 100644
--- a/drivers/acpi/tables/tbxface.c
+++ b/drivers/acpi/tables/tbxface.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,8 +75,7 @@ acpi_status acpi_load_tables(void)
         status = acpi_os_get_root_pointer(ACPI_LOGICAL_ADDRESSING,
                                           &rsdp_address);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Could not get RSDP, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Could not get the RSDP"));
                 goto error_exit;
         }
 
@@ -86,7 +85,7 @@ acpi_status acpi_load_tables(void)
 
         status = acpi_tb_verify_rsdp(&rsdp_address);
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: RSDP Failed validation: %s\n", acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During RSDP validation"));
                 goto error_exit;
         }
 
@@ -94,7 +93,7 @@ acpi_status acpi_load_tables(void)
 
         status = acpi_tb_get_table_rsdt();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Could not load RSDT: %s\n", acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Could not load RSDT"));
                 goto error_exit;
         }
 
@@ -102,7 +101,8 @@ acpi_status acpi_load_tables(void)
 
         status = acpi_tb_get_required_tables();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Error getting required tables (DSDT/FADT/FACS): %s\n", acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Could not get all required tables (DSDT/FADT/FACS)"));
                 goto error_exit;
         }
 
@@ -112,16 +112,14 @@ acpi_status acpi_load_tables(void)
 
         status = acpi_ns_load_namespace();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("acpi_load_tables: Could not load namespace: %s\n", acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Could not load namespace"));
                 goto error_exit;
         }
 
         return_ACPI_STATUS(AE_OK);
 
       error_exit:
-        ACPI_REPORT_ERROR(("acpi_load_tables: Could not load tables: %s\n",
-                           acpi_format_exception(status)));
-
+        ACPI_EXCEPTION((AE_INFO, status, "Could not load tables"));
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 3b8a7e063e8a..a62db6af83c9 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -251,7 +251,7 @@ acpi_get_firmware_table(acpi_string signature,
 
         acpi_tb_get_rsdt_address(&address);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "RSDP located at %p, RSDT physical=%8.8X%8.8X \n",
+                          "RSDP located at %p, RSDT physical=%8.8X%8.8X\n",
                           acpi_gbl_RSDP,
                           ACPI_FORMAT_UINT64(address.pointer.value)));
 
@@ -396,9 +396,8 @@ acpi_status acpi_find_root_pointer(u32 flags, struct acpi_pointer *rsdp_address)
 
         status = acpi_tb_find_rsdp(&table_info, flags);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "RSDP structure not found, %s Flags=%X\n",
-                                  acpi_format_exception(status), flags));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "RSDP structure not found - Flags=%X", flags));
 
                 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
         }
@@ -503,10 +502,10 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                             ACPI_EBDA_PTR_LENGTH,
                                             (void *)&table_ptr);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not map memory at %8.8X for length %X\n",
-                                          ACPI_EBDA_PTR_LOCATION,
-                                          ACPI_EBDA_PTR_LENGTH));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not map memory at %8.8X for length %X",
+                                    ACPI_EBDA_PTR_LOCATION,
+                                    ACPI_EBDA_PTR_LENGTH));
 
                         return_ACPI_STATUS(status);
                 }
@@ -530,10 +529,10 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                                     ACPI_EBDA_WINDOW_SIZE,
                                                     (void *)&table_ptr);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Could not map memory at %8.8X for length %X\n",
-                                                  physical_address,
-                                                  ACPI_EBDA_WINDOW_SIZE));
+                                ACPI_ERROR((AE_INFO,
+                                            "Could not map memory at %8.8X for length %X",
+                                            physical_address,
+                                            ACPI_EBDA_WINDOW_SIZE));
 
                                 return_ACPI_STATUS(status);
                         }
@@ -563,10 +562,10 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                             (void *)&table_ptr);
 
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Could not map memory at %8.8X for length %X\n",
-                                          ACPI_HI_RSDP_WINDOW_BASE,
-                                          ACPI_HI_RSDP_WINDOW_SIZE));
+                        ACPI_ERROR((AE_INFO,
+                                    "Could not map memory at %8.8X for length %X",
+                                    ACPI_HI_RSDP_WINDOW_BASE,
+                                    ACPI_HI_RSDP_WINDOW_SIZE));
 
                         return_ACPI_STATUS(status);
                 }
@@ -635,7 +634,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
         /* A valid RSDP was not found */
 
-        ACPI_REPORT_ERROR(("No valid RSDP was found\n"));
+        ACPI_ERROR((AE_INFO, "No valid RSDP was found"));
         return_ACPI_STATUS(AE_NOT_FOUND);
 }
 
diff --git a/drivers/acpi/utilities/Makefile b/drivers/acpi/utilities/Makefile
index e87108b7338a..88eff14c4894 100644
--- a/drivers/acpi/utilities/Makefile
+++ b/drivers/acpi/utilities/Makefile
@@ -2,7 +2,8 @@
 # Makefile for all Linux ACPI interpreter subdirectories
 #
 
-obj-y := utalloc.o  utdebug.o   uteval.o    utinit.o  utmisc.o    utxface.o \
-         utcopy.o   utdelete.o  utglobal.o  utmath.o  utobject.o utstate.o utmutex.o utobject.o utcache.o
+obj-y := utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
+                utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
+                utstate.o utmutex.o utobject.o utcache.o utresrc.o
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 068450b36475..03b0044974c2 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 ACPI_MODULE_NAME("utalloc")
 
 /* Local prototypes */
-#ifdef  ACPI_DBG_TRACK_ALLOCATIONS
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
 static struct acpi_debug_mem_block *acpi_ut_find_allocation(void *allocation);
 
 static acpi_status
@@ -58,9 +58,7 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *address,
 static acpi_status
 acpi_ut_remove_allocation(struct acpi_debug_mem_block *address,
                           u32 component, char *module, u32 line);
-#endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
 
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
 static acpi_status
 acpi_ut_create_list(char *list_name,
                     u16 object_size, struct acpi_memory_list **return_cache);
@@ -303,8 +301,8 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
         /* Check for an inadvertent size of zero bytes */
 
         if (!size) {
-                _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_allocate: Attempt to allocate zero bytes\n"));
+                ACPI_ERROR((module, line,
+                            "ut_allocate: Attempt to allocate zero bytes, allocating 1 byte"));
                 size = 1;
         }
 
@@ -312,9 +310,9 @@ void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
         if (!allocation) {
                 /* Report allocation error */
 
-                _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_allocate: Could not allocate size %X\n",
-                                    (u32) size));
+                ACPI_ERROR((module, line,
+                            "ut_allocate: Could not allocate size %X",
+                            (u32) size));
 
                 return_PTR(NULL);
         }
@@ -346,18 +344,17 @@ void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)
         /* Check for an inadvertent size of zero bytes */
 
         if (!size) {
-                _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_callocate: Attempt to allocate zero bytes\n"));
-                return_PTR(NULL);
+                ACPI_ERROR((module, line,
+                            "Attempt to allocate zero bytes, allocating 1 byte"));
+                size = 1;
         }
 
         allocation = acpi_os_allocate(size);
         if (!allocation) {
                 /* Report allocation error */
 
-                _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_callocate: Could not allocate size %X\n",
-                                    (u32) size));
+                ACPI_ERROR((module, line,
+                            "Could not allocate size %X", (u32) size));
                 return_PTR(NULL);
         }
 
@@ -482,9 +479,8 @@ void *acpi_ut_callocate_and_track(acpi_size size,
         if (!allocation) {
                 /* Report allocation error */
 
-                _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_callocate: Could not allocate size %X\n",
-                                    (u32) size));
+                ACPI_ERROR((module, line,
+                            "Could not allocate size %X", (u32) size));
                 return (NULL);
         }
 
@@ -526,8 +522,7 @@ acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)
         ACPI_FUNCTION_TRACE_PTR("ut_free", allocation);
 
         if (NULL == allocation) {
-                _ACPI_REPORT_ERROR(module, line, component,
-                                   ("acpi_ut_free: Attempt to delete a NULL address\n"));
+                ACPI_ERROR((module, line, "Attempt to delete a NULL address"));
 
                 return_VOID;
         }
@@ -542,14 +537,11 @@ acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)
         status = acpi_ut_remove_allocation(debug_block,
                                            component, module, line);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Could not free memory, %s\n",
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "Could not free memory"));
         }
 
         acpi_os_free(debug_block);
-
         ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "%p freed\n", allocation));
-
         return_VOID;
 }
 
@@ -626,10 +618,12 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
          */
         element = acpi_ut_find_allocation(allocation);
         if (element) {
-                ACPI_REPORT_ERROR(("ut_track_allocation: Allocation already present in list! (%p)\n", allocation));
+                ACPI_ERROR((AE_INFO,
+                            "ut_track_allocation: Allocation already present in list! (%p)",
+                            allocation));
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Element %p Address %p\n",
-                                  element, allocation));
+                ACPI_ERROR((AE_INFO, "Element %p Address %p",
+                            element, allocation));
 
                 goto unlock_and_exit;
         }
@@ -689,8 +683,8 @@ acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
         if (NULL == mem_list->list_head) {
                 /* No allocations! */
 
-                _ACPI_REPORT_ERROR(module, line, component,
-                                   ("ut_remove_allocation: Empty allocation list, nothing to free!\n"));
+                ACPI_ERROR((module, line,
+                            "Empty allocation list, nothing to free!"));
 
                 return_ACPI_STATUS(AE_OK);
         }
@@ -865,12 +859,11 @@ void acpi_ut_dump_allocations(u32 component, char *module)
         /* Print summary */
 
         if (!num_outstanding) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "No outstanding allocations.\n"));
+                ACPI_INFO((AE_INFO, "No outstanding allocations"));
         } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%d(%X) Outstanding allocations\n",
-                                  num_outstanding, num_outstanding));
+                ACPI_ERROR((AE_INFO,
+                            "%d(%X) Outstanding allocations",
+                            num_outstanding, num_outstanding));
         }
 
         return_VOID;
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 93d48681d276..2177cb1ef2c4 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c
index 5442b32de611..df2d32096b72 100644
--- a/drivers/acpi/utilities/utcopy.c
+++ b/drivers/acpi/utilities/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -398,14 +398,17 @@ acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *internal_object,
                  * Build a simple object (no nested objects)
                  */
                 status = acpi_ut_copy_isimple_to_esimple(internal_object,
-                                                         (union acpi_object *)
-                                                         ret_buffer->pointer,
-                                                         ((u8 *) ret_buffer->
-                                                          pointer +
-                                                          ACPI_ROUND_UP_TO_NATIVE_WORD
-                                                          (sizeof
-                                                           (union
-                                                            acpi_object))),
+                                                         ACPI_CAST_PTR(union
+                                                                       acpi_object,
+                                                                       ret_buffer->
+                                                                       pointer),
+                                                         ACPI_ADD_PTR(u8,
+                                                                      ret_buffer->
+                                                                      pointer,
+                                                                      ACPI_ROUND_UP_TO_NATIVE_WORD
+                                                                      (sizeof
+                                                                       (union
+                                                                        acpi_object))),
                                                          &ret_buffer->length);
                 /*
                  * build simple does not include the object size in the length
@@ -603,8 +606,8 @@ acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
                 /*
                  * Packages as external input to control methods are not supported,
                  */
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Packages as parameters not implemented!\n"));
+                ACPI_ERROR((AE_INFO,
+                            "Packages as parameters not implemented!"));
 
                 return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
         }
@@ -867,7 +870,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
                                                          count +
                                                          1) * sizeof(void *));
         if (!dest_obj->package.elements) {
-                ACPI_REPORT_ERROR(("aml_build_copy_internal_package_object: Package allocation failure\n"));
+                ACPI_ERROR((AE_INFO, "Package allocation failure"));
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c
index d80e92639932..35f3d581e034 100644
--- a/drivers/acpi/utilities/utdebug.c
+++ b/drivers/acpi/utilities/utdebug.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c
index 2bc878f7a127..1db9695b0029 100644
--- a/drivers/acpi/utilities/utdelete.c
+++ b/drivers/acpi/utilities/utdelete.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -363,8 +363,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown action (%X)\n",
-                                  action));
+                ACPI_ERROR((AE_INFO, "Unknown action (%X)", action));
                 break;
         }
 
@@ -374,9 +373,9 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
          */
         if (count > ACPI_MAX_REFERENCE_COUNT) {
 
-                ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                  "**** Warning **** Large Reference Count (%X) in object %p\n\n",
-                                  count, object));
+                ACPI_WARNING((AE_INFO,
+                              "Large Reference Count (%X) in object %p",
+                              count, object));
         }
 
         return;
@@ -535,8 +534,8 @@ acpi_ut_update_object_reference(union acpi_operand_object * object, u16 action)
 
       error_exit:
 
-        ACPI_REPORT_ERROR(("Could not update object reference count, %s\n",
-                           acpi_format_exception(status)));
+        ACPI_EXCEPTION((AE_INFO, status,
+                        "Could not update object reference count"));
 
         return_ACPI_STATUS(status);
 }
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index 7b81d5ef3c32..106cc97cb4af 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,9 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
 
         for (i = 0; i < ACPI_NUM_OSI_STRINGS; i++) {
                 if (!ACPI_STRCMP(string_desc->string.pointer,
-                                 (char *)acpi_gbl_valid_osi_strings[i])) {
+                                 ACPI_CAST_PTR(char,
+                                               acpi_gbl_valid_osi_strings[i])))
+                {
                         /* This string is supported */
 
                         return_desc->integer.value = 0xFFFFFFFF;
@@ -152,8 +154,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
                                           acpi_ut_get_node_name(prefix_node),
                                           path));
                 } else {
-                        ACPI_REPORT_METHOD_ERROR("Method execution failed",
-                                                 prefix_node, path, status);
+                        ACPI_ERROR_METHOD("Method execution failed",
+                                          prefix_node, path, status);
                 }
 
                 return_ACPI_STATUS(status);
@@ -163,9 +165,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 
         if (!info.return_object) {
                 if (expected_return_btypes) {
-                        ACPI_REPORT_METHOD_ERROR("No object was returned from",
-                                                 prefix_node, path,
-                                                 AE_NOT_EXIST);
+                        ACPI_ERROR_METHOD("No object was returned from",
+                                          prefix_node, path, AE_NOT_EXIST);
 
                         return_ACPI_STATUS(AE_NOT_EXIST);
                 }
@@ -210,15 +211,14 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
         /* Is the return object one of the expected types? */
 
         if (!(expected_return_btypes & return_btype)) {
-                ACPI_REPORT_METHOD_ERROR("Return object type is incorrect",
-                                         prefix_node, path, AE_TYPE);
+                ACPI_ERROR_METHOD("Return object type is incorrect",
+                                  prefix_node, path, AE_TYPE);
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Type returned from %s was incorrect: %s, expected Btypes: %X\n",
-                                  path,
-                                  acpi_ut_get_object_type_name(info.
-                                                               return_object),
-                                  expected_return_btypes));
+                ACPI_ERROR((AE_INFO,
+                            "Type returned from %s was incorrect: %s, expected Btypes: %X",
+                            path,
+                            acpi_ut_get_object_type_name(info.return_object),
+                            expected_return_btypes));
 
                 /* On error exit, we must delete the return object */
 
@@ -592,7 +592,7 @@ acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 * flags)
                                           "_STA on %4.4s was not found, assuming device is present\n",
                                           acpi_ut_get_node_name(device_node)));
 
-                        *flags = 0x0F;
+                        *flags = ACPI_UINT32_MAX;
                         status = AE_OK;
                 }
 
@@ -637,17 +637,17 @@ acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest)
         for (i = 0; i < 4; i++) {
                 highest[i] = 0xFF;
                 status = acpi_ut_evaluate_object(device_node,
-                                                 (char *)
-                                                 acpi_gbl_highest_dstate_names
-                                                 [i], ACPI_BTYPE_INTEGER,
-                                                 &obj_desc);
+                                                 ACPI_CAST_PTR(char,
+                                                               acpi_gbl_highest_dstate_names
+                                                               [i]),
+                                                 ACPI_BTYPE_INTEGER, &obj_desc);
                 if (ACPI_FAILURE(status)) {
                         if (status != AE_NOT_FOUND) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                                                   "%s on Device %4.4s, %s\n",
-                                                  (char *)
-                                                  acpi_gbl_highest_dstate_names
-                                                  [i],
+                                                  ACPI_CAST_PTR(char,
+                                                                acpi_gbl_highest_dstate_names
+                                                                [i]),
                                                   acpi_ut_get_node_name
                                                   (device_node),
                                                   acpi_format_exception
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index 399e64b51886..ffd13383a325 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,8 +67,11 @@ const char *acpi_format_exception(acpi_status status)
         acpi_status sub_status;
         const char *exception = NULL;
 
-        ACPI_FUNCTION_NAME("format_exception");
+        ACPI_FUNCTION_ENTRY();
 
+        /*
+         * Status is composed of two parts, a "type" and an actual code
+         */
         sub_status = (status & ~AE_CODE_MASK);
 
         switch (status & AE_CODE_MASK) {
@@ -118,13 +121,13 @@ const char *acpi_format_exception(acpi_status status)
         if (!exception) {
                 /* Exception code was not recognized */
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unknown exception code: 0x%8.8X\n", status));
+                ACPI_ERROR((AE_INFO,
+                            "Unknown exception code: 0x%8.8X", status));
 
-                return ((const char *)"UNKNOWN_STATUS_CODE");
+                exception = "UNKNOWN_STATUS_CODE";
         }
 
-        return ((const char *)exception);
+        return (ACPI_CAST_PTR(const char, exception));
 }
 
 /*******************************************************************************
@@ -217,23 +220,23 @@ const char *acpi_gbl_valid_osi_strings[ACPI_NUM_OSI_STRINGS] = {
  * 2) _TZ_ is defined to be a thermal zone in order to allow ASL code to
  *    perform a Notify() operation on it.
  */
-const struct acpi_predefined_names acpi_gbl_pre_defined_names[] =
-    { {"_GPE", ACPI_TYPE_LOCAL_SCOPE, NULL},
-{"_PR_", ACPI_TYPE_LOCAL_SCOPE, NULL},
-{"_SB_", ACPI_TYPE_DEVICE, NULL},
-{"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL},
-{"_TZ_", ACPI_TYPE_THERMAL, NULL},
-{"_REV", ACPI_TYPE_INTEGER, (char *)ACPI_CA_SUPPORT_LEVEL},
-{"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME},
-{"_GL_", ACPI_TYPE_MUTEX, (char *)1},
+const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = {
+        {"_GPE", ACPI_TYPE_LOCAL_SCOPE, NULL},
+        {"_PR_", ACPI_TYPE_LOCAL_SCOPE, NULL},
+        {"_SB_", ACPI_TYPE_DEVICE, NULL},
+        {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL},
+        {"_TZ_", ACPI_TYPE_THERMAL, NULL},
+        {"_REV", ACPI_TYPE_INTEGER, (char *)ACPI_CA_SUPPORT_LEVEL},
+        {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME},
+        {"_GL_", ACPI_TYPE_MUTEX, (char *)1},
 
 #if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY)
-{"_OSI", ACPI_TYPE_METHOD, (char *)1},
+        {"_OSI", ACPI_TYPE_METHOD, (char *)1},
 #endif
 
         /* Table terminator */
 
-{NULL, ACPI_TYPE_ANY, NULL}
+        {NULL, ACPI_TYPE_ANY, NULL}
 };
 
 /*
@@ -485,7 +488,7 @@ char *acpi_ut_get_region_name(u8 space_id)
                 return ("invalid_space_id");
         }
 
-        return ((char *)acpi_gbl_region_types[space_id]);
+        return (ACPI_CAST_PTR(char, acpi_gbl_region_types[space_id]));
 }
 
 /*******************************************************************************
@@ -503,11 +506,13 @@ char *acpi_ut_get_region_name(u8 space_id)
 /* Event type decoding */
 
 static const char *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] = {
+/*! [Begin] no source code translation (keep these strings as-is) */
         "PM_Timer",
-        "global_lock",
-        "power_button",
-        "sleep_button",
-        "real_time_clock",
+        "GlobalLock",
+        "PowerButton",
+        "SleepButton",
+        "RealTimeClock",
+/*! [End] no source code translation !*/
 };
 
 char *acpi_ut_get_event_name(u32 event_id)
@@ -517,7 +522,7 @@ char *acpi_ut_get_event_name(u32 event_id)
                 return ("invalid_event_iD");
         }
 
-        return ((char *)acpi_gbl_event_types[event_id]);
+        return (ACPI_CAST_PTR(char, acpi_gbl_event_types[event_id]));
 }
 
 /*******************************************************************************
@@ -545,12 +550,13 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
 /* Printable names of the ACPI object types */
 
 static const char *acpi_gbl_ns_type_names[] = {
+/*! [Begin] no source code translation (keep these strings as-is) */
         /* 00 */ "Untyped",
         /* 01 */ "Integer",
         /* 02 */ "String",
         /* 03 */ "Buffer",
         /* 04 */ "Package",
-        /* 05 */ "field_unit",
+        /* 05 */ "FieldUnit",
         /* 06 */ "Device",
         /* 07 */ "Event",
         /* 08 */ "Method",
@@ -559,33 +565,34 @@ static const char *acpi_gbl_ns_type_names[] = {
         /* 11 */ "Power",
         /* 12 */ "Processor",
         /* 13 */ "Thermal",
-        /* 14 */ "buffer_field",
-        /* 15 */ "ddb_handle",
-        /* 16 */ "debug_object",
-        /* 17 */ "region_field",
-        /* 18 */ "bank_field",
-        /* 19 */ "index_field",
+        /* 14 */ "BufferField",
+        /* 15 */ "DdbHandle",
+        /* 16 */ "DebugObject",
+        /* 17 */ "RegionField",
+        /* 18 */ "BankField",
+        /* 19 */ "IndexField",
         /* 20 */ "Reference",
         /* 21 */ "Alias",
-        /* 22 */ "method_alias",
+        /* 22 */ "MethodAlias",
         /* 23 */ "Notify",
-        /* 24 */ "addr_handler",
-        /* 25 */ "resource_desc",
-        /* 26 */ "resource_fld",
+        /* 24 */ "AddrHandler",
+        /* 25 */ "ResourceDesc",
+        /* 26 */ "ResourceFld",
         /* 27 */ "Scope",
         /* 28 */ "Extra",
         /* 29 */ "Data",
         /* 30 */ "Invalid"
+/*! [End] no source code translation !*/
 };
 
 char *acpi_ut_get_type_name(acpi_object_type type)
 {
 
         if (type > ACPI_TYPE_INVALID) {
-                return ((char *)acpi_gbl_bad_type);
+                return (ACPI_CAST_PTR(char, acpi_gbl_bad_type));
         }
 
-        return ((char *)acpi_gbl_ns_type_names[type]);
+        return (ACPI_CAST_PTR(char, acpi_gbl_ns_type_names[type]));
 }
 
 char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
@@ -634,7 +641,7 @@ char *acpi_ut_get_node_name(void *object)
 
         /* Name must be a valid ACPI name */
 
-        if (!acpi_ut_valid_acpi_name(*(u32 *) node->name.ascii)) {
+        if (!acpi_ut_valid_acpi_name(node->name.integer)) {
                 return ("????");
         }
 
@@ -658,15 +665,16 @@ char *acpi_ut_get_node_name(void *object)
 /* Printable names of object descriptor types */
 
 static const char *acpi_gbl_desc_type_names[] = {
+/*! [Begin] no source code translation (keep these ASL Keywords as-is) */
         /* 00 */ "Invalid",
         /* 01 */ "Cached",
         /* 02 */ "State-Generic",
         /* 03 */ "State-Update",
         /* 04 */ "State-Package",
         /* 05 */ "State-Control",
-        /* 06 */ "State-root_parse_scope",
-        /* 07 */ "State-parse_scope",
-        /* 08 */ "State-walk_scope",
+        /* 06 */ "State-RootParseScope",
+        /* 07 */ "State-ParseScope",
+        /* 08 */ "State-WalkScope",
         /* 09 */ "State-Result",
         /* 10 */ "State-Notify",
         /* 11 */ "State-Thread",
@@ -674,6 +682,7 @@ static const char *acpi_gbl_desc_type_names[] = {
         /* 13 */ "Parser",
         /* 14 */ "Operand",
         /* 15 */ "Node"
+/*! [End] no source code translation !*/
 };
 
 char *acpi_ut_get_descriptor_name(void *object)
@@ -684,11 +693,12 @@ char *acpi_ut_get_descriptor_name(void *object)
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE(object) > ACPI_DESC_TYPE_MAX) {
-                return ((char *)acpi_gbl_bad_type);
+                return (ACPI_CAST_PTR(char, acpi_gbl_bad_type));
         }
 
-        return ((char *)
-                acpi_gbl_desc_type_names[ACPI_GET_DESCRIPTOR_TYPE(object)]);
+        return (ACPI_CAST_PTR(char,
+                              acpi_gbl_desc_type_names[ACPI_GET_DESCRIPTOR_TYPE
+                                                       (object)]));
 
 }
 
@@ -787,6 +797,11 @@ void acpi_ut_init_globals(void)
                 acpi_gbl_mutex_info[i].use_count = 0;
         }
 
+        for (i = 0; i < ACPI_NUM_OWNERID_MASKS; i++) {
+                acpi_gbl_owner_id_mask[i] = 0;
+        }
+        acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS - 1] = 0x80000000;        /* Last ID is never valid */
+
         /* GPE support */
 
         acpi_gbl_gpe_xrupt_list_head = NULL;
@@ -824,7 +839,11 @@ void acpi_ut_init_globals(void)
         acpi_gbl_ns_lookup_count = 0;
         acpi_gbl_ps_find_count = 0;
         acpi_gbl_acpi_hardware_present = TRUE;
-        acpi_gbl_owner_id_mask = 0;
+        acpi_gbl_last_owner_id_index = 0;
+        acpi_gbl_next_owner_id_offset = 0;
+        acpi_gbl_trace_method_name = 0;
+        acpi_gbl_trace_dbg_level = 0;
+        acpi_gbl_trace_dbg_layer = 0;
         acpi_gbl_debugger_configuration = DEBUGGER_THREADING;
         acpi_gbl_db_output_flags = ACPI_DB_CONSOLE_OUTPUT;
 
@@ -836,7 +855,6 @@ void acpi_ut_init_globals(void)
         /* Namespace */
 
         acpi_gbl_root_node = NULL;
-
         acpi_gbl_root_node_struct.name.integer = ACPI_ROOT_NAME;
         acpi_gbl_root_node_struct.descriptor = ACPI_DESC_TYPE_NAMED;
         acpi_gbl_root_node_struct.type = ACPI_TYPE_DEVICE;
diff --git a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c
index 9dde82b0beaf..ba771b4f39bc 100644
--- a/drivers/acpi/utilities/utinit.c
+++ b/drivers/acpi/utilities/utinit.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,9 +72,9 @@ static void
 acpi_ut_fadt_register_error(char *register_name, u32 value, acpi_size offset)
 {
 
-        ACPI_REPORT_WARNING(("Invalid FADT value %s=%X at offset %X FADT=%p\n",
-                             register_name, value, (u32) offset,
-                             acpi_gbl_FADT));
+        ACPI_WARNING((AE_INFO,
+                      "Invalid FADT value %s=%X at offset %X FADT=%p",
+                      register_name, value, (u32) offset, acpi_gbl_FADT));
 }
 
 /******************************************************************************
@@ -221,15 +221,14 @@ void acpi_ut_subsystem_shutdown(void)
         /* Just exit if subsystem is already shutdown */
 
         if (acpi_gbl_shutdown) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "ACPI Subsystem is already terminated\n"));
+                ACPI_ERROR((AE_INFO, "ACPI Subsystem is already terminated"));
                 return_VOID;
         }
 
         /* Subsystem appears active, go ahead and shut it down */
 
         acpi_gbl_shutdown = TRUE;
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem...\n"));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Shutting down ACPI Subsystem\n"));
 
         /* Close the acpi_event Handling */
 
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c
index 68a0a6f94129..4a3360484e72 100644
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/utilities/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,7 @@ acpi_ut_short_divide(acpi_integer dividend,
         /* Always check for a zero divisor */
 
         if (divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n"));
+                ACPI_ERROR((AE_INFO, "Divide by zero"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
@@ -144,7 +144,7 @@ acpi_ut_divide(acpi_integer in_dividend,
         /* Always check for a zero divisor */
 
         if (in_divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n"));
+                ACPI_ERROR((AE_INFO, "Divide by zero"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
@@ -266,7 +266,7 @@ acpi_ut_short_divide(acpi_integer in_dividend,
         /* Always check for a zero divisor */
 
         if (divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n"));
+                ACPI_ERROR((AE_INFO, "Divide by zero"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
@@ -292,7 +292,7 @@ acpi_ut_divide(acpi_integer in_dividend,
         /* Always check for a zero divisor */
 
         if (in_divisor == 0) {
-                ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n"));
+                ACPI_ERROR((AE_INFO, "Divide by zero"));
                 return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
         }
 
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 2ce872d75890..7364f5f8c9cd 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,6 +63,8 @@ ACPI_MODULE_NAME("utmisc")
 acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
 {
         acpi_native_uint i;
+        acpi_native_uint j;
+        acpi_native_uint k;
         acpi_status status;
 
         ACPI_FUNCTION_TRACE("ut_allocate_owner_id");
@@ -70,8 +72,8 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
         /* Guard against multiple allocations of ID to the same location */
 
         if (*owner_id) {
-                ACPI_REPORT_ERROR(("Owner ID [%2.2X] already exists\n",
-                                   *owner_id));
+                ACPI_ERROR((AE_INFO, "Owner ID [%2.2X] already exists",
+                            *owner_id));
                 return_ACPI_STATUS(AE_ALREADY_EXISTS);
         }
 
@@ -82,31 +84,67 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
                 return_ACPI_STATUS(status);
         }
 
-        /* Find a free owner ID */
+        /*
+         * Find a free owner ID, cycle through all possible IDs on repeated
+         * allocations. (ACPI_NUM_OWNERID_MASKS + 1) because first index may have
+         * to be scanned twice.
+         */
+        for (i = 0, j = acpi_gbl_last_owner_id_index;
+             i < (ACPI_NUM_OWNERID_MASKS + 1); i++, j++) {
+                if (j >= ACPI_NUM_OWNERID_MASKS) {
+                        j = 0;  /* Wraparound to start of mask array */
+                }
+
+                for (k = acpi_gbl_next_owner_id_offset; k < 32; k++) {
+                        if (acpi_gbl_owner_id_mask[j] == ACPI_UINT32_MAX) {
+                                /* There are no free IDs in this mask */
 
-        for (i = 0; i < 64; i++) {
-                if (!(acpi_gbl_owner_id_mask & (1ULL << i))) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_VALUES,
-                                          "Current owner_id mask: %16.16LX New ID: %2.2X\n",
-                                          acpi_gbl_owner_id_mask,
-                                          (unsigned int)(i + 1)));
+                                break;
+                        }
 
-                        acpi_gbl_owner_id_mask |= (1ULL << i);
-                        *owner_id = (acpi_owner_id) (i + 1);
-                        goto exit;
+                        if (!(acpi_gbl_owner_id_mask[j] & (1 << k))) {
+                                /*
+                                 * Found a free ID. The actual ID is the bit index plus one,
+                                 * making zero an invalid Owner ID. Save this as the last ID
+                                 * allocated and update the global ID mask.
+                                 */
+                                acpi_gbl_owner_id_mask[j] |= (1 << k);
+
+                                acpi_gbl_last_owner_id_index = (u8) j;
+                                acpi_gbl_next_owner_id_offset = (u8) (k + 1);
+
+                                /*
+                                 * Construct encoded ID from the index and bit position
+                                 *
+                                 * Note: Last [j].k (bit 255) is never used and is marked
+                                 * permanently allocated (prevents +1 overflow)
+                                 */
+                                *owner_id =
+                                    (acpi_owner_id) ((k + 1) + ACPI_MUL_32(j));
+
+                                ACPI_DEBUG_PRINT((ACPI_DB_VALUES,
+                                                  "Allocated owner_id: %2.2X\n",
+                                                  (unsigned int)*owner_id));
+                                goto exit;
+                        }
                 }
+
+                acpi_gbl_next_owner_id_offset = 0;
         }
 
         /*
-         * If we are here, all owner_ids have been allocated. This probably should
+         * All owner_ids have been allocated. This typically should
          * not happen since the IDs are reused after deallocation. The IDs are
          * allocated upon table load (one per table) and method execution, and
          * they are released when a table is unloaded or a method completes
          * execution.
+         *
+         * If this error happens, there may be very deep nesting of invoked control
+         * methods, or there may be a bug where the IDs are not released.
          */
-        *owner_id = 0;
         status = AE_OWNER_ID_LIMIT;
-        ACPI_REPORT_ERROR(("Could not allocate new owner_id (64 max), AE_OWNER_ID_LIMIT\n"));
+        ACPI_ERROR((AE_INFO,
+                    "Could not allocate new owner_id (255 max), AE_OWNER_ID_LIMIT"));
 
       exit:
         (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
@@ -123,7 +161,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
  *              control method or unloading a table. Either way, we would
  *              ignore any error anyway.
  *
- * DESCRIPTION: Release a table or method owner ID.  Valid IDs are 1 - 64
+ * DESCRIPTION: Release a table or method owner ID.  Valid IDs are 1 - 255
  *
  ******************************************************************************/
 
@@ -131,6 +169,8 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
 {
         acpi_owner_id owner_id = *owner_id_ptr;
         acpi_status status;
+        acpi_native_uint index;
+        u32 bit;
 
         ACPI_FUNCTION_TRACE_U32("ut_release_owner_id", owner_id);
 
@@ -140,8 +180,8 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
 
         /* Zero is not a valid owner_iD */
 
-        if ((owner_id == 0) || (owner_id > 64)) {
-                ACPI_REPORT_ERROR(("Invalid owner_id: %2.2X\n", owner_id));
+        if (owner_id == 0) {
+                ACPI_ERROR((AE_INFO, "Invalid owner_id: %2.2X", owner_id));
                 return_VOID;
         }
 
@@ -156,10 +196,19 @@ void acpi_ut_release_owner_id(acpi_owner_id * owner_id_ptr)
 
         owner_id--;
 
+        /* Decode ID to index/offset pair */
+
+        index = ACPI_DIV_32(owner_id);
+        bit = 1 << ACPI_MOD_32(owner_id);
+
         /* Free the owner ID only if it is valid */
 
-        if (acpi_gbl_owner_id_mask & (1ULL << owner_id)) {
-                acpi_gbl_owner_id_mask ^= (1ULL << owner_id);
+        if (acpi_gbl_owner_id_mask[index] & bit) {
+                acpi_gbl_owner_id_mask[index] ^= bit;
+        } else {
+                ACPI_ERROR((AE_INFO,
+                            "Release of non-allocated owner_id: %2.2X",
+                            owner_id + 1));
         }
 
         (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
@@ -790,109 +839,97 @@ u8 acpi_ut_generate_checksum(u8 * buffer, u32 length)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_get_resource_end_tag
+ * FUNCTION:    acpi_ut_error, acpi_ut_warning, acpi_ut_info
  *
- * PARAMETERS:  obj_desc        - The resource template buffer object
+ * PARAMETERS:  module_name         - Caller's module name (for error output)
+ *              line_number         - Caller's line number (for error output)
+ *              Format              - Printf format string + additional args
  *
- * RETURN:      Pointer to the end tag
+ * RETURN:      None
  *
- * DESCRIPTION: Find the END_TAG resource descriptor in a resource template
+ * DESCRIPTION: Print message with module/line/version info
  *
  ******************************************************************************/
 
-u8 *acpi_ut_get_resource_end_tag(union acpi_operand_object * obj_desc)
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_error(char *module_name, u32 line_number, char *format, ...)
 {
-        u8 buffer_byte;
-        u8 *buffer;
-        u8 *end_buffer;
+        va_list args;
 
-        buffer = obj_desc->buffer.pointer;
-        end_buffer = buffer + obj_desc->buffer.length;
+        acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);
 
-        while (buffer < end_buffer) {
-                buffer_byte = *buffer;
-                if (buffer_byte & ACPI_RDESC_TYPE_MASK) {
-                        /* Large Descriptor - Length is next 2 bytes */
+        va_start(args, format);
+        acpi_os_vprintf(format, args);
+        acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
+}
 
-                        buffer += ((*(buffer + 1) | (*(buffer + 2) << 8)) + 3);
-                } else {
-                        /* Small Descriptor.  End Tag will be found here */
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_exception(char *module_name,
+                  u32 line_number, acpi_status status, char *format, ...)
+{
+        va_list args;
 
-                        if ((buffer_byte & ACPI_RDESC_SMALL_MASK) ==
-                            ACPI_RDESC_TYPE_END_TAG) {
-                                /* Found the end tag descriptor, all done. */
+        acpi_os_printf("ACPI Exception (%s-%04d): %s, ", module_name,
+                       line_number, acpi_format_exception(status));
 
-                                return (buffer);
-                        }
+        va_start(args, format);
+        acpi_os_vprintf(format, args);
+        acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
+}
 
-                        /* Length is in the header */
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_warning(char *module_name, u32 line_number, char *format, ...)
+{
+        va_list args;
 
-                        buffer += ((buffer_byte & 0x07) + 1);
-                }
-        }
+        acpi_os_printf("ACPI Warning (%s-%04d): ", module_name, line_number);
+
+        va_start(args, format);
+        acpi_os_vprintf(format, args);
+        acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
+}
+
+void ACPI_INTERNAL_VAR_XFACE
+acpi_ut_info(char *module_name, u32 line_number, char *format, ...)
+{
+        va_list args;
 
-        /* End tag not found */
+        acpi_os_printf("ACPI (%s-%04d): ", module_name, line_number);
 
-        return (NULL);
+        va_start(args, format);
+        acpi_os_vprintf(format, args);
+        acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_report_error
+ * FUNCTION:    acpi_ut_report_error, Warning, Info
  *
  * PARAMETERS:  module_name         - Caller's module name (for error output)
  *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
  *
  * RETURN:      None
  *
  * DESCRIPTION: Print error message
  *
+ * Note: Legacy only, should be removed when no longer used by drivers.
+ *
  ******************************************************************************/
 
-void acpi_ut_report_error(char *module_name, u32 line_number, u32 component_id)
+void acpi_ut_report_error(char *module_name, u32 line_number)
 {
 
-        acpi_os_printf("%8s-%04d: *** Error: ", module_name, line_number);
+        acpi_os_printf("ACPI Error (%s-%04d): ", module_name, line_number);
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_report_warning
- *
- * PARAMETERS:  module_name         - Caller's module name (for error output)
- *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print warning message
- *
- ******************************************************************************/
-
-void
-acpi_ut_report_warning(char *module_name, u32 line_number, u32 component_id)
+void acpi_ut_report_warning(char *module_name, u32 line_number)
 {
 
-        acpi_os_printf("%8s-%04d: *** Warning: ", module_name, line_number);
+        acpi_os_printf("ACPI Warning (%s-%04d): ", module_name, line_number);
 }
 
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ut_report_info
- *
- * PARAMETERS:  module_name         - Caller's module name (for error output)
- *              line_number         - Caller's line number (for error output)
- *              component_id        - Caller's component ID (for error output)
- *
- * RETURN:      None
- *
- * DESCRIPTION: Print information message
- *
- ******************************************************************************/
-
-void acpi_ut_report_info(char *module_name, u32 line_number, u32 component_id)
+void acpi_ut_report_info(char *module_name, u32 line_number)
 {
 
-        acpi_os_printf("%8s-%04d: *** Info: ", module_name, line_number);
+        acpi_os_printf("ACPI (%s-%04d): ", module_name, line_number);
 }
diff --git a/drivers/acpi/utilities/utmutex.c b/drivers/acpi/utilities/utmutex.c
index 90134c56ece9..45a7244df924 100644
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -214,23 +214,22 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                  * the ACPI subsystem code.
                  */
                 for (i = mutex_id; i < MAX_MUTEX; i++) {
-                        if (acpi_gbl_mutex_info[i].owner_id == this_thread_id) {
+                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                 if (i == mutex_id) {
-                                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                          "Mutex [%s] already acquired by this thread [%X]\n",
-                                                          acpi_ut_get_mutex_name
-                                                          (mutex_id),
-                                                          this_thread_id));
+                                        ACPI_ERROR((AE_INFO,
+                                                    "Mutex [%s] already acquired by this thread [%X]",
+                                                    acpi_ut_get_mutex_name
+                                                    (mutex_id),
+                                                    this_thread_id));
 
                                         return (AE_ALREADY_ACQUIRED);
                                 }
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Invalid acquire order: Thread %X owns [%s], wants [%s]\n",
-                                                  this_thread_id,
-                                                  acpi_ut_get_mutex_name(i),
-                                                  acpi_ut_get_mutex_name
-                                                  (mutex_id)));
+                                ACPI_ERROR((AE_INFO,
+                                            "Invalid acquire order: Thread %X owns [%s], wants [%s]",
+                                            this_thread_id,
+                                            acpi_ut_get_mutex_name(i),
+                                            acpi_ut_get_mutex_name(mutex_id)));
 
                                 return (AE_ACQUIRE_DEADLOCK);
                         }
@@ -253,11 +252,9 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 acpi_gbl_mutex_info[mutex_id].use_count++;
                 acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id;
         } else {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Thread %X could not acquire Mutex [%s] %s\n",
-                                  this_thread_id,
-                                  acpi_ut_get_mutex_name(mutex_id),
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Thread %X could not acquire Mutex [%X]",
+                                this_thread_id, mutex_id));
         }
 
         return (status);
@@ -295,9 +292,9 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
          * Mutex must be acquired in order to release it!
          */
         if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Mutex [%s] is not acquired, cannot release\n",
-                                  acpi_ut_get_mutex_name(mutex_id)));
+                ACPI_ERROR((AE_INFO,
+                            "Mutex [%X] is not acquired, cannot release",
+                            mutex_id));
 
                 return (AE_NOT_ACQUIRED);
         }
@@ -313,16 +310,15 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
                  * the ACPI subsystem code.
                  */
                 for (i = mutex_id; i < MAX_MUTEX; i++) {
-                        if (acpi_gbl_mutex_info[i].owner_id == this_thread_id) {
+                        if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
                                 if (i == mutex_id) {
                                         continue;
                                 }
 
-                                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                                  "Invalid release order: owns [%s], releasing [%s]\n",
-                                                  acpi_ut_get_mutex_name(i),
-                                                  acpi_ut_get_mutex_name
-                                                  (mutex_id)));
+                                ACPI_ERROR((AE_INFO,
+                                            "Invalid release order: owns [%s], releasing [%s]",
+                                            acpi_ut_get_mutex_name(i),
+                                            acpi_ut_get_mutex_name(mutex_id)));
 
                                 return (AE_RELEASE_DEADLOCK);
                         }
@@ -338,11 +334,9 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
             acpi_os_signal_semaphore(acpi_gbl_mutex_info[mutex_id].mutex, 1);
 
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Thread %X could not release Mutex [%s] %s\n",
-                                  this_thread_id,
-                                  acpi_ut_get_mutex_name(mutex_id),
-                                  acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "Thread %X could not release Mutex [%X]",
+                                this_thread_id, mutex_id));
         } else {
                 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                                   "Thread %X released Mutex [%s]\n",
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index 3015e1540053..7ee2d1d98071 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -177,7 +177,8 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size)
 
                 buffer = ACPI_MEM_CALLOCATE(buffer_size);
                 if (!buffer) {
-                        ACPI_REPORT_ERROR(("create_buffer: could not allocate size %X\n", (u32) buffer_size));
+                        ACPI_ERROR((AE_INFO, "Could not allocate size %X",
+                                    (u32) buffer_size));
                         acpi_ut_remove_reference(buffer_desc);
                         return_PTR(NULL);
                 }
@@ -228,7 +229,8 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
          */
         string = ACPI_MEM_CALLOCATE(string_size + 1);
         if (!string) {
-                ACPI_REPORT_ERROR(("create_string: could not allocate size %X\n", (u32) string_size));
+                ACPI_ERROR((AE_INFO, "Could not allocate size %X",
+                            (u32) string_size));
                 acpi_ut_remove_reference(string_desc);
                 return_PTR(NULL);
         }
@@ -310,8 +312,8 @@ void *acpi_ut_allocate_object_desc_dbg(char *module_name,
 
         object = acpi_os_acquire_object(acpi_gbl_operand_cache);
         if (!object) {
-                _ACPI_REPORT_ERROR(module_name, line_number, component_id,
-                                   ("Could not allocate an object descriptor\n"));
+                ACPI_ERROR((module_name, line_number,
+                            "Could not allocate an object descriptor"));
 
                 return_PTR(NULL);
         }
@@ -345,9 +347,9 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
         /* Object must be an union acpi_operand_object    */
 
         if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "%p is not an ACPI Operand object [%s]\n",
-                                  object, acpi_ut_get_descriptor_name(object)));
+                ACPI_ERROR((AE_INFO,
+                            "%p is not an ACPI Operand object [%s]", object,
+                            acpi_ut_get_descriptor_name(object)));
                 return_VOID;
         }
 
@@ -449,10 +451,10 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
                          * Notably, Locals and Args are not supported, but this may be
                          * required eventually.
                          */
-                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                          "Unsupported Reference opcode=%X in object %p\n",
-                                          internal_object->reference.opcode,
-                                          internal_object));
+                        ACPI_ERROR((AE_INFO,
+                                    "Unsupported Reference opcode=%X in object %p",
+                                    internal_object->reference.opcode,
+                                    internal_object));
                         status = AE_TYPE;
                         break;
                 }
@@ -460,10 +462,9 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
 
         default:
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unsupported type=%X in object %p\n",
-                                  ACPI_GET_OBJECT_TYPE(internal_object),
-                                  internal_object));
+                ACPI_ERROR((AE_INFO, "Unsupported type=%X in object %p",
+                            ACPI_GET_OBJECT_TYPE(internal_object),
+                            internal_object));
                 status = AE_TYPE;
                 break;
         }
diff --git a/drivers/acpi/utilities/utresrc.c b/drivers/acpi/utilities/utresrc.c
new file mode 100644
index 000000000000..16461317113f
--- /dev/null
+++ b/drivers/acpi/utilities/utresrc.c
@@ -0,0 +1,554 @@
+/*******************************************************************************
+ *
+ * Module Name: utresrc - Resource managment utilities
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2006, R. Byron Moore
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include <acpi/amlresrc.h>
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utmisc")
+
+#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
+/*
+ * Strings used to decode resource descriptors.
+ * Used by both the disasssembler and the debugger resource dump routines
+ */
+const char *acpi_gbl_BMdecode[2] = {
+        "not_bus_master",
+        "bus_master"
+};
+
+const char *acpi_gbl_config_decode[4] = {
+        "0 - Good Configuration",
+        "1 - Acceptable Configuration",
+        "2 - Suboptimal Configuration",
+        "3 - ***Invalid Configuration***",
+};
+
+const char *acpi_gbl_consume_decode[2] = {
+        "resource_producer",
+        "resource_consumer"
+};
+
+const char *acpi_gbl_DECdecode[2] = {
+        "pos_decode",
+        "sub_decode"
+};
+
+const char *acpi_gbl_HEdecode[2] = {
+        "Level",
+        "Edge"
+};
+
+const char *acpi_gbl_io_decode[2] = {
+        "Decode10",
+        "Decode16"
+};
+
+const char *acpi_gbl_LLdecode[2] = {
+        "active_high",
+        "active_low"
+};
+
+const char *acpi_gbl_max_decode[2] = {
+        "max_not_fixed",
+        "max_fixed"
+};
+
+const char *acpi_gbl_MEMdecode[4] = {
+        "non_cacheable",
+        "Cacheable",
+        "write_combining",
+        "Prefetchable"
+};
+
+const char *acpi_gbl_min_decode[2] = {
+        "min_not_fixed",
+        "min_fixed"
+};
+
+const char *acpi_gbl_MTPdecode[4] = {
+        "address_range_memory",
+        "address_range_reserved",
+        "address_range_aCPI",
+        "address_range_nVS"
+};
+
+const char *acpi_gbl_RNGdecode[4] = {
+        "invalid_ranges",
+        "non_iSAonly_ranges",
+        "ISAonly_ranges",
+        "entire_range"
+};
+
+const char *acpi_gbl_RWdecode[2] = {
+        "read_only",
+        "read_write"
+};
+
+const char *acpi_gbl_SHRdecode[2] = {
+        "Exclusive",
+        "Shared"
+};
+
+const char *acpi_gbl_SIZdecode[4] = {
+        "Transfer8",
+        "Transfer8_16",
+        "Transfer16",
+        "invalid_size"
+};
+
+const char *acpi_gbl_TRSdecode[2] = {
+        "dense_translation",
+        "sparse_translation"
+};
+
+const char *acpi_gbl_TTPdecode[2] = {
+        "type_static",
+        "type_translation"
+};
+
+const char *acpi_gbl_TYPdecode[4] = {
+        "Compatibility",
+        "type_a",
+        "type_b",
+        "type_f"
+};
+
+#endif
+
+/*
+ * Base sizes of the raw AML resource descriptors, indexed by resource type.
+ * Zero indicates a reserved (and therefore invalid) resource type.
+ */
+const u8 acpi_gbl_resource_aml_sizes[] = {
+        /* Small descriptors */
+
+        0,
+        0,
+        0,
+        0,
+        ACPI_AML_SIZE_SMALL(struct aml_resource_irq),
+        ACPI_AML_SIZE_SMALL(struct aml_resource_dma),
+        ACPI_AML_SIZE_SMALL(struct aml_resource_start_dependent),
+        ACPI_AML_SIZE_SMALL(struct aml_resource_end_dependent),
+        ACPI_AML_SIZE_SMALL(struct aml_resource_io),
+        ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_io),
+        0,
+        0,
+        0,
+        0,
+        ACPI_AML_SIZE_SMALL(struct aml_resource_vendor_small),
+        ACPI_AML_SIZE_SMALL(struct aml_resource_end_tag),
+
+        /* Large descriptors */
+
+        0,
+        ACPI_AML_SIZE_LARGE(struct aml_resource_memory24),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_generic_register),
+        0,
+        ACPI_AML_SIZE_LARGE(struct aml_resource_vendor_large),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_memory32),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_fixed_memory32),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_address32),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_address16),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_extended_irq),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_address64),
+        ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64)
+};
+
+/*
+ * Resource types, used to validate the resource length field.
+ * The length of fixed-length types must match exactly, variable
+ * lengths must meet the minimum required length, etc.
+ * Zero indicates a reserved (and therefore invalid) resource type.
+ */
+static const u8 acpi_gbl_resource_types[] = {
+        /* Small descriptors */
+
+        0,
+        0,
+        0,
+        0,
+        ACPI_SMALL_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_SMALL_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
+        0,
+        0,
+        0,
+        0,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
+
+        /* Large descriptors */
+
+        0,
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
+        0,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_FIXED_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_VARIABLE_LENGTH,
+        ACPI_FIXED_LENGTH
+};
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_validate_resource
+ *
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ *              return_index    - Where the resource index is returned. NULL
+ *                                if the index is not required.
+ *
+ * RETURN:      Status, and optionally the Index into the global resource tables
+ *
+ * DESCRIPTION: Validate an AML resource descriptor by checking the Resource
+ *              Type and Resource Length. Returns an index into the global
+ *              resource information/dispatch tables for later use.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
+{
+        u8 resource_type;
+        u8 resource_index;
+        acpi_rs_length resource_length;
+        acpi_rs_length minimum_resource_length;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /*
+         * 1) Validate the resource_type field (Byte 0)
+         */
+        resource_type = ACPI_GET8(aml);
+
+        /*
+         * Byte 0 contains the descriptor name (Resource Type)
+         * Examine the large/small bit in the resource header
+         */
+        if (resource_type & ACPI_RESOURCE_NAME_LARGE) {
+                /* Verify the large resource type (name) against the max */
+
+                if (resource_type > ACPI_RESOURCE_NAME_LARGE_MAX) {
+                        return (AE_AML_INVALID_RESOURCE_TYPE);
+                }
+
+                /*
+                 * Large Resource Type -- bits 6:0 contain the name
+                 * Translate range 0x80-0x8B to index range 0x10-0x1B
+                 */
+                resource_index = (u8) (resource_type - 0x70);
+        } else {
+                /*
+                 * Small Resource Type -- bits 6:3 contain the name
+                 * Shift range to index range 0x00-0x0F
+                 */
+                resource_index = (u8)
+                    ((resource_type & ACPI_RESOURCE_NAME_SMALL_MASK) >> 3);
+        }
+
+        /* Check validity of the resource type, zero indicates name is invalid */
+
+        if (!acpi_gbl_resource_types[resource_index]) {
+                return (AE_AML_INVALID_RESOURCE_TYPE);
+        }
+
+        /*
+         * 2) Validate the resource_length field. This ensures that the length
+         *    is at least reasonable, and guarantees that it is non-zero.
+         */
+        resource_length = acpi_ut_get_resource_length(aml);
+        minimum_resource_length = acpi_gbl_resource_aml_sizes[resource_index];
+
+        /* Validate based upon the type of resource - fixed length or variable */
+
+        switch (acpi_gbl_resource_types[resource_index]) {
+        case ACPI_FIXED_LENGTH:
+
+                /* Fixed length resource, length must match exactly */
+
+                if (resource_length != minimum_resource_length) {
+                        return (AE_AML_BAD_RESOURCE_LENGTH);
+                }
+                break;
+
+        case ACPI_VARIABLE_LENGTH:
+
+                /* Variable length resource, length must be at least the minimum */
+
+                if (resource_length < minimum_resource_length) {
+                        return (AE_AML_BAD_RESOURCE_LENGTH);
+                }
+                break;
+
+        case ACPI_SMALL_VARIABLE_LENGTH:
+
+                /* Small variable length resource, length can be (Min) or (Min-1) */
+
+                if ((resource_length > minimum_resource_length) ||
+                    (resource_length < (minimum_resource_length - 1))) {
+                        return (AE_AML_BAD_RESOURCE_LENGTH);
+                }
+                break;
+
+        default:
+
+                /* Shouldn't happen (because of validation earlier), but be sure */
+
+                return (AE_AML_INVALID_RESOURCE_TYPE);
+        }
+
+        /* Optionally return the resource table index */
+
+        if (return_index) {
+                *return_index = resource_index;
+        }
+
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_resource_type
+ *
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ *
+ * RETURN:      The Resource Type with no extraneous bits (except the
+ *              Large/Small descriptor bit -- this is left alone)
+ *
+ * DESCRIPTION: Extract the Resource Type/Name from the first byte of
+ *              a resource descriptor.
+ *
+ ******************************************************************************/
+
+u8 acpi_ut_get_resource_type(void *aml)
+{
+        ACPI_FUNCTION_ENTRY();
+
+        /*
+         * Byte 0 contains the descriptor name (Resource Type)
+         * Examine the large/small bit in the resource header
+         */
+        if (ACPI_GET8(aml) & ACPI_RESOURCE_NAME_LARGE) {
+                /* Large Resource Type -- bits 6:0 contain the name */
+
+                return (ACPI_GET8(aml));
+        } else {
+                /* Small Resource Type -- bits 6:3 contain the name */
+
+                return ((u8) (ACPI_GET8(aml) & ACPI_RESOURCE_NAME_SMALL_MASK));
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_resource_length
+ *
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ *
+ * RETURN:      Byte Length
+ *
+ * DESCRIPTION: Get the "Resource Length" of a raw AML descriptor. By
+ *              definition, this does not include the size of the descriptor
+ *              header or the length field itself.
+ *
+ ******************************************************************************/
+
+u16 acpi_ut_get_resource_length(void *aml)
+{
+        acpi_rs_length resource_length;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /*
+         * Byte 0 contains the descriptor name (Resource Type)
+         * Examine the large/small bit in the resource header
+         */
+        if (ACPI_GET8(aml) & ACPI_RESOURCE_NAME_LARGE) {
+                /* Large Resource type -- bytes 1-2 contain the 16-bit length */
+
+                ACPI_MOVE_16_TO_16(&resource_length, ACPI_ADD_PTR(u8, aml, 1));
+
+        } else {
+                /* Small Resource type -- bits 2:0 of byte 0 contain the length */
+
+                resource_length = (u16) (ACPI_GET8(aml) &
+                                         ACPI_RESOURCE_NAME_SMALL_LENGTH_MASK);
+        }
+
+        return (resource_length);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_resource_header_length
+ *
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ *
+ * RETURN:      Length of the AML header (depends on large/small descriptor)
+ *
+ * DESCRIPTION: Get the length of the header for this resource.
+ *
+ ******************************************************************************/
+
+u8 acpi_ut_get_resource_header_length(void *aml)
+{
+        ACPI_FUNCTION_ENTRY();
+
+        /* Examine the large/small bit in the resource header */
+
+        if (ACPI_GET8(aml) & ACPI_RESOURCE_NAME_LARGE) {
+                return (sizeof(struct aml_resource_large_header));
+        } else {
+                return (sizeof(struct aml_resource_small_header));
+        }
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_descriptor_length
+ *
+ * PARAMETERS:  Aml             - Pointer to the raw AML resource descriptor
+ *
+ * RETURN:      Byte length
+ *
+ * DESCRIPTION: Get the total byte length of a raw AML descriptor, including the
+ *              length of the descriptor header and the length field itself.
+ *              Used to walk descriptor lists.
+ *
+ ******************************************************************************/
+
+u32 acpi_ut_get_descriptor_length(void *aml)
+{
+        ACPI_FUNCTION_ENTRY();
+
+        /*
+         * Get the Resource Length (does not include header length) and add
+         * the header length (depends on if this is a small or large resource)
+         */
+        return (acpi_ut_get_resource_length(aml) +
+                acpi_ut_get_resource_header_length(aml));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_get_resource_end_tag
+ *
+ * PARAMETERS:  obj_desc        - The resource template buffer object
+ *              end_tag         - Where the pointer to the end_tag is returned
+ *
+ * RETURN:      Status, pointer to the end tag
+ *
+ * DESCRIPTION: Find the end_tag resource descriptor in an AML resource template
+ *              Note: allows a buffer length of zero.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_get_resource_end_tag(union acpi_operand_object * obj_desc,
+                             u8 ** end_tag)
+{
+        acpi_status status;
+        u8 *aml;
+        u8 *end_aml;
+
+        ACPI_FUNCTION_TRACE("ut_get_resource_end_tag");
+
+        /* Get start and end pointers */
+
+        aml = obj_desc->buffer.pointer;
+        end_aml = aml + obj_desc->buffer.length;
+
+        /* Allow a buffer length of zero */
+
+        if (!obj_desc->buffer.length) {
+                *end_tag = aml;
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        /* Walk the resource template, one descriptor per iteration */
+
+        while (aml < end_aml) {
+                /* Validate the Resource Type and Resource Length */
+
+                status = acpi_ut_validate_resource(aml, NULL);
+                if (ACPI_FAILURE(status)) {
+                        return_ACPI_STATUS(status);
+                }
+
+                /* end_tag resource indicates the end of the resource template */
+
+                if (acpi_ut_get_resource_type(aml) ==
+                    ACPI_RESOURCE_NAME_END_TAG) {
+                        /*
+                         * There must be at least one more byte in the buffer for
+                         * the 2nd byte of the end_tag
+                         */
+                        if ((aml + 1) >= end_aml) {
+                                return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
+                        }
+
+                        /* Return the pointer to the end_tag */
+
+                        *end_tag = aml;
+                        return_ACPI_STATUS(AE_OK);
+                }
+
+                /*
+                 * Point to the next resource descriptor in the AML buffer. The
+                 * descriptor length is guaranteed to be non-zero by resource
+                 * validation above.
+                 */
+                aml += acpi_ut_get_descriptor_length(aml);
+        }
+
+        /* Did not find an end_tag resource descriptor */
+
+        return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG);
+}
diff --git a/drivers/acpi/utilities/utstate.c b/drivers/acpi/utilities/utstate.c
index c1cb27583be8..4b134a722907 100644
--- a/drivers/acpi/utilities/utstate.c
+++ b/drivers/acpi/utilities/utstate.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ acpi_status
 acpi_ut_create_pkg_state_and_push(void *internal_object,
                                   void *external_object,
                                   u16 index,
-                                  union acpi_generic_state ** state_list)
+                                  union acpi_generic_state **state_list)
 {
         union acpi_generic_state *state;
 
diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index f06bd5e5e9d1..308a960871be 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,8 +75,7 @@ acpi_status acpi_initialize_subsystem(void)
 
         status = acpi_os_initialize();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("OSD failed to initialize, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status, "During OSL initialization"));
                 return_ACPI_STATUS(status);
         }
 
@@ -88,8 +87,8 @@ acpi_status acpi_initialize_subsystem(void)
 
         status = acpi_ut_mutex_initialize();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Global mutex creation failure, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During Global Mutex creation"));
                 return_ACPI_STATUS(status);
         }
 
@@ -99,15 +98,14 @@ acpi_status acpi_initialize_subsystem(void)
          */
         status = acpi_ns_root_initialize();
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_ERROR(("Namespace initialization failure, %s\n",
-                                   acpi_format_exception(status)));
+                ACPI_EXCEPTION((AE_INFO, status,
+                                "During Namespace initialization"));
                 return_ACPI_STATUS(status);
         }
 
         /* If configured, initialize the AML debugger */
 
         ACPI_DEBUGGER_EXEC(status = acpi_db_initialize());
-
         return_ACPI_STATUS(status);
 }
 
@@ -154,8 +152,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
 
                 status = acpi_enable();
                 if (ACPI_FAILURE(status)) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
-                                          "acpi_enable failed.\n"));
+                        ACPI_WARNING((AE_INFO, "acpi_enable failed"));
                         return_ACPI_STATUS(status);
                 }
         }
@@ -178,10 +175,14 @@ acpi_status acpi_enable_subsystem(u32 flags)
         /*
          * Initialize ACPI Event handling (Fixed and General Purpose)
          *
-         * NOTE: We must have the hardware AND events initialized before we can
-         * execute ANY control methods SAFELY.  Any control method can require
-         * ACPI hardware support, so the hardware MUST be initialized before
-         * execution!
+         * Note1: We must have the hardware and events initialized before we can
+         * execute any control methods safely. Any control method can require
+         * ACPI hardware support, so the hardware must be fully initialized before
+         * any method execution!
+         *
+         * Note2: Fixed events are initialized and enabled here. GPEs are
+         * initialized, but cannot be enabled until after the hardware is
+         * completely initialized (SCI and global_lock activated)
          */
         if (!(flags & ACPI_NO_EVENT_INIT)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
@@ -193,8 +194,10 @@ acpi_status acpi_enable_subsystem(u32 flags)
                 }
         }
 
-        /* Install the SCI handler and Global Lock handler */
-
+        /*
+         * Install the SCI handler and Global Lock handler. This completes the
+         * hardware initialization.
+         */
         if (!(flags & ACPI_NO_HANDLER_INIT)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                                   "[Init] Installing SCI/GL handlers\n"));
@@ -205,6 +208,24 @@ acpi_status acpi_enable_subsystem(u32 flags)
                 }
         }
 
+        /*
+         * Complete the GPE initialization for the GPE blocks defined in the FADT
+         * (GPE block 0 and 1).
+         *
+         * Note1: This is where the _PRW methods are executed for the GPEs. These
+         * methods can only be executed after the SCI and Global Lock handlers are
+         * installed and initialized.
+         *
+         * Note2: Currently, there seems to be no need to run the _REG methods
+         * before execution of the _PRW methods and enabling of the GPEs.
+         */
+        if (!(flags & ACPI_NO_EVENT_INIT)) {
+                status = acpi_ev_install_fadt_gpes();
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+        }
+
         return_ACPI_STATUS(status);
 }
 
@@ -230,9 +251,9 @@ acpi_status acpi_initialize_objects(u32 flags)
         /*
          * Run all _REG methods
          *
-         * NOTE: Any objects accessed
-         * by the _REG methods will be automatically initialized, even if they
-         * contain executable AML (see call to acpi_ns_initialize_objects below).
+         * Note: Any objects accessed by the _REG methods will be automatically
+         * initialized, even if they contain executable AML (see the call to
+         * acpi_ns_initialize_objects below).
          */
         if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
@@ -245,9 +266,9 @@ acpi_status acpi_initialize_objects(u32 flags)
         }
 
         /*
-         * Initialize the objects that remain uninitialized.  This
-         * runs the executable AML that may be part of the declaration of these
-         * objects: operation_regions, buffer_fields, Buffers, and Packages.
+         * Initialize the objects that remain uninitialized. This runs the
+         * executable AML that may be part of the declaration of these objects:
+         * operation_regions, buffer_fields, Buffers, and Packages.
          */
         if (!(flags & ACPI_NO_OBJECT_INIT)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
@@ -260,8 +281,8 @@ acpi_status acpi_initialize_objects(u32 flags)
         }
 
         /*
-         * Initialize all device objects in the namespace
-         * This runs the _STA and _INI methods.
+         * Initialize all device objects in the namespace. This runs the device
+         * _STA and _INI methods.
          */
         if (!(flags & ACPI_NO_DEVICE_INIT)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index d10668f14699..bd4887518373 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -920,8 +920,8 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "Unable to create 'state' fs entry\n"));
         else {
+                acpi_video_device_state_fops.write = acpi_video_device_write_state;
                 entry->proc_fops = &acpi_video_device_state_fops;
-                entry->proc_fops->write = acpi_video_device_write_state;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
@@ -934,8 +934,8 @@ static int acpi_video_device_add_fs(struct acpi_device *device)
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "Unable to create 'brightness' fs entry\n"));
         else {
+                acpi_video_device_brightness_fops.write = acpi_video_device_write_brightness;
                 entry->proc_fops = &acpi_video_device_brightness_fops;
-                entry->proc_fops->write = acpi_video_device_write_brightness;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
@@ -1239,8 +1239,8 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "Unable to create 'POST' fs entry\n"));
         else {
+                acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST;
                 entry->proc_fops = &acpi_video_bus_POST_fops;
-                entry->proc_fops->write = acpi_video_bus_write_POST;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
@@ -1253,8 +1253,8 @@ static int acpi_video_bus_add_fs(struct acpi_device *device)
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                   "Unable to create 'DOS' fs entry\n"));
         else {
+                acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS;
                 entry->proc_fops = &acpi_video_bus_DOS_fops;
-                entry->proc_fops->write = acpi_video_bus_write_DOS;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index f12898d53078..e99471d3232b 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -8,6 +8,7 @@ obj-y			+= power/
 obj-$(CONFIG_FW_LOADER) += firmware_class.o
 obj-$(CONFIG_NUMA)      += node.o
 obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o
+obj-$(CONFIG_SMP)       += topology.o
 
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
new file mode 100644
index 000000000000..915810f6237e
--- /dev/null
+++ b/drivers/base/topology.c
@@ -0,0 +1,148 @@
+/*
+ * driver/base/topology.c - Populate sysfs with cpu topology information
+ *
+ * Written by: Zhang Yanmin, Intel Corporation
+ *
+ * Copyright (C) 2006, Intel Corp.
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of 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, GOOD TITLE or
+ * NON INFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/sysdev.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/cpu.h>
+#include <linux/module.h>
+#include <linux/topology.h>
+
+#define define_one_ro(_name)            \
+static SYSDEV_ATTR(_name, 0444, show_##_name, NULL)
+
+#define define_id_show_func(name)                               \
+static ssize_t show_##name(struct sys_device *dev, char *buf)   \
+{                                                               \
+        unsigned int cpu = dev->id;                             \
+        return sprintf(buf, "%d\n", topology_##name(cpu));      \
+}
+
+#define define_siblings_show_func(name)                                 \
+static ssize_t show_##name(struct sys_device *dev, char *buf)           \
+{                                                                       \
+        ssize_t len = -1;                                               \
+        unsigned int cpu = dev->id;                                     \
+        len = cpumask_scnprintf(buf, NR_CPUS+1, topology_##name(cpu));  \
+        return (len + sprintf(buf + len, "\n"));                        \
+}
+
+#ifdef  topology_physical_package_id
+define_id_show_func(physical_package_id);
+define_one_ro(physical_package_id);
+#define ref_physical_package_id_attr    &attr_physical_package_id.attr,
+#else
+#define ref_physical_package_id_attr
+#endif
+
+#ifdef topology_core_id
+define_id_show_func(core_id);
+define_one_ro(core_id);
+#define ref_core_id_attr                &attr_core_id.attr,
+#else
+#define ref_core_id_attr
+#endif
+
+#ifdef topology_thread_siblings
+define_siblings_show_func(thread_siblings);
+define_one_ro(thread_siblings);
+#define ref_thread_siblings_attr        &attr_thread_siblings.attr,
+#else
+#define ref_thread_siblings_attr
+#endif
+
+#ifdef topology_core_siblings
+define_siblings_show_func(core_siblings);
+define_one_ro(core_siblings);
+#define ref_core_siblings_attr          &attr_core_siblings.attr,
+#else
+#define ref_core_siblings_attr
+#endif
+
+static struct attribute *default_attrs[] = {
+        ref_physical_package_id_attr
+        ref_core_id_attr
+        ref_thread_siblings_attr
+        ref_core_siblings_attr
+        NULL
+};
+
+static struct attribute_group topology_attr_group = {
+        .attrs = default_attrs,
+        .name = "topology"
+};
+
+/* Add/Remove cpu_topology interface for CPU device */
+static int __cpuinit topology_add_dev(struct sys_device * sys_dev)
+{
+        sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
+        return 0;
+}
+
+static int __cpuinit topology_remove_dev(struct sys_device * sys_dev)
+{
+        sysfs_remove_group(&sys_dev->kobj, &topology_attr_group);
+        return 0;
+}
+
+static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
+                unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (unsigned long)hcpu;
+        struct sys_device *sys_dev;
+
+        sys_dev = get_cpu_sysdev(cpu);
+        switch (action) {
+        case CPU_ONLINE:
+                topology_add_dev(sys_dev);
+                break;
+        case CPU_DEAD:
+                topology_remove_dev(sys_dev);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block topology_cpu_notifier =
+{
+        .notifier_call = topology_cpu_callback,
+};
+
+static int __cpuinit topology_sysfs_init(void)
+{
+        int i;
+
+        for_each_online_cpu(i) {
+                topology_cpu_callback(&topology_cpu_notifier, CPU_ONLINE,
+                                (void *)(long)i);
+        }
+
+        register_cpu_notifier(&topology_cpu_notifier);
+
+        return 0;
+}
+
+device_initcall(topology_sysfs_init);
+
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 139cbba76180..8b1331677407 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -433,12 +433,12 @@ config CDROM_PKTCDVD_BUFFERS
           This controls the maximum number of active concurrent packets. More
           concurrent packets can increase write performance, but also require
           more memory. Each concurrent packet will require approximately 64Kb
-          of non-swappable kernel memory, memory which will be allocated at
-          pktsetup time.
+          of non-swappable kernel memory, memory which will be allocated when
+          a disc is opened for writing.
 
 config CDROM_PKTCDVD_WCACHE
-        bool "Enable write caching"
-        depends on CDROM_PKTCDVD
+        bool "Enable write caching (EXPERIMENTAL)"
+        depends on CDROM_PKTCDVD && EXPERIMENTAL
         help
           If enabled, write caching will be set for the CD-R/W device. For now
           this option is dangerous unless the CD-RW media is known good, as we
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 93affeeef7bd..4e7dbcc425ff 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -43,8 +43,6 @@
  *
  *************************************************************************/
 
-#define VERSION_CODE    "v0.2.0a 2004-07-14 Jens Axboe (axboe@suse.de) and petero2@telia.com"
-
 #include <linux/pktcdvd.h>
 #include <linux/config.h>
 #include <linux/module.h>
@@ -131,7 +129,7 @@ static struct bio *pkt_bio_alloc(int nr_iovecs)
 /*
  * Allocate a packet_data struct
  */
-static struct packet_data *pkt_alloc_packet_data(void)
+static struct packet_data *pkt_alloc_packet_data(int frames)
 {
         int i;
         struct packet_data *pkt;
@@ -140,11 +138,12 @@ static struct packet_data *pkt_alloc_packet_data(void)
         if (!pkt)
                 goto no_pkt;
 
-        pkt->w_bio = pkt_bio_alloc(PACKET_MAX_SIZE);
+        pkt->frames = frames;
+        pkt->w_bio = pkt_bio_alloc(frames);
         if (!pkt->w_bio)
                 goto no_bio;
 
-        for (i = 0; i < PAGES_PER_PACKET; i++) {
+        for (i = 0; i < frames / FRAMES_PER_PAGE; i++) {
                 pkt->pages[i] = alloc_page(GFP_KERNEL|__GFP_ZERO);
                 if (!pkt->pages[i])
                         goto no_page;
@@ -152,7 +151,7 @@ static struct packet_data *pkt_alloc_packet_data(void)
 
         spin_lock_init(&pkt->lock);
 
-        for (i = 0; i < PACKET_MAX_SIZE; i++) {
+        for (i = 0; i < frames; i++) {
                 struct bio *bio = pkt_bio_alloc(1);
                 if (!bio)
                         goto no_rd_bio;
@@ -162,14 +161,14 @@ static struct packet_data *pkt_alloc_packet_data(void)
         return pkt;
 
 no_rd_bio:
-        for (i = 0; i < PACKET_MAX_SIZE; i++) {
+        for (i = 0; i < frames; i++) {
                 struct bio *bio = pkt->r_bios[i];
                 if (bio)
                         bio_put(bio);
         }
 
 no_page:
-        for (i = 0; i < PAGES_PER_PACKET; i++)
+        for (i = 0; i < frames / FRAMES_PER_PAGE; i++)
                 if (pkt->pages[i])
                         __free_page(pkt->pages[i]);
         bio_put(pkt->w_bio);
@@ -186,12 +185,12 @@ static void pkt_free_packet_data(struct packet_data *pkt)
 {
         int i;
 
-        for (i = 0; i < PACKET_MAX_SIZE; i++) {
+        for (i = 0; i < pkt->frames; i++) {
                 struct bio *bio = pkt->r_bios[i];
                 if (bio)
                         bio_put(bio);
         }
-        for (i = 0; i < PAGES_PER_PACKET; i++)
+        for (i = 0; i < pkt->frames / FRAMES_PER_PAGE; i++)
                 __free_page(pkt->pages[i]);
         bio_put(pkt->w_bio);
         kfree(pkt);
@@ -206,17 +205,17 @@ static void pkt_shrink_pktlist(struct pktcdvd_device *pd)
         list_for_each_entry_safe(pkt, next, &pd->cdrw.pkt_free_list, list) {
                 pkt_free_packet_data(pkt);
         }
+        INIT_LIST_HEAD(&pd->cdrw.pkt_free_list);
 }
 
 static int pkt_grow_pktlist(struct pktcdvd_device *pd, int nr_packets)
 {
         struct packet_data *pkt;
 
-        INIT_LIST_HEAD(&pd->cdrw.pkt_free_list);
-        INIT_LIST_HEAD(&pd->cdrw.pkt_active_list);
-        spin_lock_init(&pd->cdrw.active_list_lock);
+        BUG_ON(!list_empty(&pd->cdrw.pkt_free_list));
+
         while (nr_packets > 0) {
-                pkt = pkt_alloc_packet_data();
+                pkt = pkt_alloc_packet_data(pd->settings.size >> 2);
                 if (!pkt) {
                         pkt_shrink_pktlist(pd);
                         return 0;
@@ -951,7 +950,7 @@ try_next_bio:
 
         pd->current_sector = zone + pd->settings.size;
         pkt->sector = zone;
-        pkt->frames = pd->settings.size >> 2;
+        BUG_ON(pkt->frames != pd->settings.size >> 2);
         pkt->write_size = 0;
 
         /*
@@ -1639,7 +1638,7 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
         pd->settings.size = be32_to_cpu(ti.fixed_packet_size) << 2;
         if (pd->settings.size == 0) {
                 printk("pktcdvd: detected zero packet size!\n");
-                pd->settings.size = 128;
+                return -ENXIO;
         }
         if (pd->settings.size > PACKET_MAX_SECTORS) {
                 printk("pktcdvd: packet size is too big\n");
@@ -1987,8 +1986,14 @@ static int pkt_open_dev(struct pktcdvd_device *pd, int write)
         if ((ret = pkt_set_segment_merging(pd, q)))
                 goto out_unclaim;
 
-        if (write)
+        if (write) {
+                if (!pkt_grow_pktlist(pd, CONFIG_CDROM_PKTCDVD_BUFFERS)) {
+                        printk("pktcdvd: not enough memory for buffers\n");
+                        ret = -ENOMEM;
+                        goto out_unclaim;
+                }
                 printk("pktcdvd: %lukB available on disc\n", lba << 1);
+        }
 
         return 0;
 
@@ -2014,6 +2019,8 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)
         pkt_set_speed(pd, MAX_SPEED, MAX_SPEED);
         bd_release(pd->bdev);
         blkdev_put(pd->bdev);
+
+        pkt_shrink_pktlist(pd);
 }
 
 static struct pktcdvd_device *pkt_find_dev_from_minor(int dev_minor)
@@ -2379,12 +2386,6 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         /* This is safe, since we have a reference from open(). */
         __module_get(THIS_MODULE);
 
-        if (!pkt_grow_pktlist(pd, CONFIG_CDROM_PKTCDVD_BUFFERS)) {
-                printk("pktcdvd: not enough memory for buffers\n");
-                ret = -ENOMEM;
-                goto out_mem;
-        }
-
         pd->bdev = bdev;
         set_blocksize(bdev, CD_FRAMESIZE);
 
@@ -2395,7 +2396,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         if (IS_ERR(pd->cdrw.thread)) {
                 printk("pktcdvd: can't start kernel thread\n");
                 ret = -ENOMEM;
-                goto out_thread;
+                goto out_mem;
         }
 
         proc = create_proc_entry(pd->name, 0, pkt_proc);
@@ -2406,8 +2407,6 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         DPRINTK("pktcdvd: writer %s mapped to %s\n", pd->name, bdevname(bdev, b));
         return 0;
 
-out_thread:
-        pkt_shrink_pktlist(pd);
 out_mem:
         blkdev_put(bdev);
         /* This is safe: open() is still holding a reference. */
@@ -2503,6 +2502,10 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd)
                 goto out_mem;
         pd->disk = disk;
 
+        INIT_LIST_HEAD(&pd->cdrw.pkt_free_list);
+        INIT_LIST_HEAD(&pd->cdrw.pkt_active_list);
+        spin_lock_init(&pd->cdrw.active_list_lock);
+
         spin_lock_init(&pd->lock);
         spin_lock_init(&pd->iosched.lock);
         sprintf(pd->name, "pktcdvd%d", idx);
@@ -2567,8 +2570,6 @@ static int pkt_remove_dev(struct pkt_ctrl_command *ctrl_cmd)
 
         blkdev_put(pd->bdev);
 
-        pkt_shrink_pktlist(pd);
-
         remove_proc_entry(pd->name, pkt_proc);
         DPRINTK("pktcdvd: writer %s unmapped\n", pd->name);
 
@@ -2678,7 +2679,6 @@ static int __init pkt_init(void)
 
         pkt_proc = proc_mkdir("pktcdvd", proc_root_driver);
 
-        DPRINTK("pktcdvd: %s\n", VERSION_CODE);
         return 0;
 
 out:
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index a05fe5843e6c..f04d864770ad 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -14,7 +14,6 @@
  *  -- special case some senses, e.g. 3a/0 -> no media present, reduce retries
  *  -- verify the 13 conditions and do bulk resets
  *  -- kill last_pipe and simply do two-state clearing on both pipes
- *  -- verify protocol (bulk) from USB descriptors (maybe...)
  *  -- highmem
  *  -- move top_sense and work_bcs into separate allocations (if they survive)
  *     for cache purists and esoteric architectures.
@@ -355,7 +354,7 @@ struct ub_lun {
  * The USB device instance.
  */
 struct ub_dev {
-        spinlock_t lock;
+        spinlock_t *lock;
         atomic_t poison;                /* The USB device is disconnected */
         int openc;                      /* protected by ub_lock! */
                                         /* kref is too implicit for our taste */
@@ -420,11 +419,13 @@ static void ub_state_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd);
 static int ub_submit_clear_stall(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
     int stalled_pipe);
 static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd);
-static void ub_reset_enter(struct ub_dev *sc);
+static void ub_reset_enter(struct ub_dev *sc, int try);
 static void ub_reset_task(void *arg);
 static int ub_sync_tur(struct ub_dev *sc, struct ub_lun *lun);
 static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,
     struct ub_capacity *ret);
+static int ub_sync_reset(struct ub_dev *sc);
+static int ub_probe_clear_stall(struct ub_dev *sc, int stalled_pipe);
 static int ub_probe_lun(struct ub_dev *sc, int lnum);
 
 /*
@@ -452,6 +453,10 @@ MODULE_DEVICE_TABLE(usb, ub_usb_ids);
 #define UB_MAX_HOSTS  26
 static char ub_hostv[UB_MAX_HOSTS];
 
+#define UB_QLOCK_NUM 5
+static spinlock_t ub_qlockv[UB_QLOCK_NUM];
+static int ub_qlock_next = 0;
+
 static DEFINE_SPINLOCK(ub_lock);        /* Locks globals and ->openc */
 
 /*
@@ -531,7 +536,7 @@ static ssize_t ub_diag_show(struct device *dev, struct device_attribute *attr,
                 return 0;
 
         cnt = 0;
-        spin_lock_irqsave(&sc->lock, flags);
+        spin_lock_irqsave(sc->lock, flags);
 
         cnt += sprintf(page + cnt,
             "poison %d reset %d\n",
@@ -579,7 +584,7 @@ static ssize_t ub_diag_show(struct device *dev, struct device_attribute *attr,
                 if (++nc == SCMD_TRACE_SZ) nc = 0;
         }
 
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_unlock_irqrestore(sc->lock, flags);
         return cnt;
 }
 
@@ -627,6 +632,24 @@ static void ub_id_put(int id)
 }
 
 /*
+ * This is necessitated by the fact that blk_cleanup_queue does not
+ * necesserily destroy the queue. Instead, it may merely decrease q->refcnt.
+ * Since our blk_init_queue() passes a spinlock common with ub_dev,
+ * we have life time issues when ub_cleanup frees ub_dev.
+ */
+static spinlock_t *ub_next_lock(void)
+{
+        unsigned long flags;
+        spinlock_t *ret;
+
+        spin_lock_irqsave(&ub_lock, flags);
+        ret = &ub_qlockv[ub_qlock_next];
+        ub_qlock_next = (ub_qlock_next + 1) % UB_QLOCK_NUM;
+        spin_unlock_irqrestore(&ub_lock, flags);
+        return ret;
+}
+
+/*
  * Downcount for deallocation. This rides on two assumptions:
  *  - once something is poisoned, its refcount cannot grow
  *  - opens cannot happen at this time (del_gendisk was done)
@@ -961,7 +984,7 @@ static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,
         if (atomic_read(&sc->poison))
                 return -ENXIO;
 
-        ub_reset_enter(sc);
+        ub_reset_enter(sc, urq->current_try);
 
         if (urq->current_try >= 3)
                 return -EIO;
@@ -997,8 +1020,6 @@ static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,
  * No exceptions.
  *
  * Host is assumed locked.
- *
- * XXX We only support Bulk for the moment.
  */
 static int ub_submit_scsi(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 {
@@ -1083,9 +1104,10 @@ static void ub_urb_timeout(unsigned long arg)
         struct ub_dev *sc = (struct ub_dev *) arg;
         unsigned long flags;
 
-        spin_lock_irqsave(&sc->lock, flags);
-        usb_unlink_urb(&sc->work_urb);
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_lock_irqsave(sc->lock, flags);
+        if (!ub_is_completed(&sc->work_done))
+                usb_unlink_urb(&sc->work_urb);
+        spin_unlock_irqrestore(sc->lock, flags);
 }
 
 /*
@@ -1108,10 +1130,9 @@ static void ub_scsi_action(unsigned long _dev)
         struct ub_dev *sc = (struct ub_dev *) _dev;
         unsigned long flags;
 
-        spin_lock_irqsave(&sc->lock, flags);
-        del_timer(&sc->work_timer);
+        spin_lock_irqsave(sc->lock, flags);
         ub_scsi_dispatch(sc);
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_unlock_irqrestore(sc->lock, flags);
 }
 
 static void ub_scsi_dispatch(struct ub_dev *sc)
@@ -1133,6 +1154,7 @@ static void ub_scsi_dispatch(struct ub_dev *sc)
                 } else {
                         if (!ub_is_completed(&sc->work_done))
                                 break;
+                        del_timer(&sc->work_timer);
                         ub_scsi_urb_compl(sc, cmd);
                 }
         }
@@ -1680,16 +1702,18 @@ static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd)
 
 /*
  * Reset management
+ * XXX Move usb_reset_device to khubd. Hogging kevent is not a good thing.
+ * XXX Make usb_sync_reset asynchronous.
  */
 
-static void ub_reset_enter(struct ub_dev *sc)
+static void ub_reset_enter(struct ub_dev *sc, int try)
 {
 
         if (sc->reset) {
                 /* This happens often on multi-LUN devices. */
                 return;
         }
-        sc->reset = 1;
+        sc->reset = try + 1;
 
 #if 0 /* Not needed because the disconnect waits for us. */
         unsigned long flags;
@@ -1727,6 +1751,11 @@ static void ub_reset_task(void *arg)
         if (atomic_read(&sc->poison)) {
                 printk(KERN_NOTICE "%s: Not resetting disconnected device\n",
                     sc->name); /* P3 This floods. Remove soon. XXX */
+        } else if ((sc->reset & 1) == 0) {
+                ub_sync_reset(sc);
+                msleep(700);    /* usb-storage sleeps 6s (!) */
+                ub_probe_clear_stall(sc, sc->recv_bulk_pipe);
+                ub_probe_clear_stall(sc, sc->send_bulk_pipe);
         } else if (sc->dev->actconfig->desc.bNumInterfaces != 1) {
                 printk(KERN_NOTICE "%s: Not resetting multi-interface device\n",
                     sc->name); /* P3 This floods. Remove soon. XXX */
@@ -1754,7 +1783,7 @@ static void ub_reset_task(void *arg)
          * queues of resets or anything. We do need a spinlock though,
          * to interact with block layer.
          */
-        spin_lock_irqsave(&sc->lock, flags);
+        spin_lock_irqsave(sc->lock, flags);
         sc->reset = 0;
         tasklet_schedule(&sc->tasklet);
         list_for_each(p, &sc->luns) {
@@ -1762,7 +1791,7 @@ static void ub_reset_task(void *arg)
                 blk_start_queue(lun->disk->queue);
         }
         wake_up(&sc->reset_wait);
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_unlock_irqrestore(sc->lock, flags);
 }
 
 /*
@@ -1990,11 +2019,11 @@ static int ub_sync_tur(struct ub_dev *sc, struct ub_lun *lun)
         cmd->done = ub_probe_done;
         cmd->back = &compl;
 
-        spin_lock_irqsave(&sc->lock, flags);
+        spin_lock_irqsave(sc->lock, flags);
         cmd->tag = sc->tagcnt++;
 
         rc = ub_submit_scsi(sc, cmd);
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_unlock_irqrestore(sc->lock, flags);
 
         if (rc != 0) {
                 printk("ub: testing ready: submit error (%d)\n", rc); /* P3 */
@@ -2052,11 +2081,11 @@ static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun,
         cmd->done = ub_probe_done;
         cmd->back = &compl;
 
-        spin_lock_irqsave(&sc->lock, flags);
+        spin_lock_irqsave(sc->lock, flags);
         cmd->tag = sc->tagcnt++;
 
         rc = ub_submit_scsi(sc, cmd);
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_unlock_irqrestore(sc->lock, flags);
 
         if (rc != 0) {
                 printk("ub: reading capacity: submit error (%d)\n", rc); /* P3 */
@@ -2118,6 +2147,52 @@ static void ub_probe_timeout(unsigned long arg)
 }
 
 /*
+ * Reset with a Bulk reset.
+ */
+static int ub_sync_reset(struct ub_dev *sc)
+{
+        int ifnum = sc->intf->cur_altsetting->desc.bInterfaceNumber;
+        struct usb_ctrlrequest *cr;
+        struct completion compl;
+        struct timer_list timer;
+        int rc;
+
+        init_completion(&compl);
+
+        cr = &sc->work_cr;
+        cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE;
+        cr->bRequest = US_BULK_RESET_REQUEST;
+        cr->wValue = cpu_to_le16(0);
+        cr->wIndex = cpu_to_le16(ifnum);
+        cr->wLength = cpu_to_le16(0);
+
+        usb_fill_control_urb(&sc->work_urb, sc->dev, sc->send_ctrl_pipe,
+            (unsigned char*) cr, NULL, 0, ub_probe_urb_complete, &compl);
+        sc->work_urb.actual_length = 0;
+        sc->work_urb.error_count = 0;
+        sc->work_urb.status = 0;
+
+        if ((rc = usb_submit_urb(&sc->work_urb, GFP_KERNEL)) != 0) {
+                printk(KERN_WARNING
+                     "%s: Unable to submit a bulk reset (%d)\n", sc->name, rc);
+                return rc;
+        }
+
+        init_timer(&timer);
+        timer.function = ub_probe_timeout;
+        timer.data = (unsigned long) &compl;
+        timer.expires = jiffies + UB_CTRL_TIMEOUT;
+        add_timer(&timer);
+
+        wait_for_completion(&compl);
+
+        del_timer_sync(&timer);
+        usb_kill_urb(&sc->work_urb);
+
+        return sc->work_urb.status;
+}
+
+/*
  * Get number of LUNs by the way of Bulk GetMaxLUN command.
  */
 static int ub_sync_getmaxlun(struct ub_dev *sc)
@@ -2333,7 +2408,7 @@ static int ub_probe(struct usb_interface *intf,
         if ((sc = kmalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL)
                 goto err_core;
         memset(sc, 0, sizeof(struct ub_dev));
-        spin_lock_init(&sc->lock);
+        sc->lock = ub_next_lock();
         INIT_LIST_HEAD(&sc->luns);
         usb_init_urb(&sc->work_urb);
         tasklet_init(&sc->tasklet, ub_scsi_action, (unsigned long)sc);
@@ -2483,7 +2558,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)
         disk->driverfs_dev = &sc->intf->dev;
 
         rc = -ENOMEM;
-        if ((q = blk_init_queue(ub_request_fn, &sc->lock)) == NULL)
+        if ((q = blk_init_queue(ub_request_fn, sc->lock)) == NULL)
                 goto err_blkqinit;
 
         disk->queue = q;
@@ -2554,7 +2629,7 @@ static void ub_disconnect(struct usb_interface *intf)
          * and the whole queue drains. So, we just use this code to
          * print warnings.
          */
-        spin_lock_irqsave(&sc->lock, flags);
+        spin_lock_irqsave(sc->lock, flags);
         {
                 struct ub_scsi_cmd *cmd;
                 int cnt = 0;
@@ -2571,7 +2646,7 @@ static void ub_disconnect(struct usb_interface *intf)
                             "%d was queued after shutdown\n", sc->name, cnt);
                 }
         }
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_unlock_irqrestore(sc->lock, flags);
 
         /*
          * Unregister the upper layer.
@@ -2590,19 +2665,15 @@ static void ub_disconnect(struct usb_interface *intf)
         }
 
         /*
-         * Taking a lock on a structure which is about to be freed
-         * is very nonsensual. Here it is largely a way to do a debug freeze,
-         * and a bracket which shows where the nonsensual code segment ends.
-         *
          * Testing for -EINPROGRESS is always a bug, so we are bending
          * the rules a little.
          */
-        spin_lock_irqsave(&sc->lock, flags);
+        spin_lock_irqsave(sc->lock, flags);
         if (sc->work_urb.status == -EINPROGRESS) {      /* janitors: ignore */
                 printk(KERN_WARNING "%s: "
                     "URB is active after disconnect\n", sc->name);
         }
-        spin_unlock_irqrestore(&sc->lock, flags);
+        spin_unlock_irqrestore(sc->lock, flags);
 
         /*
          * There is virtually no chance that other CPU runs times so long
@@ -2636,6 +2707,10 @@ static struct usb_driver ub_driver = {
 static int __init ub_init(void)
 {
         int rc;
+        int i;
+
+        for (i = 0; i < UB_QLOCK_NUM; i++)
+                spin_lock_init(&ub_qlockv[i]);
 
         if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)
                 goto err_regblkdev;
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index a3614e6a68d0..4ada1268b40d 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -882,7 +882,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
                card->card_number, dev->bus->number, dev->devfn);
 
         if (pci_set_dma_mask(dev, 0xffffffffffffffffLL) &&
-            !pci_set_dma_mask(dev, 0xffffffffLL)) {
+            pci_set_dma_mask(dev, 0xffffffffLL)) {
                 printk(KERN_WARNING "MM%d: NO suitable DMA found\n",num_cards);
                 return  -ENOMEM;
         }
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 4135d8c5bcae..4c67727d75b1 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -992,7 +992,7 @@ config HPET_MMAP
 
 config HANGCHECK_TIMER
         tristate "Hangcheck timer"
-        depends on X86 || IA64 || PPC64 || S390
+        depends on X86 || IA64 || PPC64
         help
           The hangcheck-timer module detects when the system has gone
           out to lunch past a certain margin.  It can reboot the system
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 810679dcbbb0..9964c508c111 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -600,6 +600,26 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
         agp_put_bridge(bridge);
 }
 
+#ifdef CONFIG_PM
+
+static int agp_amd64_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_amd64_resume(struct pci_dev *pdev)
+{
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+
+        return amd_8151_configure();
+}
+
+#endif /* CONFIG_PM */
+
 static struct pci_device_id agp_amd64_pci_table[] = {
         {
         .class          = (PCI_CLASS_BRIDGE_HOST << 8),
@@ -718,6 +738,10 @@ static struct pci_driver agp_amd64_pci_driver = {
         .id_table       = agp_amd64_pci_table,
         .probe          = agp_amd64_probe,
         .remove         = agp_amd64_remove,
+#ifdef CONFIG_PM
+        .suspend        = agp_amd64_suspend,
+        .resume         = agp_amd64_resume,
+#endif
 };
 
 
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 53372a83b675..5b74c36c116c 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -244,6 +244,22 @@ static int ati_configure(void)
 }
 
 
+#ifdef CONFIG_PM
+static int agp_ati_resume(struct pci_dev *dev)
+{
+        pci_restore_state(dev);
+
+        return ati_configure();
+}
+
+static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)
+{
+        pci_save_state(dev);
+
+        return 0;
+}
+#endif
+
 /*
  *Since we don't need contigious memory we just try
  * to get the gatt table once
@@ -525,6 +541,10 @@ static struct pci_driver agp_ati_pci_driver = {
         .id_table       = agp_ati_pci_table,
         .probe          = agp_ati_probe,
         .remove         = agp_ati_remove,
+#ifdef CONFIG_PM
+        .resume         = agp_ati_resume,
+        .suspend        = agp_ati_suspend,
+#endif
 };
 
 static int __init agp_ati_init(void)
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 17f520c9d471..97eeb2345b18 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -592,7 +592,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma)
         struct agp_file_private *priv = file->private_data;
         struct agp_kern_info kerninfo;
 
-        down(&(agp_fe.agp_mutex));
+        mutex_lock(&(agp_fe.agp_mutex));
 
         if (agp_fe.backend_acquired != TRUE)
                 goto out_eperm;
@@ -627,7 +627,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma)
                                             size, vma->vm_page_prot)) {
                         goto out_again;
                 }
-                up(&(agp_fe.agp_mutex));
+                mutex_unlock(&(agp_fe.agp_mutex));
                 return 0;
         }
 
@@ -643,20 +643,20 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma)
                                             size, vma->vm_page_prot)) {
                         goto out_again;
                 }
-                up(&(agp_fe.agp_mutex));
+                mutex_unlock(&(agp_fe.agp_mutex));
                 return 0;
         }
 
 out_eperm:
-        up(&(agp_fe.agp_mutex));
+        mutex_unlock(&(agp_fe.agp_mutex));
         return -EPERM;
 
 out_inval:
-        up(&(agp_fe.agp_mutex));
+        mutex_unlock(&(agp_fe.agp_mutex));
         return -EINVAL;
 
 out_again:
-        up(&(agp_fe.agp_mutex));
+        mutex_unlock(&(agp_fe.agp_mutex));
         return -EAGAIN;
 }
 
@@ -664,7 +664,7 @@ static int agp_release(struct inode *inode, struct file *file)
 {
         struct agp_file_private *priv = file->private_data;
 
-        down(&(agp_fe.agp_mutex));
+        mutex_lock(&(agp_fe.agp_mutex));
 
         DBG("priv=%p", priv);
 
@@ -687,7 +687,7 @@ static int agp_release(struct inode *inode, struct file *file)
         agp_remove_file_private(priv);
         kfree(priv);
         file->private_data = NULL;
-        up(&(agp_fe.agp_mutex));
+        mutex_unlock(&(agp_fe.agp_mutex));
         return 0;
 }
 
@@ -698,7 +698,7 @@ static int agp_open(struct inode *inode, struct file *file)
         struct agp_client *client;
         int rc = -ENXIO;
 
-        down(&(agp_fe.agp_mutex));
+        mutex_lock(&(agp_fe.agp_mutex));
 
         if (minor != AGPGART_MINOR)
                 goto err_out;
@@ -723,13 +723,13 @@ static int agp_open(struct inode *inode, struct file *file)
         file->private_data = (void *) priv;
         agp_insert_file_private(priv);
         DBG("private=%p, client=%p", priv, client);
-        up(&(agp_fe.agp_mutex));
+        mutex_unlock(&(agp_fe.agp_mutex));
         return 0;
 
 err_out_nomem:
         rc = -ENOMEM;
 err_out:
-        up(&(agp_fe.agp_mutex));
+        mutex_unlock(&(agp_fe.agp_mutex));
         return rc;
 }
 
@@ -985,7 +985,7 @@ static int agp_ioctl(struct inode *inode, struct file *file,
         int ret_val = -ENOTTY;
 
         DBG("priv=%p, cmd=%x", curr_priv, cmd);
-        down(&(agp_fe.agp_mutex));
+        mutex_lock(&(agp_fe.agp_mutex));
 
         if ((agp_fe.current_controller == NULL) &&
             (cmd != AGPIOC_ACQUIRE)) {
@@ -1055,7 +1055,7 @@ static int agp_ioctl(struct inode *inode, struct file *file,
 
 ioctl_out:
         DBG("ioctl returns %d\n", ret_val);
-        up(&(agp_fe.agp_mutex));
+        mutex_unlock(&(agp_fe.agp_mutex));
         return ret_val;
 }
 
@@ -1081,7 +1081,7 @@ static struct miscdevice agp_miscdev =
 int agp_frontend_initialize(void)
 {
         memset(&agp_fe, 0, sizeof(struct agp_front_data));
-        sema_init(&(agp_fe.agp_mutex), 1);
+        mutex_init(&(agp_fe.agp_mutex));
 
         if (misc_register(&agp_miscdev)) {
                 printk(KERN_ERR PFX "unable to get minor: %d\n", AGPGART_MINOR);
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index e7bed5047dcc..631531fd97a5 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -422,7 +422,8 @@ static void intel_i830_init_gtt_entries(void)
                         /* Check it's really I915G */
                         if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
-                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB)
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB)
                                 gtt_entries = MB(48) - KB(size);
                         else
                                 gtt_entries = 0;
@@ -431,7 +432,8 @@ static void intel_i830_init_gtt_entries(void)
                         /* Check it's really I915G */
                         if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
                             agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
-                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB)
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
+                            agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB)
                                 gtt_entries = MB(64) - KB(size);
                         else
                                 gtt_entries = 0;
@@ -1681,6 +1683,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
                 }
                 name = "945G";
                 break;
+        case PCI_DEVICE_ID_INTEL_82945GM_HB:
+                if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG)) {
+                        bridge->driver = &intel_915_driver;
+                } else {
+                        bridge->driver = &intel_845_driver;
+                }
+                name = "945GM";
+                break;
         case PCI_DEVICE_ID_INTEL_7505_0:
                 bridge->driver = &intel_7505_driver;
                 name = "E7505";
@@ -1821,6 +1831,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_82915G_HB),
         ID(PCI_DEVICE_ID_INTEL_82915GM_HB),
         ID(PCI_DEVICE_ID_INTEL_82945G_HB),
+        ID(PCI_DEVICE_ID_INTEL_82945GM_HB),
         { }
 };
 
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c
index 40083241804e..7c14a096b85e 100644
--- a/drivers/char/agp/isoch.c
+++ b/drivers/char/agp/isoch.c
@@ -218,10 +218,8 @@ static int agp_3_5_isochronous_node_enable(struct agp_bridge_data *bridge,
                         master[cdev].rq *= (1 << (master[cdev].y - 1));
 
                 tot_rq += master[cdev].rq;
-
-                if (cdev == ndevs-1)
-                        master[cdev].n += rem;
         }
+        master[ndevs-1].n += rem;
 
         /* Figure the number of isochronous and asynchronous RQ slots the
          * target is providing. */
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 39c61a71176e..cc7acf877dc0 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -1233,7 +1233,7 @@ cyy_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                             }
                              info->idle_stats.recv_idle = jiffies;
                         }
-                        schedule_delayed_work(&tty->buf.work, 1);
+                        tty_schedule_flip(tty);
                     }
                     /* end of service */
                     cy_writeb(base_addr+(CyRIR<<index), (save_xir & 0x3f));
@@ -1606,7 +1606,7 @@ cyz_handle_rx(struct cyclades_port *info,
             }
 #endif
             info->idle_stats.recv_idle = jiffies;
-            schedule_delayed_work(&tty->buf.work, 1);
+            tty_schedule_flip(tty);
         }
         /* Update rx_get */
         cy_writel(&buf_ctrl->rx_get, new_rx_get);
@@ -1809,7 +1809,7 @@ cyz_handle_cmd(struct cyclades_card *cinfo)
         if(delta_count)
             cy_sched_event(info, Cy_EVENT_DELTA_WAKEUP);
         if(special_count)
-            schedule_delayed_work(&tty->buf.work, 1);
+            tty_schedule_flip(tty);
     }
 }
 
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index 5485382cadec..bd7be09ea53d 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -59,17 +59,16 @@ static void *drm_ati_alloc_pcigart_table(void)
         int i;
         DRM_DEBUG("%s\n", __FUNCTION__);
 
-        address = __get_free_pages(GFP_KERNEL, ATI_PCIGART_TABLE_ORDER);
+        address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
+                                   ATI_PCIGART_TABLE_ORDER);
         if (address == 0UL) {
-                return 0;
+                return NULL;
         }
 
         page = virt_to_page(address);
 
-        for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
-                get_page(page);
+        for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
                 SetPageReserved(page);
-        }
 
         DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);
         return (void *)address;
@@ -83,10 +82,8 @@ static void drm_ati_free_pcigart_table(void *address)
 
         page = virt_to_page((unsigned long)address);
 
-        for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
-                __put_page(page);
+        for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
                 ClearPageReserved(page);
-        }
 
         free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER);
 }
@@ -127,7 +124,7 @@ int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
         if (gart_info->gart_table_location == DRM_ATI_GART_MAIN
             && gart_info->addr) {
                 drm_ati_free_pcigart_table(gart_info->addr);
-                gart_info->addr = 0;
+                gart_info->addr = NULL;
         }
 
         return 1;
@@ -168,7 +165,7 @@ int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info)
                 if (bus_address == 0) {
                         DRM_ERROR("unable to map PCIGART pages!\n");
                         drm_ati_free_pcigart_table(address);
-                        address = 0;
+                        address = NULL;
                         goto done;
                 }
         } else {
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 54b561e69486..71b8b32b075f 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -57,6 +57,7 @@
 #include <linux/smp_lock.h>     /* For (un)lock_kernel */
 #include <linux/mm.h>
 #include <linux/cdev.h>
+#include <linux/mutex.h>
 #if defined(__alpha__) || defined(__powerpc__)
 #include <asm/pgtable.h>        /* For pte_wrprotect */
 #endif
@@ -623,7 +624,7 @@ typedef struct drm_device {
         /** \name Locks */
         /*@{ */
         spinlock_t count_lock;          /**< For inuse, drm_device::open_count, drm_device::buf_use */
-        struct semaphore struct_sem;    /**< For others */
+        struct mutex struct_mutex;      /**< For others */
         /*@} */
 
         /** \name Usage Counters */
@@ -658,7 +659,7 @@ typedef struct drm_device {
         /*@{ */
         drm_ctx_list_t *ctxlist;        /**< Linked list of context handles */
         int ctx_count;                  /**< Number of context handles */
-        struct semaphore ctxlist_sem;   /**< For ctxlist */
+        struct mutex ctxlist_mutex;     /**< For ctxlist */
 
         drm_map_t **context_sareas;         /**< per-context SAREA's */
         int max_context;
diff --git a/drivers/char/drm/drm_auth.c b/drivers/char/drm/drm_auth.c
index a47b502bc7cc..2a37586a7ee8 100644
--- a/drivers/char/drm/drm_auth.c
+++ b/drivers/char/drm/drm_auth.c
@@ -56,7 +56,7 @@ static int drm_hash_magic(drm_magic_t magic)
  * \param magic magic number.
  *
  * Searches in drm_device::magiclist within all files with the same hash key
- * the one with matching magic number, while holding the drm_device::struct_sem
+ * the one with matching magic number, while holding the drm_device::struct_mutex
  * lock.
  */
 static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic)
@@ -65,14 +65,14 @@ static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic)
         drm_magic_entry_t *pt;
         int hash = drm_hash_magic(magic);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         for (pt = dev->magiclist[hash].head; pt; pt = pt->next) {
                 if (pt->magic == magic) {
                         retval = pt->priv;
                         break;
                 }
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return retval;
 }
 
@@ -85,7 +85,7 @@ static drm_file_t *drm_find_file(drm_device_t * dev, drm_magic_t magic)
  *
  * Creates a drm_magic_entry structure and appends to the linked list
  * associated the magic number hash key in drm_device::magiclist, while holding
- * the drm_device::struct_sem lock.
+ * the drm_device::struct_mutex lock.
  */
 static int drm_add_magic(drm_device_t * dev, drm_file_t * priv,
                          drm_magic_t magic)
@@ -104,7 +104,7 @@ static int drm_add_magic(drm_device_t * dev, drm_file_t * priv,
         entry->priv = priv;
         entry->next = NULL;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         if (dev->magiclist[hash].tail) {
                 dev->magiclist[hash].tail->next = entry;
                 dev->magiclist[hash].tail = entry;
@@ -112,7 +112,7 @@ static int drm_add_magic(drm_device_t * dev, drm_file_t * priv,
                 dev->magiclist[hash].head = entry;
                 dev->magiclist[hash].tail = entry;
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         return 0;
 }
@@ -124,7 +124,7 @@ static int drm_add_magic(drm_device_t * dev, drm_file_t * priv,
  * \param magic magic number.
  *
  * Searches and unlinks the entry in drm_device::magiclist with the magic
- * number hash key, while holding the drm_device::struct_sem lock.
+ * number hash key, while holding the drm_device::struct_mutex lock.
  */
 static int drm_remove_magic(drm_device_t * dev, drm_magic_t magic)
 {
@@ -135,7 +135,7 @@ static int drm_remove_magic(drm_device_t * dev, drm_magic_t magic)
         DRM_DEBUG("%d\n", magic);
         hash = drm_hash_magic(magic);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         for (pt = dev->magiclist[hash].head; pt; prev = pt, pt = pt->next) {
                 if (pt->magic == magic) {
                         if (dev->magiclist[hash].head == pt) {
@@ -147,11 +147,11 @@ static int drm_remove_magic(drm_device_t * dev, drm_magic_t magic)
                         if (prev) {
                                 prev->next = pt->next;
                         }
-                        up(&dev->struct_sem);
+                        mutex_unlock(&dev->struct_mutex);
                         return 0;
                 }
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
 
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 1db12dcb6802..e2637b4d51de 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -255,14 +255,14 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
         memset(list, 0, sizeof(*list));
         list->map = map;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         list_add(&list->head, &dev->maplist->head);
         /* Assign a 32-bit handle */
-        /* We do it here so that dev->struct_sem protects the increment */
+        /* We do it here so that dev->struct_mutex protects the increment */
         list->user_token = HandleID(map->type == _DRM_SHM
                                     ? (unsigned long)map->handle
                                     : map->offset, dev);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         *maplist = list;
         return 0;
@@ -392,9 +392,9 @@ int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)
 {
         int ret;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         ret = drm_rmmap_locked(dev, map);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         return ret;
 }
@@ -423,7 +423,7 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
                 return -EFAULT;
         }
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         list_for_each(list, &dev->maplist->head) {
                 drm_map_list_t *r_list = list_entry(list, drm_map_list_t, head);
 
@@ -439,7 +439,7 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
          * find anything.
          */
         if (list == (&dev->maplist->head)) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
 
@@ -448,13 +448,13 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
 
         /* Register and framebuffer maps are permanent */
         if ((map->type == _DRM_REGISTERS) || (map->type == _DRM_FRAME_BUFFER)) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return 0;
         }
 
         ret = drm_rmmap_locked(dev, map);
 
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         return ret;
 }
@@ -566,16 +566,16 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
         atomic_inc(&dev->buf_alloc);
         spin_unlock(&dev->count_lock);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         entry = &dma->bufs[order];
         if (entry->buf_count) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM; /* May only call once for each order */
         }
 
         if (count < 0 || count > 4096) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -EINVAL;
         }
@@ -583,7 +583,7 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
         entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
                                    DRM_MEM_BUFS);
         if (!entry->buflist) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -616,7 +616,7 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
                         /* Set count correctly so we free the proper amount. */
                         entry->buf_count = count;
                         drm_cleanup_buf_error(dev, entry);
-                        up(&dev->struct_sem);
+                        mutex_unlock(&dev->struct_mutex);
                         atomic_dec(&dev->buf_alloc);
                         return -ENOMEM;
                 }
@@ -638,7 +638,7 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
         if (!temp_buflist) {
                 /* Free the entry because it isn't valid */
                 drm_cleanup_buf_error(dev, entry);
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -656,7 +656,7 @@ int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request)
         DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
         DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
 
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         request->count = entry->buf_count;
         request->size = size;
@@ -722,16 +722,16 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
         atomic_inc(&dev->buf_alloc);
         spin_unlock(&dev->count_lock);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         entry = &dma->bufs[order];
         if (entry->buf_count) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM; /* May only call once for each order */
         }
 
         if (count < 0 || count > 4096) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -EINVAL;
         }
@@ -739,7 +739,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
         entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
                                    DRM_MEM_BUFS);
         if (!entry->buflist) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -750,7 +750,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
         if (!entry->seglist) {
                 drm_free(entry->buflist,
                          count * sizeof(*entry->buflist), DRM_MEM_BUFS);
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -766,7 +766,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
                          count * sizeof(*entry->buflist), DRM_MEM_BUFS);
                 drm_free(entry->seglist,
                          count * sizeof(*entry->seglist), DRM_MEM_SEGS);
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -790,7 +790,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
                         drm_free(temp_pagelist,
                                  (dma->page_count + (count << page_order))
                                  * sizeof(*dma->pagelist), DRM_MEM_PAGES);
-                        up(&dev->struct_sem);
+                        mutex_unlock(&dev->struct_mutex);
                         atomic_dec(&dev->buf_alloc);
                         return -ENOMEM;
                 }
@@ -831,7 +831,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
                                           (count << page_order))
                                          * sizeof(*dma->pagelist),
                                          DRM_MEM_PAGES);
-                                up(&dev->struct_sem);
+                                mutex_unlock(&dev->struct_mutex);
                                 atomic_dec(&dev->buf_alloc);
                                 return -ENOMEM;
                         }
@@ -853,7 +853,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
                 drm_free(temp_pagelist,
                          (dma->page_count + (count << page_order))
                          * sizeof(*dma->pagelist), DRM_MEM_PAGES);
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -878,7 +878,7 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request)
         dma->page_count += entry->seg_count << page_order;
         dma->byte_count += PAGE_SIZE * (entry->seg_count << page_order);
 
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         request->count = entry->buf_count;
         request->size = size;
@@ -948,16 +948,16 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request)
         atomic_inc(&dev->buf_alloc);
         spin_unlock(&dev->count_lock);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         entry = &dma->bufs[order];
         if (entry->buf_count) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM; /* May only call once for each order */
         }
 
         if (count < 0 || count > 4096) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -EINVAL;
         }
@@ -965,7 +965,7 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request)
         entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
                                    DRM_MEM_BUFS);
         if (!entry->buflist) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -999,7 +999,7 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request)
                         /* Set count correctly so we free the proper amount. */
                         entry->buf_count = count;
                         drm_cleanup_buf_error(dev, entry);
-                        up(&dev->struct_sem);
+                        mutex_unlock(&dev->struct_mutex);
                         atomic_dec(&dev->buf_alloc);
                         return -ENOMEM;
                 }
@@ -1022,7 +1022,7 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request)
         if (!temp_buflist) {
                 /* Free the entry because it isn't valid */
                 drm_cleanup_buf_error(dev, entry);
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -1040,7 +1040,7 @@ static int drm_addbufs_sg(drm_device_t * dev, drm_buf_desc_t * request)
         DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
         DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
 
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         request->count = entry->buf_count;
         request->size = size;
@@ -1110,16 +1110,16 @@ int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
         atomic_inc(&dev->buf_alloc);
         spin_unlock(&dev->count_lock);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         entry = &dma->bufs[order];
         if (entry->buf_count) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM; /* May only call once for each order */
         }
 
         if (count < 0 || count > 4096) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -EINVAL;
         }
@@ -1127,7 +1127,7 @@ int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
         entry->buflist = drm_alloc(count * sizeof(*entry->buflist),
                                    DRM_MEM_BUFS);
         if (!entry->buflist) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -1160,7 +1160,7 @@ int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
                         /* Set count correctly so we free the proper amount. */
                         entry->buf_count = count;
                         drm_cleanup_buf_error(dev, entry);
-                        up(&dev->struct_sem);
+                        mutex_unlock(&dev->struct_mutex);
                         atomic_dec(&dev->buf_alloc);
                         return -ENOMEM;
                 }
@@ -1182,7 +1182,7 @@ int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
         if (!temp_buflist) {
                 /* Free the entry because it isn't valid */
                 drm_cleanup_buf_error(dev, entry);
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
@@ -1200,7 +1200,7 @@ int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
         DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
         DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
 
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         request->count = entry->buf_count;
         request->size = size;
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c
index f84254526949..83094c73da67 100644
--- a/drivers/char/drm/drm_context.c
+++ b/drivers/char/drm/drm_context.c
@@ -53,7 +53,7 @@
  * \param ctx_handle context handle.
  *
  * Clears the bit specified by \p ctx_handle in drm_device::ctx_bitmap and the entry
- * in drm_device::context_sareas, while holding the drm_device::struct_sem
+ * in drm_device::context_sareas, while holding the drm_device::struct_mutex
  * lock.
  */
 void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle)
@@ -64,10 +64,10 @@ void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle)
                 goto failed;
 
         if (ctx_handle < DRM_MAX_CTXBITMAP) {
-                down(&dev->struct_sem);
+                mutex_lock(&dev->struct_mutex);
                 clear_bit(ctx_handle, dev->ctx_bitmap);
                 dev->context_sareas[ctx_handle] = NULL;
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return;
         }
       failed:
@@ -83,7 +83,7 @@ void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle)
  *
  * Find the first zero bit in drm_device::ctx_bitmap and (re)allocates
  * drm_device::context_sareas to accommodate the new entry while holding the
- * drm_device::struct_sem lock.
+ * drm_device::struct_mutex lock.
  */
 static int drm_ctxbitmap_next(drm_device_t * dev)
 {
@@ -92,7 +92,7 @@ static int drm_ctxbitmap_next(drm_device_t * dev)
         if (!dev->ctx_bitmap)
                 return -1;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         bit = find_first_zero_bit(dev->ctx_bitmap, DRM_MAX_CTXBITMAP);
         if (bit < DRM_MAX_CTXBITMAP) {
                 set_bit(bit, dev->ctx_bitmap);
@@ -113,7 +113,7 @@ static int drm_ctxbitmap_next(drm_device_t * dev)
                                                          DRM_MEM_MAPS);
                                 if (!ctx_sareas) {
                                         clear_bit(bit, dev->ctx_bitmap);
-                                        up(&dev->struct_sem);
+                                        mutex_unlock(&dev->struct_mutex);
                                         return -1;
                                 }
                                 dev->context_sareas = ctx_sareas;
@@ -126,16 +126,16 @@ static int drm_ctxbitmap_next(drm_device_t * dev)
                                               DRM_MEM_MAPS);
                                 if (!dev->context_sareas) {
                                         clear_bit(bit, dev->ctx_bitmap);
-                                        up(&dev->struct_sem);
+                                        mutex_unlock(&dev->struct_mutex);
                                         return -1;
                                 }
                                 dev->context_sareas[bit] = NULL;
                         }
                 }
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return bit;
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return -1;
 }
 
@@ -145,24 +145,24 @@ static int drm_ctxbitmap_next(drm_device_t * dev)
  * \param dev DRM device.
  *
  * Allocates and initialize drm_device::ctx_bitmap and drm_device::context_sareas, while holding
- * the drm_device::struct_sem lock.
+ * the drm_device::struct_mutex lock.
  */
 int drm_ctxbitmap_init(drm_device_t * dev)
 {
         int i;
         int temp;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         dev->ctx_bitmap = (unsigned long *)drm_alloc(PAGE_SIZE,
                                                      DRM_MEM_CTXBITMAP);
         if (dev->ctx_bitmap == NULL) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -ENOMEM;
         }
         memset((void *)dev->ctx_bitmap, 0, PAGE_SIZE);
         dev->context_sareas = NULL;
         dev->max_context = -1;
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
                 temp = drm_ctxbitmap_next(dev);
@@ -178,17 +178,17 @@ int drm_ctxbitmap_init(drm_device_t * dev)
  * \param dev DRM device.
  *
  * Frees drm_device::ctx_bitmap and drm_device::context_sareas, while holding
- * the drm_device::struct_sem lock.
+ * the drm_device::struct_mutex lock.
  */
 void drm_ctxbitmap_cleanup(drm_device_t * dev)
 {
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         if (dev->context_sareas)
                 drm_free(dev->context_sareas,
                          sizeof(*dev->context_sareas) *
                          dev->max_context, DRM_MEM_MAPS);
         drm_free((void *)dev->ctx_bitmap, PAGE_SIZE, DRM_MEM_CTXBITMAP);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 }
 
 /*@}*/
@@ -222,15 +222,15 @@ int drm_getsareactx(struct inode *inode, struct file *filp,
         if (copy_from_user(&request, argp, sizeof(request)))
                 return -EFAULT;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         if (dev->max_context < 0
             || request.ctx_id >= (unsigned)dev->max_context) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
 
         map = dev->context_sareas[request.ctx_id];
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         request.handle = NULL;
         list_for_each_entry(_entry, &dev->maplist->head, head) {
@@ -274,7 +274,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
                            (drm_ctx_priv_map_t __user *) arg, sizeof(request)))
                 return -EFAULT;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         list_for_each(list, &dev->maplist->head) {
                 r_list = list_entry(list, drm_map_list_t, head);
                 if (r_list->map
@@ -282,7 +282,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
                         goto found;
         }
       bad:
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return -EINVAL;
 
       found:
@@ -294,7 +294,7 @@ int drm_setsareactx(struct inode *inode, struct file *filp,
         if (request.ctx_id >= (unsigned)dev->max_context)
                 goto bad;
         dev->context_sareas[request.ctx_id] = map;
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return 0;
 }
 
@@ -448,10 +448,10 @@ int drm_addctx(struct inode *inode, struct file *filp,
         ctx_entry->handle = ctx.handle;
         ctx_entry->tag = priv;
 
-        down(&dev->ctxlist_sem);
+        mutex_lock(&dev->ctxlist_mutex);
         list_add(&ctx_entry->head, &dev->ctxlist->head);
         ++dev->ctx_count;
-        up(&dev->ctxlist_sem);
+        mutex_unlock(&dev->ctxlist_mutex);
 
         if (copy_to_user(argp, &ctx, sizeof(ctx)))
                 return -EFAULT;
@@ -574,7 +574,7 @@ int drm_rmctx(struct inode *inode, struct file *filp,
                 drm_ctxbitmap_free(dev, ctx.handle);
         }
 
-        down(&dev->ctxlist_sem);
+        mutex_lock(&dev->ctxlist_mutex);
         if (!list_empty(&dev->ctxlist->head)) {
                 drm_ctx_list_t *pos, *n;
 
@@ -586,7 +586,7 @@ int drm_rmctx(struct inode *inode, struct file *filp,
                         }
                 }
         }
-        up(&dev->ctxlist_sem);
+        mutex_unlock(&dev->ctxlist_mutex);
 
         return 0;
 }
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index c4fa5a29582b..dc6bbe8a18dc 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -151,7 +151,7 @@ int drm_lastclose(drm_device_t * dev)
         if (dev->irq_enabled)
                 drm_irq_uninstall(dev);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         del_timer(&dev->timer);
 
         /* Clear pid list */
@@ -231,7 +231,7 @@ int drm_lastclose(drm_device_t * dev)
                 dev->lock.filp = NULL;
                 wake_up_interruptible(&dev->lock.lock_queue);
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         DRM_DEBUG("lastclose completed\n");
         return 0;
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 403f44a1bf01..641f7633878c 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -262,7 +262,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                         goto out_free;
         }
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         if (!dev->file_last) {
                 priv->next = NULL;
                 priv->prev = NULL;
@@ -276,7 +276,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                 dev->file_last->next = priv;
                 dev->file_last = priv;
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
 #ifdef __alpha__
         /*
@@ -413,7 +413,7 @@ int drm_release(struct inode *inode, struct file *filp)
 
         drm_fasync(-1, filp, 0);
 
-        down(&dev->ctxlist_sem);
+        mutex_lock(&dev->ctxlist_mutex);
         if (dev->ctxlist && (!list_empty(&dev->ctxlist->head))) {
                 drm_ctx_list_t *pos, *n;
 
@@ -432,9 +432,9 @@ int drm_release(struct inode *inode, struct file *filp)
                         }
                 }
         }
-        up(&dev->ctxlist_sem);
+        mutex_unlock(&dev->ctxlist_mutex);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         if (priv->remove_auth_on_close == 1) {
                 drm_file_t *temp = dev->file_first;
                 while (temp) {
@@ -452,7 +452,7 @@ int drm_release(struct inode *inode, struct file *filp)
         } else {
                 dev->file_last = priv->prev;
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         if (dev->driver->postclose)
                 dev->driver->postclose(dev, priv);
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
index bcd4e604d3ec..555f323b8a32 100644
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -194,9 +194,9 @@ int drm_getmap(struct inode *inode, struct file *filp,
                 return -EFAULT;
         idx = map.offset;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         if (idx < 0) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
 
@@ -209,7 +209,7 @@ int drm_getmap(struct inode *inode, struct file *filp,
                 i++;
         }
         if (!r_list || !r_list->map) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
 
@@ -219,7 +219,7 @@ int drm_getmap(struct inode *inode, struct file *filp,
         map.flags = r_list->map->flags;
         map.handle = (void *)(unsigned long)r_list->user_token;
         map.mtrr = r_list->map->mtrr;
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         if (copy_to_user(argp, &map, sizeof(map)))
                 return -EFAULT;
@@ -253,11 +253,11 @@ int drm_getclient(struct inode *inode, struct file *filp,
         if (copy_from_user(&client, argp, sizeof(client)))
                 return -EFAULT;
         idx = client.idx;
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         for (i = 0, pt = dev->file_first; i < idx && pt; i++, pt = pt->next) ;
 
         if (!pt) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
         client.auth = pt->authenticated;
@@ -265,7 +265,7 @@ int drm_getclient(struct inode *inode, struct file *filp,
         client.uid = pt->uid;
         client.magic = pt->magic;
         client.iocs = pt->ioctl_count;
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         if (copy_to_user(argp, &client, sizeof(client)))
                 return -EFAULT;
@@ -292,7 +292,7 @@ int drm_getstats(struct inode *inode, struct file *filp,
 
         memset(&stats, 0, sizeof(stats));
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
 
         for (i = 0; i < dev->counters; i++) {
                 if (dev->types[i] == _DRM_STAT_LOCK)
@@ -305,7 +305,7 @@ int drm_getstats(struct inode *inode, struct file *filp,
 
         stats.count = dev->counters;
 
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         if (copy_to_user((drm_stats_t __user *) arg, &stats, sizeof(stats)))
                 return -EFAULT;
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index b0d4b236e837..611a1173091d 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -98,20 +98,20 @@ static int drm_irq_install(drm_device_t * dev)
         if (dev->irq == 0)
                 return -EINVAL;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
 
         /* Driver must have been initialized */
         if (!dev->dev_private) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -EINVAL;
         }
 
         if (dev->irq_enabled) {
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return -EBUSY;
         }
         dev->irq_enabled = 1;
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq);
 
@@ -135,9 +135,9 @@ static int drm_irq_install(drm_device_t * dev)
         ret = request_irq(dev->irq, dev->driver->irq_handler,
                           sh_flags, dev->devname, dev);
         if (ret < 0) {
-                down(&dev->struct_sem);
+                mutex_lock(&dev->struct_mutex);
                 dev->irq_enabled = 0;
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
                 return ret;
         }
 
@@ -161,10 +161,10 @@ int drm_irq_uninstall(drm_device_t * dev)
         if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                 return -EINVAL;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         irq_enabled = dev->irq_enabled;
         dev->irq_enabled = 0;
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 
         if (!irq_enabled)
                 return -EINVAL;
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 5b1d3a04458d..8fd6357a48da 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -3,6 +3,7 @@
    Please contact dri-devel@lists.sf.net to add new cards to this list
 */
 #define radeon_PCI_IDS \
+        {0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350},\
         {0x1002, 0x4136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS100|CHIP_IS_IGP}, \
         {0x1002, 0x4137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|CHIP_IS_IGP}, \
         {0x1002, 0x4144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \
@@ -242,5 +243,6 @@
         {0x8086, 0x2582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2592, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0x8086, 0x2772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+        {0x8086, 0x27a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
         {0, 0, 0}
 
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 6f943e3309ef..362a270af0f1 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -258,7 +258,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,
 }
 
 /**
- * Simply calls _vm_info() while holding the drm_device::struct_sem lock.
+ * Simply calls _vm_info() while holding the drm_device::struct_mutex lock.
  */
 static int drm_vm_info(char *buf, char **start, off_t offset, int request,
                        int *eof, void *data)
@@ -266,9 +266,9 @@ static int drm_vm_info(char *buf, char **start, off_t offset, int request,
         drm_device_t *dev = (drm_device_t *) data;
         int ret;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         ret = drm__vm_info(buf, start, offset, request, eof, data);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return ret;
 }
 
@@ -331,7 +331,7 @@ static int drm__queues_info(char *buf, char **start, off_t offset,
 }
 
 /**
- * Simply calls _queues_info() while holding the drm_device::struct_sem lock.
+ * Simply calls _queues_info() while holding the drm_device::struct_mutex lock.
  */
 static int drm_queues_info(char *buf, char **start, off_t offset, int request,
                            int *eof, void *data)
@@ -339,9 +339,9 @@ static int drm_queues_info(char *buf, char **start, off_t offset, int request,
         drm_device_t *dev = (drm_device_t *) data;
         int ret;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         ret = drm__queues_info(buf, start, offset, request, eof, data);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return ret;
 }
 
@@ -403,7 +403,7 @@ static int drm__bufs_info(char *buf, char **start, off_t offset, int request,
 }
 
 /**
- * Simply calls _bufs_info() while holding the drm_device::struct_sem lock.
+ * Simply calls _bufs_info() while holding the drm_device::struct_mutex lock.
  */
 static int drm_bufs_info(char *buf, char **start, off_t offset, int request,
                          int *eof, void *data)
@@ -411,9 +411,9 @@ static int drm_bufs_info(char *buf, char **start, off_t offset, int request,
         drm_device_t *dev = (drm_device_t *) data;
         int ret;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         ret = drm__bufs_info(buf, start, offset, request, eof, data);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return ret;
 }
 
@@ -459,7 +459,7 @@ static int drm__clients_info(char *buf, char **start, off_t offset,
 }
 
 /**
- * Simply calls _clients_info() while holding the drm_device::struct_sem lock.
+ * Simply calls _clients_info() while holding the drm_device::struct_mutex lock.
  */
 static int drm_clients_info(char *buf, char **start, off_t offset,
                             int request, int *eof, void *data)
@@ -467,9 +467,9 @@ static int drm_clients_info(char *buf, char **start, off_t offset,
         drm_device_t *dev = (drm_device_t *) data;
         int ret;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         ret = drm__clients_info(buf, start, offset, request, eof, data);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return ret;
 }
 
@@ -540,9 +540,9 @@ static int drm_vma_info(char *buf, char **start, off_t offset, int request,
         drm_device_t *dev = (drm_device_t *) data;
         int ret;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         ret = drm__vma_info(buf, start, offset, request, eof, data);
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
         return ret;
 }
 #endif
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 42d766359caa..7a9263ff3007 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -61,8 +61,8 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
 
         spin_lock_init(&dev->count_lock);
         init_timer(&dev->timer);
-        sema_init(&dev->struct_sem, 1);
-        sema_init(&dev->ctxlist_sem, 1);
+        mutex_init(&dev->struct_mutex);
+        mutex_init(&dev->ctxlist_mutex);
 
         dev->pdev = pdev;
 
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 3f73aa774c80..0291cd62c69f 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -188,7 +188,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
 
         map = vma->vm_private_data;
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         for (pt = dev->vmalist, prev = NULL; pt; pt = next) {
                 next = pt->next;
                 if (pt->vma->vm_private_data == map)
@@ -248,7 +248,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
                         drm_free(map, sizeof(*map), DRM_MEM_MAPS);
                 }
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 }
 
 /**
@@ -404,12 +404,12 @@ static void drm_vm_open(struct vm_area_struct *vma)
 
         vma_entry = drm_alloc(sizeof(*vma_entry), DRM_MEM_VMAS);
         if (vma_entry) {
-                down(&dev->struct_sem);
+                mutex_lock(&dev->struct_mutex);
                 vma_entry->vma = vma;
                 vma_entry->next = dev->vmalist;
                 vma_entry->pid = current->pid;
                 dev->vmalist = vma_entry;
-                up(&dev->struct_sem);
+                mutex_unlock(&dev->struct_mutex);
         }
 }
 
@@ -431,7 +431,7 @@ static void drm_vm_close(struct vm_area_struct *vma)
                   vma->vm_start, vma->vm_end - vma->vm_start);
         atomic_dec(&dev->vma_count);
 
-        down(&dev->struct_sem);
+        mutex_lock(&dev->struct_mutex);
         for (pt = dev->vmalist, prev = NULL; pt; prev = pt, pt = pt->next) {
                 if (pt->vma == vma) {
                         if (prev) {
@@ -443,7 +443,7 @@ static void drm_vm_close(struct vm_area_struct *vma)
                         break;
                 }
         }
-        up(&dev->struct_sem);
+        mutex_unlock(&dev->struct_mutex);
 }
 
 /**
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index cc1b89086876..ae0aa6d7e0bb 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -958,7 +958,7 @@ static int i810_flush_queue(drm_device_t * dev)
 }
 
 /* Must be called with the lock held */
-void i810_reclaim_buffers(drm_device_t * dev, struct file *filp)
+static void i810_reclaim_buffers(drm_device_t * dev, struct file *filp)
 {
         drm_device_dma_t *dma = dev->dma;
         int i;
diff --git a/drivers/char/drm/i810_drv.h b/drivers/char/drm/i810_drv.h
index a18b80d91920..e8cf3ff606f0 100644
--- a/drivers/char/drm/i810_drv.h
+++ b/drivers/char/drm/i810_drv.h
@@ -113,8 +113,6 @@ typedef struct drm_i810_private {
 } drm_i810_private_t;
 
                                 /* i810_dma.c */
-extern void i810_reclaim_buffers(drm_device_t * dev, struct file *filp);
-
 extern int i810_driver_dma_quiescent(drm_device_t * dev);
 extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev,
                                                struct file *filp);
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 4fea32aed6d2..163f2cbfe60d 100644
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -1239,7 +1239,7 @@ static int i830_flush_queue(drm_device_t * dev)
 }
 
 /* Must be called with the lock held */
-void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
+static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
 {
         drm_device_dma_t *dma = dev->dma;
         int i;
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h
index bf9075b576bd..85bc5be6f916 100644
--- a/drivers/char/drm/i830_drv.h
+++ b/drivers/char/drm/i830_drv.h
@@ -123,9 +123,6 @@ typedef struct drm_i830_private {
 extern drm_ioctl_desc_t i830_ioctls[];
 extern int i830_max_ioctl;
 
-/* i830_dma.c */
-extern void i830_reclaim_buffers(drm_device_t * dev, struct file *filp);
-
 /* i830_irq.c */
 extern int i830_irq_emit(struct inode *inode, struct file *filp,
                          unsigned int cmd, unsigned long arg);
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 9140703da1ba..1ff4c7ca0bff 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -344,18 +344,20 @@ static int i915_emit_cmds(drm_device_t * dev, int __user * buffer, int dwords)
         int i;
         RING_LOCALS;
 
+        if ((dwords+1) * sizeof(int) >= dev_priv->ring.Size - 8)
+                return DRM_ERR(EINVAL);
+
+        BEGIN_LP_RING(((dwords+1)&~1));
+
         for (i = 0; i < dwords;) {
                 int cmd, sz;
 
                 if (DRM_COPY_FROM_USER_UNCHECKED(&cmd, &buffer[i], sizeof(cmd)))
                         return DRM_ERR(EINVAL);
 
-/*              printk("%d/%d ", i, dwords); */
-
                 if ((sz = validate_cmd(cmd)) == 0 || i + sz > dwords)
                         return DRM_ERR(EINVAL);
 
-                BEGIN_LP_RING(sz);
                 OUT_RING(cmd);
 
                 while (++i, --sz) {
@@ -365,9 +367,13 @@ static int i915_emit_cmds(drm_device_t * dev, int __user * buffer, int dwords)
                         }
                         OUT_RING(cmd);
                 }
-                ADVANCE_LP_RING();
         }
 
+        if (dwords & 1)
+                OUT_RING(0);
+
+        ADVANCE_LP_RING();
+
         return 0;
 }
 
@@ -401,6 +407,21 @@ static int i915_emit_box(drm_device_t * dev,
         return 0;
 }
 
+static void i915_emit_breadcrumb(drm_device_t *dev)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        RING_LOCALS;
+
+        dev_priv->sarea_priv->last_enqueue = dev_priv->counter++;
+
+        BEGIN_LP_RING(4);
+        OUT_RING(CMD_STORE_DWORD_IDX);
+        OUT_RING(20);
+        OUT_RING(dev_priv->counter);
+        OUT_RING(0);
+        ADVANCE_LP_RING();
+}
+
 static int i915_dispatch_cmdbuffer(drm_device_t * dev,
                                    drm_i915_cmdbuffer_t * cmd)
 {
@@ -429,6 +450,7 @@ static int i915_dispatch_cmdbuffer(drm_device_t * dev,
                         return ret;
         }
 
+        i915_emit_breadcrumb(dev);
         return 0;
 }
 
@@ -475,12 +497,7 @@ static int i915_dispatch_batchbuffer(drm_device_t * dev,
 
         dev_priv->sarea_priv->last_enqueue = dev_priv->counter++;
 
-        BEGIN_LP_RING(4);
-        OUT_RING(CMD_STORE_DWORD_IDX);
-        OUT_RING(20);
-        OUT_RING(dev_priv->counter);
-        OUT_RING(0);
-        ADVANCE_LP_RING();
+        i915_emit_breadcrumb(dev);
 
         return 0;
 }
@@ -657,7 +674,7 @@ static int i915_getparam(DRM_IOCTL_ARGS)
                 value = READ_BREADCRUMB(dev_priv);
                 break;
         default:
-                DRM_ERROR("Unkown parameter %d\n", param.param);
+                DRM_ERROR("Unknown parameter %d\n", param.param);
                 return DRM_ERR(EINVAL);
         }
 
@@ -742,7 +759,8 @@ drm_ioctl_desc_t i915_ioctls[] = {
         [DRM_IOCTL_NR(DRM_I915_ALLOC)] = {i915_mem_alloc, DRM_AUTH},
         [DRM_IOCTL_NR(DRM_I915_FREE)] = {i915_mem_free, DRM_AUTH},
         [DRM_IOCTL_NR(DRM_I915_INIT_HEAP)] = {i915_mem_init_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
-        [DRM_IOCTL_NR(DRM_I915_CMDBUFFER)] = {i915_cmdbuffer, DRM_AUTH}
+        [DRM_IOCTL_NR(DRM_I915_CMDBUFFER)] = {i915_cmdbuffer, DRM_AUTH},
+        [DRM_IOCTL_NR(DRM_I915_DESTROY_HEAP)] = { i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY }
 };
 
 int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h
index 77412ddac007..4cb3da578330 100644
--- a/drivers/char/drm/i915_drm.h
+++ b/drivers/char/drm/i915_drm.h
@@ -74,6 +74,30 @@ typedef struct _drm_i915_sarea {
         int pf_active;
         int pf_current_page;    /* which buffer is being displayed? */
         int perf_boxes;         /* performance boxes to be displayed */
+        int width, height;      /* screen size in pixels */
+
+        drm_handle_t front_handle;
+        int front_offset;
+        int front_size;
+
+        drm_handle_t back_handle;
+        int back_offset;
+        int back_size;
+
+        drm_handle_t depth_handle;
+        int depth_offset;
+        int depth_size;
+
+        drm_handle_t tex_handle;
+        int tex_offset;
+        int tex_size;
+        int log_tex_granularity;
+        int pitch;
+        int rotation;           /* 0, 90, 180 or 270 */
+        int rotated_offset;
+        int rotated_size;
+        int rotated_pitch;
+        int virtualX, virtualY;
 } drm_i915_sarea_t;
 
 /* Flags for perf_boxes
@@ -99,6 +123,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_I915_FREE           0x09
 #define DRM_I915_INIT_HEAP      0x0a
 #define DRM_I915_CMDBUFFER      0x0b
+#define DRM_I915_DESTROY_HEAP   0x0c
 
 #define DRM_IOCTL_I915_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -112,6 +137,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_FREE             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FREE, drm_i915_mem_free_t)
 #define DRM_IOCTL_I915_INIT_HEAP        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT_HEAP, drm_i915_mem_init_heap_t)
 #define DRM_IOCTL_I915_CMDBUFFER        DRM_IOW( DRM_COMMAND_BASE + DRM_I915_CMDBUFFER, drm_i915_cmdbuffer_t)
+#define DRM_IOCTL_I915_DESTROY_HEAP     DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)
 
 /* Allow drivers to submit batchbuffers directly to hardware, relying
  * on the security mechanisms provided by hardware.
@@ -191,4 +217,11 @@ typedef struct drm_i915_mem_init_heap {
         int start;
 } drm_i915_mem_init_heap_t;
 
+/* Allow memory manager to be torn down and re-initialized (eg on
+ * rotate):
+ */
+typedef struct drm_i915_mem_destroy_heap {
+        int region;
+} drm_i915_mem_destroy_heap_t;
+
 #endif                          /* _I915_DRM_H_ */
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index c6c71b45f101..7a65666899e4 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -37,16 +37,17 @@
 
 #define DRIVER_NAME             "i915"
 #define DRIVER_DESC             "Intel Graphics"
-#define DRIVER_DATE             "20051209"
+#define DRIVER_DATE             "20060119"
 
 /* Interface history:
  *
  * 1.1: Original.
  * 1.2: Add Power Management
  * 1.3: Add vblank support
+ * 1.4: Fix cmdbuffer path, add heap destroy
  */
 #define DRIVER_MAJOR            1
-#define DRIVER_MINOR            3
+#define DRIVER_MINOR            4
 #define DRIVER_PATCHLEVEL       0
 
 typedef struct _drm_i915_ring_buffer {
@@ -123,6 +124,7 @@ extern void i915_driver_irq_uninstall(drm_device_t * dev);
 extern int i915_mem_alloc(DRM_IOCTL_ARGS);
 extern int i915_mem_free(DRM_IOCTL_ARGS);
 extern int i915_mem_init_heap(DRM_IOCTL_ARGS);
+extern int i915_mem_destroy_heap(DRM_IOCTL_ARGS);
 extern void i915_mem_takedown(struct mem_block **heap);
 extern void i915_mem_release(drm_device_t * dev,
                              DRMFILE filp, struct mem_block *heap);
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index ba87ff17ff64..52c67324df58 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -365,3 +365,34 @@ int i915_mem_init_heap(DRM_IOCTL_ARGS)
 
         return init_heap(heap, initheap.start, initheap.size);
 }
+
+int i915_mem_destroy_heap( DRM_IOCTL_ARGS )
+{
+        DRM_DEVICE;
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        drm_i915_mem_destroy_heap_t destroyheap;
+        struct mem_block **heap;
+
+        if ( !dev_priv ) {
+                DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+                return DRM_ERR(EINVAL);
+        }
+
+        DRM_COPY_FROM_USER_IOCTL( destroyheap, (drm_i915_mem_destroy_heap_t *)data,
+                                  sizeof(destroyheap) );
+
+        heap = get_heap( dev_priv, destroyheap.region );
+        if (!heap) {
+                DRM_ERROR("get_heap failed");
+                return DRM_ERR(EFAULT);
+        }
+        
+        if (!*heap) {
+                DRM_ERROR("heap not initialized?");
+                return DRM_ERR(EFAULT);
+        }
+
+        i915_mem_takedown( heap );
+        return 0;
+}
+
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 915665c7fe7c..9bb8ae0c1c27 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1640,7 +1640,7 @@ static int radeon_do_cleanup_cp(drm_device_t * dev)
                 if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB)
                 {
                         drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev);
-                        dev_priv->gart_info.addr = 0;
+                        dev_priv->gart_info.addr = NULL;
                 }
         }
         /* only clear to the start of flags */
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c
index 0d426deeefec..59c7520bf9a2 100644
--- a/drivers/char/drm/savage_bci.c
+++ b/drivers/char/drm/savage_bci.c
@@ -32,6 +32,8 @@
 #define SAVAGE_EVENT_USEC_TIMEOUT       5000000 /* 5s */
 #define SAVAGE_FREELIST_DEBUG           0
 
+static int savage_do_cleanup_bci(drm_device_t *dev);
+
 static int
 savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n)
 {
@@ -895,7 +897,7 @@ static int savage_do_init_bci(drm_device_t * dev, drm_savage_init_t * init)
         return 0;
 }
 
-int savage_do_cleanup_bci(drm_device_t * dev)
+static int savage_do_cleanup_bci(drm_device_t * dev)
 {
         drm_savage_private_t *dev_priv = dev->dev_private;
 
diff --git a/drivers/char/drm/savage_drv.h b/drivers/char/drm/savage_drv.h
index dd46cb85439c..8f04b3d82292 100644
--- a/drivers/char/drm/savage_drv.h
+++ b/drivers/char/drm/savage_drv.h
@@ -212,7 +212,6 @@ extern int savage_driver_load(drm_device_t *dev, unsigned long chipset);
 extern int savage_driver_firstopen(drm_device_t *dev);
 extern void savage_driver_lastclose(drm_device_t *dev);
 extern int savage_driver_unload(drm_device_t *dev);
-extern int savage_do_cleanup_bci(drm_device_t * dev);
 extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp);
 
 /* state functions */
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
index 593c0b8f650a..a691ae74129d 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
@@ -222,7 +222,7 @@ static int via_initialize(drm_device_t * dev,
         return 0;
 }
 
-int via_dma_init(DRM_IOCTL_ARGS)
+static int via_dma_init(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
@@ -321,7 +321,7 @@ int via_driver_dma_quiescent(drm_device_t * dev)
         return 0;
 }
 
-int via_flush_ioctl(DRM_IOCTL_ARGS)
+static int via_flush_ioctl(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
 
@@ -330,7 +330,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS)
         return via_driver_dma_quiescent(dev);
 }
 
-int via_cmdbuffer(DRM_IOCTL_ARGS)
+static int via_cmdbuffer(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_via_cmdbuffer_t cmdbuf;
@@ -375,7 +375,7 @@ static int via_dispatch_pci_cmdbuffer(drm_device_t * dev,
         return ret;
 }
 
-int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
+static int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_via_cmdbuffer_t cmdbuf;
@@ -665,7 +665,7 @@ static void via_cmdbuf_reset(drm_via_private_t * dev_priv)
  * User interface to the space and lag functions.
  */
 
-int via_cmdbuf_size(DRM_IOCTL_ARGS)
+static int via_cmdbuf_size(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
         drm_via_cmdbuf_size_t d_siz;
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
index 9d5e027dae0e..b7f17457b424 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/char/drm/via_dmablit.c
@@ -108,7 +108,7 @@ via_map_blit_for_device(struct pci_dev *pdev,
         int num_desc = 0;
         int cur_line;
         dma_addr_t next = 0 | VIA_DMA_DPR_EC;
-        drm_via_descriptor_t *desc_ptr = 0;
+        drm_via_descriptor_t *desc_ptr = NULL;
 
         if (mode == 1) 
                 desc_ptr = vsg->desc_pages[cur_descriptor_page];
@@ -167,7 +167,7 @@ via_map_blit_for_device(struct pci_dev *pdev,
  */
 
 
-void
+static void
 via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) 
 {
         struct page *page;
@@ -581,7 +581,7 @@ via_build_sg_info(drm_device_t *dev, drm_via_sg_info_t *vsg, drm_via_dmablit_t *
         int ret = 0;
         
         vsg->direction = (draw) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
-        vsg->bounce_buffer = 0;
+        vsg->bounce_buffer = NULL;
 
         vsg->state = dr_via_sg_init;
 
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
index aad4f99f5405..52bcc7b1ba45 100644
--- a/drivers/char/drm/via_drv.h
+++ b/drivers/char/drm/via_drv.h
@@ -110,11 +110,6 @@ extern int via_mem_free(DRM_IOCTL_ARGS);
 extern int via_agp_init(DRM_IOCTL_ARGS);
 extern int via_map_init(DRM_IOCTL_ARGS);
 extern int via_decoder_futex(DRM_IOCTL_ARGS);
-extern int via_dma_init(DRM_IOCTL_ARGS);
-extern int via_cmdbuffer(DRM_IOCTL_ARGS);
-extern int via_flush_ioctl(DRM_IOCTL_ARGS);
-extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS);
-extern int via_cmdbuf_size(DRM_IOCTL_ARGS);
 extern int via_wait_irq(DRM_IOCTL_ARGS);
 extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
 extern int via_dma_blit( DRM_IOCTL_ARGS );
@@ -139,8 +134,6 @@ extern int via_driver_dma_quiescent(drm_device_t * dev);
 extern void via_init_futex(drm_via_private_t * dev_priv);
 extern void via_cleanup_futex(drm_via_private_t * dev_priv);
 extern void via_release_futex(drm_via_private_t * dev_priv, int context);
-extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq,
-                               int force_sequence, unsigned int *sequence);
 
 extern void via_dmablit_handler(drm_device_t *dev, int engine, int from_irq);
 extern void via_init_dmablit(drm_device_t *dev);
diff --git a/drivers/char/drm/via_irq.c b/drivers/char/drm/via_irq.c
index 56d7e3daea12..6152415644e9 100644
--- a/drivers/char/drm/via_irq.c
+++ b/drivers/char/drm/via_irq.c
@@ -190,7 +190,7 @@ int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence)
         return ret;
 }
 
-int
+static int
 via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
                     unsigned int *sequence)
 {
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 3f3ac039f4d9..57539d8f9f7c 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -359,7 +359,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
                 }
         }
 
-        schedule_delayed_work(&tty->buf.work, 1);
+        tty_schedule_flip(tty);
 
         info->stat_flags &= ~ESP_STAT_RX_TIMEOUT;
         release_pio_buffer(pio_buf);
@@ -426,7 +426,7 @@ static inline void receive_chars_dma_done(struct esp_struct *info,
                         }
                         tty_insert_flip_char(tty, dma_buffer[num_bytes - 1], statflag);
                 }
-                schedule_delayed_work(&tty->buf.work, 1);
+                tty_schedule_flip(tty);
         }
 
         if (dma_bytes != num_bytes) {
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index 40a67c86420c..ac626418b329 100644
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -117,12 +117,9 @@ __setup("hcheck_reboot", hangcheck_parse_reboot);
 __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks);
 #endif /* not MODULE */
 
-#if defined(CONFIG_X86)
+#if defined(CONFIG_X86) || defined(CONFIG_S390)
 # define HAVE_MONOTONIC
 # define TIMER_FREQ 1000000000ULL
-#elif defined(CONFIG_S390)
-/* FA240000 is 1 Second in the IBM time universe (Page 4-38 Principles of Op for zSeries */
-# define TIMER_FREQ 0xFA240000ULL
 #elif defined(CONFIG_IA64)
 # define TIMER_FREQ ((unsigned long long)local_cpu_data->itc_freq)
 #elif defined(CONFIG_PPC64)
@@ -134,12 +131,7 @@ extern unsigned long long monotonic_clock(void);
 #else
 static inline unsigned long long monotonic_clock(void)
 {
-# ifdef __s390__
-        /* returns the TOD.  see 4-38 Principles of Op of zSeries */
-        return get_clock();
-# else
         return get_cycles();
-# endif  /* __s390__ */
 }
 #endif  /* HAVE_MONOTONIC */
 
@@ -188,8 +180,6 @@ static int __init hangcheck_init(void)
                VERSION_STR, hangcheck_tick, hangcheck_margin);
 #if defined (HAVE_MONOTONIC)
         printk("Hangcheck: Using monotonic_clock().\n");
-#elif defined(__s390__)
-        printk("Hangcheck: Using TOD.\n");
 #else
         printk("Hangcheck: Using get_cycles().\n");
 #endif  /* HAVE_MONOTONIC */
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 3808d9572619..66a2fee06eb9 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -927,9 +927,9 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
         if (ACPI_SUCCESS(status)) {
                 unsigned long size;
 
-                size = addr.max_address_range - addr.min_address_range + 1;
-                hdp->hd_phys_address = addr.min_address_range;
-                hdp->hd_address = ioremap(addr.min_address_range, size);
+                size = addr.maximum - addr.minimum + 1;
+                hdp->hd_phys_address = addr.minimum;
+                hdp->hd_address = ioremap(addr.minimum, size);
 
                 if (hpet_is_known(hdp)) {
                         printk(KERN_DEBUG "%s: 0x%lx is busy\n",
@@ -937,15 +937,15 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                         iounmap(hdp->hd_address);
                         return -EBUSY;
                 }
-        } else if (res->id == ACPI_RSTYPE_FIXED_MEM32) {
-                struct acpi_resource_fixed_mem32 *fixmem32;
+        } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
+                struct acpi_resource_fixed_memory32 *fixmem32;
 
                 fixmem32 = &res->data.fixed_memory32;
                 if (!fixmem32)
                         return -EINVAL;
 
-                hdp->hd_phys_address = fixmem32->range_base_address;
-                hdp->hd_address = ioremap(fixmem32->range_base_address,
+                hdp->hd_phys_address = fixmem32->address;
+                hdp->hd_address = ioremap(fixmem32->address,
                                                 HPET_RANGE_SIZE);
 
                 if (hpet_is_known(hdp)) {
@@ -954,20 +954,20 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                         iounmap(hdp->hd_address);
                         return -EBUSY;
                 }
-        } else if (res->id == ACPI_RSTYPE_EXT_IRQ) {
-                struct acpi_resource_ext_irq *irqp;
+        } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) {
+                struct acpi_resource_extended_irq *irqp;
                 int i;
 
                 irqp = &res->data.extended_irq;
 
-                if (irqp->number_of_interrupts > 0) {
-                        hdp->hd_nirqs = irqp->number_of_interrupts;
+                if (irqp->interrupt_count > 0) {
+                        hdp->hd_nirqs = irqp->interrupt_count;
 
                         for (i = 0; i < hdp->hd_nirqs; i++) {
                                 int rc =
                                     acpi_register_gsi(irqp->interrupts[i],
-                                                      irqp->edge_level,
-                                                      irqp->active_high_low);
+                                                      irqp->triggering,
+                                                      irqp->polarity);
                                 if (rc < 0)
                                         return AE_ERROR;
                                 hdp->hd_irq[i] = rc;
diff --git a/drivers/char/ip2/i2cmd.c b/drivers/char/ip2/i2cmd.c
index cb8f4198e9a3..e7af647800b6 100644
--- a/drivers/char/ip2/i2cmd.c
+++ b/drivers/char/ip2/i2cmd.c
@@ -139,7 +139,6 @@ static UCHAR ct79[] = { 2, BYP,     0x4F,0                   }; // XMIT_NOW
 //static UCHAR ct86[]={ 2, BTH,     0x56,0                   }; // RCV_ENABLE
 static UCHAR ct87[] = { 1, BYP,     0x57                     }; // HW_TEST
 //static UCHAR ct88[]={ 3, BTH,     0x58,0,0                 }; // RCV_THRESHOLD
-static UCHAR ct89[]={ 1, BYP,     0x59                     }; // DSS_NOW
 //static UCHAR ct90[]={ 3, BYP,     0x5A,0,0                 }; // Set SILO
 //static UCHAR ct91[]={ 2, BYP,     0x5B,0                   }; // timed break
 
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index 56e93a5a1e24..48fcfba37bfa 100644
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -2906,65 +2906,16 @@ ip2_ipl_ioctl ( struct inode *pInode, struct file *pFile, UINT cmd, ULONG arg )
                 rc = -EINVAL;
                 break;
         case 3:     // Trace device
-                if ( cmd == 1 ) {
-                        rc = put_user(iiSendPendingMail, pIndex++ );
-                        rc = put_user(i2InitChannels, pIndex++ );
-                        rc = put_user(i2QueueNeeds, pIndex++ );
-                        rc = put_user(i2QueueCommands, pIndex++ );
-                        rc = put_user(i2GetStatus, pIndex++ );
-                        rc = put_user(i2Input, pIndex++ );
-                        rc = put_user(i2InputFlush, pIndex++ );
-                        rc = put_user(i2Output, pIndex++ );
-                        rc = put_user(i2FlushOutput, pIndex++ );
-                        rc = put_user(i2DrainWakeup, pIndex++ );
-                        rc = put_user(i2DrainOutput, pIndex++ );
-                        rc = put_user(i2OutputFree, pIndex++ );
-                        rc = put_user(i2StripFifo, pIndex++ );
-                        rc = put_user(i2StuffFifoBypass, pIndex++ );
-                        rc = put_user(i2StuffFifoFlow, pIndex++ );
-                        rc = put_user(i2StuffFifoInline, pIndex++ );
-                        rc = put_user(i2ServiceBoard, pIndex++ );
-                        rc = put_user(serviceOutgoingFifo, pIndex++ );
-                        // rc = put_user(ip2_init, pIndex++ );
-                        rc = put_user(ip2_init_board, pIndex++ );
-                        rc = put_user(find_eisa_board, pIndex++ );
-                        rc = put_user(set_irq, pIndex++ );
-                        rc = put_user(ip2_interrupt, pIndex++ );
-                        rc = put_user(ip2_poll, pIndex++ );
-                        rc = put_user(service_all_boards, pIndex++ );
-                        rc = put_user(do_input, pIndex++ );
-                        rc = put_user(do_status, pIndex++ );
-#ifndef IP2DEBUG_OPEN
-                        rc = put_user(0, pIndex++ );
-#else
-                        rc = put_user(open_sanity_check, pIndex++ );
-#endif
-                        rc = put_user(ip2_open, pIndex++ );
-                        rc = put_user(ip2_close, pIndex++ );
-                        rc = put_user(ip2_hangup, pIndex++ );
-                        rc = put_user(ip2_write, pIndex++ );
-                        rc = put_user(ip2_putchar, pIndex++ );
-                        rc = put_user(ip2_flush_chars, pIndex++ );
-                        rc = put_user(ip2_write_room, pIndex++ );
-                        rc = put_user(ip2_chars_in_buf, pIndex++ );
-                        rc = put_user(ip2_flush_buffer, pIndex++ );
-
-                        //rc = put_user(ip2_wait_until_sent, pIndex++ );
-                        rc = put_user(0, pIndex++ );
-
-                        rc = put_user(ip2_throttle, pIndex++ );
-                        rc = put_user(ip2_unthrottle, pIndex++ );
-                        rc = put_user(ip2_ioctl, pIndex++ );
-                        rc = put_user(0, pIndex++ );
-                        rc = put_user(get_serial_info, pIndex++ );
-                        rc = put_user(set_serial_info, pIndex++ );
-                        rc = put_user(ip2_set_termios, pIndex++ );
-                        rc = put_user(ip2_set_line_discipline, pIndex++ );
-                        rc = put_user(set_params, pIndex++ );
-                } else {
+                /*
+                 * akpm: This used to write a whole bunch of function addresses
+                 * to userspace, which generated lots of put_user() warnings.
+                 * I killed it all.  Just return "success" and don't do
+                 * anything.
+                 */
+                if (cmd == 1)
+                        rc = 0;
+                else
                         rc = -EINVAL;
-                }
-
                 break;
 
         default:
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 0097f06fa67b..d745004281d0 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -481,7 +481,7 @@ int ipmi_validate_addr(struct ipmi_addr *addr, int len)
         }
 
         if ((addr->channel == IPMI_BMC_CHANNEL)
-            || (addr->channel >= IPMI_NUM_CHANNELS)
+            || (addr->channel >= IPMI_MAX_CHANNELS)
             || (addr->channel < 0))
                 return -EINVAL;
 
@@ -1321,7 +1321,7 @@ static int i_ipmi_request(ipmi_user_t          user,
                 unsigned char         ipmb_seq;
                 long                  seqid;
 
-                if (addr->channel >= IPMI_NUM_CHANNELS) {
+                if (addr->channel >= IPMI_MAX_CHANNELS) {
                         spin_lock_irqsave(&intf->counter_lock, flags);
                         intf->sent_invalid_commands++;
                         spin_unlock_irqrestore(&intf->counter_lock, flags);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index c67ef3e47ad5..e59b638766ef 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1270,36 +1270,36 @@ static int try_init_port(int intf_num, struct smi_info **new_info)
         return 0;
 }
 
-static unsigned char mem_inb(struct si_sm_io *io, unsigned int offset)
+static unsigned char intf_mem_inb(struct si_sm_io *io, unsigned int offset)
 {
         return readb((io->addr)+(offset * io->regspacing));
 }
 
-static void mem_outb(struct si_sm_io *io, unsigned int offset,
+static void intf_mem_outb(struct si_sm_io *io, unsigned int offset,
                      unsigned char b)
 {
         writeb(b, (io->addr)+(offset * io->regspacing));
 }
 
-static unsigned char mem_inw(struct si_sm_io *io, unsigned int offset)
+static unsigned char intf_mem_inw(struct si_sm_io *io, unsigned int offset)
 {
         return (readw((io->addr)+(offset * io->regspacing)) >> io->regshift)
                 && 0xff;
 }
 
-static void mem_outw(struct si_sm_io *io, unsigned int offset,
+static void intf_mem_outw(struct si_sm_io *io, unsigned int offset,
                      unsigned char b)
 {
         writeb(b << io->regshift, (io->addr)+(offset * io->regspacing));
 }
 
-static unsigned char mem_inl(struct si_sm_io *io, unsigned int offset)
+static unsigned char intf_mem_inl(struct si_sm_io *io, unsigned int offset)
 {
         return (readl((io->addr)+(offset * io->regspacing)) >> io->regshift)
                 && 0xff;
 }
 
-static void mem_outl(struct si_sm_io *io, unsigned int offset,
+static void intf_mem_outl(struct si_sm_io *io, unsigned int offset,
                      unsigned char b)
 {
         writel(b << io->regshift, (io->addr)+(offset * io->regspacing));
@@ -1349,16 +1349,16 @@ static int mem_setup(struct smi_info *info)
            upon the register size. */
         switch (info->io.regsize) {
         case 1:
-                info->io.inputb = mem_inb;
-                info->io.outputb = mem_outb;
+                info->io.inputb = intf_mem_inb;
+                info->io.outputb = intf_mem_outb;
                 break;
         case 2:
-                info->io.inputb = mem_inw;
-                info->io.outputb = mem_outw;
+                info->io.inputb = intf_mem_inw;
+                info->io.outputb = intf_mem_outw;
                 break;
         case 4:
-                info->io.inputb = mem_inl;
-                info->io.outputb = mem_outl;
+                info->io.inputb = intf_mem_inl;
+                info->io.outputb = intf_mem_outl;
                 break;
 #ifdef readq
         case 8:
@@ -1580,11 +1580,6 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
         if (! is_new_interface(-1, addr_space, spmi->addr.address))
                 return -ENODEV;
 
-        if (! spmi->addr.register_bit_width) {
-                acpi_failure = 1;
-                return -ENODEV;
-        }
-
         /* Figure out the interface type. */
         switch (spmi->InterfaceType)
         {
@@ -1634,9 +1629,6 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info)
                 regspacings[intf_num] = spmi->addr.register_bit_width / 8;
                 info->io.regspacing = spmi->addr.register_bit_width / 8;
         } else {
-                /* Some broken systems get this wrong and set the value
-                 * to zero.  Assume it is the default spacing.  If that
-                 * is wrong, too bad, the vendor should fix the tables. */
                 regspacings[intf_num] = DEFAULT_REGSPACING;
                 info->io.regspacing = DEFAULT_REGSPACING;
         }
diff --git a/drivers/char/rio/cirrus.h b/drivers/char/rio/cirrus.h
index 217ff09f2fa1..89bd94eb45be 100644
--- a/drivers/char/rio/cirrus.h
+++ b/drivers/char/rio/cirrus.h
@@ -40,148 +40,6 @@
 #endif
 #define _cirrus_h 1
 
-#ifdef RTA
-#define TO_UART RX
-#define TO_DRIVER TX
-#endif
-
-#ifdef HOST
-#define TO_UART TX
-#define TO_DRIVER RX
-#endif
-#ifdef RTA
-/* Miscellaneous defines for CIRRUS addresses and related logic for
-   interrupts etc.
-*/
-#define MAP(a)          ((short *)(cirrus_base + (a)))
-#define outp(a,b)       (*MAP (a) =(b))
-#define inp(a)          ((*MAP (a)) & 0xff)
-#define CIRRUS_FIRST    (short*)0x7300
-#define CIRRUS_SECOND   (short*)0x7200
-#define CIRRUS_THIRD    (short*)0x7100
-#define CIRRUS_FOURTH   (short*)0x7000
-#define PORTS_ON_CIRRUS 4
-#define CIRRUS_FIFO_SIZE        12
-#define SPACE           0x20
-#define TAB             0x09
-#define LINE_FEED       0x0a
-#define CARRIAGE_RETURN 0x0d
-#define BACKSPACE       0x08
-#define SPACES_IN_TABS  8
-#define SEND_ESCAPE     0x00
-#define START_BREAK     0x81
-#define TIMER_TICK      0x82
-#define STOP_BREAK      0x83
-#define BASE(a) ((a) < 4 ? (short*)CIRRUS_FIRST : ((a) < 8 ? (short *)CIRRUS_SECOND : ((a) < 12 ? (short*)CIRRUS_THIRD : (short *)CIRRUS_FOURTH)))
-#define txack1  ((short *)0x7104)
-#define rxack1  ((short *)0x7102)
-#define mdack1  ((short *)0x7106)
-#define txack2  ((short *)0x7006)
-#define rxack2  ((short *)0x7004)
-#define mdack2  ((short *)0x7100)
-#define int_latch       ((short *) 0x7800)
-#define int_status      ((short *) 0x7c00)
-#define tx1_pending     0x20
-#define rx1_pending     0x10
-#define md1_pending     0x40
-#define tx2_pending     0x02
-#define rx2_pending     0x01
-#define md2_pending     0x40
-#define module1_bits    0x07
-#define module1_modern  0x08
-#define module2_bits    0x70
-#define module2_modern  0x80
-#define module_blank    0xf
-#define rs232_d25       0x0
-#define rs232_rj45      0x1
-#define rs422_d25       0x3
-#define parallel        0x5
-
-#define CLK0    0x00
-#define CLK1    0x01
-#define CLK2    0x02
-#define CLK3    0x03
-#define CLK4    0x04
-
-#define CIRRUS_REVC    0x42
-#define CIRRUS_REVE    0x44
-
-#define TURNON  1
-#define TURNOFF 0
-
-/* The list of CIRRUS registers. 
-   NB. These registers are relative values on 8 bit boundaries whereas
-   on the RTA's the CIRRUS registers are on word boundaries. Use pointer
-   arithmetic (short *) to obtain the real addresses required */
-#define ccr     0x05            /* Channel Command Register     */
-#define ier     0x06            /* Interrupt Enable Register    */
-#define cor1    0x08            /* Channel Option Register 1    */
-#define cor2    0x09            /* Channel Option Register 2    */
-#define cor3    0x0a            /* Channel Option Register 3    */
-#define cor4    0x1e            /* Channel Option Register 4    */
-#define cor5    0x1f            /* Channel Option Register 5    */
-
-#define ccsr    0x0b            /* Channel Control Status Register */
-#define rdcr    0x0e            /* Receive Data Count Register  */
-#define tdcr    0x12            /* Transmit Data Count Register */
-#define mcor1   0x15            /* Modem Change Option Register 1 */
-#define mcor2   0x16            /* Modem Change Option Regsiter 2 */
-
-#define livr    0x18            /* Local Interrupt Vector Register */
-#define schr1   0x1a            /* Special Character Register 1 */
-#define schr2   0x1b            /* Special Character Register 2 */
-#define schr3   0x1c            /* Special Character Register 3 */
-#define schr4   0x1d            /* Special Character Register 4 */
-
-#define rtr     0x20            /* Receive Timer Register */
-#define rtpr    0x21            /* Receive Timeout Period Register */
-#define lnc     0x24            /* Lnext character */
-
-#define rivr    0x43            /* Receive Interrupt Vector Register    */
-#define tivr    0x42            /* Transmit Interrupt Vector Register   */
-#define mivr    0x41            /* Modem Interrupt Vector Register      */
-#define gfrcr   0x40            /* Global Firmware Revision code Reg    */
-#define ricr    0x44            /* Receive Interrupting Channel Reg     */
-#define ticr    0x45            /* Transmit Interrupting Channel Reg    */
-#define micr    0x46            /* Modem Interrupting Channel Register  */
-
-#define gcr     0x4b            /* Global configuration register */
-#define misr    0x4c            /* Modem interrupt status register */
-
-#define rbusr   0x59
-#define tbusr   0x5a
-#define mbusr   0x5b
-
-#define eoir    0x60            /* End Of Interrupt Register */
-#define rdsr    0x62            /* Receive Data / Status Register */
-#define tdr     0x63            /* Transmit Data Register */
-#define svrr    0x67            /* Service Request Register */
-
-#define car     0x68            /* Channel Access Register */
-#define mir     0x69            /* Modem Interrupt Register */
-#define tir     0x6a            /* Transmit Interrupt Register */
-#define rir     0x6b            /* Receive Interrupt Register */
-#define msvr1   0x6c            /* Modem Signal Value Register 1 */
-#define msvr2   0x6d            /* Modem Signal Value Register 2 */
-#define psvr    0x6f            /* Printer Signal Value Register */
-
-#define tbpr    0x72            /* Transmit Baud Rate Period Register */
-#define tcor    0x76            /* Transmit Clock Option Register */
-
-#define rbpr    0x78            /* Receive Baud Rate Period Register */
-#define rber    0x7a            /* Receive Baud Rate Extension Register */
-#define rcor    0x7c            /* Receive Clock Option Register */
-#define ppr     0x7e            /* Prescalar Period Register    */
-
-/* Misc registers used for forcing the 1400 out of its reset woes */
-#define airl    0x6d
-#define airm    0x6e
-#define airh    0x6f
-#define btcr    0x66
-#define mtcr    0x6c
-#define tber    0x74
-
-#endif                          /* #ifdef RTA */
 
 
 /* Bit fields for particular registers */
diff --git a/drivers/char/rio/defaults.h b/drivers/char/rio/defaults.h
index 5b600c32ac02..d55c2f6a9877 100644
--- a/drivers/char/rio/defaults.h
+++ b/drivers/char/rio/defaults.h
@@ -45,13 +45,6 @@ static char *_rio_defaults_h_sccs = "@(#)defaults.h	1.1";
 #define MILLISECOND           (int) (1000/64)   /* 15.625 low ticks */
 #define SECOND                (int) 15625       /* Low priority ticks */
 
-#ifdef RTA
-#define RX_LIMIT       (ushort) 3
-#endif
-#ifdef HOST
-#define RX_LIMIT       (ushort) 1
-#endif
-
 #define LINK_TIMEOUT          (int) (POLL_PERIOD / 2)
 
 
diff --git a/drivers/char/rio/link.h b/drivers/char/rio/link.h
index bfba5b0c033e..48d68ca7f825 100644
--- a/drivers/char/rio/link.h
+++ b/drivers/char/rio/link.h
@@ -102,30 +102,14 @@
 /*
 ** LED stuff
 */
-#if defined(RTA)
-#define LED_OFF            ((ushort) 0) /* LED off */
-#define LED_RED            ((ushort) 1) /* LED Red */
-#define LED_GREEN          ((ushort) 2) /* LED Green */
-#define LED_ORANGE         ((ushort) 4) /* LED Orange */
-#define LED_1TO8_OPEN      ((ushort) 1) /* Port 1->8 LED on */
-#define LED_9TO16_OPEN     ((ushort) 2) /* Port 9->16 LED on */
-#define LED_SET_COLOUR(colour)  (link->led = (colour))
-#define LED_OR_COLOUR(colour)   (link->led |= (colour))
-#define LED_TIMEOUT(time)    (link->led_timeout = RioTimePlus(RioTime(),(time)))
-#else
 #define LED_SET_COLOUR(colour)
 #define LED_OR_COLOUR(colour)
 #define LED_TIMEOUT(time)
-#endif                          /* RTA */
 
 struct LPB {
         WORD link_number;       /* Link Number */
         Channel_ptr in_ch;      /* Link In Channel */
         Channel_ptr out_ch;     /* Link Out Channel */
-#ifdef RTA
-        uchar stat_led;         /* Port open leds */
-        uchar led;              /* True, light led! */
-#endif
         BYTE attached_serial[4];        /* Attached serial number */
         BYTE attached_host_serial[4];
         /* Serial number of Host who
@@ -144,30 +128,12 @@ struct LPB {
         WORD WaitNoBoot;        /* Secs to hold off booting */
         PKT_ptr add_packet_list;        /* Add packets to here */
         PKT_ptr remove_packet_list;     /* Send packets from here */
-#ifdef RTA
-#ifdef DCIRRUS
-#define    QBUFS_PER_REDIRECT (4 / PKTS_PER_BUFFER + 1)
-#else
-#define    QBUFS_PER_REDIRECT (8 / PKTS_PER_BUFFER + 1)
-#endif
-        PKT_ptr_ptr rd_add;     /* Add a new Packet here */
-        Q_BUF_ptr rd_add_qb;    /* Pointer to the add Q buf */
-        PKT_ptr_ptr rd_add_st_qbb;      /* Pointer to start of the Q's buf */
-        PKT_ptr_ptr rd_add_end_qbb;     /* Pointer to the end of the Q's buf */
-        PKT_ptr_ptr rd_remove;  /* Remove a Packet here */
-        Q_BUF_ptr rd_remove_qb; /* Pointer to the remove Q buf */
-        PKT_ptr_ptr rd_remove_st_qbb;   /* Pointer to the start of the Q buf */
-        PKT_ptr_ptr rd_remove_end_qbb;  /* Pointer to the end of the Q buf */
-        ushort pkts_in_q;       /* Packets in queue */
-#endif
 
         Channel_ptr lrt_fail_chan;      /* Lrt's failure channel */
         Channel_ptr ltt_fail_chan;      /* Ltt's failure channel */
 
-#if defined (HOST) || defined (INKERNEL)
         /* RUP structure for HOST to driver communications */
         struct RUP rup;
-#endif
         struct RUP link_rup;    /* RUP for the link (POLL,
                                    topology etc.) */
         WORD attached_link;     /* Number of attached link */
diff --git a/drivers/char/rio/list.h b/drivers/char/rio/list.h
index 36aad4c9cb3a..79b853140ae5 100644
--- a/drivers/char/rio/list.h
+++ b/drivers/char/rio/list.h
@@ -44,8 +44,6 @@ static char *_rio_list_h_sccs = "@(#)list.h	1.9";
 
 #define PKT_IN_USE    0x1
 
-#ifdef INKERNEL
-
 #define ZERO_PTR (ushort) 0x8000
 #define CaD     PortP->Caddr
 
@@ -54,143 +52,5 @@ static char *_rio_list_h_sccs = "@(#)list.h	1.9";
 ** to by the TxAdd pointer has PKT_IN_USE clear in its address.
 */
 
-#ifndef linux
-#if defined( MIPS ) && !defined( MIPSEISA )
-/* May the shoes of the Devil dance on your grave for creating this */
-#define   can_add_transmit(PacketP,PortP) \
-          (!((uint)(PacketP = (struct PKT *)RIO_PTR(CaD,RINDW(PortP->TxAdd))) \
-          & (PKT_IN_USE<<2)))
-
-#elif  defined(MIPSEISA) || defined(nx6000) || \
-       defined(drs6000)  || defined(UWsparc)
-
-#define   can_add_transmit(PacketP,PortP) \
-          (!((uint)(PacketP = (struct PKT *)RIO_PTR(CaD,RINDW(PortP->TxAdd))) \
-          & PKT_IN_USE))
-
-#else
-#define   can_add_transmit(PacketP,PortP) \
-          (!((uint)(PacketP = (struct PKT *)RIO_PTR(CaD,*PortP->TxAdd)) \
-          & PKT_IN_USE))
-#endif
-
-/*
-** To add a packet to the queue, you set the PKT_IN_USE bit in the address,
-** and then move the TxAdd pointer along one position to point to the next
-** packet pointer. You must wrap the pointer from the end back to the start.
-*/
-#if defined(MIPS) || defined(nx6000) || defined(drs6000) || defined(UWsparc)
-#   define add_transmit(PortP)  \
-        WINDW(PortP->TxAdd,RINDW(PortP->TxAdd) | PKT_IN_USE);\
-        if (PortP->TxAdd == PortP->TxEnd)\
-            PortP->TxAdd = PortP->TxStart;\
-        else\
-            PortP->TxAdd++;\
-        WWORD(PortP->PhbP->tx_add , RIO_OFF(CaD,PortP->TxAdd));
-#elif defined(AIX)
-#   define add_transmit(PortP)  \
-        {\
-            register ushort *TxAddP = (ushort *)RIO_PTR(Cad,PortP->TxAddO);\
-            WINDW( TxAddP, RINDW( TxAddP ) | PKT_IN_USE );\
-            if (PortP->TxAddO == PortP->TxEndO )\
-                PortP->TxAddO = PortP->TxStartO;\
-            else\
-                PortP->TxAddO += sizeof(ushort);\
-            WWORD(((PHB *)RIO_PTR(Cad,PortP->PhbO))->tx_add , PortP->TxAddO );\
-        }
-#else
-#   define add_transmit(PortP)  \
-        *PortP->TxAdd |= PKT_IN_USE;\
-        if (PortP->TxAdd == PortP->TxEnd)\
-            PortP->TxAdd = PortP->TxStart;\
-        else\
-            PortP->TxAdd++;\
-        PortP->PhbP->tx_add = RIO_OFF(CaD,PortP->TxAdd);
-#endif
-
-/*
-** can_remove_receive( PacketP, PortP ) returns non-zero if PKT_IN_USE is set
-** for the next packet on the queue. It will also set PacketP to point to the
-** relevant packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear,
-** then can_remove_receive() returns 0.
-*/
-#if defined(MIPS) || defined(nx6000) || defined(drs6000) || defined(UWsparc)
-#   define can_remove_receive(PacketP,PortP) \
-        ((RINDW(PortP->RxRemove) & PKT_IN_USE) ? \
-        (PacketP=(struct PKT *)RIO_PTR(CaD,(RINDW(PortP->RxRemove) & ~PKT_IN_USE))):0)
-#elif defined(AIX)
-#   define can_remove_receive(PacketP,PortP) \
-        ((RINDW((ushort *)RIO_PTR(Cad,PortP->RxRemoveO)) & PKT_IN_USE) ? \
-        (PacketP=(struct PKT *)RIO_PTR(Cad,RINDW((ushort *)RIO_PTR(Cad,PortP->RxRemoveO)) & ~PKT_IN_USE)):0)
-#else
-#   define can_remove_receive(PacketP,PortP) \
-        ((*PortP->RxRemove & PKT_IN_USE) ? \
-        (PacketP=(struct PKT *)RIO_PTR(CaD,(*PortP->RxRemove & ~PKT_IN_USE))):0)
-#endif
-
-
-/*
-** Will God see it within his heart to forgive us for this thing that
-** we have created? To remove a packet from the receive queue you clear
-** its PKT_IN_USE bit, and then bump the pointers. Once the pointers
-** get to the end, they must be wrapped back to the start.
-*/
-#if defined(MIPS) || defined(nx6000) || defined(drs6000) || defined(UWsparc)
-#   define remove_receive(PortP) \
-        WINDW(PortP->RxRemove, (RINDW(PortP->RxRemove) & ~PKT_IN_USE));\
-        if (PortP->RxRemove == PortP->RxEnd)\
-            PortP->RxRemove = PortP->RxStart;\
-        else\
-            PortP->RxRemove++;\
-        WWORD(PortP->PhbP->rx_remove , RIO_OFF(CaD,PortP->RxRemove));
-#elif defined(AIX)
-#   define remove_receive(PortP) \
-    {\
-        register ushort *RxRemoveP = (ushort *)RIO_PTR(Cad,PortP->RxRemoveO);\
-        WINDW( RxRemoveP, RINDW( RxRemoveP ) & ~PKT_IN_USE );\
-        if (PortP->RxRemoveO == PortP->RxEndO)\
-            PortP->RxRemoveO = PortP->RxStartO;\
-        else\
-            PortP->RxRemoveO += sizeof(ushort);\
-        WWORD(((PHB *)RIO_PTR(Cad,PortP->PhbO))->rx_remove, PortP->RxRemoveO );\
-    }
-#else
-#   define remove_receive(PortP) \
-        *PortP->RxRemove &= ~PKT_IN_USE;\
-        if (PortP->RxRemove == PortP->RxEnd)\
-            PortP->RxRemove = PortP->RxStart;\
-        else\
-            PortP->RxRemove++;\
-        PortP->PhbP->rx_remove = RIO_OFF(CaD,PortP->RxRemove);
-#endif
-#endif
-
-
-#else                           /* !IN_KERNEL */
-
-#define ZERO_PTR NULL
-
-
-#ifdef HOST
-/* #define can_remove_transmit(pkt,phb) ((((char*)pkt = (*(char**)(phb->tx_remove))-1) || 1)) && (*phb->u3.s2.tx_remove_ptr & PKT_IN_USE))   */
-#define remove_transmit(phb) *phb->u3.s2.tx_remove_ptr &= ~(ushort)PKT_IN_USE;\
-                             if (phb->tx_remove == phb->tx_end)\
-                                phb->tx_remove = phb->tx_start;\
-                             else\
-                                phb->tx_remove++;
-#define can_add_receive(phb) !(*phb->u4.s2.rx_add_ptr & PKT_IN_USE)
-#define add_receive(pkt,phb) *phb->rx_add = pkt;\
-                             *phb->u4.s2.rx_add_ptr |= PKT_IN_USE;\
-                             if (phb->rx_add == phb->rx_end)\
-                                phb->rx_add = phb->rx_start;\
-                             else\
-                                phb->rx_add++;
-#endif
-#endif
-
-#ifdef RTA
-#define splx(oldspl)    if ((oldspl) == 0) spl0()
-#endif
-
 #endif                          /* ifndef _list.h */
 /*********** end of file ***********/
diff --git a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h
index fe4e00567065..e24acc1d1844 100644
--- a/drivers/char/rio/parmmap.h
+++ b/drivers/char/rio/parmmap.h
@@ -78,14 +78,9 @@ struct PARM_MAP {
         WORD idle_count;        /* Idle time counter */
         WORD busy_count;        /* Busy counter */
         WORD idle_control;      /* Control Idle Process */
-#if defined(HOST) || defined(INKERNEL)
         WORD tx_intr;           /* TX interrupt pending */
         WORD rx_intr;           /* RX interrupt pending */
         WORD rup_intr;          /* RUP interrupt pending */
-#endif
-#if defined(RTA)
-        WORD dying_count;       /* Count of processes dead */
-#endif
 };
 
 #endif
diff --git a/drivers/char/rio/phb.h b/drivers/char/rio/phb.h
index 3baebf8513af..2663ca0306e2 100644
--- a/drivers/char/rio/phb.h
+++ b/drivers/char/rio/phb.h
@@ -44,17 +44,6 @@
 #endif
 
 
- /*************************************************
-  * Set the LIMIT values.
-  ************************************************/
-#ifdef RTA
-#define RX_LIMIT       (ushort) 3
-#endif
-#ifdef HOST
-#define RX_LIMIT       (ushort) 1
-#endif
-
-
 /*************************************************
  * Handshake asserted. Deasserted by the LTT(s)
  ************************************************/
@@ -69,11 +58,7 @@
 /*************************************************
  * Maximum number of PHB's
  ************************************************/
-#if defined (HOST) || defined (INKERNEL)
 #define MAX_PHB               ((ushort) 128)    /* range 0-127 */
-#else
-#define MAX_PHB               ((ushort) 8)      /* range 0-7 */
-#endif
 
 /*************************************************
  * Defines for the mode fields
@@ -139,141 +124,23 @@
  * the start. The pointer tx_add points to a SPACE to put a Packet.
  * The pointer tx_remove points to the next Packet to remove
  *************************************************************************/
-#ifndef INKERNEL
-#define src_unit     u2.s2.unit
-#define src_port     u2.s2.port
-#define dest_unit    u1.s1.unit
-#define dest_port    u1.s1.port
-#endif
-#ifdef HOST
-#define tx_start     u3.s1.tx_start_ptr_ptr
-#define tx_add       u3.s1.tx_add_ptr_ptr
-#define tx_end       u3.s1.tx_end_ptr_ptr
-#define tx_remove    u3.s1.tx_remove_ptr_ptr
-#define rx_start     u4.s1.rx_start_ptr_ptr
-#define rx_add       u4.s1.rx_add_ptr_ptr
-#define rx_end       u4.s1.rx_end_ptr_ptr
-#define rx_remove    u4.s1.rx_remove_ptr_ptr
-#endif
 typedef struct PHB PHB;
 struct PHB {
-#ifdef RTA
-        ushort port;
-#endif
-#ifdef INKERNEL
         WORD source;
-#else
-        union {
-                ushort source;  /* Complete source */
-                struct {
-                        unsigned char unit;     /* Source unit */
-                        unsigned char port;     /* Source port */
-                } s2;
-        } u2;
-#endif
         WORD handshake;
         WORD status;
         NUMBER timeout;         /* Maximum of 1.9 seconds */
         WORD link;              /* Send down this link */
-#ifdef INKERNEL
         WORD destination;
-#else
-        union {
-                ushort destination;     /* Complete destination */
-                struct {
-                        unsigned char unit;     /* Destination unit */
-                        unsigned char port;     /* Destination port */
-                } s1;
-        } u1;
-#endif
-#ifdef RTA
-        ushort tx_pkts_added;
-        ushort tx_pkts_removed;
-        Q_BUF_ptr tx_q_start;   /* Start of the Q list chain */
-        short num_tx_q_bufs;    /* Number of Q buffers in the chain */
-        PKT_ptr_ptr tx_add;     /* Add a new Packet here */
-        Q_BUF_ptr tx_add_qb;    /* Pointer to the add Q buf */
-        PKT_ptr_ptr tx_add_st_qbb;      /* Pointer to start of the Q's buf */
-        PKT_ptr_ptr tx_add_end_qbb;     /* Pointer to the end of the Q's buf */
-        PKT_ptr_ptr tx_remove;  /* Remove a Packet here */
-        Q_BUF_ptr tx_remove_qb; /* Pointer to the remove Q buf */
-        PKT_ptr_ptr tx_remove_st_qbb;   /* Pointer to the start of the Q buf */
-        PKT_ptr_ptr tx_remove_end_qbb;  /* Pointer to the end of the Q buf */
-#endif
-#ifdef INKERNEL
         PKT_ptr_ptr tx_start;
         PKT_ptr_ptr tx_end;
         PKT_ptr_ptr tx_add;
         PKT_ptr_ptr tx_remove;
-#endif
-#ifdef HOST
-        union {
-                struct {
-                        PKT_ptr_ptr tx_start_ptr_ptr;
-                        PKT_ptr_ptr tx_end_ptr_ptr;
-                        PKT_ptr_ptr tx_add_ptr_ptr;
-                        PKT_ptr_ptr tx_remove_ptr_ptr;
-                } s1;
-                struct {
-                        ushort *tx_start_ptr;
-                        ushort *tx_end_ptr;
-                        ushort *tx_add_ptr;
-                        ushort *tx_remove_ptr;
-                } s2;
-        } u3;
-#endif
 
-#ifdef  RTA
-        ushort rx_pkts_added;
-        ushort rx_pkts_removed;
-        Q_BUF_ptr rx_q_start;   /* Start of the Q list chain */
-        short num_rx_q_bufs;    /* Number of Q buffers in the chain */
-        PKT_ptr_ptr rx_add;     /* Add a new Packet here */
-        Q_BUF_ptr rx_add_qb;    /* Pointer to the add Q buf */
-        PKT_ptr_ptr rx_add_st_qbb;      /* Pointer to start of the Q's buf */
-        PKT_ptr_ptr rx_add_end_qbb;     /* Pointer to the end of the Q's buf */
-        PKT_ptr_ptr rx_remove;  /* Remove a Packet here */
-        Q_BUF_ptr rx_remove_qb; /* Pointer to the remove Q buf */
-        PKT_ptr_ptr rx_remove_st_qbb;   /* Pointer to the start of the Q buf */
-        PKT_ptr_ptr rx_remove_end_qbb;  /* Pointer to the end of the Q buf */
-#endif
-#ifdef INKERNEL
         PKT_ptr_ptr rx_start;
         PKT_ptr_ptr rx_end;
         PKT_ptr_ptr rx_add;
         PKT_ptr_ptr rx_remove;
-#endif
-#ifdef HOST
-        union {
-                struct {
-                        PKT_ptr_ptr rx_start_ptr_ptr;
-                        PKT_ptr_ptr rx_end_ptr_ptr;
-                        PKT_ptr_ptr rx_add_ptr_ptr;
-                        PKT_ptr_ptr rx_remove_ptr_ptr;
-                } s1;
-                struct {
-                        ushort *rx_start_ptr;
-                        ushort *rx_end_ptr;
-                        ushort *rx_add_ptr;
-                        ushort *rx_remove_ptr;
-                } s2;
-        } u4;
-#endif
-
-#ifdef RTA                      /* some fields for the remotes */
-        ushort flush_count;     /* Count of write flushes */
-        ushort txmode;          /* Modes for tx */
-        ushort rxmode;          /* Modes for rx */
-        ushort portmode;        /* Generic modes */
-        ushort column;          /* TAB3 column count */
-        ushort tx_subscript;    /* (TX) Subscript into data field */
-        ushort rx_subscript;    /* (RX) Subscript into data field */
-        PKT_ptr rx_incomplete;  /* Hold an incomplete packet here */
-        ushort modem_bits;      /* Modem bits to mask */
-        ushort lastModem;       /* Modem control lines. */
-        ushort addr;            /* Address for sub commands */
-        ushort MonitorTstate;   /* TRUE if monitoring tstop */
-#endif
 
 };
 
diff --git a/drivers/char/rio/pkt.h b/drivers/char/rio/pkt.h
index 882fd429ac2e..7011e52e82db 100644
--- a/drivers/char/rio/pkt.h
+++ b/drivers/char/rio/pkt.h
@@ -70,39 +70,12 @@
 #define CONTROL_DATA_WNDW  (DATA_WNDW << 8)
 
 struct PKT {
-#ifdef INKERNEL
         BYTE dest_unit;         /* Destination Unit Id */
         BYTE dest_port;         /* Destination POrt */
         BYTE src_unit;          /* Source Unit Id */
         BYTE src_port;          /* Source POrt */
-#else
-        union {
-                ushort destination;     /* Complete destination */
-                struct {
-                        unsigned char unit;     /* Destination unit */
-                        unsigned char port;     /* Destination port */
-                } s1;
-        } u1;
-        union {
-                ushort source;  /* Complete source */
-                struct {
-                        unsigned char unit;     /* Source unit */
-                        unsigned char port;     /* Source port */
-                } s2;
-        } u2;
-#endif
-#ifdef INKERNEL
         BYTE len;
         BYTE control;
-#else
-        union {
-                ushort control;
-                struct {
-                        unsigned char len;
-                        unsigned char control;
-                } s3;
-        } u3;
-#endif
         BYTE data[PKT_MAX_DATA_LEN];
         /* Actual data :-) */
         WORD csum;              /* C-SUM */
diff --git a/drivers/char/rio/qbuf.h b/drivers/char/rio/qbuf.h
index acd9e8e5307d..391ffc335535 100644
--- a/drivers/char/rio/qbuf.h
+++ b/drivers/char/rio/qbuf.h
@@ -46,11 +46,7 @@ static char *_rio_qbuf_h_sccs = "@(#)qbuf.h	1.1";
 
 
 
-#ifdef HOST
-#define PKTS_PER_BUFFER    1
-#else
 #define PKTS_PER_BUFFER    (220 / PKT_LENGTH)
-#endif
 
 typedef struct Q_BUF Q_BUF;
 struct Q_BUF {
diff --git a/drivers/char/rio/riotypes.h b/drivers/char/rio/riotypes.h
index 9b67e2468bec..46084d5c7e98 100644
--- a/drivers/char/rio/riotypes.h
+++ b/drivers/char/rio/riotypes.h
@@ -43,9 +43,6 @@
 #endif
 #endif
 
-#ifdef INKERNEL
-
-#if !defined(MIPSAT)
 typedef unsigned short NUMBER_ptr;
 typedef unsigned short WORD_ptr;
 typedef unsigned short BYTE_ptr;
@@ -65,69 +62,6 @@ typedef unsigned short RUP_ptr;
 typedef unsigned short short_ptr;
 typedef unsigned short u_short_ptr;
 typedef unsigned short ushort_ptr;
-#else
-/* MIPSAT types */
-typedef char RIO_POINTER[8];
-typedef RIO_POINTER NUMBER_ptr;
-typedef RIO_POINTER WORD_ptr;
-typedef RIO_POINTER BYTE_ptr;
-typedef RIO_POINTER char_ptr;
-typedef RIO_POINTER Channel_ptr;
-typedef RIO_POINTER FREE_LIST_ptr_ptr;
-typedef RIO_POINTER FREE_LIST_ptr;
-typedef RIO_POINTER LPB_ptr;
-typedef RIO_POINTER Process_ptr;
-typedef RIO_POINTER PHB_ptr;
-typedef RIO_POINTER PKT_ptr;
-typedef RIO_POINTER PKT_ptr_ptr;
-typedef RIO_POINTER Q_BUF_ptr;
-typedef RIO_POINTER Q_BUF_ptr_ptr;
-typedef RIO_POINTER ROUTE_STR_ptr;
-typedef RIO_POINTER RUP_ptr;
-typedef RIO_POINTER short_ptr;
-typedef RIO_POINTER u_short_ptr;
-typedef RIO_POINTER ushort_ptr;
-#endif
-
-#else                           /* not INKERNEL */
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-typedef short NUMBER;
-typedef short *NUMBER_ptr;
-typedef unsigned short *WORD_ptr;
-typedef unsigned char *BYTE_ptr;
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-typedef unsigned long ulong;
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-typedef unsigned short ERROR;
-typedef unsigned long ID;
-typedef char *char_ptr;
-typedef Channel *Channel_ptr;
-typedef struct FREE_LIST *FREE_LIST_ptr;
-typedef struct FREE_LIST **FREE_LIST_ptr_ptr;
-typedef struct LPB *LPB_ptr;
-typedef struct Process *Process_ptr;
-typedef struct PHB *PHB_ptr;
-typedef struct PKT *PKT_ptr;
-typedef struct PKT **PKT_ptr_ptr;
-typedef struct Q_BUF *Q_BUF_ptr;
-typedef struct Q_BUF **Q_BUF_ptr_ptr;
-typedef struct ROUTE_STR *ROUTE_STR_ptr;
-typedef struct RUP *RUP_ptr;
-typedef short *short_ptr;
-typedef u_short *u_short_ptr;
-typedef ushort *ushort_ptr;
-typedef struct PKT PKT;
-typedef struct LPB LPB;
-typedef struct RUP RUP;
-#endif
-
 
 #endif                          /* __riotypes__ */
 
diff --git a/drivers/char/rio/rup.h b/drivers/char/rio/rup.h
index 8d44fec91dd5..f74f67c6f702 100644
--- a/drivers/char/rio/rup.h
+++ b/drivers/char/rio/rup.h
@@ -43,12 +43,7 @@
 #endif
 #endif
 
-#if defined( HOST ) || defined( INKERNEL )
 #define MAX_RUP          ((short) 16)
-#endif
-#ifdef RTA
-#define MAX_RUP          ((short) 1)
-#endif
 
 #define PKTS_PER_RUP     ((short) 2)    /* They are always used in pairs */
 
diff --git a/drivers/char/rio/sam.h b/drivers/char/rio/sam.h
index 31494054b213..6f754e19015d 100644
--- a/drivers/char/rio/sam.h
+++ b/drivers/char/rio/sam.h
@@ -43,10 +43,6 @@
 #endif
 
 
-#if !defined( HOST ) && !defined( INKERNEL )
-#define RTA 1
-#endif
-
 #define NUM_FREE_LIST_UNITS     500
 
 #ifndef FALSE
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 0949dcef0697..7edc6a4dbdc4 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -433,7 +433,7 @@ static void rp_do_receive(struct r_port *info,
                 count += ToRecv;
         }
         /*  Push the data up to the tty layer */
-        ld->receive_buf(tty, cbuf, fbuf, count);
+        ld->receive_buf(tty, chead, fhead, count);
 done:
         tty_ldisc_deref(ld);
 }
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 64bf89cb574f..c2490e270f1f 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -931,7 +931,7 @@ static int sx_set_real_termios (void *ptr)
         case CS6:sx_write_channel_byte (port, hi_mask, 0x3f);break;
         case CS5:sx_write_channel_byte (port, hi_mask, 0x1f);break;
         default:
-                printk (KERN_INFO "sx: Invalid wordsize: %d\n", CFLAG & CSIZE);
+                printk (KERN_INFO "sx: Invalid wordsize: %u\n", CFLAG & CSIZE);
                 break;
         }
 
@@ -958,7 +958,7 @@ static int sx_set_real_termios (void *ptr)
         } else {
                 set_bit(TTY_HW_COOK_IN, &port->gs.tty->flags);
         }
-        sx_dprintk (SX_DEBUG_TERMIOS, "iflags: %x(%d) ", 
+        sx_dprintk (SX_DEBUG_TERMIOS, "iflags: %x(%d) ",
                     port->gs.tty->termios->c_iflag, 
                     I_OTHER(port->gs.tty));
 
@@ -973,7 +973,7 @@ static int sx_set_real_termios (void *ptr)
         } else {
                 clear_bit(TTY_HW_COOK_OUT, &port->gs.tty->flags);
         }
-        sx_dprintk (SX_DEBUG_TERMIOS, "oflags: %x(%d)\n", 
+        sx_dprintk (SX_DEBUG_TERMIOS, "oflags: %x(%d)\n",
                     port->gs.tty->termios->c_oflag, 
                     O_OTHER(port->gs.tty));
         /* port->c_dcd = sx_get_CD (port); */
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index aedf7a8e6da7..537aa45d8c67 100644
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -191,7 +191,7 @@ static int get_event_name(char *dest, struct tcpa_event *event,
         const char *name = "";
         char data[40] = "";
         int i, n_len = 0, d_len = 0;
-        u32 event_id, event_data_size;
+        u32 event_id;
 
         switch(event->event_type) {
         case PREBOOT:
@@ -220,8 +220,7 @@ static int get_event_name(char *dest, struct tcpa_event *event,
                 }
                 break;
         case EVENT_TAG:
-                event_id = be32_to_cpu(event_entry);
-                event_data_size = be32_to_cpu(&event_entry[4]);
+                event_id = be32_to_cpu(*((u32 *)event_entry));
 
                 /* ToDo Row data -> Base64 */
 
@@ -376,7 +375,7 @@ static int read_log(struct tpm_bios_log *log)
 {
         struct acpi_tcpa *buff;
         acpi_status status;
-        void *virt;
+        struct acpi_table_header *virt;
 
         if (log->bios_event_log != NULL) {
                 printk(KERN_ERR
@@ -413,7 +412,7 @@ static int read_log(struct tpm_bios_log *log)
 
         log->bios_event_log_end = log->bios_event_log + buff->log_max_len;
 
-        acpi_os_map_memory(buff->log_start_addr, buff->log_max_len, &virt);
+        acpi_os_map_memory(buff->log_start_addr, buff->log_max_len, (void *) &virt);
 
         memcpy(log->bios_event_log, virt, buff->log_max_len);
 
@@ -487,26 +486,35 @@ struct file_operations tpm_binary_bios_measurements_ops = {
         .release = tpm_bios_measurements_release,
 };
 
+static int is_bad(void *p)
+{
+        if (!p)
+                return 1;
+        if (IS_ERR(p) && (PTR_ERR(p) != -ENODEV))
+                return 1;
+        return 0;
+}
+
 struct dentry **tpm_bios_log_setup(char *name)
 {
         struct dentry **ret = NULL, *tpm_dir, *bin_file, *ascii_file;
 
         tpm_dir = securityfs_create_dir(name, NULL);
-        if (!tpm_dir)
+        if (is_bad(tpm_dir))
                 goto out;
 
         bin_file =
             securityfs_create_file("binary_bios_measurements",
                                    S_IRUSR | S_IRGRP, tpm_dir, NULL,
                                    &tpm_binary_bios_measurements_ops);
-        if (!bin_file)
+        if (is_bad(bin_file))
                 goto out_tpm;
 
         ascii_file =
             securityfs_create_file("ascii_bios_measurements",
                                    S_IRUSR | S_IRGRP, tpm_dir, NULL,
                                    &tpm_ascii_bios_measurements_ops);
-        if (!ascii_file)
+        if (is_bad(ascii_file))
                 goto out_bin;
 
         ret = kmalloc(3 * sizeof(struct dentry *), GFP_KERNEL);
@@ -538,3 +546,4 @@ void tpm_bios_log_teardown(struct dentry **lst)
                 securityfs_remove(lst[i]);
 }
 EXPORT_SYMBOL_GPL(tpm_bios_log_teardown);
+MODULE_LICENSE("GPL");
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 8198dbb7370f..ec7590951af5 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -441,7 +441,7 @@ static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
 
                 if ((ioh << 8 | iol) != tpm_inf.base) {
                         dev_err(&dev->dev,
-                                "Could not set IO-ports to %04x\n",
+                                "Could not set IO-ports to 0x%lx\n",
                                 tpm_inf.base);
                         release_region(tpm_inf.base, TPM_INF_PORT_LEN);
                         return -EIO;
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index eb8b5be4e249..076e07c1da38 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -253,6 +253,7 @@ static void tty_buffer_free_all(struct tty_struct *tty)
 
 static void tty_buffer_init(struct tty_struct *tty)
 {
+        spin_lock_init(&tty->buf.lock);
         tty->buf.head = NULL;
         tty->buf.tail = NULL;
         tty->buf.free = NULL;
@@ -266,6 +267,7 @@ static struct tty_buffer *tty_buffer_alloc(size_t size)
         p->used = 0;
         p->size = size;
         p->next = NULL;
+        p->active = 0;
         p->char_buf_ptr = (char *)(p->data);
         p->flag_buf_ptr = (unsigned char *)p->char_buf_ptr + size;
 /*      printk("Flip create %p\n", p); */
@@ -312,25 +314,36 @@ static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
 
 int tty_buffer_request_room(struct tty_struct *tty, size_t size)
 {
-        struct tty_buffer *b = tty->buf.tail, *n;
-        int left = 0;
+        struct tty_buffer *b, *n;
+        int left;
+        unsigned long flags;
+
+        spin_lock_irqsave(&tty->buf.lock, flags);
 
         /* OPTIMISATION: We could keep a per tty "zero" sized buffer to
            remove this conditional if its worth it. This would be invisible
            to the callers */
-        if(b != NULL)
+        if ((b = tty->buf.tail) != NULL) {
                 left = b->size - b->used;
-        if(left >= size)
-                return size;
-        /* This is the slow path - looking for new buffers to use */
-        n = tty_buffer_find(tty, size);
-        if(n == NULL)
-                return left;
-        if(b != NULL)
-                b->next = n;
-        else
-                tty->buf.head = n;
-        tty->buf.tail = n;
+                b->active = 1;
+        } else
+                left = 0;
+
+        if (left < size) {
+                /* This is the slow path - looking for new buffers to use */
+                if ((n = tty_buffer_find(tty, size)) != NULL) {
+                        if (b != NULL) {
+                                b->next = n;
+                                b->active = 0;
+                        } else
+                                tty->buf.head = n;
+                        tty->buf.tail = n;
+                        n->active = 1;
+                } else
+                        size = left;
+        }
+
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
         return size;
 }
 
@@ -396,10 +409,12 @@ EXPORT_SYMBOL_GPL(tty_insert_flip_string_flags);
 int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size)
 {
         int space = tty_buffer_request_room(tty, size);
-        struct tty_buffer *tb = tty->buf.tail;
-        *chars = tb->char_buf_ptr + tb->used;
-        memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
-        tb->used += space;
+        if (likely(space)) {
+                struct tty_buffer *tb = tty->buf.tail;
+                *chars = tb->char_buf_ptr + tb->used;
+                memset(tb->flag_buf_ptr + tb->used, TTY_NORMAL, space);
+                tb->used += space;
+        }
         return space;
 }
 
@@ -416,10 +431,12 @@ EXPORT_SYMBOL_GPL(tty_prepare_flip_string);
 int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size)
 {
         int space = tty_buffer_request_room(tty, size);
-        struct tty_buffer *tb = tty->buf.tail;
-        *chars = tb->char_buf_ptr + tb->used;
-        *flags = tb->flag_buf_ptr + tb->used;
-        tb->used += space;
+        if (likely(space)) {
+                struct tty_buffer *tb = tty->buf.tail;
+                *chars = tb->char_buf_ptr + tb->used;
+                *flags = tb->flag_buf_ptr + tb->used;
+                tb->used += space;
+        }
         return space;
 }
 
@@ -2747,20 +2764,20 @@ static void flush_to_ldisc(void *private_)
                 schedule_delayed_work(&tty->buf.work, 1);
                 goto out;
         }
-        spin_lock_irqsave(&tty->read_lock, flags);
-        while((tbuf = tty->buf.head) != NULL) {
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        while((tbuf = tty->buf.head) != NULL && !tbuf->active) {
                 tty->buf.head = tbuf->next;
                 if (tty->buf.head == NULL)
                         tty->buf.tail = NULL;
-                spin_unlock_irqrestore(&tty->read_lock, flags);
+                spin_unlock_irqrestore(&tty->buf.lock, flags);
                 /* printk("Process buffer %p for %d\n", tbuf, tbuf->used); */
                 disc->receive_buf(tty, tbuf->char_buf_ptr,
                                        tbuf->flag_buf_ptr,
                                        tbuf->used);
-                spin_lock_irqsave(&tty->read_lock, flags);
+                spin_lock_irqsave(&tty->buf.lock, flags);
                 tty_buffer_free(tty, tbuf);
         }
-        spin_unlock_irqrestore(&tty->read_lock, flags);
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
 out:
         tty_ldisc_deref(disc);
 }
@@ -2852,6 +2869,12 @@ EXPORT_SYMBOL(tty_get_baud_rate);
 
 void tty_flip_buffer_push(struct tty_struct *tty)
 {
+        unsigned long flags;
+        spin_lock_irqsave(&tty->buf.lock, flags);
+        if (tty->buf.tail != NULL)
+                tty->buf.tail->active = 0;
+        spin_unlock_irqrestore(&tty->buf.lock, flags);
+
         if (tty->low_latency)
                 flush_to_ldisc((void *) tty);
         else
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index f1d9cb7feae6..0900d1dbee59 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -3213,6 +3213,7 @@ void getconsxy(struct vc_data *vc, unsigned char *p)
 
 void putconsxy(struct vc_data *vc, unsigned char *p)
 {
+        hide_cursor(vc);
         gotoxy(vc, p[0], p[1]);
         set_cursor(vc);
 }
diff --git a/drivers/char/watchdog/sbc_epx_c3.c b/drivers/char/watchdog/sbc_epx_c3.c
index 951764614ebf..7a4dfb95d087 100644
--- a/drivers/char/watchdog/sbc_epx_c3.c
+++ b/drivers/char/watchdog/sbc_epx_c3.c
@@ -25,6 +25,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/ioport.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -181,11 +182,14 @@ static int __init watchdog_init(void)
 {
         int ret;
 
+        if (!request_region(EPXC3_WATCHDOG_CTL_REG, 2, "epxc3_watchdog"))
+                return -EBUSY;
+
         ret = register_reboot_notifier(&epx_c3_notifier);
         if (ret) {
                 printk(KERN_ERR PFX "cannot register reboot notifier "
                         "(err=%d)\n", ret);
-                return ret;
+                goto out;
         }
 
         ret = misc_register(&epx_c3_miscdev);
@@ -193,18 +197,23 @@ static int __init watchdog_init(void)
                 printk(KERN_ERR PFX "cannot register miscdev on minor=%d "
                         "(err=%d)\n", WATCHDOG_MINOR, ret);
                 unregister_reboot_notifier(&epx_c3_notifier);
-                return ret;
+                goto out;
         }
 
         printk(banner);
 
         return 0;
+
+out:
+        release_region(EPXC3_WATCHDOG_CTL_REG, 2);
+        return ret;
 }
 
 static void __exit watchdog_exit(void)
 {
         misc_deregister(&epx_c3_miscdev);
         unregister_reboot_notifier(&epx_c3_notifier);
+        release_region(EPXC3_WATCHDOG_CTL_REG, 2);
 }
 
 module_init(watchdog_init);
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 277a843a87a6..7a511479ae29 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -26,6 +26,7 @@
 #include <linux/slab.h>
 #include <linux/cpu.h>
 #include <linux/completion.h>
+#include <linux/mutex.h>
 
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, "cpufreq-core", msg)
 
@@ -55,7 +56,7 @@ static DECLARE_RWSEM		(cpufreq_notifier_rwsem);
 
 
 static LIST_HEAD(cpufreq_governor_list);
-static DECLARE_MUTEX            (cpufreq_governor_sem);
+static DEFINE_MUTEX             (cpufreq_governor_mutex);
 
 struct cpufreq_policy * cpufreq_cpu_get(unsigned int cpu)
 {
@@ -297,18 +298,18 @@ static int cpufreq_parse_governor (char *str_governor, unsigned int *policy,
                 return -EINVAL;
         } else {
                 struct cpufreq_governor *t;
-                down(&cpufreq_governor_sem);
+                mutex_lock(&cpufreq_governor_mutex);
                 if (!cpufreq_driver || !cpufreq_driver->target)
                         goto out;
                 list_for_each_entry(t, &cpufreq_governor_list, governor_list) {
                         if (!strnicmp(str_governor,t->name,CPUFREQ_NAME_LEN)) {
                                 *governor = t;
-                                up(&cpufreq_governor_sem);
+                                mutex_unlock(&cpufreq_governor_mutex);
                                 return 0;
                         }
                 }
         out:
-                up(&cpufreq_governor_sem);
+                mutex_unlock(&cpufreq_governor_mutex);
         }
         return -EINVAL;
 }
@@ -600,7 +601,8 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         policy->cpu = cpu;
         policy->cpus = cpumask_of_cpu(cpu);
 
-        init_MUTEX_LOCKED(&policy->lock);
+        mutex_init(&policy->lock);
+        mutex_lock(&policy->lock);
         init_completion(&policy->kobj_unregister);
         INIT_WORK(&policy->update, handle_update, (void *)(long)cpu);
 
@@ -610,6 +612,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         ret = cpufreq_driver->init(policy);
         if (ret) {
                 dprintk("initialization failed\n");
+                mutex_unlock(&policy->lock);
                 goto err_out;
         }
 
@@ -621,9 +624,10 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         strlcpy(policy->kobj.name, "cpufreq", KOBJ_NAME_LEN);
 
         ret = kobject_register(&policy->kobj);
-        if (ret)
+        if (ret) {
+                mutex_unlock(&policy->lock);
                 goto err_out_driver_exit;
-
+        }
         /* set up files for this cpu device */
         drv_attr = cpufreq_driver->attr;
         while ((drv_attr) && (*drv_attr)) {
@@ -641,7 +645,7 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
         policy->governor = NULL; /* to assure that the starting sequence is
                                   * run in cpufreq_set_policy */
-        up(&policy->lock);
+        mutex_unlock(&policy->lock);
         
         /* set default policy */
         
@@ -762,10 +766,10 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
         spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
 #endif
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
         if (cpufreq_driver->target)
                 __cpufreq_governor(data, CPUFREQ_GOV_STOP);
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 
         kobject_unregister(&data->kobj);
 
@@ -834,9 +838,9 @@ unsigned int cpufreq_quick_get(unsigned int cpu)
         unsigned int ret = 0;
 
         if (policy) {
-                down(&policy->lock);
+                mutex_lock(&policy->lock);
                 ret = policy->cur;
-                up(&policy->lock);
+                mutex_unlock(&policy->lock);
                 cpufreq_cpu_put(policy);
         }
 
@@ -862,7 +866,7 @@ unsigned int cpufreq_get(unsigned int cpu)
         if (!cpufreq_driver->get)
                 goto out;
 
-        down(&policy->lock);
+        mutex_lock(&policy->lock);
 
         ret = cpufreq_driver->get(cpu);
 
@@ -875,7 +879,7 @@ unsigned int cpufreq_get(unsigned int cpu)
                 }
         }
 
-        up(&policy->lock);
+        mutex_unlock(&policy->lock);
 
  out:
         cpufreq_cpu_put(policy);
@@ -1158,11 +1162,11 @@ int cpufreq_driver_target(struct cpufreq_policy *policy,
         if (!policy)
                 return -EINVAL;
 
-        down(&policy->lock);
+        mutex_lock(&policy->lock);
 
         ret = __cpufreq_driver_target(policy, target_freq, relation);
 
-        up(&policy->lock);
+        mutex_unlock(&policy->lock);
 
         cpufreq_cpu_put(policy);
 
@@ -1199,9 +1203,9 @@ int cpufreq_governor(unsigned int cpu, unsigned int event)
         if (!policy)
                 return -EINVAL;
 
-        down(&policy->lock);
+        mutex_lock(&policy->lock);
         ret = __cpufreq_governor(policy, event);
-        up(&policy->lock);
+        mutex_unlock(&policy->lock);
 
         cpufreq_cpu_put(policy);
 
@@ -1217,17 +1221,17 @@ int cpufreq_register_governor(struct cpufreq_governor *governor)
         if (!governor)
                 return -EINVAL;
 
-        down(&cpufreq_governor_sem);
+        mutex_lock(&cpufreq_governor_mutex);
         
         list_for_each_entry(t, &cpufreq_governor_list, governor_list) {
                 if (!strnicmp(governor->name,t->name,CPUFREQ_NAME_LEN)) {
-                        up(&cpufreq_governor_sem);
+                        mutex_unlock(&cpufreq_governor_mutex);
                         return -EBUSY;
                 }
         }
         list_add(&governor->governor_list, &cpufreq_governor_list);
 
-        up(&cpufreq_governor_sem);
+        mutex_unlock(&cpufreq_governor_mutex);
 
         return 0;
 }
@@ -1239,9 +1243,9 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
         if (!governor)
                 return;
 
-        down(&cpufreq_governor_sem);
+        mutex_lock(&cpufreq_governor_mutex);
         list_del(&governor->governor_list);
-        up(&cpufreq_governor_sem);
+        mutex_unlock(&cpufreq_governor_mutex);
         return;
 }
 EXPORT_SYMBOL_GPL(cpufreq_unregister_governor);
@@ -1268,9 +1272,9 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu)
         if (!cpu_policy)
                 return -EINVAL;
 
-        down(&cpu_policy->lock);
+        mutex_lock(&cpu_policy->lock);
         memcpy(policy, cpu_policy, sizeof(struct cpufreq_policy));
-        up(&cpu_policy->lock);
+        mutex_unlock(&cpu_policy->lock);
 
         cpufreq_cpu_put(cpu_policy);
 
@@ -1382,7 +1386,7 @@ int cpufreq_set_policy(struct cpufreq_policy *policy)
                 return -EINVAL;
 
         /* lock this CPU */
-        down(&data->lock);
+        mutex_lock(&data->lock);
 
         ret = __cpufreq_set_policy(data, policy);
         data->user_policy.min = data->min;
@@ -1390,7 +1394,7 @@ int cpufreq_set_policy(struct cpufreq_policy *policy)
         data->user_policy.policy = data->policy;
         data->user_policy.governor = data->governor;
 
-        up(&data->lock);
+        mutex_unlock(&data->lock);
         cpufreq_cpu_put(data);
 
         return ret;
@@ -1414,7 +1418,7 @@ int cpufreq_update_policy(unsigned int cpu)
         if (!data)
                 return -ENODEV;
 
-        down(&data->lock);
+        mutex_lock(&data->lock);
 
         dprintk("updating policy for CPU %u\n", cpu);
         memcpy(&policy, 
@@ -1425,9 +1429,17 @@ int cpufreq_update_policy(unsigned int cpu)
         policy.policy = data->user_policy.policy;
         policy.governor = data->user_policy.governor;
 
+        /* BIOS might change freq behind our back
+          -> ask driver for current freq and notify governors about a change */
+        if (cpufreq_driver->get) {
+                policy.cur = cpufreq_driver->get(cpu);
+                if (data->cur != policy.cur)
+                        cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+        }
+
         ret = __cpufreq_set_policy(data, &policy);
 
-        up(&data->lock);
+        mutex_unlock(&data->lock);
 
         cpufreq_cpu_put(data);
         return ret;
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 39543a2bed0f..ac38766b2583 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -28,7 +28,7 @@
 #include <linux/jiffies.h>
 #include <linux/kernel_stat.h>
 #include <linux/percpu.h>
-
+#include <linux/mutex.h>
 /*
  * dbs is used in this file as a shortform for demandbased switching
  * It helps to keep variable names smaller, simpler
@@ -71,7 +71,7 @@ static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 
 static unsigned int dbs_enable; /* number of CPUs using this policy */
 
-static DECLARE_MUTEX    (dbs_sem);
+static DEFINE_MUTEX     (dbs_mutex);
 static DECLARE_WORK     (dbs_work, do_dbs_timer, NULL);
 
 struct dbs_tuners {
@@ -139,9 +139,9 @@ static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
         if (ret != 1 )
                 return -EINVAL;
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         dbs_tuners_ins.sampling_down_factor = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -153,14 +153,14 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
         int ret;
         ret = sscanf (buf, "%u", &input);
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > MAX_SAMPLING_RATE || input < MIN_SAMPLING_RATE) {
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
 
         dbs_tuners_ins.sampling_rate = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -172,16 +172,16 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
         int ret;
         ret = sscanf (buf, "%u", &input);
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || 
                         input < MIN_FREQUENCY_UP_THRESHOLD ||
                         input <= dbs_tuners_ins.down_threshold) {
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
 
         dbs_tuners_ins.up_threshold = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -193,16 +193,16 @@ static ssize_t store_down_threshold(struct cpufreq_policy *unused,
         int ret;
         ret = sscanf (buf, "%u", &input);
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > MAX_FREQUENCY_DOWN_THRESHOLD || 
                         input < MIN_FREQUENCY_DOWN_THRESHOLD ||
                         input >= dbs_tuners_ins.up_threshold) {
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
 
         dbs_tuners_ins.down_threshold = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -222,9 +222,9 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
         if ( input > 1 )
                 input = 1;
         
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if ( input == dbs_tuners_ins.ignore_nice ) { /* nothing to do */
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return count;
         }
         dbs_tuners_ins.ignore_nice = input;
@@ -236,7 +236,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
                 j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
                 j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up;
         }
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -257,9 +257,9 @@ static ssize_t store_freq_step(struct cpufreq_policy *policy,
         
         /* no need to test here if freq_step is zero as the user might actually
          * want this, they would be crazy though :) */
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         dbs_tuners_ins.freq_step = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -444,12 +444,12 @@ static void dbs_check_cpu(int cpu)
 static void do_dbs_timer(void *data)
 { 
         int i;
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         for_each_online_cpu(i)
                 dbs_check_cpu(i);
         schedule_delayed_work(&dbs_work, 
                         usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 } 
 
 static inline void dbs_timer_init(void)
@@ -487,7 +487,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (this_dbs_info->enable) /* Already enabled */
                         break;
                  
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 for_each_cpu_mask(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
@@ -521,11 +521,11 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         dbs_timer_init();
                 }
                 
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 break;
 
         case CPUFREQ_GOV_STOP:
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 this_dbs_info->enable = 0;
                 sysfs_remove_group(&policy->kobj, &dbs_attr_group);
                 dbs_enable--;
@@ -536,12 +536,12 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (dbs_enable == 0) 
                         dbs_timer_exit();
                 
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
 
                 break;
 
         case CPUFREQ_GOV_LIMITS:
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 if (policy->max < this_dbs_info->cur_policy->cur)
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
@@ -550,7 +550,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
                                         policy->min, CPUFREQ_RELATION_L);
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 break;
         }
         return 0;
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index e69fd8dd1f1c..9ee9411f186f 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -27,6 +27,7 @@
 #include <linux/jiffies.h>
 #include <linux/kernel_stat.h>
 #include <linux/percpu.h>
+#include <linux/mutex.h>
 
 /*
  * dbs is used in this file as a shortform for demandbased switching
@@ -70,7 +71,7 @@ static DEFINE_PER_CPU(struct cpu_dbs_info_s, cpu_dbs_info);
 
 static unsigned int dbs_enable; /* number of CPUs using this policy */
 
-static DECLARE_MUTEX    (dbs_sem);
+static DEFINE_MUTEX     (dbs_mutex);
 static DECLARE_WORK     (dbs_work, do_dbs_timer, NULL);
 
 struct dbs_tuners {
@@ -136,9 +137,9 @@ static ssize_t store_sampling_down_factor(struct cpufreq_policy *unused,
         if (input > MAX_SAMPLING_DOWN_FACTOR || input < 1)
                 return -EINVAL;
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         dbs_tuners_ins.sampling_down_factor = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -150,14 +151,14 @@ static ssize_t store_sampling_rate(struct cpufreq_policy *unused,
         int ret;
         ret = sscanf (buf, "%u", &input);
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > MAX_SAMPLING_RATE || input < MIN_SAMPLING_RATE) {
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
 
         dbs_tuners_ins.sampling_rate = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -169,15 +170,15 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
         int ret;
         ret = sscanf (buf, "%u", &input);
 
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if (ret != 1 || input > MAX_FREQUENCY_UP_THRESHOLD || 
                         input < MIN_FREQUENCY_UP_THRESHOLD) {
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
 
         dbs_tuners_ins.up_threshold = input;
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -197,9 +198,9 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
         if ( input > 1 )
                 input = 1;
         
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         if ( input == dbs_tuners_ins.ignore_nice ) { /* nothing to do */
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 return count;
         }
         dbs_tuners_ins.ignore_nice = input;
@@ -211,7 +212,7 @@ static ssize_t store_ignore_nice_load(struct cpufreq_policy *policy,
                 j_dbs_info->prev_cpu_idle_up = get_cpu_idle_time(j);
                 j_dbs_info->prev_cpu_idle_down = j_dbs_info->prev_cpu_idle_up;
         }
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 
         return count;
 }
@@ -356,12 +357,12 @@ static void dbs_check_cpu(int cpu)
 static void do_dbs_timer(void *data)
 { 
         int i;
-        down(&dbs_sem);
+        mutex_lock(&dbs_mutex);
         for_each_online_cpu(i)
                 dbs_check_cpu(i);
         schedule_delayed_work(&dbs_work, 
                         usecs_to_jiffies(dbs_tuners_ins.sampling_rate));
-        up(&dbs_sem);
+        mutex_unlock(&dbs_mutex);
 } 
 
 static inline void dbs_timer_init(void)
@@ -399,7 +400,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (this_dbs_info->enable) /* Already enabled */
                         break;
                  
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 for_each_cpu_mask(j, policy->cpus) {
                         struct cpu_dbs_info_s *j_dbs_info;
                         j_dbs_info = &per_cpu(cpu_dbs_info, j);
@@ -435,11 +436,11 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         dbs_timer_init();
                 }
                 
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 break;
 
         case CPUFREQ_GOV_STOP:
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 this_dbs_info->enable = 0;
                 sysfs_remove_group(&policy->kobj, &dbs_attr_group);
                 dbs_enable--;
@@ -450,12 +451,12 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                 if (dbs_enable == 0) 
                         dbs_timer_exit();
                 
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
 
                 break;
 
         case CPUFREQ_GOV_LIMITS:
-                down(&dbs_sem);
+                mutex_lock(&dbs_mutex);
                 if (policy->max < this_dbs_info->cur_policy->cur)
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
@@ -464,7 +465,7 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy,
                         __cpufreq_driver_target(
                                         this_dbs_info->cur_policy,
                                         policy->min, CPUFREQ_RELATION_L);
-                up(&dbs_sem);
+                mutex_unlock(&dbs_mutex);
                 break;
         }
         return 0;
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c
index d32bf3593cd3..92a0be22a2a9 100644
--- a/drivers/cpufreq/cpufreq_userspace.c
+++ b/drivers/cpufreq/cpufreq_userspace.c
@@ -1,3 +1,4 @@
+
 /*
  *  linux/drivers/cpufreq/cpufreq_userspace.c
  *
@@ -21,6 +22,7 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/sysfs.h>
+#include <linux/mutex.h>
 
 #include <asm/uaccess.h>
 
@@ -33,9 +35,8 @@ static unsigned int	cpu_min_freq[NR_CPUS];
 static unsigned int     cpu_cur_freq[NR_CPUS]; /* current CPU freq */
 static unsigned int     cpu_set_freq[NR_CPUS]; /* CPU freq desired by userspace */
 static unsigned int     cpu_is_managed[NR_CPUS];
-static struct cpufreq_policy current_policy[NR_CPUS];
 
-static DECLARE_MUTEX    (userspace_sem); 
+static DEFINE_MUTEX     (userspace_mutex);
 
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "userspace", msg)
 
@@ -64,35 +65,34 @@ static struct notifier_block userspace_cpufreq_notifier_block = {
  *
  * Sets the CPU frequency to freq.
  */
-static int cpufreq_set(unsigned int freq, unsigned int cpu)
+static int cpufreq_set(unsigned int freq, struct cpufreq_policy *policy)
 {
         int ret = -EINVAL;
 
-        dprintk("cpufreq_set for cpu %u, freq %u kHz\n", cpu, freq);
+        dprintk("cpufreq_set for cpu %u, freq %u kHz\n", policy->cpu, freq);
 
-        down(&userspace_sem);
-        if (!cpu_is_managed[cpu])
+        mutex_lock(&userspace_mutex);
+        if (!cpu_is_managed[policy->cpu])
                 goto err;
 
-        cpu_set_freq[cpu] = freq;
+        cpu_set_freq[policy->cpu] = freq;
 
-        if (freq < cpu_min_freq[cpu])
-                freq = cpu_min_freq[cpu];
-        if (freq > cpu_max_freq[cpu])
-                freq = cpu_max_freq[cpu];
+        if (freq < cpu_min_freq[policy->cpu])
+                freq = cpu_min_freq[policy->cpu];
+        if (freq > cpu_max_freq[policy->cpu])
+                freq = cpu_max_freq[policy->cpu];
 
         /*
          * We're safe from concurrent calls to ->target() here
-         * as we hold the userspace_sem lock. If we were calling
+         * as we hold the userspace_mutex lock. If we were calling
          * cpufreq_driver_target, a deadlock situation might occur:
-         * A: cpufreq_set (lock userspace_sem) -> cpufreq_driver_target(lock policy->lock)
-         * B: cpufreq_set_policy(lock policy->lock) -> __cpufreq_governor -> cpufreq_governor_userspace (lock userspace_sem)
+         * A: cpufreq_set (lock userspace_mutex) -> cpufreq_driver_target(lock policy->lock)
+         * B: cpufreq_set_policy(lock policy->lock) -> __cpufreq_governor -> cpufreq_governor_userspace (lock userspace_mutex)
          */
-        ret = __cpufreq_driver_target(&current_policy[cpu], freq, 
-              CPUFREQ_RELATION_L);
+        ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L);
 
  err:
-        up(&userspace_sem);
+        mutex_unlock(&userspace_mutex);
         return ret;
 }
 
@@ -113,7 +113,7 @@ store_speed (struct cpufreq_policy *policy, const char *buf, size_t count)
         if (ret != 1)
                 return -EINVAL;
 
-        cpufreq_set(freq, policy->cpu);
+        cpufreq_set(freq, policy);
 
         return count;
 }
@@ -134,44 +134,48 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,
                 if (!cpu_online(cpu))
                         return -EINVAL;
                 BUG_ON(!policy->cur);
-                down(&userspace_sem);
+                mutex_lock(&userspace_mutex);
                 cpu_is_managed[cpu] = 1;                
                 cpu_min_freq[cpu] = policy->min;
                 cpu_max_freq[cpu] = policy->max;
                 cpu_cur_freq[cpu] = policy->cur;
                 cpu_set_freq[cpu] = policy->cur;
                 sysfs_create_file (&policy->kobj, &freq_attr_scaling_setspeed.attr);
-                memcpy (&current_policy[cpu], policy, sizeof(struct cpufreq_policy));
                 dprintk("managing cpu %u started (%u - %u kHz, currently %u kHz)\n", cpu, cpu_min_freq[cpu], cpu_max_freq[cpu], cpu_cur_freq[cpu]);
-                up(&userspace_sem);
+                mutex_unlock(&userspace_mutex);
                 break;
         case CPUFREQ_GOV_STOP:
-                down(&userspace_sem);
+                mutex_lock(&userspace_mutex);
                 cpu_is_managed[cpu] = 0;
                 cpu_min_freq[cpu] = 0;
                 cpu_max_freq[cpu] = 0;
                 cpu_set_freq[cpu] = 0;
                 sysfs_remove_file (&policy->kobj, &freq_attr_scaling_setspeed.attr);
                 dprintk("managing cpu %u stopped\n", cpu);
-                up(&userspace_sem);
+                mutex_unlock(&userspace_mutex);
                 break;
         case CPUFREQ_GOV_LIMITS:
-                down(&userspace_sem);
-                cpu_min_freq[cpu] = policy->min;
-                cpu_max_freq[cpu] = policy->max;
-                dprintk("limit event for cpu %u: %u - %u kHz, currently %u kHz, last set to %u kHz\n", cpu, cpu_min_freq[cpu], cpu_max_freq[cpu], cpu_cur_freq[cpu], cpu_set_freq[cpu]);
+                mutex_lock(&userspace_mutex);
+                dprintk("limit event for cpu %u: %u - %u kHz,"
+                        "currently %u kHz, last set to %u kHz\n",
+                        cpu, policy->min, policy->max,
+                        cpu_cur_freq[cpu], cpu_set_freq[cpu]);
                 if (policy->max < cpu_set_freq[cpu]) {
-                        __cpufreq_driver_target(&current_policy[cpu], policy->max, 
-                              CPUFREQ_RELATION_H);
-                } else if (policy->min > cpu_set_freq[cpu]) {
-                        __cpufreq_driver_target(&current_policy[cpu], policy->min, 
-                              CPUFREQ_RELATION_L);
-                } else {
-                        __cpufreq_driver_target(&current_policy[cpu], cpu_set_freq[cpu],
-                              CPUFREQ_RELATION_L);
+                        __cpufreq_driver_target(policy, policy->max,
+                                                CPUFREQ_RELATION_H);
+                }
+                else if (policy->min > cpu_set_freq[cpu]) {
+                        __cpufreq_driver_target(policy, policy->min,
+                                                CPUFREQ_RELATION_L);
                 }
-                memcpy (&current_policy[cpu], policy, sizeof(struct cpufreq_policy));
-                up(&userspace_sem);
+                else {
+                        __cpufreq_driver_target(policy, cpu_set_freq[cpu],
+                                                CPUFREQ_RELATION_L);
+                }
+                cpu_min_freq[cpu] = policy->min;
+                cpu_max_freq[cpu] = policy->max;
+                cpu_cur_freq[cpu] = policy->cur;
+                mutex_unlock(&userspace_mutex);
                 break;
         }
         return 0;
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 4819e7fc00dd..18a455651121 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -11,7 +11,6 @@ menu 'EDAC - error detection and reporting (RAS)'
 config EDAC
         tristate "EDAC core system error reporting"
         depends on X86
-        default y
         help
           EDAC is designed to report errors in the core system.
           These are low-level errors that are reported in the CPU or
@@ -46,7 +45,7 @@ config EDAC_MM_EDAC
 
 config EDAC_AMD76X
         tristate "AMD 76x (760, 762, 768)"
-        depends on EDAC_MM_EDAC  && PCI
+        depends on EDAC_MM_EDAC && PCI && X86_32
         help
           Support for error detection and correction on the AMD 76x
           series of chipsets used with the Athlon processor.
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index 770a5a633079..c454ded2b060 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -1039,10 +1039,10 @@ MODULE_DEVICE_TABLE(pci, e752x_pci_tbl);
 
 
 static struct pci_driver e752x_driver = {
-      name: BS_MOD_STR,
-      probe: e752x_init_one,
-      remove: __devexit_p(e752x_remove_one),
-      id_table: e752x_pci_tbl,
+        .name = BS_MOD_STR,
+        .probe = e752x_init_one,
+        .remove = __devexit_p(e752x_remove_one),
+        .id_table = e752x_pci_tbl,
 };
 
 
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 4be9bd0a1267..b10ee4698b1d 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -14,7 +14,6 @@
 
 
 #include <linux/config.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 1c81174595b3..d633081fa4c5 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -52,9 +52,9 @@ config IDE
 
 if IDE
 
-config IDE_MAX_HWIFS 
+config IDE_MAX_HWIFS
         int "Max IDE interfaces"
-        depends on ALPHA || SUPERH
+        depends on ALPHA || SUPERH || IA64
         default 4
         help
           This is the maximum number of IDE hardware interfaces that will
@@ -162,8 +162,8 @@ config BLK_DEV_IDECS
         tristate "PCMCIA IDE support"
         depends on PCMCIA
         help
-          Support for outboard IDE disks, tape drives, and CD-ROM drives
-          connected through a  PCMCIA card.
+          Support for Compact Flash cards, outboard IDE disks, tape drives,
+          and CD-ROM drives connected through a PCMCIA card.
 
 config BLK_DEV_IDECD
         tristate "Include IDE/ATAPI CDROM support"
@@ -267,7 +267,7 @@ config IDE_TASK_IOCTL
         help
           This is a direct raw access to the media.  It is a complex but
           elegant solution to test and validate the domain of the hardware and
-          perform below the driver data recover if needed.  This is the most
+          perform below the driver data recovery if needed.  This is the most
           basic form of media-forensics.
 
           If you are unsure, say N here.
@@ -525,7 +525,7 @@ config BLK_DEV_CS5520
         tristate "Cyrix CS5510/20 MediaGX chipset support (VERY EXPERIMENTAL)"
         depends on EXPERIMENTAL
         help
-          Include support for PIO tuning an virtual DMA on the Cyrix MediaGX 
+          Include support for PIO tuning and virtual DMA on the Cyrix MediaGX
           5510/5520 chipset. This will automatically be detected and
           configured if found.
 
@@ -662,7 +662,7 @@ config PDC202XX_BURST
 
           It was originally designed for the PDC20246/Ultra33, whose BIOS will
           only setup UDMA on the first two PDC20246 cards.  It has also been
-          used succesfully on a PDC20265/Ultra100, allowing use of UDMA modes
+          used successfully on a PDC20265/Ultra100, allowing use of UDMA modes
           when the PDC20265 BIOS has been disabled (for faster boot up).
 
           Please read the comments at the top of
@@ -673,13 +673,6 @@ config PDC202XX_BURST
 config BLK_DEV_PDC202XX_NEW
         tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
 
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
-        bool "Enable controller even if disabled by BIOS"
-        depends on BLK_DEV_PDC202XX_NEW
-        help
-          Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
 config BLK_DEV_SVWKS
         tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
         help
@@ -722,7 +715,7 @@ config BLK_DEV_SIS5513
 config BLK_DEV_SLC90E66
         tristate "SLC90E66 chipset support"
         help
-          This driver ensures (U)DMA support for Victroy66 SouthBridges for
+          This driver ensures (U)DMA support for Victory66 SouthBridges for
           SMsC with Intel NorthBridges.  This is an Ultra66 based chipset.
           The nice thing about it is that you can mix Ultra/DMA/PIO devices
           and it will handle timing cycles.  Since this is an improved
@@ -1060,7 +1053,7 @@ config IDEDMA_IVB
           in that mode with an 80c ribbon.
 
           If you are experiencing compatibility or performance problems, you
-          MAY try to answering Y here. However, it does not necessarily solve
+          MAY try to answer Y here. However, it does not necessarily solve
           any of your problems, it could even cause more of them.
 
           It is normally safe to answer Y; however, the default is N.
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index ca25f9e3d0f4..6c60a9d2afd8 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -776,7 +776,7 @@ static void update_ordered(ide_drive_t *drive)
                          ide_id_has_flush_cache_ext(id));
 
                 printk(KERN_INFO "%s: cache flushes %ssupported\n",
-                       drive->name, barrier ? "" : "not");
+                       drive->name, barrier ? "" : "not ");
 
                 if (barrier) {
                         ordered = QUEUE_ORDERED_DRAIN_FLUSH;
@@ -889,11 +889,7 @@ static void idedisk_setup (ide_drive_t *drive)
         if (drive->id_read == 0)
                 return;
 
-        /*
-         * CompactFlash cards and their brethern look just like hard drives
-         * to us, but they are removable and don't have a doorlock mechanism.
-         */
-        if (drive->removable && !(drive->is_flash)) {
+        if (drive->removable) {
                 /*
                  * Removable disks (eg. SYQUEST); ignore 'WD' drives 
                  */
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 8d50df4526a4..c01615dec202 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -55,8 +55,8 @@
 #include <asm/io.h>
 #include <asm/bitops.h>
 
-int __ide_end_request(ide_drive_t *drive, struct request *rq, int uptodate,
-                      int nr_sectors)
+static int __ide_end_request(ide_drive_t *drive, struct request *rq,
+                             int uptodate, int nr_sectors)
 {
         int ret = 1;
 
@@ -91,7 +91,6 @@ int __ide_end_request(ide_drive_t *drive, struct request *rq, int uptodate,
 
         return ret;
 }
-EXPORT_SYMBOL(__ide_end_request);
 
 /**
  *      ide_end_request         -       complete an IDE I/O
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index af7af958ab3e..b72dde70840a 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1243,6 +1243,7 @@ int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
                  */
                 if (stat == 0xff)
                         return -ENODEV;
+                touch_softlockup_watchdog();
         }
         return -EBUSY;
 }
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index e7425546b4b1..427d1c204174 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -125,45 +125,6 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)
 }
 
 /**
- *      drive_is_flashcard      -       check for compact flash
- *      @drive: drive to check
- *
- *      CompactFlash cards and their brethern pretend to be removable
- *      hard disks, except:
- *              (1) they never have a slave unit, and
- *              (2) they don't have doorlock mechanisms.
- *      This test catches them, and is invoked elsewhere when setting
- *      appropriate config bits.
- *
- *      FIXME: This treatment is probably applicable for *all* PCMCIA (PC CARD)
- *      devices, so in linux 2.3.x we should change this to just treat all
- *      PCMCIA  drives this way, and get rid of the model-name tests below
- *      (too big of an interface change for 2.4.x).
- *      At that time, we might also consider parameterizing the timeouts and
- *      retries, since these are MUCH faster than mechanical drives. -M.Lord
- */
- 
-static inline int drive_is_flashcard (ide_drive_t *drive)
-{
-        struct hd_driveid *id = drive->id;
-
-        if (drive->removable) {
-                if (id->config == 0x848a) return 1;     /* CompactFlash */
-                if (!strncmp(id->model, "KODAK ATA_FLASH", 15)  /* Kodak */
-                 || !strncmp(id->model, "Hitachi CV", 10)       /* Hitachi */
-                 || !strncmp(id->model, "SunDisk SDCFB", 13)    /* old SanDisk */
-                 || !strncmp(id->model, "SanDisk SDCFB", 13)    /* SanDisk */
-                 || !strncmp(id->model, "HAGIWARA HPC", 12)     /* Hagiwara */
-                 || !strncmp(id->model, "LEXAR ATA_FLASH", 15)  /* Lexar */
-                 || !strncmp(id->model, "ATA_FLASH", 9))        /* Simple Tech */
-                {
-                        return 1;       /* yes, it is a flash memory card */
-                }
-        }
-        return 0;       /* no, it is not a flash memory card */
-}
-
-/**
  *      do_identify     -       identify a drive
  *      @drive: drive to identify 
  *      @cmd: command used
@@ -278,13 +239,17 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
         /*
          * Not an ATAPI device: looks like a "regular" hard disk
          */
-        if (id->config & (1<<7))
+
+        /*
+         * 0x848a = CompactFlash device
+         * These are *not* removable in Linux definition of the term
+         */
+
+        if ((id->config != 0x848a) && (id->config & (1<<7)))
                 drive->removable = 1;
 
-        if (drive_is_flashcard(drive))
-                drive->is_flash = 1;
         drive->media = ide_disk;
-        printk("%s DISK drive\n", (drive->is_flash) ? "CFA" : "ATA" );
+        printk("%s DISK drive\n", (id->config == 0x848a) ? "CFA" : "ATA" );
         QUIRK_LIST(drive);
         return;
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index afeb02bbb722..b2cc43702f65 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -242,7 +242,6 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index)
                 drive->name[2]                  = 'a' + (index * MAX_DRIVES) + unit;
                 drive->max_failures             = IDE_DEFAULT_MAX_FAILURES;
                 drive->using_dma                = 0;
-                drive->is_flash                 = 0;
                 drive->vdma                     = 0;
                 INIT_LIST_HEAD(&drive->list);
                 init_completion(&drive->gendev_rel_comp);
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index a21b1e11eef4..c743e68c33aa 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -262,6 +262,21 @@ static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch
         else
                 pci_set_drvdata(dev, (void *) aec6xxx_34_base);
 
+        /* These are necessary to get AEC6280 Macintosh cards to work */
+        if ((dev->device == PCI_DEVICE_ID_ARTOP_ATP865) ||
+            (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R)) {
+                u8 reg49h = 0, reg4ah = 0;
+                /* Clear reset and test bits.  */
+                pci_read_config_byte(dev, 0x49, &reg49h);
+                pci_write_config_byte(dev, 0x49, reg49h & ~0x30);
+                /* Enable chip interrupt output.  */
+                pci_read_config_byte(dev, 0x4a, &reg4ah);
+                pci_write_config_byte(dev, 0x4a, reg4ah & ~0x01);
+                /* Enable burst mode. */
+                pci_read_config_byte(dev, 0x4a, &reg4ah);
+                pci_write_config_byte(dev, 0x4a, reg4ah | 0x80);
+        }
+
         return dev->irq;
 }
 
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 7b589d948bf9..940bdd4c5784 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1288,6 +1288,10 @@ static void __devinit hpt37x_clocking(ide_hwif_t *hwif)
                                 goto init_hpt37X_done;
                         }
                 }
+                if (!pci_get_drvdata(dev)) {
+                        printk("No Clock Stabilization!!!\n");
+                        return;
+                }
 pll_recal:
                 if (adjust & 1)
                         pll -= (adjust >> 1);
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 108fda83fea4..38f41b377ff6 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -733,7 +733,7 @@ static void __devinit it8212_disable_raid(struct pci_dev *dev)
 
         pci_write_config_dword(dev,0x4C, 0x02040204);
         pci_write_config_byte(dev, 0x42, 0x36);
-        pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0);
+        pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20);
 }
 
 static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const char *name)
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index fe06ebb0e5bf..acd63173199b 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -420,9 +420,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
                 .bootable       = OFF_BOARD,
         },{     /* 3 */
                 .name           = "PDC20271",
@@ -447,9 +444,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_pdc202new,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
                 .bootable       = OFF_BOARD,
         },{     /* 6 */
                 .name           = "PDC20277",
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index ad9d95817f95..6f8f8645b02c 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -786,9 +786,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_pdc202xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
                 .bootable       = OFF_BOARD,
                 .extra          = 16,
         },{     /* 1 */
@@ -799,9 +796,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_pdc202xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
                 .flags          = IDEPCI_FLAG_FORCE_PDC,
@@ -813,9 +807,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_pdc202xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
         },{     /* 3 */
@@ -826,9 +817,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_pdc202xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
                 .flags          = IDEPCI_FLAG_FORCE_PDC,
@@ -840,9 +828,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                 .init_dma       = init_dma_pdc202xx,
                 .channels       = 2,
                 .autodma        = AUTODMA,
-#ifndef CONFIG_PDC202XX_FORCE
-                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
-#endif
                 .bootable       = OFF_BOARD,
                 .extra          = 48,
         }
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index b3e77df63cef..e9b83e1a3028 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -135,6 +135,7 @@ static u8 piix_ratemask (ide_drive_t *drive)
                 case PCI_DEVICE_ID_INTEL_ICH6_19:
                 case PCI_DEVICE_ID_INTEL_ICH7_21:
                 case PCI_DEVICE_ID_INTEL_ESB2_18:
+                case PCI_DEVICE_ID_INTEL_ICH8_6:
                         mode = 3;
                         break;
                 /* UDMA 66 capable */
@@ -449,6 +450,7 @@ static unsigned int __devinit init_chipset_piix (struct pci_dev *dev, const char
                 case PCI_DEVICE_ID_INTEL_ICH6_19:
                 case PCI_DEVICE_ID_INTEL_ICH7_21:
                 case PCI_DEVICE_ID_INTEL_ESB2_18:
+                case PCI_DEVICE_ID_INTEL_ICH8_6:
                 {
                         unsigned int extra = 0;
                         pci_read_config_dword(dev, 0x54, &extra);
@@ -575,6 +577,7 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
         /* 21 */ DECLARE_PIIX_DEV("ICH7"),
         /* 22 */ DECLARE_PIIX_DEV("ICH4"),
         /* 23 */ DECLARE_PIIX_DEV("ESB2"),
+        /* 24 */ DECLARE_PIIX_DEV("ICH8M"),
 };
 
 /**
@@ -651,6 +654,7 @@ static struct pci_device_id piix_pci_tbl[] = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22},
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 23},
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 24},
         { 0, },
 };
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 4ee597d08797..2b286e865163 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License
@@ -510,7 +510,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
                                        drive->name);
                                 goto use_pio_instead;
                         } else {
-                                u32 xcount, bcount =
+                                u32 bcount =
                                     0x10000 - (cur_addr & 0xffff);
 
                                 if (bcount > cur_len)
@@ -525,8 +525,7 @@ sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
                                 *table = 0x0;
                                 table++;
 
-                                xcount = bcount & 0xffff;
-                                *table = cpu_to_be32(xcount);
+                                *table = cpu_to_be32(bcount);
                                 table++;
 
                                 cur_addr += bcount;
@@ -680,7 +679,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
                 return -EIO;
 
         /* Create /proc/ide entries */
-        create_proc_ide_interfaces(); 
+        create_proc_ide_interfaces();
 
         return 0;
 }
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index acda7d63d6fe..501cc054cb3b 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -956,6 +956,8 @@ static void ib_sa_remove_one(struct ib_device *device)
 
         ib_unregister_event_handler(&sa_dev->event_handler);
 
+        flush_scheduled_work();
+
         for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) {
                 ib_unregister_mad_agent(sa_dev->port[i].agent);
                 kref_put(&sa_dev->port[i].sm_ah->ref, free_sm_ah);
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 96ea79b63df7..903f85a4bc0c 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -902,6 +902,7 @@ static void __exit ib_uverbs_cleanup(void)
         unregister_filesystem(&uverbs_event_fs);
         class_destroy(uverbs_class);
         unregister_chrdev_region(IB_UVERBS_BASE_DEV, IB_UVERBS_MAX_DEVICES);
+        flush_scheduled_work();
         idr_destroy(&ib_uverbs_pd_idr);
         idr_destroy(&ib_uverbs_mr_idr);
         idr_destroy(&ib_uverbs_mw_idr);
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
index a14eed08a0fc..a19e0ed03d7c 100644
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -184,7 +184,7 @@ int mthca_read_ah(struct mthca_dev *dev, struct mthca_ah *ah,
                         ah->av->sl_tclass_flowlabel & cpu_to_be32(0xfffff);
                 ib_get_cached_gid(&dev->ib_dev,
                                   be32_to_cpu(ah->av->port_pd) >> 24,
-                                  ah->av->gid_index,
+                                  ah->av->gid_index % dev->limits.gid_table_len,
                                   &header->grh.source_gid);
                 memcpy(header->grh.destination_gid.raw,
                        ah->av->dgid, 16);
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index be1791be627b..f9b9b93dc501 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -199,8 +199,7 @@ static int mthca_cmd_post(struct mthca_dev *dev,
 {
         int err = 0;
 
-        if (down_interruptible(&dev->cmd.hcr_sem))
-                return -EINTR;
+        mutex_lock(&dev->cmd.hcr_mutex);
 
         if (event) {
                 unsigned long end = jiffies + GO_BIT_TIMEOUT;
@@ -238,7 +237,7 @@ static int mthca_cmd_post(struct mthca_dev *dev,
                                                op),                       dev->hcr + 6 * 4);
 
 out:
-        up(&dev->cmd.hcr_sem);
+        mutex_unlock(&dev->cmd.hcr_mutex);
         return err;
 }
 
@@ -255,8 +254,7 @@ static int mthca_cmd_poll(struct mthca_dev *dev,
         int err = 0;
         unsigned long end;
 
-        if (down_interruptible(&dev->cmd.poll_sem))
-                return -EINTR;
+        down(&dev->cmd.poll_sem);
 
         err = mthca_cmd_post(dev, in_param,
                              out_param ? *out_param : 0,
@@ -333,8 +331,7 @@ static int mthca_cmd_wait(struct mthca_dev *dev,
         int err = 0;
         struct mthca_cmd_context *context;
 
-        if (down_interruptible(&dev->cmd.event_sem))
-                return -EINTR;
+        down(&dev->cmd.event_sem);
 
         spin_lock(&dev->cmd.context_lock);
         BUG_ON(dev->cmd.free_head < 0);
@@ -438,7 +435,7 @@ static int mthca_cmd_imm(struct mthca_dev *dev,
 
 int mthca_cmd_init(struct mthca_dev *dev)
 {
-        sema_init(&dev->cmd.hcr_sem, 1);
+        mutex_init(&dev->cmd.hcr_mutex);
         sema_init(&dev->cmd.poll_sem, 1);
         dev->cmd.use_events = 0;
 
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index a104ab041ea3..2a165fd06e57 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -44,6 +44,8 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/timer.h>
+#include <linux/mutex.h>
+
 #include <asm/semaphore.h>
 
 #include "mthca_provider.h"
@@ -111,7 +113,7 @@ enum {
 struct mthca_cmd {
         struct pci_pool          *pool;
         int                       use_events;
-        struct semaphore          hcr_sem;
+        struct mutex              hcr_mutex;
         struct semaphore          poll_sem;
         struct semaphore          event_sem;
         int                       max_cmds;
@@ -256,7 +258,7 @@ struct mthca_av_table {
 };
 
 struct mthca_mcg_table {
-        struct semaphore        sem;
+        struct mutex            mutex;
         struct mthca_alloc      alloc;
         struct mthca_icm_table *table;
 };
@@ -301,7 +303,7 @@ struct mthca_dev {
         u64              ddr_end;
 
         MTHCA_DECLARE_DOORBELL_LOCK(doorbell_lock)
-        struct semaphore cap_mask_mutex;
+        struct mutex cap_mask_mutex;
 
         void __iomem    *hcr;
         void __iomem    *kar;
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 8b00d9a0f6f4..9c849d27b06e 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -155,6 +155,13 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim
                 return -ENODEV;
         }
 
+        if (dev_lim->uar_size > pci_resource_len(mdev->pdev, 2)) {
+                mthca_err(mdev, "HCA reported UAR size of 0x%x bigger than "
+                          "PCI resource 2 size of 0x%lx, aborting.\n",
+                          dev_lim->uar_size, pci_resource_len(mdev->pdev, 2));
+                return -ENODEV;
+        }
+
         mdev->limits.num_ports          = dev_lim->num_ports;
         mdev->limits.vl_cap             = dev_lim->max_vl;
         mdev->limits.mtu_cap            = dev_lim->max_mtu;
@@ -976,8 +983,7 @@ static int __devinit mthca_init_one(struct pci_dev *pdev,
                 err = -ENODEV;
                 goto err_disable_pdev;
         }
-        if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM) ||
-            pci_resource_len(pdev, 2) != 1 << 23) {
+        if (!(pci_resource_flags(pdev, 2) & IORESOURCE_MEM)) {
                 dev_err(&pdev->dev, "Missing UAR, aborting.\n");
                 err = -ENODEV;
                 goto err_disable_pdev;
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index 77bc6c746f43..321f11e707f2 100644
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -154,10 +154,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 return PTR_ERR(mailbox);
         mgm = mailbox->buf;
 
-        if (down_interruptible(&dev->mcg_table.sem)) {
-                err = -EINTR;
-                goto err_sem;
-        }
+        mutex_lock(&dev->mcg_table.mutex);
 
         err = find_mgm(dev, gid->raw, mailbox, &hash, &prev, &index);
         if (err)
@@ -241,8 +238,8 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 BUG_ON(index < dev->limits.num_mgms);
                 mthca_free(&dev->mcg_table.alloc, index);
         }
-        up(&dev->mcg_table.sem);
- err_sem:
+        mutex_unlock(&dev->mcg_table.mutex);
+
         mthca_free_mailbox(dev, mailbox);
         return err;
 }
@@ -263,10 +260,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 return PTR_ERR(mailbox);
         mgm = mailbox->buf;
 
-        if (down_interruptible(&dev->mcg_table.sem)) {
-                err = -EINTR;
-                goto err_sem;
-        }
+        mutex_lock(&dev->mcg_table.mutex);
 
         err = find_mgm(dev, gid->raw, mailbox, &hash, &prev, &index);
         if (err)
@@ -371,8 +365,8 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         }
 
  out:
-        up(&dev->mcg_table.sem);
- err_sem:
+        mutex_unlock(&dev->mcg_table.mutex);
+
         mthca_free_mailbox(dev, mailbox);
         return err;
 }
@@ -389,7 +383,7 @@ int __devinit mthca_init_mcg_table(struct mthca_dev *dev)
         if (err)
                 return err;
 
-        init_MUTEX(&dev->mcg_table.sem);
+        mutex_init(&dev->mcg_table.mutex);
 
         return 0;
 }
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c
index 9fb985a016e9..d709cb162a72 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
@@ -50,7 +50,7 @@ enum {
 };
 
 struct mthca_user_db_table {
-        struct semaphore mutex;
+        struct mutex mutex;
         struct {
                 u64                uvirt;
                 struct scatterlist mem;
@@ -158,7 +158,7 @@ int mthca_table_get(struct mthca_dev *dev, struct mthca_icm_table *table, int ob
         int ret = 0;
         u8 status;
 
-        down(&table->mutex);
+        mutex_lock(&table->mutex);
 
         if (table->icm[i]) {
                 ++table->icm[i]->refcount;
@@ -184,7 +184,7 @@ int mthca_table_get(struct mthca_dev *dev, struct mthca_icm_table *table, int ob
         ++table->icm[i]->refcount;
 
 out:
-        up(&table->mutex);
+        mutex_unlock(&table->mutex);
         return ret;
 }
 
@@ -198,7 +198,7 @@ void mthca_table_put(struct mthca_dev *dev, struct mthca_icm_table *table, int o
 
         i = (obj & (table->num_obj - 1)) * table->obj_size / MTHCA_TABLE_CHUNK_SIZE;
 
-        down(&table->mutex);
+        mutex_lock(&table->mutex);
 
         if (--table->icm[i]->refcount == 0) {
                 mthca_UNMAP_ICM(dev, table->virt + i * MTHCA_TABLE_CHUNK_SIZE,
@@ -207,7 +207,7 @@ void mthca_table_put(struct mthca_dev *dev, struct mthca_icm_table *table, int o
                 table->icm[i] = NULL;
         }
 
-        up(&table->mutex);
+        mutex_unlock(&table->mutex);
 }
 
 void *mthca_table_find(struct mthca_icm_table *table, int obj)
@@ -220,7 +220,7 @@ void *mthca_table_find(struct mthca_icm_table *table, int obj)
         if (!table->lowmem)
                 return NULL;
 
-        down(&table->mutex);
+        mutex_lock(&table->mutex);
 
         idx = (obj & (table->num_obj - 1)) * table->obj_size;
         icm = table->icm[idx / MTHCA_TABLE_CHUNK_SIZE];
@@ -240,7 +240,7 @@ void *mthca_table_find(struct mthca_icm_table *table, int obj)
         }
 
 out:
-        up(&table->mutex);
+        mutex_unlock(&table->mutex);
         return page ? lowmem_page_address(page) + offset : NULL;
 }
 
@@ -301,7 +301,7 @@ struct mthca_icm_table *mthca_alloc_icm_table(struct mthca_dev *dev,
         table->num_obj  = nobj;
         table->obj_size = obj_size;
         table->lowmem   = use_lowmem;
-        init_MUTEX(&table->mutex);
+        mutex_init(&table->mutex);
 
         for (i = 0; i < num_icm; ++i)
                 table->icm[i] = NULL;
@@ -380,7 +380,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
         if (index < 0 || index > dev->uar_table.uarc_size / 8)
                 return -EINVAL;
 
-        down(&db_tab->mutex);
+        mutex_lock(&db_tab->mutex);
 
         i = index / MTHCA_DB_REC_PER_PAGE;
 
@@ -424,7 +424,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
         db_tab->page[i].refcount = 1;
 
 out:
-        up(&db_tab->mutex);
+        mutex_unlock(&db_tab->mutex);
         return ret;
 }
 
@@ -439,11 +439,11 @@ void mthca_unmap_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
          * pages until we clean up the whole db table.
          */
 
-        down(&db_tab->mutex);
+        mutex_lock(&db_tab->mutex);
 
         --db_tab->page[index / MTHCA_DB_REC_PER_PAGE].refcount;
 
-        up(&db_tab->mutex);
+        mutex_unlock(&db_tab->mutex);
 }
 
 struct mthca_user_db_table *mthca_init_user_db_tab(struct mthca_dev *dev)
@@ -460,7 +460,7 @@ struct mthca_user_db_table *mthca_init_user_db_tab(struct mthca_dev *dev)
         if (!db_tab)
                 return ERR_PTR(-ENOMEM);
 
-        init_MUTEX(&db_tab->mutex);
+        mutex_init(&db_tab->mutex);
         for (i = 0; i < npages; ++i) {
                 db_tab->page[i].refcount = 0;
                 db_tab->page[i].uvirt    = 0;
@@ -499,7 +499,7 @@ int mthca_alloc_db(struct mthca_dev *dev, enum mthca_db_type type,
         int ret = 0;
         u8 status;
 
-        down(&dev->db_tab->mutex);
+        mutex_lock(&dev->db_tab->mutex);
 
         switch (type) {
         case MTHCA_DB_TYPE_CQ_ARM:
@@ -585,7 +585,7 @@ found:
         *db = (__be32 *) &page->db_rec[j];
 
 out:
-        up(&dev->db_tab->mutex);
+        mutex_unlock(&dev->db_tab->mutex);
 
         return ret;
 }
@@ -601,7 +601,7 @@ void mthca_free_db(struct mthca_dev *dev, int type, int db_index)
 
         page = dev->db_tab->page + i;
 
-        down(&dev->db_tab->mutex);
+        mutex_lock(&dev->db_tab->mutex);
 
         page->db_rec[j] = 0;
         if (i >= dev->db_tab->min_group2)
@@ -624,7 +624,7 @@ void mthca_free_db(struct mthca_dev *dev, int type, int db_index)
                         ++dev->db_tab->min_group2;
         }
 
-        up(&dev->db_tab->mutex);
+        mutex_unlock(&dev->db_tab->mutex);
 }
 
 int mthca_init_db_tab(struct mthca_dev *dev)
@@ -638,7 +638,7 @@ int mthca_init_db_tab(struct mthca_dev *dev)
         if (!dev->db_tab)
                 return -ENOMEM;
 
-        init_MUTEX(&dev->db_tab->mutex);
+        mutex_init(&dev->db_tab->mutex);
 
         dev->db_tab->npages     = dev->uar_table.uarc_size / 4096;
         dev->db_tab->max_group1 = 0;
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.h b/drivers/infiniband/hw/mthca/mthca_memfree.h
index 4fdca26eea85..36f1141a08aa 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.h
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.h
@@ -39,8 +39,7 @@
 
 #include <linux/list.h>
 #include <linux/pci.h>
-
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 #define MTHCA_ICM_CHUNK_LEN \
         ((256 - sizeof (struct list_head) - 2 * sizeof (int)) /         \
@@ -64,7 +63,7 @@ struct mthca_icm_table {
         int               num_obj;
         int               obj_size;
         int               lowmem;
-        struct semaphore  mutex;
+        struct mutex      mutex;
         struct mthca_icm *icm[0];
 };
 
@@ -147,7 +146,7 @@ struct mthca_db_table {
         int                   max_group1;
         int                   min_group2;
         struct mthca_db_page *page;
-        struct semaphore      mutex;
+        struct mutex          mutex;
 };
 
 enum mthca_db_type {
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index 484a7e6b7f8c..e88e39aef85a 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -185,7 +185,7 @@ static int mthca_modify_port(struct ib_device *ibdev,
         int err;
         u8 status;
 
-        if (down_interruptible(&to_mdev(ibdev)->cap_mask_mutex))
+        if (mutex_lock_interruptible(&to_mdev(ibdev)->cap_mask_mutex))
                 return -ERESTARTSYS;
 
         err = mthca_query_port(ibdev, port, &attr);
@@ -207,7 +207,7 @@ static int mthca_modify_port(struct ib_device *ibdev,
         }
 
 out:
-        up(&to_mdev(ibdev)->cap_mask_mutex);
+        mutex_unlock(&to_mdev(ibdev)->cap_mask_mutex);
         return err;
 }
 
@@ -1185,7 +1185,7 @@ int mthca_register_device(struct mthca_dev *dev)
                 dev->ib_dev.post_recv     = mthca_tavor_post_receive;
         }
 
-        init_MUTEX(&dev->cap_mask_mutex);
+        mutex_init(&dev->cap_mask_mutex);
 
         ret = ib_register_device(&dev->ib_dev);
         if (ret)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index fd3f5c862a5d..c3b5f79d1168 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -505,7 +505,7 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)
 
         list_add_tail(&neigh->list, &path->neigh_list);
 
-        if (path->pathrec.dlid) {
+        if (path->ah) {
                 kref_get(&path->ah->ref);
                 neigh->ah = path->ah;
 
@@ -591,7 +591,7 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
                 return;
         }
 
-        if (path->pathrec.dlid) {
+        if (path->ah) {
                 ipoib_dbg(priv, "Send unicast ARP to %04x\n",
                           be16_to_cpu(path->pathrec.dlid));
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 98039da0caf0..ccaa0c387076 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -97,6 +97,7 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_neigh *neigh, *tmp;
         unsigned long flags;
+        int tx_dropped = 0;
 
         ipoib_dbg_mcast(netdev_priv(dev),
                         "deleting multicast group " IPOIB_GID_FMT "\n",
@@ -123,8 +124,14 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
         if (mcast->ah)
                 ipoib_put_ah(mcast->ah);
 
-        while (!skb_queue_empty(&mcast->pkt_queue))
+        while (!skb_queue_empty(&mcast->pkt_queue)) {
+                ++tx_dropped;
                 dev_kfree_skb_any(skb_dequeue(&mcast->pkt_queue));
+        }
+
+        spin_lock_irqsave(&priv->tx_lock, flags);
+        priv->stats.tx_dropped += tx_dropped;
+        spin_unlock_irqrestore(&priv->tx_lock, flags);
 
         kfree(mcast);
 }
@@ -276,8 +283,10 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
         }
 
         /* actually send any queued packets */
+        spin_lock_irq(&priv->tx_lock);
         while (!skb_queue_empty(&mcast->pkt_queue)) {
                 struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
+                spin_unlock_irq(&priv->tx_lock);
 
                 skb->dev = dev;
 
@@ -288,7 +297,9 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
 
                 if (dev_queue_xmit(skb))
                         ipoib_warn(priv, "dev_queue_xmit failed to requeue packet\n");
+                spin_lock_irq(&priv->tx_lock);
         }
+        spin_unlock_irq(&priv->tx_lock);
 
         return 0;
 }
@@ -300,6 +311,7 @@ ipoib_mcast_sendonly_join_complete(int status,
 {
         struct ipoib_mcast *mcast = mcast_ptr;
         struct net_device *dev = mcast->dev;
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
 
         if (!status)
                 ipoib_mcast_join_finish(mcast, mcmember);
@@ -310,8 +322,12 @@ ipoib_mcast_sendonly_join_complete(int status,
                                         IPOIB_GID_ARG(mcast->mcmember.mgid), status);
 
                 /* Flush out any queued packets */
-                while (!skb_queue_empty(&mcast->pkt_queue))
+                spin_lock_irq(&priv->tx_lock);
+                while (!skb_queue_empty(&mcast->pkt_queue)) {
+                        ++priv->stats.tx_dropped;
                         dev_kfree_skb_any(skb_dequeue(&mcast->pkt_queue));
+                }
+                spin_unlock_irq(&priv->tx_lock);
 
                 /* Clear the busy flag so we try again */
                 clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags);
@@ -687,6 +703,7 @@ void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid,
                 if (!mcast) {
                         ipoib_warn(priv, "unable to allocate memory for "
                                    "multicast structure\n");
+                        ++priv->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
                         goto out;
                 }
@@ -700,8 +717,10 @@ void ipoib_mcast_send(struct net_device *dev, union ib_gid *mgid,
         if (!mcast->ah) {
                 if (skb_queue_len(&mcast->pkt_queue) < IPOIB_MAX_MCAST_QUEUE)
                         skb_queue_tail(&mcast->pkt_queue, skb);
-                else
+                else {
+                        ++priv->stats.tx_dropped;
                         dev_kfree_skb_any(skb);
+                }
 
                 if (mcast->query)
                         ipoib_dbg_mcast(priv, "no address vector, "
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 31207e664148..2d2d4ac3525a 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -357,9 +357,9 @@ static void srp_remove_work(void *target_ptr)
         target->state = SRP_TARGET_REMOVED;
         spin_unlock_irq(target->scsi_host->host_lock);
 
-        down(&target->srp_host->target_mutex);
+        mutex_lock(&target->srp_host->target_mutex);
         list_del(&target->list);
-        up(&target->srp_host->target_mutex);
+        mutex_unlock(&target->srp_host->target_mutex);
 
         scsi_remove_host(target->scsi_host);
         ib_destroy_cm_id(target->cm_id);
@@ -1254,9 +1254,9 @@ static int srp_add_target(struct srp_host *host, struct srp_target_port *target)
         if (scsi_add_host(target->scsi_host, host->dev->dma_device))
                 return -ENODEV;
 
-        down(&host->target_mutex);
+        mutex_lock(&host->target_mutex);
         list_add_tail(&target->list, &host->target_list);
-        up(&host->target_mutex);
+        mutex_unlock(&host->target_mutex);
 
         target->state = SRP_TARGET_LIVE;
 
@@ -1525,7 +1525,7 @@ static struct srp_host *srp_add_port(struct ib_device *device, u8 port)
                 return NULL;
 
         INIT_LIST_HEAD(&host->target_list);
-        init_MUTEX(&host->target_mutex);
+        mutex_init(&host->target_mutex);
         init_completion(&host->released);
         host->dev  = device;
         host->port = port;
@@ -1626,7 +1626,7 @@ static void srp_remove_one(struct ib_device *device)
                  * Mark all target ports as removed, so we stop queueing
                  * commands and don't try to reconnect.
                  */
-                down(&host->target_mutex);
+                mutex_lock(&host->target_mutex);
                 list_for_each_entry_safe(target, tmp_target,
                                          &host->target_list, list) {
                         spin_lock_irqsave(target->scsi_host->host_lock, flags);
@@ -1634,7 +1634,7 @@ static void srp_remove_one(struct ib_device *device)
                                 target->state = SRP_TARGET_REMOVED;
                         spin_unlock_irqrestore(target->scsi_host->host_lock, flags);
                 }
-                up(&host->target_mutex);
+                mutex_unlock(&host->target_mutex);
 
                 /*
                  * Wait for any reconnection tasks that may have
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index b564f18caf78..4e7727df32f1 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -37,8 +37,7 @@
 
 #include <linux/types.h>
 #include <linux/list.h>
-
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
@@ -85,7 +84,7 @@ struct srp_host {
         struct ib_mr           *mr;
         struct class_device     class_dev;
         struct list_head        target_list;
-        struct semaphore        target_mutex;
+        struct mutex            target_mutex;
         struct completion       released;
         struct list_head        list;
 };
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index 4571ea3a4b92..4612d13ea756 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -57,7 +57,7 @@ static char *a3d_names[] = { NULL, "FP-Gaming Assassin 3D", "MadCatz Panther", "
 struct a3d {
         struct gameport *gameport;
         struct gameport *adc;
-        struct input_dev dev;
+        struct input_dev *dev;
         int axes[4];
         int buttons;
         int mode;
@@ -115,7 +115,7 @@ static int a3d_csum(char *data, int count)
 
 static void a3d_read(struct a3d *a3d, unsigned char *data)
 {
-        struct input_dev *dev = &a3d->dev;
+        struct input_dev *dev = a3d->dev;
 
         switch (a3d->mode) {
 
@@ -265,14 +265,20 @@ static void a3d_close(struct input_dev *dev)
 static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
 {
         struct a3d *a3d;
+        struct input_dev *input_dev;
         struct gameport *adc;
         unsigned char data[A3D_MAX_LENGTH];
         int i;
         int err;
 
-        if (!(a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL)))
-                return -ENOMEM;
+        a3d = kzalloc(sizeof(struct a3d), GFP_KERNEL);
+        input_dev = input_allocate_device();
+        if (!a3d || !input_dev) {
+                err = -ENOMEM;
+                goto fail1;
+        }
 
+        a3d->dev = input_dev;
         a3d->gameport = gameport;
 
         gameport_set_drvdata(gameport, a3d);
@@ -302,42 +308,48 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
 
         sprintf(a3d->phys, "%s/input0", gameport->phys);
 
+        input_dev->name = a3d_names[a3d->mode];
+        input_dev->phys = a3d->phys;
+        input_dev->id.bustype = BUS_GAMEPORT;
+        input_dev->id.vendor = GAMEPORT_ID_VENDOR_MADCATZ;
+        input_dev->id.product = a3d->mode;
+        input_dev->id.version = 0x0100;
+        input_dev->cdev.dev = &gameport->dev;
+        input_dev->private = a3d;
+        input_dev->open = a3d_open;
+        input_dev->close = a3d_close;
+
         if (a3d->mode == A3D_MODE_PXL) {
 
                 int axes[] = { ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER };
 
                 a3d->length = 33;
 
-                init_input_dev(&a3d->dev);
-
-                a3d->dev.evbit[0] |= BIT(EV_ABS) | BIT(EV_KEY) | BIT(EV_REL);
-                a3d->dev.relbit[0] |= BIT(REL_X) | BIT(REL_Y);
-                a3d->dev.absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_THROTTLE) | BIT(ABS_RUDDER)
-                                   | BIT(ABS_HAT0X) | BIT(ABS_HAT0Y) | BIT(ABS_HAT1X) | BIT(ABS_HAT1Y);
-
-                a3d->dev.keybit[LONG(BTN_MOUSE)] |= BIT(BTN_RIGHT) | BIT(BTN_LEFT) | BIT(BTN_MIDDLE)
-                                                 | BIT(BTN_SIDE) | BIT(BTN_EXTRA);
-
-                a3d->dev.keybit[LONG(BTN_JOYSTICK)] |= BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_PINKIE);
+                input_dev->evbit[0] |= BIT(EV_ABS) | BIT(EV_KEY) | BIT(EV_REL);
+                input_dev->relbit[0] |= BIT(REL_X) | BIT(REL_Y);
+                input_dev->absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_THROTTLE) | BIT(ABS_RUDDER)
+                                        | BIT(ABS_HAT0X) | BIT(ABS_HAT0Y) | BIT(ABS_HAT1X) | BIT(ABS_HAT1Y);
+                input_dev->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_RIGHT) | BIT(BTN_LEFT) | BIT(BTN_MIDDLE)
+                                                        | BIT(BTN_SIDE) | BIT(BTN_EXTRA);
+                input_dev->keybit[LONG(BTN_JOYSTICK)] |= BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP)
+                                                        | BIT(BTN_PINKIE);
 
                 a3d_read(a3d, data);
 
                 for (i = 0; i < 4; i++) {
                         if (i < 2)
-                                input_set_abs_params(&a3d->dev, axes[i], 48, a3d->dev.abs[axes[i]] * 2 - 48, 0, 8);
+                                input_set_abs_params(input_dev, axes[i], 48, input_dev->abs[axes[i]] * 2 - 48, 0, 8);
                         else
-                                input_set_abs_params(&a3d->dev, axes[i], 2, 253, 0, 0);
-                        input_set_abs_params(&a3d->dev, ABS_HAT0X + i, -1, 1, 0, 0);
+                                input_set_abs_params(input_dev, axes[i], 2, 253, 0, 0);
+                        input_set_abs_params(input_dev, ABS_HAT0X + i, -1, 1, 0, 0);
                 }
 
         } else {
                 a3d->length = 29;
 
-                init_input_dev(&a3d->dev);
-
-                a3d->dev.evbit[0] |= BIT(EV_KEY) | BIT(EV_REL);
-                a3d->dev.relbit[0] |= BIT(REL_X) | BIT(REL_Y);
-                a3d->dev.keybit[LONG(BTN_MOUSE)] |= BIT(BTN_RIGHT) | BIT(BTN_LEFT) | BIT(BTN_MIDDLE);
+                input_dev->evbit[0] |= BIT(EV_KEY) | BIT(EV_REL);
+                input_dev->relbit[0] |= BIT(REL_X) | BIT(REL_Y);
+                input_dev->keybit[LONG(BTN_MOUSE)] |= BIT(BTN_RIGHT) | BIT(BTN_LEFT) | BIT(BTN_MIDDLE);
 
                 a3d_read(a3d, data);
 
@@ -358,24 +370,17 @@ static int a3d_connect(struct gameport *gameport, struct gameport_driver *drv)
                 }
         }
 
-        a3d->dev.private = a3d;
-        a3d->dev.open = a3d_open;
-        a3d->dev.close = a3d_close;
-
-        a3d->dev.name = a3d_names[a3d->mode];
-        a3d->dev.phys = a3d->phys;
-        a3d->dev.id.bustype = BUS_GAMEPORT;
-        a3d->dev.id.vendor = GAMEPORT_ID_VENDOR_MADCATZ;
-        a3d->dev.id.product = a3d->mode;
-        a3d->dev.id.version = 0x0100;
-
-        input_register_device(&a3d->dev);
-        printk(KERN_INFO "input: %s on %s\n", a3d_names[a3d->mode], a3d->phys);
+        err = input_register_device(a3d->dev);
+        if (err)
+                goto fail3;
 
         return 0;
 
-fail2:  gameport_close(gameport);
-fail1:  gameport_set_drvdata(gameport, NULL);
+ fail3: if (a3d->adc)
+                gameport_unregister_port(a3d->adc);
+ fail2: gameport_close(gameport);
+ fail1: gameport_set_drvdata(gameport, NULL);
+        input_free_device(input_dev);
         kfree(a3d);
         return err;
 }
@@ -384,11 +389,9 @@ static void a3d_disconnect(struct gameport *gameport)
 {
         struct a3d *a3d = gameport_get_drvdata(gameport);
 
-        input_unregister_device(&a3d->dev);
-        if (a3d->adc) {
+        input_unregister_device(a3d->dev);
+        if (a3d->adc)
                 gameport_unregister_port(a3d->adc);
-                a3d->adc = NULL;
-        }
         gameport_close(gameport);
         gameport_set_drvdata(gameport, NULL);
         kfree(a3d);
@@ -397,6 +400,7 @@ static void a3d_disconnect(struct gameport *gameport)
 static struct gameport_driver a3d_drv = {
         .driver         = {
                 .name   = "adc",
+                .owner  = THIS_MODULE,
         },
         .description    = DRIVER_DESC,
         .connect        = a3d_connect,
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 499344c72756..dcffc34f30c3 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -275,68 +275,70 @@ static unsigned char db9_saturn_read_packet(struct parport *port, unsigned char
 /*
  * db9_saturn_report() analyzes packet and reports.
  */
-static int db9_saturn_report(unsigned char id, unsigned char data[60], struct input_dev *dev, int n, int max_pads)
+static int db9_saturn_report(unsigned char id, unsigned char data[60], struct input_dev *devs[], int n, int max_pads)
 {
+        struct input_dev *dev;
         int tmp, i, j;
 
         tmp = (id == 0x41) ? 60 : 10;
-        for (j = 0; (j < tmp) && (n < max_pads); j += 10, n++) {
+        for (j = 0; j < tmp && n < max_pads; j += 10, n++) {
+                dev = devs[n];
                 switch (data[j]) {
                 case 0x16: /* multi controller (analog 4 axis) */
-                        input_report_abs(dev + n, db9_abs[5], data[j + 6]);
+                        input_report_abs(dev, db9_abs[5], data[j + 6]);
                 case 0x15: /* mission stick (analog 3 axis) */
-                        input_report_abs(dev + n, db9_abs[3], data[j + 4]);
-                        input_report_abs(dev + n, db9_abs[4], data[j + 5]);
+                        input_report_abs(dev, db9_abs[3], data[j + 4]);
+                        input_report_abs(dev, db9_abs[4], data[j + 5]);
                 case 0x13: /* racing controller (analog 1 axis) */
-                        input_report_abs(dev + n, db9_abs[2], data[j + 3]);
+                        input_report_abs(dev, db9_abs[2], data[j + 3]);
                 case 0x34: /* saturn keyboard (udlr ZXC ASD QE Esc) */
                 case 0x02: /* digital pad (digital 2 axis + buttons) */
-                        input_report_abs(dev + n, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
-                        input_report_abs(dev + n, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
+                        input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
+                        input_report_abs(dev, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
                         for (i = 0; i < 9; i++)
-                                input_report_key(dev + n, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
+                                input_report_key(dev, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
                         break;
                 case 0x19: /* mission stick x2 (analog 6 axis + buttons) */
-                        input_report_abs(dev + n, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
-                        input_report_abs(dev + n, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
+                        input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
+                        input_report_abs(dev, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
                         for (i = 0; i < 9; i++)
-                                input_report_key(dev + n, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
-                        input_report_abs(dev + n, db9_abs[2], data[j + 3]);
-                        input_report_abs(dev + n, db9_abs[3], data[j + 4]);
-                        input_report_abs(dev + n, db9_abs[4], data[j + 5]);
+                                input_report_key(dev, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
+                        input_report_abs(dev, db9_abs[2], data[j + 3]);
+                        input_report_abs(dev, db9_abs[3], data[j + 4]);
+                        input_report_abs(dev, db9_abs[4], data[j + 5]);
                         /*
-                        input_report_abs(dev + n, db9_abs[8], (data[j + 6] & 128 ? 0 : 1) - (data[j + 6] & 64 ? 0 : 1));
-                        input_report_abs(dev + n, db9_abs[9], (data[j + 6] & 32 ? 0 : 1) - (data[j + 6] & 16 ? 0 : 1));
+                        input_report_abs(dev, db9_abs[8], (data[j + 6] & 128 ? 0 : 1) - (data[j + 6] & 64 ? 0 : 1));
+                        input_report_abs(dev, db9_abs[9], (data[j + 6] & 32 ? 0 : 1) - (data[j + 6] & 16 ? 0 : 1));
                         */
-                        input_report_abs(dev + n, db9_abs[6], data[j + 7]);
-                        input_report_abs(dev + n, db9_abs[7], data[j + 8]);
-                        input_report_abs(dev + n, db9_abs[5], data[j + 9]);
+                        input_report_abs(dev, db9_abs[6], data[j + 7]);
+                        input_report_abs(dev, db9_abs[7], data[j + 8]);
+                        input_report_abs(dev, db9_abs[5], data[j + 9]);
                         break;
                 case 0xd3: /* sankyo ff (analog 1 axis + stop btn) */
-                        input_report_key(dev + n, BTN_A, data[j + 3] & 0x80);
-                        input_report_abs(dev + n, db9_abs[2], data[j + 3] & 0x7f);
+                        input_report_key(dev, BTN_A, data[j + 3] & 0x80);
+                        input_report_abs(dev, db9_abs[2], data[j + 3] & 0x7f);
                         break;
                 case 0xe3: /* shuttle mouse (analog 2 axis + buttons. signed value) */
-                        input_report_key(dev + n, BTN_START, data[j + 1] & 0x08);
-                        input_report_key(dev + n, BTN_A, data[j + 1] & 0x04);
-                        input_report_key(dev + n, BTN_C, data[j + 1] & 0x02);
-                        input_report_key(dev + n, BTN_B, data[j + 1] & 0x01);
-                        input_report_abs(dev + n, db9_abs[2], data[j + 2] ^ 0x80);
-                        input_report_abs(dev + n, db9_abs[3], (0xff-(data[j + 3] ^ 0x80))+1); /* */
+                        input_report_key(dev, BTN_START, data[j + 1] & 0x08);
+                        input_report_key(dev, BTN_A, data[j + 1] & 0x04);
+                        input_report_key(dev, BTN_C, data[j + 1] & 0x02);
+                        input_report_key(dev, BTN_B, data[j + 1] & 0x01);
+                        input_report_abs(dev, db9_abs[2], data[j + 2] ^ 0x80);
+                        input_report_abs(dev, db9_abs[3], (0xff-(data[j + 3] ^ 0x80))+1); /* */
                         break;
                 case 0xff:
                 default: /* no pad */
-                        input_report_abs(dev + n, db9_abs[0], 0);
-                        input_report_abs(dev + n, db9_abs[1], 0);
+                        input_report_abs(dev, db9_abs[0], 0);
+                        input_report_abs(dev, db9_abs[1], 0);
                         for (i = 0; i < 9; i++)
-                                input_report_key(dev + n, db9_cd32_btn[i], 0);
+                                input_report_key(dev, db9_cd32_btn[i], 0);
                         break;
                 }
         }
         return n;
 }
 
-static int db9_saturn(int mode, struct parport *port, struct input_dev *dev)
+static int db9_saturn(int mode, struct parport *port, struct input_dev *devs[])
 {
         unsigned char id, data[60];
         int type, n, max_pads;
@@ -361,7 +363,7 @@ static int db9_saturn(int mode, struct parport *port, struct input_dev *dev)
         max_pads = min(db9_modes[mode].n_pads, DB9_MAX_DEVICES);
         for (tmp = 0, i = 0; i < n; i++) {
                 id = db9_saturn_read_packet(port, data, type + i, 1);
-                tmp = db9_saturn_report(id, data, dev, tmp, max_pads);
+                tmp = db9_saturn_report(id, data, devs, tmp, max_pads);
         }
         return 0;
 }
@@ -489,7 +491,7 @@ static void db9_timer(unsigned long private)
                 case DB9_SATURN_DPP:
                 case DB9_SATURN_DPP_2:
 
-                        db9_saturn(db9->mode, port, dev);
+                        db9_saturn(db9->mode, port, db9->dev);
                         break;
 
                 case DB9_CD32_PAD:
@@ -614,7 +616,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
                 if (!input_dev) {
                         printk(KERN_ERR "db9.c: Not enough memory for input device\n");
                         err = -ENOMEM;
-                        goto err_free_devs;
+                        goto err_unreg_devs;
                 }
 
                 sprintf(db9->phys[i], "%s/input%d", db9->pd->port->name, i);
@@ -640,13 +642,17 @@ static struct db9 __init *db9_probe(int parport, int mode)
                                 input_set_abs_params(input_dev, db9_abs[j], 1, 255, 0, 0);
                 }
 
-                input_register_device(input_dev);
+                err = input_register_device(input_dev);
+                if (err)
+                        goto err_free_dev;
         }
 
         parport_put_port(pp);
         return db9;
 
- err_free_devs:
+ err_free_dev:
+        input_free_device(db9->dev[i]);
+ err_unreg_devs:
         while (--i >= 0)
                 input_unregister_device(db9->dev[i]);
         kfree(db9);
@@ -658,7 +664,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
         return ERR_PTR(err);
 }
 
-static void __exit db9_remove(struct db9 *db9)
+static void db9_remove(struct db9 *db9)
 {
         int i;
 
@@ -696,7 +702,8 @@ static int __init db9_init(void)
 
         if (err) {
                 while (--i >= 0)
-                        db9_remove(db9_base[i]);
+                        if (db9_base[i])
+                                db9_remove(db9_base[i]);
                 return err;
         }
 
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 7df2d82f2c83..900587acdb47 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -159,6 +159,48 @@ static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
 
 }
 
+static void gc_n64_process_packet(struct gc *gc)
+{
+        unsigned char data[GC_N64_LENGTH];
+        signed char axes[2];
+        struct input_dev *dev;
+        int i, j, s;
+
+        gc_n64_read_packet(gc, data);
+
+        for (i = 0; i < GC_MAX_DEVICES; i++) {
+
+                dev = gc->dev[i];
+                if (!dev)
+                        continue;
+
+                s = gc_status_bit[i];
+
+                if (s & gc->pads[GC_N64] & ~(data[8] | data[9])) {
+
+                        axes[0] = axes[1] = 0;
+
+                        for (j = 0; j < 8; j++) {
+                                if (data[23 - j] & s)
+                                        axes[0] |= 1 << j;
+                                if (data[31 - j] & s)
+                                        axes[1] |= 1 << j;
+                        }
+
+                        input_report_abs(dev, ABS_X,  axes[0]);
+                        input_report_abs(dev, ABS_Y, -axes[1]);
+
+                        input_report_abs(dev, ABS_HAT0X, !(s & data[6]) - !(s & data[7]));
+                        input_report_abs(dev, ABS_HAT0Y, !(s & data[4]) - !(s & data[5]));
+
+                        for (j = 0; j < 10; j++)
+                                input_report_key(dev, gc_n64_btn[j], s & data[gc_n64_bytes[j]]);
+
+                        input_sync(dev);
+                }
+        }
+}
+
 /*
  * NES/SNES support.
  */
@@ -198,6 +240,39 @@ static void gc_nes_read_packet(struct gc *gc, int length, unsigned char *data)
         }
 }
 
+static void gc_nes_process_packet(struct gc *gc)
+{
+        unsigned char data[GC_SNES_LENGTH];
+        struct input_dev *dev;
+        int i, j, s;
+
+        gc_nes_read_packet(gc, gc->pads[GC_SNES] ? GC_SNES_LENGTH : GC_NES_LENGTH, data);
+
+        for (i = 0; i < GC_MAX_DEVICES; i++) {
+
+                dev = gc->dev[i];
+                if (!dev)
+                        continue;
+
+                s = gc_status_bit[i];
+
+                if (s & (gc->pads[GC_NES] | gc->pads[GC_SNES])) {
+                        input_report_abs(dev, ABS_X, !(s & data[6]) - !(s & data[7]));
+                        input_report_abs(dev, ABS_Y, !(s & data[4]) - !(s & data[5]));
+                }
+
+                if (s & gc->pads[GC_NES])
+                        for (j = 0; j < 4; j++)
+                                input_report_key(dev, gc_snes_btn[j], s & data[gc_nes_bytes[j]]);
+
+                if (s & gc->pads[GC_SNES])
+                        for (j = 0; j < 8; j++)
+                                input_report_key(dev, gc_snes_btn[j], s & data[gc_snes_bytes[j]]);
+
+                input_sync(dev);
+        }
+}
+
 /*
  * Multisystem joystick support
  */
@@ -219,6 +294,35 @@ static void gc_multi_read_packet(struct gc *gc, int length, unsigned char *data)
         }
 }
 
+static void gc_multi_process_packet(struct gc *gc)
+{
+        unsigned char data[GC_MULTI2_LENGTH];
+        struct input_dev *dev;
+        int i, s;
+
+        gc_multi_read_packet(gc, gc->pads[GC_MULTI2] ? GC_MULTI2_LENGTH : GC_MULTI_LENGTH, data);
+
+        for (i = 0; i < GC_MAX_DEVICES; i++) {
+
+                dev = gc->dev[i];
+                if (!dev)
+                        continue;
+
+                s = gc_status_bit[i];
+
+                if (s & (gc->pads[GC_MULTI] | gc->pads[GC_MULTI2])) {
+                        input_report_abs(dev, ABS_X,  !(s & data[2]) - !(s & data[3]));
+                        input_report_abs(dev, ABS_Y,  !(s & data[0]) - !(s & data[1]));
+                        input_report_key(dev, BTN_TRIGGER, s & data[4]);
+                }
+
+                if (s & gc->pads[GC_MULTI2])
+                        input_report_key(dev, BTN_THUMB, s & data[5]);
+
+                input_sync(dev);
+        }
+}
+
 /*
  * PSX support
  *
@@ -263,10 +367,11 @@ static short gc_psx_ddr_btn[] = { BTN_0, BTN_1, BTN_2, BTN_3 };
  * the psx pad.
  */
 
-static void gc_psx_command(struct gc *gc, int b, unsigned char data[5])
+static void gc_psx_command(struct gc *gc, int b, unsigned char data[GC_MAX_DEVICES])
 {
         int i, j, cmd, read;
-        for (i = 0; i < 5; i++)
+
+        for (i = 0; i < GC_MAX_DEVICES; i++)
                 data[i] = 0;
 
         for (i = 0; i < GC_PSX_LENGTH; i++, b >>= 1) {
@@ -274,7 +379,7 @@ static void gc_psx_command(struct gc *gc, int b, unsigned char data[5])
                 parport_write_data(gc->pd->port, cmd | GC_PSX_POWER);
                 udelay(gc_psx_delay);
                 read = parport_read_status(gc->pd->port) ^ 0x80;
-                for (j = 0; j < 5; j++)
+                for (j = 0; j < GC_MAX_DEVICES; j++)
                         data[j] |= (read & gc_status_bit[j] & (gc->pads[GC_PSX] | gc->pads[GC_DDR])) ? (1 << i) : 0;
                 parport_write_data(gc->pd->port, cmd | GC_PSX_CLOCK | GC_PSX_POWER);
                 udelay(gc_psx_delay);
@@ -286,11 +391,12 @@ static void gc_psx_command(struct gc *gc, int b, unsigned char data[5])
  * device identifier code.
  */
 
-static void gc_psx_read_packet(struct gc *gc, unsigned char data[5][GC_PSX_BYTES], unsigned char id[5])
+static void gc_psx_read_packet(struct gc *gc, unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES],
+                               unsigned char id[GC_MAX_DEVICES])
 {
         int i, j, max_len = 0;
         unsigned long flags;
-        unsigned char data2[5];
+        unsigned char data2[GC_MAX_DEVICES];
 
         parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER);  /* Select pad */
         udelay(gc_psx_delay);
@@ -303,7 +409,7 @@ static void gc_psx_read_packet(struct gc *gc, unsigned char data[5][GC_PSX_BYTES
         gc_psx_command(gc, 0x42, id);                                                   /* Get device ids */
         gc_psx_command(gc, 0, data2);                                                   /* Dump status */
 
-        for (i =0; i < 5; i++)                                                          /* Find the longest pad */
+        for (i =0; i < GC_MAX_DEVICES; i++)                                                             /* Find the longest pad */
                 if((gc_status_bit[i] & (gc->pads[GC_PSX] | gc->pads[GC_DDR]))
                         && (GC_PSX_LEN(id[i]) > max_len)
                         && (GC_PSX_LEN(id[i]) <= GC_PSX_BYTES))
@@ -311,7 +417,7 @@ static void gc_psx_read_packet(struct gc *gc, unsigned char data[5][GC_PSX_BYTES
 
         for (i = 0; i < max_len; i++) {                                         /* Read in all the data */
                 gc_psx_command(gc, 0, data2);
-                for (j = 0; j < 5; j++)
+                for (j = 0; j < GC_MAX_DEVICES; j++)
                         data[j][i] = data2[j];
         }
 
@@ -319,185 +425,124 @@ static void gc_psx_read_packet(struct gc *gc, unsigned char data[5][GC_PSX_BYTES
 
         parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER);
 
-        for(i = 0; i < 5; i++)                                                          /* Set id's to the real value */
+        for(i = 0; i < GC_MAX_DEVICES; i++)                                                             /* Set id's to the real value */
                 id[i] = GC_PSX_ID(id[i]);
 }
 
-/*
- * gc_timer() reads and analyzes console pads data.
- */
+static void gc_psx_process_packet(struct gc *gc)
+{
+        unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES];
+        unsigned char id[GC_MAX_DEVICES];
+        struct input_dev *dev;
+        int i, j;
 
-#define GC_MAX_LENGTH GC_N64_LENGTH
+        gc_psx_read_packet(gc, data, id);
 
-static void gc_timer(unsigned long private)
-{
-        struct gc *gc = (void *) private;
-        unsigned char data[GC_MAX_LENGTH];
-        unsigned char data_psx[5][GC_PSX_BYTES];
-        int i, j, s;
+        for (i = 0; i < GC_MAX_DEVICES; i++) {
 
-/*
- * N64 pads - must be read first, any read confuses them for 200 us
- */
+                dev = gc->dev[i];
+                if (!dev)
+                        continue;
 
-        if (gc->pads[GC_N64]) {
+                switch (id[i]) {
 
-                gc_n64_read_packet(gc, data);
+                        case GC_PSX_RUMBLE:
 
-                for (i = 0; i < 5; i++) {
+                                input_report_key(dev, BTN_THUMBL, ~data[i][0] & 0x04);
+                                input_report_key(dev, BTN_THUMBR, ~data[i][0] & 0x02);
 
-                        s = gc_status_bit[i];
+                        case GC_PSX_NEGCON:
+                        case GC_PSX_ANALOG:
 
-                        if (s & gc->pads[GC_N64] & ~(data[8] | data[9])) {
+                                if (gc->pads[GC_DDR] & gc_status_bit[i]) {
+                                        for(j = 0; j < 4; j++)
+                                                input_report_key(dev, gc_psx_ddr_btn[j], ~data[i][0] & (0x10 << j));
+                                } else {
+                                        for (j = 0; j < 4; j++)
+                                                input_report_abs(dev, gc_psx_abs[j + 2], data[i][j + 2]);
 
-                                signed char axes[2];
-                                axes[0] = axes[1] = 0;
+                                        input_report_abs(dev, ABS_X, 128 + !(data[i][0] & 0x20) * 127 - !(data[i][0] & 0x80) * 128);
+                                        input_report_abs(dev, ABS_Y, 128 + !(data[i][0] & 0x40) * 127 - !(data[i][0] & 0x10) * 128);
+                                }
 
-                                for (j = 0; j < 8; j++) {
-                                        if (data[23 - j] & s) axes[0] |= 1 << j;
-                                        if (data[31 - j] & s) axes[1] |= 1 << j;
+                                for (j = 0; j < 8; j++)
+                                        input_report_key(dev, gc_psx_btn[j], ~data[i][1] & (1 << j));
+
+                                input_report_key(dev, BTN_START,  ~data[i][0] & 0x08);
+                                input_report_key(dev, BTN_SELECT, ~data[i][0] & 0x01);
+
+                                input_sync(dev);
+
+                                break;
+
+                        case GC_PSX_NORMAL:
+                                if (gc->pads[GC_DDR] & gc_status_bit[i]) {
+                                        for(j = 0; j < 4; j++)
+                                                input_report_key(dev, gc_psx_ddr_btn[j], ~data[i][0] & (0x10 << j));
+                                } else {
+                                        input_report_abs(dev, ABS_X, 128 + !(data[i][0] & 0x20) * 127 - !(data[i][0] & 0x80) * 128);
+                                        input_report_abs(dev, ABS_Y, 128 + !(data[i][0] & 0x40) * 127 - !(data[i][0] & 0x10) * 128);
+
+                                        /* for some reason if the extra axes are left unset they drift */
+                                        /* for (j = 0; j < 4; j++)
+                                                input_report_abs(dev, gc_psx_abs[j + 2], 128);
+                                         * This needs to be debugged properly,
+                                         * maybe fuzz processing needs to be done in input_sync()
+                                         *                               --vojtech
+                                         */
                                 }
 
-                                input_report_abs(gc->dev[i], ABS_X,  axes[0]);
-                                input_report_abs(gc->dev[i], ABS_Y, -axes[1]);
+                                for (j = 0; j < 8; j++)
+                                        input_report_key(dev, gc_psx_btn[j], ~data[i][1] & (1 << j));
+
+                                input_report_key(dev, BTN_START,  ~data[i][0] & 0x08);
+                                input_report_key(dev, BTN_SELECT, ~data[i][0] & 0x01);
 
-                                input_report_abs(gc->dev[i], ABS_HAT0X, !(s & data[6]) - !(s & data[7]));
-                                input_report_abs(gc->dev[i], ABS_HAT0Y, !(s & data[4]) - !(s & data[5]));
+                                input_sync(dev);
 
-                                for (j = 0; j < 10; j++)
-                                        input_report_key(gc->dev[i], gc_n64_btn[j], s & data[gc_n64_bytes[j]]);
+                                break;
 
-                                input_sync(gc->dev[i]);
-                        }
+                        case 0: /* not a pad, ignore */
+                                break;
                 }
         }
+}
 
 /*
- * NES and SNES pads
+ * gc_timer() initiates reads of console pads data.
  */
 
-        if (gc->pads[GC_NES] || gc->pads[GC_SNES]) {
-
-                gc_nes_read_packet(gc, gc->pads[GC_SNES] ? GC_SNES_LENGTH : GC_NES_LENGTH, data);
-
-                for (i = 0; i < 5; i++) {
-
-                        s = gc_status_bit[i];
+static void gc_timer(unsigned long private)
+{
+        struct gc *gc = (void *) private;
 
-                        if (s & (gc->pads[GC_NES] | gc->pads[GC_SNES])) {
-                                input_report_abs(gc->dev[i], ABS_X, !(s & data[6]) - !(s & data[7]));
-                                input_report_abs(gc->dev[i], ABS_Y, !(s & data[4]) - !(s & data[5]));
-                        }
+/*
+ * N64 pads - must be read first, any read confuses them for 200 us
+ */
 
-                        if (s & gc->pads[GC_NES])
-                                for (j = 0; j < 4; j++)
-                                        input_report_key(gc->dev[i], gc_snes_btn[j], s & data[gc_nes_bytes[j]]);
+        if (gc->pads[GC_N64])
+                gc_n64_process_packet(gc);
 
-                        if (s & gc->pads[GC_SNES])
-                                for (j = 0; j < 8; j++)
-                                        input_report_key(gc->dev[i], gc_snes_btn[j], s & data[gc_snes_bytes[j]]);
+/*
+ * NES and SNES pads
+ */
 
-                        input_sync(gc->dev[i]);
-                }
-        }
+        if (gc->pads[GC_NES] || gc->pads[GC_SNES])
+                gc_nes_process_packet(gc);
 
 /*
  * Multi and Multi2 joysticks
  */
 
-        if (gc->pads[GC_MULTI] || gc->pads[GC_MULTI2]) {
-
-                gc_multi_read_packet(gc, gc->pads[GC_MULTI2] ? GC_MULTI2_LENGTH : GC_MULTI_LENGTH, data);
-
-                for (i = 0; i < 5; i++) {
-
-                        s = gc_status_bit[i];
-
-                        if (s & (gc->pads[GC_MULTI] | gc->pads[GC_MULTI2])) {
-                                input_report_abs(gc->dev[i], ABS_X,  !(s & data[2]) - !(s & data[3]));
-                                input_report_abs(gc->dev[i], ABS_Y,  !(s & data[0]) - !(s & data[1]));
-                                input_report_key(gc->dev[i], BTN_TRIGGER, s & data[4]);
-                        }
-
-                        if (s & gc->pads[GC_MULTI2])
-                                input_report_key(gc->dev[i], BTN_THUMB, s & data[5]);
-
-                        input_sync(gc->dev[i]);
-                }
-        }
+        if (gc->pads[GC_MULTI] || gc->pads[GC_MULTI2])
+                gc_multi_process_packet(gc);
 
 /*
  * PSX controllers
  */
 
-        if (gc->pads[GC_PSX] || gc->pads[GC_DDR]) {
-
-                gc_psx_read_packet(gc, data_psx, data);
-
-                for (i = 0; i < 5; i++) {
-                        switch (data[i]) {
-
-                                case GC_PSX_RUMBLE:
-
-                                        input_report_key(gc->dev[i], BTN_THUMBL, ~data_psx[i][0] & 0x04);
-                                        input_report_key(gc->dev[i], BTN_THUMBR, ~data_psx[i][0] & 0x02);
-
-                                case GC_PSX_NEGCON:
-                                case GC_PSX_ANALOG:
-
-                                        if (gc->pads[GC_DDR] & gc_status_bit[i]) {
-                                                for(j = 0; j < 4; j++)
-                                                        input_report_key(gc->dev[i], gc_psx_ddr_btn[j], ~data_psx[i][0] & (0x10 << j));
-                                        } else {
-                                                for (j = 0; j < 4; j++)
-                                                        input_report_abs(gc->dev[i], gc_psx_abs[j+2], data_psx[i][j + 2]);
-
-                                                input_report_abs(gc->dev[i], ABS_X, 128 + !(data_psx[i][0] & 0x20) * 127 - !(data_psx[i][0] & 0x80) * 128);
-                                                input_report_abs(gc->dev[i], ABS_Y, 128 + !(data_psx[i][0] & 0x40) * 127 - !(data_psx[i][0] & 0x10) * 128);
-                                        }
-
-                                        for (j = 0; j < 8; j++)
-                                                input_report_key(gc->dev[i], gc_psx_btn[j], ~data_psx[i][1] & (1 << j));
-
-                                        input_report_key(gc->dev[i], BTN_START,  ~data_psx[i][0] & 0x08);
-                                        input_report_key(gc->dev[i], BTN_SELECT, ~data_psx[i][0] & 0x01);
-
-                                        input_sync(gc->dev[i]);
-
-                                        break;
-
-                                case GC_PSX_NORMAL:
-                                        if (gc->pads[GC_DDR] & gc_status_bit[i]) {
-                                                for(j = 0; j < 4; j++)
-                                                        input_report_key(gc->dev[i], gc_psx_ddr_btn[j], ~data_psx[i][0] & (0x10 << j));
-                                        } else {
-                                                input_report_abs(gc->dev[i], ABS_X, 128 + !(data_psx[i][0] & 0x20) * 127 - !(data_psx[i][0] & 0x80) * 128);
-                                                input_report_abs(gc->dev[i], ABS_Y, 128 + !(data_psx[i][0] & 0x40) * 127 - !(data_psx[i][0] & 0x10) * 128);
-
-                                                /* for some reason if the extra axes are left unset they drift */
-                                                /* for (j = 0; j < 4; j++)
-                                                        input_report_abs(gc->dev[i], gc_psx_abs[j+2], 128);
-                                                 * This needs to be debugged properly,
-                                                 * maybe fuzz processing needs to be done in input_sync()
-                                                 *                               --vojtech
-                                                 */
-                                        }
-
-                                        for (j = 0; j < 8; j++)
-                                                input_report_key(gc->dev[i], gc_psx_btn[j], ~data_psx[i][1] & (1 << j));
-
-                                        input_report_key(gc->dev[i], BTN_START,  ~data_psx[i][0] & 0x08);
-                                        input_report_key(gc->dev[i], BTN_SELECT, ~data_psx[i][0] & 0x01);
-
-                                        input_sync(gc->dev[i]);
-
-                                        break;
-
-                                case 0: /* not a pad, ignore */
-                                        break;
-                        }
-                }
-        }
+        if (gc->pads[GC_PSX] || gc->pads[GC_DDR])
+                gc_psx_process_packet(gc);
 
         mod_timer(&gc->timer, jiffies + GC_REFRESH_TIME);
 }
@@ -654,16 +699,18 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
         gc->timer.data = (long) gc;
         gc->timer.function = gc_timer;
 
-        for (i = 0; i < n_pads; i++) {
+        for (i = 0; i < n_pads && i < GC_MAX_DEVICES; i++) {
                 if (!pads[i])
                         continue;
 
                 sprintf(gc->phys[i], "%s/input%d", gc->pd->port->name, i);
                 err = gc_setup_pad(gc, i, pads[i]);
                 if (err)
-                        goto err_free_devs;
+                        goto err_unreg_devs;
 
-                input_register_device(gc->dev[i]);
+                err = input_register_device(gc->dev[i]);
+                if (err)
+                        goto err_free_dev;
         }
 
         if (!gc->pads[0]) {
@@ -675,9 +722,12 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
         parport_put_port(pp);
         return gc;
 
- err_free_devs:
+ err_free_dev:
+        input_free_device(gc->dev[i]);
+ err_unreg_devs:
         while (--i >= 0)
-                input_unregister_device(gc->dev[i]);
+                if (gc->dev[i])
+                        input_unregister_device(gc->dev[i]);
  err_free_gc:
         kfree(gc);
  err_unreg_pardev:
@@ -688,7 +738,7 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
         return ERR_PTR(err);
 }
 
-static void __exit gc_remove(struct gc *gc)
+static void gc_remove(struct gc *gc)
 {
         int i;
 
@@ -726,7 +776,8 @@ static int __init gc_init(void)
 
         if (err) {
                 while (--i >= 0)
-                        gc_remove(gc_base[i]);
+                        if (gc_base[i])
+                                gc_remove(gc_base[i]);
                 return err;
         }
 
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index a936e7aedb10..20cb98ac2d79 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -192,6 +192,9 @@ static void grip_poll(struct gameport *gameport)
         for (i = 0; i < 2; i++) {
 
                 dev = grip->dev[i];
+                if (!dev)
+                        continue;
+
                 grip->reads++;
 
                 switch (grip->mode[i]) {
@@ -381,12 +384,15 @@ static int grip_connect(struct gameport *gameport, struct gameport_driver *drv)
                         if (t > 0)
                                 set_bit(t, input_dev->keybit);
 
-                input_register_device(grip->dev[i]);
+                err = input_register_device(grip->dev[i]);
+                if (err)
+                        goto fail4;
         }
 
         return 0;
 
- fail3: for (i = 0; i < 2; i++)
+ fail4: input_free_device(grip->dev[i]);
+ fail3: while (--i >= 0)
                 if (grip->dev[i])
                         input_unregister_device(grip->dev[i]);
  fail2: gameport_close(gameport);
@@ -411,6 +417,7 @@ static void grip_disconnect(struct gameport *gameport)
 static struct gameport_driver grip_drv = {
         .driver         = {
                 .name   = "grip",
+                .owner  = THIS_MODULE,
         },
         .description    = DRIVER_DESC,
         .connect        = grip_connect,
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index 64b9c31c47fc..b6bc04998047 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -345,7 +345,7 @@ int iforce_init_device(struct iforce *iforce)
         int i;
 
         input_dev = input_allocate_device();
-        if (input_dev)
+        if (!input_dev)
                 return -ENOMEM;
 
         init_waitqueue_head(&iforce->wait);
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index 4a2629243e19..76cb1f88f4e8 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -167,9 +167,9 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data,
                 iforce->expect_packet = 0;
                 iforce->ecmd = cmd;
                 memcpy(iforce->edata, data, IFORCE_MAX_LENGTH);
-                wake_up(&iforce->wait);
         }
 #endif
+        wake_up(&iforce->wait);
 
         if (!iforce->type) {
                 being_used--;
@@ -264,7 +264,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
                 wait_event_interruptible_timeout(iforce->wait,
                         iforce->ctrl->status != -EINPROGRESS, HZ);
 
-                if (iforce->ctrl->status != -EINPROGRESS) {
+                if (iforce->ctrl->status) {
                         usb_unlink_urb(iforce->ctrl);
                         return -1;
                 }
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index bc2fce60f9f8..fe79d158456d 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -95,7 +95,6 @@ static void iforce_usb_irq(struct urb *urb, struct pt_regs *regs)
                 goto exit;
         }
 
-        wake_up(&iforce->wait);
         iforce_process_packet(iforce,
                 (iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1, regs);
 
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index 78dd163cd702..2b2ec1057dee 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -736,7 +736,7 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
                 sprintf(sw->name, "Microsoft SideWinder %s", sw_name[sw->type]);
                 sprintf(sw->phys[i], "%s/input%d", gameport->phys, i);
 
-                input_dev = input_allocate_device();
+                sw->dev[i] = input_dev = input_allocate_device();
                 if (!input_dev) {
                         err = -ENOMEM;
                         goto fail3;
@@ -771,12 +771,15 @@ static int sw_connect(struct gameport *gameport, struct gameport_driver *drv)
 
                 dbg("%s%s [%d-bit id %d data %d]\n", sw->name, comment, m, l, k);
 
-                input_register_device(sw->dev[i]);
+                err = input_register_device(sw->dev[i]);
+                if (err)
+                        goto fail4;
         }
 
         return 0;
 
- fail3: while (--i >= 0)
+ fail4: input_free_device(sw->dev[i]);
+ fail3: while (--i >= 0)
                 input_unregister_device(sw->dev[i]);
  fail2: gameport_close(gameport);
  fail1: gameport_set_drvdata(gameport, NULL);
@@ -801,6 +804,7 @@ static void sw_disconnect(struct gameport *gameport)
 static struct gameport_driver sw_drv = {
         .driver         = {
                 .name   = "sidewinder",
+                .owner  = THIS_MODULE,
         },
         .description    = DRIVER_DESC,
         .connect        = sw_connect,
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 60e2aac7d06e..bb23ed2a04a6 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -284,13 +284,13 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
         struct tmdc_port *port;
         struct input_dev *input_dev;
         int i, j, b = 0;
+        int err;
 
         tmdc->port[idx] = port = kzalloc(sizeof (struct tmdc_port), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!port || !input_dev) {
-                kfree(port);
-                input_free_device(input_dev);
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto fail;
         }
 
         port->mode = data[TMDC_BYTE_ID];
@@ -347,9 +347,15 @@ static int tmdc_setup_port(struct tmdc *tmdc, int idx, unsigned char *data)
                 b += port->btnc[i];
         }
 
-        input_register_device(port->dev);
+        err = input_register_device(port->dev);
+        if (err)
+                goto fail;
 
         return 0;
+
+ fail:  input_free_device(input_dev);
+        kfree(port);
+        return err;
 }
 
 /*
@@ -424,6 +430,7 @@ static void tmdc_disconnect(struct gameport *gameport)
 static struct gameport_driver tmdc_drv = {
         .driver         = {
                 .name   = "tmdc",
+                .owner  = THIS_MODULE,
         },
         .description    = DRIVER_DESC,
         .connect        = tmdc_connect,
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 7e9764937d06..b154938e88a4 100644
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -204,14 +204,14 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                 if (n_buttons[i] > 6) {
                         printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]);
                         err = -EINVAL;
-                        goto err_free_devs;
+                        goto err_unreg_devs;
                 }
 
                 tgfx->dev[i] = input_dev = input_allocate_device();
                 if (!input_dev) {
                         printk(KERN_ERR "turbografx.c: Not enough memory for input device\n");
                         err = -ENOMEM;
-                        goto err_free_devs;
+                        goto err_unreg_devs;
                 }
 
                 tgfx->sticks |= (1 << i);
@@ -238,7 +238,9 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                 for (j = 0; j < n_buttons[i]; j++)
                         set_bit(tgfx_buttons[j], input_dev->keybit);
 
-                input_register_device(tgfx->dev[i]);
+                err = input_register_device(tgfx->dev[i]);
+                if (err)
+                        goto err_free_dev;
         }
 
         if (!tgfx->sticks) {
@@ -249,9 +251,12 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
 
         return tgfx;
 
- err_free_devs:
+ err_free_dev:
+        input_free_device(tgfx->dev[i]);
+ err_unreg_devs:
         while (--i >= 0)
-                input_unregister_device(tgfx->dev[i]);
+                if (tgfx->dev[i])
+                        input_unregister_device(tgfx->dev[i]);
  err_free_tgfx:
         kfree(tgfx);
  err_unreg_pardev:
@@ -262,7 +267,7 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
         return ERR_PTR(err);
 }
 
-static void __exit tgfx_remove(struct tgfx *tgfx)
+static void tgfx_remove(struct tgfx *tgfx)
 {
         int i;
 
@@ -300,7 +305,8 @@ static int __init tgfx_init(void)
 
         if (err) {
                 while (--i >= 0)
-                        tgfx_remove(tgfx_base[i]);
+                        if (tgfx_base[i])
+                                tgfx_remove(tgfx_base[i]);
                 return err;
         }
 
diff --git a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
index cd3a1e742a30..7f8b0093c5bc 100644
--- a/drivers/input/joystick/twidjoy.c
+++ b/drivers/input/joystick/twidjoy.c
@@ -265,13 +265,13 @@ static struct serio_driver twidjoy_drv = {
  * The functions for inserting/removing us as a module.
  */
 
-int __init twidjoy_init(void)
+static int __init twidjoy_init(void)
 {
         serio_register_driver(&twidjoy_drv);
         return 0;
 }
 
-void __exit twidjoy_exit(void)
+static void __exit twidjoy_exit(void)
 {
         serio_unregister_driver(&twidjoy_drv);
 }
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index e08dbe08f46d..4bad588d0e5d 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -50,6 +50,18 @@ config INPUT_WISTRON_BTNS
           To compile this driver as a module, choose M here: the module will
           be called wistron_btns.
 
+config INPUT_IXP4XX_BEEPER
+        tristate "IXP4XX Beeper support"
+        depends on ARCH_IXP4XX
+        help
+          If you say yes here, you can connect a beeper to the
+          ixp4xx gpio pins. This is used by the LinkSys NSLU2.
+
+          If unsure, say Y.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ixp4xx-beeper.
+
 config INPUT_UINPUT
         tristate "User level driver support"
         help
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index ce44cce01285..184c4129470d 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_INPUT_98SPKR)		+= 98spkr.o
 obj-$(CONFIG_INPUT_UINPUT)              += uinput.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)        += wistron_btns.o
 obj-$(CONFIG_HP_SDC_RTC)                += hp_sdc_rtc.o
+obj-$(CONFIG_INPUT_IXP4XX_BEEPER)       += ixp4xx-beeper.o
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
new file mode 100644
index 000000000000..d448bb5e4869
--- /dev/null
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -0,0 +1,183 @@
+/*
+ * Generic IXP4xx beeper driver
+ *
+ * Copyright (C) 2005 Tower Technologies
+ *
+ * based on nslu2-io.c
+ *  Copyright (C) 2004 Karen Spearel
+ *
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ * Maintainers: http://www.nslu2-linux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
+MODULE_DESCRIPTION("ixp4xx beeper driver");
+MODULE_LICENSE("GPL");
+
+static DEFINE_SPINLOCK(beep_lock);
+
+static void ixp4xx_spkr_control(unsigned int pin, unsigned int count)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&beep_lock, flags);
+
+         if (count) {
+                gpio_line_config(pin, IXP4XX_GPIO_OUT);
+                gpio_line_set(pin, IXP4XX_GPIO_LOW);
+
+                *IXP4XX_OSRT2 = (count & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE;
+        } else {
+                gpio_line_config(pin, IXP4XX_GPIO_IN);
+                gpio_line_set(pin, IXP4XX_GPIO_HIGH);
+
+                *IXP4XX_OSRT2 = 0;
+        }
+
+        spin_unlock_irqrestore(&beep_lock, flags);
+}
+
+static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+{
+        unsigned int pin = (unsigned int) dev->private;
+        unsigned int count = 0;
+
+        if (type != EV_SND)
+                return -1;
+
+        switch (code) {
+                case SND_BELL:
+                        if (value)
+                                value = 1000;
+                case SND_TONE:
+                        break;
+                default:
+                        return -1;
+        }
+
+        if (value > 20 && value < 32767)
+#ifndef FREQ
+                count = (ixp4xx_get_board_tick_rate() / (value * 4)) - 1;
+#else
+                count = (FREQ / (value * 4)) - 1;
+#endif
+
+        ixp4xx_spkr_control(pin, count);
+
+        return 0;
+}
+
+static irqreturn_t ixp4xx_spkr_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        /* clear interrupt */
+        *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND;
+
+        /* flip the beeper output */
+        *IXP4XX_GPIO_GPOUTR ^= (1 << (unsigned int) dev_id);
+
+        return IRQ_HANDLED;
+}
+
+static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
+{
+        struct input_dev *input_dev;
+        int err;
+
+        input_dev = input_allocate_device();
+        if (!input_dev)
+                return -ENOMEM;
+
+        input_dev->private = (void *) dev->id;
+        input_dev->name = "ixp4xx beeper",
+        input_dev->phys = "ixp4xx/gpio";
+        input_dev->id.bustype = BUS_HOST;
+        input_dev->id.vendor  = 0x001f;
+        input_dev->id.product = 0x0001;
+        input_dev->id.version = 0x0100;
+        input_dev->cdev.dev = &dev->dev;
+
+        input_dev->evbit[0] = BIT(EV_SND);
+        input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
+        input_dev->event = ixp4xx_spkr_event;
+
+        err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
+                          SA_INTERRUPT | SA_TIMER, "ixp4xx-beeper", (void *) dev->id);
+        if (err)
+                goto err_free_device;
+
+        err = input_register_device(input_dev);
+        if (err)
+                goto err_free_irq;
+
+        platform_set_drvdata(dev, input_dev);
+
+        return 0;
+
+ err_free_irq:
+        free_irq(IRQ_IXP4XX_TIMER2, dev);
+ err_free_device:
+        input_free_device(input_dev);
+
+        return err;
+}
+
+static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)
+{
+        struct input_dev *input_dev = platform_get_drvdata(dev);
+        unsigned int pin = (unsigned int) input_dev->private;
+
+        input_unregister_device(input_dev);
+        platform_set_drvdata(dev, NULL);
+
+        /* turn the speaker off */
+        disable_irq(IRQ_IXP4XX_TIMER2);
+        ixp4xx_spkr_control(pin, 0);
+
+        free_irq(IRQ_IXP4XX_TIMER2, dev);
+
+        return 0;
+}
+
+static void ixp4xx_spkr_shutdown(struct platform_device *dev)
+{
+        struct input_dev *input_dev = platform_get_drvdata(dev);
+        unsigned int pin = (unsigned int) input_dev->private;
+
+        /* turn off the speaker */
+        disable_irq(IRQ_IXP4XX_TIMER2);
+        ixp4xx_spkr_control(pin, 0);
+}
+
+static struct platform_driver ixp4xx_spkr_platform_driver = {
+        .driver         = {
+                .name   = "ixp4xx-beeper",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = ixp4xx_spkr_probe,
+        .remove         = __devexit_p(ixp4xx_spkr_remove),
+        .shutdown       = ixp4xx_spkr_shutdown,
+};
+
+static int __init ixp4xx_spkr_init(void)
+{
+        return platform_driver_register(&ixp4xx_spkr_platform_driver);
+}
+
+static void __exit ixp4xx_spkr_exit(void)
+{
+        platform_driver_unregister(&ixp4xx_spkr_platform_driver);
+}
+
+module_init(ixp4xx_spkr_init);
+module_exit(ixp4xx_spkr_exit);
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 7665fd9ce559..19b1b0121726 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -403,6 +403,7 @@ static int genius_detect(struct psmouse *psmouse, int set_properties)
                 set_bit(REL_WHEEL, psmouse->dev->relbit);
 
                 psmouse->vendor = "Genius";
+                psmouse->name = "Mouse";
                 psmouse->pktsize = 4;
         }
 
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 81fd7a97a93d..9abed18d2ecf 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -356,7 +356,7 @@ static void mousedev_free(struct mousedev *mousedev)
         kfree(mousedev);
 }
 
-static int mixdev_release(void)
+static void mixdev_release(void)
 {
         struct input_handle *handle;
 
@@ -370,8 +370,6 @@ static int mixdev_release(void)
                                 mousedev_free(mousedev);
                 }
         }
-
-        return 0;
 }
 
 static int mousedev_release(struct inode * inode, struct file * file)
@@ -384,9 +382,8 @@ static int mousedev_release(struct inode * inode, struct file * file)
 
         if (!--list->mousedev->open) {
                 if (list->mousedev->minor == MOUSEDEV_MIX)
-                        return mixdev_release();
-
-                if (!mousedev_mix.open) {
+                        mixdev_release();
+                else if (!mousedev_mix.open) {
                         if (list->mousedev->exist)
                                 input_close_device(&list->mousedev->handle);
                         else
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index dd8c6a9ffc76..b45a45ca7cc9 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -29,9 +29,6 @@
 #ifdef  CONFIG_ARCH_OMAP
 #include <asm/arch/gpio.h>
 #endif
-
-#else
-#define set_irq_type(irq,type)  do{}while(0)
 #endif
 
 
@@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi)
         ts->msg.complete = ads7846_rx;
         ts->msg.context = ts;
 
-        if (request_irq(spi->irq, ads7846_irq, SA_SAMPLE_RANDOM,
-                                spi->dev.bus_id, ts)) {
+        if (request_irq(spi->irq, ads7846_irq,
+                        SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,
+                        spi->dev.bus_id, ts)) {
                 dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
                 input_unregister_device(&ts->input);
                 kfree(ts);
                 return -EBUSY;
         }
-        set_irq_type(spi->irq, IRQT_FALLING);
 
         dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq);
 
diff --git a/drivers/input/touchscreen/mk712.c b/drivers/input/touchscreen/mk712.c
index 4844d250a5eb..3226830eea08 100644
--- a/drivers/input/touchscreen/mk712.c
+++ b/drivers/input/touchscreen/mk712.c
@@ -154,7 +154,7 @@ static void mk712_close(struct input_dev *dev)
         spin_unlock_irqrestore(&mk712_lock, flags);
 }
 
-int __init mk712_init(void)
+static int __init mk712_init(void)
 {
         int err;
 
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 1b85ce166af8..11fe537e2f6f 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -216,7 +216,7 @@ struct Layer1 {
 #define GROUP_TEI       127
 #define TEI_SAPI        63
 #define CTRL_SAPI       0
-#define PACKET_NOACK    250
+#define PACKET_NOACK    7
 
 /* Layer2 Flags */
 
diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c
index 3314a5a19854..94c9afb7017c 100644
--- a/drivers/isdn/sc/ioctl.c
+++ b/drivers/isdn/sc/ioctl.c
@@ -71,14 +71,14 @@ int sc_ioctl(int card, scs_ioctl *data)
                 /*
                  * Get the SRec from user space
                  */
-                if (copy_from_user(srec, data->dataptr, sizeof(srec))) {
+                if (copy_from_user(srec, data->dataptr, SCIOC_SRECSIZE)) {
                         kfree(rcvmsg);
                         kfree(srec);
                         return -EFAULT;
                 }
 
                 status = send_and_receive(card, CMPID, cmReqType2, cmReqClass0, cmReqLoadProc,
-                                0, sizeof(srec), srec, rcvmsg, SAR_TIMEOUT);
+                                0, SCIOC_SRECSIZE, srec, rcvmsg, SAR_TIMEOUT);
                 kfree(rcvmsg);
                 kfree(srec);
 
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index ed6d3174d660..69596f6438e9 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -140,10 +140,9 @@ static int macio_uevent(struct device *dev, char **envp, int num_envp,
 {
         struct macio_dev * macio_dev;
         struct of_device * of;
-        char *scratch, *compat;
+        char *scratch, *compat, *compat2;
         int i = 0;
-        int length = 0;
-        int cplen, seen = 0;
+        int length, cplen, cplen2, seen = 0;
 
         if (!dev)
                 return -ENODEV;
@@ -153,23 +152,22 @@ static int macio_uevent(struct device *dev, char **envp, int num_envp,
                 return -ENODEV;
 
         of = &macio_dev->ofdev;
-        scratch = buffer;
 
         /* stuff we want to pass to /sbin/hotplug */
-        envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length, "OF_NAME=%s",
-                             of->node->name);
-        if ((buffer_size - length <= 0) || (i >= num_envp))
-                return -ENOMEM;
+        envp[i++] = scratch = buffer;
+        length = scnprintf (scratch, buffer_size, "OF_NAME=%s", of->node->name);
         ++length;
+        buffer_size -= length;
+        if ((buffer_size <= 0) || (i >= num_envp))
+                return -ENOMEM;
         scratch += length;
 
         envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length, "OF_TYPE=%s",
-                             of->node->type);
-        if ((buffer_size - length <= 0) || (i >= num_envp))
-                return -ENOMEM;
+        length = scnprintf (scratch, buffer_size, "OF_TYPE=%s", of->node->type);
         ++length;
+        buffer_size -= length;
+        if ((buffer_size <= 0) || (i >= num_envp))
+                return -ENOMEM;
         scratch += length;
 
         /* Since the compatible field can contain pretty much anything
@@ -177,29 +175,55 @@ static int macio_uevent(struct device *dev, char **envp, int num_envp,
          * up using a number of environment variables instead. */
 
         compat = (char *) get_property(of->node, "compatible", &cplen);
+        compat2 = compat;
+        cplen2= cplen;
         while (compat && cplen > 0) {
-                int l;
                 envp[i++] = scratch;
-                length += scnprintf (scratch, buffer_size - length,
+                length = scnprintf (scratch, buffer_size,
                                      "OF_COMPATIBLE_%d=%s", seen, compat);
-                if ((buffer_size - length <= 0) || (i >= num_envp))
+                ++length;
+                buffer_size -= length;
+                if ((buffer_size <= 0) || (i >= num_envp))
                         return -ENOMEM;
-                length++;
                 scratch += length;
-                l = strlen (compat) + 1;
-                compat += l;
-                cplen -= l;
+                length = strlen (compat) + 1;
+                compat += length;
+                cplen -= length;
                 seen++;
         }
 
         envp[i++] = scratch;
-        length += scnprintf (scratch, buffer_size - length,
-                             "OF_COMPATIBLE_N=%d", seen);
-        if ((buffer_size - length <= 0) || (i >= num_envp))
-                return -ENOMEM;
+        length = scnprintf (scratch, buffer_size, "OF_COMPATIBLE_N=%d", seen);
         ++length;
+        buffer_size -= length;
+        if ((buffer_size <= 0) || (i >= num_envp))
+                return -ENOMEM;
+        scratch += length;
+
+        envp[i++] = scratch;
+        length = scnprintf (scratch, buffer_size, "MODALIAS=of:N%sT%s",
+                        of->node->name, of->node->type);
+        /* overwrite '\0' */
+        buffer_size -= length;
+        if ((buffer_size <= 0) || (i >= num_envp))
+                return -ENOMEM;
         scratch += length;
 
+        if (!compat2) {
+                compat2 = "";
+                cplen2 = 1;
+        }
+        while (cplen2 > 0) {
+                length = snprintf (scratch, buffer_size, "C%s", compat2);
+                buffer_size -= length;
+                if (buffer_size <= 0)
+                        return -ENOMEM;
+                scratch += length;
+                length = strlen (compat2) + 1;
+                compat2 += length;
+                cplen2 -= length;
+        }
+
         envp[i] = NULL;
 
         return 0;
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 1235135b384b..442e2be6052e 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1359,16 +1359,11 @@ static int ctl_ioctl(struct inode *inode, struct file *file,
          * Copy the parameters into kernel space.
          */
         r = copy_params(user, &param);
-        if (r) {
-                current->flags &= ~PF_MEMALLOC;
-                return r;
-        }
 
-        /*
-         * FIXME: eventually we will remove the PF_MEMALLOC flag
-         * here.  However the tools still do nasty things like
-         * 'load' while a device is suspended.
-         */
+        current->flags &= ~PF_MEMALLOC;
+
+        if (r)
+                return r;
 
         r = validate_params(cmd, param);
         if (r)
@@ -1386,7 +1381,6 @@ static int ctl_ioctl(struct inode *inode, struct file *file,
 
  out:
         free_params(param);
-        current->flags &= ~PF_MEMALLOC;
         return r;
 }
 
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index efe4adf78530..d73779a42417 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -112,7 +112,7 @@ void dm_destroy_dirty_log(struct dirty_log *log)
 /*
  * The on-disk version of the metadata.
  */
-#define MIRROR_DISK_VERSION 1
+#define MIRROR_DISK_VERSION 2
 #define LOG_OFFSET 2
 
 struct log_header {
@@ -157,7 +157,6 @@ struct log_c {
         struct log_header *disk_header;
 
         struct io_region bits_location;
-        uint32_t *disk_bits;
 };
 
 /*
@@ -166,20 +165,20 @@ struct log_c {
  */
 static  inline int log_test_bit(uint32_t *bs, unsigned bit)
 {
-        return test_bit(bit, (unsigned long *) bs) ? 1 : 0;
+        return ext2_test_bit(bit, (unsigned long *) bs) ? 1 : 0;
 }
 
 static inline void log_set_bit(struct log_c *l,
                                uint32_t *bs, unsigned bit)
 {
-        set_bit(bit, (unsigned long *) bs);
+        ext2_set_bit(bit, (unsigned long *) bs);
         l->touched = 1;
 }
 
 static inline void log_clear_bit(struct log_c *l,
                                  uint32_t *bs, unsigned bit)
 {
-        clear_bit(bit, (unsigned long *) bs);
+        ext2_clear_bit(bit, (unsigned long *) bs);
         l->touched = 1;
 }
 
@@ -219,6 +218,11 @@ static int read_header(struct log_c *log)
                 log->header.nr_regions = 0;
         }
 
+#ifdef __LITTLE_ENDIAN
+        if (log->header.version == 1)
+                log->header.version = 2;
+#endif
+
         if (log->header.version != MIRROR_DISK_VERSION) {
                 DMWARN("incompatible disk log version");
                 return -EINVAL;
@@ -239,45 +243,24 @@ static inline int write_header(struct log_c *log)
 /*----------------------------------------------------------------
  * Bits IO
  *--------------------------------------------------------------*/
-static inline void bits_to_core(uint32_t *core, uint32_t *disk, unsigned count)
-{
-        unsigned i;
-
-        for (i = 0; i < count; i++)
-                core[i] = le32_to_cpu(disk[i]);
-}
-
-static inline void bits_to_disk(uint32_t *core, uint32_t *disk, unsigned count)
-{
-        unsigned i;
-
-        /* copy across the clean/dirty bitset */
-        for (i = 0; i < count; i++)
-                disk[i] = cpu_to_le32(core[i]);
-}
-
 static int read_bits(struct log_c *log)
 {
         int r;
         unsigned long ebits;
 
         r = dm_io_sync_vm(1, &log->bits_location, READ,
-                          log->disk_bits, &ebits);
+                          log->clean_bits, &ebits);
         if (r)
                 return r;
 
-        bits_to_core(log->clean_bits, log->disk_bits,
-                     log->bitset_uint32_count);
         return 0;
 }
 
 static int write_bits(struct log_c *log)
 {
         unsigned long ebits;
-        bits_to_disk(log->clean_bits, log->disk_bits,
-                     log->bitset_uint32_count);
         return dm_io_sync_vm(1, &log->bits_location, WRITE,
-                             log->disk_bits, &ebits);
+                             log->clean_bits, &ebits);
 }
 
 /*----------------------------------------------------------------
@@ -433,11 +416,6 @@ static int disk_ctr(struct dirty_log *log, struct dm_target *ti,
         size = dm_round_up(lc->bitset_uint32_count * sizeof(uint32_t),
                            1 << SECTOR_SHIFT);
         lc->bits_location.count = size >> SECTOR_SHIFT;
-        lc->disk_bits = vmalloc(size);
-        if (!lc->disk_bits) {
-                vfree(lc->disk_header);
-                goto bad;
-        }
         return 0;
 
  bad:
@@ -451,7 +429,6 @@ static void disk_dtr(struct dirty_log *log)
         struct log_c *lc = (struct log_c *) log->context;
         dm_put_device(lc->ti, lc->log_dev);
         vfree(lc->disk_header);
-        vfree(lc->disk_bits);
         core_dtr(log);
 }
 
@@ -568,7 +545,8 @@ static int core_get_resync_work(struct dirty_log *log, region_t *region)
                 return 0;
 
         do {
-                *region = find_next_zero_bit((unsigned long *) lc->sync_bits,
+                *region = ext2_find_next_zero_bit(
+                                             (unsigned long *) lc->sync_bits,
                                              lc->region_count,
                                              lc->sync_search);
                 lc->sync_search = *region + 1;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 87727d84dbba..f3759dd7828e 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -373,16 +373,11 @@ static inline ulong round_up(ulong n, ulong size)
 
 static void read_snapshot_metadata(struct dm_snapshot *s)
 {
-        if (s->have_metadata)
-                return;
-
         if (s->store.read_metadata(&s->store)) {
                 down_write(&s->lock);
                 s->valid = 0;
                 up_write(&s->lock);
         }
-
-        s->have_metadata = 1;
 }
 
 /*
@@ -471,7 +466,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         s->chunk_shift = ffs(chunk_size) - 1;
 
         s->valid = 1;
-        s->have_metadata = 0;
+        s->active = 0;
         s->last_percent = 0;
         init_rwsem(&s->lock);
         s->table = ti->table;
@@ -506,7 +501,11 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad5;
         }
 
+        /* Metadata must only be loaded into one table at once */
+        read_snapshot_metadata(s);
+
         /* Add snapshot to the list of snapshots for this origin */
+        /* Exceptions aren't triggered till snapshot_resume() is called */
         if (register_snapshot(s)) {
                 r = -EINVAL;
                 ti->error = "Cannot register snapshot origin";
@@ -793,6 +792,9 @@ static int snapshot_map(struct dm_target *ti, struct bio *bio,
         if (!s->valid)
                 return -EIO;
 
+        if (unlikely(bio_barrier(bio)))
+                return -EOPNOTSUPP;
+
         /*
          * Write to snapshot - higher level takes care of RW/RO
          * flags so we should only get this if we are
@@ -862,7 +864,9 @@ static void snapshot_resume(struct dm_target *ti)
 {
         struct dm_snapshot *s = (struct dm_snapshot *) ti->private;
 
-        read_snapshot_metadata(s);
+        down_write(&s->lock);
+        s->active = 1;
+        up_write(&s->lock);
 }
 
 static int snapshot_status(struct dm_target *ti, status_type_t type,
@@ -932,8 +936,8 @@ static int __origin_write(struct list_head *snapshots, struct bio *bio)
         /* Do all the snapshots on this origin */
         list_for_each_entry (snap, snapshots, list) {
 
-                /* Only deal with valid snapshots */
-                if (!snap->valid)
+                /* Only deal with valid and active snapshots */
+                if (!snap->valid || !snap->active)
                         continue;
 
                 /* Nothing to do if writing beyond end of snapshot */
@@ -1057,6 +1061,9 @@ static int origin_map(struct dm_target *ti, struct bio *bio,
         struct dm_dev *dev = (struct dm_dev *) ti->private;
         bio->bi_bdev = dev->bdev;
 
+        if (unlikely(bio_barrier(bio)))
+                return -EOPNOTSUPP;
+
         /* Only tell snapshots if this is a write */
         return (bio_rw(bio) == WRITE) ? do_origin(dev, bio) : 1;
 }
@@ -1104,7 +1111,7 @@ static int origin_status(struct dm_target *ti, status_type_t type, char *result,
 
 static struct target_type origin_target = {
         .name    = "snapshot-origin",
-        .version = {1, 0, 1},
+        .version = {1, 1, 0},
         .module  = THIS_MODULE,
         .ctr     = origin_ctr,
         .dtr     = origin_dtr,
@@ -1115,7 +1122,7 @@ static struct target_type origin_target = {
 
 static struct target_type snapshot_target = {
         .name    = "snapshot",
-        .version = {1, 0, 1},
+        .version = {1, 1, 0},
         .module  = THIS_MODULE,
         .ctr     = snapshot_ctr,
         .dtr     = snapshot_dtr,
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index 375aa24d4d7d..fdec1e2dc871 100644
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -99,7 +99,9 @@ struct dm_snapshot {
 
         /* You can't use a snapshot if this is 0 (e.g. if full) */
         int valid;
-        int have_metadata;
+
+        /* Origin writes don't trigger exceptions until this is set */
+        int active;
 
         /* Used for display of table */
         char type;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index a6f2dc66c3db..9b1e2f5ca630 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -508,7 +508,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
                 if (q->merge_bvec_fn)
                         rs->max_sectors =
                                 min_not_zero(rs->max_sectors,
-                                             (unsigned short)(PAGE_SIZE >> 9));
+                                             (unsigned int) (PAGE_SIZE >> 9));
 
                 rs->max_phys_segments =
                         min_not_zero(rs->max_phys_segments,
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 8c16359f8b01..e9adeb9d172f 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -31,6 +31,7 @@ struct dm_io {
         int error;
         struct bio *bio;
         atomic_t io_count;
+        unsigned long start_time;
 };
 
 /*
@@ -244,6 +245,36 @@ static inline void free_tio(struct mapped_device *md, struct target_io *tio)
         mempool_free(tio, md->tio_pool);
 }
 
+static void start_io_acct(struct dm_io *io)
+{
+        struct mapped_device *md = io->md;
+
+        io->start_time = jiffies;
+
+        preempt_disable();
+        disk_round_stats(dm_disk(md));
+        preempt_enable();
+        dm_disk(md)->in_flight = atomic_inc_return(&md->pending);
+}
+
+static int end_io_acct(struct dm_io *io)
+{
+        struct mapped_device *md = io->md;
+        struct bio *bio = io->bio;
+        unsigned long duration = jiffies - io->start_time;
+        int pending;
+        int rw = bio_data_dir(bio);
+
+        preempt_disable();
+        disk_round_stats(dm_disk(md));
+        preempt_enable();
+        dm_disk(md)->in_flight = pending = atomic_dec_return(&md->pending);
+
+        disk_stat_add(dm_disk(md), ticks[rw], duration);
+
+        return !pending;
+}
+
 /*
  * Add the bio to the list of deferred io.
  */
@@ -299,7 +330,7 @@ static void dec_pending(struct dm_io *io, int error)
                 io->error = error;
 
         if (atomic_dec_and_test(&io->io_count)) {
-                if (atomic_dec_and_test(&io->md->pending))
+                if (end_io_acct(io))
                         /* nudge anyone waiting on suspend queue */
                         wake_up(&io->md->wait);
 
@@ -554,7 +585,7 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
         ci.sector_count = bio_sectors(bio);
         ci.idx = bio->bi_idx;
 
-        atomic_inc(&md->pending);
+        start_io_acct(ci.io);
         while (ci.sector_count)
                 __clone_and_map(&ci);
 
@@ -573,10 +604,14 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
 static int dm_request(request_queue_t *q, struct bio *bio)
 {
         int r;
+        int rw = bio_data_dir(bio);
         struct mapped_device *md = q->queuedata;
 
         down_read(&md->io_lock);
 
+        disk_stat_inc(dm_disk(md), ios[rw]);
+        disk_stat_add(dm_disk(md), sectors[rw], bio_sectors(bio));
+
         /*
          * If we're suspended we have to queue
          * this io for later.
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 7145cd150f7b..d05e3125d298 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1024,7 +1024,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
                 rdev-> sb_size = (rdev->sb_size | bmask)+1;
 
         if (refdev == 0)
-                return 1;
+                ret = 1;
         else {
                 __u64 ev1, ev2;
                 struct mdp_superblock_1 *refsb = 
@@ -1044,7 +1044,9 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
                 ev2 = le64_to_cpu(refsb->events);
 
                 if (ev1 > ev2)
-                        return 1;
+                        ret = 1;
+                else
+                        ret = 0;
         }
         if (minor_version) 
                 rdev->size = ((rdev->bdev->bd_inode->i_size>>9) - le64_to_cpu(sb->data_offset)) / 2;
@@ -1058,7 +1060,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
 
         if (le32_to_cpu(sb->size) > rdev->size*2)
                 return -EINVAL;
-        return 0;
+        return ret;
 }
 
 static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
@@ -1081,7 +1083,7 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev)
                 mddev->size = le64_to_cpu(sb->size)/2;
                 mddev->events = le64_to_cpu(sb->events);
                 mddev->bitmap_offset = 0;
-                mddev->default_bitmap_offset = 1024;
+                mddev->default_bitmap_offset = 1024 >> 9;
                 
                 mddev->recovery_cp = le64_to_cpu(sb->resync_offset);
                 memcpy(mddev->uuid, sb->set_uuid, 16);
@@ -1161,6 +1163,9 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
 
         sb->cnt_corrected_read = atomic_read(&rdev->corrected_errors);
 
+        sb->raid_disks = cpu_to_le32(mddev->raid_disks);
+        sb->size = cpu_to_le64(mddev->size<<1);
+
         if (mddev->bitmap && mddev->bitmap_file == NULL) {
                 sb->bitmap_offset = cpu_to_le32((__u32)mddev->bitmap_offset);
                 sb->feature_map = cpu_to_le32(MD_FEATURE_BITMAP_OFFSET);
@@ -2686,14 +2691,6 @@ static int do_md_stop(mddev_t * mddev, int ro)
                         set_disk_ro(disk, 1);
         }
 
-        bitmap_destroy(mddev);
-        if (mddev->bitmap_file) {
-                atomic_set(&mddev->bitmap_file->f_dentry->d_inode->i_writecount, 1);
-                fput(mddev->bitmap_file);
-                mddev->bitmap_file = NULL;
-        }
-        mddev->bitmap_offset = 0;
-
         /*
          * Free resources if final stop
          */
@@ -2703,6 +2700,14 @@ static int do_md_stop(mddev_t * mddev, int ro)
                 struct gendisk *disk;
                 printk(KERN_INFO "md: %s stopped.\n", mdname(mddev));
 
+                bitmap_destroy(mddev);
+                if (mddev->bitmap_file) {
+                        atomic_set(&mddev->bitmap_file->f_dentry->d_inode->i_writecount, 1);
+                        fput(mddev->bitmap_file);
+                        mddev->bitmap_file = NULL;
+                }
+                mddev->bitmap_offset = 0;
+
                 ITERATE_RDEV(mddev,rdev,tmp)
                         if (rdev->raid_disk >= 0) {
                                 char nm[20];
@@ -2939,6 +2944,8 @@ static int get_array_info(mddev_t * mddev, void __user * arg)
         info.ctime         = mddev->ctime;
         info.level         = mddev->level;
         info.size          = mddev->size;
+        if (info.size != mddev->size) /* overflow */
+                info.size = -1;
         info.nr_disks      = nr;
         info.raid_disks    = mddev->raid_disks;
         info.md_minor      = mddev->md_minor;
@@ -3465,7 +3472,7 @@ static int update_size(mddev_t *mddev, unsigned long size)
                 bdev = bdget_disk(mddev->gendisk, 0);
                 if (bdev) {
                         mutex_lock(&bdev->bd_inode->i_mutex);
-                        i_size_write(bdev->bd_inode, mddev->array_size << 10);
+                        i_size_write(bdev->bd_inode, (loff_t)mddev->array_size << 10);
                         mutex_unlock(&bdev->bd_inode->i_mutex);
                         bdput(bdev);
                 }
@@ -3485,17 +3492,6 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks)
         if (mddev->sync_thread)
                 return -EBUSY;
         rv = mddev->pers->reshape(mddev, raid_disks);
-        if (!rv) {
-                struct block_device *bdev;
-
-                bdev = bdget_disk(mddev->gendisk, 0);
-                if (bdev) {
-                        mutex_lock(&bdev->bd_inode->i_mutex);
-                        i_size_write(bdev->bd_inode, mddev->array_size << 10);
-                        mutex_unlock(&bdev->bd_inode->i_mutex);
-                        bdput(bdev);
-                }
-        }
         return rv;
 }
 
@@ -3531,7 +3527,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info)
                 )
                 return -EINVAL;
         /* Check there is only one change */
-        if (mddev->size != info->size) cnt++;
+        if (info->size >= 0 && mddev->size != info->size) cnt++;
         if (mddev->raid_disks != info->raid_disks) cnt++;
         if (mddev->layout != info->layout) cnt++;
         if ((state ^ info->state) & (1<<MD_SB_BITMAP_PRESENT)) cnt++;
@@ -3548,7 +3544,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info)
                 else
                         return mddev->pers->reconfig(mddev, info->layout, -1);
         }
-        if (mddev->size != info->size)
+        if (info->size >= 0 && mddev->size != info->size)
                 rv = update_size(mddev, info->size);
 
         if (mddev->raid_disks    != info->raid_disks)
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index d03f99cf4b7d..678f4dbbea1d 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -372,7 +372,7 @@ out_free_conf:
         kfree(conf);
         mddev->private = NULL;
 out:
-        return 1;
+        return -ENOMEM;
 }
 
 static int raid0_stop (mddev_t *mddev)
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 9130d051b474..ab90a6d12020 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -565,6 +565,8 @@ rb_out:
 
         if (disk >= 0 && (rdev=rcu_dereference(conf->mirrors[disk].rdev))!= NULL)
                 atomic_inc(&conf->mirrors[disk].rdev->nr_pending);
+        else
+                disk = -1;
         rcu_read_unlock();
 
         return disk;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 25976bfb6f9c..2dba305daf3c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -350,7 +350,8 @@ static void shrink_stripes(raid5_conf_t *conf)
         while (drop_one_stripe(conf))
                 ;
 
-        kmem_cache_destroy(conf->slab_cache);
+        if (conf->slab_cache)
+                kmem_cache_destroy(conf->slab_cache);
         conf->slab_cache = NULL;
 }
 
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index f618a53b98be..cd477ebf2ee4 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -115,7 +115,7 @@ static void __release_stripe(raid6_conf_t *conf, struct stripe_head *sh)
                         list_add_tail(&sh->lru, &conf->inactive_list);
                         atomic_dec(&conf->active_stripes);
                         if (!conf->inactive_blocked ||
-                            atomic_read(&conf->active_stripes) < (NR_STRIPES*3/4))
+                            atomic_read(&conf->active_stripes) < (conf->max_nr_stripes*3/4))
                                 wake_up(&conf->wait_for_stripe);
                 }
         }
@@ -273,7 +273,8 @@ static struct stripe_head *get_active_stripe(raid6_conf_t *conf, sector_t sector
                                 conf->inactive_blocked = 1;
                                 wait_event_lock_irq(conf->wait_for_stripe,
                                                     !list_empty(&conf->inactive_list) &&
-                                                    (atomic_read(&conf->active_stripes) < (NR_STRIPES *3/4)
+                                                    (atomic_read(&conf->active_stripes)
+                                                     < (conf->max_nr_stripes *3/4)
                                                      || !conf->inactive_blocked),
                                                     conf->device_lock,
                                                     unplug_slaves(conf->mddev);
@@ -302,9 +303,31 @@ static struct stripe_head *get_active_stripe(raid6_conf_t *conf, sector_t sector
         return sh;
 }
 
-static int grow_stripes(raid6_conf_t *conf, int num)
+static int grow_one_stripe(raid6_conf_t *conf)
 {
         struct stripe_head *sh;
+        sh = kmem_cache_alloc(conf->slab_cache, GFP_KERNEL);
+        if (!sh)
+                return 0;
+        memset(sh, 0, sizeof(*sh) + (conf->raid_disks-1)*sizeof(struct r5dev));
+        sh->raid_conf = conf;
+        spin_lock_init(&sh->lock);
+
+        if (grow_buffers(sh, conf->raid_disks)) {
+                shrink_buffers(sh, conf->raid_disks);
+                kmem_cache_free(conf->slab_cache, sh);
+                return 0;
+        }
+        /* we just created an active stripe so... */
+        atomic_set(&sh->count, 1);
+        atomic_inc(&conf->active_stripes);
+        INIT_LIST_HEAD(&sh->lru);
+        release_stripe(sh);
+        return 1;
+}
+
+static int grow_stripes(raid6_conf_t *conf, int num)
+{
         kmem_cache_t *sc;
         int devs = conf->raid_disks;
 
@@ -316,45 +339,35 @@ static int grow_stripes(raid6_conf_t *conf, int num)
         if (!sc)
                 return 1;
         conf->slab_cache = sc;
-        while (num--) {
-                sh = kmem_cache_alloc(sc, GFP_KERNEL);
-                if (!sh)
-                        return 1;
-                memset(sh, 0, sizeof(*sh) + (devs-1)*sizeof(struct r5dev));
-                sh->raid_conf = conf;
-                spin_lock_init(&sh->lock);
-
-                if (grow_buffers(sh, conf->raid_disks)) {
-                        shrink_buffers(sh, conf->raid_disks);
-                        kmem_cache_free(sc, sh);
+        while (num--)
+                if (!grow_one_stripe(conf))
                         return 1;
-                }
-                /* we just created an active stripe so... */
-                atomic_set(&sh->count, 1);
-                atomic_inc(&conf->active_stripes);
-                INIT_LIST_HEAD(&sh->lru);
-                release_stripe(sh);
-        }
         return 0;
 }
 
-static void shrink_stripes(raid6_conf_t *conf)
+static int drop_one_stripe(raid6_conf_t *conf)
 {
         struct stripe_head *sh;
+        spin_lock_irq(&conf->device_lock);
+        sh = get_free_stripe(conf);
+        spin_unlock_irq(&conf->device_lock);
+        if (!sh)
+                return 0;
+        if (atomic_read(&sh->count))
+                BUG();
+        shrink_buffers(sh, conf->raid_disks);
+        kmem_cache_free(conf->slab_cache, sh);
+        atomic_dec(&conf->active_stripes);
+        return 1;
+}
 
-        while (1) {
-                spin_lock_irq(&conf->device_lock);
-                sh = get_free_stripe(conf);
-                spin_unlock_irq(&conf->device_lock);
-                if (!sh)
-                        break;
-                if (atomic_read(&sh->count))
-                        BUG();
-                shrink_buffers(sh, conf->raid_disks);
-                kmem_cache_free(conf->slab_cache, sh);
-                atomic_dec(&conf->active_stripes);
-        }
-        kmem_cache_destroy(conf->slab_cache);
+static void shrink_stripes(raid6_conf_t *conf)
+{
+        while (drop_one_stripe(conf))
+                ;
+
+        if (conf->slab_cache)
+                kmem_cache_destroy(conf->slab_cache);
         conf->slab_cache = NULL;
 }
 
@@ -1912,6 +1925,74 @@ static void raid6d (mddev_t *mddev)
         PRINTK("--- raid6d inactive\n");
 }
 
+static ssize_t
+raid6_show_stripe_cache_size(mddev_t *mddev, char *page)
+{
+        raid6_conf_t *conf = mddev_to_conf(mddev);
+        if (conf)
+                return sprintf(page, "%d\n", conf->max_nr_stripes);
+        else
+                return 0;
+}
+
+static ssize_t
+raid6_store_stripe_cache_size(mddev_t *mddev, const char *page, size_t len)
+{
+        raid6_conf_t *conf = mddev_to_conf(mddev);
+        char *end;
+        int new;
+        if (len >= PAGE_SIZE)
+                return -EINVAL;
+        if (!conf)
+                return -ENODEV;
+
+        new = simple_strtoul(page, &end, 10);
+        if (!*page || (*end && *end != '\n') )
+                return -EINVAL;
+        if (new <= 16 || new > 32768)
+                return -EINVAL;
+        while (new < conf->max_nr_stripes) {
+                if (drop_one_stripe(conf))
+                        conf->max_nr_stripes--;
+                else
+                        break;
+        }
+        while (new > conf->max_nr_stripes) {
+                if (grow_one_stripe(conf))
+                        conf->max_nr_stripes++;
+                else break;
+        }
+        return len;
+}
+
+static struct md_sysfs_entry
+raid6_stripecache_size = __ATTR(stripe_cache_size, S_IRUGO | S_IWUSR,
+                                raid6_show_stripe_cache_size,
+                                raid6_store_stripe_cache_size);
+
+static ssize_t
+stripe_cache_active_show(mddev_t *mddev, char *page)
+{
+        raid6_conf_t *conf = mddev_to_conf(mddev);
+        if (conf)
+                return sprintf(page, "%d\n", atomic_read(&conf->active_stripes));
+        else
+                return 0;
+}
+
+static struct md_sysfs_entry
+raid6_stripecache_active = __ATTR_RO(stripe_cache_active);
+
+static struct attribute *raid6_attrs[] =  {
+        &raid6_stripecache_size.attr,
+        &raid6_stripecache_active.attr,
+        NULL,
+};
+static struct attribute_group raid6_attrs_group = {
+        .name = NULL,
+        .attrs = raid6_attrs,
+};
+
 static int run(mddev_t *mddev)
 {
         raid6_conf_t *conf;
@@ -2095,6 +2176,7 @@ static int stop (mddev_t *mddev)
         shrink_stripes(conf);
         kfree(conf->stripe_hashtbl);
         blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
+        sysfs_remove_group(&mddev->kobj, &raid6_attrs_group);
         kfree(conf);
         mddev->private = NULL;
         return 0;
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 0b6c2096ec66..aad4a18aafd6 100644
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -484,7 +484,7 @@ static struct saa7146_ext_vv vv_data = {
 };
 
 static struct saa7146_extension extension = {
-        .name = "hexium HV-PCI6/Orion",
+        .name = "hexium HV-PCI6 Orion",
         .flags = 0,             // SAA7146_USE_I2C_IRQ,
 
         .pci_tbl = &pci_tbl[0],
diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile
index 8a2e2657f4c2..33ace373241c 100644
--- a/drivers/message/fusion/Makefile
+++ b/drivers/message/fusion/Makefile
@@ -29,6 +29,8 @@
 #  For mptctl:
 #CFLAGS_mptctl.o += -DMPT_DEBUG_IOCTL
 #
+#  For mptfc:
+#CFLAGS_mptfc.o += -DMPT_DEBUG_FC
 
 #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index d890b2b8a93e..9a2c7605d49c 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -81,6 +81,10 @@ MODULE_LICENSE("GPL");
 /*
  *  cmd line parameters
  */
+static int mpt_msi_enable;
+module_param(mpt_msi_enable, int, 0);
+MODULE_PARM_DESC(mpt_msi_enable, " MSI Support Enable (default=0)");
+
 #ifdef MFCNT
 static int mfcounter = 0;
 #define PRINT_MF_COUNT 20000
@@ -174,7 +178,7 @@ static void	mpt_get_fw_exp_ver(char *buf, MPT_ADAPTER *ioc);
 static int      ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *evReply, int *evHandlers);
 static void     mpt_sp_ioc_info(MPT_ADAPTER *ioc, u32 ioc_status, MPT_FRAME_HDR *mf);
 static void     mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info);
-static void     mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info);
+static void     mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info);
 static void     mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info);
 
 /* module entry point */
@@ -313,7 +317,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa)
                 if (ioc->bus_type == FC)
                         mpt_fc_log_info(ioc, log_info);
                 else if (ioc->bus_type == SPI)
-                        mpt_sp_log_info(ioc, log_info);
+                        mpt_spi_log_info(ioc, log_info);
                 else if (ioc->bus_type == SAS)
                         mpt_sas_log_info(ioc, log_info);
         }
@@ -1444,6 +1448,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
         ioc->pci_irq = -1;
         if (pdev->irq) {
+                if (mpt_msi_enable && !pci_enable_msi(pdev))
+                        printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ioc->name);
+
                 r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc);
 
                 if (r < 0) {
@@ -1483,6 +1490,10 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
                 list_del(&ioc->list);
                 free_irq(ioc->pci_irq, ioc);
+                if (mpt_msi_enable)
+                        pci_disable_msi(pdev);
+                if (ioc->alt_ioc)
+                        ioc->alt_ioc->alt_ioc = NULL;
                 iounmap(mem);
                 kfree(ioc);
                 pci_set_drvdata(pdev, NULL);
@@ -2136,6 +2147,8 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc)
 
         if (ioc->pci_irq != -1) {
                 free_irq(ioc->pci_irq, ioc);
+                if (mpt_msi_enable)
+                        pci_disable_msi(ioc->pcidev);
                 ioc->pci_irq = -1;
         }
 
@@ -2157,6 +2170,10 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc)
         sz_last = ioc->alloc_total;
         dprintk((KERN_INFO MYNAM ": %s: free'd %d of %d bytes\n",
                         ioc->name, sz_first-sz_last+(int)sizeof(*ioc), sz_first));
+
+        if (ioc->alt_ioc)
+                ioc->alt_ioc->alt_ioc = NULL;
+
         kfree(ioc);
 }
 
@@ -2770,13 +2787,16 @@ SendPortEnable(MPT_ADAPTER *ioc, int portnum, int sleepFlag)
 
         /* RAID FW may take a long time to enable
          */
-        if ( (ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK)
-                        > MPI_FW_HEADER_PID_PROD_TARGET_SCSI ) {
-                rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable,
-                                reply_sz, (u16*)&reply_buf, 300 /*seconds*/, sleepFlag);
+        if (((ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK)
+            > MPI_FW_HEADER_PID_PROD_TARGET_SCSI) ||
+            (ioc->bus_type == SAS)) {
+                rc = mpt_handshake_req_reply_wait(ioc, req_sz,
+                (u32*)&port_enable, reply_sz, (u16*)&reply_buf,
+                300 /*seconds*/, sleepFlag);
         } else {
-                rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable,
-                                reply_sz, (u16*)&reply_buf, 30 /*seconds*/, sleepFlag);
+                rc = mpt_handshake_req_reply_wait(ioc, req_sz,
+                (u32*)&port_enable, reply_sz, (u16*)&reply_buf,
+                30 /*seconds*/, sleepFlag);
         }
         return rc;
 }
@@ -4387,6 +4407,138 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+
+static void
+mptbase_raid_process_event_data(MPT_ADAPTER *ioc,
+    MpiEventDataRaid_t * pRaidEventData)
+{
+        int     volume;
+        int     reason;
+        int     disk;
+        int     status;
+        int     flags;
+        int     state;
+
+        volume  = pRaidEventData->VolumeID;
+        reason  = pRaidEventData->ReasonCode;
+        disk    = pRaidEventData->PhysDiskNum;
+        status  = le32_to_cpu(pRaidEventData->SettingsStatus);
+        flags   = (status >> 0) & 0xff;
+        state   = (status >> 8) & 0xff;
+
+        if (reason == MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED) {
+                return;
+        }
+
+        if ((reason >= MPI_EVENT_RAID_RC_PHYSDISK_CREATED &&
+             reason <= MPI_EVENT_RAID_RC_PHYSDISK_STATUS_CHANGED) ||
+            (reason == MPI_EVENT_RAID_RC_SMART_DATA)) {
+                printk(MYIOC_s_INFO_FMT "RAID STATUS CHANGE for PhysDisk %d\n",
+                        ioc->name, disk);
+        } else {
+                printk(MYIOC_s_INFO_FMT "RAID STATUS CHANGE for VolumeID %d\n",
+                        ioc->name, volume);
+        }
+
+        switch(reason) {
+        case MPI_EVENT_RAID_RC_VOLUME_CREATED:
+                printk(MYIOC_s_INFO_FMT "  volume has been created\n",
+                        ioc->name);
+                break;
+
+        case MPI_EVENT_RAID_RC_VOLUME_DELETED:
+
+                printk(MYIOC_s_INFO_FMT "  volume has been deleted\n",
+                        ioc->name);
+                break;
+
+        case MPI_EVENT_RAID_RC_VOLUME_SETTINGS_CHANGED:
+                printk(MYIOC_s_INFO_FMT "  volume settings have been changed\n",
+                        ioc->name);
+                break;
+
+        case MPI_EVENT_RAID_RC_VOLUME_STATUS_CHANGED:
+                printk(MYIOC_s_INFO_FMT "  volume is now %s%s%s%s\n",
+                        ioc->name,
+                        state == MPI_RAIDVOL0_STATUS_STATE_OPTIMAL
+                         ? "optimal"
+                         : state == MPI_RAIDVOL0_STATUS_STATE_DEGRADED
+                          ? "degraded"
+                          : state == MPI_RAIDVOL0_STATUS_STATE_FAILED
+                           ? "failed"
+                           : "state unknown",
+                        flags & MPI_RAIDVOL0_STATUS_FLAG_ENABLED
+                         ? ", enabled" : "",
+                        flags & MPI_RAIDVOL0_STATUS_FLAG_QUIESCED
+                         ? ", quiesced" : "",
+                        flags & MPI_RAIDVOL0_STATUS_FLAG_RESYNC_IN_PROGRESS
+                         ? ", resync in progress" : "" );
+                break;
+
+        case MPI_EVENT_RAID_RC_VOLUME_PHYSDISK_CHANGED:
+                printk(MYIOC_s_INFO_FMT "  volume membership of PhysDisk %d has changed\n",
+                        ioc->name, disk);
+                break;
+
+        case MPI_EVENT_RAID_RC_PHYSDISK_CREATED:
+                printk(MYIOC_s_INFO_FMT "  PhysDisk has been created\n",
+                        ioc->name);
+                break;
+
+        case MPI_EVENT_RAID_RC_PHYSDISK_DELETED:
+                printk(MYIOC_s_INFO_FMT "  PhysDisk has been deleted\n",
+                        ioc->name);
+                break;
+
+        case MPI_EVENT_RAID_RC_PHYSDISK_SETTINGS_CHANGED:
+                printk(MYIOC_s_INFO_FMT "  PhysDisk settings have been changed\n",
+                        ioc->name);
+                break;
+
+        case MPI_EVENT_RAID_RC_PHYSDISK_STATUS_CHANGED:
+                printk(MYIOC_s_INFO_FMT "  PhysDisk is now %s%s%s\n",
+                        ioc->name,
+                        state == MPI_PHYSDISK0_STATUS_ONLINE
+                         ? "online"
+                         : state == MPI_PHYSDISK0_STATUS_MISSING
+                          ? "missing"
+                          : state == MPI_PHYSDISK0_STATUS_NOT_COMPATIBLE
+                           ? "not compatible"
+                           : state == MPI_PHYSDISK0_STATUS_FAILED
+                            ? "failed"
+                            : state == MPI_PHYSDISK0_STATUS_INITIALIZING
+                             ? "initializing"
+                             : state == MPI_PHYSDISK0_STATUS_OFFLINE_REQUESTED
+                              ? "offline requested"
+                              : state == MPI_PHYSDISK0_STATUS_FAILED_REQUESTED
+                               ? "failed requested"
+                               : state == MPI_PHYSDISK0_STATUS_OTHER_OFFLINE
+                                ? "offline"
+                                : "state unknown",
+                        flags & MPI_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC
+                         ? ", out of sync" : "",
+                        flags & MPI_PHYSDISK0_STATUS_FLAG_QUIESCED
+                         ? ", quiesced" : "" );
+                break;
+
+        case MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED:
+                printk(MYIOC_s_INFO_FMT "  Domain Validation needed for PhysDisk %d\n",
+                        ioc->name, disk);
+                break;
+
+        case MPI_EVENT_RAID_RC_SMART_DATA:
+                printk(MYIOC_s_INFO_FMT "  SMART data received, ASC/ASCQ = %02xh/%02xh\n",
+                        ioc->name, pRaidEventData->ASC, pRaidEventData->ASCQ);
+                break;
+
+        case MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED:
+                printk(MYIOC_s_INFO_FMT "  replacement of PhysDisk %d has started\n",
+                        ioc->name, disk);
+                break;
+        }
+}
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *      GetIoUnitPage2 - Retrieve BIOS version and boot order information.
  *      @ioc: Pointer to MPT_ADAPTER structure
@@ -4598,6 +4750,14 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
                                 SCSIPortPage2_t *pPP2 = (SCSIPortPage2_t  *) pbuf;
                                 MpiDeviceInfo_t *pdevice = NULL;
 
+                                /*
+                                 * Save "Set to Avoid SCSI Bus Resets" flag
+                                 */
+                                ioc->spi_data.bus_reset =
+                                    (le32_to_cpu(pPP2->PortFlags) &
+                                MPI_SCSIPORTPAGE2_PORT_FLAGS_AVOID_SCSI_RESET) ?
+                                    0 : 1 ;
+
                                 /* Save the Port Page 2 data
                                  * (reformat into a 32bit quantity)
                                  */
@@ -5967,6 +6127,10 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply
                         }
                 }
                 break;
+        case MPI_EVENT_INTEGRATED_RAID:
+                mptbase_raid_process_event_data(ioc,
+                    (MpiEventDataRaid_t *)pEventReply->Data);
+                break;
         default:
                 break;
         }
@@ -6046,7 +6210,7 @@ mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
- *      mpt_sp_log_info - Log information returned from SCSI Parallel IOC.
+ *      mpt_spi_log_info - Log information returned from SCSI Parallel IOC.
  *      @ioc: Pointer to MPT_ADAPTER structure
  *      @mr: Pointer to MPT reply frame
  *      @log_info: U32 LogInfo word from the IOC
@@ -6054,7 +6218,7 @@ mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info)
  *      Refer to lsi/sp_log.h.
  */
 static void
-mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info)
+mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
 {
         u32 info = log_info & 0x00FF0000;
         char *desc = "unknown";
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 47053ac65068..ea2649ecad1f 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -76,8 +76,8 @@
 #define COPYRIGHT       "Copyright (c) 1999-2005 " MODULEAUTHOR
 #endif
 
-#define MPT_LINUX_VERSION_COMMON        "3.03.06"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.03.06"
+#define MPT_LINUX_VERSION_COMMON        "3.03.07"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.03.07"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
@@ -123,7 +123,7 @@
 #define  MPT_MAX_FRAME_SIZE             128
 #define  MPT_DEFAULT_FRAME_SIZE         128
 
-#define  MPT_REPLY_FRAME_SIZE           0x40  /* Must be a multiple of 8 */
+#define  MPT_REPLY_FRAME_SIZE           0x50  /* Must be a multiple of 8 */
 
 #define  MPT_SG_REQ_128_SCALE           1
 #define  MPT_SG_REQ_96_SCALE            2
@@ -510,9 +510,10 @@ struct mptfc_rport_info
 {
         struct list_head list;
         struct fc_rport *rport;
-        VirtDevice      *vdev;
+        struct scsi_target *starget;
         FCDevicePage0_t pg0;
         u8              flags;
+        u8              remap_needed;
 };
 
 /*
@@ -631,6 +632,7 @@ typedef struct _MPT_ADAPTER
         struct mutex             sas_topology_mutex;
         MPT_SAS_MGMT             sas_mgmt;
         int                      num_ports;
+        struct work_struct       mptscsih_persistTask;
 
         struct list_head         fc_rports;
         spinlock_t               fc_rport_lock; /* list and ri flags */
@@ -803,6 +805,12 @@ typedef struct _mpt_sge {
 #define dreplyprintk(x)
 #endif
 
+#ifdef DMPT_DEBUG_FC
+#define dfcprintk(x) printk x
+#else
+#define dfcprintk(x)
+#endif
+
 #ifdef MPT_DEBUG_TM
 #define dtmprintk(x) printk x
 #define DBG_DUMP_TM_REQUEST_FRAME(mfp) \
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index b102c7666d0e..c3a3499bce2a 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -93,10 +93,11 @@ static int	mptfcDoneCtx = -1;
 static int      mptfcTaskCtx = -1;
 static int      mptfcInternalCtx = -1; /* Used only for internal commands */
 
-int mptfc_slave_alloc(struct scsi_device *device);
+static int mptfc_target_alloc(struct scsi_target *starget);
+static int mptfc_slave_alloc(struct scsi_device *sdev);
 static int mptfc_qcmd(struct scsi_cmnd *SCpnt,
-    void (*done)(struct scsi_cmnd *));
-
+                      void (*done)(struct scsi_cmnd *));
+static void mptfc_target_destroy(struct scsi_target *starget);
 static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout);
 static void __devexit mptfc_remove(struct pci_dev *pdev);
 
@@ -107,10 +108,10 @@ static struct scsi_host_template mptfc_driver_template = {
         .name                           = "MPT FC Host",
         .info                           = mptscsih_info,
         .queuecommand                   = mptfc_qcmd,
-        .target_alloc                   = mptscsih_target_alloc,
+        .target_alloc                   = mptfc_target_alloc,
         .slave_alloc                    = mptfc_slave_alloc,
         .slave_configure                = mptscsih_slave_configure,
-        .target_destroy                 = mptscsih_target_destroy,
+        .target_destroy                 = mptfc_target_destroy,
         .slave_destroy                  = mptscsih_slave_destroy,
         .change_queue_depth             = mptscsih_change_queue_depth,
         .eh_abort_handler               = mptscsih_abort,
@@ -348,14 +349,33 @@ mptfc_generate_rport_ids(FCDevicePage0_t *pg0, struct fc_rport_identifiers *rid)
 }
 
 static void
+mptfc_remap_sdev(struct scsi_device *sdev, void *arg)
+{
+        VirtDevice              *vdev;
+        VirtTarget              *vtarget;
+        struct scsi_target      *starget;
+
+        starget = scsi_target(sdev);
+        if (starget->hostdata == arg) {
+                vtarget = arg;
+                vdev = sdev->hostdata;
+                if (vdev) {
+                        vdev->bus_id = vtarget->bus_id;
+                        vdev->target_id = vtarget->target_id;
+                }
+        }
+}
+
+static void
 mptfc_register_dev(MPT_ADAPTER *ioc, int channel, FCDevicePage0_t *pg0)
 {
         struct fc_rport_identifiers rport_ids;
         struct fc_rport         *rport;
         struct mptfc_rport_info *ri;
-        int                     match = 0;
-        u64                     port_name;
+        int                     new_ri = 1;
+        u64                     pn;
         unsigned long           flags;
+        VirtTarget              *vtarget;
 
         if (mptfc_generate_rport_ids(pg0, &rport_ids) < 0)
                 return;
@@ -363,14 +383,14 @@ mptfc_register_dev(MPT_ADAPTER *ioc, int channel, FCDevicePage0_t *pg0)
         /* scan list looking for a match */
         spin_lock_irqsave(&ioc->fc_rport_lock, flags);
         list_for_each_entry(ri, &ioc->fc_rports, list) {
-                port_name = (u64)ri->pg0.WWPN.High << 32 | (u64)ri->pg0.WWPN.Low;
-                if (port_name == rport_ids.port_name) { /* match */
+                pn = (u64)ri->pg0.WWPN.High << 32 | (u64)ri->pg0.WWPN.Low;
+                if (pn == rport_ids.port_name) {        /* match */
                         list_move_tail(&ri->list, &ioc->fc_rports);
-                        match = 1;
+                        new_ri = 0;
                         break;
                 }
         }
-        if (!match) {   /* allocate one */
+        if (new_ri) {   /* allocate one */
                 spin_unlock_irqrestore(&ioc->fc_rport_lock, flags);
                 ri = kzalloc(sizeof(struct mptfc_rport_info), GFP_KERNEL);
                 if (!ri)
@@ -382,40 +402,43 @@ mptfc_register_dev(MPT_ADAPTER *ioc, int channel, FCDevicePage0_t *pg0)
         ri->pg0 = *pg0; /* add/update pg0 data */
         ri->flags &= ~MPT_RPORT_INFO_FLAGS_MISSING;
 
+        /* MPT_RPORT_INFO_FLAGS_REGISTERED - rport not previously deleted */
         if (!(ri->flags & MPT_RPORT_INFO_FLAGS_REGISTERED)) {
                 ri->flags |= MPT_RPORT_INFO_FLAGS_REGISTERED;
                 spin_unlock_irqrestore(&ioc->fc_rport_lock, flags);
-                rport = fc_remote_port_add(ioc->sh,channel, &rport_ids);
+                rport = fc_remote_port_add(ioc->sh, channel, &rport_ids);
                 spin_lock_irqsave(&ioc->fc_rport_lock, flags);
                 if (rport) {
-                        if (*((struct mptfc_rport_info **)rport->dd_data) != ri) {
-                                ri->flags &= ~MPT_RPORT_INFO_FLAGS_MAPPED_VDEV;
-                                ri->vdev = NULL;
-                                ri->rport = rport;
-                                *((struct mptfc_rport_info **)rport->dd_data) = ri;
-                        }
-                        rport->dev_loss_tmo = mptfc_dev_loss_tmo;
+                        ri->rport = rport;
+                        if (new_ri) /* may have been reset by user */
+                                rport->dev_loss_tmo = mptfc_dev_loss_tmo;
+                        *((struct mptfc_rport_info **)rport->dd_data) = ri;
                         /*
                          * if already mapped, remap here.  If not mapped,
-                         * slave_alloc will allocate vdev and map
+                         * target_alloc will allocate vtarget and map,
+                         * slave_alloc will fill in vdev from vtarget.
                          */
-                        if (ri->flags & MPT_RPORT_INFO_FLAGS_MAPPED_VDEV) {
-                                ri->vdev->target_id = ri->pg0.CurrentTargetID;
-                                ri->vdev->bus_id = ri->pg0.CurrentBus;
-                                ri->vdev->vtarget->target_id = ri->vdev->target_id;
-                                ri->vdev->vtarget->bus_id = ri->vdev->bus_id;
+                        if (ri->starget) {
+                                vtarget = ri->starget->hostdata;
+                                if (vtarget) {
+                                        vtarget->target_id = pg0->CurrentTargetID;
+                                        vtarget->bus_id = pg0->CurrentBus;
+                                        starget_for_each_device(ri->starget,
+                                                vtarget,mptfc_remap_sdev);
+                                }
+                                ri->remap_needed = 0;
                         }
-                        #ifdef MPT_DEBUG
-                        printk ("mptfc_reg_dev.%d: %x, %llx / %llx, tid %d, "
+                        dfcprintk ((MYIOC_s_INFO_FMT
+                                "mptfc_reg_dev.%d: %x, %llx / %llx, tid %d, "
                                 "rport tid %d, tmo %d\n",
-                                        ioc->sh->host_no,
+                                        ioc->name,
+                                        oc->sh->host_no,
                                         pg0->PortIdentifier,
                                         pg0->WWNN,
                                         pg0->WWPN,
                                         pg0->CurrentTargetID,
                                         ri->rport->scsi_target_id,
-                                        ri->rport->dev_loss_tmo);
-                        #endif
+                                        ri->rport->dev_loss_tmo));
                 } else {
                         list_del(&ri->list);
                         kfree(ri);
@@ -427,6 +450,65 @@ mptfc_register_dev(MPT_ADAPTER *ioc, int channel, FCDevicePage0_t *pg0)
 }
 
 /*
+ *      OS entry point to allow for host driver to free allocated memory
+ *      Called if no device present or device being unloaded
+ */
+static void
+mptfc_target_destroy(struct scsi_target *starget)
+{
+        struct fc_rport         *rport;
+        struct mptfc_rport_info *ri;
+
+        rport = starget_to_rport(starget);
+        if (rport) {
+                ri = *((struct mptfc_rport_info **)rport->dd_data);
+                if (ri) /* better be! */
+                        ri->starget = NULL;
+        }
+        if (starget->hostdata)
+                kfree(starget->hostdata);
+        starget->hostdata = NULL;
+}
+
+/*
+ *      OS entry point to allow host driver to alloc memory
+ *      for each scsi target. Called once per device the bus scan.
+ *      Return non-zero if allocation fails.
+ */
+static int
+mptfc_target_alloc(struct scsi_target *starget)
+{
+        VirtTarget              *vtarget;
+        struct fc_rport         *rport;
+        struct mptfc_rport_info *ri;
+        int                     rc;
+
+        vtarget = kzalloc(sizeof(VirtTarget), GFP_KERNEL);
+        if (!vtarget)
+                return -ENOMEM;
+        starget->hostdata = vtarget;
+
+        rc = -ENODEV;
+        rport = starget_to_rport(starget);
+        if (rport) {
+                ri = *((struct mptfc_rport_info **)rport->dd_data);
+                if (ri) {       /* better be! */
+                        vtarget->target_id = ri->pg0.CurrentTargetID;
+                        vtarget->bus_id = ri->pg0.CurrentBus;
+                        ri->starget = starget;
+                        ri->remap_needed = 0;
+                        rc = 0;
+                }
+        }
+        if (rc != 0) {
+                kfree(vtarget);
+                starget->hostdata = NULL;
+        }
+
+        return rc;
+}
+
+/*
  *      OS entry point to allow host driver to alloc memory
  *      for each scsi device. Called once per device the bus scan.
  *      Return non-zero if allocation fails.
@@ -440,7 +522,6 @@ mptfc_slave_alloc(struct scsi_device *sdev)
         VirtDevice              *vdev;
         struct scsi_target      *starget;
         struct fc_rport         *rport;
-        struct mptfc_rport_info *ri;
         unsigned long           flags;
 
 
@@ -451,55 +532,44 @@ mptfc_slave_alloc(struct scsi_device *sdev)
 
         hd = (MPT_SCSI_HOST *)sdev->host->hostdata;
 
-        vdev = kmalloc(sizeof(VirtDevice), GFP_KERNEL);
+        vdev = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
         if (!vdev) {
                 printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",
                                 hd->ioc->name, sizeof(VirtDevice));
                 return -ENOMEM;
         }
-        memset(vdev, 0, sizeof(VirtDevice));
 
         spin_lock_irqsave(&hd->ioc->fc_rport_lock,flags);
 
-        if (!(ri = *((struct mptfc_rport_info **)rport->dd_data))) {
-                spin_unlock_irqrestore(&hd->ioc->fc_rport_lock,flags);
-                kfree(vdev);
-                return -ENODEV;
-        }
-
         sdev->hostdata = vdev;
         starget = scsi_target(sdev);
         vtarget = starget->hostdata;
+
         if (vtarget->num_luns == 0) {
+                vtarget->ioc_id = hd->ioc->id;
                 vtarget->tflags = MPT_TARGET_FLAGS_Q_YES |
                                   MPT_TARGET_FLAGS_VALID_INQUIRY;
                 hd->Targets[sdev->id] = vtarget;
         }
 
-        vtarget->target_id = vdev->target_id;
-        vtarget->bus_id = vdev->bus_id;
-
         vdev->vtarget = vtarget;
         vdev->ioc_id = hd->ioc->id;
         vdev->lun = sdev->lun;
-        vdev->target_id = ri->pg0.CurrentTargetID;
-        vdev->bus_id = ri->pg0.CurrentBus;
-
-        ri->flags |= MPT_RPORT_INFO_FLAGS_MAPPED_VDEV;
-        ri->vdev = vdev;
+        vdev->target_id = vtarget->target_id;
+        vdev->bus_id = vtarget->bus_id;
 
         spin_unlock_irqrestore(&hd->ioc->fc_rport_lock,flags);
 
         vtarget->num_luns++;
 
-#ifdef MPT_DEBUG
-        printk ("mptfc_slv_alloc.%d: num_luns %d, sdev.id %d, "
+        dfcprintk ((MYIOC_s_INFO_FMT
+                "mptfc_slv_alloc.%d: num_luns %d, sdev.id %d, "
                 "CurrentTargetID %d, %x %llx %llx\n",
-                        sdev->host->host_no,
-                        vtarget->num_luns,
-                        sdev->id, ri->pg0.CurrentTargetID,
-                        ri->pg0.PortIdentifier, ri->pg0.WWPN, ri->pg0.WWNN);
-#endif
+                ioc->name,
+                sdev->host->host_no,
+                vtarget->num_luns,
+                sdev->id, ri->pg0.CurrentTargetID,
+                ri->pg0.PortIdentifier, ri->pg0.WWPN, ri->pg0.WWNN));
 
         return 0;
 }
@@ -507,6 +577,7 @@ mptfc_slave_alloc(struct scsi_device *sdev)
 static int
 mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
+        struct mptfc_rport_info *ri;
         struct fc_rport *rport = starget_to_rport(scsi_target(SCpnt->device));
         int             err;
 
@@ -516,6 +587,10 @@ mptfc_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
                 done(SCpnt);
                 return 0;
         }
+        ri = *((struct mptfc_rport_info **)rport->dd_data);
+        if (unlikely(ri->remap_needed))
+                return SCSI_MLQUEUE_HOST_BUSY;
+
         return mptscsih_qcmd(SCpnt,done);
 }
 
@@ -591,16 +666,20 @@ mptfc_rescan_devices(void *arg)
 
                                 ri->flags &= ~(MPT_RPORT_INFO_FLAGS_REGISTERED|
                                                MPT_RPORT_INFO_FLAGS_MISSING);
+                                ri->remap_needed = 1;
                                 fc_remote_port_delete(ri->rport);
                                 /*
                                  * remote port not really deleted 'cause
                                  * binding is by WWPN and driver only
-                                 * registers FCP_TARGETs
+                                 * registers FCP_TARGETs but cannot trust
+                                 * data structures.
                                  */
-                                #ifdef MPT_DEBUG
-                                printk ("mptfc_rescan.%d: %llx deleted\n",
-                                        ioc->sh->host_no, ri->pg0.WWPN);
-                                #endif
+                                ri->rport = NULL;
+                                dfcprintk ((MYIOC_s_INFO_FMT
+                                        "mptfc_rescan.%d: %llx deleted\n",
+                                        ioc->name,
+                                        ioc->sh->host_no,
+                                        ri->pg0.WWPN));
                         }
                 }
                 spin_unlock_irqrestore(&ioc->fc_rport_lock,flags);
@@ -872,9 +951,8 @@ mptfc_init(void)
         }
 
         error = pci_register_driver(&mptfc_driver);
-        if (error) {
+        if (error)
                 fc_release_transport(mptfc_transport_template);
-        }
 
         return error;
 }
@@ -885,7 +963,8 @@ mptfc_init(void)
  *      @pdev: Pointer to pci_dev structure
  *
  */
-static void __devexit mptfc_remove(struct pci_dev *pdev)
+static void __devexit
+mptfc_remove(struct pci_dev *pdev)
 {
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
         struct mptfc_rport_info *p, *n;
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 5a06d8d8694e..2512d0e6155e 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -89,6 +89,8 @@ static int	mptsasMgmtCtx = -1;
 enum mptsas_hotplug_action {
         MPTSAS_ADD_DEVICE,
         MPTSAS_DEL_DEVICE,
+        MPTSAS_ADD_RAID,
+        MPTSAS_DEL_RAID,
 };
 
 struct mptsas_hotplug_event {
@@ -114,6 +116,7 @@ struct mptsas_hotplug_event {
 
 struct mptsas_devinfo {
         u16     handle;         /* unique id to address this device */
+        u16     handle_parent;  /* unique id to address parent device */
         u8      phy_id;         /* phy number of parent device */
         u8      port_id;        /* sas physical port this device
                                    is assoc'd with */
@@ -301,9 +304,8 @@ mptsas_slave_alloc(struct scsi_device *sdev)
         }
         mutex_unlock(&hd->ioc->sas_topology_mutex);
 
-        printk("No matching SAS device found!!\n");
         kfree(vdev);
-        return -ENODEV;
+        return -ENXIO;
 
  out:
         vtarget->ioc_id = vdev->ioc_id;
@@ -321,6 +323,7 @@ mptsas_slave_destroy(struct scsi_device *sdev)
         struct sas_rphy *rphy;
         struct mptsas_portinfo *p;
         int i;
+        VirtDevice *vdev;
 
         /*
          * Handle hotplug removal case.
@@ -344,8 +347,29 @@ mptsas_slave_destroy(struct scsi_device *sdev)
  out:
         mutex_unlock(&hd->ioc->sas_topology_mutex);
         /*
-         * TODO: Issue target reset to flush firmware outstanding commands.
+         * Issue target reset to flush firmware outstanding commands.
          */
+        vdev = sdev->hostdata;
+        if (vdev->configured_lun){
+                if (mptscsih_TMHandler(hd,
+                     MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET,
+                     vdev->bus_id,
+                     vdev->target_id,
+                     0, 0, 5 /* 5 second timeout */)
+                     < 0){
+
+                        /* The TM request failed!
+                         * Fatal error case.
+                         */
+                        printk(MYIOC_s_WARN_FMT
+                       "Error processing TaskMgmt id=%d TARGET_RESET\n",
+                                hd->ioc->name,
+                                vdev->target_id);
+
+                        hd->tmPending = 0;
+                        hd->tmState = TM_STATE_NONE;
+                }
+        }
         mptscsih_slave_destroy(sdev);
 }
 
@@ -714,6 +738,7 @@ mptsas_sas_device_pg0(MPT_ADAPTER *ioc, struct mptsas_devinfo *device_info,
         mptsas_print_device_pg0(buffer);
 
         device_info->handle = le16_to_cpu(buffer->DevHandle);
+        device_info->handle_parent = le16_to_cpu(buffer->ParentDevHandle);
         device_info->phy_id = buffer->PhyNum;
         device_info->port_id = buffer->PhysicalPort;
         device_info->id = buffer->TargetID;
@@ -863,6 +888,26 @@ mptsas_sas_expander_pg1(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info,
         return error;
 }
 
+/*
+ * Returns true if there is a scsi end device
+ */
+static inline int
+mptsas_is_end_device(struct mptsas_devinfo * attached)
+{
+        if ((attached->handle) &&
+            (attached->device_info &
+            MPI_SAS_DEVICE_INFO_END_DEVICE) &&
+            ((attached->device_info &
+            MPI_SAS_DEVICE_INFO_SSP_TARGET) |
+            (attached->device_info &
+            MPI_SAS_DEVICE_INFO_STP_TARGET) |
+            (attached->device_info &
+            MPI_SAS_DEVICE_INFO_SATA_DEVICE)))
+                return 1;
+        else
+                return 0;
+}
+
 static void
 mptsas_parse_device_info(struct sas_identify *identify,
                 struct mptsas_devinfo *device_info)
@@ -1227,7 +1272,7 @@ mptsas_find_phyinfo_by_parent(MPT_ADAPTER *ioc, u16 parent_handle, u8 phy_id)
 }
 
 static struct mptsas_phyinfo *
-mptsas_find_phyinfo_by_handle(MPT_ADAPTER *ioc, u16 handle)
+mptsas_find_phyinfo_by_target(MPT_ADAPTER *ioc, u32 id)
 {
         struct mptsas_portinfo *port_info;
         struct mptsas_phyinfo *phy_info = NULL;
@@ -1239,12 +1284,12 @@ mptsas_find_phyinfo_by_handle(MPT_ADAPTER *ioc, u16 handle)
          */
         mutex_lock(&ioc->sas_topology_mutex);
         list_for_each_entry(port_info, &ioc->sas_topology, list) {
-                for (i = 0; i < port_info->num_phys; i++) {
-                        if (port_info->phy_info[i].attached.handle == handle) {
-                                phy_info = &port_info->phy_info[i];
-                                break;
-                        }
-                }
+                for (i = 0; i < port_info->num_phys; i++)
+                        if (mptsas_is_end_device(&port_info->phy_info[i].attached))
+                                if (port_info->phy_info[i].attached.id == id) {
+                                        phy_info = &port_info->phy_info[i];
+                                        break;
+                                }
         }
         mutex_unlock(&ioc->sas_topology_mutex);
 
@@ -1258,36 +1303,58 @@ mptsas_hotplug_work(void *arg)
         MPT_ADAPTER *ioc = ev->ioc;
         struct mptsas_phyinfo *phy_info;
         struct sas_rphy *rphy;
+        struct scsi_device *sdev;
         char *ds = NULL;
-
-        if (ev->device_info & MPI_SAS_DEVICE_INFO_SSP_TARGET)
-                ds = "ssp";
-        if (ev->device_info & MPI_SAS_DEVICE_INFO_STP_TARGET)
-                ds = "stp";
-        if (ev->device_info & MPI_SAS_DEVICE_INFO_SATA_DEVICE)
-                ds = "sata";
+        struct mptsas_devinfo sas_device;
 
         switch (ev->event_type) {
         case MPTSAS_DEL_DEVICE:
-                printk(MYIOC_s_INFO_FMT
-                       "removing %s device, channel %d, id %d, phy %d\n",
-                       ioc->name, ds, ev->channel, ev->id, ev->phy_id);
 
-                phy_info = mptsas_find_phyinfo_by_handle(ioc, ev->handle);
+                phy_info = mptsas_find_phyinfo_by_target(ioc, ev->id);
                 if (!phy_info) {
                         printk("mptsas: remove event for non-existant PHY.\n");
                         break;
                 }
 
+                if (phy_info->attached.device_info & MPI_SAS_DEVICE_INFO_SSP_TARGET)
+                        ds = "ssp";
+                if (phy_info->attached.device_info & MPI_SAS_DEVICE_INFO_STP_TARGET)
+                        ds = "stp";
+                if (phy_info->attached.device_info & MPI_SAS_DEVICE_INFO_SATA_DEVICE)
+                        ds = "sata";
+
+                printk(MYIOC_s_INFO_FMT
+                       "removing %s device, channel %d, id %d, phy %d\n",
+                       ioc->name, ds, ev->channel, ev->id, phy_info->phy_id);
+
                 if (phy_info->rphy) {
                         sas_rphy_delete(phy_info->rphy);
                         phy_info->rphy = NULL;
                 }
                 break;
         case MPTSAS_ADD_DEVICE:
-                printk(MYIOC_s_INFO_FMT
-                       "attaching %s device, channel %d, id %d, phy %d\n",
-                       ioc->name, ds, ev->channel, ev->id, ev->phy_id);
+
+                /*
+                 * When there is no sas address,
+                 * RAID volumes are being deleted,
+                 * and hidden phy disk are being added.
+                 * We don't know the SAS data yet,
+                 * so lookup sas device page to get
+                 * pertaining info
+                 */
+                if (!ev->sas_address) {
+                        if (mptsas_sas_device_pg0(ioc,
+                            &sas_device, ev->id,
+                            (MPI_SAS_DEVICE_PGAD_FORM_BUS_TARGET_ID <<
+                             MPI_SAS_DEVICE_PGAD_FORM_SHIFT)))
+                                break;
+                        ev->handle = sas_device.handle;
+                        ev->parent_handle = sas_device.handle_parent;
+                        ev->channel = sas_device.channel;
+                        ev->phy_id = sas_device.phy_id;
+                        ev->sas_address = sas_device.sas_address;
+                        ev->device_info = sas_device.device_info;
+                }
 
                 phy_info = mptsas_find_phyinfo_by_parent(ioc,
                                 ev->parent_handle, ev->phy_id);
@@ -1310,10 +1377,23 @@ mptsas_hotplug_work(void *arg)
                 phy_info->attached.sas_address = ev->sas_address;
                 phy_info->attached.device_info = ev->device_info;
 
+                if (phy_info->attached.device_info & MPI_SAS_DEVICE_INFO_SSP_TARGET)
+                        ds = "ssp";
+                if (phy_info->attached.device_info & MPI_SAS_DEVICE_INFO_STP_TARGET)
+                        ds = "stp";
+                if (phy_info->attached.device_info & MPI_SAS_DEVICE_INFO_SATA_DEVICE)
+                        ds = "sata";
+
+                printk(MYIOC_s_INFO_FMT
+                       "attaching %s device, channel %d, id %d, phy %d\n",
+                       ioc->name, ds, ev->channel, ev->id, ev->phy_id);
+
+
                 rphy = sas_rphy_alloc(phy_info->phy);
                 if (!rphy)
                         break; /* non-fatal: an rphy can be added later */
 
+                rphy->scsi_target_id = phy_info->attached.id;
                 mptsas_parse_device_info(&rphy->identify, &phy_info->attached);
                 if (sas_rphy_add(rphy)) {
                         sas_rphy_free(rphy);
@@ -1322,6 +1402,40 @@ mptsas_hotplug_work(void *arg)
 
                 phy_info->rphy = rphy;
                 break;
+        case MPTSAS_ADD_RAID:
+                sdev = scsi_device_lookup(
+                        ioc->sh,
+                        ioc->num_ports,
+                        ev->id,
+                        0);
+                if (sdev) {
+                        scsi_device_put(sdev);
+                        break;
+                }
+                printk(MYIOC_s_INFO_FMT
+                       "attaching device, channel %d, id %d\n",
+                       ioc->name, ioc->num_ports, ev->id);
+                scsi_add_device(ioc->sh,
+                        ioc->num_ports,
+                        ev->id,
+                        0);
+                mpt_findImVolumes(ioc);
+                break;
+        case MPTSAS_DEL_RAID:
+                sdev = scsi_device_lookup(
+                        ioc->sh,
+                        ioc->num_ports,
+                        ev->id,
+                        0);
+                if (!sdev)
+                        break;
+                printk(MYIOC_s_INFO_FMT
+                       "removing device, channel %d, id %d\n",
+                       ioc->name, ioc->num_ports, ev->id);
+                scsi_remove_device(sdev);
+                scsi_device_put(sdev);
+                mpt_findImVolumes(ioc);
+                break;
         }
 
         kfree(ev);
@@ -1372,23 +1486,94 @@ mptscsih_send_sas_event(MPT_ADAPTER *ioc,
         schedule_work(&ev->work);
 }
 
+static void
+mptscsih_send_raid_event(MPT_ADAPTER *ioc,
+                EVENT_DATA_RAID *raid_event_data)
+{
+        struct mptsas_hotplug_event *ev;
+        RAID_VOL0_STATUS * volumeStatus;
+
+        if (ioc->bus_type != SAS)
+                return;
+
+        ev = kmalloc(sizeof(*ev), GFP_ATOMIC);
+        if (!ev) {
+                printk(KERN_WARNING "mptsas: lost hotplug event\n");
+                return;
+        }
+
+        memset(ev,0,sizeof(struct mptsas_hotplug_event));
+        INIT_WORK(&ev->work, mptsas_hotplug_work, ev);
+        ev->ioc = ioc;
+        ev->id = raid_event_data->VolumeID;
+
+        switch (raid_event_data->ReasonCode) {
+        case MPI_EVENT_RAID_RC_PHYSDISK_DELETED:
+                ev->event_type = MPTSAS_ADD_DEVICE;
+                break;
+        case MPI_EVENT_RAID_RC_PHYSDISK_CREATED:
+                ev->event_type = MPTSAS_DEL_DEVICE;
+                break;
+        case MPI_EVENT_RAID_RC_VOLUME_DELETED:
+                ev->event_type = MPTSAS_DEL_RAID;
+                break;
+        case MPI_EVENT_RAID_RC_VOLUME_CREATED:
+                ev->event_type = MPTSAS_ADD_RAID;
+                break;
+        case MPI_EVENT_RAID_RC_VOLUME_STATUS_CHANGED:
+                volumeStatus = (RAID_VOL0_STATUS *) &
+                    raid_event_data->SettingsStatus;
+                ev->event_type = (volumeStatus->State ==
+                    MPI_RAIDVOL0_STATUS_STATE_FAILED) ?
+                    MPTSAS_DEL_RAID : MPTSAS_ADD_RAID;
+                break;
+        default:
+                break;
+        }
+        schedule_work(&ev->work);
+}
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+/* work queue thread to clear the persitency table */
+static void
+mptscsih_sas_persist_clear_table(void * arg)
+{
+        MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;
+
+        mptbase_sas_persist_operation(ioc, MPI_SAS_OP_CLEAR_NOT_PRESENT);
+}
+
 static int
 mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
 {
+        int rc=1;
         u8 event = le32_to_cpu(reply->Event) & 0xFF;
 
         if (!ioc->sh)
-                return 1;
+                goto out;
 
         switch (event) {
         case MPI_EVENT_SAS_DEVICE_STATUS_CHANGE:
                 mptscsih_send_sas_event(ioc,
                         (EVENT_DATA_SAS_DEVICE_STATUS_CHANGE *)reply->Data);
-                return 1;               /* currently means nothing really */
-
+                break;
+        case MPI_EVENT_INTEGRATED_RAID:
+                mptscsih_send_raid_event(ioc,
+                        (EVENT_DATA_RAID *)reply->Data);
+                break;
+        case MPI_EVENT_PERSISTENT_TABLE_FULL:
+                INIT_WORK(&ioc->mptscsih_persistTask,
+                    mptscsih_sas_persist_clear_table,
+                    (void *)ioc);
+                schedule_work(&ioc->mptscsih_persistTask);
+                break;
         default:
-                return mptscsih_event_process(ioc, reply);
+                rc = mptscsih_event_process(ioc, reply);
+                break;
         }
+ out:
+
+        return rc;
 }
 
 static int
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index cdac5578fdf2..05789e505464 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -144,7 +144,6 @@ static int	mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd);
 static int      mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout );
 static u32      SCPNT_TO_LOOKUP_IDX(struct scsi_cmnd *sc);
 
-static int      mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout);
 static int      mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout);
 
 int             mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
@@ -159,11 +158,9 @@ static int	mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus);
 int             mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
 static int      mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *iocmd);
 static void     mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, VirtDevice *vdevice);
-static void     mptscsih_negotiate_to_asyn_narrow(MPT_SCSI_HOST *hd, VirtTarget *vtarget);
+static void     mptscsih_negotiate_to_asyn_narrow(MPT_SCSI_HOST *hd, VirtDevice *vdevice);
 static int      mptscsih_is_phys_disk(MPT_ADAPTER *ioc, int id);
 
-static struct work_struct   mptscsih_persistTask;
-
 #ifdef MPTSCSIH_ENABLE_DOMAIN_VALIDATION
 static int      mptscsih_do_raid(MPT_SCSI_HOST *hd, u8 action, INTERNAL_CMD *io);
 static void     mptscsih_domainValidation(void *hd);
@@ -563,11 +560,24 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
         MPT_SCSI_HOST   *hd;
         SCSIIORequest_t *pScsiReq;
         SCSIIOReply_t   *pScsiReply;
-        u16              req_idx;
+        u16              req_idx, req_idx_MR;
 
         hd = (MPT_SCSI_HOST *) ioc->sh->hostdata;
 
         req_idx = le16_to_cpu(mf->u.frame.hwhdr.msgctxu.fld.req_idx);
+        req_idx_MR = (mr != NULL) ?
+            le16_to_cpu(mr->u.frame.hwhdr.msgctxu.fld.req_idx) : req_idx;
+        if ((req_idx != req_idx_MR) ||
+            (mf->u.frame.linkage.arg1 == 0xdeadbeaf)) {
+                printk(MYIOC_s_ERR_FMT "Received a mf that was already freed\n",
+                    ioc->name);
+                printk (MYIOC_s_ERR_FMT
+                    "req_idx=%x req_idx_MR=%x mf=%p mr=%p sc=%p\n",
+                    ioc->name, req_idx, req_idx_MR, mf, mr,
+                    hd->ScsiLookup[req_idx_MR]);
+                return 0;
+        }
+
         sc = hd->ScsiLookup[req_idx];
         if (sc == NULL) {
                 MPIHeader_t *hdr = (MPIHeader_t *)mf;
@@ -730,6 +740,8 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
 
                         break;
 
+                case MPI_IOCSTATUS_SCSI_DATA_OVERRUN:           /* 0x0044 */
+                        sc->resid=0;
                 case MPI_IOCSTATUS_SCSI_RECOVERED_ERROR:        /* 0x0040 */
                 case MPI_IOCSTATUS_SUCCESS:                     /* 0x0000 */
                         if (scsi_status == MPI_SCSI_STATUS_BUSY)
@@ -789,7 +801,6 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                 case MPI_IOCSTATUS_INSUFFICIENT_RESOURCES:      /* 0x0006 */
                 case MPI_IOCSTATUS_INVALID_FIELD:               /* 0x0007 */
                 case MPI_IOCSTATUS_INVALID_STATE:               /* 0x0008 */
-                case MPI_IOCSTATUS_SCSI_DATA_OVERRUN:           /* 0x0044 */
                 case MPI_IOCSTATUS_SCSI_IO_DATA_ERROR:          /* 0x0046 */
                 case MPI_IOCSTATUS_SCSI_TASK_MGMT_FAILED:       /* 0x004A */
                 default:
@@ -1530,7 +1541,7 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx)
  *
  *      Returns 0 for SUCCESS or -1 if FAILED.
  */
-static int
+int
 mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout)
 {
         MPT_ADAPTER     *ioc;
@@ -1721,6 +1732,20 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun
         return retval;
 }
 
+static int
+mptscsih_get_tm_timeout(MPT_ADAPTER *ioc)
+{
+        switch (ioc->bus_type) {
+        case FC:
+                return 40;
+        case SAS:
+                return 10;
+        case SPI:
+        default:
+                return 2;
+        }
+}
+
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mptscsih_abort - Abort linux scsi_cmnd routine, new_eh variant
@@ -1792,7 +1817,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
         vdev = SCpnt->device->hostdata;
         retval = mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK,
                 vdev->bus_id, vdev->target_id, vdev->lun,
-                ctx2abort, 2 /* 2 second timeout */);
+                ctx2abort, mptscsih_get_tm_timeout(ioc));
 
         printk (KERN_WARNING MYNAM ": %s: task abort: %s (sc=%p)\n",
                 hd->ioc->name,
@@ -1843,7 +1868,7 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
         vdev = SCpnt->device->hostdata;
         retval = mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET,
                 vdev->bus_id, vdev->target_id,
-                0, 0, 5 /* 5 second timeout */);
+                0, 0, mptscsih_get_tm_timeout(hd->ioc));
 
         printk (KERN_WARNING MYNAM ": %s: target reset: %s (sc=%p)\n",
                 hd->ioc->name,
@@ -1893,7 +1918,7 @@ mptscsih_bus_reset(struct scsi_cmnd * SCpnt)
 
         vdev = SCpnt->device->hostdata;
         retval = mptscsih_TMHandler(hd, MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
-                vdev->bus_id, 0, 0, 0, 5 /* 5 second timeout */);
+                vdev->bus_id, 0, 0, 0, mptscsih_get_tm_timeout(hd->ioc));
 
         printk (KERN_WARNING MYNAM ": %s: bus reset: %s (sc=%p)\n",
                 hd->ioc->name,
@@ -2016,6 +2041,42 @@ mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout )
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
+static void
+mptscsih_taskmgmt_response_code(MPT_ADAPTER *ioc, u8 response_code)
+{
+        char *desc;
+
+        switch (response_code) {
+        case MPI_SCSITASKMGMT_RSP_TM_COMPLETE:
+                desc = "The task completed.";
+                break;
+        case MPI_SCSITASKMGMT_RSP_INVALID_FRAME:
+                desc = "The IOC received an invalid frame status.";
+                break;
+        case MPI_SCSITASKMGMT_RSP_TM_NOT_SUPPORTED:
+                desc = "The task type is not supported.";
+                break;
+        case MPI_SCSITASKMGMT_RSP_TM_FAILED:
+                desc = "The requested task failed.";
+                break;
+        case MPI_SCSITASKMGMT_RSP_TM_SUCCEEDED:
+                desc = "The task completed successfully.";
+                break;
+        case MPI_SCSITASKMGMT_RSP_TM_INVALID_LUN:
+                desc = "The LUN request is invalid.";
+                break;
+        case MPI_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC:
+                desc = "The task is in the IOC queue and has not been sent to target.";
+                break;
+        default:
+                desc = "unknown";
+                break;
+        }
+        printk(MYIOC_s_INFO_FMT "Response Code(0x%08x): F/W: %s\n",
+                ioc->name, response_code, desc);
+}
+
+/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mptscsih_taskmgmt_complete - Registered with Fusion MPT base driver
  *      @ioc: Pointer to MPT_ADAPTER structure
@@ -2064,6 +2125,11 @@ mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *m
                 /* Figure out if this was ABORT_TASK, TARGET_RESET, or BUS_RESET! */
                 tmType = pScsiTmReq->TaskType;
 
+                if (ioc->facts.MsgVersion >= MPI_VERSION_01_05 &&
+                    pScsiTmReply->ResponseCode)
+                        mptscsih_taskmgmt_response_code(ioc,
+                            pScsiTmReply->ResponseCode);
+
                 dtmprintk((MYIOC_s_WARN_FMT "  TaskType = %d, TerminationCount=%d\n",
                                 ioc->name, tmType, le32_to_cpu(pScsiTmReply->TerminationCount)));
                 DBG_DUMP_TM_REPLY_FRAME((u32 *)pScsiTmReply);
@@ -2255,7 +2321,7 @@ mptscsih_slave_destroy(struct scsi_device *sdev)
         vtarget->luns[0] &= ~(1 << vdevice->lun);
         vtarget->num_luns--;
         if (vtarget->num_luns == 0) {
-                mptscsih_negotiate_to_asyn_narrow(hd, vtarget);
+                mptscsih_negotiate_to_asyn_narrow(hd, vdevice);
                 if (hd->ioc->bus_type == SPI) {
                         if (mptscsih_is_phys_disk(hd->ioc, vtarget->target_id)) {
                                 hd->ioc->spi_data.forceDv |= MPT_SCSICFG_RELOAD_IOC_PG3;
@@ -2585,16 +2651,6 @@ mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/* work queue thread to clear the persitency table */
-static void
-mptscsih_sas_persist_clear_table(void * arg)
-{
-        MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;
-
-        mptbase_sas_persist_operation(ioc, MPI_SAS_OP_CLEAR_NOT_PRESENT);
-}
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 int
 mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
 {
@@ -2656,13 +2712,6 @@ mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
                 break;
         }
 
-        /* Persistent table is full. */
-        case MPI_EVENT_PERSISTENT_TABLE_FULL:
-                INIT_WORK(&mptscsih_persistTask,
-                    mptscsih_sas_persist_clear_table,(void *)ioc);
-                schedule_work(&mptscsih_persistTask);
-                break;
-
         case MPI_EVENT_NONE:                            /* 00 */
         case MPI_EVENT_LOG_DATA:                        /* 01 */
         case MPI_EVENT_STATE_CHANGE:                    /* 02 */
@@ -3863,8 +3912,9 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io)
  *
  */
 static void
-mptscsih_negotiate_to_asyn_narrow(MPT_SCSI_HOST *hd, VirtTarget *vtarget)
+mptscsih_negotiate_to_asyn_narrow(MPT_SCSI_HOST *hd, VirtDevice *vdevice)
 {
+        VirtTarget              *vtarget = vdevice->vtarget;
         MPT_ADAPTER             *ioc= hd->ioc;
         SCSIDevicePage1_t       *pcfg1Data;
         CONFIGPARMS              cfg;
@@ -3874,7 +3924,8 @@ mptscsih_negotiate_to_asyn_narrow(MPT_SCSI_HOST *hd, VirtTarget *vtarget)
         int                      requested, configuration, data,i;
         u8                       flags, factor;
 
-        if (ioc->bus_type != SPI)
+        if ((ioc->bus_type != SPI) ||
+                (!vdevice->configured_lun))
                 return;
 
         if (!ioc->spi_data.sdp1length)
@@ -3910,7 +3961,7 @@ mptscsih_negotiate_to_asyn_narrow(MPT_SCSI_HOST *hd, VirtTarget *vtarget)
                         }
                         mptscsih_setDevicePage1Flags(0, MPT_ASYNC, 0, &requested,
                                 &configuration, flags);
-                        dnegoprintk(("syncronize cache: id=%d width=0 factor=MPT_ASYNC "
+                        dnegoprintk(("nego asyn narrow: id=%d width=0 factor=MPT_ASYNC "
                                 "offset=0 negoFlags=%x request=%x config=%x\n",
                                 id, flags, requested, configuration));
                         pcfg1Data->RequestedParameters = cpu_to_le32(requested);
@@ -3923,7 +3974,7 @@ mptscsih_negotiate_to_asyn_narrow(MPT_SCSI_HOST *hd, VirtTarget *vtarget)
                 flags = vtarget->negoFlags;
                 mptscsih_setDevicePage1Flags(0, MPT_ASYNC, 0, &requested,
                                 &configuration, flags);
-                dnegoprintk(("syncronize cache: id=%d width=0 factor=MPT_ASYNC "
+                dnegoprintk(("nego asyn narrow: id=%d width=0 factor=MPT_ASYNC "
                         "offset=0 negoFlags=%x request=%x config=%x\n",
                         vtarget->target_id, flags, requested, configuration));
                 pcfg1Data->RequestedParameters = cpu_to_le32(requested);
@@ -5620,5 +5671,6 @@ EXPORT_SYMBOL(mptscsih_event_process);
 EXPORT_SYMBOL(mptscsih_ioc_reset);
 EXPORT_SYMBOL(mptscsih_change_queue_depth);
 EXPORT_SYMBOL(mptscsih_timer_expired);
+EXPORT_SYMBOL(mptscsih_TMHandler);
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index d3cba12f4bd9..44b248d51ea3 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -108,3 +108,4 @@ extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pE
 extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
 extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth);
 extern void mptscsih_timer_expired(unsigned long data);
+extern int mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout);
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 7dce29277cb7..f148dfa39117 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -384,6 +384,14 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto out_mptspi_probe;
         }
 
+        /*
+         * issue internal bus reset
+         */
+        if (ioc->spi_data.bus_reset)
+                mptscsih_TMHandler(hd,
+                    MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS,
+                    0, 0, 0, 0, 5);
+
         scsi_scan_host(sh);
         return 0;
 
@@ -445,7 +453,7 @@ static void __exit
 mptspi_exit(void)
 {
         pci_unregister_driver(&mptspi_driver);
-        
+
         mpt_reset_deregister(mptspiDoneCtx);
         dprintk((KERN_INFO MYNAM
           ": Deregistered for IOC reset notifications\n"));
diff --git a/drivers/message/i2o/core.h b/drivers/message/i2o/core.h
index 90628562851e..184974cc734d 100644
--- a/drivers/message/i2o/core.h
+++ b/drivers/message/i2o/core.h
@@ -60,4 +60,7 @@ extern void i2o_iop_remove(struct i2o_controller *);
 #define I2O_IN_PORT     0x40
 #define I2O_OUT_PORT    0x44
 
+/* Motorola/Freescale specific register offset */
+#define I2O_MOTOROLA_PORT_OFFSET        0x10400
+
 #define I2O_IRQ_OUTBOUND_POST   0x00000008
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index f9e5a23697a1..c08ddac3717d 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -732,7 +732,7 @@ static int i2o_scsi_abort(struct scsi_cmnd *SCpnt)
             cpu_to_le32(I2O_CMD_SCSI_ABORT << 24 | HOST_TID << 12 | tid);
         msg->body[0] = cpu_to_le32(i2o_cntxt_list_get_ptr(c, SCpnt));
 
-        if (i2o_msg_post_wait(c, msg, I2O_TIMEOUT_SCSI_SCB_ABORT))
+        if (!i2o_msg_post_wait(c, msg, I2O_TIMEOUT_SCSI_SCB_ABORT))
                 status = SUCCESS;
 
         return status;
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index d698d7709c31..4f1515cae5dc 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -88,6 +88,11 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c)
         struct device *dev = &pdev->dev;
         int i;
 
+        if (pci_request_regions(pdev, OSM_DESCRIPTION)) {
+                printk(KERN_ERR "%s: device already claimed\n", c->name);
+                return -ENODEV;
+        }
+
         for (i = 0; i < 6; i++) {
                 /* Skip I/O spaces */
                 if (!(pci_resource_flags(pdev, i) & IORESOURCE_IO)) {
@@ -163,6 +168,24 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c)
         c->in_port = c->base.virt + I2O_IN_PORT;
         c->out_port = c->base.virt + I2O_OUT_PORT;
 
+        /* Motorola/Freescale chip does not follow spec */
+        if (pdev->vendor == PCI_VENDOR_ID_MOTOROLA && pdev->device == 0x18c0) {
+                /* Check if CPU is enabled */
+                if (be32_to_cpu(readl(c->base.virt + 0x10000)) & 0x10000000) {
+                        printk(KERN_INFO "%s: MPC82XX needs CPU running to "
+                               "service I2O.\n", c->name);
+                        i2o_pci_free(c);
+                        return -ENODEV;
+                } else {
+                        c->irq_status += I2O_MOTOROLA_PORT_OFFSET;
+                        c->irq_mask += I2O_MOTOROLA_PORT_OFFSET;
+                        c->in_port += I2O_MOTOROLA_PORT_OFFSET;
+                        c->out_port += I2O_MOTOROLA_PORT_OFFSET;
+                        printk(KERN_INFO "%s: MPC82XX workarounds activated.\n",
+                               c->name);
+                }
+        }
+
         if (i2o_dma_alloc(dev, &c->status, 8, GFP_KERNEL)) {
                 i2o_pci_free(c);
                 return -ENOMEM;
@@ -298,7 +321,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
         struct i2o_controller *c;
         int rc;
         struct pci_dev *i960 = NULL;
-        int pci_dev_busy = 0;
+        int enabled = pdev->is_enabled;
 
         printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
 
@@ -308,16 +331,12 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
                 return -ENODEV;
         }
 
-        if ((rc = pci_enable_device(pdev))) {
-                printk(KERN_WARNING "i2o: couldn't enable device %s\n",
-                       pci_name(pdev));
-                return rc;
-        }
-
-        if (pci_request_regions(pdev, OSM_DESCRIPTION)) {
-                printk(KERN_ERR "i2o: device already claimed\n");
-                return -ENODEV;
-        }
+        if (!enabled)
+                if ((rc = pci_enable_device(pdev))) {
+                        printk(KERN_WARNING "i2o: couldn't enable device %s\n",
+                               pci_name(pdev));
+                        return rc;
+                }
 
         if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_WARNING "i2o: no suitable DMA found for %s\n",
@@ -395,9 +414,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
 
         if ((rc = i2o_pci_alloc(c))) {
                 printk(KERN_ERR "%s: DMA / IO allocation for I2O controller "
-                       " failed\n", c->name);
-                if (rc == -ENODEV)
-                        pci_dev_busy = 1;
+                       "failed\n", c->name);
                 goto free_controller;
         }
 
@@ -425,7 +442,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
         i2o_iop_free(c);
 
       disable:
-        if (!pci_dev_busy)
+        if (!enabled)
                 pci_disable_device(pdev);
 
         return rc;
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c
index 7e98434cfa37..9783caf49696 100644
--- a/drivers/misc/ibmasm/uart.c
+++ b/drivers/misc/ibmasm/uart.c
@@ -50,7 +50,7 @@ void ibmasm_register_uart(struct service_processor *sp)
         memset(&uport, 0, sizeof(struct uart_port));
         uport.irq       = sp->irq;
         uport.uartclk   = 3686400;
-        uport.flags     = UPF_AUTOPROBE | UPF_SHARE_IRQ;
+        uport.flags     = UPF_SHARE_IRQ;
         uport.iotype    = UPIO_MEM;
         uport.membase   = iomem_base;
 
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index aaf04638054e..227c39a7c1b4 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -194,7 +194,7 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
 
         u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT);
 
-        switch(cmd->flags) {
+        switch (mmc_rsp_type(cmd->flags)) {
         case MMC_RSP_R1:
                 mmccmd |= SD_CMD_RT_1;
                 break;
@@ -483,34 +483,35 @@ static void au1xmmc_cmd_complete(struct au1xmmc_host *host, u32 status)
         cmd = mrq->cmd;
         cmd->error = MMC_ERR_NONE;
 
-        if ((cmd->flags & MMC_RSP_MASK) == MMC_RSP_SHORT) {
-
-                /* Techincally, we should be getting all 48 bits of the response
-                 * (SD_RESP1 + SD_RESP2), but because our response omits the CRC,
-                 * our data ends up being shifted 8 bits to the right.  In this case,
-                 * that means that the OSR data starts at bit 31, so we can just
-                 * read RESP0 and return that
-                 */
-
-                cmd->resp[0] = au_readl(host->iobase + SD_RESP0);
-        }
-        else if ((cmd->flags & MMC_RSP_MASK) == MMC_RSP_LONG) {
-                u32 r[4];
-                int i;
-
-                r[0] = au_readl(host->iobase + SD_RESP3);
-                r[1] = au_readl(host->iobase + SD_RESP2);
-                r[2] = au_readl(host->iobase + SD_RESP1);
-                r[3] = au_readl(host->iobase + SD_RESP0);
-
-                /* The CRC is omitted from the response, so really we only got
-                 * 120 bytes, but the engine expects 128 bits, so we have to shift
-                 * things up
-                 */
-
-                for(i = 0; i < 4; i++) {
-                        cmd->resp[i] = (r[i] & 0x00FFFFFF) << 8;
-                        if (i != 3) cmd->resp[i] |= (r[i + 1] & 0xFF000000) >> 24;
+        if (cmd->flags & MMC_RSP_PRESENT) {
+                if (cmd->flags & MMC_RSP_136) {
+                        u32 r[4];
+                        int i;
+
+                        r[0] = au_readl(host->iobase + SD_RESP3);
+                        r[1] = au_readl(host->iobase + SD_RESP2);
+                        r[2] = au_readl(host->iobase + SD_RESP1);
+                        r[3] = au_readl(host->iobase + SD_RESP0);
+
+                        /* The CRC is omitted from the response, so really
+                         * we only got 120 bytes, but the engine expects
+                         * 128 bits, so we have to shift things up
+                         */
+
+                        for(i = 0; i < 4; i++) {
+                                cmd->resp[i] = (r[i] & 0x00FFFFFF) << 8;
+                                if (i != 3)
+                                        cmd->resp[i] |= (r[i + 1] & 0xFF000000) >> 24;
+                        }
+                } else {
+                        /* Techincally, we should be getting all 48 bits of
+                         * the response (SD_RESP1 + SD_RESP2), but because
+                         * our response omits the CRC, our data ends up
+                         * being shifted 8 bits to the right.  In this case,
+                         * that means that the OSR data starts at bit 31,
+                         * so we can just read RESP0 and return that
+                         */
+                        cmd->resp[0] = au_readl(host->iobase + SD_RESP0);
                 }
         }
 
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index bfca5c176e88..1888060c5e0c 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -211,7 +211,7 @@ int mmc_wait_for_app_cmd(struct mmc_host *host, unsigned int rca,
 
                 appcmd.opcode = MMC_APP_CMD;
                 appcmd.arg = rca << 16;
-                appcmd.flags = MMC_RSP_R1;
+                appcmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
                 appcmd.retries = 0;
                 memset(appcmd.resp, 0, sizeof(appcmd.resp));
                 appcmd.data = NULL;
@@ -331,7 +331,7 @@ static int mmc_select_card(struct mmc_host *host, struct mmc_card *card)
 
         cmd.opcode = MMC_SELECT_CARD;
         cmd.arg = card->rca << 16;
-        cmd.flags = MMC_RSP_R1;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
 
         err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
         if (err != MMC_ERR_NONE)
@@ -358,7 +358,7 @@ static int mmc_select_card(struct mmc_host *host, struct mmc_card *card)
                         struct mmc_command cmd;
                         cmd.opcode = SD_APP_SET_BUS_WIDTH;
                         cmd.arg = SD_BUS_WIDTH_4;
-                        cmd.flags = MMC_RSP_R1;
+                        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
 
                         err = mmc_wait_for_app_cmd(host, card->rca, &cmd,
                                 CMD_RETRIES);
@@ -386,7 +386,7 @@ static void mmc_deselect_cards(struct mmc_host *host)
 
                 cmd.opcode = MMC_SELECT_CARD;
                 cmd.arg = 0;
-                cmd.flags = MMC_RSP_NONE;
+                cmd.flags = MMC_RSP_NONE | MMC_CMD_AC;
 
                 mmc_wait_for_cmd(host, &cmd, 0);
         }
@@ -677,7 +677,7 @@ static void mmc_idle_cards(struct mmc_host *host)
 
         cmd.opcode = MMC_GO_IDLE_STATE;
         cmd.arg = 0;
-        cmd.flags = MMC_RSP_NONE;
+        cmd.flags = MMC_RSP_NONE | MMC_CMD_BC;
 
         mmc_wait_for_cmd(host, &cmd, 0);
 
@@ -738,7 +738,7 @@ static int mmc_send_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
 
         cmd.opcode = MMC_SEND_OP_COND;
         cmd.arg = ocr;
-        cmd.flags = MMC_RSP_R3;
+        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
 
         for (i = 100; i; i--) {
                 err = mmc_wait_for_cmd(host, &cmd, 0);
@@ -766,7 +766,7 @@ static int mmc_send_app_op_cond(struct mmc_host *host, u32 ocr, u32 *rocr)
 
         cmd.opcode = SD_APP_OP_COND;
         cmd.arg = ocr;
-        cmd.flags = MMC_RSP_R3;
+        cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
 
         for (i = 100; i; i--) {
                 err = mmc_wait_for_app_cmd(host, 0, &cmd, CMD_RETRIES);
@@ -805,7 +805,7 @@ static void mmc_discover_cards(struct mmc_host *host)
 
                 cmd.opcode = MMC_ALL_SEND_CID;
                 cmd.arg = 0;
-                cmd.flags = MMC_RSP_R2;
+                cmd.flags = MMC_RSP_R2 | MMC_CMD_BCR;
 
                 err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
                 if (err == MMC_ERR_TIMEOUT) {
@@ -835,7 +835,7 @@ static void mmc_discover_cards(struct mmc_host *host)
 
                         cmd.opcode = SD_SEND_RELATIVE_ADDR;
                         cmd.arg = 0;
-                        cmd.flags = MMC_RSP_R6;
+                        cmd.flags = MMC_RSP_R6 | MMC_CMD_BCR;
 
                         err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
                         if (err != MMC_ERR_NONE)
@@ -856,7 +856,7 @@ static void mmc_discover_cards(struct mmc_host *host)
                 } else {
                         cmd.opcode = MMC_SET_RELATIVE_ADDR;
                         cmd.arg = card->rca << 16;
-                        cmd.flags = MMC_RSP_R1;
+                        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
 
                         err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
                         if (err != MMC_ERR_NONE)
@@ -878,7 +878,7 @@ static void mmc_read_csds(struct mmc_host *host)
 
                 cmd.opcode = MMC_SEND_CSD;
                 cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R2;
+                cmd.flags = MMC_RSP_R2 | MMC_CMD_AC;
 
                 err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
                 if (err != MMC_ERR_NONE) {
@@ -920,7 +920,7 @@ static void mmc_read_scrs(struct mmc_host *host)
 
                 cmd.opcode = MMC_APP_CMD;
                 cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
 
                 err = mmc_wait_for_cmd(host, &cmd, 0);
                 if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD)) {
@@ -932,7 +932,7 @@ static void mmc_read_scrs(struct mmc_host *host)
 
                 cmd.opcode = SD_APP_SEND_SCR;
                 cmd.arg = 0;
-                cmd.flags = MMC_RSP_R1;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
 
                 memset(&data, 0, sizeof(struct mmc_data));
 
@@ -1003,7 +1003,7 @@ static void mmc_check_cards(struct mmc_host *host)
 
                 cmd.opcode = MMC_SEND_STATUS;
                 cmd.arg = card->rca << 16;
-                cmd.flags = MMC_RSP_R1;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
 
                 err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
                 if (err == MMC_ERR_NONE)
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index 5b014c370e80..8eb2a2ede64b 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -171,14 +171,14 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                 brq.mrq.data = &brq.data;
 
                 brq.cmd.arg = req->sector << 9;
-                brq.cmd.flags = MMC_RSP_R1;
+                brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
                 brq.data.timeout_ns = card->csd.tacc_ns * 10;
                 brq.data.timeout_clks = card->csd.tacc_clks * 10;
                 brq.data.blksz_bits = md->block_bits;
                 brq.data.blocks = req->nr_sectors >> (md->block_bits - 9);
                 brq.stop.opcode = MMC_STOP_TRANSMISSION;
                 brq.stop.arg = 0;
-                brq.stop.flags = MMC_RSP_R1B;
+                brq.stop.flags = MMC_RSP_R1B | MMC_CMD_AC;
 
                 if (rq_data_dir(req) == READ) {
                         brq.cmd.opcode = brq.data.blocks > 1 ? MMC_READ_MULTIPLE_BLOCK : MMC_READ_SINGLE_BLOCK;
@@ -223,7 +223,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 
                         cmd.opcode = MMC_SEND_STATUS;
                         cmd.arg = card->rca << 16;
-                        cmd.flags = MMC_RSP_R1;
+                        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
                         err = mmc_wait_for_cmd(card->host, &cmd, 5);
                         if (err) {
                                 printk(KERN_ERR "%s: error %d requesting status\n",
@@ -430,7 +430,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card)
         mmc_card_claim_host(card);
         cmd.opcode = MMC_SET_BLOCKLEN;
         cmd.arg = 1 << md->block_bits;
-        cmd.flags = MMC_RSP_R1;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
         err = mmc_wait_for_cmd(card->host, &cmd, 5);
         mmc_card_release_host(card);
 
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 634ef53e85a5..37ee7f8dc82f 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -124,15 +124,10 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c)
         }
 
         c |= cmd->opcode | MCI_CPSM_ENABLE;
-        switch (cmd->flags & MMC_RSP_MASK) {
-        case MMC_RSP_NONE:
-        default:
-                break;
-        case MMC_RSP_LONG:
-                c |= MCI_CPSM_LONGRSP;
-        case MMC_RSP_SHORT:
+        if (cmd->flags & MMC_RSP_PRESENT) {
+                if (cmd->flags & MMC_RSP_136)
+                        c |= MCI_CPSM_LONGRSP;
                 c |= MCI_CPSM_RESPONSE;
-                break;
         }
         if (/*interrupt*/0)
                 c |= MCI_CPSM_INTERRUPT;
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index ee8f8a0420d1..285d7d068097 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -178,14 +178,15 @@ static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd,
         if (cmd->flags & MMC_RSP_BUSY)
                 cmdat |= CMDAT_BUSY;
 
-        switch (cmd->flags & (MMC_RSP_MASK | MMC_RSP_CRC)) {
-        case MMC_RSP_SHORT | MMC_RSP_CRC:
+#define RSP_TYPE(x)     ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE))
+        switch (RSP_TYPE(mmc_resp_type(cmd))) {
+        case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */
                 cmdat |= CMDAT_RESP_SHORT;
                 break;
-        case MMC_RSP_SHORT:
+        case RSP_TYPE(MMC_RSP_R3):
                 cmdat |= CMDAT_RESP_R3;
                 break;
-        case MMC_RSP_LONG | MMC_RSP_CRC:
+        case RSP_TYPE(MMC_RSP_R2):
                 cmdat |= CMDAT_RESP_R2;
                 break;
         default:
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index f25757625361..3be397d436fa 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -459,7 +459,7 @@ static void wbsd_send_command(struct wbsd_host *host, struct mmc_command *cmd)
         /*
          * Do we expect a reply?
          */
-        if ((cmd->flags & MMC_RSP_MASK) != MMC_RSP_NONE) {
+        if (cmd->flags & MMC_RSP_PRESENT) {
                 /*
                  * Read back status.
                  */
@@ -476,10 +476,10 @@ static void wbsd_send_command(struct wbsd_host *host, struct mmc_command *cmd)
                         cmd->error = MMC_ERR_BADCRC;
                 /* All ok */
                 else {
-                        if ((cmd->flags & MMC_RSP_MASK) == MMC_RSP_SHORT)
-                                wbsd_get_short_reply(host, cmd);
-                        else
+                        if (cmd->flags & MMC_RSP_136)
                                 wbsd_get_long_reply(host, cmd);
+                        else
+                                wbsd_get_short_reply(host, cmd);
                 }
         }
 
diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c
index 701620b6baed..8b3784e2de89 100644
--- a/drivers/mtd/maps/dc21285.c
+++ b/drivers/mtd/maps/dc21285.c
@@ -110,8 +110,9 @@ static void dc21285_copy_to_32(struct map_info *map, unsigned long to, const voi
 {
         while (len > 0) {
                 map_word d;
-                d.x[0] = *((uint32_t*)from)++;
+                d.x[0] = *((uint32_t*)from);
                 dc21285_write32(map, d, to);
+                from += 4;
                 to += 4;
                 len -= 4;
         }
@@ -121,8 +122,9 @@ static void dc21285_copy_to_16(struct map_info *map, unsigned long to, const voi
 {
         while (len > 0) {
                 map_word d;
-                d.x[0] = *((uint16_t*)from)++;
+                d.x[0] = *((uint16_t*)from);
                 dc21285_write16(map, d, to);
+                from += 2;
                 to += 2;
                 len -= 2;
         }
@@ -131,8 +133,9 @@ static void dc21285_copy_to_16(struct map_info *map, unsigned long to, const voi
 static void dc21285_copy_to_8(struct map_info *map, unsigned long to, const void *from, ssize_t len)
 {
         map_word d;
-        d.x[0] = *((uint8_t*)from)++;
+        d.x[0] = *((uint8_t*)from);
         dc21285_write8(map, d, to);
+        from++;
         to++;
         len--;
 }
diff --git a/drivers/mtd/maps/tsunami_flash.c b/drivers/mtd/maps/tsunami_flash.c
index 9e21e6c02f80..0f915ac3102e 100644
--- a/drivers/mtd/maps/tsunami_flash.c
+++ b/drivers/mtd/maps/tsunami_flash.c
@@ -62,7 +62,7 @@ static void tsunami_flash_copy_to(
 static struct map_info tsunami_flash_map = {
         .name = "flash chip on the Tsunami TIG bus",
         .size = MAX_TIG_FLASH_SIZE,
-        .phys = NO_XIP;
+        .phys = NO_XIP,
         .bankwidth = 1,
         .read = tsunami_flash_read8,
         .copy_from = tsunami_flash_copy_from,
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 3dde1df33487..9e8897976a69 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -754,9 +754,11 @@ enum tx_desc_status {
 enum ChipCaps { CapBusMaster=0x20, CapPwrMgmt=0x2000 };
 
 struct vortex_extra_stats {
-        unsigned long tx_deferred;
-        unsigned long tx_multiple_collisions;
-        unsigned long rx_bad_ssd;
+        unsigned long tx_deferred;
+        unsigned long tx_max_collisions;
+        unsigned long tx_multiple_collisions;
+        unsigned long tx_single_collisions;
+        unsigned long rx_bad_ssd;
 };
 
 struct vortex_private {
@@ -864,12 +866,14 @@ static struct {
         const char str[ETH_GSTRING_LEN];
 } ethtool_stats_keys[] = {
         { "tx_deferred" },
+        { "tx_max_collisions" },
         { "tx_multiple_collisions" },
+        { "tx_single_collisions" },
         { "rx_bad_ssd" },
 };
 
 /* number of ETHTOOL_GSTATS u64's */
-#define VORTEX_NUM_STATS     3
+#define VORTEX_NUM_STATS    5
 
 static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
                                    int chip_idx, int card_idx);
@@ -2109,9 +2113,12 @@ vortex_error(struct net_device *dev, int status)
                 iowrite8(0, ioaddr + TxStatus);
                 if (tx_status & 0x30) {                 /* txJabber or txUnderrun */
                         do_tx_reset = 1;
-                } else if ((tx_status & 0x08) && (vp->drv_flags & MAX_COLLISION_RESET)) {       /* maxCollisions */
-                        do_tx_reset = 1;
-                        reset_mask = 0x0108;            /* Reset interface logic, but not download logic */
+                } else if (tx_status & 0x08) {  /* maxCollisions */
+                        vp->xstats.tx_max_collisions++;
+                        if (vp->drv_flags & MAX_COLLISION_RESET) {
+                                do_tx_reset = 1;
+                                reset_mask = 0x0108;            /* Reset interface logic, but not download logic */
+                        }
                 } else {                                                /* Merely re-enable the transmitter. */
                         iowrite16(TxEnable, ioaddr + EL3_CMD);
                 }
@@ -2927,7 +2934,6 @@ static void update_stats(void __iomem *ioaddr, struct net_device *dev)
         EL3WINDOW(6);
         vp->stats.tx_carrier_errors             += ioread8(ioaddr + 0);
         vp->stats.tx_heartbeat_errors           += ioread8(ioaddr + 1);
-        vp->stats.collisions                    += ioread8(ioaddr + 3);
         vp->stats.tx_window_errors              += ioread8(ioaddr + 4);
         vp->stats.rx_fifo_errors                += ioread8(ioaddr + 5);
         vp->stats.tx_packets                    += ioread8(ioaddr + 6);
@@ -2940,10 +2946,15 @@ static void update_stats(void __iomem *ioaddr, struct net_device *dev)
         vp->stats.tx_bytes                      += ioread16(ioaddr + 12);
         /* Extra stats for get_ethtool_stats() */
         vp->xstats.tx_multiple_collisions       += ioread8(ioaddr + 2);
+        vp->xstats.tx_single_collisions         += ioread8(ioaddr + 3);
         vp->xstats.tx_deferred                  += ioread8(ioaddr + 8);
         EL3WINDOW(4);
         vp->xstats.rx_bad_ssd                   += ioread8(ioaddr + 12);
 
+        vp->stats.collisions = vp->xstats.tx_multiple_collisions
+                + vp->xstats.tx_single_collisions
+                + vp->xstats.tx_max_collisions;
+
         {
                 u8 up = ioread8(ioaddr + 13);
                 vp->stats.rx_bytes += (up & 0x0f) << 16;
@@ -3037,8 +3048,10 @@ static void vortex_get_ethtool_stats(struct net_device *dev,
         spin_unlock_irqrestore(&vp->lock, flags);
 
         data[0] = vp->xstats.tx_deferred;
-        data[1] = vp->xstats.tx_multiple_collisions;
-        data[2] = vp->xstats.rx_bad_ssd;
+        data[1] = vp->xstats.tx_max_collisions;
+        data[2] = vp->xstats.tx_multiple_collisions;
+        data[3] = vp->xstats.tx_single_collisions;
+        data[4] = vp->xstats.rx_bad_ssd;
 }
 
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 49fa1e4413fa..a24200d0a616 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1,6 +1,6 @@
 /* bnx2.c: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004, 2005 Broadcom Corporation
+ * Copyright (c) 2004, 2005, 2006 Broadcom Corporation
  *
  * 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
@@ -14,8 +14,8 @@
 
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.4.30"
-#define DRV_MODULE_RELDATE      "October 11, 2005"
+#define DRV_MODULE_VERSION      "1.4.31"
+#define DRV_MODULE_RELDATE      "January 19, 2006"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -316,6 +316,10 @@ bnx2_enable_int(struct bnx2 *bp)
         u32 val;
 
         REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+               BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
+               BNX2_PCICFG_INT_ACK_CMD_MASK_INT | bp->last_status_idx);
+
+        REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
                BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | bp->last_status_idx);
 
         val = REG_RD(bp, BNX2_HC_COMMAND);
@@ -1171,7 +1175,8 @@ bnx2_init_5708s_phy(struct bnx2 *bp)
         }
 
         if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
-            (CHIP_ID(bp) == CHIP_ID_5708_B0)) {
+            (CHIP_ID(bp) == CHIP_ID_5708_B0) ||
+            (CHIP_ID(bp) == CHIP_ID_5708_B1)) {
                 /* increase tx signal amplitude */
                 bnx2_write_phy(bp, BCM5708S_BLK_ADDR,
                                BCM5708S_BLK_ADDR_TX_MISC);
@@ -1326,44 +1331,78 @@ bnx2_set_mac_loopback(struct bnx2 *bp)
         return 0;
 }
 
+static int bnx2_test_link(struct bnx2 *);
+
+static int
+bnx2_set_phy_loopback(struct bnx2 *bp)
+{
+        u32 mac_mode;
+        int rc, i;
+
+        spin_lock_bh(&bp->phy_lock);
+        rc = bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK | BMCR_FULLDPLX |
+                            BMCR_SPEED1000);
+        spin_unlock_bh(&bp->phy_lock);
+        if (rc)
+                return rc;
+
+        for (i = 0; i < 10; i++) {
+                if (bnx2_test_link(bp) == 0)
+                        break;
+                udelay(10);
+        }
+
+        mac_mode = REG_RD(bp, BNX2_EMAC_MODE);
+        mac_mode &= ~(BNX2_EMAC_MODE_PORT | BNX2_EMAC_MODE_HALF_DUPLEX |
+                      BNX2_EMAC_MODE_MAC_LOOP | BNX2_EMAC_MODE_FORCE_LINK |
+                      BNX2_EMAC_MODE_25G);
+
+        mac_mode |= BNX2_EMAC_MODE_PORT_GMII;
+        REG_WR(bp, BNX2_EMAC_MODE, mac_mode);
+        bp->link_up = 1;
+        return 0;
+}
+
 static int
-bnx2_fw_sync(struct bnx2 *bp, u32 msg_data)
+bnx2_fw_sync(struct bnx2 *bp, u32 msg_data, int silent)
 {
         int i;
         u32 val;
 
-        if (bp->fw_timed_out)
-                return -EBUSY;
-
         bp->fw_wr_seq++;
         msg_data |= bp->fw_wr_seq;
 
         REG_WR_IND(bp, bp->shmem_base + BNX2_DRV_MB, msg_data);
 
         /* wait for an acknowledgement. */
-        for (i = 0; i < (FW_ACK_TIME_OUT_MS * 1000)/5; i++) {
-                udelay(5);
+        for (i = 0; i < (FW_ACK_TIME_OUT_MS / 10); i++) {
+                msleep(10);
 
                 val = REG_RD_IND(bp, bp->shmem_base + BNX2_FW_MB);
 
                 if ((val & BNX2_FW_MSG_ACK) == (msg_data & BNX2_DRV_MSG_SEQ))
                         break;
         }
+        if ((msg_data & BNX2_DRV_MSG_DATA) == BNX2_DRV_MSG_DATA_WAIT0)
+                return 0;
 
         /* If we timed out, inform the firmware that this is the case. */
-        if (((val & BNX2_FW_MSG_ACK) != (msg_data & BNX2_DRV_MSG_SEQ)) &&
-                ((msg_data & BNX2_DRV_MSG_DATA) != BNX2_DRV_MSG_DATA_WAIT0)) {
+        if ((val & BNX2_FW_MSG_ACK) != (msg_data & BNX2_DRV_MSG_SEQ)) {
+                if (!silent)
+                        printk(KERN_ERR PFX "fw sync timeout, reset code = "
+                                            "%x\n", msg_data);
 
                 msg_data &= ~BNX2_DRV_MSG_CODE;
                 msg_data |= BNX2_DRV_MSG_CODE_FW_TIMEOUT;
 
                 REG_WR_IND(bp, bp->shmem_base + BNX2_DRV_MB, msg_data);
 
-                bp->fw_timed_out = 1;
-
                 return -EBUSY;
         }
 
+        if ((val & BNX2_FW_MSG_STATUS_MASK) != BNX2_FW_MSG_STATUS_OK)
+                return -EIO;
+
         return 0;
 }
 
@@ -1657,7 +1696,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget)
         rmb();
         while (sw_cons != hw_cons) {
                 unsigned int len;
-                u16 status;
+                u32 status;
                 struct sw_bd *rx_buf;
                 struct sk_buff *skb;
 
@@ -1673,7 +1712,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget)
                 rx_hdr = (struct l2_fhdr *) skb->data;
                 len = rx_hdr->l2_fhdr_pkt_len - 4;
 
-                if (rx_hdr->l2_fhdr_errors &
+                if ((status = rx_hdr->l2_fhdr_status) &
                         (L2_FHDR_ERRORS_BAD_CRC |
                         L2_FHDR_ERRORS_PHY_DECODE |
                         L2_FHDR_ERRORS_ALIGNMENT |
@@ -1732,15 +1771,13 @@ reuse_rx:
 
                 }
 
-                status = rx_hdr->l2_fhdr_status;
                 skb->ip_summed = CHECKSUM_NONE;
                 if (bp->rx_csum &&
                         (status & (L2_FHDR_STATUS_TCP_SEGMENT |
                         L2_FHDR_STATUS_UDP_DATAGRAM))) {
 
-                        u16 cksum = rx_hdr->l2_fhdr_tcp_udp_xsum;
-
-                        if (cksum == 0xffff)
+                        if (likely((status & (L2_FHDR_ERRORS_TCP_XSUM |
+                                              L2_FHDR_ERRORS_UDP_XSUM)) == 0))
                                 skb->ip_summed = CHECKSUM_UNNECESSARY;
                 }
 
@@ -1794,7 +1831,7 @@ static irqreturn_t
 bnx2_msi(int irq, void *dev_instance, struct pt_regs *regs)
 {
         struct net_device *dev = dev_instance;
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         prefetch(bp->status_blk);
         REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
@@ -1814,7 +1851,7 @@ static irqreturn_t
 bnx2_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
 {
         struct net_device *dev = dev_instance;
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         /* When using INTx, it is possible for the interrupt to arrive
          * at the CPU before the status block posted prior to the
@@ -1859,7 +1896,7 @@ bnx2_has_work(struct bnx2 *bp)
 static int
 bnx2_poll(struct net_device *dev, int *budget)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         if ((bp->status_blk->status_attn_bits &
                 STATUS_ATTN_BITS_LINK_STATE) !=
@@ -1891,9 +1928,20 @@ bnx2_poll(struct net_device *dev, int *budget)
 
         if (!bnx2_has_work(bp)) {
                 netif_rx_complete(dev);
+                if (likely(bp->flags & USING_MSI_FLAG)) {
+                        REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+                               BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
+                               bp->last_status_idx);
+                        return 0;
+                }
+                REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
+                       BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
+                       BNX2_PCICFG_INT_ACK_CMD_MASK_INT |
+                       bp->last_status_idx);
+
                 REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD,
-                        BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
-                        bp->last_status_idx);
+                       BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID |
+                       bp->last_status_idx);
                 return 0;
         }
 
@@ -1906,7 +1954,7 @@ bnx2_poll(struct net_device *dev, int *budget)
 static void
 bnx2_set_rx_mode(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         u32 rx_mode, sort_mode;
         int i;
 
@@ -1916,11 +1964,11 @@ bnx2_set_rx_mode(struct net_device *dev)
                                   BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);
         sort_mode = 1 | BNX2_RPM_SORT_USER0_BC_EN;
 #ifdef BCM_VLAN
-        if (!bp->vlgrp) {
+        if (!bp->vlgrp && !(bp->flags & ASF_ENABLE_FLAG))
                 rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
-        }
 #else
-        rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
+        if (!(bp->flags & ASF_ENABLE_FLAG))
+                rx_mode |= BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG;
 #endif
         if (dev->flags & IFF_PROMISC) {
                 /* Promiscuous mode. */
@@ -2338,7 +2386,6 @@ bnx2_set_power_state(struct bnx2 *bp, pci_power_t state)
                         val |= BNX2_EMAC_MODE_PORT_MII |
                                BNX2_EMAC_MODE_MPKT_RCVD |
                                BNX2_EMAC_MODE_ACPI_RCVD |
-                               BNX2_EMAC_MODE_FORCE_LINK |
                                BNX2_EMAC_MODE_MPKT;
 
                         REG_WR(bp, BNX2_EMAC_MODE, val);
@@ -2374,7 +2421,8 @@ bnx2_set_power_state(struct bnx2 *bp, pci_power_t state)
                         wol_msg = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
                 }
 
-                bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT3 | wol_msg);
+                if (!(bp->flags & NO_WOL_FLAG))
+                        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT3 | wol_msg, 0);
 
                 pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
                 if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
@@ -2708,9 +2756,16 @@ bnx2_init_nvram(struct bnx2 *bp)
         if (j == entry_count) {
                 bp->flash_info = NULL;
                 printk(KERN_ALERT PFX "Unknown flash/EEPROM type.\n");
-                rc = -ENODEV;
+                return -ENODEV;
         }
 
+        val = REG_RD_IND(bp, bp->shmem_base + BNX2_SHARED_HW_CFG_CONFIG2);
+        val &= BNX2_SHARED_HW_CFG2_NVM_SIZE_MASK;
+        if (val)
+                bp->flash_size = val;
+        else
+                bp->flash_size = bp->flash_info->total_size;
+
         return rc;
 }
 
@@ -3014,16 +3069,14 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
         val = REG_RD(bp, BNX2_MISC_ENABLE_CLR_BITS);
         udelay(5);
 
+        /* Wait for the firmware to tell us it is ok to issue a reset. */
+        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT0 | reset_code, 1);
+
         /* Deposit a driver reset signature so the firmware knows that
          * this is a soft reset. */
         REG_WR_IND(bp, bp->shmem_base + BNX2_DRV_RESET_SIGNATURE,
                    BNX2_DRV_RESET_SIGNATURE_MAGIC);
 
-        bp->fw_timed_out = 0;
-
-        /* Wait for the firmware to tell us it is ok to issue a reset. */
-        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT0 | reset_code);
-
         /* Do a dummy read to force the chip to complete all current transaction
          * before we issue a reset. */
         val = REG_RD(bp, BNX2_MISC_ID);
@@ -3062,10 +3115,10 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
                 return -ENODEV;
         }
 
-        bp->fw_timed_out = 0;
-
         /* Wait for the firmware to finish its initialization. */
-        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT1 | reset_code);
+        rc = bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT1 | reset_code, 0);
+        if (rc)
+                return rc;
 
         if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
                 /* Adjust the voltage regular to two steps lower.  The default
@@ -3083,6 +3136,7 @@ static int
 bnx2_init_chip(struct bnx2 *bp)
 {
         u32 val;
+        int rc;
 
         /* Make sure the interrupt is not active. */
         REG_WR(bp, BNX2_PCICFG_INT_ACK_CMD, BNX2_PCICFG_INT_ACK_CMD_MASK_INT);
@@ -3098,7 +3152,7 @@ bnx2_init_chip(struct bnx2 *bp)
 
         val |= (0x2 << 20) | (1 << 11);
 
-        if ((bp->flags & PCIX_FLAG) && (bp->bus_speed_mhz = 133))
+        if ((bp->flags & PCIX_FLAG) && (bp->bus_speed_mhz == 133))
                 val |= (1 << 23);
 
         if ((CHIP_NUM(bp) == CHIP_NUM_5706) &&
@@ -3218,17 +3272,22 @@ bnx2_init_chip(struct bnx2 *bp)
 
         REG_WR(bp, BNX2_HC_ATTN_BITS_ENABLE, STATUS_ATTN_BITS_LINK_STATE);
 
+        if (REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_FEATURE) &
+            BNX2_PORT_FEATURE_ASF_ENABLED)
+                bp->flags |= ASF_ENABLE_FLAG;
+
         /* Initialize the receive filter. */
         bnx2_set_rx_mode(bp->dev);
 
-        bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT2 | BNX2_DRV_MSG_CODE_RESET);
+        rc = bnx2_fw_sync(bp, BNX2_DRV_MSG_DATA_WAIT2 | BNX2_DRV_MSG_CODE_RESET,
+                          0);
 
         REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS, 0x5ffffff);
         REG_RD(bp, BNX2_MISC_ENABLE_SET_BITS);
 
         udelay(20);
 
-        return 0;
+        return rc;
 }
 
 
@@ -3880,26 +3939,33 @@ bnx2_test_memory(struct bnx2 *bp)
         return ret;
 }
 
+#define BNX2_MAC_LOOPBACK       0
+#define BNX2_PHY_LOOPBACK       1
+
 static int
-bnx2_test_loopback(struct bnx2 *bp)
+bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
 {
         unsigned int pkt_size, num_pkts, i;
         struct sk_buff *skb, *rx_skb;
         unsigned char *packet;
-        u16 rx_start_idx, rx_idx, send_idx;
-        u32 send_bseq, val;
+        u16 rx_start_idx, rx_idx;
+        u32 val;
         dma_addr_t map;
         struct tx_bd *txbd;
         struct sw_bd *rx_buf;
         struct l2_fhdr *rx_hdr;
         int ret = -ENODEV;
 
-        if (!netif_running(bp->dev))
-                return -ENODEV;
-
-        bp->loopback = MAC_LOOPBACK;
-        bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_DIAG);
-        bnx2_set_mac_loopback(bp);
+        if (loopback_mode == BNX2_MAC_LOOPBACK) {
+                bp->loopback = MAC_LOOPBACK;
+                bnx2_set_mac_loopback(bp);
+        }
+        else if (loopback_mode == BNX2_PHY_LOOPBACK) {
+                bp->loopback = 0;
+                bnx2_set_phy_loopback(bp);
+        }
+        else
+                return -EINVAL;
 
         pkt_size = 1514;
         skb = dev_alloc_skb(pkt_size);
@@ -3921,11 +3987,9 @@ bnx2_test_loopback(struct bnx2 *bp)
         udelay(5);
         rx_start_idx = bp->status_blk->status_rx_quick_consumer_index0;
 
-        send_idx = 0;
-        send_bseq = 0;
         num_pkts = 0;
 
-        txbd = &bp->tx_desc_ring[send_idx];
+        txbd = &bp->tx_desc_ring[TX_RING_IDX(bp->tx_prod)];
 
         txbd->tx_bd_haddr_hi = (u64) map >> 32;
         txbd->tx_bd_haddr_lo = (u64) map & 0xffffffff;
@@ -3933,13 +3997,11 @@ bnx2_test_loopback(struct bnx2 *bp)
         txbd->tx_bd_vlan_tag_flags = TX_BD_FLAGS_START | TX_BD_FLAGS_END;
 
         num_pkts++;
-        send_idx = NEXT_TX_BD(send_idx);
-
-        send_bseq += pkt_size;
-
-        REG_WR16(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BIDX, send_idx);
-        REG_WR(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BSEQ, send_bseq);
+        bp->tx_prod = NEXT_TX_BD(bp->tx_prod);
+        bp->tx_prod_bseq += pkt_size;
 
+        REG_WR16(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BIDX, bp->tx_prod);
+        REG_WR(bp, MB_TX_CID_ADDR + BNX2_L2CTX_TX_HOST_BSEQ, bp->tx_prod_bseq);
 
         udelay(100);
 
@@ -3952,7 +4014,7 @@ bnx2_test_loopback(struct bnx2 *bp)
         pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE);
         dev_kfree_skb_irq(skb);
 
-        if (bp->status_blk->status_tx_quick_consumer_index0 != send_idx) {
+        if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) {
                 goto loopback_test_done;
         }
 
@@ -3971,7 +4033,7 @@ bnx2_test_loopback(struct bnx2 *bp)
                 pci_unmap_addr(rx_buf, mapping),
                 bp->rx_buf_size, PCI_DMA_FROMDEVICE);
 
-        if (rx_hdr->l2_fhdr_errors &
+        if (rx_hdr->l2_fhdr_status &
                 (L2_FHDR_ERRORS_BAD_CRC |
                 L2_FHDR_ERRORS_PHY_DECODE |
                 L2_FHDR_ERRORS_ALIGNMENT |
@@ -3998,6 +4060,30 @@ loopback_test_done:
         return ret;
 }
 
+#define BNX2_MAC_LOOPBACK_FAILED        1
+#define BNX2_PHY_LOOPBACK_FAILED        2
+#define BNX2_LOOPBACK_FAILED            (BNX2_MAC_LOOPBACK_FAILED |     \
+                                         BNX2_PHY_LOOPBACK_FAILED)
+
+static int
+bnx2_test_loopback(struct bnx2 *bp)
+{
+        int rc = 0;
+
+        if (!netif_running(bp->dev))
+                return BNX2_LOOPBACK_FAILED;
+
+        bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_RESET);
+        spin_lock_bh(&bp->phy_lock);
+        bnx2_init_phy(bp);
+        spin_unlock_bh(&bp->phy_lock);
+        if (bnx2_run_loopback(bp, BNX2_MAC_LOOPBACK))
+                rc |= BNX2_MAC_LOOPBACK_FAILED;
+        if (bnx2_run_loopback(bp, BNX2_PHY_LOOPBACK))
+                rc |= BNX2_PHY_LOOPBACK_FAILED;
+        return rc;
+}
+
 #define NVRAM_SIZE 0x200
 #define CRC32_RESIDUAL 0xdebb20e3
 
@@ -4167,7 +4253,7 @@ bnx2_restart_timer:
 static int
 bnx2_open(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         int rc;
 
         bnx2_set_power_state(bp, PCI_D0);
@@ -4280,7 +4366,7 @@ bnx2_reset_task(void *data)
 static void
 bnx2_tx_timeout(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         /* This allows the netif to be shutdown gracefully before resetting */
         schedule_work(&bp->reset_task);
@@ -4291,7 +4377,7 @@ bnx2_tx_timeout(struct net_device *dev)
 static void
 bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         bnx2_netif_stop(bp);
 
@@ -4305,7 +4391,7 @@ bnx2_vlan_rx_register(struct net_device *dev, struct vlan_group *vlgrp)
 static void
 bnx2_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         bnx2_netif_stop(bp);
 
@@ -4326,7 +4412,7 @@ bnx2_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
 static int
 bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         dma_addr_t mapping;
         struct tx_bd *txbd;
         struct sw_bd *tx_buf;
@@ -4455,7 +4541,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static int
 bnx2_close(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         u32 reset_code;
 
         /* Calling flush_scheduled_work() may deadlock because
@@ -4467,7 +4553,9 @@ bnx2_close(struct net_device *dev)
 
         bnx2_netif_stop(bp);
         del_timer_sync(&bp->timer);
-        if (bp->wol)
+        if (bp->flags & NO_WOL_FLAG)
+                reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
+        else if (bp->wol)
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
         else
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
@@ -4501,7 +4589,7 @@ bnx2_close(struct net_device *dev)
 static struct net_device_stats *
 bnx2_get_stats(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         struct statistics_block *stats_blk = bp->stats_blk;
         struct net_device_stats *net_stats = &bp->net_stats;
 
@@ -4575,7 +4663,7 @@ bnx2_get_stats(struct net_device *dev)
 static int
 bnx2_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         cmd->supported = SUPPORTED_Autoneg;
         if (bp->phy_flags & PHY_SERDES_FLAG) {
@@ -4622,7 +4710,7 @@ bnx2_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static int
 bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         u8 autoneg = bp->autoneg;
         u8 req_duplex = bp->req_duplex;
         u16 req_line_speed = bp->req_line_speed;
@@ -4694,7 +4782,7 @@ bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static void
 bnx2_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         strcpy(info->driver, DRV_MODULE_NAME);
         strcpy(info->version, DRV_MODULE_VERSION);
@@ -4702,15 +4790,14 @@ bnx2_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
         info->fw_version[0] = ((bp->fw_ver & 0xff000000) >> 24) + '0';
         info->fw_version[2] = ((bp->fw_ver & 0xff0000) >> 16) + '0';
         info->fw_version[4] = ((bp->fw_ver & 0xff00) >> 8) + '0';
-        info->fw_version[6] = (bp->fw_ver & 0xff) + '0';
-        info->fw_version[1] = info->fw_version[3] = info->fw_version[5] = '.';
-        info->fw_version[7] = 0;
+        info->fw_version[1] = info->fw_version[3] = '.';
+        info->fw_version[5] = 0;
 }
 
 static void
 bnx2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         if (bp->flags & NO_WOL_FLAG) {
                 wol->supported = 0;
@@ -4729,7 +4816,7 @@ bnx2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 static int
 bnx2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         if (wol->wolopts & ~WAKE_MAGIC)
                 return -EINVAL;
@@ -4749,7 +4836,7 @@ bnx2_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 static int
 bnx2_nway_reset(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         u32 bmcr;
 
         if (!(bp->autoneg & AUTONEG_SPEED)) {
@@ -4785,19 +4872,19 @@ bnx2_nway_reset(struct net_device *dev)
 static int
 bnx2_get_eeprom_len(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
-        if (bp->flash_info == 0)
+        if (bp->flash_info == NULL)
                 return 0;
 
-        return (int) bp->flash_info->total_size;
+        return (int) bp->flash_size;
 }
 
 static int
 bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                 u8 *eebuf)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         int rc;
 
         /* parameters already validated in ethtool_get_eeprom */
@@ -4811,7 +4898,7 @@ static int
 bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                 u8 *eebuf)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         int rc;
 
         /* parameters already validated in ethtool_set_eeprom */
@@ -4824,7 +4911,7 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
 static int
 bnx2_get_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         memset(coal, 0, sizeof(struct ethtool_coalesce));
 
@@ -4846,7 +4933,7 @@ bnx2_get_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)
 static int
 bnx2_set_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         bp->rx_ticks = (u16) coal->rx_coalesce_usecs;
         if (bp->rx_ticks > 0x3ff) bp->rx_ticks = 0x3ff;
@@ -4890,7 +4977,7 @@ bnx2_set_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)
 static void
 bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         ering->rx_max_pending = MAX_RX_DESC_CNT;
         ering->rx_mini_max_pending = 0;
@@ -4907,7 +4994,7 @@ bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
 static int
 bnx2_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         if ((ering->rx_pending > MAX_RX_DESC_CNT) ||
                 (ering->tx_pending > MAX_TX_DESC_CNT) ||
@@ -4930,7 +5017,7 @@ bnx2_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)
 static void
 bnx2_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         epause->autoneg = ((bp->autoneg & AUTONEG_FLOW_CTRL) != 0);
         epause->rx_pause = ((bp->flow_ctrl & FLOW_CTRL_RX) != 0);
@@ -4940,7 +5027,7 @@ bnx2_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
 static int
 bnx2_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         bp->req_flow_ctrl = 0;
         if (epause->rx_pause)
@@ -4967,7 +5054,7 @@ bnx2_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
 static u32
 bnx2_get_rx_csum(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         return bp->rx_csum;
 }
@@ -4975,7 +5062,7 @@ bnx2_get_rx_csum(struct net_device *dev)
 static int
 bnx2_set_rx_csum(struct net_device *dev, u32 data)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         bp->rx_csum = data;
         return 0;
@@ -5124,7 +5211,7 @@ bnx2_self_test_count(struct net_device *dev)
 static void
 bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         memset(buf, 0, sizeof(u64) * BNX2_NUM_TESTS);
         if (etest->flags & ETH_TEST_FL_OFFLINE) {
@@ -5140,10 +5227,8 @@ bnx2_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *buf)
                         buf[1] = 1;
                         etest->flags |= ETH_TEST_FL_FAILED;
                 }
-                if (bnx2_test_loopback(bp) != 0) {
-                        buf[2] = 1;
+                if ((buf[2] = bnx2_test_loopback(bp)) != 0)
                         etest->flags |= ETH_TEST_FL_FAILED;
-                }
 
                 if (!netif_running(bp->dev)) {
                         bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);
@@ -5200,7 +5285,7 @@ static void
 bnx2_get_ethtool_stats(struct net_device *dev,
                 struct ethtool_stats *stats, u64 *buf)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         int i;
         u32 *hw_stats = (u32 *) bp->stats_blk;
         u8 *stats_len_arr = NULL;
@@ -5240,7 +5325,7 @@ bnx2_get_ethtool_stats(struct net_device *dev,
 static int
 bnx2_phys_id(struct net_device *dev, u32 data)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         int i;
         u32 save;
 
@@ -5312,7 +5397,7 @@ static int
 bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         struct mii_ioctl_data *data = if_mii(ifr);
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         int err;
 
         switch(cmd) {
@@ -5354,7 +5439,7 @@ static int
 bnx2_change_mac_addr(struct net_device *dev, void *p)
 {
         struct sockaddr *addr = p;
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EINVAL;
@@ -5370,7 +5455,7 @@ bnx2_change_mac_addr(struct net_device *dev, void *p)
 static int
 bnx2_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         if (((new_mtu + ETH_HLEN) > MAX_ETHERNET_JUMBO_PACKET_SIZE) ||
                 ((new_mtu + ETH_HLEN) < MIN_ETHERNET_PACKET_SIZE))
@@ -5391,7 +5476,7 @@ bnx2_change_mtu(struct net_device *dev, int new_mtu)
 static void
 poll_bnx2(struct net_device *dev)
 {
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         disable_irq(bp->pdev->irq);
         bnx2_interrupt(bp->pdev->irq, dev, NULL);
@@ -5409,7 +5494,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         SET_MODULE_OWNER(dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
-        bp = dev->priv;
+        bp = netdev_priv(dev);
 
         bp->flags = 0;
         bp->phy_flags = 0;
@@ -5629,6 +5714,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                 }
         }
 
+        if (CHIP_NUM(bp) == CHIP_NUM_5708)
+                bp->flags |= NO_WOL_FLAG;
+
         if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
                 bp->tx_quick_cons_trip_int =
                         bp->tx_quick_cons_trip;
@@ -5725,7 +5813,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->ethtool_ops = &bnx2_ethtool_ops;
         dev->weight = 64;
 
-        bp = dev->priv;
+        bp = netdev_priv(dev);
 
 #if defined(HAVE_POLL_CONTROLLER) || defined(CONFIG_NET_POLL_CONTROLLER)
         dev->poll_controller = poll_bnx2;
@@ -5784,7 +5872,7 @@ static void __devexit
 bnx2_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         flush_scheduled_work();
 
@@ -5803,7 +5891,7 @@ static int
 bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
         u32 reset_code;
 
         if (!netif_running(dev))
@@ -5812,7 +5900,9 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
         bnx2_netif_stop(bp);
         netif_device_detach(dev);
         del_timer_sync(&bp->timer);
-        if (bp->wol)
+        if (bp->flags & NO_WOL_FLAG)
+                reset_code = BNX2_DRV_MSG_CODE_UNLOAD;
+        else if (bp->wol)
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;
         else
                 reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
@@ -5826,7 +5916,7 @@ static int
 bnx2_resume(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
-        struct bnx2 *bp = dev->priv;
+        struct bnx2 *bp = netdev_priv(dev);
 
         if (!netif_running(dev))
                 return 0;
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 76bb5f1a250b..9f691cbd666b 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -1,6 +1,6 @@
 /* bnx2.h: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004, 2005 Broadcom Corporation
+ * Copyright (c) 2004, 2005, 2006 Broadcom Corporation
  *
  * 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
@@ -277,19 +277,7 @@ struct statistics_block {
  *  l2_fhdr definition
  */
 struct l2_fhdr {
-#if defined(__BIG_ENDIAN)
-        u16 l2_fhdr_errors;
-        u16 l2_fhdr_status;
-#elif defined(__LITTLE_ENDIAN)
-        u16 l2_fhdr_status;
-        u16 l2_fhdr_errors;
-#endif
-                #define L2_FHDR_ERRORS_BAD_CRC          (1<<1)
-                #define L2_FHDR_ERRORS_PHY_DECODE       (1<<2)
-                #define L2_FHDR_ERRORS_ALIGNMENT        (1<<3)
-                #define L2_FHDR_ERRORS_TOO_SHORT        (1<<4)
-                #define L2_FHDR_ERRORS_GIANT_FRAME      (1<<5)
-
+        u32 l2_fhdr_status;
                 #define L2_FHDR_STATUS_RULE_CLASS       (0x7<<0)
                 #define L2_FHDR_STATUS_RULE_P2          (1<<3)
                 #define L2_FHDR_STATUS_RULE_P3          (1<<4)
@@ -301,6 +289,14 @@ struct l2_fhdr {
                 #define L2_FHDR_STATUS_TCP_SEGMENT      (1<<14)
                 #define L2_FHDR_STATUS_UDP_DATAGRAM     (1<<15)
 
+                #define L2_FHDR_ERRORS_BAD_CRC          (1<<17)
+                #define L2_FHDR_ERRORS_PHY_DECODE       (1<<18)
+                #define L2_FHDR_ERRORS_ALIGNMENT        (1<<19)
+                #define L2_FHDR_ERRORS_TOO_SHORT        (1<<20)
+                #define L2_FHDR_ERRORS_GIANT_FRAME      (1<<21)
+                #define L2_FHDR_ERRORS_TCP_XSUM         (1<<28)
+                #define L2_FHDR_ERRORS_UDP_XSUM         (1<<31)
+
         u32 l2_fhdr_hash;
 #if defined(__BIG_ENDIAN)
         u16 l2_fhdr_pkt_len;
@@ -3956,6 +3952,7 @@ struct bnx2 {
 #define NO_WOL_FLAG                     8
 #define USING_DAC_FLAG                  0x10
 #define USING_MSI_FLAG                  0x20
+#define ASF_ENABLE_FLAG                 0x40
 
         u32                     phy_flags;
 #define PHY_SERDES_FLAG                 1
@@ -3986,6 +3983,7 @@ struct bnx2 {
 #define CHIP_ID_5706_A2                 0x57060020
 #define CHIP_ID_5708_A0                 0x57080000
 #define CHIP_ID_5708_B0                 0x57081000
+#define CHIP_ID_5708_B1                 0x57081010
 
 #define CHIP_BOND_ID(bp)                (((bp)->chip_id) & 0xf)
 
@@ -3998,7 +3996,7 @@ struct bnx2 {
         u16                     bus_speed_mhz;
         u8                      wol;
 
-        u8                      fw_timed_out;
+        u8                      pad;
 
         u16                     fw_wr_seq;
         u16                     fw_drv_pulse_wr_seq;
@@ -4074,6 +4072,7 @@ struct bnx2 {
         struct net_device_stats net_stats;
 
         struct flash_spec       *flash_info;
+        u32                     flash_size;
 };
 
 static u32 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset);
@@ -4172,7 +4171,7 @@ struct fw_info {
  * the firmware has timed out, the driver will assume there is no firmware
  * running and there won't be any firmware-driver synchronization during a
  * driver reset. */
-#define FW_ACK_TIME_OUT_MS                  50
+#define FW_ACK_TIME_OUT_MS                  100
 
 
 #define BNX2_DRV_RESET_SIGNATURE                0x00000000
@@ -4275,6 +4274,9 @@ struct fw_info {
 #define BNX2_SHARED_HW_CFG_LED_MODE_GPHY1        0x100
 #define BNX2_SHARED_HW_CFG_LED_MODE_GPHY2        0x200
 
+#define BNX2_SHARED_HW_CFG_CONFIG2              0x00000040
+#define BNX2_SHARED_HW_CFG2_NVM_SIZE_MASK        0x00fff000
+
 #define BNX2_DEV_INFO_BC_REV                    0x0000004c
 
 #define BNX2_PORT_HW_CFG_MAC_UPPER              0x00000050
diff --git a/drivers/net/bnx2_fw.h b/drivers/net/bnx2_fw.h
index ab07a4900e9a..0c21bd849814 100644
--- a/drivers/net/bnx2_fw.h
+++ b/drivers/net/bnx2_fw.h
@@ -1,6 +1,6 @@
 /* bnx2_fw.h: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004, 2005 Broadcom Corporation
+ * Copyright (c) 2004, 2005, 2006 Broadcom Corporation
  *
  * 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
@@ -978,20 +978,20 @@ static u32 bnx2_COM_b06FwSbss[(0x1c/4) + 1] = { 0x0 };
 static int bnx2_RXP_b06FwReleaseMajor = 0x1;
 static int bnx2_RXP_b06FwReleaseMinor = 0x0;
 static int bnx2_RXP_b06FwReleaseFix = 0x0;
-static u32 bnx2_RXP_b06FwStartAddr = 0x08003104;
+static u32 bnx2_RXP_b06FwStartAddr = 0x08003184;
 static u32 bnx2_RXP_b06FwTextAddr = 0x08000000;
-static int bnx2_RXP_b06FwTextLen = 0x562c;
-static u32 bnx2_RXP_b06FwDataAddr = 0x08005660;
+static int bnx2_RXP_b06FwTextLen = 0x588c;
+static u32 bnx2_RXP_b06FwDataAddr = 0x080058e0;
 static int bnx2_RXP_b06FwDataLen = 0x0;
-static u32 bnx2_RXP_b06FwRodataAddr = 0x00000000;
-static int bnx2_RXP_b06FwRodataLen = 0x0;
-static u32 bnx2_RXP_b06FwBssAddr = 0x08005680;
-static int bnx2_RXP_b06FwBssLen = 0x1394;
-static u32 bnx2_RXP_b06FwSbssAddr = 0x08005660;
-static int bnx2_RXP_b06FwSbssLen = 0x18;
-static u32 bnx2_RXP_b06FwText[(0x562c/4) + 1] = {
-        0x0a000c41, 0x00000000, 0x00000000, 0x0000000d, 0x72787020, 0x322e352e,
-        0x38000000, 0x02050803, 0x00000000, 0x0000000d, 0x00000000, 0x00000000,
+static u32 bnx2_RXP_b06FwRodataAddr = 0x08005890;
+static int bnx2_RXP_b06FwRodataLen = 0x28;
+static u32 bnx2_RXP_b06FwBssAddr = 0x08005900;
+static int bnx2_RXP_b06FwBssLen = 0x13a4;
+static u32 bnx2_RXP_b06FwSbssAddr = 0x080058e0;
+static int bnx2_RXP_b06FwSbssLen = 0x1c;
+static u32 bnx2_RXP_b06FwText[(0x588c/4) + 1] = {
+        0x0a000c61, 0x00000000, 0x00000000, 0x0000000d, 0x72787020, 0x322e362e,
+        0x31000000, 0x02060103, 0x00000000, 0x0000000d, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -1513,408 +1513,435 @@ static u32 bnx2_RXP_b06FwText[(0x562c/4) + 1] = {
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c020800, 0x24425660,
-        0x3c030800, 0x24636a14, 0xac400000, 0x0043202b, 0x1480fffd, 0x24420004,
-        0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800, 0x26103104, 0x3c1c0800,
-        0x279c5660, 0x0e001035, 0x00000000, 0x0000000d, 0x3c080800, 0x8d023100,
-        0x2c420080, 0x50400001, 0xad003100, 0x8d073100, 0x3c040800, 0x24840100,
-        0x8f460100, 0x00071840, 0x00671821, 0x00031940, 0x00641021, 0xac460000,
-        0x8f450104, 0x00831021, 0xac450004, 0x8f460108, 0xac460008, 0x8f45010c,
-        0xac45000c, 0x8f460114, 0xac460010, 0x8f450118, 0xac450014, 0x8f460124,
-        0xac460018, 0x8f450128, 0xac45001c, 0x8f464010, 0xac460020, 0x8f454014,
-        0xac450024, 0x8f464018, 0xac460028, 0x8f45401c, 0xac45002c, 0x8f464020,
-        0xac460030, 0x8f454024, 0xac450034, 0x8f464028, 0xac460038, 0x8f45402c,
-        0xac45003c, 0x8f464030, 0xac460040, 0x8f454034, 0xac450044, 0x8f464038,
-        0xac460048, 0x8f45403c, 0xac45004c, 0x8f464040, 0xac460050, 0x8f454044,
-        0xac450054, 0x8f464048, 0xac460058, 0x8f45404c, 0x24e70001, 0x00402021,
-        0xad073100, 0x03e00008, 0xac85005c, 0x8f820004, 0x9743010c, 0x00804821,
-        0x00403021, 0x30421000, 0x10400010, 0x306affff, 0x30c20020, 0x1440000e,
-        0x24070005, 0x3c021000, 0x00c21024, 0x10400009, 0x3c030dff, 0x3463ffff,
-        0x3c020e00, 0x00c21024, 0x0062182b, 0x50600004, 0x24070001, 0x0a000cb1,
-        0x3c020800, 0x24070001, 0x3c020800, 0x8c430034, 0x1460001d, 0x00405821,
-        0x8f820010, 0x30424000, 0x1440001a, 0x3c020001, 0x3c021f01, 0x00c24024,
-        0x3c031000, 0x15030015, 0x3c020001, 0x31420200, 0x54400012, 0x3c020001,
-        0x9744010e, 0x24020003, 0xa342018b, 0x97850012, 0x24020002, 0x34e30002,
-        0xaf400180, 0xa742018c, 0xa7430188, 0x24840004, 0x30a5bfff, 0xa744018e,
-        0xa74501a6, 0xaf4801b8, 0x03e00008, 0x00001021, 0x3c020001, 0x00c21024,
-        0x10400039, 0x00000000, 0x9742010e, 0x3c038000, 0x3046ffff, 0x8f4201b8,
-        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006, 0x8f85000c,
-        0x24020080, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005,
-        0xa7440190, 0x9743011c, 0x9742011e, 0x0a000cec, 0x00021400, 0x9743011e,
-        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x24020003,
-        0x30838000, 0x1060000d, 0xa7420188, 0x93420116, 0x304200fc, 0x005a1021,
-        0x24424004, 0x8c430000, 0x3063ffff, 0x14600005, 0x00000000, 0x3c02ffff,
-        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
-        0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
-        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x8f820010, 0x30434000,
-        0x10600016, 0x00404021, 0x3c020f00, 0x00c21024, 0x14400012, 0x00000000,
-        0x93420116, 0x34424000, 0x03421821, 0x94650002, 0x2ca21389, 0x1040000b,
-        0x3c020800, 0x24425680, 0x00051942, 0x00031880, 0x00621821, 0x30a5001f,
-        0x8c640000, 0x24020001, 0x00a21004, 0x00822024, 0x01244825, 0x11200039,
-        0x3c021000, 0x9742010e, 0x34e70002, 0x3c038000, 0x24420004, 0x3046ffff,
-        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006,
-        0x8f85000c, 0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e,
-        0x10a00005, 0xa7440190, 0x9743011c, 0x9742011e, 0x0a000d41, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010,
-        0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+        0x00000000, 0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d,
+        0x3c020800, 0x244258e0, 0x3c030800, 0x24636ca4, 0xac400000, 0x0043202b,
+        0x1480fffd, 0x24420004, 0x3c1d0800, 0x37bd7ffc, 0x03a0f021, 0x3c100800,
+        0x26103184, 0x3c1c0800, 0x279c58e0, 0x0e00104a, 0x00000000, 0x0000000d,
+        0x27bdffe8, 0xafb00010, 0xafbf0014, 0x0e000f1d, 0x00808021, 0x1440000d,
+        0x00000000, 0x8f820010, 0x10400005, 0x00000000, 0x9743011c, 0x9742011e,
+        0x0a000c89, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825,
+        0xaf830004, 0x8f840008, 0x3c020020, 0x34424000, 0x00821824, 0x54620004,
+        0x3c020020, 0x8f820014, 0x0a000c9a, 0x34421000, 0x34428000, 0x00821824,
+        0x14620004, 0x00000000, 0x8f820014, 0x34428000, 0xaf820014, 0x8f820008,
+        0x9743010c, 0x00403021, 0x30421000, 0x10400010, 0x3069ffff, 0x30c20020,
+        0x1440000e, 0x24070005, 0x3c021000, 0x00c21024, 0x10400009, 0x3c030dff,
+        0x3463ffff, 0x3c020e00, 0x00c21024, 0x0062182b, 0x50600004, 0x24070001,
+        0x0a000cb2, 0x3c020800, 0x24070001, 0x3c020800, 0x8c430034, 0x1460001d,
+        0x00405821, 0x8f820014, 0x30424000, 0x1440001a, 0x3c020001, 0x3c021f01,
+        0x00c24024, 0x3c031000, 0x15030015, 0x3c020001, 0x31220200, 0x14400012,
+        0x3c020001, 0x9744010e, 0x24020003, 0xa342018b, 0x97850016, 0x24020002,
+        0x34e30002, 0xaf400180, 0xa742018c, 0xa7430188, 0x24840004, 0x30a5bfff,
+        0xa744018e, 0xa74501a6, 0xaf4801b8, 0x0a000f19, 0x00001021, 0x3c020001,
+        0x00c21024, 0x1040002f, 0x00000000, 0x9742010e, 0x3c038000, 0x3046ffff,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9784000a,
+        0x8f850004, 0x8f870014, 0x24020080, 0x24030002, 0xaf420180, 0x24020003,
+        0xa743018c, 0xa746018e, 0xa7420188, 0x30e28000, 0xa7440190, 0x1040000c,
+        0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000,
+        0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00e21024, 0xaf820014,
+        0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff,
+        0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x0a000f19,
+        0x00001021, 0x8f820014, 0x30434000, 0x10600016, 0x00404021, 0x3c020f00,
+        0x00c21024, 0x14400012, 0x00000000, 0x93420116, 0x34424000, 0x03421821,
+        0x94650002, 0x2ca21389, 0x1040000b, 0x3c020800, 0x24425900, 0x00051942,
+        0x00031880, 0x00621821, 0x30a5001f, 0x8c640000, 0x24020001, 0x00a21004,
+        0x00822024, 0x02048025, 0x12000030, 0x3c021000, 0x9742010e, 0x34e80002,
+        0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x24020003, 0xa342018b, 0x9784000a, 0x8f850004, 0x8f870014, 0x24020180,
+        0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0xa7480188, 0x30e28000,
+        0xa7440190, 0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021,
         0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
-        0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00e21024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff,
         0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
-        0xaf4201b8, 0x03e00008, 0x00001021, 0x00c21024, 0x104000e3, 0x3c020800,
-        0x8c430030, 0x10600040, 0x31024000, 0x1040003e, 0x3c030f00, 0x00c31824,
-        0x3c020100, 0x0043102b, 0x1440003a, 0x3c030800, 0x9742010e, 0x34e70002,
+        0xaf4201b8, 0x0a000f19, 0x00001021, 0x00c21024, 0x104000c0, 0x3c020800,
+        0x8c430030, 0x10600037, 0x31024000, 0x10400035, 0x3c030f00, 0x00c31824,
+        0x3c020100, 0x0043102b, 0x14400031, 0x3c030800, 0x9742010e, 0x34e80002,
         0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x24020003, 0xa342018b, 0x97840006, 0x8f85000c, 0x24020080, 0x24030002,
-        0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005, 0xa7440190, 0x9743011c,
-        0x9742011e, 0x0a000d86, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400,
-        0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000, 0x1040000c, 0xa7470188,
+        0x24020003, 0xa342018b, 0x9784000a, 0x8f850004, 0x8f870014, 0x24020080,
+        0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0xa7480188, 0x30e28000,
+        0xa7440190, 0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
+        0x00e21024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
+        0xaf4201b8, 0x0a000f19, 0x00001021, 0x3c030800, 0x8c620024, 0x30420008,
+        0x10400035, 0x34ea0002, 0x3c020f00, 0x00c21024, 0x14400032, 0x8d620034,
+        0x31220200, 0x1040002f, 0x8d620034, 0x9742010e, 0x30e8fffb, 0x3c038000,
+        0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
+        0xa342018b, 0x9784000a, 0x8f850004, 0x8f870014, 0x24020180, 0x24030002,
+        0xaf420180, 0xa743018c, 0xa746018e, 0xa7480188, 0x30e28000, 0xa7440190,
+        0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
+        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00e21024,
+        0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
+        0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
+        0x8d620034, 0x8f860008, 0x10400012, 0x30c20100, 0x10400010, 0x3c020f00,
+        0x00c21024, 0x3c030200, 0x1043000c, 0x3c020800, 0x8c430038, 0x8f840004,
+        0x3c020800, 0x2442003c, 0x2463ffff, 0x00832024, 0x00822021, 0x90830000,
+        0x24630004, 0x0a000de1, 0x000329c0, 0x00000000, 0x00061602, 0x3042000f,
+        0x000229c0, 0x3c04fc00, 0x00441021, 0x3c030300, 0x0062182b, 0x50600001,
+        0x24050800, 0x9742010e, 0x3148ffff, 0x3c038000, 0x24420004, 0x3046ffff,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9783000a,
+        0x8f840004, 0x8f870014, 0x24020002, 0xaf450180, 0xa742018c, 0xa746018e,
+        0xa7480188, 0x30e28000, 0xa7430190, 0x1040000c, 0xaf4401a8, 0x93420116,
+        0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004,
+        0x3c02ffff, 0x34427fff, 0x00e21024, 0xaf820014, 0x97820016, 0x9743010c,
+        0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,
+        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x0a000f19, 0x00001021, 0x8f424000,
+        0x30420100, 0x104000d5, 0x3c020800, 0x8c440024, 0x24030001, 0x1483002f,
+        0x00405021, 0x9742010e, 0x34e70002, 0x3c038000, 0x24420004, 0x3045ffff,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9783000a,
+        0x8f840004, 0x8f860014, 0x24020002, 0xaf400180, 0xa742018c, 0xa745018e,
+        0xa7470188, 0x30c28000, 0xa7430190, 0x1040000c, 0xaf4401a8, 0x93420116,
+        0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004,
+        0x3c02ffff, 0x34427fff, 0x00c21024, 0xaf820014, 0x97820016, 0x9743010c,
+        0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,
+        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x0a000f19, 0x00001021, 0x30820001,
+        0x1040002e, 0x30eb0004, 0x9742010e, 0x30e9fffb, 0x3c038000, 0x24420004,
+        0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b,
+        0x9783000a, 0x8f840004, 0x8f860014, 0x24020002, 0xaf400180, 0xa742018c,
+        0xa745018e, 0xa7470188, 0x30c28000, 0xa7430190, 0x1040000c, 0xaf4401a8,
         0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff,
-        0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf820010, 0x97820012,
+        0x14600004, 0x3c02ffff, 0x34427fff, 0x00c21024, 0xaf820014, 0x97820016,
         0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825,
-        0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021,
-        0x3c030800, 0x8c620024, 0x30420008, 0x1040003e, 0x34e80002, 0x3c020f00,
-        0x00c21024, 0x1440003b, 0x8d620034, 0x31420200, 0x10400038, 0x8d620034,
-        0x9742010e, 0x30e7fffb, 0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8,
-        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006, 0x8f85000c,
-        0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005,
-        0xa7440190, 0x9743011c, 0x9742011e, 0x0a000dca, 0x00021400, 0x9743011e,
-        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000,
-        0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
-        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024,
-        0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
-        0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
-        0x8d620034, 0x8f860004, 0x1040001a, 0x30c20100, 0x10400018, 0x3c020f00,
-        0x00c21024, 0x3c030200, 0x10430014, 0x00000000, 0x8f82000c, 0x10400004,
-        0x00000000, 0x9742011c, 0x0a000df8, 0x3044ffff, 0x9742011e, 0x3044ffff,
-        0x3c030800, 0x8c620038, 0x3c030800, 0x2463003c, 0x2442ffff, 0x00822024,
-        0x00831821, 0x90620000, 0x24420004, 0x0a000e0d, 0x000229c0, 0x00000000,
-        0x00061602, 0x3042000f, 0x000229c0, 0x3c04fc00, 0x00441021, 0x3c030300,
-        0x0062182b, 0x50600001, 0x24050800, 0x9742010e, 0x3107ffff, 0x3c038000,
+        0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x3127ffff, 0x8d420024,
+        0x30420004, 0x10400030, 0x8d420024, 0x9742010e, 0x30e9fffb, 0x3c038000,
         0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
-        0xa342018b, 0x97830006, 0x8f84000c, 0x24020002, 0xaf450180, 0xa742018c,
-        0xa746018e, 0x10800005, 0xa7430190, 0x9743011c, 0x9742011e, 0x0a000e26,
-        0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8,
-        0x8f840010, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc,
-        0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,
-        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
-        0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
-        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x8f424000, 0x30420100,
-        0x104000f9, 0x3c020800, 0x8c440024, 0x24030001, 0x14830038, 0x00404821,
-        0x9742010e, 0x34e60002, 0x3c038000, 0x24420004, 0x3045ffff, 0x8f4201b8,
-        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97830006, 0x8f84000c,
-        0x24020002, 0xaf400180, 0xa742018c, 0xa745018e, 0x10800005, 0xa7430190,
-        0x9743011c, 0x9742011e, 0x0a000e65, 0x00021400, 0x9743011e, 0x9742011c,
-        0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000, 0x1040000c,
-        0xa7460188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004, 0x8c430000,
-        0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024, 0xaf820010,
-        0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff,
-        0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x03e00008,
-        0x00001021, 0x30820001, 0x10400037, 0x30ea0004, 0x9742010e, 0x30e8fffb,
+        0xa342018b, 0x9784000a, 0x8f850004, 0x8f880014, 0x24020100, 0x24030002,
+        0xaf420180, 0xa743018c, 0xa746018e, 0xa7470188, 0x31028000, 0xa7440190,
+        0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
+        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x01021024,
+        0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
+        0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
+        0x3127ffff, 0x8d420024, 0x30420008, 0x1040002d, 0x00000000, 0x9742010e,
+        0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x24020003, 0xa342018b, 0x9784000a, 0x8f850004, 0x8f880014, 0x24020180,
+        0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0xa7470188, 0x31028000,
+        0xa7440190, 0x1040000c, 0xaf4501a8, 0x93420116, 0x304200fc, 0x005a1021,
+        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
+        0x01021024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff,
+        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
+        0xaf4201b8, 0x15600041, 0x00001021, 0x27440180, 0x3c038000, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x24022000, 0x24030002, 0xa4820008, 0xa083000b,
+        0xa4800010, 0x3c021000, 0xaf4201b8, 0x0a000f19, 0x00001021, 0x3c030800,
+        0x8c620024, 0x30420001, 0x1040002e, 0x00001021, 0x9742010e, 0x34e70002,
         0x3c038000, 0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x24020003, 0xa342018b, 0x97830006, 0x8f84000c, 0x24020002, 0xaf400180,
-        0xa742018c, 0xa745018e, 0x10800005, 0xa7430190, 0x9743011c, 0x9742011e,
-        0x0a000e9f, 0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825,
-        0xaf4301a8, 0x8f840010, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116,
-        0x304200fc, 0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004,
-        0x3c02ffff, 0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c,
-        0x8f440104, 0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6,
-        0xaf4301ac, 0x3c021000, 0xaf4201b8, 0x3107ffff, 0x8d220024, 0x30420004,
-        0x10400039, 0x8d220024, 0x9742010e, 0x30e8fffb, 0x3c038000, 0x24420004,
-        0x3046ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b,
-        0x97840006, 0x8f85000c, 0x24020100, 0x24030002, 0xaf420180, 0xa743018c,
-        0xa746018e, 0x10a00005, 0xa7440190, 0x9743011c, 0x9742011e, 0x0a000eda,
-        0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8,
-        0x8f840010, 0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc,
-        0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,
-        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
-        0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
-        0x3c021000, 0xaf4201b8, 0x3107ffff, 0x8d220024, 0x30420008, 0x10400036,
-        0x00000000, 0x9742010e, 0x3c038000, 0x24420004, 0x3046ffff, 0x8f4201b8,
-        0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x97840006, 0x8f85000c,
-        0x24020180, 0x24030002, 0xaf420180, 0xa743018c, 0xa746018e, 0x10a00005,
-        0xa7440190, 0x9743011c, 0x9742011e, 0x0a000f14, 0x00021400, 0x9743011e,
-        0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010, 0x30828000,
-        0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
-        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00821024,
-        0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
+        0x24020003, 0xa342018b, 0x9783000a, 0x8f840004, 0x8f860014, 0x24020002,
+        0xaf400180, 0xa742018c, 0xa745018e, 0xa7470188, 0x30c28000, 0xa7430190,
+        0x1040000c, 0xaf4401a8, 0x93420116, 0x304200fc, 0x005a1021, 0x24424004,
+        0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff, 0x00c21024,
+        0xaf820014, 0x97820016, 0x9743010c, 0x8f440104, 0x3042bfff, 0x00031c00,
         0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000, 0xaf4201b8,
-        0x1540004a, 0x00001021, 0x27440180, 0x3c038000, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24022000, 0x24030002, 0xa4820008, 0xa083000b, 0xa4800010,
-        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00001021, 0x3c030800, 0x8c620024,
-        0x30420001, 0x10400037, 0x00001021, 0x9742010e, 0x34e60002, 0x3c038000,
-        0x24420004, 0x3045ffff, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
-        0xa342018b, 0x97830006, 0x8f84000c, 0x24020002, 0xaf400180, 0xa742018c,
-        0xa745018e, 0x10800005, 0xa7430190, 0x9743011c, 0x9742011e, 0x0a000f5e,
-        0x00021400, 0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8,
-        0x8f840010, 0x30828000, 0x1040000c, 0xa7460188, 0x93420116, 0x304200fc,
+        0x00001021, 0x8fbf0014, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x8f4b0070,
+        0x93420112, 0x8f840008, 0x00022882, 0x30820100, 0x14400003, 0x24a30003,
+        0x03e00008, 0x00001021, 0x30824000, 0x10400010, 0x27424000, 0x00031880,
+        0x00431021, 0x8c470000, 0x24a30004, 0x00031880, 0x27424000, 0x00431021,
+        0x8c490000, 0x93430116, 0x27424000, 0x306300fc, 0x00431021, 0x8c4a0000,
+        0x0a000f45, 0x3c030800, 0x30822000, 0x1040ffea, 0x00031880, 0x27424000,
+        0x00431021, 0x8c470000, 0x24a30004, 0x00031880, 0x27424000, 0x00431021,
+        0x8c490000, 0x00005021, 0x3c030800, 0x24680100, 0x00071602, 0x00021080,
+        0x00481021, 0x8c460000, 0x00071b82, 0x306303fc, 0x01031821, 0x8c640400,
+        0x00071182, 0x304203fc, 0x01021021, 0x8c450800, 0x30e300ff, 0x00031880,
+        0x01031821, 0x00091602, 0x00021080, 0x01021021, 0x00c43026, 0x8c640c00,
+        0x8c431000, 0x00c53026, 0x00091382, 0x304203fc, 0x01021021, 0x8c451400,
+        0x312200ff, 0x00021080, 0x01021021, 0x00c43026, 0x00c33026, 0x00091982,
+        0x306303fc, 0x01031821, 0x8c641800, 0x8c431c00, 0x00c53026, 0x00c43026,
+        0x11400015, 0x00c33026, 0x000a1602, 0x00021080, 0x01021021, 0x8c432000,
+        0x000a1382, 0x304203fc, 0x01021021, 0x8c452400, 0x314200ff, 0x00021080,
+        0x01021021, 0x00c33026, 0x000a1982, 0x306303fc, 0x01031821, 0x8c642800,
+        0x8c432c00, 0x00c53026, 0x00c43026, 0x00c33026, 0x8f430070, 0x3c050800,
+        0x8ca43100, 0x2c820020, 0x10400008, 0x006b5823, 0x3c020800, 0x24423104,
+        0x00041880, 0x00621821, 0x24820001, 0xac6b0000, 0xaca23100, 0xaf860004,
+        0x03e00008, 0x24020001, 0x27bdffe8, 0xafbf0010, 0x8f460128, 0x8f840010,
+        0xaf460020, 0x8f450104, 0x8f420100, 0x24030800, 0xaf850008, 0xaf820014,
+        0xaf4301b8, 0x1080000a, 0x3c020800, 0x8c430034, 0x10600007, 0x30a22000,
+        0x10400005, 0x34a30100, 0x8f82000c, 0xaf830008, 0x24420001, 0xaf82000c,
+        0x3c020800, 0x8c4300c0, 0x10600006, 0x3c030800, 0x8c6200c4, 0x24040001,
+        0x24420001, 0x0a000fd5, 0xac6200c4, 0x8f820008, 0x3c030010, 0x00431024,
+        0x14400009, 0x3c02001f, 0x3c030800, 0x8c620020, 0x00002021, 0x24420001,
+        0x0e000c78, 0xac620020, 0x0a000fd5, 0x00402021, 0x3442ff00, 0x14c20009,
+        0x2403bfff, 0x3c030800, 0x8c620020, 0x24040001, 0x24420001, 0x0e000c78,
+        0xac620020, 0x0a000fd5, 0x00402021, 0x8f820014, 0x00431024, 0x14400006,
+        0x00000000, 0xaf400048, 0x0e0011a9, 0xaf400040, 0x0a000fd5, 0x00402021,
+        0x0e001563, 0x00000000, 0x00402021, 0x10800005, 0x3c024000, 0x8f430124,
+        0x3c026020, 0xac430014, 0x3c024000, 0xaf420138, 0x00000000, 0x8fbf0010,
+        0x03e00008, 0x27bd0018, 0x27bdffe0, 0xafbf0018, 0xafb10014, 0xafb00010,
+        0x8f420140, 0xaf420020, 0x8f430148, 0x3c027000, 0x00621824, 0x3c023000,
+        0x10620021, 0x0043102b, 0x14400006, 0x3c024000, 0x3c022000, 0x10620009,
+        0x3c024000, 0x0a001040, 0x00000000, 0x10620045, 0x3c025000, 0x10620047,
+        0x3c024000, 0x0a001040, 0x00000000, 0x27440180, 0x3c038000, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x00000000, 0x8f420148, 0x24030002, 0xa083000b,
+        0x00021402, 0xa4820008, 0x8f430148, 0xa4830010, 0x8f420144, 0x3c031000,
+        0xac820024, 0xaf4301b8, 0x0a001040, 0x3c024000, 0x8f420148, 0x24030002,
+        0x3044ffff, 0x00021402, 0x305000ff, 0x1203000c, 0x27510180, 0x2a020003,
+        0x10400005, 0x24020003, 0x0600001d, 0x36053000, 0x0a001027, 0x3c038000,
+        0x12020007, 0x00000000, 0x0a001034, 0x00000000, 0x0e00112c, 0x00000000,
+        0x0a001025, 0x00402021, 0x0e00113e, 0x00000000, 0x00402021, 0x36053000,
+        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0xa6250008,
+        0xa222000b, 0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8,
+        0x0a001040, 0x3c024000, 0x0000000d, 0x00000000, 0x240002bf, 0x0a001040,
+        0x3c024000, 0x0e001441, 0x00000000, 0x0a001040, 0x3c024000, 0x0e0015ea,
+        0x00000000, 0x3c024000, 0xaf420178, 0x00000000, 0x8fbf0018, 0x8fb10014,
+        0x8fb00010, 0x03e00008, 0x27bd0020, 0x24020800, 0x03e00008, 0xaf4201b8,
+        0x27bdffe8, 0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000,
+        0x2403ff7f, 0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000,
+        0x3c020008, 0xaf430008, 0x8e040808, 0x0342d825, 0x8e020808, 0x3c030800,
+        0xac600020, 0x3084fff0, 0x2c840001, 0x3042fff0, 0x38420010, 0x2c420001,
+        0xaf840010, 0xaf820000, 0x0e00160c, 0x00000000, 0x0e001561, 0x00000000,
+        0x3c020400, 0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c,
+        0x8e021980, 0x34420200, 0xae021980, 0x8f500000, 0x32020003, 0x1040fffd,
+        0x32020001, 0x10400004, 0x32020002, 0x0e000f92, 0x00000000, 0x32020002,
+        0x1040fff6, 0x00000000, 0x0e000fe0, 0x00000000, 0x0a001071, 0x00000000,
+        0x27bdffe8, 0x3c04600c, 0xafbf0014, 0xafb00010, 0x8c825000, 0x3c1a8000,
+        0x2403ff7f, 0x3c106000, 0x00431024, 0x3442380c, 0x24030003, 0xac825000,
+        0x3c020008, 0xaf430008, 0x8e040808, 0x0342d825, 0x8e020808, 0x3c030800,
+        0xac600020, 0x3084fff0, 0x2c840001, 0x3042fff0, 0x38420010, 0x2c420001,
+        0xaf840010, 0xaf820000, 0x0e00160c, 0x00000000, 0x0e001561, 0x00000000,
+        0x3c020400, 0x3442000c, 0x3c03ffff, 0x34630806, 0xae021948, 0xae03194c,
+        0x8e021980, 0x8fbf0014, 0x34420200, 0xae021980, 0x8fb00010, 0x03e00008,
+        0x27bd0018, 0x00804821, 0x30a5ffff, 0x30c6ffff, 0x30e7ffff, 0x3c038000,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003, 0xa342018b, 0x9783000a,
+        0x8f840004, 0x8f880014, 0xaf490180, 0xa745018c, 0xa746018e, 0xa7470188,
+        0x31028000, 0xa7430190, 0x1040000c, 0xaf4401a8, 0x93420116, 0x304200fc,
         0x005a1021, 0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff,
-        0x34427fff, 0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104,
+        0x34427fff, 0x01021024, 0xaf820014, 0x97820016, 0x9743010c, 0x8f440104,
         0x3042bfff, 0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac,
-        0x3c021000, 0xaf4201b8, 0x00001021, 0x03e00008, 0x00000000, 0x27bdffe8,
-        0xafbf0010, 0x8f460128, 0x8f84000c, 0xaf460020, 0x8f450104, 0x8f420100,
-        0x24030800, 0xaf850004, 0xaf820010, 0xaf4301b8, 0x1080000a, 0x3c020800,
-        0x8c430034, 0x10600007, 0x30a22000, 0x10400005, 0x34a30100, 0x8f820008,
-        0xaf830004, 0x24420001, 0xaf820008, 0x3c020800, 0x8c4300c0, 0x10600006,
-        0x3c030800, 0x8c6200c4, 0x24040001, 0x24420001, 0x0a000fc0, 0xac6200c4,
-        0x8f820004, 0x3c030010, 0x00431024, 0x14400009, 0x3c02001f, 0x3c030800,
-        0x8c620020, 0x00002021, 0x24420001, 0x0e000c99, 0xac620020, 0x0a000fc0,
-        0x00402021, 0x3442ff00, 0x14c20009, 0x2403bfff, 0x3c030800, 0x8c620020,
-        0x24040001, 0x24420001, 0x0e000c99, 0xac620020, 0x0a000fc0, 0x00402021,
-        0x8f820010, 0x00431024, 0x14400006, 0x00000000, 0xaf400048, 0x0e001144,
-        0xaf400040, 0x0a000fc0, 0x00402021, 0x0e0014c9, 0x00000000, 0x00402021,
-        0x10800005, 0x3c024000, 0x8f430124, 0x3c026020, 0xac430014, 0x3c024000,
-        0xaf420138, 0x00000000, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x27bdffe0,
-        0xafbf0018, 0xafb10014, 0xafb00010, 0x8f420140, 0xaf420020, 0x8f430148,
-        0x3c027000, 0x00621824, 0x3c023000, 0x10620021, 0x0043102b, 0x14400006,
-        0x3c024000, 0x3c022000, 0x10620009, 0x3c024000, 0x0a00102b, 0x00000000,
-        0x10620045, 0x3c025000, 0x10620047, 0x3c024000, 0x0a00102b, 0x00000000,
+        0x3c021000, 0xaf4201b8, 0x03e00008, 0x00000000, 0x27440180, 0x3c038000,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24022000, 0x24030002, 0xa4820008,
+        0xa083000b, 0xa4800010, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00000000,
         0x27440180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,
         0x8f420148, 0x24030002, 0xa083000b, 0x00021402, 0xa4820008, 0x8f430148,
-        0xa4830010, 0x8f420144, 0x3c031000, 0xac820024, 0xaf4301b8, 0x0a00102b,
-        0x3c024000, 0x8f420148, 0x24030002, 0x3044ffff, 0x00021402, 0x305000ff,
-        0x1203000c, 0x27510180, 0x2a020003, 0x10400005, 0x24020003, 0x0600001d,
-        0x36053000, 0x0a001012, 0x3c038000, 0x12020007, 0x00000000, 0x0a00101f,
-        0x00000000, 0x0e00111f, 0x00000000, 0x0a001010, 0x00402021, 0x0e001131,
-        0x00000000, 0x00402021, 0x36053000, 0x3c038000, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24020002, 0xa6250008, 0xa222000b, 0xa6240010, 0x8f420144,
-        0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00102b, 0x3c024000, 0x0000000d,
-        0x00000000, 0x24000295, 0x0a00102b, 0x3c024000, 0x0e0013a7, 0x00000000,
-        0x0a00102b, 0x3c024000, 0x0e001552, 0x00000000, 0x3c024000, 0xaf420178,
-        0x00000000, 0x8fbf0018, 0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020,
-        0x24020800, 0x03e00008, 0xaf4201b8, 0x27bdffe8, 0x3c04600c, 0xafbf0014,
-        0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f, 0x3c106000, 0x00431024,
-        0x3442380c, 0x24030003, 0xac825000, 0x3c020008, 0xaf430008, 0x8e040808,
-        0x0342d825, 0x8e020808, 0x3c030800, 0xac600020, 0x3084fff0, 0x2c840001,
-        0x3042fff0, 0x38420010, 0x2c420001, 0xaf84000c, 0xaf820000, 0x0e001574,
-        0x00000000, 0x0e0014c7, 0x00000000, 0x3c020400, 0x3442000c, 0x3c03ffff,
-        0x34630806, 0xae021948, 0xae03194c, 0x8e021980, 0x34420200, 0xae021980,
-        0x8f500000, 0x32020003, 0x1040fffd, 0x32020001, 0x10400004, 0x32020002,
-        0x0e000f7d, 0x00000000, 0x32020002, 0x1040fff6, 0x00000000, 0x0e000fcb,
-        0x00000000, 0x0a00105c, 0x00000000, 0x27bdffe8, 0x3c04600c, 0xafbf0014,
-        0xafb00010, 0x8c825000, 0x3c1a8000, 0x2403ff7f, 0x3c106000, 0x00431024,
-        0x3442380c, 0x24030003, 0xac825000, 0x3c020008, 0xaf430008, 0x8e040808,
-        0x0342d825, 0x8e020808, 0x3c030800, 0xac600020, 0x3084fff0, 0x2c840001,
-        0x3042fff0, 0x38420010, 0x2c420001, 0xaf84000c, 0xaf820000, 0x0e001574,
-        0x00000000, 0x0e0014c7, 0x00000000, 0x3c020400, 0x3442000c, 0x3c03ffff,
-        0x34630806, 0xae021948, 0xae03194c, 0x8e021980, 0x8fbf0014, 0x34420200,
-        0xae021980, 0x8fb00010, 0x03e00008, 0x27bd0018, 0x30a5ffff, 0x30c6ffff,
-        0x30e7ffff, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020003,
-        0xa342018b, 0x97830006, 0x8f82000c, 0xaf440180, 0xa745018c, 0xa746018e,
-        0x10400005, 0xa7430190, 0x9743011c, 0x9742011e, 0x0a0010ad, 0x00021400,
-        0x9743011e, 0x9742011c, 0x00021400, 0x00621825, 0xaf4301a8, 0x8f840010,
-        0x30828000, 0x1040000c, 0xa7470188, 0x93420116, 0x304200fc, 0x005a1021,
-        0x24424004, 0x8c430000, 0x3063ffff, 0x14600004, 0x3c02ffff, 0x34427fff,
-        0x00821024, 0xaf820010, 0x97820012, 0x9743010c, 0x8f440104, 0x3042bfff,
-        0x00031c00, 0x3084ffff, 0x00641825, 0xa74201a6, 0xaf4301ac, 0x3c021000,
-        0xaf4201b8, 0x03e00008, 0x00000000, 0x27440180, 0x3c038000, 0x8f4201b8,
-        0x00431024, 0x1440fffd, 0x24022000, 0x24030002, 0xa4820008, 0xa083000b,
-        0xa4800010, 0x3c021000, 0xaf4201b8, 0x03e00008, 0x00000000, 0x27440180,
-        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420148,
-        0x24030002, 0xa083000b, 0x00021402, 0xa4820008, 0x8f430148, 0xa4830010,
-        0x8f420144, 0x3c031000, 0xac820024, 0x03e00008, 0xaf4301b8, 0x27bdffe0,
-        0xafbf0018, 0xafb10014, 0xafb00010, 0x8f420148, 0x24030002, 0x3044ffff,
-        0x00021402, 0x305000ff, 0x1203000c, 0x27510180, 0x2a020003, 0x10400005,
-        0x24020003, 0x0600001d, 0x36053000, 0x0a00110a, 0x3c038000, 0x12020007,
-        0x00000000, 0x0a001117, 0x00000000, 0x0e00111f, 0x00000000, 0x0a001108,
-        0x00402021, 0x0e001131, 0x00000000, 0x00402021, 0x36053000, 0x3c038000,
-        0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0xa6250008, 0xa222000b,
-        0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8, 0x0a00111b,
-        0x8fbf0018, 0x0000000d, 0x00000000, 0x24000295, 0x8fbf0018, 0x8fb10014,
-        0x8fb00010, 0x03e00008, 0x27bd0020, 0x3084ffff, 0x2c821389, 0x1040000d,
-        0x00001021, 0x3c030800, 0x24635680, 0x00042942, 0x00052880, 0x00a32821,
-        0x3086001f, 0x8ca40000, 0x24030001, 0x00c31804, 0x00832025, 0x03e00008,
-        0xaca40000, 0x03e00008, 0x24020091, 0x3084ffff, 0x2c821389, 0x1040000e,
-        0x00001021, 0x3c030800, 0x24635680, 0x00042942, 0x00052880, 0x00a32821,
-        0x3086001f, 0x24030001, 0x8ca40000, 0x00c31804, 0x00031827, 0x00832024,
-        0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x27bdffb0, 0xafbf0048,
-        0x93620023, 0x30420010, 0x1440025b, 0x24020001, 0x93420116, 0x93630005,
-        0x34424000, 0x30630001, 0x14600005, 0x03425821, 0x0e001548, 0x00000000,
-        0x0a0013a5, 0x8fbf0048, 0x93420112, 0x8f430104, 0x3c040020, 0x34424000,
-        0x00641824, 0x10600012, 0x03422821, 0x27450180, 0x3c038000, 0x8f4201b8,
+        0xa4830010, 0x8f420144, 0x3c031000, 0xac820024, 0x03e00008, 0xaf4301b8,
+        0x27bdffe0, 0xafbf0018, 0xafb10014, 0xafb00010, 0x8f420148, 0x24030002,
+        0x3044ffff, 0x00021402, 0x305000ff, 0x1203000c, 0x27510180, 0x2a020003,
+        0x10400005, 0x24020003, 0x0600001d, 0x36053000, 0x0a001117, 0x3c038000,
+        0x12020007, 0x00000000, 0x0a001124, 0x00000000, 0x0e00112c, 0x00000000,
+        0x0a001115, 0x00402021, 0x0e00113e, 0x00000000, 0x00402021, 0x36053000,
+        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002, 0xa6250008,
+        0xa222000b, 0xa6240010, 0x8f420144, 0x3c031000, 0xae220024, 0xaf4301b8,
+        0x0a001128, 0x8fbf0018, 0x0000000d, 0x00000000, 0x240002bf, 0x8fbf0018,
+        0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x3084ffff, 0x2c821389,
+        0x1040000d, 0x00001021, 0x3c030800, 0x24635900, 0x00042942, 0x00052880,
+        0x00a32821, 0x3086001f, 0x8ca40000, 0x24030001, 0x00c31804, 0x00832025,
+        0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x3084ffff, 0x2c821389,
+        0x1040000e, 0x00001021, 0x3c030800, 0x24635900, 0x00042942, 0x00052880,
+        0x00a32821, 0x3086001f, 0x24030001, 0x8ca40000, 0x00c31804, 0x00031827,
+        0x00832024, 0x03e00008, 0xaca40000, 0x03e00008, 0x24020091, 0x9482000c,
+        0x24870014, 0x00021302, 0x00021080, 0x00824021, 0x00e8182b, 0x1060004f,
+        0x00000000, 0x90e30000, 0x2c620009, 0x10400047, 0x3c020800, 0x24425890,
+        0x00031880, 0x00621821, 0x8c640000, 0x00800008, 0x00000000, 0x0a0011a4,
+        0x24e70001, 0x90e30001, 0x2402000a, 0x54620024, 0x01003821, 0x01071023,
+        0x2c42000a, 0x54400020, 0x01003821, 0x3c050800, 0x8ca26c98, 0x24e70002,
+        0x34420100, 0xaca26c98, 0x90e30000, 0x90e20001, 0x90e40002, 0x90e60003,
+        0x24e70004, 0x24a56c98, 0x00031e00, 0x00021400, 0x00621825, 0x00042200,
+        0x00641825, 0x00661825, 0xaca30004, 0x90e20000, 0x90e30001, 0x90e40002,
+        0x90e60003, 0x24e70004, 0x00021600, 0x00031c00, 0x00431025, 0x00042200,
+        0x00441025, 0x00461025, 0x0a0011a4, 0xaca20008, 0x90e30001, 0x24020004,
+        0x1062000e, 0x00601021, 0x0a00119e, 0x01001021, 0x90e30001, 0x24020003,
+        0x10620008, 0x00601021, 0x0a00119e, 0x01001021, 0x90e30001, 0x24020002,
+        0x14620003, 0x01001021, 0x00601021, 0x00e21021, 0x0a0011a4, 0x00403821,
+        0x90e20001, 0x0a0011a4, 0x00e23821, 0x01003821, 0x00e8102b, 0x5440ffb4,
+        0x90e30000, 0x03e00008, 0x24020001, 0x27bdff90, 0x3c030800, 0xafbf006c,
+        0xafbe0068, 0xafb70064, 0xafb60060, 0xafb5005c, 0xafb40058, 0xafb30054,
+        0xafb20050, 0xafb1004c, 0xafb00048, 0xac606c98, 0x93620023, 0x30420010,
+        0x1440027c, 0x24020001, 0x93420116, 0x93630005, 0x34424000, 0x30630001,
+        0x14600005, 0x0342b021, 0x0e0015e0, 0x00000000, 0x0a001436, 0x8fbf006c,
+        0x93420112, 0x8f430104, 0x3c040020, 0x34424000, 0x00641824, 0x10600012,
+        0x03422821, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x00000000, 0x8f420128, 0xaca20000, 0x8f640040, 0x24030008, 0x240240c1,
+        0xa4a20008, 0x24020002, 0xa0a2000b, 0x3c021000, 0x0a0011f1, 0xa0a3000a,
+        0x8f420104, 0x3c030040, 0x00431024, 0x1040001d, 0x3c038000, 0x27450180,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000,
+        0x8f640040, 0x24030010, 0x240240c1, 0xa4a20008, 0x24020002, 0xa0a3000a,
+        0x24030008, 0xa0a2000b, 0x3c021000, 0xa4a30010, 0xa0a00012, 0xa0a00013,
+        0xaca00014, 0xaca00024, 0xaca00028, 0xaca0002c, 0xaca40018, 0x0e0015e0,
+        0xaf4201b8, 0x0a001436, 0x8fbf006c, 0x8f820000, 0x10400016, 0x00000000,
+        0x8f420104, 0x3c030001, 0x00431024, 0x10400011, 0x00000000, 0x8ca3000c,
+        0x8f620030, 0x1462022d, 0x24020001, 0x8ca30010, 0x8f62002c, 0x14620229,
+        0x24020001, 0x9763003a, 0x96c20000, 0x14430225, 0x24020001, 0x97630038,
+        0x96c20002, 0x14430221, 0x24020001, 0xaf400048, 0xaf400054, 0xaf400040,
+        0x8f740040, 0x8f650048, 0x00b43023, 0x04c10004, 0x00000000, 0x0000000d,
+        0x00000000, 0x240001af, 0x9742011a, 0x3052ffff, 0x12400004, 0x8ed30004,
+        0x02721021, 0x0a001228, 0x2451ffff, 0x02608821, 0x92d7000d, 0xa7a00020,
+        0xa3a0001a, 0xafa00028, 0x9362003f, 0x32e30004, 0x1060003a, 0x305000ff,
+        0x24040012, 0x16040006, 0x24020001, 0x3c040800, 0x8c830028, 0x24630001,
+        0x0a001328, 0xac830028, 0x8f620044, 0x16620010, 0x27a60010, 0x27450180,
+        0x3c038000, 0x2402001a, 0xa7a20020, 0x24020020, 0xafb40028, 0xa3b00022,
+        0xa3a40023, 0xa3a2001a, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,
+        0x0a00130d, 0x00000000, 0x8f620044, 0x02621023, 0x0440001a, 0x02651023,
+        0x044100d9, 0x24020001, 0x3c020800, 0x8c4300d8, 0x10600004, 0x24020001,
+        0xa7a20020, 0x0a00125e, 0xafb40028, 0x2402001a, 0xa7a20020, 0x24020020,
+        0xafb40028, 0xa3b00022, 0xa3a40023, 0xa3a2001a, 0x27a60010, 0x27450180,
+        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a00130d,
+        0x00000000, 0x0a001328, 0x24020001, 0x0293f023, 0x1bc00016, 0x025e102a,
+        0x54400007, 0x32f700fe, 0x57d2000f, 0x027e9821, 0x32e20001, 0x5440000c,
+        0x027e9821, 0x32f700fe, 0x0240f021, 0x3c040800, 0x8c8300c8, 0x00009021,
+        0x24020001, 0xa7a20020, 0xafb40028, 0x24630001, 0x0a001282, 0xac8300c8,
+        0x025e1023, 0x0a001282, 0x3052ffff, 0x0000f021, 0x24a2ffff, 0x02221823,
+        0x1860001f, 0x0072102a, 0x54400019, 0x00a08821, 0x97a20020, 0x3c040800,
+        0x8c8300cc, 0xafb40028, 0x34420001, 0x24630001, 0xa7a20020, 0x02741026,
+        0x2c420001, 0xac8300cc, 0x2cc30001, 0x00431024, 0x1440000a, 0x02401821,
+        0x27a60010, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
+        0x00000000, 0x0a00130d, 0x00000000, 0x00a08821, 0x02431023, 0x3052ffff,
+        0x0a0012ae, 0x32f700f6, 0x02741023, 0x18400008, 0x97a20020, 0x3c040800,
+        0x8c8300d4, 0xafb30028, 0x34420400, 0x24630001, 0xa7a20020, 0xac8300d4,
+        0x32e20002, 0x1040001c, 0x32e20010, 0x8f620044, 0x1662000d, 0x27a60010,
+        0x97a20020, 0x27450180, 0x3c038000, 0xafb40028, 0x34420001, 0xa7a20020,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a00130d, 0x00000000,
+        0x97a20020, 0x27450180, 0x3c038000, 0xafb40028, 0x34420001, 0xa7a20020,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a00130d, 0x00000000,
+        0x54400003, 0x8ed50008, 0x0a001328, 0x24020001, 0x8f630054, 0x26a2ffff,
+        0x00431023, 0x18400011, 0x27a60010, 0x97a20020, 0x3c040800, 0x8c8300d0,
+        0x27450180, 0x3c078000, 0xafb40028, 0x34420001, 0x24630001, 0xa7a20020,
+        0xac8300d0, 0x8f4201b8, 0x00471024, 0x1440fffd, 0x00000000, 0x0a00130d,
+        0x00000000, 0x32e20020, 0x10400011, 0x00000000, 0x96c20012, 0x0052102b,
+        0x10400008, 0x97a20020, 0x96d20012, 0x12400003, 0x02721021, 0x0a0012f2,
+        0x2451ffff, 0x02608821, 0x97a20020, 0x93a3001a, 0x34420008, 0x34630004,
+        0xa7a20020, 0xa3a3001a, 0x8f420104, 0x3c030080, 0x00431024, 0x10400037,
+        0x3a03000a, 0x0e001151, 0x02c02021, 0x24030002, 0x1443002b, 0x3c030800,
+        0x27a60010, 0x97a20020, 0x27450180, 0x3c038000, 0xafb40028, 0x34420001,
+        0xa7a20020, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128,
+        0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018, 0x90c4000a,
+        0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010, 0x90c30012,
+        0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014, 0x8cc20024,
+        0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc4002c, 0x24020001, 0x3c031000,
+        0xaca4002c, 0xaf4301b8, 0xaf400044, 0xaf400050, 0x0a001436, 0x8fbf006c,
+        0x8c626c98, 0x30420100, 0x10400003, 0x24636c98, 0x8c620004, 0xaf62017c,
+        0x3a03000a, 0x2c630001, 0x3a02000c, 0x2c420001, 0x00621825, 0x14600003,
+        0x2402000e, 0x56020030, 0x00009021, 0x52400008, 0x96c4000e, 0x12400004,
+        0xa7b20040, 0x02721021, 0x0a001343, 0x2451ffff, 0x02608821, 0x96c4000e,
+        0x93630035, 0x8f62004c, 0x00642004, 0x00952021, 0x00821023, 0x18400015,
+        0x00000000, 0x8f620018, 0x02621023, 0x1c400015, 0x97a20020, 0x8f620018,
+        0x1662001c, 0x00000000, 0x8f62001c, 0x02a21023, 0x1c40000e, 0x97a20020,
+        0x8f62001c, 0x16a20015, 0x00000000, 0x8f620058, 0x00821023, 0x18400011,
+        0x97a20020, 0x0a001364, 0xafb10028, 0x8f620058, 0x00821023, 0x0441000b,
+        0x97a20020, 0xafb10028, 0xafb30034, 0xafb50038, 0xafa4003c, 0x34420020,
+        0x0a00136d, 0xa7a20020, 0x02809821, 0x02608821, 0x8f640058, 0x8f62004c,
+        0x02a21023, 0x18400009, 0x00000000, 0x8f620054, 0x02a21023, 0x1c400005,
+        0x97a20020, 0xafb10028, 0xafb50024, 0x0a001385, 0x34420040, 0x9742011a,
+        0x1440000c, 0x24020014, 0x8f620058, 0x14820009, 0x24020014, 0x8f63004c,
+        0x8f620054, 0x10620004, 0x97a20020, 0xafb10028, 0x34420080, 0xa7a20020,
+        0x24020014, 0x1202000a, 0x2a020015, 0x10400005, 0x2402000c, 0x12020006,
+        0x32e20001, 0x0a0013c6, 0x00000000, 0x24020016, 0x16020035, 0x32e20001,
+        0x8f620084, 0x24420001, 0x16a20031, 0x32e20001, 0x24020014, 0x12020021,
+        0x2a020015, 0x10400005, 0x2402000c, 0x12020008, 0x32e20001, 0x0a0013c6,
+        0x00000000, 0x24020016, 0x1202000c, 0x32e20001, 0x0a0013c6, 0x00000000,
+        0x97a30020, 0x2402000e, 0xafb10028, 0xa3b00022, 0xa3a20023, 0xafb50024,
+        0x34630054, 0x0a0013c5, 0xa7a30020, 0x97a20020, 0x93a4001a, 0x24030010,
+        0xafb10028, 0xa3b00022, 0xa3a30023, 0xafb50024, 0x3442005d, 0x34840002,
+        0xa7a20020, 0x0a0013c5, 0xa3a4001a, 0x97a20020, 0x24030012, 0xa3a30023,
+        0x93a3001a, 0xafb10028, 0xa3b00022, 0xafb50024, 0x3042fffe, 0x3442005c,
+        0x34630002, 0xa7a20020, 0xa3a3001a, 0x32e20001, 0x10400030, 0x2402000c,
+        0x12020013, 0x2a02000d, 0x10400005, 0x2402000a, 0x12020008, 0x97a20020,
+        0x0a0013f8, 0x32e20009, 0x2402000e, 0x1202001b, 0x32e20009, 0x0a0013f9,
+        0x0002102b, 0x93a4001a, 0x24030008, 0xafb10028, 0xa3b00022, 0xa3a30023,
+        0x0a0013f4, 0x34420013, 0x97a30020, 0x30620004, 0x14400005, 0x93a2001a,
+        0x3463001b, 0xa7a30020, 0x0a0013e7, 0x24030016, 0x3463001b, 0xa7a30020,
+        0x24030010, 0xafb10028, 0xa3b00022, 0xa3a30023, 0x34420002, 0x0a0013f7,
+        0xa3a2001a, 0x97a20020, 0x93a4001a, 0x24030010, 0xafb10028, 0xa3b00022,
+        0xa3a30023, 0x3442001b, 0x34840002, 0xa7a20020, 0xa3a4001a, 0x32e20009,
+        0x0002102b, 0x00021023, 0x30420007, 0x12400015, 0x34450003, 0x8f820018,
+        0x24030800, 0x27440180, 0x24420001, 0xaf820018, 0x24020004, 0xaf4301b8,
+        0xa4850008, 0xa082000b, 0x93430120, 0x00003021, 0x3c021000, 0xa492000e,
+        0xac950024, 0xac930028, 0x007e1821, 0xa483000c, 0xaf4201b8, 0x0a001413,
+        0x97a20020, 0x24060001, 0x97a20020, 0x10400020, 0x27450180, 0x3c038000,
+        0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000,
+        0x8fa30028, 0x240240c1, 0xa4a20008, 0xaca30018, 0x93a4001a, 0x24020002,
+        0xa0a2000b, 0xa0a4000a, 0x97a20020, 0xa4a20010, 0x93a30022, 0xa0a30012,
+        0x93a20023, 0xa0a20013, 0x8fa30024, 0xaca30014, 0x8fa20034, 0xaca20024,
+        0x8fa30038, 0xaca30028, 0x8fa2003c, 0x3c031000, 0xaca2002c, 0xaf4301b8,
+        0x00c01021, 0x8fbf006c, 0x8fbe0068, 0x8fb70064, 0x8fb60060, 0x8fb5005c,
+        0x8fb40058, 0x8fb30054, 0x8fb20050, 0x8fb1004c, 0x8fb00048, 0x03e00008,
+        0x27bd0070, 0x8f470140, 0x8f460148, 0x3c028000, 0x00c24024, 0x00062c02,
+        0x30a300ff, 0x24020019, 0x106200e7, 0x27440180, 0x2862001a, 0x1040001f,
+        0x24020008, 0x106200be, 0x28620009, 0x1040000d, 0x24020001, 0x10620046,
+        0x28620002, 0x50400005, 0x24020006, 0x1060002e, 0x00a01821, 0x0a00155e,
+        0x00000000, 0x1062005b, 0x00a01821, 0x0a00155e, 0x00000000, 0x2402000b,
+        0x10620084, 0x2862000c, 0x10400005, 0x24020009, 0x106200bc, 0x00061c02,
+        0x0a00155e, 0x00000000, 0x2402000e, 0x106200b7, 0x00061c02, 0x0a00155e,
+        0x00000000, 0x28620021, 0x10400009, 0x2862001f, 0x104000c1, 0x2402001b,
+        0x106200bf, 0x2402001c, 0x1062009a, 0x00061c02, 0x0a00155e, 0x00000000,
+        0x240200c2, 0x106200ca, 0x286200c3, 0x10400005, 0x24020080, 0x1062005a,
+        0x00a01821, 0x0a00155e, 0x00000000, 0x240200c9, 0x106200cd, 0x30c5ffff,
+        0x0a00155e, 0x00000000, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd,
+        0x24020001, 0xa4830008, 0x24030002, 0xac870000, 0xac800004, 0xa082000a,
+        0xa083000b, 0xa4860010, 0x8f430144, 0x3c021000, 0xac800028, 0xac830024,
+        0x3c036000, 0xaf4201b8, 0x03e00008, 0xac600808, 0x11000009, 0x00a01821,
+        0x3c020800, 0x24030002, 0xa0436c88, 0x24426c88, 0xac470008, 0x8f430144,
+        0x03e00008, 0xac430004, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd,
+        0x24020002, 0xac800000, 0xac870004, 0xa4830008, 0xa082000a, 0xa082000b,
+        0xa4860010, 0xac800024, 0x8f420144, 0x3c031000, 0xac820028, 0x3c026000,
+        0xaf4301b8, 0x03e00008, 0xac400808, 0x3c080800, 0x3c058000, 0x8f4201b8,
+        0x00451024, 0x1440fffd, 0x00000000, 0xac870000, 0x91026c88, 0x00002821,
+        0x10400002, 0x25076c88, 0x8ce50008, 0xac850004, 0xa4830008, 0x91036c88,
+        0x24020002, 0xa082000b, 0xa4860010, 0x34630001, 0xa083000a, 0x8f420144,
+        0xac820024, 0x91036c88, 0x10600002, 0x00001021, 0x8ce20004, 0xac820028,
+        0x3c021000, 0xaf4201b8, 0x3c026000, 0xa1006c88, 0x03e00008, 0xac400808,
+        0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002, 0xa082000b,
+        0xa4830008, 0xa4860010, 0x8f420144, 0x3c031000, 0xa4820012, 0x03e00008,
+        0xaf4301b8, 0x30c2ffff, 0x14400028, 0x00061c02, 0x93620005, 0x30420004,
+        0x14400020, 0x3c029000, 0x34420001, 0x00e21025, 0xaf420020, 0x3c038000,
+        0x8f420020, 0x00431024, 0x1440fffd, 0x00000000, 0x93620005, 0x3c038000,
+        0x34630001, 0x00e31825, 0x34420004, 0xa3620005, 0xaf430020, 0x93620005,
+        0x30420004, 0x14400003, 0x3c038000, 0x0000000d, 0x3c038000, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x24020005, 0x3c031000, 0xac870000, 0xa082000b,
+        0xaf4301b8, 0x0a00150d, 0x00061c02, 0x0000000d, 0x03e00008, 0x00000000,
+        0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001,
+        0xa4830008, 0x24030002, 0xac870000, 0xac800004, 0xa082000a, 0xa083000b,
+        0xa4860010, 0x8f430144, 0x3c021000, 0xac800028, 0xac830024, 0x03e00008,
+        0xaf4201b8, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002,
+        0xac800000, 0xac870004, 0xa4830008, 0xa082000a, 0xa082000b, 0xa4860010,
+        0xac800024, 0x8f420144, 0x3c031000, 0xac820028, 0x03e00008, 0xaf4301b8,
+        0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020001,
+        0xa4830008, 0x24030002, 0xa082000a, 0x3c021000, 0xac870000, 0xac800004,
+        0xa083000b, 0xa4860010, 0xac800024, 0xac800028, 0x03e00008, 0xaf4201b8,
+        0x00a01821, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x24020002,
+        0xac870000, 0xac800004, 0xa4830008, 0xa080000a, 0x0a001518, 0xa082000b,
+        0x8f440144, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002,
+        0x240340c9, 0xaf470180, 0xa342018b, 0x3c021000, 0xa7430188, 0xaf4401a4,
+        0xaf4501a8, 0xaf4001ac, 0x03e00008, 0xaf4201b8, 0x0000000d, 0x03e00008,
+        0x00000000, 0x03e00008, 0x00000000, 0x8f420100, 0x3042003e, 0x14400011,
+        0x24020001, 0xaf400048, 0x8f420100, 0x304207c0, 0x10400005, 0x00000000,
+        0xaf40004c, 0xaf400050, 0x03e00008, 0x24020001, 0xaf400054, 0xaf400040,
+        0x8f420100, 0x30423800, 0x54400001, 0xaf400044, 0x24020001, 0x03e00008,
+        0x00000000, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020002,
+        0x240340c9, 0xaf440180, 0xa342018b, 0x3c021000, 0xa7430188, 0xaf4501a4,
+        0xaf4601a8, 0xaf4701ac, 0x03e00008, 0xaf4201b8, 0x3c029000, 0x34420001,
+        0x00822025, 0xaf440020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd,
+        0x00000000, 0x03e00008, 0x00000000, 0x3c028000, 0x34420001, 0x00822025,
+        0x03e00008, 0xaf440020, 0x308600ff, 0x27450180, 0x3c038000, 0x8f4201b8,
         0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000, 0x8f640040,
         0x24030008, 0x240240c1, 0xa4a20008, 0x24020002, 0xa0a2000b, 0x3c021000,
-        0x0a001181, 0xa0a3000a, 0x8f420104, 0x3c030040, 0x00431024, 0x1040001d,
-        0x3c038000, 0x27450180, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,
-        0x8f420128, 0xaca20000, 0x8f640040, 0x24030010, 0x240240c1, 0xa4a20008,
-        0x24020002, 0xa0a3000a, 0x24030008, 0xa0a2000b, 0x3c021000, 0xa4a30010,
-        0xa0a00012, 0xa0a00013, 0xaca00014, 0xaca00024, 0xaca00028, 0xaca0002c,
-        0xaca40018, 0x0e001548, 0xaf4201b8, 0x0a0013a5, 0x8fbf0048, 0x8f820000,
-        0x10400016, 0x00000000, 0x8f420104, 0x3c030001, 0x00431024, 0x10400011,
-        0x00000000, 0x8ca3000c, 0x8f620030, 0x1462020c, 0x24020001, 0x8ca30010,
-        0x8f62002c, 0x14620208, 0x24020001, 0x9763003a, 0x95620000, 0x14430204,
-        0x24020001, 0x97630038, 0x95620002, 0x14430200, 0x24020001, 0xaf400048,
-        0xaf400054, 0xaf400040, 0x8f690040, 0x8f6a0048, 0x01497023, 0x05c10004,
-        0x00000000, 0x0000000d, 0x00000000, 0x24000169, 0x9742011a, 0x3046ffff,
-        0x10c00004, 0x8d680004, 0x01061021, 0x0a0011b8, 0x2445ffff, 0x01002821,
-        0x916c000d, 0xa7a00020, 0xa3a0001a, 0xafa00028, 0x9362003f, 0x31830004,
-        0x1060003a, 0x304700ff, 0x24040012, 0x14e40006, 0x24020001, 0x3c040800,
-        0x8c830028, 0x24630001, 0x0a00128d, 0xac830028, 0x8f620044, 0x15020010,
-        0x27a60010, 0x27450180, 0x3c038000, 0x2402001a, 0xa7a20020, 0x24020020,
-        0xafa90028, 0xa3a70022, 0xa3a40023, 0xa3a2001a, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x00000000, 0x0a001272, 0x00000000, 0x8f620044, 0x01021023,
-        0x0440001a, 0x010a1023, 0x044100ae, 0x24020001, 0x3c020800, 0x8c4300d8,
-        0x10600004, 0x24020001, 0xa7a20020, 0x0a0011ee, 0xafa90028, 0x2402001a,
-        0xa7a20020, 0x24020020, 0xafa90028, 0xa3a70022, 0xa3a40023, 0xa3a2001a,
-        0x27a60010, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x00000000, 0x0a001272, 0x00000000, 0x0a00128d, 0x24020001, 0x01286823,
-        0x19a00016, 0x00cd102a, 0x54400007, 0x318c00fe, 0x55a6000f, 0x010d4021,
-        0x31820001, 0x5440000c, 0x010d4021, 0x318c00fe, 0x00c06821, 0x3c040800,
-        0x8c8300c8, 0x00003021, 0x24020001, 0xa7a20020, 0xafa90028, 0x24630001,
-        0x0a001212, 0xac8300c8, 0x00cd1023, 0x0a001212, 0x3046ffff, 0x00006821,
-        0x2542ffff, 0x00a21823, 0x1860001e, 0x0066102a, 0x14400018, 0x01402821,
-        0x97a20020, 0x3c040800, 0x8c8300cc, 0xafa90028, 0x34420001, 0x24630001,
-        0xa7a20020, 0x01091026, 0x2c420001, 0xac8300cc, 0x2dc30001, 0x00431024,
-        0x1440000a, 0x00c01821, 0x27a60010, 0x27450180, 0x3c038000, 0x8f4201b8,
-        0x00431024, 0x1440fffd, 0x00000000, 0x0a001272, 0x00000000, 0x00c31023,
-        0x3046ffff, 0x0a00123d, 0x318c00f6, 0x01091023, 0x18400008, 0x97a20020,
-        0x3c040800, 0x8c8300d4, 0xafa80028, 0x34420400, 0x24630001, 0xa7a20020,
-        0xac8300d4, 0x31820002, 0x1040001c, 0x31820010, 0x8f620044, 0x1502000d,
-        0x27a60010, 0x97a20020, 0x27450180, 0x3c038000, 0xafa90028, 0x34420001,
-        0xa7a20020, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a001272,
-        0x00000000, 0x97a20020, 0x27450180, 0x3c038000, 0xafa90028, 0x34420001,
-        0xa7a20020, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x0a001272,
-        0x00000000, 0x54400003, 0x8d6a0008, 0x0a00128d, 0x24020001, 0x8f630054,
-        0x2542ffff, 0x00431023, 0x1840002e, 0x97a20020, 0x27a60010, 0x3c040800,
-        0x8c8300d0, 0x27450180, 0x3c078000, 0xafa90028, 0x34420001, 0x24630001,
-        0xa7a20020, 0xac8300d0, 0x8f4201b8, 0x00471024, 0x1440fffd, 0x00000000,
-        0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018,
-        0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010,
-        0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014,
-        0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc4002c, 0x24020001,
-        0x3c031000, 0xaca4002c, 0xaf4301b8, 0xaf400044, 0xaf400050, 0x0a0013a5,
-        0x8fbf0048, 0x31820020, 0x10400011, 0x00000000, 0x95620012, 0x0046102b,
-        0x10400008, 0x97a20020, 0x95660012, 0x10c00003, 0x01061021, 0x0a00129e,
-        0x2445ffff, 0x01002821, 0x97a20020, 0x93a3001a, 0x34420008, 0x34630004,
-        0xa7a20020, 0xa3a3001a, 0x8f420104, 0x38e3000a, 0x2c630001, 0x38e2000c,
-        0x2c420001, 0x00621825, 0x14600003, 0x2402000e, 0x54e2002a, 0x00003021,
-        0x50c00008, 0x9564000e, 0x10c00004, 0xa7a60040, 0x01061021, 0x0a0012b6,
-        0x2445ffff, 0x01002821, 0x9564000e, 0x93630035, 0x8f62004c, 0x00642004,
-        0x008a2021, 0x00821023, 0x1840001d, 0x00000000, 0x8f620018, 0x01021023,
-        0x1c40000f, 0x97a20020, 0x8f620018, 0x15020016, 0x00000000, 0x8f62001c,
-        0x01421023, 0x1c400008, 0x97a20020, 0x8f62001c, 0x1542000f, 0x00000000,
-        0x8f620058, 0x00821023, 0x1840000b, 0x97a20020, 0xafa50028, 0xafa80034,
-        0xafaa0038, 0xafa4003c, 0x34420020, 0x0a0012da, 0xa7a20020, 0x01204021,
-        0x01002821, 0x8f640058, 0x8f62004c, 0x01421023, 0x18400009, 0x00000000,
-        0x8f620054, 0x01421023, 0x1c400005, 0x97a20020, 0xafa50028, 0xafaa0024,
-        0x0a0012f2, 0x34420040, 0x9742011a, 0x1440000c, 0x24020014, 0x8f620058,
-        0x14820009, 0x24020014, 0x8f63004c, 0x8f620054, 0x10620004, 0x97a20020,
-        0xafa50028, 0x34420080, 0xa7a20020, 0x24020014, 0x10e2000a, 0x28e20015,
-        0x10400005, 0x2402000c, 0x10e20006, 0x31820001, 0x0a001333, 0x00000000,
-        0x24020016, 0x14e20035, 0x31820001, 0x8f620084, 0x24420001, 0x15420031,
-        0x31820001, 0x24020014, 0x10e20021, 0x28e20015, 0x10400005, 0x2402000c,
-        0x10e20008, 0x31820001, 0x0a001333, 0x00000000, 0x24020016, 0x10e2000c,
-        0x31820001, 0x0a001333, 0x00000000, 0x97a30020, 0x2402000e, 0xafa50028,
-        0xa3a70022, 0xa3a20023, 0xafaa0024, 0x34630054, 0x0a001332, 0xa7a30020,
-        0x97a20020, 0x93a4001a, 0x24030010, 0xafa50028, 0xa3a70022, 0xa3a30023,
-        0xafaa0024, 0x3442005d, 0x34840002, 0xa7a20020, 0x0a001332, 0xa3a4001a,
-        0x97a20020, 0x24030012, 0xa3a30023, 0x93a3001a, 0xafa50028, 0xa3a70022,
-        0xafaa0024, 0x3042fffe, 0x3442005c, 0x34630002, 0xa7a20020, 0xa3a3001a,
-        0x31820001, 0x10400030, 0x2402000c, 0x10e20013, 0x28e2000d, 0x10400005,
-        0x2402000a, 0x10e20008, 0x97a20020, 0x0a001365, 0x31820009, 0x2402000e,
-        0x10e2001b, 0x31820009, 0x0a001366, 0x0002102b, 0x93a4001a, 0x24030008,
-        0xafa50028, 0xa3a70022, 0xa3a30023, 0x0a001361, 0x34420013, 0x97a30020,
-        0x30620004, 0x14400005, 0x93a2001a, 0x3463001b, 0xa7a30020, 0x0a001354,
-        0x24030016, 0x3463001b, 0xa7a30020, 0x24030010, 0xafa50028, 0xa3a70022,
-        0xa3a30023, 0x34420002, 0x0a001364, 0xa3a2001a, 0x97a20020, 0x93a4001a,
-        0x24030010, 0xafa50028, 0xa3a70022, 0xa3a30023, 0x3442001b, 0x34840002,
-        0xa7a20020, 0xa3a4001a, 0x31820009, 0x0002102b, 0x00021023, 0x30420007,
-        0x10c00017, 0x34440003, 0x8f820014, 0x24030800, 0x27450180, 0x24420001,
-        0xaf820014, 0x24020004, 0xaf4301b8, 0xa4a40008, 0xa0a2000b, 0x93440120,
-        0x3c031000, 0xa4a6000e, 0xacaa0024, 0xaca80028, 0x008d2021, 0xa4a4000c,
-        0xaf4301b8, 0x97a20020, 0x00003021, 0x3042ffbf, 0x0a001381, 0xa7a20020,
-        0x24060001, 0x97a20020, 0x10400020, 0x27450180, 0x3c038000, 0x8f4201b8,
-        0x00431024, 0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000, 0x8fa30028,
-        0x240240c1, 0xa4a20008, 0xaca30018, 0x93a4001a, 0x24020002, 0xa0a2000b,
-        0xa0a4000a, 0x97a20020, 0xa4a20010, 0x93a30022, 0xa0a30012, 0x93a20023,
-        0xa0a20013, 0x8fa30024, 0xaca30014, 0x8fa20034, 0xaca20024, 0x8fa30038,
-        0xaca30028, 0x8fa2003c, 0x3c031000, 0xaca2002c, 0xaf4301b8, 0x00c01021,
-        0x8fbf0048, 0x03e00008, 0x27bd0050, 0x8f470140, 0x8f460148, 0x3c028000,
-        0x00c24024, 0x00062c02, 0x30a300ff, 0x24020019, 0x106200e7, 0x27440180,
-        0x2862001a, 0x1040001f, 0x24020008, 0x106200be, 0x28620009, 0x1040000d,
-        0x24020001, 0x10620046, 0x28620002, 0x50400005, 0x24020006, 0x1060002e,
-        0x00a01821, 0x0a0014c4, 0x00000000, 0x1062005b, 0x00a01821, 0x0a0014c4,
-        0x00000000, 0x2402000b, 0x10620084, 0x2862000c, 0x10400005, 0x24020009,
-        0x106200bc, 0x00061c02, 0x0a0014c4, 0x00000000, 0x2402000e, 0x106200b7,
-        0x00061c02, 0x0a0014c4, 0x00000000, 0x28620021, 0x10400009, 0x2862001f,
-        0x104000c1, 0x2402001b, 0x106200bf, 0x2402001c, 0x1062009a, 0x00061c02,
-        0x0a0014c4, 0x00000000, 0x240200c2, 0x106200ca, 0x286200c3, 0x10400005,
-        0x24020080, 0x1062005a, 0x00a01821, 0x0a0014c4, 0x00000000, 0x240200c9,
-        0x106200cd, 0x30c5ffff, 0x0a0014c4, 0x00000000, 0x3c058000, 0x8f4201b8,
-        0x00451024, 0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xac870000,
-        0xac800004, 0xa082000a, 0xa083000b, 0xa4860010, 0x8f430144, 0x3c021000,
-        0xac800028, 0xac830024, 0x3c036000, 0xaf4201b8, 0x03e00008, 0xac600808,
-        0x11000009, 0x00a01821, 0x3c020800, 0x24030002, 0xa0436a08, 0x24426a08,
-        0xac470008, 0x8f430144, 0x03e00008, 0xac430004, 0x3c058000, 0x8f4201b8,
-        0x00451024, 0x1440fffd, 0x24020002, 0xac800000, 0xac870004, 0xa4830008,
-        0xa082000a, 0xa082000b, 0xa4860010, 0xac800024, 0x8f420144, 0x3c031000,
-        0xac820028, 0x3c026000, 0xaf4301b8, 0x03e00008, 0xac400808, 0x3c080800,
-        0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd, 0x00000000, 0xac870000,
-        0x91026a08, 0x00002821, 0x10400002, 0x25076a08, 0x8ce50008, 0xac850004,
-        0xa4830008, 0x91036a08, 0x24020002, 0xa082000b, 0xa4860010, 0x34630001,
-        0xa083000a, 0x8f420144, 0xac820024, 0x91036a08, 0x10600002, 0x00001021,
-        0x8ce20004, 0xac820028, 0x3c021000, 0xaf4201b8, 0x3c026000, 0xa1006a08,
-        0x03e00008, 0xac400808, 0x3c058000, 0x8f4201b8, 0x00451024, 0x1440fffd,
-        0x24020002, 0xa082000b, 0xa4830008, 0xa4860010, 0x8f420144, 0x3c031000,
-        0xa4820012, 0x03e00008, 0xaf4301b8, 0x30c2ffff, 0x14400028, 0x00061c02,
-        0x93620005, 0x30420004, 0x14400020, 0x3c029000, 0x34420001, 0x00e21025,
-        0xaf420020, 0x3c038000, 0x8f420020, 0x00431024, 0x1440fffd, 0x00000000,
-        0x93620005, 0x3c038000, 0x34630001, 0x00e31825, 0x34420004, 0xa3620005,
-        0xaf430020, 0x93620005, 0x30420004, 0x14400003, 0x3c038000, 0x0000000d,
-        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x24020005, 0x3c031000,
-        0xac870000, 0xa082000b, 0xaf4301b8, 0x0a001473, 0x00061c02, 0x0000000d,
-        0x03e00008, 0x00000000, 0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024,
-        0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xac870000, 0xac800004,
-        0xa082000a, 0xa083000b, 0xa4860010, 0x8f430144, 0x3c021000, 0xac800028,
-        0xac830024, 0x03e00008, 0xaf4201b8, 0x3c058000, 0x8f4201b8, 0x00451024,
-        0x1440fffd, 0x24020002, 0xac800000, 0xac870004, 0xa4830008, 0xa082000a,
-        0xa082000b, 0xa4860010, 0xac800024, 0x8f420144, 0x3c031000, 0xac820028,
-        0x03e00008, 0xaf4301b8, 0x00061c02, 0x3c058000, 0x8f4201b8, 0x00451024,
-        0x1440fffd, 0x24020001, 0xa4830008, 0x24030002, 0xa082000a, 0x3c021000,
-        0xac870000, 0xac800004, 0xa083000b, 0xa4860010, 0xac800024, 0xac800028,
-        0x03e00008, 0xaf4201b8, 0x00a01821, 0x3c058000, 0x8f4201b8, 0x00451024,
-        0x1440fffd, 0x24020002, 0xac870000, 0xac800004, 0xa4830008, 0xa080000a,
-        0x0a00147e, 0xa082000b, 0x8f440144, 0x3c038000, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24020002, 0x240340c9, 0xaf470180, 0xa342018b, 0x3c021000,
-        0xa7430188, 0xaf4401a4, 0xaf4501a8, 0xaf4001ac, 0x03e00008, 0xaf4201b8,
-        0x0000000d, 0x03e00008, 0x00000000, 0x03e00008, 0x00000000, 0x8f420100,
-        0x3042003e, 0x14400011, 0x24020001, 0xaf400048, 0x8f420100, 0x304207c0,
-        0x10400005, 0x00000000, 0xaf40004c, 0xaf400050, 0x03e00008, 0x24020001,
-        0xaf400054, 0xaf400040, 0x8f420100, 0x30423800, 0x54400001, 0xaf400044,
-        0x24020001, 0x03e00008, 0x00000000, 0x3c038000, 0x8f4201b8, 0x00431024,
-        0x1440fffd, 0x24020002, 0x240340c9, 0xaf440180, 0xa342018b, 0x3c021000,
-        0xa7430188, 0xaf4501a4, 0xaf4601a8, 0xaf4701ac, 0x03e00008, 0xaf4201b8,
-        0x3c029000, 0x34420001, 0x00822025, 0xaf440020, 0x3c038000, 0x8f420020,
-        0x00431024, 0x1440fffd, 0x00000000, 0x03e00008, 0x00000000, 0x3c028000,
-        0x34420001, 0x00822025, 0x03e00008, 0xaf440020, 0x308600ff, 0x27450180,
-        0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000, 0x8f420128,
-        0xaca20000, 0x8f640040, 0x24030008, 0x240240c1, 0xa4a20008, 0x24020002,
-        0xa0a2000b, 0x3c021000, 0xa0a6000a, 0xa4a30010, 0xa0a00012, 0xa0a00013,
-        0xaca00014, 0xaca00024, 0xaca00028, 0xaca0002c, 0xaca40018, 0x03e00008,
-        0xaf4201b8, 0x24020001, 0xacc40000, 0x03e00008, 0xa4e50000, 0x03e00008,
-        0x24020001, 0x24020001, 0xaf400044, 0x03e00008, 0xaf400050, 0x00803021,
-        0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024, 0x1440fffd, 0x00000000,
-        0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1, 0xa4a20008, 0xaca30018,
-        0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a, 0x94c20010, 0xa4a20010,
-        0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013, 0x8cc30014, 0xaca30014,
-        0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028, 0x8cc2002c, 0x3c031000,
-        0xaca2002c, 0x24020001, 0xaf4301b8, 0xaf400044, 0x03e00008, 0xaf400050,
-        0x27bdffe8, 0xafbf0010, 0x0e001032, 0x00000000, 0x00002021, 0x0e000c99,
-        0xaf400180, 0x8fbf0010, 0x03e00008, 0x27bd0018, 0x8f460148, 0x27450180,
-        0x3c038000, 0x00061402, 0x304700ff, 0x8f4201b8, 0x00431024, 0x1440fffd,
-        0x00000000, 0x8f440140, 0x00061202, 0x304200ff, 0x00061c02, 0xaca20004,
-        0x24020002, 0xa4a30008, 0x30c300ff, 0xa0a2000b, 0xaca30024, 0x10e0000a,
-        0xaca40000, 0x28e20004, 0x14400005, 0x24020001, 0x24020005, 0x54e20005,
-        0xa0a0000a, 0x24020001, 0x0a001571, 0xa0a2000a, 0xa0a0000a, 0x3c021000,
-        0x03e00008, 0xaf4201b8, 0x03e00008, 0x00001021, 0x10c00007, 0x00000000,
-        0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000, 0x14c0fffb, 0x24840004,
-        0x03e00008, 0x00000000, 0x0a001587, 0x00a01021, 0xac860000, 0x00000000,
-        0x00000000, 0x24840004, 0x00a01021, 0x1440fffa, 0x24a5ffff, 0x03e00008,
-        0x00000000, 0x00000000 };
+        0xa0a6000a, 0xa4a30010, 0xa0a00012, 0xa0a00013, 0xaca00014, 0xaca00024,
+        0xaca00028, 0xaca0002c, 0xaca40018, 0x03e00008, 0xaf4201b8, 0x24020001,
+        0xacc40000, 0x03e00008, 0xa4e50000, 0x24020001, 0xaf400044, 0x03e00008,
+        0xaf400050, 0x00803021, 0x27450180, 0x3c038000, 0x8f4201b8, 0x00431024,
+        0x1440fffd, 0x00000000, 0x8f420128, 0xaca20000, 0x8cc30018, 0x240240c1,
+        0xa4a20008, 0xaca30018, 0x90c4000a, 0x24020002, 0xa0a2000b, 0xa0a4000a,
+        0x94c20010, 0xa4a20010, 0x90c30012, 0xa0a30012, 0x90c20013, 0xa0a20013,
+        0x8cc30014, 0xaca30014, 0x8cc20024, 0xaca20024, 0x8cc30028, 0xaca30028,
+        0x8cc2002c, 0x3c031000, 0xaca2002c, 0x24020001, 0xaf4301b8, 0xaf400044,
+        0x03e00008, 0xaf400050, 0x27bdffe8, 0xafbf0010, 0x0e001047, 0x00000000,
+        0x00002021, 0x0e000c78, 0xaf400180, 0x8fbf0010, 0x03e00008, 0x27bd0018,
+        0x8f460148, 0x27450180, 0x3c038000, 0x00061402, 0x304700ff, 0x8f4201b8,
+        0x00431024, 0x1440fffd, 0x00000000, 0x8f440140, 0x00061202, 0x304200ff,
+        0x00061c02, 0xaca20004, 0x24020002, 0xa4a30008, 0x30c300ff, 0xa0a2000b,
+        0xaca30024, 0x10e0000a, 0xaca40000, 0x28e20004, 0x14400005, 0x24020001,
+        0x24020005, 0x54e20005, 0xa0a0000a, 0x24020001, 0x0a001609, 0xa0a2000a,
+        0xa0a0000a, 0x3c021000, 0x03e00008, 0xaf4201b8, 0x03e00008, 0x00001021,
+        0x10c00007, 0x00000000, 0x8ca20000, 0x24c6ffff, 0x24a50004, 0xac820000,
+        0x14c0fffb, 0x24840004, 0x03e00008, 0x00000000, 0x0a00161f, 0x00a01021,
+        0xac860000, 0x00000000, 0x00000000, 0x24840004, 0x00a01021, 0x1440fffa,
+        0x24a5ffff, 0x03e00008, 0x00000000, 0x00000000 }; 
 
 static u32 bnx2_RXP_b06FwData[(0x0/4) + 1] = { 0x0 };
-static u32 bnx2_RXP_b06FwRodata[(0x0/4) + 1] = { 0x0 };
-static u32 bnx2_RXP_b06FwBss[(0x1394/4) + 1] = { 0x0 };
-static u32 bnx2_RXP_b06FwSbss[(0x18/4) + 1] = { 0x0 };
+static u32 bnx2_RXP_b06FwRodata[(0x28/4) + 1] = {
+        0x0800468c, 0x0800458c, 0x08004630, 0x08004648, 0x08004660, 0x08004680,
+        0x0800468c, 0x0800468c, 0x08004594, 0x00000000, 0x00000000 };
+static u32 bnx2_RXP_b06FwBss[(0x13a4/4) + 1] = { 0x0 };
+static u32 bnx2_RXP_b06FwSbss[(0x1c/4) + 1] = { 0x0 };
 
 static u32 bnx2_rv2p_proc1[] = {
         0x00000008, 0xac000001, 0x0000000c, 0x2f800001, 0x00000010, 0x213f0004,
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 6139f06d7d2b..94d5ea1ce8bd 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -56,8 +56,6 @@ PORT  SIZE ACTION MEANING
 All other communication is through memory!
 */
 
-#define SLOW_DOWN_IO udelay(5)
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 1c6d328165bb..0245e40b51a1 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1610,6 +1610,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                 }
                 else if (!pskb_may_pull(skb, skb->len))
                         goto err;
+                else
+                        skb->ip_summed = CHECKSUM_NONE;
 
                 len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2);
                 if (len <= 0) {
@@ -1690,6 +1692,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                         kfree_skb(skb);
                 } else {
                         skb_pull(skb, 2);       /* chop off protocol */
+                        skb_postpull_rcsum(skb, skb->data - 2, 2);
                         skb->dev = ppp->dev;
                         skb->protocol = htons(npindex_to_ethertype[npi]);
                         skb->mac.raw = skb->data;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f2d1dafde087..e7dc653d5bd6 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -69,8 +69,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.48"
-#define DRV_MODULE_RELDATE      "Jan 16, 2006"
+#define DRV_MODULE_VERSION      "3.49"
+#define DRV_MODULE_RELDATE      "Feb 2, 2006"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -3482,6 +3482,17 @@ static void tg3_reset_task(void *_data)
         struct tg3 *tp = _data;
         unsigned int restart_timer;
 
+        tg3_full_lock(tp, 0);
+        tp->tg3_flags |= TG3_FLAG_IN_RESET_TASK;
+
+        if (!netif_running(tp->dev)) {
+                tp->tg3_flags &= ~TG3_FLAG_IN_RESET_TASK;
+                tg3_full_unlock(tp);
+                return;
+        }
+
+        tg3_full_unlock(tp);
+
         tg3_netif_stop(tp);
 
         tg3_full_lock(tp, 1);
@@ -3494,10 +3505,12 @@ static void tg3_reset_task(void *_data)
 
         tg3_netif_start(tp);
 
-        tg3_full_unlock(tp);
-
         if (restart_timer)
                 mod_timer(&tp->timer, jiffies + 1);
+
+        tp->tg3_flags &= ~TG3_FLAG_IN_RESET_TASK;
+
+        tg3_full_unlock(tp);
 }
 
 static void tg3_tx_timeout(struct net_device *dev)
@@ -6786,6 +6799,13 @@ static int tg3_close(struct net_device *dev)
 {
         struct tg3 *tp = netdev_priv(dev);
 
+        /* Calling flush_scheduled_work() may deadlock because
+         * linkwatch_event() may be on the workqueue and it will try to get
+         * the rtnl_lock which we are holding.
+         */
+        while (tp->tg3_flags & TG3_FLAG_IN_RESET_TASK)
+                msleep(1);
+
         netif_stop_queue(dev);
 
         del_timer_sync(&tp->timer);
@@ -10880,6 +10900,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
         if (dev) {
                 struct tg3 *tp = netdev_priv(dev);
 
+                flush_scheduled_work();
                 unregister_netdev(dev);
                 if (tp->regs) {
                         iounmap(tp->regs);
@@ -10901,6 +10922,7 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
         if (!netif_running(dev))
                 return 0;
 
+        flush_scheduled_work();
         tg3_netif_stop(tp);
 
         del_timer_sync(&tp->timer);
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index e8243305f0e8..7f4b7f6ac40d 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2162,6 +2162,7 @@ struct tg3 {
 #define TG3_FLAG_JUMBO_RING_ENABLE      0x00800000
 #define TG3_FLAG_10_100_ONLY            0x01000000
 #define TG3_FLAG_PAUSE_AUTONEG          0x02000000
+#define TG3_FLAG_IN_RESET_TASK          0x04000000
 #define TG3_FLAG_BROKEN_CHECKSUMS       0x10000000
 #define TG3_FLAG_GOT_SERDES_FLOWCTL     0x20000000
 #define TG3_FLAG_SPLIT_MODE             0x40000000
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 734d2cb1de06..0702f0eeb784 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -2463,7 +2463,7 @@ static void ipw_eeprom_init_sram(struct ipw_priv *priv)
            copy.  Otherwise let the firmware know to perform the operation
            on its own.
          */
-        if ((priv->eeprom + EEPROM_VERSION) != 0) {
+        if (priv->eeprom[EEPROM_VERSION] != 0) {
                 IPW_DEBUG_INFO("Writing EEPROM data into SRAM\n");
 
                 /* write the eeprom data to sram */
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 9e0229f7e25f..f46e8438e0d2 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1423,7 +1423,7 @@ static void __init ccio_init_resources(struct ioc *ioc)
         struct resource *res = ioc->mmio_region;
         char *name = kmalloc(14, GFP_KERNEL);
 
-        sprintf(name, "GSC Bus [%d/]", ioc->hw_path);
+        snprintf(name, 14, "GSC Bus [%d/]", ioc->hw_path);
 
         ccio_init_resource(res, name, &ioc->ioc_regs->io_io_low);
         ccio_init_resource(res + 1, name, &ioc->ioc_regs->io_io_low_hv);
@@ -1557,12 +1557,11 @@ static int ccio_probe(struct parisc_device *dev)
         int i;
         struct ioc *ioc, **ioc_p = &ioc_list;
         
-        ioc = kmalloc(sizeof(struct ioc), GFP_KERNEL);
+        ioc = kzalloc(sizeof(struct ioc), GFP_KERNEL);
         if (ioc == NULL) {
                 printk(KERN_ERR MODULE_NAME ": memory allocation failure\n");
                 return 1;
         }
-        memset(ioc, 0, sizeof(struct ioc));
 
         ioc->name = dev->id.hversion == U2_IOA_RUNWAY ? "U2" : "UTurn";
 
@@ -1578,7 +1577,7 @@ static int ccio_probe(struct parisc_device *dev)
         ccio_ioc_init(ioc);
         ccio_init_resources(ioc);
         hppa_dma_ops = &ccio_ops;
-        dev->dev.platform_data = kmalloc(sizeof(struct pci_hba_data), GFP_KERNEL);
+        dev->dev.platform_data = kzalloc(sizeof(struct pci_hba_data), GFP_KERNEL);
 
         /* if this fails, no I/O cards will work, so may as well bug */
         BUG_ON(dev->dev.platform_data == NULL);
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 216d1d859326..3d1a7f98c676 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -989,14 +989,12 @@ static int __init dino_probe(struct parisc_device *dev)
 */
         }
 
-        dino_dev = kmalloc(sizeof(struct dino_device), GFP_KERNEL);
+        dino_dev = kzalloc(sizeof(struct dino_device), GFP_KERNEL);
         if (!dino_dev) {
                 printk("dino_init_chip - couldn't alloc dino_device\n");
                 return 1;
         }
 
-        memset(dino_dev, 0, sizeof(struct dino_device));
-
         dino_dev->hba.dev = dev;
         dino_dev->hba.base_addr = ioremap(hpa, 4096);
         dino_dev->hba.lmmio_space_offset = 0;   /* CPU addrs == bus addrs */
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index 5edf93f80757..07dc2b6d4e93 100644
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -60,12 +60,11 @@ static int hppb_probe(struct parisc_device *dev)
         }
 
         if(card->hpa) {
-                card->next = kmalloc(sizeof(struct hppb_card), GFP_KERNEL);
+                card->next = kzalloc(sizeof(struct hppb_card), GFP_KERNEL);
                 if(!card->next) {
                         printk(KERN_ERR "HP-PB: Unable to allocate memory.\n");
                         return 1;
                 }
-                memset(card->next, '\0', sizeof(struct hppb_card));
                 card = card->next;
         }
         printk(KERN_INFO "Found GeckoBoa at 0x%lx\n", dev->hpa.start);
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 19657efa8dc3..8d7a36392eb8 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -873,28 +873,24 @@ void *iosapic_register(unsigned long hpa)
                 return NULL;
         }
 
-        isi = (struct iosapic_info *)kmalloc(sizeof(struct iosapic_info), GFP_KERNEL);
+        isi = (struct iosapic_info *)kzalloc(sizeof(struct iosapic_info), GFP_KERNEL);
         if (!isi) {
                 BUG();
                 return NULL;
         }
 
-        memset(isi, 0, sizeof(struct iosapic_info));
-
         isi->addr = ioremap(hpa, 4096);
         isi->isi_hpa = hpa;
         isi->isi_version = iosapic_rd_version(isi);
         isi->isi_num_vectors = IOSAPIC_IRDT_MAX_ENTRY(isi->isi_version) + 1;
 
         vip = isi->isi_vector = (struct vector_info *)
-                kmalloc(sizeof(struct vector_info) * isi->isi_num_vectors, GFP_KERNEL);
+                kzalloc(sizeof(struct vector_info) * isi->isi_num_vectors, GFP_KERNEL);
         if (vip == NULL) {
                 kfree(isi);
                 return NULL;
         }
 
-        memset(vip, 0, sizeof(struct vector_info) * isi->isi_num_vectors);
-
         for (cnt=0; cnt < isi->isi_num_vectors; cnt++, vip++) {
                 vip->irqline = (unsigned char) cnt;
                 vip->iosapic = isi;
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
index 2b3ba1dcf332..cb3d28176129 100644
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
@@ -166,11 +166,12 @@ static void lasi_power_off(void)
 int __init
 lasi_init_chip(struct parisc_device *dev)
 {
+        extern void (*chassis_power_off)(void);
         struct gsc_asic *lasi;
         struct gsc_irq gsc_irq;
         int ret;
 
-        lasi = kmalloc(sizeof(*lasi), GFP_KERNEL);
+        lasi = kzalloc(sizeof(*lasi), GFP_KERNEL);
         if (!lasi)
                 return -ENOMEM;
 
@@ -222,7 +223,7 @@ lasi_init_chip(struct parisc_device *dev)
          * ensure that only the first LASI (the one controlling the power off)
          * should set the HPA here */
         lasi_power_off_hpa = lasi->hpa;
-        pm_power_off = lasi_power_off;
+        chassis_power_off = lasi_power_off;
         
         return ret;
 }
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index cbae8c8963fa..e8a2a4a852f5 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -1565,7 +1565,7 @@ lba_driver_probe(struct parisc_device *dev)
         } else if (IS_MERCURY(dev) || IS_QUICKSILVER(dev)) {
                 func_class &= 0xff;
                 version = kmalloc(6, GFP_KERNEL);
-                sprintf(version,"TR%d.%d",(func_class >> 4),(func_class & 0xf));
+                snprintf(version, 6, "TR%d.%d",(func_class >> 4),(func_class & 0xf));
                 /* We could use one printk for both Elroy and Mercury,
                  * but for the mask for func_class.
                  */ 
@@ -1586,14 +1586,12 @@ lba_driver_probe(struct parisc_device *dev)
         **      have an IRT entry will get NULL back from iosapic code.
         */
         
-        lba_dev = kmalloc(sizeof(struct lba_device), GFP_KERNEL);
+        lba_dev = kzalloc(sizeof(struct lba_device), GFP_KERNEL);
         if (!lba_dev) {
                 printk(KERN_ERR "lba_init_chip - couldn't alloc lba_device\n");
                 return(1);
         }
 
-        memset(lba_dev, 0, sizeof(struct lba_device));
-
 
         /* ---------- First : initialize data we already have --------- */
 
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 42a3c54e8e6c..a28e17898fbd 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -1,7 +1,7 @@
 /* 
  *    Interfaces to retrieve and set PDC Stable options (firmware)
  *
- *    Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org>
+ *    Copyright (C) 2005-2006 Thibaut VARENE <varenet@parisc-linux.org>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -26,11 +26,19 @@
  *
  *    Since locations between 96 and 192 are the various paths, most (if not
  *    all) PA-RISC machines should have them. Anyway, for safety reasons, the
- *    following code can deal with only 96 bytes of Stable Storage, and all
+ *    following code can deal with just 96 bytes of Stable Storage, and all
  *    sizes between 96 and 192 bytes (provided they are multiple of struct
  *    device_path size, eg: 128, 160 and 192) to provide full information.
  *    The code makes no use of data above 192 bytes. One last word: there's one
  *    path we can always count on: the primary path.
+ *
+ *    The current policy wrt file permissions is:
+ *      - write: root only
+ *      - read: (reading triggers PDC calls) ? root only : everyone
+ *    The rationale is that PDC calls could hog (DoS) the machine.
+ *
+ *      TODO:
+ *      - timer/fastsize write calls
  */
 
 #undef PDCS_DEBUG
@@ -50,13 +58,15 @@
 #include <linux/kobject.h>
 #include <linux/device.h>
 #include <linux/errno.h>
+#include <linux/spinlock.h>
 
 #include <asm/pdc.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <asm/hardware.h>
 
-#define PDCS_VERSION    "0.10"
+#define PDCS_VERSION    "0.22"
+#define PDCS_PREFIX     "PDC Stable Storage"
 
 #define PDCS_ADDR_PPRI  0x00
 #define PDCS_ADDR_OSID  0x40
@@ -70,10 +80,12 @@ MODULE_DESCRIPTION("sysfs interface to HP PDC Stable Storage data");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(PDCS_VERSION);
 
+/* holds Stable Storage size. Initialized once and for all, no lock needed */
 static unsigned long pdcs_size __read_mostly;
 
 /* This struct defines what we need to deal with a parisc pdc path entry */
 struct pdcspath_entry {
+        rwlock_t rw_lock;               /* to protect path entry access */
         short ready;                    /* entry record is valid if != 0 */
         unsigned long addr;             /* entry address in stable storage */
         char *name;                     /* entry name */
@@ -121,6 +133,8 @@ struct pdcspath_attribute paths_attr_##_name = { \
  * content of the stable storage WRT various paths in these structs. We read
  * these structs when reading the files, and we will write to these structs when
  * writing to the files, and only then write them back to the Stable Storage.
+ *
+ * This function expects to be called with @entry->rw_lock write-hold.
  */
 static int
 pdcspath_fetch(struct pdcspath_entry *entry)
@@ -160,14 +174,15 @@ pdcspath_fetch(struct pdcspath_entry *entry)
  * pointer, from which it'll find out the corresponding hardware path.
  * For now we do not handle the case where there's an error in writing to the
  * Stable Storage area, so you'd better not mess up the data :P
+ *
+ * This function expects to be called with @entry->rw_lock write-hold.
  */
-static int
+static void
 pdcspath_store(struct pdcspath_entry *entry)
 {
         struct device_path *devpath;
 
-        if (!entry)
-                return -EINVAL;
+        BUG_ON(!entry);
 
         devpath = &entry->devpath;
         
@@ -176,10 +191,8 @@ pdcspath_store(struct pdcspath_entry *entry)
            First case, we don't have a preset hwpath... */
         if (!entry->ready) {
                 /* ...but we have a device, map it */
-                if (entry->dev)
-                        device_to_hwpath(entry->dev, (struct hardware_path *)devpath);
-                else
-                        return -EINVAL;
+                BUG_ON(!entry->dev);
+                device_to_hwpath(entry->dev, (struct hardware_path *)devpath);
         }
         /* else, we expect the provided hwpath to be valid. */
         
@@ -191,15 +204,13 @@ pdcspath_store(struct pdcspath_entry *entry)
                 printk(KERN_ERR "%s: an error occured when writing to PDC.\n"
                                 "It is likely that the Stable Storage data has been corrupted.\n"
                                 "Please check it carefully upon next reboot.\n", __func__);
-                return -EIO;
+                WARN_ON(1);
         }
                 
         /* kobject is already registered */
         entry->ready = 2;
         
         DPRINTK("%s: device: 0x%p\n", __func__, entry->dev);
-        
-        return 0;
 }
 
 /**
@@ -214,14 +225,17 @@ pdcspath_hwpath_read(struct pdcspath_entry *entry, char *buf)
 {
         char *out = buf;
         struct device_path *devpath;
-        unsigned short i;
+        short i;
 
         if (!entry || !buf)
                 return -EINVAL;
 
+        read_lock(&entry->rw_lock);
         devpath = &entry->devpath;
+        i = entry->ready;
+        read_unlock(&entry->rw_lock);
 
-        if (!entry->ready)
+        if (!i) /* entry is not ready */
                 return -ENODATA;
         
         for (i = 0; i < 6; i++) {
@@ -242,7 +256,7 @@ pdcspath_hwpath_read(struct pdcspath_entry *entry, char *buf)
  * 
  * We will call this function to change the current hardware path.
  * Hardware paths are to be given '/'-delimited, without brackets.
- * We take care to make sure that the provided path actually maps to an existing
+ * We make sure that the provided path actually maps to an existing
  * device, BUT nothing would prevent some foolish user to set the path to some
  * PCI bridge or even a CPU...
  * A better work around would be to make sure we are at the end of a device tree
@@ -298,17 +312,19 @@ pdcspath_hwpath_write(struct pdcspath_entry *entry, const char *buf, size_t coun
         }
         
         /* So far so good, let's get in deep */
+        write_lock(&entry->rw_lock);
         entry->ready = 0;
         entry->dev = dev;
         
         /* Now, dive in. Write back to the hardware */
-        WARN_ON(pdcspath_store(entry)); /* this warn should *NEVER* happen */
+        pdcspath_store(entry);
         
         /* Update the symlink to the real device */
         sysfs_remove_link(&entry->kobj, "device");
         sysfs_create_link(&entry->kobj, &entry->dev->kobj, "device");
+        write_unlock(&entry->rw_lock);
         
-        printk(KERN_INFO "PDC Stable Storage: changed \"%s\" path to \"%s\"\n",
+        printk(KERN_INFO PDCS_PREFIX ": changed \"%s\" path to \"%s\"\n",
                 entry->name, buf);
         
         return count;
@@ -326,14 +342,17 @@ pdcspath_layer_read(struct pdcspath_entry *entry, char *buf)
 {
         char *out = buf;
         struct device_path *devpath;
-        unsigned short i;
+        short i;
 
         if (!entry || !buf)
                 return -EINVAL;
         
+        read_lock(&entry->rw_lock);
         devpath = &entry->devpath;
+        i = entry->ready;
+        read_unlock(&entry->rw_lock);
 
-        if (!entry->ready)
+        if (!i) /* entry is not ready */
                 return -ENODATA;
         
         for (i = 0; devpath->layers[i] && (likely(i < 6)); i++)
@@ -388,15 +407,17 @@ pdcspath_layer_write(struct pdcspath_entry *entry, const char *buf, size_t count
         }
                 
         /* So far so good, let's get in deep */
+        write_lock(&entry->rw_lock);
         
         /* First, overwrite the current layers with the new ones, not touching
            the hardware path. */
         memcpy(&entry->devpath.layers, &layers, sizeof(layers));
         
         /* Now, dive in. Write back to the hardware */
-        WARN_ON(pdcspath_store(entry)); /* this warn should *NEVER* happen */
+        pdcspath_store(entry);
+        write_unlock(&entry->rw_lock);
         
-        printk(KERN_INFO "PDC Stable Storage: changed \"%s\" layers to \"%s\"\n",
+        printk(KERN_INFO PDCS_PREFIX ": changed \"%s\" layers to \"%s\"\n",
                 entry->name, buf);
         
         return count;
@@ -415,9 +436,6 @@ pdcspath_attr_show(struct kobject *kobj, struct attribute *attr, char *buf)
         struct pdcspath_attribute *pdcs_attr = to_pdcspath_attribute(attr);
         ssize_t ret = 0;
 
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-
         if (pdcs_attr->show)
                 ret = pdcs_attr->show(entry, buf);
 
@@ -454,8 +472,8 @@ static struct sysfs_ops pdcspath_attr_ops = {
 };
 
 /* These are the two attributes of any PDC path. */
-static PATHS_ATTR(hwpath, 0600, pdcspath_hwpath_read, pdcspath_hwpath_write);
-static PATHS_ATTR(layer, 0600, pdcspath_layer_read, pdcspath_layer_write);
+static PATHS_ATTR(hwpath, 0644, pdcspath_hwpath_read, pdcspath_hwpath_write);
+static PATHS_ATTR(layer, 0644, pdcspath_layer_read, pdcspath_layer_write);
 
 static struct attribute *paths_subsys_attrs[] = {
         &paths_attr_hwpath.attr,
@@ -484,36 +502,119 @@ static struct pdcspath_entry *pdcspath_entries[] = {
         NULL,
 };
 
+
+/* For more insight of what's going on here, refer to PDC Procedures doc,
+ * Section PDC_STABLE */
+
 /**
- * pdcs_info_read - Pretty printing of the remaining useful data.
+ * pdcs_size_read - Stable Storage size output.
  * @entry: An allocated and populated subsytem struct. We don't use it tho.
  * @buf: The output buffer to write to.
- * 
- * We will call this function to format the output of the 'info' attribute file.
- * Please refer to PDC Procedures documentation, section PDC_STABLE to get a
- * better insight of what we're doing here.
  */
 static ssize_t
-pdcs_info_read(struct subsystem *entry, char *buf)
+pdcs_size_read(struct subsystem *entry, char *buf)
 {
         char *out = buf;
-        __u32 result;
-        struct device_path devpath;
-        char *tmpstr = NULL;
         
         if (!entry || !buf)
                 return -EINVAL;
                 
         /* show the size of the stable storage */
-        out += sprintf(out, "Stable Storage size: %ld bytes\n", pdcs_size);
+        out += sprintf(out, "%ld\n", pdcs_size);
 
-        /* deal with flags */
-        if (pdc_stable_read(PDCS_ADDR_PPRI, &devpath, sizeof(devpath)) != PDC_OK)
-                return -EIO;
+        return out - buf;
+}
+
+/**
+ * pdcs_auto_read - Stable Storage autoboot/search flag output.
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The output buffer to write to.
+ * @knob: The PF_AUTOBOOT or PF_AUTOSEARCH flag
+ */
+static ssize_t
+pdcs_auto_read(struct subsystem *entry, char *buf, int knob)
+{
+        char *out = buf;
+        struct pdcspath_entry *pathentry;
         
-        out += sprintf(out, "Autoboot: %s\n", (devpath.flags & PF_AUTOBOOT) ? "On" : "Off");
-        out += sprintf(out, "Autosearch: %s\n", (devpath.flags & PF_AUTOSEARCH) ? "On" : "Off");
-        out += sprintf(out, "Timer: %u s\n", (devpath.flags & PF_TIMER) ? (1 << (devpath.flags & PF_TIMER)) : 0);
+        if (!entry || !buf)
+                return -EINVAL;
+
+        /* Current flags are stored in primary boot path entry */
+        pathentry = &pdcspath_entry_primary;
+
+        read_lock(&pathentry->rw_lock);
+        out += sprintf(out, "%s\n", (pathentry->devpath.flags & knob) ?
+                                        "On" : "Off");
+        read_unlock(&pathentry->rw_lock);
+
+        return out - buf;
+}
+
+/**
+ * pdcs_autoboot_read - Stable Storage autoboot flag output.
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The output buffer to write to.
+ */
+static inline ssize_t
+pdcs_autoboot_read(struct subsystem *entry, char *buf)
+{
+        return pdcs_auto_read(entry, buf, PF_AUTOBOOT);
+}
+
+/**
+ * pdcs_autosearch_read - Stable Storage autoboot flag output.
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The output buffer to write to.
+ */
+static inline ssize_t
+pdcs_autosearch_read(struct subsystem *entry, char *buf)
+{
+        return pdcs_auto_read(entry, buf, PF_AUTOSEARCH);
+}
+
+/**
+ * pdcs_timer_read - Stable Storage timer count output (in seconds).
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The output buffer to write to.
+ *
+ * The value of the timer field correponds to a number of seconds in powers of 2.
+ */
+static ssize_t
+pdcs_timer_read(struct subsystem *entry, char *buf)
+{
+        char *out = buf;
+        struct pdcspath_entry *pathentry;
+
+        if (!entry || !buf)
+                return -EINVAL;
+
+        /* Current flags are stored in primary boot path entry */
+        pathentry = &pdcspath_entry_primary;
+
+        /* print the timer value in seconds */
+        read_lock(&pathentry->rw_lock);
+        out += sprintf(out, "%u\n", (pathentry->devpath.flags & PF_TIMER) ?
+                                (1 << (pathentry->devpath.flags & PF_TIMER)) : 0);
+        read_unlock(&pathentry->rw_lock);
+
+        return out - buf;
+}
+
+/**
+ * pdcs_osid_read - Stable Storage OS ID register output.
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The output buffer to write to.
+ */
+static ssize_t
+pdcs_osid_read(struct subsystem *entry, char *buf)
+{
+        char *out = buf;
+        __u32 result;
+        char *tmpstr = NULL;
+
+        if (!entry || !buf)
+                return -EINVAL;
 
         /* get OSID */
         if (pdc_stable_read(PDCS_ADDR_OSID, &result, sizeof(result)) != PDC_OK)
@@ -529,13 +630,31 @@ pdcs_info_read(struct subsystem *entry, char *buf)
                 case 0x0005:    tmpstr = "Novell Netware dependent data"; break;
                 default:        tmpstr = "Unknown"; break;
         }
-        out += sprintf(out, "OS ID: %s (0x%.4x)\n", tmpstr, (result >> 16));
+        out += sprintf(out, "%s (0x%.4x)\n", tmpstr, (result >> 16));
+
+        return out - buf;
+}
+
+/**
+ * pdcs_fastsize_read - Stable Storage FastSize register output.
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The output buffer to write to.
+ *
+ * This register holds the amount of system RAM to be tested during boot sequence.
+ */
+static ssize_t
+pdcs_fastsize_read(struct subsystem *entry, char *buf)
+{
+        char *out = buf;
+        __u32 result;
+
+        if (!entry || !buf)
+                return -EINVAL;
 
         /* get fast-size */
         if (pdc_stable_read(PDCS_ADDR_FSIZ, &result, sizeof(result)) != PDC_OK)
                 return -EIO;
 
-        out += sprintf(out, "Memory tested: ");
         if ((result & 0x0F) < 0x0E)
                 out += sprintf(out, "%d kB", (1<<(result & 0x0F))*256);
         else
@@ -546,22 +665,18 @@ pdcs_info_read(struct subsystem *entry, char *buf)
 }
 
 /**
- * pdcs_info_write - This function handles boot flag modifying.
+ * pdcs_auto_write - This function handles autoboot/search flag modifying.
  * @entry: An allocated and populated subsytem struct. We don't use it tho.
  * @buf: The input buffer to read from.
  * @count: The number of bytes to be read.
+ * @knob: The PF_AUTOBOOT or PF_AUTOSEARCH flag
  * 
- * We will call this function to change the current boot flags.
+ * We will call this function to change the current autoboot flag.
  * We expect a precise syntax:
- *      \"n n\" (n == 0 or 1) to toggle respectively AutoBoot and AutoSearch
- *
- * As of now there is no incentive on my side to provide more "knobs" to that
- * interface, since modifying the rest of the data is pretty meaningless when
- * the machine is running and for the expected use of that facility, such as
- * PALO setting up the boot disk when installing a Linux distribution...
+ *      \"n\" (n == 0 or 1) to toggle AutoBoot Off or On
  */
 static ssize_t
-pdcs_info_write(struct subsystem *entry, const char *buf, size_t count)
+pdcs_auto_write(struct subsystem *entry, const char *buf, size_t count, int knob)
 {
         struct pdcspath_entry *pathentry;
         unsigned char flags;
@@ -582,7 +697,9 @@ pdcs_info_write(struct subsystem *entry, const char *buf, size_t count)
         pathentry = &pdcspath_entry_primary;
         
         /* Be nice to the existing flag record */
+        read_lock(&pathentry->rw_lock);
         flags = pathentry->devpath.flags;
+        read_unlock(&pathentry->rw_lock);
         
         DPRINTK("%s: flags before: 0x%X\n", __func__, flags);
                         
@@ -595,50 +712,85 @@ pdcs_info_write(struct subsystem *entry, const char *buf, size_t count)
         if ((c != 0) && (c != 1))
                 goto parse_error;
         if (c == 0)
-                flags &= ~PF_AUTOBOOT;
+                flags &= ~knob;
         else
-                flags |= PF_AUTOBOOT;
-        
-        if (*temp++ != ' ')
-                goto parse_error;
-        
-        c = *temp++ - '0';
-        if ((c != 0) && (c != 1))
-                goto parse_error;
-        if (c == 0)
-                flags &= ~PF_AUTOSEARCH;
-        else
-                flags |= PF_AUTOSEARCH;
+                flags |= knob;
         
         DPRINTK("%s: flags after: 0x%X\n", __func__, flags);
                 
         /* So far so good, let's get in deep */
+        write_lock(&pathentry->rw_lock);
         
         /* Change the path entry flags first */
         pathentry->devpath.flags = flags;
                 
         /* Now, dive in. Write back to the hardware */
-        WARN_ON(pdcspath_store(pathentry));     /* this warn should *NEVER* happen */
+        pdcspath_store(pathentry);
+        write_unlock(&pathentry->rw_lock);
         
-        printk(KERN_INFO "PDC Stable Storage: changed flags to \"%s\"\n", buf);
+        printk(KERN_INFO PDCS_PREFIX ": changed \"%s\" to \"%s\"\n",
+                (knob & PF_AUTOBOOT) ? "autoboot" : "autosearch",
+                (flags & knob) ? "On" : "Off");
         
         return count;
 
 parse_error:
-        printk(KERN_WARNING "%s: Parse error: expect \"n n\" (n == 0 or 1) for AB and AS\n", __func__);
+        printk(KERN_WARNING "%s: Parse error: expect \"n\" (n == 0 or 1)\n", __func__);
         return -EINVAL;
 }
 
-/* The last attribute (the 'root' one actually) with all remaining data. */
-static PDCS_ATTR(info, 0600, pdcs_info_read, pdcs_info_write);
+/**
+ * pdcs_autoboot_write - This function handles autoboot flag modifying.
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The input buffer to read from.
+ * @count: The number of bytes to be read.
+ *
+ * We will call this function to change the current boot flags.
+ * We expect a precise syntax:
+ *      \"n\" (n == 0 or 1) to toggle AutoSearch Off or On
+ */
+static inline ssize_t
+pdcs_autoboot_write(struct subsystem *entry, const char *buf, size_t count)
+{
+        return pdcs_auto_write(entry, buf, count, PF_AUTOBOOT);
+}
+
+/**
+ * pdcs_autosearch_write - This function handles autosearch flag modifying.
+ * @entry: An allocated and populated subsytem struct. We don't use it tho.
+ * @buf: The input buffer to read from.
+ * @count: The number of bytes to be read.
+ *
+ * We will call this function to change the current boot flags.
+ * We expect a precise syntax:
+ *      \"n\" (n == 0 or 1) to toggle AutoSearch Off or On
+ */
+static inline ssize_t
+pdcs_autosearch_write(struct subsystem *entry, const char *buf, size_t count)
+{
+        return pdcs_auto_write(entry, buf, count, PF_AUTOSEARCH);
+}
+
+/* The remaining attributes. */
+static PDCS_ATTR(size, 0444, pdcs_size_read, NULL);
+static PDCS_ATTR(autoboot, 0644, pdcs_autoboot_read, pdcs_autoboot_write);
+static PDCS_ATTR(autosearch, 0644, pdcs_autosearch_read, pdcs_autosearch_write);
+static PDCS_ATTR(timer, 0444, pdcs_timer_read, NULL);
+static PDCS_ATTR(osid, 0400, pdcs_osid_read, NULL);
+static PDCS_ATTR(fastsize, 0400, pdcs_fastsize_read, NULL);
 
 static struct subsys_attribute *pdcs_subsys_attrs[] = {
-        &pdcs_attr_info,
-        NULL,   /* maybe more in the future? */
+        &pdcs_attr_size,
+        &pdcs_attr_autoboot,
+        &pdcs_attr_autosearch,
+        &pdcs_attr_timer,
+        &pdcs_attr_osid,
+        &pdcs_attr_fastsize,
+        NULL,
 };
 
 static decl_subsys(paths, &ktype_pdcspath, NULL);
-static decl_subsys(pdc, NULL, NULL);
+static decl_subsys(stable, NULL, NULL);
 
 /**
  * pdcs_register_pathentries - Prepares path entries kobjects for sysfs usage.
@@ -656,8 +808,16 @@ pdcs_register_pathentries(void)
         struct pdcspath_entry *entry;
         int err;
         
+        /* Initialize the entries rw_lock before anything else */
+        for (i = 0; (entry = pdcspath_entries[i]); i++)
+                rwlock_init(&entry->rw_lock);
+
         for (i = 0; (entry = pdcspath_entries[i]); i++) {
-                if (pdcspath_fetch(entry) < 0)
+                write_lock(&entry->rw_lock);
+                err = pdcspath_fetch(entry);
+                write_unlock(&entry->rw_lock);
+
+                if (err < 0)
                         continue;
 
                 if ((err = kobject_set_name(&entry->kobj, "%s", entry->name)))
@@ -667,13 +827,14 @@ pdcs_register_pathentries(void)
                         return err;
                 
                 /* kobject is now registered */
+                write_lock(&entry->rw_lock);
                 entry->ready = 2;
                 
-                if (!entry->dev)
-                        continue;
-
                 /* Add a nice symlink to the real device */
-                sysfs_create_link(&entry->kobj, &entry->dev->kobj, "device");
+                if (entry->dev)
+                        sysfs_create_link(&entry->kobj, &entry->dev->kobj, "device");
+
+                write_unlock(&entry->rw_lock);
         }
         
         return 0;
@@ -688,14 +849,17 @@ pdcs_unregister_pathentries(void)
         unsigned short i;
         struct pdcspath_entry *entry;
         
-        for (i = 0; (entry = pdcspath_entries[i]); i++)
+        for (i = 0; (entry = pdcspath_entries[i]); i++) {
+                read_lock(&entry->rw_lock);
                 if (entry->ready >= 2)
-                        kobject_unregister(&entry->kobj);       
+                        kobject_unregister(&entry->kobj);
+                read_unlock(&entry->rw_lock);
+        }
 }
 
 /*
- * For now we register the pdc subsystem with the firmware subsystem
- * and the paths subsystem with the pdc subsystem
+ * For now we register the stable subsystem with the firmware subsystem
+ * and the paths subsystem with the stable subsystem
  */
 static int __init
 pdc_stable_init(void)
@@ -707,19 +871,23 @@ pdc_stable_init(void)
         if (pdc_stable_get_size(&pdcs_size) != PDC_OK) 
                 return -ENODEV;
 
-        printk(KERN_INFO "PDC Stable Storage facility v%s\n", PDCS_VERSION);
+        /* make sure we have enough data */
+        if (pdcs_size < 96)
+                return -ENODATA;
+
+        printk(KERN_INFO PDCS_PREFIX " facility v%s\n", PDCS_VERSION);
 
-        /* For now we'll register the pdc subsys within this driver */
-        if ((rc = firmware_register(&pdc_subsys)))
+        /* For now we'll register the stable subsys within this driver */
+        if ((rc = firmware_register(&stable_subsys)))
                 goto fail_firmreg;
 
-        /* Don't forget the info entry */
+        /* Don't forget the root entries */
         for (i = 0; (attr = pdcs_subsys_attrs[i]) && !error; i++)
                 if (attr->show)
-                        error = subsys_create_file(&pdc_subsys, attr);
+                        error = subsys_create_file(&stable_subsys, attr);
         
-        /* register the paths subsys as a subsystem of pdc subsys */
-        kset_set_kset_s(&paths_subsys, pdc_subsys);
+        /* register the paths subsys as a subsystem of stable subsys */
+        kset_set_kset_s(&paths_subsys, stable_subsys);
         if ((rc= subsystem_register(&paths_subsys)))
                 goto fail_subsysreg;
 
@@ -734,10 +902,10 @@ fail_pdcsreg:
         subsystem_unregister(&paths_subsys);
         
 fail_subsysreg:
-        firmware_unregister(&pdc_subsys);
+        firmware_unregister(&stable_subsys);
         
 fail_firmreg:
-        printk(KERN_INFO "PDC Stable Storage bailing out\n");
+        printk(KERN_INFO PDCS_PREFIX " bailing out\n");
         return rc;
 }
 
@@ -747,7 +915,7 @@ pdc_stable_exit(void)
         pdcs_unregister_pathentries();
         subsystem_unregister(&paths_subsys);
 
-        firmware_unregister(&pdc_subsys);
+        firmware_unregister(&stable_subsys);
 }
 
 
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index c85653f315aa..52f265e97729 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -2064,14 +2064,13 @@ sba_driver_callback(struct parisc_device *dev)
         printk(KERN_INFO "%s found %s at 0x%lx\n",
                 MODULE_NAME, version, dev->hpa.start);
 
-        sba_dev = kmalloc(sizeof(struct sba_device), GFP_KERNEL);
+        sba_dev = kzalloc(sizeof(struct sba_device), GFP_KERNEL);
         if (!sba_dev) {
                 printk(KERN_ERR MODULE_NAME " - couldn't alloc sba_device\n");
                 return -ENOMEM;
         }
 
         parisc_set_drvdata(dev, sba_dev);
-        memset(sba_dev, 0, sizeof(struct sba_device));
 
         for(i=0; i<MAX_IOC; i++)
                 spin_lock_init(&(sba_dev->ioc[i].res_lock));
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index d14888e149bb..ba971fecd0d8 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -89,6 +89,9 @@ static struct superio_device sio_dev;
 #define DBG_INIT(x...)
 #endif
 
+#define SUPERIO "SuperIO"
+#define PFX     SUPERIO ": "
+
 static irqreturn_t
 superio_interrupt(int parent_irq, void *devp, struct pt_regs *regs)
 {
@@ -117,7 +120,7 @@ superio_interrupt(int parent_irq, void *devp, struct pt_regs *regs)
         local_irq = results & 0x0f;
 
         if (local_irq == 2 || local_irq > 7) {
-                printk(KERN_ERR "SuperIO: slave interrupted!\n");
+                printk(KERN_ERR PFX "slave interrupted!\n");
                 return IRQ_HANDLED;
         }
 
@@ -128,7 +131,7 @@ superio_interrupt(int parent_irq, void *devp, struct pt_regs *regs)
                 outb(OCW3_ISR,IC_PIC1+0);
                 results = inb(IC_PIC1+0);
                 if ((results & 0x80) == 0) { /* if ISR7 not set: spurious */
-                        printk(KERN_WARNING "SuperIO: spurious interrupt!\n");
+                        printk(KERN_WARNING PFX "spurious interrupt!\n");
                         return IRQ_HANDLED;
                 }
         }
@@ -163,27 +166,27 @@ superio_init(struct pci_dev *pcidev)
         /* ...then properly fixup the USB to point at suckyio PIC */
         sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev);
 
-        printk(KERN_INFO "SuperIO: Found NS87560 Legacy I/O device at %s (IRQ %i) \n",
+        printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i) \n",
                pci_name(pdev), pdev->irq);
 
         pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base);
         sio->sp1_base &= ~1;
-        printk (KERN_INFO "SuperIO: Serial port 1 at 0x%x\n", sio->sp1_base);
+        printk(KERN_INFO PFX "Serial port 1 at 0x%x\n", sio->sp1_base);
 
         pci_read_config_dword (pdev, SIO_SP2BAR, &sio->sp2_base);
         sio->sp2_base &= ~1;
-        printk (KERN_INFO "SuperIO: Serial port 2 at 0x%x\n", sio->sp2_base);
+        printk(KERN_INFO PFX "Serial port 2 at 0x%x\n", sio->sp2_base);
 
         pci_read_config_dword (pdev, SIO_PPBAR, &sio->pp_base);
         sio->pp_base &= ~1;
-        printk (KERN_INFO "SuperIO: Parallel port at 0x%x\n", sio->pp_base);
+        printk(KERN_INFO PFX "Parallel port at 0x%x\n", sio->pp_base);
 
         pci_read_config_dword (pdev, SIO_FDCBAR, &sio->fdc_base);
         sio->fdc_base &= ~1;
-        printk (KERN_INFO "SuperIO: Floppy controller at 0x%x\n", sio->fdc_base);
+        printk(KERN_INFO PFX "Floppy controller at 0x%x\n", sio->fdc_base);
         pci_read_config_dword (pdev, SIO_ACPIBAR, &sio->acpi_base);
         sio->acpi_base &= ~1;
-        printk (KERN_INFO "SuperIO: ACPI at 0x%x\n", sio->acpi_base);
+        printk(KERN_INFO PFX "ACPI at 0x%x\n", sio->acpi_base);
 
         request_region (IC_PIC1, 0x1f, "pic1");
         request_region (IC_PIC2, 0x1f, "pic2");
@@ -263,14 +266,14 @@ superio_init(struct pci_dev *pcidev)
         /* Setup USB power regulation */
         outb(1, sio->acpi_base + USB_REG_CR);
         if (inb(sio->acpi_base + USB_REG_CR) & 1)
-                printk(KERN_INFO "SuperIO: USB regulator enabled\n");
+                printk(KERN_INFO PFX "USB regulator enabled\n");
         else
-                printk(KERN_ERR "USB regulator not initialized!\n");
+                printk(KERN_ERR PFX "USB regulator not initialized!\n");
 
         if (request_irq(pdev->irq, superio_interrupt, SA_INTERRUPT,
-                        "SuperIO", (void *)sio)) {
+                        SUPERIO, (void *)sio)) {
 
-                printk(KERN_ERR "SuperIO: could not get irq\n");
+                printk(KERN_ERR PFX "could not get irq\n");
                 BUG();
                 return;
         }
@@ -284,7 +287,7 @@ static void superio_disable_irq(unsigned int irq)
         u8 r8;
 
         if ((irq < 1) || (irq == 2) || (irq > 7)) {
-                printk(KERN_ERR "SuperIO: Illegal irq number.\n");
+                printk(KERN_ERR PFX "Illegal irq number.\n");
                 BUG();
                 return;
         }
@@ -301,7 +304,7 @@ static void superio_enable_irq(unsigned int irq)
         u8 r8;
 
         if ((irq < 1) || (irq == 2) || (irq > 7)) {
-                printk(KERN_ERR "SuperIO: Illegal irq number (%d).\n", irq);
+                printk(KERN_ERR PFX "Illegal irq number (%d).\n", irq);
                 BUG();
                 return;
         }
@@ -319,7 +322,7 @@ static unsigned int superio_startup_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type superio_interrupt_type = {
-        .typename =     "SuperIO",
+        .typename =     SUPERIO,
         .startup =      superio_startup_irq,
         .shutdown =     superio_disable_irq,
         .enable =       superio_enable_irq,
@@ -413,7 +416,7 @@ static void __devinit superio_serial_init(void)
 
         retval = early_serial_setup(&serial[0]);
         if (retval < 0) {
-                printk(KERN_WARNING "SuperIO: Register Serial #0 failed.\n");
+                printk(KERN_WARNING PFX "Register Serial #0 failed.\n");
                 return;
         }
 
@@ -423,7 +426,7 @@ static void __devinit superio_serial_init(void)
         retval = early_serial_setup(&serial[1]);
 
         if (retval < 0)
-                printk(KERN_WARNING "SuperIO: Register Serial #1 failed.\n");
+                printk(KERN_WARNING PFX "Register Serial #1 failed.\n");
 #endif /* CONFIG_SERIAL_8250 */
 }
 
@@ -437,7 +440,7 @@ static void __devinit superio_parport_init(void)
                         PARPORT_DMA_NONE /* dma */,
                         NULL /*struct pci_dev* */) )
 
-                printk(KERN_WARNING "SuperIO: Probing parallel port failed.\n");
+                printk(KERN_WARNING PFX "Probing parallel port failed.\n");
 #endif  /* CONFIG_PARPORT_PC */
 }
 
@@ -499,7 +502,7 @@ static struct pci_device_id superio_tbl[] = {
 };
 
 static struct pci_driver superio_driver = {
-        .name =         "SuperIO",
+        .name =         SUPERIO,
         .id_table =     superio_tbl,
         .probe =        superio_probe,
 };
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 17dce2adf7fe..813c2c24ab1e 100644
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -76,7 +76,7 @@ wax_init_chip(struct parisc_device *dev)
         struct gsc_irq gsc_irq;
         int ret;
 
-        wax = kmalloc(sizeof(*wax), GFP_KERNEL);
+        wax = kzalloc(sizeof(*wax), GFP_KERNEL);
         if (!wax)
                 return -ENOMEM;
 
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index f605dea57224..f63c387976cf 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -90,6 +90,15 @@ config PARPORT_ARC
         depends on ARM && PARPORT
         select PARPORT_NOT_PC
 
+config PARPORT_IP32
+        tristate "SGI IP32 builtin port (EXPERIMENTAL)"
+        depends on SGI_IP32 && PARPORT && EXPERIMENTAL
+        select PARPORT_NOT_PC
+        help
+          Say Y here if you need support for the parallel port on
+          SGI O2 machines. This code is also available as a module (say M),
+          called parport_ip32.  If in doubt, saying N is the safe plan.
+
 config PARPORT_AMIGA
         tristate "Amiga builtin port"
         depends on AMIGA && PARPORT
diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile
index 5372212bb9d9..a19de35f8de2 100644
--- a/drivers/parport/Makefile
+++ b/drivers/parport/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_PARPORT_MFC3)	+= parport_mfc3.o
 obj-$(CONFIG_PARPORT_ATARI)     += parport_atari.o
 obj-$(CONFIG_PARPORT_SUNBPP)    += parport_sunbpp.o
 obj-$(CONFIG_PARPORT_GSC)       += parport_gsc.o
+obj-$(CONFIG_PARPORT_IP32)      += parport_ip32.o
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c
index 5b887ba5aaf9..690b239ad3a7 100644
--- a/drivers/parport/ieee1284.c
+++ b/drivers/parport/ieee1284.c
@@ -61,10 +61,10 @@ static void timeout_waiting_on_port (unsigned long cookie)
  *      set to zero, it returns immediately.
  *
  *      If an interrupt occurs before the timeout period elapses, this
- *      function returns one immediately.  If it times out, it returns
- *      a value greater than zero.  An error code less than zero
- *      indicates an error (most likely a pending signal), and the
- *      calling code should finish what it's doing as soon as it can.
+ *      function returns zero immediately.  If it times out, it returns
+ *      one.  An error code less than zero indicates an error (most
+ *      likely a pending signal), and the calling code should finish
+ *      what it's doing as soon as it can.
  */
 
 int parport_wait_event (struct parport *port, signed long timeout)
@@ -110,7 +110,7 @@ int parport_wait_event (struct parport *port, signed long timeout)
  *
  *      If the status lines take on the desired values before the
  *      timeout period elapses, parport_poll_peripheral() returns zero
- *      immediately.  A zero return value greater than zero indicates
+ *      immediately.  A return value greater than zero indicates
  *      a timeout.  An error code (less than zero) indicates an error,
  *      most likely a signal that arrived, and the caller should
  *      finish what it is doing as soon as possible.
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index fde29a75f888..1de52d9febf9 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -249,7 +249,7 @@ struct parport *__devinit parport_gsc_probe_port (unsigned long base,
         struct parport tmp;
         struct parport *p = &tmp;
 
-        priv = kmalloc (sizeof (struct parport_gsc_private), GFP_KERNEL);
+        priv = kzalloc (sizeof (struct parport_gsc_private), GFP_KERNEL);
         if (!priv) {
                 printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base);
                 return NULL;
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c
new file mode 100644
index 000000000000..46e06e596d73
--- /dev/null
+++ b/drivers/parport/parport_ip32.c
@@ -0,0 +1,2253 @@
+/* Low-level parallel port routines for built-in port on SGI IP32
+ *
+ * Author: Arnaud Giersch <arnaud.giersch@free.fr>
+ *
+ * Based on parport_pc.c by
+ *      Phil Blundell, Tim Waugh, Jose Renau, David Campbell,
+ *      Andrea Arcangeli, et al.
+ *
+ * Thanks to Ilya A. Volynets-Evenbakh for his help.
+ *
+ * Copyright (C) 2005, 2006 Arnaud Giersch.
+ *
+ * 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.
+ */
+
+/* Current status:
+ *
+ *      Basic SPP and PS2 modes are supported.
+ *      Support for parallel port IRQ is present.
+ *      Hardware SPP (a.k.a. compatibility), EPP, and ECP modes are
+ *      supported.
+ *      SPP/ECP FIFO can be driven in PIO or DMA mode.  PIO mode can work with
+ *      or without interrupt support.
+ *
+ *      Hardware ECP mode is not fully implemented (ecp_read_data and
+ *      ecp_write_addr are actually missing).
+ *
+ * To do:
+ *
+ *      Fully implement ECP mode.
+ *      EPP and ECP mode need to be tested.  I currently do not own any
+ *      peripheral supporting these extended mode, and cannot test them.
+ *      If DMA mode works well, decide if support for PIO FIFO modes should be
+ *      dropped.
+ *      Use the io{read,write} family functions when they become available in
+ *      the linux-mips.org tree.  Note: the MIPS specific functions readsb()
+ *      and writesb() are to be translated by ioread8_rep() and iowrite8_rep()
+ *      respectively.
+ */
+
+/* The built-in parallel port on the SGI 02 workstation (a.k.a. IP32) is an
+ * IEEE 1284 parallel port driven by a Texas Instrument TL16PIR552PH chip[1].
+ * This chip supports SPP, bidirectional, EPP and ECP modes.  It has a 16 byte
+ * FIFO buffer and supports DMA transfers.
+ *
+ * [1] http://focus.ti.com/docs/prod/folders/print/tl16pir552.html
+ *
+ * Theoretically, we could simply use the parport_pc module.  It is however
+ * not so simple.  The parport_pc code assumes that the parallel port
+ * registers are port-mapped.  On the O2, they are memory-mapped.
+ * Furthermore, each register is replicated on 256 consecutive addresses (as
+ * it is for the built-in serial ports on the same chip).
+ */
+
+/*--- Some configuration defines ---------------------------------------*/
+
+/* DEBUG_PARPORT_IP32
+ *      0       disable debug
+ *      1       standard level: pr_debug1 is enabled
+ *      2       parport_ip32_dump_state is enabled
+ *      >=3     verbose level: pr_debug is enabled
+ */
+#if !defined(DEBUG_PARPORT_IP32)
+#       define DEBUG_PARPORT_IP32  0    /* 0 (disabled) for production */
+#endif
+
+/*----------------------------------------------------------------------*/
+
+/* Setup DEBUG macros.  This is done before any includes, just in case we
+ * activate pr_debug() with DEBUG_PARPORT_IP32 >= 3.
+ */
+#if DEBUG_PARPORT_IP32 == 1
+#       warning DEBUG_PARPORT_IP32 == 1
+#elif DEBUG_PARPORT_IP32 == 2
+#       warning DEBUG_PARPORT_IP32 == 2
+#elif DEBUG_PARPORT_IP32 >= 3
+#       warning DEBUG_PARPORT_IP32 >= 3
+#       if !defined(DEBUG)
+#               define DEBUG /* enable pr_debug() in kernel.h */
+#       endif
+#endif
+
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/jiffies.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/parport.h>
+#include <linux/sched.h>
+#include <linux/spinlock.h>
+#include <linux/stddef.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <asm/ip32/ip32_ints.h>
+#include <asm/ip32/mace.h>
+
+/*--- Global variables -------------------------------------------------*/
+
+/* Verbose probing on by default for debugging. */
+#if DEBUG_PARPORT_IP32 >= 1
+#       define DEFAULT_VERBOSE_PROBING  1
+#else
+#       define DEFAULT_VERBOSE_PROBING  0
+#endif
+
+/* Default prefix for printk */
+#define PPIP32 "parport_ip32: "
+
+/*
+ * These are the module parameters:
+ * @features:           bit mask of features to enable/disable
+ *                      (all enabled by default)
+ * @verbose_probing:    log chit-chat during initialization
+ */
+#define PARPORT_IP32_ENABLE_IRQ (1U << 0)
+#define PARPORT_IP32_ENABLE_DMA (1U << 1)
+#define PARPORT_IP32_ENABLE_SPP (1U << 2)
+#define PARPORT_IP32_ENABLE_EPP (1U << 3)
+#define PARPORT_IP32_ENABLE_ECP (1U << 4)
+static unsigned int features =  ~0U;
+static int verbose_probing =    DEFAULT_VERBOSE_PROBING;
+
+/* We do not support more than one port. */
+static struct parport *this_port = NULL;
+
+/* Timing constants for FIFO modes.  */
+#define FIFO_NFAULT_TIMEOUT     100     /* milliseconds */
+#define FIFO_POLLING_INTERVAL   50      /* microseconds */
+
+/*--- I/O register definitions -----------------------------------------*/
+
+/**
+ * struct parport_ip32_regs - virtual addresses of parallel port registers
+ * @data:       Data Register
+ * @dsr:        Device Status Register
+ * @dcr:        Device Control Register
+ * @eppAddr:    EPP Address Register
+ * @eppData0:   EPP Data Register 0
+ * @eppData1:   EPP Data Register 1
+ * @eppData2:   EPP Data Register 2
+ * @eppData3:   EPP Data Register 3
+ * @ecpAFifo:   ECP Address FIFO
+ * @fifo:       General FIFO register.  The same address is used for:
+ *              - cFifo, the Parallel Port DATA FIFO
+ *              - ecpDFifo, the ECP Data FIFO
+ *              - tFifo, the ECP Test FIFO
+ * @cnfgA:      Configuration Register A
+ * @cnfgB:      Configuration Register B
+ * @ecr:        Extended Control Register
+ */
+struct parport_ip32_regs {
+        void __iomem *data;
+        void __iomem *dsr;
+        void __iomem *dcr;
+        void __iomem *eppAddr;
+        void __iomem *eppData0;
+        void __iomem *eppData1;
+        void __iomem *eppData2;
+        void __iomem *eppData3;
+        void __iomem *ecpAFifo;
+        void __iomem *fifo;
+        void __iomem *cnfgA;
+        void __iomem *cnfgB;
+        void __iomem *ecr;
+};
+
+/* Device Status Register */
+#define DSR_nBUSY               (1U << 7)       /* PARPORT_STATUS_BUSY */
+#define DSR_nACK                (1U << 6)       /* PARPORT_STATUS_ACK */
+#define DSR_PERROR              (1U << 5)       /* PARPORT_STATUS_PAPEROUT */
+#define DSR_SELECT              (1U << 4)       /* PARPORT_STATUS_SELECT */
+#define DSR_nFAULT              (1U << 3)       /* PARPORT_STATUS_ERROR */
+#define DSR_nPRINT              (1U << 2)       /* specific to TL16PIR552 */
+/* #define DSR_reserved         (1U << 1) */
+#define DSR_TIMEOUT             (1U << 0)       /* EPP timeout */
+
+/* Device Control Register */
+/* #define DCR_reserved         (1U << 7) | (1U <<  6) */
+#define DCR_DIR                 (1U << 5)       /* direction */
+#define DCR_IRQ                 (1U << 4)       /* interrupt on nAck */
+#define DCR_SELECT              (1U << 3)       /* PARPORT_CONTROL_SELECT */
+#define DCR_nINIT               (1U << 2)       /* PARPORT_CONTROL_INIT */
+#define DCR_AUTOFD              (1U << 1)       /* PARPORT_CONTROL_AUTOFD */
+#define DCR_STROBE              (1U << 0)       /* PARPORT_CONTROL_STROBE */
+
+/* ECP Configuration Register A */
+#define CNFGA_IRQ               (1U << 7)
+#define CNFGA_ID_MASK           ((1U << 6) | (1U << 5) | (1U << 4))
+#define CNFGA_ID_SHIFT          4
+#define CNFGA_ID_16             (00U << CNFGA_ID_SHIFT)
+#define CNFGA_ID_8              (01U << CNFGA_ID_SHIFT)
+#define CNFGA_ID_32             (02U << CNFGA_ID_SHIFT)
+/* #define CNFGA_reserved       (1U << 3) */
+#define CNFGA_nBYTEINTRANS      (1U << 2)
+#define CNFGA_PWORDLEFT         ((1U << 1) | (1U << 0))
+
+/* ECP Configuration Register B */
+#define CNFGB_COMPRESS          (1U << 7)
+#define CNFGB_INTRVAL           (1U << 6)
+#define CNFGB_IRQ_MASK          ((1U << 5) | (1U << 4) | (1U << 3))
+#define CNFGB_IRQ_SHIFT         3
+#define CNFGB_DMA_MASK          ((1U << 2) | (1U << 1) | (1U << 0))
+#define CNFGB_DMA_SHIFT         0
+
+/* Extended Control Register */
+#define ECR_MODE_MASK           ((1U << 7) | (1U << 6) | (1U << 5))
+#define ECR_MODE_SHIFT          5
+#define ECR_MODE_SPP            (00U << ECR_MODE_SHIFT)
+#define ECR_MODE_PS2            (01U << ECR_MODE_SHIFT)
+#define ECR_MODE_PPF            (02U << ECR_MODE_SHIFT)
+#define ECR_MODE_ECP            (03U << ECR_MODE_SHIFT)
+#define ECR_MODE_EPP            (04U << ECR_MODE_SHIFT)
+/* #define ECR_MODE_reserved    (05U << ECR_MODE_SHIFT) */
+#define ECR_MODE_TST            (06U << ECR_MODE_SHIFT)
+#define ECR_MODE_CFG            (07U << ECR_MODE_SHIFT)
+#define ECR_nERRINTR            (1U << 4)
+#define ECR_DMAEN               (1U << 3)
+#define ECR_SERVINTR            (1U << 2)
+#define ECR_F_FULL              (1U << 1)
+#define ECR_F_EMPTY             (1U << 0)
+
+/*--- Private data -----------------------------------------------------*/
+
+/**
+ * enum parport_ip32_irq_mode - operation mode of interrupt handler
+ * @PARPORT_IP32_IRQ_FWD:       forward interrupt to the upper parport layer
+ * @PARPORT_IP32_IRQ_HERE:      interrupt is handled locally
+ */
+enum parport_ip32_irq_mode { PARPORT_IP32_IRQ_FWD, PARPORT_IP32_IRQ_HERE };
+
+/**
+ * struct parport_ip32_private - private stuff for &struct parport
+ * @regs:               register addresses
+ * @dcr_cache:          cached contents of DCR
+ * @dcr_writable:       bit mask of writable DCR bits
+ * @pword:              number of bytes per PWord
+ * @fifo_depth:         number of PWords that FIFO will hold
+ * @readIntrThreshold:  minimum number of PWords we can read
+ *                      if we get an interrupt
+ * @writeIntrThreshold: minimum number of PWords we can write
+ *                      if we get an interrupt
+ * @irq_mode:           operation mode of interrupt handler for this port
+ * @irq_complete:       mutex used to wait for an interrupt to occur
+ */
+struct parport_ip32_private {
+        struct parport_ip32_regs        regs;
+        unsigned int                    dcr_cache;
+        unsigned int                    dcr_writable;
+        unsigned int                    pword;
+        unsigned int                    fifo_depth;
+        unsigned int                    readIntrThreshold;
+        unsigned int                    writeIntrThreshold;
+        enum parport_ip32_irq_mode      irq_mode;
+        struct completion               irq_complete;
+};
+
+/*--- Debug code -------------------------------------------------------*/
+
+/*
+ * pr_debug1 - print debug messages
+ *
+ * This is like pr_debug(), but is defined for %DEBUG_PARPORT_IP32 >= 1
+ */
+#if DEBUG_PARPORT_IP32 >= 1
+#       define pr_debug1(...)   printk(KERN_DEBUG __VA_ARGS__)
+#else /* DEBUG_PARPORT_IP32 < 1 */
+#       define pr_debug1(...)   do { } while (0)
+#endif
+
+/*
+ * pr_trace, pr_trace1 - trace function calls
+ * @p:          pointer to &struct parport
+ * @fmt:        printk format string
+ * @...:        parameters for format string
+ *
+ * Macros used to trace function calls.  The given string is formatted after
+ * function name.  pr_trace() uses pr_debug(), and pr_trace1() uses
+ * pr_debug1().  __pr_trace() is the low-level macro and is not to be used
+ * directly.
+ */
+#define __pr_trace(pr, p, fmt, ...)                                     \
+        pr("%s: %s" fmt "\n",                                           \
+           ({ const struct parport *__p = (p);                          \
+                   __p ? __p->name : "parport_ip32"; }),                \
+           __func__ , ##__VA_ARGS__)
+#define pr_trace(p, fmt, ...)   __pr_trace(pr_debug, p, fmt , ##__VA_ARGS__)
+#define pr_trace1(p, fmt, ...)  __pr_trace(pr_debug1, p, fmt , ##__VA_ARGS__)
+
+/*
+ * __pr_probe, pr_probe - print message if @verbose_probing is true
+ * @p:          pointer to &struct parport
+ * @fmt:        printk format string
+ * @...:        parameters for format string
+ *
+ * For new lines, use pr_probe().  Use __pr_probe() for continued lines.
+ */
+#define __pr_probe(...)                                                 \
+        do { if (verbose_probing) printk(__VA_ARGS__); } while (0)
+#define pr_probe(p, fmt, ...)                                           \
+        __pr_probe(KERN_INFO PPIP32 "0x%lx: " fmt, (p)->base , ##__VA_ARGS__)
+
+/*
+ * parport_ip32_dump_state - print register status of parport
+ * @p:          pointer to &struct parport
+ * @str:        string to add in message
+ * @show_ecp_config:    shall we dump ECP configuration registers too?
+ *
+ * This function is only here for debugging purpose, and should be used with
+ * care.  Reading the parallel port registers may have undesired side effects.
+ * Especially if @show_ecp_config is true, the parallel port is resetted.
+ * This function is only defined if %DEBUG_PARPORT_IP32 >= 2.
+ */
+#if DEBUG_PARPORT_IP32 >= 2
+static void parport_ip32_dump_state(struct parport *p, char *str,
+                                    unsigned int show_ecp_config)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        unsigned int i;
+
+        printk(KERN_DEBUG PPIP32 "%s: state (%s):\n", p->name, str);
+        {
+                static const char ecr_modes[8][4] = {"SPP", "PS2", "PPF",
+                                                     "ECP", "EPP", "???",
+                                                     "TST", "CFG"};
+                unsigned int ecr = readb(priv->regs.ecr);
+                printk(KERN_DEBUG PPIP32 "    ecr=0x%02x", ecr);
+                printk(" %s",
+                       ecr_modes[(ecr & ECR_MODE_MASK) >> ECR_MODE_SHIFT]);
+                if (ecr & ECR_nERRINTR)
+                        printk(",nErrIntrEn");
+                if (ecr & ECR_DMAEN)
+                        printk(",dmaEn");
+                if (ecr & ECR_SERVINTR)
+                        printk(",serviceIntr");
+                if (ecr & ECR_F_FULL)
+                        printk(",f_full");
+                if (ecr & ECR_F_EMPTY)
+                        printk(",f_empty");
+                printk("\n");
+        }
+        if (show_ecp_config) {
+                unsigned int oecr, cnfgA, cnfgB;
+                oecr = readb(priv->regs.ecr);
+                writeb(ECR_MODE_PS2, priv->regs.ecr);
+                writeb(ECR_MODE_CFG, priv->regs.ecr);
+                cnfgA = readb(priv->regs.cnfgA);
+                cnfgB = readb(priv->regs.cnfgB);
+                writeb(ECR_MODE_PS2, priv->regs.ecr);
+                writeb(oecr, priv->regs.ecr);
+                printk(KERN_DEBUG PPIP32 "    cnfgA=0x%02x", cnfgA);
+                printk(" ISA-%s", (cnfgA & CNFGA_IRQ) ? "Level" : "Pulses");
+                switch (cnfgA & CNFGA_ID_MASK) {
+                case CNFGA_ID_8:
+                        printk(",8 bits");
+                        break;
+                case CNFGA_ID_16:
+                        printk(",16 bits");
+                        break;
+                case CNFGA_ID_32:
+                        printk(",32 bits");
+                        break;
+                default:
+                        printk(",unknown ID");
+                        break;
+                }
+                if (!(cnfgA & CNFGA_nBYTEINTRANS))
+                        printk(",ByteInTrans");
+                if ((cnfgA & CNFGA_ID_MASK) != CNFGA_ID_8)
+                        printk(",%d byte%s left", cnfgA & CNFGA_PWORDLEFT,
+                               ((cnfgA & CNFGA_PWORDLEFT) > 1) ? "s" : "");
+                printk("\n");
+                printk(KERN_DEBUG PPIP32 "    cnfgB=0x%02x", cnfgB);
+                printk(" irq=%u,dma=%u",
+                       (cnfgB & CNFGB_IRQ_MASK) >> CNFGB_IRQ_SHIFT,
+                       (cnfgB & CNFGB_DMA_MASK) >> CNFGB_DMA_SHIFT);
+                printk(",intrValue=%d", !!(cnfgB & CNFGB_INTRVAL));
+                if (cnfgB & CNFGB_COMPRESS)
+                        printk(",compress");
+                printk("\n");
+        }
+        for (i = 0; i < 2; i++) {
+                unsigned int dcr = i ? priv->dcr_cache : readb(priv->regs.dcr);
+                printk(KERN_DEBUG PPIP32 "    dcr(%s)=0x%02x",
+                       i ? "soft" : "hard", dcr);
+                printk(" %s", (dcr & DCR_DIR) ? "rev" : "fwd");
+                if (dcr & DCR_IRQ)
+                        printk(",ackIntEn");
+                if (!(dcr & DCR_SELECT))
+                        printk(",nSelectIn");
+                if (dcr & DCR_nINIT)
+                        printk(",nInit");
+                if (!(dcr & DCR_AUTOFD))
+                        printk(",nAutoFD");
+                if (!(dcr & DCR_STROBE))
+                        printk(",nStrobe");
+                printk("\n");
+        }
+#define sep (f++ ? ',' : ' ')
+        {
+                unsigned int f = 0;
+                unsigned int dsr = readb(priv->regs.dsr);
+                printk(KERN_DEBUG PPIP32 "    dsr=0x%02x", dsr);
+                if (!(dsr & DSR_nBUSY))
+                        printk("%cBusy", sep);
+                if (dsr & DSR_nACK)
+                        printk("%cnAck", sep);
+                if (dsr & DSR_PERROR)
+                        printk("%cPError", sep);
+                if (dsr & DSR_SELECT)
+                        printk("%cSelect", sep);
+                if (dsr & DSR_nFAULT)
+                        printk("%cnFault", sep);
+                if (!(dsr & DSR_nPRINT))
+                        printk("%c(Print)", sep);
+                if (dsr & DSR_TIMEOUT)
+                        printk("%cTimeout", sep);
+                printk("\n");
+        }
+#undef sep
+}
+#else /* DEBUG_PARPORT_IP32 < 2 */
+#define parport_ip32_dump_state(...)    do { } while (0)
+#endif
+
+/*
+ * CHECK_EXTRA_BITS - track and log extra bits
+ * @p:          pointer to &struct parport
+ * @b:          byte to inspect
+ * @m:          bit mask of authorized bits
+ *
+ * This is used to track and log extra bits that should not be there in
+ * parport_ip32_write_control() and parport_ip32_frob_control().  It is only
+ * defined if %DEBUG_PARPORT_IP32 >= 1.
+ */
+#if DEBUG_PARPORT_IP32 >= 1
+#define CHECK_EXTRA_BITS(p, b, m)                                       \
+        do {                                                            \
+                unsigned int __b = (b), __m = (m);                      \
+                if (__b & ~__m)                                         \
+                        pr_debug1(PPIP32 "%s: extra bits in %s(%s): "   \
+                                  "0x%02x/0x%02x\n",                    \
+                                  (p)->name, __func__, #b, __b, __m);   \
+        } while (0)
+#else /* DEBUG_PARPORT_IP32 < 1 */
+#define CHECK_EXTRA_BITS(...)   do { } while (0)
+#endif
+
+/*--- IP32 parallel port DMA operations --------------------------------*/
+
+/**
+ * struct parport_ip32_dma_data - private data needed for DMA operation
+ * @dir:        DMA direction (from or to device)
+ * @buf:        buffer physical address
+ * @len:        buffer length
+ * @next:       address of next bytes to DMA transfer
+ * @left:       number of bytes remaining
+ * @ctx:        next context to write (0: context_a; 1: context_b)
+ * @irq_on:     are the DMA IRQs currently enabled?
+ * @lock:       spinlock to protect access to the structure
+ */
+struct parport_ip32_dma_data {
+        enum dma_data_direction         dir;
+        dma_addr_t                      buf;
+        dma_addr_t                      next;
+        size_t                          len;
+        size_t                          left;
+        unsigned int                    ctx;
+        unsigned int                    irq_on;
+        spinlock_t                      lock;
+};
+static struct parport_ip32_dma_data parport_ip32_dma;
+
+/**
+ * parport_ip32_dma_setup_context - setup next DMA context
+ * @limit:      maximum data size for the context
+ *
+ * The alignment constraints must be verified in caller function, and the
+ * parameter @limit must be set accordingly.
+ */
+static void parport_ip32_dma_setup_context(unsigned int limit)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&parport_ip32_dma.lock, flags);
+        if (parport_ip32_dma.left > 0) {
+                /* Note: ctxreg is "volatile" here only because
+                 * mace->perif.ctrl.parport.context_a and context_b are
+                 * "volatile".  */
+                volatile u64 __iomem *ctxreg = (parport_ip32_dma.ctx == 0) ?
+                        &mace->perif.ctrl.parport.context_a :
+                        &mace->perif.ctrl.parport.context_b;
+                u64 count;
+                u64 ctxval;
+                if (parport_ip32_dma.left <= limit) {
+                        count = parport_ip32_dma.left;
+                        ctxval = MACEPAR_CONTEXT_LASTFLAG;
+                } else {
+                        count = limit;
+                        ctxval = 0;
+                }
+
+                pr_trace(NULL,
+                         "(%u): 0x%04x:0x%04x, %u -> %u%s",
+                         limit,
+                         (unsigned int)parport_ip32_dma.buf,
+                         (unsigned int)parport_ip32_dma.next,
+                         (unsigned int)count,
+                         parport_ip32_dma.ctx, ctxval ? "*" : "");
+
+                ctxval |= parport_ip32_dma.next &
+                        MACEPAR_CONTEXT_BASEADDR_MASK;
+                ctxval |= ((count - 1) << MACEPAR_CONTEXT_DATALEN_SHIFT) &
+                        MACEPAR_CONTEXT_DATALEN_MASK;
+                writeq(ctxval, ctxreg);
+                parport_ip32_dma.next += count;
+                parport_ip32_dma.left -= count;
+                parport_ip32_dma.ctx ^= 1U;
+        }
+        /* If there is nothing more to send, disable IRQs to avoid to
+         * face an IRQ storm which can lock the machine.  Disable them
+         * only once. */
+        if (parport_ip32_dma.left == 0 && parport_ip32_dma.irq_on) {
+                pr_debug(PPIP32 "IRQ off (ctx)\n");
+                disable_irq_nosync(MACEISA_PAR_CTXA_IRQ);
+                disable_irq_nosync(MACEISA_PAR_CTXB_IRQ);
+                parport_ip32_dma.irq_on = 0;
+        }
+        spin_unlock_irqrestore(&parport_ip32_dma.lock, flags);
+}
+
+/**
+ * parport_ip32_dma_interrupt - DMA interrupt handler
+ * @irq:        interrupt number
+ * @dev_id:     unused
+ * @regs:       pointer to &struct pt_regs
+ */
+static irqreturn_t parport_ip32_dma_interrupt(int irq, void *dev_id,
+                                              struct pt_regs *regs)
+{
+        if (parport_ip32_dma.left)
+                pr_trace(NULL, "(%d): ctx=%d", irq, parport_ip32_dma.ctx);
+        parport_ip32_dma_setup_context(MACEPAR_CONTEXT_DATA_BOUND);
+        return IRQ_HANDLED;
+}
+
+#if DEBUG_PARPORT_IP32
+static irqreturn_t parport_ip32_merr_interrupt(int irq, void *dev_id,
+                                               struct pt_regs *regs)
+{
+        pr_trace1(NULL, "(%d)", irq);
+        return IRQ_HANDLED;
+}
+#endif
+
+/**
+ * parport_ip32_dma_start - begins a DMA transfer
+ * @dir:        DMA direction: DMA_TO_DEVICE or DMA_FROM_DEVICE
+ * @addr:       pointer to data buffer
+ * @count:      buffer size
+ *
+ * Calls to parport_ip32_dma_start() and parport_ip32_dma_stop() must be
+ * correctly balanced.
+ */
+static int parport_ip32_dma_start(enum dma_data_direction dir,
+                                  void *addr, size_t count)
+{
+        unsigned int limit;
+        u64 ctrl;
+
+        pr_trace(NULL, "(%d, %lu)", dir, (unsigned long)count);
+
+        /* FIXME - add support for DMA_FROM_DEVICE.  In this case, buffer must
+         * be 64 bytes aligned. */
+        BUG_ON(dir != DMA_TO_DEVICE);
+
+        /* Reset DMA controller */
+        ctrl = MACEPAR_CTLSTAT_RESET;
+        writeq(ctrl, &mace->perif.ctrl.parport.cntlstat);
+
+        /* DMA IRQs should normally be enabled */
+        if (!parport_ip32_dma.irq_on) {
+                WARN_ON(1);
+                enable_irq(MACEISA_PAR_CTXA_IRQ);
+                enable_irq(MACEISA_PAR_CTXB_IRQ);
+                parport_ip32_dma.irq_on = 1;
+        }
+
+        /* Prepare DMA pointers */
+        parport_ip32_dma.dir = dir;
+        parport_ip32_dma.buf = dma_map_single(NULL, addr, count, dir);
+        parport_ip32_dma.len = count;
+        parport_ip32_dma.next = parport_ip32_dma.buf;
+        parport_ip32_dma.left = parport_ip32_dma.len;
+        parport_ip32_dma.ctx = 0;
+
+        /* Setup DMA direction and first two contexts */
+        ctrl = (dir == DMA_TO_DEVICE) ? 0 : MACEPAR_CTLSTAT_DIRECTION;
+        writeq(ctrl, &mace->perif.ctrl.parport.cntlstat);
+        /* Single transfer should not cross a 4K page boundary */
+        limit = MACEPAR_CONTEXT_DATA_BOUND -
+                (parport_ip32_dma.next & (MACEPAR_CONTEXT_DATA_BOUND - 1));
+        parport_ip32_dma_setup_context(limit);
+        parport_ip32_dma_setup_context(MACEPAR_CONTEXT_DATA_BOUND);
+
+        /* Real start of DMA transfer */
+        ctrl |= MACEPAR_CTLSTAT_ENABLE;
+        writeq(ctrl, &mace->perif.ctrl.parport.cntlstat);
+
+        return 0;
+}
+
+/**
+ * parport_ip32_dma_stop - ends a running DMA transfer
+ *
+ * Calls to parport_ip32_dma_start() and parport_ip32_dma_stop() must be
+ * correctly balanced.
+ */
+static void parport_ip32_dma_stop(void)
+{
+        u64 ctx_a;
+        u64 ctx_b;
+        u64 ctrl;
+        u64 diag;
+        size_t res[2];  /* {[0] = res_a, [1] = res_b} */
+
+        pr_trace(NULL, "()");
+
+        /* Disable IRQs */
+        spin_lock_irq(&parport_ip32_dma.lock);
+        if (parport_ip32_dma.irq_on) {
+                pr_debug(PPIP32 "IRQ off (stop)\n");
+                disable_irq_nosync(MACEISA_PAR_CTXA_IRQ);
+                disable_irq_nosync(MACEISA_PAR_CTXB_IRQ);
+                parport_ip32_dma.irq_on = 0;
+        }
+        spin_unlock_irq(&parport_ip32_dma.lock);
+        /* Force IRQ synchronization, even if the IRQs were disabled
+         * elsewhere. */
+        synchronize_irq(MACEISA_PAR_CTXA_IRQ);
+        synchronize_irq(MACEISA_PAR_CTXB_IRQ);
+
+        /* Stop DMA transfer */
+        ctrl = readq(&mace->perif.ctrl.parport.cntlstat);
+        ctrl &= ~MACEPAR_CTLSTAT_ENABLE;
+        writeq(ctrl, &mace->perif.ctrl.parport.cntlstat);
+
+        /* Adjust residue (parport_ip32_dma.left) */
+        ctx_a = readq(&mace->perif.ctrl.parport.context_a);
+        ctx_b = readq(&mace->perif.ctrl.parport.context_b);
+        ctrl = readq(&mace->perif.ctrl.parport.cntlstat);
+        diag = readq(&mace->perif.ctrl.parport.diagnostic);
+        res[0] = (ctrl & MACEPAR_CTLSTAT_CTXA_VALID) ?
+                1 + ((ctx_a & MACEPAR_CONTEXT_DATALEN_MASK) >>
+                     MACEPAR_CONTEXT_DATALEN_SHIFT) :
+                0;
+        res[1] = (ctrl & MACEPAR_CTLSTAT_CTXB_VALID) ?
+                1 + ((ctx_b & MACEPAR_CONTEXT_DATALEN_MASK) >>
+                     MACEPAR_CONTEXT_DATALEN_SHIFT) :
+                0;
+        if (diag & MACEPAR_DIAG_DMACTIVE)
+                res[(diag & MACEPAR_DIAG_CTXINUSE) != 0] =
+                        1 + ((diag & MACEPAR_DIAG_CTRMASK) >>
+                             MACEPAR_DIAG_CTRSHIFT);
+        parport_ip32_dma.left += res[0] + res[1];
+
+        /* Reset DMA controller, and re-enable IRQs */
+        ctrl = MACEPAR_CTLSTAT_RESET;
+        writeq(ctrl, &mace->perif.ctrl.parport.cntlstat);
+        pr_debug(PPIP32 "IRQ on (stop)\n");
+        enable_irq(MACEISA_PAR_CTXA_IRQ);
+        enable_irq(MACEISA_PAR_CTXB_IRQ);
+        parport_ip32_dma.irq_on = 1;
+
+        dma_unmap_single(NULL, parport_ip32_dma.buf, parport_ip32_dma.len,
+                         parport_ip32_dma.dir);
+}
+
+/**
+ * parport_ip32_dma_get_residue - get residue from last DMA transfer
+ *
+ * Returns the number of bytes remaining from last DMA transfer.
+ */
+static inline size_t parport_ip32_dma_get_residue(void)
+{
+        return parport_ip32_dma.left;
+}
+
+/**
+ * parport_ip32_dma_register - initialize DMA engine
+ *
+ * Returns zero for success.
+ */
+static int parport_ip32_dma_register(void)
+{
+        int err;
+
+        spin_lock_init(&parport_ip32_dma.lock);
+        parport_ip32_dma.irq_on = 1;
+
+        /* Reset DMA controller */
+        writeq(MACEPAR_CTLSTAT_RESET, &mace->perif.ctrl.parport.cntlstat);
+
+        /* Request IRQs */
+        err = request_irq(MACEISA_PAR_CTXA_IRQ, parport_ip32_dma_interrupt,
+                          0, "parport_ip32", NULL);
+        if (err)
+                goto fail_a;
+        err = request_irq(MACEISA_PAR_CTXB_IRQ, parport_ip32_dma_interrupt,
+                          0, "parport_ip32", NULL);
+        if (err)
+                goto fail_b;
+#if DEBUG_PARPORT_IP32
+        /* FIXME - what is this IRQ for? */
+        err = request_irq(MACEISA_PAR_MERR_IRQ, parport_ip32_merr_interrupt,
+                          0, "parport_ip32", NULL);
+        if (err)
+                goto fail_merr;
+#endif
+        return 0;
+
+#if DEBUG_PARPORT_IP32
+fail_merr:
+        free_irq(MACEISA_PAR_CTXB_IRQ, NULL);
+#endif
+fail_b:
+        free_irq(MACEISA_PAR_CTXA_IRQ, NULL);
+fail_a:
+        return err;
+}
+
+/**
+ * parport_ip32_dma_unregister - release and free resources for DMA engine
+ */
+static void parport_ip32_dma_unregister(void)
+{
+#if DEBUG_PARPORT_IP32
+        free_irq(MACEISA_PAR_MERR_IRQ, NULL);
+#endif
+        free_irq(MACEISA_PAR_CTXB_IRQ, NULL);
+        free_irq(MACEISA_PAR_CTXA_IRQ, NULL);
+}
+
+/*--- Interrupt handlers and associates --------------------------------*/
+
+/**
+ * parport_ip32_wakeup - wakes up code waiting for an interrupt
+ * @p:          pointer to &struct parport
+ */
+static inline void parport_ip32_wakeup(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        complete(&priv->irq_complete);
+}
+
+/**
+ * parport_ip32_interrupt - interrupt handler
+ * @irq:        interrupt number
+ * @dev_id:     pointer to &struct parport
+ * @regs:       pointer to &struct pt_regs
+ *
+ * Caught interrupts are forwarded to the upper parport layer if IRQ_mode is
+ * %PARPORT_IP32_IRQ_FWD.
+ */
+static irqreturn_t parport_ip32_interrupt(int irq, void *dev_id,
+                                          struct pt_regs *regs)
+{
+        struct parport * const p = dev_id;
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        enum parport_ip32_irq_mode irq_mode = priv->irq_mode;
+        switch (irq_mode) {
+        case PARPORT_IP32_IRQ_FWD:
+                parport_generic_irq(irq, p, regs);
+                break;
+        case PARPORT_IP32_IRQ_HERE:
+                parport_ip32_wakeup(p);
+                break;
+        }
+        return IRQ_HANDLED;
+}
+
+/*--- Some utility function to manipulate ECR register -----------------*/
+
+/**
+ * parport_ip32_read_econtrol - read contents of the ECR register
+ * @p:          pointer to &struct parport
+ */
+static inline unsigned int parport_ip32_read_econtrol(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return readb(priv->regs.ecr);
+}
+
+/**
+ * parport_ip32_write_econtrol - write new contents to the ECR register
+ * @p:          pointer to &struct parport
+ * @c:          new value to write
+ */
+static inline void parport_ip32_write_econtrol(struct parport *p,
+                                               unsigned int c)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        writeb(c, priv->regs.ecr);
+}
+
+/**
+ * parport_ip32_frob_econtrol - change bits from the ECR register
+ * @p:          pointer to &struct parport
+ * @mask:       bit mask of bits to change
+ * @val:        new value for changed bits
+ *
+ * Read from the ECR, mask out the bits in @mask, exclusive-or with the bits
+ * in @val, and write the result to the ECR.
+ */
+static inline void parport_ip32_frob_econtrol(struct parport *p,
+                                              unsigned int mask,
+                                              unsigned int val)
+{
+        unsigned int c;
+        c = (parport_ip32_read_econtrol(p) & ~mask) ^ val;
+        parport_ip32_write_econtrol(p, c);
+}
+
+/**
+ * parport_ip32_set_mode - change mode of ECP port
+ * @p:          pointer to &struct parport
+ * @mode:       new mode to write in ECR
+ *
+ * ECR is reset in a sane state (interrupts and DMA disabled), and placed in
+ * mode @mode.  Go through PS2 mode if needed.
+ */
+static void parport_ip32_set_mode(struct parport *p, unsigned int mode)
+{
+        unsigned int omode;
+
+        mode &= ECR_MODE_MASK;
+        omode = parport_ip32_read_econtrol(p) & ECR_MODE_MASK;
+
+        if (!(mode == ECR_MODE_SPP || mode == ECR_MODE_PS2
+              || omode == ECR_MODE_SPP || omode == ECR_MODE_PS2)) {
+                /* We have to go through PS2 mode */
+                unsigned int ecr = ECR_MODE_PS2 | ECR_nERRINTR | ECR_SERVINTR;
+                parport_ip32_write_econtrol(p, ecr);
+        }
+        parport_ip32_write_econtrol(p, mode | ECR_nERRINTR | ECR_SERVINTR);
+}
+
+/*--- Basic functions needed for parport -------------------------------*/
+
+/**
+ * parport_ip32_read_data - return current contents of the DATA register
+ * @p:          pointer to &struct parport
+ */
+static inline unsigned char parport_ip32_read_data(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return readb(priv->regs.data);
+}
+
+/**
+ * parport_ip32_write_data - set new contents for the DATA register
+ * @p:          pointer to &struct parport
+ * @d:          new value to write
+ */
+static inline void parport_ip32_write_data(struct parport *p, unsigned char d)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        writeb(d, priv->regs.data);
+}
+
+/**
+ * parport_ip32_read_status - return current contents of the DSR register
+ * @p:          pointer to &struct parport
+ */
+static inline unsigned char parport_ip32_read_status(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return readb(priv->regs.dsr);
+}
+
+/**
+ * __parport_ip32_read_control - return cached contents of the DCR register
+ * @p:          pointer to &struct parport
+ */
+static inline unsigned int __parport_ip32_read_control(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return priv->dcr_cache; /* use soft copy */
+}
+
+/**
+ * __parport_ip32_write_control - set new contents for the DCR register
+ * @p:          pointer to &struct parport
+ * @c:          new value to write
+ */
+static inline void __parport_ip32_write_control(struct parport *p,
+                                                unsigned int c)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        CHECK_EXTRA_BITS(p, c, priv->dcr_writable);
+        c &= priv->dcr_writable; /* only writable bits */
+        writeb(c, priv->regs.dcr);
+        priv->dcr_cache = c;            /* update soft copy */
+}
+
+/**
+ * __parport_ip32_frob_control - change bits from the DCR register
+ * @p:          pointer to &struct parport
+ * @mask:       bit mask of bits to change
+ * @val:        new value for changed bits
+ *
+ * This is equivalent to read from the DCR, mask out the bits in @mask,
+ * exclusive-or with the bits in @val, and write the result to the DCR.
+ * Actually, the cached contents of the DCR is used.
+ */
+static inline void __parport_ip32_frob_control(struct parport *p,
+                                               unsigned int mask,
+                                               unsigned int val)
+{
+        unsigned int c;
+        c = (__parport_ip32_read_control(p) & ~mask) ^ val;
+        __parport_ip32_write_control(p, c);
+}
+
+/**
+ * parport_ip32_read_control - return cached contents of the DCR register
+ * @p:          pointer to &struct parport
+ *
+ * The return value is masked so as to only return the value of %DCR_STROBE,
+ * %DCR_AUTOFD, %DCR_nINIT, and %DCR_SELECT.
+ */
+static inline unsigned char parport_ip32_read_control(struct parport *p)
+{
+        const unsigned int rm =
+                DCR_STROBE | DCR_AUTOFD | DCR_nINIT | DCR_SELECT;
+        return __parport_ip32_read_control(p) & rm;
+}
+
+/**
+ * parport_ip32_write_control - set new contents for the DCR register
+ * @p:          pointer to &struct parport
+ * @c:          new value to write
+ *
+ * The value is masked so as to only change the value of %DCR_STROBE,
+ * %DCR_AUTOFD, %DCR_nINIT, and %DCR_SELECT.
+ */
+static inline void parport_ip32_write_control(struct parport *p,
+                                              unsigned char c)
+{
+        const unsigned int wm =
+                DCR_STROBE | DCR_AUTOFD | DCR_nINIT | DCR_SELECT;
+        CHECK_EXTRA_BITS(p, c, wm);
+        __parport_ip32_frob_control(p, wm, c & wm);
+}
+
+/**
+ * parport_ip32_frob_control - change bits from the DCR register
+ * @p:          pointer to &struct parport
+ * @mask:       bit mask of bits to change
+ * @val:        new value for changed bits
+ *
+ * This differs from __parport_ip32_frob_control() in that it only allows to
+ * change the value of %DCR_STROBE, %DCR_AUTOFD, %DCR_nINIT, and %DCR_SELECT.
+ */
+static inline unsigned char parport_ip32_frob_control(struct parport *p,
+                                                      unsigned char mask,
+                                                      unsigned char val)
+{
+        const unsigned int wm =
+                DCR_STROBE | DCR_AUTOFD | DCR_nINIT | DCR_SELECT;
+        CHECK_EXTRA_BITS(p, mask, wm);
+        CHECK_EXTRA_BITS(p, val, wm);
+        __parport_ip32_frob_control(p, mask & wm, val & wm);
+        return parport_ip32_read_control(p);
+}
+
+/**
+ * parport_ip32_disable_irq - disable interrupts on the rising edge of nACK
+ * @p:          pointer to &struct parport
+ */
+static inline void parport_ip32_disable_irq(struct parport *p)
+{
+        __parport_ip32_frob_control(p, DCR_IRQ, 0);
+}
+
+/**
+ * parport_ip32_enable_irq - enable interrupts on the rising edge of nACK
+ * @p:          pointer to &struct parport
+ */
+static inline void parport_ip32_enable_irq(struct parport *p)
+{
+        __parport_ip32_frob_control(p, DCR_IRQ, DCR_IRQ);
+}
+
+/**
+ * parport_ip32_data_forward - enable host-to-peripheral communications
+ * @p:          pointer to &struct parport
+ *
+ * Enable the data line drivers, for 8-bit host-to-peripheral communications.
+ */
+static inline void parport_ip32_data_forward(struct parport *p)
+{
+        __parport_ip32_frob_control(p, DCR_DIR, 0);
+}
+
+/**
+ * parport_ip32_data_reverse - enable peripheral-to-host communications
+ * @p:          pointer to &struct parport
+ *
+ * Place the data bus in a high impedance state, if @p->modes has the
+ * PARPORT_MODE_TRISTATE bit set.
+ */
+static inline void parport_ip32_data_reverse(struct parport *p)
+{
+        __parport_ip32_frob_control(p, DCR_DIR, DCR_DIR);
+}
+
+/**
+ * parport_ip32_init_state - for core parport code
+ * @dev:        pointer to &struct pardevice
+ * @s:          pointer to &struct parport_state to initialize
+ */
+static void parport_ip32_init_state(struct pardevice *dev,
+                                    struct parport_state *s)
+{
+        s->u.ip32.dcr = DCR_SELECT | DCR_nINIT;
+        s->u.ip32.ecr = ECR_MODE_PS2 | ECR_nERRINTR | ECR_SERVINTR;
+}
+
+/**
+ * parport_ip32_save_state - for core parport code
+ * @p:          pointer to &struct parport
+ * @s:          pointer to &struct parport_state to save state to
+ */
+static void parport_ip32_save_state(struct parport *p,
+                                    struct parport_state *s)
+{
+        s->u.ip32.dcr = __parport_ip32_read_control(p);
+        s->u.ip32.ecr = parport_ip32_read_econtrol(p);
+}
+
+/**
+ * parport_ip32_restore_state - for core parport code
+ * @p:          pointer to &struct parport
+ * @s:          pointer to &struct parport_state to restore state from
+ */
+static void parport_ip32_restore_state(struct parport *p,
+                                       struct parport_state *s)
+{
+        parport_ip32_set_mode(p, s->u.ip32.ecr & ECR_MODE_MASK);
+        parport_ip32_write_econtrol(p, s->u.ip32.ecr);
+        __parport_ip32_write_control(p, s->u.ip32.dcr);
+}
+
+/*--- EPP mode functions -----------------------------------------------*/
+
+/**
+ * parport_ip32_clear_epp_timeout - clear Timeout bit in EPP mode
+ * @p:          pointer to &struct parport
+ *
+ * Returns 1 if the Timeout bit is clear, and 0 otherwise.
+ */
+static unsigned int parport_ip32_clear_epp_timeout(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        unsigned int cleared;
+
+        if (!(parport_ip32_read_status(p) & DSR_TIMEOUT))
+                cleared = 1;
+        else {
+                unsigned int r;
+                /* To clear timeout some chips require double read */
+                parport_ip32_read_status(p);
+                r = parport_ip32_read_status(p);
+                /* Some reset by writing 1 */
+                writeb(r | DSR_TIMEOUT, priv->regs.dsr);
+                /* Others by writing 0 */
+                writeb(r & ~DSR_TIMEOUT, priv->regs.dsr);
+
+                r = parport_ip32_read_status(p);
+                cleared = !(r & DSR_TIMEOUT);
+        }
+
+        pr_trace(p, "(): %s", cleared ? "cleared" : "failed");
+        return cleared;
+}
+
+/**
+ * parport_ip32_epp_read - generic EPP read function
+ * @eppreg:     I/O register to read from
+ * @p:          pointer to &struct parport
+ * @buf:        buffer to store read data
+ * @len:        length of buffer @buf
+ * @flags:      may be PARPORT_EPP_FAST
+ */
+static size_t parport_ip32_epp_read(void __iomem *eppreg,
+                                    struct parport *p, void *buf,
+                                    size_t len, int flags)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        size_t got;
+        parport_ip32_set_mode(p, ECR_MODE_EPP);
+        parport_ip32_data_reverse(p);
+        parport_ip32_write_control(p, DCR_nINIT);
+        if ((flags & PARPORT_EPP_FAST) && (len > 1)) {
+                readsb(eppreg, buf, len);
+                if (readb(priv->regs.dsr) & DSR_TIMEOUT) {
+                        parport_ip32_clear_epp_timeout(p);
+                        return -EIO;
+                }
+                got = len;
+        } else {
+                u8 *bufp = buf;
+                for (got = 0; got < len; got++) {
+                        *bufp++ = readb(eppreg);
+                        if (readb(priv->regs.dsr) & DSR_TIMEOUT) {
+                                parport_ip32_clear_epp_timeout(p);
+                                break;
+                        }
+                }
+        }
+        parport_ip32_data_forward(p);
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        return got;
+}
+
+/**
+ * parport_ip32_epp_write - generic EPP write function
+ * @eppreg:     I/O register to write to
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ * @flags:      may be PARPORT_EPP_FAST
+ */
+static size_t parport_ip32_epp_write(void __iomem *eppreg,
+                                     struct parport *p, const void *buf,
+                                     size_t len, int flags)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        size_t written;
+        parport_ip32_set_mode(p, ECR_MODE_EPP);
+        parport_ip32_data_forward(p);
+        parport_ip32_write_control(p, DCR_nINIT);
+        if ((flags & PARPORT_EPP_FAST) && (len > 1)) {
+                writesb(eppreg, buf, len);
+                if (readb(priv->regs.dsr) & DSR_TIMEOUT) {
+                        parport_ip32_clear_epp_timeout(p);
+                        return -EIO;
+                }
+                written = len;
+        } else {
+                const u8 *bufp = buf;
+                for (written = 0; written < len; written++) {
+                        writeb(*bufp++, eppreg);
+                        if (readb(priv->regs.dsr) & DSR_TIMEOUT) {
+                                parport_ip32_clear_epp_timeout(p);
+                                break;
+                        }
+                }
+        }
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        return written;
+}
+
+/**
+ * parport_ip32_epp_read_data - read a block of data in EPP mode
+ * @p:          pointer to &struct parport
+ * @buf:        buffer to store read data
+ * @len:        length of buffer @buf
+ * @flags:      may be PARPORT_EPP_FAST
+ */
+static size_t parport_ip32_epp_read_data(struct parport *p, void *buf,
+                                         size_t len, int flags)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return parport_ip32_epp_read(priv->regs.eppData0, p, buf, len, flags);
+}
+
+/**
+ * parport_ip32_epp_write_data - write a block of data in EPP mode
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ * @flags:      may be PARPORT_EPP_FAST
+ */
+static size_t parport_ip32_epp_write_data(struct parport *p, const void *buf,
+                                          size_t len, int flags)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return parport_ip32_epp_write(priv->regs.eppData0, p, buf, len, flags);
+}
+
+/**
+ * parport_ip32_epp_read_addr - read a block of addresses in EPP mode
+ * @p:          pointer to &struct parport
+ * @buf:        buffer to store read data
+ * @len:        length of buffer @buf
+ * @flags:      may be PARPORT_EPP_FAST
+ */
+static size_t parport_ip32_epp_read_addr(struct parport *p, void *buf,
+                                         size_t len, int flags)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return parport_ip32_epp_read(priv->regs.eppAddr, p, buf, len, flags);
+}
+
+/**
+ * parport_ip32_epp_write_addr - write a block of addresses in EPP mode
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ * @flags:      may be PARPORT_EPP_FAST
+ */
+static size_t parport_ip32_epp_write_addr(struct parport *p, const void *buf,
+                                          size_t len, int flags)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        return parport_ip32_epp_write(priv->regs.eppAddr, p, buf, len, flags);
+}
+
+/*--- ECP mode functions (FIFO) ----------------------------------------*/
+
+/**
+ * parport_ip32_fifo_wait_break - check if the waiting function should return
+ * @p:          pointer to &struct parport
+ * @expire:     timeout expiring date, in jiffies
+ *
+ * parport_ip32_fifo_wait_break() checks if the waiting function should return
+ * immediately or not.  The break conditions are:
+ *      - expired timeout;
+ *      - a pending signal;
+ *      - nFault asserted low.
+ * This function also calls cond_resched().
+ */
+static unsigned int parport_ip32_fifo_wait_break(struct parport *p,
+                                                 unsigned long expire)
+{
+        cond_resched();
+        if (time_after(jiffies, expire)) {
+                pr_debug1(PPIP32 "%s: FIFO write timed out\n", p->name);
+                return 1;
+        }
+        if (signal_pending(current)) {
+                pr_debug1(PPIP32 "%s: Signal pending\n", p->name);
+                return 1;
+        }
+        if (!(parport_ip32_read_status(p) & DSR_nFAULT)) {
+                pr_debug1(PPIP32 "%s: nFault asserted low\n", p->name);
+                return 1;
+        }
+        return 0;
+}
+
+/**
+ * parport_ip32_fwp_wait_polling - wait for FIFO to empty (polling)
+ * @p:          pointer to &struct parport
+ *
+ * Returns the number of bytes that can safely be written in the FIFO.  A
+ * return value of zero means that the calling function should terminate as
+ * fast as possible.
+ */
+static unsigned int parport_ip32_fwp_wait_polling(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        struct parport * const physport = p->physport;
+        unsigned long expire;
+        unsigned int count;
+        unsigned int ecr;
+
+        expire = jiffies + physport->cad->timeout;
+        count = 0;
+        while (1) {
+                if (parport_ip32_fifo_wait_break(p, expire))
+                        break;
+
+                /* Check FIFO state.  We do nothing when the FIFO is nor full,
+                 * nor empty.  It appears that the FIFO full bit is not always
+                 * reliable, the FIFO state is sometimes wrongly reported, and
+                 * the chip gets confused if we give it another byte. */
+                ecr = parport_ip32_read_econtrol(p);
+                if (ecr & ECR_F_EMPTY) {
+                        /* FIFO is empty, fill it up */
+                        count = priv->fifo_depth;
+                        break;
+                }
+
+                /* Wait a moment... */
+                udelay(FIFO_POLLING_INTERVAL);
+        } /* while (1) */
+
+        return count;
+}
+
+/**
+ * parport_ip32_fwp_wait_interrupt - wait for FIFO to empty (interrupt-driven)
+ * @p:          pointer to &struct parport
+ *
+ * Returns the number of bytes that can safely be written in the FIFO.  A
+ * return value of zero means that the calling function should terminate as
+ * fast as possible.
+ */
+static unsigned int parport_ip32_fwp_wait_interrupt(struct parport *p)
+{
+        static unsigned int lost_interrupt = 0;
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        struct parport * const physport = p->physport;
+        unsigned long nfault_timeout;
+        unsigned long expire;
+        unsigned int count;
+        unsigned int ecr;
+
+        nfault_timeout = min((unsigned long)physport->cad->timeout,
+                             msecs_to_jiffies(FIFO_NFAULT_TIMEOUT));
+        expire = jiffies + physport->cad->timeout;
+        count = 0;
+        while (1) {
+                if (parport_ip32_fifo_wait_break(p, expire))
+                        break;
+
+                /* Initialize mutex used to take interrupts into account */
+                INIT_COMPLETION(priv->irq_complete);
+
+                /* Enable serviceIntr */
+                parport_ip32_frob_econtrol(p, ECR_SERVINTR, 0);
+
+                /* Enabling serviceIntr while the FIFO is empty does not
+                 * always generate an interrupt, so check for emptiness
+                 * now. */
+                ecr = parport_ip32_read_econtrol(p);
+                if (!(ecr & ECR_F_EMPTY)) {
+                        /* FIFO is not empty: wait for an interrupt or a
+                         * timeout to occur */
+                        wait_for_completion_interruptible_timeout(
+                                &priv->irq_complete, nfault_timeout);
+                        ecr = parport_ip32_read_econtrol(p);
+                        if ((ecr & ECR_F_EMPTY) && !(ecr & ECR_SERVINTR)
+                            && !lost_interrupt) {
+                                printk(KERN_WARNING PPIP32
+                                       "%s: lost interrupt in %s\n",
+                                       p->name, __func__);
+                                lost_interrupt = 1;
+                        }
+                }
+
+                /* Disable serviceIntr */
+                parport_ip32_frob_econtrol(p, ECR_SERVINTR, ECR_SERVINTR);
+
+                /* Check FIFO state */
+                if (ecr & ECR_F_EMPTY) {
+                        /* FIFO is empty, fill it up */
+                        count = priv->fifo_depth;
+                        break;
+                } else if (ecr & ECR_SERVINTR) {
+                        /* FIFO is not empty, but we know that can safely push
+                         * writeIntrThreshold bytes into it */
+                        count = priv->writeIntrThreshold;
+                        break;
+                }
+                /* FIFO is not empty, and we did not get any interrupt.
+                 * Either it's time to check for nFault, or a signal is
+                 * pending.  This is verified in
+                 * parport_ip32_fifo_wait_break(), so we continue the loop. */
+        } /* while (1) */
+
+        return count;
+}
+
+/**
+ * parport_ip32_fifo_write_block_pio - write a block of data (PIO mode)
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ *
+ * Uses PIO to write the contents of the buffer @buf into the parallel port
+ * FIFO.  Returns the number of bytes that were actually written.  It can work
+ * with or without the help of interrupts.  The parallel port must be
+ * correctly initialized before calling parport_ip32_fifo_write_block_pio().
+ */
+static size_t parport_ip32_fifo_write_block_pio(struct parport *p,
+                                                const void *buf, size_t len)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        const u8 *bufp = buf;
+        size_t left = len;
+
+        priv->irq_mode = PARPORT_IP32_IRQ_HERE;
+
+        while (left > 0) {
+                unsigned int count;
+
+                count = (p->irq == PARPORT_IRQ_NONE) ?
+                        parport_ip32_fwp_wait_polling(p) :
+                        parport_ip32_fwp_wait_interrupt(p);
+                if (count == 0)
+                        break;  /* Transmission should be stopped */
+                if (count > left)
+                        count = left;
+                if (count == 1) {
+                        writeb(*bufp, priv->regs.fifo);
+                        bufp++, left--;
+                } else {
+                        writesb(priv->regs.fifo, bufp, count);
+                        bufp += count, left -= count;
+                }
+        }
+
+        priv->irq_mode = PARPORT_IP32_IRQ_FWD;
+
+        return len - left;
+}
+
+/**
+ * parport_ip32_fifo_write_block_dma - write a block of data (DMA mode)
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ *
+ * Uses DMA to write the contents of the buffer @buf into the parallel port
+ * FIFO.  Returns the number of bytes that were actually written.  The
+ * parallel port must be correctly initialized before calling
+ * parport_ip32_fifo_write_block_dma().
+ */
+static size_t parport_ip32_fifo_write_block_dma(struct parport *p,
+                                                const void *buf, size_t len)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        struct parport * const physport = p->physport;
+        unsigned long nfault_timeout;
+        unsigned long expire;
+        size_t written;
+        unsigned int ecr;
+
+        priv->irq_mode = PARPORT_IP32_IRQ_HERE;
+
+        parport_ip32_dma_start(DMA_TO_DEVICE, (void *)buf, len);
+        INIT_COMPLETION(priv->irq_complete);
+        parport_ip32_frob_econtrol(p, ECR_DMAEN | ECR_SERVINTR, ECR_DMAEN);
+
+        nfault_timeout = min((unsigned long)physport->cad->timeout,
+                             msecs_to_jiffies(FIFO_NFAULT_TIMEOUT));
+        expire = jiffies + physport->cad->timeout;
+        while (1) {
+                if (parport_ip32_fifo_wait_break(p, expire))
+                        break;
+                wait_for_completion_interruptible_timeout(&priv->irq_complete,
+                                                          nfault_timeout);
+                ecr = parport_ip32_read_econtrol(p);
+                if (ecr & ECR_SERVINTR)
+                        break;  /* DMA transfer just finished */
+        }
+        parport_ip32_dma_stop();
+        written = len - parport_ip32_dma_get_residue();
+
+        priv->irq_mode = PARPORT_IP32_IRQ_FWD;
+
+        return written;
+}
+
+/**
+ * parport_ip32_fifo_write_block - write a block of data
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ *
+ * Uses PIO or DMA to write the contents of the buffer @buf into the parallel
+ * p FIFO.  Returns the number of bytes that were actually written.
+ */
+static size_t parport_ip32_fifo_write_block(struct parport *p,
+                                            const void *buf, size_t len)
+{
+        size_t written = 0;
+        if (len)
+                /* FIXME - Maybe some threshold value should be set for @len
+                 * under which we revert to PIO mode? */
+                written = (p->modes & PARPORT_MODE_DMA) ?
+                        parport_ip32_fifo_write_block_dma(p, buf, len) :
+                        parport_ip32_fifo_write_block_pio(p, buf, len);
+        return written;
+}
+
+/**
+ * parport_ip32_drain_fifo - wait for FIFO to empty
+ * @p:          pointer to &struct parport
+ * @timeout:    timeout, in jiffies
+ *
+ * This function waits for FIFO to empty.  It returns 1 when FIFO is empty, or
+ * 0 if the timeout @timeout is reached before, or if a signal is pending.
+ */
+static unsigned int parport_ip32_drain_fifo(struct parport *p,
+                                            unsigned long timeout)
+{
+        unsigned long expire = jiffies + timeout;
+        unsigned int polling_interval;
+        unsigned int counter;
+
+        /* Busy wait for approx. 200us */
+        for (counter = 0; counter < 40; counter++) {
+                if (parport_ip32_read_econtrol(p) & ECR_F_EMPTY)
+                        break;
+                if (time_after(jiffies, expire))
+                        break;
+                if (signal_pending(current))
+                        break;
+                udelay(5);
+        }
+        /* Poll slowly.  Polling interval starts with 1 millisecond, and is
+         * increased exponentially until 128.  */
+        polling_interval = 1; /* msecs */
+        while (!(parport_ip32_read_econtrol(p) & ECR_F_EMPTY)) {
+                if (time_after_eq(jiffies, expire))
+                        break;
+                msleep_interruptible(polling_interval);
+                if (signal_pending(current))
+                        break;
+                if (polling_interval < 128)
+                        polling_interval *= 2;
+        }
+
+        return !!(parport_ip32_read_econtrol(p) & ECR_F_EMPTY);
+}
+
+/**
+ * parport_ip32_get_fifo_residue - reset FIFO
+ * @p:          pointer to &struct parport
+ * @mode:       current operation mode (ECR_MODE_PPF or ECR_MODE_ECP)
+ *
+ * This function resets FIFO, and returns the number of bytes remaining in it.
+ */
+static unsigned int parport_ip32_get_fifo_residue(struct parport *p,
+                                                  unsigned int mode)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        unsigned int residue;
+        unsigned int cnfga;
+
+        /* FIXME - We are missing one byte if the printer is off-line.  I
+         * don't know how to detect this.  It looks that the full bit is not
+         * always reliable.  For the moment, the problem is avoided in most
+         * cases by testing for BUSY in parport_ip32_compat_write_data().
+         */
+        if (parport_ip32_read_econtrol(p) & ECR_F_EMPTY)
+                residue = 0;
+        else {
+                pr_debug1(PPIP32 "%s: FIFO is stuck\n", p->name);
+
+                /* Stop all transfers.
+                 *
+                 * Microsoft's document instructs to drive DCR_STROBE to 0,
+                 * but it doesn't work (at least in Compatibility mode, not
+                 * tested in ECP mode).  Switching directly to Test mode (as
+                 * in parport_pc) is not an option: it does confuse the port,
+                 * ECP service interrupts are no more working after that.  A
+                 * hard reset is then needed to revert to a sane state.
+                 *
+                 * Let's hope that the FIFO is really stuck and that the
+                 * peripheral doesn't wake up now.
+                 */
+                parport_ip32_frob_control(p, DCR_STROBE, 0);
+
+                /* Fill up FIFO */
+                for (residue = priv->fifo_depth; residue > 0; residue--) {
+                        if (parport_ip32_read_econtrol(p) & ECR_F_FULL)
+                                break;
+                        writeb(0x00, priv->regs.fifo);
+                }
+        }
+        if (residue)
+                pr_debug1(PPIP32 "%s: %d PWord%s left in FIFO\n",
+                          p->name, residue,
+                          (residue == 1) ? " was" : "s were");
+
+        /* Now reset the FIFO */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+
+        /* Host recovery for ECP mode */
+        if (mode == ECR_MODE_ECP) {
+                parport_ip32_data_reverse(p);
+                parport_ip32_frob_control(p, DCR_nINIT, 0);
+                if (parport_wait_peripheral(p, DSR_PERROR, 0))
+                        pr_debug1(PPIP32 "%s: PEerror timeout 1 in %s\n",
+                                  p->name, __func__);
+                parport_ip32_frob_control(p, DCR_STROBE, DCR_STROBE);
+                parport_ip32_frob_control(p, DCR_nINIT, DCR_nINIT);
+                if (parport_wait_peripheral(p, DSR_PERROR, DSR_PERROR))
+                        pr_debug1(PPIP32 "%s: PEerror timeout 2 in %s\n",
+                                  p->name, __func__);
+        }
+
+        /* Adjust residue if needed */
+        parport_ip32_set_mode(p, ECR_MODE_CFG);
+        cnfga = readb(priv->regs.cnfgA);
+        if (!(cnfga & CNFGA_nBYTEINTRANS)) {
+                pr_debug1(PPIP32 "%s: cnfgA contains 0x%02x\n",
+                          p->name, cnfga);
+                pr_debug1(PPIP32 "%s: Accounting for extra byte\n",
+                          p->name);
+                residue++;
+        }
+
+        /* Don't care about partial PWords since we do not support
+         * PWord != 1 byte. */
+
+        /* Back to forward PS2 mode. */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        parport_ip32_data_forward(p);
+
+        return residue;
+}
+
+/**
+ * parport_ip32_compat_write_data - write a block of data in SPP mode
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ * @flags:      ignored
+ */
+static size_t parport_ip32_compat_write_data(struct parport *p,
+                                             const void *buf, size_t len,
+                                             int flags)
+{
+        static unsigned int ready_before = 1;
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        struct parport * const physport = p->physport;
+        size_t written = 0;
+
+        /* Special case: a timeout of zero means we cannot call schedule().
+         * Also if O_NONBLOCK is set then use the default implementation. */
+        if (physport->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK)
+                return parport_ieee1284_write_compat(p, buf, len, flags);
+
+        /* Reset FIFO, go in forward mode, and disable ackIntEn */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        parport_ip32_write_control(p, DCR_SELECT | DCR_nINIT);
+        parport_ip32_data_forward(p);
+        parport_ip32_disable_irq(p);
+        parport_ip32_set_mode(p, ECR_MODE_PPF);
+        physport->ieee1284.phase = IEEE1284_PH_FWD_DATA;
+
+        /* Wait for peripheral to become ready */
+        if (parport_wait_peripheral(p, DSR_nBUSY | DSR_nFAULT,
+                                       DSR_nBUSY | DSR_nFAULT)) {
+                /* Avoid to flood the logs */
+                if (ready_before)
+                        printk(KERN_INFO PPIP32 "%s: not ready in %s\n",
+                               p->name, __func__);
+                ready_before = 0;
+                goto stop;
+        }
+        ready_before = 1;
+
+        written = parport_ip32_fifo_write_block(p, buf, len);
+
+        /* Wait FIFO to empty.  Timeout is proportional to FIFO_depth.  */
+        parport_ip32_drain_fifo(p, physport->cad->timeout * priv->fifo_depth);
+
+        /* Check for a potential residue */
+        written -= parport_ip32_get_fifo_residue(p, ECR_MODE_PPF);
+
+        /* Then, wait for BUSY to get low. */
+        if (parport_wait_peripheral(p, DSR_nBUSY, DSR_nBUSY))
+                printk(KERN_DEBUG PPIP32 "%s: BUSY timeout in %s\n",
+                       p->name, __func__);
+
+stop:
+        /* Reset FIFO */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        physport->ieee1284.phase = IEEE1284_PH_FWD_IDLE;
+
+        return written;
+}
+
+/*
+ * FIXME - Insert here parport_ip32_ecp_read_data().
+ */
+
+/**
+ * parport_ip32_ecp_write_data - write a block of data in ECP mode
+ * @p:          pointer to &struct parport
+ * @buf:        buffer of data to write
+ * @len:        length of buffer @buf
+ * @flags:      ignored
+ */
+static size_t parport_ip32_ecp_write_data(struct parport *p,
+                                          const void *buf, size_t len,
+                                          int flags)
+{
+        static unsigned int ready_before = 1;
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        struct parport * const physport = p->physport;
+        size_t written = 0;
+
+        /* Special case: a timeout of zero means we cannot call schedule().
+         * Also if O_NONBLOCK is set then use the default implementation. */
+        if (physport->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK)
+                return parport_ieee1284_ecp_write_data(p, buf, len, flags);
+
+        /* Negotiate to forward mode if necessary. */
+        if (physport->ieee1284.phase != IEEE1284_PH_FWD_IDLE) {
+                /* Event 47: Set nInit high. */
+                parport_ip32_frob_control(p, DCR_nINIT | DCR_AUTOFD,
+                                             DCR_nINIT | DCR_AUTOFD);
+
+                /* Event 49: PError goes high. */
+                if (parport_wait_peripheral(p, DSR_PERROR, DSR_PERROR)) {
+                        printk(KERN_DEBUG PPIP32 "%s: PError timeout in %s",
+                               p->name, __func__);
+                        physport->ieee1284.phase = IEEE1284_PH_ECP_DIR_UNKNOWN;
+                        return 0;
+                }
+        }
+
+        /* Reset FIFO, go in forward mode, and disable ackIntEn */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        parport_ip32_write_control(p, DCR_SELECT | DCR_nINIT);
+        parport_ip32_data_forward(p);
+        parport_ip32_disable_irq(p);
+        parport_ip32_set_mode(p, ECR_MODE_ECP);
+        physport->ieee1284.phase = IEEE1284_PH_FWD_DATA;
+
+        /* Wait for peripheral to become ready */
+        if (parport_wait_peripheral(p, DSR_nBUSY | DSR_nFAULT,
+                                       DSR_nBUSY | DSR_nFAULT)) {
+                /* Avoid to flood the logs */
+                if (ready_before)
+                        printk(KERN_INFO PPIP32 "%s: not ready in %s\n",
+                               p->name, __func__);
+                ready_before = 0;
+                goto stop;
+        }
+        ready_before = 1;
+
+        written = parport_ip32_fifo_write_block(p, buf, len);
+
+        /* Wait FIFO to empty.  Timeout is proportional to FIFO_depth.  */
+        parport_ip32_drain_fifo(p, physport->cad->timeout * priv->fifo_depth);
+
+        /* Check for a potential residue */
+        written -= parport_ip32_get_fifo_residue(p, ECR_MODE_ECP);
+
+        /* Then, wait for BUSY to get low. */
+        if (parport_wait_peripheral(p, DSR_nBUSY, DSR_nBUSY))
+                printk(KERN_DEBUG PPIP32 "%s: BUSY timeout in %s\n",
+                       p->name, __func__);
+
+stop:
+        /* Reset FIFO */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        physport->ieee1284.phase = IEEE1284_PH_FWD_IDLE;
+
+        return written;
+}
+
+/*
+ * FIXME - Insert here parport_ip32_ecp_write_addr().
+ */
+
+/*--- Default parport operations ---------------------------------------*/
+
+static __initdata struct parport_operations parport_ip32_ops = {
+        .write_data             = parport_ip32_write_data,
+        .read_data              = parport_ip32_read_data,
+
+        .write_control          = parport_ip32_write_control,
+        .read_control           = parport_ip32_read_control,
+        .frob_control           = parport_ip32_frob_control,
+
+        .read_status            = parport_ip32_read_status,
+
+        .enable_irq             = parport_ip32_enable_irq,
+        .disable_irq            = parport_ip32_disable_irq,
+
+        .data_forward           = parport_ip32_data_forward,
+        .data_reverse           = parport_ip32_data_reverse,
+
+        .init_state             = parport_ip32_init_state,
+        .save_state             = parport_ip32_save_state,
+        .restore_state          = parport_ip32_restore_state,
+
+        .epp_write_data         = parport_ieee1284_epp_write_data,
+        .epp_read_data          = parport_ieee1284_epp_read_data,
+        .epp_write_addr         = parport_ieee1284_epp_write_addr,
+        .epp_read_addr          = parport_ieee1284_epp_read_addr,
+
+        .ecp_write_data         = parport_ieee1284_ecp_write_data,
+        .ecp_read_data          = parport_ieee1284_ecp_read_data,
+        .ecp_write_addr         = parport_ieee1284_ecp_write_addr,
+
+        .compat_write_data      = parport_ieee1284_write_compat,
+        .nibble_read_data       = parport_ieee1284_read_nibble,
+        .byte_read_data         = parport_ieee1284_read_byte,
+
+        .owner                  = THIS_MODULE,
+};
+
+/*--- Device detection -------------------------------------------------*/
+
+/**
+ * parport_ip32_ecp_supported - check for an ECP port
+ * @p:          pointer to the &parport structure
+ *
+ * Returns 1 if an ECP port is found, and 0 otherwise.  This function actually
+ * checks if an Extended Control Register seems to be present.  On successful
+ * return, the port is placed in SPP mode.
+ */
+static __init unsigned int parport_ip32_ecp_supported(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        unsigned int ecr;
+
+        ecr = ECR_MODE_PS2 | ECR_nERRINTR | ECR_SERVINTR;
+        writeb(ecr, priv->regs.ecr);
+        if (readb(priv->regs.ecr) != (ecr | ECR_F_EMPTY))
+                goto fail;
+
+        pr_probe(p, "Found working ECR register\n");
+        parport_ip32_set_mode(p, ECR_MODE_SPP);
+        parport_ip32_write_control(p, DCR_SELECT | DCR_nINIT);
+        return 1;
+
+fail:
+        pr_probe(p, "ECR register not found\n");
+        return 0;
+}
+
+/**
+ * parport_ip32_fifo_supported - check for FIFO parameters
+ * @p:          pointer to the &parport structure
+ *
+ * Check for FIFO parameters of an Extended Capabilities Port.  Returns 1 on
+ * success, and 0 otherwise.  Adjust FIFO parameters in the parport structure.
+ * On return, the port is placed in SPP mode.
+ */
+static __init unsigned int parport_ip32_fifo_supported(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        unsigned int configa, configb;
+        unsigned int pword;
+        unsigned int i;
+
+        /* Configuration mode */
+        parport_ip32_set_mode(p, ECR_MODE_CFG);
+        configa = readb(priv->regs.cnfgA);
+        configb = readb(priv->regs.cnfgB);
+
+        /* Find out PWord size */
+        switch (configa & CNFGA_ID_MASK) {
+        case CNFGA_ID_8:
+                pword = 1;
+                break;
+        case CNFGA_ID_16:
+                pword = 2;
+                break;
+        case CNFGA_ID_32:
+                pword = 4;
+                break;
+        default:
+                pr_probe(p, "Unknown implementation ID: 0x%0x\n",
+                         (configa & CNFGA_ID_MASK) >> CNFGA_ID_SHIFT);
+                goto fail;
+                break;
+        }
+        if (pword != 1) {
+                pr_probe(p, "Unsupported PWord size: %u\n", pword);
+                goto fail;
+        }
+        priv->pword = pword;
+        pr_probe(p, "PWord is %u bits\n", 8 * priv->pword);
+
+        /* Check for compression support */
+        writeb(configb | CNFGB_COMPRESS, priv->regs.cnfgB);
+        if (readb(priv->regs.cnfgB) & CNFGB_COMPRESS)
+                pr_probe(p, "Hardware compression detected (unsupported)\n");
+        writeb(configb & ~CNFGB_COMPRESS, priv->regs.cnfgB);
+
+        /* Reset FIFO and go in test mode (no interrupt, no DMA) */
+        parport_ip32_set_mode(p, ECR_MODE_TST);
+
+        /* FIFO must be empty now */
+        if (!(readb(priv->regs.ecr) & ECR_F_EMPTY)) {
+                pr_probe(p, "FIFO not reset\n");
+                goto fail;
+        }
+
+        /* Find out FIFO depth. */
+        priv->fifo_depth = 0;
+        for (i = 0; i < 1024; i++) {
+                if (readb(priv->regs.ecr) & ECR_F_FULL) {
+                        /* FIFO full */
+                        priv->fifo_depth = i;
+                        break;
+                }
+                writeb((u8)i, priv->regs.fifo);
+        }
+        if (i >= 1024) {
+                pr_probe(p, "Can't fill FIFO\n");
+                goto fail;
+        }
+        if (!priv->fifo_depth) {
+                pr_probe(p, "Can't get FIFO depth\n");
+                goto fail;
+        }
+        pr_probe(p, "FIFO is %u PWords deep\n", priv->fifo_depth);
+
+        /* Enable interrupts */
+        parport_ip32_frob_econtrol(p, ECR_SERVINTR, 0);
+
+        /* Find out writeIntrThreshold: number of PWords we know we can write
+         * if we get an interrupt. */
+        priv->writeIntrThreshold = 0;
+        for (i = 0; i < priv->fifo_depth; i++) {
+                if (readb(priv->regs.fifo) != (u8)i) {
+                        pr_probe(p, "Invalid data in FIFO\n");
+                        goto fail;
+                }
+                if (!priv->writeIntrThreshold
+                    && readb(priv->regs.ecr) & ECR_SERVINTR)
+                        /* writeIntrThreshold reached */
+                        priv->writeIntrThreshold = i + 1;
+                if (i + 1 < priv->fifo_depth
+                    && readb(priv->regs.ecr) & ECR_F_EMPTY) {
+                        /* FIFO empty before the last byte? */
+                        pr_probe(p, "Data lost in FIFO\n");
+                        goto fail;
+                }
+        }
+        if (!priv->writeIntrThreshold) {
+                pr_probe(p, "Can't get writeIntrThreshold\n");
+                goto fail;
+        }
+        pr_probe(p, "writeIntrThreshold is %u\n", priv->writeIntrThreshold);
+
+        /* FIFO must be empty now */
+        if (!(readb(priv->regs.ecr) & ECR_F_EMPTY)) {
+                pr_probe(p, "Can't empty FIFO\n");
+                goto fail;
+        }
+
+        /* Reset FIFO */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        /* Set reverse direction (must be in PS2 mode) */
+        parport_ip32_data_reverse(p);
+        /* Test FIFO, no interrupt, no DMA */
+        parport_ip32_set_mode(p, ECR_MODE_TST);
+        /* Enable interrupts */
+        parport_ip32_frob_econtrol(p, ECR_SERVINTR, 0);
+
+        /* Find out readIntrThreshold: number of PWords we can read if we get
+         * an interrupt. */
+        priv->readIntrThreshold = 0;
+        for (i = 0; i < priv->fifo_depth; i++) {
+                writeb(0xaa, priv->regs.fifo);
+                if (readb(priv->regs.ecr) & ECR_SERVINTR) {
+                        /* readIntrThreshold reached */
+                        priv->readIntrThreshold = i + 1;
+                        break;
+                }
+        }
+        if (!priv->readIntrThreshold) {
+                pr_probe(p, "Can't get readIntrThreshold\n");
+                goto fail;
+        }
+        pr_probe(p, "readIntrThreshold is %u\n", priv->readIntrThreshold);
+
+        /* Reset ECR */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        parport_ip32_data_forward(p);
+        parport_ip32_set_mode(p, ECR_MODE_SPP);
+        return 1;
+
+fail:
+        priv->fifo_depth = 0;
+        parport_ip32_set_mode(p, ECR_MODE_SPP);
+        return 0;
+}
+
+/*--- Initialization code ----------------------------------------------*/
+
+/**
+ * parport_ip32_make_isa_registers - compute (ISA) register addresses
+ * @regs:       pointer to &struct parport_ip32_regs to fill
+ * @base:       base address of standard and EPP registers
+ * @base_hi:    base address of ECP registers
+ * @regshift:   how much to shift register offset by
+ *
+ * Compute register addresses, according to the ISA standard.  The addresses
+ * of the standard and EPP registers are computed from address @base.  The
+ * addresses of the ECP registers are computed from address @base_hi.
+ */
+static void __init
+parport_ip32_make_isa_registers(struct parport_ip32_regs *regs,
+                                void __iomem *base, void __iomem *base_hi,
+                                unsigned int regshift)
+{
+#define r_base(offset)    ((u8 __iomem *)base    + ((offset) << regshift))
+#define r_base_hi(offset) ((u8 __iomem *)base_hi + ((offset) << regshift))
+        *regs = (struct parport_ip32_regs){
+                .data           = r_base(0),
+                .dsr            = r_base(1),
+                .dcr            = r_base(2),
+                .eppAddr        = r_base(3),
+                .eppData0       = r_base(4),
+                .eppData1       = r_base(5),
+                .eppData2       = r_base(6),
+                .eppData3       = r_base(7),
+                .ecpAFifo       = r_base(0),
+                .fifo           = r_base_hi(0),
+                .cnfgA          = r_base_hi(0),
+                .cnfgB          = r_base_hi(1),
+                .ecr            = r_base_hi(2)
+        };
+#undef r_base_hi
+#undef r_base
+}
+
+/**
+ * parport_ip32_probe_port - probe and register IP32 built-in parallel port
+ *
+ * Returns the new allocated &parport structure.  On error, an error code is
+ * encoded in return value with the ERR_PTR function.
+ */
+static __init struct parport *parport_ip32_probe_port(void)
+{
+        struct parport_ip32_regs regs;
+        struct parport_ip32_private *priv = NULL;
+        struct parport_operations *ops = NULL;
+        struct parport *p = NULL;
+        int err;
+
+        parport_ip32_make_isa_registers(&regs, &mace->isa.parallel,
+                                        &mace->isa.ecp1284, 8 /* regshift */);
+
+        ops = kmalloc(sizeof(struct parport_operations), GFP_KERNEL);
+        priv = kmalloc(sizeof(struct parport_ip32_private), GFP_KERNEL);
+        p = parport_register_port(0, PARPORT_IRQ_NONE, PARPORT_DMA_NONE, ops);
+        if (ops == NULL || priv == NULL || p == NULL) {
+                err = -ENOMEM;
+                goto fail;
+        }
+        p->base = MACE_BASE + offsetof(struct sgi_mace, isa.parallel);
+        p->base_hi = MACE_BASE + offsetof(struct sgi_mace, isa.ecp1284);
+        p->private_data = priv;
+
+        *ops = parport_ip32_ops;
+        *priv = (struct parport_ip32_private){
+                .regs                   = regs,
+                .dcr_writable           = DCR_DIR | DCR_SELECT | DCR_nINIT |
+                                          DCR_AUTOFD | DCR_STROBE,
+                .irq_mode               = PARPORT_IP32_IRQ_FWD,
+        };
+        init_completion(&priv->irq_complete);
+
+        /* Probe port. */
+        if (!parport_ip32_ecp_supported(p)) {
+                err = -ENODEV;
+                goto fail;
+        }
+        parport_ip32_dump_state(p, "begin init", 0);
+
+        /* We found what looks like a working ECR register.  Simply assume
+         * that all modes are correctly supported.  Enable basic modes. */
+        p->modes = PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT;
+        p->modes |= PARPORT_MODE_TRISTATE;
+
+        if (!parport_ip32_fifo_supported(p)) {
+                printk(KERN_WARNING PPIP32
+                       "%s: error: FIFO disabled\n", p->name);
+                /* Disable hardware modes depending on a working FIFO. */
+                features &= ~PARPORT_IP32_ENABLE_SPP;
+                features &= ~PARPORT_IP32_ENABLE_ECP;
+                /* DMA is not needed if FIFO is not supported.  */
+                features &= ~PARPORT_IP32_ENABLE_DMA;
+        }
+
+        /* Request IRQ */
+        if (features & PARPORT_IP32_ENABLE_IRQ) {
+                int irq = MACEISA_PARALLEL_IRQ;
+                if (request_irq(irq, parport_ip32_interrupt, 0, p->name, p)) {
+                        printk(KERN_WARNING PPIP32
+                               "%s: error: IRQ disabled\n", p->name);
+                        /* DMA cannot work without interrupts. */
+                        features &= ~PARPORT_IP32_ENABLE_DMA;
+                } else {
+                        pr_probe(p, "Interrupt support enabled\n");
+                        p->irq = irq;
+                        priv->dcr_writable |= DCR_IRQ;
+                }
+        }
+
+        /* Allocate DMA resources */
+        if (features & PARPORT_IP32_ENABLE_DMA) {
+                if (parport_ip32_dma_register())
+                        printk(KERN_WARNING PPIP32
+                               "%s: error: DMA disabled\n", p->name);
+                else {
+                        pr_probe(p, "DMA support enabled\n");
+                        p->dma = 0; /* arbitrary value != PARPORT_DMA_NONE */
+                        p->modes |= PARPORT_MODE_DMA;
+                }
+        }
+
+        if (features & PARPORT_IP32_ENABLE_SPP) {
+                /* Enable compatibility FIFO mode */
+                p->ops->compat_write_data = parport_ip32_compat_write_data;
+                p->modes |= PARPORT_MODE_COMPAT;
+                pr_probe(p, "Hardware support for SPP mode enabled\n");
+        }
+        if (features & PARPORT_IP32_ENABLE_EPP) {
+                /* Set up access functions to use EPP hardware. */
+                p->ops->epp_read_data = parport_ip32_epp_read_data;
+                p->ops->epp_write_data = parport_ip32_epp_write_data;
+                p->ops->epp_read_addr = parport_ip32_epp_read_addr;
+                p->ops->epp_write_addr = parport_ip32_epp_write_addr;
+                p->modes |= PARPORT_MODE_EPP;
+                pr_probe(p, "Hardware support for EPP mode enabled\n");
+        }
+        if (features & PARPORT_IP32_ENABLE_ECP) {
+                /* Enable ECP FIFO mode */
+                p->ops->ecp_write_data = parport_ip32_ecp_write_data;
+                /* FIXME - not implemented */
+/*              p->ops->ecp_read_data  = parport_ip32_ecp_read_data; */
+/*              p->ops->ecp_write_addr = parport_ip32_ecp_write_addr; */
+                p->modes |= PARPORT_MODE_ECP;
+                pr_probe(p, "Hardware support for ECP mode enabled\n");
+        }
+
+        /* Initialize the port with sensible values */
+        parport_ip32_set_mode(p, ECR_MODE_PS2);
+        parport_ip32_write_control(p, DCR_SELECT | DCR_nINIT);
+        parport_ip32_data_forward(p);
+        parport_ip32_disable_irq(p);
+        parport_ip32_write_data(p, 0x00);
+        parport_ip32_dump_state(p, "end init", 0);
+
+        /* Print out what we found */
+        printk(KERN_INFO "%s: SGI IP32 at 0x%lx (0x%lx)",
+               p->name, p->base, p->base_hi);
+        if (p->irq != PARPORT_IRQ_NONE)
+                printk(", irq %d", p->irq);
+        printk(" [");
+#define printmode(x)    if (p->modes & PARPORT_MODE_##x)                \
+                                printk("%s%s", f++ ? "," : "", #x)
+        {
+                unsigned int f = 0;
+                printmode(PCSPP);
+                printmode(TRISTATE);
+                printmode(COMPAT);
+                printmode(EPP);
+                printmode(ECP);
+                printmode(DMA);
+        }
+#undef printmode
+        printk("]\n");
+
+        parport_announce_port(p);
+        return p;
+
+fail:
+        if (p)
+                parport_put_port(p);
+        kfree(priv);
+        kfree(ops);
+        return ERR_PTR(err);
+}
+
+/**
+ * parport_ip32_unregister_port - unregister a parallel port
+ * @p:          pointer to the &struct parport
+ *
+ * Unregisters a parallel port and free previously allocated resources
+ * (memory, IRQ, ...).
+ */
+static __exit void parport_ip32_unregister_port(struct parport *p)
+{
+        struct parport_ip32_private * const priv = p->physport->private_data;
+        struct parport_operations *ops = p->ops;
+
+        parport_remove_port(p);
+        if (p->modes & PARPORT_MODE_DMA)
+                parport_ip32_dma_unregister();
+        if (p->irq != PARPORT_IRQ_NONE)
+                free_irq(p->irq, p);
+        parport_put_port(p);
+        kfree(priv);
+        kfree(ops);
+}
+
+/**
+ * parport_ip32_init - module initialization function
+ */
+static int __init parport_ip32_init(void)
+{
+        pr_info(PPIP32 "SGI IP32 built-in parallel port driver v0.6\n");
+        pr_debug1(PPIP32 "Compiled on %s, %s\n", __DATE__, __TIME__);
+        this_port = parport_ip32_probe_port();
+        return IS_ERR(this_port) ? PTR_ERR(this_port) : 0;
+}
+
+/**
+ * parport_ip32_exit - module termination function
+ */
+static void __exit parport_ip32_exit(void)
+{
+        parport_ip32_unregister_port(this_port);
+}
+
+/*--- Module stuff -----------------------------------------------------*/
+
+MODULE_AUTHOR("Arnaud Giersch <arnaud.giersch@free.fr>");
+MODULE_DESCRIPTION("SGI IP32 built-in parallel port driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("0.6");          /* update in parport_ip32_init() too */
+
+module_init(parport_ip32_init);
+module_exit(parport_ip32_exit);
+
+module_param(verbose_probing, bool, S_IRUGO);
+MODULE_PARM_DESC(verbose_probing, "Log chit-chat during initialization");
+
+module_param(features, uint, S_IRUGO);
+MODULE_PARM_DESC(features,
+                 "Bit mask of features to enable"
+                 ", bit 0: IRQ support"
+                 ", bit 1: DMA support"
+                 ", bit 2: hardware SPP mode"
+                 ", bit 3: hardware EPP mode"
+                 ", bit 4: hardware ECP mode");
+
+/*--- Inform (X)Emacs about preferred coding style ---------------------*/
+/*
+ * Local Variables:
+ * mode: c
+ * c-file-style: "linux"
+ * indent-tabs-mode: t
+ * tab-width: 8
+ * fill-column: 78
+ * ispell-local-dictionary: "american"
+ * End:
+ */
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 76dd077e3184..166de3507780 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -329,9 +329,9 @@ static int __devinit parport_register (struct pci_dev *dev,
 
                 if (priv->num_par == ARRAY_SIZE (priv->port)) {
                         printk (KERN_WARNING
-                                "parport_serial: %s: only %u parallel ports "
+                                "parport_serial: %s: only %zu parallel ports "
                                 "supported (%d reported)\n", pci_name (dev),
-                                ARRAY_SIZE (priv->port), card->numports);
+                                ARRAY_SIZE(priv->port), card->numports);
                         break;
                 }
 
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index b62aee8de3cb..ea83b70e0de2 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -199,7 +199,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,
 
                 if (port->physport->ieee1284.phase != IEEE1284_PH_HBUSY_DAVAIL) {
                         if (belen != len) {
-                                printk (KERN_DEBUG "%s: Device ID was %d bytes"
+                                printk (KERN_DEBUG "%s: Device ID was %zd bytes"
                                         " while device told it would be %d"
                                         " bytes\n",
                                         port->name, len, belen);
@@ -214,7 +214,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,
                 if (buffer[len-1] == ';') {
                         printk (KERN_DEBUG "%s: Device ID reading stopped"
                                 " before device told data not available. "
-                                "Current idlen %d of %d, len bytes %02X %02X\n",
+                                "Current idlen %u of %u, len bytes %02X %02X\n",
                                 port->name, current_idlen, numidlens,
                                 length[0], length[1]);
                         goto done;
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 2f1289eebb3c..222a1cc4aa28 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -11,8 +11,7 @@ config HOTPLUG_PCI
         ---help---
           Say Y here if you have a motherboard with a PCI Hotplug controller.
           This allows you to add and remove PCI cards while the machine is
-          powered up and running.  The file system pcihpfs must be mounted
-          in order to interact with any PCI Hotplug controllers.
+          powered up and running.
 
           To compile this driver as a module, choose M here: the
           module will be called pci_hotplug.
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 7e7f913ba7b9..317457dd4014 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -302,7 +302,7 @@ static int ibm_get_table_from_acpi(char **bufp)
         }
 
         package = (union acpi_object *) buffer.pointer;
-        if(!(package) ||
+        if (!(package) ||
                         (package->type != ACPI_TYPE_PACKAGE) ||
                         !(package->package.elements)) {
                 err("%s:  Invalid APCI object\n", __FUNCTION__);
@@ -405,7 +405,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
         }
         info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
 
-        if(info.current_status && (info.valid & ACPI_VALID_HID) &&
+        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,
@@ -449,13 +449,11 @@ static int __init ibm_acpiphp_init(void)
         }
 
         ibm_note.device = device;
-        status = acpi_install_notify_handler(
-                        ibm_acpi_handle,
-                        ACPI_DEVICE_NOTIFY,
-                        ibm_handle_events,
+        status = acpi_install_notify_handler(ibm_acpi_handle,
+                        ACPI_DEVICE_NOTIFY, ibm_handle_events,
                         &ibm_note);
         if (ACPI_FAILURE(status)) {
-                err("%s:  Failed to register notification handler\n",
+                err("%s: Failed to register notification handler\n",
                                 __FUNCTION__);
                 retval = -EBUSY;
                 goto init_cleanup;
@@ -482,14 +480,13 @@ static void __exit ibm_acpiphp_exit(void)
         if (acpiphp_unregister_attention(&ibm_attention_info))
                 err("%s: attention info deregistration failed", __FUNCTION__);
 
-           status = acpi_remove_notify_handler(
+        status = acpi_remove_notify_handler(
                            ibm_acpi_handle,
                            ACPI_DEVICE_NOTIFY,
                            ibm_handle_events);
-           if (ACPI_FAILURE(status))
-                   err("%s:  Notification handler removal failed\n",
-                                   __FUNCTION__);
-        // remove the /sys entries
+        if (ACPI_FAILURE(status))
+                err("%s: Notification handler removal failed\n", __FUNCTION__);
+        /* remove the /sys entries */
         if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr))
                 err("%s: removal of sysfs file apci_table failed\n",
                                 __FUNCTION__);
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index aabf1e70b528..dc59da675c08 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -235,12 +235,12 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
 {
         int rc = 0;
         struct slot *pslot;
-        u8 cmd;
+        u8 cmd = 0x00;     /* avoid compiler warning */
 
         debug("set_attention_status - Entry hotplug_slot[%lx] value[%x]\n",
                         (ulong) hotplug_slot, value);
         ibmphp_lock_operations();
-        cmd = 0x00;     // avoid compiler warning
+
 
         if (hotplug_slot) {
                 switch (value) {
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 7d93dbaf628d..3eefe2cec72d 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -103,13 +103,13 @@ static struct slot *find_slot(struct device_node *dn)
         struct list_head *tmp, *n;
         struct slot *slot;
 
-        list_for_each_safe(tmp, n, &rpaphp_slot_head) {
-                slot = list_entry(tmp, struct slot, rpaphp_slot_list);
-                if (slot->dn == dn)
-                        return slot;
-        }
+        list_for_each_safe(tmp, n, &rpaphp_slot_head) {
+                slot = list_entry(tmp, struct slot, rpaphp_slot_list);
+                if (slot->dn == dn)
+                        return slot;
+        }
 
-        return NULL;
+        return NULL;
 }
 
 static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,
@@ -126,9 +126,9 @@ static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,
         return NULL;
 }
 
-static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
+static void dlpar_pci_add_bus(struct device_node *dn)
 {
-        struct pci_dn *pdn = dn->data;
+        struct pci_dn *pdn = PCI_DN(dn);
         struct pci_controller *phb = pdn->phb;
         struct pci_dev *dev = NULL;
 
@@ -139,52 +139,52 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
         if (!dev) {
                 printk(KERN_ERR "%s: failed to create pci dev for %s\n",
                                 __FUNCTION__, dn->full_name);
-                return NULL;
+                return;
         }
 
         if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
             dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
                 of_scan_pci_bridge(dn, dev);
 
-        rpaphp_init_new_devs(dev->subordinate);
+        pcibios_fixup_new_pci_devices(dev->subordinate,0);
 
         /* Claim new bus resources */
         pcibios_claim_one_bus(dev->bus);
 
         /* ioremap() for child bus, which may or may not succeed */
-        (void) remap_bus_range(dev->bus);
+        remap_bus_range(dev->subordinate);
 
         /* Add new devices to global lists.  Register in proc, sysfs. */
         pci_bus_add_devices(phb->bus);
-
-        /* Confirm new bridge dev was created */
-        dev = dlpar_find_new_dev(phb->bus, dn);
-        if (dev) {
-                if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
-                        printk(KERN_ERR "%s: unexpected header type %d\n",
-                                __FUNCTION__, dev->hdr_type);
-                        return NULL;
-                }
-        }
-
-        return dev;
 }
 
 static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn)
 {
         struct pci_dev *dev;
+        struct pci_controller *phb;
 
-        if (rpaphp_find_pci_bus(dn))
+        if (pcibios_find_pci_bus(dn))
                 return -EINVAL;
 
         /* Add pci bus */
-        dev = dlpar_pci_add_bus(dn);
+        dlpar_pci_add_bus(dn);
+
+        /* Confirm new bridge dev was created */
+        phb = PCI_DN(dn)->phb;
+        dev = dlpar_find_new_dev(phb->bus, dn);
+
         if (!dev) {
                 printk(KERN_ERR "%s: unable to add bus %s\n", __FUNCTION__,
                         drc_name);
                 return -EIO;
         }
 
+        if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
+                printk(KERN_ERR "%s: unexpected header type %d, unable to add bus %s\n",
+                        __FUNCTION__, dev->hdr_type, drc_name);
+                return -EIO;
+        }
+
         /* Add hotplug slot */
         if (rpaphp_add_slot(dn)) {
                 printk(KERN_ERR "%s: unable to add hotplug slot %s\n",
@@ -221,13 +221,13 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn)
         struct pci_dn *pdn;
         int rc = 0;
 
-        if (!rpaphp_find_pci_bus(dn))
+        if (!pcibios_find_pci_bus(dn))
                 return -EINVAL;
 
         slot = find_slot(dn);
         if (slot) {
                 /* Remove hotplug slot */
-                if (rpaphp_remove_slot(slot)) {
+                if (rpaphp_deregister_slot(slot)) {
                         printk(KERN_ERR
                                 "%s: unable to remove hotplug slot %s\n",
                                 __FUNCTION__, drc_name);
@@ -366,21 +366,25 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
         struct pci_bus *bus;
         struct slot *slot;
 
-        bus = rpaphp_find_pci_bus(dn);
+        bus = pcibios_find_pci_bus(dn);
         if (!bus)
                 return -EINVAL;
 
         slot = find_slot(dn);
         if (slot) {
                 /* Remove hotplug slot */
-                if (rpaphp_remove_slot(slot)) {
+                if (rpaphp_deregister_slot(slot)) {
                         printk(KERN_ERR
                                 "%s: unable to remove hotplug slot %s\n",
                                 __FUNCTION__, drc_name);
                         return -EIO;
                 }
         } else {
-                rpaphp_unconfig_pci_adapter(bus);
+                struct pci_dev *dev, *tmp;
+                list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
+                        eeh_remove_bus_device(dev);
+                        pci_remove_bus_device(dev);
+                }
         }
 
         if (unmap_bus_range(bus)) {
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 57ea71a7bda5..310b6186c0e5 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -88,16 +88,10 @@ extern int num_slots;
 /* function prototypes */
 
 /* rpaphp_pci.c */
-extern struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn);
-extern int rpaphp_claim_resource(struct pci_dev *dev, int resource);
 extern int rpaphp_enable_pci_slot(struct slot *slot);
-extern int register_pci_slot(struct slot *slot);
+extern int rpaphp_register_pci_slot(struct slot *slot);
 extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
-extern void rpaphp_init_new_devs(struct pci_bus *bus);
-extern void rpaphp_eeh_init_nodes(struct device_node *dn);
-
-extern int rpaphp_config_pci_adapter(struct pci_bus *bus);
-extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus);
+extern int rpaphp_get_sensor_state(struct slot *slot, int *state);
 
 /* rpaphp_core.c */
 extern int rpaphp_add_slot(struct device_node *dn);
@@ -108,8 +102,8 @@ extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
 /* rpaphp_slot.c */
 extern void dealloc_slot_struct(struct slot *slot);
 extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
-extern int register_slot(struct slot *slot);
-extern int deregister_slot(struct slot *slot);
+extern int rpaphp_register_slot(struct slot *slot);
+extern int rpaphp_deregister_slot(struct slot *slot);
 extern int rpaphp_get_power_status(struct slot *slot, u8 * value);
 extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
         
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index cf075c34b578..6e79f5675b0d 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -56,25 +56,6 @@ MODULE_LICENSE("GPL");
 
 module_param(debug, bool, 0644);
 
-static int enable_slot(struct hotplug_slot *slot);
-static int disable_slot(struct hotplug_slot *slot);
-static int set_attention_status(struct hotplug_slot *slot, u8 value);
-static int get_power_status(struct hotplug_slot *slot, u8 * value);
-static int get_attention_status(struct hotplug_slot *slot, u8 * value);
-static int get_adapter_status(struct hotplug_slot *slot, u8 * value);
-static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value);
-
-struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
-        .owner = THIS_MODULE,
-        .enable_slot = enable_slot,
-        .disable_slot = disable_slot,
-        .set_attention_status = set_attention_status,
-        .get_power_status = get_power_status,
-        .get_attention_status = get_attention_status,
-        .get_adapter_status = get_adapter_status,
-        .get_max_bus_speed = get_max_bus_speed,
-};
-
 static int rpaphp_get_attention_status(struct slot *slot)
 {
         return slot->hotplug_slot->info->attention_status;
@@ -196,11 +177,6 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
         return 0;
 }
 
-int rpaphp_remove_slot(struct slot *slot)
-{
-        return deregister_slot(slot);
-}
-
 static int get_children_props(struct device_node *dn, int **drc_indexes,
                 int **drc_names, int **drc_types, int **drc_power_domains)
 {
@@ -307,13 +283,15 @@ static int is_php_dn(struct device_node *dn, int **indexes, int **names,
         return 0;
 }
 
-/****************************************************************
+/**
+ * rpaphp_add_slot -- add hotplug or dlpar slot
+ *
  *      rpaphp not only registers PCI hotplug slots(HOTPLUG), 
  *      but also logical DR slots(EMBEDDED).
  *      HOTPLUG slot: An adapter can be physically added/removed. 
  *      EMBEDDED slot: An adapter can be logically removed/added
  *                from/to a partition with the slot.
- ***************************************************************/
+ */
 int rpaphp_add_slot(struct device_node *dn)
 {
         struct slot *slot;
@@ -344,7 +322,7 @@ int rpaphp_add_slot(struct device_node *dn)
                         dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
                                         indexes[i + 1], name, type);
 
-                        retval = register_pci_slot(slot);
+                        retval = rpaphp_register_pci_slot(slot);
                 }
         }
 exit:
@@ -393,53 +371,85 @@ static void __exit rpaphp_exit(void)
         cleanup_slots();
 }
 
-static int enable_slot(struct hotplug_slot *hotplug_slot)
+static int __enable_slot(struct slot *slot)
 {
-        int retval = 0;
-        struct slot *slot = (struct slot *)hotplug_slot->private;
+        int state;
+        int retval;
 
-        if (slot->state == CONFIGURED) {
-                dbg("%s: %s is already enabled\n", __FUNCTION__, slot->name);
-                goto exit;
+        if (slot->state == CONFIGURED)
+                return 0;
+
+        retval = rpaphp_get_sensor_state(slot, &state);
+        if (retval)
+                return retval;
+
+        if (state == PRESENT) {
+                pcibios_add_pci_devices(slot->bus);
+                slot->state = CONFIGURED;
+        } else if (state == EMPTY) {
+                slot->state = EMPTY;
+        } else {
+                err("%s: slot[%s] is in invalid state\n", __FUNCTION__, slot->name);
+                slot->state = NOT_VALID;
+                return -EINVAL;
         }
+        return 0;
+}
+
+static int enable_slot(struct hotplug_slot *hotplug_slot)
+{
+        int retval;
+        struct slot *slot = (struct slot *)hotplug_slot->private;
 
-        dbg("ENABLING SLOT %s\n", slot->name);
         down(&rpaphp_sem);
-        retval = rpaphp_enable_pci_slot(slot);
+        retval = __enable_slot(slot);
         up(&rpaphp_sem);
-exit:
-        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
         return retval;
 }
 
-static int disable_slot(struct hotplug_slot *hotplug_slot)
+static int __disable_slot(struct slot *slot)
 {
-        int retval = -EINVAL;
-        struct slot *slot = (struct slot *)hotplug_slot->private;
+        struct pci_dev *dev, *tmp;
 
-        dbg("%s - Entry: slot[%s]\n", __FUNCTION__, slot->name);
+        if (slot->state == NOT_CONFIGURED)
+                return -EINVAL;
 
-        if (slot->state == NOT_CONFIGURED) {
-                dbg("%s: %s is already disabled\n", __FUNCTION__, slot->name);
-                goto exit;
+        list_for_each_entry_safe(dev, tmp, &slot->bus->devices, bus_list) {
+                eeh_remove_bus_device(dev);
+                pci_remove_bus_device(dev);
         }
 
-        dbg("DISABLING SLOT %s\n", slot->name);
+        slot->state = NOT_CONFIGURED;
+        return 0;
+}
+
+static int disable_slot(struct hotplug_slot *hotplug_slot)
+{
+        struct slot *slot = (struct slot *)hotplug_slot->private;
+        int retval;
+
         down(&rpaphp_sem);
-        retval = rpaphp_unconfig_pci_adapter(slot->bus);
+        retval = __disable_slot (slot);
         up(&rpaphp_sem);
-        slot->state = NOT_CONFIGURED;
-        info("%s: devices in slot[%s] unconfigured.\n", __FUNCTION__,
-             slot->name);
-exit:
-        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
         return retval;
 }
 
+struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
+        .owner = THIS_MODULE,
+        .enable_slot = enable_slot,
+        .disable_slot = disable_slot,
+        .set_attention_status = set_attention_status,
+        .get_power_status = get_power_status,
+        .get_attention_status = get_attention_status,
+        .get_adapter_status = get_adapter_status,
+        .get_max_bus_speed = get_max_bus_speed,
+};
+
 module_init(rpaphp_init);
 module_exit(rpaphp_exit);
 
 EXPORT_SYMBOL_GPL(rpaphp_add_slot);
-EXPORT_SYMBOL_GPL(rpaphp_remove_slot);
 EXPORT_SYMBOL_GPL(rpaphp_slot_head);
 EXPORT_SYMBOL_GPL(rpaphp_get_drc_props);
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 396b54b0c847..6f6cbede5135 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -32,37 +32,7 @@
 #include "../pci.h"             /* for pci_add_new_bus */
 #include "rpaphp.h"
 
-static struct pci_bus *find_bus_among_children(struct pci_bus *bus,
-                                        struct device_node *dn)
-{
-        struct pci_bus *child = NULL;
-        struct list_head *tmp;
-        struct device_node *busdn;
-
-        busdn = pci_bus_to_OF_node(bus);
-        if (busdn == dn)
-                return bus;
-
-        list_for_each(tmp, &bus->children) {
-                child = find_bus_among_children(pci_bus_b(tmp), dn);
-                if (child)
-                        break;
-        }
-        return child;
-}
-
-struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn)
-{
-        struct pci_dn *pdn = dn->data;
-
-        if (!pdn  || !pdn->phb || !pdn->phb->bus)
-                return NULL;
-
-        return find_bus_among_children(pdn->phb->bus, dn);
-}
-EXPORT_SYMBOL_GPL(rpaphp_find_pci_bus);
-
-static int rpaphp_get_sensor_state(struct slot *slot, int *state)
+int rpaphp_get_sensor_state(struct slot *slot, int *state)
 {
         int rc;
         int setlevel;
@@ -120,7 +90,7 @@ int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value)
                         /* config/unconfig adapter */
                         *value = slot->state;
                 } else {
-                        bus = rpaphp_find_pci_bus(slot->dn);
+                        bus = pcibios_find_pci_bus(slot->dn);
                         if (bus && !list_empty(&bus->devices))
                                 *value = CONFIGURED;
                         else
@@ -131,140 +101,6 @@ exit:
         return rc;
 }
 
-/* Must be called before pci_bus_add_devices */
-void rpaphp_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
-{
-        struct pci_dev *dev;
-
-        list_for_each_entry(dev, &bus->devices, bus_list) {
-                /*
-                 * Skip already-present devices (which are on the
-                 * global device list.)
-                 */
-                if (list_empty(&dev->global_list)) {
-                        int i;
-                        
-                        /* Need to setup IOMMU tables */
-                        ppc_md.iommu_dev_setup(dev);
-
-                        if(fix_bus)
-                                pcibios_fixup_device_resources(dev, bus);
-                        pci_read_irq_line(dev);
-                        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                                struct resource *r = &dev->resource[i];
-
-                                if (r->parent || !r->start || !r->flags)
-                                        continue;
-                                pci_claim_resource(dev, i);
-                        }
-                }
-        }
-}
-
-static void rpaphp_eeh_add_bus_device(struct pci_bus *bus)
-{
-        struct pci_dev *dev;
-
-        list_for_each_entry(dev, &bus->devices, bus_list) {
-                eeh_add_device_late(dev);
-                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                        struct pci_bus *subbus = dev->subordinate;
-                        if (subbus)
-                                rpaphp_eeh_add_bus_device (subbus);
-                }
-        }
-}
-
-static int rpaphp_pci_config_bridge(struct pci_dev *dev)
-{
-        u8 sec_busno;
-        struct pci_bus *child_bus;
-        struct pci_dev *child_dev;
-
-        dbg("Enter %s:  BRIDGE dev=%s\n", __FUNCTION__, pci_name(dev));
-
-        /* get busno of downstream bus */
-        pci_read_config_byte(dev, PCI_SECONDARY_BUS, &sec_busno);
-                
-        /* add to children of PCI bridge dev->bus */
-        child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
-        if (!child_bus) {
-                err("%s: could not add second bus\n", __FUNCTION__);
-                return -EIO;
-        }
-        sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
-        /* do pci_scan_child_bus */
-        pci_scan_child_bus(child_bus);
-
-        list_for_each_entry(child_dev, &child_bus->devices, bus_list) {
-                eeh_add_device_late(child_dev);
-        }
-
-         /* fixup new pci devices without touching bus struct */
-        rpaphp_fixup_new_pci_devices(child_bus, 0);
-
-        /* Make the discovered devices available */
-        pci_bus_add_devices(child_bus);
-        return 0;
-}
-
-void rpaphp_init_new_devs(struct pci_bus *bus)
-{
-        rpaphp_fixup_new_pci_devices(bus, 0);
-        rpaphp_eeh_add_bus_device(bus);
-}
-EXPORT_SYMBOL_GPL(rpaphp_init_new_devs);
-
-/*****************************************************************************
- rpaphp_pci_config_slot() will  configure all devices under the
- given slot->dn and return the the first pci_dev.
- *****************************************************************************/
-static struct pci_dev *
-rpaphp_pci_config_slot(struct pci_bus *bus)
-{
-        struct device_node *dn = pci_bus_to_OF_node(bus);
-        struct pci_dev *dev = NULL;
-        int slotno;
-        int num;
-
-        dbg("Enter %s: dn=%s bus=%s\n", __FUNCTION__, dn->full_name, bus->name);
-        if (!dn || !dn->child)
-                return NULL;
-
-        if (_machine == PLATFORM_PSERIES_LPAR) {
-                of_scan_bus(dn, bus);
-                if (list_empty(&bus->devices)) {
-                        err("%s: No new device found\n", __FUNCTION__);
-                        return NULL;
-                }
-
-                rpaphp_init_new_devs(bus);
-                pci_bus_add_devices(bus);
-                dev = list_entry(&bus->devices, struct pci_dev, bus_list);
-        } else {
-                slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
-
-                /* pci_scan_slot should find all children */
-                num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
-                if (num) {
-                        rpaphp_fixup_new_pci_devices(bus, 1);
-                        pci_bus_add_devices(bus);
-                }
-                if (list_empty(&bus->devices)) {
-                        err("%s: No new device found\n", __FUNCTION__);
-                        return NULL;
-                }
-                list_for_each_entry(dev, &bus->devices, bus_list) {
-                        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
-                                rpaphp_pci_config_bridge(dev);
-
-                        rpaphp_eeh_add_bus_device(bus);
-                }
-        }
-
-        return dev;
-}
-
 static void print_slot_pci_funcs(struct pci_bus *bus)
 {
         struct device_node *dn;
@@ -280,60 +116,6 @@ static void print_slot_pci_funcs(struct pci_bus *bus)
         return;
 }
 
-int rpaphp_config_pci_adapter(struct pci_bus *bus)
-{
-        struct device_node *dn = pci_bus_to_OF_node(bus);
-        struct pci_dev *dev;
-        int rc = -ENODEV;
-
-        dbg("Entry %s: slot[%s]\n", __FUNCTION__, dn->full_name);
-        if (!dn)
-                goto exit;
-
-        eeh_add_device_tree_early(dn);
-        dev = rpaphp_pci_config_slot(bus);
-        if (!dev) {
-                err("%s: can't find any devices.\n", __FUNCTION__);
-                goto exit;
-        }
-        print_slot_pci_funcs(bus);
-        rc = 0;
-exit:
-        dbg("Exit %s:  rc=%d\n", __FUNCTION__, rc);
-        return rc;
-}
-EXPORT_SYMBOL_GPL(rpaphp_config_pci_adapter);
-
-static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev)
-{
-        eeh_remove_device(dev);
-        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                struct pci_bus *bus = dev->subordinate;
-                struct list_head *ln;
-                if (!bus)
-                        return; 
-                for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
-                        struct pci_dev *pdev = pci_dev_b(ln);
-                        if (pdev)
-                                rpaphp_eeh_remove_bus_device(pdev);
-                }
-
-        }
-        return;
-}
-
-int rpaphp_unconfig_pci_adapter(struct pci_bus *bus)
-{
-        struct pci_dev *dev, *tmp;
-
-        list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
-                rpaphp_eeh_remove_bus_device(dev);
-                pci_remove_bus_device(dev);
-        }
-        return 0;
-}
-EXPORT_SYMBOL_GPL(rpaphp_unconfig_pci_adapter);
-
 static int setup_pci_hotplug_slot_info(struct slot *slot)
 {
         struct hotplug_slot_info *hotplug_slot_info = slot->hotplug_slot->info;
@@ -370,7 +152,7 @@ static int setup_pci_slot(struct slot *slot)
         struct pci_bus *bus;
 
         BUG_ON(!dn);
-        bus = rpaphp_find_pci_bus(dn);
+        bus = pcibios_find_pci_bus(dn);
         if (!bus) {
                 err("%s: no pci_bus for dn %s\n", __FUNCTION__, dn->full_name);
                 goto exit_rc;
@@ -395,10 +177,7 @@ static int setup_pci_slot(struct slot *slot)
                 if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) {
                         dbg("%s CONFIGURING pci adapter in slot[%s]\n",  
                                 __FUNCTION__, slot->name);
-                        if (rpaphp_config_pci_adapter(slot->bus)) {
-                                err("%s: CONFIG pci adapter failed\n", __FUNCTION__);
-                                goto exit_rc;           
-                        }
+                        pcibios_add_pci_devices(slot->bus);
 
                 } else if (slot->hotplug_slot->info->adapter_status != CONFIGURED) {
                         err("%s: slot[%s]'s adapter_status is NOT_VALID.\n",
@@ -420,7 +199,7 @@ exit_rc:
         return -EINVAL;
 }
 
-int register_pci_slot(struct slot *slot)
+int rpaphp_register_pci_slot(struct slot *slot)
 {
         int rc = -EINVAL;
 
@@ -428,42 +207,8 @@ int register_pci_slot(struct slot *slot)
                 goto exit_rc;
         if (setup_pci_slot(slot))
                 goto exit_rc;
-        rc = register_slot(slot);
+        rc = rpaphp_register_slot(slot);
 exit_rc:
         return rc;
 }
 
-int rpaphp_enable_pci_slot(struct slot *slot)
-{
-        int retval = 0, state;
-
-        retval = rpaphp_get_sensor_state(slot, &state);
-        if (retval)
-                goto exit;
-        dbg("%s: sensor state[%d]\n", __FUNCTION__, state);
-        /* if slot is not empty, enable the adapter */
-        if (state == PRESENT) {
-                dbg("%s : slot[%s] is occupied.\n", __FUNCTION__, slot->name);
-                retval = rpaphp_config_pci_adapter(slot->bus);
-                if (!retval) {
-                        slot->state = CONFIGURED;
-                        info("%s: devices in slot[%s] configured\n",
-                                        __FUNCTION__, slot->name);
-                } else {
-                        slot->state = NOT_CONFIGURED;
-                        dbg("%s: no pci_dev struct for adapter in slot[%s]\n",
-                            __FUNCTION__, slot->name);
-                }
-        } else if (state == EMPTY) {
-                dbg("%s : slot[%s] is empty\n", __FUNCTION__, slot->name);
-                slot->state = EMPTY;
-        } else {
-                err("%s: slot[%s] is in invalid state\n", __FUNCTION__,
-                    slot->name);
-                slot->state = NOT_VALID;
-                retval = -EINVAL;
-        }
-exit:
-        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
-        return retval;
-}
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index daa89ae57123..78943e064b59 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -35,16 +35,16 @@
 
 static ssize_t location_read_file (struct hotplug_slot *php_slot, char *buf)
 {
-        char *value;
-        int retval = -ENOENT;
+        char *value;
+        int retval = -ENOENT;
         struct slot *slot = (struct slot *)php_slot->private;
 
         if (!slot)
                 return retval;
 
-        value = slot->location;
-        retval = sprintf (buf, "%s\n", value);
-        return retval;
+        value = slot->location;
+        retval = sprintf (buf, "%s\n", value);
+        return retval;
 }
 
 static struct hotplug_slot_attribute hotplug_slot_attr_location = {
@@ -137,7 +137,7 @@ static int is_registered(struct slot *slot)
         return 0;
 }
 
-int deregister_slot(struct slot *slot)
+int rpaphp_deregister_slot(struct slot *slot)
 {
         int retval = 0;
         struct hotplug_slot *php_slot = slot->hotplug_slot;
@@ -159,8 +159,9 @@ int deregister_slot(struct slot *slot)
         dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
         return retval;
 }
+EXPORT_SYMBOL_GPL(rpaphp_deregister_slot);
 
-int register_slot(struct slot *slot)
+int rpaphp_register_slot(struct slot *slot)
 {
         int retval;
 
@@ -169,7 +170,7 @@ int register_slot(struct slot *slot)
                 slot->power_domain, slot->type);
         /* should not try to register the same slot twice */
         if (is_registered(slot)) { /* should't be here */
-                err("register_slot: slot[%s] is already registered\n", slot->name);
+                err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
                 rpaphp_release_slot(slot->hotplug_slot);
                 return -EAGAIN;
         }       
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index ce0e9b6ce833..7d6f521d02ea 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -95,6 +95,7 @@ struct controller {
         u8 function;
         u8 slot_device_offset;
         u8 add_support;
+        u32 pcix_misc2_reg;     /* for amd pogo errata */
         enum pci_bus_speed speed;
         u32 first_slot;         /* First physical slot number */
         u8 slot_bus;            /* Bus where the slots handled by this controller sit */
@@ -113,6 +114,26 @@ struct hotplug_params {
 
 /* Define AMD SHPC ID  */
 #define PCI_DEVICE_ID_AMD_GOLAM_7450    0x7450 
+#define PCI_DEVICE_ID_AMD_POGO_7458     0x7458
+
+/* AMD PCIX bridge registers */
+
+#define PCIX_MEM_BASE_LIMIT_OFFSET      0x1C
+#define PCIX_MISCII_OFFSET              0x48
+#define PCIX_MISC_BRIDGE_ERRORS_OFFSET  0x80
+
+/* AMD PCIX_MISCII masks and offsets */
+#define PERRNONFATALENABLE_MASK         0x00040000
+#define PERRFATALENABLE_MASK            0x00080000
+#define PERRFLOODENABLE_MASK            0x00100000
+#define SERRNONFATALENABLE_MASK         0x00200000
+#define SERRFATALENABLE_MASK            0x00400000
+
+/* AMD PCIX_MISC_BRIDGE_ERRORS masks and offsets */
+#define PERR_OBSERVED_MASK              0x00000001
+
+/* AMD PCIX_MEM_BASE_LIMIT masks */
+#define RSE_MASK                        0x40000000
 
 #define INT_BUTTON_IGNORE               0
 #define INT_PRESENCE_ON                 1
@@ -333,6 +354,79 @@ static inline int wait_for_ctrl_irq (struct controller *ctrl)
         return retval;
 }
 
+static inline void amd_pogo_errata_save_misc_reg(struct slot *p_slot)
+{
+        u32 pcix_misc2_temp;
+
+        /* save MiscII register */
+        pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp);
+
+        p_slot->ctrl->pcix_misc2_reg = pcix_misc2_temp;
+
+        /* clear SERR/PERR enable bits */
+        pcix_misc2_temp &= ~SERRFATALENABLE_MASK;
+        pcix_misc2_temp &= ~SERRNONFATALENABLE_MASK;
+        pcix_misc2_temp &= ~PERRFLOODENABLE_MASK;
+        pcix_misc2_temp &= ~PERRFATALENABLE_MASK;
+        pcix_misc2_temp &= ~PERRNONFATALENABLE_MASK;
+        pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, pcix_misc2_temp);
+}
+
+static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
+{
+        u32 pcix_misc2_temp;
+        u32 pcix_bridge_errors_reg;
+        u32 pcix_mem_base_reg;
+        u8  perr_set;
+        u8  rse_set;
+
+        /* write-one-to-clear Bridge_Errors[ PERR_OBSERVED ] */
+        pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MISC_BRIDGE_ERRORS_OFFSET, &pcix_bridge_errors_reg);
+        perr_set = pcix_bridge_errors_reg & PERR_OBSERVED_MASK;
+        if (perr_set) {
+                dbg ("%s  W1C: Bridge_Errors[ PERR_OBSERVED = %08X]\n",__FUNCTION__ , perr_set);
+
+                pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISC_BRIDGE_ERRORS_OFFSET, perr_set);
+        }
+
+        /* write-one-to-clear Memory_Base_Limit[ RSE ] */
+        pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, &pcix_mem_base_reg);
+        rse_set = pcix_mem_base_reg & RSE_MASK;
+        if (rse_set) {
+                dbg ("%s  W1C: Memory_Base_Limit[ RSE ]\n",__FUNCTION__ );
+
+                pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, rse_set);
+        }
+        /* restore MiscII register */
+        pci_read_config_dword( p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp );
+
+        if (p_slot->ctrl->pcix_misc2_reg & SERRFATALENABLE_MASK)
+                pcix_misc2_temp |= SERRFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~SERRFATALENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & SERRNONFATALENABLE_MASK)
+                pcix_misc2_temp |= SERRNONFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~SERRNONFATALENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & PERRFLOODENABLE_MASK)
+                pcix_misc2_temp |= PERRFLOODENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~PERRFLOODENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & PERRFATALENABLE_MASK)
+                pcix_misc2_temp |= PERRFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~PERRFATALENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & PERRNONFATALENABLE_MASK)
+                pcix_misc2_temp |= PERRNONFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~PERRNONFATALENABLE_MASK;
+        pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, pcix_misc2_temp);
+}
+
 #define SLOT_NAME_SIZE 10
 
 static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 25ccb0e47593..643252d9bf3b 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -894,7 +894,17 @@ int shpchp_enable_slot (struct slot *p_slot)
         dbg("%s: p_slot->pwr_save %x\n", __FUNCTION__, p_slot->pwr_save);
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
 
-        rc = board_added(p_slot);
+        if(((p_slot->ctrl->pci_dev->vendor == PCI_VENDOR_ID_AMD) ||
+            (p_slot->ctrl->pci_dev->device == PCI_DEVICE_ID_AMD_POGO_7458))
+             && p_slot->ctrl->num_slots == 1) {
+                /* handle amd pogo errata; this must be done before enable  */
+                amd_pogo_errata_save_misc_reg(p_slot);
+                rc = board_added(p_slot);
+                /* handle amd pogo errata; this must be done after enable  */
+                amd_pogo_errata_restore_misc_reg(p_slot);
+        } else
+                rc = board_added(p_slot);
+
         if (rc) {
                 p_slot->hpc_ops->get_adapter_status(p_slot,
                                 &(p_slot->presence_save));
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 202b7507a357..48723d6fa60f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -137,6 +137,8 @@ static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
                 break;
         }
 }
+#else
+#define set_msi_affinity NULL
 #endif /* CONFIG_SMP */
 
 static void mask_MSI_irq(unsigned int vector)
@@ -214,7 +216,7 @@ static struct hw_interrupt_type msix_irq_type = {
         .disable        = mask_MSI_irq,
         .ack            = mask_MSI_irq,
         .end            = end_msi_irq_w_maskbit,
-        .set_affinity   = set_msi_irq_affinity
+        .set_affinity   = set_msi_affinity
 };
 
 /*
@@ -230,7 +232,7 @@ static struct hw_interrupt_type msi_irq_w_maskbit_type = {
         .disable        = mask_MSI_irq,
         .ack            = mask_MSI_irq,
         .end            = end_msi_irq_w_maskbit,
-        .set_affinity   = set_msi_irq_affinity
+        .set_affinity   = set_msi_affinity
 };
 
 /*
@@ -246,7 +248,7 @@ static struct hw_interrupt_type msi_irq_wo_maskbit_type = {
         .disable        = do_nothing,
         .ack            = do_nothing,
         .end            = end_msi_irq_wo_maskbit,
-        .set_affinity   = set_msi_irq_affinity
+        .set_affinity   = set_msi_affinity
 };
 
 static void msi_data_init(struct msg_data *msi_data,
@@ -416,7 +418,9 @@ static void attach_msi_entry(struct msi_desc *entry, int vector)
 
 static void irq_handler_init(int cap_id, int pos, int mask)
 {
-        spin_lock(&irq_desc[pos].lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&irq_desc[pos].lock, flags);
         if (cap_id == PCI_CAP_ID_MSIX)
                 irq_desc[pos].handler = &msix_irq_type;
         else {
@@ -425,7 +429,7 @@ static void irq_handler_init(int cap_id, int pos, int mask)
                 else
                         irq_desc[pos].handler = &msi_irq_w_maskbit_type;
         }
-        spin_unlock(&irq_desc[pos].lock);
+        spin_unlock_irqrestore(&irq_desc[pos].lock, flags);
 }
 
 static void enable_msi_mode(struct pci_dev *dev, int pos, int type)
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index 402136a5c9e4..4ac52d441e47 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -22,12 +22,6 @@ extern int vector_irq[NR_VECTORS];
 extern void (*interrupt[NR_IRQS])(void);
 extern int pci_vector_resources(int last, int nr_released);
 
-#ifdef CONFIG_SMP
-#define set_msi_irq_affinity    set_msi_affinity
-#else
-#define set_msi_irq_affinity    NULL
-#endif
-
 /*
  * MSI-X Address Register
  */
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d2a633efa10a..d2d187916643 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -163,6 +163,7 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap)
         return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap);
 }
 
+#if 0
 /**
  * pci_find_ext_capability - Find an extended capability
  * @dev: PCI device to query
@@ -210,6 +211,7 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap)
 
         return 0;
 }
+#endif  /*  0  */
 
 /**
  * pci_find_parent_resource - return resource region of parent bus of given region
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 50d6685dcbcc..ea9277b7f899 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -112,6 +112,7 @@ pci_claim_resource(struct pci_dev *dev, int resource)
 
         return err;
 }
+EXPORT_SYMBOL_GPL(pci_claim_resource);
 
 int pci_assign_resource(struct pci_dev *dev, int resno)
 {
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 0ecbe4edbec1..aaa568a3806e 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -363,7 +363,7 @@ static int card_resume(struct pnp_dev *dev)
 
 int pnp_register_card_driver(struct pnp_card_driver * drv)
 {
-        int count = 0;
+        int count;
         struct list_head *pos, *temp;
 
         drv->link.name = drv->name;
@@ -374,10 +374,15 @@ int pnp_register_card_driver(struct pnp_card_driver * drv)
         drv->link.suspend = drv->suspend ? card_suspend : NULL;
         drv->link.resume = drv->resume ? card_resume : NULL;
 
+        count = pnp_register_driver(&drv->link);
+        if (count < 0)
+                return count;
+
         spin_lock(&pnp_lock);
         list_add_tail(&drv->global_list, &pnp_card_drivers);
         spin_unlock(&pnp_lock);
-        pnp_register_driver(&drv->link);
+
+        count = 0;
 
         list_for_each_safe(pos,temp,&pnp_cards){
                 struct pnp_card *card = list_entry(pos, struct pnp_card, global_list);
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 816479ad217b..f104577f73e0 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -27,12 +27,15 @@
 
 static int num = 0;
 
+/* We need only to blacklist devices that have already an acpi driver that
+ * can't use pnp layer. We don't need to blacklist device that are directly
+ * used by the kernel (PCI root, ...), as it is harmless and there were
+ * already present in pnpbios. But there is an exception for devices that
+ * have irqs (PIC, Timer) because we call acpi_register_gsi.
+ * Finaly only devices that have a CRS method need to be in this list.
+ */
 static char __initdata excluded_id_list[] =
-        "PNP0C0A," /* Battery */
-        "PNP0C0C,PNP0C0E,PNP0C0D," /* Button */
         "PNP0C09," /* EC */
-        "PNP0C0B," /* Fan */
-        "PNP0A03," /* PCI root */
         "PNP0C0F," /* Link device */
         "PNP0000," /* PIC */
         "PNP0100," /* Timer */
@@ -131,7 +134,8 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
         struct pnp_id *dev_id;
         struct pnp_dev *dev;
 
-        if (!ispnpidacpi(acpi_device_hid(device)) ||
+        status = acpi_get_handle(device->handle, "_CRS", &temp);
+        if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
                 is_exclusive_device(device))
                 return 0;
 
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 416d30debe6c..407b4eaddcbf 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2004 Matthieu Castet <castet.matthieu@free.fr>
  * Copyright (c) 2004 Li Shaohua <shaohua.li@intel.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
@@ -32,17 +32,17 @@
 /*
  * Allocated Resources
  */
-static int irq_flags(int edge_level, int active_high_low)
+static int irq_flags(int triggering, int polarity)
 {
         int flag;
-        if (edge_level == ACPI_LEVEL_SENSITIVE) {
-                if(active_high_low == ACPI_ACTIVE_LOW)
+        if (triggering == ACPI_LEVEL_SENSITIVE) {
+                if(polarity == ACPI_ACTIVE_LOW)
                         flag = IORESOURCE_IRQ_LOWLEVEL;
                 else
                         flag = IORESOURCE_IRQ_HIGHLEVEL;
         }
         else {
-                if(active_high_low == ACPI_ACTIVE_LOW)
+                if(polarity == ACPI_ACTIVE_LOW)
                         flag = IORESOURCE_IRQ_LOWEDGE;
                 else
                         flag = IORESOURCE_IRQ_HIGHEDGE;
@@ -50,31 +50,31 @@ static int irq_flags(int edge_level, int active_high_low)
         return flag;
 }
 
-static void decode_irq_flags(int flag, int *edge_level, int *active_high_low)
+static void decode_irq_flags(int flag, int *triggering, int *polarity)
 {
         switch (flag) {
         case IORESOURCE_IRQ_LOWLEVEL:
-                *edge_level = ACPI_LEVEL_SENSITIVE;
-                *active_high_low = ACPI_ACTIVE_LOW;
+                *triggering = ACPI_LEVEL_SENSITIVE;
+                *polarity = ACPI_ACTIVE_LOW;
                 break;
         case IORESOURCE_IRQ_HIGHLEVEL:  
-                *edge_level = ACPI_LEVEL_SENSITIVE;
-                *active_high_low = ACPI_ACTIVE_HIGH;
+                *triggering = ACPI_LEVEL_SENSITIVE;
+                *polarity = ACPI_ACTIVE_HIGH;
                 break;
         case IORESOURCE_IRQ_LOWEDGE:
-                *edge_level = ACPI_EDGE_SENSITIVE;
-                *active_high_low = ACPI_ACTIVE_LOW;
+                *triggering = ACPI_EDGE_SENSITIVE;
+                *polarity = ACPI_ACTIVE_LOW;
                 break;
         case IORESOURCE_IRQ_HIGHEDGE:
-                *edge_level = ACPI_EDGE_SENSITIVE;
-                *active_high_low = ACPI_ACTIVE_HIGH;
+                *triggering = ACPI_EDGE_SENSITIVE;
+                *polarity = ACPI_ACTIVE_HIGH;
                 break;
         }
 }
 
 static void
 pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
-        int edge_level, int active_high_low)
+        int triggering, int polarity)
 {
         int i = 0;
         int irq;
@@ -89,7 +89,7 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, u32 gsi,
                 return;
 
         res->irq_resource[i].flags = IORESOURCE_IRQ;  // Also clears _UNSET flag
-        irq = acpi_register_gsi(gsi, edge_level, active_high_low);
+        irq = acpi_register_gsi(gsi, triggering, polarity);
         if (irq < 0) {
                 res->irq_resource[i].flags |= IORESOURCE_DISABLED;
                 return;
@@ -163,77 +163,96 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
         struct pnp_resource_table * res_table = (struct pnp_resource_table *)data;
         int i;
 
-        switch (res->id) {
-        case ACPI_RSTYPE_IRQ:
+        switch (res->type) {
+        case ACPI_RESOURCE_TYPE_IRQ:
                 /*
                  * Per spec, only one interrupt per descriptor is allowed in
                  * _CRS, but some firmware violates this, so parse them all.
                  */
-                for (i = 0; i < res->data.irq.number_of_interrupts; i++) {
+                for (i = 0; i < res->data.irq.interrupt_count; i++) {
                         pnpacpi_parse_allocated_irqresource(res_table,
                                 res->data.irq.interrupts[i],
-                                res->data.irq.edge_level,
-                                res->data.irq.active_high_low);
+                                res->data.irq.triggering,
+                                res->data.irq.polarity);
                 }
                 break;
 
-        case ACPI_RSTYPE_EXT_IRQ:
-                for (i = 0; i < res->data.extended_irq.number_of_interrupts; i++) {
-                        pnpacpi_parse_allocated_irqresource(res_table,
-                                res->data.extended_irq.interrupts[i],
-                                res->data.extended_irq.edge_level,
-                                res->data.extended_irq.active_high_low);
-                }
-                break;
-        case ACPI_RSTYPE_DMA:
-                if (res->data.dma.number_of_channels > 0)
-                        pnpacpi_parse_allocated_dmaresource(res_table, 
+        case ACPI_RESOURCE_TYPE_DMA:
+                if (res->data.dma.channel_count > 0)
+                        pnpacpi_parse_allocated_dmaresource(res_table,
                                         res->data.dma.channels[0]);
                 break;
-        case ACPI_RSTYPE_IO:
-                pnpacpi_parse_allocated_ioresource(res_table, 
-                                res->data.io.min_base_address, 
-                                res->data.io.range_length);
+
+        case ACPI_RESOURCE_TYPE_IO:
+                pnpacpi_parse_allocated_ioresource(res_table,
+                                res->data.io.minimum,
+                                res->data.io.address_length);
                 break;
-        case ACPI_RSTYPE_FIXED_IO:
-                pnpacpi_parse_allocated_ioresource(res_table, 
-                                res->data.fixed_io.base_address, 
-                                res->data.fixed_io.range_length);
+
+        case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+        case ACPI_RESOURCE_TYPE_END_DEPENDENT:
                 break;
-        case ACPI_RSTYPE_MEM24:
-                pnpacpi_parse_allocated_memresource(res_table, 
-                                res->data.memory24.min_base_address, 
-                                res->data.memory24.range_length);
+
+        case ACPI_RESOURCE_TYPE_FIXED_IO:
+                pnpacpi_parse_allocated_ioresource(res_table,
+                                res->data.fixed_io.address,
+                                res->data.fixed_io.address_length);
+                break;
+
+        case ACPI_RESOURCE_TYPE_VENDOR:
                 break;
-        case ACPI_RSTYPE_MEM32:
-                pnpacpi_parse_allocated_memresource(res_table, 
-                                res->data.memory32.min_base_address, 
-                                res->data.memory32.range_length);
+
+        case ACPI_RESOURCE_TYPE_END_TAG:
+                break;
+
+        case ACPI_RESOURCE_TYPE_MEMORY24:
+                pnpacpi_parse_allocated_memresource(res_table,
+                                res->data.memory24.minimum,
+                                res->data.memory24.address_length);
                 break;
-        case ACPI_RSTYPE_FIXED_MEM32:
-                pnpacpi_parse_allocated_memresource(res_table, 
-                                res->data.fixed_memory32.range_base_address, 
-                                res->data.fixed_memory32.range_length);
+        case ACPI_RESOURCE_TYPE_MEMORY32:
+                pnpacpi_parse_allocated_memresource(res_table,
+                                res->data.memory32.minimum,
+                                res->data.memory32.address_length);
                 break;
-        case ACPI_RSTYPE_ADDRESS16:
-                pnpacpi_parse_allocated_memresource(res_table, 
-                                res->data.address16.min_address_range, 
+        case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+                pnpacpi_parse_allocated_memresource(res_table,
+                                res->data.fixed_memory32.address,
+                                res->data.fixed_memory32.address_length);
+                break;
+        case ACPI_RESOURCE_TYPE_ADDRESS16:
+                pnpacpi_parse_allocated_memresource(res_table,
+                                res->data.address16.minimum,
                                 res->data.address16.address_length);
                 break;
-        case ACPI_RSTYPE_ADDRESS32:
-                pnpacpi_parse_allocated_memresource(res_table, 
-                                res->data.address32.min_address_range, 
+        case ACPI_RESOURCE_TYPE_ADDRESS32:
+                pnpacpi_parse_allocated_memresource(res_table,
+                                res->data.address32.minimum,
                                 res->data.address32.address_length);
                 break;
-        case ACPI_RSTYPE_ADDRESS64:
-                pnpacpi_parse_allocated_memresource(res_table, 
-                res->data.address64.min_address_range, 
+        case ACPI_RESOURCE_TYPE_ADDRESS64:
+                pnpacpi_parse_allocated_memresource(res_table,
+                res->data.address64.minimum,
                 res->data.address64.address_length);
                 break;
-        case ACPI_RSTYPE_VENDOR:
+
+        case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
+                break;
+
+        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+                for (i = 0; i < res->data.extended_irq.interrupt_count; i++) {
+                        pnpacpi_parse_allocated_irqresource(res_table,
+                                res->data.extended_irq.interrupts[i],
+                                res->data.extended_irq.triggering,
+                                res->data.extended_irq.polarity);
+                }
+                break;
+
+        case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
                 break;
+
         default:
-                pnp_warn("PnPACPI: unknown resource type %d", res->id);
+                pnp_warn("PnPACPI: unknown resource type %d", res->type);
                 return AE_ERROR;
         }
                         
@@ -253,13 +272,13 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso
         int i;
         struct pnp_dma * dma;
 
-        if (p->number_of_channels == 0)
+        if (p->channel_count == 0)
                 return;
         dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL);
         if (!dma)
                 return;
 
-        for(i = 0; i < p->number_of_channels; i++)
+        for(i = 0; i < p->channel_count; i++)
                 dma->map |= 1 << p->channels[i];
         dma->flags = 0;
         if (p->bus_master)
@@ -309,37 +328,37 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option,
         int i;
         struct pnp_irq * irq;
         
-        if (p->number_of_interrupts == 0)
+        if (p->interrupt_count == 0)
                 return;
         irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
-        for(i = 0; i < p->number_of_interrupts; i++)
+        for(i = 0; i < p->interrupt_count; i++)
                 if (p->interrupts[i])
                         __set_bit(p->interrupts[i], irq->map);
-        irq->flags = irq_flags(p->edge_level, p->active_high_low);
+        irq->flags = irq_flags(p->triggering, p->polarity);
 
         pnp_register_irq_resource(option, irq);
         return;
 }
 
 static void pnpacpi_parse_ext_irq_option(struct pnp_option *option,
-        struct acpi_resource_ext_irq *p)
+        struct acpi_resource_extended_irq *p)
 {
         int i;
         struct pnp_irq * irq;
 
-        if (p->number_of_interrupts == 0)
+        if (p->interrupt_count == 0)
                 return;
         irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL);
         if (!irq)
                 return;
 
-        for(i = 0; i < p->number_of_interrupts; i++)
+        for(i = 0; i < p->interrupt_count; i++)
                 if (p->interrupts[i])
                         __set_bit(p->interrupts[i], irq->map);
-        irq->flags = irq_flags(p->edge_level, p->active_high_low);
+        irq->flags = irq_flags(p->triggering, p->polarity);
 
         pnp_register_irq_resource(option, irq);
         return;
@@ -351,16 +370,16 @@ pnpacpi_parse_port_option(struct pnp_option *option,
 {
         struct pnp_port * port;
 
-        if (io->range_length == 0)
+        if (io->address_length == 0)
                 return;
         port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
-        port->min = io->min_base_address;
-        port->max = io->max_base_address;
+        port->min = io->minimum;
+        port->max = io->maximum;
         port->align = io->alignment;
-        port->size = io->range_length;
-        port->flags = ACPI_DECODE_16 == io->io_decode ? 
+        port->size = io->address_length;
+        port->flags = ACPI_DECODE_16 == io->io_decode ?
                 PNP_PORT_FLAG_16BITADDR : 0;
         pnp_register_port_resource(option,port);
         return;
@@ -372,13 +391,13 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
 {
         struct pnp_port * port;
 
-        if (io->range_length == 0)
+        if (io->address_length == 0)
                 return;
         port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
         if (!port)
                 return;
-        port->min = port->max = io->base_address;
-        port->size = io->range_length;
+        port->min = port->max = io->address;
+        port->size = io->address_length;
         port->align = 0;
         port->flags = PNP_PORT_FLAG_FIXED;
         pnp_register_port_resource(option,port);
@@ -387,21 +406,21 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option,
 
 static void
 pnpacpi_parse_mem24_option(struct pnp_option *option,
-        struct acpi_resource_mem24 *p)
+        struct acpi_resource_memory24 *p)
 {
         struct pnp_mem * mem;
 
-        if (p->range_length == 0)
+        if (p->address_length == 0)
                 return;
         mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
-        mem->min = p->min_base_address;
-        mem->max = p->max_base_address;
+        mem->min = p->minimum;
+        mem->max = p->maximum;
         mem->align = p->alignment;
-        mem->size = p->range_length;
+        mem->size = p->address_length;
 
-        mem->flags = (ACPI_READ_WRITE_MEMORY == p->read_write_attribute) ?
+        mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                         IORESOURCE_MEM_WRITEABLE : 0;
 
         pnp_register_mem_resource(option,mem);
@@ -410,21 +429,21 @@ pnpacpi_parse_mem24_option(struct pnp_option *option,
 
 static void
 pnpacpi_parse_mem32_option(struct pnp_option *option,
-        struct acpi_resource_mem32 *p)
+        struct acpi_resource_memory32 *p)
 {
         struct pnp_mem * mem;
 
-        if (p->range_length == 0)
+        if (p->address_length == 0)
                 return;
         mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
-        mem->min = p->min_base_address;
-        mem->max = p->max_base_address;
+        mem->min = p->minimum;
+        mem->max = p->maximum;
         mem->align = p->alignment;
-        mem->size = p->range_length;
+        mem->size = p->address_length;
 
-        mem->flags = (ACPI_READ_WRITE_MEMORY == p->read_write_attribute) ?
+        mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                         IORESOURCE_MEM_WRITEABLE : 0;
 
         pnp_register_mem_resource(option,mem);
@@ -433,33 +452,72 @@ pnpacpi_parse_mem32_option(struct pnp_option *option,
 
 static void
 pnpacpi_parse_fixed_mem32_option(struct pnp_option *option,
-        struct acpi_resource_fixed_mem32 *p)
+        struct acpi_resource_fixed_memory32 *p)
 {
         struct pnp_mem * mem;
 
-        if (p->range_length == 0)
+        if (p->address_length == 0)
                 return;
         mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
         if (!mem)
                 return;
-        mem->min = mem->max = p->range_base_address;
-        mem->size = p->range_length;
+        mem->min = mem->max = p->address;
+        mem->size = p->address_length;
         mem->align = 0;
 
-        mem->flags = (ACPI_READ_WRITE_MEMORY == p->read_write_attribute) ?
+        mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
                         IORESOURCE_MEM_WRITEABLE : 0;
 
         pnp_register_mem_resource(option,mem);
         return;
 }
 
+static void
+pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r)
+{
+        struct acpi_resource_address64 addr, *p = &addr;
+        acpi_status status;
+        struct pnp_mem * mem;
+        struct pnp_port * port;
+
+        status = acpi_resource_to_address64(r, p);
+        if (!ACPI_SUCCESS(status)) {
+                pnp_warn("PnPACPI: failed to convert resource type %d", r->type);
+                return;
+        }
+
+        if (p->address_length == 0)
+                return;
+
+        if (p->resource_type == ACPI_MEMORY_RANGE) {
+                mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL);
+                if (!mem)
+                        return;
+                mem->min = mem->max = p->minimum;
+                mem->size = p->address_length;
+                mem->align = 0;
+                mem->flags = (p->info.mem.write_protect ==
+                    ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0;
+                pnp_register_mem_resource(option,mem);
+        } else if (p->resource_type == ACPI_IO_RANGE) {
+                port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL);
+                if (!port)
+                        return;
+                port->min = port->max = p->minimum;
+                port->size = p->address_length;
+                port->align = 0;
+                port->flags = PNP_PORT_FLAG_FIXED;
+                pnp_register_port_resource(option,port);
+        }
+}
+
 struct acpipnp_parse_option_s {
         struct pnp_option *option;
         struct pnp_option *option_independent;
         struct pnp_dev *dev;
 };
 
-static acpi_status pnpacpi_option_resource(struct acpi_resource *res, 
+static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
         void *data)
 {
         int priority = 0;
@@ -467,35 +525,16 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
         struct pnp_dev *dev = parse_data->dev;
         struct pnp_option *option = parse_data->option;
 
-        switch (res->id) {
-                case ACPI_RSTYPE_IRQ:
+        switch (res->type) {
+                case ACPI_RESOURCE_TYPE_IRQ:
                         pnpacpi_parse_irq_option(option, &res->data.irq);
                         break;
-                case ACPI_RSTYPE_EXT_IRQ:
-                        pnpacpi_parse_ext_irq_option(option,
-                                &res->data.extended_irq);
-                        break;
-                case ACPI_RSTYPE_DMA:
+
+                case ACPI_RESOURCE_TYPE_DMA:
                         pnpacpi_parse_dma_option(option, &res->data.dma);       
                         break;
-                case ACPI_RSTYPE_IO:
-                        pnpacpi_parse_port_option(option, &res->data.io);
-                        break;
-                case ACPI_RSTYPE_FIXED_IO:
-                        pnpacpi_parse_fixed_port_option(option,
-                                &res->data.fixed_io);
-                        break;
-                case ACPI_RSTYPE_MEM24:
-                        pnpacpi_parse_mem24_option(option, &res->data.memory24);
-                        break;
-                case ACPI_RSTYPE_MEM32:
-                        pnpacpi_parse_mem32_option(option, &res->data.memory32);
-                        break;
-                case ACPI_RSTYPE_FIXED_MEM32:
-                        pnpacpi_parse_fixed_mem32_option(option,
-                                &res->data.fixed_memory32);
-                        break;
-                case ACPI_RSTYPE_START_DPF:
+
+                case ACPI_RESOURCE_TYPE_START_DEPENDENT:
                         switch (res->data.start_dpf.compatibility_priority) {
                                 case ACPI_GOOD_CONFIGURATION:
                                         priority = PNP_RES_PRIORITY_PREFERRED;
@@ -518,7 +557,8 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                                 return AE_ERROR;
                         parse_data->option = option;    
                         break;
-                case ACPI_RSTYPE_END_DPF:
+
+                case ACPI_RESOURCE_TYPE_END_DEPENDENT:
                         /*only one EndDependentFn is allowed*/
                         if (!parse_data->option_independent) {
                                 pnp_warn("PnPACPI: more than one EndDependentFn");
@@ -527,15 +567,59 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                         parse_data->option = parse_data->option_independent;
                         parse_data->option_independent = NULL;
                         break;
+
+                case ACPI_RESOURCE_TYPE_IO:
+                        pnpacpi_parse_port_option(option, &res->data.io);
+                        break;
+
+                case ACPI_RESOURCE_TYPE_FIXED_IO:
+                        pnpacpi_parse_fixed_port_option(option,
+                                &res->data.fixed_io);
+                        break;
+
+                case ACPI_RESOURCE_TYPE_VENDOR:
+                case ACPI_RESOURCE_TYPE_END_TAG:
+                        break;
+
+                case ACPI_RESOURCE_TYPE_MEMORY24:
+                        pnpacpi_parse_mem24_option(option, &res->data.memory24);
+                        break;
+
+                case ACPI_RESOURCE_TYPE_MEMORY32:
+                        pnpacpi_parse_mem32_option(option, &res->data.memory32);
+                        break;
+
+                case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+                        pnpacpi_parse_fixed_mem32_option(option,
+                                &res->data.fixed_memory32);
+                        break;
+
+                case ACPI_RESOURCE_TYPE_ADDRESS16:
+                case ACPI_RESOURCE_TYPE_ADDRESS32:
+                case ACPI_RESOURCE_TYPE_ADDRESS64:
+                        pnpacpi_parse_address_option(option, res);
+                        break;
+
+                case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
+                        break;
+
+                case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+                        pnpacpi_parse_ext_irq_option(option,
+                                &res->data.extended_irq);
+                        break;
+
+                case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
+                        break;
+
                 default:
-                        pnp_warn("PnPACPI: unknown resource type %d", res->id);
+                        pnp_warn("PnPACPI: unknown resource type %d", res->type);
                         return AE_ERROR;
         }
                         
         return AE_OK;
 }
 
-acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle, 
+acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle,
         struct pnp_dev *dev)
 {
         acpi_status status;
@@ -546,7 +630,7 @@ acpi_status pnpacpi_parse_resource_option_data(acpi_handle handle,
                 return AE_ERROR;
         parse_data.option_independent = parse_data.option;
         parse_data.dev = dev;
-        status = acpi_walk_resources(handle, METHOD_NAME__PRS, 
+        status = acpi_walk_resources(handle, METHOD_NAME__PRS,
                 pnpacpi_option_resource, &parse_data);
 
         return status;
@@ -559,21 +643,24 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
         void *data)
 {
         int *res_cnt = (int *)data;
-        switch (res->id) {
-        case ACPI_RSTYPE_IRQ:
-        case ACPI_RSTYPE_EXT_IRQ:
-        case ACPI_RSTYPE_DMA:
-        case ACPI_RSTYPE_IO:
-        case ACPI_RSTYPE_FIXED_IO:
-        case ACPI_RSTYPE_MEM24:
-        case ACPI_RSTYPE_MEM32:
-        case ACPI_RSTYPE_FIXED_MEM32:
-#if 0
-        case ACPI_RSTYPE_ADDRESS16:
-        case ACPI_RSTYPE_ADDRESS32:
-        case ACPI_RSTYPE_ADDRESS64:
-#endif
+        switch (res->type) {
+        case ACPI_RESOURCE_TYPE_IRQ:
+        case ACPI_RESOURCE_TYPE_DMA:
+        case ACPI_RESOURCE_TYPE_IO:
+        case ACPI_RESOURCE_TYPE_FIXED_IO:
+        case ACPI_RESOURCE_TYPE_MEMORY24:
+        case ACPI_RESOURCE_TYPE_MEMORY32:
+        case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+        case ACPI_RESOURCE_TYPE_ADDRESS16:
+        case ACPI_RESOURCE_TYPE_ADDRESS32:
+        case ACPI_RESOURCE_TYPE_ADDRESS64:
+        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
                 (*res_cnt) ++;
+        case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+        case ACPI_RESOURCE_TYPE_END_DEPENDENT:
+        case ACPI_RESOURCE_TYPE_VENDOR:
+        case ACPI_RESOURCE_TYPE_END_TAG:
+        case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
         default:
                 return AE_OK;
         }
@@ -584,22 +671,25 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
         void *data)
 {
         struct acpi_resource **resource = (struct acpi_resource **)data;        
-        switch (res->id) {
-        case ACPI_RSTYPE_IRQ:
-        case ACPI_RSTYPE_EXT_IRQ:
-        case ACPI_RSTYPE_DMA:
-        case ACPI_RSTYPE_IO:
-        case ACPI_RSTYPE_FIXED_IO:
-        case ACPI_RSTYPE_MEM24:
-        case ACPI_RSTYPE_MEM32:
-        case ACPI_RSTYPE_FIXED_MEM32:
-#if 0
-        case ACPI_RSTYPE_ADDRESS16:
-        case ACPI_RSTYPE_ADDRESS32:
-        case ACPI_RSTYPE_ADDRESS64:
-#endif
-                (*resource)->id = res->id;
+        switch (res->type) {
+        case ACPI_RESOURCE_TYPE_IRQ:
+        case ACPI_RESOURCE_TYPE_DMA:
+        case ACPI_RESOURCE_TYPE_IO:
+        case ACPI_RESOURCE_TYPE_FIXED_IO:
+        case ACPI_RESOURCE_TYPE_MEMORY24:
+        case ACPI_RESOURCE_TYPE_MEMORY32:
+        case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+        case ACPI_RESOURCE_TYPE_ADDRESS16:
+        case ACPI_RESOURCE_TYPE_ADDRESS32:
+        case ACPI_RESOURCE_TYPE_ADDRESS64:
+        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+                (*resource)->type = res->type;
                 (*resource)++;
+        case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+        case ACPI_RESOURCE_TYPE_END_DEPENDENT:
+        case ACPI_RESOURCE_TYPE_VENDOR:
+        case ACPI_RESOURCE_TYPE_END_TAG:
+        case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
         default:
                 return AE_OK;
         }
@@ -607,14 +697,14 @@ static acpi_status pnpacpi_type_resources(struct acpi_resource *res,
         return AE_OK;
 }
 
-int pnpacpi_build_resource_template(acpi_handle handle, 
+int pnpacpi_build_resource_template(acpi_handle handle,
         struct acpi_buffer *buffer)
 {
         struct acpi_resource *resource;
         int res_cnt = 0;
         acpi_status status;
 
-        status = acpi_walk_resources(handle, METHOD_NAME__CRS, 
+        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
                 pnpacpi_count_resources, &res_cnt);
         if (ACPI_FAILURE(status)) {
                 pnp_err("Evaluate _CRS failed");
@@ -628,7 +718,7 @@ int pnpacpi_build_resource_template(acpi_handle handle,
                 return -ENOMEM;
         pnp_dbg("Res cnt %d", res_cnt);
         resource = (struct acpi_resource *)buffer->pointer;
-        status = acpi_walk_resources(handle, METHOD_NAME__CRS, 
+        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
                 pnpacpi_type_resources, &resource);
         if (ACPI_FAILURE(status)) {
                 kfree(buffer->pointer);
@@ -636,54 +726,54 @@ int pnpacpi_build_resource_template(acpi_handle handle,
                 return -EINVAL;
         }
         /* resource will pointer the end resource now */
-        resource->id = ACPI_RSTYPE_END_TAG;
+        resource->type = ACPI_RESOURCE_TYPE_END_TAG;
 
         return 0;
 }
 
-static void pnpacpi_encode_irq(struct acpi_resource *resource, 
+static void pnpacpi_encode_irq(struct acpi_resource *resource,
         struct resource *p)
 {
-        int edge_level, active_high_low;
+        int triggering, polarity;
         
-        decode_irq_flags(p->flags & IORESOURCE_BITS, &edge_level, 
-                &active_high_low);
-        resource->id = ACPI_RSTYPE_IRQ;
+        decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,
+                &polarity);
+        resource->type = ACPI_RESOURCE_TYPE_IRQ;
         resource->length = sizeof(struct acpi_resource);
-        resource->data.irq.edge_level = edge_level;
-        resource->data.irq.active_high_low = active_high_low;
-        if (edge_level == ACPI_EDGE_SENSITIVE)
-                resource->data.irq.shared_exclusive = ACPI_EXCLUSIVE;
+        resource->data.irq.triggering = triggering;
+        resource->data.irq.polarity = polarity;
+        if (triggering == ACPI_EDGE_SENSITIVE)
+                resource->data.irq.sharable = ACPI_EXCLUSIVE;
         else
-                resource->data.irq.shared_exclusive = ACPI_SHARED;
-        resource->data.irq.number_of_interrupts = 1;
+                resource->data.irq.sharable = ACPI_SHARED;
+        resource->data.irq.interrupt_count = 1;
         resource->data.irq.interrupts[0] = p->start;
 }
 
 static void pnpacpi_encode_ext_irq(struct acpi_resource *resource,
         struct resource *p)
 {
-        int edge_level, active_high_low;
+        int triggering, polarity;
         
-        decode_irq_flags(p->flags & IORESOURCE_BITS, &edge_level, 
-                &active_high_low);
-        resource->id = ACPI_RSTYPE_EXT_IRQ;
+        decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering,
+                &polarity);
+        resource->type = ACPI_RESOURCE_TYPE_EXTENDED_IRQ;
         resource->length = sizeof(struct acpi_resource);
         resource->data.extended_irq.producer_consumer = ACPI_CONSUMER;
-        resource->data.extended_irq.edge_level = edge_level;
-        resource->data.extended_irq.active_high_low = active_high_low;
-        if (edge_level == ACPI_EDGE_SENSITIVE)
-                resource->data.irq.shared_exclusive = ACPI_EXCLUSIVE;
+        resource->data.extended_irq.triggering = triggering;
+        resource->data.extended_irq.polarity = polarity;
+        if (triggering == ACPI_EDGE_SENSITIVE)
+                resource->data.irq.sharable = ACPI_EXCLUSIVE;
         else
-                resource->data.irq.shared_exclusive = ACPI_SHARED;
-        resource->data.extended_irq.number_of_interrupts = 1;
+                resource->data.irq.sharable = ACPI_SHARED;
+        resource->data.extended_irq.interrupt_count = 1;
         resource->data.extended_irq.interrupts[0] = p->start;
 }
 
 static void pnpacpi_encode_dma(struct acpi_resource *resource,
         struct resource *p)
 {
-        resource->id = ACPI_RSTYPE_DMA;
+        resource->type = ACPI_RESOURCE_TYPE_DMA;
         resource->length = sizeof(struct acpi_resource);
         /* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
         if (p->flags & IORESOURCE_DMA_COMPATIBLE)
@@ -701,75 +791,75 @@ static void pnpacpi_encode_dma(struct acpi_resource *resource,
         else if (p->flags & IORESOURCE_DMA_16BIT)
                 resource->data.dma.transfer = ACPI_TRANSFER_16;
         resource->data.dma.bus_master = p->flags & IORESOURCE_DMA_MASTER;
-        resource->data.dma.number_of_channels = 1;
+        resource->data.dma.channel_count = 1;
         resource->data.dma.channels[0] = p->start;
 }
 
 static void pnpacpi_encode_io(struct acpi_resource *resource,
         struct resource *p)
 {
-        resource->id = ACPI_RSTYPE_IO;
+        resource->type = ACPI_RESOURCE_TYPE_IO;
         resource->length = sizeof(struct acpi_resource);
         /* Note: pnp_assign_port will copy pnp_port->flags into p->flags */
         resource->data.io.io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR)?
-                ACPI_DECODE_16 : ACPI_DECODE_10; 
-        resource->data.io.min_base_address = p->start;
-        resource->data.io.max_base_address = p->end;
+                ACPI_DECODE_16 : ACPI_DECODE_10;
+        resource->data.io.minimum = p->start;
+        resource->data.io.maximum = p->end;
         resource->data.io.alignment = 0; /* Correct? */
-        resource->data.io.range_length = p->end - p->start + 1;
+        resource->data.io.address_length = p->end - p->start + 1;
 }
 
 static void pnpacpi_encode_fixed_io(struct acpi_resource *resource,
         struct resource *p)
 {
-        resource->id = ACPI_RSTYPE_FIXED_IO;
+        resource->type = ACPI_RESOURCE_TYPE_FIXED_IO;
         resource->length = sizeof(struct acpi_resource);
-        resource->data.fixed_io.base_address = p->start;
-        resource->data.fixed_io.range_length = p->end - p->start + 1;
+        resource->data.fixed_io.address = p->start;
+        resource->data.fixed_io.address_length = p->end - p->start + 1;
 }
 
 static void pnpacpi_encode_mem24(struct acpi_resource *resource,
         struct resource *p)
 {
-        resource->id = ACPI_RSTYPE_MEM24;
+        resource->type = ACPI_RESOURCE_TYPE_MEMORY24;
         resource->length = sizeof(struct acpi_resource);
         /* Note: pnp_assign_mem will copy pnp_mem->flags into p->flags */
-        resource->data.memory24.read_write_attribute =
+        resource->data.memory24.write_protect =
                 (p->flags & IORESOURCE_MEM_WRITEABLE) ?
                 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
-        resource->data.memory24.min_base_address = p->start;
-        resource->data.memory24.max_base_address = p->end;
+        resource->data.memory24.minimum = p->start;
+        resource->data.memory24.maximum = p->end;
         resource->data.memory24.alignment = 0;
-        resource->data.memory24.range_length = p->end - p->start + 1;
+        resource->data.memory24.address_length = p->end - p->start + 1;
 }
 
 static void pnpacpi_encode_mem32(struct acpi_resource *resource,
         struct resource *p)
 {
-        resource->id = ACPI_RSTYPE_MEM32;
+        resource->type = ACPI_RESOURCE_TYPE_MEMORY32;
         resource->length = sizeof(struct acpi_resource);
-        resource->data.memory32.read_write_attribute =
+        resource->data.memory32.write_protect =
                 (p->flags & IORESOURCE_MEM_WRITEABLE) ?
                 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
-        resource->data.memory32.min_base_address = p->start;
-        resource->data.memory32.max_base_address = p->end;
+        resource->data.memory32.minimum = p->start;
+        resource->data.memory32.maximum = p->end;
         resource->data.memory32.alignment = 0;
-        resource->data.memory32.range_length = p->end - p->start + 1;
+        resource->data.memory32.address_length = p->end - p->start + 1;
 }
 
 static void pnpacpi_encode_fixed_mem32(struct acpi_resource *resource,
         struct resource *p)
 {
-        resource->id = ACPI_RSTYPE_FIXED_MEM32;
+        resource->type = ACPI_RESOURCE_TYPE_FIXED_MEMORY32;
         resource->length = sizeof(struct acpi_resource);
-        resource->data.fixed_memory32.read_write_attribute =
+        resource->data.fixed_memory32.write_protect =
                 (p->flags & IORESOURCE_MEM_WRITEABLE) ?
                 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
-        resource->data.fixed_memory32.range_base_address = p->start;
-        resource->data.fixed_memory32.range_length = p->end - p->start + 1;
+        resource->data.fixed_memory32.address = p->start;
+        resource->data.fixed_memory32.address_length = p->end - p->start + 1;
 }
 
-int pnpacpi_encode_resources(struct pnp_resource_table *res_table, 
+int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
         struct acpi_buffer *buffer)
 {
         int i = 0;
@@ -780,58 +870,67 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
 
         pnp_dbg("res cnt %d", res_cnt);
         while (i < res_cnt) {
-                switch(resource->id) {
-                case ACPI_RSTYPE_IRQ:
+                switch(resource->type) {
+                case ACPI_RESOURCE_TYPE_IRQ:
                         pnp_dbg("Encode irq");
-                        pnpacpi_encode_irq(resource, 
+                        pnpacpi_encode_irq(resource,
                                 &res_table->irq_resource[irq]);
                         irq++;
                         break;
 
-                case ACPI_RSTYPE_EXT_IRQ:
-                        pnp_dbg("Encode ext irq");
-                        pnpacpi_encode_ext_irq(resource, 
-                                &res_table->irq_resource[irq]);
-                        irq++;
-                        break;
-                case ACPI_RSTYPE_DMA:
+                case ACPI_RESOURCE_TYPE_DMA:
                         pnp_dbg("Encode dma");
-                        pnpacpi_encode_dma(resource, 
+                        pnpacpi_encode_dma(resource,
                                 &res_table->dma_resource[dma]);
                         dma ++;
                         break;
-                case ACPI_RSTYPE_IO:
+                case ACPI_RESOURCE_TYPE_IO:
                         pnp_dbg("Encode io");
-                        pnpacpi_encode_io(resource, 
+                        pnpacpi_encode_io(resource,
                                 &res_table->port_resource[port]);
                         port ++;
                         break;
-                case ACPI_RSTYPE_FIXED_IO:
+                case ACPI_RESOURCE_TYPE_FIXED_IO:
                         pnp_dbg("Encode fixed io");
                         pnpacpi_encode_fixed_io(resource,
                                 &res_table->port_resource[port]);
                         port ++;
                         break;
-                case ACPI_RSTYPE_MEM24:
+                case ACPI_RESOURCE_TYPE_MEMORY24:
                         pnp_dbg("Encode mem24");
                         pnpacpi_encode_mem24(resource,
                                 &res_table->mem_resource[mem]);
                         mem ++;
                         break;
-                case ACPI_RSTYPE_MEM32:
+                case ACPI_RESOURCE_TYPE_MEMORY32:
                         pnp_dbg("Encode mem32");
                         pnpacpi_encode_mem32(resource,
                                 &res_table->mem_resource[mem]);
                         mem ++;
                         break;
-                case ACPI_RSTYPE_FIXED_MEM32:
+                case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
                         pnp_dbg("Encode fixed mem32");
                         pnpacpi_encode_fixed_mem32(resource,
                                 &res_table->mem_resource[mem]);
                         mem ++;
                         break;
+                case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+                        pnp_dbg("Encode ext irq");
+                        pnpacpi_encode_ext_irq(resource,
+                                &res_table->irq_resource[irq]);
+                        irq++;
+                        break;
+                case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+                case ACPI_RESOURCE_TYPE_END_DEPENDENT:
+                case ACPI_RESOURCE_TYPE_VENDOR:
+                case ACPI_RESOURCE_TYPE_END_TAG:
+                case ACPI_RESOURCE_TYPE_ADDRESS16:
+                case ACPI_RESOURCE_TYPE_ADDRESS32:
+                case ACPI_RESOURCE_TYPE_ADDRESS64:
+                case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
+                case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
                 default: /* other type */
-                        pnp_warn("unknown resource type %d", resource->id);
+                        pnp_warn("unknown resource type %d", resource->type);
                         return -EINVAL;
                 }
                 resource ++;
diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index a86a650f3d6d..721787cc5a1c 100644
--- a/drivers/s390/Kconfig
+++ b/drivers/s390/Kconfig
@@ -51,6 +51,13 @@ config UNIX98_PTY_COUNT
           When not in use, each additional set of 256 PTYs occupy
           approximately 8 KB of kernel memory on 32-bit architectures.
 
+config HANGCHECK_TIMER
+        tristate "Hangcheck timer"
+        help
+          The hangcheck-timer module detects when the system has gone
+          out to lunch past a certain margin.  It can reboot the system
+          or merely print a warning.
+
 source "drivers/char/watchdog/Kconfig"
 
 comment "S/390 character device drivers"
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 6f50cc9323d9..6912399d0937 100644
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -55,13 +55,21 @@ config DASD_DIAG
           Disks under VM.  If you are not running under VM or unsure what it is,
           say "N".
 
+config DASD_EER
+        tristate "Extended error reporting (EER)"
+        depends on DASD
+        help
+          This driver provides a character device interface to the
+          DASD extended error reporting. This is only needed if you want to
+          use applications written for the EER facility.
+
 config DASD_CMB
         tristate "Compatibility interface for DASD channel measurement blocks"
         depends on DASD
         help
-          This driver provides an additional interface to the channel measurement
-          facility, which is normally accessed though sysfs, with a set of
-          ioctl functions specific to the dasd driver.
+          This driver provides an additional interface to the channel
+          measurement facility, which is normally accessed though sysfs, with
+          a set of ioctl functions specific to the dasd driver.
           This is only needed if you want to use applications written for
           linux-2.4 dasd channel measurement facility interface.
 
diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile
index 58c6780134f7..0c0d871e8f51 100644
--- a/drivers/s390/block/Makefile
+++ b/drivers/s390/block/Makefile
@@ -5,6 +5,7 @@
 dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o
 dasd_fba_mod-objs  := dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o
 dasd_diag_mod-objs := dasd_diag.o
+dasd_eer_mod-objs := dasd_eer.o
 dasd_mod-objs      := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \
                         dasd_genhd.o dasd_erp.o
 
@@ -13,5 +14,6 @@ obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o
 obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
 obj-$(CONFIG_DASD_FBA)  += dasd_fba_mod.o
 obj-$(CONFIG_DASD_CMB)  += dasd_cmb.o
+obj-$(CONFIG_DASD_EER)  += dasd_eer.o
 obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
 obj-$(CONFIG_DCSSBLK) += dcssblk.o
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index ef4c687e7c01..08c88fcd8963 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -7,7 +7,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
- * $Revision: 1.172 $
  */
 
 #include <linux/config.h>
@@ -19,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/buffer_head.h>
 #include <linux/hdreg.h>
+#include <linux/notifier.h>
 
 #include <asm/ccwdev.h>
 #include <asm/ebcdic.h>
@@ -58,6 +58,7 @@ static void dasd_int_handler(struct ccw_device *, unsigned long, struct irb *);
 static void dasd_flush_ccw_queue(struct dasd_device *, int);
 static void dasd_tasklet(struct dasd_device *);
 static void do_kick_device(void *data);
+static void dasd_disable_eer(struct dasd_device *device);
 
 /*
  * SECTION: Operations on the device structure.
@@ -152,6 +153,8 @@ dasd_state_new_to_known(struct dasd_device *device)
 static inline void
 dasd_state_known_to_new(struct dasd_device * device)
 {
+        /* disable extended error reporting for this device */
+        dasd_disable_eer(device);
         /* Forget the discipline information. */
         device->discipline = NULL;
         device->state = DASD_STATE_NEW;
@@ -675,11 +678,8 @@ dasd_term_IO(struct dasd_ccw_req * cqr)
                 rc = ccw_device_clear(device->cdev, (long) cqr);
                 switch (rc) {
                 case 0: /* termination successful */
-                        if (cqr->retries > 0) {
-                                cqr->retries--;
-                                cqr->status = DASD_CQR_CLEAR;
-                        } else
-                                cqr->status = DASD_CQR_FAILED;
+                        cqr->retries--;
+                        cqr->status = DASD_CQR_CLEAR;
                         cqr->stopclk = get_clock();
                         DBF_DEV_EVENT(DBF_DEBUG, device,
                                       "terminate cqr %p successful",
@@ -871,6 +871,9 @@ dasd_handle_state_change_pending(struct dasd_device *device)
         struct dasd_ccw_req *cqr;
         struct list_head *l, *n;
 
+        /* first of all call extended error reporting */
+        dasd_write_eer_trigger(DASD_EER_STATECHANGE, device, NULL);
+
         device->stopped &= ~DASD_STOPPED_PENDING;
 
         /* restart all 'running' IO on queue */
@@ -1090,6 +1093,19 @@ restart:
                         }
                         goto restart;
                 }
+
+                /* first of all call extended error reporting */
+                if (device->eer && cqr->status == DASD_CQR_FAILED) {
+                        dasd_write_eer_trigger(DASD_EER_FATALERROR,
+                                               device, cqr);
+
+                        /* restart request  */
+                        cqr->status = DASD_CQR_QUEUED;
+                        cqr->retries = 255;
+                        device->stopped |= DASD_STOPPED_QUIESCE;
+                        goto restart;
+                }
+
                 /* Process finished ERP request. */
                 if (cqr->refers) {
                         __dasd_process_erp(device, cqr);
@@ -1227,7 +1243,8 @@ __dasd_start_head(struct dasd_device * device)
         cqr = list_entry(device->ccw_queue.next, struct dasd_ccw_req, list);
         /* check FAILFAST */
         if (device->stopped & ~DASD_STOPPED_PENDING &&
-            test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags)) {
+            test_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags) &&
+            (!device->eer)) {
                 cqr->status = DASD_CQR_FAILED;
                 dasd_schedule_bh(device);
         }
@@ -1308,7 +1325,7 @@ dasd_tasklet(struct dasd_device * device)
         /* Now call the callback function of requests with final status */
         list_for_each_safe(l, n, &final_queue) {
                 cqr = list_entry(l, struct dasd_ccw_req, list);
-                list_del(&cqr->list);
+                list_del_init(&cqr->list);
                 if (cqr->callback != NULL)
                         (cqr->callback)(cqr, cqr->callback_data);
         }
@@ -1393,7 +1410,9 @@ _wait_for_wakeup(struct dasd_ccw_req *cqr)
 
         device = cqr->device;
         spin_lock_irq(get_ccwdev_lock(device->cdev));
-        rc = cqr->status == DASD_CQR_DONE || cqr->status == DASD_CQR_FAILED;
+        rc = ((cqr->status == DASD_CQR_DONE ||
+               cqr->status == DASD_CQR_FAILED) &&
+              list_empty(&cqr->list));
         spin_unlock_irq(get_ccwdev_lock(device->cdev));
         return rc;
 }
@@ -1457,15 +1476,37 @@ dasd_sleep_on_interruptible(struct dasd_ccw_req * cqr)
         while (!finished) {
                 rc = wait_event_interruptible(wait_q, _wait_for_wakeup(cqr));
                 if (rc != -ERESTARTSYS) {
-                        /* Request status is either done or failed. */
-                        rc = (cqr->status == DASD_CQR_FAILED) ? -EIO : 0;
+                        /* Request is final (done or failed) */
+                        rc = (cqr->status == DASD_CQR_DONE) ? 0 : -EIO;
                         break;
                 }
                 spin_lock_irq(get_ccwdev_lock(device->cdev));
-                if (cqr->status == DASD_CQR_IN_IO &&
-                    device->discipline->term_IO(cqr) == 0) {
-                        list_del(&cqr->list);
+                switch (cqr->status) {
+                case DASD_CQR_IN_IO:
+                        /* terminate runnig cqr */
+                        if (device->discipline->term_IO) {
+                                cqr->retries = -1;
+                                device->discipline->term_IO(cqr);
+                                /*nished =
+                                 * wait (non-interruptible) for final status
+                                 * because signal ist still pending
+                                 */
+                                spin_unlock_irq(get_ccwdev_lock(device->cdev));
+                                wait_event(wait_q, _wait_for_wakeup(cqr));
+                                spin_lock_irq(get_ccwdev_lock(device->cdev));
+                                rc = (cqr->status == DASD_CQR_DONE) ? 0 : -EIO;
+                                finished = 1;
+                        }
+                        break;
+                case DASD_CQR_QUEUED:
+                        /* request  */
+                        list_del_init(&cqr->list);
+                        rc = -EIO;
                         finished = 1;
+                        break;
+                default:
+                        /* cqr with 'non-interruptable' status - just wait */
+                        break;
                 }
                 spin_unlock_irq(get_ccwdev_lock(device->cdev));
         }
@@ -1945,6 +1986,9 @@ dasd_generic_notify(struct ccw_device *cdev, int event)
         switch (event) {
         case CIO_GONE:
         case CIO_NO_PATH:
+                /* first of all call extended error reporting */
+                dasd_write_eer_trigger(DASD_EER_NOPATH, device, NULL);
+
                 if (device->state < DASD_STATE_BASIC)
                         break;
                 /* Device is active. We want to keep it. */
@@ -2002,6 +2046,51 @@ dasd_generic_auto_online (struct ccw_driver *dasd_discipline_driver)
         put_driver(drv);
 }
 
+/*
+ * notifications for extended error reports
+ */
+static struct notifier_block *dasd_eer_chain;
+
+int
+dasd_register_eer_notifier(struct notifier_block *nb)
+{
+        return notifier_chain_register(&dasd_eer_chain, nb);
+}
+
+int
+dasd_unregister_eer_notifier(struct notifier_block *nb)
+{
+        return notifier_chain_unregister(&dasd_eer_chain, nb);
+}
+
+/*
+ * Notify the registered error reporting module of a problem
+ */
+void
+dasd_write_eer_trigger(unsigned int id, struct dasd_device *device,
+                       struct dasd_ccw_req *cqr)
+{
+        if (device->eer) {
+                struct dasd_eer_trigger temp;
+                temp.id = id;
+                temp.device = device;
+                temp.cqr = cqr;
+                notifier_call_chain(&dasd_eer_chain, DASD_EER_TRIGGER,
+                                    (void *)&temp);
+        }
+}
+
+/*
+ * Tell the registered error reporting module to disable error reporting for
+ * a given device and to cleanup any private data structures on that device.
+ */
+static void
+dasd_disable_eer(struct dasd_device *device)
+{
+        notifier_call_chain(&dasd_eer_chain, DASD_EER_DISABLE, (void *)device);
+}
+
+
 static int __init
 dasd_init(void)
 {
@@ -2083,6 +2172,11 @@ EXPORT_SYMBOL_GPL(dasd_generic_set_online);
 EXPORT_SYMBOL_GPL(dasd_generic_set_offline);
 EXPORT_SYMBOL_GPL(dasd_generic_auto_online);
 
+EXPORT_SYMBOL(dasd_register_eer_notifier);
+EXPORT_SYMBOL(dasd_unregister_eer_notifier);
+EXPORT_SYMBOL(dasd_write_eer_trigger);
+
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically
diff --git a/drivers/s390/block/dasd_3370_erp.c b/drivers/s390/block/dasd_3370_erp.c
index 84565c8f584e..1d11c2a9525d 100644
--- a/drivers/s390/block/dasd_3370_erp.c
+++ b/drivers/s390/block/dasd_3370_erp.c
@@ -4,7 +4,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000
  *
- * $Revision: 1.9 $
  */
 
 #define PRINTK_HEADER "dasd_erp(3370)"
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index c143ecb53d9d..c811380b9079 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -5,7 +5,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000, 2001
  *
- * $Revision: 1.36 $
  */
 
 #include <linux/timer.h>
@@ -1109,6 +1108,9 @@ dasd_3990_handle_env_data(struct dasd_ccw_req * erp, char *sense)
                 case 0x0B:
                         DEV_MESSAGE(KERN_WARNING, device, "%s",
                                     "FORMAT F - Volume is suspended duplex");
+                        /* call extended error reporting (EER) */
+                        dasd_write_eer_trigger(DASD_EER_PPRCSUSPEND, device,
+                                               erp->refers);
                         break;
                 case 0x0C:
                         DEV_MESSAGE(KERN_WARNING, device, "%s",
diff --git a/drivers/s390/block/dasd_9336_erp.c b/drivers/s390/block/dasd_9336_erp.c
index 01e87170a3a2..dc861446d056 100644
--- a/drivers/s390/block/dasd_9336_erp.c
+++ b/drivers/s390/block/dasd_9336_erp.c
@@ -4,7 +4,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000
  *
- * $Revision: 1.8 $
  */
 
 #define PRINTK_HEADER "dasd_erp(9336)"
diff --git a/drivers/s390/block/dasd_9343_erp.c b/drivers/s390/block/dasd_9343_erp.c
index 2a23b74faf3f..4a5b79569aaa 100644
--- a/drivers/s390/block/dasd_9343_erp.c
+++ b/drivers/s390/block/dasd_9343_erp.c
@@ -4,7 +4,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000
  *
- * $Revision: 1.13 $
  */
 
 #define PRINTK_HEADER "dasd_erp(9343)"
diff --git a/drivers/s390/block/dasd_cmb.c b/drivers/s390/block/dasd_cmb.c
index 4f365bff275c..e88f73ee72ce 100644
--- a/drivers/s390/block/dasd_cmb.c
+++ b/drivers/s390/block/dasd_cmb.c
@@ -1,6 +1,4 @@
 /*
- * linux/drivers/s390/block/dasd_cmb.c ($Revision: 1.9 $)
- *
  * Linux on zSeries Channel Measurement Facility support
  *  (dasd device driver interface)
  *
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index caee16a3dc62..1629b27c48ab 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -11,7 +11,6 @@
  * functions may not be called from interrupt context. In particular
  * dasd_get_device is a no-no from interrupt context.
  *
- * $Revision: 1.43 $
  */
 
 #include <linux/config.h>
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index ba80fdea7ebf..3f9d704d2657 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -6,7 +6,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.53 $
  */
 
 #include <linux/config.h>
diff --git a/drivers/s390/block/dasd_diag.h b/drivers/s390/block/dasd_diag.h
index a4f80bd735f1..38a4e55f8953 100644
--- a/drivers/s390/block/dasd_diag.h
+++ b/drivers/s390/block/dasd_diag.h
@@ -6,7 +6,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.9 $
  */
 
 #define MDSK_WRITE_REQ 0x01
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 96eb48258580..822e2a265578 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -7,7 +7,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.74 $
  */
 
 #include <linux/config.h>
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index b6888c68b224..e15dd7978050 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -5,7 +5,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.10 $
  */
 
 #ifndef DASD_ECKD_H
@@ -30,6 +29,7 @@
 #define DASD_ECKD_CCW_PSF                0x27
 #define DASD_ECKD_CCW_RSSD               0x3e
 #define DASD_ECKD_CCW_LOCATE_RECORD      0x47
+#define DASD_ECKD_CCW_SNSS               0x54
 #define DASD_ECKD_CCW_DEFINE_EXTENT      0x63
 #define DASD_ECKD_CCW_WRITE_MT           0x85
 #define DASD_ECKD_CCW_READ_MT            0x86
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
new file mode 100644
index 000000000000..f70cd7716b24
--- /dev/null
+++ b/drivers/s390/block/dasd_eer.c
@@ -0,0 +1,1090 @@
+/*
+ *      character device driver for extended error reporting
+ *
+ *
+ *      Copyright (C) 2005 IBM Corporation
+ *      extended error reporting for DASD ECKD devices
+ *      Author(s): Stefan Weinhuber <wein@de.ibm.com>
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h>
+#include <linux/workqueue.h>
+#include <linux/poll.h>
+#include <linux/notifier.h>
+
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
+#include <asm/atomic.h>
+#include <asm/ebcdic.h>
+
+#include "dasd_int.h"
+#include "dasd_eckd.h"
+
+
+MODULE_LICENSE("GPL");
+
+MODULE_AUTHOR("Stefan Weinhuber <wein@de.ibm.com>");
+MODULE_DESCRIPTION("DASD extended error reporting module");
+
+
+#ifdef PRINTK_HEADER
+#undef PRINTK_HEADER
+#endif                          /* PRINTK_HEADER */
+#define PRINTK_HEADER "dasd(eer):"
+
+
+
+
+
+/*****************************************************************************/
+/*      the internal buffer                                                  */
+/*****************************************************************************/
+
+/*
+ * The internal buffer is meant to store obaque blobs of data, so it doesn't
+ * know of higher level concepts like triggers.
+ * It consists of a number of pages that are used as a ringbuffer. Each data
+ * blob is stored in a simple record that consists of an integer, which
+ * contains the size of the following data, and the data bytes themselfes.
+ *
+ * To allow for multiple independent readers we create one internal buffer
+ * each time the device is opened and destroy the buffer when the file is
+ * closed again.
+ *
+ * One record can be written to a buffer by using the functions
+ * - dasd_eer_start_record (one time per record to write the size to the buffer
+ *                          and reserve the space for the data)
+ * - dasd_eer_write_buffer (one or more times per record to write the data)
+ * The data can be written in several steps but you will have to compute
+ * the total size up front for the invocation of dasd_eer_start_record.
+ * If the ringbuffer is full, dasd_eer_start_record will remove the required
+ * number of old records.
+ *
+ * A record is typically read in two steps, first read the integer that
+ * specifies the size of the following data, then read the data.
+ * Both can be done by
+ * - dasd_eer_read_buffer
+ *
+ * For all mentioned functions you need to get the bufferlock first and keep it
+ * until a complete record is written or read.
+ */
+
+
+/*
+ * Alle information necessary to keep track of an internal buffer is kept in
+ * a struct eerbuffer. The buffer specific to a file pointer is strored in
+ * the private_data field of that file. To be able to write data to all
+ * existing buffers, each buffer is also added to the bufferlist.
+ * If the user doesn't want to read a complete record in one go, we have to
+ * keep track of the rest of the record. residual stores the number of bytes
+ * that are still to deliver. If the rest of the record is invalidated between
+ * two reads then residual will be set to -1 so that the next read will fail.
+ * All entries in the eerbuffer structure are protected with the bufferlock.
+ * To avoid races between writing to a buffer on the one side and creating
+ * and destroying buffers on the other side, the bufferlock must also be used
+ * to protect the bufferlist.
+ */
+
+struct eerbuffer {
+        struct list_head list;
+        char **buffer;
+        int buffersize;
+        int buffer_page_count;
+        int head;
+        int tail;
+        int residual;
+};
+
+LIST_HEAD(bufferlist);
+
+static spinlock_t bufferlock = SPIN_LOCK_UNLOCKED;
+
+DECLARE_WAIT_QUEUE_HEAD(dasd_eer_read_wait_queue);
+
+/*
+ * How many free bytes are available on the buffer.
+ * needs to be called with bufferlock held
+ */
+static int
+dasd_eer_get_free_bytes(struct eerbuffer *eerb)
+{
+        if (eerb->head < eerb->tail) {
+                return eerb->tail - eerb->head - 1;
+        } else
+                return eerb->buffersize - eerb->head + eerb->tail -1;
+}
+
+/*
+ * How many bytes of buffer space are used.
+ * needs to be called with bufferlock held
+ */
+static int
+dasd_eer_get_filled_bytes(struct eerbuffer *eerb)
+{
+
+        if (eerb->head >= eerb->tail) {
+                return eerb->head - eerb->tail;
+        } else
+                return eerb->buffersize - eerb->tail + eerb->head;
+}
+
+/*
+ * The dasd_eer_write_buffer function just copies count bytes of data
+ * to the buffer. Make sure to call dasd_eer_start_record first, to
+ * make sure that enough free space is available.
+ * needs to be called with bufferlock held
+ */
+static void
+dasd_eer_write_buffer(struct eerbuffer *eerb, int count, char *data)
+{
+
+        unsigned long headindex,localhead;
+        unsigned long rest, len;
+        char *nextdata;
+
+        nextdata = data;
+        rest = count;
+        while (rest > 0) {
+                headindex = eerb->head / PAGE_SIZE;
+                localhead = eerb->head % PAGE_SIZE;
+                len = min(rest, (PAGE_SIZE - localhead));
+                memcpy(eerb->buffer[headindex]+localhead, nextdata, len);
+                nextdata += len;
+                rest -= len;
+                eerb->head += len;
+                if ( eerb->head == eerb->buffersize )
+                        eerb->head = 0; /* wrap around */
+                if (eerb->head > eerb->buffersize) {
+                        MESSAGE(KERN_ERR, "%s", "runaway buffer head.");
+                        BUG();
+                }
+        }
+}
+
+/*
+ * needs to be called with bufferlock held
+ */
+static int
+dasd_eer_read_buffer(struct eerbuffer *eerb, int count, char *data)
+{
+
+        unsigned long tailindex,localtail;
+        unsigned long rest, len, finalcount;
+        char *nextdata;
+
+        finalcount = min(count, dasd_eer_get_filled_bytes(eerb));
+        nextdata = data;
+        rest = finalcount;
+        while (rest > 0) {
+                tailindex = eerb->tail / PAGE_SIZE;
+                localtail = eerb->tail % PAGE_SIZE;
+                len = min(rest, (PAGE_SIZE - localtail));
+                memcpy(nextdata, eerb->buffer[tailindex]+localtail, len);
+                nextdata += len;
+                rest -= len;
+                eerb->tail += len;
+                if ( eerb->tail == eerb->buffersize )
+                        eerb->tail = 0; /* wrap around */
+                if (eerb->tail > eerb->buffersize) {
+                        MESSAGE(KERN_ERR, "%s", "runaway buffer tail.");
+                        BUG();
+                }
+        }
+        return finalcount;
+}
+
+/*
+ * Whenever you want to write a blob of data to the internal buffer you
+ * have to start by using this function first. It will write the number
+ * of bytes that will be written to the buffer. If necessary it will remove
+ * old records to make room for the new one.
+ * needs to be called with bufferlock held
+ */
+static int
+dasd_eer_start_record(struct eerbuffer *eerb, int count)
+{
+        int tailcount;
+        if (count + sizeof(count) > eerb->buffersize)
+                return -ENOMEM;
+        while (dasd_eer_get_free_bytes(eerb) < count + sizeof(count)) {
+                if (eerb->residual > 0) {
+                        eerb->tail += eerb->residual;
+                        if (eerb->tail >= eerb->buffersize)
+                                eerb->tail -= eerb->buffersize;
+                        eerb->residual = -1;
+                }
+                dasd_eer_read_buffer(eerb, sizeof(tailcount),
+                                     (char*)(&tailcount));
+                eerb->tail += tailcount;
+                if (eerb->tail >= eerb->buffersize)
+                        eerb->tail -= eerb->buffersize;
+        }
+        dasd_eer_write_buffer(eerb, sizeof(count), (char*)(&count));
+
+        return 0;
+};
+
+/*
+ * release pages that are not used anymore
+ */
+static void
+dasd_eer_free_buffer_pages(char **buf, int no_pages)
+{
+        int i;
+
+        for (i = 0; i < no_pages; ++i) {
+                free_page((unsigned long)buf[i]);
+        }
+}
+
+/*
+ * allocate a new set of memory pages
+ */
+static int
+dasd_eer_allocate_buffer_pages(char **buf, int no_pages)
+{
+        int i;
+
+        for (i = 0; i < no_pages; ++i) {
+                buf[i] = (char *) get_zeroed_page(GFP_KERNEL);
+                if (!buf[i]) {
+                        dasd_eer_free_buffer_pages(buf, i);
+                        return -ENOMEM;
+                }
+        }
+        return 0;
+}
+
+/*
+ * empty the buffer by resetting head and tail
+ * In case there is a half read data blob in the buffer, we set residual
+ * to -1 to indicate that the remainder of the blob is lost.
+ */
+static void
+dasd_eer_purge_buffer(struct eerbuffer *eerb)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&bufferlock, flags);
+        if (eerb->residual > 0)
+                eerb->residual = -1;
+        eerb->tail=0;
+        eerb->head=0;
+        spin_unlock_irqrestore(&bufferlock, flags);
+}
+
+/*
+ * set the size of the buffer, newsize is the new number of pages to be used
+ * we don't try to copy any data back an forth, so any resize will also purge
+ * the buffer
+ */
+static int
+dasd_eer_resize_buffer(struct eerbuffer *eerb, int newsize)
+{
+        int i, oldcount, reuse;
+        char **new;
+        char **old;
+        unsigned long flags;
+
+        if (newsize < 1)
+                return -EINVAL;
+        if (eerb->buffer_page_count == newsize) {
+                /* documented behaviour is that any successfull invocation
+                 * will purge all records */
+                dasd_eer_purge_buffer(eerb);
+                return 0;
+        }
+        new = kmalloc(newsize*sizeof(char*), GFP_KERNEL);
+        if (!new)
+                return -ENOMEM;
+
+        reuse=min(eerb->buffer_page_count, newsize);
+        for (i = 0; i < reuse; ++i) {
+                new[i] = eerb->buffer[i];
+        }
+        if (eerb->buffer_page_count < newsize) {
+                if (dasd_eer_allocate_buffer_pages(
+                            &new[eerb->buffer_page_count],
+                            newsize - eerb->buffer_page_count)) {
+                        kfree(new);
+                        return -ENOMEM;
+                }
+        }
+
+        spin_lock_irqsave(&bufferlock, flags);
+        old = eerb->buffer;
+        eerb->buffer = new;
+        if (eerb->residual > 0)
+                eerb->residual = -1;
+        eerb->tail = 0;
+        eerb->head = 0;
+        oldcount = eerb->buffer_page_count;
+        eerb->buffer_page_count = newsize;
+        spin_unlock_irqrestore(&bufferlock, flags);
+
+        if (oldcount > newsize) {
+                for (i = newsize; i < oldcount; ++i) {
+                        free_page((unsigned long)old[i]);
+                }
+        }
+        kfree(old);
+
+        return 0;
+}
+
+
+/*****************************************************************************/
+/*      The extended error reporting functionality                           */
+/*****************************************************************************/
+
+/*
+ * When a DASD device driver wants to report an error, it calls the
+ * function dasd_eer_write_trigger (via a notifier mechanism) and gives the
+ * respective trigger ID as parameter.
+ * Currently there are four kinds of triggers:
+ *
+ * DASD_EER_FATALERROR:  all kinds of unrecoverable I/O problems
+ * DASD_EER_PPRCSUSPEND: PPRC was suspended
+ * DASD_EER_NOPATH:      There is no path to the device left.
+ * DASD_EER_STATECHANGE: The state of the device has changed.
+ *
+ * For the first three triggers all required information can be supplied by
+ * the caller. For these triggers a record is written by the function
+ * dasd_eer_write_standard_trigger.
+ *
+ * When dasd_eer_write_trigger is called to write a DASD_EER_STATECHANGE
+ * trigger, we have to gather the necessary sense data first. We cannot queue
+ * the necessary SNSS (sense subsystem status) request immediatly, since we
+ * are likely to run in a deadlock situation. Instead, we schedule a
+ * work_struct that calls the function dasd_eer_sense_subsystem_status to
+ * create and start an SNSS  request asynchronously.
+ *
+ * To avoid memory allocations at runtime, the necessary memory is allocated
+ * when the extended error reporting is enabled for a device (by
+ * dasd_eer_probe). There is one private eer data structure for each eer
+ * enabled DASD device. It contains memory for the work_struct, one SNSS cqr
+ * and a flags field that is used to coordinate the use of the cqr. The call
+ * to write a state change trigger can come in at any time, so we have one flag
+ * CQR_IN_USE that protects the cqr itself. When this flag indicates that the
+ * cqr is currently in use, dasd_eer_sense_subsystem_status cannot start a
+ * second request but sets the SNSS_REQUESTED flag instead.
+ *
+ * When the request is finished, the callback function dasd_eer_SNSS_cb
+ * is called. This function will invoke the function
+ * dasd_eer_write_SNSS_trigger to finally write the trigger. It will also
+ * check the SNSS_REQUESTED flag and if it is set it will call
+ * dasd_eer_sense_subsystem_status again.
+ *
+ * To avoid race conditions during the handling of the lock, the flags must
+ * be protected by the snsslock.
+ */
+
+struct dasd_eer_private {
+        struct dasd_ccw_req *cqr;
+        unsigned long flags;
+        struct work_struct worker;
+};
+
+static void dasd_eer_destroy(struct dasd_device *device,
+                             struct dasd_eer_private *eer);
+static int
+dasd_eer_write_trigger(struct dasd_eer_trigger *trigger);
+static void dasd_eer_sense_subsystem_status(void *data);
+static int dasd_eer_notify(struct notifier_block *self,
+                           unsigned long action, void *data);
+
+struct workqueue_struct *dasd_eer_workqueue;
+
+#define SNSS_DATA_SIZE 44
+static spinlock_t snsslock = SPIN_LOCK_UNLOCKED;
+
+#define DASD_EER_BUSID_SIZE 10
+struct dasd_eer_header {
+        __u32 total_size;
+        __u32 trigger;
+        __u64 tv_sec;
+        __u64 tv_usec;
+        char busid[DASD_EER_BUSID_SIZE];
+} __attribute__ ((packed));
+
+static struct notifier_block dasd_eer_nb = {
+        .notifier_call = dasd_eer_notify,
+};
+
+/*
+ * flags for use with dasd_eer_private
+ */
+#define CQR_IN_USE     0
+#define SNSS_REQUESTED 1
+
+/*
+ * This function checks if extended error reporting is available for a given
+ * dasd_device. If yes, then it creates and returns a struct dasd_eer,
+ * otherwise it returns an -EPERM error pointer.
+ */
+struct dasd_eer_private *
+dasd_eer_probe(struct dasd_device *device)
+{
+        struct dasd_eer_private *private;
+
+        if (!(device && device->discipline
+              && !strcmp(device->discipline->name, "ECKD"))) {
+                return ERR_PTR(-EPERM);
+        }
+        /* allocate the private data structure */
+        private = (struct dasd_eer_private *)kmalloc(
+                sizeof(struct dasd_eer_private), GFP_KERNEL);
+        if (!private) {
+                return ERR_PTR(-ENOMEM);
+        }
+        INIT_WORK(&private->worker, dasd_eer_sense_subsystem_status,
+                  (void *)device);
+        private->cqr = dasd_kmalloc_request("ECKD",
+                                            1 /* SNSS */ ,
+                                            SNSS_DATA_SIZE ,
+                                            device);
+        if (!private->cqr) {
+                kfree(private);
+                return ERR_PTR(-ENOMEM);
+        }
+        private->flags = 0;
+        return private;
+};
+
+/*
+ * If our private SNSS request is queued, remove it from the
+ * dasd ccw queue so we can free the requests memory.
+ */
+static void
+dasd_eer_dequeue_SNSS_request(struct dasd_device *device,
+                              struct dasd_eer_private *eer)
+{
+        struct list_head *lst, *nxt;
+        struct dasd_ccw_req *cqr, *erpcqr;
+        dasd_erp_fn_t erp_fn;
+
+        spin_lock_irq(get_ccwdev_lock(device->cdev));
+        list_for_each_safe(lst, nxt, &device->ccw_queue) {
+                cqr = list_entry(lst, struct dasd_ccw_req, list);
+                /* we are looking for two kinds or requests */
+                /* first kind: our SNSS request: */
+                if (cqr == eer->cqr) {
+                        if (cqr->status == DASD_CQR_IN_IO)
+                                device->discipline->term_IO(cqr);
+                        list_del(&cqr->list);
+                        break;
+                }
+                /* second kind: ERP requests for our SNSS request */
+                if (cqr->refers) {
+                        /* If this erp request chain ends in our cqr, then */
+                        /* cal the erp_postaction to clean it up  */
+                        erpcqr = cqr;
+                        while (erpcqr->refers) {
+                                erpcqr = erpcqr->refers;
+                        }
+                        if (erpcqr == eer->cqr) {
+                                erp_fn = device->discipline->erp_postaction(
+                                         cqr);
+                                erp_fn(cqr);
+                        }
+                        continue;
+                }
+        }
+        spin_unlock_irq(get_ccwdev_lock(device->cdev));
+}
+
+/*
+ * This function dismantles a struct dasd_eer that was created by
+ * dasd_eer_probe. Since we want to free our private data structure,
+ * we must make sure that the memory is not in use anymore.
+ * We have to flush the work queue and remove a possible SNSS request
+ * from the dasd queue.
+ */
+static void
+dasd_eer_destroy(struct dasd_device *device, struct dasd_eer_private *eer)
+{
+        flush_workqueue(dasd_eer_workqueue);
+        dasd_eer_dequeue_SNSS_request(device, eer);
+        dasd_kfree_request(eer->cqr, device);
+        kfree(eer);
+};
+
+/*
+ * enable the extended error reporting for a particular device
+ */
+static int
+dasd_eer_enable_on_device(struct dasd_device *device)
+{
+        void *eer;
+        if (!device)
+                return -ENODEV;
+        if (device->eer)
+                return 0;
+        if (!try_module_get(THIS_MODULE)) {
+                return -EINVAL;
+        }
+        eer = (void *)dasd_eer_probe(device);
+        if (IS_ERR(eer)) {
+                module_put(THIS_MODULE);
+                return PTR_ERR(eer);
+        }
+        device->eer = eer;
+        return 0;
+}
+
+/*
+ * enable the extended error reporting for a particular device
+ */
+static int
+dasd_eer_disable_on_device(struct dasd_device *device)
+{
+        struct dasd_eer_private *eer = device->eer;
+
+        if (!device)
+                return -ENODEV;
+        if (!device->eer)
+                return 0;
+        device->eer = NULL;
+        dasd_eer_destroy(device,eer);
+        module_put(THIS_MODULE);
+
+        return 0;
+}
+
+/*
+ * Set extended error reporting (eer)
+ * Note: This will be registered as a DASD ioctl, to be called on DASD devices.
+ */
+static int
+dasd_ioctl_set_eer(struct block_device *bdev, int no, long args)
+{
+        struct dasd_device *device;
+        int intval;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
+        if (bdev != bdev->bd_contains)
+                /* Error-reporting is not allowed for partitions */
+                return -EINVAL;
+        if (get_user(intval, (int __user *) args))
+                return -EFAULT;
+        device =  bdev->bd_disk->private_data;
+        if (device == NULL)
+                return -ENODEV;
+
+        intval = (intval != 0);
+        DEV_MESSAGE (KERN_DEBUG, device,
+                     "set eer on device to %d", intval);
+        if (intval)
+                return dasd_eer_enable_on_device(device);
+        else
+                return dasd_eer_disable_on_device(device);
+}
+
+/*
+ * Get value of extended error reporting.
+ * Note: This will be registered as a DASD ioctl, to be called on DASD devices.
+ */
+static int
+dasd_ioctl_get_eer(struct block_device *bdev, int no, long args)
+{
+        struct dasd_device *device;
+
+        device =  bdev->bd_disk->private_data;
+        if (device == NULL)
+                return -ENODEV;
+        return put_user((device->eer != NULL), (int __user *) args);
+}
+
+/*
+ * The following function can be used for those triggers that have
+ * all necessary data available when the function is called.
+ * If the parameter cqr is not NULL, the chain of requests will be searched
+ * for valid sense data, and all valid sense data sets will be added to
+ * the triggers data.
+ */
+static int
+dasd_eer_write_standard_trigger(int trigger, struct dasd_device *device,
+                                struct dasd_ccw_req *cqr)
+{
+        struct dasd_ccw_req *temp_cqr;
+        int data_size;
+        struct timeval tv;
+        struct dasd_eer_header header;
+        unsigned long flags;
+        struct eerbuffer *eerb;
+
+        /* go through cqr chain and count the valid sense data sets */
+        temp_cqr = cqr;
+        data_size = 0;
+        while (temp_cqr) {
+                if (temp_cqr->irb.esw.esw0.erw.cons)
+                        data_size += 32;
+                temp_cqr = temp_cqr->refers;
+        }
+
+        header.total_size = sizeof(header) + data_size + 4; /* "EOR" */
+        header.trigger = trigger;
+        do_gettimeofday(&tv);
+        header.tv_sec = tv.tv_sec;
+        header.tv_usec = tv.tv_usec;
+        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
+
+        spin_lock_irqsave(&bufferlock, flags);
+        list_for_each_entry(eerb, &bufferlist, list) {
+                dasd_eer_start_record(eerb, header.total_size);
+                dasd_eer_write_buffer(eerb, sizeof(header), (char*)(&header));
+                temp_cqr = cqr;
+                while (temp_cqr) {
+                        if (temp_cqr->irb.esw.esw0.erw.cons)
+                                dasd_eer_write_buffer(eerb, 32, cqr->irb.ecw);
+                        temp_cqr = temp_cqr->refers;
+                }
+                dasd_eer_write_buffer(eerb, 4,"EOR");
+        }
+        spin_unlock_irqrestore(&bufferlock, flags);
+
+        wake_up_interruptible(&dasd_eer_read_wait_queue);
+
+        return 0;
+}
+
+/*
+ * This function writes a DASD_EER_STATECHANGE trigger.
+ */
+static void
+dasd_eer_write_SNSS_trigger(struct dasd_device *device,
+                            struct dasd_ccw_req *cqr)
+{
+        int data_size;
+        int snss_rc;
+        struct timeval tv;
+        struct dasd_eer_header header;
+        unsigned long flags;
+        struct eerbuffer *eerb;
+
+        snss_rc = (cqr->status == DASD_CQR_FAILED) ? -EIO : 0;
+        if (snss_rc)
+                data_size = 0;
+        else
+                data_size = SNSS_DATA_SIZE;
+
+        header.total_size = sizeof(header) + data_size + 4; /* "EOR" */
+        header.trigger = DASD_EER_STATECHANGE;
+        do_gettimeofday(&tv);
+        header.tv_sec = tv.tv_sec;
+        header.tv_usec = tv.tv_usec;
+        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
+
+        spin_lock_irqsave(&bufferlock, flags);
+        list_for_each_entry(eerb, &bufferlist, list) {
+                dasd_eer_start_record(eerb, header.total_size);
+                dasd_eer_write_buffer(eerb, sizeof(header),(char*)(&header));
+                if (!snss_rc)
+                        dasd_eer_write_buffer(eerb, SNSS_DATA_SIZE, cqr->data);
+                dasd_eer_write_buffer(eerb, 4,"EOR");
+        }
+        spin_unlock_irqrestore(&bufferlock, flags);
+
+        wake_up_interruptible(&dasd_eer_read_wait_queue);
+}
+
+/*
+ * callback function for use with SNSS request
+ */
+static void
+dasd_eer_SNSS_cb(struct dasd_ccw_req *cqr, void *data)
+{
+        struct dasd_device *device;
+        struct dasd_eer_private *private;
+        unsigned long irqflags;
+
+        device = (struct dasd_device *)data;
+        private = (struct dasd_eer_private *)device->eer;
+        dasd_eer_write_SNSS_trigger(device, cqr);
+        spin_lock_irqsave(&snsslock, irqflags);
+        if(!test_and_clear_bit(SNSS_REQUESTED, &private->flags)) {
+                clear_bit(CQR_IN_USE, &private->flags);
+                spin_unlock_irqrestore(&snsslock, irqflags);
+                return;
+        };
+        clear_bit(CQR_IN_USE, &private->flags);
+        spin_unlock_irqrestore(&snsslock, irqflags);
+        dasd_eer_sense_subsystem_status(device);
+        return;
+}
+
+/*
+ * clean a used cqr before using it again
+ */
+static void
+dasd_eer_clean_SNSS_request(struct dasd_ccw_req *cqr)
+{
+        struct ccw1 *cpaddr = cqr->cpaddr;
+        void *data = cqr->data;
+
+        memset(cqr, 0, sizeof(struct dasd_ccw_req));
+        memset(cpaddr, 0, sizeof(struct ccw1));
+        memset(data, 0, SNSS_DATA_SIZE);
+        cqr->cpaddr = cpaddr;
+        cqr->data = data;
+        strncpy((char *) &cqr->magic, "ECKD", 4);
+        ASCEBC((char *) &cqr->magic, 4);
+        set_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
+}
+
+/*
+ * build and start an SNSS request
+ * This function is called from a work queue so we have to
+ * pass the dasd_device pointer as a void pointer.
+ */
+static void
+dasd_eer_sense_subsystem_status(void *data)
+{
+        struct dasd_device *device;
+        struct dasd_eer_private *private;
+        struct dasd_ccw_req *cqr;
+        struct ccw1 *ccw;
+        unsigned long irqflags;
+
+        device = (struct dasd_device *)data;
+        private = (struct dasd_eer_private *)device->eer;
+        if (!private) /* device not eer enabled any more */
+                return;
+        cqr = private->cqr;
+        spin_lock_irqsave(&snsslock, irqflags);
+        if(test_and_set_bit(CQR_IN_USE, &private->flags)) {
+                set_bit(SNSS_REQUESTED, &private->flags);
+                spin_unlock_irqrestore(&snsslock, irqflags);
+                return;
+        };
+        spin_unlock_irqrestore(&snsslock, irqflags);
+        dasd_eer_clean_SNSS_request(cqr);
+        cqr->device = device;
+        cqr->retries = 255;
+        cqr->expires = 10 * HZ;
+
+        ccw = cqr->cpaddr;
+        ccw->cmd_code = DASD_ECKD_CCW_SNSS;
+        ccw->count = SNSS_DATA_SIZE;
+        ccw->flags = 0;
+        ccw->cda = (__u32)(addr_t)cqr->data;
+
+        cqr->buildclk = get_clock();
+        cqr->status = DASD_CQR_FILLED;
+        cqr->callback = dasd_eer_SNSS_cb;
+        cqr->callback_data = (void *)device;
+        dasd_add_request_head(cqr);
+
+        return;
+}
+
+/*
+ * This function is called for all triggers. It calls the appropriate
+ * function that writes the actual trigger records.
+ */
+static int
+dasd_eer_write_trigger(struct dasd_eer_trigger *trigger)
+{
+        int rc;
+        struct dasd_eer_private *private = trigger->device->eer;
+
+        switch (trigger->id) {
+        case DASD_EER_FATALERROR:
+        case DASD_EER_PPRCSUSPEND:
+                rc = dasd_eer_write_standard_trigger(
+                        trigger->id, trigger->device, trigger->cqr);
+                break;
+        case DASD_EER_NOPATH:
+                rc = dasd_eer_write_standard_trigger(
+                        trigger->id, trigger->device, NULL);
+                break;
+        case DASD_EER_STATECHANGE:
+                if (queue_work(dasd_eer_workqueue, &private->worker)) {
+                        rc=0;
+                } else {
+                        /* If the work_struct was already queued, it can't
+                         * be queued again. But this is OK since we don't
+                         * need to have it queued twice.
+                         */
+                        rc = -EBUSY;
+                }
+                break;
+        default: /* unknown trigger, so we write it without any sense data */
+                rc = dasd_eer_write_standard_trigger(
+                        trigger->id, trigger->device, NULL);
+                break;
+        }
+        return rc;
+}
+
+/*
+ * This function is registered with the dasd device driver and gets called
+ * for all dasd eer notifications.
+ */
+static int dasd_eer_notify(struct notifier_block *self,
+                            unsigned long action, void *data)
+{
+        switch (action) {
+        case DASD_EER_DISABLE:
+                dasd_eer_disable_on_device((struct dasd_device *)data);
+                break;
+        case DASD_EER_TRIGGER:
+                dasd_eer_write_trigger((struct dasd_eer_trigger *)data);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+
+/*****************************************************************************/
+/*      the device operations                                                */
+/*****************************************************************************/
+
+/*
+ * On the one side we need a lock to access our internal buffer, on the
+ * other side a copy_to_user can sleep. So we need to copy the data we have
+ * to transfer in a readbuffer, which is protected by the readbuffer_mutex.
+ */
+static char readbuffer[PAGE_SIZE];
+DECLARE_MUTEX(readbuffer_mutex);
+
+
+static int
+dasd_eer_open(struct inode *inp, struct file *filp)
+{
+        struct eerbuffer *eerb;
+        unsigned long flags;
+
+        eerb = kmalloc(sizeof(struct eerbuffer), GFP_KERNEL);
+        eerb->head = 0;
+        eerb->tail = 0;
+        eerb->residual = 0;
+        eerb->buffer_page_count = 1;
+        eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE;
+        eerb->buffer = kmalloc(eerb->buffer_page_count*sizeof(char*),
+                               GFP_KERNEL);
+        if (!eerb->buffer)
+                return -ENOMEM;
+        if (dasd_eer_allocate_buffer_pages(eerb->buffer,
+                                           eerb->buffer_page_count)) {
+                kfree(eerb->buffer);
+                return -ENOMEM;
+        }
+        filp->private_data = eerb;
+        spin_lock_irqsave(&bufferlock, flags);
+        list_add(&eerb->list, &bufferlist);
+        spin_unlock_irqrestore(&bufferlock, flags);
+
+        return nonseekable_open(inp,filp);
+}
+
+static int
+dasd_eer_close(struct inode *inp, struct file *filp)
+{
+        struct eerbuffer *eerb;
+        unsigned long flags;
+
+        eerb = (struct eerbuffer *)filp->private_data;
+        spin_lock_irqsave(&bufferlock, flags);
+        list_del(&eerb->list);
+        spin_unlock_irqrestore(&bufferlock, flags);
+        dasd_eer_free_buffer_pages(eerb->buffer, eerb->buffer_page_count);
+        kfree(eerb->buffer);
+        kfree(eerb);
+
+        return 0;
+}
+
+static long
+dasd_eer_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+        int intval;
+        struct eerbuffer *eerb;
+
+        eerb = (struct eerbuffer *)filp->private_data;
+        switch (cmd) {
+        case DASD_EER_PURGE:
+                dasd_eer_purge_buffer(eerb);
+                return 0;
+        case DASD_EER_SETBUFSIZE:
+                if (get_user(intval, (int __user *)arg))
+                        return -EFAULT;
+                return dasd_eer_resize_buffer(eerb, intval);
+        default:
+                return -ENOIOCTLCMD;
+        }
+}
+
+static ssize_t
+dasd_eer_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
+{
+        int tc,rc;
+        int tailcount,effective_count;
+        unsigned long flags;
+        struct eerbuffer *eerb;
+
+        eerb = (struct eerbuffer *)filp->private_data;
+        if(down_interruptible(&readbuffer_mutex))
+                return -ERESTARTSYS;
+
+        spin_lock_irqsave(&bufferlock, flags);
+
+        if (eerb->residual < 0) { /* the remainder of this record */
+                                  /* has been deleted             */
+                eerb->residual = 0;
+                spin_unlock_irqrestore(&bufferlock, flags);
+                up(&readbuffer_mutex);
+                return -EIO;
+        } else if (eerb->residual > 0) {
+                /* OK we still have a second half of a record to deliver */
+                effective_count = min(eerb->residual, (int)count);
+                eerb->residual -= effective_count;
+        } else {
+                tc = 0;
+                while (!tc) {
+                        tc = dasd_eer_read_buffer(eerb,
+                                sizeof(tailcount), (char*)(&tailcount));
+                        if (!tc) {
+                                /* no data available */
+                                spin_unlock_irqrestore(&bufferlock, flags);
+                                up(&readbuffer_mutex);
+                                if (filp->f_flags & O_NONBLOCK)
+                                        return -EAGAIN;
+                                rc = wait_event_interruptible(
+                                        dasd_eer_read_wait_queue,
+                                        eerb->head != eerb->tail);
+                                if (rc) {
+                                        return rc;
+                                }
+                                if(down_interruptible(&readbuffer_mutex))
+                                        return -ERESTARTSYS;
+                                spin_lock_irqsave(&bufferlock, flags);
+                        }
+                }
+                WARN_ON(tc != sizeof(tailcount));
+                effective_count = min(tailcount,(int)count);
+                eerb->residual = tailcount - effective_count;
+        }
+
+        tc = dasd_eer_read_buffer(eerb, effective_count, readbuffer);
+        WARN_ON(tc != effective_count);
+
+        spin_unlock_irqrestore(&bufferlock, flags);
+
+        if (copy_to_user(buf, readbuffer, effective_count)) {
+                up(&readbuffer_mutex);
+                return -EFAULT;
+        }
+
+        up(&readbuffer_mutex);
+        return effective_count;
+}
+
+static unsigned int
+dasd_eer_poll (struct file *filp, poll_table *ptable)
+{
+        unsigned int mask;
+        unsigned long flags;
+        struct eerbuffer *eerb;
+
+        eerb = (struct eerbuffer *)filp->private_data;
+        poll_wait(filp, &dasd_eer_read_wait_queue, ptable);
+        spin_lock_irqsave(&bufferlock, flags);
+        if (eerb->head != eerb->tail)
+                mask = POLLIN | POLLRDNORM ;
+        else
+                mask = 0;
+        spin_unlock_irqrestore(&bufferlock, flags);
+        return mask;
+}
+
+static struct file_operations dasd_eer_fops = {
+        .open           = &dasd_eer_open,
+        .release        = &dasd_eer_close,
+        .unlocked_ioctl = &dasd_eer_ioctl,
+        .compat_ioctl   = &dasd_eer_ioctl,
+        .read           = &dasd_eer_read,
+        .poll           = &dasd_eer_poll,
+        .owner          = THIS_MODULE,
+};
+
+static struct miscdevice dasd_eer_dev = {
+        .minor      = MISC_DYNAMIC_MINOR,
+        .name       = "dasd_eer",
+        .fops       = &dasd_eer_fops,
+};
+
+
+/*****************************************************************************/
+/*      Init and exit                                                        */
+/*****************************************************************************/
+
+static int
+__init dasd_eer_init(void)
+{
+        int rc;
+
+        dasd_eer_workqueue = create_singlethread_workqueue("dasd_eer");
+        if (!dasd_eer_workqueue) {
+                MESSAGE(KERN_ERR , "%s", "dasd_eer_init could not "
+                       "create workqueue \n");
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        rc = dasd_register_eer_notifier(&dasd_eer_nb);
+        if (rc) {
+                MESSAGE(KERN_ERR, "%s", "dasd_eer_init could not "
+                       "register error reporting");
+                goto queue;
+        }
+
+        dasd_ioctl_no_register(THIS_MODULE, BIODASDEERSET, dasd_ioctl_set_eer);
+        dasd_ioctl_no_register(THIS_MODULE, BIODASDEERGET, dasd_ioctl_get_eer);
+
+        /* we don't need our own character device,
+         * so we just register as misc device */
+        rc = misc_register(&dasd_eer_dev);
+        if (rc) {
+                MESSAGE(KERN_ERR, "%s", "dasd_eer_init could not "
+                       "register misc device");
+                goto unregister;
+        }
+
+        return 0;
+
+unregister:
+        dasd_unregister_eer_notifier(&dasd_eer_nb);
+        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERSET,
+                                 dasd_ioctl_set_eer);
+        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERGET,
+                                 dasd_ioctl_get_eer);
+queue:
+        destroy_workqueue(dasd_eer_workqueue);
+out:
+        return rc;
+
+}
+module_init(dasd_eer_init);
+
+static void
+__exit dasd_eer_exit(void)
+{
+        dasd_unregister_eer_notifier(&dasd_eer_nb);
+        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERSET,
+                                 dasd_ioctl_set_eer);
+        dasd_ioctl_no_unregister(THIS_MODULE, BIODASDEERGET,
+                                 dasd_ioctl_get_eer);
+        destroy_workqueue(dasd_eer_workqueue);
+
+        WARN_ON(misc_deregister(&dasd_eer_dev) != 0);
+}
+module_exit(dasd_eer_exit);
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index 7cb98d25f341..8fd71ab02ef0 100644
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -7,7 +7,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
- * $Revision: 1.14 $
  */
 
 #include <linux/config.h>
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 8ec75dc08e2c..91145698f8e9 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -4,7 +4,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.41 $
  */
 
 #include <linux/config.h>
diff --git a/drivers/s390/block/dasd_fba.h b/drivers/s390/block/dasd_fba.h
index 624f0402ee22..da1fa91fc01d 100644
--- a/drivers/s390/block/dasd_fba.h
+++ b/drivers/s390/block/dasd_fba.h
@@ -4,7 +4,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.6 $
  */
 
 #ifndef DASD_FBA_H
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index a601c9a33541..65dc844b975c 100644
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -9,7 +9,6 @@
  *
  * gendisk related functions for the dasd driver.
  *
- * $Revision: 1.51 $
  */
 
 #include <linux/config.h>
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index e4b401500b01..d1b08fa13fd2 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -6,7 +6,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.68 $
  */
 
 #ifndef DASD_INT_H
@@ -276,6 +275,34 @@ struct dasd_discipline {
 
 extern struct dasd_discipline *dasd_diag_discipline_pointer;
 
+
+/*
+ * Notification numbers for extended error reporting notifications:
+ * The DASD_EER_DISABLE notification is sent before a dasd_device (and it's
+ * eer pointer) is freed. The error reporting module needs to do all necessary
+ * cleanup steps.
+ * The DASD_EER_TRIGGER notification sends the actual error reports (triggers).
+ */
+#define DASD_EER_DISABLE 0
+#define DASD_EER_TRIGGER 1
+
+/* Trigger IDs for extended error reporting DASD_EER_TRIGGER notification */
+#define DASD_EER_FATALERROR  1
+#define DASD_EER_NOPATH      2
+#define DASD_EER_STATECHANGE 3
+#define DASD_EER_PPRCSUSPEND 4
+
+/*
+ * The dasd_eer_trigger structure contains all data that we need to send
+ * along with an DASD_EER_TRIGGER notification.
+ */
+struct dasd_eer_trigger {
+        unsigned int id;
+        struct dasd_device *device;
+        struct dasd_ccw_req *cqr;
+};
+
+
 struct dasd_device {
         /* Block device stuff. */
         struct gendisk *gdp;
@@ -289,6 +316,9 @@ struct dasd_device {
         unsigned long flags;            /* per device flags */
         unsigned short features;        /* copy of devmap-features (read-only!) */
 
+        /* extended error reporting stuff (eer) */
+        void *eer;
+
         /* Device discipline stuff. */
         struct dasd_discipline *discipline;
         char *private;
@@ -489,6 +519,12 @@ int dasd_generic_set_online(struct ccw_device *, struct dasd_discipline *);
 int dasd_generic_set_offline (struct ccw_device *cdev);
 int dasd_generic_notify(struct ccw_device *, int);
 void dasd_generic_auto_online (struct ccw_driver *);
+int dasd_register_eer_notifier(struct notifier_block *);
+int dasd_unregister_eer_notifier(struct notifier_block *);
+void dasd_write_eer_trigger(unsigned int , struct dasd_device *,
+                        struct dasd_ccw_req *);
+
+
 
 /* externals in dasd_devmap.c */
 extern int dasd_max_devindex;
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 9396fcacb8f8..fafeeae52675 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -7,8 +7,6 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001
  *
- * $Revision: 1.50 $
- *
  * i/o controls for the dasd driver.
  */
 #include <linux/config.h>
@@ -423,8 +421,15 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args)
         dasd_info->cu_model = cdev->id.cu_model;
         dasd_info->dev_type = cdev->id.dev_type;
         dasd_info->dev_model = cdev->id.dev_model;
-        dasd_info->open_count = atomic_read(&device->open_count);
         dasd_info->status = device->state;
+        /*
+         * The open_count is increased for every opener, that includes
+         * the blkdev_get in dasd_scan_partitions.
+         * This must be hidden from user-space.
+         */
+        dasd_info->open_count = atomic_read(&device->open_count);
+        if (!device->bdev)
+                dasd_info->open_count++;
         
         /*
          * check if device is really formatted
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index fff9020d4886..2d5da3c75ca7 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -9,7 +9,6 @@
  *
  * /proc interface for the dasd driver.
  *
- * $Revision: 1.33 $
  */
 
 #include <linux/config.h>
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 1f060914cfa4..606f6ad285a0 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/interrupt.h>
+#include <linux/err.h>
 
 #include <linux/slab.h>
 #include <linux/bootmem.h>
@@ -864,7 +865,7 @@ con3215_init(void)
         }
 
         cdev = ccw_device_probe_console();
-        if (!cdev)
+        if (IS_ERR(cdev))
                 return -ENODEV;
 
         raw3215[0] = raw = (struct raw3215_info *)
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index c570a9f6ce9c..ef607a1de55a 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/err.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -597,7 +598,7 @@ con3270_init(void)
         }
 
         cdev = ccw_device_probe_console();
-        if (!cdev)
+        if (IS_ERR(cdev))
                 return -ENODEV;
         rp = raw3270_setup_console(cdev);
         if (IS_ERR(rp))
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 5bda2340a39d..a317a123daba 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -440,7 +440,11 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,
                         return -EPERM;
                 len = strnlen_user(u_kbs->kb_string,
                                    sizeof(u_kbs->kb_string) - 1);
-                p = kmalloc(len, GFP_KERNEL);
+                if (!len)
+                        return -EFAULT;
+                if (len > sizeof(u_kbs->kb_string) - 1)
+                        return -EINVAL;
+                p = kmalloc(len + 1, GFP_KERNEL);
                 if (!p)
                         return -ENOMEM;
                 if (copy_from_user(p, u_kbs->kb_string, len)) {
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 20be88e91fa1..682039cac15b 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -1357,7 +1357,7 @@ tape_34xx_init (void)
         debug_set_level(TAPE_DBF_AREA, 6);
 #endif
 
-        DBF_EVENT(3, "34xx init: $Revision: 1.23 $\n");
+        DBF_EVENT(3, "34xx init\n");
         /* Register driver for 3480/3490 tapes. */
         rc = ccw_driver_register(&tape_34xx_driver);
         if (rc)
@@ -1377,8 +1377,7 @@ tape_34xx_exit(void)
 
 MODULE_DEVICE_TABLE(ccw, tape_34xx_ids);
 MODULE_AUTHOR("(C) 2001-2002 IBM Deutschland Entwicklung GmbH");
-MODULE_DESCRIPTION("Linux on zSeries channel attached 3480 tape "
-                   "device driver ($Revision: 1.23 $)");
+MODULE_DESCRIPTION("Linux on zSeries channel attached 3480 tape device driver");
 MODULE_LICENSE("GPL");
 
 module_init(tape_34xx_init);
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c
index fcaee447d6fe..b3569c82bb16 100644
--- a/drivers/s390/char/tape_class.c
+++ b/drivers/s390/char/tape_class.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright IBM Corp. 2004
- * tape_class.c ($Revision: 1.8 $)
+ * tape_class.c
  *
  * Tape class device support
  *
@@ -12,7 +12,7 @@
 MODULE_AUTHOR("Stefan Bader <shbader@de.ibm.com>");
 MODULE_DESCRIPTION(
         "(C) Copyright IBM Corp. 2004   All Rights Reserved.\n"
-        "tape_class.c ($Revision: 1.8 $)"
+        "tape_class.c"
 );
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h
index 33133ad00ba2..3d0ca054cdee 100644
--- a/drivers/s390/char/tape_class.h
+++ b/drivers/s390/char/tape_class.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright IBM Corp. 2004   All Rights Reserved.
- * tape_class.h ($Revision: 1.4 $)
+ * tape_class.h
  *
  * Tape class device support
  *
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 8f486e1a8507..4ea438c749c9 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -1239,7 +1239,7 @@ tape_init (void)
 #ifdef DBF_LIKE_HELL
         debug_set_level(TAPE_DBF_AREA, 6);
 #endif
-        DBF_EVENT(3, "tape init: ($Revision: 1.54 $)\n");
+        DBF_EVENT(3, "tape init\n");
         tape_proc_init();
         tapechar_init ();
         tapeblock_init ();
@@ -1263,8 +1263,7 @@ tape_exit(void)
 
 MODULE_AUTHOR("(C) 2001 IBM Deutschland Entwicklung GmbH by Carsten Otte and "
               "Michael Holzheu (cotte@de.ibm.com,holzheu@de.ibm.com)");
-MODULE_DESCRIPTION("Linux on zSeries channel attached "
-                   "tape device driver ($Revision: 1.54 $)");
+MODULE_DESCRIPTION("Linux on zSeries channel attached tape device driver");
 MODULE_LICENSE("GPL");
 
 module_init(tape_init);
diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index cd2cc28e16a7..5287631fbfc8 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -2,8 +2,6 @@
  *  drivers/s390/cio/airq.c
  *   S/390 common I/O routines -- support for adapter interruptions
  *
- *   $Revision: 1.15 $
- *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
  *    Author(s): Ingo Adlung (adlung@de.ibm.com)
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 72f27c151c09..cb8e2e672b68 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -1,7 +1,6 @@
 /*
  *  drivers/s390/cio/blacklist.c
  *   S/390 common I/O routines -- blacklisting of specific devices
- *   $Revision: 1.42 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 6c077ad71edc..8013c8eb76fe 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -1,7 +1,6 @@
 /*
  *  drivers/s390/cio/ccwgroup.c
  *  bus driver for ccwgroup
- *   $Revision: 1.35 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 2cbb724791a8..92be75d99a56 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -1,7 +1,6 @@
 /*
  *  drivers/s390/cio/chsc.c
  *   S/390 common I/O routines -- channel subsystem call
- *   $Revision: 1.128 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
diff --git a/drivers/s390/cio/chsc.h b/drivers/s390/cio/chsc.h
index 44e4b4bb1c5a..3e75095f35d0 100644
--- a/drivers/s390/cio/chsc.h
+++ b/drivers/s390/cio/chsc.h
@@ -68,6 +68,6 @@ extern void *chsc_get_chp_desc(struct subchannel*, int);
 
 extern int chsc_enable_facility(int);
 
-#define to_channelpath(dev) container_of(dev, struct channel_path, dev)
+#define to_channelpath(device) container_of(device, struct channel_path, dev)
 
 #endif
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 6223b06d27d5..cbb86fa5f293 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,6 @@
 /*
  *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.140 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                            IBM Corporation
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 0b03714e696a..07ef3f640f4a 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/s390/cio/cmf.c ($Revision: 1.19 $)
+ * linux/drivers/s390/cio/cmf.c
  *
  * Linux on zSeries Channel Measurement Facility support
  *
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 516108779f60..1bbf231f8aaf 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -1,7 +1,6 @@
 /*
  *  drivers/s390/cio/css.c
  *  driver for channel subsystem
- *   $Revision: 1.96 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index a67e7e60e330..062fb100d94c 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1,7 +1,6 @@
 /*
  *  drivers/s390/cio/device.c
  *  bus driver for ccw devices
- *   $Revision: 1.140 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
@@ -255,7 +254,7 @@ modalias_show (struct device *dev, struct device_attribute *attr, char *buf)
         struct ccw_device_id *id = &(cdev->id);
         int ret;
 
-        ret = sprintf(buf, "ccw:t%04Xm%02x",
+        ret = sprintf(buf, "ccw:t%04Xm%02X",
                         id->cu_type, id->cu_model);
         if (id->dev_type != 0)
                 ret += sprintf(buf + ret, "dt%04Xdm%02X\n",
@@ -1013,7 +1012,7 @@ ccw_device_probe_console(void)
         int ret;
 
         if (xchg(&console_cdev_in_use, 1) != 0)
-                return NULL;
+                return ERR_PTR(-EBUSY);
         sch = cio_probe_console();
         if (IS_ERR(sch)) {
                 console_cdev_in_use = 0;
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 8b0218949b62..3a50b1903287 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -1,8 +1,6 @@
 /*
  *  drivers/s390/cio/device_ops.c
  *
- *   $Revision: 1.61 $
- *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 77be2c39bfe4..45ce032772f4 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -56,8 +56,6 @@
 #include "ioasm.h"
 #include "chsc.h"
 
-#define VERSION_QDIO_C "$Revision: 1.117 $"
-
 /****************** MODULE PARAMETER VARIABLES ********************/
 MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
 MODULE_DESCRIPTION("QDIO base support version 2, " \
@@ -66,8 +64,7 @@ MODULE_LICENSE("GPL");
 
 /******************** HERE WE GO ***********************************/
 
-static const char version[] = "QDIO base support version 2 ("
-        VERSION_QDIO_C "/" VERSION_QDIO_H  "/" VERSION_CIO_QDIO_H ")";
+static const char version[] = "QDIO base support version 2";
 
 #ifdef QDIO_PERFORMANCE_STATS
 static int proc_perf_file_registration;
diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index fa385e761fe1..ceb3ab31ee08 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -5,8 +5,6 @@
 
 #include "schid.h"
 
-#define VERSION_CIO_QDIO_H "$Revision: 1.40 $"
-
 #ifdef CONFIG_QDIO_DEBUG
 #define QDIO_VERBOSE_LEVEL 9
 #else /* CONFIG_QDIO_DEBUG */
diff --git a/drivers/s390/crypto/z90common.h b/drivers/s390/crypto/z90common.h
index f87c785f2039..dbbcda3c846a 100644
--- a/drivers/s390/crypto/z90common.h
+++ b/drivers/s390/crypto/z90common.h
@@ -27,8 +27,6 @@
 #ifndef _Z90COMMON_H_
 #define _Z90COMMON_H_
 
-#define VERSION_Z90COMMON_H "$Revision: 1.17 $"
-
 
 #define RESPBUFFSIZE 256
 #define PCI_FUNC_KEY_DECRYPT 0x5044
diff --git a/drivers/s390/crypto/z90crypt.h b/drivers/s390/crypto/z90crypt.h
index 3a18443fdfa7..5e6b1f535f62 100644
--- a/drivers/s390/crypto/z90crypt.h
+++ b/drivers/s390/crypto/z90crypt.h
@@ -29,8 +29,6 @@
 
 #include <linux/ioctl.h>
 
-#define VERSION_Z90CRYPT_H "$Revision: 1.2.2.4 $"
-
 #define z90crypt_VERSION 1
 #define z90crypt_RELEASE 3      // 2 = PCIXCC, 3 = rewrite for coding standards
 #define z90crypt_VARIANT 3      // 3 = CEX2A support
diff --git a/drivers/s390/crypto/z90hardware.c b/drivers/s390/crypto/z90hardware.c
index d7f7494a0cbe..4141919da805 100644
--- a/drivers/s390/crypto/z90hardware.c
+++ b/drivers/s390/crypto/z90hardware.c
@@ -32,12 +32,6 @@
 #include "z90crypt.h"
 #include "z90common.h"
 
-#define VERSION_Z90HARDWARE_C "$Revision: 1.34 $"
-
-char z90hardware_version[] __initdata =
-        "z90hardware.o (" VERSION_Z90HARDWARE_C "/"
-                          VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")";
-
 struct cca_token_hdr {
         unsigned char  token_identifier;
         unsigned char  version;
diff --git a/drivers/s390/crypto/z90main.c b/drivers/s390/crypto/z90main.c
index 2f54d033d7cf..7d6f19030ef9 100644
--- a/drivers/s390/crypto/z90main.c
+++ b/drivers/s390/crypto/z90main.c
@@ -38,14 +38,6 @@
 #include "z90crypt.h"
 #include "z90common.h"
 
-#define VERSION_Z90MAIN_C "$Revision: 1.62 $"
-
-static char z90main_version[] __initdata =
-        "z90main.o (" VERSION_Z90MAIN_C "/"
-                      VERSION_Z90COMMON_H "/" VERSION_Z90CRYPT_H ")";
-
-extern char z90hardware_version[];
-
 /**
  * Defaults that may be modified.
  */
@@ -594,8 +586,6 @@ z90crypt_init_module(void)
                 PRINTKN("Version %d.%d.%d loaded, built on %s %s\n",
                         z90crypt_VERSION, z90crypt_RELEASE, z90crypt_VARIANT,
                         __DATE__, __TIME__);
-                PRINTKN("%s\n", z90main_version);
-                PRINTKN("%s\n", z90hardware_version);
                 PDEBUG("create_z90crypt (domain index %d) successful.\n",
                        domain);
         } else
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index e70af7f39946..a86436a7a606 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2,8 +2,6 @@
  *  drivers/s390/net/claw.c
  *    ESCON CLAW network driver
  *
- *    $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $
- *
  *  Linux for zSeries version
  *    Copyright (C) 2002,2005 IBM Corporation
  *  Author(s) Original code written by:
@@ -4391,14 +4389,7 @@ static int __init
 claw_init(void)
 {
         int ret = 0;
-       printk(KERN_INFO "claw: starting driver "
-#ifdef MODULE
-                "module "
-#else
-                "compiled into kernel "
-#endif
-                " $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $ \n");
-
+        printk(KERN_INFO "claw: starting driver\n");
 
 #ifdef FUNCTRACE
         printk(KERN_INFO "claw: %s() enter \n",__FUNCTION__);
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 3df71970f601..969be465309c 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -2,7 +2,7 @@
 *  Define constants                                    *
 *                                                      *
 ********************************************************/
-#define VERSION_CLAW_H "$Revision: 1.6 $"
+
 /*-----------------------------------------------------*
 *     CCW command codes for CLAW protocol              *
 *------------------------------------------------------*/
diff --git a/drivers/s390/net/ctcdbug.c b/drivers/s390/net/ctcdbug.c
index 0e2a8bb93032..e6e72deb36b5 100644
--- a/drivers/s390/net/ctcdbug.c
+++ b/drivers/s390/net/ctcdbug.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/ctcdbug.c ($Revision: 1.6 $)
+ * linux/drivers/s390/net/ctcdbug.c
  *
  * CTC / ESCON network driver - s390 dbf exploit.
  *
@@ -9,8 +9,6 @@
  *    Author(s): Original Code written by
  *                        Peter Tiedemann (ptiedem@de.ibm.com)
  *
- *    $Revision: 1.6 $   $Date: 2005/05/11 08:10:17 $
- *
  * 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)
@@ -80,4 +78,3 @@ ctc_register_dbf_views(void)
         return 0;
 }
 
-
diff --git a/drivers/s390/net/ctcdbug.h b/drivers/s390/net/ctcdbug.h
index 7d6afa1627c3..413925ee23d1 100644
--- a/drivers/s390/net/ctcdbug.h
+++ b/drivers/s390/net/ctcdbug.h
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/ctcdbug.h ($Revision: 1.6 $)
+ * linux/drivers/s390/net/ctcdbug.h
  *
  * CTC / ESCON network driver - s390 dbf exploit.
  *
@@ -9,8 +9,6 @@
  *    Author(s): Original Code written by
  *                        Peter Tiedemann (ptiedem@de.ibm.com)
  *
- *    $Revision: 1.6 $   $Date: 2005/05/11 08:10:17 $
- *
  * 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)
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 1901feef07d9..af9f212314b3 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -1,6 +1,4 @@
 /*
- * $Id: ctcmain.c,v 1.79 2006/01/11 11:32:18 cohuck Exp $
- *
  * CTC / ESCON network driver
  *
  * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -37,8 +35,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.79 $
- *
  */
 #undef DEBUG
 #include <linux/module.h>
@@ -248,22 +244,11 @@ static void
 print_banner(void)
 {
         static int printed = 0;
-        char vbuf[] = "$Revision: 1.79 $";
-        char *version = vbuf;
 
         if (printed)
                 return;
-        if ((version = strchr(version, ':'))) {
-                char *p = strchr(version + 1, '$');
-                if (p)
-                        *p = '\0';
-        } else
-                version = " ??? ";
-        printk(KERN_INFO "CTC driver Version%s"
-#ifdef DEBUG
-                    " (DEBUG-VERSION, " __DATE__ __TIME__ ")"
-#endif
-                    " initialized\n", version);
+
+        printk(KERN_INFO "CTC driver initialized\n");
         printed = 1;
 }
 
diff --git a/drivers/s390/net/ctcmain.h b/drivers/s390/net/ctcmain.h
index ba3605f16335..d2e835c0c134 100644
--- a/drivers/s390/net/ctcmain.h
+++ b/drivers/s390/net/ctcmain.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ctcmain.h,v 1.4 2005/03/24 09:04:17 mschwide Exp $
- *
  * CTC / ESCON network driver
  *
  * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -29,8 +27,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.4 $
- *
  */
 
 #ifndef _CTCMAIN_H_
diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c
index 93d1725eb79b..5cdcdbf92962 100644
--- a/drivers/s390/net/ctctty.c
+++ b/drivers/s390/net/ctctty.c
@@ -1,6 +1,4 @@
 /*
- * $Id: ctctty.c,v 1.29 2005/04/05 08:50:44 mschwide Exp $
- *
  * CTC / ESCON network driver, tty interface.
  *
  * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
diff --git a/drivers/s390/net/ctctty.h b/drivers/s390/net/ctctty.h
index 84b2f8f23ab3..7254dc006311 100644
--- a/drivers/s390/net/ctctty.h
+++ b/drivers/s390/net/ctctty.h
@@ -1,6 +1,4 @@
 /*
- * $Id: ctctty.h,v 1.4 2003/09/18 08:01:10 mschwide Exp $
- *
  * CTC / ESCON network driver, tty interface.
  *
  * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c
index 2014fb7a4881..b12533104c1f 100644
--- a/drivers/s390/net/cu3088.c
+++ b/drivers/s390/net/cu3088.c
@@ -1,6 +1,4 @@
 /*
- * $Id: cu3088.c,v 1.38 2006/01/12 14:33:09 cohuck Exp $
- *
  * CTC / LCS ccw_device driver
  *
  * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c
index 24029bd9c7d0..6caf5fa6a3b5 100644
--- a/drivers/s390/net/fsm.c
+++ b/drivers/s390/net/fsm.c
@@ -1,6 +1,4 @@
 /**
- * $Id: fsm.c,v 1.6 2003/10/15 11:37:29 mschwide Exp $
- *
  * A generic FSM based on fsm used in isdn4linux
  *
  */
diff --git a/drivers/s390/net/fsm.h b/drivers/s390/net/fsm.h
index 5b98253be7aa..af679c10f1bd 100644
--- a/drivers/s390/net/fsm.h
+++ b/drivers/s390/net/fsm.h
@@ -1,5 +1,3 @@
-/* $Id: fsm.h,v 1.1.1.1 2002/03/13 19:33:09 mschwide Exp $
- */
 #ifndef _FSM_H_
 #define _FSM_H_
 
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index ea8177392564..760e77ec5a11 100644
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -1,6 +1,4 @@
 /* 
- * $Id: iucv.c,v 1.47 2005/11/21 11:35:22 mschwide Exp $
- *
  * IUCV network driver
  *
  * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -29,8 +27,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: IUCV lowlevel driver $Revision: 1.47 $
- *
  */
 
 /* #define DEBUG */
@@ -355,17 +351,7 @@ do { \
 static void
 iucv_banner(void)
 {
-        char vbuf[] = "$Revision: 1.47 $";
-        char *version = vbuf;
-
-        if ((version = strchr(version, ':'))) {
-                char *p = strchr(version + 1, '$');
-                if (p)
-                        *p = '\0';
-        } else
-                version = " ??? ";
-        printk(KERN_INFO
-               "IUCV lowlevel driver Version%s initialized\n", version);
+        printk(KERN_INFO "IUCV lowlevel driver initialized\n");
 }
 
 /**
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index da8c515743e8..6229ba4995ad 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -11,8 +11,6 @@
  *                        Frank Pavlic (fpavlic@de.ibm.com) and
  *                        Martin Schwidefsky <schwidefsky@de.ibm.com>
  *
- *    $Revision: 1.99 $  $Date: 2005/05/11 08:10:17 $
- *
  * 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)
@@ -59,9 +57,8 @@
 /**
  * initialization string for output
  */
-#define VERSION_LCS_C  "$Revision: 1.99 $"
 
-static char version[] __initdata = "LCS driver ("VERSION_LCS_C "/" VERSION_LCS_H ")";
+static char version[] __initdata = "LCS driver";
 static char debug_buffer[255];
 
 /**
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index a7f348ef1b08..08e60ad43916 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -6,8 +6,6 @@
 #include <linux/workqueue.h>
 #include <asm/ccwdev.h>
 
-#define VERSION_LCS_H "$Revision: 1.19 $"
-
 #define LCS_DBF_TEXT(level, name, text) \
         do { \
                 debug_text_event(lcs_dbf_##name, level, text); \
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index ac4c4b83fe17..71d3853e8682 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1,6 +1,4 @@
 /*
- * $Id: netiucv.c,v 1.69 2006/01/12 14:33:09 cohuck Exp $
- *
  * IUCV network driver
  *
  * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
@@ -31,8 +29,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: IUCV network driver $Revision: 1.69 $
- *
  */
 
 #undef DEBUG
@@ -2077,16 +2073,7 @@ DRIVER_ATTR(remove, 0200, NULL, remove_write);
 static void
 netiucv_banner(void)
 {
-        char vbuf[] = "$Revision: 1.69 $";
-        char *version = vbuf;
-
-        if ((version = strchr(version, ':'))) {
-                char *p = strchr(version + 1, '$');
-                if (p)
-                        *p = '\0';
-        } else
-                version = " ??? ";
-        PRINT_INFO("NETIUCV driver Version%s initialized\n", version);
+        PRINT_INFO("NETIUCV driver initialized\n");
 }
 
 static void __exit
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index d238c7ed103b..9a064d4727ad 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -25,8 +25,6 @@
 
 #include "qeth_mpc.h"
 
-#define VERSION_QETH_H          "$Revision: 1.152 $"
-
 #ifdef CONFIG_QETH_IPV6
 #define QETH_VERSION_IPV6       ":IPv6"
 #else
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index f94f1f25eec6..b02313127780 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -1,6 +1,5 @@
 /*
- *
- * linux/drivers/s390/net/qeth_eddp.c ($Revision: 1.13 $)
+ * linux/drivers/s390/net/qeth_eddp.c
  *
  * Enhanced Device Driver Packing (EDDP) support for the qeth driver.
  *
@@ -8,8 +7,6 @@
  *
  *    Author(s): Thomas Spatzier <tspat@de.ibm.com>
  *
- *    $Revision: 1.13 $  $Date: 2005/05/04 20:19:18 $
- *
  */
 #include <linux/config.h>
 #include <linux/errno.h>
diff --git a/drivers/s390/net/qeth_eddp.h b/drivers/s390/net/qeth_eddp.h
index e1b51860bc57..cae9ba265056 100644
--- a/drivers/s390/net/qeth_eddp.h
+++ b/drivers/s390/net/qeth_eddp.h
@@ -1,14 +1,12 @@
 /*
- * linux/drivers/s390/net/qeth_eddp.c ($Revision: 1.5 $)
+ * linux/drivers/s390/net/qeth_eddp.h
  *
- * Header file for qeth enhanced device driver pakcing.
+ * Header file for qeth enhanced device driver packing.
  *
  * Copyright 2004 IBM Corporation
  *
  *    Author(s): Thomas Spatzier <tspat@de.ibm.com>
  *
- *    $Revision: 1.5 $   $Date: 2005/03/24 09:04:18 $
- *
  */
 #ifndef __QETH_EDDP_H__
 #define __QETH_EDDP_H__
diff --git a/drivers/s390/net/qeth_fs.h b/drivers/s390/net/qeth_fs.h
index c0b4c8d82c45..e422b41c656e 100644
--- a/drivers/s390/net/qeth_fs.h
+++ b/drivers/s390/net/qeth_fs.h
@@ -12,11 +12,6 @@
 #ifndef __QETH_FS_H__
 #define __QETH_FS_H__
 
-#define VERSION_QETH_FS_H "$Revision: 1.10 $"
-
-extern const char *VERSION_QETH_PROC_C;
-extern const char *VERSION_QETH_SYS_C;
-
 #ifdef CONFIG_PROC_FS
 extern int
 qeth_create_procfs_entries(void);
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 97f927c01a82..410abeada6c4 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1,6 +1,5 @@
 /*
- *
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.251 $)
+ * linux/drivers/s390/net/qeth_main.c
  *
  * Linux on zSeries OSA Express and HiperSockets support
  *
@@ -12,8 +11,6 @@
  *                        Frank Pavlic (fpavlic@de.ibm.com) and
  *                        Thomas Spatzier <tspat@de.ibm.com>
  *
- *    $Revision: 1.251 $         $Date: 2005/05/04 20:19:18 $
- *
  * 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)
@@ -73,7 +70,6 @@
 #include "qeth_eddp.h"
 #include "qeth_tso.h"
 
-#define VERSION_QETH_C "$Revision: 1.251 $"
 static const char *version = "qeth S/390 OSA-Express driver";
 
 /**
@@ -8626,12 +8622,7 @@ qeth_init(void)
 {
         int rc=0;
 
-        PRINT_INFO("loading %s (%s/%s/%s/%s/%s/%s/%s %s %s)\n",
-                   version, VERSION_QETH_C, VERSION_QETH_H,
-                   VERSION_QETH_MPC_H, VERSION_QETH_MPC_C,
-                   VERSION_QETH_FS_H, VERSION_QETH_PROC_C,
-                   VERSION_QETH_SYS_C, QETH_VERSION_IPV6,
-                   QETH_VERSION_VLAN);
+        PRINT_INFO("loading %s\n", version);
 
         INIT_LIST_HEAD(&qeth_card_list.list);
         INIT_LIST_HEAD(&qeth_notify_list);
diff --git a/drivers/s390/net/qeth_mpc.c b/drivers/s390/net/qeth_mpc.c
index 5f8754addc14..77c83209d70e 100644
--- a/drivers/s390/net/qeth_mpc.c
+++ b/drivers/s390/net/qeth_mpc.c
@@ -11,8 +11,6 @@
 #include <asm/cio.h>
 #include "qeth_mpc.h"
 
-const char *VERSION_QETH_MPC_C = "$Revision: 1.13 $";
-
 unsigned char IDX_ACTIVATE_READ[]={
         0x00,0x00,0x80,0x00, 0x00,0x00,0x00,0x00,
         0x19,0x01,0x01,0x80, 0x00,0x00,0x00,0x00,
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h
index 864cec5f6c62..011c41041029 100644
--- a/drivers/s390/net/qeth_mpc.h
+++ b/drivers/s390/net/qeth_mpc.h
@@ -14,10 +14,6 @@
 
 #include <asm/qeth.h>
 
-#define VERSION_QETH_MPC_H "$Revision: 1.46 $"
-
-extern const char *VERSION_QETH_MPC_C;
-
 #define IPA_PDU_HEADER_SIZE     0x40
 #define QETH_IPA_PDU_LEN_TOTAL(buffer) (buffer+0x0e)
 #define QETH_IPA_PDU_LEN_PDU1(buffer) (buffer+0x26)
diff --git a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c
index 7bf35098831e..3c6339df879d 100644
--- a/drivers/s390/net/qeth_proc.c
+++ b/drivers/s390/net/qeth_proc.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_fs.c ($Revision: 1.16 $)
+ * linux/drivers/s390/net/qeth_fs.c
  *
  * Linux on zSeries OSA Express and HiperSockets support
  * This file contains code related to procfs.
@@ -21,8 +21,6 @@
 #include "qeth_mpc.h"
 #include "qeth_fs.h"
 
-const char *VERSION_QETH_PROC_C = "$Revision: 1.16 $";
-
 /***** /proc/qeth *****/
 #define QETH_PROCFILE_NAME "qeth"
 static struct proc_dir_entry *qeth_procfile;
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c
index 0ea185f70f75..c1831f572585 100644
--- a/drivers/s390/net/qeth_sys.c
+++ b/drivers/s390/net/qeth_sys.c
@@ -1,6 +1,6 @@
 /*
  *
- * linux/drivers/s390/net/qeth_sys.c ($Revision: 1.60 $)
+ * linux/drivers/s390/net/qeth_sys.c
  *
  * Linux on zSeries OSA Express and HiperSockets support
  * This file contains code related to sysfs.
@@ -20,8 +20,6 @@
 #include "qeth_mpc.h"
 #include "qeth_fs.h"
 
-const char *VERSION_QETH_SYS_C = "$Revision: 1.60 $";
-
 /*****************************************************************************/
 /*                                                                           */
 /*          /sys-fs stuff UNDER DEVELOPMENT !!!                              */
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h
index 3c50b6f24f51..1286ddea450b 100644
--- a/drivers/s390/net/qeth_tso.h
+++ b/drivers/s390/net/qeth_tso.h
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/s390/net/qeth_tso.h ($Revision: 1.8 $)
+ * linux/drivers/s390/net/qeth_tso.h
  *
  * Header file for qeth TCP Segmentation Offload support.
  *
@@ -7,8 +7,6 @@
  *
  *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>
  *
- *    $Revision: 1.8 $   $Date: 2005/05/04 20:19:18 $
- *
  */
 #ifndef __QETH_TSO_H__
 #define __QETH_TSO_H__
diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c
index 206518c7d332..e3f647169827 100644
--- a/drivers/s390/s390_rdev.c
+++ b/drivers/s390/s390_rdev.c
@@ -1,7 +1,6 @@
 /*
  *  drivers/s390/s390_rdev.c
  *  s390 root device
- *   $Revision: 1.4 $
  *
  *    Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH,
  *                       IBM Corporation
diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index d9ea7ed2e46e..7abb42a09ae2 100644
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -90,15 +90,16 @@ struct crw {
 
 static inline int stcrw(struct crw *pcrw )
 {
-        int ccode;
+        int ccode;
 
-        __asm__ __volatile__(
-                "STCRW 0(%1)\n\t"
-                "IPM %0\n\t"
-                "SRL %0,28\n\t"
-                : "=d" (ccode) : "a" (pcrw)
-                : "cc", "1" );
-        return ccode;
+        __asm__ __volatile__(
+                "stcrw 0(%2)\n\t"
+                "ipm %0\n\t"
+                "srl %0,28\n\t"
+                : "=d" (ccode), "=m" (*pcrw)
+                : "a" (pcrw)
+                : "cc" );
+        return ccode;
 }
 
 #endif /* __s390mach */
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 167fef39d8a7..95b92f317b6f 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -29,8 +29,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_AUX_REVISION "$Revision: 1.145 $"
-
 #include "zfcp_ext.h"
 
 /* accumulated log level (module parameter) */
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index 0fc46381fc22..241136d0c6eb 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -27,8 +27,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_CCW_C_REVISION "$Revision: 1.58 $"
-
 #include "zfcp_ext.h"
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_CONFIG
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 95599719f8ab..4d7d47cf2394 100644
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -23,8 +23,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_DBF_REVISION "$Revision$"
-
 #include <asm/debug.h>
 #include <linux/ctype.h>
 #include "zfcp_ext.h"
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 9bb511083a26..e260d19fa717 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -34,8 +34,6 @@
 #ifndef ZFCP_DEF_H
 #define ZFCP_DEF_H
 
-#define ZFCP_DEF_REVISION "$Revision: 1.111 $"
-
 /*************************** INCLUDES *****************************************/
 
 #include <linux/init.h>
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index c065cb836c97..da947e662031 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -31,8 +31,6 @@
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_ERP
 
-#define ZFCP_ERP_REVISION "$Revision: 1.86 $"
-
 #include "zfcp_ext.h"
 
 static int zfcp_erp_adisc(struct zfcp_port *);
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h
index c3782261cb5c..c1ba7cf1b496 100644
--- a/drivers/s390/scsi/zfcp_ext.h
+++ b/drivers/s390/scsi/zfcp_ext.h
@@ -32,8 +32,6 @@
 #ifndef ZFCP_EXT_H
 #define ZFCP_EXT_H
 
-#define ZFCP_EXT_REVISION "$Revision: 1.62 $"
-
 #include "zfcp_def.h"
 
 extern struct zfcp_data zfcp_data;
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index cbfab09899c8..9f0cb3d820c0 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -30,8 +30,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_FSF_C_REVISION "$Revision: 1.92 $"
-
 #include "zfcp_ext.h"
 
 static int zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *);
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index d719f66a29a4..1c3275163c91 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -29,8 +29,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_QDIO_C_REVISION "$Revision: 1.20 $"
-
 #include "zfcp_ext.h"
 
 static inline void zfcp_qdio_sbal_limit(struct zfcp_fsf_req *, int);
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 3c2cbcccbf54..e0803757c0fa 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -31,8 +31,6 @@
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_SCSI
 
-#define ZFCP_SCSI_REVISION "$Revision: 1.74 $"
-
 #include "zfcp_ext.h"
 
 static void zfcp_scsi_slave_destroy(struct scsi_device *sdp);
diff --git a/drivers/s390/scsi/zfcp_sysfs_adapter.c b/drivers/s390/scsi/zfcp_sysfs_adapter.c
index 9f262250043a..dfc07370f412 100644
--- a/drivers/s390/scsi/zfcp_sysfs_adapter.c
+++ b/drivers/s390/scsi/zfcp_sysfs_adapter.c
@@ -27,8 +27,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_SYSFS_ADAPTER_C_REVISION "$Revision: 1.38 $"
-
 #include "zfcp_ext.h"
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_CONFIG
diff --git a/drivers/s390/scsi/zfcp_sysfs_driver.c b/drivers/s390/scsi/zfcp_sysfs_driver.c
index 77a5e2dcc0ff..6622d55e0a45 100644
--- a/drivers/s390/scsi/zfcp_sysfs_driver.c
+++ b/drivers/s390/scsi/zfcp_sysfs_driver.c
@@ -27,8 +27,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_SYSFS_DRIVER_C_REVISION "$Revision: 1.17 $"
-
 #include "zfcp_ext.h"
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_CONFIG
diff --git a/drivers/s390/scsi/zfcp_sysfs_port.c b/drivers/s390/scsi/zfcp_sysfs_port.c
index 3924eb38805c..f401d42db21c 100644
--- a/drivers/s390/scsi/zfcp_sysfs_port.c
+++ b/drivers/s390/scsi/zfcp_sysfs_port.c
@@ -28,8 +28,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_SYSFS_PORT_C_REVISION "$Revision: 1.47 $"
-
 #include "zfcp_ext.h"
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_CONFIG
diff --git a/drivers/s390/scsi/zfcp_sysfs_unit.c b/drivers/s390/scsi/zfcp_sysfs_unit.c
index 2f50815f65c7..ad5dfb889bee 100644
--- a/drivers/s390/scsi/zfcp_sysfs_unit.c
+++ b/drivers/s390/scsi/zfcp_sysfs_unit.c
@@ -28,8 +28,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define ZFCP_SYSFS_UNIT_C_REVISION "$Revision: 1.30 $"
-
 #include "zfcp_ext.h"
 
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_CONFIG
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 19bd346951dd..a800fb51168b 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -286,6 +286,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
           board_ahci }, /* ICH8M */
         { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_ahci }, /* ICH8M */
+        { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+          board_ahci }, /* JMicron JMB360 */
+        { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+          board_ahci }, /* JMicron JMB363 */
         { }     /* terminate list */
 };
 
@@ -802,7 +806,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
         struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
         void __iomem *mmio = probe_ent->mmio_base;
         u32 tmp, cap_save;
-        u16 tmp16;
         unsigned int i, j, using_dac;
         int rc;
         void __iomem *port_mmio;
@@ -836,9 +839,13 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
         writel(0xf, mmio + HOST_PORTS_IMPL);
         (void) readl(mmio + HOST_PORTS_IMPL);   /* flush */
 
-        pci_read_config_word(pdev, 0x92, &tmp16);
-        tmp16 |= 0xf;
-        pci_write_config_word(pdev, 0x92, tmp16);
+        if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
+                u16 tmp16;
+
+                pci_read_config_word(pdev, 0x92, &tmp16);
+                tmp16 |= 0xf;
+                pci_write_config_word(pdev, 0x92, tmp16);
+        }
 
         hpriv->cap = readl(mmio + HOST_CAP);
         hpriv->port_map = readl(mmio + HOST_PORTS_IMPL);
@@ -1082,6 +1089,10 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (have_msi)
                 hpriv->flags |= AHCI_FLAG_MSI;
 
+        /* JMicron-specific fixup: make sure we're in AHCI mode */
+        if (pdev->vendor == 0x197b)
+                pci_write_config_byte(pdev, 0x41, 0xa1);
+
         /* initialize adapter */
         rc = ahci_host_init(probe_ent);
         if (rc)
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 69ed77fcb71f..7955ebe8e1e8 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -37,13 +37,13 @@ config AIC79XX_CMDS_PER_DEVICE
 config AIC79XX_RESET_DELAY_MS
         int "Initial bus reset delay in milli-seconds"
         depends on SCSI_AIC79XX
-        default "15000"
+        default "5000"
         ---help---
         The number of milliseconds to delay after an initial bus reset.
         The bus settle delay following all error recovery actions is
         dictated by the SCSI layer and is not affected by this value.
 
-        Default: 15000 (15 seconds)
+        Default: 5000 (5 seconds)
 
 config AIC79XX_BUILD_FIRMWARE
         bool "Build Adapter Firmware with Kernel Build"
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 2cfdbef447db..1d11f7e77564 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#108 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#109 $
  *
  * $FreeBSD$
  */
@@ -222,6 +222,7 @@ typedef enum {
 typedef enum {
         AHD_FENONE              = 0x00000,
         AHD_WIDE                = 0x00001,/* Wide Channel */
+        AHD_AIC79XXB_SLOWCRC    = 0x00002,/* SLOWCRC bit should be set */
         AHD_MULTI_FUNC          = 0x00100,/* Multi-Function/Channel Device */
         AHD_TARGETMODE          = 0x01000,/* Has tested target mode support */
         AHD_MULTIROLE           = 0x02000,/* Space for two roles at a time */
diff --git a/drivers/scsi/aic7xxx/aic79xx.reg b/drivers/scsi/aic7xxx/aic79xx.reg
index 3a3204703b15..be14e2ecb8f7 100644
--- a/drivers/scsi/aic7xxx/aic79xx.reg
+++ b/drivers/scsi/aic7xxx/aic79xx.reg
@@ -1,7 +1,7 @@
 /*
  * Aic79xx register and scratch ram definitions.
  *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
+ * Copyright (c) 1994-2001, 2004 Justin T. Gibbs.
  * Copyright (c) 2000-2002 Adaptec Inc.
  * All rights reserved.
  *
@@ -39,7 +39,7 @@
  *
  * $FreeBSD$
  */
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $"
 
 /*
  * This file is processed by the aic7xxx_asm utility for use in assembling
@@ -3715,8 +3715,9 @@ scratch_ram {
 
         SEQ_FLAGS2 {
                 size            1
-                field   TARGET_MSG_PENDING        0x02
-                field   SELECTOUT_QFROZEN         0x04
+                field   PENDING_MK_MESSAGE      0x01
+                field   TARGET_MSG_PENDING      0x02
+                field   SELECTOUT_QFROZEN       0x04
         }
 
         ALLOCFIFO_SCBPTR {
@@ -3777,6 +3778,26 @@ scratch_ram {
         CMDSIZE_TABLE {
                 size            8
         }
+        /*
+         * When an SCB with the MK_MESSAGE flag is
+         * queued to the controller, it cannot enter
+         * the waiting for selection list until the
+         * selections for any previously queued
+         * commands to that target complete.  During
+         * the wait, the MK_MESSAGE SCB is queued
+         * here.
+         */
+        MK_MESSAGE_SCB {
+                size            2
+        }
+        /*
+         * Saved SCSIID of MK_MESSAGE_SCB to avoid
+         * an extra SCBPTR operation when deciding
+         * if the MK_MESSAGE_SCB can be run.
+         */
+        MK_MESSAGE_SCSIID {
+                size            1
+        }
 }
 
 /************************* Hardware SCB Definition ****************************/
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq
index bef1f9d369b6..58bc17591b54 100644
--- a/drivers/scsi/aic7xxx/aic79xx.seq
+++ b/drivers/scsi/aic7xxx/aic79xx.seq
@@ -1,7 +1,7 @@
 /*
  * Adaptec U320 device driver firmware for Linux and FreeBSD.
  *
- * Copyright (c) 1994-2001 Justin T. Gibbs.
+ * Copyright (c) 1994-2001, 2004 Justin T. Gibbs.
  * Copyright (c) 2000-2002 Adaptec Inc.
  * All rights reserved.
  *
@@ -40,7 +40,7 @@
  * $FreeBSD$
  */
 
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $"
+VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $"
 PATCH_ARG_LIST = "struct ahd_softc *ahd"
 PREFIX = "ahd_"
 
@@ -110,10 +110,8 @@ check_waiting_list:
          * one last time.
          */
         test    SSTAT0, SELDO jnz select_out;
-END_CRITICAL;
         call    start_selection;
 idle_loop_checkbus:
-BEGIN_CRITICAL;
         test    SSTAT0, SELDO jnz select_out;
 END_CRITICAL;
         test    SSTAT0, SELDI jnz select_in;
@@ -294,7 +292,6 @@ fetch_new_scb_inprog:
         test    CCSCBCTL, ARRDONE jz return;
 fetch_new_scb_done:
         and     CCSCBCTL, ~(CCARREN|CCSCBEN);
-        bmov    REG0, SCBPTR, 2;
         clr     A;
         add     CMDS_PENDING, 1;
         adc     CMDS_PENDING[1], A;
@@ -316,43 +313,117 @@ fetch_new_scb_done:
         clr     SCB_FIFO_USE_COUNT;
         /* Update the next SCB address to download. */
         bmov    NEXT_QUEUED_SCB_ADDR, SCB_NEXT_SCB_BUSADDR, 4;
+        /*
+         * NULL out the SCB links since these fields
+         * occupy the same location as SCB_NEXT_SCB_BUSADDR.
+         */
         mvi     SCB_NEXT[1], SCB_LIST_NULL;
         mvi     SCB_NEXT2[1], SCB_LIST_NULL;
         /* Increment our position in the QINFIFO. */
         mov     NONE, SNSCB_QOFF;
+
         /*
-         * SCBs that want to send messages are always
-         * queued independently.  This ensures that they
-         * are at the head of the SCB list to select out
-         * to a target and we will see the MK_MESSAGE flag.
+         * Save SCBID of this SCB in REG0 since
+         * SCBPTR will be clobbered during target
+         * list updates.  We also record the SCB's
+         * flags so that we can refer to them even
+         * after SCBPTR has been changed.
+         */
+        bmov    REG0, SCBPTR, 2;
+        mov     A, SCB_CONTROL;
+
+        /*
+         * Find the tail SCB of the execution queue
+         * for this target.
          */
-        test    SCB_CONTROL, MK_MESSAGE jnz first_new_target_scb;
         shr     SINDEX, 3, SCB_SCSIID;
         and     SINDEX, ~0x1;
         mvi     SINDEX[1], (WAITING_SCB_TAILS >> 8);
         bmov    DINDEX, SINDEX, 2;
         bmov    SCBPTR, SINDIR, 2;
+
+        /*
+         * Update the tail to point to the new SCB.
+         */
         bmov    DINDIR, REG0, 2;
+
+        /*
+         * If the queue was empty, queue this SCB as
+         * the first for this target.
+         */
         cmp     SCBPTR[1], SCB_LIST_NULL je first_new_target_scb;
+
+        /*
+         * SCBs that want to send messages must always be
+         * at the head of their per-target queue so that
+         * ATN can be asserted even if the current
+         * negotiation agreement is packetized.  If the
+         * target queue is empty, the SCB can be queued
+         * immediately.  If the queue is not empty, we must
+         * wait for it to empty before entering this SCB
+         * into the waiting for selection queue.  Otherwise
+         * our batching and round-robin selection scheme 
+         * could allow commands to be queued out of order.
+         * To simplify the implementation, we stop pulling
+         * new commands from the host until the MK_MESSAGE
+         * SCB can be queued to the waiting for selection
+         * list.
+         */
+        test    A, MK_MESSAGE jz batch_scb; 
+
+        /*
+         * If the last SCB is also a MK_MESSAGE SCB, then
+         * order is preserved even if we batch.
+         */
+        test    SCB_CONTROL, MK_MESSAGE jz batch_scb; 
+
+        /*
+         * Defer this SCB and stop fetching new SCBs until
+         * it can be queued.  Since the SCB_SCSIID of the
+         * tail SCB must be the same as that of the newly
+         * queued SCB, there is no need to restore the SCBID
+         * here.
+         */
+        or      SEQ_FLAGS2, PENDING_MK_MESSAGE;
+        bmov    MK_MESSAGE_SCB, REG0, 2;
+        mov     MK_MESSAGE_SCSIID, SCB_SCSIID ret;
+
+batch_scb:
+        /*
+         * Otherwise just update the previous tail SCB to
+         * point to the new tail.
+         */
         bmov    SCB_NEXT, REG0, 2 ret;
+
 first_new_target_scb:
+        /*
+         * Append SCB to the tail of the waiting for
+         * selection list.
+         */
         cmp     WAITING_TID_HEAD[1], SCB_LIST_NULL je first_new_scb;
         bmov    SCBPTR, WAITING_TID_TAIL, 2;
         bmov    SCB_NEXT2, REG0, 2;
         bmov    WAITING_TID_TAIL, REG0, 2 ret;
 first_new_scb:
+        /*
+         * Whole list is empty, so the head of
+         * the list must be initialized too.
+         */
         bmov    WAITING_TID_HEAD, REG0, 2;
         bmov    WAITING_TID_TAIL, REG0, 2 ret;
 END_CRITICAL;
 
 scbdma_idle:
         /*
-         * Give precedence to downloading new SCBs to execute
-         * unless select-outs are currently frozen.
+         * Don't bother downloading new SCBs to execute
+         * if select-outs are currently frozen or we have
+         * a MK_MESSAGE SCB waiting to enter the queue.
          */
-        test    SEQ_FLAGS2, SELECTOUT_QFROZEN jnz . + 2;
+        test    SEQ_FLAGS2, SELECTOUT_QFROZEN|PENDING_MK_MESSAGE
+                jnz scbdma_no_new_scbs;
 BEGIN_CRITICAL;
         test    QOFF_CTLSTA, NEW_SCB_AVAIL jnz fetch_new_scb;
+scbdma_no_new_scbs:
         cmp     COMPLETE_DMA_SCB_HEAD[1], SCB_LIST_NULL jne dma_complete_scb;
         cmp     COMPLETE_SCB_HEAD[1], SCB_LIST_NULL je return;
         /* FALLTHROUGH */
@@ -671,27 +742,41 @@ curscb_ww_done:
         }
 
         /*
-         * Requeue any SCBs not sent, to the tail of the waiting Q.
+         * The whole list made it.  Clear our tail pointer to indicate
+         * that the per-target selection queue is now empty.
          */
-        cmp     SCB_NEXT[1], SCB_LIST_NULL je select_out_list_done;
+        cmp     SCB_NEXT[1], SCB_LIST_NULL je select_out_clear_tail;
 
         /*
+         * Requeue any SCBs not sent, to the tail of the waiting Q.
          * We know that neither the per-TID list nor the list of
-         * TIDs is empty.  Use this knowledge to our advantage.
+         * TIDs is empty.  Use this knowledge to our advantage and
+         * queue the remainder to the tail of the global execution
+         * queue.
          */
         bmov    REG0, SCB_NEXT, 2;
+select_out_queue_remainder:
         bmov    SCBPTR, WAITING_TID_TAIL, 2;
         bmov    SCB_NEXT2, REG0, 2;
         bmov    WAITING_TID_TAIL, REG0, 2;
         jmp     select_out_inc_tid_q;
 
-select_out_list_done:
+select_out_clear_tail:
+        /*
+         * Queue any pending MK_MESSAGE SCB for this target now
+         * that the queue is empty.
+         */
+        test    SEQ_FLAGS2, PENDING_MK_MESSAGE jz select_out_no_mk_message_scb;
+        mov     A, MK_MESSAGE_SCSIID;
+        cmp     SCB_SCSIID, A jne select_out_no_mk_message_scb;
+        and     SEQ_FLAGS2, ~PENDING_MK_MESSAGE;
+        bmov    REG0, MK_MESSAGE_SCB, 2;
+        jmp select_out_queue_remainder;
+
+select_out_no_mk_message_scb:
         /*
-         * The whole list made it.  Just clear our TID's tail pointer
-         * unless we were queued independently due to our need to
-         * send a message.
+         * Clear this target's execution tail and increment the queue.
          */
-        test    SCB_CONTROL, MK_MESSAGE jnz select_out_inc_tid_q;
         shr     DINDEX, 3, SCB_SCSIID;
         or      DINDEX, 1;      /* Want only the second byte */
         mvi     DINDEX[1], ((WAITING_SCB_TAILS) >> 8);
@@ -703,8 +788,8 @@ select_out_inc_tid_q:
         mvi     WAITING_TID_TAIL[1], SCB_LIST_NULL;
         bmov    SCBPTR, CURRSCB, 2;
         mvi     CLRSINT0, CLRSELDO;
-        test    LQOSTAT2, LQOPHACHGOUTPKT jnz unexpected_nonpkt_phase;
-        test    LQOSTAT1, LQOPHACHGINPKT jnz unexpected_nonpkt_phase;
+        test    LQOSTAT2, LQOPHACHGOUTPKT jnz unexpected_nonpkt_mode_cleared;
+        test    LQOSTAT1, LQOPHACHGINPKT jnz unexpected_nonpkt_mode_cleared;
 
         /*
          * If this is a packetized connection, return to our
@@ -2127,6 +2212,18 @@ SET_DST_MODE	M_DFF0;
         mvi     DFFSXFRCTL, CLRCHN;
 unexpected_nonpkt_mode_cleared:
         mvi     CLRSINT2, CLRNONPACKREQ;
+        if ((ahd->bugs & AHD_BUSFREEREV_BUG) != 0) {
+                /*
+                 * Test to ensure that the bus has not
+                 * already gone free prior to clearing
+                 * any stale busfree status.  This avoids
+                 * a window whereby a busfree just after
+                 * a selection could be missed.
+                 */
+                test    SCSISIGI, BSYI jz . + 2;
+                mvi     CLRSINT1,CLRBUSFREE;
+                or      SIMODE1, ENBUSFREE;
+        }
         test    SCSIPHASE, ~(MSG_IN_PHASE|MSG_OUT_PHASE) jnz illegal_phase;
         SET_SEQINTCODE(ENTERING_NONPACK)
         jmp     ITloop;
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index db8f5ce99ee3..342f77966a5b 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#247 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#250 $
  */
 
 #ifdef __linux__
@@ -197,7 +197,8 @@ static int		ahd_search_scb_list(struct ahd_softc *ahd, int target,
                                             char channel, int lun, u_int tag,
                                             role_t role, uint32_t status,
                                             ahd_search_action action,
-                                            u_int *list_head, u_int tid);
+                                            u_int *list_head, u_int *list_tail,
+                                            u_int tid);
 static void             ahd_stitch_tid_list(struct ahd_softc *ahd,
                                             u_int tid_prev, u_int tid_cur,
                                             u_int tid_next);
@@ -1660,7 +1661,8 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
                  * so just clear the error.
                  */
                 ahd_outb(ahd, CLRLQIINT1, CLRLQICRCI_NLQ);
-        } else if ((status & BUSFREE) != 0) {
+        } else if ((status & BUSFREE) != 0
+                || (lqistat1 & LQOBUSFREE) != 0) {
                 u_int lqostat1;
                 int   restart;
                 int   clear_fifo;
@@ -2025,10 +2027,6 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
                 u_int waiting_t;
                 u_int next;
 
-                if ((busfreetime & BUSFREE_LQO) == 0)
-                        printf("%s: Warning, BUSFREE time is 0x%x.  "
-                               "Expected BUSFREE_LQO.\n",
-                               ahd_name(ahd), busfreetime);
                 /*
                  * The LQO manager detected an unexpected busfree
                  * either:
@@ -2251,8 +2249,14 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         struct ahd_tmode_tstate *tstate;
 
                         /*
-                         * PPR Rejected.  Try non-ppr negotiation
-                         * and retry command.
+                         * PPR Rejected.
+                         *
+                         * If the previous negotiation was packetized,
+                         * this could be because the device has been
+                         * reset without our knowledge.  Force our
+                         * current negotiation to async and retry the
+                         * negotiation.  Otherwise retry the command
+                         * with non-ppr negotiation.
                          */
 #ifdef AHD_DEBUG
                         if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
@@ -2261,11 +2265,34 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                         tinfo = ahd_fetch_transinfo(ahd, devinfo.channel,
                                                     devinfo.our_scsiid,
                                                     devinfo.target, &tstate);
-                        tinfo->curr.transport_version = 2;
-                        tinfo->goal.transport_version = 2;
-                        tinfo->goal.ppr_options = 0;
-                        ahd_qinfifo_requeue_tail(ahd, scb);
-                        printerror = 0;
+                        if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ)!=0) {
+                                ahd_set_width(ahd, &devinfo,
+                                              MSG_EXT_WDTR_BUS_8_BIT,
+                                              AHD_TRANS_CUR,
+                                              /*paused*/TRUE);
+                                ahd_set_syncrate(ahd, &devinfo,
+                                                /*period*/0, /*offset*/0,
+                                                /*ppr_options*/0,
+                                                AHD_TRANS_CUR,
+                                                /*paused*/TRUE);
+                                /*
+                                 * The expect PPR busfree handler below
+                                 * will effect the retry and necessary
+                                 * abort.
+                                 */
+                        } else {
+                                tinfo->curr.transport_version = 2;
+                                tinfo->goal.transport_version = 2;
+                                tinfo->goal.ppr_options = 0;
+                                /*
+                                 * Remove any SCBs in the waiting for selection
+                                 * queue that may also be for this target so
+                                 * that command ordering is preserved.
+                                 */
+                                ahd_freeze_devq(ahd, scb);
+                                ahd_qinfifo_requeue_tail(ahd, scb);
+                                printerror = 0;
+                        }
                 } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE)
                         && ppr_busfree == 0) {
                         /*
@@ -2280,6 +2307,12 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                                       MSG_EXT_WDTR_BUS_8_BIT,
                                       AHD_TRANS_CUR|AHD_TRANS_GOAL,
                                       /*paused*/TRUE);
+                        /*
+                         * Remove any SCBs in the waiting for selection
+                         * queue that may also be for this target so that
+                         * command ordering is preserved.
+                         */
+                        ahd_freeze_devq(ahd, scb);
                         ahd_qinfifo_requeue_tail(ahd, scb);
                         printerror = 0;
                 } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE)
@@ -2297,6 +2330,12 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                                         /*ppr_options*/0,
                                         AHD_TRANS_CUR|AHD_TRANS_GOAL,
                                         /*paused*/TRUE);
+                        /*
+                         * Remove any SCBs in the waiting for selection
+                         * queue that may also be for this target so that
+                         * command ordering is preserved.
+                         */
+                        ahd_freeze_devq(ahd, scb);
                         ahd_qinfifo_requeue_tail(ahd, scb);
                         printerror = 0;
                 } else if ((ahd->msg_flags & MSG_FLAG_EXPECT_IDE_BUSFREE) != 0
@@ -2369,14 +2408,14 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd)
                          */
                         printf("%s: ", ahd_name(ahd));
                 }
-                if (lastphase != P_BUSFREE)
-                        ahd_force_renegotiation(ahd, &devinfo);
                 printf("Unexpected busfree %s, %d SCBs aborted, "
                        "PRGMCNT == 0x%x\n",
                        ahd_lookup_phase_entry(lastphase)->phasemsg,
                        aborted,
                        ahd_inw(ahd, PRGMCNT));
                 ahd_dump_card_state(ahd);
+                if (lastphase != P_BUSFREE)
+                        ahd_force_renegotiation(ahd, &devinfo);
         }
         /* Always restart the sequencer. */
         return (1);
@@ -3293,6 +3332,15 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                 con_opts |= WIDEXFER;
 
         /*
+         * Slow down our CRC interval to be
+         * compatible with packetized U320 devices
+         * that can't handle a CRC at full speed
+         */
+        if (ahd->features & AHD_AIC79XXB_SLOWCRC) {
+                con_opts |= ENSLOWCRC;
+        }
+
+        /*
          * During packetized transfers, the target will
          * give us the oportunity to send command packets
          * without us asserting attention.
@@ -3315,7 +3363,6 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
 {
         struct          scb *pending_scb;
         int             pending_scb_count;
-        u_int           scb_tag;
         int             paused;
         u_int           saved_scbptr;
         ahd_mode_state  saved_modes;
@@ -3333,7 +3380,6 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
         pending_scb_count = 0;
         LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
                 struct ahd_devinfo devinfo;
-                struct hardware_scb *pending_hscb;
                 struct ahd_initiator_tinfo *tinfo;
                 struct ahd_tmode_tstate *tstate;
 
@@ -3341,11 +3387,10 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
                 tinfo = ahd_fetch_transinfo(ahd, devinfo.channel,
                                             devinfo.our_scsiid,
                                             devinfo.target, &tstate);
-                pending_hscb = pending_scb->hscb;
                 if ((tstate->auto_negotiate & devinfo.target_mask) == 0
                  && (pending_scb->flags & SCB_AUTO_NEGOTIATE) != 0) {
                         pending_scb->flags &= ~SCB_AUTO_NEGOTIATE;
-                        pending_hscb->control &= ~MK_MESSAGE;
+                        pending_scb->hscb->control &= ~MK_MESSAGE;
                 }
                 ahd_sync_scb(ahd, pending_scb,
                              BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
@@ -3377,18 +3422,15 @@ ahd_update_pending_scbs(struct ahd_softc *ahd)
                 ahd_outb(ahd, SCSISEQ0, ahd_inb(ahd, SCSISEQ0) & ~ENSELO);
         saved_scbptr = ahd_get_scbptr(ahd);
         /* Ensure that the hscbs down on the card match the new information */
-        for (scb_tag = 0; scb_tag < ahd->scb_data.maxhscbs; scb_tag++) {
-                struct  hardware_scb *pending_hscb;
+        LIST_FOREACH(pending_scb, &ahd->pending_scbs, pending_links) {
+                u_int   scb_tag;
                 u_int   control;
 
-                pending_scb = ahd_lookup_scb(ahd, scb_tag);
-                if (pending_scb == NULL)
-                        continue;
+                scb_tag = SCB_GET_TAG(pending_scb);
                 ahd_set_scbptr(ahd, scb_tag);
-                pending_hscb = pending_scb->hscb;
                 control = ahd_inb_scbram(ahd, SCB_CONTROL);
                 control &= ~MK_MESSAGE;
-                control |= pending_hscb->control & MK_MESSAGE;
+                control |= pending_scb->hscb->control & MK_MESSAGE;
                 ahd_outb(ahd, SCB_CONTROL, control);
         }
         ahd_set_scbptr(ahd, saved_scbptr);
@@ -6500,13 +6542,14 @@ ahd_chip_init(struct ahd_softc *ahd)
                               | ENLQIOVERI_LQ|ENLQIOVERI_NLQ);
         ahd_outb(ahd, LQOMODE0, ENLQOATNLQ|ENLQOATNPKT|ENLQOTCRC);
         /*
-         * An interrupt from LQOBUSFREE is made redundant by the
-         * BUSFREE interrupt.  We choose to have the sequencer catch
-         * LQOPHCHGINPKT errors manually for the command phase at the
-         * start of a packetized selection case.
-        ahd_outb(ahd, LQOMODE1, ENLQOBUSFREE|ENLQOPHACHGINPKT);
+         * We choose to have the sequencer catch LQOPHCHGINPKT errors
+         * manually for the command phase at the start of a packetized
+         * selection case.  ENLQOBUSFREE should be made redundant by
+         * the BUSFREE interrupt, but it seems that some LQOBUSFREE
+         * events fail to assert the BUSFREE interrupt so we must
+         * also enable LQOBUSFREE interrupts.
          */
-        ahd_outb(ahd, LQOMODE1, 0);
+        ahd_outb(ahd, LQOMODE1, ENLQOBUSFREE);
 
         /*
          * Setup sequencer interrupt handlers.
@@ -6617,6 +6660,8 @@ ahd_chip_init(struct ahd_softc *ahd)
         /* We don't have any waiting selections */
         ahd_outw(ahd, WAITING_TID_HEAD, SCB_LIST_NULL);
         ahd_outw(ahd, WAITING_TID_TAIL, SCB_LIST_NULL);
+        ahd_outw(ahd, MK_MESSAGE_SCB, SCB_LIST_NULL);
+        ahd_outw(ahd, MK_MESSAGE_SCSIID, 0xFF);
         for (i = 0; i < AHD_NUM_TARGETS; i++)
                 ahd_outw(ahd, WAITING_SCB_TAILS + (2 * i), SCB_LIST_NULL);
 
@@ -6704,6 +6749,18 @@ ahd_chip_init(struct ahd_softc *ahd)
 
         ahd_loadseq(ahd);
         ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+
+        if (ahd->features & AHD_AIC79XXB_SLOWCRC) {
+                u_int negodat3 = ahd_inb(ahd, NEGCONOPTS);
+
+                negodat3 |= ENSLOWCRC;
+                ahd_outb(ahd, NEGCONOPTS, negodat3);
+                negodat3 = ahd_inb(ahd, NEGCONOPTS);
+                if (!(negodat3 & ENSLOWCRC))
+                        printf("aic79xx: failed to set the SLOWCRC bit\n");
+                else
+                        printf("aic79xx: SLOWCRC bit set\n");
+        }
 }
 
 /*
@@ -7260,12 +7317,28 @@ ahd_reset_cmds_pending(struct ahd_softc *ahd)
         ahd->flags &= ~AHD_UPDATE_PEND_CMDS;
 }
 
+void
+ahd_done_with_status(struct ahd_softc *ahd, struct scb *scb, uint32_t status)
+{
+        cam_status ostat;
+        cam_status cstat;
+
+        ostat = ahd_get_transaction_status(scb);
+        if (ostat == CAM_REQ_INPROG)
+                ahd_set_transaction_status(scb, status);
+        cstat = ahd_get_transaction_status(scb);
+        if (cstat != CAM_REQ_CMP)
+                ahd_freeze_scb(scb);
+        ahd_done(ahd, scb);
+}
+
 int
 ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                    int lun, u_int tag, role_t role, uint32_t status,
                    ahd_search_action action)
 {
         struct scb      *scb;
+        struct scb      *mk_msg_scb;
         struct scb      *prev_scb;
         ahd_mode_state   saved_modes;
         u_int            qinstart;
@@ -7274,6 +7347,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
         u_int            tid_next;
         u_int            tid_prev;
         u_int            scbid;
+        u_int            seq_flags2;
         u_int            savedscbptr;
         uint32_t         busaddr;
         int              found;
@@ -7329,23 +7403,10 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                         found++;
                         switch (action) {
                         case SEARCH_COMPLETE:
-                        {
-                                cam_status ostat;
-                                cam_status cstat;
-
-                                ostat = ahd_get_transaction_status(scb);
-                                if (ostat == CAM_REQ_INPROG)
-                                        ahd_set_transaction_status(scb,
-                                                                   status);
-                                cstat = ahd_get_transaction_status(scb);
-                                if (cstat != CAM_REQ_CMP)
-                                        ahd_freeze_scb(scb);
                                 if ((scb->flags & SCB_ACTIVE) == 0)
                                         printf("Inactive SCB in qinfifo\n");
-                                ahd_done(ahd, scb);
-
+                                ahd_done_with_status(ahd, scb, status);
                                 /* FALLTHROUGH */
-                        }
                         case SEARCH_REMOVE:
                                 break;
                         case SEARCH_PRINT:
@@ -7375,21 +7436,24 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
          * looking for matches.
          */
         ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+        seq_flags2 = ahd_inb(ahd, SEQ_FLAGS2);
+        if ((seq_flags2 & PENDING_MK_MESSAGE) != 0) {
+                scbid = ahd_inw(ahd, MK_MESSAGE_SCB);
+                mk_msg_scb = ahd_lookup_scb(ahd, scbid);
+        } else
+                mk_msg_scb = NULL;
         savedscbptr = ahd_get_scbptr(ahd);
         tid_next = ahd_inw(ahd, WAITING_TID_HEAD);
         tid_prev = SCB_LIST_NULL;
         targets = 0;
         for (scbid = tid_next; !SCBID_IS_NULL(scbid); scbid = tid_next) {
                 u_int tid_head;
+                u_int tid_tail;
 
-                /*
-                 * We limit based on the number of SCBs since
-                 * MK_MESSAGE SCBs are not in the per-tid lists.
-                 */
                 targets++;
-                if (targets > AHD_SCB_MAX) {
+                if (targets > AHD_NUM_TARGETS)
                         panic("TID LIST LOOP");
-                }
+
                 if (scbid >= ahd->scb_data.numscbs) {
                         printf("%s: Waiting TID List inconsistency. "
                                "SCB index == 0x%x, yet numscbs == 0x%x.",
@@ -7419,8 +7483,71 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                 tid_head = scbid;
                 found += ahd_search_scb_list(ahd, target, channel,
                                              lun, tag, role, status,
-                                             action, &tid_head,
+                                             action, &tid_head, &tid_tail,
                                              SCB_GET_TARGET(ahd, scb));
+                /*
+                 * Check any MK_MESSAGE SCB that is still waiting to
+                 * enter this target's waiting for selection queue.
+                 */
+                if (mk_msg_scb != NULL
+                 && ahd_match_scb(ahd, mk_msg_scb, target, channel,
+                                  lun, tag, role)) {
+
+                        /*
+                         * We found an scb that needs to be acted on.
+                         */
+                        found++;
+                        switch (action) {
+                        case SEARCH_COMPLETE:
+                                if ((mk_msg_scb->flags & SCB_ACTIVE) == 0)
+                                        printf("Inactive SCB pending MK_MSG\n");
+                                ahd_done_with_status(ahd, mk_msg_scb, status);
+                                /* FALLTHROUGH */
+                        case SEARCH_REMOVE:
+                        {
+                                u_int tail_offset;
+
+                                printf("Removing MK_MSG scb\n");
+
+                                /*
+                                 * Reset our tail to the tail of the
+                                 * main per-target list.
+                                 */
+                                tail_offset = WAITING_SCB_TAILS
+                                    + (2 * SCB_GET_TARGET(ahd, mk_msg_scb));
+                                ahd_outw(ahd, tail_offset, tid_tail);
+
+                                seq_flags2 &= ~PENDING_MK_MESSAGE;
+                                ahd_outb(ahd, SEQ_FLAGS2, seq_flags2);
+                                ahd_outw(ahd, CMDS_PENDING,
+                                         ahd_inw(ahd, CMDS_PENDING)-1);
+                                mk_msg_scb = NULL;
+                                break;
+                        }
+                        case SEARCH_PRINT:
+                                printf(" 0x%x", SCB_GET_TAG(scb));
+                                /* FALLTHROUGH */
+                        case SEARCH_COUNT:
+                                break;
+                        }
+                }
+
+                if (mk_msg_scb != NULL
+                 && SCBID_IS_NULL(tid_head)
+                 && ahd_match_scb(ahd, scb, target, channel, CAM_LUN_WILDCARD,
+                                  SCB_LIST_NULL, ROLE_UNKNOWN)) {
+
+                        /*
+                         * When removing the last SCB for a target
+                         * queue with a pending MK_MESSAGE scb, we
+                         * must queue the MK_MESSAGE scb.
+                         */
+                        printf("Queueing mk_msg_scb\n");
+                        tid_head = ahd_inw(ahd, MK_MESSAGE_SCB);
+                        seq_flags2 &= ~PENDING_MK_MESSAGE;
+                        ahd_outb(ahd, SEQ_FLAGS2, seq_flags2);
+                        mk_msg_scb = NULL;
+                }
                 if (tid_head != scbid)
                         ahd_stitch_tid_list(ahd, tid_prev, tid_head, tid_next);
                 if (!SCBID_IS_NULL(tid_head))
@@ -7428,6 +7555,8 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
                 if (action == SEARCH_PRINT)
                         printf(")\n");
         }
+
+        /* Restore saved state. */
         ahd_set_scbptr(ahd, savedscbptr);
         ahd_restore_modes(ahd, saved_modes);
         return (found);
@@ -7436,7 +7565,8 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
 static int
 ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
                     int lun, u_int tag, role_t role, uint32_t status,
-                    ahd_search_action action, u_int *list_head, u_int tid)
+                    ahd_search_action action, u_int *list_head, 
+                    u_int *list_tail, u_int tid)
 {
         struct  scb *scb;
         u_int   scbid;
@@ -7448,6 +7578,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
         found = 0;
         prev = SCB_LIST_NULL;
         next = *list_head;
+        *list_tail = SCB_LIST_NULL;
         for (scbid = next; !SCBID_IS_NULL(scbid); scbid = next) {
                 if (scbid >= ahd->scb_data.numscbs) {
                         printf("%s:SCB List inconsistency. "
@@ -7463,6 +7594,7 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
                         panic("Waiting List traversal\n");
                 }
                 ahd_set_scbptr(ahd, scbid);
+                *list_tail = scbid;
                 next = ahd_inw_scbram(ahd, SCB_NEXT);
                 if (ahd_match_scb(ahd, scb, target, channel,
                                   lun, SCB_LIST_NULL, role) == 0) {
@@ -7472,24 +7604,14 @@ ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
                 found++;
                 switch (action) {
                 case SEARCH_COMPLETE:
-                {
-                        cam_status ostat;
-                        cam_status cstat;
-
-                        ostat = ahd_get_transaction_status(scb);
-                        if (ostat == CAM_REQ_INPROG)
-                                ahd_set_transaction_status(scb, status);
-                        cstat = ahd_get_transaction_status(scb);
-                        if (cstat != CAM_REQ_CMP)
-                                ahd_freeze_scb(scb);
                         if ((scb->flags & SCB_ACTIVE) == 0)
                                 printf("Inactive SCB in Waiting List\n");
-                        ahd_done(ahd, scb);
+                        ahd_done_with_status(ahd, scb, status);
                         /* FALLTHROUGH */
-                }
                 case SEARCH_REMOVE:
                         ahd_rem_wscb(ahd, scbid, prev, next, tid);
-                        if (prev == SCB_LIST_NULL)
+                        *list_tail = prev;
+                        if (SCBID_IS_NULL(prev))
                                 *list_head = next;
                         break;
                 case SEARCH_PRINT:
@@ -7558,14 +7680,17 @@ ahd_rem_wscb(struct ahd_softc *ahd, u_int scbid,
         }
 
         /*
-         * SCBs that had MK_MESSAGE set in them will not
-         * be queued to the per-target lists, so don't
-         * blindly clear the tail pointer.
+         * SCBs that have MK_MESSAGE set in them may
+         * cause the tail pointer to be updated without
+         * setting the next pointer of the previous tail.
+         * Only clear the tail if the removed SCB was
+         * the tail.
          */
         tail_offset = WAITING_SCB_TAILS + (2 * tid);
         if (SCBID_IS_NULL(next)
          && ahd_inw(ahd, tail_offset) == scbid)
                 ahd_outw(ahd, tail_offset, prev);
+
         ahd_add_scb_to_free_list(ahd, scbid);
         return (next);
 }
@@ -8148,11 +8273,6 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
                 ahd_setup_data_scb(ahd, scb);
                 scb->flags |= SCB_SENSE;
                 ahd_queue_scb(ahd, scb);
-                /*
-                 * Ensure we have enough time to actually
-                 * retrieve the sense.
-                 */
-                ahd_scb_timer_reset(scb, 5 * 1000000);
                 break;
         }
         case SCSI_STATUS_OK:
@@ -8793,6 +8913,9 @@ ahd_dump_card_state(struct ahd_softc *ahd)
          * Mode independent registers.
          */
         cur_col = 0;
+        ahd_intstat_print(ahd_inb(ahd, INTSTAT), &cur_col, 50);
+        ahd_seloid_print(ahd_inb(ahd, SELOID), &cur_col, 50);
+        ahd_selid_print(ahd_inb(ahd, SELID), &cur_col, 50);
         ahd_hs_mailbox_print(ahd_inb(ahd, LOCAL_HS_MAILBOX), &cur_col, 50);
         ahd_intctl_print(ahd_inb(ahd, INTCTL), &cur_col, 50);
         ahd_seqintstat_print(ahd_inb(ahd, SEQINTSTAT), &cur_col, 50);
@@ -8808,6 +8931,12 @@ ahd_dump_card_state(struct ahd_softc *ahd)
         ahd_seqintctl_print(ahd_inb(ahd, SEQINTCTL), &cur_col, 50);
         ahd_seq_flags_print(ahd_inb(ahd, SEQ_FLAGS), &cur_col, 50);
         ahd_seq_flags2_print(ahd_inb(ahd, SEQ_FLAGS2), &cur_col, 50);
+        ahd_qfreeze_count_print(ahd_inw(ahd, QFREEZE_COUNT), &cur_col, 50);
+        ahd_kernel_qfreeze_count_print(ahd_inw(ahd, KERNEL_QFREEZE_COUNT),
+                                       &cur_col, 50);
+        ahd_mk_message_scb_print(ahd_inw(ahd, MK_MESSAGE_SCB), &cur_col, 50);
+        ahd_mk_message_scsiid_print(ahd_inb(ahd, MK_MESSAGE_SCSIID),
+                                    &cur_col, 50);
         ahd_sstat0_print(ahd_inb(ahd, SSTAT0), &cur_col, 50);
         ahd_sstat1_print(ahd_inb(ahd, SSTAT1), &cur_col, 50);
         ahd_sstat2_print(ahd_inb(ahd, SSTAT2), &cur_col, 50);
@@ -8915,7 +9044,7 @@ ahd_dump_card_state(struct ahd_softc *ahd)
 
                 ahd_set_modes(ahd, AHD_MODE_DFF0 + i, AHD_MODE_DFF0 + i);
                 fifo_scbptr = ahd_get_scbptr(ahd);
-                printf("\n%s: FIFO%d %s, LONGJMP == 0x%x, SCB 0x%x\n",
+                printf("\n\n%s: FIFO%d %s, LONGJMP == 0x%x, SCB 0x%x\n",
                        ahd_name(ahd), i,
                        (dffstat & (FIFO0FREE << i)) ? "Free" : "Active",
                        ahd_inw(ahd, LONGJMP_ADDR), fifo_scbptr);
@@ -8970,6 +9099,9 @@ ahd_dump_card_state(struct ahd_softc *ahd)
         printf("%s: OS_SPACE_CNT = 0x%x MAXCMDCNT = 0x%x\n",
                ahd_name(ahd), ahd_inb(ahd, OS_SPACE_CNT),
                ahd_inb(ahd, MAXCMDCNT));
+        printf("%s: SAVED_SCSIID = 0x%x SAVED_LUN = 0x%x\n",
+               ahd_name(ahd), ahd_inb(ahd, SAVED_SCSIID),
+               ahd_inb(ahd, SAVED_LUN));
         ahd_simode0_print(ahd_inb(ahd, SIMODE0), &cur_col, 50);
         printf("\n");
         ahd_set_modes(ahd, AHD_MODE_CCHAN, AHD_MODE_CCHAN);
diff --git a/drivers/scsi/aic7xxx/aic79xx_inline.h b/drivers/scsi/aic7xxx/aic79xx_inline.h
index 91c4f7f484b1..8ad3ce945b9e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_inline.h
+++ b/drivers/scsi/aic7xxx/aic79xx_inline.h
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#58 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#59 $
  *
  * $FreeBSD$
  */
@@ -804,9 +804,10 @@ ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb)
                 uint64_t host_dataptr;
 
                 host_dataptr = ahd_le64toh(scb->hscb->dataptr);
-                printf("%s: Queueing SCB 0x%x bus addr 0x%x - 0x%x%x/0x%x\n",
+                printf("%s: Queueing SCB %d:0x%x bus addr 0x%x - 0x%x%x/0x%x\n",
                        ahd_name(ahd),
-                       SCB_GET_TAG(scb), ahd_le32toh(scb->hscb->hscb_busaddr),
+                       SCB_GET_TAG(scb), scb->hscb->scsiid,
+                       ahd_le32toh(scb->hscb->hscb_busaddr),
                        (u_int)((host_dataptr >> 32) & 0xFFFFFFFF),
                        (u_int)(host_dataptr & 0xFFFFFFFF),
                        ahd_le32toh(scb->hscb->datacnt));
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 2567e29960bd..7254ea535a16 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -314,6 +314,21 @@ static uint32_t aic79xx_seltime;
  */
 uint32_t aic79xx_periodic_otag;
 
+/* Some storage boxes are using an LSI chip which has a bug making it
+ * impossible to use aic79xx Rev B chip in 320 speeds.  The following
+ * storage boxes have been reported to be buggy:
+ * EonStor 3U 16-Bay: U16U-G3A3
+ * EonStor 2U 12-Bay: U12U-G3A3
+ * SentinelRAID: 2500F R5 / R6
+ * SentinelRAID: 2500F R1
+ * SentinelRAID: 2500F/1500F
+ * SentinelRAID: 150F
+ * 
+ * To get around this LSI bug, you can set your board to 160 mode
+ * or you can enable the SLOWCRC bit.
+ */
+uint32_t aic79xx_slowcrc;
+
 /*
  * Module information and settable options.
  */
@@ -343,6 +358,7 @@ MODULE_PARM_DESC(aic79xx,
 "       amplitude:<int>         Set the signal amplitude (0-7).\n"
 "       seltime:<int>           Selection Timeout:\n"
 "                               (0/256ms,1/128ms,2/64ms,3/32ms)\n"
+"       slowcrc                 Turn on the SLOWCRC bit (Rev B only)\n"          
 "\n"
 "       Sample /etc/modprobe.conf line:\n"
 "               Enable verbose logging\n"
@@ -1003,6 +1019,7 @@ aic79xx_setup(char *s)
                 { "slewrate", NULL },
                 { "precomp", NULL },
                 { "amplitude", NULL },
+                { "slowcrc", &aic79xx_slowcrc },
         };
 
         end = strchr(s, '\0');
@@ -1072,7 +1089,6 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
                 return (ENOMEM);
 
         *((struct ahd_softc **)host->hostdata) = ahd;
-        ahd_lock(ahd, &s);
         ahd->platform_data->host = host;
         host->can_queue = AHD_MAX_QUEUE;
         host->cmd_per_lun = 2;
@@ -1083,7 +1099,9 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
         host->max_lun = AHD_NUM_LUNS;
         host->max_channel = 0;
         host->sg_tablesize = AHD_NSEG;
+        ahd_lock(ahd, &s);
         ahd_set_unit(ahd, ahd_linux_unit++);
+        ahd_unlock(ahd, &s);
         sprintf(buf, "scsi%d", host->host_no);
         new_name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
         if (new_name != NULL) {
@@ -1093,7 +1111,6 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
         host->unique_id = ahd->unit;
         ahd_linux_initialize_scsi_bus(ahd);
         ahd_intr_enable(ahd, TRUE);
-        ahd_unlock(ahd, &s);
 
         host->transportt = ahd_linux_transport_template;
 
@@ -1127,6 +1144,7 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
 {
         u_int target_id;
         u_int numtarg;
+        unsigned long s;
 
         target_id = 0;
         numtarg = 0;
@@ -1139,6 +1157,8 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
         else
                 numtarg = (ahd->features & AHD_WIDE) ? 16 : 8;
 
+        ahd_lock(ahd, &s);
+
         /*
          * Force negotiation to async for all targets that
          * will not see an initial bus reset.
@@ -1155,16 +1175,12 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
                 ahd_update_neg_request(ahd, &devinfo, tstate,
                                        tinfo, AHD_NEG_ALWAYS);
         }
+        ahd_unlock(ahd, &s);
         /* Give the bus some time to recover */
         if ((ahd->flags & AHD_RESET_BUS_A) != 0) {
                 ahd_freeze_simq(ahd);
-                init_timer(&ahd->platform_data->reset_timer);
-                ahd->platform_data->reset_timer.data = (u_long)ahd;
-                ahd->platform_data->reset_timer.expires =
-                    jiffies + (AIC79XX_RESET_DELAY * HZ)/1000;
-                ahd->platform_data->reset_timer.function =
-                    (ahd_linux_callback_t *)ahd_release_simq;
-                add_timer(&ahd->platform_data->reset_timer);
+                msleep(AIC79XX_RESET_DELAY);
+                ahd_release_simq(ahd);
         }
 }
 
@@ -2033,6 +2049,9 @@ ahd_linux_sem_timeout(u_long arg)
 void
 ahd_freeze_simq(struct ahd_softc *ahd)
 {
+        unsigned long s;
+
+        ahd_lock(ahd, &s);
         ahd->platform_data->qfrozen++;
         if (ahd->platform_data->qfrozen == 1) {
                 scsi_block_requests(ahd->platform_data->host);
@@ -2040,6 +2059,7 @@ ahd_freeze_simq(struct ahd_softc *ahd)
                                         CAM_LUN_WILDCARD, SCB_LIST_NULL,
                                         ROLE_INITIATOR, CAM_REQUEUE_REQ);
         }
+        ahd_unlock(ahd, &s);
 }
 
 void
@@ -2344,8 +2364,9 @@ done:
                                ahd_name(ahd), dev->active);
                         retval = FAILED;
                 }
-        }
-        ahd_unlock(ahd, &flags);
+        } else
+                ahd_unlock(ahd, &flags);
+
         return (retval);
 }
 
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index cb74fccc8100..9cb101345107 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -36,7 +36,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#137 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#166 $
  *
  */
 #ifndef _AIC79XX_LINUX_H_
@@ -228,7 +228,6 @@ typedef struct timer_list ahd_timer_t;
 typedef void ahd_linux_callback_t (u_long);  
 static __inline void ahd_timer_reset(ahd_timer_t *timer, int usec,
                                      ahd_callback_t *func, void *arg);
-static __inline void ahd_scb_timer_reset(struct scb *scb, u_int usec);
 
 static __inline void
 ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
@@ -243,12 +242,6 @@ ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
         add_timer(timer);
 }
 
-static __inline void
-ahd_scb_timer_reset(struct scb *scb, u_int usec)
-{
-        mod_timer(&scb->io_ctx->eh_timeout, jiffies + (usec * HZ)/1000000);
-}
-
 /***************************** SMP support ************************************/
 #include <linux/spinlock.h>
 
@@ -389,7 +382,6 @@ struct ahd_platform_data {
 
         spinlock_t               spin_lock;
         u_int                    qfrozen;
-        struct timer_list        reset_timer;
         struct semaphore         eh_sem;
         struct Scsi_Host        *host;          /* pointer to scsi host */
 #define AHD_LINUX_NOIRQ ((uint32_t)~0)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index bf360ae021ab..ebbf7e4ff4cc 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -220,10 +220,10 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base,
         *base2 = pci_resource_start(ahd->dev_softc, 3);
         if (*base == 0 || *base2 == 0)
                 return (ENOMEM);
-        if (request_region(*base, 256, "aic79xx") == 0)
+        if (!request_region(*base, 256, "aic79xx"))
                 return (ENOMEM);
-        if (request_region(*base2, 256, "aic79xx") == 0) {
-                release_region(*base2, 256);
+        if (!request_region(*base2, 256, "aic79xx")) {
+                release_region(*base, 256);
                 return (ENOMEM);
         }
         return (0);
@@ -237,7 +237,7 @@ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
         u_long  start;
         u_long  base_page;
         u_long  base_offset;
-        int     error;
+        int     error = 0;
 
         if (aic79xx_allow_memio == 0)
                 return (ENOMEM);
@@ -245,16 +245,15 @@ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
         if ((ahd->bugs & AHD_PCIX_MMAPIO_BUG) != 0)
                 return (ENOMEM);
 
-        error = 0;
         start = pci_resource_start(ahd->dev_softc, 1);
         base_page = start & PAGE_MASK;
         base_offset = start - base_page;
         if (start != 0) {
                 *bus_addr = start;
-                if (request_mem_region(start, 0x1000, "aic79xx") == 0)
+                if (!request_mem_region(start, 0x1000, "aic79xx"))
                         error = ENOMEM;
-                if (error == 0) {
-                        *maddr = ioremap_nocache(base_page, base_offset + 256);
+                if (!error) {
+                        *maddr = ioremap_nocache(base_page, base_offset + 512);
                         if (*maddr == NULL) {
                                 error = ENOMEM;
                                 release_mem_region(start, 0x1000);
@@ -344,7 +343,7 @@ ahd_pci_map_int(struct ahd_softc *ahd)
 
         error = request_irq(ahd->dev_softc->irq, ahd_linux_isr,
                             SA_SHIRQ, "aic79xx", ahd);
-        if (error == 0)
+        if (!error)
                 ahd->platform_data->irq = ahd->dev_softc->irq;
         
         return (-error);
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 196a6344b037..757242e522c2 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#89 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#92 $
  */
 
 #ifdef __linux__
@@ -950,12 +950,19 @@ ahd_aic790X_setup(struct ahd_softc *ahd)
                 if ((ahd->flags & AHD_HP_BOARD) == 0)
                         AHD_SET_SLEWRATE(ahd, AHD_SLEWRATE_DEF_REVA);
         } else {
+                /* This is revision B and newer. */
+                extern uint32_t aic79xx_slowcrc;
                 u_int devconfig1;
 
                 ahd->features |= AHD_RTI|AHD_NEW_IOCELL_OPTS
-                              |  AHD_NEW_DFCNTRL_OPTS|AHD_FAST_CDB_DELIVERY;
+                              |  AHD_NEW_DFCNTRL_OPTS|AHD_FAST_CDB_DELIVERY
+                              |  AHD_BUSFREEREV_BUG;
                 ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG;
 
+                /* If the user requested the the SLOWCRC bit to be set. */
+                if (aic79xx_slowcrc)
+                        ahd->features |= AHD_AIC79XXB_SLOWCRC;
+
                 /*
                  * Some issues have been resolved in the 7901B.
                  */
diff --git a/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped b/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
index 8763b158856b..2068e00d2c75 100644
--- a/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $
  */
 typedef int (ahd_reg_print_t)(u_int, u_int *, u_int);
 typedef struct ahd_reg_parse_entry {
@@ -2204,6 +2204,20 @@ ahd_reg_print_t ahd_cmdsize_table_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
+ahd_reg_print_t ahd_mk_message_scb_print;
+#else
+#define ahd_mk_message_scb_print(regvalue, cur_col, wrap) \
+    ahd_print_register(NULL, 0, "MK_MESSAGE_SCB", 0x160, regvalue, cur_col, wrap)
+#endif
+
+#if AIC_DEBUG_REGISTERS
+ahd_reg_print_t ahd_mk_message_scsiid_print;
+#else
+#define ahd_mk_message_scsiid_print(regvalue, cur_col, wrap) \
+    ahd_print_register(NULL, 0, "MK_MESSAGE_SCSIID", 0x162, regvalue, cur_col, wrap)
+#endif
+
+#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scb_base_print;
 #else
 #define ahd_scb_base_print(regvalue, cur_col, wrap) \
@@ -3638,6 +3652,7 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 #define SEQ_FLAGS2                      0x14d
 #define         SELECTOUT_QFROZEN       0x04
 #define         TARGET_MSG_PENDING      0x02
+#define         PENDING_MK_MESSAGE      0x01
 
 #define ALLOCFIFO_SCBPTR                0x14e
 
@@ -3655,6 +3670,10 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 
 #define CMDSIZE_TABLE                   0x158
 
+#define MK_MESSAGE_SCB                  0x160
+
+#define MK_MESSAGE_SCSIID               0x162
+
 #define SCB_BASE                        0x180
 
 #define SCB_RESIDUAL_DATACNT            0x180
@@ -3800,5 +3819,5 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print;
 
 
 /* Exported Labels */
-#define LABEL_seq_isr   0x285
-#define LABEL_timer_isr 0x281
+#define LABEL_seq_isr   0x28f
+#define LABEL_timer_isr 0x28b
diff --git a/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped b/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
index a4137c985376..db38a61a8cb4 100644
--- a/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#118 $
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#75 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $
  */
 
 #include "aic79xx_osm.h"
@@ -3382,6 +3382,7 @@ ahd_initiator_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 
 static ahd_reg_parse_entry_t SEQ_FLAGS2_parse_table[] = {
+        { "PENDING_MK_MESSAGE", 0x01, 0x01 },
         { "TARGET_MSG_PENDING", 0x02, 0x02 },
         { "SELECTOUT_QFROZEN",  0x04, 0x04 }
 };
@@ -3389,7 +3390,7 @@ static ahd_reg_parse_entry_t SEQ_FLAGS2_parse_table[] = {
 int
 ahd_seq_flags2_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
-        return (ahd_print_register(SEQ_FLAGS2_parse_table, 2, "SEQ_FLAGS2",
+        return (ahd_print_register(SEQ_FLAGS2_parse_table, 3, "SEQ_FLAGS2",
             0x14d, regvalue, cur_col, wrap));
 }
 
@@ -3450,6 +3451,20 @@ ahd_cmdsize_table_print(u_int regvalue, u_int *cur_col, u_int wrap)
 }
 
 int
+ahd_mk_message_scb_print(u_int regvalue, u_int *cur_col, u_int wrap)
+{
+        return (ahd_print_register(NULL, 0, "MK_MESSAGE_SCB",
+            0x160, regvalue, cur_col, wrap));
+}
+
+int
+ahd_mk_message_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
+{
+        return (ahd_print_register(NULL, 0, "MK_MESSAGE_SCSIID",
+            0x162, regvalue, cur_col, wrap));
+}
+
+int
 ahd_scb_base_print(u_int regvalue, u_int *cur_col, u_int wrap)
 {
         return (ahd_print_register(NULL, 0, "SCB_BASE",
diff --git a/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped b/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
index b1e5365be230..11bed07e90b7 100644
--- a/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
+++ b/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
@@ -2,17 +2,17 @@
  * DO NOT EDIT - This file is automatically generated
  *               from the following source files:
  *
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#119 $
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#76 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#120 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#77 $
  */
 static uint8_t seqprog[] = {
         0xff, 0x02, 0x06, 0x78,
-        0x00, 0xea, 0x64, 0x59,
+        0x00, 0xea, 0x6e, 0x59,
         0x01, 0xea, 0x04, 0x30,
         0xff, 0x04, 0x0c, 0x78,
-        0x19, 0xea, 0x64, 0x59,
+        0x19, 0xea, 0x6e, 0x59,
         0x19, 0xea, 0x04, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x60, 0x3a, 0x3a, 0x68,
         0x04, 0x4d, 0x35, 0x78,
@@ -33,15 +33,15 @@ static uint8_t seqprog[] = {
         0xff, 0xea, 0x62, 0x02,
         0x00, 0xe2, 0x3a, 0x40,
         0xff, 0x21, 0x3b, 0x70,
-        0x40, 0x4b, 0xaa, 0x69,
-        0x00, 0xe2, 0x68, 0x59,
-        0x40, 0x4b, 0xaa, 0x69,
-        0x20, 0x4b, 0x96, 0x69,
+        0x40, 0x4b, 0xb4, 0x69,
+        0x00, 0xe2, 0x72, 0x59,
+        0x40, 0x4b, 0xb4, 0x69,
+        0x20, 0x4b, 0xa0, 0x69,
         0xfc, 0x42, 0x44, 0x78,
         0x10, 0x40, 0x44, 0x78,
-        0x00, 0xe2, 0xfc, 0x5d,
+        0x00, 0xe2, 0x10, 0x5e,
         0x20, 0x4d, 0x48, 0x78,
-        0x00, 0xe2, 0xfc, 0x5d,
+        0x00, 0xe2, 0x10, 0x5e,
         0x30, 0x3f, 0xc0, 0x09,
         0x30, 0xe0, 0x50, 0x60,
         0x7f, 0x4a, 0x94, 0x08,
@@ -51,7 +51,7 @@ static uint8_t seqprog[] = {
         0x00, 0xe2, 0x76, 0x58,
         0x00, 0xe2, 0x86, 0x58,
         0x00, 0xe2, 0x06, 0x40,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x01, 0x52, 0x84, 0x78,
         0x02, 0x58, 0x50, 0x31,
@@ -59,26 +59,26 @@ static uint8_t seqprog[] = {
         0xff, 0x97, 0x6f, 0x78,
         0x50, 0x4b, 0x6a, 0x68,
         0xbf, 0x3a, 0x74, 0x08,
-        0x14, 0xea, 0x64, 0x59,
+        0x14, 0xea, 0x6e, 0x59,
         0x14, 0xea, 0x04, 0x00,
         0x08, 0x92, 0x25, 0x03,
         0xff, 0x90, 0x5f, 0x68,
-        0x00, 0xe2, 0x76, 0x5b,
+        0x00, 0xe2, 0x8a, 0x5b,
         0x00, 0xe2, 0x5e, 0x40,
-        0x00, 0xea, 0x5e, 0x59,
+        0x00, 0xea, 0x68, 0x59,
         0x01, 0xea, 0x00, 0x30,
         0x80, 0xf9, 0x7e, 0x68,
-        0x00, 0xe2, 0x5c, 0x59,
-        0x11, 0xea, 0x5e, 0x59,
+        0x00, 0xe2, 0x66, 0x59,
+        0x11, 0xea, 0x68, 0x59,
         0x11, 0xea, 0x00, 0x00,
-        0x80, 0xf9, 0x5c, 0x79,
+        0x80, 0xf9, 0x66, 0x79,
         0xff, 0xea, 0xd4, 0x0d,
-        0x22, 0xea, 0x5e, 0x59,
+        0x22, 0xea, 0x68, 0x59,
         0x22, 0xea, 0x00, 0x00,
         0x10, 0x16, 0x90, 0x78,
         0x10, 0x16, 0x2c, 0x00,
         0x01, 0x0b, 0xae, 0x32,
-        0x18, 0xad, 0x12, 0x79,
+        0x18, 0xad, 0x1c, 0x79,
         0x04, 0xad, 0xdc, 0x68,
         0x80, 0xad, 0x84, 0x78,
         0x10, 0xad, 0xaa, 0x78,
@@ -118,7 +118,6 @@ static uint8_t seqprog[] = {
         0x80, 0x18, 0x30, 0x04,
         0x40, 0xad, 0x84, 0x78,
         0xe7, 0xad, 0x5a, 0x09,
-        0x02, 0xa8, 0x40, 0x31,
         0xff, 0xea, 0xc0, 0x09,
         0x01, 0x54, 0xa9, 0x1a,
         0x00, 0x55, 0xab, 0x22,
@@ -128,24 +127,30 @@ static uint8_t seqprog[] = {
         0xff, 0xea, 0x5a, 0x03,
         0xff, 0xea, 0x5e, 0x03,
         0x01, 0x10, 0xd4, 0x31,
-        0x10, 0x92, 0x07, 0x69,
+        0x02, 0xa8, 0x40, 0x31,
+        0x01, 0x92, 0xc1, 0x31,
         0x3d, 0x93, 0xc5, 0x29,
         0xfe, 0xe2, 0xc4, 0x09,
         0x01, 0xea, 0xc6, 0x01,
         0x02, 0xe2, 0xc8, 0x31,
         0x02, 0xec, 0x50, 0x31,
         0x02, 0xa0, 0xda, 0x31,
-        0xff, 0xa9, 0x06, 0x71,
+        0xff, 0xa9, 0x10, 0x71,
+        0x10, 0xe0, 0x0e, 0x79,
+        0x10, 0x92, 0x0f, 0x79,
+        0x01, 0x4d, 0x9b, 0x02,
+        0x02, 0xa0, 0xc0, 0x32,
+        0x01, 0x93, 0xc5, 0x36,
         0x02, 0xa0, 0x58, 0x37,
-        0xff, 0x21, 0x0f, 0x71,
+        0xff, 0x21, 0x19, 0x71,
         0x02, 0x22, 0x51, 0x31,
         0x02, 0xa0, 0x5c, 0x33,
         0x02, 0xa0, 0x44, 0x36,
         0x02, 0xa0, 0x40, 0x32,
         0x02, 0xa0, 0x44, 0x36,
-        0x04, 0x4d, 0x17, 0x69,
-        0x40, 0x16, 0x48, 0x69,
-        0xff, 0x2d, 0x4d, 0x61,
+        0x05, 0x4d, 0x21, 0x69,
+        0x40, 0x16, 0x52, 0x69,
+        0xff, 0x2d, 0x57, 0x61,
         0xff, 0x29, 0x85, 0x70,
         0x02, 0x28, 0x55, 0x32,
         0x01, 0xea, 0x5a, 0x01,
@@ -159,22 +164,22 @@ static uint8_t seqprog[] = {
         0x01, 0x56, 0xad, 0x1a,
         0xff, 0x54, 0xa9, 0x1a,
         0xff, 0x55, 0xab, 0x22,
-        0xff, 0x8d, 0x41, 0x71,
-        0x80, 0xac, 0x40, 0x71,
-        0x20, 0x16, 0x40, 0x69,
+        0xff, 0x8d, 0x4b, 0x71,
+        0x80, 0xac, 0x4a, 0x71,
+        0x20, 0x16, 0x4a, 0x69,
         0x00, 0xac, 0xc4, 0x19,
-        0x07, 0xe2, 0x40, 0xf9,
+        0x07, 0xe2, 0x4a, 0xf9,
         0x02, 0x8c, 0x51, 0x31,
-        0x00, 0xe2, 0x24, 0x41,
+        0x00, 0xe2, 0x2e, 0x41,
         0x01, 0xac, 0x08, 0x31,
         0x09, 0xea, 0x5a, 0x01,
         0x02, 0x8c, 0x51, 0x32,
         0xff, 0xea, 0x1a, 0x07,
         0x04, 0x24, 0xf9, 0x30,
-        0x1d, 0xea, 0x52, 0x41,
+        0x1d, 0xea, 0x5c, 0x41,
         0x02, 0x2c, 0x51, 0x31,
         0x04, 0xa8, 0xf9, 0x30,
-        0x19, 0xea, 0x52, 0x41,
+        0x19, 0xea, 0x5c, 0x41,
         0x06, 0xea, 0x08, 0x81,
         0x01, 0xe2, 0x5a, 0x35,
         0x02, 0xf2, 0xf0, 0x31,
@@ -190,27 +195,27 @@ static uint8_t seqprog[] = {
         0x02, 0x20, 0xb9, 0x30,
         0x02, 0x20, 0x51, 0x31,
         0x4c, 0x93, 0xd7, 0x28,
-        0x10, 0x92, 0x77, 0x79,
+        0x10, 0x92, 0x81, 0x79,
         0x01, 0x6b, 0xc0, 0x30,
         0x02, 0x64, 0xc8, 0x00,
         0x40, 0x3a, 0x74, 0x04,
         0x00, 0xe2, 0x76, 0x58,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x30, 0x3f, 0xc0, 0x09,
-        0x30, 0xe0, 0x78, 0x61,
-        0x20, 0x3f, 0x8e, 0x69,
-        0x10, 0x3f, 0x78, 0x79,
+        0x30, 0xe0, 0x82, 0x61,
+        0x20, 0x3f, 0x98, 0x69,
+        0x10, 0x3f, 0x82, 0x79,
         0x02, 0xea, 0x7e, 0x00,
-        0x00, 0xea, 0x5e, 0x59,
+        0x00, 0xea, 0x68, 0x59,
         0x01, 0xea, 0x00, 0x30,
         0x02, 0x4e, 0x51, 0x35,
         0x01, 0xea, 0x7e, 0x00,
-        0x11, 0xea, 0x5e, 0x59,
+        0x11, 0xea, 0x68, 0x59,
         0x11, 0xea, 0x00, 0x00,
         0x02, 0x4e, 0x51, 0x35,
         0xc0, 0x4a, 0x94, 0x00,
-        0x04, 0x41, 0x9c, 0x79,
+        0x04, 0x41, 0xa6, 0x79,
         0x08, 0xea, 0x98, 0x00,
         0x08, 0x57, 0xae, 0x00,
         0x08, 0x3c, 0x78, 0x00,
@@ -218,12 +223,12 @@ static uint8_t seqprog[] = {
         0x0f, 0x67, 0xc0, 0x09,
         0x00, 0x3a, 0x75, 0x02,
         0x20, 0xea, 0x96, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0xc0, 0x4a, 0x94, 0x00,
-        0x40, 0x3a, 0xc8, 0x69,
+        0x40, 0x3a, 0xd2, 0x69,
         0x02, 0x55, 0x06, 0x68,
-        0x02, 0x56, 0xc8, 0x69,
-        0xff, 0x5b, 0xc8, 0x61,
+        0x02, 0x56, 0xd2, 0x69,
+        0xff, 0x5b, 0xd2, 0x61,
         0x02, 0x20, 0x51, 0x31,
         0x80, 0xea, 0xb2, 0x01,
         0x44, 0xea, 0x00, 0x00,
@@ -231,40 +236,45 @@ static uint8_t seqprog[] = {
         0x33, 0xea, 0x00, 0x00,
         0xff, 0xea, 0xb2, 0x09,
         0xff, 0xe0, 0xc0, 0x19,
-        0xff, 0xe0, 0xca, 0x79,
+        0xff, 0xe0, 0xd4, 0x79,
         0x02, 0xac, 0x51, 0x31,
-        0x00, 0xe2, 0xc0, 0x41,
+        0x00, 0xe2, 0xca, 0x41,
         0x02, 0x5e, 0x50, 0x31,
         0x02, 0xa8, 0xb8, 0x30,
         0x02, 0x5c, 0x50, 0x31,
-        0xff, 0xad, 0xdb, 0x71,
+        0xff, 0xad, 0xe5, 0x71,
         0x02, 0xac, 0x41, 0x31,
         0x02, 0x22, 0x51, 0x31,
         0x02, 0xa0, 0x5c, 0x33,
         0x02, 0xa0, 0x44, 0x32,
-        0x00, 0xe2, 0xe4, 0x41,
-        0x10, 0x92, 0xe5, 0x69,
+        0x00, 0xe2, 0xf8, 0x41,
+        0x01, 0x4d, 0xf1, 0x79,
+        0x01, 0x62, 0xc1, 0x31,
+        0x00, 0x93, 0xf1, 0x61,
+        0xfe, 0x4d, 0x9b, 0x0a,
+        0x02, 0x60, 0x41, 0x31,
+        0x00, 0xe2, 0xdc, 0x41,
         0x3d, 0x93, 0xc9, 0x29,
         0x01, 0xe4, 0xc8, 0x01,
         0x01, 0xea, 0xca, 0x01,
         0xff, 0xea, 0xda, 0x01,
         0x02, 0x20, 0x51, 0x31,
         0x02, 0xae, 0x41, 0x32,
-        0xff, 0x21, 0xed, 0x61,
+        0xff, 0x21, 0x01, 0x62,
         0xff, 0xea, 0x46, 0x02,
         0x02, 0x5c, 0x50, 0x31,
         0x40, 0xea, 0x96, 0x00,
-        0x02, 0x56, 0x04, 0x6e,
-        0x01, 0x55, 0x04, 0x6e,
-        0x10, 0x92, 0xf9, 0x79,
-        0x10, 0x40, 0x02, 0x6a,
-        0x01, 0x56, 0x02, 0x7a,
+        0x02, 0x56, 0x20, 0x6e,
+        0x01, 0x55, 0x20, 0x6e,
+        0x10, 0x92, 0x0d, 0x7a,
+        0x10, 0x40, 0x16, 0x6a,
+        0x01, 0x56, 0x16, 0x7a,
         0xff, 0x97, 0x07, 0x78,
-        0x13, 0xea, 0x64, 0x59,
+        0x13, 0xea, 0x6e, 0x59,
         0x13, 0xea, 0x04, 0x00,
         0x00, 0xe2, 0x06, 0x40,
         0xbf, 0x3a, 0x74, 0x08,
-        0x04, 0x41, 0x08, 0x7a,
+        0x04, 0x41, 0x1c, 0x7a,
         0x08, 0xea, 0x98, 0x00,
         0x08, 0x57, 0xae, 0x00,
         0x01, 0x93, 0x75, 0x32,
@@ -272,108 +282,108 @@ static uint8_t seqprog[] = {
         0x40, 0xea, 0x72, 0x02,
         0x08, 0x3c, 0x78, 0x00,
         0x80, 0xea, 0x6e, 0x02,
-        0x00, 0xe2, 0xe2, 0x5b,
+        0x00, 0xe2, 0xf6, 0x5b,
         0x01, 0x3c, 0xc1, 0x31,
-        0x9f, 0xe0, 0x84, 0x7c,
-        0x80, 0xe0, 0x28, 0x72,
-        0xa0, 0xe0, 0x64, 0x72,
-        0xc0, 0xe0, 0x5a, 0x72,
-        0xe0, 0xe0, 0x94, 0x72,
-        0x01, 0xea, 0x64, 0x59,
+        0x9f, 0xe0, 0x98, 0x7c,
+        0x80, 0xe0, 0x3c, 0x72,
+        0xa0, 0xe0, 0x78, 0x72,
+        0xc0, 0xe0, 0x6e, 0x72,
+        0xe0, 0xe0, 0xa8, 0x72,
+        0x01, 0xea, 0x6e, 0x59,
         0x01, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x80, 0x39, 0x2f, 0x7a,
-        0x03, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0x80, 0x39, 0x43, 0x7a,
+        0x03, 0xea, 0x6e, 0x59,
         0x03, 0xea, 0x04, 0x00,
-        0xee, 0x00, 0x36, 0x6a,
+        0xee, 0x00, 0x4a, 0x6a,
         0x05, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x02, 0xa8, 0x9c, 0x32,
-        0x00, 0xe2, 0x7e, 0x59,
+        0x00, 0xe2, 0x88, 0x59,
         0xef, 0x96, 0xd5, 0x19,
-        0x00, 0xe2, 0x46, 0x52,
+        0x00, 0xe2, 0x5a, 0x52,
         0x09, 0x80, 0xe1, 0x30,
         0x02, 0xea, 0x36, 0x00,
         0xa8, 0xea, 0x32, 0x00,
-        0x00, 0xe2, 0x4c, 0x42,
+        0x00, 0xe2, 0x60, 0x42,
         0x01, 0x96, 0xd1, 0x30,
         0x10, 0x80, 0x89, 0x31,
         0x20, 0xea, 0x32, 0x00,
         0xbf, 0x39, 0x73, 0x0a,
-        0x10, 0x4c, 0x56, 0x6a,
-        0x20, 0x19, 0x4e, 0x6a,
-        0x20, 0x19, 0x52, 0x6a,
-        0x02, 0x4d, 0x14, 0x6a,
+        0x10, 0x4c, 0x6a, 0x6a,
+        0x20, 0x19, 0x62, 0x6a,
+        0x20, 0x19, 0x66, 0x6a,
+        0x02, 0x4d, 0x28, 0x6a,
         0x40, 0x39, 0x73, 0x02,
-        0x00, 0xe2, 0x14, 0x42,
-        0x80, 0x39, 0xd5, 0x6a,
+        0x00, 0xe2, 0x28, 0x42,
+        0x80, 0x39, 0xe9, 0x6a,
         0x01, 0x44, 0x10, 0x33,
         0x08, 0x92, 0x25, 0x03,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0x10, 0xea, 0x80, 0x00,
         0x01, 0x37, 0xc5, 0x31,
-        0x80, 0xe2, 0x80, 0x62,
-        0x10, 0x92, 0xa5, 0x6a,
+        0x80, 0xe2, 0x94, 0x62,
+        0x10, 0x92, 0xb9, 0x6a,
         0xc0, 0x94, 0xc5, 0x01,
-        0x40, 0x92, 0x71, 0x6a,
+        0x40, 0x92, 0x85, 0x6a,
         0xbf, 0xe2, 0xc4, 0x09,
-        0x20, 0x92, 0x85, 0x7a,
+        0x20, 0x92, 0x99, 0x7a,
         0x01, 0xe2, 0x88, 0x30,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0xa0, 0x3c, 0x8d, 0x62,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0xa0, 0x3c, 0xa1, 0x62,
         0x23, 0x92, 0x89, 0x08,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0xa0, 0x3c, 0x8d, 0x62,
-        0x00, 0xa8, 0x84, 0x42,
-        0xff, 0xe2, 0x84, 0x62,
-        0x00, 0xe2, 0xa4, 0x42,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0xa0, 0x3c, 0xa1, 0x62,
+        0x00, 0xa8, 0x98, 0x42,
+        0xff, 0xe2, 0x98, 0x62,
+        0x00, 0xe2, 0xb8, 0x42,
         0x40, 0xea, 0x98, 0x00,
         0x01, 0xe2, 0x88, 0x30,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0xa0, 0x3c, 0x63, 0x72,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0xa0, 0x3c, 0x77, 0x72,
         0x40, 0xea, 0x98, 0x00,
         0x01, 0x37, 0x95, 0x32,
         0x08, 0xea, 0x6e, 0x02,
-        0x00, 0xe2, 0x14, 0x42,
-        0xe0, 0xea, 0xfe, 0x5b,
-        0x80, 0xe0, 0xe0, 0x6a,
-        0x04, 0xe0, 0x92, 0x73,
-        0x02, 0xe0, 0xc4, 0x73,
-        0x00, 0xea, 0x3e, 0x73,
-        0x03, 0xe0, 0xd4, 0x73,
-        0x23, 0xe0, 0xb6, 0x72,
-        0x08, 0xe0, 0xdc, 0x72,
-        0x00, 0xe2, 0xe2, 0x5b,
-        0x07, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0xe0, 0xea, 0x12, 0x5c,
+        0x80, 0xe0, 0xf4, 0x6a,
+        0x04, 0xe0, 0xa6, 0x73,
+        0x02, 0xe0, 0xd8, 0x73,
+        0x00, 0xea, 0x52, 0x73,
+        0x03, 0xe0, 0xe8, 0x73,
+        0x23, 0xe0, 0xca, 0x72,
+        0x08, 0xe0, 0xf0, 0x72,
+        0x00, 0xe2, 0xf6, 0x5b,
+        0x07, 0xea, 0x6e, 0x59,
         0x07, 0xea, 0x04, 0x00,
-        0x08, 0x48, 0x15, 0x72,
-        0x04, 0x48, 0xb3, 0x62,
+        0x08, 0x48, 0x29, 0x72,
+        0x04, 0x48, 0xc7, 0x62,
         0x01, 0x49, 0x89, 0x30,
-        0x00, 0xe2, 0xa4, 0x42,
+        0x00, 0xe2, 0xb8, 0x42,
         0x01, 0x44, 0xd4, 0x31,
-        0x00, 0xe2, 0xa4, 0x42,
+        0x00, 0xe2, 0xb8, 0x42,
         0x01, 0x00, 0x6c, 0x32,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x4c, 0x3a, 0xc1, 0x28,
         0x01, 0x64, 0xc0, 0x31,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x01, 0xe0, 0xda, 0x7a,
-        0xa0, 0xea, 0xf4, 0x5b,
-        0x01, 0xa0, 0xda, 0x62,
-        0x01, 0x84, 0xcf, 0x7a,
-        0x01, 0x95, 0xdd, 0x6a,
-        0x05, 0xea, 0x64, 0x59,
+        0x01, 0xe0, 0xee, 0x7a,
+        0xa0, 0xea, 0x08, 0x5c,
+        0x01, 0xa0, 0xee, 0x62,
+        0x01, 0x84, 0xe3, 0x7a,
+        0x01, 0x95, 0xf1, 0x6a,
+        0x05, 0xea, 0x6e, 0x59,
         0x05, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x03, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x03, 0xea, 0x6e, 0x59,
         0x03, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x07, 0xea, 0x06, 0x5c,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x07, 0xea, 0x1a, 0x5c,
         0x01, 0x44, 0xd4, 0x31,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0x3f, 0xe0, 0x76, 0x0a,
         0xc0, 0x3a, 0xc1, 0x09,
         0x00, 0x3b, 0x51, 0x01,
@@ -384,54 +394,54 @@ static uint8_t seqprog[] = {
         0x01, 0xea, 0xc6, 0x01,
         0x02, 0xe2, 0xc8, 0x31,
         0x02, 0xec, 0x40, 0x31,
-        0xff, 0xa1, 0xfc, 0x72,
+        0xff, 0xa1, 0x10, 0x73,
         0x02, 0xe8, 0xda, 0x31,
         0x02, 0xa0, 0x50, 0x31,
-        0x00, 0xe2, 0x1e, 0x43,
+        0x00, 0xe2, 0x32, 0x43,
         0x80, 0x39, 0x73, 0x02,
         0x01, 0x44, 0xd4, 0x31,
-        0x00, 0xe2, 0xe2, 0x5b,
+        0x00, 0xe2, 0xf6, 0x5b,
         0x01, 0x39, 0x73, 0x02,
-        0xe0, 0x3c, 0x39, 0x63,
+        0xe0, 0x3c, 0x4d, 0x63,
         0x02, 0x39, 0x73, 0x02,
-        0x20, 0x46, 0x32, 0x63,
+        0x20, 0x46, 0x46, 0x63,
         0xff, 0xea, 0x52, 0x09,
-        0xa8, 0xea, 0xf4, 0x5b,
-        0x04, 0x92, 0x19, 0x7b,
+        0xa8, 0xea, 0x08, 0x5c,
+        0x04, 0x92, 0x2d, 0x7b,
         0x01, 0x3a, 0xc1, 0x31,
-        0x00, 0x93, 0x19, 0x63,
+        0x00, 0x93, 0x2d, 0x63,
         0x01, 0x3b, 0xc1, 0x31,
-        0x00, 0x94, 0x23, 0x73,
+        0x00, 0x94, 0x37, 0x73,
         0x01, 0xa9, 0x52, 0x11,
-        0xff, 0xa9, 0x0e, 0x6b,
-        0x00, 0xe2, 0x32, 0x43,
+        0xff, 0xa9, 0x22, 0x6b,
+        0x00, 0xe2, 0x46, 0x43,
         0x10, 0x39, 0x73, 0x02,
-        0x04, 0x92, 0x33, 0x7b,
+        0x04, 0x92, 0x47, 0x7b,
         0xfb, 0x92, 0x25, 0x0b,
         0xff, 0xea, 0x72, 0x0a,
-        0x01, 0xa4, 0x2d, 0x6b,
+        0x01, 0xa4, 0x41, 0x6b,
         0x02, 0xa8, 0x9c, 0x32,
-        0x00, 0xe2, 0x7e, 0x59,
-        0x10, 0x92, 0xdd, 0x7a,
-        0xff, 0xea, 0x06, 0x5c,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x04, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x88, 0x59,
+        0x10, 0x92, 0xf1, 0x7a,
+        0xff, 0xea, 0x1a, 0x5c,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x04, 0xea, 0x6e, 0x59,
         0x04, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xdc, 0x42,
-        0x04, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0xf0, 0x42,
+        0x04, 0xea, 0x6e, 0x59,
         0x04, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x08, 0x92, 0xd5, 0x7a,
-        0xc0, 0x39, 0x49, 0x7b,
-        0x80, 0x39, 0xd5, 0x6a,
-        0xff, 0x88, 0x49, 0x6b,
-        0x40, 0x39, 0xd5, 0x6a,
-        0x10, 0x92, 0x4f, 0x7b,
-        0x0a, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0x08, 0x92, 0xe9, 0x7a,
+        0xc0, 0x39, 0x5d, 0x7b,
+        0x80, 0x39, 0xe9, 0x6a,
+        0xff, 0x88, 0x5d, 0x6b,
+        0x40, 0x39, 0xe9, 0x6a,
+        0x10, 0x92, 0x63, 0x7b,
+        0x0a, 0xea, 0x6e, 0x59,
         0x0a, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x6e, 0x5b,
-        0x00, 0xe2, 0xae, 0x43,
-        0x50, 0x4b, 0x56, 0x6b,
+        0x00, 0xe2, 0x82, 0x5b,
+        0x00, 0xe2, 0xc2, 0x43,
+        0x50, 0x4b, 0x6a, 0x6b,
         0xbf, 0x3a, 0x74, 0x08,
         0x01, 0xe0, 0xf4, 0x31,
         0xff, 0xea, 0xc0, 0x09,
@@ -441,31 +451,31 @@ static uint8_t seqprog[] = {
         0x01, 0xfa, 0xc0, 0x35,
         0x02, 0xa8, 0x90, 0x32,
         0x02, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x02, 0x48, 0x51, 0x31,
         0xff, 0x90, 0x85, 0x68,
-        0xff, 0x88, 0x7b, 0x6b,
-        0x01, 0xa4, 0x77, 0x6b,
-        0x02, 0xa4, 0x7f, 0x6b,
-        0x01, 0x84, 0x7f, 0x7b,
+        0xff, 0x88, 0x8f, 0x6b,
+        0x01, 0xa4, 0x8b, 0x6b,
+        0x02, 0xa4, 0x93, 0x6b,
+        0x01, 0x84, 0x93, 0x7b,
         0x02, 0x28, 0x19, 0x33,
         0x02, 0xa8, 0x50, 0x36,
-        0xff, 0x88, 0x7f, 0x73,
-        0x00, 0xe2, 0x52, 0x5b,
+        0xff, 0x88, 0x93, 0x73,
+        0x00, 0xe2, 0x66, 0x5b,
         0x02, 0xa8, 0x20, 0x33,
         0x04, 0xa4, 0x49, 0x03,
         0xff, 0xea, 0x1a, 0x03,
-        0xff, 0x2d, 0x8b, 0x63,
+        0xff, 0x2d, 0x9f, 0x63,
         0x02, 0xa8, 0x58, 0x32,
         0x02, 0xa8, 0x5c, 0x36,
         0x02, 0xa8, 0x40, 0x31,
         0x02, 0x2e, 0x51, 0x31,
         0x02, 0xa0, 0x18, 0x33,
         0x02, 0xa0, 0x5c, 0x36,
-        0xc0, 0x39, 0xd5, 0x6a,
+        0xc0, 0x39, 0xe9, 0x6a,
         0x04, 0x92, 0x25, 0x03,
-        0x20, 0x92, 0xaf, 0x6b,
+        0x20, 0x92, 0xc3, 0x6b,
         0x02, 0xa8, 0x40, 0x31,
         0xc0, 0x3a, 0xc1, 0x09,
         0x00, 0x3b, 0x51, 0x01,
@@ -480,60 +490,60 @@ static uint8_t seqprog[] = {
         0xf7, 0x57, 0xae, 0x08,
         0x08, 0xea, 0x98, 0x00,
         0x01, 0x44, 0xd4, 0x31,
-        0xee, 0x00, 0xb8, 0x6b,
+        0xee, 0x00, 0xcc, 0x6b,
         0x02, 0xea, 0xb4, 0x00,
         0xc0, 0xea, 0x72, 0x02,
-        0x09, 0x4c, 0xba, 0x7b,
+        0x09, 0x4c, 0xce, 0x7b,
         0x01, 0xea, 0x78, 0x02,
         0x08, 0x4c, 0x06, 0x68,
-        0x0b, 0xea, 0x64, 0x59,
+        0x0b, 0xea, 0x6e, 0x59,
         0x0b, 0xea, 0x04, 0x00,
         0x01, 0x44, 0xd4, 0x31,
-        0x20, 0x39, 0x15, 0x7a,
-        0x00, 0xe2, 0xcc, 0x5b,
-        0x00, 0xe2, 0x14, 0x42,
-        0x01, 0x84, 0xd1, 0x7b,
+        0x20, 0x39, 0x29, 0x7a,
+        0x00, 0xe2, 0xe0, 0x5b,
+        0x00, 0xe2, 0x28, 0x42,
+        0x01, 0x84, 0xe5, 0x7b,
         0x01, 0xa4, 0x49, 0x07,
         0x08, 0x60, 0x30, 0x33,
         0x08, 0x80, 0x41, 0x37,
         0xdf, 0x39, 0x73, 0x0a,
-        0xee, 0x00, 0xde, 0x6b,
+        0xee, 0x00, 0xf2, 0x6b,
         0x05, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
-        0x00, 0xe2, 0x7e, 0x59,
-        0x00, 0xe2, 0xdc, 0x42,
-        0xff, 0x42, 0xee, 0x6b,
-        0x01, 0x41, 0xe2, 0x6b,
-        0x02, 0x41, 0xe2, 0x7b,
-        0xff, 0x42, 0xee, 0x6b,
-        0x01, 0x41, 0xe2, 0x6b,
-        0x02, 0x41, 0xe2, 0x7b,
-        0xff, 0x42, 0xee, 0x7b,
-        0x04, 0x4c, 0xe2, 0x6b,
+        0x00, 0xe2, 0x88, 0x59,
+        0x00, 0xe2, 0xf0, 0x42,
+        0xff, 0x42, 0x02, 0x6c,
+        0x01, 0x41, 0xf6, 0x6b,
+        0x02, 0x41, 0xf6, 0x7b,
+        0xff, 0x42, 0x02, 0x6c,
+        0x01, 0x41, 0xf6, 0x6b,
+        0x02, 0x41, 0xf6, 0x7b,
+        0xff, 0x42, 0x02, 0x7c,
+        0x04, 0x4c, 0xf6, 0x6b,
         0xe0, 0x41, 0x78, 0x0e,
         0x01, 0x44, 0xd4, 0x31,
-        0xff, 0x42, 0xf6, 0x7b,
-        0x04, 0x4c, 0xf6, 0x6b,
+        0xff, 0x42, 0x0a, 0x7c,
+        0x04, 0x4c, 0x0a, 0x6c,
         0xe0, 0x41, 0x78, 0x0a,
-        0xe0, 0x3c, 0x15, 0x62,
+        0xe0, 0x3c, 0x29, 0x62,
         0xff, 0xea, 0xca, 0x09,
         0x01, 0xe2, 0xc8, 0x31,
         0x01, 0x46, 0xda, 0x35,
         0x01, 0x44, 0xd4, 0x35,
         0x10, 0xea, 0x80, 0x00,
         0x01, 0xe2, 0x6e, 0x36,
-        0x04, 0xa6, 0x0e, 0x7c,
+        0x04, 0xa6, 0x22, 0x7c,
         0xff, 0xea, 0x5a, 0x09,
         0xff, 0xea, 0x4c, 0x0d,
-        0x01, 0xa6, 0x3a, 0x6c,
+        0x01, 0xa6, 0x4e, 0x6c,
         0x10, 0xad, 0x84, 0x78,
-        0x80, 0xad, 0x32, 0x6c,
+        0x80, 0xad, 0x46, 0x6c,
         0x08, 0xad, 0x84, 0x68,
-        0x20, 0x19, 0x26, 0x7c,
+        0x20, 0x19, 0x3a, 0x7c,
         0x80, 0xea, 0xb2, 0x01,
         0x11, 0x00, 0x00, 0x10,
-        0x02, 0xa6, 0x22, 0x7c,
+        0x02, 0xa6, 0x36, 0x7c,
         0xff, 0xea, 0xb2, 0x0d,
         0x11, 0x00, 0x00, 0x10,
         0xff, 0xea, 0xb2, 0x09,
@@ -561,7 +571,7 @@ static uint8_t seqprog[] = {
         0x00, 0x86, 0x0d, 0x23,
         0x00, 0x87, 0x0f, 0x23,
         0x01, 0x84, 0xc5, 0x31,
-        0x80, 0x83, 0x5d, 0x7c,
+        0x80, 0x83, 0x71, 0x7c,
         0x02, 0xe2, 0xc4, 0x01,
         0xff, 0xea, 0x4c, 0x09,
         0x01, 0xe2, 0x36, 0x30,
@@ -572,75 +582,75 @@ static uint8_t seqprog[] = {
         0xfe, 0xa6, 0x4c, 0x0d,
         0x0b, 0x98, 0xe1, 0x30,
         0xfd, 0xa4, 0x49, 0x09,
-        0x80, 0xa3, 0x71, 0x7c,
+        0x80, 0xa3, 0x85, 0x7c,
         0x02, 0xa4, 0x48, 0x01,
         0x01, 0xa4, 0x36, 0x30,
         0xa8, 0xea, 0x32, 0x00,
         0xfd, 0xa4, 0x49, 0x0b,
         0x05, 0xa3, 0x07, 0x33,
-        0x80, 0x83, 0x7d, 0x6c,
+        0x80, 0x83, 0x91, 0x6c,
         0x02, 0xea, 0x4c, 0x05,
         0xff, 0xea, 0x4c, 0x0d,
-        0x00, 0xe2, 0x56, 0x59,
-        0x02, 0xa6, 0x10, 0x6c,
+        0x00, 0xe2, 0x60, 0x59,
+        0x02, 0xa6, 0x24, 0x6c,
         0x80, 0xf9, 0xf2, 0x05,
-        0xc0, 0x39, 0x8b, 0x7c,
-        0x03, 0xea, 0x64, 0x59,
+        0xc0, 0x39, 0x9f, 0x7c,
+        0x03, 0xea, 0x6e, 0x59,
         0x03, 0xea, 0x04, 0x00,
-        0x20, 0x39, 0xaf, 0x7c,
-        0x01, 0x84, 0x95, 0x6c,
-        0x06, 0xea, 0x64, 0x59,
+        0x20, 0x39, 0xc3, 0x7c,
+        0x01, 0x84, 0xa9, 0x6c,
+        0x06, 0xea, 0x6e, 0x59,
         0x06, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xb2, 0x44,
+        0x00, 0xe2, 0xc6, 0x44,
         0x01, 0x00, 0x6c, 0x32,
-        0xee, 0x00, 0x9e, 0x6c,
+        0xee, 0x00, 0xb2, 0x6c,
         0x05, 0xea, 0xb4, 0x00,
-        0x33, 0xea, 0x5e, 0x59,
+        0x33, 0xea, 0x68, 0x59,
         0x33, 0xea, 0x00, 0x00,
         0x80, 0x3d, 0x7a, 0x00,
-        0xfc, 0x42, 0xa0, 0x7c,
+        0xfc, 0x42, 0xb4, 0x7c,
         0x7f, 0x3d, 0x7a, 0x08,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x09, 0xea, 0x64, 0x59,
+        0x09, 0xea, 0x6e, 0x59,
         0x09, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x01, 0xa4, 0x95, 0x6c,
-        0x00, 0xe2, 0x68, 0x5c,
+        0x00, 0xe2, 0x28, 0x42,
+        0x01, 0xa4, 0xa9, 0x6c,
+        0x00, 0xe2, 0x7c, 0x5c,
         0x20, 0x39, 0x73, 0x02,
         0x01, 0x00, 0x6c, 0x32,
-        0x02, 0xa6, 0xba, 0x7c,
-        0x00, 0xe2, 0x7e, 0x5c,
+        0x02, 0xa6, 0xce, 0x7c,
+        0x00, 0xe2, 0x92, 0x5c,
         0x00, 0xe2, 0x76, 0x58,
         0x00, 0xe2, 0x86, 0x58,
         0x00, 0xe2, 0x5a, 0x58,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x20, 0x19, 0xba, 0x6c,
-        0x00, 0xe2, 0xea, 0x5c,
-        0x04, 0x19, 0xd4, 0x6c,
+        0x20, 0x19, 0xce, 0x6c,
+        0x00, 0xe2, 0xfe, 0x5c,
+        0x04, 0x19, 0xe8, 0x6c,
         0x02, 0x19, 0x32, 0x00,
-        0x01, 0x84, 0xd5, 0x7c,
-        0x01, 0x1b, 0xce, 0x7c,
-        0x01, 0x1a, 0xd4, 0x6c,
-        0x00, 0xe2, 0x84, 0x44,
-        0x80, 0x4b, 0xda, 0x6c,
-        0x01, 0x4c, 0xd6, 0x7c,
-        0x03, 0x42, 0x84, 0x6c,
-        0x00, 0xe2, 0x0a, 0x5c,
+        0x01, 0x84, 0xe9, 0x7c,
+        0x01, 0x1b, 0xe2, 0x7c,
+        0x01, 0x1a, 0xe8, 0x6c,
+        0x00, 0xe2, 0x98, 0x44,
+        0x80, 0x4b, 0xee, 0x6c,
+        0x01, 0x4c, 0xea, 0x7c,
+        0x03, 0x42, 0x98, 0x6c,
+        0x00, 0xe2, 0x1e, 0x5c,
         0x80, 0xf9, 0xf2, 0x01,
-        0x04, 0x39, 0x15, 0x7a,
-        0x00, 0xe2, 0x14, 0x42,
-        0x08, 0x5d, 0xf2, 0x6c,
+        0x04, 0x39, 0x29, 0x7a,
+        0x00, 0xe2, 0x28, 0x42,
+        0x08, 0x5d, 0x06, 0x6d,
         0x00, 0xe2, 0x76, 0x58,
-        0x00, 0x36, 0x5f, 0x59,
+        0x00, 0x36, 0x69, 0x59,
         0x01, 0x36, 0x01, 0x30,
-        0x02, 0x1b, 0xe2, 0x7c,
-        0x08, 0x5d, 0xf0, 0x7c,
+        0x02, 0x1b, 0xf6, 0x7c,
+        0x08, 0x5d, 0x04, 0x7d,
         0x03, 0x68, 0x00, 0x37,
         0x01, 0x84, 0x09, 0x07,
-        0x80, 0x1b, 0xfc, 0x7c,
-        0x80, 0x84, 0xfd, 0x6c,
+        0x80, 0x1b, 0x10, 0x7d,
+        0x80, 0x84, 0x11, 0x6d,
         0xff, 0x85, 0x0b, 0x1b,
         0xff, 0x86, 0x0d, 0x23,
         0xff, 0x87, 0x0f, 0x23,
@@ -652,161 +662,164 @@ static uint8_t seqprog[] = {
         0xf9, 0xd9, 0xb2, 0x0d,
         0x01, 0xd9, 0xb2, 0x05,
         0x01, 0x52, 0x48, 0x31,
-        0x20, 0xa4, 0x26, 0x7d,
-        0x20, 0x5b, 0x26, 0x7d,
-        0x80, 0xf9, 0x34, 0x7d,
+        0x20, 0xa4, 0x3a, 0x7d,
+        0x20, 0x5b, 0x3a, 0x7d,
+        0x80, 0xf9, 0x48, 0x7d,
         0x02, 0xea, 0xb4, 0x00,
         0x11, 0x00, 0x00, 0x10,
-        0x04, 0x19, 0x40, 0x7d,
+        0x04, 0x19, 0x54, 0x7d,
         0xdf, 0x19, 0x32, 0x08,
-        0x60, 0x5b, 0x40, 0x6d,
-        0x01, 0x4c, 0x1a, 0x7d,
+        0x60, 0x5b, 0x54, 0x6d,
+        0x01, 0x4c, 0x2e, 0x7d,
         0x20, 0x19, 0x32, 0x00,
         0x01, 0xd9, 0xb2, 0x05,
         0x02, 0xea, 0xb4, 0x00,
         0x01, 0xd9, 0xb2, 0x05,
-        0x10, 0x5b, 0x38, 0x6d,
-        0x08, 0x5b, 0x42, 0x6d,
-        0x20, 0x5b, 0x32, 0x6d,
-        0x02, 0x5b, 0x62, 0x6d,
-        0x0e, 0xea, 0x64, 0x59,
+        0x10, 0x5b, 0x4c, 0x6d,
+        0x08, 0x5b, 0x56, 0x6d,
+        0x20, 0x5b, 0x46, 0x6d,
+        0x02, 0x5b, 0x76, 0x6d,
+        0x0e, 0xea, 0x6e, 0x59,
         0x0e, 0xea, 0x04, 0x00,
-        0x80, 0xf9, 0x22, 0x6d,
+        0x80, 0xf9, 0x36, 0x6d,
         0xdf, 0x5c, 0xb8, 0x08,
         0x01, 0xd9, 0xb2, 0x05,
-        0x01, 0xa4, 0x1d, 0x6e,
-        0x00, 0xe2, 0x68, 0x5c,
-        0x00, 0xe2, 0x6c, 0x5d,
+        0x01, 0xa4, 0x37, 0x6e,
+        0x00, 0xe2, 0x7c, 0x5c,
+        0x00, 0xe2, 0x80, 0x5d,
         0x01, 0x90, 0x21, 0x1b,
         0x01, 0xd9, 0xb2, 0x05,
-        0x00, 0xe2, 0x52, 0x5b,
+        0x00, 0xe2, 0x66, 0x5b,
         0xf3, 0x96, 0xd5, 0x19,
-        0x00, 0xe2, 0x50, 0x55,
-        0x80, 0x96, 0x51, 0x6d,
-        0x0f, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x64, 0x55,
+        0x80, 0x96, 0x65, 0x6d,
+        0x0f, 0xea, 0x6e, 0x59,
         0x0f, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x58, 0x45,
+        0x00, 0xe2, 0x6c, 0x45,
         0x04, 0x8c, 0xe1, 0x30,
         0x01, 0xea, 0xf2, 0x00,
         0x02, 0xea, 0x36, 0x00,
         0xa8, 0xea, 0x32, 0x00,
-        0xff, 0x97, 0x5f, 0x7d,
-        0x14, 0xea, 0x64, 0x59,
+        0xff, 0x97, 0x73, 0x7d,
+        0x14, 0xea, 0x6e, 0x59,
         0x14, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0xce, 0x5d,
+        0x00, 0xe2, 0xe2, 0x5d,
         0x01, 0xd9, 0xb2, 0x05,
         0x09, 0x80, 0xe1, 0x30,
         0x02, 0xea, 0x36, 0x00,
         0xa8, 0xea, 0x32, 0x00,
-        0x00, 0xe2, 0xc6, 0x5d,
+        0x00, 0xe2, 0xda, 0x5d,
         0x01, 0xd9, 0xb2, 0x05,
-        0x02, 0xa6, 0x7c, 0x7d,
-        0x00, 0xe2, 0x56, 0x59,
-        0x20, 0x5b, 0x8a, 0x6d,
-        0xfc, 0x42, 0x76, 0x7d,
-        0x10, 0x40, 0x78, 0x6d,
-        0x20, 0x4d, 0x7a, 0x7d,
-        0x08, 0x5d, 0x8a, 0x6d,
-        0x02, 0xa6, 0x10, 0x6c,
-        0x00, 0xe2, 0x56, 0x59,
-        0x20, 0x5b, 0x8a, 0x6d,
-        0x01, 0x1b, 0xaa, 0x6d,
-        0xfc, 0x42, 0x86, 0x7d,
-        0x10, 0x40, 0x88, 0x6d,
+        0x02, 0xa6, 0x90, 0x7d,
+        0x00, 0xe2, 0x60, 0x59,
+        0x20, 0x5b, 0x9e, 0x6d,
+        0xfc, 0x42, 0x8a, 0x7d,
+        0x10, 0x40, 0x8c, 0x6d,
+        0x20, 0x4d, 0x8e, 0x7d,
+        0x08, 0x5d, 0x9e, 0x6d,
+        0x02, 0xa6, 0x24, 0x6c,
+        0x00, 0xe2, 0x60, 0x59,
+        0x20, 0x5b, 0x9e, 0x6d,
+        0x01, 0x1b, 0xbe, 0x6d,
+        0xfc, 0x42, 0x9a, 0x7d,
+        0x10, 0x40, 0x9c, 0x6d,
         0x20, 0x4d, 0x84, 0x78,
         0x08, 0x5d, 0x84, 0x78,
         0x02, 0x19, 0x32, 0x00,
         0x01, 0x5b, 0x40, 0x31,
-        0x00, 0xe2, 0xea, 0x5c,
-        0x00, 0xe2, 0xcc, 0x5b,
+        0x00, 0xe2, 0xfe, 0x5c,
+        0x00, 0xe2, 0xe0, 0x5b,
         0x20, 0xea, 0xb6, 0x00,
-        0x00, 0xe2, 0x0a, 0x5c,
+        0x00, 0xe2, 0x1e, 0x5c,
         0x20, 0x5c, 0xb8, 0x00,
-        0x04, 0x19, 0xa0, 0x6d,
-        0x01, 0x1a, 0xa0, 0x6d,
-        0x00, 0xe2, 0x56, 0x59,
+        0x04, 0x19, 0xb4, 0x6d,
+        0x01, 0x1a, 0xb4, 0x6d,
+        0x00, 0xe2, 0x60, 0x59,
         0x01, 0x1a, 0x84, 0x78,
         0x80, 0xf9, 0xf2, 0x01,
-        0x20, 0xa0, 0x04, 0x7e,
+        0x20, 0xa0, 0x18, 0x7e,
         0xff, 0x90, 0x21, 0x1b,
-        0x08, 0x92, 0x63, 0x6b,
+        0x08, 0x92, 0x77, 0x6b,
         0x02, 0xea, 0xb4, 0x04,
         0x01, 0xa4, 0x49, 0x03,
-        0x40, 0x5b, 0xba, 0x6d,
-        0x00, 0xe2, 0x56, 0x59,
-        0x40, 0x5b, 0xba, 0x6d,
-        0x04, 0x5d, 0x1e, 0x7e,
-        0x01, 0x1a, 0x1e, 0x7e,
+        0x40, 0x5b, 0xce, 0x6d,
+        0x00, 0xe2, 0x60, 0x59,
+        0x40, 0x5b, 0xce, 0x6d,
+        0x04, 0x5d, 0x38, 0x7e,
+        0x01, 0x1a, 0x38, 0x7e,
         0x20, 0x4d, 0x84, 0x78,
-        0x40, 0x5b, 0x04, 0x7e,
-        0x04, 0x5d, 0x1e, 0x7e,
-        0x01, 0x1a, 0x1e, 0x7e,
+        0x40, 0x5b, 0x18, 0x7e,
+        0x04, 0x5d, 0x38, 0x7e,
+        0x01, 0x1a, 0x38, 0x7e,
         0x80, 0xf9, 0xf2, 0x01,
         0xff, 0x90, 0x21, 0x1b,
-        0x08, 0x92, 0x63, 0x6b,
+        0x08, 0x92, 0x77, 0x6b,
         0x02, 0xea, 0xb4, 0x04,
-        0x00, 0xe2, 0x56, 0x59,
+        0x00, 0xe2, 0x60, 0x59,
         0x01, 0x1b, 0x84, 0x78,
         0x80, 0xf9, 0xf2, 0x01,
         0x02, 0xea, 0xb4, 0x04,
-        0x00, 0xe2, 0x56, 0x59,
-        0x01, 0x1b, 0xe2, 0x6d,
-        0x40, 0x5b, 0xf0, 0x7d,
-        0x01, 0x1b, 0xe2, 0x6d,
+        0x00, 0xe2, 0x60, 0x59,
+        0x01, 0x1b, 0xf6, 0x6d,
+        0x40, 0x5b, 0x04, 0x7e,
+        0x01, 0x1b, 0xf6, 0x6d,
         0x02, 0x19, 0x32, 0x00,
         0x01, 0x1a, 0x84, 0x78,
         0x80, 0xf9, 0xf2, 0x01,
         0xff, 0xea, 0x10, 0x03,
         0x08, 0x92, 0x25, 0x03,
-        0x00, 0xe2, 0x62, 0x43,
-        0x01, 0x1a, 0xec, 0x7d,
-        0x40, 0x5b, 0xe8, 0x7d,
-        0x01, 0x1a, 0xd6, 0x6d,
+        0x00, 0xe2, 0x76, 0x43,
+        0x01, 0x1a, 0x00, 0x7e,
+        0x40, 0x5b, 0xfc, 0x7d,
+        0x01, 0x1a, 0xea, 0x6d,
         0xfc, 0x42, 0x84, 0x78,
-        0x01, 0x1a, 0xf0, 0x6d,
-        0x10, 0xea, 0x64, 0x59,
+        0x01, 0x1a, 0x04, 0x6e,
+        0x10, 0xea, 0x6e, 0x59,
         0x10, 0xea, 0x04, 0x00,
         0xfc, 0x42, 0x84, 0x78,
-        0x10, 0x40, 0xf6, 0x6d,
+        0x10, 0x40, 0x0a, 0x6e,
         0x20, 0x4d, 0x84, 0x78,
-        0x40, 0x5b, 0xd6, 0x6d,
+        0x40, 0x5b, 0xea, 0x6d,
         0x01, 0x1a, 0x84, 0x78,
         0x01, 0x90, 0x21, 0x1b,
         0x30, 0x3f, 0xc0, 0x09,
         0x30, 0xe0, 0x84, 0x60,
         0x40, 0x4b, 0x84, 0x68,
         0xff, 0xea, 0x52, 0x01,
-        0xee, 0x00, 0x0c, 0x6e,
+        0xee, 0x00, 0x20, 0x6e,
         0x80, 0xf9, 0xf2, 0x01,
         0xff, 0x90, 0x21, 0x1b,
         0x02, 0xea, 0xb4, 0x00,
         0x20, 0xea, 0x9a, 0x00,
-        0xf3, 0x42, 0x16, 0x6e,
-        0x12, 0xea, 0x64, 0x59,
+        0x04, 0x41, 0x26, 0x7e,
+        0x08, 0xea, 0x98, 0x00,
+        0x08, 0x57, 0xae, 0x00,
+        0xf3, 0x42, 0x30, 0x6e,
+        0x12, 0xea, 0x6e, 0x59,
         0x12, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
-        0x0d, 0xea, 0x64, 0x59,
+        0x00, 0xe2, 0x28, 0x42,
+        0x0d, 0xea, 0x6e, 0x59,
         0x0d, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x14, 0x42,
+        0x00, 0xe2, 0x28, 0x42,
         0x01, 0x90, 0x21, 0x1b,
-        0x11, 0xea, 0x64, 0x59,
+        0x11, 0xea, 0x6e, 0x59,
         0x11, 0xea, 0x04, 0x00,
-        0x00, 0xe2, 0x52, 0x5b,
+        0x00, 0xe2, 0x66, 0x5b,
         0x08, 0x5a, 0xb4, 0x00,
-        0x00, 0xe2, 0x44, 0x5e,
+        0x00, 0xe2, 0x5e, 0x5e,
         0xa8, 0xea, 0x32, 0x00,
-        0x00, 0xe2, 0x56, 0x59,
-        0x80, 0x1a, 0x32, 0x7e,
-        0x00, 0xe2, 0x44, 0x5e,
+        0x00, 0xe2, 0x60, 0x59,
+        0x80, 0x1a, 0x4c, 0x7e,
+        0x00, 0xe2, 0x5e, 0x5e,
         0x80, 0x19, 0x32, 0x00,
-        0x40, 0x5b, 0x38, 0x6e,
-        0x08, 0x5a, 0x38, 0x7e,
+        0x40, 0x5b, 0x52, 0x6e,
+        0x08, 0x5a, 0x52, 0x7e,
         0x20, 0x4d, 0x84, 0x78,
         0x02, 0x84, 0x09, 0x03,
-        0x40, 0x5b, 0x04, 0x7e,
+        0x40, 0x5b, 0x18, 0x7e,
         0xff, 0x90, 0x21, 0x1b,
         0x80, 0xf9, 0xf2, 0x01,
-        0x08, 0x92, 0x63, 0x6b,
+        0x08, 0x92, 0x77, 0x6b,
         0x02, 0xea, 0xb4, 0x04,
         0x01, 0x40, 0xe1, 0x30,
         0x05, 0x41, 0xe3, 0x98,
@@ -1039,138 +1052,138 @@ static struct patch {
         { ahd_patch0_func, 64, 1, 1 },
         { ahd_patch2_func, 67, 1, 2 },
         { ahd_patch0_func, 68, 1, 1 },
-        { ahd_patch4_func, 116, 1, 1 },
-        { ahd_patch2_func, 175, 3, 1 },
-        { ahd_patch1_func, 178, 2, 1 },
-        { ahd_patch5_func, 180, 1, 1 },
-        { ahd_patch2_func, 189, 1, 2 },
-        { ahd_patch0_func, 190, 1, 1 },
-        { ahd_patch6_func, 191, 2, 2 },
-        { ahd_patch0_func, 193, 6, 3 },
-        { ahd_patch2_func, 196, 1, 2 },
-        { ahd_patch0_func, 197, 1, 1 },
-        { ahd_patch2_func, 200, 1, 2 },
-        { ahd_patch0_func, 201, 1, 1 },
-        { ahd_patch3_func, 203, 1, 1 },
-        { ahd_patch7_func, 204, 3, 1 },
-        { ahd_patch3_func, 213, 1, 1 },
-        { ahd_patch5_func, 214, 16, 2 },
-        { ahd_patch0_func, 230, 1, 1 },
-        { ahd_patch8_func, 250, 2, 1 },
-        { ahd_patch1_func, 254, 1, 2 },
-        { ahd_patch0_func, 255, 1, 1 },
-        { ahd_patch7_func, 258, 3, 1 },
-        { ahd_patch1_func, 273, 1, 2 },
-        { ahd_patch0_func, 274, 1, 1 },
-        { ahd_patch1_func, 277, 1, 2 },
-        { ahd_patch0_func, 278, 1, 1 },
-        { ahd_patch2_func, 281, 1, 2 },
-        { ahd_patch0_func, 282, 1, 1 },
-        { ahd_patch9_func, 295, 2, 2 },
-        { ahd_patch0_func, 297, 1, 1 },
-        { ahd_patch1_func, 339, 1, 2 },
-        { ahd_patch0_func, 340, 1, 1 },
-        { ahd_patch2_func, 348, 1, 2 },
-        { ahd_patch0_func, 349, 1, 1 },
-        { ahd_patch2_func, 352, 1, 2 },
-        { ahd_patch0_func, 353, 1, 1 },
-        { ahd_patch1_func, 359, 1, 2 },
-        { ahd_patch0_func, 360, 1, 1 },
-        { ahd_patch1_func, 362, 1, 2 },
+        { ahd_patch4_func, 115, 1, 1 },
+        { ahd_patch2_func, 180, 3, 1 },
+        { ahd_patch1_func, 183, 2, 1 },
+        { ahd_patch5_func, 185, 1, 1 },
+        { ahd_patch2_func, 194, 1, 2 },
+        { ahd_patch0_func, 195, 1, 1 },
+        { ahd_patch6_func, 196, 2, 2 },
+        { ahd_patch0_func, 198, 6, 3 },
+        { ahd_patch2_func, 201, 1, 2 },
+        { ahd_patch0_func, 202, 1, 1 },
+        { ahd_patch2_func, 205, 1, 2 },
+        { ahd_patch0_func, 206, 1, 1 },
+        { ahd_patch3_func, 208, 1, 1 },
+        { ahd_patch7_func, 209, 3, 1 },
+        { ahd_patch3_func, 218, 1, 1 },
+        { ahd_patch5_func, 219, 16, 2 },
+        { ahd_patch0_func, 235, 1, 1 },
+        { ahd_patch8_func, 260, 2, 1 },
+        { ahd_patch1_func, 264, 1, 2 },
+        { ahd_patch0_func, 265, 1, 1 },
+        { ahd_patch7_func, 268, 3, 1 },
+        { ahd_patch1_func, 283, 1, 2 },
+        { ahd_patch0_func, 284, 1, 1 },
+        { ahd_patch1_func, 287, 1, 2 },
+        { ahd_patch0_func, 288, 1, 1 },
+        { ahd_patch2_func, 291, 1, 2 },
+        { ahd_patch0_func, 292, 1, 1 },
+        { ahd_patch9_func, 305, 2, 2 },
+        { ahd_patch0_func, 307, 1, 1 },
+        { ahd_patch1_func, 349, 1, 2 },
+        { ahd_patch0_func, 350, 1, 1 },
+        { ahd_patch2_func, 358, 1, 2 },
+        { ahd_patch0_func, 359, 1, 1 },
+        { ahd_patch2_func, 362, 1, 2 },
         { ahd_patch0_func, 363, 1, 1 },
-        { ahd_patch10_func, 382, 1, 1 },
-        { ahd_patch10_func, 385, 1, 1 },
-        { ahd_patch10_func, 387, 1, 1 },
-        { ahd_patch10_func, 399, 1, 1 },
-        { ahd_patch1_func, 409, 1, 2 },
-        { ahd_patch0_func, 410, 1, 1 },
-        { ahd_patch1_func, 412, 1, 2 },
-        { ahd_patch0_func, 413, 1, 1 },
-        { ahd_patch1_func, 421, 1, 2 },
-        { ahd_patch0_func, 422, 1, 1 },
-        { ahd_patch2_func, 435, 1, 2 },
-        { ahd_patch0_func, 436, 1, 1 },
-        { ahd_patch11_func, 472, 1, 1 },
-        { ahd_patch1_func, 480, 1, 2 },
-        { ahd_patch0_func, 481, 1, 1 },
-        { ahd_patch2_func, 493, 1, 2 },
-        { ahd_patch0_func, 494, 1, 1 },
-        { ahd_patch12_func, 497, 6, 2 },
-        { ahd_patch0_func, 503, 1, 1 },
-        { ahd_patch13_func, 524, 7, 1 },
-        { ahd_patch14_func, 533, 1, 1 },
-        { ahd_patch15_func, 542, 1, 1 },
-        { ahd_patch16_func, 543, 1, 2 },
-        { ahd_patch0_func, 544, 1, 1 },
-        { ahd_patch17_func, 547, 1, 1 },
-        { ahd_patch16_func, 548, 1, 1 },
-        { ahd_patch18_func, 559, 1, 2 },
-        { ahd_patch0_func, 560, 1, 1 },
-        { ahd_patch1_func, 579, 1, 2 },
-        { ahd_patch0_func, 580, 1, 1 },
-        { ahd_patch1_func, 583, 1, 2 },
-        { ahd_patch0_func, 584, 1, 1 },
-        { ahd_patch2_func, 589, 1, 2 },
+        { ahd_patch1_func, 369, 1, 2 },
+        { ahd_patch0_func, 370, 1, 1 },
+        { ahd_patch1_func, 372, 1, 2 },
+        { ahd_patch0_func, 373, 1, 1 },
+        { ahd_patch10_func, 392, 1, 1 },
+        { ahd_patch10_func, 395, 1, 1 },
+        { ahd_patch10_func, 397, 1, 1 },
+        { ahd_patch10_func, 409, 1, 1 },
+        { ahd_patch1_func, 419, 1, 2 },
+        { ahd_patch0_func, 420, 1, 1 },
+        { ahd_patch1_func, 422, 1, 2 },
+        { ahd_patch0_func, 423, 1, 1 },
+        { ahd_patch1_func, 431, 1, 2 },
+        { ahd_patch0_func, 432, 1, 1 },
+        { ahd_patch2_func, 445, 1, 2 },
+        { ahd_patch0_func, 446, 1, 1 },
+        { ahd_patch11_func, 482, 1, 1 },
+        { ahd_patch1_func, 490, 1, 2 },
+        { ahd_patch0_func, 491, 1, 1 },
+        { ahd_patch2_func, 503, 1, 2 },
+        { ahd_patch0_func, 504, 1, 1 },
+        { ahd_patch12_func, 507, 6, 2 },
+        { ahd_patch0_func, 513, 1, 1 },
+        { ahd_patch13_func, 534, 7, 1 },
+        { ahd_patch14_func, 543, 1, 1 },
+        { ahd_patch15_func, 552, 1, 1 },
+        { ahd_patch16_func, 553, 1, 2 },
+        { ahd_patch0_func, 554, 1, 1 },
+        { ahd_patch17_func, 557, 1, 1 },
+        { ahd_patch16_func, 558, 1, 1 },
+        { ahd_patch18_func, 569, 1, 2 },
+        { ahd_patch0_func, 570, 1, 1 },
+        { ahd_patch1_func, 589, 1, 2 },
         { ahd_patch0_func, 590, 1, 1 },
-        { ahd_patch2_func, 594, 1, 2 },
-        { ahd_patch0_func, 595, 1, 1 },
-        { ahd_patch1_func, 596, 1, 2 },
-        { ahd_patch0_func, 597, 1, 1 },
-        { ahd_patch2_func, 608, 1, 2 },
-        { ahd_patch0_func, 609, 1, 1 },
-        { ahd_patch19_func, 613, 1, 1 },
-        { ahd_patch20_func, 618, 1, 1 },
-        { ahd_patch21_func, 619, 2, 1 },
-        { ahd_patch20_func, 623, 1, 2 },
-        { ahd_patch0_func, 624, 1, 1 },
-        { ahd_patch2_func, 627, 1, 2 },
-        { ahd_patch0_func, 628, 1, 1 },
-        { ahd_patch2_func, 643, 1, 2 },
-        { ahd_patch0_func, 644, 1, 1 },
-        { ahd_patch13_func, 645, 14, 1 },
-        { ahd_patch1_func, 663, 1, 2 },
-        { ahd_patch0_func, 664, 1, 1 },
-        { ahd_patch13_func, 665, 1, 1 },
-        { ahd_patch1_func, 677, 1, 2 },
-        { ahd_patch0_func, 678, 1, 1 },
-        { ahd_patch1_func, 685, 1, 2 },
-        { ahd_patch0_func, 686, 1, 1 },
-        { ahd_patch19_func, 709, 1, 1 },
-        { ahd_patch19_func, 747, 1, 1 },
-        { ahd_patch1_func, 758, 1, 2 },
-        { ahd_patch0_func, 759, 1, 1 },
-        { ahd_patch1_func, 776, 1, 2 },
-        { ahd_patch0_func, 777, 1, 1 },
-        { ahd_patch1_func, 779, 1, 2 },
-        { ahd_patch0_func, 780, 1, 1 },
-        { ahd_patch1_func, 783, 1, 2 },
-        { ahd_patch0_func, 784, 1, 1 },
-        { ahd_patch22_func, 786, 1, 2 },
-        { ahd_patch0_func, 787, 2, 1 },
-        { ahd_patch23_func, 790, 4, 2 },
-        { ahd_patch0_func, 794, 1, 1 },
-        { ahd_patch23_func, 802, 11, 1 }
+        { ahd_patch1_func, 593, 1, 2 },
+        { ahd_patch0_func, 594, 1, 1 },
+        { ahd_patch2_func, 599, 1, 2 },
+        { ahd_patch0_func, 600, 1, 1 },
+        { ahd_patch2_func, 604, 1, 2 },
+        { ahd_patch0_func, 605, 1, 1 },
+        { ahd_patch1_func, 606, 1, 2 },
+        { ahd_patch0_func, 607, 1, 1 },
+        { ahd_patch2_func, 618, 1, 2 },
+        { ahd_patch0_func, 619, 1, 1 },
+        { ahd_patch19_func, 623, 1, 1 },
+        { ahd_patch20_func, 628, 1, 1 },
+        { ahd_patch21_func, 629, 2, 1 },
+        { ahd_patch20_func, 633, 1, 2 },
+        { ahd_patch0_func, 634, 1, 1 },
+        { ahd_patch2_func, 637, 1, 2 },
+        { ahd_patch0_func, 638, 1, 1 },
+        { ahd_patch2_func, 653, 1, 2 },
+        { ahd_patch0_func, 654, 1, 1 },
+        { ahd_patch13_func, 655, 14, 1 },
+        { ahd_patch1_func, 673, 1, 2 },
+        { ahd_patch0_func, 674, 1, 1 },
+        { ahd_patch13_func, 675, 1, 1 },
+        { ahd_patch1_func, 687, 1, 2 },
+        { ahd_patch0_func, 688, 1, 1 },
+        { ahd_patch1_func, 695, 1, 2 },
+        { ahd_patch0_func, 696, 1, 1 },
+        { ahd_patch19_func, 719, 1, 1 },
+        { ahd_patch19_func, 757, 1, 1 },
+        { ahd_patch1_func, 768, 1, 2 },
+        { ahd_patch0_func, 769, 1, 1 },
+        { ahd_patch7_func, 785, 3, 1 },
+        { ahd_patch1_func, 789, 1, 2 },
+        { ahd_patch0_func, 790, 1, 1 },
+        { ahd_patch1_func, 792, 1, 2 },
+        { ahd_patch0_func, 793, 1, 1 },
+        { ahd_patch1_func, 796, 1, 2 },
+        { ahd_patch0_func, 797, 1, 1 },
+        { ahd_patch22_func, 799, 1, 2 },
+        { ahd_patch0_func, 800, 2, 1 },
+        { ahd_patch23_func, 803, 4, 2 },
+        { ahd_patch0_func, 807, 1, 1 },
+        { ahd_patch23_func, 815, 11, 1 }
 };
 
 static struct cs {
         uint16_t        begin;
         uint16_t        end;
 } critical_sections[] = {
-        { 17, 28 },
-        { 29, 30 },
+        { 17, 30 },
         { 47, 58 },
         { 61, 63 },
         { 65, 66 },
         { 72, 92 },
-        { 110, 137 },
-        { 138, 175 },
-        { 180, 188 },
-        { 213, 264 },
-        { 425, 433 },
-        { 443, 445 },
-        { 448, 457 },
-        { 709, 739 },
-        { 749, 753 }
+        { 110, 142 },
+        { 143, 180 },
+        { 185, 193 },
+        { 218, 274 },
+        { 435, 443 },
+        { 453, 455 },
+        { 458, 467 },
+        { 719, 749 },
+        { 759, 763 }
 };
 
 static const int num_critical_sections = sizeof(critical_sections)
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm.c b/drivers/scsi/aic7xxx/aicasm/aicasm.c
index f936b691232f..924102720b14 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm.c
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm.c
@@ -37,7 +37,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#22 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $
  *
  * $FreeBSD$
  */
@@ -609,10 +609,10 @@ output_listing(char *ifilename)
 
                 while (line < cur_instr->srcline) {
                         fgets(buf, sizeof(buf), ifile);
-                                fprintf(listfile, "\t\t%s", buf);
+                                fprintf(listfile, "             \t%s", buf);
                                 line++;
                 }
-                fprintf(listfile, "%03x %02x%02x%02x%02x", instrptr,
+                fprintf(listfile, "%04x %02x%02x%02x%02x", instrptr,
 #ifdef __LITTLE_ENDIAN
                         cur_instr->format.bytes[0],
                         cur_instr->format.bytes[1],
@@ -624,14 +624,23 @@ output_listing(char *ifilename)
                         cur_instr->format.bytes[1],
                         cur_instr->format.bytes[0]);
 #endif
-                fgets(buf, sizeof(buf), ifile);
-                fprintf(listfile, "\t%s", buf);
-                line++;
+                /*
+                 * Macro expansions can cause several instructions
+                 * to be output for a single source line.  Only
+                 * advance the line once in these cases.
+                 */
+                if (line == cur_instr->srcline) {
+                        fgets(buf, sizeof(buf), ifile);
+                        fprintf(listfile, "\t%s", buf);
+                        line++;
+                } else {
+                        fprintf(listfile, "\n");
+                }
                 instrptr++;
         }
         /* Dump the remainder of the file */
         while(fgets(buf, sizeof(buf), ifile) != NULL)
-                fprintf(listfile, "\t\t%s", buf);
+                fprintf(listfile, "             %s", buf);
 
         fclose(ifile);
 }
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index 67e046d96625..c328596def3c 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#29 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#30 $
  *
  * $FreeBSD$
  */
@@ -157,6 +157,8 @@ static int  is_download_const(expression_t *immed);
 
 %token T_END_CS
 
+%token T_PAD_PAGE
+
 %token T_FIELD
 
 %token T_ENUM
@@ -189,6 +191,10 @@ static int  is_download_const(expression_t *immed);
 
 %token <value> T_OR
 
+/* 16 bit extensions */
+%token <value> T_OR16 T_AND16 T_XOR16 T_ADD16
+%token <value> T_ADC16 T_MVI16 T_TEST16 T_CMP16 T_CMPXCHG
+
 %token T_RET
 
 %token T_NOP
@@ -207,7 +213,7 @@ static int  is_download_const(expression_t *immed);
 
 %type <expression> expression immediate immediate_or_a
 
-%type <value> export ret f1_opcode f2_opcode jmp_jc_jnc_call jz_jnz je_jne
+%type <value> export ret f1_opcode f2_opcode f4_opcode jmp_jc_jnc_call jz_jnz je_jne
 
 %type <value> mode_value mode_list macro_arglist
 
@@ -1304,6 +1310,15 @@ f2_opcode:
 |       T_ROR { $$ = AIC_OP_ROR; }
 ;
 
+f4_opcode:
+        T_OR16  { $$ = AIC_OP_OR16; }
+|       T_AND16 { $$ = AIC_OP_AND16; }
+|       T_XOR16 { $$ = AIC_OP_XOR16; }
+|       T_ADD16 { $$ = AIC_OP_ADD16; }
+|       T_ADC16 { $$ = AIC_OP_ADC16; }
+|       T_MVI16 { $$ = AIC_OP_MVI16; }
+;
+
 code:
         f2_opcode destination ',' expression opt_source ret ';'
         {
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h b/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
index e64f802bbaaa..9df9e2ce3538 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_insformat.h
@@ -37,13 +37,14 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#11 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#12 $
  *
  * $FreeBSD$
  */
 
 #include <asm/byteorder.h>
 
+/* 8bit ALU logic operations */
 struct ins_format1 {
 #ifdef __LITTLE_ENDIAN
         uint32_t        immediate       : 8,
@@ -62,6 +63,7 @@ struct ins_format1 {
 #endif
 };
 
+/* 8bit ALU shift/rotate operations */
 struct ins_format2 {
 #ifdef __LITTLE_ENDIAN
         uint32_t        shift_control   : 8,
@@ -80,6 +82,7 @@ struct ins_format2 {
 #endif
 };
 
+/* 8bit branch control operations */
 struct ins_format3 {
 #ifdef __LITTLE_ENDIAN
         uint32_t        immediate       : 8,
@@ -96,10 +99,68 @@ struct ins_format3 {
 #endif
 };
 
+/* 16bit ALU logic operations */
+struct ins_format4 {
+#ifdef __LITTLE_ENDIAN
+        uint32_t        opcode_ext      : 8,
+                        source          : 9,
+                        destination     : 9,
+                        ret             : 1,
+                        opcode          : 4,
+                        parity          : 1;
+#else
+        uint32_t        parity          : 1,
+                        opcode          : 4,
+                        ret             : 1,
+                        destination     : 9,
+                        source          : 9,
+                        opcode_ext      : 8;
+#endif
+};
+
+/* 16bit branch control operations */
+struct ins_format5 {
+#ifdef __LITTLE_ENDIAN
+        uint32_t        opcode_ext      : 8,
+                        source          : 9,
+                        address         : 10,
+                        opcode          : 4,
+                        parity          : 1;
+#else
+        uint32_t        parity          : 1,
+                        opcode          : 4,
+                        address         : 10,
+                        source          : 9,
+                        opcode_ext      : 8;
+#endif
+};
+
+/*  Far branch operations */
+struct ins_format6 {
+#ifdef __LITTLE_ENDIAN
+        uint32_t        page            : 3,
+                        opcode_ext      : 5,
+                        source          : 9,
+                        address         : 10,
+                        opcode          : 4,
+                        parity          : 1;
+#else
+        uint32_t        parity          : 1,
+                        opcode          : 4,
+                        address         : 10,
+                        source          : 9,
+                        opcode_ext      : 5,
+                        page            : 3;
+#endif
+};
+
 union ins_formats {
                 struct ins_format1 format1;
                 struct ins_format2 format2;
                 struct ins_format3 format3;
+                struct ins_format4 format4;
+                struct ins_format5 format5;
+                struct ins_format6 format6;
                 uint8_t            bytes[4];
                 uint32_t           integer;
 };
@@ -118,6 +179,8 @@ struct instruction {
 #define AIC_OP_ROL      0x5
 #define AIC_OP_BMOV     0x6
 
+#define AIC_OP_MVI16    0x7
+
 #define AIC_OP_JMP      0x8
 #define AIC_OP_JC       0x9
 #define AIC_OP_JNC      0xa
@@ -131,3 +194,26 @@ struct instruction {
 #define AIC_OP_SHL      0x10
 #define AIC_OP_SHR      0x20
 #define AIC_OP_ROR      0x30
+
+/* 16bit Ops. Low byte main opcode.  High byte extended opcode. */ 
+#define AIC_OP_OR16     0x8005
+#define AIC_OP_AND16    0x8105
+#define AIC_OP_XOR16    0x8205
+#define AIC_OP_ADD16    0x8305
+#define AIC_OP_ADC16    0x8405
+#define AIC_OP_JNE16    0x8805
+#define AIC_OP_JNZ16    0x8905
+#define AIC_OP_JE16     0x8C05
+#define AIC_OP_JZ16     0x8B05
+#define AIC_OP_JMP16    0x9005
+#define AIC_OP_JC16     0x9105
+#define AIC_OP_JNC16    0x9205
+#define AIC_OP_CALL16   0x9305
+#define AIC_OP_CALL16   0x9305
+
+/* Page extension is low three bits of second opcode byte. */
+#define AIC_OP_JMPF     0xA005
+#define AIC_OP_CALLF    0xB005
+#define AIC_OP_JCF      0xC005
+#define AIC_OP_JNCF     0xD005
+#define AIC_OP_CMPXCHG  0xE005
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
index 45c0b233d0bc..7c3983f868a9 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#19 $
+ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#20 $
  *
  * $FreeBSD$
  */
@@ -132,7 +132,7 @@ if[ \t]*\(		{
                                                 *string_buf_ptr++ = *yptr++;
                                 }
                         }
-
+else                    { return T_ELSE; }
 VERSION                 { return T_VERSION; }
 PREFIX                  { return T_PREFIX; }
 PATCH_ARG_LIST          { return T_PATCH_ARG_LIST; }
@@ -173,10 +173,6 @@ RW|RO|WO		{
                                         yylval.value = WO;
                                  return T_MODE;
                         }
-BEGIN_CRITICAL          { return T_BEGIN_CS; }
-END_CRITICAL            { return T_END_CS; }
-SET_SRC_MODE            { return T_SET_SRC_MODE; }
-SET_DST_MODE            { return T_SET_DST_MODE; }
 field                   { return T_FIELD; }
 enum                    { return T_ENUM; }
 mask                    { return T_MASK; }
@@ -192,6 +188,13 @@ none			{ return T_NONE; }
 sindex                  { return T_SINDEX; }
 A                       { return T_A; }
 
+        /* Instruction Formatting */
+PAD_PAGE                { return T_PAD_PAGE; }
+BEGIN_CRITICAL          { return T_BEGIN_CS; }
+END_CRITICAL            { return T_END_CS; }
+SET_SRC_MODE            { return T_SET_SRC_MODE; }
+SET_DST_MODE            { return T_SET_DST_MODE; }
+
         /* Opcodes */
 shl                     { return T_SHL; }
 shr                     { return T_SHR; }
@@ -223,7 +226,17 @@ and			{ return T_AND;	}
 or                      { return T_OR;  }
 ret                     { return T_RET; }
 nop                     { return T_NOP; }
-else                    { return T_ELSE; }
+
+        /* ARP2 16bit extensions */
+or16                    { return T_OR16; }
+and16                   { return T_AND16; }
+xor16                   { return T_XOR16; }
+add16                   { return T_ADD16; }
+adc16                   { return T_ADC16; }
+mvi16                   { return T_MVI16; }
+test16                  { return T_TEST16; }
+cmp16                   { return T_CMP16; }
+cmpxchg                 { return T_CMPXCHG; }
 
         /* Allowed Symbols */
 \<\<                    { return T_EXPR_LSHIFT; }
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index c8a32cf47d73..cbf825263f3b 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -246,6 +246,7 @@ struct ScsiReqBlk {
          * total_xfer_length in xferred. These values are restored in
          * pci_unmap_srb_sense. This is the only place xferred is used.
          */
+        unsigned char *virt_addr_req;   /* Saved virtual address of the request buffer */
         u32 xferred;                    /* Saved copy of total_xfer_length */
 
         u16 state;
@@ -2017,7 +2018,7 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
         sg_verify_length(srb);
 
         /* we need the corresponding virtual address */
-        if (!segment) {
+        if (!segment || (srb->flag & AUTO_REQSENSE)) {
                 srb->virt_addr += xferred;
                 return;
         }
@@ -3318,6 +3319,7 @@ static void pci_unmap_srb_sense(struct AdapterCtlBlk *acb,
             srb->segment_x[DC395x_MAX_SG_LISTENTRY - 1].address;
         srb->segment_x[0].length =
             srb->segment_x[DC395x_MAX_SG_LISTENTRY - 1].length;
+        srb->virt_addr = srb->virt_addr_req;
 }
 
 
@@ -3711,6 +3713,8 @@ static void request_sense(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
         srb->xferred = srb->total_xfer_length;
         /* srb->segment_x : a one entry of S/G list table */
         srb->total_xfer_length = sizeof(cmd->sense_buffer);
+        srb->virt_addr_req = srb->virt_addr;
+        srb->virt_addr = cmd->sense_buffer;
         srb->segment_x[0].length = sizeof(cmd->sense_buffer);
         /* Map sense buffer */
         srb->segment_x[0].address =
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 822b9fa706f3..eaefeddb2b4a 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -87,7 +87,7 @@ static int max_channel = 3;
 static int init_timeout = 5;
 static int max_requests = 50;
 
-#define IBMVSCSI_VERSION "1.5.7"
+#define IBMVSCSI_VERSION "1.5.8"
 
 MODULE_DESCRIPTION("IBM Virtual SCSI");
 MODULE_AUTHOR("Dave Boutcher");
@@ -534,7 +534,6 @@ static int map_data_for_srp_cmd(struct scsi_cmnd *cmd,
 static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
                                    struct ibmvscsi_host_data *hostdata)
 {
-        struct scsi_cmnd *cmnd;
         u64 *crq_as_u64 = (u64 *) &evt_struct->crq;
         int rc;
 
@@ -544,19 +543,8 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
          * can handle more requests (can_queue) when we actually can't
          */
         if ((evt_struct->crq.format == VIOSRP_SRP_FORMAT) &&
-            (atomic_dec_if_positive(&hostdata->request_limit) < 0)) {
-                /* See if the adapter is disabled */
-                if (atomic_read(&hostdata->request_limit) < 0)
-                        goto send_error;
-        
-                printk(KERN_WARNING 
-                       "ibmvscsi: Warning, request_limit exceeded\n");
-                unmap_cmd_data(&evt_struct->iu.srp.cmd,
-                               evt_struct,
-                               hostdata->dev);
-                free_event_struct(&hostdata->pool, evt_struct);
-                return SCSI_MLQUEUE_HOST_BUSY;
-        }
+            (atomic_dec_if_positive(&hostdata->request_limit) < 0))
+                goto send_error;
 
         /* Copy the IU into the transfer area */
         *evt_struct->xfer_iu = evt_struct->iu;
@@ -572,7 +560,7 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
              ibmvscsi_send_crq(hostdata, crq_as_u64[0], crq_as_u64[1])) != 0) {
                 list_del(&evt_struct->list);
 
-                printk(KERN_ERR "ibmvscsi: failed to send event struct rc %d\n",
+                printk(KERN_ERR "ibmvscsi: send error %d\n",
                        rc);
                 goto send_error;
         }
@@ -582,14 +570,8 @@ static int ibmvscsi_send_srp_event(struct srp_event_struct *evt_struct,
  send_error:
         unmap_cmd_data(&evt_struct->iu.srp.cmd, evt_struct, hostdata->dev);
 
-        if ((cmnd = evt_struct->cmnd) != NULL) {
-                cmnd->result = DID_ERROR << 16;
-                evt_struct->cmnd_done(cmnd);
-        } else if (evt_struct->done)
-                evt_struct->done(evt_struct);
-        
         free_event_struct(&hostdata->pool, evt_struct);
-        return 0;
+        return SCSI_MLQUEUE_HOST_BUSY;
 }
 
 /**
@@ -802,7 +784,8 @@ static void login_rsp(struct srp_event_struct *evt_struct)
         case SRP_LOGIN_RSP_TYPE:        /* it worked! */
                 break;
         case SRP_LOGIN_REJ_TYPE:        /* refused! */
-                printk(KERN_INFO "ibmvscsi: SRP_LOGIN_REQ rejected\n");
+                printk(KERN_INFO "ibmvscsi: SRP_LOGIN_REJ reason %u\n",
+                       evt_struct->xfer_iu->srp.login_rej.reason);
                 /* Login failed.  */
                 atomic_set(&hostdata->request_limit, -1);
                 return;
@@ -834,6 +817,9 @@ static void login_rsp(struct srp_event_struct *evt_struct)
                 return;
         }
 
+        /* If we had any pending I/Os, kick them */
+        scsi_unblock_requests(hostdata->host);
+
         send_mad_adapter_info(hostdata);
         return;
 }
@@ -862,6 +848,7 @@ static int send_srp_login(struct ibmvscsi_host_data *hostdata)
                           init_timeout * HZ);
 
         login = &evt_struct->iu.srp.login_req;
+        memset(login, 0x00, sizeof(struct srp_login_req));
         login->type = SRP_LOGIN_REQ_TYPE;
         login->max_requested_initiator_to_target_iulen = sizeof(union srp_iu);
         login->required_buffer_formats = 0x0006;
@@ -1122,7 +1109,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
  * purge_requests: Our virtual adapter just shut down.  purge any sent requests
  * @hostdata:    the adapter
  */
-static void purge_requests(struct ibmvscsi_host_data *hostdata)
+static void purge_requests(struct ibmvscsi_host_data *hostdata, int error_code)
 {
         struct srp_event_struct *tmp_evt, *pos;
         unsigned long flags;
@@ -1131,7 +1118,7 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata)
         list_for_each_entry_safe(tmp_evt, pos, &hostdata->sent, list) {
                 list_del(&tmp_evt->list);
                 if (tmp_evt->cmnd) {
-                        tmp_evt->cmnd->result = (DID_ERROR << 16);
+                        tmp_evt->cmnd->result = (error_code << 16);
                         unmap_cmd_data(&tmp_evt->iu.srp.cmd, 
                                        tmp_evt, 
                                        tmp_evt->hostdata->dev);
@@ -1186,12 +1173,30 @@ void ibmvscsi_handle_crq(struct viosrp_crq *crq,
                         printk(KERN_ERR "ibmvscsi: unknown crq message type\n");
                 }
                 return;
-        case 0xFF:              /* Hypervisor telling us the connection is closed */
-                printk(KERN_INFO "ibmvscsi: Virtual adapter failed!\n");
+        case 0xFF:      /* Hypervisor telling us the connection is closed */
+                scsi_block_requests(hostdata->host);
+                if (crq->format == 0x06) {
+                        /* We need to re-setup the interpartition connection */
+                        printk(KERN_INFO
+                               "ibmvscsi: Re-enabling adapter!\n");
+                        purge_requests(hostdata, DID_REQUEUE);
+                        if (ibmvscsi_reenable_crq_queue(&hostdata->queue,
+                                                        hostdata) == 0)
+                                if (ibmvscsi_send_crq(hostdata,
+                                                      0xC001000000000000LL, 0))
+                                        printk(KERN_ERR
+                                               "ibmvscsi: transmit error after"
+                                               " enable\n");
+                } else {
+                        printk(KERN_INFO
+                               "ibmvscsi: Virtual adapter failed rc %d!\n",
+                               crq->format);
 
-                atomic_set(&hostdata->request_limit, -1);
-                purge_requests(hostdata);
-                ibmvscsi_reset_crq_queue(&hostdata->queue, hostdata);
+                        atomic_set(&hostdata->request_limit, -1);
+                        purge_requests(hostdata, DID_ERROR);
+                        ibmvscsi_reset_crq_queue(&hostdata->queue, hostdata);
+                }
+                scsi_unblock_requests(hostdata->host);
                 return;
         case 0x80:              /* real payload */
                 break;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 5b0edd1f1921..4550d71e4744 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -103,6 +103,9 @@ void ibmvscsi_release_crq_queue(struct crq_queue *queue,
 int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                               struct ibmvscsi_host_data *hostdata);
 
+int ibmvscsi_reenable_crq_queue(struct crq_queue *queue,
+                                struct ibmvscsi_host_data *hostdata);
+
 void ibmvscsi_handle_crq(struct viosrp_crq *crq,
                          struct ibmvscsi_host_data *hostdata);
 int ibmvscsi_send_crq(struct ibmvscsi_host_data *hostdata,
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index ce15d9e39621..7eed0b098171 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -124,6 +124,19 @@ int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
 }
 
 /**
+ * reenable_crq_queue: - reenables a crq after a failure
+ * @queue:      crq_queue to initialize and register
+ * @hostdata:   ibmvscsi_host_data of host
+ *
+ * no-op for iSeries
+ */
+int ibmvscsi_reenable_crq_queue(struct crq_queue *queue,
+                                struct ibmvscsi_host_data *hostdata)
+{
+        return 0;
+}
+
+/**
  * ibmvscsi_send_crq: - Send a CRQ
  * @hostdata:   the adapter
  * @word1:      the first 64 bits of the data
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index 75db2f5c545e..f47dd87c05e7 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -281,6 +281,28 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
 }
 
 /**
+ * reenable_crq_queue: - reenables a crq after
+ * @queue:      crq_queue to initialize and register
+ * @hostdata:   ibmvscsi_host_data of host
+ *
+ */
+int ibmvscsi_reenable_crq_queue(struct crq_queue *queue,
+                                 struct ibmvscsi_host_data *hostdata)
+{
+        int rc;
+        struct vio_dev *vdev = to_vio_dev(hostdata->dev);
+
+        /* Re-enable the CRQ */
+        do {
+                rc = plpar_hcall_norets(H_ENABLE_CRQ, vdev->unit_address);
+        } while ((rc == H_InProgress) || (rc == H_Busy) || (H_isLongBusy(rc)));
+
+        if (rc)
+                printk(KERN_ERR "ibmvscsi: Error %d enabling adapter\n", rc);
+        return rc;
+}
+
+/**
  * reset_crq_queue: - resets a crq after a failure
  * @queue:      crq_queue to initialize and register
  * @hostdata:   ibmvscsi_host_data of host
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 3c688ef54660..0cf0e4c7ac0c 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -751,9 +751,8 @@ static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
         idescsi_add_settings(drive);
 }
 
-static int ide_scsi_remove(struct device *dev)
+static void ide_scsi_remove(ide_drive_t *drive)
 {
-        ide_drive_t *drive = to_ide_device(dev);
         struct Scsi_Host *scsihost = drive->driver_data;
         struct ide_scsi_obj *scsi = scsihost_to_idescsi(scsihost);
         struct gendisk *g = scsi->disk;
@@ -768,11 +767,9 @@ static int ide_scsi_remove(struct device *dev)
 
         scsi_remove_host(scsihost);
         ide_scsi_put(scsi);
-
-        return 0;
 }
 
-static int ide_scsi_probe(struct device *);
+static int ide_scsi_probe(ide_drive_t *);
 
 #ifdef CONFIG_PROC_FS
 static ide_proc_entry_t idescsi_proc[] = {
@@ -788,9 +785,9 @@ static ide_driver_t idescsi_driver = {
                 .owner          = THIS_MODULE,
                 .name           = "ide-scsi",
                 .bus            = &ide_bus_type,
-                .probe          = ide_scsi_probe,
-                .remove         = ide_scsi_remove,
         },
+        .probe                  = ide_scsi_probe,
+        .remove                 = ide_scsi_remove,
         .version                = IDESCSI_VERSION,
         .media                  = ide_scsi,
         .supports_dsc_overlap   = 0,
@@ -1119,9 +1116,8 @@ static struct scsi_host_template idescsi_template = {
         .proc_name              = "ide-scsi",
 };
 
-static int ide_scsi_probe(struct device *dev)
+static int ide_scsi_probe(ide_drive_t *drive)
 {
-        ide_drive_t *drive = to_ide_device(dev);
         idescsi_scsi_t *idescsi;
         struct Scsi_Host *host;
         struct gendisk *g;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index e5e1ca44e1ee..86c546164da9 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -3499,6 +3499,7 @@ ips_map_status(ips_ha_t * ha, ips_scb_t * scb, ips_stat_t * sp)
         int device_error;
         uint32_t transfer_len;
         IPS_DCDB_TABLE_TAPE *tapeDCDB;
+        IPS_SCSI_INQ_DATA inquiryData;
 
         METHOD_TRACE("ips_map_status", 1);
 
@@ -3557,13 +3558,13 @@ ips_map_status(ips_ha_t * ha, ips_scb_t * scb, ips_stat_t * sp)
                                 errcode = DID_OK;
 
                                 /* Restrict access to physical DASD */
-                                if ((scb->scsi_cmd->cmnd[0] == INQUIRY) &&
-                                    ((((char *) scb->scsi_cmd->
-                                       buffer)[0] & 0x1f) == TYPE_DISK)) {
-                                        /* underflow -- no error               */
-                                        /* restrict access to physical DASD    */
-                                        errcode = DID_TIME_OUT;
-                                        break;
+                                if (scb->scsi_cmd->cmnd[0] == INQUIRY) {
+                                    ips_scmd_buf_read(scb->scsi_cmd, 
+                                      &inquiryData, sizeof (inquiryData));
+                                    if ((inquiryData.DeviceType & 0x1f) == TYPE_DISK) {
+                                        errcode = DID_TIME_OUT;
+                                        break;
+                                    }
                                 }
                         } else
                                 errcode = DID_ERROR;
@@ -4135,6 +4136,7 @@ ips_chkstatus(ips_ha_t * ha, IPS_STATUS * pstatus)
         uint8_t basic_status;
         uint8_t ext_status;
         int errcode;
+        IPS_SCSI_INQ_DATA inquiryData;
 
         METHOD_TRACE("ips_chkstatus", 1);
 
@@ -4255,11 +4257,11 @@ ips_chkstatus(ips_ha_t * ha, IPS_STATUS * pstatus)
                         scb->scsi_cmd->result = errcode << 16;
                 } else {        /* bus == 0 */
                         /* restrict access to physical drives */
-                        if ((scb->scsi_cmd->cmnd[0] == INQUIRY) &&
-                            ((((char *) scb->scsi_cmd->buffer)[0] & 0x1f) ==
-                             TYPE_DISK)) {
-
-                                scb->scsi_cmd->result = DID_TIME_OUT << 16;
+                        if (scb->scsi_cmd->cmnd[0] == INQUIRY) { 
+                            ips_scmd_buf_read(scb->scsi_cmd, 
+                                  &inquiryData, sizeof (inquiryData));
+                            if ((inquiryData.DeviceType & 0x1f) == TYPE_DISK) 
+                                scb->scsi_cmd->result = DID_TIME_OUT << 16;
                         }
                 }               /* else */
         } else {                /* recovered error / success */
@@ -5012,7 +5014,7 @@ ips_init_copperhead(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 45)
@@ -5038,7 +5040,7 @@ ips_init_copperhead(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 240)
@@ -5056,7 +5058,7 @@ ips_init_copperhead(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 240)
@@ -5106,7 +5108,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 45)
@@ -5132,7 +5134,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
                                 break;
 
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (j >= 240)
@@ -5150,7 +5152,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 240)
@@ -5202,7 +5204,7 @@ ips_init_morpheus(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 45) {
@@ -5228,7 +5230,7 @@ ips_init_morpheus(ips_ha_t * ha)
                         if (Post != 0x4F00)
                                 break;
                         /* Delay for 1 Second */
-                        MDELAY(IPS_ONE_SEC);
+                        msleep(IPS_ONE_SEC);
                 }
 
                 if (i >= 120) {
@@ -5258,7 +5260,7 @@ ips_init_morpheus(ips_ha_t * ha)
                         break;
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
         }
 
         if (i >= 240) {
@@ -5318,12 +5320,12 @@ ips_reset_copperhead(ips_ha_t * ha)
                 outb(IPS_BIT_RST, ha->io_addr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 outb(0, ha->io_addr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 if ((*ha->func.init) (ha))
                         break;
@@ -5363,12 +5365,12 @@ ips_reset_copperhead_memio(ips_ha_t * ha)
                 writeb(IPS_BIT_RST, ha->mem_ptr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 writeb(0, ha->mem_ptr + IPS_REG_SCPR);
 
                 /* Delay for 1 Second */
-                MDELAY(IPS_ONE_SEC);
+                msleep(IPS_ONE_SEC);
 
                 if ((*ha->func.init) (ha))
                         break;
@@ -5409,7 +5411,7 @@ ips_reset_morpheus(ips_ha_t * ha)
                 writel(0x80000000, ha->mem_ptr + IPS_REG_I960_IDR);
 
                 /* Delay for 5 Seconds */
-                MDELAY(5 * IPS_ONE_SEC);
+                msleep(5 * IPS_ONE_SEC);
 
                 /* Do a PCI config read to wait for adapter */
                 pci_read_config_byte(ha->pcidev, 4, &junk);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index cfbceb504718..07b1e7cc61df 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1700,6 +1700,31 @@ static unsigned int ata_msense_rw_recovery(u8 **ptr_io, const u8 *last)
         return sizeof(def_rw_recovery_mpage);
 }
 
+/*
+ * We can turn this into a real blacklist if it's needed, for now just
+ * blacklist any Maxtor BANC1G10 revision firmware
+ */
+static int ata_dev_supports_fua(u16 *id)
+{
+        unsigned char model[41], fw[9];
+
+        if (!ata_id_has_fua(id))
+                return 0;
+
+        model[40] = '\0';
+        fw[8] = '\0';
+
+        ata_dev_id_string(id, model, ATA_ID_PROD_OFS, sizeof(model) - 1);
+        ata_dev_id_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw) - 1);
+
+        if (strncmp(model, "Maxtor", 6))
+                return 1;
+        if (strncmp(fw, "BANC1G10", 8))
+                return 1;
+
+        return 0; /* blacklisted */
+}
+
 /**
  *      ata_scsiop_mode_sense - Simulate MODE SENSE 6, 10 commands
  *      @args: device IDENTIFY data / SCSI command of interest.
@@ -1797,7 +1822,7 @@ unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf,
                 return 0;
 
         dpofua = 0;
-        if (ata_id_has_fua(args->id) && dev->flags & ATA_DFLAG_LBA48 &&
+        if (ata_dev_supports_fua(args->id) && dev->flags & ATA_DFLAG_LBA48 &&
             (!(dev->flags & ATA_DFLAG_PIO) || dev->multi_count))
                 dpofua = 1 << 4;
 
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 511ed52a5807..a487f414960e 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -10,7 +10,7 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_sas.c
- * Version      : v00.00.02.00-rc4
+ * Version      : v00.00.02.02
  *
  * Authors:
  *      Sreenivas Bagalkote     <Sreenivas.Bagalkote@lsil.com>
@@ -55,13 +55,13 @@ static struct pci_device_id megasas_pci_table[] = {
 
         {
          PCI_VENDOR_ID_LSI_LOGIC,
-         PCI_DEVICE_ID_LSI_SAS1064R,
+         PCI_DEVICE_ID_LSI_SAS1064R, // xscale IOP
          PCI_ANY_ID,
          PCI_ANY_ID,
          },
         {
          PCI_VENDOR_ID_DELL,
-         PCI_DEVICE_ID_DELL_PERC5,
+         PCI_DEVICE_ID_DELL_PERC5, // xscale IOP
          PCI_ANY_ID,
          PCI_ANY_ID,
          },
@@ -119,12 +119,18 @@ megasas_return_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd)
         spin_unlock_irqrestore(&instance->cmd_pool_lock, flags);
 }
 
+
+/**
+*       The following functions are defined for xscale 
+*       (deviceid : 1064R, PERC5) controllers
+*/
+
 /**
- * megasas_enable_intr -        Enables interrupts
+ * megasas_enable_intr_xscale - Enables interrupts
  * @regs:                       MFI register set
  */
 static inline void
-megasas_enable_intr(struct megasas_register_set __iomem * regs)
+megasas_enable_intr_xscale(struct megasas_register_set __iomem * regs)
 {
         writel(1, &(regs)->outbound_intr_mask);
 
@@ -133,13 +139,73 @@ megasas_enable_intr(struct megasas_register_set __iomem * regs)
 }
 
 /**
+ * megasas_read_fw_status_reg_xscale - returns the current FW status value
+ * @regs:                       MFI register set
+ */
+static u32
+megasas_read_fw_status_reg_xscale(struct megasas_register_set __iomem * regs)
+{
+        return readl(&(regs)->outbound_msg_0);
+}
+/**
+ * megasas_clear_interrupt_xscale -     Check & clear interrupt
+ * @regs:                               MFI register set
+ */
+static int 
+megasas_clear_intr_xscale(struct megasas_register_set __iomem * regs)
+{
+        u32 status;
+        /*
+         * Check if it is our interrupt
+         */
+        status = readl(&regs->outbound_intr_status);
+
+        if (!(status & MFI_OB_INTR_STATUS_MASK)) {
+                return 1;
+        }
+
+        /*
+         * Clear the interrupt by writing back the same value
+         */
+        writel(status, &regs->outbound_intr_status);
+
+        return 0;
+}
+
+/**
+ * megasas_fire_cmd_xscale -    Sends command to the FW
+ * @frame_phys_addr :           Physical address of cmd
+ * @frame_count :               Number of frames for the command
+ * @regs :                      MFI register set
+ */
+static inline void 
+megasas_fire_cmd_xscale(dma_addr_t frame_phys_addr,u32 frame_count, struct megasas_register_set __iomem *regs)
+{
+        writel((frame_phys_addr >> 3)|(frame_count),
+               &(regs)->inbound_queue_port);
+}
+
+static struct megasas_instance_template megasas_instance_template_xscale = {
+
+        .fire_cmd = megasas_fire_cmd_xscale,
+        .enable_intr = megasas_enable_intr_xscale,
+        .clear_intr = megasas_clear_intr_xscale,
+        .read_fw_status_reg = megasas_read_fw_status_reg_xscale,
+};
+
+/**
+*       This is the end of set of functions & definitions specific 
+*       to xscale (deviceid : 1064R, PERC5) controllers
+*/
+
+/**
  * megasas_disable_intr -       Disables interrupts
  * @regs:                       MFI register set
  */
 static inline void
 megasas_disable_intr(struct megasas_register_set __iomem * regs)
 {
-        u32 mask = readl(&regs->outbound_intr_mask) & (~0x00000001);
+        u32 mask = 0x1f; 
         writel(mask, &regs->outbound_intr_mask);
 
         /* Dummy readl to force pci flush */
@@ -167,8 +233,7 @@ megasas_issue_polled(struct megasas_instance *instance, struct megasas_cmd *cmd)
         /*
          * Issue the frame using inbound queue port
          */
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         /*
          * Wait for cmd_status to change
@@ -198,8 +263,7 @@ megasas_issue_blocked_cmd(struct megasas_instance *instance,
 {
         cmd->cmd_status = ENODATA;
 
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         wait_event(instance->int_cmd_wait_q, (cmd->cmd_status != ENODATA));
 
@@ -242,8 +306,7 @@ megasas_issue_blocked_abort_cmd(struct megasas_instance *instance,
         cmd->sync_cmd = 1;
         cmd->cmd_status = 0xFF;
 
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         /*
          * Wait for this cmd to complete
@@ -558,112 +621,29 @@ megasas_build_ldio(struct megasas_instance *instance, struct scsi_cmnd *scp,
 }
 
 /**
- * megasas_build_cmd -  Prepares a command packet
- * @instance:           Adapter soft state
- * @scp:                SCSI command
- * @frame_count:        [OUT] Number of frames used to prepare this command
+ * megasas_is_ldio -            Checks if the cmd is for logical drive
+ * @scmd:                       SCSI command
+ *      
+ * Called by megasas_queue_command to find out if the command to be queued
+ * is a logical drive command   
  */
-static struct megasas_cmd *megasas_build_cmd(struct megasas_instance
-                                                    *instance,
-                                                    struct scsi_cmnd *scp,
-                                                    int *frame_count)
+static inline int megasas_is_ldio(struct scsi_cmnd *cmd)
 {
-        u32 logical_cmd;
-        struct megasas_cmd *cmd;
-
-        /*
-         * Find out if this is logical or physical drive command.
-         */
-        logical_cmd = MEGASAS_IS_LOGICAL(scp);
-
-        /*
-         * Logical drive command
-         */
-        if (logical_cmd) {
-
-                if (scp->device->id >= MEGASAS_MAX_LD) {
-                        scp->result = DID_BAD_TARGET << 16;
-                        return NULL;
-                }
-
-                switch (scp->cmnd[0]) {
-
-                case READ_10:
-                case WRITE_10:
-                case READ_12:
-                case WRITE_12:
-                case READ_6:
-                case WRITE_6:
-                case READ_16:
-                case WRITE_16:
-                        /*
-                         * Fail for LUN > 0
-                         */
-                        if (scp->device->lun) {
-                                scp->result = DID_BAD_TARGET << 16;
-                                return NULL;
-                        }
-
-                        cmd = megasas_get_cmd(instance);
-
-                        if (!cmd) {
-                                scp->result = DID_IMM_RETRY << 16;
-                                return NULL;
-                        }
-
-                        *frame_count = megasas_build_ldio(instance, scp, cmd);
-
-                        if (!(*frame_count)) {
-                                megasas_return_cmd(instance, cmd);
-                                return NULL;
-                        }
-
-                        return cmd;
-
-                default:
-                        /*
-                         * Fail for LUN > 0
-                         */
-                        if (scp->device->lun) {
-                                scp->result = DID_BAD_TARGET << 16;
-                                return NULL;
-                        }
-
-                        cmd = megasas_get_cmd(instance);
-
-                        if (!cmd) {
-                                scp->result = DID_IMM_RETRY << 16;
-                                return NULL;
-                        }
-
-                        *frame_count = megasas_build_dcdb(instance, scp, cmd);
-
-                        if (!(*frame_count)) {
-                                megasas_return_cmd(instance, cmd);
-                                return NULL;
-                        }
-
-                        return cmd;
-                }
-        } else {
-                cmd = megasas_get_cmd(instance);
-
-                if (!cmd) {
-                        scp->result = DID_IMM_RETRY << 16;
-                        return NULL;
-                }
-
-                *frame_count = megasas_build_dcdb(instance, scp, cmd);
-
-                if (!(*frame_count)) {
-                        megasas_return_cmd(instance, cmd);
-                        return NULL;
-                }
-
-                return cmd;
+        if (!MEGASAS_IS_LOGICAL(cmd))
+                return 0;
+        switch (cmd->cmnd[0]) {
+        case READ_10:
+        case WRITE_10:
+        case READ_12:
+        case WRITE_12:
+        case READ_6:
+        case WRITE_6:
+        case READ_16:
+        case WRITE_16:
+                return 1;
+        default:
+                return 0;
         }
-
-        return NULL;
 }
 
 /**
@@ -684,13 +664,27 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))
         scmd->scsi_done = done;
         scmd->result = 0;
 
-        cmd = megasas_build_cmd(instance, scmd, &frame_count);
-
-        if (!cmd) {
-                done(scmd);
-                return 0;
+        if (MEGASAS_IS_LOGICAL(scmd) &&
+            (scmd->device->id >= MEGASAS_MAX_LD || scmd->device->lun)) {
+                scmd->result = DID_BAD_TARGET << 16;
+                goto out_done;
         }
 
+        cmd = megasas_get_cmd(instance);
+        if (!cmd)
+                return SCSI_MLQUEUE_HOST_BUSY;
+
+        /*
+         * Logical drive command
+         */
+        if (megasas_is_ldio(scmd))
+                frame_count = megasas_build_ldio(instance, scmd, cmd);
+        else
+                frame_count = megasas_build_dcdb(instance, scmd, cmd);
+
+        if (!frame_count)
+                goto out_return_cmd;
+
         cmd->scmd = scmd;
         scmd->SCp.ptr = (char *)cmd;
         scmd->SCp.sent_command = jiffies;
@@ -702,10 +696,15 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))
         instance->fw_outstanding++;
         spin_unlock_irqrestore(&instance->instance_lock, flags);
 
-        writel(((cmd->frame_phys_addr >> 3) | (cmd->frame_count - 1)),
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,cmd->frame_count-1,instance->reg_set);
 
         return 0;
+
+ out_return_cmd:
+        megasas_return_cmd(instance, cmd);
+ out_done:
+        done(scmd);
+        return 0;
 }
 
 /**
@@ -1108,7 +1107,6 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
 static int
 megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status)
 {
-        u32 status;
         u32 producer;
         u32 consumer;
         u32 context;
@@ -1116,17 +1114,10 @@ megasas_deplete_reply_queue(struct megasas_instance *instance, u8 alt_status)
 
         /*
          * Check if it is our interrupt
+         * Clear the interrupt 
          */
-        status = readl(&instance->reg_set->outbound_intr_status);
-
-        if (!(status & MFI_OB_INTR_STATUS_MASK)) {
+        if(instance->instancet->clear_intr(instance->reg_set))
                 return IRQ_NONE;
-        }
-
-        /*
-         * Clear the interrupt by writing back the same value
-         */
-        writel(status, &instance->reg_set->outbound_intr_status);
 
         producer = *instance->producer;
         consumer = *instance->consumer;
@@ -1160,7 +1151,7 @@ static irqreturn_t megasas_isr(int irq, void *devp, struct pt_regs *regs)
 
 /**
  * megasas_transition_to_ready -        Move the FW to READY state
- * @reg_set:                            MFI register set
+ * @instance:                           Adapter soft state
  *
  * During the initialization, FW passes can potentially be in any one of
  * several possible states. If the FW in operational, waiting-for-handshake
@@ -1168,14 +1159,14 @@ static irqreturn_t megasas_isr(int irq, void *devp, struct pt_regs *regs)
  * has to wait for the ready state.
  */
 static int
-megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
+megasas_transition_to_ready(struct megasas_instance* instance)
 {
         int i;
         u8 max_wait;
         u32 fw_state;
         u32 cur_state;
 
-        fw_state = readl(&reg_set->outbound_msg_0) & MFI_STATE_MASK;
+        fw_state = instance->instancet->read_fw_status_reg(instance->reg_set) & MFI_STATE_MASK;
 
         while (fw_state != MFI_STATE_READY) {
 
@@ -1193,7 +1184,7 @@ megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
                          * Set the CLR bit in inbound doorbell
                          */
                         writel(MFI_INIT_CLEAR_HANDSHAKE,
-                               &reg_set->inbound_doorbell);
+                                &instance->reg_set->inbound_doorbell);
 
                         max_wait = 2;
                         cur_state = MFI_STATE_WAIT_HANDSHAKE;
@@ -1203,8 +1194,8 @@ megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
                         /*
                          * Bring it to READY state; assuming max wait 2 secs
                          */
-                        megasas_disable_intr(reg_set);
-                        writel(MFI_INIT_READY, &reg_set->inbound_doorbell);
+                        megasas_disable_intr(instance->reg_set);
+                        writel(MFI_INIT_READY, &instance->reg_set->inbound_doorbell);
 
                         max_wait = 10;
                         cur_state = MFI_STATE_OPERATIONAL;
@@ -1253,8 +1244,8 @@ megasas_transition_to_ready(struct megasas_register_set __iomem * reg_set)
                  * The cur_state should not last for more than max_wait secs
                  */
                 for (i = 0; i < (max_wait * 1000); i++) {
-                        fw_state = MFI_STATE_MASK &
-                            readl(&reg_set->outbound_msg_0);
+                        fw_state = instance->instancet->read_fw_status_reg(instance->reg_set) &  
+                                        MFI_STATE_MASK ;
 
                         if (fw_state == cur_state) {
                                 msleep(1);
@@ -1616,18 +1607,20 @@ static int megasas_init_mfi(struct megasas_instance *instance)
 
         reg_set = instance->reg_set;
 
+        instance->instancet = &megasas_instance_template_xscale;
+
         /*
          * We expect the FW state to be READY
          */
-        if (megasas_transition_to_ready(instance->reg_set))
+        if (megasas_transition_to_ready(instance))
                 goto fail_ready_state;
 
         /*
          * Get various operational parameters from status register
          */
-        instance->max_fw_cmds = readl(&reg_set->outbound_msg_0) & 0x00FFFF;
-        instance->max_num_sge = (readl(&reg_set->outbound_msg_0) & 0xFF0000) >>
-            0x10;
+        instance->max_fw_cmds = instance->instancet->read_fw_status_reg(reg_set) & 0x00FFFF;
+        instance->max_num_sge = (instance->instancet->read_fw_status_reg(reg_set) & 0xFF0000) >> 
+                                        0x10;
         /*
          * Create a pool of commands
          */
@@ -1936,8 +1929,7 @@ megasas_register_aen(struct megasas_instance *instance, u32 seq_num,
         /*
          * Issue the aen registration frame
          */
-        writel(cmd->frame_phys_addr >> 3,
-               &instance->reg_set->inbound_queue_port);
+        instance->instancet->fire_cmd(cmd->frame_phys_addr ,0,instance->reg_set);
 
         return 0;
 }
@@ -2126,7 +2118,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto fail_irq;
         }
 
-        megasas_enable_intr(instance->reg_set);
+        instance->instancet->enable_intr(instance->reg_set);
 
         /*
          * Store instance in PCI softstate
@@ -2681,9 +2673,8 @@ megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd,
                           unsigned long arg)
 {
         switch (cmd) {
-        case MEGASAS_IOC_FIRMWARE:{
-                        return megasas_mgmt_compat_ioctl_fw(file, arg);
-                }
+        case MEGASAS_IOC_FIRMWARE32:
+                return megasas_mgmt_compat_ioctl_fw(file, arg);
         case MEGASAS_IOC_GET_AEN:
                 return megasas_mgmt_ioctl_aen(file, arg);
         }
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index eaec9d531424..d6d166c0663f 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -18,10 +18,9 @@
 /**
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                         "00.00.02.00-rc4"
-#define MEGASAS_RELDATE                         "Sep 16, 2005"
-#define MEGASAS_EXT_VERSION                     "Fri Sep 16 12:37:08 EDT 2005"
-
+#define MEGASAS_VERSION                         "00.00.02.02"
+#define MEGASAS_RELDATE                         "Jan 23, 2006"
+#define MEGASAS_EXT_VERSION                     "Mon Jan 23 14:09:01 PST 2006"
 /*
  * =====================================
  * MegaRAID SAS MFI firmware definitions
@@ -1013,6 +1012,16 @@ struct megasas_evt_detail {
 
 } __attribute__ ((packed));
 
+ struct megasas_instance_template {
+        void (*fire_cmd)(dma_addr_t ,u32 ,struct megasas_register_set __iomem *);
+
+        void (*enable_intr)(struct megasas_register_set __iomem *) ;
+
+        int (*clear_intr)(struct megasas_register_set __iomem *);
+
+        u32 (*read_fw_status_reg)(struct megasas_register_set __iomem *);
+ };
+
 struct megasas_instance {
 
         u32 *producer;
@@ -1056,6 +1065,8 @@ struct megasas_instance {
         u32 fw_outstanding;
         u32 hw_crit_error;
         spinlock_t instance_lock;
+
+        struct megasas_instance_template *instancet;
 };
 
 #define MEGASAS_IS_LOGICAL(scp)                                         \
@@ -1125,11 +1136,10 @@ struct compat_megasas_iocpacket {
         struct compat_iovec sgl[MAX_IOCTL_SGE];
 } __attribute__ ((packed));
 
-#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct compat_megasas_iocpacket)
-#else
-#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct megasas_iocpacket)
 #endif
 
+#define MEGASAS_IOC_FIRMWARE    _IOWR('M', 1, struct megasas_iocpacket)
+#define MEGASAS_IOC_FIRMWARE32  _IOWR('M', 1, struct compat_megasas_iocpacket)
 #define MEGASAS_IOC_GET_AEN     _IOW('M', 3, struct megasas_aen)
 
 struct megasas_mgmt_info {
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 0878f95b5449..e0230249fa0f 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -17,9 +17,11 @@
 * General Public License for more details.
 *
 ******************************************************************************/
-#define QLA1280_VERSION      "3.25"
+#define QLA1280_VERSION      "3.26"
 /*****************************************************************************
     Revision History:
+    Rev  3.26, January 16, 2006 Jes Sorensen
+        - Ditch all < 2.6 support
     Rev  3.25.1, February 10, 2005 Christoph Hellwig
         - use pci_map_single to map non-S/G requests
         - remove qla1280_proc_info
@@ -356,25 +358,18 @@
 #include <asm/types.h>
 #include <asm/system.h>
 
-#if LINUX_VERSION_CODE >= 0x020545
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
-#else
-#include <linux/blk.h>
-#include "scsi.h"
-#include <scsi/scsi_host.h>
-#include "sd.h"
-#endif
 
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
 #include <asm/sn/io.h>
 #endif
 
-#if LINUX_VERSION_CODE < 0x020407
-#error "Kernels older than 2.4.7 are no longer supported"
+#if LINUX_VERSION_CODE < 0x020600
+#error "Kernels older than 2.6.0 are no longer supported"
 #endif
 
 
@@ -441,52 +436,6 @@
 
 #define NVRAM_DELAY()                   udelay(500)     /* 2 microseconds */
 
-#if LINUX_VERSION_CODE < 0x020500
-#define HOST_LOCK                       &io_request_lock
-#define irqreturn_t                     void
-#define IRQ_RETVAL(foo)
-#define MSG_ORDERED_TAG                 1
-
-#define DMA_BIDIRECTIONAL       SCSI_DATA_UNKNOWN
-#define DMA_TO_DEVICE           SCSI_DATA_WRITE
-#define DMA_FROM_DEVICE         SCSI_DATA_READ
-#define DMA_NONE                SCSI_DATA_NONE
-
-#ifndef HAVE_SECTOR_T
-typedef unsigned int sector_t;
-#endif
-
-static inline void
-scsi_adjust_queue_depth(struct scsi_device *device, int tag, int depth)
-{
-        if (tag) {
-                device->tagged_queue = tag;
-                device->current_tag = 0;
-        }
-        device->queue_depth = depth;
-}
-static inline struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *t, size_t s)
-{
-        return scsi_register(t, s);
-}
-static inline void scsi_host_put(struct Scsi_Host *h)
-{
-        scsi_unregister(h);
-}
-#else
-#define HOST_LOCK                       ha->host->host_lock
-#endif
-#if LINUX_VERSION_CODE < 0x020600
-#define DEV_SIMPLE_TAGS(device)         device->tagged_queue
-/*
- * Hack around that qla1280_remove_one is called from
- * qla1280_release in 2.4
- */
-#undef __devexit
-#define __devexit
-#else
-#define DEV_SIMPLE_TAGS(device)         device->simple_tags
-#endif
 #if defined(__ia64__) && !defined(ia64_platform_is)
 #define ia64_platform_is(foo)           (!strcmp(x, platform_name))
 #endif
@@ -506,9 +455,6 @@ static void qla1280_remove_one(struct pci_dev *);
  *  QLogic Driver Support Function Prototypes.
  */
 static void qla1280_done(struct scsi_qla_host *);
-#if LINUX_VERSION_CODE < 0x020545
-static void qla1280_get_target_options(struct scsi_cmnd *, struct scsi_qla_host *);
-#endif
 static int qla1280_get_token(char *);
 static int qla1280_setup(char *s) __init;
 
@@ -610,11 +556,7 @@ __setup("qla1280=", qla1280_setup);
 #define CMD_SNSLEN(Cmnd)        sizeof(Cmnd->sense_buffer)
 #define CMD_RESULT(Cmnd)        Cmnd->result
 #define CMD_HANDLE(Cmnd)        Cmnd->host_scribble
-#if LINUX_VERSION_CODE < 0x020545
-#define CMD_REQUEST(Cmnd)       Cmnd->request.cmd
-#else
 #define CMD_REQUEST(Cmnd)       Cmnd->request->cmd
-#endif
 
 #define CMD_HOST(Cmnd)          Cmnd->device->host
 #define SCSI_BUS_32(Cmnd)       Cmnd->device->channel
@@ -1064,10 +1006,10 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
         add_timer(&timer);
 
         /* wait for the action to complete (or the timer to expire) */
-        spin_unlock_irq(HOST_LOCK);
+        spin_unlock_irq(ha->host->host_lock);
         wait_for_completion(&wait);
         del_timer_sync(&timer);
-        spin_lock_irq(HOST_LOCK);
+        spin_lock_irq(ha->host->host_lock);
         sp->wait = NULL;
 
         /* the only action we might get a fail for is abort */
@@ -1173,96 +1115,6 @@ qla1280_biosparam(struct scsi_device *sdev, struct block_device *bdev,
         return 0;
 }
 
-#if LINUX_VERSION_CODE < 0x020600
-static int
-qla1280_detect(struct scsi_host_template *template)
-{
-        struct pci_device_id *id = &qla1280_pci_tbl[0];
-        struct pci_dev *pdev = NULL;
-        int num_hosts = 0;
-
-        if (sizeof(struct srb) > sizeof(Scsi_Pointer)) {
-                printk(KERN_WARNING
-                       "qla1280: struct srb too big, aborting\n");
-                return 0;
-        }
-
-        if ((DMA_BIDIRECTIONAL != PCI_DMA_BIDIRECTIONAL) ||
-            (DMA_TO_DEVICE != PCI_DMA_TODEVICE) ||
-            (DMA_FROM_DEVICE != PCI_DMA_FROMDEVICE) ||
-            (DMA_NONE != PCI_DMA_NONE)) {
-                printk(KERN_WARNING
-                       "qla1280: dma direction bits don't match\n");
-                return 0;
-        }
-
-#ifdef MODULE
-        /*
-         * If we are called as a module, the qla1280 pointer may not be null
-         * and it would point to our bootup string, just like on the lilo
-         * command line.  IF not NULL, then process this config string with
-         * qla1280_setup
-         *
-         * Boot time Options
-         * To add options at boot time add a line to your lilo.conf file like:
-         * append="qla1280=verbose,max_tags:{{255,255,255,255},{255,255,255,255}}"
-         * which will result in the first four devices on the first two
-         * controllers being set to a tagged queue depth of 32.
-         */
-        if (qla1280)
-                qla1280_setup(qla1280);
-#endif
-
-        /* First Initialize QLA12160 on PCI Bus 1 Dev 2 */
-        while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
-                if (pdev->bus->number == 1 && PCI_SLOT(pdev->devfn) == 2) {
-                        if (!qla1280_probe_one(pdev, id))
-                                num_hosts++;
-                }
-        }
-
-        pdev = NULL;
-        /* Try and find each different type of adapter we support */
-        for (id = &qla1280_pci_tbl[0]; id->device; id++) {
-                while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
-                        /*
-                         * skip QLA12160 already initialized on
-                         * PCI Bus 1 Dev 2 since we already initialized
-                         * and presented it
-                         */
-                        if (id->device == PCI_DEVICE_ID_QLOGIC_ISP12160 &&
-                            pdev->bus->number == 1 &&
-                            PCI_SLOT(pdev->devfn) == 2)
-                                continue;
-
-                        if (!qla1280_probe_one(pdev, id))
-                                num_hosts++;
-                }
-        }
-
-        return num_hosts;
-}
-
-/*
- * This looks a bit ugly as we could just pass down host to
- * qla1280_remove_one, but I want to keep qla1280_release purely a wrapper
- * around pci_driver::remove as used from 2.6 onwards.
- */
-static int
-qla1280_release(struct Scsi_Host *host)
-{
-        struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
-
-        qla1280_remove_one(ha->pdev);
-        return 0;
-}
-
-static int
-qla1280_biosparam_old(Disk * disk, kdev_t dev, int geom[])
-{
-        return qla1280_biosparam(disk->device, NULL, disk->capacity, geom);
-}
-#endif
  
 /* disable risc and host interrupts */
 static inline void
@@ -1295,7 +1147,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         ENTER_INTR ("qla1280_intr_handler");
         ha = (struct scsi_qla_host *)dev_id;
 
-        spin_lock(HOST_LOCK);
+        spin_lock(ha->host->host_lock);
 
         ha->isr_count++;
         reg = ha->iobase;
@@ -1311,7 +1163,7 @@ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
         if (!list_empty(&ha->done_q))
                 qla1280_done(ha);
 
-        spin_unlock(HOST_LOCK);
+        spin_unlock(ha->host->host_lock);
 
         qla1280_enable_intrs(ha);
 
@@ -1411,11 +1263,9 @@ qla1280_slave_configure(struct scsi_device *device)
                 scsi_adjust_queue_depth(device, 0, default_depth);
         }
 
-#if LINUX_VERSION_CODE > 0x020500
         nv->bus[bus].target[target].parameter.enable_sync = device->sdtr;
         nv->bus[bus].target[target].parameter.enable_wide = device->wdtr;
         nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = device->ppr;
-#endif
 
         if (driver_setup.no_sync ||
             (driver_setup.sync_mask &&
@@ -1432,38 +1282,14 @@ qla1280_slave_configure(struct scsi_device *device)
                         nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
         }
 
-        spin_lock_irqsave(HOST_LOCK, flags);
+        spin_lock_irqsave(ha->host->host_lock, flags);
         if (nv->bus[bus].target[target].parameter.enable_sync)
                 status = qla1280_set_target_parameters(ha, bus, target);
         qla1280_get_target_parameters(ha, device);
-        spin_unlock_irqrestore(HOST_LOCK, flags);
+        spin_unlock_irqrestore(ha->host->host_lock, flags);
         return status;
 }
 
-#if LINUX_VERSION_CODE < 0x020545
-/**************************************************************************
- *   qla1280_select_queue_depth
- *
- *   Sets the queue depth for each SCSI device hanging off the input
- *   host adapter.  We use a queue depth of 2 for devices that do not
- *   support tagged queueing.
- **************************************************************************/
-static void
-qla1280_select_queue_depth(struct Scsi_Host *host, struct scsi_device *sdev_q)
-{
-        struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
-        struct scsi_device *sdev;
-
-        ENTER("qla1280_select_queue_depth");
-        for (sdev = sdev_q; sdev; sdev = sdev->next)
-                if (sdev->host == host)
-                        qla1280_slave_configure(sdev);
-
-        if (sdev_q)
-                qla1280_check_for_dead_scsi_bus(ha, sdev_q->channel);
-        LEAVE("qla1280_select_queue_depth");
-}
-#endif
 
 /*
  * qla1280_done
@@ -1523,10 +1349,6 @@ qla1280_done(struct scsi_qla_host *ha)
                 CMD_HANDLE(sp->cmd) = (unsigned char *)INVALID_HANDLE;
                 ha->actthreads--;
 
-#if LINUX_VERSION_CODE < 0x020500
-                if (cmd->cmnd[0] == INQUIRY)
-                        qla1280_get_target_options(cmd, ha);
-#endif
                 (*(cmd)->scsi_done)(cmd);
 
                 if(sp->wait != NULL)
@@ -1655,9 +1477,7 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
         struct device_reg __iomem *reg;
         int status;
         int bus;
-#if LINUX_VERSION_CODE > 0x020500
         unsigned long flags;
-#endif
 
         ENTER("qla1280_initialize_adapter");
 
@@ -1695,15 +1515,12 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
                         "NVRAM\n");
         }
 
-#if LINUX_VERSION_CODE >= 0x020500
         /*
          * It's necessary to grab the spin here as qla1280_mailbox_command
          * needs to be able to drop the lock unconditionally to wait
          * for completion.
-         * In 2.4 ->detect is called with the io_request_lock held.
          */
-        spin_lock_irqsave(HOST_LOCK, flags);
-#endif
+        spin_lock_irqsave(ha->host->host_lock, flags);
 
         status = qla1280_load_firmware(ha);
         if (status) {
@@ -1735,9 +1552,8 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha)
 
         ha->flags.online = 1;
  out:
-#if LINUX_VERSION_CODE >= 0x020500
-        spin_unlock_irqrestore(HOST_LOCK, flags);
-#endif
+        spin_unlock_irqrestore(ha->host->host_lock, flags);
+
         if (status)
                 dprintk(2, "qla1280_initialize_adapter: **** FAILED ****\n");
 
@@ -2650,14 +2466,14 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb)
         timer.function = qla1280_mailbox_timeout;
         add_timer(&timer);
 
-        spin_unlock_irq(HOST_LOCK);
+        spin_unlock_irq(ha->host->host_lock);
         WRT_REG_WORD(&reg->host_cmd, HC_SET_HOST_INT);
         data = qla1280_debounce_register(&reg->istatus);
 
         wait_for_completion(&wait);
         del_timer_sync(&timer);
 
-        spin_lock_irq(HOST_LOCK);
+        spin_lock_irq(ha->host->host_lock);
 
         ha->mailbox_wait = NULL;
 
@@ -2770,9 +2586,9 @@ qla1280_bus_reset(struct scsi_qla_host *ha, int bus)
                         ha->bus_settings[bus].scsi_bus_dead = 1;
                 ha->bus_settings[bus].failed_reset_count++;
         } else {
-                spin_unlock_irq(HOST_LOCK);
+                spin_unlock_irq(ha->host->host_lock);
                 ssleep(reset_delay);
-                spin_lock_irq(HOST_LOCK);
+                spin_lock_irq(ha->host->host_lock);
 
                 ha->bus_settings[bus].scsi_bus_dead = 0;
                 ha->bus_settings[bus].failed_reset_count = 0;
@@ -3078,7 +2894,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                 (SCSI_TCN_32(cmd) | BIT_7) : SCSI_TCN_32(cmd);
 
         /* Enable simple tag queuing if device supports it. */
-        if (DEV_SIMPLE_TAGS(cmd->device))
+        if (cmd->device->simple_tags)
                 pkt->control_flags |= cpu_to_le16(BIT_3);
 
         /* Load SCSI command packet. */
@@ -3377,7 +3193,7 @@ qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
                 (SCSI_TCN_32(cmd) | BIT_7) : SCSI_TCN_32(cmd);
 
         /* Enable simple tag queuing if device supports it. */
-        if (DEV_SIMPLE_TAGS(cmd->device))
+        if (cmd->device->simple_tags)
                 pkt->control_flags |= cpu_to_le16(BIT_3);
 
         /* Load SCSI command packet. */
@@ -3889,50 +3705,6 @@ qla1280_rst_aen(struct scsi_qla_host *ha)
 }
 
 
-#if LINUX_VERSION_CODE < 0x020500
-/*
- *
- */
-static void
-qla1280_get_target_options(struct scsi_cmnd *cmd, struct scsi_qla_host *ha)
-{
-        unsigned char *result;
-        struct nvram *n;
-        int bus, target, lun;
-
-        bus = SCSI_BUS_32(cmd);
-        target = SCSI_TCN_32(cmd);
-        lun = SCSI_LUN_32(cmd);
-
-        /*
-         * Make sure to not touch anything if someone is using the
-         * sg interface.
-         */
-        if (cmd->use_sg || (CMD_RESULT(cmd) >> 16) != DID_OK || lun)
-                return;
-
-        result = cmd->request_buffer;
-        n = &ha->nvram;
-
-        n->bus[bus].target[target].parameter.enable_wide = 0;
-        n->bus[bus].target[target].parameter.enable_sync = 0;
-        n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
-
-        if (result[7] & 0x60)
-                n->bus[bus].target[target].parameter.enable_wide = 1;
-        if (result[7] & 0x10)
-                n->bus[bus].target[target].parameter.enable_sync = 1;
-        if ((result[2] >= 3) && (result[4] + 5 > 56) &&
-            (result[56] & 0x4))
-                n->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 1;
-
-        dprintk(2, "get_target_options(): wide %i, sync %i, ppr %i\n",
-                n->bus[bus].target[target].parameter.enable_wide,
-                n->bus[bus].target[target].parameter.enable_sync,
-                n->bus[bus].target[target].ppr_1x160.flags.enable_ppr);
-}
-#endif
-
 /*
  *  qla1280_status_entry
  *      Processes received ISP status entry.
@@ -4271,7 +4043,7 @@ qla1280_get_target_parameters(struct scsi_qla_host *ha,
         } else
                 printk(" Async");
 
-        if (DEV_SIMPLE_TAGS(device))
+        if (device->simple_tags)
                 printk(", Tagged queuing: depth %d", device->queue_depth);
         printk("\n");
 }
@@ -4485,7 +4257,7 @@ qla1280_get_token(char *str)
         return ret;
 }
 
-#if LINUX_VERSION_CODE >= 0x020600
+
 static struct scsi_host_template qla1280_driver_template = {
         .module                 = THIS_MODULE,
         .proc_name              = "qla1280",
@@ -4504,27 +4276,7 @@ static struct scsi_host_template qla1280_driver_template = {
         .cmd_per_lun            = 1,
         .use_clustering         = ENABLE_CLUSTERING,
 };
-#else
-static struct scsi_host_template qla1280_driver_template = {
-        .proc_name              = "qla1280",
-        .name                   = "Qlogic ISP 1280/12160",
-        .detect                 = qla1280_detect,
-        .release                = qla1280_release,
-        .info                   = qla1280_info,
-        .queuecommand           = qla1280_queuecommand,
-        .eh_abort_handler       = qla1280_eh_abort,
-        .eh_device_reset_handler= qla1280_eh_device_reset,
-        .eh_bus_reset_handler   = qla1280_eh_bus_reset,
-        .eh_host_reset_handler  = qla1280_eh_adapter_reset,
-        .bios_param             = qla1280_biosparam_old,
-        .can_queue              = 0xfffff,
-        .this_id                = -1,
-        .sg_tablesize           = SG_ALL,
-        .cmd_per_lun            = 1,
-        .use_clustering         = ENABLE_CLUSTERING,
-        .use_new_eh_code        = 1,
-};
-#endif
+
 
 static int __devinit
 qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
@@ -4615,10 +4367,6 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         host->max_sectors = 1024;
         host->unique_id = host->host_no;
 
-#if LINUX_VERSION_CODE < 0x020545
-        host->select_queue_depths = qla1280_select_queue_depth;
-#endif
-
         error = -ENODEV;
 
 #if MEMORY_MAPPED_IO
@@ -4666,21 +4414,15 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         pci_set_drvdata(pdev, host);
 
-#if LINUX_VERSION_CODE >= 0x020600
         error = scsi_add_host(host, &pdev->dev);
         if (error)
                 goto error_disable_adapter;
         scsi_scan_host(host);
-#else
-        scsi_set_pci_device(host, pdev);
-#endif
 
         return 0;
 
-#if LINUX_VERSION_CODE >= 0x020600
  error_disable_adapter:
         qla1280_disable_intrs(ha);
-#endif
  error_free_irq:
         free_irq(pdev->irq, ha);
  error_release_region:
@@ -4712,9 +4454,7 @@ qla1280_remove_one(struct pci_dev *pdev)
         struct Scsi_Host *host = pci_get_drvdata(pdev);
         struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
 
-#if LINUX_VERSION_CODE >= 0x020600
         scsi_remove_host(host);
-#endif
 
         qla1280_disable_intrs(ha);
 
@@ -4738,7 +4478,6 @@ qla1280_remove_one(struct pci_dev *pdev)
         scsi_host_put(host);
 }
 
-#if LINUX_VERSION_CODE >= 0x020600
 static struct pci_driver qla1280_pci_driver = {
         .name           = "qla1280",
         .id_table       = qla1280_pci_tbl,
@@ -4784,10 +4523,6 @@ qla1280_exit(void)
 module_init(qla1280_init);
 module_exit(qla1280_exit);
 
-#else
-# define driver_template qla1280_driver_template
-# include "scsi_module.c"
-#endif
 
 MODULE_AUTHOR("Qlogic & Jes Sorensen");
 MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver");
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 79d8a914f9d0..bad066e5772a 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1680,7 +1680,8 @@ typedef struct fc_port {
         uint8_t mp_byte;                /* multi-path byte (not used) */
         uint8_t cur_path;               /* current path id */
 
-        struct fc_rport *rport;
+        spinlock_t rport_lock;
+        struct fc_rport *rport, *drport;
         u32 supported_classes;
         struct work_struct rport_add_work;
         struct work_struct rport_del_work;
@@ -2270,6 +2271,7 @@ typedef struct scsi_qla_host {
 #define LOOP_RESET_NEEDED       24
 #define BEACON_BLINK_NEEDED     25
 #define REGISTER_FDMI_NEEDED    26
+#define FCPORT_UPDATE_NEEDED    27
 
         uint32_t        device_flags;
 #define DFLG_LOCAL_DEVICES              BIT_0
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 32be4c14cccb..35266bd5d538 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -47,9 +47,11 @@ extern int qla2x00_local_device_login(scsi_qla_host_t *, uint16_t);
 extern void qla2x00_restart_queues(scsi_qla_host_t *, uint8_t);
 
 extern void qla2x00_rescan_fcports(scsi_qla_host_t *);
+extern void qla2x00_update_fcports(scsi_qla_host_t *);
 
 extern int qla2x00_abort_isp(scsi_qla_host_t *);
 
+extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);
 extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *);
 
 /*
@@ -70,8 +72,8 @@ extern char *qla2x00_get_fw_version_str(struct scsi_qla_host *, char *);
 
 extern void qla2x00_cmd_timeout(srb_t *);
 
-extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int);
-extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *);
+extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *, int, int);
+extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *, int);
 
 extern void qla2x00_blink_led(scsi_qla_host_t *);
 
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a91fea69ad63..e67bb0997818 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -32,7 +32,6 @@ static int qla2x00_fw_ready(scsi_qla_host_t *);
 static int qla2x00_configure_hba(scsi_qla_host_t *);
 static int qla2x00_configure_loop(scsi_qla_host_t *);
 static int qla2x00_configure_local_loop(scsi_qla_host_t *);
-static void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);
 static int qla2x00_configure_fabric(scsi_qla_host_t *);
 static int qla2x00_find_all_fabric_devs(scsi_qla_host_t *, struct list_head *);
 static int qla2x00_device_resync(scsi_qla_host_t *);
@@ -1688,10 +1687,16 @@ static void
 qla2x00_rport_del(void *data)
 {
         fc_port_t *fcport = data;
+        struct fc_rport *rport;
+        unsigned long flags;
+
+        spin_lock_irqsave(&fcport->rport_lock, flags);
+        rport = fcport->drport;
+        fcport->drport = NULL;
+        spin_unlock_irqrestore(&fcport->rport_lock, flags);
+        if (rport)
+                fc_remote_port_delete(rport);
 
-        if (fcport->rport)
-                fc_remote_port_delete(fcport->rport);
-        fcport->rport = NULL;
 }
 
 /**
@@ -1719,6 +1724,7 @@ qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags)
         atomic_set(&fcport->state, FCS_UNCONFIGURED);
         fcport->flags = FCF_RLC_SUPPORT;
         fcport->supported_classes = FC_COS_UNSPECIFIED;
+        spin_lock_init(&fcport->rport_lock);
         INIT_WORK(&fcport->rport_add_work, qla2x00_rport_add, fcport);
         INIT_WORK(&fcport->rport_del_work, qla2x00_rport_del, fcport);
 
@@ -2008,7 +2014,7 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha)
 {
         fc_port_t       *fcport;
 
-        qla2x00_mark_all_devices_lost(ha);
+        qla2x00_mark_all_devices_lost(ha, 0);
         list_for_each_entry(fcport, &ha->fcports, list) {
                 if (fcport->port_type != FCT_TARGET)
                         continue;
@@ -2032,13 +2038,9 @@ qla2x00_probe_for_all_luns(scsi_qla_host_t *ha)
  * Context:
  *      Kernel context.
  */
-static void
+void
 qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
-        uint16_t        index;
-        unsigned long flags;
-        srb_t *sp;
-
         fcport->ha = ha;
         fcport->login_retry = 0;
         fcport->port_login_retry_count = ha->port_down_retry_count *
@@ -2047,28 +2049,6 @@ qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
             PORT_RETRY_TIME);
         fcport->flags &= ~FCF_LOGIN_NEEDED;
 
-        /*
-         * Check for outstanding cmd on tape Bypass LUN discovery if active
-         * command on tape.
-         */
-        if (fcport->flags & FCF_TAPE_PRESENT) {
-                spin_lock_irqsave(&ha->hardware_lock, flags);
-                for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
-                        fc_port_t *sfcp;
-
-                        if ((sp = ha->outstanding_cmds[index]) != 0) {
-                                sfcp = sp->fcport;
-                                if (sfcp == fcport) {
-                                        atomic_set(&fcport->state, FCS_ONLINE);
-                                        spin_unlock_irqrestore(
-                                            &ha->hardware_lock, flags);
-                                        return;
-                                }
-                        }
-                }
-                spin_unlock_irqrestore(&ha->hardware_lock, flags);
-        }
-
         if (fcport->port_type == FCT_INITIATOR ||
             fcport->port_type == FCT_BROADCAST)
                 fcport->device_type = TYPE_PROCESSOR;
@@ -2084,24 +2064,29 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
         struct fc_rport_identifiers rport_ids;
         struct fc_rport *rport;
+        unsigned long flags;
 
-        if (fcport->rport) {
-                fc_remote_port_delete(fcport->rport);
-                fcport->rport = NULL;
-        }
+        if (fcport->drport)
+                qla2x00_rport_del(fcport);
+        if (fcport->rport)
+                return;
 
         rport_ids.node_name = wwn_to_u64(fcport->node_name);
         rport_ids.port_name = wwn_to_u64(fcport->port_name);
         rport_ids.port_id = fcport->d_id.b.domain << 16 |
             fcport->d_id.b.area << 8 | fcport->d_id.b.al_pa;
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
-        fcport->rport = rport = fc_remote_port_add(ha->host, 0, &rport_ids);
+        rport = fc_remote_port_add(ha->host, 0, &rport_ids);
         if (!rport) {
                 qla_printk(KERN_WARNING, ha,
                     "Unable to allocate fc remote port!\n");
                 return;
         }
+        spin_lock_irqsave(&fcport->rport_lock, flags);
+        fcport->rport = rport;
         *((fc_port_t **)rport->dd_data) = fcport;
+        spin_unlock_irqrestore(&fcport->rport_lock, flags);
+
         rport->supported_classes = fcport->supported_classes;
 
         rport_ids.roles = FC_RPORT_ROLE_UNKNOWN;
@@ -2217,12 +2202,11 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)
 
                         if (atomic_read(&fcport->state) == FCS_DEVICE_LOST) {
                                 qla2x00_mark_device_lost(ha, fcport,
-                                    ql2xplogiabsentdevice);
+                                    ql2xplogiabsentdevice, 0);
                                 if (fcport->loop_id != FC_NO_LOOP_ID &&
                                     (fcport->flags & FCF_TAPE_PRESENT) == 0 &&
                                     fcport->port_type != FCT_INITIATOR &&
                                     fcport->port_type != FCT_BROADCAST) {
-
                                         ha->isp_ops.fabric_logout(ha,
                                             fcport->loop_id,
                                             fcport->d_id.b.domain,
@@ -2694,7 +2678,8 @@ qla2x00_device_resync(scsi_qla_host_t *ha)
                         if (atomic_read(&fcport->state) == FCS_ONLINE) {
                                 if (format != 3 ||
                                     fcport->port_type != FCT_INITIATOR) {
-                                        qla2x00_mark_device_lost(ha, fcport, 0);
+                                        qla2x00_mark_device_lost(ha, fcport,
+                                            0, 0);
                                 }
                         }
                         fcport->flags &= ~FCF_FARP_DONE;
@@ -2741,8 +2726,7 @@ qla2x00_fabric_dev_login(scsi_qla_host_t *ha, fc_port_t *fcport,
                         ha->isp_ops.fabric_logout(ha, fcport->loop_id,
                             fcport->d_id.b.domain, fcport->d_id.b.area,
                             fcport->d_id.b.al_pa);
-                        qla2x00_mark_device_lost(ha, fcport, 1);
-
+                        qla2x00_mark_device_lost(ha, fcport, 1, 0);
                 } else {
                         qla2x00_update_fcport(ha, fcport);
                 }
@@ -2855,7 +2839,7 @@ qla2x00_fabric_login(scsi_qla_host_t *ha, fc_port_t *fcport,
                         ha->isp_ops.fabric_logout(ha, fcport->loop_id,
                             fcport->d_id.b.domain, fcport->d_id.b.area,
                             fcport->d_id.b.al_pa);
-                        qla2x00_mark_device_lost(ha, fcport, 1);
+                        qla2x00_mark_device_lost(ha, fcport, 1, 0);
 
                         rval = 1;
                         break;
@@ -2990,6 +2974,17 @@ qla2x00_rescan_fcports(scsi_qla_host_t *ha)
         qla2x00_probe_for_all_luns(ha);
 }
 
+void
+qla2x00_update_fcports(scsi_qla_host_t *ha)
+{
+        fc_port_t *fcport;
+
+        /* Go with deferred removal of rport references. */
+        list_for_each_entry(fcport, &ha->fcports, list)
+                if (fcport->drport)
+                        qla2x00_rport_del(fcport);
+}
+
 /*
 *  qla2x00_abort_isp
 *      Resets ISP and aborts all outstanding commands.
@@ -3019,7 +3014,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                 atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
                 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                         atomic_set(&ha->loop_state, LOOP_DOWN);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 0);
                 } else {
                         if (!atomic_read(&ha->loop_down_timer))
                                 atomic_set(&ha->loop_down_timer,
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index f63af081d4ff..71a46fcee8cc 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -389,7 +389,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                         atomic_set(&ha->loop_state, LOOP_DOWN);
                         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
@@ -432,7 +432,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                         atomic_set(&ha->loop_state, LOOP_DOWN);
                         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
                         ha->device_flags |= DFLG_NO_CABLE;
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 ha->flags.management_server_logged_in = 0;
@@ -453,7 +453,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                 if (atomic_read(&ha->loop_state) != LOOP_DOWN) {
                         atomic_set(&ha->loop_state, LOOP_DOWN);
                         atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
@@ -482,7 +482,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                         if (!atomic_read(&ha->loop_down_timer))
                                 atomic_set(&ha->loop_down_timer,
                                     LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags))) {
@@ -506,7 +506,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                         if (!atomic_read(&ha->loop_down_timer))
                                 atomic_set(&ha->loop_down_timer,
                                     LOOP_DOWN_TIME);
-                        qla2x00_mark_all_devices_lost(ha);
+                        qla2x00_mark_all_devices_lost(ha, 1);
                 }
 
                 set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
@@ -580,7 +580,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                  */
                 atomic_set(&ha->loop_state, LOOP_UP);
 
-                qla2x00_mark_all_devices_lost(ha);
+                qla2x00_mark_all_devices_lost(ha, 1);
 
                 ha->flags.rscn_queue_overflow = 1;
 
@@ -1091,7 +1091,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 
                 cp->result = DID_BUS_BUSY << 16;
                 if (atomic_read(&fcport->state) == FCS_ONLINE) {
-                        qla2x00_mark_device_lost(ha, fcport, 1);
+                        qla2x00_mark_device_lost(ha, fcport, 1, 1);
                 }
                 break;
 
@@ -1135,7 +1135,7 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
 
                 /* Check to see if logout occurred. */
                 if ((le16_to_cpu(sts->status_flags) & SF_LOGOUT_SENT))
-                        qla2x00_mark_device_lost(ha, fcport, 1);
+                        qla2x00_mark_device_lost(ha, fcport, 1, 1);
                 break;
 
         case CS_QUEUE_FULL:
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 4916847d84ec..5866a7c706a8 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -756,7 +756,7 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
                 if (ret == SUCCESS) {
                         if (fcport->flags & FC_FABRIC_DEVICE) {
                                 ha->isp_ops.fabric_logout(ha, fcport->loop_id);
-                                qla2x00_mark_device_lost(ha, fcport);
+                                qla2x00_mark_device_lost(ha, fcport, 0, 0);
                         }
                 }
 #endif
@@ -1642,6 +1642,31 @@ qla2x00_free_device(scsi_qla_host_t *ha)
         pci_disable_device(ha->pdev);
 }
 
+static inline void
+qla2x00_schedule_rport_del(struct scsi_qla_host *ha, fc_port_t *fcport,
+    int defer)
+{
+        unsigned long flags;
+        struct fc_rport *rport;
+
+        if (!fcport->rport)
+                return;
+
+        rport = fcport->rport;
+        if (defer) {
+                spin_lock_irqsave(&fcport->rport_lock, flags);
+                fcport->drport = rport;
+                fcport->rport = NULL;
+                spin_unlock_irqrestore(&fcport->rport_lock, flags);
+                set_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags);
+        } else {
+                spin_lock_irqsave(&fcport->rport_lock, flags);
+                fcport->rport = NULL;
+                spin_unlock_irqrestore(&fcport->rport_lock, flags);
+                fc_remote_port_delete(rport);
+        }
+}
+
 /*
  * qla2x00_mark_device_lost Updates fcport state when device goes offline.
  *
@@ -1652,10 +1677,10 @@ qla2x00_free_device(scsi_qla_host_t *ha)
  * Context:
  */
 void qla2x00_mark_device_lost(scsi_qla_host_t *ha, fc_port_t *fcport,
-    int do_login)
+    int do_login, int defer)
 {
-        if (atomic_read(&fcport->state) == FCS_ONLINE && fcport->rport)
-                schedule_work(&fcport->rport_del_work);
+        if (atomic_read(&fcport->state) == FCS_ONLINE)
+                qla2x00_schedule_rport_del(ha, fcport, defer);
 
         /*
          * We may need to retry the login, so don't change the state of the
@@ -1702,7 +1727,7 @@ void qla2x00_mark_device_lost(scsi_qla_host_t *ha, fc_port_t *fcport,
  * Context:
  */
 void
-qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha)
+qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha, int defer)
 {
         fc_port_t *fcport;
 
@@ -1716,10 +1741,13 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha)
                  */
                 if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD)
                         continue;
-                if (atomic_read(&fcport->state) == FCS_ONLINE && fcport->rport)
-                        schedule_work(&fcport->rport_del_work);
+                if (atomic_read(&fcport->state) == FCS_ONLINE)
+                        qla2x00_schedule_rport_del(ha, fcport, defer);
                 atomic_set(&fcport->state, FCS_DEVICE_LOST);
         }
+
+        if (defer && ha->dpc_wait && !ha->dpc_active)
+                up(ha->dpc_wait);
 }
 
 /*
@@ -2161,6 +2189,9 @@ qla2x00_do_dpc(void *data)
                             ha->host_no));
                 }
 
+                if (test_and_clear_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags))
+                        qla2x00_update_fcports(ha);
+
                 if (test_and_clear_bit(LOOP_RESET_NEEDED, &ha->dpc_flags)) {
                         DEBUG(printk("scsi(%ld): dpc: sched loop_reset()\n",
                             ha->host_no));
@@ -2219,13 +2250,8 @@ qla2x00_do_dpc(void *data)
                                                 DEBUG(printk("scsi(%ld): port login OK: logged in ID 0x%x\n",
                                                     ha->host_no, fcport->loop_id));
 
-                                                fcport->port_login_retry_count =
-                                                    ha->port_down_retry_count * PORT_RETRY_TIME;
-                                                atomic_set(&fcport->state, FCS_ONLINE);
-                                                atomic_set(&fcport->port_down_timer,
-                                                    ha->port_down_retry_count * PORT_RETRY_TIME);
-
-                                                fcport->login_retry = 0;
+                                                qla2x00_update_fcport(ha,
+                                                    fcport);
                                         } else if (status == 1) {
                                                 set_bit(RELOGIN_NEEDED, &ha->dpc_flags);
                                                 /* retry the login again */
@@ -2469,6 +2495,7 @@ qla2x00_timer(scsi_qla_host_t *ha)
         if ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) ||
             test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) ||
             test_bit(LOOP_RESET_NEEDED, &ha->dpc_flags) ||
+            test_bit(FCPORT_UPDATE_NEEDED, &ha->dpc_flags) ||
             start_dpc ||
             test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags) ||
             test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) ||
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 245ca99a641e..c551bb84dbfb 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -1245,7 +1245,7 @@ static int __init init_scsi(void)
         if (error)
                 goto cleanup_sysctl;
 
-        for (i = 0; i < NR_CPUS; i++)
+        for_each_cpu(i)
                 INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
 
         devfs_mk_dir("scsi");
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a2333d2c7af0..5cc97b721661 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1350,7 +1350,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev)
         cmnd[4] = SCSI_REMOVAL_PREVENT;
         cmnd[5] = 0;
 
-        scsi_execute_async(sdev, cmnd, DMA_NONE, NULL, 0, 0, 10 * HZ,
+        scsi_execute_async(sdev, cmnd, 6, DMA_NONE, NULL, 0, 0, 10 * HZ,
                            5, NULL, NULL, GFP_KERNEL);
 }
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 3574ba935af8..4a602853a98e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -436,6 +436,7 @@ free_bios:
  * scsi_execute_async - insert request
  * @sdev:       scsi device
  * @cmd:        scsi command
+ * @cmd_len:    length of scsi cdb
  * @data_direction: data direction
  * @buffer:     data buffer (this can be a kernel buffer or scatterlist)
  * @bufflen:    len of buffer
@@ -445,7 +446,7 @@ free_bios:
  * @flags:      or into request flags
  **/
 int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
-                       int data_direction, void *buffer, unsigned bufflen,
+                       int cmd_len, int data_direction, void *buffer, unsigned bufflen,
                        int use_sg, int timeout, int retries, void *privdata,
                        void (*done)(void *, char *, int, int), gfp_t gfp)
 {
@@ -472,7 +473,7 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
         if (err)
                 goto free_req;
 
-        req->cmd_len = COMMAND_SIZE(cmd[0]);
+        req->cmd_len = cmd_len;
         memcpy(req->cmd, cmd, req->cmd_len);
         req->sense = sioc->sense;
         req->sense_len = 0;
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index a3e0b7bc2d7b..210dab5879fa 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -377,7 +377,7 @@ static void sas_phy_release(struct device *dev)
 /**
  * sas_phy_alloc  --  allocates and initialize a SAS PHY structure
  * @parent:     Parent device
- * @number:     Port number
+ * @number:     Phy index
  *
  * Allocates an SAS PHY structure.  It will be added in the device tree
  * below the device specified by @parent, which has to be either a Scsi_Host
@@ -595,8 +595,8 @@ struct sas_rphy *sas_rphy_alloc(struct sas_phy *parent)
         device_initialize(&rphy->dev);
         rphy->dev.parent = get_device(&parent->dev);
         rphy->dev.release = sas_rphy_release;
-        sprintf(rphy->dev.bus_id, "rphy-%d:%d",
-                shost->host_no, parent->number);
+        sprintf(rphy->dev.bus_id, "rphy-%d:%d-%d",
+                shost->host_no, parent->port_identifier, parent->number);
         transport_setup_device(&rphy->dev);
 
         return rphy;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 78aad9582bcf..7d0700091f3d 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -741,7 +741,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
         hp->duration = jiffies_to_msecs(jiffies);
 /* Now send everything of to mid-level. The next time we hear about this
    packet is when sg_cmd_done() is called (i.e. a callback). */
-        if (scsi_execute_async(sdp->device, cmnd, data_dir, srp->data.buffer,
+        if (scsi_execute_async(sdp->device, cmnd, hp->cmd_len, data_dir, srp->data.buffer,
                                 hp->dxfer_len, srp->data.k_use_sg, timeout,
                                 SG_DEFAULT_RETRIES, srp, sg_cmd_done,
                                 GFP_ATOMIC)) {
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 13b1d3aac265..7f96f33c1bb1 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -508,7 +508,7 @@ st_do_scsi(struct st_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd
         STp->buffer->cmdstat.have_sense = 0;
         STp->buffer->syscall_result = 0;
 
-        if (scsi_execute_async(STp->device, cmd, direction,
+        if (scsi_execute_async(STp->device, cmd, COMMAND_SIZE(cmd[0]), direction,
                         &((STp->buffer)->sg[0]), bytes, (STp->buffer)->sg_segs,
                                timeout, retries, SRpnt, st_sleep_done, GFP_KERNEL)) {
                 /* could not allocate the buffer or request was too large */
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 221999bcf8fe..7aef7518b0d1 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -366,7 +366,7 @@ static struct uart_port serial21285_port = {
         .irq            = NO_IRQ,
         .fifosize       = 16,
         .ops            = &serial21285_ops,
-        .flags          = ASYNC_BOOT_AUTOCONF,
+        .flags          = UPF_BOOT_AUTOCONF,
 };
 
 static void serial21285_setup_ports(void)
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index bc36edff2058..179c1f065e60 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -31,7 +31,6 @@
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/sysrq.h>
-#include <linux/mca.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/tty.h>
@@ -2027,12 +2026,6 @@ static void serial8250_config_port(struct uart_port *port, int flags)
         int ret;
 
         /*
-         * Don't probe for MCA ports on non-MCA machines.
-         */
-        if (up->port.flags & UPF_BOOT_ONLYMCA && !MCA_bus)
-                return;
-
-        /*
          * Find the region that we can probe for.  This in turn
          * tells us whether we can probe for the type of port.
          */
@@ -2164,7 +2157,7 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev)
 /*
  *      Wait for transmitter & holding register to empty
  */
-static inline void wait_for_xmitr(struct uart_8250_port *up)
+static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
 {
         unsigned int status, tmout = 10000;
 
@@ -2178,7 +2171,7 @@ static inline void wait_for_xmitr(struct uart_8250_port *up)
                 if (--tmout == 0)
                         break;
                 udelay(1);
-        } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
+        } while ((status & bits) != bits);
 
         /* Wait up to 1s for flow control if necessary */
         if (up->port.flags & UPF_CONS_FLOW) {
@@ -2218,7 +2211,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
          *      Now, do each character
          */
         for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up);
+                wait_for_xmitr(up, UART_LSR_THRE);
 
                 /*
                  *      Send the character out.
@@ -2226,7 +2219,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
                  */
                 serial_out(up, UART_TX, *s);
                 if (*s == 10) {
-                        wait_for_xmitr(up);
+                        wait_for_xmitr(up, UART_LSR_THRE);
                         serial_out(up, UART_TX, 13);
                 }
         }
@@ -2235,8 +2228,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
          *      Finally, wait for transmitter to become empty
          *      and restore the IER
          */
-        wait_for_xmitr(up);
-        serial_out(up, UART_IER, ier);
+        wait_for_xmitr(up, BOTH_EMPTY);
+        serial_out(up, UART_IER, ier | UART_IER_THRI);
 }
 
 static int serial8250_console_setup(struct console *co, char *options)
diff --git a/drivers/serial/8250_acpi.c b/drivers/serial/8250_acpi.c
index a802bdce6e5d..809f89ab965c 100644
--- a/drivers/serial/8250_acpi.c
+++ b/drivers/serial/8250_acpi.c
@@ -27,7 +27,7 @@ struct serial_private {
 static acpi_status acpi_serial_mmio(struct uart_port *port,
                                     struct acpi_resource_address64 *addr)
 {
-        port->mapbase = addr->min_address_range;
+        port->mapbase = addr->minimum;
         port->iotype = UPIO_MEM;
         port->flags |= UPF_IOREMAP;
         return AE_OK;
@@ -36,8 +36,8 @@ static acpi_status acpi_serial_mmio(struct uart_port *port,
 static acpi_status acpi_serial_port(struct uart_port *port,
                                     struct acpi_resource_io *io)
 {
-        if (io->range_length) {
-                port->iobase = io->min_base_address;
+        if (io->address_length) {
+                port->iobase = io->minimum;
                 port->iotype = UPIO_PORT;
         } else
                 printk(KERN_ERR "%s: zero-length IO port range?\n", __FUNCTION__);
@@ -45,13 +45,13 @@ static acpi_status acpi_serial_port(struct uart_port *port,
 }
 
 static acpi_status acpi_serial_ext_irq(struct uart_port *port,
-                                       struct acpi_resource_ext_irq *ext_irq)
+                                       struct acpi_resource_extended_irq *ext_irq)
 {
         int rc;
 
-        if (ext_irq->number_of_interrupts > 0) {
+        if (ext_irq->interrupt_count > 0) {
                 rc = acpi_register_gsi(ext_irq->interrupts[0],
-                           ext_irq->edge_level, ext_irq->active_high_low);
+                           ext_irq->triggering, ext_irq->polarity);
                 if (rc < 0)
                         return AE_ERROR;
                 port->irq = rc;
@@ -64,9 +64,9 @@ static acpi_status acpi_serial_irq(struct uart_port *port,
 {
         int rc;
 
-        if (irq->number_of_interrupts > 0) {
+        if (irq->interrupt_count > 0) {
                 rc = acpi_register_gsi(irq->interrupts[0],
-                           irq->edge_level, irq->active_high_low);
+                           irq->triggering, irq->polarity);
                 if (rc < 0)
                         return AE_ERROR;
                 port->irq = rc;
@@ -83,11 +83,11 @@ static acpi_status acpi_serial_resource(struct acpi_resource *res, void *data)
         status = acpi_resource_to_address64(res, &addr);
         if (ACPI_SUCCESS(status))
                 return acpi_serial_mmio(port, &addr);
-        else if (res->id == ACPI_RSTYPE_IO)
+        else if (res->type == ACPI_RESOURCE_TYPE_IO)
                 return acpi_serial_port(port, &res->data.io);
-        else if (res->id == ACPI_RSTYPE_EXT_IRQ)
+        else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ)
                 return acpi_serial_ext_irq(port, &res->data.extended_irq);
-        else if (res->id == ACPI_RSTYPE_IRQ)
+        else if (res->type == ACPI_RESOURCE_TYPE_IRQ)
                 return acpi_serial_irq(port, &res->data.irq);
         return AE_OK;
 }
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 2a912153321e..bb9ec28ccc2b 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -439,6 +439,20 @@ static int pci_siig_init(struct pci_dev *dev)
         return -ENODEV;
 }
 
+static int pci_siig_setup(struct serial_private *priv,
+                          struct pciserial_board *board,
+                          struct uart_port *port, int idx)
+{
+        unsigned int bar = FL_GET_BASE(board->flags) + idx, offset = 0;
+
+        if (idx > 3) {
+                bar = 4;
+                offset = (idx - 4) * 8;
+        }
+
+        return setup_port(priv, port, bar, offset, 0);
+}
+
 /*
  * Timedia has an explosion of boards, and to avoid the PCI table from
  * growing *huge*, we use this function to collapse some 70 entries
@@ -748,7 +762,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
                 .subvendor      = PCI_ANY_ID,
                 .subdevice      = PCI_ANY_ID,
                 .init           = pci_siig_init,
-                .setup          = pci_default_setup,
+                .setup          = pci_siig_setup,
         },
         /*
          * Titan cards
@@ -2141,6 +2155,15 @@ static struct pci_device_id serial_pci_tbl[] = {
         {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_20x_850,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                 pbn_b0_bt_4_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_550,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_8_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_650,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_8_921600 },
+        {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_850,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_bt_8_921600 },
 
         /*
          * Computone devices submitted by Doug McNash dmcnash@computone.com
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 9fd1925de361..0f4361c8466b 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -23,7 +23,7 @@ config SERIAL_8250
           work.)
 
           To compile this driver as a module, choose M here: the
-          module will be called serial.
+          module will be called 8250.
           [WARNING: Do not compile this driver as a module if you are using
           non-standard serial ports, since the configuration information will
           be lost when the driver is unloaded.  This limitation may be lifted
@@ -98,6 +98,7 @@ config SERIAL_8250_NR_UARTS
 config SERIAL_8250_RUNTIME_UARTS
         int "Number of 8250/16550 serial ports to register at runtime"
         depends on SERIAL_8250
+        range 0 SERIAL_8250_NR_UARTS
         default "4"
         help
           Set this to the maximum number of serial ports you want
@@ -892,20 +893,20 @@ config SERIAL_VR41XX_CONSOLE
           a console on a serial port, say Y.  Otherwise, say N.
 
 config SERIAL_JSM
-        tristate "Digi International NEO PCI Support"
-        depends on PCI && BROKEN
-        select SERIAL_CORE
-        help
-          This is a driver for Digi International's Neo series
-          of cards which provide multiple serial ports. You would need
-          something like this to connect more than two modems to your Linux
-          box, for instance in order to become a dial-in server. This driver
-          supports PCI boards only.
-          If you have a card like this, say Y here and read the file
-          <file:Documentation/jsm.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called jsm.
+        tristate "Digi International NEO PCI Support"
+        depends on PCI
+        select SERIAL_CORE
+        help
+          This is a driver for Digi International's Neo series
+          of cards which provide multiple serial ports. You would need
+          something like this to connect more than two modems to your Linux
+          box, for instance in order to become a dial-in server. This driver
+          supports PCI boards only.
+          If you have a card like this, say Y here and read the file
+          <file:Documentation/jsm.txt>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called jsm.
 
 config SERIAL_SGI_IOC4
         tristate "SGI IOC4 controller serial support"
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 3490022e9fdc..429de2723a1c 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -566,7 +566,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
                         .uartclk        = 14745600,
                         .fifosize       = 16,
                         .ops            = &amba_pl010_pops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .dtr_mask       = 1 << 5,
@@ -581,7 +581,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
                         .uartclk        = 14745600,
                         .fifosize       = 16,
                         .ops            = &amba_pl010_pops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .dtr_mask       = 1 << 7,
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 8ef999481f93..ce7b2e4ecd17 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -410,7 +410,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
                 .fifosize       = 16,
                 .ops            = &clps711x_pops,
                 .line           = 0,
-                .flags          = ASYNC_BOOT_AUTOCONF,
+                .flags          = UPF_BOOT_AUTOCONF,
         },
         {
                 .iobase         = SYSCON2,
@@ -419,7 +419,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
                 .fifosize       = 16,
                 .ops            = &clps711x_pops,
                 .line           = 1,
-                .flags          = ASYNC_BOOT_AUTOCONF,
+                .flags          = UPF_BOOT_AUTOCONF,
         }
 };
 
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 587cc6a95114..858048efe1ed 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port)
                              DRIVER_NAME, sport);
         if (retval) goto error_out2;
 
-        retval = request_irq(sport->rtsirq, imx_rtsint, 0,
+        retval = request_irq(sport->rtsirq, imx_rtsint,
+                             SA_TRIGGER_FALLING | SA_TRIGGER_RISING,
                              DRIVER_NAME, sport);
         if (retval) goto error_out3;
-        set_irq_type(sport->rtsirq, IRQT_BOTHEDGE);
 
         /*
          * Finally, clear and enable interrupts
@@ -674,7 +674,7 @@ static struct imx_port imx_ports[] = {
                 .irq            = UART1_MINT_RX,
                 .uartclk        = 16000000,
                 .fifosize       = 8,
-                .flags          = ASYNC_BOOT_AUTOCONF,
+                .flags          = UPF_BOOT_AUTOCONF,
                 .ops            = &imx_pops,
                 .line           = 0,
         },
@@ -690,7 +690,7 @@ static struct imx_port imx_ports[] = {
                 .irq            = UART2_MINT_RX,
                 .uartclk        = 16000000,
                 .fifosize       = 8,
-                .flags          = ASYNC_BOOT_AUTOCONF,
+                .flags          = UPF_BOOT_AUTOCONF,
                 .ops            = &imx_pops,
                 .line           = 1,
         },
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h
index 18753193f59b..dfc1e86d3aa1 100644
--- a/drivers/serial/jsm/jsm.h
+++ b/drivers/serial/jsm/jsm.h
@@ -380,7 +380,6 @@ struct neo_uart_struct {
 extern struct   uart_driver jsm_uart_driver;
 extern struct   board_ops jsm_neo_ops;
 extern int      jsm_debug;
-extern int      jsm_rawreadok;
 
 /*************************************************************************
  *
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
index 7e56c7824194..b1b66e71d281 100644
--- a/drivers/serial/jsm/jsm_driver.c
+++ b/drivers/serial/jsm/jsm_driver.c
@@ -49,11 +49,8 @@ struct uart_driver jsm_uart_driver = {
 };
 
 int jsm_debug;
-int jsm_rawreadok;
 module_param(jsm_debug, int, 0);
-module_param(jsm_rawreadok, int, 0);
 MODULE_PARM_DESC(jsm_debug, "Driver debugging level");
-MODULE_PARM_DESC(jsm_rawreadok, "Bypass flip buffers on input");
 
 static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index 6f22b42d9337..87e4e2cf8ce7 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -965,56 +965,47 @@ static void neo_param(struct jsm_channel *ch)
                         baud = ch->ch_custom_speed;
                         if (ch->ch_flags & CH_BAUD0)
                                 ch->ch_flags &= ~(CH_BAUD0);
-                } else {
-                        int iindex = 0;
-                        int jindex = 0;
-
-                        const u64 bauds[4][16] = {
-                                {
-                                        0,      50,     75,     110,
-                                        134,    150,    200,    300,
-                                        600,    1200,   1800,   2400,
-                                        4800,   9600,   19200,  38400 },
-                                {
-                                        0,      57600,  115200, 230400,
-                                        460800, 150,    200,    921600,
-                                        600,    1200,   1800,   2400,
-                                        4800,   9600,   19200,  38400 },
-                                {
-                                        0,      57600,  76800, 115200,
-                                        131657, 153600, 230400, 460800,
-                                        921600, 1200,   1800,   2400,
-                                        4800,   9600,   19200,  38400 },
-                                {
-                                        0,      57600,  115200, 230400,
-                                        460800, 150,    200,    921600,
-                                        600,    1200,   1800,   2400,
-                                        4800,   9600,   19200,  38400 }
-                        };
-
-                        baud = C_BAUD(ch->uart_port.info->tty) & 0xff;
-
-                        if (ch->ch_c_cflag & CBAUDEX)
-                                iindex = 1;
-
-                        jindex = baud;
-
-                        if ((iindex >= 0) && (iindex < 4) && (jindex >= 0) && (jindex < 16))
-                                baud = bauds[iindex][jindex];
-                        else {
-                                jsm_printk(IOCTL, DEBUG, &ch->ch_bd->pci_dev,
-                                        "baud indices were out of range (%d)(%d)",
-                                iindex, jindex);
-                                baud = 0;
+        } else {
+                int i;
+                unsigned int cflag;
+                static struct {
+                        unsigned int rate;
+                        unsigned int cflag;
+                } baud_rates[] = {
+                        { 921600, B921600 },
+                        { 460800, B460800 },
+                        { 230400, B230400 },
+                        { 115200, B115200 },
+                        {  57600, B57600  },
+                        {  38400, B38400  },
+                        {  19200, B19200  },
+                        {   9600, B9600   },
+                        {   4800, B4800   },
+                        {   2400, B2400   },
+                        {   1200, B1200   },
+                        {    600, B600    },
+                        {    300, B300    },
+                        {    200, B200    },
+                        {    150, B150    },
+                        {    134, B134    },
+                        {    110, B110    },
+                        {     75, B75     },
+                        {     50, B50     },
+                };
+
+                cflag = C_BAUD(ch->uart_port.info->tty);
+                baud = 9600;
+                for (i = 0; i < ARRAY_SIZE(baud_rates); i++) {
+                        if (baud_rates[i].cflag == cflag) {
+                                baud = baud_rates[i].rate;
+                                break;
                         }
-
-                        if (baud == 0)
-                                baud = 9600;
-
-                        if (ch->ch_flags & CH_BAUD0)
-                                ch->ch_flags &= ~(CH_BAUD0);
                 }
 
+                if (ch->ch_flags & CH_BAUD0)
+                        ch->ch_flags &= ~(CH_BAUD0);
+        }
+
         if (ch->ch_c_cflag & PARENB)
                 lcr |= UART_LCR_PARITY;
 
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 6fa0d62d6f68..4d48b625cd3d 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -20,8 +20,10 @@
  *
  * Contact Information:
  * Scott H Kilau <Scott_Kilau@digi.com>
- * Wendy Xiong   <wendyx@us.ltcfwd.linux.ibm.com>
- *
+ * Ananda Venkatarman <mansarov@us.ibm.com>
+ * Modifications:
+ * 01/19/06:    changed jsm_input routine to use the dynamically allocated
+ *              tty_buffer changes. Contributors: Scott Kilau and Ananda V.
  ***********************************************************************/
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
@@ -497,16 +499,15 @@ void jsm_input(struct jsm_channel *ch)
 {
         struct jsm_board *bd;
         struct tty_struct *tp;
+        struct tty_ldisc *ld;
         u32 rmask;
         u16 head;
         u16 tail;
         int data_len;
         unsigned long lock_flags;
-        int flip_len;
+        int flip_len = 0;
         int len = 0;
         int n = 0;
-        char *buf = NULL;
-        char *buf2 = NULL;
         int s = 0;
         int i = 0;
 
@@ -574,56 +575,50 @@ void jsm_input(struct jsm_channel *ch)
 
         /*
          * If the rxbuf is empty and we are not throttled, put as much
-         * as we can directly into the linux TTY flip buffer.
-         * The jsm_rawreadok case takes advantage of carnal knowledge that
-         * the char_buf and the flag_buf are next to each other and
-         * are each of (2 * TTY_FLIPBUF_SIZE) size.
+         * as we can directly into the linux TTY buffer.
          *
-         * NOTE: if(!tty->real_raw), the call to ldisc.receive_buf
-         *actually still uses the flag buffer, so you can't
-         *use it for input data
          */
-        if (jsm_rawreadok) {
-                if (tp->real_raw)
-                        flip_len = MYFLIPLEN;
-                else
-                        flip_len = 2 * TTY_FLIPBUF_SIZE;
-        } else
-                flip_len = TTY_FLIPBUF_SIZE - tp->flip.count;
+        flip_len = TTY_FLIPBUF_SIZE;
 
         len = min(data_len, flip_len);
         len = min(len, (N_TTY_BUF_SIZE - 1) - tp->read_cnt);
+        ld = tty_ldisc_ref(tp);
 
-        if (len <= 0) {
-                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "jsm_input 1\n");
-                return;
-        }
+        /*
+         * If the DONT_FLIP flag is on, don't flush our buffer, and act
+         * like the ld doesn't have any space to put the data right now.
+         */
+        if (test_bit(TTY_DONT_FLIP, &tp->flags))
+                len = 0;
 
         /*
-         * If we're bypassing flip buffers on rx, we can blast it
-         * right into the beginning of the buffer.
+         * If we were unable to get a reference to the ld,
+         * don't flush our buffer, and act like the ld doesn't
+         * have any space to put the data right now.
          */
-        if (jsm_rawreadok) {
-                if (tp->real_raw) {
-                        if (ch->ch_flags & CH_FLIPBUF_IN_USE) {
-                                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                                        "JSM - FLIPBUF in use. delaying input\n");
-                                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-                                return;
-                        }
-                        ch->ch_flags |= CH_FLIPBUF_IN_USE;
-                        buf = ch->ch_bd->flipbuf;
-                        buf2 = NULL;
-                } else {
-                        buf = tp->flip.char_buf;
-                        buf2 = tp->flip.flag_buf;
-                }
+        if (!ld) {
+                len = 0;
         } else {
-                buf = tp->flip.char_buf_ptr;
-                buf2 = tp->flip.flag_buf_ptr;
+                /*
+                 * If ld doesn't have a pointer to a receive_buf function,
+                 * flush the data, then act like the ld doesn't have any
+                 * space to put the data right now.
+                 */
+                if (!ld->receive_buf) {
+                                ch->ch_r_head = ch->ch_r_tail;
+                                len = 0;
+                }
         }
 
+        if (len <= 0) {
+                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "jsm_input 1\n");
+                if (ld)
+                        tty_ldisc_deref(ld);
+                return;
+        }
+
+        len = tty_buffer_request_room(tp, len);
         n = len;
 
         /*
@@ -638,121 +633,47 @@ void jsm_input(struct jsm_channel *ch)
                 if (s <= 0)
                         break;
 
-                memcpy(buf, ch->ch_rqueue + tail, s);
-
-                /* buf2 is only set when port isn't raw */
-                if (buf2)
-                        memcpy(buf2, ch->ch_equeue + tail, s);
-
-                tail += s;
-                buf += s;
-                if (buf2)
-                        buf2 += s;
-                n -= s;
-                /* Flip queue if needed */
-                tail &= rmask;
-        }
+                        /*
+                         * If conditions are such that ld needs to see all
+                         * UART errors, we will have to walk each character
+                         * and error byte and send them to the buffer one at
+                         * a time.
+                         */
 
-        /*
-         * In high performance mode, we don't have to update
-         * flag_buf or any of the counts or pointers into flip buf.
-         */
-        if (!jsm_rawreadok) {
                 if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) {
-                        for (i = 0; i < len; i++) {
+                        for (i = 0; i < s; i++) {
                                 /*
                                  * Give the Linux ld the flags in the
                                  * format it likes.
                                  */
-                                if (tp->flip.flag_buf_ptr[i] & UART_LSR_BI)
-                                        tp->flip.flag_buf_ptr[i] = TTY_BREAK;
-                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_PE)
-                                        tp->flip.flag_buf_ptr[i] = TTY_PARITY;
-                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_FE)
-                                        tp->flip.flag_buf_ptr[i] = TTY_FRAME;
+                                if (*(ch->ch_equeue +tail +i) & UART_LSR_BI)
+                                        tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i),  TTY_BREAK);
+                                else if (*(ch->ch_equeue +tail +i) & UART_LSR_PE)
+                                        tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_PARITY);
+                                else if (*(ch->ch_equeue +tail +i) & UART_LSR_FE)
+                                        tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_FRAME);
                                 else
-                                        tp->flip.flag_buf_ptr[i] = TTY_NORMAL;
+                                tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_NORMAL);
                         }
                 } else {
-                        memset(tp->flip.flag_buf_ptr, 0, len);
+                        tty_insert_flip_string(tp, ch->ch_rqueue + tail, s) ;
                 }
-
-                tp->flip.char_buf_ptr += len;
-                tp->flip.flag_buf_ptr += len;
-                tp->flip.count += len;
-        }
-        else if (!tp->real_raw) {
-                if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) {
-                        for (i = 0; i < len; i++) {
-                                /*
-                                 * Give the Linux ld the flags in the
-                                 * format it likes.
-                                 */
-                                if (tp->flip.flag_buf_ptr[i] & UART_LSR_BI)
-                                        tp->flip.flag_buf_ptr[i] = TTY_BREAK;
-                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_PE)
-                                        tp->flip.flag_buf_ptr[i] = TTY_PARITY;
-                                else if (tp->flip.flag_buf_ptr[i] & UART_LSR_FE)
-                                        tp->flip.flag_buf_ptr[i] = TTY_FRAME;
-                                else
-                                        tp->flip.flag_buf_ptr[i] = TTY_NORMAL;
-                        }
-                } else
-                        memset(tp->flip.flag_buf, 0, len);
+                tail += s;
+                n -= s;
+                /* Flip queue if needed */
+                tail &= rmask;
         }
 
-        /*
-         * If we're doing raw reads, jam it right into the
-         * line disc bypassing the flip buffers.
-         */
-        if (jsm_rawreadok) {
-                if (tp->real_raw) {
-                        ch->ch_r_tail = tail & rmask;
-                        ch->ch_e_tail = tail & rmask;
-
-                        jsm_check_queue_flow_control(ch);
-
-                        /* !!! WE *MUST* LET GO OF ALL LOCKS BEFORE CALLING RECEIVE BUF !!! */
+        ch->ch_r_tail = tail & rmask;
+        ch->ch_e_tail = tail & rmask;
+        jsm_check_queue_flow_control(ch);
+        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
 
-                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
+        /* Tell the tty layer its okay to "eat" the data now */
+        tty_flip_buffer_push(tp);
 
-                        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                                "jsm_input. %d real_raw len:%d calling receive_buf for board %d\n",
-                                __LINE__, len, ch->ch_bd->boardnum);
-                        tp->ldisc.receive_buf(tp, ch->ch_bd->flipbuf, NULL, len);
-
-                        /* Allow use of channel flip buffer again */
-                        spin_lock_irqsave(&ch->ch_lock, lock_flags);
-                        ch->ch_flags &= ~CH_FLIPBUF_IN_USE;
-                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-
-                } else {
-                        ch->ch_r_tail = tail & rmask;
-                        ch->ch_e_tail = tail & rmask;
-
-                        jsm_check_queue_flow_control(ch);
-
-                        /* !!! WE *MUST* LET GO OF ALL LOCKS BEFORE CALLING RECEIVE BUF !!! */
-                        spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-
-                        jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                                "jsm_input. %d not real_raw len:%d calling receive_buf for board %d\n",
-                                __LINE__, len, ch->ch_bd->boardnum);
-
-                        tp->ldisc.receive_buf(tp, tp->flip.char_buf, tp->flip.flag_buf, len);
-                }
-        } else {
-                ch->ch_r_tail = tail & rmask;
-                ch->ch_e_tail = tail & rmask;
-
-                jsm_check_queue_flow_control(ch);
-
-                spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
-
-                jsm_printk(READ, INFO, &ch->ch_bd->pci_dev,
-                        "jsm_input. %d not jsm_read raw okay scheduling flip\n", __LINE__);
-                tty_schedule_flip(tp);
-        }
+        if (ld)
+                tty_ldisc_deref(ld);
 
         jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
 }
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index d957a3a9edf1..0ef648fa4b2d 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -350,8 +350,7 @@ static inline void receive_chars(struct mcf_serial *info)
                 }
                 tty_insert_flip_char(tty, ch, flag);
         }
-
-        schedule_work(&tty->flip.work);
+        tty_flip_buffer_push(tty);
         return;
 }
 
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index eb4883efb7c6..0a2dd6c5b95f 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1060,7 +1060,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
 
         port->mapbase   = res->start;
-        port->membase   = S3C24XX_VA_UART + (res->start - S3C2410_PA_UART);
+        port->membase   = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
         port->irq       = platform_get_irq(platdev, 0);
 
         ourport->clk    = clk_get(&platdev->dev, "uart");
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 1bd93168f504..ff7b60b4de37 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -665,21 +665,21 @@ void __init sa1100_register_uart(int idx, int port)
                 sa1100_ports[idx].port.membase = (void __iomem *)&Ser1UTCR0;
                 sa1100_ports[idx].port.mapbase = _Ser1UTCR0;
                 sa1100_ports[idx].port.irq     = IRQ_Ser1UART;
-                sa1100_ports[idx].port.flags   = ASYNC_BOOT_AUTOCONF;
+                sa1100_ports[idx].port.flags   = UPF_BOOT_AUTOCONF;
                 break;
 
         case 2:
                 sa1100_ports[idx].port.membase = (void __iomem *)&Ser2UTCR0;
                 sa1100_ports[idx].port.mapbase = _Ser2UTCR0;
                 sa1100_ports[idx].port.irq     = IRQ_Ser2ICP;
-                sa1100_ports[idx].port.flags   = ASYNC_BOOT_AUTOCONF;
+                sa1100_ports[idx].port.flags   = UPF_BOOT_AUTOCONF;
                 break;
 
         case 3:
                 sa1100_ports[idx].port.membase = (void __iomem *)&Ser3UTCR0;
                 sa1100_ports[idx].port.mapbase = _Ser3UTCR0;
                 sa1100_ports[idx].port.irq     = IRQ_Ser3UART;
-                sa1100_ports[idx].port.flags   = ASYNC_BOOT_AUTOCONF;
+                sa1100_ports[idx].port.flags   = UPF_BOOT_AUTOCONF;
                 break;
 
         default:
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 943770470b9d..95fb4939c675 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -332,7 +332,7 @@ uart_get_baud_rate(struct uart_port *port, struct termios *termios,
                    struct termios *old, unsigned int min, unsigned int max)
 {
         unsigned int try, baud, altbaud = 38400;
-        unsigned int flags = port->flags & UPF_SPD_MASK;
+        upf_t flags = port->flags & UPF_SPD_MASK;
 
         if (flags == UPF_SPD_HI)
                 altbaud = 57600;
@@ -615,8 +615,9 @@ static int uart_set_info(struct uart_state *state,
         struct serial_struct new_serial;
         struct uart_port *port = state->port;
         unsigned long new_port;
-        unsigned int change_irq, change_port, old_flags, closing_wait;
+        unsigned int change_irq, change_port, closing_wait;
         unsigned int old_custom_divisor, close_delay;
+        upf_t old_flags, new_flags;
         int retval = 0;
 
         if (copy_from_user(&new_serial, newinfo, sizeof(new_serial)))
@@ -655,6 +656,7 @@ static int uart_set_info(struct uart_state *state,
                       new_serial.type != port->type;
 
         old_flags = port->flags;
+        new_flags = new_serial.flags;
         old_custom_divisor = port->custom_divisor;
 
         if (!capable(CAP_SYS_ADMIN)) {
@@ -664,10 +666,10 @@ static int uart_set_info(struct uart_state *state,
                     (close_delay != state->close_delay) ||
                     (closing_wait != state->closing_wait) ||
                     (new_serial.xmit_fifo_size != port->fifosize) ||
-                    (((new_serial.flags ^ old_flags) & ~UPF_USR_MASK) != 0))
+                    (((new_flags ^ old_flags) & ~UPF_USR_MASK) != 0))
                         goto exit;
                 port->flags = ((port->flags & ~UPF_USR_MASK) |
-                               (new_serial.flags & UPF_USR_MASK));
+                               (new_flags & UPF_USR_MASK));
                 port->custom_divisor = new_serial.custom_divisor;
                 goto check_and_exit;
         }
@@ -764,7 +766,7 @@ static int uart_set_info(struct uart_state *state,
         port->irq              = new_serial.irq;
         port->uartclk          = new_serial.baud_base * 16;
         port->flags            = (port->flags & ~UPF_CHANGE_MASK) |
-                                 (new_serial.flags & UPF_CHANGE_MASK);
+                                 (new_flags & UPF_CHANGE_MASK);
         port->custom_divisor   = new_serial.custom_divisor;
         state->close_delay     = close_delay;
         state->closing_wait    = closing_wait;
@@ -1870,7 +1872,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
         mutex_lock(&state->mutex);
 
         if (state->info && state->info->flags & UIF_INITIALIZED) {
-                struct uart_ops *ops = port->ops;
+                const struct uart_ops *ops = port->ops;
 
                 spin_lock_irq(&port->lock);
                 ops->stop_tx(port);
@@ -1932,7 +1934,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
         }
 
         if (state->info && state->info->flags & UIF_INITIALIZED) {
-                struct uart_ops *ops = port->ops;
+                const struct uart_ops *ops = port->ops;
                 int ret;
 
                 ops->set_mctrl(port, 0);
@@ -2235,7 +2237,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
          * If this port is a console, then the spinlock is already
          * initialised.
          */
-        if (!uart_console(port))
+        if (!(uart_console(port) && (port->cons->flags & CON_ENABLED)))
                 spin_lock_init(&port->lock);
 
         uart_configure_port(drv, state, port);
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
index d4a1f0e798c1..d0490f67f597 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
@@ -506,7 +506,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
                         .uartclk        = 14745600/2,
                         .fifosize       = 16,
                         .ops            = &lh7a40x_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
         },
@@ -519,7 +519,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
                         .uartclk        = 14745600/2,
                         .fifosize       = 16,
                         .ops            = &lh7a40x_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
         },
@@ -532,7 +532,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
                         .uartclk        = 14745600/2,
                         .fifosize       = 16,
                         .ops            = &lh7a40x_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 2,
                 },
         },
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index a9e070759628..80737c131ce7 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -42,6 +42,7 @@
 #include <linux/delay.h>
 #include <linux/console.h>
 #include <linux/bitops.h>
+#include <linux/generic_serial.h>
 
 #ifdef CONFIG_CPU_FREQ
 #include <linux/notifier.h>
@@ -53,7 +54,9 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
-#include <linux/generic_serial.h>
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+#include <asm/clock.h>
+#endif
 
 #ifdef CONFIG_SH_STANDARD_BIOS
 #include <asm/sh_bios.h>
@@ -86,9 +89,11 @@ static void sci_stop_rx(struct uart_port *port);
 static int sci_request_irq(struct sci_port *port);
 static void sci_free_irq(struct sci_port *port);
 
-static struct sci_port sci_ports[SCI_NPORTS];
+static struct sci_port sci_ports[];
 static struct uart_driver sci_uart_driver;
 
+#define SCI_NPORTS sci_uart_driver.nr
+
 #if defined(CONFIG_SH_STANDARD_BIOS) || defined(CONFIG_SH_KGDB)
 
 static void handle_error(struct uart_port *port)
@@ -168,7 +173,7 @@ static void put_string(struct sci_port *sci_port, const char *buffer, int count)
         int usegdb=0;
 
 #ifdef CONFIG_SH_STANDARD_BIOS
-        /* This call only does a trap the first time it is
+        /* This call only does a trap the first time it is
          * called, and so is safe to do here unconditionally
          */
         usegdb |= sh_bios_in_gdb_mode();
@@ -324,47 +329,46 @@ static void sci_init_pins_sci(struct uart_port* port, unsigned int cflag)
         /* tx mark output*/
         H8300_SCI_DR(ch) |= h8300_sci_pins[ch].tx;
 }
-#else
-static void sci_init_pins_sci(struct uart_port *port, unsigned int cflag)
-{
-}
 #endif
 #endif
 
 #if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
-#if defined(CONFIG_CPU_SH3)
-/* For SH7705, SH7707, SH7709, SH7709A, SH7729, SH7300*/
+#if defined(CONFIG_CPU_SUBTYPE_SH7300)
+/* SH7300 doesn't use RTS/CTS */
+static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
+{
+        sci_out(port, SCFCR, 0);
+}
+#elif defined(CONFIG_CPU_SH3)
+/* For SH7705, SH7707, SH7709, SH7709A, SH7729 */
 static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
 {
         unsigned int fcr_val = 0;
-#if !defined(CONFIG_CPU_SUBTYPE_SH7300) /* SH7300 doesn't use RTS/CTS */
-        {
-                unsigned short data;
+        unsigned short data;
+
+        /* We need to set SCPCR to enable RTS/CTS */
+        data = ctrl_inw(SCPCR);
+        /* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/
+        ctrl_outw(data & 0x0fcf, SCPCR);
 
-                /* We need to set SCPCR to enable RTS/CTS */
-                data = ctrl_inw(SCPCR);
-                /* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/
-                ctrl_outw(data&0x0fcf, SCPCR);
-        }
         if (cflag & CRTSCTS)
                 fcr_val |= SCFCR_MCE;
         else {
-                unsigned short data;
-
                 /* We need to set SCPCR to enable RTS/CTS */
                 data = ctrl_inw(SCPCR);
                 /* Clear out SCP7MD1,0, SCP4MD1,0,
                    Set SCP6MD1,0 = {01} (output)  */
-                ctrl_outw((data&0x0fcf)|0x1000, SCPCR);
+                ctrl_outw((data & 0x0fcf) | 0x1000, SCPCR);
 
                 data = ctrl_inb(SCPDR);
                 /* Set /RTS2 (bit6) = 0 */
-                ctrl_outb(data&0xbf, SCPDR);
+                ctrl_outb(data & 0xbf, SCPDR);
         }
-#endif
+
         sci_out(port, SCFCR, fcr_val);
 }
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
 static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
 {
         unsigned int fcr_val = 0;
@@ -374,7 +378,7 @@ static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
 
         sci_out(port, SCFCR, fcr_val);
 }
-
+#endif
 #else
 
 /* For SH7750 */
@@ -385,7 +389,11 @@ 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_SH7780
+                ctrl_outw(0x0080, SCSPTR0); /* Set RTS = 1 */
+#else
                 ctrl_outw(0x0080, SCSPTR2); /* Set RTS = 1 */
+#endif
         }
         sci_out(port, SCFCR, fcr_val);
 }
@@ -422,7 +430,11 @@ static void sci_transmit_chars(struct uart_port *port)
 
 #if !defined(SCI_ONLY)
         if (port->type == PORT_SCIF) {
+#if defined(CONFIG_CPU_SUBTYPE_SH7760) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+                txroom = SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0x7f);
+#else
                 txroom = SCIF_TXROOM_MAX - (sci_in(port, SCFDR)>>8);
+#endif
         } else {
                 txroom = (sci_in(port, SCxSR) & SCI_TDRE)?1:0;
         }
@@ -491,7 +503,11 @@ static inline void sci_receive_chars(struct uart_port *port,
         while (1) {
 #if !defined(SCI_ONLY)
                 if (port->type == PORT_SCIF) {
+#if defined(CONFIG_CPU_SUBTYPE_SH7760) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+                        count = sci_in(port, SCRFDR) & 0x7f;
+#else
                         count = sci_in(port, SCFDR)&SCIF_RFDC_MASK ;
+#endif
                 } else {
                         count = (sci_in(port, SCxSR)&SCxSR_RDxF(port))?1:0;
                 }
@@ -652,7 +668,7 @@ static inline int sci_handle_breaks(struct uart_port *port)
         struct tty_struct *tty = port->info->tty;
         struct sci_port *s = &sci_ports[port->line];
 
-        if (!s->break_flag && status & SCxSR_BRK(port))
+        if (!s->break_flag && status & SCxSR_BRK(port)) {
 #if defined(CONFIG_CPU_SH3)
                 /* Debounce break */
                 s->break_flag = 1;
@@ -783,6 +799,7 @@ static int sci_notifier(struct notifier_block *self, unsigned long phase, void *
             (phase == CPUFREQ_RESUMECHANGE)){
                 for (i = 0; i < SCI_NPORTS; i++) {
                         struct uart_port *port = &sci_ports[i].port;
+                        struct clk *clk;
 
                         /*
                          * Update the uartclk per-port if frequency has
@@ -795,7 +812,9 @@ static int sci_notifier(struct notifier_block *self, unsigned long phase, void *
                          *
                          * Clean this up later..
                          */
-                        port->uartclk = current_cpu_data.module_clock * 16;
+                        clk = clk_get("module_clk");
+                        port->uartclk = clk_get_rate(clk) * 16;
+                        clk_put(clk);
                 }
 
                 printk("%s: got a postchange notification for cpu %d (old %d, new %d)\n",
@@ -1008,15 +1027,20 @@ static void sci_set_termios(struct uart_port *port, struct termios *termios,
         sci_out(port, SCSMR, smr_val);
 
         switch (baud) {
-                case 0:         t = -1;         break;
-                case 2400:      t = BPS_2400;   break;
-                case 4800:      t = BPS_4800;   break;
-                case 9600:      t = BPS_9600;   break;
-                case 19200:     t = BPS_19200;  break;
-                case 38400:     t = BPS_38400;  break;
-                case 57600:     t = BPS_57600;  break;
-                case 115200:    t = BPS_115200; break;
-                default:        t = SCBRR_VALUE(baud); break;
+                case 0:
+                        t = -1;
+                        break;
+                default:
+                {
+#if defined(CONFIG_SUPERH) && !defined(CONFIG_SUPERH64)
+                        struct clk *clk = clk_get("module_clk");
+                        t = SCBRR_VALUE(baud, clk_get_rate(clk));
+                        clk_put(clk);
+#else
+                        t = SCBRR_VALUE(baud);
+#endif
+                }
+                        break;
         }
 
         if (t > 0) {
@@ -1030,7 +1054,9 @@ static void sci_set_termios(struct uart_port *port, struct termios *termios,
                 udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
         }
 
-        s->init_pins(port, termios->c_cflag);
+        if (likely(s->init_pins))
+                s->init_pins(port, termios->c_cflag);
+
         sci_out(port, SCSCR, SCSCR_INIT(port));
 
         if ((termios->c_cflag & CREAD) != 0)
@@ -1107,31 +1133,30 @@ static struct uart_ops sci_uart_ops = {
         .verify_port    = sci_verify_port,
 };
 
-static struct sci_port sci_ports[SCI_NPORTS] = {
+static struct sci_port sci_ports[] = {
 #if defined(CONFIG_CPU_SUBTYPE_SH7708)
         {
                 .port   = {
                         .membase        = (void *)0xfffffe80,
                         .mapbase        = 0xfffffe80,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 25,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCI,
                 .irqs           = SCI_IRQS,
-                .init_pins      = sci_init_pins_sci,
         },
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
         {
                 .port   = {
                         .membase        = (void *)SCIF0,
                         .mapbase        = SCIF0,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 55,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCIF,
@@ -1142,10 +1167,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)SCIF2,
                         .mapbase        = SCIF2,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 59,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .type           = PORT_SCIF,
@@ -1157,24 +1182,23 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xfffffe80,
                         .mapbase        = 0xfffffe80,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 25,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCI,
                 .irqs           = SCI_IRQS,
-                .init_pins      = sci_init_pins_sci,
         },
         {
                 .port   = {
                         .membase        = (void *)0xa4000150,
                         .mapbase        = 0xa4000150,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 59,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .type           = PORT_SCIF,
@@ -1185,10 +1209,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xa4000140,
                         .mapbase        = 0xa4000140,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 55,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 2,
                 },
                 .type           = PORT_IRDA,
@@ -1200,10 +1224,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xA4430000,
                         .mapbase        = 0xA4430000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 25,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCIF,
@@ -1215,25 +1239,25 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xffe00000,
                         .mapbase        = 0xffe00000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 25,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCIF,
                 .irqs           = SH73180_SCIF_IRQS,
                 .init_pins      = sci_init_pins_scif,
         },
-#elif defined(CONFIG_SH_RTS7751R2D)
+#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
         {
                 .port   = {
                         .membase        = (void *)0xffe80000,
                         .mapbase        = 0xffe80000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 43,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCIF,
@@ -1245,24 +1269,23 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xffe00000,
                         .mapbase        = 0xffe00000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 25,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCI,
                 .irqs           = SCI_IRQS,
-                .init_pins      = sci_init_pins_sci,
         },
         {
                 .port   = {
                         .membase        = (void *)0xffe80000,
                         .mapbase        = 0xffe80000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 43,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .type           = PORT_SCIF,
@@ -1274,10 +1297,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xfe600000,
                         .mapbase        = 0xfe600000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 55,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCIF,
@@ -1288,10 +1311,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xfe610000,
                         .mapbase        = 0xfe610000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 75,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .type           = PORT_SCIF,
@@ -1302,40 +1325,25 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xfe620000,
                         .mapbase        = 0xfe620000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 79,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 2,
                 },
                 .type           = PORT_SCIF,
                 .irqs           = SH7760_SCIF2_IRQS,
                 .init_pins      = sci_init_pins_scif,
         },
-#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
-        {
-                .port   = {
-                        .membase        = (void *)0xffe80000,
-                        .mapbase        = 0xffe80000,
-                        .iotype         = SERIAL_IO_MEM,
-                        .irq            = 43,
-                        .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
-                        .line           = 0,
-                },
-                .type           = PORT_SCIF,
-                .irqs           = SH4_SCIF_IRQS,
-                .init_pins      = sci_init_pins_scif,
-        },
 #elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
         {
                 .port   = {
                         .membase        = (void *)0xffe00000,
                         .mapbase        = 0xffe00000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 26,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCIF,
@@ -1346,10 +1354,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0xffe80000,
                         .mapbase        = 0xffe80000,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 43,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .type           = PORT_SCIF,
@@ -1359,10 +1367,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
 #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
         {
                 .port   = {
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 42,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCIF,
@@ -1374,10 +1382,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0x00ffffb0,
                         .mapbase        = 0x00ffffb0,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 54,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCI,
@@ -1388,10 +1396,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0x00ffffb8,
                         .mapbase        = 0x00ffffb8,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 58,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .type           = PORT_SCI,
@@ -1402,10 +1410,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0x00ffffc0,
                         .mapbase        = 0x00ffffc0,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 62,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 2,
                 },
                 .type           = PORT_SCI,
@@ -1417,10 +1425,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0x00ffff78,
                         .mapbase        = 0x00ffff78,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 90,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 0,
                 },
                 .type           = PORT_SCI,
@@ -1431,10 +1439,10 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0x00ffff80,
                         .mapbase        = 0x00ffff80,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 94,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 1,
                 },
                 .type           = PORT_SCI,
@@ -1445,16 +1453,88 @@ static struct sci_port sci_ports[SCI_NPORTS] = {
                 .port   = {
                         .membase        = (void *)0x00ffff88,
                         .mapbase        = 0x00ffff88,
-                        .iotype         = SERIAL_IO_MEM,
+                        .iotype         = UPIO_MEM,
                         .irq            = 98,
                         .ops            = &sci_uart_ops,
-                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .flags          = UPF_BOOT_AUTOCONF,
                         .line           = 2,
                 },
                 .type           = PORT_SCI,
                 .irqs           = H8S_SCI_IRQS2,
                 .init_pins      = sci_init_pins_sci,
         },
+#elif defined(CONFIG_CPU_SUBTYPE_SH7770)
+        {
+                .port   = {
+                        .membase        = (void *)0xff923000,
+                        .mapbase        = 0xff923000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 61,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7770_SCIF0_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xff924000,
+                        .mapbase        = 0xff924000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 62,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7770_SCIF1_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xff925000,
+                        .mapbase        = 0xff925000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 63,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 2,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7770_SCIF2_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+        {
+                .port   = {
+                        .membase        = (void *)0xffe00000,
+                        .mapbase        = 0xffe00000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 43,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7780_SCIF0_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
+        {
+                .port   = {
+                        .membase        = (void *)0xffe10000,
+                        .mapbase        = 0xffe10000,
+                        .iotype         = SERIAL_IO_MEM,
+                        .irq            = 79,
+                        .ops            = &sci_uart_ops,
+                        .flags          = ASYNC_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+                .type           = PORT_SCIF,
+                .irqs           = SH7780_SCIF1_IRQS,
+                .init_pins      = sci_init_pins_scif,
+        },
 #else
 #error "CPU subtype not defined"
 #endif
@@ -1480,9 +1560,6 @@ static int __init serial_console_setup(struct console *co, char *options)
         int flow = 'n';
         int ret;
 
-        if (co->index >= SCI_NPORTS)
-                co->index = 0;
-
         serial_console_port = &sci_ports[co->index];
         port = &serial_console_port->port;
         port->type = serial_console_port->type;
@@ -1496,14 +1573,21 @@ static int __init serial_console_setup(struct console *co, char *options)
          * We need to set the initial uartclk here, since otherwise it will
          * only ever be setup at sci_init() time.
          */
-#if !defined(__H8300H__) && !defined(__H8300S__)
-        port->uartclk = current_cpu_data.module_clock * 16;
-#else
+#if defined(__H8300H__) || defined(__H8300S__)
         port->uartclk = CONFIG_CPU_CLOCK;
-#endif
+
 #if defined(__H8300S__)
         h8300_sci_enable(port, sci_enable);
 #endif
+#elif defined(CONFIG_SUPERH64)
+        port->uartclk = current_cpu_info.module_clock * 16;
+#else
+        {
+                struct clk *clk = clk_get("module_clk");
+                port->uartclk = clk_get_rate(clk) * 16;
+                clk_put(clk);
+        }
+#endif
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
 
@@ -1566,7 +1650,7 @@ int __init kgdb_console_setup(struct console *co, char *options)
         int parity = 'n';
         int flow = 'n';
 
-        if (co->index >= SCI_NPORTS || co->index != kgdb_portnum)
+        if (co->index != kgdb_portnum)
                 co->index = kgdb_portnum;
 
         if (options)
@@ -1606,7 +1690,7 @@ console_initcall(kgdb_console_init);
 #elif defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
 #define SCI_CONSOLE     &serial_console
 #else
-#define SCI_CONSOLE     0
+#define SCI_CONSOLE     0
 #endif
 
 static char banner[] __initdata =
@@ -1621,7 +1705,6 @@ static struct uart_driver sci_uart_driver = {
         .dev_name       = "ttySC",
         .major          = SCI_MAJOR,
         .minor          = SCI_MINOR_START,
-        .nr             = SCI_NPORTS,
         .cons           = SCI_CONSOLE,
 };
 
@@ -1631,15 +1714,21 @@ static int __init sci_init(void)
 
         printk("%s", banner);
 
+        sci_uart_driver.nr = ARRAY_SIZE(sci_ports);
+
         ret = uart_register_driver(&sci_uart_driver);
         if (ret == 0) {
                 for (chan = 0; chan < SCI_NPORTS; chan++) {
                         struct sci_port *sciport = &sci_ports[chan];
 
-#if !defined(__H8300H__) && !defined(__H8300S__)
-                        sciport->port.uartclk = (current_cpu_data.module_clock * 16);
-#else
+#if defined(__H8300H__) || defined(__H8300S__)
                         sciport->port.uartclk = CONFIG_CPU_CLOCK;
+#elif defined(CONFIG_SUPERH64)
+                        sciport->port.uartclk = current_cpu_info.module_clock * 16;
+#else
+                        struct clk *clk = clk_get("module_clk");
+                        sciport->port.uartclk = clk_get_rate(clk) * 16;
+                        clk_put(clk);
 #endif
                         uart_add_one_port(&sci_uart_driver, &sciport->port);
                         sciport->break_timer.data = (unsigned long)sciport;
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 2892169eff05..1f14bb4382f6 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -46,14 +46,17 @@
 #define H8S_SCI_IRQS1 {92, 93, 94,   0 }
 #define H8S_SCI_IRQS2 {96, 97, 98,   0 }
 #define SH5_SCIF_IRQS {39, 40, 42,   0 }
+#define SH7770_SCIF0_IRQS {61, 61, 61, 61 }
+#define SH7770_SCIF1_IRQS {62, 62, 62, 62 }
+#define SH7770_SCIF2_IRQS {63, 63, 63, 63 }
+#define SH7780_SCIF0_IRQS {40, 41, 43, 42 }
+#define SH7780_SCIF1_IRQS {76, 77, 79, 78 }
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7708)
-# define SCI_NPORTS 1
 # define SCSPTR 0xffffff7c /* 8 bit */
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCI_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
-# define SCI_NPORTS 3
 # define SCPCR  0xA4000116 /* 16 bit SCI and SCIF */
 # define SCPDR  0xA4000136 /* 8  bit SCI and SCIF */
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
@@ -61,9 +64,8 @@
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
 # define SCIF0          0xA4400000
 # define SCIF2          0xA4410000
-# define SCSMR_Ir       0xA44A0000
-# define IRDA_SCIF      SCIF0
-# define SCI_NPORTS 2
+# define SCSMR_Ir       0xA44A0000
+# define IRDA_SCIF      SCIF0
 # define SCPCR 0xA4000116
 # define SCPDR 0xA4000136
 
@@ -74,14 +76,11 @@
 # define SCSCR_INIT(port) (port->mapbase == SCIF2) ? 0xF3 : 0xF0
 # define SCIF_ONLY
 #elif defined(CONFIG_SH_RTS7751R2D)
-# define SCI_NPORTS 1
-# define SCSPTR1 0xffe0001c /* 8  bit SCI */
 # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751)
-# define SCI_NPORTS 2
 # define SCSPTR1 0xffe0001c /* 8  bit SCI */
 # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
@@ -90,34 +89,29 @@
         0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ )
 # define SCI_AND_SCIF
 #elif defined(CONFIG_CPU_SUBTYPE_SH7760)
-# define SCI_NPORTS 3
-# define SCSPTR0 0xfe600000 /* 16 bit SCIF */
-# define SCSPTR1 0xfe610000 /* 16 bit SCIF */
-# define SCSPTR2 0xfe620000 /* 16 bit SCIF */
+# define SCSPTR0 0xfe600024 /* 16 bit SCIF */
+# define SCSPTR1 0xfe610024 /* 16 bit SCIF */
+# define SCSPTR2 0xfe620024 /* 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_SH7300)
-# define SCI_NPORTS 1
 # define SCPCR  0xA4050116        /* 16 bit SCIF */
 # define SCPDR  0xA4050136        /* 16 bit SCIF */
 # define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH73180)
-# define SCI_NPORTS 1
 # define SCPDR  0xA4050138        /* 16 bit SCIF */
 # define SCSPTR2 SCPDR
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define SCSCR_INIT(port)  0x0038 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
-# define SCI_NPORTS 1
 # 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_ST40STB1)
-# define SCI_NPORTS 2
 # define SCSPTR1 0xffe00020 /* 16 bit SCIF */
 # define SCSPTR2 0xffe80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
@@ -129,26 +123,32 @@
 # define SCIF_ADDR_SH5     PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR
 # define SCIF_PTR2_OFFS    0x0000020
 # define SCIF_LSR2_OFFS    0x0000024
-# define SCI_NPORTS 1
-# define SCI_INIT { \
-  { {}, PORT_SCIF, 0, \
-     SH5_SCIF_IRQS, sci_init_pins_scif }  \
-}
 # define SCSPTR2           ((port->mapbase)+SCIF_PTR2_OFFS) /* 16 bit SCIF */
 # define SCLSR2            ((port->mapbase)+SCIF_LSR2_OFFS) /* 16 bit SCIF */
 # define SCSCR_INIT(port)  0x38                           /* TIE=0,RIE=0,
                                                              TE=1,RE=1,REIE=1 */
 # define SCIF_ONLY
 #elif defined(CONFIG_H83007) || defined(CONFIG_H83068)
-# define SCI_NPORTS 3
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCI_ONLY
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
 #elif defined(CONFIG_H8S2678)
-# define SCI_NPORTS 3
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define SCI_ONLY
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7770)
+# define SCSPTR0 0xff923020 /* 16 bit SCIF */
+# define SCSPTR1 0xff924020 /* 16 bit SCIF */
+# define SCSPTR2 0xff925020 /* 16 bit SCIF */
+# define SCIF_ORER 0x0001  /* overrun error bit */
+# define SCSCR_INIT(port)       0x3c /* TIE=0,RIE=0,TE=1,RE=1,REIE=1,cke=2 */
+# define SCIF_ONLY
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+# define SCSPTR0        0xffe00024      /* 16 bit SCIF */
+# define SCSPTR1        0xffe10024      /* 16 bit SCIF */
+# define SCIF_OPER      0x0001          /* Overrun error bit */
+# define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
+# define SCIF_ONLY
 #else
 # error CPU subtype not defined
 #endif
@@ -158,7 +158,7 @@
 #define SCI_CTRL_FLAGS_RIE  0x40 /* all */
 #define SCI_CTRL_FLAGS_TE   0x20 /* all */
 #define SCI_CTRL_FLAGS_RE   0x10 /* all */
-#if defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751)
+#if defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751) || defined(CONFIG_CPU_SUBTYPE_SH7780)
 #define SCI_CTRL_FLAGS_REIE 0x08 /* 7750 SCIF */
 #else
 #define SCI_CTRL_FLAGS_REIE 0
@@ -213,7 +213,7 @@
 # define SCxSR_RDxF_CLEAR(port)         0xbc
 # define SCxSR_ERROR_CLEAR(port)        0xc4
 # define SCxSR_TDxE_CLEAR(port)         0x78
-# define SCxSR_BREAK_CLEAR(port)        0xc4
+# define SCxSR_BREAK_CLEAR(port)        0xc4
 #elif defined(SCIF_ONLY)
 # define SCxSR_TEND(port)               SCIF_TEND
 # define SCxSR_ERRORS(port)             SCIF_ERRORS
@@ -237,7 +237,7 @@
 # define SCxSR_RDxF_CLEAR(port)         0x00fc
 # define SCxSR_ERROR_CLEAR(port)        0x0073
 # define SCxSR_TDxE_CLEAR(port)         0x00df
-# define SCxSR_BREAK_CLEAR(port)        0x00e3
+# define SCxSR_BREAK_CLEAR(port)        0x00e3
 #endif
 #else
 # define SCxSR_TEND(port)        (((port)->type == PORT_SCI) ? SCI_TEND   : SCIF_TEND)
@@ -285,14 +285,14 @@ struct sci_port {
 
 #define SCI_IN(size, offset)                                    \
   unsigned int addr = port->mapbase + (offset);                 \
-  if ((size) == 8) {                                            \
+  if ((size) == 8) {                                            \
     return ctrl_inb(addr);                                      \
-  } else {                                                      \
+  } else {                                                      \
     return ctrl_inw(addr);                                      \
   }
 #define SCI_OUT(size, offset, value)                            \
   unsigned int addr = port->mapbase + (offset);                 \
-  if ((size) == 8) {                                            \
+  if ((size) == 8) {                                            \
     ctrl_outb(value, addr);                                     \
   } else {                                                      \
     ctrl_outw(value, addr);                                     \
@@ -301,10 +301,10 @@ struct sci_port {
 #define CPU_SCIx_FNS(name, sci_offset, sci_size, scif_offset, scif_size)\
   static inline unsigned int sci_##name##_in(struct uart_port *port)    \
   {                                                                     \
-    if (port->type == PORT_SCI) {                                       \
+    if (port->type == PORT_SCI) {                                       \
       SCI_IN(sci_size, sci_offset)                                      \
     } else {                                                            \
-      SCI_IN(scif_size, scif_offset);                                   \
+      SCI_IN(scif_size, scif_offset);                                   \
     }                                                                   \
   }                                                                     \
   static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
@@ -319,7 +319,7 @@ struct sci_port {
 #define CPU_SCIF_FNS(name, scif_offset, scif_size)                              \
   static inline unsigned int sci_##name##_in(struct uart_port *port)    \
   {                                                                     \
-    SCI_IN(scif_size, scif_offset);                                     \
+    SCI_IN(scif_size, scif_offset);                                     \
   }                                                                     \
   static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
   {                                                                     \
@@ -329,7 +329,7 @@ struct sci_port {
 #define CPU_SCI_FNS(name, sci_offset, sci_size)                         \
   static inline unsigned int sci_##name##_in(struct uart_port* port)    \
   {                                                                     \
-    SCI_IN(sci_size, sci_offset);                                       \
+    SCI_IN(sci_size, sci_offset);                                       \
   }                                                                     \
   static inline void sci_##name##_out(struct uart_port* port, unsigned int value) \
   {                                                                     \
@@ -385,10 +385,17 @@ SCIx_FNS(SCxTDR, 0x06,  8, 0x0c,  8, 0x06,  8, 0x0C,  8, 0x03,  8)
 SCIx_FNS(SCxSR,  0x08,  8, 0x10,  8, 0x08, 16, 0x10, 16, 0x04,  8)
 SCIx_FNS(SCxRDR, 0x0a,  8, 0x14,  8, 0x0A,  8, 0x14,  8, 0x05,  8)
 SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)
+#if defined(CONFIG_CPU_SUBTYPE_SH7760) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+SCIF_FNS(SCTFDR,                     0x0e, 16, 0x1C, 16)
+SCIF_FNS(SCRFDR,                     0x0e, 16, 0x20, 16)
+SCIF_FNS(SCSPTR,                        0,  0, 0x24, 16)
+SCIF_FNS(SCLSR,                         0,  0, 0x28, 16)
+#else
 SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)
 SCIF_FNS(SCSPTR,                        0,  0, 0x20, 16)
 SCIF_FNS(SCLSR,                         0,  0, 0x24, 16)
 #endif
+#endif
 #define sci_in(port, reg) sci_##reg##_in(port)
 #define sci_out(port, reg, value) sci_##reg##_out(port, value)
 
@@ -518,6 +525,24 @@ static inline int sci_rxd_in(struct uart_port *port)
         int ch = (port->mapbase - SMR0) >> 3;
         return (H8300_SCI_DR(ch) & h8300_sci_pins[ch].rx) ? 1 : 0;
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7770)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xff923000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xff924000)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xff925000)
+                return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0; /* SCIF */
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xffe00000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0; /* SCIF */
+        if (port->mapbase == 0xffe10000)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0; /* SCIF */
+}
 #endif
 
 /*
@@ -552,22 +577,15 @@ static inline int sci_rxd_in(struct uart_port *port)
  * -- Mitch Davis - 15 Jul 2000
  */
 
-#define PCLK           (current_cpu_data.module_clock)
-
-#if defined(CONFIG_CPU_SUBTYPE_SH7300)
-#define SCBRR_VALUE(bps) ((PCLK+16*bps)/(16*bps)-1)
+#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7780)
+#define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(16*bps)-1)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
-#define SCBRR_VALUE(bps) (((PCLK*2)+16*bps)/(32*bps)-1)
-#elif !defined(__H8300H__) && !defined(__H8300S__)
-#define SCBRR_VALUE(bps) ((PCLK+16*bps)/(32*bps)-1)
-#else
+#define SCBRR_VALUE(bps, clk) (((clk*2)+16*bps)/(32*bps)-1)
+#elif defined(__H8300H__) || defined(__H8300S__)
 #define SCBRR_VALUE(bps) (((CONFIG_CPU_CLOCK*1000/32)/bps)-1)
+#elif defined(CONFIG_SUPERH64)
+#define SCBRR_VALUE(bps) ((current_cpu_data.module_clock+16*bps)/(32*bps)-1)
+#else /* Generic SH */
+#define SCBRR_VALUE(bps, clk) ((clk+16*bps)/(32*bps)-1)
 #endif
-#define BPS_2400       SCBRR_VALUE(2400)
-#define BPS_4800       SCBRR_VALUE(4800)
-#define BPS_9600       SCBRR_VALUE(9600)
-#define BPS_19200      SCBRR_VALUE(19200)
-#define BPS_38400      SCBRR_VALUE(38400)
-#define BPS_57600      SCBRR_VALUE(57600)
-#define BPS_115200     SCBRR_VALUE(115200)
 
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 9a3665b34d97..bc67442c6b4c 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -669,7 +669,7 @@ static int sunsu_startup(struct uart_port *port)
          * if it is, then bail out, because there's likely no UART
          * here.
          */
-        if (!(up->port.flags & ASYNC_BUGGY_UART) &&
+        if (!(up->port.flags & UPF_BUGGY_UART) &&
             (serial_inp(up, UART_LSR) == 0xff)) {
                 printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
                 return -ENODEV;
@@ -707,7 +707,7 @@ static int sunsu_startup(struct uart_port *port)
         up->ier = UART_IER_RLSI | UART_IER_RDI;
         serial_outp(up, UART_IER, up->ier);
 
-        if (up->port.flags & ASYNC_FOURPORT) {
+        if (up->port.flags & UPF_FOURPORT) {
                 unsigned int icp;
                 /*
                  * Enable interrupts on the AST Fourport board
@@ -740,7 +740,7 @@ static void sunsu_shutdown(struct uart_port *port)
         serial_outp(up, UART_IER, 0);
 
         spin_lock_irqsave(&up->port.lock, flags);
-        if (up->port.flags & ASYNC_FOURPORT) {
+        if (up->port.flags & UPF_FOURPORT) {
                 /* reset interrupts on the AST Fourport board */
                 inb((up->port.iobase & 0xfe0) | 0x1f);
                 up->port.mctrl |= TIOCM_OUT1;
@@ -1132,7 +1132,7 @@ ebus_done:
 
         spin_lock_irqsave(&up->port.lock, flags);
 
-        if (!(up->port.flags & ASYNC_BUGGY_UART)) {
+        if (!(up->port.flags & UPF_BUGGY_UART)) {
                 /*
                  * Do a simple existence test first; if we fail this, there's
                  * no point trying anything else.
@@ -1170,7 +1170,7 @@ ebus_done:
          * manufacturer would be stupid enough to design a board
          * that conflicts with COM 1-4 --- we hope!
          */
-        if (!(up->port.flags & ASYNC_SKIP_TEST)) {
+        if (!(up->port.flags & UPF_SKIP_TEST)) {
                 serial_outp(up, UART_MCR, UART_MCR_LOOP | 0x0A);
                 status1 = serial_inp(up, UART_MSR) & 0xF0;
                 serial_outp(up, UART_MCR, save_mcr);
@@ -1371,7 +1371,7 @@ static __inline__ void wait_for_xmitr(struct uart_sunsu_port *up)
         } while ((status & BOTH_EMPTY) != BOTH_EMPTY);
 
         /* Wait up to 1s for flow control if necessary */
-        if (up->port.flags & ASYNC_CONS_FLOW) {
+        if (up->port.flags & UPF_CONS_FLOW) {
                 tmout = 1000000;
                 while (--tmout &&
                        ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
@@ -1513,7 +1513,7 @@ static int __init sunsu_serial_init(void)
                     up->su_type == SU_PORT_KBD)
                         continue;
 
-                up->port.flags |= ASYNC_BOOT_AUTOCONF;
+                up->port.flags |= UPF_BOOT_AUTOCONF;
                 up->port.type = PORT_UNKNOWN;
                 up->port.uartclk = (SU_BASE_BAUD * 16);
 
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index aaa009f4a7bf..c70ae81b5d98 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -843,9 +843,9 @@ MODULE_AUTHOR("Stanislaw Skowronek <skylark@linux-mips.org>");
 MODULE_DESCRIPTION("PCI driver for SGI IOC3");
 MODULE_LICENSE("GPL");
 
-EXPORT_SYMBOL(ioc3_register_submodule);
-EXPORT_SYMBOL(ioc3_unregister_submodule);
-EXPORT_SYMBOL(ioc3_ack);
-EXPORT_SYMBOL(ioc3_gpcr_set);
-EXPORT_SYMBOL(ioc3_disable);
-EXPORT_SYMBOL(ioc3_enable);
+EXPORT_SYMBOL_GPL(ioc3_register_submodule);
+EXPORT_SYMBOL_GPL(ioc3_unregister_submodule);
+EXPORT_SYMBOL_GPL(ioc3_ack);
+EXPORT_SYMBOL_GPL(ioc3_gpcr_set);
+EXPORT_SYMBOL_GPL(ioc3_disable);
+EXPORT_SYMBOL_GPL(ioc3_enable);
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index f6704688ee8c..5578a9dd04e8 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -3558,10 +3558,16 @@ static void ixj_write_frame(IXJ *j)
                                 }
                         /* Add word 0 to G.729 frames for the 8021.  Right now we don't do VAD/CNG  */
                                 if (j->play_codec == G729 && (cnt == 0 || cnt == 10 || cnt == 20)) {
-                                        if(j->write_buffer_rp + cnt == 0 && j->write_buffer_rp + cnt + 1 == 0 && j->write_buffer_rp + cnt + 2 == 0 &&
-                                           j->write_buffer_rp + cnt + 3 == 0 && j->write_buffer_rp + cnt + 4 == 0 && j->write_buffer_rp + cnt + 5 == 0 &&
-                                           j->write_buffer_rp + cnt + 6 == 0 && j->write_buffer_rp + cnt + 7 == 0 && j->write_buffer_rp + cnt + 8 == 0 &&
-                                           j->write_buffer_rp + cnt + 9 == 0) {
+                                        if (j->write_buffer_rp[cnt] == 0 &&
+                                            j->write_buffer_rp[cnt + 1] == 0 &&
+                                            j->write_buffer_rp[cnt + 2] == 0 &&
+                                            j->write_buffer_rp[cnt + 3] == 0 &&
+                                            j->write_buffer_rp[cnt + 4] == 0 &&
+                                            j->write_buffer_rp[cnt + 5] == 0 &&
+                                            j->write_buffer_rp[cnt + 6] == 0 &&
+                                            j->write_buffer_rp[cnt + 7] == 0 &&
+                                            j->write_buffer_rp[cnt + 8] == 0 &&
+                                            j->write_buffer_rp[cnt + 9] == 0) {
                                         /* someone is trying to write silence lets make this a type 0 frame. */
                                                 outb_p(0x00, j->DSPbase + 0x0C);
                                                 outb_p(0x00, j->DSPbase + 0x0D);
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 3639c3f8d357..36e476dd9123 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -38,6 +38,7 @@ obj-$(CONFIG_USB_XPAD)		+= input/
 
 obj-$(CONFIG_USB_DABUSB)        += media/
 obj-$(CONFIG_USB_DSBR)          += media/
+obj-$(CONFIG_USB_ET61X251)      += media/
 obj-$(CONFIG_USB_IBMCAM)        += media/
 obj-$(CONFIG_USB_KONICAWC)      += media/
 obj-$(CONFIG_USB_OV511)         += media/
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index af0a41e7870e..04631dcbabbc 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/device.h>       /* FIXME: linux/firmware.h should include it itself */
 #include <linux/firmware.h>
+#include <linux/mutex.h>
 
 #include "usbatm.h"
 
@@ -160,7 +161,7 @@ struct cxacru_data {
         struct work_struct poll_work;
 
         /* contol handles */
-        struct semaphore cm_serialize;
+        struct mutex cm_serialize;
         u8 *rcv_buf;
         u8 *snd_buf;
         struct urb *rcv_urb;
@@ -219,7 +220,7 @@ static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm,
                 goto fail;
         }
 
-        down(&instance->cm_serialize);
+        mutex_lock(&instance->cm_serialize);
 
         /* submit reading urb before the writing one */
         init_completion(&instance->rcv_done);
@@ -288,7 +289,7 @@ static int cxacru_cm(struct cxacru_data *instance, enum cxacru_cm_request cm,
         ret = offd;
         dbg("cm %#x", cm);
 fail:
-        up(&instance->cm_serialize);
+        mutex_unlock(&instance->cm_serialize);
         return ret;
 }
 
@@ -352,7 +353,6 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
                 struct atm_dev *atm_dev)
 {
         struct cxacru_data *instance = usbatm_instance->driver_data;
-        struct device *dev = &usbatm_instance->usb_intf->dev;
         /*
         struct atm_dev *atm_dev = usbatm_instance->atm_dev;
         */
@@ -364,14 +364,14 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
         ret = cxacru_cm(instance, CM_REQUEST_CARD_GET_MAC_ADDRESS, NULL, 0,
                         atm_dev->esi, sizeof(atm_dev->esi));
         if (ret < 0) {
-                dev_err(dev, "cxacru_atm_start: CARD_GET_MAC_ADDRESS returned %d\n", ret);
+                atm_err(usbatm_instance, "cxacru_atm_start: CARD_GET_MAC_ADDRESS returned %d\n", ret);
                 return ret;
         }
 
         /* start ADSL */
         ret = cxacru_cm(instance, CM_REQUEST_CHIP_ADSL_LINE_START, NULL, 0, NULL, 0);
         if (ret < 0) {
-                dev_err(dev, "cxacru_atm_start: CHIP_ADSL_LINE_START returned %d\n", ret);
+                atm_err(usbatm_instance, "cxacru_atm_start: CHIP_ADSL_LINE_START returned %d\n", ret);
                 return ret;
         }
 
@@ -383,13 +383,13 @@ static int cxacru_atm_start(struct usbatm_data *usbatm_instance,
 static void cxacru_poll_status(struct cxacru_data *instance)
 {
         u32 buf[CXINF_MAX] = {};
-        struct device *dev = &instance->usbatm->usb_intf->dev;
-        struct atm_dev *atm_dev = instance->usbatm->atm_dev;
+        struct usbatm_data *usbatm = instance->usbatm;
+        struct atm_dev *atm_dev = usbatm->atm_dev;
         int ret;
 
         ret = cxacru_cm_get_array(instance, CM_REQUEST_CARD_INFO_GET, buf, CXINF_MAX);
         if (ret < 0) {
-                dev_warn(dev, "poll status: error %d\n", ret);
+                atm_warn(usbatm, "poll status: error %d\n", ret);
                 goto reschedule;
         }
 
@@ -400,50 +400,50 @@ static void cxacru_poll_status(struct cxacru_data *instance)
         switch (instance->line_status) {
         case 0:
                 atm_dev->signal = ATM_PHY_SIG_LOST;
-                dev_info(dev, "ADSL line: down\n");
+                atm_info(usbatm, "ADSL line: down\n");
                 break;
 
         case 1:
                 atm_dev->signal = ATM_PHY_SIG_LOST;
-                dev_info(dev, "ADSL line: attemtping to activate\n");
+                atm_info(usbatm, "ADSL line: attempting to activate\n");
                 break;
 
         case 2:
                 atm_dev->signal = ATM_PHY_SIG_LOST;
-                dev_info(dev, "ADSL line: training\n");
+                atm_info(usbatm, "ADSL line: training\n");
                 break;
 
         case 3:
                 atm_dev->signal = ATM_PHY_SIG_LOST;
-                dev_info(dev, "ADSL line: channel analysis\n");
+                atm_info(usbatm, "ADSL line: channel analysis\n");
                 break;
 
         case 4:
                 atm_dev->signal = ATM_PHY_SIG_LOST;
-                dev_info(dev, "ADSL line: exchange\n");
+                atm_info(usbatm, "ADSL line: exchange\n");
                 break;
 
         case 5:
                 atm_dev->link_rate = buf[CXINF_DOWNSTREAM_RATE] * 1000 / 424;
                 atm_dev->signal = ATM_PHY_SIG_FOUND;
 
-                dev_info(dev, "ADSL line: up (%d kb/s down | %d kb/s up)\n",
+                atm_info(usbatm, "ADSL line: up (%d kb/s down | %d kb/s up)\n",
                      buf[CXINF_DOWNSTREAM_RATE], buf[CXINF_UPSTREAM_RATE]);
                 break;
 
         case 6:
                 atm_dev->signal = ATM_PHY_SIG_LOST;
-                dev_info(dev, "ADSL line: waiting\n");
+                atm_info(usbatm, "ADSL line: waiting\n");
                 break;
 
         case 7:
                 atm_dev->signal = ATM_PHY_SIG_LOST;
-                dev_info(dev, "ADSL line: initializing\n");
+                atm_info(usbatm, "ADSL line: initializing\n");
                 break;
 
         default:
                 atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
-                dev_info(dev, "Unknown line state %02x\n", instance->line_status);
+                atm_info(usbatm, "Unknown line state %02x\n", instance->line_status);
                 break;
         }
 reschedule:
@@ -504,8 +504,8 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
 {
         int ret;
         int off;
-        struct usb_device *usb_dev = instance->usbatm->usb_dev;
-        struct device *dev = &instance->usbatm->usb_intf->dev;
+        struct usbatm_data *usbatm = instance->usbatm;
+        struct usb_device *usb_dev = usbatm->usb_dev;
         u16 signature[] = { usb_dev->descriptor.idVendor, usb_dev->descriptor.idProduct };
         u32 val;
 
@@ -515,7 +515,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
         val = cpu_to_le32(instance->modem_type->pll_f_clk);
         ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, PLLFCLK_ADDR, (u8 *) &val, 4);
         if (ret) {
-                dev_err(dev, "FirmwarePllFClkValue failed: %d\n", ret);
+                usb_err(usbatm, "FirmwarePllFClkValue failed: %d\n", ret);
                 return;
         }
 
@@ -523,7 +523,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
         val = cpu_to_le32(instance->modem_type->pll_b_clk);
         ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, PLLBCLK_ADDR, (u8 *) &val, 4);
         if (ret) {
-                dev_err(dev, "FirmwarePllBClkValue failed: %d\n", ret);
+                usb_err(usbatm, "FirmwarePllBClkValue failed: %d\n", ret);
                 return;
         }
 
@@ -531,14 +531,14 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
         val = cpu_to_le32(SDRAM_ENA);
         ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, SDRAMEN_ADDR, (u8 *) &val, 4);
         if (ret) {
-                dev_err(dev, "Enable SDRAM failed: %d\n", ret);
+                usb_err(usbatm, "Enable SDRAM failed: %d\n", ret);
                 return;
         }
 
         /* Firmware */
         ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, FW_ADDR, fw->data, fw->size);
         if (ret) {
-                dev_err(dev, "Firmware upload failed: %d\n", ret);
+                usb_err(usbatm, "Firmware upload failed: %d\n", ret);
                 return;
         }
 
@@ -546,7 +546,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
         if (instance->modem_type->boot_rom_patch) {
                 ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, BR_ADDR, bp->data, bp->size);
                 if (ret) {
-                        dev_err(dev, "Boot ROM patching failed: %d\n", ret);
+                        usb_err(usbatm, "Boot ROM patching failed: %d\n", ret);
                         return;
                 }
         }
@@ -554,7 +554,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
         /* Signature */
         ret = cxacru_fw(usb_dev, FW_WRITE_MEM, 0x2, 0x0, SIG_ADDR, (u8 *) signature, 4);
         if (ret) {
-                dev_err(dev, "Signature storing failed: %d\n", ret);
+                usb_err(usbatm, "Signature storing failed: %d\n", ret);
                 return;
         }
 
@@ -566,7 +566,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
                 ret = cxacru_fw(usb_dev, FW_GOTO_MEM, 0x0, 0x0, FW_ADDR, NULL, 0);
         }
         if (ret) {
-                dev_err(dev, "Passing control to firmware failed: %d\n", ret);
+                usb_err(usbatm, "Passing control to firmware failed: %d\n", ret);
                 return;
         }
 
@@ -580,7 +580,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
 
         ret = cxacru_cm(instance, CM_REQUEST_CARD_GET_STATUS, NULL, 0, NULL, 0);
         if (ret < 0) {
-                dev_err(dev, "modem failed to initialize: %d\n", ret);
+                usb_err(usbatm, "modem failed to initialize: %d\n", ret);
                 return;
         }
 
@@ -597,7 +597,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
                         ret = cxacru_cm(instance, CM_REQUEST_CARD_DATA_SET,
                                         (u8 *) buf, len, NULL, 0);
                         if (ret < 0) {
-                                dev_err(dev, "load config data failed: %d\n", ret);
+                                usb_err(usbatm, "load config data failed: %d\n", ret);
                                 return;
                         }
                 }
@@ -608,18 +608,19 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
 static int cxacru_find_firmware(struct cxacru_data *instance,
                                 char* phase, const struct firmware **fw_p)
 {
-        struct device *dev = &instance->usbatm->usb_intf->dev;
+        struct usbatm_data *usbatm = instance->usbatm;
+        struct device *dev = &usbatm->usb_intf->dev;
         char buf[16];
 
         sprintf(buf, "cxacru-%s.bin", phase);
         dbg("cxacru_find_firmware: looking for %s", buf);
 
         if (request_firmware(fw_p, buf, dev)) {
-                dev_dbg(dev, "no stage %s firmware found\n", phase);
+                usb_dbg(usbatm, "no stage %s firmware found\n", phase);
                 return -ENOENT;
         }
 
-        dev_info(dev, "found firmware %s\n", buf);
+        usb_info(usbatm, "found firmware %s\n", buf);
 
         return 0;
 }
@@ -627,20 +628,19 @@ static int cxacru_find_firmware(struct cxacru_data *instance,
 static int cxacru_heavy_init(struct usbatm_data *usbatm_instance,
                              struct usb_interface *usb_intf)
 {
-        struct device *dev = &usbatm_instance->usb_intf->dev;
         const struct firmware *fw, *bp, *cf;
         struct cxacru_data *instance = usbatm_instance->driver_data;
 
         int ret = cxacru_find_firmware(instance, "fw", &fw);
         if (ret) {
-                dev_warn(dev, "firmware (cxacru-fw.bin) unavailable (hotplug misconfiguration?)\n");
+                usb_warn(usbatm_instance, "firmware (cxacru-fw.bin) unavailable (system misconfigured?)\n");
                 return ret;
         }
 
         if (instance->modem_type->boot_rom_patch) {
                 ret = cxacru_find_firmware(instance, "bp", &bp);
                 if (ret) {
-                        dev_warn(dev, "boot ROM patch (cxacru-bp.bin) unavailable (hotplug misconfiguration?)\n");
+                        usb_warn(usbatm_instance, "boot ROM patch (cxacru-bp.bin) unavailable (system misconfigured?)\n");
                         release_firmware(fw);
                         return ret;
                 }
@@ -667,22 +667,19 @@ static int cxacru_heavy_init(struct usbatm_data *usbatm_instance,
 }
 
 static int cxacru_bind(struct usbatm_data *usbatm_instance,
-                       struct usb_interface *intf, const struct usb_device_id *id,
-                       int *need_heavy_init)
+                       struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct cxacru_data *instance;
         struct usb_device *usb_dev = interface_to_usbdev(intf);
         int ret;
 
         /* instance init */
-        instance = kmalloc(sizeof(*instance), GFP_KERNEL);
+        instance = kzalloc(sizeof(*instance), GFP_KERNEL);
         if (!instance) {
                 dbg("cxacru_bind: no memory for instance data");
                 return -ENOMEM;
         }
 
-        memset(instance, 0, sizeof(*instance));
-
         instance->usbatm = usbatm_instance;
         instance->modem_type = (struct cxacru_modem_type *) id->driver_info;
 
@@ -721,13 +718,13 @@ static int cxacru_bind(struct usbatm_data *usbatm_instance,
                         instance->snd_buf, PAGE_SIZE,
                         cxacru_blocking_completion, &instance->snd_done, 4);
 
-        init_MUTEX(&instance->cm_serialize);
+        mutex_init(&instance->cm_serialize);
 
         INIT_WORK(&instance->poll_work, (void *)cxacru_poll_status, instance);
 
         usbatm_instance->driver_data = instance;
 
-        *need_heavy_init = cxacru_card_status(instance);
+        usbatm_instance->flags = (cxacru_card_status(instance) ? 0 : UDSL_SKIP_HEAVY_INIT);
 
         return 0;
 
@@ -787,12 +784,12 @@ static const struct usb_device_id cxacru_usb_ids[] = {
         { /* V = Conexant                       P = ADSL modem (Hasbani project)        */
                 USB_DEVICE(0x0572, 0xcb00),     .driver_info = (unsigned long) &cxacru_cb00
         },
-        { /* V = Conexant             P = ADSL modem (Well PTI-800 */
-                USB_DEVICE(0x0572, 0xcb02),     .driver_info = (unsigned long) &cxacru_cb00
-        },
         { /* V = Conexant                       P = ADSL modem                          */
                 USB_DEVICE(0x0572, 0xcb01),     .driver_info = (unsigned long) &cxacru_cb00
         },
+        { /* V = Conexant                       P = ADSL modem (Well PTI-800) */
+                USB_DEVICE(0x0572, 0xcb02),     .driver_info = (unsigned long) &cxacru_cb00
+        },
         { /* V = Conexant                       P = ADSL modem                          */
                 USB_DEVICE(0x0572, 0xcb06),     .driver_info = (unsigned long) &cxacru_cb00
         },
@@ -835,14 +832,13 @@ static const struct usb_device_id cxacru_usb_ids[] = {
 MODULE_DEVICE_TABLE(usb, cxacru_usb_ids);
 
 static struct usbatm_driver cxacru_driver = {
-        .owner          = THIS_MODULE,
         .driver_name    = cxacru_driver_name,
         .bind           = cxacru_bind,
         .heavy_init     = cxacru_heavy_init,
         .unbind         = cxacru_unbind,
         .atm_start      = cxacru_atm_start,
-        .in             = CXACRU_EP_DATA,
-        .out            = CXACRU_EP_DATA,
+        .bulk_in        = CXACRU_EP_DATA,
+        .bulk_out       = CXACRU_EP_DATA,
         .rx_padding     = 3,
         .tx_padding     = 11,
 };
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index c1b47d74e206..7860c8a5800d 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -35,12 +35,14 @@
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/timer.h>
+#include <linux/types.h>
+#include <linux/usb_ch9.h>
 #include <linux/workqueue.h>
 
 #include "usbatm.h"
 
 #define DRIVER_AUTHOR   "Johan Verrept, Duncan Sands <duncan.sands@free.fr>"
-#define DRIVER_VERSION  "1.9"
+#define DRIVER_VERSION  "1.10"
 #define DRIVER_DESC     "Alcatel SpeedTouch USB driver version " DRIVER_VERSION
 
 static const char speedtch_driver_name[] = "speedtch";
@@ -66,31 +68,42 @@ static const char speedtch_driver_name[] = "speedtch";
 
 #define RESUBMIT_DELAY          1000    /* milliseconds */
 
-#define DEFAULT_ALTSETTING      1
+#define DEFAULT_BULK_ALTSETTING 1
+#define DEFAULT_ISOC_ALTSETTING 2
 #define DEFAULT_DL_512_FIRST    0
+#define DEFAULT_ENABLE_ISOC     0
 #define DEFAULT_SW_BUFFERING    0
 
-static int altsetting = DEFAULT_ALTSETTING;
+static unsigned int altsetting = 0; /* zero means: use the default */
 static int dl_512_first = DEFAULT_DL_512_FIRST;
+static int enable_isoc = DEFAULT_ENABLE_ISOC;
 static int sw_buffering = DEFAULT_SW_BUFFERING;
 
-module_param(altsetting, int, S_IRUGO | S_IWUSR);
+module_param(altsetting, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(altsetting,
-                 "Alternative setting for data interface (default: "
-                 __MODULE_STRING(DEFAULT_ALTSETTING) ")");
+                "Alternative setting for data interface (bulk_default: "
+                __MODULE_STRING(DEFAULT_BULK_ALTSETTING) "; isoc_default: "
+                __MODULE_STRING(DEFAULT_ISOC_ALTSETTING) ")");
 
 module_param(dl_512_first, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(dl_512_first,
                  "Read 512 bytes before sending firmware (default: "
                  __MODULE_STRING(DEFAULT_DL_512_FIRST) ")");
 
+module_param(enable_isoc, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(enable_isoc,
+                "Use isochronous transfers if available (default: "
+                __MODULE_STRING(DEFAULT_ENABLE_ISOC) ")");
+
 module_param(sw_buffering, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(sw_buffering,
                  "Enable software buffering (default: "
                  __MODULE_STRING(DEFAULT_SW_BUFFERING) ")");
 
+#define INTERFACE_DATA          1
 #define ENDPOINT_INT            0x81
-#define ENDPOINT_DATA           0x07
+#define ENDPOINT_BULK_DATA      0x07
+#define ENDPOINT_ISOC_DATA      0x07
 #define ENDPOINT_FIRMWARE       0x05
 
 #define hex2int(c) ( (c >= '0') && (c <= '9') ? (c - '0') : ((c & 0xf) + 9) )
@@ -98,6 +111,8 @@ MODULE_PARM_DESC(sw_buffering,
 struct speedtch_instance_data {
         struct usbatm_data *usbatm;
 
+        unsigned int altsetting;
+
         struct work_struct status_checker;
 
         unsigned char last_status;
@@ -205,7 +220,7 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
                                    buffer, 0x200, &actual_length, 2000);
 
                 if (ret < 0 && ret != -ETIMEDOUT)
-                        usb_dbg(usbatm, "%s: read BLOCK0 from modem failed (%d)!\n", __func__, ret);
+                        usb_warn(usbatm, "%s: read BLOCK0 from modem failed (%d)!\n", __func__, ret);
                 else
                         usb_dbg(usbatm, "%s: BLOCK0 downloaded (%d bytes)\n", __func__, ret);
         }
@@ -219,7 +234,7 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
                                    buffer, thislen, &actual_length, DATA_TIMEOUT);
 
                 if (ret < 0) {
-                        usb_dbg(usbatm, "%s: write BLOCK1 to modem failed (%d)!\n", __func__, ret);
+                        usb_err(usbatm, "%s: write BLOCK1 to modem failed (%d)!\n", __func__, ret);
                         goto out_free;
                 }
                 usb_dbg(usbatm, "%s: BLOCK1 uploaded (%zu bytes)\n", __func__, fw1->size);
@@ -232,7 +247,7 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
                            buffer, 0x200, &actual_length, DATA_TIMEOUT);
 
         if (ret < 0) {
-                usb_dbg(usbatm, "%s: read BLOCK2 from modem failed (%d)!\n", __func__, ret);
+                usb_err(usbatm, "%s: read BLOCK2 from modem failed (%d)!\n", __func__, ret);
                 goto out_free;
         }
         usb_dbg(usbatm, "%s: BLOCK2 downloaded (%d bytes)\n", __func__, actual_length);
@@ -246,7 +261,7 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
                                    buffer, thislen, &actual_length, DATA_TIMEOUT);
 
                 if (ret < 0) {
-                        usb_dbg(usbatm, "%s: write BLOCK3 to modem failed (%d)!\n", __func__, ret);
+                        usb_err(usbatm, "%s: write BLOCK3 to modem failed (%d)!\n", __func__, ret);
                         goto out_free;
                 }
         }
@@ -259,7 +274,7 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
                            buffer, 0x200, &actual_length, DATA_TIMEOUT);
 
         if (ret < 0) {
-                usb_dbg(usbatm, "%s: read BLOCK4 from modem failed (%d)!\n", __func__, ret);
+                usb_err(usbatm, "%s: read BLOCK4 from modem failed (%d)!\n", __func__, ret);
                 goto out_free;
         }
 
@@ -270,6 +285,11 @@ static int speedtch_upload_firmware(struct speedtch_instance_data *instance,
            because we're in our own kernel thread anyway. */
         msleep_interruptible(1000);
 
+        if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, instance->altsetting)) < 0) {
+                usb_err(usbatm, "%s: setting interface to %d failed (%d)!\n", __func__, instance->altsetting, ret);
+                goto out_free;
+        }
+
         /* Enable software buffering, if requested */
         if (sw_buffering)
                 speedtch_set_swbuff(instance, 1);
@@ -285,8 +305,8 @@ out:
         return ret;
 }
 
-static int speedtch_find_firmware(struct usb_interface *intf, int phase,
-                                  const struct firmware **fw_p)
+static int speedtch_find_firmware(struct usbatm_data *usbatm, struct usb_interface *intf,
+                                  int phase, const struct firmware **fw_p)
 {
         struct device *dev = &intf->dev;
         const u16 bcdDevice = le16_to_cpu(interface_to_usbdev(intf)->descriptor.bcdDevice);
@@ -295,24 +315,24 @@ static int speedtch_find_firmware(struct usb_interface *intf, int phase,
         char buf[24];
 
         sprintf(buf, "speedtch-%d.bin.%x.%02x", phase, major_revision, minor_revision);
-        dev_dbg(dev, "%s: looking for %s\n", __func__, buf);
+        usb_dbg(usbatm, "%s: looking for %s\n", __func__, buf);
 
         if (request_firmware(fw_p, buf, dev)) {
                 sprintf(buf, "speedtch-%d.bin.%x", phase, major_revision);
-                dev_dbg(dev, "%s: looking for %s\n", __func__, buf);
+                usb_dbg(usbatm, "%s: looking for %s\n", __func__, buf);
 
                 if (request_firmware(fw_p, buf, dev)) {
                         sprintf(buf, "speedtch-%d.bin", phase);
-                        dev_dbg(dev, "%s: looking for %s\n", __func__, buf);
+                        usb_dbg(usbatm, "%s: looking for %s\n", __func__, buf);
 
                         if (request_firmware(fw_p, buf, dev)) {
-                                dev_warn(dev, "no stage %d firmware found!\n", phase);
+                                usb_err(usbatm, "%s: no stage %d firmware found!\n", __func__, phase);
                                 return -ENOENT;
                         }
                 }
         }
 
-        dev_info(dev, "found stage %d firmware %s\n", phase, buf);
+        usb_info(usbatm, "found stage %d firmware %s\n", phase, buf);
 
         return 0;
 }
@@ -323,15 +343,16 @@ static int speedtch_heavy_init(struct usbatm_data *usbatm, struct usb_interface
         struct speedtch_instance_data *instance = usbatm->driver_data;
         int ret;
 
-        if ((ret = speedtch_find_firmware(intf, 1, &fw1)) < 0)
-                        return ret;
+        if ((ret = speedtch_find_firmware(usbatm, intf, 1, &fw1)) < 0)
+                return ret;
 
-        if ((ret = speedtch_find_firmware(intf, 2, &fw2)) < 0) {
+        if ((ret = speedtch_find_firmware(usbatm, intf, 2, &fw2)) < 0) {
                 release_firmware(fw1);
                 return ret;
         }
 
-        ret = speedtch_upload_firmware(instance, fw1, fw2);
+        if ((ret = speedtch_upload_firmware(instance, fw1, fw2)) < 0)
+                usb_err(usbatm, "%s: firmware upload failed (%d)!\n", __func__, ret);
 
         release_firmware(fw2);
         release_firmware(fw1);
@@ -428,7 +449,9 @@ static void speedtch_check_status(struct speedtch_instance_data *instance)
         int down_speed, up_speed, ret;
         unsigned char status;
 
+#ifdef VERBOSE_DEBUG
         atm_dbg(usbatm, "%s entered\n", __func__);
+#endif
 
         ret = speedtch_read_status(instance);
         if (ret < 0) {
@@ -441,9 +464,9 @@ static void speedtch_check_status(struct speedtch_instance_data *instance)
 
         status = buf[OFFSET_7];
 
-        atm_dbg(usbatm, "%s: line state %02x\n", __func__, status);
-
         if ((status != instance->last_status) || !status) {
+                atm_dbg(usbatm, "%s: line state 0x%02x\n", __func__, status);
+
                 switch (status) {
                 case 0:
                         atm_dev->signal = ATM_PHY_SIG_LOST;
@@ -484,7 +507,7 @@ static void speedtch_check_status(struct speedtch_instance_data *instance)
 
                 default:
                         atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
-                        atm_info(usbatm, "Unknown line state %02x\n", status);
+                        atm_info(usbatm, "unknown line state %02x\n", status);
                         break;
                 }
 
@@ -583,11 +606,6 @@ static int speedtch_atm_start(struct usbatm_data *usbatm, struct atm_dev *atm_de
 
         atm_dbg(usbatm, "%s entered\n", __func__);
 
-        if ((ret = usb_set_interface(usb_dev, 1, altsetting)) < 0) {
-                atm_dbg(usbatm, "%s: usb_set_interface returned %d!\n", __func__, ret);
-                return ret;
-        }
-
         /* Set MAC address, it is stored in the serial number */
         memset(atm_dev->esi, 0, sizeof(atm_dev->esi));
         if (usb_string(usb_dev, usb_dev->descriptor.iSerialNumber, mac_str, sizeof(mac_str)) == 12) {
@@ -678,20 +696,27 @@ static void speedtch_release_interfaces(struct usb_device *usb_dev, int num_inte
 
 static int speedtch_bind(struct usbatm_data *usbatm,
                          struct usb_interface *intf,
-                         const struct usb_device_id *id,
-                         int *need_heavy_init)
+                         const struct usb_device_id *id)
 {
         struct usb_device *usb_dev = interface_to_usbdev(intf);
-        struct usb_interface *cur_intf;
+        struct usb_interface *cur_intf, *data_intf;
         struct speedtch_instance_data *instance;
         int ifnum = intf->altsetting->desc.bInterfaceNumber;
         int num_interfaces = usb_dev->actconfig->desc.bNumInterfaces;
         int i, ret;
+        int use_isoc;
 
         usb_dbg(usbatm, "%s entered\n", __func__);
 
+        /* sanity checks */
+
         if (usb_dev->descriptor.bDeviceClass != USB_CLASS_VENDOR_SPEC) {
-                usb_dbg(usbatm, "%s: wrong device class %d\n", __func__, usb_dev->descriptor.bDeviceClass);
+                usb_err(usbatm, "%s: wrong device class %d\n", __func__, usb_dev->descriptor.bDeviceClass);
+                return -ENODEV;
+        }
+
+        if (!(data_intf = usb_ifnum_to_if(usb_dev, INTERFACE_DATA))) {
+                usb_err(usbatm, "%s: data interface not found!\n", __func__);
                 return -ENODEV;
         }
 
@@ -704,25 +729,71 @@ static int speedtch_bind(struct usbatm_data *usbatm,
                         ret = usb_driver_claim_interface(&speedtch_usb_driver, cur_intf, usbatm);
 
                         if (ret < 0) {
-                                usb_dbg(usbatm, "%s: failed to claim interface %d (%d)\n", __func__, i, ret);
+                                usb_err(usbatm, "%s: failed to claim interface %2d (%d)!\n", __func__, i, ret);
                                 speedtch_release_interfaces(usb_dev, i);
                                 return ret;
                         }
                 }
         }
 
-        instance = kmalloc(sizeof(*instance), GFP_KERNEL);
+        instance = kzalloc(sizeof(*instance), GFP_KERNEL);
 
         if (!instance) {
-                usb_dbg(usbatm, "%s: no memory for instance data!\n", __func__);
+                usb_err(usbatm, "%s: no memory for instance data!\n", __func__);
                 ret = -ENOMEM;
                 goto fail_release;
         }
 
-        memset(instance, 0, sizeof(struct speedtch_instance_data));
-
         instance->usbatm = usbatm;
 
+        /* altsetting and enable_isoc may change at any moment, so take a snapshot */
+        instance->altsetting = altsetting;
+        use_isoc = enable_isoc;
+
+        if (instance->altsetting)
+                if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, instance->altsetting)) < 0) {
+                        usb_err(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, instance->altsetting, ret);
+                        instance->altsetting = 0; /* fall back to default */
+                }
+
+        if (!instance->altsetting && use_isoc)
+                if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, DEFAULT_ISOC_ALTSETTING)) < 0) {
+                        usb_dbg(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, DEFAULT_ISOC_ALTSETTING, ret);
+                        use_isoc = 0; /* fall back to bulk */
+                }
+
+        if (use_isoc) {
+                const struct usb_host_interface *desc = data_intf->cur_altsetting;
+                const __u8 target_address = USB_DIR_IN | usbatm->driver->isoc_in;
+                int i;
+
+                use_isoc = 0; /* fall back to bulk if endpoint not found */
+
+                for (i=0; i<desc->desc.bNumEndpoints; i++) {
+                        const struct usb_endpoint_descriptor *endpoint_desc = &desc->endpoint[i].desc;
+
+                        if ((endpoint_desc->bEndpointAddress == target_address)) {
+                                use_isoc = (endpoint_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                                        USB_ENDPOINT_XFER_ISOC;
+                                break;
+                        }
+                }
+
+                if (!use_isoc)
+                        usb_info(usbatm, "isochronous transfer not supported - using bulk\n");
+        }
+
+        if (!use_isoc && !instance->altsetting)
+                if ((ret = usb_set_interface(usb_dev, INTERFACE_DATA, DEFAULT_BULK_ALTSETTING)) < 0) {
+                        usb_err(usbatm, "%s: setting interface to %2d failed (%d)!\n", __func__, DEFAULT_BULK_ALTSETTING, ret);
+                        goto fail_free;
+                }
+
+        if (!instance->altsetting)
+                instance->altsetting = use_isoc ? DEFAULT_ISOC_ALTSETTING : DEFAULT_BULK_ALTSETTING;
+
+        usbatm->flags |= (use_isoc ? UDSL_USE_ISOC : 0);
+
         INIT_WORK(&instance->status_checker, (void *)speedtch_check_status, instance);
 
         instance->status_checker.timer.function = speedtch_status_poll;
@@ -749,13 +820,15 @@ static int speedtch_bind(struct usbatm_data *usbatm,
                               0x12, 0xc0, 0x07, 0x00,
                               instance->scratch_buffer + OFFSET_7, SIZE_7, 500);
 
-        *need_heavy_init = (ret != SIZE_7);
+        usbatm->flags |= (ret == SIZE_7 ? UDSL_SKIP_HEAVY_INIT : 0);
 
-        usb_dbg(usbatm, "%s: firmware %s loaded\n", __func__, need_heavy_init ? "not" : "already");
+        usb_dbg(usbatm, "%s: firmware %s loaded\n", __func__, usbatm->flags & UDSL_SKIP_HEAVY_INIT ? "already" : "not");
 
-        if (*need_heavy_init)
-                if ((ret = usb_reset_device(usb_dev)) < 0)
+        if (!(usbatm->flags & UDSL_SKIP_HEAVY_INIT))
+                if ((ret = usb_reset_device(usb_dev)) < 0) {
+                        usb_err(usbatm, "%s: device reset failed (%d)!\n", __func__, ret);
                         goto fail_free;
+                }
 
         usbatm->driver_data = instance;
 
@@ -787,15 +860,15 @@ static void speedtch_unbind(struct usbatm_data *usbatm, struct usb_interface *in
 ***********/
 
 static struct usbatm_driver speedtch_usbatm_driver = {
-        .owner          = THIS_MODULE,
         .driver_name    = speedtch_driver_name,
         .bind           = speedtch_bind,
         .heavy_init     = speedtch_heavy_init,
         .unbind         = speedtch_unbind,
         .atm_start      = speedtch_atm_start,
         .atm_stop       = speedtch_atm_stop,
-        .in             = ENDPOINT_DATA,
-        .out            = ENDPOINT_DATA
+        .bulk_in        = ENDPOINT_BULK_DATA,
+        .bulk_out       = ENDPOINT_BULK_DATA,
+        .isoc_in        = ENDPOINT_ISOC_DATA
 };
 
 static int speedtch_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index 7d2a679989ed..830d2c982670 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -63,11 +63,12 @@
 #include <linux/ctype.h>
 #include <linux/kthread.h>
 #include <linux/version.h>
+#include <linux/mutex.h>
 #include <asm/unaligned.h>
 
 #include "usbatm.h"
 
-#define EAGLEUSBVERSION "ueagle 1.1"
+#define EAGLEUSBVERSION "ueagle 1.2"
 
 
 /*
@@ -358,16 +359,19 @@ struct intr_pkt {
 #define INTR_PKT_SIZE 28
 
 static struct usb_driver uea_driver;
-static DECLARE_MUTEX(uea_semaphore);
+static DEFINE_MUTEX(uea_mutex);
 static const char *chip_name[] = {"ADI930", "Eagle I", "Eagle II", "Eagle III"};
 
 static int modem_index;
 static unsigned int debug;
+static int use_iso[NB_MODEM] = {[0 ... (NB_MODEM - 1)] = 1};
 static int sync_wait[NB_MODEM];
 static char *cmv_file[NB_MODEM];
 
 module_param(debug, uint, 0644);
 MODULE_PARM_DESC(debug, "module debug level (0=off,1=on,2=verbose)");
+module_param_array(use_iso, bool, NULL, 0644);
+MODULE_PARM_DESC(use_iso, "use isochronous usb pipe for incoming traffic");
 module_param_array(sync_wait, bool, NULL, 0644);
 MODULE_PARM_DESC(sync_wait, "wait the synchronisation before starting ATM");
 module_param_array(cmv_file, charp, NULL, 0644);
@@ -628,8 +632,7 @@ static int request_dsp(struct uea_softc *sc)
                         dsp_name = FW_DIR "DSPep.bin";
         }
 
-        ret = request_firmware(&sc->dsp_firm,
-                                dsp_name, &sc->usb_dev->dev);
+        ret = request_firmware(&sc->dsp_firm, dsp_name, &sc->usb_dev->dev);
         if (ret < 0) {
                 uea_err(INS_TO_USBDEV(sc),
                        "requesting firmware %s failed with error %d\n",
@@ -744,7 +747,6 @@ static inline int wait_cmv_ack(struct uea_softc *sc)
                 return ret;
 
         return (ret == 0) ? -ETIMEDOUT : 0;
-
 }
 
 #define UCDC_SEND_ENCAPSULATED_COMMAND 0x00
@@ -935,6 +937,7 @@ static int uea_stat(struct uea_softc *sc)
          * ADI930 don't support it (-EPIPE error).
          */
         if (UEA_CHIP_VERSION(sc) != ADI930
+                    && !use_iso[sc->modem_index]
                     && sc->stats.phy.dsrate != (data >> 16) * 32) {
                 /* Original timming from ADI(used in windows driver)
                  * 0x20ffff>>16 * 32 = 32 * 32 = 1Mbits
@@ -1010,7 +1013,7 @@ static int request_cmvs(struct uea_softc *sc,
         int ret, size;
         u8 *data;
         char *file;
-        static char cmv_name[256] = FW_DIR;
+        char cmv_name[FIRMWARE_NAME_MAX]; /* 30 bytes stack variable */
 
         if (cmv_file[sc->modem_index] == NULL) {
                 if (UEA_CHIP_VERSION(sc) == ADI930)
@@ -1184,8 +1187,7 @@ static int load_XILINX_firmware(struct uea_softc *sc)
                 }
         }
 
-        /* finish to send the fpga
-         */
+        /* finish to send the fpga */
         ret = uea_request(sc, 0xe, 1, 0, NULL);
         if (ret < 0) {
                 uea_err(INS_TO_USBDEV(sc),
@@ -1193,9 +1195,7 @@ static int load_XILINX_firmware(struct uea_softc *sc)
                 goto err1;
         }
 
-        /*
-         * Tell the modem we finish : de-assert reset
-         */
+        /* Tell the modem we finish : de-assert reset */
         value = 0;
         ret = uea_send_modem_cmd(sc->usb_dev, 0xe, 1, &value);
         if (ret < 0)
@@ -1209,6 +1209,7 @@ err0:
         return ret;
 }
 
+/* The modem send us an ack. First with check if it right */
 static void uea_dispatch_cmv(struct uea_softc *sc, struct cmv* cmv)
 {
         uea_enters(INS_TO_USBDEV(sc));
@@ -1268,23 +1269,19 @@ bad1:
  */
 static void uea_intr(struct urb *urb, struct pt_regs *regs)
 {
-        struct uea_softc *sc = (struct uea_softc *)urb->context;
-        struct intr_pkt *intr;
+        struct uea_softc *sc = urb->context;
+        struct intr_pkt *intr = urb->transfer_buffer;
         uea_enters(INS_TO_USBDEV(sc));
 
-        if (urb->status < 0) {
+        if (unlikely(urb->status < 0)) {
                 uea_err(INS_TO_USBDEV(sc), "uea_intr() failed with %d\n",
                        urb->status);
                 return;
         }
 
-        intr = (struct intr_pkt *) urb->transfer_buffer;
-
         /* device-to-host interrupt */
         if (intr->bType != 0x08 || sc->booting) {
-                uea_err(INS_TO_USBDEV(sc), "wrong intr\n");
-                // rebooting ?
-                // sc->reset = 1;
+                uea_err(INS_TO_USBDEV(sc), "wrong interrupt\n");
                 goto resubmit;
         }
 
@@ -1300,7 +1297,7 @@ static void uea_intr(struct urb *urb, struct pt_regs *regs)
                 break;
 
         default:
-                uea_err(INS_TO_USBDEV(sc), "unknown intr %u\n",
+                uea_err(INS_TO_USBDEV(sc), "unknown interrupt %u\n",
                        le16_to_cpu(intr->wInterrupt));
         }
 
@@ -1379,7 +1376,7 @@ static void uea_stop(struct uea_softc *sc)
         int ret;
         uea_enters(INS_TO_USBDEV(sc));
         ret = kthread_stop(sc->kthread);
-        uea_info(INS_TO_USBDEV(sc), "kthread finish with status %d\n", ret);
+        uea_dbg(INS_TO_USBDEV(sc), "kthread finish with status %d\n", ret);
 
         /* stop any pending boot process */
         flush_scheduled_work();
@@ -1418,13 +1415,13 @@ static ssize_t read_status(struct device *dev, struct device_attribute *attr,
         int ret = -ENODEV;
         struct uea_softc *sc;
 
-        down(&uea_semaphore);
+        mutex_lock(&uea_mutex);
         sc = dev_to_uea(dev);
         if (!sc)
                 goto out;
         ret = snprintf(buf, 10, "%08x\n", sc->stats.phy.state);
 out:
-        up(&uea_semaphore);
+        mutex_unlock(&uea_mutex);
         return ret;
 }
 
@@ -1434,14 +1431,14 @@ static ssize_t reboot(struct device *dev, struct device_attribute *attr,
         int ret = -ENODEV;
         struct uea_softc *sc;
 
-        down(&uea_semaphore);
+        mutex_lock(&uea_mutex);
         sc = dev_to_uea(dev);
         if (!sc)
                 goto out;
         sc->reset = 1;
         ret = count;
 out:
-        up(&uea_semaphore);
+        mutex_unlock(&uea_mutex);
         return ret;
 }
 
@@ -1453,7 +1450,7 @@ static ssize_t read_human_status(struct device *dev, struct device_attribute *at
         int ret = -ENODEV;
         struct uea_softc *sc;
 
-        down(&uea_semaphore);
+        mutex_lock(&uea_mutex);
         sc = dev_to_uea(dev);
         if (!sc)
                 goto out;
@@ -1473,7 +1470,7 @@ static ssize_t read_human_status(struct device *dev, struct device_attribute *at
                 break;
         }
 out:
-        up(&uea_semaphore);
+        mutex_unlock(&uea_mutex);
         return ret;
 }
 
@@ -1485,7 +1482,7 @@ static ssize_t read_delin(struct device *dev, struct device_attribute *attr,
         int ret = -ENODEV;
         struct uea_softc *sc;
 
-        down(&uea_semaphore);
+        mutex_lock(&uea_mutex);
         sc = dev_to_uea(dev);
         if (!sc)
                 goto out;
@@ -1497,7 +1494,7 @@ static ssize_t read_delin(struct device *dev, struct device_attribute *attr,
         else
                 ret = sprintf(buf, "GOOD\n");
 out:
-        up(&uea_semaphore);
+        mutex_unlock(&uea_mutex);
         return ret;
 }
 
@@ -1511,7 +1508,7 @@ static ssize_t read_##name(struct device *dev, 			\
         int ret = -ENODEV;                                      \
         struct uea_softc *sc;                                   \
                                                                 \
-        down(&uea_semaphore);                                   \
+        mutex_lock(&uea_mutex);                                         \
         sc = dev_to_uea(dev);                                   \
         if (!sc)                                                \
                 goto out;                                       \
@@ -1519,7 +1516,7 @@ static ssize_t read_##name(struct device *dev, 			\
         if (reset)                                              \
                 sc->stats.phy.name = 0;                         \
 out:                                                            \
-        up(&uea_semaphore);                                     \
+        mutex_unlock(&uea_mutex);                                       \
         return ret;                                             \
 }                                                               \
                                                                 \
@@ -1617,7 +1614,7 @@ static void create_fs_entries(struct uea_softc *sc, struct usb_interface *intf)
 }
 
 static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
-                   const struct usb_device_id *id, int *heavy)
+                   const struct usb_device_id *id)
 {
         struct usb_device *usb = interface_to_usbdev(intf);
         struct uea_softc *sc;
@@ -1629,16 +1626,14 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
         if (ifnum != UEA_INTR_IFACE_NO)
                 return -ENODEV;
 
-        *heavy = sync_wait[modem_index];
+        usbatm->flags = (sync_wait[modem_index] ? 0 : UDSL_SKIP_HEAVY_INIT);
 
         /* interface 1 is for outbound traffic */
         ret = claim_interface(usb, usbatm, UEA_US_IFACE_NO);
         if (ret < 0)
                 return ret;
 
-        /* ADI930 has only 2 interfaces and inbound traffic
-         * is on interface 1
-         */
+        /* ADI930 has only 2 interfaces and inbound traffic is on interface 1 */
         if (UEA_CHIP_VERSION(id) != ADI930) {
                 /* interface 2 is for inbound traffic */
                 ret = claim_interface(usb, usbatm, UEA_DS_IFACE_NO);
@@ -1658,6 +1653,25 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
         sc->modem_index = (modem_index < NB_MODEM) ? modem_index++ : 0;
         sc->driver_info = id->driver_info;
 
+        /* ADI930 don't support iso */
+        if (UEA_CHIP_VERSION(id) != ADI930 && use_iso[sc->modem_index]) {
+                int i;
+
+                /* try set fastest alternate for inbound traffic interface */
+                for (i = FASTEST_ISO_INTF; i > 0; i--)
+                        if (usb_set_interface(usb, UEA_DS_IFACE_NO, i) == 0)
+                                break;
+
+                if (i > 0) {
+                        uea_dbg(usb, "set alternate %d for 2 interface\n", i);
+                        uea_info(usb, "using iso mode\n");
+                        usbatm->flags |= UDSL_USE_ISOC | UDSL_IGNORE_EILSEQ;
+                } else {
+                        uea_err(usb, "setting any alternate failed for "
+                                        "2 interface, using bulk mode\n");
+                }
+        }
+
         ret = uea_boot(sc);
         if (ret < 0) {
                 kfree(sc);
@@ -1701,13 +1715,13 @@ static void uea_unbind(struct usbatm_data *usbatm, struct usb_interface *intf)
 
 static struct usbatm_driver uea_usbatm_driver = {
         .driver_name = "ueagle-atm",
-        .owner = THIS_MODULE,
         .bind = uea_bind,
         .atm_start = uea_atm_open,
         .unbind = uea_unbind,
         .heavy_init = uea_heavy,
-        .in = UEA_BULK_DATA_PIPE,
-        .out = UEA_BULK_DATA_PIPE,
+        .bulk_in = UEA_BULK_DATA_PIPE,
+        .bulk_out = UEA_BULK_DATA_PIPE,
+        .isoc_in = UEA_ISO_DATA_PIPE,
 };
 
 static int uea_probe(struct usb_interface *intf, const struct usb_device_id *id)
@@ -1738,9 +1752,9 @@ static void uea_disconnect(struct usb_interface *intf)
          * Pre-firmware device has one interface
          */
         if (usb->config->desc.bNumInterfaces != 1 && ifnum == 0) {
-                down(&uea_semaphore);
+                mutex_lock(&uea_mutex);
                 usbatm_usb_disconnect(intf);
-                up(&uea_semaphore);
+                mutex_unlock(&uea_mutex);
                 uea_info(usb, "ADSL device removed\n");
         }
 
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 7af1883d4bf9..c1211fc037d9 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -72,6 +72,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
@@ -91,19 +92,18 @@ static int usbatm_print_packet(const unsigned char *data, int len);
 #endif
 
 #define DRIVER_AUTHOR   "Johan Verrept, Duncan Sands <duncan.sands@free.fr>"
-#define DRIVER_VERSION  "1.9"
+#define DRIVER_VERSION  "1.10"
 #define DRIVER_DESC     "Generic USB ATM/DSL I/O, version " DRIVER_VERSION
 
 static const char usbatm_driver_name[] = "usbatm";
 
 #define UDSL_MAX_RCV_URBS               16
 #define UDSL_MAX_SND_URBS               16
-#define UDSL_MAX_RCV_BUF_SIZE           1024    /* ATM cells */
-#define UDSL_MAX_SND_BUF_SIZE           1024    /* ATM cells */
+#define UDSL_MAX_BUF_SIZE               64 * 1024       /* bytes */
 #define UDSL_DEFAULT_RCV_URBS           4
 #define UDSL_DEFAULT_SND_URBS           4
-#define UDSL_DEFAULT_RCV_BUF_SIZE       64      /* ATM cells */
-#define UDSL_DEFAULT_SND_BUF_SIZE       64      /* ATM cells */
+#define UDSL_DEFAULT_RCV_BUF_SIZE       64 * ATM_CELL_SIZE      /* bytes */
+#define UDSL_DEFAULT_SND_BUF_SIZE       64 * ATM_CELL_SIZE      /* bytes */
 
 #define ATM_CELL_HEADER                 (ATM_CELL_SIZE - ATM_CELL_PAYLOAD)
 
@@ -111,8 +111,8 @@ static const char usbatm_driver_name[] = "usbatm";
 
 static unsigned int num_rcv_urbs = UDSL_DEFAULT_RCV_URBS;
 static unsigned int num_snd_urbs = UDSL_DEFAULT_SND_URBS;
-static unsigned int rcv_buf_size = UDSL_DEFAULT_RCV_BUF_SIZE;
-static unsigned int snd_buf_size = UDSL_DEFAULT_SND_BUF_SIZE;
+static unsigned int rcv_buf_bytes = UDSL_DEFAULT_RCV_BUF_SIZE;
+static unsigned int snd_buf_bytes = UDSL_DEFAULT_SND_BUF_SIZE;
 
 module_param(num_rcv_urbs, uint, S_IRUGO);
 MODULE_PARM_DESC(num_rcv_urbs,
@@ -126,15 +126,15 @@ MODULE_PARM_DESC(num_snd_urbs,
                  __MODULE_STRING(UDSL_MAX_SND_URBS) ", default: "
                  __MODULE_STRING(UDSL_DEFAULT_SND_URBS) ")");
 
-module_param(rcv_buf_size, uint, S_IRUGO);
-MODULE_PARM_DESC(rcv_buf_size,
-                 "Size of the buffers used for reception in ATM cells (range: 1-"
-                 __MODULE_STRING(UDSL_MAX_RCV_BUF_SIZE) ", default: "
+module_param(rcv_buf_bytes, uint, S_IRUGO);
+MODULE_PARM_DESC(rcv_buf_bytes,
+                 "Size of the buffers used for reception, in bytes (range: 1-"
+                 __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: "
                  __MODULE_STRING(UDSL_DEFAULT_RCV_BUF_SIZE) ")");
 
-module_param(snd_buf_size, uint, S_IRUGO);
-MODULE_PARM_DESC(snd_buf_size,
-                 "Size of the buffers used for transmission in ATM cells (range: 1-"
+module_param(snd_buf_bytes, uint, S_IRUGO);
+MODULE_PARM_DESC(snd_buf_bytes,
+                 "Size of the buffers used for transmission, in bytes (range: 1-"
                  __MODULE_STRING(UDSL_MAX_SND_BUF_SIZE) ", default: "
                  __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")");
 
@@ -166,10 +166,10 @@ struct usbatm_control {
 
 /* ATM */
 
-static void usbatm_atm_dev_close(struct atm_dev *dev);
+static void usbatm_atm_dev_close(struct atm_dev *atm_dev);
 static int usbatm_atm_open(struct atm_vcc *vcc);
 static void usbatm_atm_close(struct atm_vcc *vcc);
-static int usbatm_atm_ioctl(struct atm_dev *dev, unsigned int cmd, void __user * arg);
+static int usbatm_atm_ioctl(struct atm_dev *atm_dev, unsigned int cmd, void __user * arg);
 static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb);
 static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *page);
 
@@ -199,7 +199,7 @@ static inline void usbatm_pop(struct atm_vcc *vcc, struct sk_buff *skb)
         if (vcc->pop)
                 vcc->pop(vcc, skb);
         else
-                dev_kfree_skb(skb);
+                dev_kfree_skb_any(skb);
 }
 
 
@@ -234,8 +234,9 @@ static int usbatm_submit_urb(struct urb *urb)
 
         ret = usb_submit_urb(urb, GFP_ATOMIC);
         if (ret) {
-                atm_dbg(channel->usbatm, "%s: urb 0x%p submission failed (%d)!\n",
-                        __func__, urb, ret);
+                if (printk_ratelimit())
+                        atm_warn(channel->usbatm, "%s: urb 0x%p submission failed (%d)!\n",
+                                __func__, urb, ret);
 
                 /* consider all errors transient and return the buffer back to the queue */
                 urb->status = -EAGAIN;
@@ -269,10 +270,16 @@ static void usbatm_complete(struct urb *urb, struct pt_regs *regs)
 
         spin_unlock_irqrestore(&channel->lock, flags);
 
-        if (unlikely(urb->status))
+        if (unlikely(urb->status) &&
+                        (!(channel->usbatm->flags & UDSL_IGNORE_EILSEQ) ||
+                         urb->status != -EILSEQ ))
+        {
+                if (printk_ratelimit())
+                        atm_warn(channel->usbatm, "%s: urb 0x%p failed (%d)!\n",
+                                __func__, urb, urb->status);
                 /* throttle processing in case of an error */
                 mod_timer(&channel->delay, jiffies + msecs_to_jiffies(THROTTLE_MSECS));
-        else
+        } else
                 tasklet_schedule(&channel->tasklet);
 }
 
@@ -284,129 +291,167 @@ static void usbatm_complete(struct urb *urb, struct pt_regs *regs)
 static inline struct usbatm_vcc_data *usbatm_find_vcc(struct usbatm_data *instance,
                                                   short vpi, int vci)
 {
-        struct usbatm_vcc_data *vcc;
+        struct usbatm_vcc_data *vcc_data;
 
-        list_for_each_entry(vcc, &instance->vcc_list, list)
-                if ((vcc->vci == vci) && (vcc->vpi == vpi))
-                        return vcc;
+        list_for_each_entry(vcc_data, &instance->vcc_list, list)
+                if ((vcc_data->vci == vci) && (vcc_data->vpi == vpi))
+                        return vcc_data;
         return NULL;
 }
 
-static void usbatm_extract_cells(struct usbatm_data *instance,
-                               unsigned char *source, unsigned int avail_data)
+static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char *source)
 {
-        struct usbatm_vcc_data *cached_vcc = NULL;
         struct atm_vcc *vcc;
         struct sk_buff *sarb;
-        unsigned int stride = instance->rx_channel.stride;
-        int vci, cached_vci = 0;
-        short vpi, cached_vpi = 0;
-        u8 pti;
+        short vpi = ((source[0] & 0x0f) << 4)  | (source[1] >> 4);
+        int vci = ((source[1] & 0x0f) << 12) | (source[2] << 4) | (source[3] >> 4);
+        u8 pti = ((source[3] & 0xe) >> 1);
 
-        for (; avail_data >= stride; avail_data -= stride, source += stride) {
-                vpi = ((source[0] & 0x0f) << 4)  | (source[1] >> 4);
-                vci = ((source[1] & 0x0f) << 12) | (source[2] << 4) | (source[3] >> 4);
-                pti = ((source[3] & 0xe) >> 1);
+        vdbg("%s: vpi %hd, vci %d, pti %d", __func__, vpi, vci, pti);
 
-                vdbg("%s: vpi %hd, vci %d, pti %d", __func__, vpi, vci, pti);
+        if ((vci != instance->cached_vci) || (vpi != instance->cached_vpi)) {
+                instance->cached_vpi = vpi;
+                instance->cached_vci = vci;
 
-                if ((vci != cached_vci) || (vpi != cached_vpi)) {
-                        cached_vpi = vpi;
-                        cached_vci = vci;
+                instance->cached_vcc = usbatm_find_vcc(instance, vpi, vci);
 
-                        cached_vcc = usbatm_find_vcc(instance, vpi, vci);
+                if (!instance->cached_vcc)
+                        atm_rldbg(instance, "%s: unknown vpi/vci (%hd/%d)!\n", __func__, vpi, vci);
+        }
 
-                        if (!cached_vcc)
-                                atm_dbg(instance, "%s: unknown vpi/vci (%hd/%d)!\n", __func__, vpi, vci);
-                }
+        if (!instance->cached_vcc)
+                return;
 
-                if (!cached_vcc)
-                        continue;
+        vcc = instance->cached_vcc->vcc;
 
-                vcc = cached_vcc->vcc;
+        /* OAM F5 end-to-end */
+        if (pti == ATM_PTI_E2EF5) {
+                if (printk_ratelimit())
+                        atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
+                                __func__, vpi, vci);
+                atomic_inc(&vcc->stats->rx_err);
+                return;
+        }
 
-                /* OAM F5 end-to-end */
-                if (pti == ATM_PTI_E2EF5) {
-                        atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", __func__, vpi, vci);
-                        atomic_inc(&vcc->stats->rx_err);
-                        continue;
-                }
+        sarb = instance->cached_vcc->sarb;
 
-                sarb = cached_vcc->sarb;
+        if (sarb->tail + ATM_CELL_PAYLOAD > sarb->end) {
+                atm_rldbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%p)!\n",
+                                __func__, sarb->len, vcc);
+                /* discard cells already received */
+                skb_trim(sarb, 0);
+                UDSL_ASSERT(sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);
+        }
 
-                if (sarb->tail + ATM_CELL_PAYLOAD > sarb->end) {
-                        atm_dbg(instance, "%s: buffer overrun (sarb->len %u, vcc: 0x%p)!\n",
-                                        __func__, sarb->len, vcc);
-                        /* discard cells already received */
-                        skb_trim(sarb, 0);
-                        UDSL_ASSERT(sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);
-                }
+        memcpy(sarb->tail, source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
+        __skb_put(sarb, ATM_CELL_PAYLOAD);
 
-                memcpy(sarb->tail, source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
-                __skb_put(sarb, ATM_CELL_PAYLOAD);
+        if (pti & 1) {
+                struct sk_buff *skb;
+                unsigned int length;
+                unsigned int pdu_length;
 
-                if (pti & 1) {
-                        struct sk_buff *skb;
-                        unsigned int length;
-                        unsigned int pdu_length;
+                length = (source[ATM_CELL_SIZE - 6] << 8) + source[ATM_CELL_SIZE - 5];
 
-                        length = (source[ATM_CELL_SIZE - 6] << 8) + source[ATM_CELL_SIZE - 5];
+                /* guard against overflow */
+                if (length > ATM_MAX_AAL5_PDU) {
+                        atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
+                                  __func__, length, vcc);
+                        atomic_inc(&vcc->stats->rx_err);
+                        goto out;
+                }
 
-                        /* guard against overflow */
-                        if (length > ATM_MAX_AAL5_PDU) {
-                                atm_dbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
-                                                __func__, length, vcc);
-                                atomic_inc(&vcc->stats->rx_err);
-                                goto out;
-                        }
+                pdu_length = usbatm_pdu_length(length);
 
-                        pdu_length = usbatm_pdu_length(length);
+                if (sarb->len < pdu_length) {
+                        atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
+                                  __func__, pdu_length, sarb->len, vcc);
+                        atomic_inc(&vcc->stats->rx_err);
+                        goto out;
+                }
 
-                        if (sarb->len < pdu_length) {
-                                atm_dbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
-                                                __func__, pdu_length, sarb->len, vcc);
-                                atomic_inc(&vcc->stats->rx_err);
-                                goto out;
-                        }
+                if (crc32_be(~0, sarb->tail - pdu_length, pdu_length) != 0xc704dd7b) {
+                        atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
+                                  __func__, vcc);
+                        atomic_inc(&vcc->stats->rx_err);
+                        goto out;
+                }
 
-                        if (crc32_be(~0, sarb->tail - pdu_length, pdu_length) != 0xc704dd7b) {
-                                atm_dbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
-                                                __func__, vcc);
-                                atomic_inc(&vcc->stats->rx_err);
-                                goto out;
-                        }
+                vdbg("%s: got packet (length: %u, pdu_length: %u, vcc: 0x%p)", __func__, length, pdu_length, vcc);
 
-                        vdbg("%s: got packet (length: %u, pdu_length: %u, vcc: 0x%p)", __func__, length, pdu_length, vcc);
+                if (!(skb = dev_alloc_skb(length))) {
+                        if (printk_ratelimit())
+                                atm_err(instance, "%s: no memory for skb (length: %u)!\n",
+                                        __func__, length);
+                        atomic_inc(&vcc->stats->rx_drop);
+                        goto out;
+                }
 
-                        if (!(skb = dev_alloc_skb(length))) {
-                                atm_dbg(instance, "%s: no memory for skb (length: %u)!\n", __func__, length);
-                                atomic_inc(&vcc->stats->rx_drop);
-                                goto out;
-                        }
+                vdbg("%s: allocated new sk_buff (skb: 0x%p, skb->truesize: %u)", __func__, skb, skb->truesize);
 
-                        vdbg("%s: allocated new sk_buff (skb: 0x%p, skb->truesize: %u)", __func__, skb, skb->truesize);
+                if (!atm_charge(vcc, skb->truesize)) {
+                        atm_rldbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n",
+                                  __func__, skb->truesize);
+                        dev_kfree_skb_any(skb);
+                        goto out;       /* atm_charge increments rx_drop */
+                }
 
-                        if (!atm_charge(vcc, skb->truesize)) {
-                                atm_dbg(instance, "%s: failed atm_charge (skb->truesize: %u)!\n", __func__, skb->truesize);
-                                dev_kfree_skb(skb);
-                                goto out;       /* atm_charge increments rx_drop */
-                        }
+                memcpy(skb->data, sarb->tail - pdu_length, length);
+                __skb_put(skb, length);
 
-                        memcpy(skb->data, sarb->tail - pdu_length, length);
-                        __skb_put(skb, length);
+                vdbg("%s: sending skb 0x%p, skb->len %u, skb->truesize %u",
+                     __func__, skb, skb->len, skb->truesize);
 
-                        vdbg("%s: sending skb 0x%p, skb->len %u, skb->truesize %u",
-                             __func__, skb, skb->len, skb->truesize);
+                PACKETDEBUG(skb->data, skb->len);
 
-                        PACKETDEBUG(skb->data, skb->len);
+                vcc->push(vcc, skb);
 
-                        vcc->push(vcc, skb);
+                atomic_inc(&vcc->stats->rx);
+        out:
+                skb_trim(sarb, 0);
+        }
+}
 
-                        atomic_inc(&vcc->stats->rx);
-                out:
-                        skb_trim(sarb, 0);
+static void usbatm_extract_cells(struct usbatm_data *instance,
+                unsigned char *source, unsigned int avail_data)
+{
+        unsigned int stride = instance->rx_channel.stride;
+        unsigned int buf_usage = instance->buf_usage;
+
+        /* extract cells from incoming data, taking into account that
+         * the length of avail data may not be a multiple of stride */
+
+        if (buf_usage > 0) {
+                /* we have a partially received atm cell */
+                unsigned char *cell_buf = instance->cell_buf;
+                unsigned int space_left = stride - buf_usage;
+
+                UDSL_ASSERT(buf_usage <= stride);
+
+                if (avail_data >= space_left) {
+                        /* add new data and process cell */
+                        memcpy(cell_buf + buf_usage, source, space_left);
+                        source += space_left;
+                        avail_data -= space_left;
+                        usbatm_extract_one_cell(instance, cell_buf);
+                        instance->buf_usage = 0;
+                } else {
+                        /* not enough data to fill the cell */
+                        memcpy(cell_buf + buf_usage, source, avail_data);
+                        instance->buf_usage = buf_usage + avail_data;
+                        return;
                 }
         }
+
+        for (; avail_data >= stride; avail_data -= stride, source += stride)
+                usbatm_extract_one_cell(instance, source);
+
+        if (avail_data > 0) {
+                /* length was not a multiple of stride -
+                 * save remaining data for next call */
+                memcpy(instance->cell_buf, source, avail_data);
+                instance->buf_usage = avail_data;
+        }
 }
 
 
@@ -420,14 +465,14 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance,
 {
         struct usbatm_control *ctrl = UDSL_SKB(skb);
         struct atm_vcc *vcc = ctrl->atm.vcc;
-        unsigned int num_written;
+        unsigned int bytes_written;
         unsigned int stride = instance->tx_channel.stride;
 
         vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space);
         UDSL_ASSERT(!(avail_space % stride));
 
-        for (num_written = 0; num_written < avail_space && ctrl->len;
-             num_written += stride, target += stride) {
+        for (bytes_written = 0; bytes_written < avail_space && ctrl->len;
+             bytes_written += stride, target += stride) {
                 unsigned int data_len = min_t(unsigned int, skb->len, ATM_CELL_PAYLOAD);
                 unsigned int left = ATM_CELL_PAYLOAD - data_len;
                 u8 *ptr = target;
@@ -470,7 +515,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance,
                         ctrl->crc = crc32_be(ctrl->crc, ptr, left);
         }
 
-        return num_written;
+        return bytes_written;
 }
 
 
@@ -487,16 +532,40 @@ static void usbatm_rx_process(unsigned long data)
                 vdbg("%s: processing urb 0x%p", __func__, urb);
 
                 if (usb_pipeisoc(urb->pipe)) {
+                        unsigned char *merge_start = NULL;
+                        unsigned int merge_length = 0;
+                        const unsigned int packet_size = instance->rx_channel.packet_size;
                         int i;
-                        for (i = 0; i < urb->number_of_packets; i++)
-                                if (!urb->iso_frame_desc[i].status)
-                                        usbatm_extract_cells(instance,
-                                                             (u8 *)urb->transfer_buffer + urb->iso_frame_desc[i].offset,
-                                                             urb->iso_frame_desc[i].actual_length);
-                }
-                else
+
+                        for (i = 0; i < urb->number_of_packets; i++) {
+                                if (!urb->iso_frame_desc[i].status) {
+                                        unsigned int actual_length = urb->iso_frame_desc[i].actual_length;
+
+                                        UDSL_ASSERT(actual_length <= packet_size);
+
+                                        if (!merge_length)
+                                                merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
+                                        merge_length += actual_length;
+                                        if (merge_length && (actual_length < packet_size)) {
+                                                usbatm_extract_cells(instance, merge_start, merge_length);
+                                                merge_length = 0;
+                                        }
+                                } else {
+                                        atm_rldbg(instance, "%s: status %d in frame %d!\n", __func__, urb->status, i);
+                                        if (merge_length)
+                                                usbatm_extract_cells(instance, merge_start, merge_length);
+                                        merge_length = 0;
+                                        instance->buf_usage = 0;
+                                }
+                        }
+
+                        if (merge_length)
+                                usbatm_extract_cells(instance, merge_start, merge_length);
+                } else
                         if (!urb->status)
                                 usbatm_extract_cells(instance, urb->transfer_buffer, urb->actual_length);
+                        else
+                                instance->buf_usage = 0;
 
                 if (usbatm_submit_urb(urb))
                         return;
@@ -514,7 +583,7 @@ static void usbatm_tx_process(unsigned long data)
         struct sk_buff *skb = instance->current_skb;
         struct urb *urb = NULL;
         const unsigned int buf_size = instance->tx_channel.buf_size;
-        unsigned int num_written = 0;
+        unsigned int bytes_written = 0;
         u8 *buffer = NULL;
 
         if (!skb)
@@ -526,16 +595,16 @@ static void usbatm_tx_process(unsigned long data)
                         if (!urb)
                                 break;          /* no more senders */
                         buffer = urb->transfer_buffer;
-                        num_written = (urb->status == -EAGAIN) ?
+                        bytes_written = (urb->status == -EAGAIN) ?
                                 urb->transfer_buffer_length : 0;
                 }
 
-                num_written += usbatm_write_cells(instance, skb,
-                                                  buffer + num_written,
-                                                  buf_size - num_written);
+                bytes_written += usbatm_write_cells(instance, skb,
+                                                  buffer + bytes_written,
+                                                  buf_size - bytes_written);
 
                 vdbg("%s: wrote %u bytes from skb 0x%p to urb 0x%p",
-                     __func__, num_written, skb, urb);
+                     __func__, bytes_written, skb, urb);
 
                 if (!UDSL_SKB(skb)->len) {
                         struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
@@ -546,8 +615,8 @@ static void usbatm_tx_process(unsigned long data)
                         skb = skb_dequeue(&instance->sndqueue);
                 }
 
-                if (num_written == buf_size || (!skb && num_written)) {
-                        urb->transfer_buffer_length = num_written;
+                if (bytes_written == buf_size || (!skb && bytes_written)) {
+                        urb->transfer_buffer_length = bytes_written;
 
                         if (usbatm_submit_urb(urb))
                                 break;
@@ -593,20 +662,24 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
 
         vdbg("%s called (skb 0x%p, len %u)", __func__, skb, skb->len);
 
-        if (!instance) {
-                dbg("%s: NULL data!", __func__);
+        /* racy disconnection check - fine */
+        if (!instance || instance->disconnected) {
+#ifdef DEBUG
+                if (printk_ratelimit())
+                        printk(KERN_DEBUG "%s: %s!\n", __func__, instance ? "disconnected" : "NULL instance");
+#endif
                 err = -ENODEV;
                 goto fail;
         }
 
         if (vcc->qos.aal != ATM_AAL5) {
-                atm_dbg(instance, "%s: unsupported ATM type %d!\n", __func__, vcc->qos.aal);
+                atm_rldbg(instance, "%s: unsupported ATM type %d!\n", __func__, vcc->qos.aal);
                 err = -EINVAL;
                 goto fail;
         }
 
         if (skb->len > ATM_MAX_AAL5_PDU) {
-                atm_dbg(instance, "%s: packet too long (%d vs %d)!\n",
+                atm_rldbg(instance, "%s: packet too long (%d vs %d)!\n",
                                 __func__, skb->len, ATM_MAX_AAL5_PDU);
                 err = -EINVAL;
                 goto fail;
@@ -665,16 +738,16 @@ static void usbatm_put_instance(struct usbatm_data *instance)
 **  ATM  **
 **********/
 
-static void usbatm_atm_dev_close(struct atm_dev *dev)
+static void usbatm_atm_dev_close(struct atm_dev *atm_dev)
 {
-        struct usbatm_data *instance = dev->dev_data;
+        struct usbatm_data *instance = atm_dev->dev_data;
 
         dbg("%s", __func__);
 
         if (!instance)
                 return;
 
-        dev->dev_data = NULL;
+        atm_dev->dev_data = NULL; /* catch bugs */
         usbatm_put_instance(instance);  /* taken in usbatm_atm_init */
 }
 
@@ -706,15 +779,19 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
                                atomic_read(&atm_dev->stats.aal5.rx_err),
                                atomic_read(&atm_dev->stats.aal5.rx_drop));
 
-        if (!left--)
-                switch (atm_dev->signal) {
-                case ATM_PHY_SIG_FOUND:
-                        return sprintf(page, "Line up\n");
-                case ATM_PHY_SIG_LOST:
-                        return sprintf(page, "Line down\n");
-                default:
-                        return sprintf(page, "Line state unknown\n");
-                }
+        if (!left--) {
+                if (instance->disconnected)
+                        return sprintf(page, "Disconnected\n");
+                else
+                        switch (atm_dev->signal) {
+                        case ATM_PHY_SIG_FOUND:
+                                return sprintf(page, "Line up\n");
+                        case ATM_PHY_SIG_LOST:
+                                return sprintf(page, "Line down\n");
+                        default:
+                                return sprintf(page, "Line state unknown\n");
+                        }
+        }
 
         return 0;
 }
@@ -735,13 +812,24 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
         atm_dbg(instance, "%s: vpi %hd, vci %d\n", __func__, vpi, vci);
 
         /* only support AAL5 */
-        if ((vcc->qos.aal != ATM_AAL5) || (vcc->qos.rxtp.max_sdu < 0)
-            || (vcc->qos.rxtp.max_sdu > ATM_MAX_AAL5_PDU)) {
-                atm_dbg(instance, "%s: unsupported ATM type %d!\n", __func__, vcc->qos.aal);
+        if ((vcc->qos.aal != ATM_AAL5)) {
+                atm_warn(instance, "%s: unsupported ATM type %d!\n", __func__, vcc->qos.aal);
+                return -EINVAL;
+        }
+
+        /* sanity checks */
+        if ((vcc->qos.rxtp.max_sdu < 0) || (vcc->qos.rxtp.max_sdu > ATM_MAX_AAL5_PDU)) {
+                atm_dbg(instance, "%s: max_sdu %d out of range!\n", __func__, vcc->qos.rxtp.max_sdu);
                 return -EINVAL;
         }
 
-        down(&instance->serialize);     /* vs self, usbatm_atm_close */
+        mutex_lock(&instance->serialize);       /* vs self, usbatm_atm_close, usbatm_usb_disconnect */
+
+        if (instance->disconnected) {
+                atm_dbg(instance, "%s: disconnected!\n", __func__);
+                ret = -ENODEV;
+                goto fail;
+        }
 
         if (usbatm_find_vcc(instance, vpi, vci)) {
                 atm_dbg(instance, "%s: %hd/%d already in use!\n", __func__, vpi, vci);
@@ -749,20 +837,19 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
                 goto fail;
         }
 
-        if (!(new = kmalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL))) {
-                atm_dbg(instance, "%s: no memory for vcc_data!\n", __func__);
+        if (!(new = kzalloc(sizeof(struct usbatm_vcc_data), GFP_KERNEL))) {
+                atm_err(instance, "%s: no memory for vcc_data!\n", __func__);
                 ret = -ENOMEM;
                 goto fail;
         }
 
-        memset(new, 0, sizeof(struct usbatm_vcc_data));
         new->vcc = vcc;
         new->vpi = vpi;
         new->vci = vci;
 
         new->sarb = alloc_skb(usbatm_pdu_length(vcc->qos.rxtp.max_sdu), GFP_KERNEL);
         if (!new->sarb) {
-                atm_dbg(instance, "%s: no memory for SAR buffer!\n", __func__);
+                atm_err(instance, "%s: no memory for SAR buffer!\n", __func__);
                 ret = -ENOMEM;
                 goto fail;
         }
@@ -770,6 +857,9 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
         vcc->dev_data = new;
 
         tasklet_disable(&instance->rx_channel.tasklet);
+        instance->cached_vcc = new;
+        instance->cached_vpi = vpi;
+        instance->cached_vci = vci;
         list_add(&new->list, &instance->vcc_list);
         tasklet_enable(&instance->rx_channel.tasklet);
 
@@ -777,7 +867,7 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
         set_bit(ATM_VF_PARTIAL, &vcc->flags);
         set_bit(ATM_VF_READY, &vcc->flags);
 
-        up(&instance->serialize);
+        mutex_unlock(&instance->serialize);
 
         atm_dbg(instance, "%s: allocated vcc data 0x%p\n", __func__, new);
 
@@ -785,7 +875,7 @@ static int usbatm_atm_open(struct atm_vcc *vcc)
 
 fail:
         kfree(new);
-        up(&instance->serialize);
+        mutex_unlock(&instance->serialize);
         return ret;
 }
 
@@ -806,9 +896,14 @@ static void usbatm_atm_close(struct atm_vcc *vcc)
 
         usbatm_cancel_send(instance, vcc);
 
-        down(&instance->serialize);     /* vs self, usbatm_atm_open */
+        mutex_lock(&instance->serialize);       /* vs self, usbatm_atm_open, usbatm_usb_disconnect */
 
         tasklet_disable(&instance->rx_channel.tasklet);
+        if (instance->cached_vcc == vcc_data) {
+                instance->cached_vcc = NULL;
+                instance->cached_vpi = ATM_VPI_UNSPEC;
+                instance->cached_vci = ATM_VCI_UNSPEC;
+        }
         list_del(&vcc_data->list);
         tasklet_enable(&instance->rx_channel.tasklet);
 
@@ -824,14 +919,21 @@ static void usbatm_atm_close(struct atm_vcc *vcc)
         clear_bit(ATM_VF_PARTIAL, &vcc->flags);
         clear_bit(ATM_VF_ADDR, &vcc->flags);
 
-        up(&instance->serialize);
+        mutex_unlock(&instance->serialize);
 
         atm_dbg(instance, "%s successful\n", __func__);
 }
 
-static int usbatm_atm_ioctl(struct atm_dev *dev, unsigned int cmd,
+static int usbatm_atm_ioctl(struct atm_dev *atm_dev, unsigned int cmd,
                           void __user * arg)
 {
+        struct usbatm_data *instance = atm_dev->dev_data;
+
+        if (!instance || instance->disconnected) {
+                dbg("%s: %s!", __func__, instance ? "disconnected" : "NULL instance");
+                return -ENODEV;
+        }
+
         switch (cmd) {
         case ATM_QUERYLOOP:
                 return put_user(ATM_LM_NONE, (int __user *)arg) ? -EFAULT : 0;
@@ -845,10 +947,13 @@ static int usbatm_atm_init(struct usbatm_data *instance)
         struct atm_dev *atm_dev;
         int ret, i;
 
-        /* ATM init */
+        /* ATM init.  The ATM initialization scheme suffers from an intrinsic race
+         * condition: callbacks we register can be executed at once, before we have
+         * initialized the struct atm_dev.  To protect against this, all callbacks
+         * abort if atm_dev->dev_data is NULL. */
         atm_dev = atm_dev_register(instance->driver_name, &usbatm_atm_devops, -1, NULL);
         if (!atm_dev) {
-                usb_dbg(instance, "%s: failed to register ATM device!\n", __func__);
+                usb_err(instance, "%s: failed to register ATM device!\n", __func__);
                 return -1;
         }
 
@@ -862,12 +967,13 @@ static int usbatm_atm_init(struct usbatm_data *instance)
         atm_dev->link_rate = 128 * 1000 / 424;
 
         if (instance->driver->atm_start && ((ret = instance->driver->atm_start(instance, atm_dev)) < 0)) {
-                atm_dbg(instance, "%s: atm_start failed: %d!\n", __func__, ret);
+                atm_err(instance, "%s: atm_start failed: %d!\n", __func__, ret);
                 goto fail;
         }
 
-        /* ready for ATM callbacks */
         usbatm_get_instance(instance);  /* dropped in usbatm_atm_dev_close */
+
+        /* ready for ATM callbacks */
         mb();
         atm_dev->dev_data = instance;
 
@@ -903,9 +1009,9 @@ static int usbatm_do_heavy_init(void *arg)
         if (!ret)
                 ret = usbatm_atm_init(instance);
 
-        down(&instance->serialize);
+        mutex_lock(&instance->serialize);
         instance->thread_pid = -1;
-        up(&instance->serialize);
+        mutex_unlock(&instance->serialize);
 
         complete_and_exit(&instance->thread_exited, ret);
 }
@@ -915,13 +1021,13 @@ static int usbatm_heavy_init(struct usbatm_data *instance)
         int ret = kernel_thread(usbatm_do_heavy_init, instance, CLONE_KERNEL);
 
         if (ret < 0) {
-                usb_dbg(instance, "%s: failed to create kernel_thread (%d)!\n", __func__, ret);
+                usb_err(instance, "%s: failed to create kernel_thread (%d)!\n", __func__, ret);
                 return ret;
         }
 
-        down(&instance->serialize);
+        mutex_lock(&instance->serialize);
         instance->thread_pid = ret;
-        up(&instance->serialize);
+        mutex_unlock(&instance->serialize);
 
         wait_for_completion(&instance->thread_started);
 
@@ -951,9 +1057,9 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
         char *buf;
         int error = -ENOMEM;
         int i, length;
-        int need_heavy;
+        unsigned int maxpacket, num_packets;
 
-        dev_dbg(dev, "%s: trying driver %s with vendor=0x%x, product=0x%x, ifnum %d\n",
+        dev_dbg(dev, "%s: trying driver %s with vendor=%04x, product=%04x, ifnum %2d\n",
                         __func__, driver->driver_name,
                         le16_to_cpu(usb_dev->descriptor.idVendor),
                         le16_to_cpu(usb_dev->descriptor.idProduct),
@@ -962,7 +1068,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
         /* instance init */
         instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
         if (!instance) {
-                dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
+                dev_err(dev, "%s: no memory for instance data!\n", __func__);
                 return -ENOMEM;
         }
 
@@ -996,66 +1102,96 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
         snprintf(buf, length, ")");
 
  bind:
-        need_heavy = 1;
-        if (driver->bind && (error = driver->bind(instance, intf, id, &need_heavy)) < 0) {
-                        dev_dbg(dev, "%s: bind failed: %d!\n", __func__, error);
+        if (driver->bind && (error = driver->bind(instance, intf, id)) < 0) {
+                        dev_err(dev, "%s: bind failed: %d!\n", __func__, error);
                         goto fail_free;
         }
 
         /* private fields */
 
         kref_init(&instance->refcount);         /* dropped in usbatm_usb_disconnect */
-        init_MUTEX(&instance->serialize);
+        mutex_init(&instance->serialize);
 
         instance->thread_pid = -1;
         init_completion(&instance->thread_started);
         init_completion(&instance->thread_exited);
 
         INIT_LIST_HEAD(&instance->vcc_list);
+        skb_queue_head_init(&instance->sndqueue);
 
         usbatm_init_channel(&instance->rx_channel);
         usbatm_init_channel(&instance->tx_channel);
         tasklet_init(&instance->rx_channel.tasklet, usbatm_rx_process, (unsigned long)instance);
         tasklet_init(&instance->tx_channel.tasklet, usbatm_tx_process, (unsigned long)instance);
-        instance->rx_channel.endpoint = usb_rcvbulkpipe(usb_dev, driver->in);
-        instance->tx_channel.endpoint = usb_sndbulkpipe(usb_dev, driver->out);
         instance->rx_channel.stride = ATM_CELL_SIZE + driver->rx_padding;
         instance->tx_channel.stride = ATM_CELL_SIZE + driver->tx_padding;
-        instance->rx_channel.buf_size = rcv_buf_size * instance->rx_channel.stride;
-        instance->tx_channel.buf_size = snd_buf_size * instance->tx_channel.stride;
         instance->rx_channel.usbatm = instance->tx_channel.usbatm = instance;
 
-        skb_queue_head_init(&instance->sndqueue);
+        if ((instance->flags & UDSL_USE_ISOC) && driver->isoc_in)
+                instance->rx_channel.endpoint = usb_rcvisocpipe(usb_dev, driver->isoc_in);
+        else
+                instance->rx_channel.endpoint = usb_rcvbulkpipe(usb_dev, driver->bulk_in);
+
+        instance->tx_channel.endpoint = usb_sndbulkpipe(usb_dev, driver->bulk_out);
+
+        /* tx buffer size must be a positive multiple of the stride */
+        instance->tx_channel.buf_size = max (instance->tx_channel.stride,
+                        snd_buf_bytes - (snd_buf_bytes % instance->tx_channel.stride));
+
+        /* rx buffer size must be a positive multiple of the endpoint maxpacket */
+        maxpacket = usb_maxpacket(usb_dev, instance->rx_channel.endpoint, 0);
+
+        if ((maxpacket < 1) || (maxpacket > UDSL_MAX_BUF_SIZE)) {
+                dev_err(dev, "%s: invalid endpoint %02x!\n", __func__,
+                                usb_pipeendpoint(instance->rx_channel.endpoint));
+                error = -EINVAL;
+                goto fail_unbind;
+        }
+
+        num_packets = max (1U, (rcv_buf_bytes + maxpacket / 2) / maxpacket); /* round */
+
+        if (num_packets * maxpacket > UDSL_MAX_BUF_SIZE)
+                num_packets--;
+
+        instance->rx_channel.buf_size = num_packets * maxpacket;
+        instance->rx_channel.packet_size = maxpacket;
+
+#ifdef DEBUG
+        for (i = 0; i < 2; i++) {
+                struct usbatm_channel *channel = i ?
+                        &instance->tx_channel : &instance->rx_channel;
+
+                dev_dbg(dev, "%s: using %d byte buffer for %s channel 0x%p\n", __func__, channel->buf_size, i ? "tx" : "rx", channel);
+        }
+#endif
+
+        /* initialize urbs */
 
         for (i = 0; i < num_rcv_urbs + num_snd_urbs; i++) {
-                struct urb *urb;
                 u8 *buffer;
-                unsigned int iso_packets = 0, iso_size = 0;
                 struct usbatm_channel *channel = i < num_rcv_urbs ?
                         &instance->rx_channel : &instance->tx_channel;
+                struct urb *urb;
+                unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0;
 
-                if (usb_pipeisoc(channel->endpoint)) {
-                        /* don't expect iso out endpoints */
-                        iso_size = usb_maxpacket(instance->usb_dev, channel->endpoint, 0);
-                        iso_size -= iso_size % channel->stride; /* alignment */
-                        BUG_ON(!iso_size);
-                        iso_packets = (channel->buf_size - 1) / iso_size + 1;
-                }
+                UDSL_ASSERT(!usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint));
 
                 urb = usb_alloc_urb(iso_packets, GFP_KERNEL);
                 if (!urb) {
-                        dev_dbg(dev, "%s: no memory for urb %d!\n", __func__, i);
+                        dev_err(dev, "%s: no memory for urb %d!\n", __func__, i);
+                        error = -ENOMEM;
                         goto fail_unbind;
                 }
 
                 instance->urbs[i] = urb;
 
-                buffer = kmalloc(channel->buf_size, GFP_KERNEL);
+                /* zero the tx padding to avoid leaking information */
+                buffer = kzalloc(channel->buf_size, GFP_KERNEL);
                 if (!buffer) {
-                        dev_dbg(dev, "%s: no memory for buffer %d!\n", __func__, i);
+                        dev_err(dev, "%s: no memory for buffer %d!\n", __func__, i);
+                        error = -ENOMEM;
                         goto fail_unbind;
                 }
-                memset(buffer, 0, channel->buf_size);
 
                 usb_fill_bulk_urb(urb, instance->usb_dev, channel->endpoint,
                                   buffer, channel->buf_size, usbatm_complete, channel);
@@ -1065,9 +1201,8 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
                         urb->transfer_flags = URB_ISO_ASAP;
                         urb->number_of_packets = iso_packets;
                         for (j = 0; j < iso_packets; j++) {
-                                urb->iso_frame_desc[j].offset = iso_size * j;
-                                urb->iso_frame_desc[j].length = min_t(int, iso_size,
-                                                                      channel->buf_size - urb->iso_frame_desc[j].offset);
+                                urb->iso_frame_desc[j].offset = channel->packet_size * j;
+                                urb->iso_frame_desc[j].length = channel->packet_size;
                         }
                 }
 
@@ -1079,7 +1214,17 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
                      __func__, urb->transfer_buffer, urb->transfer_buffer_length, urb);
         }
 
-        if (need_heavy && driver->heavy_init) {
+        instance->cached_vpi = ATM_VPI_UNSPEC;
+        instance->cached_vci = ATM_VCI_UNSPEC;
+        instance->cell_buf = kmalloc(instance->rx_channel.stride, GFP_KERNEL);
+
+        if (!instance->cell_buf) {
+                dev_err(dev, "%s: no memory for cell buffer!\n", __func__);
+                error = -ENOMEM;
+                goto fail_unbind;
+        }
+
+        if (!(instance->flags & UDSL_SKIP_HEAVY_INIT) && driver->heavy_init) {
                 error = usbatm_heavy_init(instance);
         } else {
                 complete(&instance->thread_exited);     /* pretend that heavy_init was run */
@@ -1098,6 +1243,8 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
         if (instance->driver->unbind)
                 instance->driver->unbind(instance, intf);
  fail_free:
+        kfree(instance->cell_buf);
+
         for (i = 0; i < num_rcv_urbs + num_snd_urbs; i++) {
                 if (instance->urbs[i])
                         kfree(instance->urbs[i]->transfer_buffer);
@@ -1114,6 +1261,7 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
 {
         struct device *dev = &intf->dev;
         struct usbatm_data *instance = usb_get_intfdata(intf);
+        struct usbatm_vcc_data *vcc_data;
         int i;
 
         dev_dbg(dev, "%s entered\n", __func__);
@@ -1125,13 +1273,19 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
 
         usb_set_intfdata(intf, NULL);
 
-        down(&instance->serialize);
+        mutex_lock(&instance->serialize);
+        instance->disconnected = 1;
         if (instance->thread_pid >= 0)
                 kill_proc(instance->thread_pid, SIGTERM, 1);
-        up(&instance->serialize);
+        mutex_unlock(&instance->serialize);
 
         wait_for_completion(&instance->thread_exited);
 
+        mutex_lock(&instance->serialize);
+        list_for_each_entry(vcc_data, &instance->vcc_list, list)
+                vcc_release_async(vcc_data->vcc, -EPIPE);
+        mutex_unlock(&instance->serialize);
+
         tasklet_disable(&instance->rx_channel.tasklet);
         tasklet_disable(&instance->tx_channel.tasklet);
 
@@ -1141,6 +1295,14 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
         del_timer_sync(&instance->rx_channel.delay);
         del_timer_sync(&instance->tx_channel.delay);
 
+        /* turn usbatm_[rt]x_process into something close to a no-op */
+        /* no need to take the spinlock */
+        INIT_LIST_HEAD(&instance->rx_channel.list);
+        INIT_LIST_HEAD(&instance->tx_channel.list);
+
+        tasklet_enable(&instance->rx_channel.tasklet);
+        tasklet_enable(&instance->tx_channel.tasklet);
+
         if (instance->atm_dev && instance->driver->atm_stop)
                 instance->driver->atm_stop(instance, instance->atm_dev);
 
@@ -1149,19 +1311,13 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
 
         instance->driver_data = NULL;
 
-        /* turn usbatm_[rt]x_process into noop */
-        /* no need to take the spinlock */
-        INIT_LIST_HEAD(&instance->rx_channel.list);
-        INIT_LIST_HEAD(&instance->tx_channel.list);
-
-        tasklet_enable(&instance->rx_channel.tasklet);
-        tasklet_enable(&instance->tx_channel.tasklet);
-
         for (i = 0; i < num_rcv_urbs + num_snd_urbs; i++) {
                 kfree(instance->urbs[i]->transfer_buffer);
                 usb_free_urb(instance->urbs[i]);
         }
 
+        kfree(instance->cell_buf);
+
         /* ATM finalize */
         if (instance->atm_dev)
                 atm_dev_deregister(instance->atm_dev);
@@ -1186,10 +1342,10 @@ static int __init usbatm_usb_init(void)
 
         if ((num_rcv_urbs > UDSL_MAX_RCV_URBS)
             || (num_snd_urbs > UDSL_MAX_SND_URBS)
-            || (rcv_buf_size < 1)
-            || (rcv_buf_size > UDSL_MAX_RCV_BUF_SIZE)
-            || (snd_buf_size < 1)
-            || (snd_buf_size > UDSL_MAX_SND_BUF_SIZE))
+            || (rcv_buf_bytes < 1)
+            || (rcv_buf_bytes > UDSL_MAX_BUF_SIZE)
+            || (snd_buf_bytes < 1)
+            || (snd_buf_bytes > UDSL_MAX_BUF_SIZE))
                 return -EINVAL;
 
         return 0;
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index 1adacd60d713..ff8551e93372 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -24,21 +24,21 @@
 #ifndef _USBATM_H_
 #define _USBATM_H_
 
-#include <linux/config.h>
-
-/*
-#define VERBOSE_DEBUG
-*/
-
 #include <asm/semaphore.h>
 #include <linux/atm.h>
 #include <linux/atmdev.h>
 #include <linux/completion.h>
 #include <linux/device.h>
+#include <linux/kernel.h>
 #include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/stringify.h>
 #include <linux/usb.h>
+#include <linux/mutex.h>
+
+/*
+#define VERBOSE_DEBUG
+*/
 
 #ifdef DEBUG
 #define UDSL_ASSERT(x)  BUG_ON(!(x))
@@ -52,8 +52,13 @@
         dev_info(&(instance)->usb_intf->dev , format , ## arg)
 #define usb_warn(instance, format, arg...)      \
         dev_warn(&(instance)->usb_intf->dev , format , ## arg)
+#ifdef DEBUG
 #define usb_dbg(instance, format, arg...)       \
-        dev_dbg(&(instance)->usb_intf->dev , format , ## arg)
+        dev_printk(KERN_DEBUG , &(instance)->usb_intf->dev , format , ## arg)
+#else
+#define usb_dbg(instance, format, arg...)       \
+        do {} while (0)
+#endif
 
 /* FIXME: move to dev_* once ATM is driver model aware */
 #define atm_printk(level, instance, format, arg...)     \
@@ -69,12 +74,24 @@
 #ifdef DEBUG
 #define atm_dbg(instance, format, arg...)       \
         atm_printk(KERN_DEBUG, instance , format , ## arg)
+#define atm_rldbg(instance, format, arg...)     \
+        if (printk_ratelimit())                         \
+                atm_printk(KERN_DEBUG, instance , format , ## arg)
 #else
 #define atm_dbg(instance, format, arg...)       \
         do {} while (0)
+#define atm_rldbg(instance, format, arg...)     \
+        do {} while (0)
 #endif
 
 
+/* flags, set by mini-driver in bind() */
+
+#define UDSL_SKIP_HEAVY_INIT    (1<<0)
+#define UDSL_USE_ISOC           (1<<1)
+#define UDSL_IGNORE_EILSEQ      (1<<2)
+
+
 /* mini driver */
 
 struct usbatm_data;
@@ -86,16 +103,11 @@ struct usbatm_data;
 */
 
 struct usbatm_driver {
-        struct module *owner;
-
         const char *driver_name;
 
-        /*
-        *  init device ... can sleep, or cause probe() failure.  Drivers with a heavy_init
-        *  method can avoid having it called by setting need_heavy_init to zero.
-        */
+        /* init device ... can sleep, or cause probe() failure */
         int (*bind) (struct usbatm_data *, struct usb_interface *,
-                     const struct usb_device_id *id, int *need_heavy_init);
+                     const struct usb_device_id *id);
 
         /* additional device initialization that is too slow to be done in probe() */
         int (*heavy_init) (struct usbatm_data *, struct usb_interface *);
@@ -109,8 +121,9 @@ struct usbatm_driver {
         /* cleanup ATM device ... can sleep, but can't fail */
         void (*atm_stop) (struct usbatm_data *, struct atm_dev *);
 
-        int in;         /* rx endpoint */
-        int out;        /* tx endpoint */
+        int bulk_in;    /* bulk rx endpoint */
+        int isoc_in;    /* isochronous rx endpoint */
+        int bulk_out;   /* bulk tx endpoint */
 
         unsigned rx_padding;
         unsigned tx_padding;
@@ -125,6 +138,7 @@ struct usbatm_channel {
         int endpoint;                   /* usb pipe */
         unsigned int stride;            /* ATM cell size + padding */
         unsigned int buf_size;          /* urb buffer size */
+        unsigned int packet_size;       /* endpoint maxpacket */
         spinlock_t lock;
         struct list_head list;
         struct tasklet_struct tasklet;
@@ -143,6 +157,7 @@ struct usbatm_data {
         struct usbatm_driver *driver;
         void *driver_data;
         char driver_name[16];
+        unsigned int flags; /* set by mini-driver in bind() */
 
         /* USB device */
         struct usb_device *usb_dev;
@@ -157,7 +172,8 @@ struct usbatm_data {
         ********************************/
 
         struct kref refcount;
-        struct semaphore serialize;
+        struct mutex serialize;
+        int disconnected;
 
         /* heavy init */
         int thread_pid;
@@ -171,7 +187,14 @@ struct usbatm_data {
         struct usbatm_channel tx_channel;
 
         struct sk_buff_head sndqueue;
-        struct sk_buff *current_skb;                    /* being emptied */
+        struct sk_buff *current_skb;    /* being emptied */
+
+        struct usbatm_vcc_data *cached_vcc;
+        int cached_vci;
+        short cached_vpi;
+
+        unsigned char *cell_buf;        /* holds partial rx cell */
+        unsigned int buf_usage;
 
         struct urb *urbs[0];
 };
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index 5c76e3aaaa5e..42d6823b82b3 100644
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -41,6 +41,8 @@ XUSBATM_PARM(rx_endpoint, unsigned char, byte, "rx endpoint number");
 XUSBATM_PARM(tx_endpoint, unsigned char, byte, "tx endpoint number");
 XUSBATM_PARM(rx_padding, unsigned char, byte, "rx padding (default 0)");
 XUSBATM_PARM(tx_padding, unsigned char, byte, "tx padding (default 0)");
+XUSBATM_PARM(rx_altsetting, unsigned char, byte, "rx altsetting (default 0)");
+XUSBATM_PARM(tx_altsetting, unsigned char, byte, "rx altsetting (default 0)");
 
 static const char xusbatm_driver_name[] = "xusbatm";
 
@@ -48,82 +50,118 @@ static struct usbatm_driver xusbatm_drivers[XUSBATM_DRIVERS_MAX];
 static struct usb_device_id xusbatm_usb_ids[XUSBATM_DRIVERS_MAX + 1];
 static struct usb_driver xusbatm_usb_driver;
 
-static int usb_intf_has_ep(const struct usb_interface *intf, u8 ep)
+static struct usb_interface *xusbatm_find_intf (struct usb_device *usb_dev, int altsetting, u8 ep)
 {
+        struct usb_host_interface *alt;
+        struct usb_interface *intf;
         int i, j;
 
-        for (i = 0; i < intf->num_altsetting; i++) {
-                struct usb_host_interface *alt = intf->altsetting;
-                for (j = 0; j < alt->desc.bNumEndpoints; j++)
-                        if ((alt->endpoint[i].desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK) == ep)
-                                return 1;
+        for(i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++)
+                if ((intf = usb_dev->actconfig->interface[i]) && (alt = usb_altnum_to_altsetting(intf, altsetting)))
+                        for (j = 0; j < alt->desc.bNumEndpoints; j++)
+                                if (alt->endpoint[j].desc.bEndpointAddress == ep)
+                                        return intf;
+        return NULL;
+}
+
+static int xusbatm_capture_intf (struct usbatm_data *usbatm, struct usb_device *usb_dev,
+                struct usb_interface *intf, int altsetting, int claim)
+{
+        int ifnum = intf->altsetting->desc.bInterfaceNumber;
+        int ret;
+
+        if (claim && (ret = usb_driver_claim_interface(&xusbatm_usb_driver, intf, usbatm))) {
+                usb_err(usbatm, "%s: failed to claim interface %2d (%d)!\n", __func__, ifnum, ret);
+                return ret;
+        }
+        if ((ret = usb_set_interface(usb_dev, ifnum, altsetting))) {
+                usb_err(usbatm, "%s: altsetting %2d for interface %2d failed (%d)!\n", __func__, altsetting, ifnum, ret);
+                return ret;
         }
         return 0;
 }
 
-static int xusbatm_bind(struct usbatm_data *usbatm_instance,
-                        struct usb_interface *intf, const struct usb_device_id *id,
-                        int *need_heavy_init)
+static void xusbatm_release_intf (struct usb_device *usb_dev, struct usb_interface *intf, int claimed)
+{
+        if (claimed) {
+                usb_set_intfdata(intf, NULL);
+                usb_driver_release_interface(&xusbatm_usb_driver, intf);
+        }
+}
+
+static int xusbatm_bind(struct usbatm_data *usbatm,
+                        struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *usb_dev = interface_to_usbdev(intf);
         int drv_ix = id - xusbatm_usb_ids;
-        int rx_ep_present = usb_intf_has_ep(intf, rx_endpoint[drv_ix]);
-        int tx_ep_present = usb_intf_has_ep(intf, tx_endpoint[drv_ix]);
-        u8 searched_ep = rx_ep_present ? tx_endpoint[drv_ix] : rx_endpoint[drv_ix];
-        int i, ret;
-
-        usb_dbg(usbatm_instance, "%s: binding driver %d: vendor %#x product %#x"
-                " rx: ep %#x padd %d tx: ep %#x padd %d\n",
+        int rx_alt = rx_altsetting[drv_ix];
+        int tx_alt = tx_altsetting[drv_ix];
+        struct usb_interface *rx_intf = xusbatm_find_intf(usb_dev, rx_alt, rx_endpoint[drv_ix]);
+        struct usb_interface *tx_intf = xusbatm_find_intf(usb_dev, tx_alt, tx_endpoint[drv_ix]);
+        int ret;
+
+        usb_dbg(usbatm, "%s: binding driver %d: vendor %04x product %04x"
+                " rx: ep %02x padd %d alt %2d tx: ep %02x padd %d alt %2d\n",
                 __func__, drv_ix, vendor[drv_ix], product[drv_ix],
-                rx_endpoint[drv_ix], rx_padding[drv_ix],
-                tx_endpoint[drv_ix], tx_padding[drv_ix]);
+                rx_endpoint[drv_ix], rx_padding[drv_ix], rx_alt,
+                tx_endpoint[drv_ix], tx_padding[drv_ix], tx_alt);
+
+        if (!rx_intf || !tx_intf) {
+                if (!rx_intf)
+                        usb_dbg(usbatm, "%s: no interface contains endpoint %02x in altsetting %2d\n",
+                                __func__, rx_endpoint[drv_ix], rx_alt);
+                if (!tx_intf)
+                        usb_dbg(usbatm, "%s: no interface contains endpoint %02x in altsetting %2d\n",
+                                __func__, tx_endpoint[drv_ix], tx_alt);
+                return -ENODEV;
+        }
 
-        if (!rx_ep_present && !tx_ep_present) {
-                usb_dbg(usbatm_instance, "%s: intf #%d has neither rx (%#x) nor tx (%#x) endpoint\n",
-                        __func__, intf->altsetting->desc.bInterfaceNumber,
-                        rx_endpoint[drv_ix], tx_endpoint[drv_ix]);
+        if ((rx_intf != intf) && (tx_intf != intf))
                 return -ENODEV;
+
+        if ((rx_intf == tx_intf) && (rx_alt != tx_alt)) {
+                usb_err(usbatm, "%s: altsettings clash on interface %2d (%2d vs %2d)!\n", __func__,
+                                rx_intf->altsetting->desc.bInterfaceNumber, rx_alt, tx_alt);
+                return -EINVAL;
         }
 
-        if (rx_ep_present && tx_ep_present)
-                return 0;
+        usb_dbg(usbatm, "%s: rx If#=%2d; tx If#=%2d\n", __func__,
+                        rx_intf->altsetting->desc.bInterfaceNumber,
+                        tx_intf->altsetting->desc.bInterfaceNumber);
 
-        for(i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) {
-                struct usb_interface *cur_if = usb_dev->actconfig->interface[i];
-
-                if (cur_if != intf && usb_intf_has_ep(cur_if, searched_ep)) {
-                        ret = usb_driver_claim_interface(&xusbatm_usb_driver,
-                                                         cur_if, usbatm_instance);
-                        if (!ret)
-                                usb_err(usbatm_instance, "%s: failed to claim interface #%d (%d)\n",
-                                        __func__, cur_if->altsetting->desc.bInterfaceNumber, ret);
-                        return ret;
-                }
+        if ((ret = xusbatm_capture_intf(usbatm, usb_dev, rx_intf, rx_alt, rx_intf != intf)))
+                return ret;
+
+        if ((tx_intf != rx_intf) && (ret = xusbatm_capture_intf(usbatm, usb_dev, tx_intf, tx_alt, tx_intf != intf))) {
+                xusbatm_release_intf(usb_dev, rx_intf, rx_intf != intf);
+                return ret;
         }
 
-        usb_err(usbatm_instance, "%s: no interface has endpoint %#x\n",
-                __func__, searched_ep);
-        return -ENODEV;
+        return 0;
 }
 
-static void xusbatm_unbind(struct usbatm_data *usbatm_instance,
+static void xusbatm_unbind(struct usbatm_data *usbatm,
                            struct usb_interface *intf)
 {
         struct usb_device *usb_dev = interface_to_usbdev(intf);
         int i;
-        usb_dbg(usbatm_instance, "%s entered\n", __func__);
+
+        usb_dbg(usbatm, "%s entered\n", __func__);
 
         for(i = 0; i < usb_dev->actconfig->desc.bNumInterfaces; i++) {
-                struct usb_interface *cur_if = usb_dev->actconfig->interface[i];
-                usb_set_intfdata(cur_if, NULL);
-                usb_driver_release_interface(&xusbatm_usb_driver, cur_if);
+                struct usb_interface *cur_intf = usb_dev->actconfig->interface[i];
+
+                if (cur_intf && (usb_get_intfdata(cur_intf) == usbatm)) {
+                        usb_set_intfdata(cur_intf, NULL);
+                        usb_driver_release_interface(&xusbatm_usb_driver, cur_intf);
+                }
         }
 }
 
-static int xusbatm_atm_start(struct usbatm_data *usbatm_instance,
+static int xusbatm_atm_start(struct usbatm_data *usbatm,
                              struct atm_dev *atm_dev)
 {
-        atm_dbg(usbatm_instance, "%s entered\n", __func__);
+        atm_dbg(usbatm, "%s entered\n", __func__);
 
         /* use random MAC as we've no way to get it from the device */
         random_ether_addr(atm_dev->esi);
@@ -161,18 +199,19 @@ static int __init xusbatm_init(void)
         }
 
         for (i = 0; i < num_vendor; i++) {
+                rx_endpoint[i] |= USB_DIR_IN;
+                tx_endpoint[i] &= USB_ENDPOINT_NUMBER_MASK;
+
                 xusbatm_usb_ids[i].match_flags  = USB_DEVICE_ID_MATCH_DEVICE;
                 xusbatm_usb_ids[i].idVendor     = vendor[i];
                 xusbatm_usb_ids[i].idProduct    = product[i];
 
-
-                xusbatm_drivers[i].owner        = THIS_MODULE;
                 xusbatm_drivers[i].driver_name  = xusbatm_driver_name;
                 xusbatm_drivers[i].bind         = xusbatm_bind;
                 xusbatm_drivers[i].unbind       = xusbatm_unbind;
                 xusbatm_drivers[i].atm_start    = xusbatm_atm_start;
-                xusbatm_drivers[i].in           = rx_endpoint[i];
-                xusbatm_drivers[i].out          = tx_endpoint[i];
+                xusbatm_drivers[i].bulk_in      = rx_endpoint[i];
+                xusbatm_drivers[i].bulk_out     = tx_endpoint[i];
                 xusbatm_drivers[i].rx_padding   = rx_padding[i];
                 xusbatm_drivers[i].tx_padding   = tx_padding[i];
         }
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index b9fd39fd1b5b..97bdeb1c2181 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1014,8 +1014,13 @@ static void acm_disconnect(struct usb_interface *intf)
         }
 
         down(&open_sem);
+        if (!usb_get_intfdata(intf)) {
+                up(&open_sem);
+                return;
+        }
         acm->dev = NULL;
-        usb_set_intfdata (intf, NULL);
+        usb_set_intfdata(acm->control, NULL);
+        usb_set_intfdata(acm->data, NULL);
 
         tasklet_disable(&acm->urb_task);
 
@@ -1036,7 +1041,7 @@ static void acm_disconnect(struct usb_interface *intf)
         for (i = 0; i < ACM_NRB; i++)
                 usb_buffer_free(usb_dev, acm->readsize, acm->rb[i].base, acm->rb[i].dma);
 
-        usb_driver_release_interface(&acm_driver, acm->data);
+        usb_driver_release_interface(&acm_driver, intf == acm->control ? acm->data : intf);
 
         if (!acm->used) {
                 acm_tty_unregister(acm);
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index dba4cc026077..d34848ac30b0 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2000 Vojtech Pavlik    <vojtech@suse.cz>
  # Copyright (c) 2001 Pete Zaitcev      <zaitcev@redhat.com>
  # Copyright (c) 2001 David Paschal     <paschal@rcsis.com>
+ * Copyright (c) 2006 Oliver Neukum     <oliver@neukum.name>
  *
  * USB Printer Device Class driver for USB printers and printer cables
  *
@@ -273,13 +274,16 @@ static void usblp_bulk_read(struct urb *urb, struct pt_regs *regs)
 {
         struct usblp *usblp = urb->context;
 
-        if (!usblp || !usblp->dev || !usblp->used || !usblp->present)
+        if (unlikely(!usblp || !usblp->dev || !usblp->used))
                 return;
 
+        if (unlikely(!usblp->present))
+                goto unplug;
         if (unlikely(urb->status))
                 warn("usblp%d: nonzero read/write bulk status received: %d",
                         usblp->minor, urb->status);
         usblp->rcomplete = 1;
+unplug:
         wake_up_interruptible(&usblp->wait);
 }
 
@@ -287,13 +291,15 @@ static void usblp_bulk_write(struct urb *urb, struct pt_regs *regs)
 {
         struct usblp *usblp = urb->context;
 
-        if (!usblp || !usblp->dev || !usblp->used || !usblp->present)
+        if (unlikely(!usblp || !usblp->dev || !usblp->used))
                 return;
-
+        if (unlikely(!usblp->present))
+                goto unplug;
         if (unlikely(urb->status))
                 warn("usblp%d: nonzero read/write bulk status received: %d",
                         usblp->minor, urb->status);
         usblp->wcomplete = 1;
+unplug:
         wake_up_interruptible(&usblp->wait);
 }
 
@@ -627,9 +633,8 @@ done:
 
 static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-        DECLARE_WAITQUEUE(wait, current);
         struct usblp *usblp = file->private_data;
-        int timeout, err = 0, transfer_length = 0;
+        int timeout, rv, err = 0, transfer_length = 0;
         size_t writecount = 0;
 
         while (writecount < count) {
@@ -641,24 +646,11 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                         }
 
                         timeout = USBLP_WRITE_TIMEOUT;
-                        add_wait_queue(&usblp->wait, &wait);
-                        while ( 1==1 ) {
 
-                                if (signal_pending(current)) {
-                                        remove_wait_queue(&usblp->wait, &wait);
-                                        return writecount ? writecount : -EINTR;
-                                }
-                                set_current_state(TASK_INTERRUPTIBLE);
-                                if (timeout && !usblp->wcomplete) {
-                                        timeout = schedule_timeout(timeout);
-                                } else {
-                                        set_current_state(TASK_RUNNING);
-                                        break;
-                                }
-                        }
-                        remove_wait_queue(&usblp->wait, &wait);
+                        rv = wait_event_interruptible_timeout(usblp->wait, usblp->wcomplete || !usblp->present , timeout);
+                        if (rv < 0)
+                                return writecount ? writecount : -EINTR;
                 }
-
                 down (&usblp->sem);
                 if (!usblp->present) {
                         up (&usblp->sem);
@@ -724,7 +716,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
 static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
         struct usblp *usblp = file->private_data;
-        DECLARE_WAITQUEUE(wait, current);
+        int rv;
 
         if (!usblp->bidir)
                 return -EINVAL;
@@ -742,26 +734,13 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
                         count = -EAGAIN;
                         goto done;
                 }
-
-                add_wait_queue(&usblp->wait, &wait);
-                while (1==1) {
-                        if (signal_pending(current)) {
-                                count = -EINTR;
-                                remove_wait_queue(&usblp->wait, &wait);
-                                goto done;
-                        }
-                        up (&usblp->sem);
-                        set_current_state(TASK_INTERRUPTIBLE);
-                        if (!usblp->rcomplete) {
-                                schedule();
-                        } else {
-                                set_current_state(TASK_RUNNING);
-                                down(&usblp->sem);
-                                break;
-                        }
-                        down (&usblp->sem);
+                up(&usblp->sem);
+                rv = wait_event_interruptible(usblp->wait, usblp->rcomplete || !usblp->present);
+                down(&usblp->sem);
+                if (rv < 0) {
+                        count = -EINTR;
+                        goto done;
                 }
-                remove_wait_queue(&usblp->wait, &wait);
         }
 
         if (!usblp->present) {
@@ -874,11 +853,10 @@ static int usblp_probe(struct usb_interface *intf,
 
         /* Malloc and start initializing usblp structure so we can use it
          * directly. */
-        if (!(usblp = kmalloc(sizeof(struct usblp), GFP_KERNEL))) {
+        if (!(usblp = kzalloc(sizeof(struct usblp), GFP_KERNEL))) {
                 err("out of memory for usblp");
                 goto abort;
         }
-        memset(usblp, 0, sizeof(struct usblp));
         usblp->dev = dev;
         init_MUTEX (&usblp->sem);
         init_waitqueue_head(&usblp->wait);
@@ -1214,10 +1192,9 @@ static int __init usblp_init(void)
 {
         int retval;
         retval = usb_register(&usblp_driver);
-        if (retval)
-                goto out;
-        info(DRIVER_VERSION ": " DRIVER_DESC);
-out:
+        if (!retval)
+                info(DRIVER_VERSION ": " DRIVER_DESC);
+
         return retval;
 }
 
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 076462c8ba2a..dce9d987f0fc 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -378,7 +378,7 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
 
         return NULL;
 }
-EXPORT_SYMBOL_GPL(usb_match_id);
+EXPORT_SYMBOL(usb_match_id);
 
 int usb_device_match(struct device *dev, struct device_driver *drv)
 {
@@ -446,7 +446,7 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner)
 
         return retval;
 }
-EXPORT_SYMBOL_GPL(usb_register_driver);
+EXPORT_SYMBOL(usb_register_driver);
 
 /**
  * usb_deregister - unregister a USB driver
@@ -469,4 +469,4 @@ void usb_deregister(struct usb_driver *driver)
 
         usbfs_update_special();
 }
-EXPORT_SYMBOL_GPL(usb_deregister);
+EXPORT_SYMBOL(usb_deregister);
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 319de03944e7..7135e542679d 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -13,6 +13,7 @@
 #include <linux/ctype.h>
 #include <linux/device.h>
 #include <asm/byteorder.h>
+#include <asm/scatterlist.h>
 
 #include "hcd.h"        /* for usbcore internals */
 #include "usb.h"
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 081796726b95..dad4d8fd8180 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -468,6 +468,7 @@ int usb_unlink_urb(struct urb *urb)
  */
 void usb_kill_urb(struct urb *urb)
 {
+        might_sleep();
         if (!(urb && urb->dev && urb->dev->bus && urb->dev->bus->op))
                 return;
         spin_lock_irq(&urb->lock);
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 9a4edc5657aa..0aab7d24c768 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -135,6 +135,7 @@ struct dev_data {
                                         setup_out_ready : 1,
                                         setup_out_error : 1,
                                         setup_abort : 1;
+        unsigned                        setup_wLength;
 
         /* the rest is basically write-once */
         struct usb_config_descriptor    *config, *hs_config;
@@ -942,6 +943,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len)
         }
         req->complete = ep0_complete;
         req->length = len;
+        req->zero = 0;
         return 0;
 }
 
@@ -1161,10 +1163,13 @@ ep0_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
                                 spin_unlock_irq (&dev->lock);
                                 if (copy_from_user (dev->req->buf, buf, len))
                                         retval = -EFAULT;
-                                else
+                                else {
+                                        if (len < dev->setup_wLength)
+                                                dev->req->zero = 1;
                                         retval = usb_ep_queue (
                                                 dev->gadget->ep0, dev->req,
                                                 GFP_KERNEL);
+                                }
                                 if (retval < 0) {
                                         spin_lock_irq (&dev->lock);
                                         clean_req (dev->gadget->ep0, dev->req);
@@ -1483,6 +1488,7 @@ unrecognized:
 delegate:
                         dev->setup_in = (ctrl->bRequestType & USB_DIR_IN)
                                                 ? 1 : 0;
+                        dev->setup_wLength = w_length;
                         dev->setup_out_ready = 0;
                         dev->setup_out_error = 0;
                         value = 0;
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index c32e1f7476da..67b13ab2f3f5 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -47,6 +47,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 2fc110d3ad5a..ae7a1c0f5748 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -165,8 +165,8 @@ static unsigned buflen = 4096;
 static unsigned qlen = 32;
 static unsigned pattern = 0;
 
-module_param (buflen, uint, S_IRUGO|S_IWUSR);
-module_param (qlen, uint, S_IRUGO|S_IWUSR);
+module_param (buflen, uint, S_IRUGO);
+module_param (qlen, uint, S_IRUGO);
 module_param (pattern, uint, S_IRUGO|S_IWUSR);
 
 /*
@@ -1127,8 +1127,10 @@ zero_unbind (struct usb_gadget *gadget)
         DBG (dev, "unbind\n");
 
         /* we've already been disconnected ... no i/o is active */
-        if (dev->req)
+        if (dev->req) {
+                dev->req->length = USB_BUFSIZ;
                 free_ep_req (gadget->ep0, dev->req);
+        }
         del_timer_sync (&dev->resume);
         kfree (dev);
         set_gadget_data (gadget, NULL);
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 08ca0f849dab..3a6687df5594 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -24,46 +24,11 @@
 
 /*-------------------------------------------------------------------------*/
 
-/* EHCI 0.96 (and later) section 5.1 says how to kick BIOS/SMM/...
- * off the controller (maybe it can boot from highspeed USB disks).
- */
-static int bios_handoff(struct ehci_hcd *ehci, int where, u32 cap)
-{
-        struct pci_dev *pdev = to_pci_dev(ehci_to_hcd(ehci)->self.controller);
-
-        /* always say Linux will own the hardware */
-        pci_write_config_byte(pdev, where + 3, 1);
-
-        /* maybe wait a while for BIOS to respond */
-        if (cap & (1 << 16)) {
-                int msec = 5000;
-
-                do {
-                        msleep(10);
-                        msec -= 10;
-                        pci_read_config_dword(pdev, where, &cap);
-                } while ((cap & (1 << 16)) && msec);
-                if (cap & (1 << 16)) {
-                        ehci_err(ehci, "BIOS handoff failed (%d, %08x)\n",
-                                where, cap);
-                        // some BIOS versions seem buggy...
-                        // return 1;
-                        ehci_warn(ehci, "continuing after BIOS bug...\n");
-                        /* disable all SMIs, and clear "BIOS owns" flag */
-                        pci_write_config_dword(pdev, where + 4, 0);
-                        pci_write_config_byte(pdev, where + 2, 0);
-                } else
-                        ehci_dbg(ehci, "BIOS handoff succeeded\n");
-        }
-        return 0;
-}
-
 /* called after powerup, by probe or system-pm "wakeup" */
 static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
 {
         u32                     temp;
         int                     retval;
-        unsigned                count = 256/4;
 
         /* optional debug port, normally in the first BAR */
         temp = pci_find_capability(pdev, 0x0a);
@@ -84,32 +49,9 @@ static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
                 }
         }
 
-        temp = HCC_EXT_CAPS(readl(&ehci->caps->hcc_params));
-
-        /* EHCI 0.96 and later may have "extended capabilities" */
-        while (temp && count--) {
-                u32             cap;
-
-                pci_read_config_dword(pdev, temp, &cap);
-                ehci_dbg(ehci, "capability %04x at %02x\n", cap, temp);
-                switch (cap & 0xff) {
-                case 1:                 /* BIOS/SMM/... handoff */
-                        if (bios_handoff(ehci, temp, cap) != 0)
-                                return -EOPNOTSUPP;
-                        break;
-                case 0:                 /* illegal reserved capability */
-                        ehci_dbg(ehci, "illegal capability!\n");
-                        cap = 0;
-                        /* FALLTHROUGH */
-                default:                /* unknown */
-                        break;
-                }
-                temp = (cap >> 8) & 0xff;
-        }
-        if (!count) {
-                ehci_err(ehci, "bogus capabilities ... PCI problems!\n");
-                return -EIO;
-        }
+        /* we expect static quirk code to handle the "extended capabilities"
+         * (currently just BIOS handoff) allowed starting with EHCI 0.96
+         */
 
         /* PCI Memory-Write-Invalidate cycle support is optional (uncommon) */
         retval = pci_set_mwi(pdev);
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 57e77374d228..ebcca9700671 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1063,6 +1063,7 @@ sitd_slot_ok (
 
                 /* for IN, check CSPLIT */
                 if (stream->c_usecs) {
+                        uf = uframe & 7;
                         max_used = 100 - stream->c_usecs;
                         do {
                                 tmp = 1 << uf;
@@ -1843,8 +1844,7 @@ done:
 #else
 
 static inline int
-sitd_submit (struct ehci_hcd *ehci, struct urb *urb,
-        unsigned mem_flags)
+sitd_submit (struct ehci_hcd *ehci, struct urb *urb, gfp_t mem_flags)
 {
         ehci_dbg (ehci, "split iso support is disabled\n");
         return -ENOSYS;
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 584b8dc65119..972ce04889f8 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1420,20 +1420,22 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
         int ret = 0;
 
         spin_lock_irqsave(&isp116x->lock, flags);
-
         val = isp116x_read_reg32(isp116x, HCCONTROL);
+
         switch (val & HCCONTROL_HCFS) {
         case HCCONTROL_USB_OPER:
+                spin_unlock_irqrestore(&isp116x->lock, flags);
                 val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE);
                 val |= HCCONTROL_USB_SUSPEND;
                 if (device_may_wakeup(&hcd->self.root_hub->dev))
                         val |= HCCONTROL_RWE;
                 /* Wait for usb transfers to finish */
-                mdelay(2);
+                msleep(2);
+                spin_lock_irqsave(&isp116x->lock, flags);
                 isp116x_write_reg32(isp116x, HCCONTROL, val);
+                spin_unlock_irqrestore(&isp116x->lock, flags);
                 /* Wait for devices to suspend */
-                mdelay(5);
-        case HCCONTROL_USB_SUSPEND:
+                msleep(5);
                 break;
         case HCCONTROL_USB_RESUME:
                 isp116x_write_reg32(isp116x, HCCONTROL,
@@ -1441,12 +1443,11 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
                                     HCCONTROL_USB_RESET);
         case HCCONTROL_USB_RESET:
                 ret = -EBUSY;
+        default:                /* HCCONTROL_USB_SUSPEND */
+                spin_unlock_irqrestore(&isp116x->lock, flags);
                 break;
-        default:
-                ret = -EINVAL;
         }
 
-        spin_unlock_irqrestore(&isp116x->lock, flags);
         return ret;
 }
 
@@ -1715,9 +1716,9 @@ static struct platform_driver isp116x_driver = {
         .remove = isp116x_remove,
         .suspend = isp116x_suspend,
         .resume = isp116x_resume,
-        .driver = {
-                .name = (char *)hcd_name,
-        },
+        .driver = {
+                   .name = (char *)hcd_name,
+                   },
 };
 
 /*-----------------------------------------------------------------*/
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index 77cd6ac07e3c..db280ca7b7a0 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -67,7 +67,7 @@ static void au1xxx_stop_hc(struct platform_device *dev)
                ": stopping Au1xxx OHCI USB Controller\n");
 
         /* Disable clock */
-        au_writel(readl((void *)USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);
+        au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);
 }
 
 
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 3ef2c0cdf1db..e9e5bc178cef 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -190,7 +190,7 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
                         msleep(10);
                 }
                 if (wait_time <= 0)
-                        printk(KERN_WARNING "%s %s: early BIOS handoff "
+                        printk(KERN_WARNING "%s %s: BIOS handoff "
                                         "failed (BIOS bug ?)\n",
                                         pdev->dev.bus_id, "OHCI");
 
@@ -212,8 +212,9 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
 {
         int wait_time, delta;
         void __iomem *base, *op_reg_base;
-        u32 hcc_params, val, temp;
-        u8 cap_length;
+        u32     hcc_params, val;
+        u8      offset, cap_length;
+        int     count = 256/4;
 
         if (!mmio_resource_enabled(pdev, 0))
                 return;
@@ -224,51 +225,80 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
 
         cap_length = readb(base);
         op_reg_base = base + cap_length;
+
+        /* EHCI 0.96 and later may have "extended capabilities"
+         * spec section 5.1 explains the bios handoff, e.g. for
+         * booting from USB disk or using a usb keyboard
+         */
         hcc_params = readl(base + EHCI_HCC_PARAMS);
-        hcc_params = (hcc_params >> 8) & 0xff;
-        if (hcc_params) {
-                pci_read_config_dword(pdev,
-                                        hcc_params + EHCI_USBLEGSUP,
-                                        &val);
-                if (((val & 0xff) == 1) && (val & EHCI_USBLEGSUP_BIOS)) {
-                        /*
-                         * Ok, BIOS is in smm mode, try to hand off...
+        offset = (hcc_params >> 8) & 0xff;
+        while (offset && count--) {
+                u32             cap;
+                int             msec;
+
+                pci_read_config_dword(pdev, offset, &cap);
+                switch (cap & 0xff) {
+                case 1:                 /* BIOS/SMM/... handoff support */
+                        if ((cap & EHCI_USBLEGSUP_BIOS)) {
+                                pr_debug("%s %s: BIOS handoff\n",
+                                                pdev->dev.bus_id, "EHCI");
+
+                                /* BIOS workaround (?): be sure the
+                                 * pre-Linux code receives the SMI
+                                 */
+                                pci_read_config_dword(pdev,
+                                                offset + EHCI_USBLEGCTLSTS,
+                                                &val);
+                                pci_write_config_dword(pdev,
+                                                offset + EHCI_USBLEGCTLSTS,
+                                                val | EHCI_USBLEGCTLSTS_SOOE);
+                        }
+
+                        /* always say Linux will own the hardware
+                         * by setting EHCI_USBLEGSUP_OS.
                          */
-                        pci_read_config_dword(pdev,
-                                                hcc_params + EHCI_USBLEGCTLSTS,
-                                                &temp);
-                        pci_write_config_dword(pdev,
-                                                hcc_params + EHCI_USBLEGCTLSTS,
-                                                temp | EHCI_USBLEGCTLSTS_SOOE);
-                        val |= EHCI_USBLEGSUP_OS;
-                        pci_write_config_dword(pdev,
-                                                hcc_params + EHCI_USBLEGSUP,
-                                                val);
+                        pci_write_config_byte(pdev, offset + 3, 1);
 
-                        wait_time = 500;
-                        do {
+                        /* if boot firmware now owns EHCI, spin till
+                         * it hands it over.
+                         */
+                        msec = 5000;
+                        while ((cap & EHCI_USBLEGSUP_BIOS) && (msec > 0)) {
                                 msleep(10);
-                                wait_time -= 10;
-                                pci_read_config_dword(pdev,
-                                                hcc_params + EHCI_USBLEGSUP,
-                                                &val);
-                        } while (wait_time && (val & EHCI_USBLEGSUP_BIOS));
-                        if (!wait_time) {
-                                /*
-                                 * well, possibly buggy BIOS...
+                                msec -= 10;
+                                pci_read_config_dword(pdev, offset, &cap);
+                        }
+
+                        if (cap & EHCI_USBLEGSUP_BIOS) {
+                                /* well, possibly buggy BIOS... try to shut
+                                 * it down, and hope nothing goes too wrong
                                  */
-                                printk(KERN_WARNING "%s %s: early BIOS handoff "
+                                printk(KERN_WARNING "%s %s: BIOS handoff "
                                                 "failed (BIOS bug ?)\n",
                                         pdev->dev.bus_id, "EHCI");
-                                pci_write_config_dword(pdev,
-                                                hcc_params + EHCI_USBLEGSUP,
-                                                EHCI_USBLEGSUP_OS);
-                                pci_write_config_dword(pdev,
-                                                hcc_params + EHCI_USBLEGCTLSTS,
-                                                0);
+                                pci_write_config_byte(pdev, offset + 2, 0);
                         }
+
+                        /* just in case, always disable EHCI SMIs */
+                        pci_write_config_dword(pdev,
+                                        offset + EHCI_USBLEGCTLSTS,
+                                        0);
+                        break;
+                case 0:                 /* illegal reserved capability */
+                        cap = 0;
+                        /* FALLTHROUGH */
+                default:
+                        printk(KERN_WARNING "%s %s: unrecognized "
+                                        "capability %02x\n",
+                                        pdev->dev.bus_id, "EHCI",
+                                        cap & 0xff);
+                        break;
                 }
+                offset = (cap >> 8) & 0xff;
         }
+        if (!count)
+                printk(KERN_DEBUG "%s %s: capability loop?\n",
+                                pdev->dev.bus_id, "EHCI");
 
         /*
          * halt EHCI & disable its interrupts in any case
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index b6076004a437..782398045f9f 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -672,9 +672,9 @@ static int uhci_submit_control(struct uhci_hcd *uhci, struct urb *urb, struct ur
         /* Low-speed transfers get a different queue, and won't hog the bus.
          * Also, some devices enumerate better without FSBR; the easiest way
          * to do that is to put URBs on the low-speed queue while the device
-         * is in the DEFAULT state. */
+         * isn't in the CONFIGURED state. */
         if (urb->dev->speed == USB_SPEED_LOW ||
-                        urb->dev->state == USB_STATE_DEFAULT)
+                        urb->dev->state != USB_STATE_CONFIGURED)
                 skelqh = uhci->skel_ls_control_qh;
         else {
                 skelqh = uhci->skel_fs_control_qh;
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index a91e72c41415..6f7a684c3e07 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1307,7 +1307,7 @@ void hid_init_reports(struct hid_device *hid)
         }
 
         if (err)
-                warn("timeout initializing reports\n");
+                warn("timeout initializing reports");
 }
 
 #define USB_VENDOR_ID_WACOM             0x056a
@@ -1453,6 +1453,9 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_CHERRY            0x046a
 #define USB_DEVICE_ID_CHERRY_CYMOTION   0x0023
 
+#define USB_VENDOR_ID_HP                0x03f0
+#define USB_DEVICE_ID_HP_USBHUB_KB      0x020c
+
 /*
  * Alphabetically sorted blacklist by quirk type.
  */
@@ -1566,6 +1569,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_KEYBOARD, HID_QUIRK_NOGET},
         { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
+        { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
 
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
@@ -1828,9 +1832,6 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         hid->urbctrl->transfer_dma = hid->ctrlbuf_dma;
         hid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
 
-        /* May be needed for some devices */
-        usb_clear_halt(hid->dev, hid->urbin->pipe);
-
         return hid;
 
 fail:
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 4dff8473553d..925f5aba06f5 100644
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -35,7 +35,6 @@
 #include <linux/usb.h>
 #include "hid.h"
 #include <linux/hiddev.h>
-#include <linux/devfs_fs_kernel.h>
 
 #ifdef CONFIG_USB_DYNAMIC_MINORS
 #define HIDDEV_MINOR_BASE       0
@@ -632,7 +631,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 
                         else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
                                  (uref_multi->num_values > HID_MAX_MULTI_USAGES ||
-                                  uref->usage_index + uref_multi->num_values >= field->report_count))
+                                  uref->usage_index + uref_multi->num_values > field->report_count))
                                 goto inval;
                         }
 
@@ -832,12 +831,10 @@ static /* const */ struct usb_driver hiddev_driver = {
 
 int __init hiddev_init(void)
 {
-        devfs_mk_dir("usb/hid");
         return usb_register(&hiddev_driver);
 }
 
 void hiddev_exit(void)
 {
         usb_deregister(&hiddev_driver);
-        devfs_remove("usb/hid");
 }
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c
index 3b3c7b4120a2..697c5e573a11 100644
--- a/drivers/usb/input/touchkitusb.c
+++ b/drivers/usb/input/touchkitusb.c
@@ -337,6 +337,9 @@ static int touchkit_probe(struct usb_interface *intf,
                          touchkit->data, TOUCHKIT_REPORT_DATA_SIZE,
                          touchkit_irq, touchkit, endpoint->bInterval);
 
+        touchkit->irq->transfer_dma = touchkit->data_dma;
+        touchkit->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+
         input_register_device(touchkit->input);
 
         usb_set_intfdata(intf, touchkit);
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index 1bfc105ad4d6..37d2f0ba0319 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -59,7 +59,7 @@
 #include "map_to_7segment.h"
 #include "yealink.h"
 
-#define DRIVER_VERSION "yld-20050816"
+#define DRIVER_VERSION "yld-20051230"
 #define DRIVER_AUTHOR "Henk Vergonet"
 #define DRIVER_DESC "Yealink phone driver"
 
@@ -786,16 +786,25 @@ static struct attribute_group yld_attr_group = {
  * Linux interface and usb initialisation
  ******************************************************************************/
 
-static const struct yld_device {
-        u16 idVendor;
-        u16 idProduct;
+struct driver_info {
         char *name;
-} yld_device[] = {
-        { 0x6993, 0xb001, "Yealink usb-p1k" },
 };
 
-static struct usb_device_id usb_table [] = {
-        { USB_INTERFACE_INFO(USB_CLASS_HID, 0, 0) },
+static const struct driver_info info_P1K = {
+        .name   = "Yealink usb-p1k",
+};
+
+static const struct usb_device_id usb_table [] = {
+        {
+                .match_flags            = USB_DEVICE_ID_MATCH_DEVICE |
+                                                USB_DEVICE_ID_MATCH_INT_INFO,
+                .idVendor               = 0x6993,
+                .idProduct              = 0xb001,
+                .bInterfaceClass        = USB_CLASS_HID,
+                .bInterfaceSubClass     = 0,
+                .bInterfaceProtocol     = 0,
+                .driver_info            = (kernel_ulong_t)&info_P1K
+        },
         { }
 };
 
@@ -842,33 +851,16 @@ static void usb_disconnect(struct usb_interface *intf)
         usb_cleanup(yld, 0);
 }
 
-static int usb_match(struct usb_device *udev)
-{
-        int i;
-        u16 idVendor = le16_to_cpu(udev->descriptor.idVendor);
-        u16 idProduct = le16_to_cpu(udev->descriptor.idProduct);
-
-        for (i = 0; i < ARRAY_SIZE(yld_device); i++) {
-                if ((idVendor == yld_device[i].idVendor) &&
-                    (idProduct == yld_device[i].idProduct))
-                        return i;
-        }
-        return -ENODEV;
-}
-
 static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *udev = interface_to_usbdev (intf);
+        struct driver_info *nfo = (struct driver_info *)id->driver_info;
         struct usb_host_interface *interface;
         struct usb_endpoint_descriptor *endpoint;
         struct yealink_dev *yld;
         struct input_dev *input_dev;
         int ret, pipe, i;
 
-        i = usb_match(udev);
-        if (i < 0)
-                return -ENODEV;
-
         interface = intf->cur_altsetting;
         endpoint = &interface->endpoint[0].desc;
         if (!(endpoint->bEndpointAddress & USB_DIR_IN))
@@ -915,7 +907,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
         ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
         if (ret != USB_PKT_LEN)
-                err("invalid payload size %d, expected %d", ret, USB_PKT_LEN);
+                err("invalid payload size %d, expected %zd", ret, USB_PKT_LEN);
 
         /* initialise irq urb */
         usb_fill_int_urb(yld->urb_irq, udev, pipe, yld->irq_data,
@@ -948,7 +940,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         strlcat(yld->phys,  "/input0", sizeof(yld->phys));
 
         /* register settings for the input device */
-        input_dev->name = yld_device[i].name;
+        input_dev->name = nfo->name;
         input_dev->phys = yld->phys;
         usb_to_input_id(udev, &input_dev->id);
         input_dev->cdev.dev = &intf->dev;
diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
index 21232ee2974c..0d3d2cc5d7be 100644
--- a/drivers/usb/media/Kconfig
+++ b/drivers/usb/media/Kconfig
@@ -53,6 +53,21 @@ config USB_DSBR
           To compile this driver as a module, choose M here: the
           module will be called dsbr100.
 
+config USB_ET61X251
+        tristate "USB ET61X[12]51 PC Camera Controller support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for cameras based on Etoms ET61X151
+          or ET61X251 PC Camera Controllers.
+
+          See <file:Documentation/usb/et61x251.txt> for more informations.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called et61x251.
+
 config USB_IBMCAM
         tristate "USB IBM (Xirlink) C-it Camera support"
         depends on USB && VIDEO_DEV
@@ -209,5 +224,3 @@ config USB_PWC
 
           To compile this driver as a module, choose M here: the
           module will be called pwc.
-
-
diff --git a/drivers/usb/media/Makefile b/drivers/usb/media/Makefile
index d83adffa925f..3957aa1be0f2 100644
--- a/drivers/usb/media/Makefile
+++ b/drivers/usb/media/Makefile
@@ -3,9 +3,11 @@
 #
 
 sn9c102-objs    := sn9c102_core.o sn9c102_hv7131d.o sn9c102_mi0343.o sn9c102_ov7630.o sn9c102_pas106b.o sn9c102_pas202bcb.o sn9c102_tas5110c1b.o sn9c102_tas5130d1b.o
+et61x251-objs   := et61x251_core.o et61x251_tas5130d1b.o
 
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
 obj-$(CONFIG_USB_DSBR)          += dsbr100.o
+obj-$(CONFIG_USB_ET61X251)      += et61x251.o
 obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o usbvideo.o ultracam.o
 obj-$(CONFIG_USB_KONICAWC)      += konicawc.o usbvideo.o
 obj-$(CONFIG_USB_OV511)         += ov511.o
diff --git a/drivers/usb/media/et61x251.h b/drivers/usb/media/et61x251.h
new file mode 100644
index 000000000000..652238f329f3
--- /dev/null
+++ b/drivers/usb/media/et61x251.h
@@ -0,0 +1,220 @@
+/***************************************************************************
+ * V4L2 driver for ET61X[12]51 PC Camera Controllers                       *
+ *                                                                         *
+ * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ *                                                                         *
+ * This program is free software; you can redistribute it and/or modify    *
+ * it under the terms of the GNU General Public License as published by    *
+ * the Free Software Foundation; either version 2 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program; if not, write to the Free Software             *
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+ ***************************************************************************/
+
+#ifndef _ET61X251_H_
+#define _ET61X251_H_
+
+#include <linux/version.h>
+#include <linux/usb.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <linux/types.h>
+#include <linux/param.h>
+#include <linux/rwsem.h>
+#include <asm/semaphore.h>
+
+#include "et61x251_sensor.h"
+
+/*****************************************************************************/
+
+#define ET61X251_DEBUG
+#define ET61X251_DEBUG_LEVEL         2
+#define ET61X251_MAX_DEVICES         64
+#define ET61X251_PRESERVE_IMGSCALE   0
+#define ET61X251_FORCE_MUNMAP        0
+#define ET61X251_MAX_FRAMES          32
+#define ET61X251_COMPRESSION_QUALITY 0
+#define ET61X251_URBS                2
+#define ET61X251_ISO_PACKETS         7
+#define ET61X251_ALTERNATE_SETTING   13
+#define ET61X251_URB_TIMEOUT         msecs_to_jiffies(2 * ET61X251_ISO_PACKETS)
+#define ET61X251_CTRL_TIMEOUT        100
+
+/*****************************************************************************/
+
+static const struct usb_device_id et61x251_id_table[] = {
+        { USB_DEVICE(0x102c, 0x6151), },
+        { USB_DEVICE(0x102c, 0x6251), },
+        { USB_DEVICE(0x102c, 0x6253), },
+        { USB_DEVICE(0x102c, 0x6254), },
+        { USB_DEVICE(0x102c, 0x6255), },
+        { USB_DEVICE(0x102c, 0x6256), },
+        { USB_DEVICE(0x102c, 0x6257), },
+        { USB_DEVICE(0x102c, 0x6258), },
+        { USB_DEVICE(0x102c, 0x6259), },
+        { USB_DEVICE(0x102c, 0x625a), },
+        { USB_DEVICE(0x102c, 0x625b), },
+        { USB_DEVICE(0x102c, 0x625c), },
+        { USB_DEVICE(0x102c, 0x625d), },
+        { USB_DEVICE(0x102c, 0x625e), },
+        { USB_DEVICE(0x102c, 0x625f), },
+        { USB_DEVICE(0x102c, 0x6260), },
+        { USB_DEVICE(0x102c, 0x6261), },
+        { USB_DEVICE(0x102c, 0x6262), },
+        { USB_DEVICE(0x102c, 0x6263), },
+        { USB_DEVICE(0x102c, 0x6264), },
+        { USB_DEVICE(0x102c, 0x6265), },
+        { USB_DEVICE(0x102c, 0x6266), },
+        { USB_DEVICE(0x102c, 0x6267), },
+        { USB_DEVICE(0x102c, 0x6268), },
+        { USB_DEVICE(0x102c, 0x6269), },
+        { }
+};
+
+ET61X251_SENSOR_TABLE
+
+/*****************************************************************************/
+
+enum et61x251_frame_state {
+        F_UNUSED,
+        F_QUEUED,
+        F_GRABBING,
+        F_DONE,
+        F_ERROR,
+};
+
+struct et61x251_frame_t {
+        void* bufmem;
+        struct v4l2_buffer buf;
+        enum et61x251_frame_state state;
+        struct list_head frame;
+        unsigned long vma_use_count;
+};
+
+enum et61x251_dev_state {
+        DEV_INITIALIZED = 0x01,
+        DEV_DISCONNECTED = 0x02,
+        DEV_MISCONFIGURED = 0x04,
+};
+
+enum et61x251_io_method {
+        IO_NONE,
+        IO_READ,
+        IO_MMAP,
+};
+
+enum et61x251_stream_state {
+        STREAM_OFF,
+        STREAM_INTERRUPT,
+        STREAM_ON,
+};
+
+struct et61x251_sysfs_attr {
+        u8 reg, i2c_reg;
+};
+
+struct et61x251_module_param {
+        u8 force_munmap;
+};
+
+static DECLARE_MUTEX(et61x251_sysfs_lock);
+static DECLARE_RWSEM(et61x251_disconnect);
+
+struct et61x251_device {
+        struct video_device* v4ldev;
+
+        struct et61x251_sensor* sensor;
+
+        struct usb_device* usbdev;
+        struct urb* urb[ET61X251_URBS];
+        void* transfer_buffer[ET61X251_URBS];
+        u8* control_buffer;
+
+        struct et61x251_frame_t *frame_current, frame[ET61X251_MAX_FRAMES];
+        struct list_head inqueue, outqueue;
+        u32 frame_count, nbuffers, nreadbuffers;
+
+        enum et61x251_io_method io;
+        enum et61x251_stream_state stream;
+
+        struct v4l2_jpegcompression compression;
+
+        struct et61x251_sysfs_attr sysfs;
+        struct et61x251_module_param module_param;
+
+        enum et61x251_dev_state state;
+        u8 users;
+
+        struct semaphore dev_sem, fileop_sem;
+        spinlock_t queue_lock;
+        wait_queue_head_t open, wait_frame, wait_stream;
+};
+
+/*****************************************************************************/
+
+void
+et61x251_attach_sensor(struct et61x251_device* cam,
+                       struct et61x251_sensor* sensor)
+{
+        cam->sensor = sensor;
+        cam->sensor->usbdev = cam->usbdev;
+}
+
+/*****************************************************************************/
+
+#undef DBG
+#undef KDBG
+#ifdef ET61X251_DEBUG
+#       define DBG(level, fmt, args...)                                       \
+do {                                                                          \
+        if (debug >= (level)) {                                               \
+                if ((level) == 1)                                             \
+                        dev_err(&cam->usbdev->dev, fmt "\n", ## args);        \
+                else if ((level) == 2)                                        \
+                        dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
+                else if ((level) >= 3)                                        \
+                        dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
+                                 __FUNCTION__, __LINE__ , ## args);           \
+        }                                                                     \
+} while (0)
+#       define KDBG(level, fmt, args...)                                      \
+do {                                                                          \
+        if (debug >= (level)) {                                               \
+                if ((level) == 1 || (level) == 2)                             \
+                        pr_info("et61x251: " fmt "\n", ## args);              \
+                else if ((level) == 3)                                        \
+                        pr_debug("et61x251: [%s:%d] " fmt "\n", __FUNCTION__, \
+                                 __LINE__ , ## args);                         \
+        }                                                                     \
+} while (0)
+#       define V4LDBG(level, name, cmd)                                       \
+do {                                                                          \
+        if (debug >= (level))                                                 \
+                v4l_print_ioctl(name, cmd);                                   \
+} while (0)
+#else
+#       define DBG(level, fmt, args...) do {;} while(0)
+#       define KDBG(level, fmt, args...) do {;} while(0)
+#       define V4LDBG(level, name, cmd) do {;} while(0)
+#endif
+
+#undef PDBG
+#define PDBG(fmt, args...)                                                    \
+dev_info(&cam->dev, "[%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args)
+
+#undef PDBGG
+#define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
+
+#endif /* _ET61X251_H_ */
diff --git a/drivers/usb/media/et61x251_core.c b/drivers/usb/media/et61x251_core.c
new file mode 100644
index 000000000000..2c0171a5ad62
--- /dev/null
+++ b/drivers/usb/media/et61x251_core.c
@@ -0,0 +1,2605 @@
+/***************************************************************************
+ * V4L2 driver for ET61X[12]51 PC Camera Controllers                       *
+ *                                                                         *
+ * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ *                                                                         *
+ * This program is free software; you can redistribute it and/or modify    *
+ * it under the terms of the GNU General Public License as published by    *
+ * the Free Software Foundation; either version 2 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program; if not, write to the Free Software             *
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+ ***************************************************************************/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/param.h>
+#include <linux/moduleparam.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/delay.h>
+#include <linux/stddef.h>
+#include <linux/compiler.h>
+#include <linux/ioctl.h>
+#include <linux/poll.h>
+#include <linux/stat.h>
+#include <linux/mm.h>
+#include <linux/vmalloc.h>
+#include <linux/page-flags.h>
+#include <linux/byteorder/generic.h>
+#include <asm/page.h>
+#include <asm/uaccess.h>
+
+#include "et61x251.h"
+
+/*****************************************************************************/
+
+#define ET61X251_MODULE_NAME    "V4L2 driver for ET61X[12]51 "                \
+                                "PC Camera Controllers"
+#define ET61X251_MODULE_AUTHOR  "(C) 2006 Luca Risolia"
+#define ET61X251_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
+#define ET61X251_MODULE_LICENSE "GPL"
+#define ET61X251_MODULE_VERSION "1:1.01"
+#define ET61X251_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 1)
+
+/*****************************************************************************/
+
+MODULE_DEVICE_TABLE(usb, et61x251_id_table);
+
+MODULE_AUTHOR(ET61X251_MODULE_AUTHOR " " ET61X251_AUTHOR_EMAIL);
+MODULE_DESCRIPTION(ET61X251_MODULE_NAME);
+MODULE_VERSION(ET61X251_MODULE_VERSION);
+MODULE_LICENSE(ET61X251_MODULE_LICENSE);
+
+static short video_nr[] = {[0 ... ET61X251_MAX_DEVICES-1] = -1};
+module_param_array(video_nr, short, NULL, 0444);
+MODULE_PARM_DESC(video_nr,
+                 "\n<-1|n[,...]> Specify V4L2 minor mode number."
+                 "\n -1 = use next available (default)"
+                 "\n  n = use minor number n (integer >= 0)"
+                 "\nYou can specify up to "
+                 __MODULE_STRING(ET61X251_MAX_DEVICES) " cameras this way."
+                 "\nFor example:"
+                 "\nvideo_nr=-1,2,-1 would assign minor number 2 to"
+                 "\nthe second registered camera and use auto for the first"
+                 "\none and for every other camera."
+                 "\n");
+
+static short force_munmap[] = {[0 ... ET61X251_MAX_DEVICES-1] =
+                               ET61X251_FORCE_MUNMAP};
+module_param_array(force_munmap, bool, NULL, 0444);
+MODULE_PARM_DESC(force_munmap,
+                 "\n<0|1[,...]> Force the application to unmap previously"
+                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
+                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
+                 "\nthis feature. This parameter is specific for each"
+                 "\ndetected camera."
+                 "\n 0 = do not force memory unmapping"
+                 "\n 1 = force memory unmapping (save memory)"
+                 "\nDefault value is "__MODULE_STRING(SN9C102_FORCE_MUNMAP)"."
+                 "\n");
+
+#ifdef ET61X251_DEBUG
+static unsigned short debug = ET61X251_DEBUG_LEVEL;
+module_param(debug, ushort, 0644);
+MODULE_PARM_DESC(debug,
+                 "\n<n> Debugging information level, from 0 to 3:"
+                 "\n0 = none (use carefully)"
+                 "\n1 = critical errors"
+                 "\n2 = significant informations"
+                 "\n3 = more verbose messages"
+                 "\nLevel 3 is useful for testing only, when only "
+                 "one device is used."
+                 "\nDefault value is "__MODULE_STRING(ET61X251_DEBUG_LEVEL)"."
+                 "\n");
+#endif
+
+/*****************************************************************************/
+
+static u32
+et61x251_request_buffers(struct et61x251_device* cam, u32 count,
+                         enum et61x251_io_method io)
+{
+        struct v4l2_pix_format* p = &(cam->sensor->pix_format);
+        struct v4l2_rect* r = &(cam->sensor->cropcap.bounds);
+        const size_t imagesize = cam->module_param.force_munmap ||
+                                 io == IO_READ ?
+                                 (p->width * p->height * p->priv) / 8 :
+                                 (r->width * r->height * p->priv) / 8;
+        void* buff = NULL;
+        u32 i;
+
+        if (count > ET61X251_MAX_FRAMES)
+                count = ET61X251_MAX_FRAMES;
+
+        cam->nbuffers = count;
+        while (cam->nbuffers > 0) {
+                if ((buff = vmalloc_32(cam->nbuffers * PAGE_ALIGN(imagesize))))
+                        break;
+                cam->nbuffers--;
+        }
+
+        for (i = 0; i < cam->nbuffers; i++) {
+                cam->frame[i].bufmem = buff + i*PAGE_ALIGN(imagesize);
+                cam->frame[i].buf.index = i;
+                cam->frame[i].buf.m.offset = i*PAGE_ALIGN(imagesize);
+                cam->frame[i].buf.length = imagesize;
+                cam->frame[i].buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                cam->frame[i].buf.sequence = 0;
+                cam->frame[i].buf.field = V4L2_FIELD_NONE;
+                cam->frame[i].buf.memory = V4L2_MEMORY_MMAP;
+                cam->frame[i].buf.flags = 0;
+        }
+
+        return cam->nbuffers;
+}
+
+
+static void et61x251_release_buffers(struct et61x251_device* cam)
+{
+        if (cam->nbuffers) {
+                vfree(cam->frame[0].bufmem);
+                cam->nbuffers = 0;
+        }
+        cam->frame_current = NULL;
+}
+
+
+static void et61x251_empty_framequeues(struct et61x251_device* cam)
+{
+        u32 i;
+
+        INIT_LIST_HEAD(&cam->inqueue);
+        INIT_LIST_HEAD(&cam->outqueue);
+
+        for (i = 0; i < ET61X251_MAX_FRAMES; i++) {
+                cam->frame[i].state = F_UNUSED;
+                cam->frame[i].buf.bytesused = 0;
+        }
+}
+
+
+static void et61x251_requeue_outqueue(struct et61x251_device* cam)
+{
+        struct et61x251_frame_t *i;
+
+        list_for_each_entry(i, &cam->outqueue, frame) {
+                i->state = F_QUEUED;
+                list_add(&i->frame, &cam->inqueue);
+        }
+
+        INIT_LIST_HEAD(&cam->outqueue);
+}
+
+
+static void et61x251_queue_unusedframes(struct et61x251_device* cam)
+{
+        unsigned long lock_flags;
+        u32 i;
+
+        for (i = 0; i < cam->nbuffers; i++)
+                if (cam->frame[i].state == F_UNUSED) {
+                        cam->frame[i].state = F_QUEUED;
+                        spin_lock_irqsave(&cam->queue_lock, lock_flags);
+                        list_add_tail(&cam->frame[i].frame, &cam->inqueue);
+                        spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
+                }
+}
+
+/*****************************************************************************/
+
+int et61x251_write_reg(struct et61x251_device* cam, u8 value, u16 index)
+{
+        struct usb_device* udev = cam->usbdev;
+        u8* buff = cam->control_buffer;
+        int res;
+
+        *buff = value;
+
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
+                              0, index, buff, 1, ET61X251_CTRL_TIMEOUT);
+        if (res < 0) {
+                DBG(3, "Failed to write a register (value 0x%02X, index "
+                       "0x%02X, error %d)", value, index, res);
+                return -1;
+        }
+
+        return 0;
+}
+
+
+int et61x251_read_reg(struct et61x251_device* cam, u16 index)
+{
+        struct usb_device* udev = cam->usbdev;
+        u8* buff = cam->control_buffer;
+        int res;
+
+        res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
+                              0, index, buff, 1, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                DBG(3, "Failed to read a register (index 0x%02X, error %d)",
+                    index, res);
+
+        return (res >= 0) ? (int)(*buff) : -1;
+}
+
+
+static int
+et61x251_i2c_wait(struct et61x251_device* cam, struct et61x251_sensor* sensor)
+{
+        int i, r;
+
+        for (i = 1; i <= 8; i++) {
+                if (sensor->interface == ET61X251_I2C_3WIRES) {
+                        r = et61x251_read_reg(cam, 0x8e);
+                        if (!(r & 0x02) && (r >= 0))
+                                return 0;
+                } else {
+                        r = et61x251_read_reg(cam, 0x8b);
+                        if (!(r & 0x01) && (r >= 0))
+                                return 0;
+                }
+                if (r < 0)
+                        return -EIO;
+                udelay(8*8); /* minimum for sensors at 400kHz */
+        }
+
+        return -EBUSY;
+}
+
+
+int
+et61x251_i2c_try_read(struct et61x251_device* cam,
+                      struct et61x251_sensor* sensor, u8 address)
+{
+        struct usb_device* udev = cam->usbdev;
+        u8* data = cam->control_buffer;
+        int err = 0, res;
+
+        data[0] = address;
+        data[1] = cam->sensor->i2c_slave_id;
+        data[2] = cam->sensor->rsta | 0x10;
+        data[3] = !(et61x251_read_reg(cam, 0x8b) & 0x02);
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
+                              0, 0x88, data, 4, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                err += res;
+
+        err += et61x251_i2c_wait(cam, sensor);
+
+        res = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x00, 0xc1,
+                              0, 0x80, data, 8, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                err += res;
+
+        if (err)
+                DBG(3, "I2C read failed for %s image sensor", sensor->name);
+
+        PDBGG("I2C read: address 0x%02X, value: 0x%02X", address, data[0]);
+
+        return err ? -1 : (int)data[0];
+}
+
+
+int
+et61x251_i2c_try_write(struct et61x251_device* cam,
+                       struct et61x251_sensor* sensor, u8 address, u8 value)
+{
+        struct usb_device* udev = cam->usbdev;
+        u8* data = cam->control_buffer;
+        int err = 0, res;
+
+        data[0] = address;
+        data[1] = cam->sensor->i2c_slave_id;
+        data[2] = cam->sensor->rsta | 0x12;
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
+                              0, 0x88, data, 3, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                err += res;
+
+        data[0] = value;
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
+                              0, 0x80, data, 1, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                err += res;
+
+        err += et61x251_i2c_wait(cam, sensor);
+
+        if (err)
+                DBG(3, "I2C write failed for %s image sensor", sensor->name);
+
+        PDBGG("I2C write: address 0x%02X, value: 0x%02X", address, value);
+
+        return err ? -1 : 0;
+}
+
+
+int
+et61x251_i2c_raw_write(struct et61x251_device* cam, u8 n, u8 data1, u8 data2,
+                       u8 data3, u8 data4, u8 data5, u8 data6, u8 data7,
+                       u8 data8, u8 address)
+{
+        struct usb_device* udev = cam->usbdev;
+        u8* data = cam->control_buffer;
+        int err = 0, res;
+
+        if (!cam->sensor)
+                return -1;
+
+        data[0] = data2;
+        data[1] = data3;
+        data[2] = data4;
+        data[3] = data5;
+        data[4] = data6;
+        data[5] = data7;
+        data[6] = data8;
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
+                              0, 0x81, data, n-1, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                err += res;
+
+        data[0] = address;
+        data[1] = cam->sensor->i2c_slave_id;
+        data[2] = cam->sensor->rsta | 0x02 | (n << 4);
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
+                              0, 0x88, data, 3, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                err += res;
+
+        /* Start writing through the serial interface */
+        data[0] = data1;
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x00, 0x41,
+                              0, 0x80, data, 1, ET61X251_CTRL_TIMEOUT);
+        if (res < 0)
+                err += res;
+
+        err += et61x251_i2c_wait(cam, cam->sensor);
+
+        if (err)
+                DBG(3, "I2C raw write failed for %s image sensor",
+                    cam->sensor->name);
+
+        PDBGG("I2C raw write: %u bytes, address = 0x%02X, data1 = 0x%02X, "
+              "data2 = 0x%02X, data3 = 0x%02X, data4 = 0x%02X, data5 = 0x%02X,"
+              " data6 = 0x%02X, data7 = 0x%02X, data8 = 0x%02X", n, address,
+              data1, data2, data3, data4, data5, data6, data7, data8);
+
+        return err ? -1 : 0;
+
+}
+
+
+int et61x251_i2c_read(struct et61x251_device* cam, u8 address)
+{
+        if (!cam->sensor)
+                return -1;
+
+        return et61x251_i2c_try_read(cam, cam->sensor, address);
+}
+
+
+int et61x251_i2c_write(struct et61x251_device* cam, u8 address, u8 value)
+{
+        if (!cam->sensor)
+                return -1;
+
+        return et61x251_i2c_try_write(cam, cam->sensor, address, value);
+}
+
+/*****************************************************************************/
+
+static void et61x251_urb_complete(struct urb *urb, struct pt_regs* regs)
+{
+        struct et61x251_device* cam = urb->context;
+        struct et61x251_frame_t** f;
+        size_t imagesize;
+        u8 i;
+        int err = 0;
+
+        if (urb->status == -ENOENT)
+                return;
+
+        f = &cam->frame_current;
+
+        if (cam->stream == STREAM_INTERRUPT) {
+                cam->stream = STREAM_OFF;
+                if ((*f))
+                        (*f)->state = F_QUEUED;
+                DBG(3, "Stream interrupted");
+                wake_up_interruptible(&cam->wait_stream);
+        }
+
+        if (cam->state & DEV_DISCONNECTED)
+                return;
+
+        if (cam->state & DEV_MISCONFIGURED) {
+                wake_up_interruptible(&cam->wait_frame);
+                return;
+        }
+
+        if (cam->stream == STREAM_OFF || list_empty(&cam->inqueue))
+                goto resubmit_urb;
+
+        if (!(*f))
+                (*f) = list_entry(cam->inqueue.next, struct et61x251_frame_t,
+                                  frame);
+
+        imagesize = (cam->sensor->pix_format.width *
+                     cam->sensor->pix_format.height *
+                     cam->sensor->pix_format.priv) / 8;
+
+        for (i = 0; i < urb->number_of_packets; i++) {
+                unsigned int len, status;
+                void *pos;
+                u8* b1, * b2, sof;
+                const u8 VOID_BYTES = 6;
+                size_t imglen;
+
+                len = urb->iso_frame_desc[i].actual_length;
+                status = urb->iso_frame_desc[i].status;
+                pos = urb->iso_frame_desc[i].offset + urb->transfer_buffer;
+
+                if (status) {
+                        DBG(3, "Error in isochronous frame");
+                        (*f)->state = F_ERROR;
+                        continue;
+                }
+
+                b1 = pos++;
+                b2 = pos++;
+                sof = ((*b1 & 0x3f) == 63);
+                imglen = ((*b1 & 0xc0) << 2) | *b2;
+
+                PDBGG("Isochrnous frame: length %u, #%u i, image length %zu",
+                      len, i, imglen);
+
+                if ((*f)->state == F_QUEUED || (*f)->state == F_ERROR)
+start_of_frame:
+                        if (sof) {
+                                (*f)->state = F_GRABBING;
+                                (*f)->buf.bytesused = 0;
+                                do_gettimeofday(&(*f)->buf.timestamp);
+                                pos += 22;
+                                DBG(3, "SOF detected: new video frame");
+                        }
+
+                if ((*f)->state == F_GRABBING) {
+                        if (sof && (*f)->buf.bytesused) {
+                                if (cam->sensor->pix_format.pixelformat ==
+                                                         V4L2_PIX_FMT_ET61X251)
+                                        goto end_of_frame;
+                                else {
+                                        DBG(3, "Not expected SOF detected "
+                                               "after %lu bytes",
+                                           (unsigned long)(*f)->buf.bytesused);
+                                        (*f)->state = F_ERROR;
+                                        continue;
+                                }
+                        }
+
+                        if ((*f)->buf.bytesused + imglen > imagesize) {
+                                DBG(3, "Video frame size exceeded");
+                                (*f)->state = F_ERROR;
+                                continue;
+                        }
+
+                        pos += VOID_BYTES;
+
+                        memcpy((*f)->bufmem+(*f)->buf.bytesused, pos, imglen);
+                        (*f)->buf.bytesused += imglen;
+
+                        if ((*f)->buf.bytesused == imagesize) {
+                                u32 b;
+end_of_frame:
+                                b = (*f)->buf.bytesused;
+                                (*f)->state = F_DONE;
+                                (*f)->buf.sequence= ++cam->frame_count;
+                                spin_lock(&cam->queue_lock);
+                                list_move_tail(&(*f)->frame, &cam->outqueue);
+                                if (!list_empty(&cam->inqueue))
+                                        (*f) = list_entry(cam->inqueue.next,
+                                                       struct et61x251_frame_t,
+                                                          frame);
+                                else
+                                        (*f) = NULL;
+                                spin_unlock(&cam->queue_lock);
+                                DBG(3, "Video frame captured: : %lu bytes",
+                                       (unsigned long)(b));
+
+                                if (!(*f))
+                                        goto resubmit_urb;
+
+                                if (sof &&
+                                    cam->sensor->pix_format.pixelformat ==
+                                                         V4L2_PIX_FMT_ET61X251)
+                                        goto start_of_frame;
+                        }
+                }
+        }
+
+resubmit_urb:
+        urb->dev = cam->usbdev;
+        err = usb_submit_urb(urb, GFP_ATOMIC);
+        if (err < 0 && err != -EPERM) {
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "usb_submit_urb() failed");
+        }
+
+        wake_up_interruptible(&cam->wait_frame);
+}
+
+
+static int et61x251_start_transfer(struct et61x251_device* cam)
+{
+        struct usb_device *udev = cam->usbdev;
+        struct urb* urb;
+        const unsigned int wMaxPacketSize[] = {0, 256, 384, 512, 640, 768, 832,
+                                               864, 896, 920, 956, 980, 1000,
+                                               1022};
+        const unsigned int psz = wMaxPacketSize[ET61X251_ALTERNATE_SETTING];
+        s8 i, j;
+        int err = 0;
+
+        for (i = 0; i < ET61X251_URBS; i++) {
+                cam->transfer_buffer[i] = kzalloc(ET61X251_ISO_PACKETS * psz,
+                                                  GFP_KERNEL);
+                if (!cam->transfer_buffer[i]) {
+                        err = -ENOMEM;
+                        DBG(1, "Not enough memory");
+                        goto free_buffers;
+                }
+        }
+
+        for (i = 0; i < ET61X251_URBS; i++) {
+                urb = usb_alloc_urb(ET61X251_ISO_PACKETS, GFP_KERNEL);
+                cam->urb[i] = urb;
+                if (!urb) {
+                        err = -ENOMEM;
+                        DBG(1, "usb_alloc_urb() failed");
+                        goto free_urbs;
+                }
+                urb->dev = udev;
+                urb->context = cam;
+                urb->pipe = usb_rcvisocpipe(udev, 1);
+                urb->transfer_flags = URB_ISO_ASAP;
+                urb->number_of_packets = ET61X251_ISO_PACKETS;
+                urb->complete = et61x251_urb_complete;
+                urb->transfer_buffer = cam->transfer_buffer[i];
+                urb->transfer_buffer_length = psz * ET61X251_ISO_PACKETS;
+                urb->interval = 1;
+                for (j = 0; j < ET61X251_ISO_PACKETS; j++) {
+                        urb->iso_frame_desc[j].offset = psz * j;
+                        urb->iso_frame_desc[j].length = psz;
+                }
+        }
+
+        err = et61x251_write_reg(cam, 0x01, 0x03);
+        err = et61x251_write_reg(cam, 0x00, 0x03);
+        err = et61x251_write_reg(cam, 0x08, 0x03);
+        if (err) {
+                err = -EIO;
+                DBG(1, "I/O hardware error");
+                goto free_urbs;
+        }
+
+        err = usb_set_interface(udev, 0, ET61X251_ALTERNATE_SETTING);
+        if (err) {
+                DBG(1, "usb_set_interface() failed");
+                goto free_urbs;
+        }
+
+        cam->frame_current = NULL;
+
+        for (i = 0; i < ET61X251_URBS; i++) {
+                err = usb_submit_urb(cam->urb[i], GFP_KERNEL);
+                if (err) {
+                        for (j = i-1; j >= 0; j--)
+                                usb_kill_urb(cam->urb[j]);
+                        DBG(1, "usb_submit_urb() failed, error %d", err);
+                        goto free_urbs;
+                }
+        }
+
+        return 0;
+
+free_urbs:
+        for (i = 0; (i < ET61X251_URBS) &&  cam->urb[i]; i++)
+                usb_free_urb(cam->urb[i]);
+
+free_buffers:
+        for (i = 0; (i < ET61X251_URBS) && cam->transfer_buffer[i]; i++)
+                kfree(cam->transfer_buffer[i]);
+
+        return err;
+}
+
+
+static int et61x251_stop_transfer(struct et61x251_device* cam)
+{
+        struct usb_device *udev = cam->usbdev;
+        s8 i;
+        int err = 0;
+
+        if (cam->state & DEV_DISCONNECTED)
+                return 0;
+
+        for (i = ET61X251_URBS-1; i >= 0; i--) {
+                usb_kill_urb(cam->urb[i]);
+                usb_free_urb(cam->urb[i]);
+                kfree(cam->transfer_buffer[i]);
+        }
+
+        err = usb_set_interface(udev, 0, 0); /* 0 Mb/s */
+        if (err)
+                DBG(3, "usb_set_interface() failed");
+
+        return err;
+}
+
+
+static int et61x251_stream_interrupt(struct et61x251_device* cam)
+{
+        int err = 0;
+
+        cam->stream = STREAM_INTERRUPT;
+        err = wait_event_timeout(cam->wait_stream,
+                                 (cam->stream == STREAM_OFF) ||
+                                 (cam->state & DEV_DISCONNECTED),
+                                 ET61X251_URB_TIMEOUT);
+        if (cam->state & DEV_DISCONNECTED)
+                return -ENODEV;
+        else if (err) {
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "URB timeout reached. The camera is misconfigured. To "
+                       "use it, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return err;
+        }
+
+        return 0;
+}
+
+/*****************************************************************************/
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static u8 et61x251_strtou8(const char* buff, size_t len, ssize_t* count)
+{
+        char str[5];
+        char* endp;
+        unsigned long val;
+
+        if (len < 4) {
+                strncpy(str, buff, len);
+                str[len+1] = '\0';
+        } else {
+                strncpy(str, buff, 4);
+                str[4] = '\0';
+        }
+
+        val = simple_strtoul(str, &endp, 0);
+
+        *count = 0;
+        if (val <= 0xff)
+                *count = (ssize_t)(endp - str);
+        if ((*count) && (len == *count+1) && (buff[*count] == '\n'))
+                *count += 1;
+
+        return (u8)val;
+}
+
+/*
+   NOTE 1: being inside one of the following methods implies that the v4l
+           device exists for sure (see kobjects and reference counters)
+   NOTE 2: buffers are PAGE_SIZE long
+*/
+
+static ssize_t et61x251_show_reg(struct class_device* cd, char* buf)
+{
+        struct et61x251_device* cam;
+        ssize_t count;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        count = sprintf(buf, "%u\n", cam->sysfs.reg);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static ssize_t
+et61x251_store_reg(struct class_device* cd, const char* buf, size_t len)
+{
+        struct et61x251_device* cam;
+        u8 index;
+        ssize_t count;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        index = et61x251_strtou8(buf, len, &count);
+        if (index > 0x8e || !count) {
+                up(&et61x251_sysfs_lock);
+                return -EINVAL;
+        }
+
+        cam->sysfs.reg = index;
+
+        DBG(2, "Moved ET61X[12]51 register index to 0x%02X", cam->sysfs.reg);
+        DBG(3, "Written bytes: %zd", count);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static ssize_t et61x251_show_val(struct class_device* cd, char* buf)
+{
+        struct et61x251_device* cam;
+        ssize_t count;
+        int val;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        if ((val = et61x251_read_reg(cam, cam->sysfs.reg)) < 0) {
+                up(&et61x251_sysfs_lock);
+                return -EIO;
+        }
+
+        count = sprintf(buf, "%d\n", val);
+
+        DBG(3, "Read bytes: %zd", count);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static ssize_t
+et61x251_store_val(struct class_device* cd, const char* buf, size_t len)
+{
+        struct et61x251_device* cam;
+        u8 value;
+        ssize_t count;
+        int err;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        value = et61x251_strtou8(buf, len, &count);
+        if (!count) {
+                up(&et61x251_sysfs_lock);
+                return -EINVAL;
+        }
+
+        err = et61x251_write_reg(cam, value, cam->sysfs.reg);
+        if (err) {
+                up(&et61x251_sysfs_lock);
+                return -EIO;
+        }
+
+        DBG(2, "Written ET61X[12]51 reg. 0x%02X, val. 0x%02X",
+            cam->sysfs.reg, value);
+        DBG(3, "Written bytes: %zd", count);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static ssize_t et61x251_show_i2c_reg(struct class_device* cd, char* buf)
+{
+        struct et61x251_device* cam;
+        ssize_t count;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        count = sprintf(buf, "%u\n", cam->sysfs.i2c_reg);
+
+        DBG(3, "Read bytes: %zd", count);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static ssize_t
+et61x251_store_i2c_reg(struct class_device* cd, const char* buf, size_t len)
+{
+        struct et61x251_device* cam;
+        u8 index;
+        ssize_t count;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        index = et61x251_strtou8(buf, len, &count);
+        if (!count) {
+                up(&et61x251_sysfs_lock);
+                return -EINVAL;
+        }
+
+        cam->sysfs.i2c_reg = index;
+
+        DBG(2, "Moved sensor register index to 0x%02X", cam->sysfs.i2c_reg);
+        DBG(3, "Written bytes: %zd", count);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static ssize_t et61x251_show_i2c_val(struct class_device* cd, char* buf)
+{
+        struct et61x251_device* cam;
+        ssize_t count;
+        int val;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        if (!(cam->sensor->sysfs_ops & ET61X251_I2C_READ)) {
+                up(&et61x251_sysfs_lock);
+                return -ENOSYS;
+        }
+
+        if ((val = et61x251_i2c_read(cam, cam->sysfs.i2c_reg)) < 0) {
+                up(&et61x251_sysfs_lock);
+                return -EIO;
+        }
+
+        count = sprintf(buf, "%d\n", val);
+
+        DBG(3, "Read bytes: %zd", count);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static ssize_t
+et61x251_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
+{
+        struct et61x251_device* cam;
+        u8 value;
+        ssize_t count;
+        int err;
+
+        if (down_interruptible(&et61x251_sysfs_lock))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(to_video_device(cd));
+        if (!cam) {
+                up(&et61x251_sysfs_lock);
+                return -ENODEV;
+        }
+
+        if (!(cam->sensor->sysfs_ops & ET61X251_I2C_READ)) {
+                up(&et61x251_sysfs_lock);
+                return -ENOSYS;
+        }
+
+        value = et61x251_strtou8(buf, len, &count);
+        if (!count) {
+                up(&et61x251_sysfs_lock);
+                return -EINVAL;
+        }
+
+        err = et61x251_i2c_write(cam, cam->sysfs.i2c_reg, value);
+        if (err) {
+                up(&et61x251_sysfs_lock);
+                return -EIO;
+        }
+
+        DBG(2, "Written sensor reg. 0x%02X, val. 0x%02X",
+            cam->sysfs.i2c_reg, value);
+        DBG(3, "Written bytes: %zd", count);
+
+        up(&et61x251_sysfs_lock);
+
+        return count;
+}
+
+
+static CLASS_DEVICE_ATTR(reg, S_IRUGO | S_IWUSR,
+                         et61x251_show_reg, et61x251_store_reg);
+static CLASS_DEVICE_ATTR(val, S_IRUGO | S_IWUSR,
+                         et61x251_show_val, et61x251_store_val);
+static CLASS_DEVICE_ATTR(i2c_reg, S_IRUGO | S_IWUSR,
+                         et61x251_show_i2c_reg, et61x251_store_i2c_reg);
+static CLASS_DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
+                         et61x251_show_i2c_val, et61x251_store_i2c_val);
+
+
+static void et61x251_create_sysfs(struct et61x251_device* cam)
+{
+        struct video_device *v4ldev = cam->v4ldev;
+
+        video_device_create_file(v4ldev, &class_device_attr_reg);
+        video_device_create_file(v4ldev, &class_device_attr_val);
+        if (cam->sensor && cam->sensor->sysfs_ops) {
+                video_device_create_file(v4ldev, &class_device_attr_i2c_reg);
+                video_device_create_file(v4ldev, &class_device_attr_i2c_val);
+        }
+}
+#endif /* CONFIG_VIDEO_ADV_DEBUG */
+
+/*****************************************************************************/
+
+static int
+et61x251_set_pix_format(struct et61x251_device* cam,
+                        struct v4l2_pix_format* pix)
+{
+        int r, err = 0;
+
+        if ((r = et61x251_read_reg(cam, 0x12)) < 0)
+                err += r;
+        if (pix->pixelformat == V4L2_PIX_FMT_ET61X251)
+                err += et61x251_write_reg(cam, r & 0xfd, 0x12);
+        else
+                err += et61x251_write_reg(cam, r | 0x02, 0x12);
+
+        return err ? -EIO : 0;
+}
+
+
+static int
+et61x251_set_compression(struct et61x251_device* cam,
+                         struct v4l2_jpegcompression* compression)
+{
+        int r, err = 0;
+
+        if ((r = et61x251_read_reg(cam, 0x12)) < 0)
+                err += r;
+        if (compression->quality == 0)
+                err += et61x251_write_reg(cam, r & 0xfb, 0x12);
+        else
+                err += et61x251_write_reg(cam, r | 0x04, 0x12);
+
+        return err ? -EIO : 0;
+}
+
+
+static int et61x251_set_scale(struct et61x251_device* cam, u8 scale)
+{
+        int r = 0, err = 0;
+
+        r = et61x251_read_reg(cam, 0x12);
+        if (r < 0)
+                err += r;
+
+        if (scale == 1)
+                err += et61x251_write_reg(cam, r & ~0x01, 0x12);
+        else if (scale == 2)
+                err += et61x251_write_reg(cam, r | 0x01, 0x12);
+
+        if (err)
+                return -EIO;
+
+        PDBGG("Scaling factor: %u", scale);
+
+        return 0;
+}
+
+
+static int
+et61x251_set_crop(struct et61x251_device* cam, struct v4l2_rect* rect)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        u16 fmw_sx = (u16)(rect->left - s->cropcap.bounds.left +
+                           s->active_pixel.left),
+            fmw_sy = (u16)(rect->top - s->cropcap.bounds.top +
+                           s->active_pixel.top),
+            fmw_length = (u16)(rect->width),
+            fmw_height = (u16)(rect->height);
+        int err = 0;
+
+        err += et61x251_write_reg(cam, fmw_sx & 0xff, 0x69);
+        err += et61x251_write_reg(cam, fmw_sy & 0xff, 0x6a);
+        err += et61x251_write_reg(cam, fmw_length & 0xff, 0x6b);
+        err += et61x251_write_reg(cam, fmw_height & 0xff, 0x6c);
+        err += et61x251_write_reg(cam, (fmw_sx >> 8) | ((fmw_sy & 0x300) >> 6)
+                                       | ((fmw_length & 0x300) >> 4)
+                                       | ((fmw_height & 0x300) >> 2), 0x6d);
+        if (err)
+                return -EIO;
+
+        PDBGG("fmw_sx, fmw_sy, fmw_length, fmw_height: %u %u %u %u",
+              fmw_sx, fmw_sy, fmw_length, fmw_height);
+
+        return 0;
+}
+
+
+static int et61x251_init(struct et61x251_device* cam)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        struct v4l2_control ctrl;
+        struct v4l2_queryctrl *qctrl;
+        struct v4l2_rect* rect;
+        u8 i = 0;
+        int err = 0;
+
+        if (!(cam->state & DEV_INITIALIZED)) {
+                init_waitqueue_head(&cam->open);
+                qctrl = s->qctrl;
+                rect = &(s->cropcap.defrect);
+                cam->compression.quality = ET61X251_COMPRESSION_QUALITY;
+        } else { /* use current values */
+                qctrl = s->_qctrl;
+                rect = &(s->_rect);
+        }
+
+        err += et61x251_set_scale(cam, rect->width / s->pix_format.width);
+        err += et61x251_set_crop(cam, rect);
+        if (err)
+                return err;
+
+        if (s->init) {
+                err = s->init(cam);
+                if (err) {
+                        DBG(3, "Sensor initialization failed");
+                        return err;
+                }
+        }
+
+        err += et61x251_set_compression(cam, &cam->compression);
+        err += et61x251_set_pix_format(cam, &s->pix_format);
+        if (s->set_pix_format)
+                err += s->set_pix_format(cam, &s->pix_format);
+        if (err)
+                return err;
+
+        if (s->pix_format.pixelformat == V4L2_PIX_FMT_ET61X251)
+                DBG(3, "Compressed video format is active, quality %d",
+                    cam->compression.quality);
+        else
+                DBG(3, "Uncompressed video format is active");
+
+        if (s->set_crop)
+                if ((err = s->set_crop(cam, rect))) {
+                        DBG(3, "set_crop() failed");
+                        return err;
+                }
+
+        if (s->set_ctrl) {
+                for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+                        if (s->qctrl[i].id != 0 &&
+                            !(s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED)) {
+                                ctrl.id = s->qctrl[i].id;
+                                ctrl.value = qctrl[i].default_value;
+                                err = s->set_ctrl(cam, &ctrl);
+                                if (err) {
+                                        DBG(3, "Set %s control failed",
+                                            s->qctrl[i].name);
+                                        return err;
+                                }
+                                DBG(3, "Image sensor supports '%s' control",
+                                    s->qctrl[i].name);
+                        }
+        }
+
+        if (!(cam->state & DEV_INITIALIZED)) {
+                init_MUTEX(&cam->fileop_sem);
+                spin_lock_init(&cam->queue_lock);
+                init_waitqueue_head(&cam->wait_frame);
+                init_waitqueue_head(&cam->wait_stream);
+                cam->nreadbuffers = 2;
+                memcpy(s->_qctrl, s->qctrl, sizeof(s->qctrl));
+                memcpy(&(s->_rect), &(s->cropcap.defrect),
+                       sizeof(struct v4l2_rect));
+                cam->state |= DEV_INITIALIZED;
+        }
+
+        DBG(2, "Initialization succeeded");
+        return 0;
+}
+
+
+static void et61x251_release_resources(struct et61x251_device* cam)
+{
+        down(&et61x251_sysfs_lock);
+
+        DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor);
+        video_set_drvdata(cam->v4ldev, NULL);
+        video_unregister_device(cam->v4ldev);
+
+        up(&et61x251_sysfs_lock);
+
+        kfree(cam->control_buffer);
+}
+
+/*****************************************************************************/
+
+static int et61x251_open(struct inode* inode, struct file* filp)
+{
+        struct et61x251_device* cam;
+        int err = 0;
+
+        /*
+           This is the only safe way to prevent race conditions with
+           disconnect
+        */
+        if (!down_read_trylock(&et61x251_disconnect))
+                return -ERESTARTSYS;
+
+        cam = video_get_drvdata(video_devdata(filp));
+
+        if (down_interruptible(&cam->dev_sem)) {
+                up_read(&et61x251_disconnect);
+                return -ERESTARTSYS;
+        }
+
+        if (cam->users) {
+                DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor);
+                if ((filp->f_flags & O_NONBLOCK) ||
+                    (filp->f_flags & O_NDELAY)) {
+                        err = -EWOULDBLOCK;
+                        goto out;
+                }
+                up(&cam->dev_sem);
+                err = wait_event_interruptible_exclusive(cam->open,
+                                                  cam->state & DEV_DISCONNECTED
+                                                         || !cam->users);
+                if (err) {
+                        up_read(&et61x251_disconnect);
+                        return err;
+                }
+                if (cam->state & DEV_DISCONNECTED) {
+                        up_read(&et61x251_disconnect);
+                        return -ENODEV;
+                }
+                down(&cam->dev_sem);
+        }
+
+
+        if (cam->state & DEV_MISCONFIGURED) {
+                err = et61x251_init(cam);
+                if (err) {
+                        DBG(1, "Initialization failed again. "
+                               "I will retry on next open().");
+                        goto out;
+                }
+                cam->state &= ~DEV_MISCONFIGURED;
+        }
+
+        if ((err = et61x251_start_transfer(cam)))
+                goto out;
+
+        filp->private_data = cam;
+        cam->users++;
+        cam->io = IO_NONE;
+        cam->stream = STREAM_OFF;
+        cam->nbuffers = 0;
+        cam->frame_count = 0;
+        et61x251_empty_framequeues(cam);
+
+        DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor);
+
+out:
+        up(&cam->dev_sem);
+        up_read(&et61x251_disconnect);
+        return err;
+}
+
+
+static int et61x251_release(struct inode* inode, struct file* filp)
+{
+        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+
+        down(&cam->dev_sem); /* prevent disconnect() to be called */
+
+        et61x251_stop_transfer(cam);
+
+        et61x251_release_buffers(cam);
+
+        if (cam->state & DEV_DISCONNECTED) {
+                et61x251_release_resources(cam);
+                up(&cam->dev_sem);
+                kfree(cam);
+                return 0;
+        }
+
+        cam->users--;
+        wake_up_interruptible_nr(&cam->open, 1);
+
+        DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor);
+
+        up(&cam->dev_sem);
+
+        return 0;
+}
+
+
+static ssize_t
+et61x251_read(struct file* filp, char __user * buf,
+              size_t count, loff_t* f_pos)
+{
+        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_frame_t* f, * i;
+        unsigned long lock_flags;
+        int err = 0;
+
+        if (down_interruptible(&cam->fileop_sem))
+                return -ERESTARTSYS;
+
+        if (cam->state & DEV_DISCONNECTED) {
+                DBG(1, "Device not present");
+                up(&cam->fileop_sem);
+                return -ENODEV;
+        }
+
+        if (cam->state & DEV_MISCONFIGURED) {
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
+                up(&cam->fileop_sem);
+                return -EIO;
+        }
+
+        if (cam->io == IO_MMAP) {
+                DBG(3, "Close and open the device again to choose the read "
+                       "method");
+                up(&cam->fileop_sem);
+                return -EINVAL;
+        }
+
+        if (cam->io == IO_NONE) {
+                if (!et61x251_request_buffers(cam, cam->nreadbuffers,
+                                              IO_READ)) {
+                        DBG(1, "read() failed, not enough memory");
+                        up(&cam->fileop_sem);
+                        return -ENOMEM;
+                }
+                cam->io = IO_READ;
+                cam->stream = STREAM_ON;
+        }
+
+        if (list_empty(&cam->inqueue)) {
+                if (!list_empty(&cam->outqueue))
+                        et61x251_empty_framequeues(cam);
+                et61x251_queue_unusedframes(cam);
+        }
+
+        if (!count) {
+                up(&cam->fileop_sem);
+                return 0;
+        }
+
+        if (list_empty(&cam->outqueue)) {
+                if (filp->f_flags & O_NONBLOCK) {
+                        up(&cam->fileop_sem);
+                        return -EAGAIN;
+                }
+                err = wait_event_interruptible
+                      ( cam->wait_frame,
+                        (!list_empty(&cam->outqueue)) ||
+                        (cam->state & DEV_DISCONNECTED) ||
+                        (cam->state & DEV_MISCONFIGURED) );
+                if (err) {
+                        up(&cam->fileop_sem);
+                        return err;
+                }
+                if (cam->state & DEV_DISCONNECTED) {
+                        up(&cam->fileop_sem);
+                        return -ENODEV;
+                }
+                if (cam->state & DEV_MISCONFIGURED) {
+                        up(&cam->fileop_sem);
+                        return -EIO;
+                }
+        }
+
+        f = list_entry(cam->outqueue.prev, struct et61x251_frame_t, frame);
+
+        if (count > f->buf.bytesused)
+                count = f->buf.bytesused;
+
+        if (copy_to_user(buf, f->bufmem, count)) {
+                err = -EFAULT;
+                goto exit;
+        }
+        *f_pos += count;
+
+exit:
+        spin_lock_irqsave(&cam->queue_lock, lock_flags);
+        list_for_each_entry(i, &cam->outqueue, frame)
+                i->state = F_UNUSED;
+        INIT_LIST_HEAD(&cam->outqueue);
+        spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
+
+        et61x251_queue_unusedframes(cam);
+
+        PDBGG("Frame #%lu, bytes read: %zu",
+              (unsigned long)f->buf.index, count);
+
+        up(&cam->fileop_sem);
+
+        return err ? err : count;
+}
+
+
+static unsigned int et61x251_poll(struct file *filp, poll_table *wait)
+{
+        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        struct et61x251_frame_t* f;
+        unsigned long lock_flags;
+        unsigned int mask = 0;
+
+        if (down_interruptible(&cam->fileop_sem))
+                return POLLERR;
+
+        if (cam->state & DEV_DISCONNECTED) {
+                DBG(1, "Device not present");
+                goto error;
+        }
+
+        if (cam->state & DEV_MISCONFIGURED) {
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
+                goto error;
+        }
+
+        if (cam->io == IO_NONE) {
+                if (!et61x251_request_buffers(cam, cam->nreadbuffers,
+                                              IO_READ)) {
+                        DBG(1, "poll() failed, not enough memory");
+                        goto error;
+                }
+                cam->io = IO_READ;
+                cam->stream = STREAM_ON;
+        }
+
+        if (cam->io == IO_READ) {
+                spin_lock_irqsave(&cam->queue_lock, lock_flags);
+                list_for_each_entry(f, &cam->outqueue, frame)
+                        f->state = F_UNUSED;
+                INIT_LIST_HEAD(&cam->outqueue);
+                spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
+                et61x251_queue_unusedframes(cam);
+        }
+
+        poll_wait(filp, &cam->wait_frame, wait);
+
+        if (!list_empty(&cam->outqueue))
+                mask |= POLLIN | POLLRDNORM;
+
+        up(&cam->fileop_sem);
+
+        return mask;
+
+error:
+        up(&cam->fileop_sem);
+        return POLLERR;
+}
+
+
+static void et61x251_vm_open(struct vm_area_struct* vma)
+{
+        struct et61x251_frame_t* f = vma->vm_private_data;
+        f->vma_use_count++;
+}
+
+
+static void et61x251_vm_close(struct vm_area_struct* vma)
+{
+        /* NOTE: buffers are not freed here */
+        struct et61x251_frame_t* f = vma->vm_private_data;
+        f->vma_use_count--;
+}
+
+
+static struct vm_operations_struct et61x251_vm_ops = {
+        .open = et61x251_vm_open,
+        .close = et61x251_vm_close,
+};
+
+
+static int et61x251_mmap(struct file* filp, struct vm_area_struct *vma)
+{
+        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        unsigned long size = vma->vm_end - vma->vm_start,
+                      start = vma->vm_start;
+        void *pos;
+        u32 i;
+
+        if (down_interruptible(&cam->fileop_sem))
+                return -ERESTARTSYS;
+
+        if (cam->state & DEV_DISCONNECTED) {
+                DBG(1, "Device not present");
+                up(&cam->fileop_sem);
+                return -ENODEV;
+        }
+
+        if (cam->state & DEV_MISCONFIGURED) {
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
+                up(&cam->fileop_sem);
+                return -EIO;
+        }
+
+        if (cam->io != IO_MMAP || !(vma->vm_flags & VM_WRITE) ||
+            size != PAGE_ALIGN(cam->frame[0].buf.length)) {
+                up(&cam->fileop_sem);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < cam->nbuffers; i++) {
+                if ((cam->frame[i].buf.m.offset>>PAGE_SHIFT) == vma->vm_pgoff)
+                        break;
+        }
+        if (i == cam->nbuffers) {
+                up(&cam->fileop_sem);
+                return -EINVAL;
+        }
+
+        vma->vm_flags |= VM_IO;
+        vma->vm_flags |= VM_RESERVED;
+
+        pos = cam->frame[i].bufmem;
+        while (size > 0) { /* size is page-aligned */
+                if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
+                        up(&cam->fileop_sem);
+                        return -EAGAIN;
+                }
+                start += PAGE_SIZE;
+                pos += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        vma->vm_ops = &et61x251_vm_ops;
+        vma->vm_private_data = &cam->frame[i];
+
+        et61x251_vm_open(vma);
+
+        up(&cam->fileop_sem);
+
+        return 0;
+}
+
+/*****************************************************************************/
+
+static int
+et61x251_vidioc_querycap(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_capability cap = {
+                .driver = "et61x251",
+                .version = ET61X251_MODULE_VERSION_CODE,
+                .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+                                V4L2_CAP_STREAMING,
+        };
+
+        strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
+        if (usb_make_path(cam->usbdev, cap.bus_info, sizeof(cap.bus_info)) < 0)
+                strlcpy(cap.bus_info, cam->usbdev->dev.bus_id,
+                        sizeof(cap.bus_info));
+
+        if (copy_to_user(arg, &cap, sizeof(cap)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_enuminput(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_input i;
+
+        if (copy_from_user(&i, arg, sizeof(i)))
+                return -EFAULT;
+
+        if (i.index)
+                return -EINVAL;
+
+        memset(&i, 0, sizeof(i));
+        strcpy(i.name, "Camera");
+
+        if (copy_to_user(arg, &i, sizeof(i)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_gs_input(struct et61x251_device* cam, void __user * arg)
+{
+        int index;
+
+        if (copy_from_user(&index, arg, sizeof(index)))
+                return -EFAULT;
+
+        if (index != 0)
+                return -EINVAL;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_query_ctrl(struct et61x251_device* cam, void __user * arg)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        struct v4l2_queryctrl qc;
+        u8 i;
+
+        if (copy_from_user(&qc, arg, sizeof(qc)))
+                return -EFAULT;
+
+        for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+                if (qc.id && qc.id == s->qctrl[i].id) {
+                        memcpy(&qc, &(s->qctrl[i]), sizeof(qc));
+                        if (copy_to_user(arg, &qc, sizeof(qc)))
+                                return -EFAULT;
+                        return 0;
+                }
+
+        return -EINVAL;
+}
+
+
+static int
+et61x251_vidioc_g_ctrl(struct et61x251_device* cam, void __user * arg)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        struct v4l2_control ctrl;
+        int err = 0;
+        u8 i;
+
+        if (!s->get_ctrl && !s->set_ctrl)
+                return -EINVAL;
+
+        if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
+                return -EFAULT;
+
+        if (!s->get_ctrl) {
+                for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+                        if (ctrl.id == s->qctrl[i].id) {
+                                ctrl.value = s->_qctrl[i].default_value;
+                                goto exit;
+                        }
+                return -EINVAL;
+        } else
+                err = s->get_ctrl(cam, &ctrl);
+
+exit:
+        if (copy_to_user(arg, &ctrl, sizeof(ctrl)))
+                return -EFAULT;
+
+        return err;
+}
+
+
+static int
+et61x251_vidioc_s_ctrl(struct et61x251_device* cam, void __user * arg)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        struct v4l2_control ctrl;
+        u8 i;
+        int err = 0;
+
+        if (!s->set_ctrl)
+                return -EINVAL;
+
+        if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
+                return -EFAULT;
+
+        for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+                if (ctrl.id == s->qctrl[i].id) {
+                        if (ctrl.value < s->qctrl[i].minimum ||
+                            ctrl.value > s->qctrl[i].maximum)
+                                return -ERANGE;
+                        ctrl.value -= ctrl.value % s->qctrl[i].step;
+                        break;
+                }
+
+        if ((err = s->set_ctrl(cam, &ctrl)))
+                return err;
+
+        s->_qctrl[i].default_value = ctrl.value;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_cropcap(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_cropcap* cc = &(cam->sensor->cropcap);
+
+        cc->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        cc->pixelaspect.numerator = 1;
+        cc->pixelaspect.denominator = 1;
+
+        if (copy_to_user(arg, cc, sizeof(*cc)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_g_crop(struct et61x251_device* cam, void __user * arg)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        struct v4l2_crop crop = {
+                .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+        };
+
+        memcpy(&(crop.c), &(s->_rect), sizeof(struct v4l2_rect));
+
+        if (copy_to_user(arg, &crop, sizeof(crop)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        struct v4l2_crop crop;
+        struct v4l2_rect* rect;
+        struct v4l2_rect* bounds = &(s->cropcap.bounds);
+        struct v4l2_pix_format* pix_format = &(s->pix_format);
+        u8 scale;
+        const enum et61x251_stream_state stream = cam->stream;
+        const u32 nbuffers = cam->nbuffers;
+        u32 i;
+        int err = 0;
+
+        if (copy_from_user(&crop, arg, sizeof(crop)))
+                return -EFAULT;
+
+        rect = &(crop.c);
+
+        if (crop.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        if (cam->module_param.force_munmap)
+                for (i = 0; i < cam->nbuffers; i++)
+                        if (cam->frame[i].vma_use_count) {
+                                DBG(3, "VIDIOC_S_CROP failed. "
+                                       "Unmap the buffers first.");
+                                return -EINVAL;
+                        }
+
+        /* Preserve R,G or B origin */
+        rect->left = (s->_rect.left & 1L) ? rect->left | 1L : rect->left & ~1L;
+        rect->top = (s->_rect.top & 1L) ? rect->top | 1L : rect->top & ~1L;
+
+        if (rect->width < 4)
+                rect->width = 4;
+        if (rect->height < 4)
+                rect->height = 4;
+        if (rect->width > bounds->width)
+                rect->width = bounds->width;
+        if (rect->height > bounds->height)
+                rect->height = bounds->height;
+        if (rect->left < bounds->left)
+                rect->left = bounds->left;
+        if (rect->top < bounds->top)
+                rect->top = bounds->top;
+        if (rect->left + rect->width > bounds->left + bounds->width)
+                rect->left = bounds->left+bounds->width - rect->width;
+        if (rect->top + rect->height > bounds->top + bounds->height)
+                rect->top = bounds->top+bounds->height - rect->height;
+
+        rect->width &= ~3L;
+        rect->height &= ~3L;
+
+        if (ET61X251_PRESERVE_IMGSCALE) {
+                /* Calculate the actual scaling factor */
+                u32 a, b;
+                a = rect->width * rect->height;
+                b = pix_format->width * pix_format->height;
+                scale = b ? (u8)((a / b) < 4 ? 1 : 2) : 1;
+        } else
+                scale = 1;
+
+        if (cam->stream == STREAM_ON)
+                if ((err = et61x251_stream_interrupt(cam)))
+                        return err;
+
+        if (copy_to_user(arg, &crop, sizeof(crop))) {
+                cam->stream = stream;
+                return -EFAULT;
+        }
+
+        if (cam->module_param.force_munmap || cam->io == IO_READ)
+                et61x251_release_buffers(cam);
+
+        err = et61x251_set_crop(cam, rect);
+        if (s->set_crop)
+                err += s->set_crop(cam, rect);
+        err += et61x251_set_scale(cam, scale);
+
+        if (err) { /* atomic, no rollback in ioctl() */
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -EIO;
+        }
+
+        s->pix_format.width = rect->width/scale;
+        s->pix_format.height = rect->height/scale;
+        memcpy(&(s->_rect), rect, sizeof(*rect));
+
+        if ((cam->module_param.force_munmap  || cam->io == IO_READ) &&
+            nbuffers != et61x251_request_buffers(cam, nbuffers, cam->io)) {
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -ENOMEM;
+        }
+
+        if (cam->io == IO_READ)
+                et61x251_empty_framequeues(cam);
+        else if (cam->module_param.force_munmap)
+                et61x251_requeue_outqueue(cam);
+
+        cam->stream = stream;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_enum_fmt(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_fmtdesc fmtd;
+
+        if (copy_from_user(&fmtd, arg, sizeof(fmtd)))
+                return -EFAULT;
+
+        if (fmtd.index == 0) {
+                strcpy(fmtd.description, "bayer rgb");
+                fmtd.pixelformat = V4L2_PIX_FMT_SBGGR8;
+        } else if (fmtd.index == 1) {
+                strcpy(fmtd.description, "compressed");
+                fmtd.pixelformat = V4L2_PIX_FMT_ET61X251;
+                fmtd.flags = V4L2_FMT_FLAG_COMPRESSED;
+        } else
+                return -EINVAL;
+
+        fmtd.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        memset(&fmtd.reserved, 0, sizeof(fmtd.reserved));
+
+        if (copy_to_user(arg, &fmtd, sizeof(fmtd)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_g_fmt(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_format format;
+        struct v4l2_pix_format* pfmt = &(cam->sensor->pix_format);
+
+        if (copy_from_user(&format, arg, sizeof(format)))
+                return -EFAULT;
+
+        if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_ET61X251)
+                             ? 0 : (pfmt->width * pfmt->priv) / 8;
+        pfmt->sizeimage = pfmt->height * ((pfmt->width*pfmt->priv)/8);
+        pfmt->field = V4L2_FIELD_NONE;
+        memcpy(&(format.fmt.pix), pfmt, sizeof(*pfmt));
+
+        if (copy_to_user(arg, &format, sizeof(format)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
+                          void __user * arg)
+{
+        struct et61x251_sensor* s = cam->sensor;
+        struct v4l2_format format;
+        struct v4l2_pix_format* pix;
+        struct v4l2_pix_format* pfmt = &(s->pix_format);
+        struct v4l2_rect* bounds = &(s->cropcap.bounds);
+        struct v4l2_rect rect;
+        u8 scale;
+        const enum et61x251_stream_state stream = cam->stream;
+        const u32 nbuffers = cam->nbuffers;
+        u32 i;
+        int err = 0;
+
+        if (copy_from_user(&format, arg, sizeof(format)))
+                return -EFAULT;
+
+        pix = &(format.fmt.pix);
+
+        if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        memcpy(&rect, &(s->_rect), sizeof(rect));
+
+        { /* calculate the actual scaling factor */
+                u32 a, b;
+                a = rect.width * rect.height;
+                b = pix->width * pix->height;
+                scale = b ? (u8)((a / b) < 4 ? 1 : 2) : 1;
+        }
+
+        rect.width = scale * pix->width;
+        rect.height = scale * pix->height;
+
+        if (rect.width < 4)
+                rect.width = 4;
+        if (rect.height < 4)
+                rect.height = 4;
+        if (rect.width > bounds->left + bounds->width - rect.left)
+                rect.width = bounds->left + bounds->width - rect.left;
+        if (rect.height > bounds->top + bounds->height - rect.top)
+                rect.height = bounds->top + bounds->height - rect.top;
+
+        rect.width &= ~3L;
+        rect.height &= ~3L;
+
+        { /* adjust the scaling factor */
+                u32 a, b;
+                a = rect.width * rect.height;
+                b = pix->width * pix->height;
+                scale = b ? (u8)((a / b) < 4 ? 1 : 2) : 1;
+        }
+
+        pix->width = rect.width / scale;
+        pix->height = rect.height / scale;
+
+        if (pix->pixelformat != V4L2_PIX_FMT_ET61X251 &&
+            pix->pixelformat != V4L2_PIX_FMT_SBGGR8)
+                pix->pixelformat = pfmt->pixelformat;
+        pix->priv = pfmt->priv; /* bpp */
+        pix->colorspace = pfmt->colorspace;
+        pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_ET61X251)
+                            ? 0 : (pix->width * pix->priv) / 8;
+        pix->sizeimage = pix->height * ((pix->width * pix->priv) / 8);
+        pix->field = V4L2_FIELD_NONE;
+
+        if (cmd == VIDIOC_TRY_FMT) {
+                if (copy_to_user(arg, &format, sizeof(format)))
+                        return -EFAULT;
+                return 0;
+        }
+
+        if (cam->module_param.force_munmap)
+                for (i = 0; i < cam->nbuffers; i++)
+                        if (cam->frame[i].vma_use_count) {
+                                DBG(3, "VIDIOC_S_FMT failed. "
+                                       "Unmap the buffers first.");
+                                return -EINVAL;
+                        }
+
+        if (cam->stream == STREAM_ON)
+                if ((err = et61x251_stream_interrupt(cam)))
+                        return err;
+
+        if (copy_to_user(arg, &format, sizeof(format))) {
+                cam->stream = stream;
+                return -EFAULT;
+        }
+
+        if (cam->module_param.force_munmap || cam->io == IO_READ)
+                et61x251_release_buffers(cam);
+
+        err += et61x251_set_pix_format(cam, pix);
+        err += et61x251_set_crop(cam, &rect);
+        if (s->set_pix_format)
+                err += s->set_pix_format(cam, pix);
+        if (s->set_crop)
+                err += s->set_crop(cam, &rect);
+        err += et61x251_set_scale(cam, scale);
+
+        if (err) { /* atomic, no rollback in ioctl() */
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -EIO;
+        }
+
+        memcpy(pfmt, pix, sizeof(*pix));
+        memcpy(&(s->_rect), &rect, sizeof(rect));
+
+        if ((cam->module_param.force_munmap  || cam->io == IO_READ) &&
+            nbuffers != et61x251_request_buffers(cam, nbuffers, cam->io)) {
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -ENOMEM;
+        }
+
+        if (cam->io == IO_READ)
+                et61x251_empty_framequeues(cam);
+        else if (cam->module_param.force_munmap)
+                et61x251_requeue_outqueue(cam);
+
+        cam->stream = stream;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_g_jpegcomp(struct et61x251_device* cam, void __user * arg)
+{
+        if (copy_to_user(arg, &cam->compression,
+                         sizeof(cam->compression)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_s_jpegcomp(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_jpegcompression jc;
+        const enum et61x251_stream_state stream = cam->stream;
+        int err = 0;
+
+        if (copy_from_user(&jc, arg, sizeof(jc)))
+                return -EFAULT;
+
+        if (jc.quality != 0 && jc.quality != 1)
+                return -EINVAL;
+
+        if (cam->stream == STREAM_ON)
+                if ((err = et61x251_stream_interrupt(cam)))
+                        return err;
+
+        err += et61x251_set_compression(cam, &jc);
+        if (err) { /* atomic, no rollback in ioctl() */
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
+                       "problems. To use the camera, close and open "
+                       "/dev/video%d again.", cam->v4ldev->minor);
+                return -EIO;
+        }
+
+        cam->compression.quality = jc.quality;
+
+        cam->stream = stream;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_reqbufs(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_requestbuffers rb;
+        u32 i;
+        int err;
+
+        if (copy_from_user(&rb, arg, sizeof(rb)))
+                return -EFAULT;
+
+        if (rb.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+            rb.memory != V4L2_MEMORY_MMAP)
+                return -EINVAL;
+
+        if (cam->io == IO_READ) {
+                DBG(3, "Close and open the device again to choose the mmap "
+                       "I/O method");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < cam->nbuffers; i++)
+                if (cam->frame[i].vma_use_count) {
+                        DBG(3, "VIDIOC_REQBUFS failed. "
+                               "Previous buffers are still mapped.");
+                        return -EINVAL;
+                }
+
+        if (cam->stream == STREAM_ON)
+                if ((err = et61x251_stream_interrupt(cam)))
+                        return err;
+
+        et61x251_empty_framequeues(cam);
+
+        et61x251_release_buffers(cam);
+        if (rb.count)
+                rb.count = et61x251_request_buffers(cam, rb.count, IO_MMAP);
+
+        if (copy_to_user(arg, &rb, sizeof(rb))) {
+                et61x251_release_buffers(cam);
+                cam->io = IO_NONE;
+                return -EFAULT;
+        }
+
+        cam->io = rb.count ? IO_MMAP : IO_NONE;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_querybuf(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_buffer b;
+
+        if (copy_from_user(&b, arg, sizeof(b)))
+                return -EFAULT;
+
+        if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+            b.index >= cam->nbuffers || cam->io != IO_MMAP)
+                return -EINVAL;
+
+        memcpy(&b, &cam->frame[b.index].buf, sizeof(b));
+
+        if (cam->frame[b.index].vma_use_count)
+                b.flags |= V4L2_BUF_FLAG_MAPPED;
+
+        if (cam->frame[b.index].state == F_DONE)
+                b.flags |= V4L2_BUF_FLAG_DONE;
+        else if (cam->frame[b.index].state != F_UNUSED)
+                b.flags |= V4L2_BUF_FLAG_QUEUED;
+
+        if (copy_to_user(arg, &b, sizeof(b)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_qbuf(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_buffer b;
+        unsigned long lock_flags;
+
+        if (copy_from_user(&b, arg, sizeof(b)))
+                return -EFAULT;
+
+        if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+            b.index >= cam->nbuffers || cam->io != IO_MMAP)
+                return -EINVAL;
+
+        if (cam->frame[b.index].state != F_UNUSED)
+                return -EINVAL;
+
+        cam->frame[b.index].state = F_QUEUED;
+
+        spin_lock_irqsave(&cam->queue_lock, lock_flags);
+        list_add_tail(&cam->frame[b.index].frame, &cam->inqueue);
+        spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
+
+        PDBGG("Frame #%lu queued", (unsigned long)b.index);
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_dqbuf(struct et61x251_device* cam, struct file* filp,
+                      void __user * arg)
+{
+        struct v4l2_buffer b;
+        struct et61x251_frame_t *f;
+        unsigned long lock_flags;
+        int err = 0;
+
+        if (copy_from_user(&b, arg, sizeof(b)))
+                return -EFAULT;
+
+        if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io!= IO_MMAP)
+                return -EINVAL;
+
+        if (list_empty(&cam->outqueue)) {
+                if (cam->stream == STREAM_OFF)
+                        return -EINVAL;
+                if (filp->f_flags & O_NONBLOCK)
+                        return -EAGAIN;
+                err = wait_event_interruptible
+                      ( cam->wait_frame,
+                        (!list_empty(&cam->outqueue)) ||
+                        (cam->state & DEV_DISCONNECTED) ||
+                        (cam->state & DEV_MISCONFIGURED) );
+                if (err)
+                        return err;
+                if (cam->state & DEV_DISCONNECTED)
+                        return -ENODEV;
+                if (cam->state & DEV_MISCONFIGURED)
+                        return -EIO;
+        }
+
+        spin_lock_irqsave(&cam->queue_lock, lock_flags);
+        f = list_entry(cam->outqueue.next, struct et61x251_frame_t, frame);
+        list_del(cam->outqueue.next);
+        spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
+
+        f->state = F_UNUSED;
+
+        memcpy(&b, &f->buf, sizeof(b));
+        if (f->vma_use_count)
+                b.flags |= V4L2_BUF_FLAG_MAPPED;
+
+        if (copy_to_user(arg, &b, sizeof(b)))
+                return -EFAULT;
+
+        PDBGG("Frame #%lu dequeued", (unsigned long)f->buf.index);
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_streamon(struct et61x251_device* cam, void __user * arg)
+{
+        int type;
+
+        if (copy_from_user(&type, arg, sizeof(type)))
+                return -EFAULT;
+
+        if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
+                return -EINVAL;
+
+        if (list_empty(&cam->inqueue))
+                return -EINVAL;
+
+        cam->stream = STREAM_ON;
+
+        DBG(3, "Stream on");
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_streamoff(struct et61x251_device* cam, void __user * arg)
+{
+        int type, err;
+
+        if (copy_from_user(&type, arg, sizeof(type)))
+                return -EFAULT;
+
+        if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
+                return -EINVAL;
+
+        if (cam->stream == STREAM_ON)
+                if ((err = et61x251_stream_interrupt(cam)))
+                        return err;
+
+        et61x251_empty_framequeues(cam);
+
+        DBG(3, "Stream off");
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_g_parm(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_streamparm sp;
+
+        if (copy_from_user(&sp, arg, sizeof(sp)))
+                return -EFAULT;
+
+        if (sp.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        sp.parm.capture.extendedmode = 0;
+        sp.parm.capture.readbuffers = cam->nreadbuffers;
+
+        if (copy_to_user(arg, &sp, sizeof(sp)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+et61x251_vidioc_s_parm(struct et61x251_device* cam, void __user * arg)
+{
+        struct v4l2_streamparm sp;
+
+        if (copy_from_user(&sp, arg, sizeof(sp)))
+                return -EFAULT;
+
+        if (sp.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        sp.parm.capture.extendedmode = 0;
+
+        if (sp.parm.capture.readbuffers == 0)
+                sp.parm.capture.readbuffers = cam->nreadbuffers;
+
+        if (sp.parm.capture.readbuffers > ET61X251_MAX_FRAMES)
+                sp.parm.capture.readbuffers = ET61X251_MAX_FRAMES;
+
+        if (copy_to_user(arg, &sp, sizeof(sp)))
+                return -EFAULT;
+
+        cam->nreadbuffers = sp.parm.capture.readbuffers;
+
+        return 0;
+}
+
+
+static int et61x251_ioctl_v4l2(struct inode* inode, struct file* filp,
+                               unsigned int cmd, void __user * arg)
+{
+        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+
+        switch (cmd) {
+
+        case VIDIOC_QUERYCAP:
+                return et61x251_vidioc_querycap(cam, arg);
+
+        case VIDIOC_ENUMINPUT:
+                return et61x251_vidioc_enuminput(cam, arg);
+
+        case VIDIOC_G_INPUT:
+        case VIDIOC_S_INPUT:
+                return et61x251_vidioc_gs_input(cam, arg);
+
+        case VIDIOC_QUERYCTRL:
+                return et61x251_vidioc_query_ctrl(cam, arg);
+
+        case VIDIOC_G_CTRL:
+                return et61x251_vidioc_g_ctrl(cam, arg);
+
+        case VIDIOC_S_CTRL_OLD:
+        case VIDIOC_S_CTRL:
+                return et61x251_vidioc_s_ctrl(cam, arg);
+
+        case VIDIOC_CROPCAP_OLD:
+        case VIDIOC_CROPCAP:
+                return et61x251_vidioc_cropcap(cam, arg);
+
+        case VIDIOC_G_CROP:
+                return et61x251_vidioc_g_crop(cam, arg);
+
+        case VIDIOC_S_CROP:
+                return et61x251_vidioc_s_crop(cam, arg);
+
+        case VIDIOC_ENUM_FMT:
+                return et61x251_vidioc_enum_fmt(cam, arg);
+
+        case VIDIOC_G_FMT:
+                return et61x251_vidioc_g_fmt(cam, arg);
+
+        case VIDIOC_TRY_FMT:
+        case VIDIOC_S_FMT:
+                return et61x251_vidioc_try_s_fmt(cam, cmd, arg);
+
+        case VIDIOC_G_JPEGCOMP:
+                return et61x251_vidioc_g_jpegcomp(cam, arg);
+
+        case VIDIOC_S_JPEGCOMP:
+                return et61x251_vidioc_s_jpegcomp(cam, arg);
+
+        case VIDIOC_REQBUFS:
+                return et61x251_vidioc_reqbufs(cam, arg);
+
+        case VIDIOC_QUERYBUF:
+                return et61x251_vidioc_querybuf(cam, arg);
+
+        case VIDIOC_QBUF:
+                return et61x251_vidioc_qbuf(cam, arg);
+
+        case VIDIOC_DQBUF:
+                return et61x251_vidioc_dqbuf(cam, filp, arg);
+
+        case VIDIOC_STREAMON:
+                return et61x251_vidioc_streamon(cam, arg);
+
+        case VIDIOC_STREAMOFF:
+                return et61x251_vidioc_streamoff(cam, arg);
+
+        case VIDIOC_G_PARM:
+                return et61x251_vidioc_g_parm(cam, arg);
+
+        case VIDIOC_S_PARM_OLD:
+        case VIDIOC_S_PARM:
+                return et61x251_vidioc_s_parm(cam, arg);
+
+        case VIDIOC_G_STD:
+        case VIDIOC_S_STD:
+        case VIDIOC_QUERYSTD:
+        case VIDIOC_ENUMSTD:
+        case VIDIOC_QUERYMENU:
+                return -EINVAL;
+
+        default:
+                return -EINVAL;
+
+        }
+}
+
+
+static int et61x251_ioctl(struct inode* inode, struct file* filp,
+                         unsigned int cmd, unsigned long arg)
+{
+        struct et61x251_device* cam = video_get_drvdata(video_devdata(filp));
+        int err = 0;
+
+        if (down_interruptible(&cam->fileop_sem))
+                return -ERESTARTSYS;
+
+        if (cam->state & DEV_DISCONNECTED) {
+                DBG(1, "Device not present");
+                up(&cam->fileop_sem);
+                return -ENODEV;
+        }
+
+        if (cam->state & DEV_MISCONFIGURED) {
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
+                up(&cam->fileop_sem);
+                return -EIO;
+        }
+
+        V4LDBG(3, "et61x251", cmd);
+
+        err = et61x251_ioctl_v4l2(inode, filp, cmd, (void __user *)arg);
+
+        up(&cam->fileop_sem);
+
+        return err;
+}
+
+
+static struct file_operations et61x251_fops = {
+        .owner = THIS_MODULE,
+        .open =    et61x251_open,
+        .release = et61x251_release,
+        .ioctl =   et61x251_ioctl,
+        .read =    et61x251_read,
+        .poll =    et61x251_poll,
+        .mmap =    et61x251_mmap,
+        .llseek =  no_llseek,
+};
+
+/*****************************************************************************/
+
+/* It exists a single interface only. We do not need to validate anything. */
+static int
+et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
+{
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct et61x251_device* cam;
+        static unsigned int dev_nr = 0;
+        unsigned int i;
+        int err = 0;
+
+        if (!(cam = kzalloc(sizeof(struct et61x251_device), GFP_KERNEL)))
+                return -ENOMEM;
+
+        cam->usbdev = udev;
+
+        if (!(cam->control_buffer = kzalloc(8, GFP_KERNEL))) {
+                DBG(1, "kmalloc() failed");
+                err = -ENOMEM;
+                goto fail;
+        }
+
+        if (!(cam->v4ldev = video_device_alloc())) {
+                DBG(1, "video_device_alloc() failed");
+                err = -ENOMEM;
+                goto fail;
+        }
+
+        init_MUTEX(&cam->dev_sem);
+
+        DBG(2, "ET61X[12]51 PC Camera Controller detected "
+               "(vid/pid 0x%04X/0x%04X)",id->idVendor, id->idProduct);
+
+        for  (i = 0; et61x251_sensor_table[i]; i++) {
+                err = et61x251_sensor_table[i](cam);
+                if (!err)
+                        break;
+        }
+
+        if (!err && cam->sensor)
+                DBG(2, "%s image sensor detected", cam->sensor->name);
+        else {
+                DBG(1, "No supported image sensor detected");
+                err = -ENODEV;
+                goto fail;
+        }
+
+        if (et61x251_init(cam)) {
+                DBG(1, "Initialization failed. I will retry on open().");
+                cam->state |= DEV_MISCONFIGURED;
+        }
+
+        strcpy(cam->v4ldev->name, "ET61X[12]51 PC Camera");
+        cam->v4ldev->owner = THIS_MODULE;
+        cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
+        cam->v4ldev->hardware = 0;
+        cam->v4ldev->fops = &et61x251_fops;
+        cam->v4ldev->minor = video_nr[dev_nr];
+        cam->v4ldev->release = video_device_release;
+        video_set_drvdata(cam->v4ldev, cam);
+
+        down(&cam->dev_sem);
+
+        err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
+                                    video_nr[dev_nr]);
+        if (err) {
+                DBG(1, "V4L2 device registration failed");
+                if (err == -ENFILE && video_nr[dev_nr] == -1)
+                        DBG(1, "Free /dev/videoX node not found");
+                video_nr[dev_nr] = -1;
+                dev_nr = (dev_nr < ET61X251_MAX_DEVICES-1) ? dev_nr+1 : 0;
+                up(&cam->dev_sem);
+                goto fail;
+        }
+
+        DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor);
+
+        cam->module_param.force_munmap = force_munmap[dev_nr];
+
+        dev_nr = (dev_nr < ET61X251_MAX_DEVICES-1) ? dev_nr+1 : 0;
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        et61x251_create_sysfs(cam);
+        DBG(2, "Optional device control through 'sysfs' interface ready");
+#endif
+
+        usb_set_intfdata(intf, cam);
+
+        up(&cam->dev_sem);
+
+        return 0;
+
+fail:
+        if (cam) {
+                kfree(cam->control_buffer);
+                if (cam->v4ldev)
+                        video_device_release(cam->v4ldev);
+                kfree(cam);
+        }
+        return err;
+}
+
+
+static void et61x251_usb_disconnect(struct usb_interface* intf)
+{
+        struct et61x251_device* cam = usb_get_intfdata(intf);
+
+        if (!cam)
+                return;
+
+        down_write(&et61x251_disconnect);
+
+        down(&cam->dev_sem);
+
+        DBG(2, "Disconnecting %s...", cam->v4ldev->name);
+
+        wake_up_interruptible_all(&cam->open);
+
+        if (cam->users) {
+                DBG(2, "Device /dev/video%d is open! Deregistration and "
+                       "memory deallocation are deferred on close.",
+                    cam->v4ldev->minor);
+                cam->state |= DEV_MISCONFIGURED;
+                et61x251_stop_transfer(cam);
+                cam->state |= DEV_DISCONNECTED;
+                wake_up_interruptible(&cam->wait_frame);
+                wake_up_interruptible(&cam->wait_stream);
+        } else {
+                cam->state |= DEV_DISCONNECTED;
+                et61x251_release_resources(cam);
+        }
+
+        up(&cam->dev_sem);
+
+        if (!cam->users)
+                kfree(cam);
+
+        up_write(&et61x251_disconnect);
+}
+
+
+static struct usb_driver et61x251_usb_driver = {
+        .name =       "et61x251",
+        .id_table =   et61x251_id_table,
+        .probe =      et61x251_usb_probe,
+        .disconnect = et61x251_usb_disconnect,
+};
+
+/*****************************************************************************/
+
+static int __init et61x251_module_init(void)
+{
+        int err = 0;
+
+        KDBG(2, ET61X251_MODULE_NAME " v" ET61X251_MODULE_VERSION);
+        KDBG(3, ET61X251_MODULE_AUTHOR);
+
+        if ((err = usb_register(&et61x251_usb_driver)))
+                KDBG(1, "usb_register() failed");
+
+        return err;
+}
+
+
+static void __exit et61x251_module_exit(void)
+{
+        usb_deregister(&et61x251_usb_driver);
+}
+
+
+module_init(et61x251_module_init);
+module_exit(et61x251_module_exit);
diff --git a/drivers/usb/media/et61x251_sensor.h b/drivers/usb/media/et61x251_sensor.h
new file mode 100644
index 000000000000..b9df91062fc0
--- /dev/null
+++ b/drivers/usb/media/et61x251_sensor.h
@@ -0,0 +1,115 @@
+/***************************************************************************
+ * API for image sensors connected to ET61X[12]51 PC Camera Controllers    *
+ *                                                                         *
+ * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ *                                                                         *
+ * This program is free software; you can redistribute it and/or modify    *
+ * it under the terms of the GNU General Public License as published by    *
+ * the Free Software Foundation; either version 2 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program; if not, write to the Free Software             *
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+ ***************************************************************************/
+
+#ifndef _ET61X251_SENSOR_H_
+#define _ET61X251_SENSOR_H_
+
+#include <linux/usb.h>
+#include <linux/videodev.h>
+#include <linux/device.h>
+#include <linux/stddef.h>
+#include <linux/errno.h>
+#include <asm/types.h>
+
+struct et61x251_device;
+struct et61x251_sensor;
+
+/*****************************************************************************/
+
+extern int et61x251_probe_tas5130d1b(struct et61x251_device* cam);
+
+#define ET61X251_SENSOR_TABLE                                                 \
+/* Weak detections must go at the end of the list */                          \
+static int (*et61x251_sensor_table[])(struct et61x251_device*) = {            \
+        &et61x251_probe_tas5130d1b,                                           \
+        NULL,                                                                 \
+};
+
+extern void
+et61x251_attach_sensor(struct et61x251_device* cam,
+                       struct et61x251_sensor* sensor);
+
+/*****************************************************************************/
+
+extern int et61x251_write_reg(struct et61x251_device*, u8 value, u16 index);
+extern int et61x251_read_reg(struct et61x251_device*, u16 index);
+extern int et61x251_i2c_write(struct et61x251_device*, u8 address, u8 value);
+extern int et61x251_i2c_read(struct et61x251_device*, u8 address);
+extern int et61x251_i2c_try_write(struct et61x251_device*,
+                                  struct et61x251_sensor*, u8 address,
+                                  u8 value);
+extern int et61x251_i2c_try_read(struct et61x251_device*,
+                                 struct et61x251_sensor*, u8 address);
+extern int et61x251_i2c_raw_write(struct et61x251_device*, u8 n, u8 data1,
+                                  u8 data2, u8 data3, u8 data4, u8 data5,
+                                  u8 data6, u8 data7, u8 data8, u8 address);
+
+/*****************************************************************************/
+
+enum et61x251_i2c_sysfs_ops {
+        ET61X251_I2C_READ = 0x01,
+        ET61X251_I2C_WRITE = 0x02,
+};
+
+enum et61x251_i2c_interface {
+        ET61X251_I2C_2WIRES,
+        ET61X251_I2C_3WIRES,
+};
+
+/* Repeat start condition when RSTA is high */
+enum et61x251_i2c_rsta {
+        ET61X251_I2C_RSTA_STOP = 0x00, /* stop then start */
+        ET61X251_I2C_RSTA_REPEAT = 0x01, /* repeat start */
+};
+
+#define ET61X251_MAX_CTRLS V4L2_CID_LASTP1-V4L2_CID_BASE+10
+
+struct et61x251_sensor {
+        char name[32];
+
+        enum et61x251_i2c_sysfs_ops sysfs_ops;
+
+        enum et61x251_i2c_interface interface;
+        u8 i2c_slave_id;
+        enum et61x251_i2c_rsta rsta;
+        struct v4l2_rect active_pixel; /* left and top define FVSX and FVSY */
+
+        struct v4l2_queryctrl qctrl[ET61X251_MAX_CTRLS];
+        struct v4l2_cropcap cropcap;
+        struct v4l2_pix_format pix_format;
+
+        int (*init)(struct et61x251_device* cam);
+        int (*get_ctrl)(struct et61x251_device* cam,
+                        struct v4l2_control* ctrl);
+        int (*set_ctrl)(struct et61x251_device* cam,
+                        const struct v4l2_control* ctrl);
+        int (*set_crop)(struct et61x251_device* cam,
+                        const struct v4l2_rect* rect);
+        int (*set_pix_format)(struct et61x251_device* cam,
+                              const struct v4l2_pix_format* pix);
+
+        const struct usb_device* usbdev;
+
+        /* Private */
+        struct v4l2_queryctrl _qctrl[ET61X251_MAX_CTRLS];
+        struct v4l2_rect _rect;
+};
+
+#endif /* _ET61X251_SENSOR_H_ */
diff --git a/drivers/usb/media/et61x251_tas5130d1b.c b/drivers/usb/media/et61x251_tas5130d1b.c
new file mode 100644
index 000000000000..65f1ae9cf2b3
--- /dev/null
+++ b/drivers/usb/media/et61x251_tas5130d1b.c
@@ -0,0 +1,137 @@
+/***************************************************************************
+ * Plug-in for TAS5130D1B image sensor connected to the ET61X[12]51        *
+ * PC Camera Controllers                                                   *
+ *                                                                         *
+ * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ *                                                                         *
+ * This program is free software; you can redistribute it and/or modify    *
+ * it under the terms of the GNU General Public License as published by    *
+ * the Free Software Foundation; either version 2 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program; if not, write to the Free Software             *
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
+ ***************************************************************************/
+
+#include "et61x251_sensor.h"
+
+
+static int tas5130d1b_init(struct et61x251_device* cam)
+{
+        int err = 0;
+
+        err += et61x251_write_reg(cam, 0x14, 0x01);
+        err += et61x251_write_reg(cam, 0x1b, 0x02);
+        err += et61x251_write_reg(cam, 0x02, 0x12);
+        err += et61x251_write_reg(cam, 0x0e, 0x60);
+        err += et61x251_write_reg(cam, 0x80, 0x61);
+        err += et61x251_write_reg(cam, 0xf0, 0x62);
+        err += et61x251_write_reg(cam, 0x03, 0x63);
+        err += et61x251_write_reg(cam, 0x14, 0x64);
+        err += et61x251_write_reg(cam, 0xf4, 0x65);
+        err += et61x251_write_reg(cam, 0x01, 0x66);
+        err += et61x251_write_reg(cam, 0x05, 0x67);
+        err += et61x251_write_reg(cam, 0x8f, 0x68);
+        err += et61x251_write_reg(cam, 0x0f, 0x8d);
+        err += et61x251_write_reg(cam, 0x08, 0x8e);
+
+        return err;
+}
+
+
+static int tas5130d1b_set_ctrl(struct et61x251_device* cam,
+                               const struct v4l2_control* ctrl)
+{
+        int err = 0;
+
+        switch (ctrl->id) {
+        case V4L2_CID_GAIN:
+                err += et61x251_i2c_raw_write(cam, 2, 0x20,
+                                              0xf6-ctrl->value, 0, 0, 0,
+                                              0, 0, 0, 0);
+                break;
+        case V4L2_CID_EXPOSURE:
+                err += et61x251_i2c_raw_write(cam, 2, 0x40,
+                                              0x47-ctrl->value, 0, 0, 0,
+                                              0, 0, 0, 0);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return err ? -EIO : 0;
+}
+
+
+static struct et61x251_sensor tas5130d1b = {
+        .name = "TAS5130D1B",
+        .interface = ET61X251_I2C_3WIRES,
+        .rsta = ET61X251_I2C_RSTA_STOP,
+        .active_pixel = {
+                .left = 106,
+                .top = 13,
+        },
+        .init = &tas5130d1b_init,
+        .qctrl = {
+                {
+                        .id = V4L2_CID_GAIN,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "global gain",
+                        .minimum = 0x00,
+                        .maximum = 0xf6,
+                        .step = 0x02,
+                        .default_value = 0x0d,
+                        .flags = 0,
+                },
+                {
+                        .id = V4L2_CID_EXPOSURE,
+                        .type = V4L2_CTRL_TYPE_INTEGER,
+                        .name = "exposure",
+                        .minimum = 0x00,
+                        .maximum = 0x47,
+                        .step = 0x01,
+                        .default_value = 0x23,
+                        .flags = 0,
+                },
+        },
+        .set_ctrl = &tas5130d1b_set_ctrl,
+        .cropcap = {
+                .bounds = {
+                        .left = 0,
+                        .top = 0,
+                        .width = 640,
+                        .height = 480,
+                },
+                .defrect = {
+                        .left = 0,
+                        .top = 0,
+                        .width = 640,
+                        .height = 480,
+                },
+        },
+        .pix_format = {
+                .width = 640,
+                .height = 480,
+                .pixelformat = V4L2_PIX_FMT_SBGGR8,
+                .priv = 8,
+        },
+};
+
+
+int et61x251_probe_tas5130d1b(struct et61x251_device* cam)
+{
+        /* This sensor has no identifiers, so let's attach it anyway */
+        et61x251_attach_sensor(cam, &tas5130d1b);
+
+        /* Sensor detection is based on USB pid/vid */
+        if (le16_to_cpu(tas5130d1b.usbdev->descriptor.idProduct) != 0x6251)
+                return -ENODEV;
+
+        return 0;
+}
diff --git a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c
index 8af665bbe330..51e9cc06f7e3 100644
--- a/drivers/usb/media/ov511.c
+++ b/drivers/usb/media/ov511.c
@@ -204,22 +204,10 @@ MODULE_LICENSE("GPL");
 
 static struct usb_driver ov511_driver;
 
-static struct ov51x_decomp_ops *ov511_decomp_ops;
-static struct ov51x_decomp_ops *ov511_mmx_decomp_ops;
-static struct ov51x_decomp_ops *ov518_decomp_ops;
-static struct ov51x_decomp_ops *ov518_mmx_decomp_ops;
-
 /* Number of times to retry a failed I2C transaction. Increase this if you
  * are getting "Failed to read sensor ID..." */
 static const int i2c_detect_tries = 5;
 
-/* MMX support is present in kernel and CPU. Checked upon decomp module load. */
-#if defined(__i386__) || defined(__x86_64__)
-#define ov51x_mmx_available (cpu_has_mmx)
-#else
-#define ov51x_mmx_available (0)
-#endif
-
 static struct usb_device_id device_table [] = {
         { USB_DEVICE(VEND_OMNIVISION, PROD_OV511) },
         { USB_DEVICE(VEND_OMNIVISION, PROD_OV511PLUS) },
@@ -3012,93 +3000,18 @@ yuv420raw_to_yuv420p(struct ov511_frame *frame,
  *
  **********************************************************************/
 
-/* Chooses a decompression module, locks it, and sets ov->decomp_ops
- * accordingly. Returns -ENXIO if decompressor is not available, otherwise
- * returns 0 if no other error.
- */
 static int
 request_decompressor(struct usb_ov511 *ov)
 {
-        if (!ov)
-                return -ENODEV;
-
-        if (ov->decomp_ops) {
-                err("ERROR: Decompressor already requested!");
-                return -EINVAL;
-        }
-
-        lock_kernel();
-
-        /* Try to get MMX, and fall back on no-MMX if necessary */
-        if (ov->bclass == BCL_OV511) {
-                if (ov511_mmx_decomp_ops) {
-                        PDEBUG(3, "Using OV511 MMX decompressor");
-                        ov->decomp_ops = ov511_mmx_decomp_ops;
-                } else if (ov511_decomp_ops) {
-                        PDEBUG(3, "Using OV511 decompressor");
-                        ov->decomp_ops = ov511_decomp_ops;
-                } else {
-                        err("No decompressor available");
-                }
-        } else if (ov->bclass == BCL_OV518) {
-                if (ov518_mmx_decomp_ops) {
-                        PDEBUG(3, "Using OV518 MMX decompressor");
-                        ov->decomp_ops = ov518_mmx_decomp_ops;
-                } else if (ov518_decomp_ops) {
-                        PDEBUG(3, "Using OV518 decompressor");
-                        ov->decomp_ops = ov518_decomp_ops;
-                } else {
-                        err("No decompressor available");
-                }
+        if (ov->bclass == BCL_OV511 || ov->bclass == BCL_OV518) {
+                err("No decompressor available");
         } else {
                 err("Unknown bridge");
         }
 
-        if (!ov->decomp_ops)
-                goto nosys;
-
-        if (!ov->decomp_ops->owner) {
-                ov->decomp_ops = NULL;
-                goto nosys;
-        }
-        
-        if (!try_module_get(ov->decomp_ops->owner))
-                goto nosys;
-
-        unlock_kernel();
-        return 0;
-
- nosys:
-        unlock_kernel();
         return -ENOSYS;
 }
 
-/* Unlocks decompression module and nulls ov->decomp_ops. Safe to call even
- * if ov->decomp_ops is NULL.
- */
-static void
-release_decompressor(struct usb_ov511 *ov)
-{
-        int released = 0;       /* Did we actually do anything? */
-
-        if (!ov)
-                return;
-
-        lock_kernel();
-
-        if (ov->decomp_ops) {
-                module_put(ov->decomp_ops->owner);
-                released = 1;
-        }
-
-        ov->decomp_ops = NULL;
-
-        unlock_kernel();
-
-        if (released)
-                PDEBUG(3, "Decompressor released");
-}
-
 static void
 decompress(struct usb_ov511 *ov, struct ov511_frame *frame,
            unsigned char *pIn0, unsigned char *pOut0)
@@ -3107,31 +3020,6 @@ decompress(struct usb_ov511 *ov, struct ov511_frame *frame,
                 if (request_decompressor(ov))
                         return;
 
-        PDEBUG(4, "Decompressing %d bytes", frame->bytes_recvd);
-
-        if (frame->format == VIDEO_PALETTE_GREY
-            && ov->decomp_ops->decomp_400) {
-                int ret = ov->decomp_ops->decomp_400(
-                        pIn0,
-                        pOut0,
-                        frame->compbuf,
-                        frame->rawwidth,
-                        frame->rawheight,
-                        frame->bytes_recvd);
-                PDEBUG(4, "DEBUG: decomp_400 returned %d", ret);
-        } else if (frame->format != VIDEO_PALETTE_GREY
-                   && ov->decomp_ops->decomp_420) {
-                int ret = ov->decomp_ops->decomp_420(
-                        pIn0,
-                        pOut0,
-                        frame->compbuf,
-                        frame->rawwidth,
-                        frame->rawheight,
-                        frame->bytes_recvd);
-                PDEBUG(4, "DEBUG: decomp_420 returned %d", ret);
-        } else {
-                err("Decompressor does not support this format");
-        }
 }
 
 /**********************************************************************
@@ -4087,8 +3975,6 @@ ov51x_v4l1_close(struct inode *inode, struct file *file)
         ov->user--;
         ov51x_stop_isoc(ov);
 
-        release_decompressor(ov);
-
         if (ov->led_policy == LED_AUTO)
                 ov51x_led_control(ov, 0);
 
@@ -6021,82 +5907,6 @@ static struct usb_driver ov511_driver = {
  *
  ***************************************************************************/
 
-/* Returns 0 for success */
-int
-ov511_register_decomp_module(int ver, struct ov51x_decomp_ops *ops, int ov518,
-                             int mmx)
-{
-        if (ver != DECOMP_INTERFACE_VER) {
-                err("Decompression module has incompatible");
-                err("interface version %d", ver);
-                err("Interface version %d is required", DECOMP_INTERFACE_VER);
-                return -EINVAL;
-        }
-
-        if (!ops)
-                return -EFAULT;
-
-        if (mmx && !ov51x_mmx_available) {
-                err("MMX not available on this system or kernel");
-                return -EINVAL;
-        }
-
-        lock_kernel();
-
-        if (ov518) {
-                if (mmx) {
-                        if (ov518_mmx_decomp_ops)
-                                goto err_in_use;
-                        else
-                                ov518_mmx_decomp_ops = ops;
-                } else {
-                        if (ov518_decomp_ops)
-                                goto err_in_use;
-                        else
-                                ov518_decomp_ops = ops;
-                }
-        } else {
-                if (mmx) {
-                        if (ov511_mmx_decomp_ops)
-                                goto err_in_use;
-                        else
-                                ov511_mmx_decomp_ops = ops;
-                } else {
-                        if (ov511_decomp_ops)
-                                goto err_in_use;
-                        else
-                                ov511_decomp_ops = ops;
-                }
-        }
-
-        unlock_kernel();
-        return 0;
-
-err_in_use:
-        unlock_kernel();
-        return -EBUSY;
-}
-
-void
-ov511_deregister_decomp_module(int ov518, int mmx)
-{
-        lock_kernel();
-
-        if (ov518) {
-                if (mmx)
-                        ov518_mmx_decomp_ops = NULL;
-                else
-                        ov518_decomp_ops = NULL;
-        } else {
-                if (mmx)
-                        ov511_mmx_decomp_ops = NULL;
-                else
-                        ov511_decomp_ops = NULL;
-        }
-
-        unlock_kernel();
-}
-
 static int __init
 usb_ov511_init(void)
 {
@@ -6123,5 +5933,3 @@ usb_ov511_exit(void)
 module_init(usb_ov511_init);
 module_exit(usb_ov511_exit);
 
-EXPORT_SYMBOL(ov511_register_decomp_module);
-EXPORT_SYMBOL(ov511_deregister_decomp_module);
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c
index 359c4b2df735..3ebb6e9cdf92 100644
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/usb/media/pwc/pwc-ctrl.c
@@ -1152,45 +1152,6 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor)
  /* End of Add-Ons                                    */
  /* ************************************************* */
 
-/* Linux 2.5.something and 2.6 pass direct pointers to arguments of
-   ioctl() calls. With 2.4, you have to do tedious copy_from_user()
-   and copy_to_user() calls. With these macros we circumvent this,
-   and let me maintain only one source file. The functionality is
-   exactly the same otherwise.
- */   
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-
-/* define local variable for arg */
-#define ARG_DEF(ARG_type, ARG_name)\
-        ARG_type *ARG_name = arg;
-/* copy arg to local variable */        
-#define ARG_IN(ARG_name) /* nothing */
-/* argument itself (referenced) */
-#define ARGR(ARG_name) (*ARG_name)
-/* argument address */
-#define ARGA(ARG_name) ARG_name
-/* copy local variable to arg */
-#define ARG_OUT(ARG_name) /* nothing */
-
-#else
-
-#define ARG_DEF(ARG_type, ARG_name)\
-        ARG_type ARG_name;
-#define ARG_IN(ARG_name)\
-        if (copy_from_user(&ARG_name, arg, sizeof(ARG_name))) {\
-                ret = -EFAULT;\
-                break;\
-        }
-#define ARGR(ARG_name) ARG_name
-#define ARGA(ARG_name) &ARG_name
-#define ARG_OUT(ARG_name)\
-        if (copy_to_user(arg, &ARG_name, sizeof(ARG_name))) {\
-                ret = -EFAULT;\
-                break;\
-        }
-
-#endif
 
 int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
 {
@@ -1220,243 +1181,206 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
         
         case VIDIOCPWCSCQUAL:
         {       
-                ARG_DEF(int, qual)
+                int *qual = arg;
 
-                ARG_IN(qual)
-                if (ARGR(qual) < 0 || ARGR(qual) > 3)
+                if (*qual < 0 || *qual > 3)
                         ret = -EINVAL;
                 else
-                        ret = pwc_try_video_mode(pdev, pdev->view.x, pdev->view.y, pdev->vframes, ARGR(qual), pdev->vsnapshot);
+                        ret = pwc_try_video_mode(pdev, pdev->view.x, pdev->view.y, pdev->vframes, *qual, pdev->vsnapshot);
                 if (ret >= 0)
-                        pdev->vcompression = ARGR(qual);
+                        pdev->vcompression = *qual;
                 break;
         }
         
         case VIDIOCPWCGCQUAL:
         {
-                ARG_DEF(int, qual)
-                
-                ARGR(qual) = pdev->vcompression;
-                ARG_OUT(qual)
+                int *qual = arg;
+                *qual = pdev->vcompression;
                 break;
         }
         
         case VIDIOCPWCPROBE:
         {
-                ARG_DEF(struct pwc_probe, probe)
-                
-                strcpy(ARGR(probe).name, pdev->vdev->name);
-                ARGR(probe).type = pdev->type;
-                ARG_OUT(probe)
+                struct pwc_probe *probe = arg;
+                strcpy(probe->name, pdev->vdev->name);
+                probe->type = pdev->type;
                 break;
         }
 
         case VIDIOCPWCGSERIAL:
         {
-                ARG_DEF(struct pwc_serial, serial)
-                
-                strcpy(ARGR(serial).serial, pdev->serial);
-                ARG_OUT(serial)
+                struct pwc_serial *serial = arg;
+                strcpy(serial->serial, pdev->serial);
                 break;
         }
 
         case VIDIOCPWCSAGC:
         {
-                ARG_DEF(int, agc)
-
-                ARG_IN(agc)
-                if (pwc_set_agc(pdev, ARGR(agc) < 0 ? 1 : 0, ARGR(agc)))
+                int *agc = arg;
+                if (pwc_set_agc(pdev, *agc < 0 ? 1 : 0, *agc))
                         ret = -EINVAL;
                 break;
         }
         
         case VIDIOCPWCGAGC:
         {
-                ARG_DEF(int, agc)
+                int *agc = arg;
                 
-                if (pwc_get_agc(pdev, ARGA(agc)))
+                if (pwc_get_agc(pdev, agc))
                         ret = -EINVAL;
-                ARG_OUT(agc)
                 break;
         }
         
         case VIDIOCPWCSSHUTTER:
         {
-                ARG_DEF(int, shutter_speed)
-
-                ARG_IN(shutter_speed)
-                ret = pwc_set_shutter_speed(pdev, ARGR(shutter_speed) < 0 ? 1 : 0, ARGR(shutter_speed));
+                int *shutter_speed = arg;
+                ret = pwc_set_shutter_speed(pdev, *shutter_speed < 0 ? 1 : 0, *shutter_speed);
                 break;
         }
         
         case VIDIOCPWCSAWB:
         {
-                ARG_DEF(struct pwc_whitebalance, wb)
+                struct pwc_whitebalance *wb = arg;
                 
-                ARG_IN(wb)
-                ret = pwc_set_awb(pdev, ARGR(wb).mode);
-                if (ret >= 0 && ARGR(wb).mode == PWC_WB_MANUAL) {
-                        pwc_set_red_gain(pdev, ARGR(wb).manual_red);
-                        pwc_set_blue_gain(pdev, ARGR(wb).manual_blue);
+                ret = pwc_set_awb(pdev, wb->mode);
+                if (ret >= 0 && wb->mode == PWC_WB_MANUAL) {
+                        pwc_set_red_gain(pdev, wb->manual_red);
+                        pwc_set_blue_gain(pdev, wb->manual_blue);
                 }
                 break;
         }
 
         case VIDIOCPWCGAWB:
         {
-                ARG_DEF(struct pwc_whitebalance, wb)
+                struct pwc_whitebalance *wb = arg;
 
-                memset(ARGA(wb), 0, sizeof(struct pwc_whitebalance));
-                ARGR(wb).mode = pwc_get_awb(pdev);
-                if (ARGR(wb).mode < 0)
+                memset(wb, 0, sizeof(struct pwc_whitebalance));
+                wb->mode = pwc_get_awb(pdev);
+                if (wb->mode < 0)
                         ret = -EINVAL;
                 else {
-                        if (ARGR(wb).mode == PWC_WB_MANUAL) {
-                                ret = pwc_get_red_gain(pdev, &ARGR(wb).manual_red);
+                        if (wb->mode == PWC_WB_MANUAL) {
+                                ret = pwc_get_red_gain(pdev, &wb->manual_red);
                                 if (ret < 0)
                                         break;
-                                ret = pwc_get_blue_gain(pdev, &ARGR(wb).manual_blue);
+                                ret = pwc_get_blue_gain(pdev, &wb->manual_blue);
                                 if (ret < 0)
                                         break;
                         }
-                        if (ARGR(wb).mode == PWC_WB_AUTO) {
-                                ret = pwc_read_red_gain(pdev, &ARGR(wb).read_red);
+                        if (wb->mode == PWC_WB_AUTO) {
+                                ret = pwc_read_red_gain(pdev, &wb->read_red);
                                 if (ret < 0)
                                         break;
-                                ret =pwc_read_blue_gain(pdev, &ARGR(wb).read_blue);
+                                ret = pwc_read_blue_gain(pdev, &wb->read_blue);
                                 if (ret < 0)
                                         break;
                         }
                 }
-                ARG_OUT(wb)
                 break;
         }
         
         case VIDIOCPWCSAWBSPEED:
         {
-                ARG_DEF(struct pwc_wb_speed, wbs)
+                struct pwc_wb_speed *wbs = arg;
                 
-                if (ARGR(wbs).control_speed > 0) {
-                        ret = pwc_set_wb_speed(pdev, ARGR(wbs).control_speed);
+                if (wbs->control_speed > 0) {
+                        ret = pwc_set_wb_speed(pdev, wbs->control_speed);
                 }
-                if (ARGR(wbs).control_delay > 0) {
-                        ret = pwc_set_wb_delay(pdev, ARGR(wbs).control_delay);
+                if (wbs->control_delay > 0) {
+                        ret = pwc_set_wb_delay(pdev, wbs->control_delay);
                 }
                 break;
         }
         
         case VIDIOCPWCGAWBSPEED:
         {
-                ARG_DEF(struct pwc_wb_speed, wbs)
+                struct pwc_wb_speed *wbs = arg;
                 
-                ret = pwc_get_wb_speed(pdev, &ARGR(wbs).control_speed);
+                ret = pwc_get_wb_speed(pdev, &wbs->control_speed);
                 if (ret < 0)
                         break;
-                ret = pwc_get_wb_delay(pdev, &ARGR(wbs).control_delay);
+                ret = pwc_get_wb_delay(pdev, &wbs->control_delay);
                 if (ret < 0)
                         break;
-                ARG_OUT(wbs)
                 break;
         }
 
         case VIDIOCPWCSLED:
         {
-                ARG_DEF(struct pwc_leds, leds)
-
-                ARG_IN(leds)
-                ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);
+                struct pwc_leds *leds = arg;
+                ret = pwc_set_leds(pdev, leds->led_on, leds->led_off);
                 break;
         }
 
 
         case VIDIOCPWCGLED:
         {
-                ARG_DEF(struct pwc_leds, leds)
-                
-                ret = pwc_get_leds(pdev, &ARGR(leds).led_on, &ARGR(leds).led_off);
-                ARG_OUT(leds)
+                struct pwc_leds *leds = arg;
+                ret = pwc_get_leds(pdev, &leds->led_on, &leds->led_off);
                 break;
         }
 
         case VIDIOCPWCSCONTOUR:
         {
-                ARG_DEF(int, contour)
-
-                ARG_IN(contour)
-                ret = pwc_set_contour(pdev, ARGR(contour));
+                int *contour = arg;
+                ret = pwc_set_contour(pdev, *contour);
                 break;
         }
                         
         case VIDIOCPWCGCONTOUR:
         {
-                ARG_DEF(int, contour)
-                
-                ret = pwc_get_contour(pdev, ARGA(contour));
-                ARG_OUT(contour)
+                int *contour = arg;
+                ret = pwc_get_contour(pdev, contour);
                 break;
         }
         
         case VIDIOCPWCSBACKLIGHT:
         {
-                ARG_DEF(int, backlight)
-                
-                ARG_IN(backlight)
-                ret = pwc_set_backlight(pdev, ARGR(backlight));
+                int *backlight = arg;
+                ret = pwc_set_backlight(pdev, *backlight);
                 break;
         }
 
         case VIDIOCPWCGBACKLIGHT:
         {
-                ARG_DEF(int, backlight)
-                
-                ret = pwc_get_backlight(pdev, ARGA(backlight));
-                ARG_OUT(backlight)
+                int *backlight = arg;
+                ret = pwc_get_backlight(pdev, backlight);
                 break;
         }
         
         case VIDIOCPWCSFLICKER:
         {
-                ARG_DEF(int, flicker)
-                
-                ARG_IN(flicker)
-                ret = pwc_set_flicker(pdev, ARGR(flicker));
+                int *flicker = arg;
+                ret = pwc_set_flicker(pdev, *flicker);
                 break;
         }
 
         case VIDIOCPWCGFLICKER:
         {
-                ARG_DEF(int, flicker)
-                
-                ret = pwc_get_flicker(pdev, ARGA(flicker));
-                ARG_OUT(flicker)
+                int *flicker = arg;
+                ret = pwc_get_flicker(pdev, flicker);
                 break;
         }
         
         case VIDIOCPWCSDYNNOISE:
         {
-                ARG_DEF(int, dynnoise)
-                
-                ARG_IN(dynnoise)
-                ret = pwc_set_dynamic_noise(pdev, ARGR(dynnoise));
+                int *dynnoise = arg;
+                ret = pwc_set_dynamic_noise(pdev, *dynnoise);
                 break;
         }
         
         case VIDIOCPWCGDYNNOISE:
         {
-                ARG_DEF(int, dynnoise)
-
-                ret = pwc_get_dynamic_noise(pdev, ARGA(dynnoise));
-                ARG_OUT(dynnoise);
+                int *dynnoise = arg;
+                ret = pwc_get_dynamic_noise(pdev, dynnoise);
                 break;
         }
 
         case VIDIOCPWCGREALSIZE:
         {
-                ARG_DEF(struct pwc_imagesize, size)
-                
-                ARGR(size).width = pdev->image.x;
-                ARGR(size).height = pdev->image.y;
-                ARG_OUT(size)
+                struct pwc_imagesize *size = arg;
+                size->width = pdev->image.x;
+                size->height = pdev->image.y;
                 break;
         }
         
@@ -1464,10 +1388,9 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
         {
                 if (pdev->features & FEATURE_MOTOR_PANTILT)
                 {
-                        ARG_DEF(int, flags)
+                        int *flags = arg;
 
-                        ARG_IN(flags)
-                        ret = pwc_mpt_reset(pdev, ARGR(flags));
+                        ret = pwc_mpt_reset(pdev, *flags);
                         if (ret >= 0)
                         {
                                 pdev->pan_angle = 0;
@@ -1485,10 +1408,8 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
         {
                 if (pdev->features & FEATURE_MOTOR_PANTILT)
                 {
-                        ARG_DEF(struct pwc_mpt_range, range)
-                        
-                        ARGR(range) = pdev->angle_range;
-                        ARG_OUT(range)
+                        struct pwc_mpt_range *range = arg;
+                        *range = pdev->angle_range;
                 }
                 else
                 {       
@@ -1503,21 +1424,19 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 
                 if (pdev->features & FEATURE_MOTOR_PANTILT)
                 {
-                        ARG_DEF(struct pwc_mpt_angles, angles)
-
-                        ARG_IN(angles)
+                        struct pwc_mpt_angles *angles = arg;
                         /* The camera can only set relative angles, so
                            do some calculations when getting an absolute angle .
                          */
-                        if (ARGR(angles).absolute)
+                        if (angles->absolute)
                         {
-                                new_pan  = ARGR(angles).pan; 
-                                new_tilt = ARGR(angles).tilt;
+                                new_pan  = angles->pan;
+                                new_tilt = angles->tilt;
                         }
                         else
                         {
-                                new_pan  = pdev->pan_angle  + ARGR(angles).pan;
-                                new_tilt = pdev->tilt_angle + ARGR(angles).tilt;
+                                new_pan  = pdev->pan_angle  + angles->pan;
+                                new_tilt = pdev->tilt_angle + angles->tilt;
                         }
                         /* check absolute ranges */
                         if (new_pan  < pdev->angle_range.pan_min  ||
@@ -1560,12 +1479,11 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
                 
                 if (pdev->features & FEATURE_MOTOR_PANTILT)
                 {
-                        ARG_DEF(struct pwc_mpt_angles, angles)
+                        struct pwc_mpt_angles *angles = arg;
 
-                        ARGR(angles).absolute = 1;
-                        ARGR(angles).pan  = pdev->pan_angle;
-                        ARGR(angles).tilt = pdev->tilt_angle;
-                        ARG_OUT(angles)
+                        angles->absolute = 1;
+                        angles->pan  = pdev->pan_angle;
+                        angles->tilt = pdev->tilt_angle;
                 }
                 else
                 {
@@ -1578,10 +1496,8 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
         {
                 if (pdev->features & FEATURE_MOTOR_PANTILT)
                 {
-                        ARG_DEF(struct pwc_mpt_status, status)
-                        
-                        ret = pwc_mpt_get_status(pdev, ARGA(status));
-                        ARG_OUT(status)
+                        struct pwc_mpt_status *status = arg;
+                        ret = pwc_mpt_get_status(pdev, status);
                 }
                 else
                 {
@@ -1592,24 +1508,22 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
 
         case VIDIOCPWCGVIDCMD:
         {
-                ARG_DEF(struct pwc_video_command, cmd);
+                struct pwc_video_command *cmd = arg;
                 
-                ARGR(cmd).type = pdev->type;
-                ARGR(cmd).release = pdev->release;
-                ARGR(cmd).command_len = pdev->cmd_len;
-                memcpy(&ARGR(cmd).command_buf, pdev->cmd_buf, pdev->cmd_len);
-                ARGR(cmd).bandlength = pdev->vbandlength;
-                ARGR(cmd).frame_size = pdev->frame_size;
-                ARG_OUT(cmd)
+                cmd->type = pdev->type;
+                cmd->release = pdev->release;
+                cmd->command_len = pdev->cmd_len;
+                memcpy(&cmd->command_buf, pdev->cmd_buf, pdev->cmd_len);
+                cmd->bandlength = pdev->vbandlength;
+                cmd->frame_size = pdev->frame_size;
                 break;
         }
        /*
         case VIDIOCPWCGVIDTABLE:
         {
-                ARG_DEF(struct pwc_table_init_buffer, table);
-                ARGR(table).len = pdev->cmd_len;
-                memcpy(&ARGR(table).buffer, pdev->decompress_data, pdev->decompressor->table_size);
-                ARG_OUT(table)
+                struct pwc_table_init_buffer *table = arg;
+                table->len = pdev->cmd_len;
+                memcpy(&table->buffer, pdev->decompress_data, pdev->decompressor->table_size);
                 break;
         }
         */
diff --git a/drivers/usb/media/sn9c102.h b/drivers/usb/media/sn9c102.h
index e5cea0e2eb57..17d60c1eea7e 100644
--- a/drivers/usb/media/sn9c102.h
+++ b/drivers/usb/media/sn9c102.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  * V4L2 driver for SN9C10x PC Camera Controllers                           *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -23,7 +23,8 @@
 
 #include <linux/version.h>
 #include <linux/usb.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
@@ -52,13 +53,6 @@
 
 /*****************************************************************************/
 
-#define SN9C102_MODULE_NAME     "V4L2 driver for SN9C10x PC Camera Controllers"
-#define SN9C102_MODULE_AUTHOR   "(C) 2004-2005 Luca Risolia"
-#define SN9C102_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
-#define SN9C102_MODULE_LICENSE  "GPL"
-#define SN9C102_MODULE_VERSION  "1:1.24a"
-#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 24)
-
 enum sn9c102_bridge {
         BRIDGE_SN9C101 = 0x01,
         BRIDGE_SN9C102 = 0x02,
@@ -102,12 +96,13 @@ enum sn9c102_stream_state {
         STREAM_ON,
 };
 
+typedef char sn9c103_sof_header_t[18];
 typedef char sn9c102_sof_header_t[12];
 typedef char sn9c102_eof_header_t[4];
 
 struct sn9c102_sysfs_attr {
         u8 reg, i2c_reg;
-        sn9c102_sof_header_t frame_header;
+        sn9c103_sof_header_t frame_header;
 };
 
 struct sn9c102_module_param {
@@ -118,8 +113,6 @@ static DECLARE_MUTEX(sn9c102_sysfs_lock);
 static DECLARE_RWSEM(sn9c102_disconnect);
 
 struct sn9c102_device {
-        struct device dev;
-
         struct video_device* v4ldev;
 
         enum sn9c102_bridge bridge;
@@ -140,8 +133,8 @@ struct sn9c102_device {
         struct v4l2_jpegcompression compression;
 
         struct sn9c102_sysfs_attr sysfs;
-        sn9c102_sof_header_t sof_header;
-        u16 reg[32];
+        sn9c103_sof_header_t sof_header;
+        u16 reg[63];
 
         struct sn9c102_module_param module_param;
 
@@ -160,7 +153,6 @@ sn9c102_attach_sensor(struct sn9c102_device* cam,
                       struct sn9c102_sensor* sensor)
 {
         cam->sensor = sensor;
-        cam->sensor->dev = &cam->dev;
         cam->sensor->usbdev = cam->usbdev;
 }
 
@@ -170,19 +162,24 @@ sn9c102_attach_sensor(struct sn9c102_device* cam,
 #undef KDBG
 #ifdef SN9C102_DEBUG
 #       define DBG(level, fmt, args...)                                       \
-{                                                                             \
+do {                                                                          \
         if (debug >= (level)) {                                               \
                 if ((level) == 1)                                             \
-                        dev_err(&cam->dev, fmt "\n", ## args);                \
+                        dev_err(&cam->usbdev->dev, fmt "\n", ## args);        \
                 else if ((level) == 2)                                        \
-                        dev_info(&cam->dev, fmt "\n", ## args);               \
+                        dev_info(&cam->usbdev->dev, fmt "\n", ## args);       \
                 else if ((level) >= 3)                                        \
-                        dev_info(&cam->dev, "[%s:%d] " fmt "\n",              \
+                        dev_info(&cam->usbdev->dev, "[%s:%d] " fmt "\n",      \
                                  __FUNCTION__, __LINE__ , ## args);           \
         }                                                                     \
-}
+} while (0)
+#       define V4LDBG(level, name, cmd)                                       \
+do {                                                                          \
+        if (debug >= (level))                                                 \
+                v4l_print_ioctl(name, cmd);                                   \
+} while (0)
 #       define KDBG(level, fmt, args...)                                      \
-{                                                                             \
+do {                                                                          \
         if (debug >= (level)) {                                               \
                 if ((level) == 1 || (level) == 2)                             \
                         pr_info("sn9c102: " fmt "\n", ## args);               \
@@ -190,17 +187,18 @@ sn9c102_attach_sensor(struct sn9c102_device* cam,
                         pr_debug("sn9c102: [%s:%d] " fmt "\n", __FUNCTION__,  \
                                  __LINE__ , ## args);                         \
         }                                                                     \
-}
+} while (0)
 #else
-#       define KDBG(level, fmt, args...) do {;} while(0);
-#       define DBG(level, fmt, args...) do {;} while(0);
+#       define DBG(level, fmt, args...) do {;} while(0)
+#       define V4LDBG(level, name, cmd) do {;} while(0)
+#       define KDBG(level, fmt, args...) do {;} while(0)
 #endif
 
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
-dev_info(&cam->dev, "[%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args);
+dev_info(&cam->dev, "[%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args)
 
 #undef PDBGG
-#define PDBGG(fmt, args...) do {;} while(0); /* placeholder */
+#define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
 
 #endif /* _SN9C102_H_ */
diff --git a/drivers/usb/media/sn9c102_core.c b/drivers/usb/media/sn9c102_core.c
index 8d1a1c357d5a..c81397e4714b 100644
--- a/drivers/usb/media/sn9c102_core.c
+++ b/drivers/usb/media/sn9c102_core.c
@@ -1,7 +1,7 @@
 /***************************************************************************
  * V4L2 driver for SN9C10x PC Camera Controllers                           *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -45,6 +45,15 @@
 
 /*****************************************************************************/
 
+#define SN9C102_MODULE_NAME     "V4L2 driver for SN9C10x PC Camera Controllers"
+#define SN9C102_MODULE_AUTHOR   "(C) 2004-2006 Luca Risolia"
+#define SN9C102_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
+#define SN9C102_MODULE_LICENSE  "GPL"
+#define SN9C102_MODULE_VERSION  "1:1.26"
+#define SN9C102_MODULE_VERSION_CODE  KERNEL_VERSION(1, 0, 26)
+
+/*****************************************************************************/
+
 MODULE_DEVICE_TABLE(usb, sn9c102_id_table);
 
 MODULE_AUTHOR(SN9C102_MODULE_AUTHOR " " SN9C102_AUTHOR_EMAIL);
@@ -70,10 +79,10 @@ static short force_munmap[] = {[0 ... SN9C102_MAX_DEVICES-1] =
                                SN9C102_FORCE_MUNMAP};
 module_param_array(force_munmap, bool, NULL, 0444);
 MODULE_PARM_DESC(force_munmap,
-                 "\n<0|1[,...]> Force the application to unmap previously "
-                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or "
-                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support "
-                 "\nthis feature. This parameter is specific for each "
+                 "\n<0|1[,...]> Force the application to unmap previously"
+                 "\nmapped buffer memory before calling any VIDIOC_S_CROP or"
+                 "\nVIDIOC_S_FMT ioctl's. Not all the applications support"
+                 "\nthis feature. This parameter is specific for each"
                  "\ndetected camera."
                  "\n 0 = do not force memory unmapping"
                  "\n 1 = force memory unmapping (save memory)"
@@ -102,6 +111,9 @@ static sn9c102_sof_header_t sn9c102_sof_header[] = {
         {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96, 0x01},
 };
 
+static sn9c103_sof_header_t sn9c103_sof_header[] = {
+        {0xff, 0xff, 0x00, 0xc4, 0xc4, 0x96, 0x20},
+};
 
 static sn9c102_eof_header_t sn9c102_eof_header[] = {
         {0x00, 0x00, 0x00, 0x00},
@@ -112,50 +124,6 @@ static sn9c102_eof_header_t sn9c102_eof_header[] = {
 
 /*****************************************************************************/
 
-static void* rvmalloc(size_t size)
-{
-        void* mem;
-        unsigned long adr;
-
-        size = PAGE_ALIGN(size);
-
-        mem = vmalloc_32((unsigned long)size);
-        if (!mem)
-                return NULL;
-
-        memset(mem, 0, size);
-
-        adr = (unsigned long)mem;
-        while (size > 0) {
-                SetPageReserved(vmalloc_to_page((void *)adr));
-                adr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-
-        return mem;
-}
-
-
-static void rvfree(void* mem, size_t size)
-{
-        unsigned long adr;
-
-        if (!mem)
-                return;
-
-        size = PAGE_ALIGN(size);
-
-        adr = (unsigned long)mem;
-        while (size > 0) {
-                ClearPageReserved(vmalloc_to_page((void *)adr));
-                adr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-
-        vfree(mem);
-}
-
-
 static u32 
 sn9c102_request_buffers(struct sn9c102_device* cam, u32 count, 
                         enum sn9c102_io_method io)
@@ -174,7 +142,7 @@ sn9c102_request_buffers(struct sn9c102_device* cam, u32 count,
 
         cam->nbuffers = count;
         while (cam->nbuffers > 0) {
-                if ((buff = rvmalloc(cam->nbuffers * PAGE_ALIGN(imagesize))))
+                if ((buff = vmalloc_32(cam->nbuffers * PAGE_ALIGN(imagesize))))
                         break;
                 cam->nbuffers--;
         }
@@ -198,10 +166,10 @@ sn9c102_request_buffers(struct sn9c102_device* cam, u32 count,
 static void sn9c102_release_buffers(struct sn9c102_device* cam)
 {
         if (cam->nbuffers) {
-                rvfree(cam->frame[0].bufmem,
-                       cam->nbuffers * PAGE_ALIGN(cam->frame[0].buf.length));
+                vfree(cam->frame[0].bufmem);
                 cam->nbuffers = 0;
         }
+        cam->frame_current = NULL;
 }
 
 
@@ -219,6 +187,19 @@ static void sn9c102_empty_framequeues(struct sn9c102_device* cam)
 }
 
 
+static void sn9c102_requeue_outqueue(struct sn9c102_device* cam)
+{
+        struct sn9c102_frame_t *i;
+
+        list_for_each_entry(i, &cam->outqueue, frame) {
+                i->state = F_QUEUED;
+                list_add(&i->frame, &cam->inqueue);
+        }
+
+        INIT_LIST_HEAD(&cam->outqueue);
+}
+
+
 static void sn9c102_queue_unusedframes(struct sn9c102_device* cam)
 {
         unsigned long lock_flags;
@@ -235,19 +216,46 @@ static void sn9c102_queue_unusedframes(struct sn9c102_device* cam)
 
 /*****************************************************************************/
 
+int sn9c102_write_regs(struct sn9c102_device* cam, u8* buff, u16 index)
+{
+        struct usb_device* udev = cam->usbdev;
+        int i, res;
+
+        if (index + sizeof(buff) >= ARRAY_SIZE(cam->reg))
+                return -1;
+
+        res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
+                              index, 0, buff, sizeof(buff),
+                              SN9C102_CTRL_TIMEOUT*sizeof(buff));
+        if (res < 0) {
+                DBG(3, "Failed to write registers (index 0x%02X, error %d)",
+                    index, res);
+                return -1;
+        }
+
+        for (i = 0; i < sizeof(buff); i++)
+                cam->reg[index+i] = buff[i];
+
+        return 0;
+}
+
+
 int sn9c102_write_reg(struct sn9c102_device* cam, u8 value, u16 index)
 {
         struct usb_device* udev = cam->usbdev;
         u8* buff = cam->control_buffer;
         int res;
 
+        if (index >= ARRAY_SIZE(cam->reg))
+                return -1;
+
         *buff = value;
 
         res = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x08, 0x41,
                               index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
         if (res < 0) {
                 DBG(3, "Failed to write a register (value 0x%02X, index "
-                       "0x%02X, error %d)", value, index, res)
+                       "0x%02X, error %d)", value, index, res);
                 return -1;
         }
 
@@ -268,7 +276,7 @@ static int sn9c102_read_reg(struct sn9c102_device* cam, u16 index)
                               index, 0, buff, 1, SN9C102_CTRL_TIMEOUT);
         if (res < 0)
                 DBG(3, "Failed to read a register (index 0x%02X, error %d)",
-                    index, res)
+                    index, res);
 
         return (res >= 0) ? (int)(*buff) : -1;
 }
@@ -276,8 +284,8 @@ static int sn9c102_read_reg(struct sn9c102_device* cam, u16 index)
 
 int sn9c102_pread_reg(struct sn9c102_device* cam, u16 index)
 {
-        if (index > 0x1f)
-                return -EINVAL;
+        if (index >= ARRAY_SIZE(cam->reg))
+                return -1;
 
         return cam->reg[index];
 }
@@ -367,10 +375,10 @@ sn9c102_i2c_try_raw_read(struct sn9c102_device* cam,
         err += sn9c102_i2c_detect_read_error(cam, sensor);
 
         PDBGG("I2C read: address 0x%02X, first read byte: 0x%02X", data1,
-              data[4])
+              data[4]);
 
         if (err) {
-                DBG(3, "I2C read failed for %s image sensor", sensor->name)
+                DBG(3, "I2C read failed for %s image sensor", sensor->name);
                 return -1;
         }
 
@@ -410,11 +418,11 @@ sn9c102_i2c_try_raw_write(struct sn9c102_device* cam,
         err += sn9c102_i2c_detect_write_error(cam, sensor);
 
         if (err)
-                DBG(3, "I2C write failed for %s image sensor", sensor->name)
+                DBG(3, "I2C write failed for %s image sensor", sensor->name);
 
         PDBGG("I2C raw write: %u bytes, data0 = 0x%02X, data1 = 0x%02X, "
               "data2 = 0x%02X, data3 = 0x%02X, data4 = 0x%02X, data5 = 0x%02X",
-              n, data0, data1, data2, data3, data4, data5)
+              n, data0, data1, data2, data3, data4, data5);
 
         return err ? -1 : 0;
 }
@@ -461,13 +469,27 @@ int sn9c102_i2c_write(struct sn9c102_device* cam, u8 address, u8 value)
 static void*
 sn9c102_find_sof_header(struct sn9c102_device* cam, void* mem, size_t len)
 {
-        size_t soflen = sizeof(sn9c102_sof_header_t), i;
-        u8 j, n = sizeof(sn9c102_sof_header) / soflen;
+        size_t soflen = 0, i;
+        u8 j, n = 0;
 
-        for (i = 0; (len >= soflen) && (i <= len - soflen); i++)
+        switch (cam->bridge) {
+        case BRIDGE_SN9C101:
+        case BRIDGE_SN9C102:
+                soflen = sizeof(sn9c102_sof_header_t);
+                n = sizeof(sn9c102_sof_header) / soflen;
+                break;
+        case BRIDGE_SN9C103:
+                soflen = sizeof(sn9c103_sof_header_t);
+                n = sizeof(sn9c103_sof_header) / soflen;
+        }
+
+        for (i = 0; (len >= soflen) && (i <= len - soflen); i++)
                 for (j = 0; j < n; j++)
-                        /* It's enough to compare 7 bytes */
-                        if (!memcmp(mem + i, sn9c102_sof_header[j], 7)) {
+                        /* The invariable part of the header is 6 bytes long */
+                        if ((cam->bridge != BRIDGE_SN9C103 &&
+                            !memcmp(mem + i, sn9c102_sof_header[j], 6)) ||
+                            (cam->bridge == BRIDGE_SN9C103 &&
+                            !memcmp(mem + i, sn9c103_sof_header[j], 6))) {
                                 memcpy(cam->sof_header, mem + i, soflen);
                                 /* Skip the header */
                                 return mem + i + soflen;
@@ -499,8 +521,7 @@ static void sn9c102_urb_complete(struct urb *urb, struct pt_regs* regs)
 {
         struct sn9c102_device* cam = urb->context;
         struct sn9c102_frame_t** f;
-        size_t imagesize;
-        unsigned long lock_flags;
+        size_t imagesize, soflen;
         u8 i;
         int err = 0;
 
@@ -513,7 +534,7 @@ static void sn9c102_urb_complete(struct urb *urb, struct pt_regs* regs)
                 cam->stream = STREAM_OFF;
                 if ((*f))
                         (*f)->state = F_QUEUED;
-                DBG(3, "Stream interrupted")
+                DBG(3, "Stream interrupted");
                 wake_up_interruptible(&cam->wait_stream);
         }
 
@@ -536,6 +557,10 @@ static void sn9c102_urb_complete(struct urb *urb, struct pt_regs* regs)
                      cam->sensor->pix_format.height *
                      cam->sensor->pix_format.priv) / 8;
 
+        soflen = (cam->bridge) == BRIDGE_SN9C103 ?
+                                  sizeof(sn9c103_sof_header_t) :
+                                  sizeof(sn9c102_sof_header_t);
+
         for (i = 0; i < urb->number_of_packets; i++) {
                 unsigned int img, len, status;
                 void *pos, *sof, *eof;
@@ -545,19 +570,12 @@ static void sn9c102_urb_complete(struct urb *urb, struct pt_regs* regs)
                 pos = urb->iso_frame_desc[i].offset + urb->transfer_buffer;
 
                 if (status) {
-                        DBG(3, "Error in isochronous frame")
+                        DBG(3, "Error in isochronous frame");
                         (*f)->state = F_ERROR;
                         continue;
                 }
 
-                PDBGG("Isochrnous frame: length %u, #%u i", len, i)
-
-                /*
-                   NOTE: It is probably correct to assume that SOF and EOF
-                         headers do not occur between two consecutive packets,
-                         but who knows..Whatever is the truth, this assumption
-                         doesn't introduce bugs.
-                */
+                PDBGG("Isochrnous frame: length %u, #%u i", len, i);
 
 redo:
                 sof = sn9c102_find_sof_header(cam, pos, len);
@@ -575,10 +593,10 @@ end_of_frame:
                                                 imagesize;
                                         img = imagesize - (*f)->buf.bytesused;
                                         DBG(3, "Expected EOF not found: "
-                                               "video frame cut")
+                                               "video frame cut");
                                         if (eof)
                                                 DBG(3, "Exceeded limit: +%u "
-                                                       "bytes", (unsigned)(b))
+                                                       "bytes", (unsigned)(b));
                                 }
 
                                 memcpy((*f)->bufmem + (*f)->buf.bytesused, pos,
@@ -595,8 +613,7 @@ end_of_frame:
                                         u32 b = (*f)->buf.bytesused;
                                         (*f)->state = F_DONE;
                                         (*f)->buf.sequence= ++cam->frame_count;
-                                        spin_lock_irqsave(&cam->queue_lock,
-                                                          lock_flags);
+                                        spin_lock(&cam->queue_lock);
                                         list_move_tail(&(*f)->frame,
                                                        &cam->outqueue);
                                         if (!list_empty(&cam->inqueue))
@@ -606,13 +623,11 @@ end_of_frame:
                                                         frame );
                                         else
                                                 (*f) = NULL;
-                                        spin_unlock_irqrestore(&cam->queue_lock
-                                                               , lock_flags);
+                                        spin_unlock(&cam->queue_lock);
                                         memcpy(cam->sysfs.frame_header,
-                                               cam->sof_header,
-                                               sizeof(sn9c102_sof_header_t));
-                                        DBG(3, "Video frame captured: "
-                                               "%lu bytes", (unsigned long)(b))
+                                               cam->sof_header, soflen);
+                                        DBG(3, "Video frame captured: %lu "
+                                               "bytes", (unsigned long)(b));
 
                                         if (!(*f))
                                                 goto resubmit_urb;
@@ -621,18 +636,19 @@ end_of_frame:
                                         (*f)->state = F_ERROR;
                                         DBG(3, "Not expected EOF after %lu "
                                                "bytes of image data", 
-                                          (unsigned long)((*f)->buf.bytesused))
+                                            (unsigned long)
+                                            ((*f)->buf.bytesused));
                                 }
 
                                 if (sof) /* (1) */
                                         goto start_of_frame;
 
                         } else if (eof) {
-                                DBG(3, "EOF without SOF")
+                                DBG(3, "EOF without SOF");
                                 continue;
 
                         } else {
-                                PDBGG("Ignoring pointless isochronous frame")
+                                PDBGG("Ignoring pointless isochronous frame");
                                 continue;
                         }
 
@@ -642,7 +658,7 @@ start_of_frame:
                         (*f)->buf.bytesused = 0;
                         len -= (sof - pos);
                         pos = sof;
-                        DBG(3, "SOF detected: new video frame")
+                        DBG(3, "SOF detected: new video frame");
                         if (len)
                                 goto redo;
 
@@ -653,12 +669,13 @@ start_of_frame:
                         else {
                                 if (cam->sensor->pix_format.pixelformat ==
                                     V4L2_PIX_FMT_SN9C10X) {
-                                        eof = sof-sizeof(sn9c102_sof_header_t);
+                                        eof = sof - soflen;
                                         goto end_of_frame;
                                 } else {
                                         DBG(3, "SOF before expected EOF after "
                                                "%lu bytes of image data", 
-                                          (unsigned long)((*f)->buf.bytesused))
+                                            (unsigned long)
+                                            ((*f)->buf.bytesused));
                                         goto start_of_frame;
                                 }
                         }
@@ -670,7 +687,7 @@ resubmit_urb:
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err < 0 && err != -EPERM) {
                 cam->state |= DEV_MISCONFIGURED;
-                DBG(1, "usb_submit_urb() failed")
+                DBG(1, "usb_submit_urb() failed");
         }
 
         wake_up_interruptible(&cam->wait_frame);
@@ -681,18 +698,22 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
 {
         struct usb_device *udev = cam->usbdev;
         struct urb* urb;
-        const unsigned int wMaxPacketSize[] = {0, 128, 256, 384, 512,
-                                               680, 800, 900, 1023};
-        const unsigned int psz = wMaxPacketSize[SN9C102_ALTERNATE_SETTING];
+        const unsigned int sn9c102_wMaxPacketSize[] = {0, 128, 256, 384, 512,
+                                                       680, 800, 900, 1023};
+        const unsigned int sn9c103_wMaxPacketSize[] = {0, 128, 256, 384, 512,
+                                                       680, 800, 900, 1003};
+        const unsigned int psz = (cam->bridge == BRIDGE_SN9C103) ?
+                            sn9c103_wMaxPacketSize[SN9C102_ALTERNATE_SETTING] :
+                            sn9c102_wMaxPacketSize[SN9C102_ALTERNATE_SETTING];
         s8 i, j;
         int err = 0;
 
         for (i = 0; i < SN9C102_URBS; i++) {
-                cam->transfer_buffer[i] = kmalloc(SN9C102_ISO_PACKETS * psz,
+                cam->transfer_buffer[i] = kzalloc(SN9C102_ISO_PACKETS * psz,
                                                   GFP_KERNEL);
                 if (!cam->transfer_buffer[i]) {
                         err = -ENOMEM;
-                        DBG(1, "Not enough memory")
+                        DBG(1, "Not enough memory");
                         goto free_buffers;
                 }
         }
@@ -702,7 +723,7 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
                 cam->urb[i] = urb;
                 if (!urb) {
                         err = -ENOMEM;
-                        DBG(1, "usb_alloc_urb() failed")
+                        DBG(1, "usb_alloc_urb() failed");
                         goto free_urbs;
                 }
                 urb->dev = udev;
@@ -725,14 +746,14 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
                 err = sn9c102_write_reg(cam, cam->reg[0x01] | 0x04, 0x01);
                 if (err) {
                         err = -EIO;
-                        DBG(1, "I/O hardware error")
+                        DBG(1, "I/O hardware error");
                         goto free_urbs;
                 }
         }
 
         err = usb_set_interface(udev, 0, SN9C102_ALTERNATE_SETTING);
         if (err) {
-                DBG(1, "usb_set_interface() failed")
+                DBG(1, "usb_set_interface() failed");
                 goto free_urbs;
         }
 
@@ -743,7 +764,7 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
                 if (err) {
                         for (j = i-1; j >= 0; j--)
                                 usb_kill_urb(cam->urb[j]);
-                        DBG(1, "usb_submit_urb() failed, error %d", err)
+                        DBG(1, "usb_submit_urb() failed, error %d", err);
                         goto free_urbs;
                 }
         }
@@ -779,7 +800,7 @@ static int sn9c102_stop_transfer(struct sn9c102_device* cam)
 
         err = usb_set_interface(udev, 0, 0); /* 0 Mb/s */
         if (err)
-                DBG(3, "usb_set_interface() failed")
+                DBG(3, "usb_set_interface() failed");
 
         return err;
 }
@@ -799,7 +820,7 @@ static int sn9c102_stream_interrupt(struct sn9c102_device* cam)
         else if (err) {
                 cam->state |= DEV_MISCONFIGURED;
                 DBG(1, "The camera is misconfigured. To use it, close and "
-                       "open /dev/video%d again.", cam->v4ldev->minor)
+                       "open /dev/video%d again.", cam->v4ldev->minor);
                 return err;
         }
 
@@ -808,6 +829,7 @@ static int sn9c102_stream_interrupt(struct sn9c102_device* cam)
 
 /*****************************************************************************/
 
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 static u8 sn9c102_strtou8(const char* buff, size_t len, ssize_t* count)
 {
         char str[5];
@@ -885,8 +907,8 @@ sn9c102_store_reg(struct class_device* cd, const char* buf, size_t len)
 
         cam->sysfs.reg = index;
 
-        DBG(2, "Moved SN9C10X register index to 0x%02X", cam->sysfs.reg)
-        DBG(3, "Written bytes: %zd", count)
+        DBG(2, "Moved SN9C10X register index to 0x%02X", cam->sysfs.reg);
+        DBG(3, "Written bytes: %zd", count);
 
         up(&sn9c102_sysfs_lock);
 
@@ -916,7 +938,7 @@ static ssize_t sn9c102_show_val(struct class_device* cd, char* buf)
 
         count = sprintf(buf, "%d\n", val);
 
-        DBG(3, "Read bytes: %zd", count)
+        DBG(3, "Read bytes: %zd", count);
 
         up(&sn9c102_sysfs_lock);
 
@@ -954,8 +976,8 @@ sn9c102_store_val(struct class_device* cd, const char* buf, size_t len)
         }
 
         DBG(2, "Written SN9C10X reg. 0x%02X, val. 0x%02X",
-            cam->sysfs.reg, value)
-        DBG(3, "Written bytes: %zd", count)
+            cam->sysfs.reg, value);
+        DBG(3, "Written bytes: %zd", count);
 
         up(&sn9c102_sysfs_lock);
 
@@ -979,7 +1001,7 @@ static ssize_t sn9c102_show_i2c_reg(struct class_device* cd, char* buf)
 
         count = sprintf(buf, "%u\n", cam->sysfs.i2c_reg);
 
-        DBG(3, "Read bytes: %zd", count)
+        DBG(3, "Read bytes: %zd", count);
 
         up(&sn9c102_sysfs_lock);
 
@@ -1011,8 +1033,8 @@ sn9c102_store_i2c_reg(struct class_device* cd, const char* buf, size_t len)
 
         cam->sysfs.i2c_reg = index;
 
-        DBG(2, "Moved sensor register index to 0x%02X", cam->sysfs.i2c_reg)
-        DBG(3, "Written bytes: %zd", count)
+        DBG(2, "Moved sensor register index to 0x%02X", cam->sysfs.i2c_reg);
+        DBG(3, "Written bytes: %zd", count);
 
         up(&sn9c102_sysfs_lock);
 
@@ -1047,7 +1069,7 @@ static ssize_t sn9c102_show_i2c_val(struct class_device* cd, char* buf)
 
         count = sprintf(buf, "%d\n", val);
 
-        DBG(3, "Read bytes: %zd", count)
+        DBG(3, "Read bytes: %zd", count);
 
         up(&sn9c102_sysfs_lock);
 
@@ -1090,8 +1112,8 @@ sn9c102_store_i2c_val(struct class_device* cd, const char* buf, size_t len)
         }
 
         DBG(2, "Written sensor reg. 0x%02X, val. 0x%02X",
-            cam->sysfs.i2c_reg, value)
-        DBG(3, "Written bytes: %zd", count)
+            cam->sysfs.i2c_reg, value);
+        DBG(3, "Written bytes: %zd", count);
 
         up(&sn9c102_sysfs_lock);
 
@@ -1193,7 +1215,7 @@ static ssize_t sn9c102_show_frame_header(struct class_device* cd, char* buf)
         count = sizeof(cam->sysfs.frame_header);
         memcpy(buf, cam->sysfs.frame_header, count);
 
-        DBG(3, "Frame header, read bytes: %zd", count)
+        DBG(3, "Frame header, read bytes: %zd", count);
 
         return count;
 } 
@@ -1227,11 +1249,12 @@ static void sn9c102_create_sysfs(struct sn9c102_device* cam)
                 video_device_create_file(v4ldev, &class_device_attr_blue);
                 video_device_create_file(v4ldev, &class_device_attr_red);
         }
-        if (cam->sensor->sysfs_ops) {
+        if (cam->sensor && cam->sensor->sysfs_ops) {
                 video_device_create_file(v4ldev, &class_device_attr_i2c_reg);
                 video_device_create_file(v4ldev, &class_device_attr_i2c_val);
         }
 }
+#endif /* CONFIG_VIDEO_ADV_DEBUG */
 
 /*****************************************************************************/
 
@@ -1281,7 +1304,7 @@ static int sn9c102_set_scale(struct sn9c102_device* cam, u8 scale)
         if (err)
                 return -EIO;
 
-        PDBGG("Scaling factor: %u", scale)
+        PDBGG("Scaling factor: %u", scale);
 
         return 0;
 }
@@ -1304,7 +1327,7 @@ static int sn9c102_set_crop(struct sn9c102_device* cam, struct v4l2_rect* rect)
                 return -EIO;
 
         PDBGG("h_start, v_start, h_size, v_size, ho_size, vo_size "
-              "%u %u %u %u", h_start, v_start, h_size, v_size)
+              "%u %u %u %u", h_start, v_start, h_size, v_size);
 
         return 0;
 }
@@ -1336,7 +1359,7 @@ static int sn9c102_init(struct sn9c102_device* cam)
         if (s->init) {
                 err = s->init(cam);
                 if (err) {
-                        DBG(3, "Sensor initialization failed")
+                        DBG(3, "Sensor initialization failed");
                         return err;
                 }
         }
@@ -1353,13 +1376,13 @@ static int sn9c102_init(struct sn9c102_device* cam)
 
         if (s->pix_format.pixelformat == V4L2_PIX_FMT_SN9C10X)
                 DBG(3, "Compressed video format is active, quality %d",
-                    cam->compression.quality)
+                    cam->compression.quality);
         else
-                DBG(3, "Uncompressed video format is active")
+                DBG(3, "Uncompressed video format is active");
 
         if (s->set_crop)
                 if ((err = s->set_crop(cam, rect))) {
-                        DBG(3, "set_crop() failed")
+                        DBG(3, "set_crop() failed");
                         return err;
                 }
 
@@ -1372,11 +1395,11 @@ static int sn9c102_init(struct sn9c102_device* cam)
                                 err = s->set_ctrl(cam, &ctrl);
                                 if (err) {
                                         DBG(3, "Set %s control failed",
-                                            s->qctrl[i].name)
+                                            s->qctrl[i].name);
                                         return err;
                                 }
                                 DBG(3, "Image sensor supports '%s' control",
-                                    s->qctrl[i].name)
+                                    s->qctrl[i].name);
                         }
         }
 
@@ -1392,7 +1415,7 @@ static int sn9c102_init(struct sn9c102_device* cam)
                 cam->state |= DEV_INITIALIZED;
         }
 
-        DBG(2, "Initialization succeeded")
+        DBG(2, "Initialization succeeded");
         return 0;
 }
 
@@ -1401,7 +1424,7 @@ static void sn9c102_release_resources(struct sn9c102_device* cam)
 {
         down(&sn9c102_sysfs_lock);
 
-        DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor)
+        DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor);
         video_set_drvdata(cam->v4ldev, NULL);
         video_unregister_device(cam->v4ldev);
 
@@ -1432,7 +1455,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
         }
 
         if (cam->users) {
-                DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor)
+                DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor);
                 if ((filp->f_flags & O_NONBLOCK) ||
                     (filp->f_flags & O_NDELAY)) {
                         err = -EWOULDBLOCK;
@@ -1458,7 +1481,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
                 err = sn9c102_init(cam);
                 if (err) {
                         DBG(1, "Initialization failed again. "
-                               "I will retry on next open().")
+                               "I will retry on next open().");
                         goto out;
                 }
                 cam->state &= ~DEV_MISCONFIGURED;
@@ -1475,7 +1498,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
         cam->frame_count = 0;
         sn9c102_empty_framequeues(cam);
 
-        DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor)
+        DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor);
 
 out:
         up(&cam->dev_sem);
@@ -1504,7 +1527,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
         cam->users--;
         wake_up_interruptible_nr(&cam->open, 1);
 
-        DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor)
+        DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor);
 
         up(&cam->dev_sem);
 
@@ -1524,32 +1547,38 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
                 return -ERESTARTSYS;
 
         if (cam->state & DEV_DISCONNECTED) {
-                DBG(1, "Device not present")
+                DBG(1, "Device not present");
                 up(&cam->fileop_sem);
                 return -ENODEV;
         }
 
         if (cam->state & DEV_MISCONFIGURED) {
-                DBG(1, "The camera is misconfigured. Close and open it again.")
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
                 up(&cam->fileop_sem);
                 return -EIO;
         }
 
         if (cam->io == IO_MMAP) {
                 DBG(3, "Close and open the device again to choose "
-                       "the read method")
+                       "the read method");
                 up(&cam->fileop_sem);
                 return -EINVAL;
         }
 
         if (cam->io == IO_NONE) {
                 if (!sn9c102_request_buffers(cam,cam->nreadbuffers, IO_READ)) {
-                        DBG(1, "read() failed, not enough memory")
+                        DBG(1, "read() failed, not enough memory");
                         up(&cam->fileop_sem);
                         return -ENOMEM;
                 }
                 cam->io = IO_READ;
                 cam->stream = STREAM_ON;
+        }
+
+        if (list_empty(&cam->inqueue)) {
+                if (!list_empty(&cam->outqueue))
+                        sn9c102_empty_framequeues(cam);
                 sn9c102_queue_unusedframes(cam);
         }
 
@@ -1584,6 +1613,16 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 
         f = list_entry(cam->outqueue.prev, struct sn9c102_frame_t, frame);
 
+        if (count > f->buf.bytesused)
+                count = f->buf.bytesused;
+
+        if (copy_to_user(buf, f->bufmem, count)) {
+                err = -EFAULT;
+                goto exit;
+        }
+        *f_pos += count;
+
+exit:
         spin_lock_irqsave(&cam->queue_lock, lock_flags);
         list_for_each_entry(i, &cam->outqueue, frame)
                 i->state = F_UNUSED;
@@ -1592,16 +1631,8 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 
         sn9c102_queue_unusedframes(cam);
 
-        if (count > f->buf.bytesused)
-                count = f->buf.bytesused;
-
-        if (copy_to_user(buf, f->bufmem, count)) {
-                up(&cam->fileop_sem);
-                return -EFAULT;
-        }
-        *f_pos += count;
-
-        PDBGG("Frame #%lu, bytes read: %zu", (unsigned long)f->buf.index,count)
+        PDBGG("Frame #%lu, bytes read: %zu",
+              (unsigned long)f->buf.index, count);
 
         up(&cam->fileop_sem);
 
@@ -1612,33 +1643,42 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 static unsigned int sn9c102_poll(struct file *filp, poll_table *wait)
 {
         struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct sn9c102_frame_t* f;
+        unsigned long lock_flags;
         unsigned int mask = 0;
 
         if (down_interruptible(&cam->fileop_sem))
                 return POLLERR;
 
         if (cam->state & DEV_DISCONNECTED) {
-                DBG(1, "Device not present")
+                DBG(1, "Device not present");
                 goto error;
         }
 
         if (cam->state & DEV_MISCONFIGURED) {
-                DBG(1, "The camera is misconfigured. Close and open it again.")
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
                 goto error;
         }
 
         if (cam->io == IO_NONE) {
                 if (!sn9c102_request_buffers(cam, cam->nreadbuffers,
                                              IO_READ)) {
-                        DBG(1, "poll() failed, not enough memory")
+                        DBG(1, "poll() failed, not enough memory");
                         goto error;
                 }
                 cam->io = IO_READ;
                 cam->stream = STREAM_ON;
         }
 
-        if (cam->io == IO_READ)
+        if (cam->io == IO_READ) {
+                spin_lock_irqsave(&cam->queue_lock, lock_flags);
+                list_for_each_entry(f, &cam->outqueue, frame)
+                        f->state = F_UNUSED;
+                INIT_LIST_HEAD(&cam->outqueue);
+                spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
                 sn9c102_queue_unusedframes(cam);
+        }
 
         poll_wait(filp, &cam->wait_frame, wait);
 
@@ -1680,22 +1720,22 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
 {
         struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
         unsigned long size = vma->vm_end - vma->vm_start,
-                      start = vma->vm_start,
-                      pos,
-                      page;
+                      start = vma->vm_start;
+        void *pos;
         u32 i;
 
         if (down_interruptible(&cam->fileop_sem))
                 return -ERESTARTSYS;
 
         if (cam->state & DEV_DISCONNECTED) {
-                DBG(1, "Device not present")
+                DBG(1, "Device not present");
                 up(&cam->fileop_sem);
                 return -ENODEV;
         }
 
         if (cam->state & DEV_MISCONFIGURED) {
-                DBG(1, "The camera is misconfigured. Close and open it again.")
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
                 up(&cam->fileop_sem);
                 return -EIO;
         }
@@ -1715,15 +1755,12 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
                 return -EINVAL;
         }
 
-        /* VM_IO is eventually going to replace PageReserved altogether */
         vma->vm_flags |= VM_IO;
-        vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
+        vma->vm_flags |= VM_RESERVED;
 
-        pos = (unsigned long)cam->frame[i].bufmem;
+        pos = cam->frame[i].bufmem;
         while (size > 0) { /* size is page-aligned */
-                page = vmalloc_to_pfn((void *)pos);
-                if (remap_pfn_range(vma, start, page, PAGE_SIZE,
-                                    vma->vm_page_prot)) {
+                if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
                         up(&cam->fileop_sem);
                         return -EAGAIN;
                 }
@@ -1742,738 +1779,861 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
         return 0;
 }
 
+/*****************************************************************************/
 
-static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
-                              unsigned int cmd, void __user * arg)
+static int
+sn9c102_vidioc_querycap(struct sn9c102_device* cam, void __user * arg)
 {
-        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+        struct v4l2_capability cap = {
+                .driver = "sn9c102",
+                .version = SN9C102_MODULE_VERSION_CODE,
+                .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+                                V4L2_CAP_STREAMING,
+        };
+
+        strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
+        if (usb_make_path(cam->usbdev, cap.bus_info, sizeof(cap.bus_info)) < 0)
+                strlcpy(cap.bus_info, cam->usbdev->dev.bus_id,
+                        sizeof(cap.bus_info));
+
+        if (copy_to_user(arg, &cap, sizeof(cap)))
+                return -EFAULT;
 
-        switch (cmd) {
+        return 0;
+}
 
-        case VIDIOC_QUERYCAP:
-        {
-                struct v4l2_capability cap = {
-                        .driver = "sn9c102",
-                        .version = SN9C102_MODULE_VERSION_CODE,
-                        .capabilities = V4L2_CAP_VIDEO_CAPTURE | 
-                                        V4L2_CAP_READWRITE |
-                                        V4L2_CAP_STREAMING,
-                };
-
-                strlcpy(cap.card, cam->v4ldev->name, sizeof(cap.card));
-                if (usb_make_path(cam->usbdev, cap.bus_info,
-                    sizeof(cap.bus_info)) < 0)
-                        strlcpy(cap.bus_info, cam->dev.bus_id,
-                                sizeof(cap.bus_info));
-
-                if (copy_to_user(arg, &cap, sizeof(cap)))
-                        return -EFAULT;
 
-                return 0;
-        }
+static int
+sn9c102_vidioc_enuminput(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_input i;
 
-        case VIDIOC_ENUMINPUT:
-        {
-                struct v4l2_input i;
+        if (copy_from_user(&i, arg, sizeof(i)))
+                return -EFAULT;
 
-                if (copy_from_user(&i, arg, sizeof(i)))
-                        return -EFAULT;
+        if (i.index)
+                return -EINVAL;
 
-                if (i.index)
-                        return -EINVAL;
+        memset(&i, 0, sizeof(i));
+        strcpy(i.name, "Camera");
 
-                memset(&i, 0, sizeof(i));
-                strcpy(i.name, "USB");
+        if (copy_to_user(arg, &i, sizeof(i)))
+                return -EFAULT;
 
-                if (copy_to_user(arg, &i, sizeof(i)))
-                        return -EFAULT;
+        return 0;
+}
 
-                return 0;
-        }
 
-        case VIDIOC_G_INPUT:
-        case VIDIOC_S_INPUT:
-        {
-                int index;
+static int
+sn9c102_vidioc_gs_input(struct sn9c102_device* cam, void __user * arg)
+{
+        int index;
 
-                if (copy_from_user(&index, arg, sizeof(index)))
-                        return -EFAULT;
+        if (copy_from_user(&index, arg, sizeof(index)))
+                return -EFAULT;
 
-                if (index != 0)
-                        return -EINVAL;
+        if (index != 0)
+                return -EINVAL;
 
-                return 0;
-        }
+        return 0;
+}
 
-        case VIDIOC_QUERYCTRL:
-        {
-                struct sn9c102_sensor* s = cam->sensor;
-                struct v4l2_queryctrl qc;
-                u8 i;
 
-                if (copy_from_user(&qc, arg, sizeof(qc)))
-                        return -EFAULT;
+static int
+sn9c102_vidioc_query_ctrl(struct sn9c102_device* cam, void __user * arg)
+{
+        struct sn9c102_sensor* s = cam->sensor;
+        struct v4l2_queryctrl qc;
+        u8 i;
 
+        if (copy_from_user(&qc, arg, sizeof(qc)))
+                return -EFAULT;
+
+        for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+                if (qc.id && qc.id == s->qctrl[i].id) {
+                        memcpy(&qc, &(s->qctrl[i]), sizeof(qc));
+                        if (copy_to_user(arg, &qc, sizeof(qc)))
+                                return -EFAULT;
+                        return 0;
+                }
+
+        return -EINVAL;
+}
+
+
+static int
+sn9c102_vidioc_g_ctrl(struct sn9c102_device* cam, void __user * arg)
+{
+        struct sn9c102_sensor* s = cam->sensor;
+        struct v4l2_control ctrl;
+        int err = 0;
+        u8 i;
+
+        if (!s->get_ctrl && !s->set_ctrl)
+                return -EINVAL;
+
+        if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
+                return -EFAULT;
+
+        if (!s->get_ctrl) {
                 for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
-                        if (qc.id && qc.id == s->qctrl[i].id) {
-                                memcpy(&qc, &(s->qctrl[i]), sizeof(qc));
-                                if (copy_to_user(arg, &qc, sizeof(qc)))
-                                        return -EFAULT;
-                                return 0;
+                        if (ctrl.id && ctrl.id == s->qctrl[i].id) {
+                                ctrl.value = s->_qctrl[i].default_value;
+                                goto exit;
                         }
-
                 return -EINVAL;
-        }
+        } else
+                err = s->get_ctrl(cam, &ctrl);
 
-        case VIDIOC_G_CTRL:
-        {
-                struct sn9c102_sensor* s = cam->sensor;
-                struct v4l2_control ctrl;
-                int err = 0;
+exit:
+        if (copy_to_user(arg, &ctrl, sizeof(ctrl)))
+                return -EFAULT;
 
-                if (!s->get_ctrl)
-                        return -EINVAL;
+        return err;
+}
 
-                if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
-                        return -EFAULT;
 
-                err = s->get_ctrl(cam, &ctrl);
+static int
+sn9c102_vidioc_s_ctrl(struct sn9c102_device* cam, void __user * arg)
+{
+        struct sn9c102_sensor* s = cam->sensor;
+        struct v4l2_control ctrl;
+        u8 i;
+        int err = 0;
 
-                if (copy_to_user(arg, &ctrl, sizeof(ctrl)))
-                        return -EFAULT;
+        if (!s->set_ctrl)
+                return -EINVAL;
+
+        if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
+                return -EFAULT;
 
+        for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
+                if (ctrl.id == s->qctrl[i].id) {
+                        if (ctrl.value < s->qctrl[i].minimum ||
+                            ctrl.value > s->qctrl[i].maximum)
+                                return -ERANGE;
+                        ctrl.value -= ctrl.value % s->qctrl[i].step;
+                        break;
+                }
+
+        if ((err = s->set_ctrl(cam, &ctrl)))
                 return err;
-        }
 
-        case VIDIOC_S_CTRL_OLD:
-        case VIDIOC_S_CTRL:
-        {
-                struct sn9c102_sensor* s = cam->sensor;
-                struct v4l2_control ctrl;
-                u8 i;
-                int err = 0;
+        s->_qctrl[i].default_value = ctrl.value;
 
-                if (!s->set_ctrl)
-                        return -EINVAL;
+        PDBGG("VIDIOC_S_CTRL: id %lu, value %lu",
+              (unsigned long)ctrl.id, (unsigned long)ctrl.value);
 
-                if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
-                        return -EFAULT;
+        return 0;
+}
 
-                for (i = 0; i < ARRAY_SIZE(s->qctrl); i++)
-                        if (ctrl.id == s->qctrl[i].id) {
-                                if (ctrl.value < s->qctrl[i].minimum ||
-                                    ctrl.value > s->qctrl[i].maximum)
-                                        return -ERANGE;
-                                ctrl.value -= ctrl.value % s->qctrl[i].step;
-                                break;
+
+static int
+sn9c102_vidioc_cropcap(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_cropcap* cc = &(cam->sensor->cropcap);
+
+        cc->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        cc->pixelaspect.numerator = 1;
+        cc->pixelaspect.denominator = 1;
+
+        if (copy_to_user(arg, cc, sizeof(*cc)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+sn9c102_vidioc_g_crop(struct sn9c102_device* cam, void __user * arg)
+{
+        struct sn9c102_sensor* s = cam->sensor;
+        struct v4l2_crop crop = {
+                .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
+        };
+
+        memcpy(&(crop.c), &(s->_rect), sizeof(struct v4l2_rect));
+
+        if (copy_to_user(arg, &crop, sizeof(crop)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg)
+{
+        struct sn9c102_sensor* s = cam->sensor;
+        struct v4l2_crop crop;
+        struct v4l2_rect* rect;
+        struct v4l2_rect* bounds = &(s->cropcap.bounds);
+        struct v4l2_pix_format* pix_format = &(s->pix_format);
+        u8 scale;
+        const enum sn9c102_stream_state stream = cam->stream;
+        const u32 nbuffers = cam->nbuffers;
+        u32 i;
+        int err = 0;
+
+        if (copy_from_user(&crop, arg, sizeof(crop)))
+                return -EFAULT;
+
+        rect = &(crop.c);
+
+        if (crop.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        if (cam->module_param.force_munmap)
+                for (i = 0; i < cam->nbuffers; i++)
+                        if (cam->frame[i].vma_use_count) {
+                                DBG(3, "VIDIOC_S_CROP failed. "
+                                       "Unmap the buffers first.");
+                                return -EINVAL;
                         }
 
-                if ((err = s->set_ctrl(cam, &ctrl)))
+        /* Preserve R,G or B origin */
+        rect->left = (s->_rect.left & 1L) ? rect->left | 1L : rect->left & ~1L;
+        rect->top = (s->_rect.top & 1L) ? rect->top | 1L : rect->top & ~1L;
+
+        if (rect->width < 16)
+                rect->width = 16;
+        if (rect->height < 16)
+                rect->height = 16;
+        if (rect->width > bounds->width)
+                rect->width = bounds->width;
+        if (rect->height > bounds->height)
+                rect->height = bounds->height;
+        if (rect->left < bounds->left)
+                rect->left = bounds->left;
+        if (rect->top < bounds->top)
+                rect->top = bounds->top;
+        if (rect->left + rect->width > bounds->left + bounds->width)
+                rect->left = bounds->left+bounds->width - rect->width;
+        if (rect->top + rect->height > bounds->top + bounds->height)
+                rect->top = bounds->top+bounds->height - rect->height;
+
+        rect->width &= ~15L;
+        rect->height &= ~15L;
+
+        if (SN9C102_PRESERVE_IMGSCALE) {
+                /* Calculate the actual scaling factor */
+                u32 a, b;
+                a = rect->width * rect->height;
+                b = pix_format->width * pix_format->height;
+                scale = b ? (u8)((a / b) < 4 ? 1 : ((a / b) < 16 ? 2 : 4)) : 1;
+        } else
+                scale = 1;
+
+        if (cam->stream == STREAM_ON)
+                if ((err = sn9c102_stream_interrupt(cam)))
                         return err;
 
-                s->_qctrl[i].default_value = ctrl.value;
+        if (copy_to_user(arg, &crop, sizeof(crop))) {
+                cam->stream = stream;
+                return -EFAULT;
+        }
+
+        if (cam->module_param.force_munmap || cam->io == IO_READ)
+                sn9c102_release_buffers(cam);
 
-                PDBGG("VIDIOC_S_CTRL: id %lu, value %lu",
-                      (unsigned long)ctrl.id, (unsigned long)ctrl.value)
+        err = sn9c102_set_crop(cam, rect);
+        if (s->set_crop)
+                err += s->set_crop(cam, rect);
+        err += sn9c102_set_scale(cam, scale);
 
-                return 0;
+        if (err) { /* atomic, no rollback in ioctl() */
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -EIO;
         }
 
-        case VIDIOC_CROPCAP:
-        {
-                struct v4l2_cropcap* cc = &(cam->sensor->cropcap);
+        s->pix_format.width = rect->width/scale;
+        s->pix_format.height = rect->height/scale;
+        memcpy(&(s->_rect), rect, sizeof(*rect));
 
-                cc->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                cc->pixelaspect.numerator = 1;
-                cc->pixelaspect.denominator = 1;
+        if ((cam->module_param.force_munmap || cam->io == IO_READ) &&
+            nbuffers != sn9c102_request_buffers(cam, nbuffers, cam->io)) {
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -ENOMEM;
+        }
 
-                if (copy_to_user(arg, cc, sizeof(*cc)))
-                        return -EFAULT;
+        if (cam->io == IO_READ)
+                sn9c102_empty_framequeues(cam);
+        else if (cam->module_param.force_munmap)
+                sn9c102_requeue_outqueue(cam);
 
-                return 0;
-        }
+        cam->stream = stream;
 
-        case VIDIOC_G_CROP:
-        {
-                struct sn9c102_sensor* s = cam->sensor;
-                struct v4l2_crop crop = {
-                        .type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                };
+        return 0;
+}
 
-                memcpy(&(crop.c), &(s->_rect), sizeof(struct v4l2_rect));
 
-                if (copy_to_user(arg, &crop, sizeof(crop)))
-                        return -EFAULT;
+static int
+sn9c102_vidioc_enum_fmt(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_fmtdesc fmtd;
 
-                return 0;
-        }
+        if (copy_from_user(&fmtd, arg, sizeof(fmtd)))
+                return -EFAULT;
 
-        case VIDIOC_S_CROP:
-        {
-                struct sn9c102_sensor* s = cam->sensor;
-                struct v4l2_crop crop;
-                struct v4l2_rect* rect;
-                struct v4l2_rect* bounds = &(s->cropcap.bounds);
-                struct v4l2_pix_format* pix_format = &(s->pix_format);
-                u8 scale;
-                const enum sn9c102_stream_state stream = cam->stream;
-                const u32 nbuffers = cam->nbuffers;
-                u32 i;
-                int err = 0;
-
-                if (copy_from_user(&crop, arg, sizeof(crop)))
-                        return -EFAULT;
+        if (fmtd.index == 0) {
+                strcpy(fmtd.description, "bayer rgb");
+                fmtd.pixelformat = V4L2_PIX_FMT_SBGGR8;
+        } else if (fmtd.index == 1) {
+                strcpy(fmtd.description, "compressed");
+                fmtd.pixelformat = V4L2_PIX_FMT_SN9C10X;
+                fmtd.flags = V4L2_FMT_FLAG_COMPRESSED;
+        } else
+                return -EINVAL;
 
-                rect = &(crop.c);
+        fmtd.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        memset(&fmtd.reserved, 0, sizeof(fmtd.reserved));
 
-                if (crop.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                        return -EINVAL;
+        if (copy_to_user(arg, &fmtd, sizeof(fmtd)))
+                return -EFAULT;
 
-                if (cam->module_param.force_munmap)
-                        for (i = 0; i < cam->nbuffers; i++)
-                                if (cam->frame[i].vma_use_count) {
-                                        DBG(3, "VIDIOC_S_CROP failed. "
-                                               "Unmap the buffers first.")
-                                        return -EINVAL;
-                                }
+        return 0;
+}
 
-                /* Preserve R,G or B origin */
-                rect->left = (s->_rect.left & 1L) ?
-                             rect->left | 1L : rect->left & ~1L;
-                rect->top = (s->_rect.top & 1L) ?
-                            rect->top | 1L : rect->top & ~1L;
-
-                if (rect->width < 16)
-                        rect->width = 16;
-                if (rect->height < 16)
-                        rect->height = 16;
-                if (rect->width > bounds->width)
-                        rect->width = bounds->width;
-                if (rect->height > bounds->height)
-                        rect->height = bounds->height;
-                if (rect->left < bounds->left)
-                        rect->left = bounds->left;
-                if (rect->top < bounds->top)
-                        rect->top = bounds->top;
-                if (rect->left + rect->width > bounds->left + bounds->width)
-                        rect->left = bounds->left+bounds->width - rect->width;
-                if (rect->top + rect->height > bounds->top + bounds->height)
-                        rect->top = bounds->top+bounds->height - rect->height;
-
-                rect->width &= ~15L;
-                rect->height &= ~15L;
-
-                if (SN9C102_PRESERVE_IMGSCALE) {
-                        /* Calculate the actual scaling factor */
-                        u32 a, b;
-                        a = rect->width * rect->height;
-                        b = pix_format->width * pix_format->height;
-                        scale = b ? (u8)((a / b) < 4 ? 1 :
-                                        ((a / b) < 16 ? 2 : 4)) : 1;
-                } else
-                        scale = 1;
-
-                if (cam->stream == STREAM_ON)
-                        if ((err = sn9c102_stream_interrupt(cam)))
-                                return err;
-
-                if (copy_to_user(arg, &crop, sizeof(crop))) {
-                        cam->stream = stream;
-                        return -EFAULT;
-                }
 
-                if (cam->module_param.force_munmap || cam->io == IO_READ)
-                        sn9c102_release_buffers(cam);
+static int
+sn9c102_vidioc_g_fmt(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_format format;
+        struct v4l2_pix_format* pfmt = &(cam->sensor->pix_format);
 
-                err = sn9c102_set_crop(cam, rect);
-                if (s->set_crop)
-                        err += s->set_crop(cam, rect);
-                err += sn9c102_set_scale(cam, scale);
+        if (copy_from_user(&format, arg, sizeof(format)))
+                return -EFAULT;
 
-                if (err) { /* atomic, no rollback in ioctl() */
-                        cam->state |= DEV_MISCONFIGURED;
-                        DBG(1, "VIDIOC_S_CROP failed because of hardware "
-                               "problems. To use the camera, close and open "
-                               "/dev/video%d again.", cam->v4ldev->minor)
-                        return -EIO;
-                }
+        if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
 
-                s->pix_format.width = rect->width/scale;
-                s->pix_format.height = rect->height/scale;
-                memcpy(&(s->_rect), rect, sizeof(*rect));
-
-                if ((cam->module_param.force_munmap || cam->io == IO_READ) &&
-                    nbuffers != sn9c102_request_buffers(cam, nbuffers,
-                                                        cam->io)) {
-                        cam->state |= DEV_MISCONFIGURED;
-                        DBG(1, "VIDIOC_S_CROP failed because of not enough "
-                               "memory. To use the camera, close and open "
-                               "/dev/video%d again.", cam->v4ldev->minor)
-                        return -ENOMEM;
-                }
+        pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_SN9C10X)
+                             ? 0 : (pfmt->width * pfmt->priv) / 8;
+        pfmt->sizeimage = pfmt->height * ((pfmt->width*pfmt->priv)/8);
+        pfmt->field = V4L2_FIELD_NONE;
+        memcpy(&(format.fmt.pix), pfmt, sizeof(*pfmt));
 
-                cam->stream = stream;
+        if (copy_to_user(arg, &format, sizeof(format)))
+                return -EFAULT;
 
-                return 0;
-        }
+        return 0;
+}
 
-        case VIDIOC_ENUM_FMT:
-        {
-                struct v4l2_fmtdesc fmtd;
 
-                if (copy_from_user(&fmtd, arg, sizeof(fmtd)))
-                        return -EFAULT;
+static int
+sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
+                         void __user * arg)
+{
+        struct sn9c102_sensor* s = cam->sensor;
+        struct v4l2_format format;
+        struct v4l2_pix_format* pix;
+        struct v4l2_pix_format* pfmt = &(s->pix_format);
+        struct v4l2_rect* bounds = &(s->cropcap.bounds);
+        struct v4l2_rect rect;
+        u8 scale;
+        const enum sn9c102_stream_state stream = cam->stream;
+        const u32 nbuffers = cam->nbuffers;
+        u32 i;
+        int err = 0;
 
-                if (fmtd.index == 0) {
-                        strcpy(fmtd.description, "bayer rgb");
-                        fmtd.pixelformat = V4L2_PIX_FMT_SBGGR8;
-                } else if (fmtd.index == 1) {
-                        strcpy(fmtd.description, "compressed");
-                        fmtd.pixelformat = V4L2_PIX_FMT_SN9C10X;
-                        fmtd.flags = V4L2_FMT_FLAG_COMPRESSED;
-                } else
-                        return -EINVAL;
+        if (copy_from_user(&format, arg, sizeof(format)))
+                return -EFAULT;
 
-                fmtd.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                memset(&fmtd.reserved, 0, sizeof(fmtd.reserved));
+        pix = &(format.fmt.pix);
 
-                if (copy_to_user(arg, &fmtd, sizeof(fmtd)))
-                        return -EFAULT;
+        if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
 
-                return 0;
+        memcpy(&rect, &(s->_rect), sizeof(rect));
+
+        { /* calculate the actual scaling factor */
+                u32 a, b;
+                a = rect.width * rect.height;
+                b = pix->width * pix->height;
+                scale = b ? (u8)((a / b) < 4 ? 1 : ((a / b) < 16 ? 2 : 4)) : 1;
         }
 
-        case VIDIOC_G_FMT:
-        {
-                struct v4l2_format format;
-                struct v4l2_pix_format* pfmt = &(cam->sensor->pix_format);
+        rect.width = scale * pix->width;
+        rect.height = scale * pix->height;
 
-                if (copy_from_user(&format, arg, sizeof(format)))
-                        return -EFAULT;
+        if (rect.width < 16)
+                rect.width = 16;
+        if (rect.height < 16)
+                rect.height = 16;
+        if (rect.width > bounds->left + bounds->width - rect.left)
+                rect.width = bounds->left + bounds->width - rect.left;
+        if (rect.height > bounds->top + bounds->height - rect.top)
+                rect.height = bounds->top + bounds->height - rect.top;
 
-                if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                        return -EINVAL;
+        rect.width &= ~15L;
+        rect.height &= ~15L;
+
+        { /* adjust the scaling factor */
+                u32 a, b;
+                a = rect.width * rect.height;
+                b = pix->width * pix->height;
+                scale = b ? (u8)((a / b) < 4 ? 1 : ((a / b) < 16 ? 2 : 4)) : 1;
+        }
 
-                pfmt->bytesperline = (pfmt->pixelformat==V4L2_PIX_FMT_SN9C10X)
-                                     ? 0 : (pfmt->width * pfmt->priv) / 8;
-                pfmt->sizeimage = pfmt->height * ((pfmt->width*pfmt->priv)/8);
-                pfmt->field = V4L2_FIELD_NONE;
-                memcpy(&(format.fmt.pix), pfmt, sizeof(*pfmt));
+        pix->width = rect.width / scale;
+        pix->height = rect.height / scale;
 
+        if (pix->pixelformat != V4L2_PIX_FMT_SN9C10X &&
+            pix->pixelformat != V4L2_PIX_FMT_SBGGR8)
+                pix->pixelformat = pfmt->pixelformat;
+        pix->priv = pfmt->priv; /* bpp */
+        pix->colorspace = pfmt->colorspace;
+        pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
+                            ? 0 : (pix->width * pix->priv) / 8;
+        pix->sizeimage = pix->height * ((pix->width * pix->priv) / 8);
+        pix->field = V4L2_FIELD_NONE;
+
+        if (cmd == VIDIOC_TRY_FMT) {
                 if (copy_to_user(arg, &format, sizeof(format)))
                         return -EFAULT;
-
                 return 0;
         }
 
-        case VIDIOC_TRY_FMT:
-        case VIDIOC_S_FMT:
-        {
-                struct sn9c102_sensor* s = cam->sensor;
-                struct v4l2_format format;
-                struct v4l2_pix_format* pix;
-                struct v4l2_pix_format* pfmt = &(s->pix_format);
-                struct v4l2_rect* bounds = &(s->cropcap.bounds);
-                struct v4l2_rect rect;
-                u8 scale;
-                const enum sn9c102_stream_state stream = cam->stream;
-                const u32 nbuffers = cam->nbuffers;
-                u32 i;
-                int err = 0;
-
-                if (copy_from_user(&format, arg, sizeof(format)))
-                        return -EFAULT;
+        if (cam->module_param.force_munmap)
+                for (i = 0; i < cam->nbuffers; i++)
+                        if (cam->frame[i].vma_use_count) {
+                                DBG(3, "VIDIOC_S_FMT failed. Unmap the "
+                                       "buffers first.");
+                                return -EINVAL;
+                        }
 
-                pix = &(format.fmt.pix);
+        if (cam->stream == STREAM_ON)
+                if ((err = sn9c102_stream_interrupt(cam)))
+                        return err;
 
-                if (format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                        return -EINVAL;
+        if (copy_to_user(arg, &format, sizeof(format))) {
+                cam->stream = stream;
+                return -EFAULT;
+        }
 
-                memcpy(&rect, &(s->_rect), sizeof(rect));
+        if (cam->module_param.force_munmap  || cam->io == IO_READ)
+                sn9c102_release_buffers(cam);
 
-                { /* calculate the actual scaling factor */
-                        u32 a, b;
-                        a = rect.width * rect.height;
-                        b = pix->width * pix->height;
-                        scale = b ? (u8)((a / b) < 4 ? 1 :
-                                        ((a / b) < 16 ? 2 : 4)) : 1;
-                }
+        err += sn9c102_set_pix_format(cam, pix);
+        err += sn9c102_set_crop(cam, &rect);
+        if (s->set_pix_format)
+                err += s->set_pix_format(cam, pix);
+        if (s->set_crop)
+                err += s->set_crop(cam, &rect);
+        err += sn9c102_set_scale(cam, scale);
 
-                rect.width = scale * pix->width;
-                rect.height = scale * pix->height;
-
-                if (rect.width < 16)
-                        rect.width = 16;
-                if (rect.height < 16)
-                        rect.height = 16;
-                if (rect.width > bounds->left + bounds->width - rect.left)
-                        rect.width = bounds->left + bounds->width - rect.left;
-                if (rect.height > bounds->top + bounds->height - rect.top)
-                        rect.height = bounds->top + bounds->height - rect.top;
-
-                rect.width &= ~15L;
-                rect.height &= ~15L;
-
-                { /* adjust the scaling factor */
-                        u32 a, b;
-                        a = rect.width * rect.height;
-                        b = pix->width * pix->height;
-                        scale = b ? (u8)((a / b) < 4 ? 1 :
-                                        ((a / b) < 16 ? 2 : 4)) : 1;
-                }
+        if (err) { /* atomic, no rollback in ioctl() */
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -EIO;
+        }
 
-                pix->width = rect.width / scale;
-                pix->height = rect.height / scale;
-
-                if (pix->pixelformat != V4L2_PIX_FMT_SN9C10X &&
-                    pix->pixelformat != V4L2_PIX_FMT_SBGGR8)
-                        pix->pixelformat = pfmt->pixelformat;
-                pix->priv = pfmt->priv; /* bpp */
-                pix->colorspace = pfmt->colorspace;
-                pix->bytesperline = (pix->pixelformat == V4L2_PIX_FMT_SN9C10X)
-                                    ? 0 : (pix->width * pix->priv) / 8;
-                pix->sizeimage = pix->height * ((pix->width * pix->priv) / 8);
-                pix->field = V4L2_FIELD_NONE;
-
-                if (cmd == VIDIOC_TRY_FMT) {
-                        if (copy_to_user(arg, &format, sizeof(format)))
-                                return -EFAULT;
-                        return 0;
-                }
+        memcpy(pfmt, pix, sizeof(*pix));
+        memcpy(&(s->_rect), &rect, sizeof(rect));
 
-                if (cam->module_param.force_munmap)
-                        for (i = 0; i < cam->nbuffers; i++)
-                                if (cam->frame[i].vma_use_count) {
-                                        DBG(3, "VIDIOC_S_FMT failed. "
-                                               "Unmap the buffers first.")
-                                        return -EINVAL;
-                                }
+        if ((cam->module_param.force_munmap  || cam->io == IO_READ) &&
+            nbuffers != sn9c102_request_buffers(cam, nbuffers, cam->io)) {
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
+                       "use the camera, close and open /dev/video%d again.",
+                    cam->v4ldev->minor);
+                return -ENOMEM;
+        }
 
-                if (cam->stream == STREAM_ON)
-                        if ((err = sn9c102_stream_interrupt(cam)))
-                                return err;
+        if (cam->io == IO_READ)
+                sn9c102_empty_framequeues(cam);
+        else if (cam->module_param.force_munmap)
+                sn9c102_requeue_outqueue(cam);
 
-                if (copy_to_user(arg, &format, sizeof(format))) {
-                        cam->stream = stream;
-                        return -EFAULT;
-                }
+        cam->stream = stream;
 
-                if (cam->module_param.force_munmap  || cam->io == IO_READ)
-                        sn9c102_release_buffers(cam);
-
-                err += sn9c102_set_pix_format(cam, pix);
-                err += sn9c102_set_crop(cam, &rect);
-                if (s->set_pix_format)
-                        err += s->set_pix_format(cam, pix);
-                if (s->set_crop)
-                        err += s->set_crop(cam, &rect);
-                err += sn9c102_set_scale(cam, scale);
-
-                if (err) { /* atomic, no rollback in ioctl() */
-                        cam->state |= DEV_MISCONFIGURED;
-                        DBG(1, "VIDIOC_S_FMT failed because of hardware "
-                               "problems. To use the camera, close and open "
-                               "/dev/video%d again.", cam->v4ldev->minor)
-                        return -EIO;
-                }
+        return 0;
+}
 
-                memcpy(pfmt, pix, sizeof(*pix));
-                memcpy(&(s->_rect), &rect, sizeof(rect));
 
-                if ((cam->module_param.force_munmap  || cam->io == IO_READ) &&
-                    nbuffers != sn9c102_request_buffers(cam, nbuffers,
-                                                        cam->io)) {
-                        cam->state |= DEV_MISCONFIGURED;
-                        DBG(1, "VIDIOC_S_FMT failed because of not enough "
-                               "memory. To use the camera, close and open "
-                               "/dev/video%d again.", cam->v4ldev->minor)
-                        return -ENOMEM;
-                }
+static int
+sn9c102_vidioc_g_jpegcomp(struct sn9c102_device* cam, void __user * arg)
+{
+        if (copy_to_user(arg, &cam->compression,
+                         sizeof(cam->compression)))
+                return -EFAULT;
 
-                cam->stream = stream;
+        return 0;
+}
 
-                return 0;
-        }
 
-        case VIDIOC_G_JPEGCOMP:
-        {
-                if (copy_to_user(arg, &cam->compression,
-                                 sizeof(cam->compression)))
-                        return -EFAULT;
+static int
+sn9c102_vidioc_s_jpegcomp(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_jpegcompression jc;
+        const enum sn9c102_stream_state stream = cam->stream;
+        int err = 0;
 
-                return 0;
-        }
+        if (copy_from_user(&jc, arg, sizeof(jc)))
+                return -EFAULT;
 
-        case VIDIOC_S_JPEGCOMP:
-        {
-                struct v4l2_jpegcompression jc;
-                const enum sn9c102_stream_state stream = cam->stream;
-                int err = 0;
+        if (jc.quality != 0 && jc.quality != 1)
+                return -EINVAL;
 
-                if (copy_from_user(&jc, arg, sizeof(jc)))
-                        return -EFAULT;
+        if (cam->stream == STREAM_ON)
+                if ((err = sn9c102_stream_interrupt(cam)))
+                        return err;
 
-                if (jc.quality != 0 && jc.quality != 1)
-                        return -EINVAL;
+        err += sn9c102_set_compression(cam, &jc);
+        if (err) { /* atomic, no rollback in ioctl() */
+                cam->state |= DEV_MISCONFIGURED;
+                DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
+                       "problems. To use the camera, close and open "
+                       "/dev/video%d again.", cam->v4ldev->minor);
+                return -EIO;
+        }
 
-                if (cam->stream == STREAM_ON)
-                        if ((err = sn9c102_stream_interrupt(cam)))
-                                return err;
+        cam->compression.quality = jc.quality;
 
-                err += sn9c102_set_compression(cam, &jc);
-                if (err) { /* atomic, no rollback in ioctl() */
-                        cam->state |= DEV_MISCONFIGURED;
-                        DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
-                               "problems. To use the camera, close and open "
-                               "/dev/video%d again.", cam->v4ldev->minor)
-                        return -EIO;
-                }
+        cam->stream = stream;
 
-                cam->compression.quality = jc.quality;
+        return 0;
+}
 
-                cam->stream = stream;
 
-                return 0;
-        }
+static int
+sn9c102_vidioc_reqbufs(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_requestbuffers rb;
+        u32 i;
+        int err;
 
-        case VIDIOC_REQBUFS:
-        {
-                struct v4l2_requestbuffers rb;
-                u32 i;
-                int err;
+        if (copy_from_user(&rb, arg, sizeof(rb)))
+                return -EFAULT;
 
-                if (copy_from_user(&rb, arg, sizeof(rb)))
-                        return -EFAULT;
+        if (rb.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+            rb.memory != V4L2_MEMORY_MMAP)
+                return -EINVAL;
 
-                if (rb.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                    rb.memory != V4L2_MEMORY_MMAP)
-                        return -EINVAL;
+        if (cam->io == IO_READ) {
+                DBG(3, "Close and open the device again to choose the mmap "
+                       "I/O method");
+                return -EINVAL;
+        }
 
-                if (cam->io == IO_READ) {
-                        DBG(3, "Close and open the device again to choose "
-                               "the mmap I/O method")
+        for (i = 0; i < cam->nbuffers; i++)
+                if (cam->frame[i].vma_use_count) {
+                        DBG(3, "VIDIOC_REQBUFS failed. Previous buffers are "
+                               "still mapped.");
                         return -EINVAL;
                 }
 
-                for (i = 0; i < cam->nbuffers; i++)
-                        if (cam->frame[i].vma_use_count) {
-                                DBG(3, "VIDIOC_REQBUFS failed. "
-                                       "Previous buffers are still mapped.")
-                                return -EINVAL;
-                        }
+        if (cam->stream == STREAM_ON)
+                if ((err = sn9c102_stream_interrupt(cam)))
+                        return err;
 
-                if (cam->stream == STREAM_ON)
-                        if ((err = sn9c102_stream_interrupt(cam)))
-                                return err;
+        sn9c102_empty_framequeues(cam);
 
-                sn9c102_empty_framequeues(cam);
+        sn9c102_release_buffers(cam);
+        if (rb.count)
+                rb.count = sn9c102_request_buffers(cam, rb.count, IO_MMAP);
 
+        if (copy_to_user(arg, &rb, sizeof(rb))) {
                 sn9c102_release_buffers(cam);
-                if (rb.count)
-                        rb.count = sn9c102_request_buffers(cam, rb.count,
-                                                           IO_MMAP);
+                cam->io = IO_NONE;
+                return -EFAULT;
+        }
 
-                if (copy_to_user(arg, &rb, sizeof(rb))) {
-                        sn9c102_release_buffers(cam);
-                        cam->io = IO_NONE;
-                        return -EFAULT;
-                }
+        cam->io = rb.count ? IO_MMAP : IO_NONE;
 
-                cam->io = rb.count ? IO_MMAP : IO_NONE;
+        return 0;
+}
 
-                return 0;
-        }
 
-        case VIDIOC_QUERYBUF:
-        {
-                struct v4l2_buffer b;
+static int
+sn9c102_vidioc_querybuf(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_buffer b;
 
-                if (copy_from_user(&b, arg, sizeof(b)))
-                        return -EFAULT;
+        if (copy_from_user(&b, arg, sizeof(b)))
+                return -EFAULT;
 
-                if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                    b.index >= cam->nbuffers || cam->io != IO_MMAP)
-                        return -EINVAL;
+        if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+            b.index >= cam->nbuffers || cam->io != IO_MMAP)
+                return -EINVAL;
 
-                memcpy(&b, &cam->frame[b.index].buf, sizeof(b));
+        memcpy(&b, &cam->frame[b.index].buf, sizeof(b));
 
-                if (cam->frame[b.index].vma_use_count)
-                        b.flags |= V4L2_BUF_FLAG_MAPPED;
+        if (cam->frame[b.index].vma_use_count)
+                b.flags |= V4L2_BUF_FLAG_MAPPED;
 
-                if (cam->frame[b.index].state == F_DONE)
-                        b.flags |= V4L2_BUF_FLAG_DONE;
-                else if (cam->frame[b.index].state != F_UNUSED)
-                        b.flags |= V4L2_BUF_FLAG_QUEUED;
+        if (cam->frame[b.index].state == F_DONE)
+                b.flags |= V4L2_BUF_FLAG_DONE;
+        else if (cam->frame[b.index].state != F_UNUSED)
+                b.flags |= V4L2_BUF_FLAG_QUEUED;
 
-                if (copy_to_user(arg, &b, sizeof(b)))
-                        return -EFAULT;
+        if (copy_to_user(arg, &b, sizeof(b)))
+                return -EFAULT;
 
-                return 0;
-        }
+        return 0;
+}
 
-        case VIDIOC_QBUF:
-        {
-                struct v4l2_buffer b;
-                unsigned long lock_flags;
 
-                if (copy_from_user(&b, arg, sizeof(b)))
-                        return -EFAULT;
+static int
+sn9c102_vidioc_qbuf(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_buffer b;
+        unsigned long lock_flags;
 
-                if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                    b.index >= cam->nbuffers || cam->io != IO_MMAP)
-                        return -EINVAL;
+        if (copy_from_user(&b, arg, sizeof(b)))
+                return -EFAULT;
 
-                if (cam->frame[b.index].state != F_UNUSED)
-                        return -EINVAL;
+        if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+            b.index >= cam->nbuffers || cam->io != IO_MMAP)
+                return -EINVAL;
 
-                cam->frame[b.index].state = F_QUEUED;
+        if (cam->frame[b.index].state != F_UNUSED)
+                return -EINVAL;
 
-                spin_lock_irqsave(&cam->queue_lock, lock_flags);
-                list_add_tail(&cam->frame[b.index].frame, &cam->inqueue);
-                spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
+        cam->frame[b.index].state = F_QUEUED;
 
-                PDBGG("Frame #%lu queued", (unsigned long)b.index)
+        spin_lock_irqsave(&cam->queue_lock, lock_flags);
+        list_add_tail(&cam->frame[b.index].frame, &cam->inqueue);
+        spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
 
-                return 0;
-        }
+        PDBGG("Frame #%lu queued", (unsigned long)b.index);
 
-        case VIDIOC_DQBUF:
-        {
-                struct v4l2_buffer b;
-                struct sn9c102_frame_t *f;
-                unsigned long lock_flags;
-                int err = 0;
+        return 0;
+}
 
-                if (copy_from_user(&b, arg, sizeof(b)))
-                        return -EFAULT;
 
-                if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io!= IO_MMAP)
+static int
+sn9c102_vidioc_dqbuf(struct sn9c102_device* cam, struct file* filp,
+                     void __user * arg)
+{
+        struct v4l2_buffer b;
+        struct sn9c102_frame_t *f;
+        unsigned long lock_flags;
+        int err = 0;
+
+        if (copy_from_user(&b, arg, sizeof(b)))
+                return -EFAULT;
+
+        if (b.type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
+                return -EINVAL;
+
+        if (list_empty(&cam->outqueue)) {
+                if (cam->stream == STREAM_OFF)
                         return -EINVAL;
+                if (filp->f_flags & O_NONBLOCK)
+                        return -EAGAIN;
+                err = wait_event_interruptible
+                      ( cam->wait_frame,
+                        (!list_empty(&cam->outqueue)) ||
+                        (cam->state & DEV_DISCONNECTED) ||
+                        (cam->state & DEV_MISCONFIGURED) );
+                if (err)
+                        return err;
+                if (cam->state & DEV_DISCONNECTED)
+                        return -ENODEV;
+                if (cam->state & DEV_MISCONFIGURED)
+                        return -EIO;
+        }
 
-                if (list_empty(&cam->outqueue)) {
-                        if (cam->stream == STREAM_OFF)
-                                return -EINVAL;
-                        if (filp->f_flags & O_NONBLOCK)
-                                return -EAGAIN;
-                        err = wait_event_interruptible
-                              ( cam->wait_frame, 
-                                (!list_empty(&cam->outqueue)) ||
-                                (cam->state & DEV_DISCONNECTED) ||
-                                (cam->state & DEV_MISCONFIGURED) );
-                        if (err)
-                                return err;
-                        if (cam->state & DEV_DISCONNECTED)
-                                return -ENODEV;
-                        if (cam->state & DEV_MISCONFIGURED)
-                                return -EIO;
-                }
+        spin_lock_irqsave(&cam->queue_lock, lock_flags);
+        f = list_entry(cam->outqueue.next, struct sn9c102_frame_t, frame);
+        list_del(cam->outqueue.next);
+        spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
 
-                spin_lock_irqsave(&cam->queue_lock, lock_flags);
-                f = list_entry(cam->outqueue.next, struct sn9c102_frame_t,
-                               frame);
-                list_del(cam->outqueue.next);
-                spin_unlock_irqrestore(&cam->queue_lock, lock_flags);
+        f->state = F_UNUSED;
 
-                f->state = F_UNUSED;
+        memcpy(&b, &f->buf, sizeof(b));
+        if (f->vma_use_count)
+                b.flags |= V4L2_BUF_FLAG_MAPPED;
 
-                memcpy(&b, &f->buf, sizeof(b));
-                if (f->vma_use_count)
-                        b.flags |= V4L2_BUF_FLAG_MAPPED;
+        if (copy_to_user(arg, &b, sizeof(b)))
+                return -EFAULT;
 
-                if (copy_to_user(arg, &b, sizeof(b)))
-                        return -EFAULT;
+        PDBGG("Frame #%lu dequeued", (unsigned long)f->buf.index);
 
-                PDBGG("Frame #%lu dequeued", (unsigned long)f->buf.index)
+        return 0;
+}
 
-                return 0;
-        }
 
-        case VIDIOC_STREAMON:
-        {
-                int type;
+static int
+sn9c102_vidioc_streamon(struct sn9c102_device* cam, void __user * arg)
+{
+        int type;
 
-                if (copy_from_user(&type, arg, sizeof(type)))
-                        return -EFAULT;
+        if (copy_from_user(&type, arg, sizeof(type)))
+                return -EFAULT;
 
-                if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
-                        return -EINVAL;
+        if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
+                return -EINVAL;
 
-                if (list_empty(&cam->inqueue))
-                        return -EINVAL;
+        if (list_empty(&cam->inqueue))
+                return -EINVAL;
 
-                cam->stream = STREAM_ON;
+        cam->stream = STREAM_ON;
 
-                DBG(3, "Stream on")
+        DBG(3, "Stream on");
 
-                return 0;
-        }
+        return 0;
+}
 
-        case VIDIOC_STREAMOFF:
-        {
-                int type, err;
 
-                if (copy_from_user(&type, arg, sizeof(type)))
-                        return -EFAULT;
+static int
+sn9c102_vidioc_streamoff(struct sn9c102_device* cam, void __user * arg)
+{
+        int type, err;
 
-                if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
-                        return -EINVAL;
+        if (copy_from_user(&type, arg, sizeof(type)))
+                return -EFAULT;
 
-                if (cam->stream == STREAM_ON)
-                        if ((err = sn9c102_stream_interrupt(cam)))
-                                return err;
+        if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE || cam->io != IO_MMAP)
+                return -EINVAL;
 
-                sn9c102_empty_framequeues(cam);
+        if (cam->stream == STREAM_ON)
+                if ((err = sn9c102_stream_interrupt(cam)))
+                        return err;
 
-                DBG(3, "Stream off")
+        sn9c102_empty_framequeues(cam);
 
-                return 0;
-        }
+        DBG(3, "Stream off");
 
-        case VIDIOC_G_PARM:
-        {
-                struct v4l2_streamparm sp;
+        return 0;
+}
 
-                if (copy_from_user(&sp, arg, sizeof(sp)))
-                        return -EFAULT;
 
-                if (sp.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                        return -EINVAL;
+static int
+sn9c102_vidioc_g_parm(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_streamparm sp;
+
+        if (copy_from_user(&sp, arg, sizeof(sp)))
+                return -EFAULT;
+
+        if (sp.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        sp.parm.capture.extendedmode = 0;
+        sp.parm.capture.readbuffers = cam->nreadbuffers;
+
+        if (copy_to_user(arg, &sp, sizeof(sp)))
+                return -EFAULT;
+
+        return 0;
+}
+
+
+static int
+sn9c102_vidioc_s_parm(struct sn9c102_device* cam, void __user * arg)
+{
+        struct v4l2_streamparm sp;
+
+        if (copy_from_user(&sp, arg, sizeof(sp)))
+                return -EFAULT;
+
+        if (sp.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                return -EINVAL;
+
+        sp.parm.capture.extendedmode = 0;
 
-                sp.parm.capture.extendedmode = 0;
+        if (sp.parm.capture.readbuffers == 0)
                 sp.parm.capture.readbuffers = cam->nreadbuffers;
 
-                if (copy_to_user(arg, &sp, sizeof(sp)))
-                        return -EFAULT;
+        if (sp.parm.capture.readbuffers > SN9C102_MAX_FRAMES)
+                sp.parm.capture.readbuffers = SN9C102_MAX_FRAMES;
 
-                return 0;
-        }
+        if (copy_to_user(arg, &sp, sizeof(sp)))
+                return -EFAULT;
 
-        case VIDIOC_S_PARM_OLD:
-        case VIDIOC_S_PARM:
-        {
-                struct v4l2_streamparm sp;
+        cam->nreadbuffers = sp.parm.capture.readbuffers;
 
-                if (copy_from_user(&sp, arg, sizeof(sp)))
-                        return -EFAULT;
+        return 0;
+}
 
-                if (sp.type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                        return -EINVAL;
 
-                sp.parm.capture.extendedmode = 0;
+static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
+                              unsigned int cmd, void __user * arg)
+{
+        struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp));
+
+        switch (cmd) {
+
+        case VIDIOC_QUERYCAP:
+                return sn9c102_vidioc_querycap(cam, arg);
 
-                if (sp.parm.capture.readbuffers == 0)
-                        sp.parm.capture.readbuffers = cam->nreadbuffers;
+        case VIDIOC_ENUMINPUT:
+                return sn9c102_vidioc_enuminput(cam, arg);
 
-                if (sp.parm.capture.readbuffers > SN9C102_MAX_FRAMES)
-                        sp.parm.capture.readbuffers = SN9C102_MAX_FRAMES;
+        case VIDIOC_G_INPUT:
+        case VIDIOC_S_INPUT:
+                return sn9c102_vidioc_gs_input(cam, arg);
 
-                if (copy_to_user(arg, &sp, sizeof(sp)))
-                        return -EFAULT;
+        case VIDIOC_QUERYCTRL:
+                return sn9c102_vidioc_query_ctrl(cam, arg);
 
-                cam->nreadbuffers = sp.parm.capture.readbuffers;
+        case VIDIOC_G_CTRL:
+                return sn9c102_vidioc_g_ctrl(cam, arg);
 
-                return 0;
-        }
+        case VIDIOC_S_CTRL_OLD:
+        case VIDIOC_S_CTRL:
+                return sn9c102_vidioc_s_ctrl(cam, arg);
+
+        case VIDIOC_CROPCAP_OLD:
+        case VIDIOC_CROPCAP:
+                return sn9c102_vidioc_cropcap(cam, arg);
+
+        case VIDIOC_G_CROP:
+                return sn9c102_vidioc_g_crop(cam, arg);
+
+        case VIDIOC_S_CROP:
+                return sn9c102_vidioc_s_crop(cam, arg);
+
+        case VIDIOC_ENUM_FMT:
+                return sn9c102_vidioc_enum_fmt(cam, arg);
+
+        case VIDIOC_G_FMT:
+                return sn9c102_vidioc_g_fmt(cam, arg);
+
+        case VIDIOC_TRY_FMT:
+        case VIDIOC_S_FMT:
+                return sn9c102_vidioc_try_s_fmt(cam, cmd, arg);
+
+        case VIDIOC_G_JPEGCOMP:
+                return sn9c102_vidioc_g_jpegcomp(cam, arg);
+
+        case VIDIOC_S_JPEGCOMP:
+                return sn9c102_vidioc_s_jpegcomp(cam, arg);
+
+        case VIDIOC_REQBUFS:
+                return sn9c102_vidioc_reqbufs(cam, arg);
+
+        case VIDIOC_QUERYBUF:
+                return sn9c102_vidioc_querybuf(cam, arg);
+
+        case VIDIOC_QBUF:
+                return sn9c102_vidioc_qbuf(cam, arg);
+
+        case VIDIOC_DQBUF:
+                return sn9c102_vidioc_dqbuf(cam, filp, arg);
+
+        case VIDIOC_STREAMON:
+                return sn9c102_vidioc_streamon(cam, arg);
+
+        case VIDIOC_STREAMOFF:
+                return sn9c102_vidioc_streamoff(cam, arg);
+
+        case VIDIOC_G_PARM:
+                return sn9c102_vidioc_g_parm(cam, arg);
+
+        case VIDIOC_S_PARM_OLD:
+        case VIDIOC_S_PARM:
+                return sn9c102_vidioc_s_parm(cam, arg);
 
         case VIDIOC_G_STD:
         case VIDIOC_S_STD:
@@ -2499,17 +2659,20 @@ static int sn9c102_ioctl(struct inode* inode, struct file* filp,
                 return -ERESTARTSYS;
 
         if (cam->state & DEV_DISCONNECTED) {
-                DBG(1, "Device not present")
+                DBG(1, "Device not present");
                 up(&cam->fileop_sem);
                 return -ENODEV;
         }
 
         if (cam->state & DEV_MISCONFIGURED) {
-                DBG(1, "The camera is misconfigured. Close and open it again.")
+                DBG(1, "The camera is misconfigured. Close and open it "
+                       "again.");
                 up(&cam->fileop_sem);
                 return -EIO;
         }
 
+        V4LDBG(3, "sn9c102", cmd);
+
         err = sn9c102_ioctl_v4l2(inode, filp, cmd, (void __user *)arg);
 
         up(&cam->fileop_sem);
@@ -2517,9 +2680,10 @@ static int sn9c102_ioctl(struct inode* inode, struct file* filp,
         return err;
 }
 
+/*****************************************************************************/
 
 static struct file_operations sn9c102_fops = {
-        .owner =   THIS_MODULE,
+        .owner = THIS_MODULE,
         .open =    sn9c102_open,
         .release = sn9c102_release,
         .ioctl =   sn9c102_ioctl,
@@ -2538,36 +2702,22 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         struct usb_device *udev = interface_to_usbdev(intf);
         struct sn9c102_device* cam;
         static unsigned int dev_nr = 0;
-        unsigned int i, n;
+        unsigned int i;
         int err = 0, r;
 
-        n = ARRAY_SIZE(sn9c102_id_table);
-        for (i = 0; i < n-1; i++)
-                if (le16_to_cpu(udev->descriptor.idVendor) == 
-                    sn9c102_id_table[i].idVendor &&
-                    le16_to_cpu(udev->descriptor.idProduct) ==
-                    sn9c102_id_table[i].idProduct)
-                        break;
-        if (i == n-1)
-                return -ENODEV;
-
-        if (!(cam = kmalloc(sizeof(struct sn9c102_device), GFP_KERNEL)))
+        if (!(cam = kzalloc(sizeof(struct sn9c102_device), GFP_KERNEL)))
                 return -ENOMEM;
-        memset(cam, 0, sizeof(*cam));
 
         cam->usbdev = udev;
 
-        memcpy(&cam->dev, &udev->dev, sizeof(struct device));
-
-        if (!(cam->control_buffer = kmalloc(8, GFP_KERNEL))) {
-                DBG(1, "kmalloc() failed")
+        if (!(cam->control_buffer = kzalloc(8, GFP_KERNEL))) {
+                DBG(1, "kmalloc() failed");
                 err = -ENOMEM;
                 goto fail;
         }
-        memset(cam->control_buffer, 0, 8);
 
         if (!(cam->v4ldev = video_device_alloc())) {
-                DBG(1, "video_device_alloc() failed")
+                DBG(1, "video_device_alloc() failed");
                 err = -ENOMEM;
                 goto fail;
         }
@@ -2577,25 +2727,22 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         r = sn9c102_read_reg(cam, 0x00);
         if (r < 0 || r != 0x10) {
                 DBG(1, "Sorry, this is not a SN9C10x based camera "
-                       "(vid/pid 0x%04X/0x%04X)",
-                    sn9c102_id_table[i].idVendor,sn9c102_id_table[i].idProduct)
+                       "(vid/pid 0x%04X/0x%04X)", id->idVendor, id->idProduct);
                 err = -ENODEV;
                 goto fail;
         }
 
-        cam->bridge = (sn9c102_id_table[i].idProduct & 0xffc0) == 0x6080 ?
+        cam->bridge = (id->idProduct & 0xffc0) == 0x6080 ?
                       BRIDGE_SN9C103 : BRIDGE_SN9C102;
         switch (cam->bridge) {
         case BRIDGE_SN9C101:
         case BRIDGE_SN9C102:
                 DBG(2, "SN9C10[12] PC Camera Controller detected "
-                       "(vid/pid 0x%04X/0x%04X)", sn9c102_id_table[i].idVendor,
-                    sn9c102_id_table[i].idProduct)
+                       "(vid/pid 0x%04X/0x%04X)", id->idVendor, id->idProduct);
                 break;
         case BRIDGE_SN9C103:
                 DBG(2, "SN9C103 PC Camera Controller detected "
-                       "(vid/pid 0x%04X/0x%04X)", sn9c102_id_table[i].idVendor,
-                    sn9c102_id_table[i].idProduct)
+                       "(vid/pid 0x%04X/0x%04X)", id->idVendor, id->idProduct);
                 break;
         }
 
@@ -2606,24 +2753,24 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         }
 
         if (!err && cam->sensor) {
-                DBG(2, "%s image sensor detected", cam->sensor->name)
+                DBG(2, "%s image sensor detected", cam->sensor->name);
                 DBG(3, "Support for %s maintained by %s",
-                    cam->sensor->name, cam->sensor->maintainer)
+                    cam->sensor->name, cam->sensor->maintainer);
         } else {
-                DBG(1, "No supported image sensor detected")
+                DBG(1, "No supported image sensor detected");
                 err = -ENODEV;
                 goto fail;
         }
 
         if (sn9c102_init(cam)) {
-                DBG(1, "Initialization failed. I will retry on open().")
+                DBG(1, "Initialization failed. I will retry on open().");
                 cam->state |= DEV_MISCONFIGURED;
         }
 
         strcpy(cam->v4ldev->name, "SN9C10x PC Camera");
         cam->v4ldev->owner = THIS_MODULE;
         cam->v4ldev->type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
-        cam->v4ldev->hardware = VID_HARDWARE_SN9C102;
+        cam->v4ldev->hardware = 0;
         cam->v4ldev->fops = &sn9c102_fops;
         cam->v4ldev->minor = video_nr[dev_nr];
         cam->v4ldev->release = video_device_release;
@@ -2634,23 +2781,25 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
         err = video_register_device(cam->v4ldev, VFL_TYPE_GRABBER,
                                     video_nr[dev_nr]);
         if (err) {
-                DBG(1, "V4L2 device registration failed")
+                DBG(1, "V4L2 device registration failed");
                 if (err == -ENFILE && video_nr[dev_nr] == -1)
-                        DBG(1, "Free /dev/videoX node not found")
+                        DBG(1, "Free /dev/videoX node not found");
                 video_nr[dev_nr] = -1;
                 dev_nr = (dev_nr < SN9C102_MAX_DEVICES-1) ? dev_nr+1 : 0;
                 up(&cam->dev_sem);
                 goto fail;
         }
 
-        DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor)
+        DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor);
 
         cam->module_param.force_munmap = force_munmap[dev_nr];
 
         dev_nr = (dev_nr < SN9C102_MAX_DEVICES-1) ? dev_nr+1 : 0;
 
+#ifdef CONFIG_VIDEO_ADV_DEBUG
         sn9c102_create_sysfs(cam);
-        DBG(2, "Optional device control through 'sysfs' interface ready")
+        DBG(2, "Optional device control through 'sysfs' interface ready");
+#endif
 
         usb_set_intfdata(intf, cam);
 
@@ -2680,14 +2829,14 @@ static void sn9c102_usb_disconnect(struct usb_interface* intf)
 
         down(&cam->dev_sem); 
 
-        DBG(2, "Disconnecting %s...", cam->v4ldev->name)
+        DBG(2, "Disconnecting %s...", cam->v4ldev->name);
 
         wake_up_interruptible_all(&cam->open);
 
         if (cam->users) {
                 DBG(2, "Device /dev/video%d is open! Deregistration and "
                        "memory deallocation are deferred on close.",
-                    cam->v4ldev->minor)
+                    cam->v4ldev->minor);
                 cam->state |= DEV_MISCONFIGURED;
                 sn9c102_stop_transfer(cam);
                 cam->state |= DEV_DISCONNECTED;
@@ -2720,11 +2869,11 @@ static int __init sn9c102_module_init(void)
 {
         int err = 0;
 
-        KDBG(2, SN9C102_MODULE_NAME " v" SN9C102_MODULE_VERSION)
-        KDBG(3, SN9C102_MODULE_AUTHOR)
+        KDBG(2, SN9C102_MODULE_NAME " v" SN9C102_MODULE_VERSION);
+        KDBG(3, SN9C102_MODULE_AUTHOR);
 
         if ((err = usb_register(&sn9c102_usb_driver)))
-                KDBG(1, "usb_register() failed")
+                KDBG(1, "usb_register() failed");
 
         return err;
 }
diff --git a/drivers/usb/media/sn9c102_hv7131d.c b/drivers/usb/media/sn9c102_hv7131d.c
index 18070d5333cf..46c12ec3ca62 100644
--- a/drivers/usb/media/sn9c102_hv7131d.c
+++ b/drivers/usb/media/sn9c102_hv7131d.c
@@ -2,7 +2,7 @@
  * Plug-in for HV7131D image sensor connected to the SN9C10x PC Camera     *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
diff --git a/drivers/usb/media/sn9c102_mi0343.c b/drivers/usb/media/sn9c102_mi0343.c
index 86676abf3547..d9aa7a61095d 100644
--- a/drivers/usb/media/sn9c102_mi0343.c
+++ b/drivers/usb/media/sn9c102_mi0343.c
@@ -2,7 +2,7 @@
  * Plug-in for MI-0343 image sensor connected to the SN9C10x PC Camera     *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
diff --git a/drivers/usb/media/sn9c102_ov7630.c b/drivers/usb/media/sn9c102_ov7630.c
index d27c5aedeaf8..4a36519b5af4 100644
--- a/drivers/usb/media/sn9c102_ov7630.c
+++ b/drivers/usb/media/sn9c102_ov7630.c
@@ -2,7 +2,7 @@
  * Plug-in for OV7630 image sensor connected to the SN9C10x PC Camera      *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2005 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2005-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -375,8 +375,10 @@ int sn9c102_probe_ov7630(struct sn9c102_device* cam)
 
         sn9c102_attach_sensor(cam, &ov7630);
 
-        if (le16_to_cpu(ov7630.usbdev->descriptor.idProduct) != 0x608f &&
-            le16_to_cpu(ov7630.usbdev->descriptor.idProduct) != 0x602c)
+        if (le16_to_cpu(ov7630.usbdev->descriptor.idProduct) != 0x602c &&
+            le16_to_cpu(ov7630.usbdev->descriptor.idProduct) != 0x602d &&
+            le16_to_cpu(ov7630.usbdev->descriptor.idProduct) != 0x608f &&
+            le16_to_cpu(ov7630.usbdev->descriptor.idProduct) != 0x60b0)
                 return -ENODEV;
 
         err += sn9c102_write_reg(cam, 0x01, 0x01);
diff --git a/drivers/usb/media/sn9c102_pas106b.c b/drivers/usb/media/sn9c102_pas106b.c
index 48e3ec39d4e2..b1dee78abe04 100644
--- a/drivers/usb/media/sn9c102_pas106b.c
+++ b/drivers/usb/media/sn9c102_pas106b.c
@@ -2,7 +2,7 @@
  * Plug-in for PAS106B image sensor connected to the SN9C10x PC Camera     *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
diff --git a/drivers/usb/media/sn9c102_sensor.h b/drivers/usb/media/sn9c102_sensor.h
index a45166c3488c..7d953b24f2f2 100644
--- a/drivers/usb/media/sn9c102_sensor.h
+++ b/drivers/usb/media/sn9c102_sensor.h
@@ -1,7 +1,7 @@
 /***************************************************************************
  * API for image sensors connected to the SN9C10x PC Camera Controllers    *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -92,7 +92,18 @@ extern void
 sn9c102_attach_sensor(struct sn9c102_device* cam,
                       struct sn9c102_sensor* sensor);
 
-/* Each SN9C10X camera has proper PID/VID identifiers. Add them here in case.*/
+/*
+   Each SN9C10x camera has proper PID/VID identifiers.
+   SN9C103 supports multiple interfaces, but we only handle the video class
+   interface.
+*/
+#define SN9C102_USB_DEVICE(vend, prod, intclass)                              \
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |                           \
+                       USB_DEVICE_ID_MATCH_INT_CLASS,                         \
+        .idVendor = (vend),                                                   \
+        .idProduct = (prod),                                                  \
+        .bInterfaceClass = (intclass)
+
 #define SN9C102_ID_TABLE                                                      \
 static const struct usb_device_id sn9c102_id_table[] = {                      \
         { USB_DEVICE(0x0c45, 0x6001), }, /* TAS5110C1B */                     \
@@ -107,33 +118,34 @@ static const struct usb_device_id sn9c102_id_table[] = {                      \
         { USB_DEVICE(0x0c45, 0x602b), }, /* MI-0343 */                        \
         { USB_DEVICE(0x0c45, 0x602c), }, /* OV7630 */                         \
         { USB_DEVICE(0x0c45, 0x602d), },                                      \
+        { USB_DEVICE(0x0c45, 0x602e), }, /* OV7630 */                         \
         { USB_DEVICE(0x0c45, 0x6030), }, /* MI03x */                          \
-        { USB_DEVICE(0x0c45, 0x6080), },                                      \
-        { USB_DEVICE(0x0c45, 0x6082), }, /* MI0343 and MI0360 */              \
-        { USB_DEVICE(0x0c45, 0x6083), }, /* HV7131[D|E1] */                   \
-        { USB_DEVICE(0x0c45, 0x6088), },                                      \
-        { USB_DEVICE(0x0c45, 0x608a), },                                      \
-        { USB_DEVICE(0x0c45, 0x608b), },                                      \
-        { USB_DEVICE(0x0c45, 0x608c), }, /* HV7131x */                        \
-        { USB_DEVICE(0x0c45, 0x608e), }, /* CIS-VF10 */                       \
-        { USB_DEVICE(0x0c45, 0x608f), }, /* OV7630 */                         \
-        { USB_DEVICE(0x0c45, 0x60a0), },                                      \
-        { USB_DEVICE(0x0c45, 0x60a2), },                                      \
-        { USB_DEVICE(0x0c45, 0x60a3), },                                      \
-        { USB_DEVICE(0x0c45, 0x60a8), }, /* PAS106B */                        \
-        { USB_DEVICE(0x0c45, 0x60aa), }, /* TAS5130D1B */                     \
-        { USB_DEVICE(0x0c45, 0x60ab), }, /* TAS5110C1B */                     \
-        { USB_DEVICE(0x0c45, 0x60ac), },                                      \
-        { USB_DEVICE(0x0c45, 0x60ae), },                                      \
-        { USB_DEVICE(0x0c45, 0x60af), }, /* PAS202BCB */                      \
-        { USB_DEVICE(0x0c45, 0x60b0), },                                      \
-        { USB_DEVICE(0x0c45, 0x60b2), },                                      \
-        { USB_DEVICE(0x0c45, 0x60b3), },                                      \
-        { USB_DEVICE(0x0c45, 0x60b8), },                                      \
-        { USB_DEVICE(0x0c45, 0x60ba), },                                      \
-        { USB_DEVICE(0x0c45, 0x60bb), },                                      \
-        { USB_DEVICE(0x0c45, 0x60bc), },                                      \
-        { USB_DEVICE(0x0c45, 0x60be), },                                      \
+        { SN9C102_USB_DEVICE(0x0c45, 0x6080, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x6082, 0xff), }, /* MI0343 & MI0360 */  \
+        { SN9C102_USB_DEVICE(0x0c45, 0x6083, 0xff), }, /* HV7131[D|E1] */     \
+        { SN9C102_USB_DEVICE(0x0c45, 0x6088, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x608a, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x608b, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x608c, 0xff), }, /* HV7131x */          \
+        { SN9C102_USB_DEVICE(0x0c45, 0x608e, 0xff), }, /* CIS-VF10 */         \
+        { SN9C102_USB_DEVICE(0x0c45, 0x608f, 0xff), }, /* OV7630 */           \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a0, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a2, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a3, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60a8, 0xff), }, /* PAS106B */          \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60aa, 0xff), }, /* TAS5130D1B */       \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ab, 0xff), }, /* TAS5110C1B */       \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ac, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ae, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60af, 0xff), }, /* PAS202BCB */        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b0, 0xff), }, /* OV7630 (?) */       \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b2, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b3, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60b8, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60ba, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60bb, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60bc, 0xff), },                        \
+        { SN9C102_USB_DEVICE(0x0c45, 0x60be, 0xff), },                        \
         { }                                                                   \
 };
 
@@ -177,16 +189,18 @@ extern int sn9c102_i2c_write(struct sn9c102_device*, u8 address, u8 value);
 extern int sn9c102_i2c_read(struct sn9c102_device*, u8 address);
 
 /* I/O on registers in the bridge. Could be used by the sensor methods too */
+extern int sn9c102_write_regs(struct sn9c102_device*, u8* buff, u16 index);
 extern int sn9c102_write_reg(struct sn9c102_device*, u8 value, u16 index);
 extern int sn9c102_pread_reg(struct sn9c102_device*, u16 index);
 
 /*
    NOTE: there are no exported debugging functions. To uniform the output you
    must use the dev_info()/dev_warn()/dev_err() macros defined in device.h,
-   already included here, the argument being the struct device 'dev' of the
-   sensor structure. Do NOT use these macros before the sensor is attached or
-   the kernel will crash! However, you should not need to notify the user about
-   common errors or other messages, since this is done by the master module.
+   already included here, the argument being the struct device '&usbdev->dev'
+   of the sensor structure. Do NOT use these macros before the sensor is
+   attached or the kernel will crash! However, you should not need to notify
+   the user about common errors or other messages, since this is done by the
+   master module.
 */
 
 /*****************************************************************************/
@@ -345,13 +359,6 @@ struct sn9c102_sensor {
            error code without rolling back.
         */
 
-        const struct device* dev;
-        /*
-           This is the argument for dev_err(), dev_info() and dev_warn(). It
-           is used for debugging purposes. You must not access the struct
-           before the sensor is attached.
-        */
-
         const struct usb_device* usbdev;
         /*
            Points to the usb_device struct after the sensor is attached.
diff --git a/drivers/usb/media/sn9c102_tas5110c1b.c b/drivers/usb/media/sn9c102_tas5110c1b.c
index 8775999b5aff..32ddf236cafe 100644
--- a/drivers/usb/media/sn9c102_tas5110c1b.c
+++ b/drivers/usb/media/sn9c102_tas5110c1b.c
@@ -2,7 +2,7 @@
  * Plug-in for TAS5110C1B image sensor connected to the SN9C10x PC Camera  *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
diff --git a/drivers/usb/media/sn9c102_tas5130d1b.c b/drivers/usb/media/sn9c102_tas5130d1b.c
index 927eafdd8c73..a0728f0ae00c 100644
--- a/drivers/usb/media/sn9c102_tas5130d1b.c
+++ b/drivers/usb/media/sn9c102_tas5130d1b.c
@@ -2,7 +2,7 @@
  * Plug-in for TAS5130D1B image sensor connected to the SN9C10x PC Camera  *
  * Controllers                                                             *
  *                                                                         *
- * Copyright (C) 2004-2005 by Luca Risolia <luca.risolia@studio.unibo.it>  *
+ * Copyright (C) 2004-2006 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index bff9434c8e55..9937fc64c8bf 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -62,7 +62,6 @@ MODULE_LICENSE(W9968CF_MODULE_LICENSE);
 MODULE_SUPPORTED_DEVICE("Video");
 
 static int ovmod_load = W9968CF_OVMOD_LOAD;
-static int vppmod_load = W9968CF_VPPMOD_LOAD;
 static unsigned short simcams = W9968CF_SIMCAMS;
 static short video_nr[]={[0 ... W9968CF_MAX_DEVICES-1] = -1}; /*-1=first free*/
 static unsigned int packet_size[] = {[0 ... W9968CF_MAX_DEVICES-1] = 
@@ -107,7 +106,6 @@ static unsigned int param_nv[24]; /* number of values per parameter */
 
 #ifdef CONFIG_KMOD
 module_param(ovmod_load, bool, 0644);
-module_param(vppmod_load, bool, 0444);
 #endif
 module_param(simcams, ushort, 0644);
 module_param_array(video_nr, short, &param_nv[0], 0444);
@@ -150,18 +148,6 @@ MODULE_PARM_DESC(ovmod_load,
                  "\ninto memory."
                  "\nDefault value is "__MODULE_STRING(W9968CF_OVMOD_LOAD)"."
                  "\n");
-MODULE_PARM_DESC(vppmod_load, 
-                 "\n<0|1> Automatic 'w9968cf-vpp' module loading."
-                 "\n0 disabled, 1 enabled."
-                 "\nIf enabled, every time an application attempts to open a"
-                 "\ncamera, 'insmod' searches for the video post-processing"
-                 "\nmodule in the system and loads it automatically (if"
-                 "\npresent). The optional 'w9968cf-vpp' module adds extra"
-                 "\n image manipulation functions to the 'w9968cf' module,like"
-                 "\nsoftware up-scaling,colour conversions and video decoding"
-                 "\nfor very high frame rates."
-                 "\nDefault value is "__MODULE_STRING(W9968CF_VPPMOD_LOAD)"."
-                 "\n");
 #endif
 MODULE_PARM_DESC(simcams, 
                  "\n<n> Number of cameras allowed to stream simultaneously."
@@ -492,10 +478,6 @@ static void w9968cf_push_frame(struct w9968cf_device*, u8 f_num);
 static void w9968cf_pop_frame(struct w9968cf_device*,struct w9968cf_frame_t**);
 static void w9968cf_release_resources(struct w9968cf_device*);
 
-/* Intermodule communication */
-static int w9968cf_vppmod_detect(struct w9968cf_device*);
-static void w9968cf_vppmod_release(struct w9968cf_device*);
-
 
 
 /****************************************************************************
@@ -2737,9 +2719,7 @@ static int w9968cf_open(struct inode* inode, struct file* filp)
         cam->streaming = 0;
         cam->misconfigured = 0;
 
-        if (!w9968cf_vpp)
-                if ((err = w9968cf_vppmod_detect(cam)))
-                        goto out;
+        w9968cf_adjust_configuration(cam);
 
         if ((err = w9968cf_allocate_memory(cam)))
                 goto deallocate_memory;
@@ -2766,7 +2746,6 @@ static int w9968cf_open(struct inode* inode, struct file* filp)
 
 deallocate_memory:
         w9968cf_deallocate_memory(cam);
-out:
         DBG(2, "Failed to open the video device")
         up(&cam->dev_sem);
         up_read(&w9968cf_disconnect);
@@ -2784,8 +2763,6 @@ static int w9968cf_release(struct inode* inode, struct file* filp)
 
         w9968cf_stop_transfer(cam);
 
-        w9968cf_vppmod_release(cam);
-
         if (cam->disconnected) {
                 w9968cf_release_resources(cam);
                 up(&cam->dev_sem);
@@ -3681,106 +3658,6 @@ static struct usb_driver w9968cf_usb_driver = {
  * Module init, exit and intermodule communication                          *
  ****************************************************************************/
 
-static int w9968cf_vppmod_detect(struct w9968cf_device* cam)
-{
-        if (!w9968cf_vpp)
-                if (vppmod_load)
-                        request_module("w9968cf-vpp");
-
-        down(&w9968cf_vppmod_lock);
-
-        if (!w9968cf_vpp) {
-                DBG(4, "Video post-processing module not detected")
-                w9968cf_adjust_configuration(cam);
-                goto out;
-        }
-
-        if (!try_module_get(w9968cf_vpp->owner)) {
-                DBG(1, "Couldn't increment the reference count of "
-                       "the video post-processing module")
-                up(&w9968cf_vppmod_lock);
-                return -ENOSYS;
-        }
-
-        w9968cf_vpp->busy++;
-
-        DBG(5, "Video post-processing module detected")
-
-out:
-        up(&w9968cf_vppmod_lock);
-        return 0;
-}
-
-
-static void w9968cf_vppmod_release(struct w9968cf_device* cam)
-{
-        down(&w9968cf_vppmod_lock);
-
-        if (w9968cf_vpp && w9968cf_vpp->busy) {
-                module_put(w9968cf_vpp->owner);
-                w9968cf_vpp->busy--;
-                wake_up(&w9968cf_vppmod_wait);
-                DBG(5, "Video post-processing module released")
-        }
-
-        up(&w9968cf_vppmod_lock);
-}
-
-
-int w9968cf_vppmod_register(struct w9968cf_vpp_t* vpp)
-{
-        down(&w9968cf_vppmod_lock);
-
-        if (w9968cf_vpp) {
-                KDBG(1, "Video post-processing module already registered")
-                up(&w9968cf_vppmod_lock);
-                return -EINVAL;
-        }
-
-        w9968cf_vpp = vpp;
-        w9968cf_vpp->busy = 0;
-
-        KDBG(2, "Video post-processing module registered")
-        up(&w9968cf_vppmod_lock);
-        return 0;
-}
-
-
-int w9968cf_vppmod_deregister(struct w9968cf_vpp_t* vpp)
-{
-        down(&w9968cf_vppmod_lock);
-
-        if (!w9968cf_vpp) {
-                up(&w9968cf_vppmod_lock);
-                return -EINVAL;
-        }
-
-        if (w9968cf_vpp != vpp) {
-                KDBG(1, "Only the owner can unregister the video "
-                        "post-processing module")
-                up(&w9968cf_vppmod_lock);
-                return -EINVAL;
-        }
-
-        if (w9968cf_vpp->busy) {
-                KDBG(2, "Video post-processing module busy. Wait for it to be "
-                        "released...")
-                up(&w9968cf_vppmod_lock);
-                wait_event(w9968cf_vppmod_wait, !w9968cf_vpp->busy);
-                w9968cf_vpp = NULL;
-                goto out;
-        }
-
-        w9968cf_vpp = NULL;
-
-        up(&w9968cf_vppmod_lock);
-
-out:
-        KDBG(2, "Video post-processing module unregistered")
-        return 0;
-}
-
-
 static int __init w9968cf_module_init(void)
 {
         int err;
@@ -3810,6 +3687,3 @@ static void __exit w9968cf_module_exit(void)
 module_init(w9968cf_module_init);
 module_exit(w9968cf_module_exit);
 
-
-EXPORT_SYMBOL(w9968cf_vppmod_register);
-EXPORT_SYMBOL(w9968cf_vppmod_deregister);
diff --git a/drivers/usb/media/w9968cf.h b/drivers/usb/media/w9968cf.h
index 8acbfe205bc7..47a6ff794171 100644
--- a/drivers/usb/media/w9968cf.h
+++ b/drivers/usb/media/w9968cf.h
@@ -195,7 +195,6 @@ enum w9968cf_vpp_flag {
 };
 
 static struct w9968cf_vpp_t* w9968cf_vpp;
-static DECLARE_MUTEX(w9968cf_vppmod_lock);
 static DECLARE_WAIT_QUEUE_HEAD(w9968cf_vppmod_wait);
 
 static LIST_HEAD(w9968cf_dev_list); /* head of V4L registered cameras list */
diff --git a/drivers/usb/media/w9968cf_vpp.h b/drivers/usb/media/w9968cf_vpp.h
index 3f5317dc4c29..f3b91b782671 100644
--- a/drivers/usb/media/w9968cf_vpp.h
+++ b/drivers/usb/media/w9968cf_vpp.h
@@ -37,7 +37,4 @@ struct w9968cf_vpp_t {
         u8 busy; /* read-only flag: module is/is not in use */
 };
 
-extern int w9968cf_vppmod_register(struct w9968cf_vpp_t*);
-extern int w9968cf_vppmod_deregister(struct w9968cf_vpp_t*);
-
 #endif /* _W9968CF_VPP_H_ */
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 449b2501acf3..ad2f4cccd388 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -2093,6 +2093,8 @@ static void auerswald_disconnect (struct usb_interface *intf)
 static struct usb_device_id auerswald_ids [] = {
         { USB_DEVICE (ID_AUERSWALD, 0x00C0) },          /* COMpact 2104 USB */
         { USB_DEVICE (ID_AUERSWALD, 0x00DB) },          /* COMpact 4410/2206 USB */
+        { USB_DEVICE (ID_AUERSWALD, 0x00DC) }, /* COMpact 4406 DSL */
+        { USB_DEVICE (ID_AUERSWALD, 0x00DD) }, /* COMpact 2204 USB */
         { USB_DEVICE (ID_AUERSWALD, 0x00F1) },          /* Comfort 2000 System Telephone */
         { USB_DEVICE (ID_AUERSWALD, 0x00F2) },          /* Comfort 1200 System Telephone */
         { }                                             /* Terminating entry */
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 981d8a5fbfd9..331d4ae949ed 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -593,7 +593,7 @@ static struct file_operations ld_usb_fops = {
 
 /*
  * usb class driver info in order to get a minor number from the usb core,
- * and to have the device registered with devfs and the driver core
+ * and to have the device registered with the driver core
  */
 static struct usb_class_driver ld_usb_class = {
         .name =         "ldusb%d",
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c
index 541181695040..3094970615cb 100644
--- a/drivers/usb/net/asix.c
+++ b/drivers/usb/net/asix.c
@@ -916,6 +916,10 @@ static const struct usb_device_id	products [] = {
         // Linksys USB200M Rev 2
         USB_DEVICE (0x13b1, 0x0018),
         .driver_info = (unsigned long) &ax88772_info,
+}, {
+        // 0Q0 cable ethernet
+        USB_DEVICE (0x1557, 0x7720),
+        .driver_info = (unsigned long) &ax88772_info,
 },
         { },            // END
 };
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index da46b351e188..dc7a069503e0 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -32,7 +32,7 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v0.05"
+#define DRIVER_VERSION "v0.06"
 #define DRIVER_DESC "Silicon Labs CP2101/CP2102 RS232 serial adaptor driver"
 
 /*
@@ -55,11 +55,15 @@ static int debug;
 
 static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */
-        { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
-        { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
-        { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
         { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */
-        { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
+        { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
+        { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */
+        { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */
+        { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
+        { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
+        { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
+        { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
+        { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
         { } /* Terminating Entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 10bc1bf23b35..f2b4ca8692d8 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -476,10 +476,16 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HRC_PID) },
         { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) },
         { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) },
         { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_TTUSB_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 00d45f8600de..ca40f16370f1 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -31,9 +31,14 @@
 #define FTDI_NF_RIC_VID 0x0DCD  /* Vendor Id */
 #define FTDI_NF_RIC_PID 0x0001  /* Product Id */
 
+
 /* www.irtrans.de device */
 #define FTDI_IRTRANS_PID 0xFC60 /* Product Id */
 
+
+/* www.thoughttechnology.com/ TT-USB provide with procomp use ftdi_sio */
+#define FTDI_TTUSB_PID 0xFF20 /* Product Id */
+
 /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */
 /* they use the ftdi chipset for the USB interface and the vendor id is the same */
 #define FTDI_XF_632_PID 0xFC08  /* 632: 16x2 Character Display */
@@ -51,6 +56,12 @@
 #define FTDI_VNHCPCUSB_D_PID 0xfe38 /* Product Id */
 
 /*
+ * PCDJ use ftdi based dj-controllers.  The following PID is for their DAC-2 device
+ * http://www.pcdjhardware.com/DAC2.asp (PID sent by Wouter Paesen)
+ * (the VID is the standard ftdi vid (FTDI_VID) */
+#define FTDI_PCDJ_DAC2_PID 0xFA88
+
+/*
  * The following are the values for the Matrix Orbital LCD displays,
  * which are the FT232BM ( similar to the 8U232AM )
  */
@@ -215,8 +226,10 @@
  * Definitions for ATIK Instruments astronomical USB based cameras
  * Check it at http://www.atik-instruments.com/
  */
-#define FTDI_ATIK_ATK16_PID     0xDF30  /* ATIK ATK-16 Camera */
-#define FTDI_ATIK_ATK16HR_PID   0xDF31  /* ATIK ATK-16HR Camera */
+#define FTDI_ATIK_ATK16_PID     0xDF30  /* ATIK ATK-16 Grayscale Camera */
+#define FTDI_ATIK_ATK16C_PID    0xDF32  /* ATIK ATK-16C Colour Camera */
+#define FTDI_ATIK_ATK16HR_PID   0xDF31  /* ATIK ATK-16HR Grayscale Camera */
+#define FTDI_ATIK_ATK16HRC_PID  0xDF33  /* ATIK ATK-16HRC Colour Camera */
 
 /*
  * Protego product ids
@@ -365,6 +378,12 @@
 #define POSIFLEX_VID            0x0d3a  /* Vendor ID */
 #define POSIFLEX_PP7000_PID     0x0300  /* PP-7000II thermal printer */
 
+/*
+ * Westrex International devices submitted by Cory Lee
+ */
+#define FTDI_WESTREX_MODEL_777_PID      0xDC00  /* Model 777 */
+#define FTDI_WESTREX_MODEL_8900F_PID    0xDC01  /* Model 8900F */
+
 /* Commands */
 #define FTDI_SIO_RESET          0 /* Reset the port */
 #define FTDI_SIO_MODEM_CTRL     1 /* Set the modem control register */
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 0eb883f44ada..e8e575e037c1 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -73,7 +73,9 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) },
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) },
         { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) },
-        { USB_DEVICE( NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID ) },
+        { USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID ) },
+        { USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID ) },
+        { USB_DEVICE(SAGEM_VENDOR_ID, SAGEM_PRODUCT_ID) },
         { }                                     /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 21d434d81813..1807087a76e3 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -64,3 +64,10 @@
 /* Nokia CA-42 Cable */
 #define NOKIA_CA42_VENDOR_ID    0x078b
 #define NOKIA_CA42_PRODUCT_ID   0x1234
+
+/* CA-42 CLONE Cable www.ca-42.com chipset: Prolific Technology Inc */
+#define CA_42_CA42_VENDOR_ID    0x10b5
+#define CA_42_CA42_PRODUCT_ID   0xac70
+
+#define SAGEM_VENDOR_ID         0x079b
+#define SAGEM_PRODUCT_ID        0x0027
diff --git a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c
index 5b06f9240d05..ab173b30076e 100644
--- a/drivers/usb/storage/initializers.c
+++ b/drivers/usb/storage/initializers.c
@@ -45,6 +45,12 @@
 #include "debug.h"
 #include "transport.h"
 
+#define RIO_MSC 0x08
+#define RIOP_INIT "RIOP\x00\x01\x08"
+#define RIOP_INIT_LEN 7
+#define RIO_SEND_LEN 40
+#define RIO_RECV_LEN 0x200
+
 /* This places the Shuttle/SCM USB<->SCSI bridge devices in multi-target
  * mode */
 int usb_stor_euscsi_init(struct us_data *us)
@@ -91,3 +97,70 @@ int usb_stor_ucr61s2b_init(struct us_data *us)
 
         return (res ? -1 : 0);
 }
+
+/* Place the Rio Karma into mass storage mode.
+ *
+ * The initialization begins by sending 40 bytes starting
+ * RIOP\x00\x01\x08\x00, which the device will ack with a 512-byte
+ * packet with the high four bits set and everything else null.
+ *
+ * Next, we send RIOP\x80\x00\x08\x00.  Each time, a 512 byte response
+ * must be read, but we must loop until byte 5 in the response is 0x08,
+ * indicating success.  */
+int rio_karma_init(struct us_data *us)
+{
+        int result, partial;
+        char *recv;
+        unsigned long timeout;
+
+        // us->iobuf is big enough to hold cmd but not receive
+        if (!(recv = kmalloc(RIO_RECV_LEN, GFP_KERNEL)))
+                goto die_nomem;
+
+        US_DEBUGP("Initializing Karma...\n");
+
+        memset(us->iobuf, 0, RIO_SEND_LEN);
+        memcpy(us->iobuf, RIOP_INIT, RIOP_INIT_LEN);
+
+        result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
+                us->iobuf, RIO_SEND_LEN, &partial);
+        if (result != USB_STOR_XFER_GOOD)
+                goto die;
+
+        result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
+                recv, RIO_RECV_LEN, &partial);
+        if (result != USB_STOR_XFER_GOOD)
+                goto die;
+
+        us->iobuf[4] = 0x80;
+        us->iobuf[5] = 0;
+        timeout = jiffies + msecs_to_jiffies(3000);
+        for (;;) {
+                US_DEBUGP("Sending init command\n");
+                result = usb_stor_bulk_transfer_buf(us, us->send_bulk_pipe,
+                        us->iobuf, RIO_SEND_LEN, &partial);
+                if (result != USB_STOR_XFER_GOOD)
+                        goto die;
+
+                result = usb_stor_bulk_transfer_buf(us, us->recv_bulk_pipe,
+                        recv, RIO_RECV_LEN, &partial);
+                if (result != USB_STOR_XFER_GOOD)
+                        goto die;
+
+                if (recv[5] == RIO_MSC)
+                        break;
+                if (time_after(jiffies, timeout))
+                        goto die;
+                msleep(10);
+        }
+        US_DEBUGP("Karma initialized.\n");
+        kfree(recv);
+        return 0;
+
+die:
+        kfree(recv);
+die_nomem:
+        US_DEBUGP("Could not initialize karma.\n");
+        return USB_STOR_TRANSPORT_FAILED;
+}
+
diff --git a/drivers/usb/storage/initializers.h b/drivers/usb/storage/initializers.h
index 4c1b2bd2e2e4..f9907a5cf129 100644
--- a/drivers/usb/storage/initializers.h
+++ b/drivers/usb/storage/initializers.h
@@ -48,3 +48,4 @@ int usb_stor_euscsi_init(struct us_data *us);
 /* This function is required to activate all four slots on the UCR-61S2B
  * flash reader */
 int usb_stor_ucr61s2b_init(struct us_data *us);
+int rio_karma_init(struct us_data *us);
diff --git a/drivers/usb/storage/libusual.c b/drivers/usb/storage/libusual.c
index b28151d1b609..b1ec4a718547 100644
--- a/drivers/usb/storage/libusual.c
+++ b/drivers/usb/storage/libusual.c
@@ -116,7 +116,7 @@ EXPORT_SYMBOL_GPL(usb_usual_check_type);
 static int usu_probe(struct usb_interface *intf,
                          const struct usb_device_id *id)
 {
-        int type;
+        unsigned long type;
         int rc;
         unsigned long flags;
 
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index dc301e567cfc..ee958f986eb8 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -145,6 +145,11 @@ UNUSUAL_DEV(  0x0451, 0x5416, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_BULK, NULL,
                 US_FL_NEED_OVERRIDE ),
 
+UNUSUAL_DEV(  0x045a, 0x5210, 0x0101, 0x0101,
+                "Rio",
+                "Rio Karma",
+                US_SC_SCSI, US_PR_BULK, rio_karma_init, 0),
+
 /* Patch submitted by Philipp Friedrich <philipp@void.at> */
 UNUSUAL_DEV(  0x0482, 0x0100, 0x0100, 0x0100,
                 "Kyocera",
@@ -424,11 +429,11 @@ UNUSUAL_DEV(  0x054c, 0x0010, 0x0106, 0x0450,
                 US_FL_SINGLE_LUN | US_FL_NOT_LOCKABLE | US_FL_NO_WP_DETECT ),
 
 /* This entry is needed because the device reports Sub=ff */
-UNUSUAL_DEV(  0x054c, 0x0010, 0x0500, 0x0500, 
-               "Sony",
-               "DSC-T1", 
-               US_SC_8070, US_PR_DEVICE, NULL,
-               US_FL_SINGLE_LUN ),
+UNUSUAL_DEV(  0x054c, 0x0010, 0x0500, 0x0600,
+                "Sony",
+                "DSC-T1/T5",
+                US_SC_8070, US_PR_DEVICE, NULL,
+                US_FL_SINGLE_LUN ),
 
 
 /* Reported by wim@geeks.nl */
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 5d02f16b7d0e..4de9fb56ebfc 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -234,7 +234,7 @@ static struct file_operations skel_fops = {
 
 /* 
  * usb class driver info in order to get a minor number from the usb core,
- * and to have the device registered with devfs and the driver core
+ * and to have the device registered with the driver core
  */
 static struct usb_class_driver skel_class = {
         .name =         "skel%d",
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index b2187175d03f..6761b68c35e9 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -116,9 +116,10 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
         int ret = 0;
 
         memset(&var->transp, 0, sizeof(var->transp));
-        memset(&var->red, 0, sizeof(var->red));
-        memset(&var->green, 0, sizeof(var->green));
-        memset(&var->blue, 0, sizeof(var->blue));
+
+        var->red.msb_right = 0;
+        var->green.msb_right = 0;
+        var->blue.msb_right = 0;
 
         switch (var->bits_per_pixel) {
         case 1:
@@ -133,34 +134,20 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
                 var->blue.offset        = 0;
                 break;
         case 16:
-                var->red.length         = 5;
-                var->green.length       = 6;
-                var->blue.length        = 5;
-                if (fb->panel->cntl & CNTL_BGR) {
-                        var->red.offset         = 11;
-                        var->green.offset       = 5;
-                        var->blue.offset        = 0;
-                } else {
-                        var->red.offset         = 0;
-                        var->green.offset       = 5;
-                        var->blue.offset        = 11;
-                }
+                var->red.length = 5;
+                var->blue.length = 5;
+                /*
+                 * Green length can be 5 or 6 depending whether
+                 * we're operating in RGB555 or RGB565 mode.
+                 */
+                if (var->green.length != 5 && var->green.length != 6)
+                        var->green.length = 6;
                 break;
         case 32:
                 if (fb->panel->cntl & CNTL_LCDTFT) {
                         var->red.length         = 8;
                         var->green.length       = 8;
                         var->blue.length        = 8;
-
-                        if (fb->panel->cntl & CNTL_BGR) {
-                                var->red.offset         = 16;
-                                var->green.offset       = 8;
-                                var->blue.offset        = 0;
-                        } else {
-                                var->red.offset         = 0;
-                                var->green.offset       = 8;
-                                var->blue.offset        = 16;
-                        }
                         break;
                 }
         default:
@@ -168,6 +155,23 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
                 break;
         }
 
+        /*
+         * >= 16bpp displays have separate colour component bitfields
+         * encoded in the pixel data.  Calculate their position from
+         * the bitfield length defined above.
+         */
+        if (ret == 0 && var->bits_per_pixel >= 16) {
+                if (fb->panel->cntl & CNTL_BGR) {
+                        var->blue.offset = 0;
+                        var->green.offset = var->blue.offset + var->blue.length;
+                        var->red.offset = var->green.offset + var->green.length;
+                } else {
+                        var->red.offset = 0;
+                        var->green.offset = var->red.offset + var->red.length;
+                        var->blue.offset = var->green.offset + var->green.length;
+                }
+        }
+
         return ret;
 }
 
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 996d543d6609..9d996f2c10d5 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -50,3 +50,11 @@ config BACKLIGHT_CORGI
           If you have a Sharp Zaurus SL-C7xx, say y to enable the
           backlight driver.
 
+config BACKLIGHT_HP680
+        tristate "HP Jornada 680 Backlight Driver"
+        depends on BACKLIGHT_DEVICE && SH_HP6XX
+        default y
+        help
+          If you have a HP Jornada 680, say y to enable the
+          backlight driver.
+
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 4af321fae390..744210c38e74 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -3,4 +3,5 @@
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_CORGI)   += corgi_bl.o
+obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
 obj-$(CONFIG_SHARP_LOCOMO)      += locomolcd.o
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
new file mode 100644
index 000000000000..95da4c9ed1f1
--- /dev/null
+++ b/drivers/video/backlight/hp680_bl.c
@@ -0,0 +1,189 @@
+/*
+ *  Backlight Driver for HP Jornada 680
+ *
+ *  Copyright (c) 2005 Andriy Skulysh
+ *
+ *  Based on Sharp's Corgi Backlight Driver
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/spinlock.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
+
+#include <asm/cpu/dac.h>
+#include <asm/hp6xx/hp6xx.h>
+#include <asm/hd64461/hd64461.h>
+
+#define HP680_MAX_INTENSITY 255
+#define HP680_DEFAULT_INTENSITY 10
+
+static int hp680bl_powermode = FB_BLANK_UNBLANK;
+static int current_intensity = 0;
+static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;
+
+static void hp680bl_send_intensity(int intensity)
+{
+        unsigned long flags;
+
+        if (hp680bl_powermode != FB_BLANK_UNBLANK)
+                intensity = 0;
+
+        spin_lock_irqsave(&bl_lock, flags);
+        sh_dac_output(255-(u8)intensity, DAC_LCD_BRIGHTNESS);
+        spin_unlock_irqrestore(&bl_lock, flags);
+}
+
+static void hp680bl_blank(int blank)
+{
+        u16 v;
+
+        switch(blank) {
+
+        case FB_BLANK_NORMAL:
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_POWERDOWN:
+                if (hp680bl_powermode == FB_BLANK_UNBLANK) {
+                        hp680bl_send_intensity(0);
+                        hp680bl_powermode = blank;
+                        sh_dac_disable(DAC_LCD_BRIGHTNESS);
+                        v = inw(HD64461_GPBDR);
+                        v |= HD64461_GPBDR_LCDOFF;
+                        outw(v, HD64461_GPBDR);
+                }
+                break;
+        case FB_BLANK_UNBLANK:
+                if (hp680bl_powermode != FB_BLANK_UNBLANK) {
+                        sh_dac_enable(DAC_LCD_BRIGHTNESS);
+                        v = inw(HD64461_GPBDR);
+                        v &= ~HD64461_GPBDR_LCDOFF;
+                        outw(v, HD64461_GPBDR);
+                        hp680bl_powermode = blank;
+                        hp680bl_send_intensity(current_intensity);
+                }
+                break;
+        }
+}
+
+#ifdef CONFIG_PM
+static int hp680bl_suspend(struct device *dev, pm_message_t state, u32 level)
+{
+        if (level == SUSPEND_POWER_DOWN)
+                hp680bl_blank(FB_BLANK_POWERDOWN);
+        return 0;
+}
+
+static int hp680bl_resume(struct device *dev, u32 level)
+{
+        if (level == RESUME_POWER_ON)
+                hp680bl_blank(FB_BLANK_UNBLANK);
+        return 0;
+}
+#else
+#define hp680bl_suspend NULL
+#define hp680bl_resume  NULL
+#endif
+
+
+static int hp680bl_set_power(struct backlight_device *bd, int state)
+{
+        hp680bl_blank(state);
+        return 0;
+}
+
+static int hp680bl_get_power(struct backlight_device *bd)
+{
+        return hp680bl_powermode;
+}
+
+static int hp680bl_set_intensity(struct backlight_device *bd, int intensity)
+{
+        if (intensity > HP680_MAX_INTENSITY)
+                intensity = HP680_MAX_INTENSITY;
+        hp680bl_send_intensity(intensity);
+        current_intensity = intensity;
+        return 0;
+}
+
+static int hp680bl_get_intensity(struct backlight_device *bd)
+{
+        return current_intensity;
+}
+
+static struct backlight_properties hp680bl_data = {
+        .owner          = THIS_MODULE,
+        .get_power      = hp680bl_get_power,
+        .set_power      = hp680bl_set_power,
+        .max_brightness = HP680_MAX_INTENSITY,
+        .get_brightness = hp680bl_get_intensity,
+        .set_brightness = hp680bl_set_intensity,
+};
+
+static struct backlight_device *hp680_backlight_device;
+
+static int __init hp680bl_probe(struct device *dev)
+{
+        hp680_backlight_device = backlight_device_register ("hp680-bl",
+                NULL, &hp680bl_data);
+        if (IS_ERR (hp680_backlight_device))
+                return PTR_ERR (hp680_backlight_device);
+
+        hp680bl_set_intensity(NULL, HP680_DEFAULT_INTENSITY);
+
+        return 0;
+}
+
+static int hp680bl_remove(struct device *dev)
+{
+        backlight_device_unregister(hp680_backlight_device);
+
+        return 0;
+}
+
+static struct device_driver hp680bl_driver = {
+        .name           = "hp680-bl",
+        .bus            = &platform_bus_type,
+        .probe          = hp680bl_probe,
+        .remove         = hp680bl_remove,
+        .suspend        = hp680bl_suspend,
+        .resume         = hp680bl_resume,
+};
+
+static struct platform_device hp680bl_device = {
+        .name   = "hp680-bl",
+        .id     = -1,
+};
+
+static int __init hp680bl_init(void)
+{
+        int ret;
+
+        ret=driver_register(&hp680bl_driver);
+        if (!ret) {
+                ret = platform_device_register(&hp680bl_device);
+                if (ret)
+                        driver_unregister(&hp680bl_driver);
+        }
+        return ret;
+}
+
+static void __exit hp680bl_exit(void)
+{
+        platform_device_unregister(&hp680bl_device);
+        driver_unregister(&hp680bl_driver);
+}
+
+module_init(hp680bl_init);
+module_exit(hp680bl_exit);
+
+MODULE_AUTHOR("Andriy Skulysh <askulysh@image.kiev.ua>");
+MODULE_DESCRIPTION("HP Jornada 680 Backlight Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index a7bcd17112c0..0339f5640a78 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -30,10 +30,11 @@
 
 #define STI_DRIVERVERSION "Version 0.9a"
 
-struct sti_struct *default_sti;
+struct sti_struct *default_sti __read_mostly;
 
-static int num_sti_roms;                          /* # of STI ROMS found */
-static struct sti_struct *sti_roms[MAX_STI_ROMS]; /* ptr to each sti_struct */
+/* number of STI ROMS found and their ptrs to each struct */
+static int num_sti_roms __read_mostly;
+static struct sti_struct *sti_roms[MAX_STI_ROMS] __read_mostly;
 
 
 /* The colour indices used by STI are
@@ -266,7 +267,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
 
 
 
-static char default_sti_path[21];
+static char default_sti_path[21] __read_mostly;
 
 #ifndef MODULE
 static int __init sti_setup(char *str)
@@ -414,10 +415,10 @@ sti_init_glob_cfg(struct sti_struct *sti,
         if (!sti->sti_mem_request)
                 sti->sti_mem_request = 256; /* STI default */
 
-        glob_cfg = kmalloc(sizeof(*sti->glob_cfg), GFP_KERNEL);
-        glob_cfg_ext = kmalloc(sizeof(*glob_cfg_ext), GFP_KERNEL);
-        save_addr = kmalloc(save_addr_size, GFP_KERNEL);
-        sti_mem_addr = kmalloc(sti->sti_mem_request, GFP_KERNEL);
+        glob_cfg = kzalloc(sizeof(*sti->glob_cfg), GFP_KERNEL);
+        glob_cfg_ext = kzalloc(sizeof(*glob_cfg_ext), GFP_KERNEL);
+        save_addr = kzalloc(save_addr_size, GFP_KERNEL);
+        sti_mem_addr = kzalloc(sti->sti_mem_request, GFP_KERNEL);
 
         if (!(glob_cfg && glob_cfg_ext && save_addr && sti_mem_addr)) {
                 kfree(glob_cfg);
@@ -427,11 +428,6 @@ sti_init_glob_cfg(struct sti_struct *sti,
                 return -ENOMEM;
         }
 
-        memset(glob_cfg, 0, sizeof(*glob_cfg));
-        memset(glob_cfg_ext, 0, sizeof(*glob_cfg_ext));
-        memset(save_addr, 0, save_addr_size);
-        memset(sti_mem_addr, 0, sti->sti_mem_request);
-
         glob_cfg->ext_ptr = STI_PTR(glob_cfg_ext);
         glob_cfg->save_addr = STI_PTR(save_addr);
         for (i=0; i<8; i++) {
@@ -502,9 +498,9 @@ sti_init_glob_cfg(struct sti_struct *sti,
 
 #ifdef CONFIG_FB
 struct sti_cooked_font * __init
-sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
+sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
 {
-        struct font_desc *fbfont;
+        const struct font_desc *fbfont;
         unsigned int size, bpc;
         void *dest;
         struct sti_rom_font *nf;
@@ -525,10 +521,9 @@ sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
         size = bpc * 256;
         size += sizeof(struct sti_rom_font);
 
-        nf = kmalloc(size, GFP_KERNEL);
+        nf = kzalloc(size, GFP_KERNEL);
         if (!nf)
                 return NULL;
-        memset(nf, 0, size);
 
         nf->first_char = 0;
         nf->last_char = 255;
@@ -544,7 +539,7 @@ sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
         dest += sizeof(struct sti_rom_font);
         memcpy(dest, fbfont->data, bpc*256);
 
-        cooked_font = kmalloc(sizeof(*cooked_font), GFP_KERNEL);
+        cooked_font = kzalloc(sizeof(*cooked_font), GFP_KERNEL);
         if (!cooked_font) {
                 kfree(nf);
                 return NULL;
@@ -559,7 +554,7 @@ sti_select_fbfont( struct sti_cooked_rom *cooked_rom, char *fbfont_name )
 }
 #else
 struct sti_cooked_font * __init
-sti_select_fbfont(struct sti_cooked_rom *cooked_rom, char *fbfont_name)
+sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
 {
         return NULL;
 }
@@ -617,7 +612,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
         struct sti_rom_font *raw_font, *font_start;
         struct sti_cooked_font *cooked_font;
         
-        cooked_font = kmalloc(sizeof(*cooked_font), GFP_KERNEL);
+        cooked_font = kzalloc(sizeof(*cooked_font), GFP_KERNEL);
         if (!cooked_font)
                 return 0;
 
@@ -631,7 +626,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
         while (raw_font->next_font) {
                 raw_font = ((void *)font_start) + (raw_font->next_font);
 
-                cooked_font->next_font = kmalloc(sizeof(*cooked_font), GFP_KERNEL);
+                cooked_font->next_font = kzalloc(sizeof(*cooked_font), GFP_KERNEL);
                 if (!cooked_font->next_font)
                         return 1;
 
@@ -668,10 +663,9 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
         unsigned char *n, *p, *q;
         int size = f->raw->bytes_per_char*256+sizeof(struct sti_rom_font);
         
-        n = kmalloc (4*size, GFP_KERNEL);
+        n = kzalloc (4*size, GFP_KERNEL);
         if (!n)
                 return NULL;
-        memset (n, 0, 4*size);
         p = n + 3;
         q = (unsigned char *)f->raw;
         while (size--) {
@@ -816,13 +810,12 @@ sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd
                 return NULL;
         }
         
-        sti = kmalloc(sizeof(*sti), GFP_KERNEL);
+        sti = kzalloc(sizeof(*sti), GFP_KERNEL);
         if (!sti) {
                 printk(KERN_ERR "Not enough memory !\n");
                 return NULL;
         }
 
-        memset(sti, 0, sizeof(*sti));
         spin_lock_init(&sti->lock);
 
 test_rom:
@@ -1035,7 +1028,7 @@ static struct parisc_driver pa_sti_driver = {
  * sti_init_roms() - detects all STI ROMs and stores them in sti_roms[]
  */
 
-static int sticore_initialized;
+static int sticore_initialized __read_mostly;
 
 static void __init sti_init_roms(void)
 {
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
index 2b972461a030..0ae0a97b0fed 100644
--- a/drivers/video/cyblafb.c
+++ b/drivers/video/cyblafb.c
@@ -1665,7 +1665,6 @@ static int __devinit cyblafb_init(void)
                 }
 #endif
         output("CyblaFB version %s initializing\n", VERSION);
-        return pci_module_init(&cyblafb_pci_driver);
         return pci_register_driver(&cyblafb_pci_driver);
 }
 
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index bd410e06db73..e3c8b5f1ca76 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -191,11 +191,11 @@ int i810_probe_i2c_connector(struct fb_info *info, u8 **out_edid, int conn)
         u8 *edid = NULL;
         int i;
 
-        DPRINTK("i810-i2c: Probe DDC%i Bus\n", conn);
-        if (conn < 4) {
+        DPRINTK("i810-i2c: Probe DDC%i Bus\n", conn+1);
+        if (conn < par->ddc_num) {
                 for (i = 0; i < 3; i++) {
                         /* Do the real work */
-                        edid = i810_do_probe_i2c_edid(&par->chan[conn-1]);
+                        edid = i810_do_probe_i2c_edid(&par->chan[conn]);
                         if (edid)
                                 break;
                 }
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index 6c187d5fe951..579195c2bea3 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -280,6 +280,7 @@ struct i810fb_par {
         u32 blit_bpp;
         u32 ovract;
         u32 cur_state;
+        u32 ddc_num;
         int mtrr_reg;
         u16 bltcntl;
         u8 interlace;
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 266d0ab92663..d8467c03b49f 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -149,6 +149,7 @@ static int vyres      __devinitdata;
 static int sync       __devinitdata;
 static int extvga     __devinitdata;
 static int dcolor     __devinitdata;
+static int ddc3       __devinitdata = 2;
 
 /*------------------------------------------------------------*/
 
@@ -1763,6 +1764,8 @@ static void __devinit i810_init_defaults(struct i810fb_par *par,
         if (sync) 
                 par->dev_flags |= ALWAYS_SYNC;
 
+        par->ddc_num = ddc3;
+
         if (bpp < 8)
                 bpp = 8;
         
@@ -1885,7 +1888,7 @@ static void __devinit i810fb_find_init_mode(struct fb_info *info)
         int found = 0;
 #ifdef CONFIG_FB_I810_I2C
         int i;
-        int err;
+        int err = 1;
         struct i810fb_par *par = info->par;
 #endif
 
@@ -1895,8 +1898,8 @@ static void __devinit i810fb_find_init_mode(struct fb_info *info)
 #ifdef CONFIG_FB_I810_I2C
         i810_create_i2c_busses(par);
 
-        for (i = 0; i < 4; i++) {
-                err = i810_probe_i2c_connector(info, &par->edid, i+1);
+        for (i = 0; i < par->ddc_num + 1; i++) {
+                err = i810_probe_i2c_connector(info, &par->edid, i);
                 if (!err)
                         break;
         }
@@ -1983,6 +1986,8 @@ static int __devinit i810fb_setup(char *options)
                         vsync2 = simple_strtoul(this_opt+7, NULL, 0);
                 else if (!strncmp(this_opt, "dcolor", 6))
                         dcolor = 1;
+                else if (!strncmp(this_opt, "ddc3", 4))
+                        ddc3 = 3;
                 else
                         mode_option = this_opt;
         }
@@ -2190,6 +2195,8 @@ MODULE_PARM_DESC(sync, "wait for accel engine to finish drawing"
 module_param(dcolor, bool, 0);
 MODULE_PARM_DESC(dcolor, "use DirectColor visuals"
                  " (default = 0 = TrueColor)");
+module_param(ddc3, bool, 0);
+MODULE_PARM_DESC(ddc3, "Probe DDC bus 3 (default = 0 = no)");
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "Specify initial video mode");